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:47
Message-Id: 1614499396.ea9a84c313855498c26825e578fbc1b2e313135e.juippis@gentoo
1 commit: ea9a84c313855498c26825e578fbc1b2e313135e
2 Author: Francisco Blas (klondike) Izquierdo Riera <klondike <AT> gentoo <DOT> org>
3 AuthorDate: Mon Jan 25 01:34:41 2021 +0000
4 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
5 CommitDate: Sun Feb 28 08:03:16 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea9a84c3
7
8 net-p2p/eiskaltdcpp: Update to 2.4.1
9
10 * Update to 2.4.1
11 * Add gold USE flag
12 * make.defaults has USE=cli enable json by default too to keep CI happy
13 * Correctly indicate support for lua-5.2
14 * Drop boost dependency
15 * All gcc and clang versions on the portage tree support c++14
16 so no need for a explicit check
17 * Port also these changes to the live ebuild
18 * Take ownership of the package
19 * Fix compilation when lua is disabled and lua is not available on the
20 system.
21 * Update longdescription. (Thanks tehnick).
22
23 Closes: https://bugs.gentoo.org/749249
24 Package-Manager: Portage-3.0.12, Repoman-3.0.2
25 Signed-off-by: Francisco Blas Izquierdo Riera (klondike) <klondike <AT> gentoo.org>
26 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
27
28 net-p2p/eiskaltdcpp/Manifest | 1 +
29 ...ltdcpp-9999.ebuild => eiskaltdcpp-2.4.1.ebuild} | 34 +++++++++++++++++-----
30 net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild | 33 ++++++++++++++++-----
31 net-p2p/eiskaltdcpp/metadata.xml | 10 ++++++-
32 4 files changed, 61 insertions(+), 17 deletions(-)
33
34 diff --git a/net-p2p/eiskaltdcpp/Manifest b/net-p2p/eiskaltdcpp/Manifest
35 index a50fbe6a2ab..d58c59f8511 100644
36 --- a/net-p2p/eiskaltdcpp/Manifest
37 +++ b/net-p2p/eiskaltdcpp/Manifest
38 @@ -1 +1,2 @@
39 DIST eiskaltdcpp-2.2.10.tar.gz 3843143 BLAKE2B 907b54271e7bf990a7826168728619020fd05b3d7826ba155763a3a2bef1154978e94978082513ca32a40866e275a8ea0da71f1eca0d77353320c0aefb7065ac SHA512 97c39287b9568aebc5ab21aeabefb63ea32bde8744242bb8647b742c933de9cf74a7fbb2e6df7be6046319bbc660e8abdec0fa332ee91ec5048492af0d763818
40 +DIST eiskaltdcpp-2.4.1.tar.xz 4301580 BLAKE2B 5fbf17d59686373b06ab7f86c5eaa00d9dd8d16b9ff89367d50024e4af1ea4c7abd281fa294718228544f8e0b8276af89a5d6a79d02fd09ca226387c278829c6 SHA512 05bb31a94081207812787d6d5ee4d8f479b3582f41f09441fbb60a4214a220d9d7fa3ea3e52c6e91a5d084aa92bab6994dbd9769e4d792d95c51dde5bc12ee55
41
42 diff --git a/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild b/net-p2p/eiskaltdcpp/eiskaltdcpp-2.4.1.ebuild
43 similarity index 80%
44 copy from net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild
45 copy to net-p2p/eiskaltdcpp/eiskaltdcpp-2.4.1.ebuild
46 index 50b6c2dfc1e..db60ca40584 100644
47 --- a/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild
48 +++ b/net-p2p/eiskaltdcpp/eiskaltdcpp-2.4.1.ebuild
49 @@ -3,11 +3,11 @@
50
51 EAPI=7
52
53 -LUA_COMPAT=( lua5-1 )
54 +LUA_COMPAT=( lua5-1 lua5-2 )
55
56 PLOCALES="be bg cs de el en es eu fr hu it pl pt_BR ru sk sr sr@latin sv_SE tr uk vi zh_CN"
57
58 -inherit cmake l10n lua-single xdg-utils
59 +inherit cmake l10n lua-single xdg-utils toolchain-funcs
60 [[ ${PV} = *9999* ]] && inherit git-r3
61
62 DESCRIPTION="Qt/DC++ based client for DirectConnect and ADC protocols"
63 @@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/eiskaltdcpp/eiskaltdcpp"
64
65 LICENSE="GPL-2 GPL-3"
66 SLOT="0"
67 -IUSE="cli daemon dbus +dht examples -gtk idn -javascript json libcanberra libnotify lua +minimal pcre +qt5 spell sqlite upnp -xmlrpc"
68 +IUSE="cli daemon dbus +dht examples -gold -gtk idn -javascript +json libcanberra libnotify lua +minimal pcre +qt5 spell sqlite upnp -xmlrpc"
69
70 REQUIRED_USE="
71 ?? ( json xmlrpc )
72 @@ -30,15 +30,15 @@ REQUIRED_USE="
73 "
74
75 if [[ ${PV} != *9999* ]]; then
76 - SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
77 + SRC_URI="mirror://sourceforge/project/${PN}/Sources/${P}.tar.xz"
78 KEYWORDS="~amd64 ~x86"
79 else
80 EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
81 + KEYWORDS=""
82 fi
83
84 RDEPEND="
85 app-arch/bzip2
86 - dev-libs/boost:=
87 dev-libs/openssl:0=
88 sys-apps/attr
89 sys-libs/zlib
90 @@ -52,7 +52,10 @@ RDEPEND="
91 json? ( dev-perl/JSON-RPC )
92 xmlrpc? ( dev-perl/RPC-XML )
93 )
94 - daemon? ( xmlrpc? ( dev-libs/xmlrpc-c[abyss,cxx] ) )
95 + daemon? (
96 + json? ( dev-libs/jsoncpp:= )
97 + xmlrpc? ( dev-libs/xmlrpc-c[abyss,cxx] )
98 + )
99 gtk? (
100 dev-libs/glib:2
101 x11-libs/gtk+:3
102 @@ -82,6 +85,9 @@ RDEPEND="
103 )
104 upnp? ( net-libs/miniupnpc )
105 "
106 +BDEPEND="
107 + gold? ( sys-devel/binutils[gold] )
108 +"
109 DEPEND="${RDEPEND}
110 sys-devel/gettext
111 virtual/pkgconfig
112 @@ -90,6 +96,10 @@ DEPEND="${RDEPEND}
113
114 DOCS=( AUTHORS ChangeLog.txt )
115
116 +PATCHES=(
117 + "${FILESDIR}/${PN}-2.2.10-cmake_lua_version.patch"
118 +)
119 +
120 CMAKE_REMOVE_MODULES_LIST="FindLua"
121
122 src_prepare() {
123 @@ -101,7 +111,7 @@ src_configure() {
124 local mycmakeargs=(
125 -DLIB_INSTALL_DIR="$(get_libdir)"
126 -Dlinguas="$(l10n_get_locales)"
127 - -DLOCAL_MINIUPNP=OFF
128 + -DCREATE_MO=ON
129 -DUSE_GTK=OFF
130 -DUSE_LIBGNOME2=OFF
131 -DUSE_QT=OFF
132 @@ -119,8 +129,16 @@ src_configure() {
133 -DPERL_REGEX=$(usex pcre)
134 -DUSE_QT5=$(usex qt5)
135 -DUSE_ASPELL=$(usex spell)
136 + -DLOCAL_ASPELL_DATA=OFF
137 -DUSE_QT_SQLITE=$(usex sqlite)
138 -DUSE_MINIUPNP=$(usex upnp)
139 + -DFORCE_XDG=ON
140 + -DENABLE_STACKTRACE=OFF
141 + -DUSE_GOLD=$(usex gold)
142 + -DLOCAL_JSONCPP=OFF
143 + -DBUILD_STATIC=OFF
144 + -DINSTALL_QT_TRANSLATIONS=OFF
145 + -DCOMPRESS_MANPAGES=OFF
146 )
147 if use cli; then
148 mycmakeargs+=(
149 @@ -137,7 +155,7 @@ src_configure() {
150 if use lua; then
151 mycmakeargs+=(
152 -DLUA_SCRIPT=ON
153 - -DWITH_LUASCRIPTS=ON
154 + -DWITH_LUASCRIPTS=$(usex examples)
155 -DLUA_VERSION=$(ver_cut 1-2 $(lua_get_version))
156 )
157 fi
158
159 diff --git a/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild b/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild
160 index 50b6c2dfc1e..fe6e41e66ad 100644
161 --- a/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild
162 +++ b/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild
163 @@ -3,11 +3,11 @@
164
165 EAPI=7
166
167 -LUA_COMPAT=( lua5-1 )
168 +LUA_COMPAT=( lua5-1 lua5-2 )
169
170 PLOCALES="be bg cs de el en es eu fr hu it pl pt_BR ru sk sr sr@latin sv_SE tr uk vi zh_CN"
171
172 -inherit cmake l10n lua-single xdg-utils
173 +inherit cmake l10n lua-single xdg-utils toolchain-funcs
174 [[ ${PV} = *9999* ]] && inherit git-r3
175
176 DESCRIPTION="Qt/DC++ based client for DirectConnect and ADC protocols"
177 @@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/eiskaltdcpp/eiskaltdcpp"
178
179 LICENSE="GPL-2 GPL-3"
180 SLOT="0"
181 -IUSE="cli daemon dbus +dht examples -gtk idn -javascript json libcanberra libnotify lua +minimal pcre +qt5 spell sqlite upnp -xmlrpc"
182 +IUSE="cli daemon dbus +dht examples -gold -gtk idn -javascript +json libcanberra libnotify lua +minimal pcre +qt5 spell sqlite upnp -xmlrpc"
183
184 REQUIRED_USE="
185 ?? ( json xmlrpc )
186 @@ -30,7 +30,7 @@ REQUIRED_USE="
187 "
188
189 if [[ ${PV} != *9999* ]]; then
190 - SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
191 + SRC_URI="mirror://sourceforge/project/${PN}/Sources/${P}.tar.xz"
192 KEYWORDS="~amd64 ~x86"
193 else
194 EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
195 @@ -38,7 +38,6 @@ fi
196
197 RDEPEND="
198 app-arch/bzip2
199 - dev-libs/boost:=
200 dev-libs/openssl:0=
201 sys-apps/attr
202 sys-libs/zlib
203 @@ -52,7 +51,10 @@ RDEPEND="
204 json? ( dev-perl/JSON-RPC )
205 xmlrpc? ( dev-perl/RPC-XML )
206 )
207 - daemon? ( xmlrpc? ( dev-libs/xmlrpc-c[abyss,cxx] ) )
208 + daemon? (
209 + json? ( dev-libs/jsoncpp:= )
210 + xmlrpc? ( dev-libs/xmlrpc-c[abyss,cxx] )
211 + )
212 gtk? (
213 dev-libs/glib:2
214 x11-libs/gtk+:3
215 @@ -82,6 +84,9 @@ RDEPEND="
216 )
217 upnp? ( net-libs/miniupnpc )
218 "
219 +BDEPEND="
220 + gold? ( sys-devel/binutils[gold] )
221 +"
222 DEPEND="${RDEPEND}
223 sys-devel/gettext
224 virtual/pkgconfig
225 @@ -90,6 +95,10 @@ DEPEND="${RDEPEND}
226
227 DOCS=( AUTHORS ChangeLog.txt )
228
229 +PATCHES=(
230 + "${FILESDIR}/${PN}-2.2.10-cmake_lua_version.patch"
231 +)
232 +
233 CMAKE_REMOVE_MODULES_LIST="FindLua"
234
235 src_prepare() {
236 @@ -101,7 +110,7 @@ src_configure() {
237 local mycmakeargs=(
238 -DLIB_INSTALL_DIR="$(get_libdir)"
239 -Dlinguas="$(l10n_get_locales)"
240 - -DLOCAL_MINIUPNP=OFF
241 + -DCREATE_MO=ON
242 -DUSE_GTK=OFF
243 -DUSE_LIBGNOME2=OFF
244 -DUSE_QT=OFF
245 @@ -119,8 +128,16 @@ src_configure() {
246 -DPERL_REGEX=$(usex pcre)
247 -DUSE_QT5=$(usex qt5)
248 -DUSE_ASPELL=$(usex spell)
249 + -DLOCAL_ASPELL_DATA=OFF
250 -DUSE_QT_SQLITE=$(usex sqlite)
251 -DUSE_MINIUPNP=$(usex upnp)
252 + -DFORCE_XDG=ON
253 + -DENABLE_STACKTRACE=OFF
254 + -DUSE_GOLD=$(usex gold)
255 + -DLOCAL_JSONCPP=OFF
256 + -DBUILD_STATIC=OFF
257 + -DINSTALL_QT_TRANSLATIONS=OFF
258 + -DCOMPRESS_MANPAGES=OFF
259 )
260 if use cli; then
261 mycmakeargs+=(
262 @@ -137,7 +154,7 @@ src_configure() {
263 if use lua; then
264 mycmakeargs+=(
265 -DLUA_SCRIPT=ON
266 - -DWITH_LUASCRIPTS=ON
267 + -DWITH_LUASCRIPTS=$(usex examples)
268 -DLUA_VERSION=$(ver_cut 1-2 $(lua_get_version))
269 )
270 fi
271
272 diff --git a/net-p2p/eiskaltdcpp/metadata.xml b/net-p2p/eiskaltdcpp/metadata.xml
273 index b65eafebb42..9f4843b1a10 100644
274 --- a/net-p2p/eiskaltdcpp/metadata.xml
275 +++ b/net-p2p/eiskaltdcpp/metadata.xml
276 @@ -1,7 +1,14 @@
277 <?xml version='1.0' encoding='UTF-8'?>
278 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
279 <pkgmetadata>
280 - <!-- maintainer-needed -->
281 + <maintainer type="person">
282 + <email>klondike@g.o</email>
283 + <name>Francisco Blas (klondike) Izquierdo Riera</name>
284 + </maintainer>
285 + <maintainer type="project">
286 + <email>proxy-maint@g.o</email>
287 + <name>Proxy Maintainers</name>
288 + </maintainer>
289 <longdescription lang="en">
290 EiskaltDC++ is a multi-platform program that uses the Direct Connect and
291 ADC protocol. It is compatible with other DC clients, such as the original DC
292 @@ -12,6 +19,7 @@
293 <flag name="cli">Enable sample cli based on readline</flag>
294 <flag name="daemon">Enable eiskaltdcpp-daemon</flag>
295 <flag name="dht">Enable DHT (distributed hash table) support for libeiskaltdcpp</flag>
296 + <flag name="gold">Use gold.ld instead of ld</flag>
297 <flag name="json">Enable JSON for cli and daemon</flag>
298 <flag name="libcanberra">Enable sound notifications support over libcanberra in EiskaltDC++ Gtk</flag>
299 <flag name="minimal">Don't install headers</flag>