gentoo resync : 21.06.2020

5 files changed, 2 insertions, 148 deletions

diff --git a/net-p2p/amule/Manifest b/net-p2p/amule/Manifest
index 8e16feaa5dbd..8a83a9c60d55 100644
--- a/net-p2p/amule/Manifest
+++ b/net-p2p/amule/Manifest
@@ -8,14 +8,11 @@ AUX amule-2.3.2-fix-crash-shared-dir-utf8.patch 2204 BLAKE2B 3266ef16038176af0e3
 AUX amule-2.3.2-fix-crash-when-shared-files-changed.patch 1648 BLAKE2B f3bf70c65b374d468935f8b2f32519bbda66bb49387a81727fd52efaa15156bc0a8a5cb49ba8bbcfa212c7ec79b8b141e27e318bee95ceb8f37e35cdd98b2988 SHA512 748d8746e01d2aeefe7084030db190302c71b57c97fa438fc958d5fe7eb415b2b624f04f6bb436ca612731061b863f9251bbd81a10e87d8acc0f9ff5fc948b7e
 AUX amule-2.3.2-libupnp-1.6.patch 10759 BLAKE2B b17237b087467dd6204296939cc4ea8bf76d7d95ed766d3a1c967fd15126e71c18ca014afc07dbe7312c807f132e4d35817521b8fb7d77b97bc4e10f5e45de5f SHA512 565f240fb05093c567f1cab4b23a6ce3d59587078e7179568e1b87dd105b0a9a2dd505f296db5208fe121c7580de9384a1e9986ef0f309f7e87e25ab37bc23f1
 AUX amule-2.3.2-libupnp-1.8.patch 9618 BLAKE2B e04d9346fe86e724af925c7494857bb9a0d8a84f6bd753d103f9c4fea636f556b5c40218b96d44743415aba2ea2b371d3ebd15459663f653fe99fec615fee9d6 SHA512 1b74c7bd94acc70dee5e10572b3b9707448e09f4f8d07a7e41c09c5f97276d94de5b905f6b2e34c8a54332f8b3fca62d8c824682f33bbcdbbdeb58b620b918ea
-AUX amuled.confd 300 BLAKE2B 891cf5d274eb10a23b5b43200d861b5e4361b9c0a11acd020542ff1f0d7d96725b113fb6d74ab34c56d408311582d8524f7bb8f77d1255f3e374abe3b9f34a8b SHA512 88a3fcc64ed4c4729609e3ffef098d4bf30bda0d17b5165fff3417161c18766df79de11c98ee510677291bca7ded33d2a23d3aff0d99781f98173cc189f44901
 AUX amuled.confd-r1 199 BLAKE2B e018a8827749b0b5266533adfc549d0c40b339470439fd5a04c9380b5489e3d58b49478c6a1fcc4954d97816e66bdbf8a6105de0aee7991defd1df553db46e27 SHA512 4b82864f874ea5ede360a88aa589baa4336d16074ed10e2841ea5e2cb0961fe8553c28368f3a9b31d19ccaf688d77ac636219e3693e044c735bbd9de5de96bd6
 AUX amuled.initd 1105 BLAKE2B 16525a9c5ad8c158d0d4f1ba316fb493cb438b985a0a4d52672b4067acdfae6dd4897d7c37459515ce4a0e6b0b89665b9feaea6b15e3535c8f46b83ce0c16d05 SHA512 3ec351e84da4e33918747de4ccd9ec86895b60f9d94836fc92112489edcfe14af7a21efb79194b80bb81aa666714bd5a21873c954b36948e31369727e71143b6
-AUX amuleweb.confd 720 BLAKE2B 1bcb4349f34c8deef069d156da29ff3dcb642f9b5c15fbef742d0154ff6580142fa2c2c797a3864cd398c980c1e2b2eb41f2c958c6f356f3077e79de47fe7610 SHA512 ba760e45002a80bb55e2729178d0901f885e8d142903f8eb98a31b8544bf6989801dabfa0315e0d1f7d8bfa3df5716cce43bf415f45a4605895dc2907716ca41
 AUX amuleweb.confd-r1 619 BLAKE2B 7140f6d957760f8184c3c73db0a58a3b7b308a6d8548700cab8517bba5274fbad35ebb940ea11f96527553807b1365b7f7c27a6e7d8b656b51f60072cabe5ab8 SHA512 d9fcfc96f4c1bcd7bdae8ed4da19b4edec05e1b55149c664589c267539d183500a732f70670f0cde935c5f509f9dfbc97fd0e92b7047e1690f1342fa6504994d
 AUX amuleweb.initd 1149 BLAKE2B ef29bae12cf72764798eecb6866405525b601ee6ea869b6191954799805f47b75976884ee566ecb03eca907b3b13ff7870541b7682a70d5db058fb1257d6f00d SHA512 4cc944af90ad81f09d74d79dede57d1ff26c1b87649432d14ed294770b04f6ea256c25c194edfdc8f9d0c85929b1c576c31eba9228703e5a21259d83968289b0
 DIST aMule-2.3.2.tar.xz 3895300 BLAKE2B cf1bce3a0fcd0c108e369b7aed257f067a4ce3ce2fd4e8509b577ac58f8bc52fbc9aabc5c703bc9111dd06ac011ee1f3756279b093b69bcaada106226493237a SHA512 3064b086f8459b4372ea0c11f239a08167c7beac3dde26889f056f617b480b487bea10c2cae8fdfa1ae99c10fc9e715adc8e01e4b968389861aa47c3ec8c0016
-EBUILD amule-2.3.2-r2.ebuild 2340 BLAKE2B 9e1a34ed32160a724264302f954280dd014899efe2b767fe2b6850738e93960bea8ee84573365d0616554cb10444face37428b057e7f98efb2c69393d80efe27 SHA512 00d8da48dabec279688a50ad92c71fd74cefe44f66386fa170cc006f94373fd23fe627271ae598447063897371f37510e8ba7c38eb85e1ff761f6d43670fb224
-EBUILD amule-2.3.2-r5.ebuild 3564 BLAKE2B 1299bcb759a16b4208803526ddae6439cd5948f0c7446c4cef1b0d9cf208c381a459e5c62552dd38a39e3a00049f76466ce41a72832c8b39d1192bd6ff49d1bd SHA512 5492d73bce793abd860bd2ce1695688aa911319ce7ac2fdb37cbf2f78f5f0b236e5d3b5d72b612ab3594d86c07efc0f0ef59214a1d6afa5fe8435f353b92d3f5
+EBUILD amule-2.3.2-r5.ebuild 3560 BLAKE2B 4c07d95d9262741fc0524ffbc2de826e867baa072c889d5c962c1cb30db54d9300d3e59fb6b012e39841a49dec3510fb5359afddcd7d77d7028d607e5e605147 SHA512 b657705ec19ead75d1a2422faa4aa5b130b441fef538513c6b745c307a5d53ecd8848951ad7f2efd2d3850e504d73fe29e05683b24b36a645816eb55d1365c45
 EBUILD amule-9999.ebuild 2993 BLAKE2B 092bff5f6c925f5a4b76d5d1152cec75e450737200393a4103c6f6c618acf9369f7c8421eb80fb97a505261f17083a86edb6a0fb0b736728b9fadc4723f6a822 SHA512 f54c20bdfe58fab7e2f231f1ebbc4b1a6a55bbe3264b3d3409e9d6881a3bf94ad48b016458d5c7367ed7bc1c4d0fbc2f385b4a23f94c921adc78e90893d69b22
 MISC metadata.xml 636 BLAKE2B 3384c1c34c9963570b17793188db257a5c0648390aaa8ca73f4bad50db8b54be9d0fe5d379b873fd0f21bf6ecaeaf5840ca65ad92c72a1449b25035f9b7ee3c3 SHA512 bd93ef13a5d116f81c8a6901e524032a85eab90589067e57e165f643f8f0a75047869801b4485fa47a0bc41008f3b8f1aff1aa8b413c83b4c27610ef6ea58d5f
diff --git a/net-p2p/amule/amule-2.3.2-r2.ebuild b/net-p2p/amule/amule-2.3.2-r2.ebuild
deleted file mode 100644
index d94a14893ecb..000000000000
--- a/net-p2p/amule/amule-2.3.2-r2.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-WX_GTK_VER="3.0"
-
-inherit wxwidgets user
-
-MY_P="${PN/m/M}-${PV}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="aMule, the all-platform eMule p2p client"
-HOMEPAGE="http://www.amule.org/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ppc ppc64 ~sparc x86"
-IUSE="daemon debug geoip nls remote stats upnp +X"
-
-COMMON_DEPEND="
-	dev-libs/boost:=
-	dev-libs/crypto++:=
-	sys-libs/binutils-libs:0=
-	sys-libs/zlib
-	x11-libs/wxGTK:${WX_GTK_VER}[X?]
-	stats? ( media-libs/gd:=[jpeg,png] )
-	geoip? ( dev-libs/geoip )
-	upnp? ( net-libs/libupnp:* )
-	remote? ( media-libs/libpng:0= )
-	!net-p2p/imule"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.3.2-fix-crash-shared-dir-utf8.patch"
-	"${FILESDIR}/${PN}-2.3.2-fix-crash-closing-last-search-tab-1.patch"
-	"${FILESDIR}/${PN}-2.3.2-fix-crash-closing-last-search-tab-2.patch"
-	"${FILESDIR}/${PN}-2.3.2-cryptopp-6.patch"
-	"${FILESDIR}/${PN}-2.3.2-disable-version-check.patch"
-)
-
-pkg_setup() {
-	if use stats && ! use X; then
-		einfo "Note: You would need both the X and stats USE flags"
-		einfo "to compile aMule Statistics GUI."
-		einfo "I will now compile console versions only."
-	fi
-
-	setup-wxwidgets
-}
-
-pkg_preinst() {
-	if use daemon || use remote; then
-		enewgroup p2p
-		enewuser p2p -1 -1 /home/p2p p2p
-	fi
-}
-
-src_configure() {
-	local myconf
-
-	if use X; then
-		use stats && myconf="${myconf}
-			--enable-wxcas
-			--enable-alc"
-		use remote && myconf="${myconf}
-			--enable-amule-gui"
-	else
-		myconf="
-			--disable-monolithic
-			--disable-amule-gui
-			--disable-wxcas
-			--disable-alc"
-	fi
-
-	econf \
-		--with-denoise-level=0 \
-		--with-wx-config="${WX_CONFIG}" \
-		--enable-amulecmd \
-		--with-boost \
-		$(use_enable debug) \
-		$(use_enable daemon amule-daemon) \
-		$(use_enable geoip) \
-		$(use_enable nls) \
-		$(use_enable remote webserver) \
-		$(use_enable stats cas) \
-		$(use_enable stats alcc) \
-		$(use_enable upnp) \
-		${myconf}
-}
-
-src_install() {
-	default
-
-	if use daemon; then
-		newconfd "${FILESDIR}"/amuled.confd amuled
-		newinitd "${FILESDIR}"/amuled.initd amuled
-	fi
-	if use remote; then
-		newconfd "${FILESDIR}"/amuleweb.confd amuleweb
-		newinitd "${FILESDIR}"/amuleweb.initd amuleweb
-	fi
-}
diff --git a/net-p2p/amule/amule-2.3.2-r5.ebuild b/net-p2p/amule/amule-2.3.2-r5.ebuild
index 50397fafc6db..c35014cef8c8 100644
--- a/net-p2p/amule/amule-2.3.2-r5.ebuild
+++ b/net-p2p/amule/amule-2.3.2-r5.ebuild
@@ -13,7 +13,7 @@ else
 	MY_P="${PN/m/M}-${PV}"
 	SRC_URI="https://download.sourceforge.net/${PN}/${MY_P}.tar.xz"
 	S="${WORKDIR}/${MY_P}"
-	KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 ~arm ppc ppc64 ~sparc x86"
 fi
 
 DESCRIPTION="aMule, the all-platform eMule p2p client"
diff --git a/net-p2p/amule/files/amuled.confd b/net-p2p/amule/files/amuled.confd
deleted file mode 100644
index f8888bf2a2ba..000000000000
--- a/net-p2p/amule/files/amuled.confd
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# owner of amuled process (must be existing)
-AMULEUSER="p2p"
-
-# home directory for amuled (must be existing)
-AMULEHOME="/home/p2p"
-
-# log file (/dev/null for nowhere)
-LOG=/var/log/amuled.log
-
diff --git a/net-p2p/amule/files/amuleweb.confd b/net-p2p/amule/files/amuleweb.confd
deleted file mode 100644
index 29a3ea624750..000000000000
--- a/net-p2p/amule/files/amuleweb.confd
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# owner of amuleweb process (must be existing)
-AMULEUSER="p2p"
-
-# home directory for amuleweb (from where to read configuration) (must be existing)
-AMULEHOME="/home/p2p"
-
-# log file (/dev/null for nowhere)
-LOG=/var/log/amuleweb.log
-
-# aMule password (note: not your webserver password, but the external
-# connection one)
-AMULEPWD="secret"
-
-# Full (admin) access password for webserver
-WEBPWD="secret2"
-
-# aMule host (this could be a remote host or usually localhost)
-AMULEHOST="localhost"
-
-# aMule external connection port
-AMULEPORT="4712"
-
-# aMuleweb template (default, php-default, chicane)
-TEMPLATE="default"