Gentoo Archives: gentoo-commits

From: Joonas Niilola <juippis@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-p2p/eiskaltdcpp/
Date: Sun, 28 Feb 2021 08:05:46
Message-Id: 1614499442.27c0a064ddc4c780307282ecbabf46f905a3145c.juippis@gentoo
1 commit: 27c0a064ddc4c780307282ecbabf46f905a3145c
2 Author: Francisco Blas (klondike) Izquierdo Riera <klondike <AT> gentoo <DOT> org>
3 AuthorDate: Fri Feb 26 12:34:04 2021 +0000
4 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
5 CommitDate: Sun Feb 28 08:04:02 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27c0a064
7
8 net-p2p/eiskaltdcpp: Drop XML-RPC support
9
10 It fails to compile with newer versions of Eiskaltdc++ and
11 upstream is already planning to drop it (see [1]).
12
13 Patching the daemon to fix these errors is not trivial and
14 this codepath may introduce other issues as it is not well
15 tested.
16
17 While we are at this, also merge JSON support with the
18 daemon and cli USE flags as there is no point on keeping
19 it as a separated USE flag.
20
21 If you intend to readd ZML-RPC, please first write a patch
22 that addresses the compilation issues.
23
24 [1] https://github.com/eiskaltdcpp/eiskaltdcpp/issues/440
25
26 Package-Manager: Portage-3.0.13, Repoman-3.0.2
27 Signed-off-by: Francisco Blas Izquierdo Riera (klondike) <klondike <AT> gentoo.org>
28 Closes: https://github.com/gentoo/gentoo/pull/18854
29 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
30
31 net-p2p/eiskaltdcpp/eiskaltdcpp-2.4.1.ebuild | 24 +++++-------------------
32 net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild | 26 +++++++-------------------
33 net-p2p/eiskaltdcpp/metadata.xml | 1 -
34 3 files changed, 12 insertions(+), 39 deletions(-)
35
36 diff --git a/net-p2p/eiskaltdcpp/eiskaltdcpp-2.4.1.ebuild b/net-p2p/eiskaltdcpp/eiskaltdcpp-2.4.1.ebuild
37 index 620632d1c3a..315afa71682 100644
38 --- a/net-p2p/eiskaltdcpp/eiskaltdcpp-2.4.1.ebuild
39 +++ b/net-p2p/eiskaltdcpp/eiskaltdcpp-2.4.1.ebuild
40 @@ -15,11 +15,9 @@ HOMEPAGE="https://github.com/eiskaltdcpp/eiskaltdcpp"
41
42 LICENSE="GPL-2 GPL-3"
43 SLOT="0"
44 -IUSE="cli daemon dbus +dht examples gold gtk idn javascript +json libcanberra libnotify lua +minimal pcre +qt5 spell sqlite upnp xmlrpc"
45 +IUSE="cli daemon dbus +dht examples gold gtk idn javascript libcanberra libnotify lua +minimal pcre +qt5 spell sqlite upnp"
46
47 REQUIRED_USE="
48 - ?? ( json xmlrpc )
49 - cli? ( ^^ ( json xmlrpc ) )
50 dbus? ( qt5 )
51 javascript? ( qt5 )
52 libcanberra? ( gtk )
53 @@ -49,12 +47,10 @@ RDEPEND="
54 dev-perl/Data-Dump
55 dev-perl/Term-ShellUI
56 virtual/perl-Getopt-Long
57 - json? ( dev-perl/JSON-RPC )
58 - xmlrpc? ( dev-perl/RPC-XML )
59 + dev-perl/JSON-RPC
60 )
61 daemon? (
62 - json? ( dev-libs/jsoncpp:= )
63 - xmlrpc? ( dev-libs/xmlrpc-c[abyss,cxx] )
64 + dev-libs/jsoncpp:=
65 )
66 gtk? (
67 dev-libs/glib:2
68 @@ -140,19 +136,9 @@ src_configure() {
69 -DBUILD_STATIC=OFF
70 -DINSTALL_QT_TRANSLATIONS=OFF
71 -DCOMPRESS_MANPAGES=OFF
72 + -DUSE_CLI_JSONRPC=$(usex cli)
73 + -DJSONRPC_DAEMON=$(usex daemon)
74 )
75 - if use cli; then
76 - mycmakeargs+=(
77 - -DUSE_CLI_JSONRPC=$(usex json)
78 - -DUSE_CLI_XMLRPC=$(usex xmlrpc)
79 - )
80 - fi
81 - if use daemon; then
82 - mycmakeargs+=(
83 - -DJSONRPC_DAEMON=$(usex json)
84 - -DXMLRPC_DAEMON=$(usex xmlrpc)
85 - )
86 - fi
87 if use lua; then
88 mycmakeargs+=(
89 -DLUA_SCRIPT=ON
90
91 diff --git a/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild b/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild
92 index 8467b419629..315afa71682 100644
93 --- a/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild
94 +++ b/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild
95 @@ -15,11 +15,9 @@ HOMEPAGE="https://github.com/eiskaltdcpp/eiskaltdcpp"
96
97 LICENSE="GPL-2 GPL-3"
98 SLOT="0"
99 -IUSE="cli daemon dbus +dht examples gold gtk idn javascript +json libcanberra libnotify lua +minimal pcre +qt5 spell sqlite upnp xmlrpc"
100 +IUSE="cli daemon dbus +dht examples gold gtk idn javascript libcanberra libnotify lua +minimal pcre +qt5 spell sqlite upnp"
101
102 REQUIRED_USE="
103 - ?? ( json xmlrpc )
104 - cli? ( ^^ ( json xmlrpc ) )
105 dbus? ( qt5 )
106 javascript? ( qt5 )
107 libcanberra? ( gtk )
108 @@ -34,6 +32,7 @@ if [[ ${PV} != *9999* ]]; then
109 KEYWORDS="~amd64 ~x86"
110 else
111 EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
112 + KEYWORDS=""
113 fi
114
115 RDEPEND="
116 @@ -48,12 +47,10 @@ RDEPEND="
117 dev-perl/Data-Dump
118 dev-perl/Term-ShellUI
119 virtual/perl-Getopt-Long
120 - json? ( dev-perl/JSON-RPC )
121 - xmlrpc? ( dev-perl/RPC-XML )
122 + dev-perl/JSON-RPC
123 )
124 daemon? (
125 - json? ( dev-libs/jsoncpp:= )
126 - xmlrpc? ( dev-libs/xmlrpc-c[abyss,cxx] )
127 + dev-libs/jsoncpp:=
128 )
129 gtk? (
130 dev-libs/glib:2
131 @@ -97,6 +94,7 @@ DOCS=( AUTHORS ChangeLog.txt )
132
133 PATCHES=(
134 "${FILESDIR}/${PN}-2.2.10-cmake_lua_version.patch"
135 + "${FILESDIR}/${P}-fix_upnp_compilation.patch"
136 )
137
138 CMAKE_REMOVE_MODULES_LIST="FindLua"
139 @@ -138,19 +136,9 @@ src_configure() {
140 -DBUILD_STATIC=OFF
141 -DINSTALL_QT_TRANSLATIONS=OFF
142 -DCOMPRESS_MANPAGES=OFF
143 + -DUSE_CLI_JSONRPC=$(usex cli)
144 + -DJSONRPC_DAEMON=$(usex daemon)
145 )
146 - if use cli; then
147 - mycmakeargs+=(
148 - -DUSE_CLI_JSONRPC=$(usex json)
149 - -DUSE_CLI_XMLRPC=$(usex xmlrpc)
150 - )
151 - fi
152 - if use daemon; then
153 - mycmakeargs+=(
154 - -DJSONRPC_DAEMON=$(usex json)
155 - -DXMLRPC_DAEMON=$(usex xmlrpc)
156 - )
157 - fi
158 if use lua; then
159 mycmakeargs+=(
160 -DLUA_SCRIPT=ON
161
162 diff --git a/net-p2p/eiskaltdcpp/metadata.xml b/net-p2p/eiskaltdcpp/metadata.xml
163 index 33f2f84657f..e7dbc6c81e7 100644
164 --- a/net-p2p/eiskaltdcpp/metadata.xml
165 +++ b/net-p2p/eiskaltdcpp/metadata.xml
166 @@ -20,7 +20,6 @@
167 <flag name="daemon">Enable eiskaltdcpp-daemon</flag>
168 <flag name="dht">Enable DHT (distributed hash table) support for libeiskaltdcpp</flag>
169 <flag name="gold">Use gold.ld instead of ld</flag>
170 - <flag name="json">Enable JSON for cli and daemon</flag>
171 <flag name="libcanberra">Enable sound notifications support over libcanberra in EiskaltDC++ Gtk</flag>
172 <flag name="minimal">Don't install headers</flag>
173 </use>