From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3FD3A1382C5 for ; Sun, 28 Feb 2021 08:05:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 55ED0E0880; Sun, 28 Feb 2021 08:05:45 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2AFC1E087E for ; Sun, 28 Feb 2021 08:05:45 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BE9CB34115D for ; Sun, 28 Feb 2021 08:05:36 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 033FD533 for ; Sun, 28 Feb 2021 08:05:35 +0000 (UTC) From: "Joonas Niilola" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Joonas Niilola" Message-ID: <1614499442.27c0a064ddc4c780307282ecbabf46f905a3145c.juippis@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-p2p/eiskaltdcpp/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-p2p/eiskaltdcpp/eiskaltdcpp-2.4.1.ebuild net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild net-p2p/eiskaltdcpp/metadata.xml X-VCS-Directories: net-p2p/eiskaltdcpp/ X-VCS-Committer: juippis X-VCS-Committer-Name: Joonas Niilola X-VCS-Revision: 27c0a064ddc4c780307282ecbabf46f905a3145c X-VCS-Branch: master Date: Sun, 28 Feb 2021 08:05:35 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 53c996eb-d52d-41df-a6a7-7377d6ba99ec X-Archives-Hash: 70f81c02c4d78265fa365f9412528e39 commit: 27c0a064ddc4c780307282ecbabf46f905a3145c Author: Francisco Blas (klondike) Izquierdo Riera gentoo org> AuthorDate: Fri Feb 26 12:34:04 2021 +0000 Commit: Joonas Niilola gentoo org> CommitDate: Sun Feb 28 08:04:02 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27c0a064 net-p2p/eiskaltdcpp: Drop XML-RPC support It fails to compile with newer versions of Eiskaltdc++ and upstream is already planning to drop it (see [1]). Patching the daemon to fix these errors is not trivial and this codepath may introduce other issues as it is not well tested. While we are at this, also merge JSON support with the daemon and cli USE flags as there is no point on keeping it as a separated USE flag. If you intend to readd ZML-RPC, please first write a patch that addresses the compilation issues. [1] https://github.com/eiskaltdcpp/eiskaltdcpp/issues/440 Package-Manager: Portage-3.0.13, Repoman-3.0.2 Signed-off-by: Francisco Blas Izquierdo Riera (klondike) gentoo.org> Closes: https://github.com/gentoo/gentoo/pull/18854 Signed-off-by: Joonas Niilola gentoo.org> net-p2p/eiskaltdcpp/eiskaltdcpp-2.4.1.ebuild | 24 +++++------------------- net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild | 26 +++++++------------------- net-p2p/eiskaltdcpp/metadata.xml | 1 - 3 files changed, 12 insertions(+), 39 deletions(-) diff --git a/net-p2p/eiskaltdcpp/eiskaltdcpp-2.4.1.ebuild b/net-p2p/eiskaltdcpp/eiskaltdcpp-2.4.1.ebuild index 620632d1c3a..315afa71682 100644 --- a/net-p2p/eiskaltdcpp/eiskaltdcpp-2.4.1.ebuild +++ b/net-p2p/eiskaltdcpp/eiskaltdcpp-2.4.1.ebuild @@ -15,11 +15,9 @@ HOMEPAGE="https://github.com/eiskaltdcpp/eiskaltdcpp" LICENSE="GPL-2 GPL-3" SLOT="0" -IUSE="cli daemon dbus +dht examples gold gtk idn javascript +json libcanberra libnotify lua +minimal pcre +qt5 spell sqlite upnp xmlrpc" +IUSE="cli daemon dbus +dht examples gold gtk idn javascript libcanberra libnotify lua +minimal pcre +qt5 spell sqlite upnp" REQUIRED_USE=" - ?? ( json xmlrpc ) - cli? ( ^^ ( json xmlrpc ) ) dbus? ( qt5 ) javascript? ( qt5 ) libcanberra? ( gtk ) @@ -49,12 +47,10 @@ RDEPEND=" dev-perl/Data-Dump dev-perl/Term-ShellUI virtual/perl-Getopt-Long - json? ( dev-perl/JSON-RPC ) - xmlrpc? ( dev-perl/RPC-XML ) + dev-perl/JSON-RPC ) daemon? ( - json? ( dev-libs/jsoncpp:= ) - xmlrpc? ( dev-libs/xmlrpc-c[abyss,cxx] ) + dev-libs/jsoncpp:= ) gtk? ( dev-libs/glib:2 @@ -140,19 +136,9 @@ src_configure() { -DBUILD_STATIC=OFF -DINSTALL_QT_TRANSLATIONS=OFF -DCOMPRESS_MANPAGES=OFF + -DUSE_CLI_JSONRPC=$(usex cli) + -DJSONRPC_DAEMON=$(usex daemon) ) - if use cli; then - mycmakeargs+=( - -DUSE_CLI_JSONRPC=$(usex json) - -DUSE_CLI_XMLRPC=$(usex xmlrpc) - ) - fi - if use daemon; then - mycmakeargs+=( - -DJSONRPC_DAEMON=$(usex json) - -DXMLRPC_DAEMON=$(usex xmlrpc) - ) - fi if use lua; then mycmakeargs+=( -DLUA_SCRIPT=ON diff --git a/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild b/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild index 8467b419629..315afa71682 100644 --- a/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild +++ b/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild @@ -15,11 +15,9 @@ HOMEPAGE="https://github.com/eiskaltdcpp/eiskaltdcpp" LICENSE="GPL-2 GPL-3" SLOT="0" -IUSE="cli daemon dbus +dht examples gold gtk idn javascript +json libcanberra libnotify lua +minimal pcre +qt5 spell sqlite upnp xmlrpc" +IUSE="cli daemon dbus +dht examples gold gtk idn javascript libcanberra libnotify lua +minimal pcre +qt5 spell sqlite upnp" REQUIRED_USE=" - ?? ( json xmlrpc ) - cli? ( ^^ ( json xmlrpc ) ) dbus? ( qt5 ) javascript? ( qt5 ) libcanberra? ( gtk ) @@ -34,6 +32,7 @@ if [[ ${PV} != *9999* ]]; then KEYWORDS="~amd64 ~x86" else EGIT_REPO_URI="https://github.com/${PN}/${PN}.git" + KEYWORDS="" fi RDEPEND=" @@ -48,12 +47,10 @@ RDEPEND=" dev-perl/Data-Dump dev-perl/Term-ShellUI virtual/perl-Getopt-Long - json? ( dev-perl/JSON-RPC ) - xmlrpc? ( dev-perl/RPC-XML ) + dev-perl/JSON-RPC ) daemon? ( - json? ( dev-libs/jsoncpp:= ) - xmlrpc? ( dev-libs/xmlrpc-c[abyss,cxx] ) + dev-libs/jsoncpp:= ) gtk? ( dev-libs/glib:2 @@ -97,6 +94,7 @@ DOCS=( AUTHORS ChangeLog.txt ) PATCHES=( "${FILESDIR}/${PN}-2.2.10-cmake_lua_version.patch" + "${FILESDIR}/${P}-fix_upnp_compilation.patch" ) CMAKE_REMOVE_MODULES_LIST="FindLua" @@ -138,19 +136,9 @@ src_configure() { -DBUILD_STATIC=OFF -DINSTALL_QT_TRANSLATIONS=OFF -DCOMPRESS_MANPAGES=OFF + -DUSE_CLI_JSONRPC=$(usex cli) + -DJSONRPC_DAEMON=$(usex daemon) ) - if use cli; then - mycmakeargs+=( - -DUSE_CLI_JSONRPC=$(usex json) - -DUSE_CLI_XMLRPC=$(usex xmlrpc) - ) - fi - if use daemon; then - mycmakeargs+=( - -DJSONRPC_DAEMON=$(usex json) - -DXMLRPC_DAEMON=$(usex xmlrpc) - ) - fi if use lua; then mycmakeargs+=( -DLUA_SCRIPT=ON diff --git a/net-p2p/eiskaltdcpp/metadata.xml b/net-p2p/eiskaltdcpp/metadata.xml index 33f2f84657f..e7dbc6c81e7 100644 --- a/net-p2p/eiskaltdcpp/metadata.xml +++ b/net-p2p/eiskaltdcpp/metadata.xml @@ -20,7 +20,6 @@ Enable eiskaltdcpp-daemon Enable DHT (distributed hash table) support for libeiskaltdcpp Use gold.ld instead of ld - Enable JSON for cli and daemon Enable sound notifications support over libcanberra in EiskaltDC++ Gtk Don't install headers