Gentoo Archives: gentoo-commits

From: Samuel Bernardo <samuelbernardo.mail@×××××.com>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/user/ssnb:master commit in: net-p2p/amule/files/, net-p2p/amule/
Date: Sun, 02 May 2021 11:31:43
Message-Id: 1619955087.e1a84a096ddb16b982dadd08aabd2b525ab1da3f.samuelbernardo@gentoo
1 commit: e1a84a096ddb16b982dadd08aabd2b525ab1da3f
2 Author: Samuel Bernardo <samuelbernardo.mail <AT> gmail <DOT> com>
3 AuthorDate: Sun May 2 11:31:27 2021 +0000
4 Commit: Samuel Bernardo <samuelbernardo.mail <AT> gmail <DOT> com>
5 CommitDate: Sun May 2 11:31:27 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/user/ssnb.git/commit/?id=e1a84a09
7
8 Remove amule since is being maintained in gentoo main overlay
9
10 Signed-off-by: Samuel Bernardo <samuelbernardo.mail <AT> gmail.com>
11
12 net-p2p/amule/Manifest | 10 ---
13 net-p2p/amule/amule-2.3.2-r2.ebuild | 104 -------------------------
14 net-p2p/amule/amule-2.3.3.ebuild | 104 -------------------------
15 net-p2p/amule/files/amule-2.2.6-fallocate.diff | 23 ------
16 net-p2p/amule/files/amuled.confd | 12 ---
17 net-p2p/amule/files/amuled.initd | 50 ------------
18 net-p2p/amule/files/amuleweb.confd | 27 -------
19 net-p2p/amule/files/amuleweb.initd | 49 ------------
20 net-p2p/amule/metadata.xml | 13 ----
21 9 files changed, 392 deletions(-)
22
23 diff --git a/net-p2p/amule/Manifest b/net-p2p/amule/Manifest
24 deleted file mode 100644
25 index 3740ec4..0000000
26 --- a/net-p2p/amule/Manifest
27 +++ /dev/null
28 @@ -1,10 +0,0 @@
29 -AUX amule-2.2.6-fallocate.diff 687 BLAKE2B c7c7df787b417e58db50c59192eb455c495ecd38f9fd5f547ff3db6cfa642eba323f4ade99c66fe981777479a728afb9e12e1ae494853af8bbb4634448820dcd SHA512 406eb05eecfa7d027f7eaeefa2ead92078d5f7ed0e72f3ce47ac4f1f23b2852577f429f999a009198515e35efacfa6e54283494bb3eaf6332ee6bed9963c65ba
30 -AUX amuled.confd 300 BLAKE2B 891cf5d274eb10a23b5b43200d861b5e4361b9c0a11acd020542ff1f0d7d96725b113fb6d74ab34c56d408311582d8524f7bb8f77d1255f3e374abe3b9f34a8b SHA512 88a3fcc64ed4c4729609e3ffef098d4bf30bda0d17b5165fff3417161c18766df79de11c98ee510677291bca7ded33d2a23d3aff0d99781f98173cc189f44901
31 -AUX amuled.initd 1105 BLAKE2B 16525a9c5ad8c158d0d4f1ba316fb493cb438b985a0a4d52672b4067acdfae6dd4897d7c37459515ce4a0e6b0b89665b9feaea6b15e3535c8f46b83ce0c16d05 SHA512 3ec351e84da4e33918747de4ccd9ec86895b60f9d94836fc92112489edcfe14af7a21efb79194b80bb81aa666714bd5a21873c954b36948e31369727e71143b6
32 -AUX amuleweb.confd 720 BLAKE2B 1bcb4349f34c8deef069d156da29ff3dcb642f9b5c15fbef742d0154ff6580142fa2c2c797a3864cd398c980c1e2b2eb41f2c958c6f356f3077e79de47fe7610 SHA512 ba760e45002a80bb55e2729178d0901f885e8d142903f8eb98a31b8544bf6989801dabfa0315e0d1f7d8bfa3df5716cce43bf415f45a4605895dc2907716ca41
33 -AUX amuleweb.initd 1149 BLAKE2B ef29bae12cf72764798eecb6866405525b601ee6ea869b6191954799805f47b75976884ee566ecb03eca907b3b13ff7870541b7682a70d5db058fb1257d6f00d SHA512 4cc944af90ad81f09d74d79dede57d1ff26c1b87649432d14ed294770b04f6ea256c25c194edfdc8f9d0c85929b1c576c31eba9228703e5a21259d83968289b0
34 -DIST aMule-2.3.2.tar.xz 3895300 BLAKE2B cf1bce3a0fcd0c108e369b7aed257f067a4ce3ce2fd4e8509b577ac58f8bc52fbc9aabc5c703bc9111dd06ac011ee1f3756279b093b69bcaada106226493237a SHA512 3064b086f8459b4372ea0c11f239a08167c7beac3dde26889f056f617b480b487bea10c2cae8fdfa1ae99c10fc9e715adc8e01e4b968389861aa47c3ec8c0016
35 -DIST aMule-2.3.3.tar.xz 3699376 BLAKE2B 4b1fb98bd52e4c75f81773020d4fc258f8e7c4d7a5d40a7aadabc8fd27b3079705761650fdcd7cd089da77575a74f1950f02039ee14bf4b9894550b8b3d9191b SHA512 a5a80c5ddd1e107d92070c1d8e232c2762c4c54791abc067c739eef7c690062ed164dd7733808f80c762719261162aeb3d602308964dda2670a0bb059d87b74e
36 -EBUILD amule-2.3.2-r2.ebuild 2264 BLAKE2B f5ce383b82f808b7a92f0739151d9b14d18b5f3357ba0acb366d57d7dbf5f6b198acd6bad91f7a7abfbc78f633a0df5a271d9fcee3975ee5ac76f15bf8997455 SHA512 5dc7d5ab1d0643a44e64e60f3e9b76df4c4f6647b3e9637398d441d88f2428a175796e41e1ae8acfd181420eebc2b82835659870f6d9c3b9eeb73a0ac9994b25
37 -EBUILD amule-2.3.3.ebuild 2264 BLAKE2B f5ce383b82f808b7a92f0739151d9b14d18b5f3357ba0acb366d57d7dbf5f6b198acd6bad91f7a7abfbc78f633a0df5a271d9fcee3975ee5ac76f15bf8997455 SHA512 5dc7d5ab1d0643a44e64e60f3e9b76df4c4f6647b3e9637398d441d88f2428a175796e41e1ae8acfd181420eebc2b82835659870f6d9c3b9eeb73a0ac9994b25
38 -MISC metadata.xml 443 BLAKE2B fe1d99ffaa324176572c2598aa153515cff324e69df364d4e7b2cc71af7c82b8573718ac2f3a4b2ae462f2aa844e7ecff97df91715ba76ebd15f001342c61057 SHA512 61b72c6f3bf1aaf4d09045f2ff0d1eb053cc55fe4126da2aa25d45ba7ee7c3db604df823cbf02db2a758e1ee108c4516f0223b4c3dfe88a67d75ae7a2bb44d38
39
40 diff --git a/net-p2p/amule/amule-2.3.2-r2.ebuild b/net-p2p/amule/amule-2.3.2-r2.ebuild
41 deleted file mode 100644
42 index d0cfae3..0000000
43 --- a/net-p2p/amule/amule-2.3.2-r2.ebuild
44 +++ /dev/null
45 @@ -1,104 +0,0 @@
46 -# Copyright 1999-2017 Gentoo Foundation
47 -# Distributed under the terms of the GNU General Public License v2
48 -
49 -EAPI=7
50 -WX_GTK_VER="3.0"
51 -
52 -inherit wxwidgets user
53 -
54 -MY_P="${PN/m/M}-${PV}"
55 -S="${WORKDIR}/${MY_P}"
56 -
57 -DESCRIPTION="aMule, the all-platform eMule p2p client"
58 -HOMEPAGE="http://www.amule.org/"
59 -SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
60 -
61 -LICENSE="GPL-2"
62 -SLOT="0"
63 -KEYWORDS="alpha amd64 ~arm ppc ppc64 ~sparc x86"
64 -IUSE="daemon debug geoip nls remote stats unicode upnp +X"
65 -
66 -COMMON_DEPEND="
67 - dev-libs/crypto++
68 - sys-libs/binutils-libs:0=
69 - sys-libs/zlib
70 - x11-libs/wxGTK:${WX_GTK_VER}[X?]
71 - stats? ( media-libs/gd:=[jpeg,png] )
72 - geoip? ( dev-libs/geoip )
73 - upnp? ( net-libs/libupnp:* )
74 - remote? ( media-libs/libpng:0=
75 - unicode? ( media-libs/gd:= ) )
76 - !net-p2p/imule"
77 -DEPEND="${COMMON_DEPEND}"
78 -RDEPEND="${COMMON_DEPEND}"
79 -
80 -PATCHES=( "${FILESDIR}/${PN}-2.2.6-fallocate.diff" )
81 -
82 -pkg_setup() {
83 - if use stats && ! use X; then
84 - einfo "Note: You would need both the X and stats USE flags"
85 - einfo "to compile aMule Statistics GUI."
86 - einfo "I will now compile console versions only."
87 - fi
88 -}
89 -
90 -pkg_preinst() {
91 - if use daemon || use remote; then
92 - enewgroup p2p
93 - enewuser p2p -1 -1 /home/p2p p2p
94 - fi
95 -}
96 -
97 -src_configure() {
98 - local myconf
99 -
100 - if use X; then
101 - einfo "wxGTK with X support will be used"
102 - need-wxwidgets unicode
103 - else
104 - einfo "wxGTK without X support will be used"
105 - need-wxwidgets base-unicode
106 - fi
107 -
108 - if use X ; then
109 - use stats && myconf="${myconf}
110 - --enable-wxcas
111 - --enable-alc"
112 - use remote && myconf="${myconf}
113 - --enable-amule-gui"
114 - else
115 - myconf="
116 - --disable-monolithic
117 - --disable-amule-gui
118 - --disable-wxcas
119 - --disable-alc"
120 - fi
121 -
122 - econf \
123 - --with-denoise-level=0 \
124 - --with-wx-config="${WX_CONFIG}" \
125 - --enable-amulecmd \
126 - --without-boost \
127 - $(use_enable debug) \
128 - $(use_enable daemon amule-daemon) \
129 - $(use_enable geoip) \
130 - $(use_enable nls) \
131 - $(use_enable remote webserver) \
132 - $(use_enable stats cas) \
133 - $(use_enable stats alcc) \
134 - $(use_enable upnp) \
135 - ${myconf}
136 -}
137 -
138 -src_install() {
139 - default
140 -
141 - if use daemon; then
142 - newconfd "${FILESDIR}"/amuled.confd amuled
143 - newinitd "${FILESDIR}"/amuled.initd amuled
144 - fi
145 - if use remote; then
146 - newconfd "${FILESDIR}"/amuleweb.confd amuleweb
147 - newinitd "${FILESDIR}"/amuleweb.initd amuleweb
148 - fi
149 -}
150
151 diff --git a/net-p2p/amule/amule-2.3.3.ebuild b/net-p2p/amule/amule-2.3.3.ebuild
152 deleted file mode 100644
153 index d0cfae3..0000000
154 --- a/net-p2p/amule/amule-2.3.3.ebuild
155 +++ /dev/null
156 @@ -1,104 +0,0 @@
157 -# Copyright 1999-2017 Gentoo Foundation
158 -# Distributed under the terms of the GNU General Public License v2
159 -
160 -EAPI=7
161 -WX_GTK_VER="3.0"
162 -
163 -inherit wxwidgets user
164 -
165 -MY_P="${PN/m/M}-${PV}"
166 -S="${WORKDIR}/${MY_P}"
167 -
168 -DESCRIPTION="aMule, the all-platform eMule p2p client"
169 -HOMEPAGE="http://www.amule.org/"
170 -SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
171 -
172 -LICENSE="GPL-2"
173 -SLOT="0"
174 -KEYWORDS="alpha amd64 ~arm ppc ppc64 ~sparc x86"
175 -IUSE="daemon debug geoip nls remote stats unicode upnp +X"
176 -
177 -COMMON_DEPEND="
178 - dev-libs/crypto++
179 - sys-libs/binutils-libs:0=
180 - sys-libs/zlib
181 - x11-libs/wxGTK:${WX_GTK_VER}[X?]
182 - stats? ( media-libs/gd:=[jpeg,png] )
183 - geoip? ( dev-libs/geoip )
184 - upnp? ( net-libs/libupnp:* )
185 - remote? ( media-libs/libpng:0=
186 - unicode? ( media-libs/gd:= ) )
187 - !net-p2p/imule"
188 -DEPEND="${COMMON_DEPEND}"
189 -RDEPEND="${COMMON_DEPEND}"
190 -
191 -PATCHES=( "${FILESDIR}/${PN}-2.2.6-fallocate.diff" )
192 -
193 -pkg_setup() {
194 - if use stats && ! use X; then
195 - einfo "Note: You would need both the X and stats USE flags"
196 - einfo "to compile aMule Statistics GUI."
197 - einfo "I will now compile console versions only."
198 - fi
199 -}
200 -
201 -pkg_preinst() {
202 - if use daemon || use remote; then
203 - enewgroup p2p
204 - enewuser p2p -1 -1 /home/p2p p2p
205 - fi
206 -}
207 -
208 -src_configure() {
209 - local myconf
210 -
211 - if use X; then
212 - einfo "wxGTK with X support will be used"
213 - need-wxwidgets unicode
214 - else
215 - einfo "wxGTK without X support will be used"
216 - need-wxwidgets base-unicode
217 - fi
218 -
219 - if use X ; then
220 - use stats && myconf="${myconf}
221 - --enable-wxcas
222 - --enable-alc"
223 - use remote && myconf="${myconf}
224 - --enable-amule-gui"
225 - else
226 - myconf="
227 - --disable-monolithic
228 - --disable-amule-gui
229 - --disable-wxcas
230 - --disable-alc"
231 - fi
232 -
233 - econf \
234 - --with-denoise-level=0 \
235 - --with-wx-config="${WX_CONFIG}" \
236 - --enable-amulecmd \
237 - --without-boost \
238 - $(use_enable debug) \
239 - $(use_enable daemon amule-daemon) \
240 - $(use_enable geoip) \
241 - $(use_enable nls) \
242 - $(use_enable remote webserver) \
243 - $(use_enable stats cas) \
244 - $(use_enable stats alcc) \
245 - $(use_enable upnp) \
246 - ${myconf}
247 -}
248 -
249 -src_install() {
250 - default
251 -
252 - if use daemon; then
253 - newconfd "${FILESDIR}"/amuled.confd amuled
254 - newinitd "${FILESDIR}"/amuled.initd amuled
255 - fi
256 - if use remote; then
257 - newconfd "${FILESDIR}"/amuleweb.confd amuleweb
258 - newinitd "${FILESDIR}"/amuleweb.initd amuleweb
259 - fi
260 -}
261
262 diff --git a/net-p2p/amule/files/amule-2.2.6-fallocate.diff b/net-p2p/amule/files/amule-2.2.6-fallocate.diff
263 deleted file mode 100644
264 index 8d1485a..0000000
265 --- a/net-p2p/amule/files/amule-2.2.6-fallocate.diff
266 +++ /dev/null
267 @@ -1,23 +0,0 @@
268 -Disable fallocate #562992
269 -
270 -This is only a workaround to fix FTBFS, the configure check is wrong and needs to be fixed:
271 -http://www.amule.org/abugs/view.php?id=1572
272 -
273 ---- a/src/ThreadTasks.cpp
274 -+++ b/src/ThreadTasks.cpp
275 -@@ -506,6 +506,15 @@ void CCompletionTask::OnExit()
276 - #include <stdlib.h>
277 - #include <errno.h>
278 -
279 -+// #562992
280 -+#if defined(__alpha__) || defined(__hppa__)
281 -+#undef HAVE_FALLOCATE
282 -+#endif
283 -+
284 -+#if defined(__hppa__)
285 -+#undef HAVE_SYS_FALLOCATE
286 -+#endif
287 -+
288 - CAllocateFileTask::CAllocateFileTask(CPartFile *file, bool pause)
289 - // GetPrintable is used to improve the readability of the log.
290 - : CThreadTask(wxT("Allocating"), file->GetFullName().RemoveExt().GetPrintable(), ETP_High),
291
292 diff --git a/net-p2p/amule/files/amuled.confd b/net-p2p/amule/files/amuled.confd
293 deleted file mode 100644
294 index f8888bf..0000000
295 --- a/net-p2p/amule/files/amuled.confd
296 +++ /dev/null
297 @@ -1,12 +0,0 @@
298 -# Copyright 1999-2005 Gentoo Foundation
299 -# Distributed under the terms of the GNU General Public License v2
300 -
301 -# owner of amuled process (must be existing)
302 -AMULEUSER="p2p"
303 -
304 -# home directory for amuled (must be existing)
305 -AMULEHOME="/home/p2p"
306 -
307 -# log file (/dev/null for nowhere)
308 -LOG=/var/log/amuled.log
309 -
310
311 diff --git a/net-p2p/amule/files/amuled.initd b/net-p2p/amule/files/amuled.initd
312 deleted file mode 100644
313 index 7a1f87e..0000000
314 --- a/net-p2p/amule/files/amuled.initd
315 +++ /dev/null
316 @@ -1,50 +0,0 @@
317 -#!/sbin/openrc-run
318 -# Copyright 1999-2016 Gentoo Foundation
319 -# Distributed under the terms of the GNU General Public License v2
320 -
321 -depend() {
322 - need net
323 -}
324 -
325 -start() {
326 - if ! test -f "${AMULEHOME}/.aMule/amule.conf"; then
327 - eerror "You must start and configure amuled before launch it. Sorry."
328 - return 1
329 - fi
330 -
331 - if pgrep -u ${AMULEUSER} amuled >/dev/null; then
332 - eerror "An instance of aMule webserver is already running"
333 - return 1
334 - fi
335 - if [ -e /var/run/amuled.pid ]; then
336 - rm /var/run/amuled.pid
337 - fi
338 -
339 - ebegin "Starting aMule Daemon"
340 - start-stop-daemon --start \
341 - --quiet --background \
342 - --make-pidfile --pidfile /var/run/amuled.pid \
343 - --env HOME="${AMULEHOME}" \
344 - --user ${AMULEUSER} \
345 - --exec /usr/bin/amuled >${LOG}
346 -
347 - sleep 2
348 - if ! pgrep -u ${AMULEUSER} amuled > /dev/null; then
349 - eerror "aMule daemon can't be started! Check logfile: ${LOG}"
350 - fi
351 - eend $?
352 -}
353 -
354 -stop() {
355 - ebegin "Stopping aMule daemon -- please wait"
356 - start-stop-daemon --stop --pidfile /var/run/amuled.pid 2>&1 >/dev/null
357 - eend $?
358 -}
359 -
360 -restart() {
361 - svc_stop
362 - while `pgrep -u ${AMULEUSER} amuled >/dev/null`; do
363 - sleep 1
364 - done
365 - svc_start
366 -}
367
368 diff --git a/net-p2p/amule/files/amuleweb.confd b/net-p2p/amule/files/amuleweb.confd
369 deleted file mode 100644
370 index 29a3ea6..0000000
371 --- a/net-p2p/amule/files/amuleweb.confd
372 +++ /dev/null
373 @@ -1,27 +0,0 @@
374 -# Copyright 1999-2005 Gentoo Foundation
375 -# Distributed under the terms of the GNU General Public License v2
376 -
377 -# owner of amuleweb process (must be existing)
378 -AMULEUSER="p2p"
379 -
380 -# home directory for amuleweb (from where to read configuration) (must be existing)
381 -AMULEHOME="/home/p2p"
382 -
383 -# log file (/dev/null for nowhere)
384 -LOG=/var/log/amuleweb.log
385 -
386 -# aMule password (note: not your webserver password, but the external
387 -# connection one)
388 -AMULEPWD="secret"
389 -
390 -# Full (admin) access password for webserver
391 -WEBPWD="secret2"
392 -
393 -# aMule host (this could be a remote host or usually localhost)
394 -AMULEHOST="localhost"
395 -
396 -# aMule external connection port
397 -AMULEPORT="4712"
398 -
399 -# aMuleweb template (default, php-default, chicane)
400 -TEMPLATE="default"
401
402 diff --git a/net-p2p/amule/files/amuleweb.initd b/net-p2p/amule/files/amuleweb.initd
403 deleted file mode 100644
404 index bf00fcd..0000000
405 --- a/net-p2p/amule/files/amuleweb.initd
406 +++ /dev/null
407 @@ -1,49 +0,0 @@
408 -#!/sbin/openrc-run
409 -# Copyright 1999-2016 Gentoo Foundation
410 -# Distributed under the terms of the GNU General Public License v2
411 -
412 -depend() {
413 - need net
414 - use amuled
415 -}
416 -
417 -start() {
418 - if ! test -f "${AMULEHOME}/.aMule/amule.conf"; then
419 - eerror "You must start and configure amuleweb before launch it. Sorry."
420 - return 1
421 - fi
422 -
423 - if pgrep -u ${AMULEUSER} amuleweb >/dev/null; then
424 - eerror "An instance of aMule webserver is already running"
425 - return 1
426 - fi
427 -
428 - if [ -e /var/run/amuleweb.pid ]; then
429 - rm /var/run/amuleweb.pid
430 - fi
431 -
432 - OPTIONS="-h ${AMULEHOST} -p ${AMULEPORT} -P ${AMULEPWD} -A ${WEBPWD} -t ${TEMPLATE} -q"
433 -
434 - ebegin "Starting aMule WebServer"
435 - start-stop-daemon --start \
436 - --quiet --background \
437 - --make-pidfile --pidfile /var/run/amuleweb.pid \
438 - --env HOME="${AMULEHOME}" \
439 - --user ${AMULEUSER} \
440 - --exec /usr/bin/amuleweb -- ${OPTIONS} 2>&1 >${LOG}
441 -
442 - sleep 1
443 - if ! pgrep -u ${AMULEUSER} amuleweb > /dev/null; then
444 - eerror "aMule daemon can't be started! Check logfile: ${LOG}"
445 - eend 1
446 - return 1
447 - fi
448 - eend $?
449 -}
450 -
451 -stop() {
452 - ebegin "Stopping aMule WebServer"
453 - start-stop-daemon --stop --pidfile /var/run/amuleweb.pid 2>&1 >/dev/null
454 - eend $?
455 -}
456 -
457
458 diff --git a/net-p2p/amule/metadata.xml b/net-p2p/amule/metadata.xml
459 deleted file mode 100644
460 index 2a3a655..0000000
461 --- a/net-p2p/amule/metadata.xml
462 +++ /dev/null
463 @@ -1,13 +0,0 @@
464 -<?xml version="1.0" encoding="UTF-8"?>
465 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
466 -<pkgmetadata>
467 - <!-- maintainer-needed -->
468 - <use>
469 - <flag name="daemon">Enable amule daemon</flag>
470 - <flag name="remote">Enable remote controlling of the client</flag>
471 - <flag name="stats">Enable statistic reporting</flag>
472 - </use>
473 - <upstream>
474 - <remote-id type="sourceforge">amule</remote-id>
475 - </upstream>
476 -</pkgmetadata>