gentoo (leap year) resync : 29.02.2020

4 files changed, 178 insertions, 1 deletions

diff --git a/net-p2p/amule/Manifest b/net-p2p/amule/Manifest
index 894232e09dbe..9a391dab3459 100644
--- a/net-p2p/amule/Manifest
+++ b/net-p2p/amule/Manifest
@@ -1,3 +1,4 @@
+AUX amule-2.3.2-Fixed-compilation-with-newer-bfd.patch 931 BLAKE2B 5506a79dfaa15578cee4da734ad27549a0c9c300acd7dc4c9dcf72148f464901a1939e013aa2acc347499ec4dbdb1aaada0730115498534b0a399d09c607d991 SHA512 7bcf505f9e5cdd0a7e282b7d35afa2277df6d5e359d8836cfbf41d10165ab859ca9ba896df171b50195d3a7acfe882bc4547254bc4ffb4774ea787e40e24a3dc
 AUX amule-2.3.2-cryptopp-6.patch 927 BLAKE2B 3be08b8219cebdaf252f21dd4a7e469d0371aa62a5ed9856c13d8772163c8f85cb7f19d9cf383e226276852c7acbb73ffdcc4f46a3e23118491154ddd47ca1da SHA512 fe07cdddf447d327ac517366449ec329d81f49ef327183eac36aca522db244732713837ac8c4d4ca0d92d648bd96dad670597b466e375324204427a381bc2b26
 AUX amule-2.3.2-disable-version-check.patch 419 BLAKE2B e4ca791348ba80eb34cb876fe05c2b85a70e2d704ecb3dd14ec6fc47550d4a677fcdd071906b93c56652c133462d5065b5907564e91c092430e310e2dd8c2523 SHA512 6d98c1a78b16778ad94ef9d70e87fe7ded2228b101bdb961565c3f2a0f2687e55c97bd824e331b53cbd45fbafbfa5803ce4c2f1fa8e245a3ebc97cdd7f282b65
 AUX amule-2.3.2-fix-crash-closing-last-search-tab-1.patch 3620 BLAKE2B f6dbba7491472d1c15f2253ea94cb83681c4f745f6cbe8662d95daaa54f69ff3eee94e02a1d5d5d69cf303c55db5cfef630096750b6bfcc431d48e120cfca91f SHA512 752f2dc7590001d830da2aa211349a2e04601c76ab01620f741e57f8c7a05851e1a4a4cba2ec88167b8c8047b8c3bca1a120003ec85c1155d6b8e71bff05f42c
@@ -14,5 +15,6 @@ AUX amuleweb.confd-r1 619 BLAKE2B 7140f6d957760f8184c3c73db0a58a3b7b308a6d854870
 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-r4.ebuild 3018 BLAKE2B 9425d4949bd4bb98c369ec13407f2c299c269c6a38ac660d8d8fc23d42d145fc3274c9c0e81af41fdf97074107a82b0d4722897705d749195f074c9792bd0b56 SHA512 1ef3b5c99bc50a3ab2caac5bcb00ed6ae904a85820a0ca1a5f2d9b710bcca4bc9f9f6f382abc351a4723e3e13196fe9d12a63d9c859b6790da60bf23b49e9a14
+EBUILD amule-2.3.2-r4.ebuild 3084 BLAKE2B ff61a3177d3b47787a667b6309cf00a6b5d3aa8c3b31f8bf5c3c9941f1fa7d50ca6fcf17fd09c1c8751920702bfd9c26289784be612f8824848f553684b3a0a3 SHA512 a2668da7c097a98c07f1ee457fb02e006d2bb24d17ec70afb481a973a5b9b04c6a07866faa71eca76178a021af20c25526c093dd74a309c76c8c0f2c0e47a2b7
+EBUILD amule-9999.ebuild 2971 BLAKE2B b45aab5acc78862fb4a16959b9b5c80d7fdc685117460a1804243ec18fe11a8b765626a1aaf37184a32bef46c472c5440e43803270361c0119aa4bd12588309b SHA512 735f436b7164b701e01feeca582e579b6481ab6b8eca5bc491579388a04fefa30f45a697d9636fc169b246c7dc8599320468271aa2f7cb97bc2f2e2f2e069ae0
 MISC metadata.xml 636 BLAKE2B 3384c1c34c9963570b17793188db257a5c0648390aaa8ca73f4bad50db8b54be9d0fe5d379b873fd0f21bf6ecaeaf5840ca65ad92c72a1449b25035f9b7ee3c3 SHA512 bd93ef13a5d116f81c8a6901e524032a85eab90589067e57e165f643f8f0a75047869801b4485fa47a0bc41008f3b8f1aff1aa8b413c83b4c27610ef6ea58d5f
diff --git a/net-p2p/amule/amule-2.3.2-r4.ebuild b/net-p2p/amule/amule-2.3.2-r4.ebuild
index 8199a8471f05..eee88909130a 100644
--- a/net-p2p/amule/amule-2.3.2-r4.ebuild
+++ b/net-p2p/amule/amule-2.3.2-r4.ebuild
@@ -45,6 +45,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-2.3.2-fix-crash-when-shared-files-changed.patch"
 	"${FILESDIR}/${PN}-2.3.2-libupnp-1.8.patch"
 	"${FILESDIR}/${PN}-2.3.2-libupnp-1.6.patch"
+	"${FILESDIR}/${PN}-2.3.2-Fixed-compilation-with-newer-bfd.patch"
 )
 
 pkg_setup() {
diff --git a/net-p2p/amule/amule-9999.ebuild b/net-p2p/amule/amule-9999.ebuild
new file mode 100644
index 000000000000..f14cc28e5c40
--- /dev/null
+++ b/net-p2p/amule/amule-9999.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+WX_GTK_VER="3.0-gtk3"
+
+inherit wxwidgets xdg-utils
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/amule-project/amule"
+	inherit autotools git-r3
+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"
+fi
+
+DESCRIPTION="aMule, the all-platform eMule p2p client"
+HOMEPAGE="http://www.amule.org/"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="daemon debug geoip nls remote stats upnp +X"
+
+RDEPEND="
+	dev-libs/boost:=
+	dev-libs/crypto++:=
+	sys-libs/binutils-libs:0=
+	sys-libs/zlib
+	>=x11-libs/wxGTK-3.0.4:${WX_GTK_VER}[X?]
+	daemon? ( acct-user/amule )
+	geoip? ( dev-libs/geoip )
+	nls? ( virtual/libintl )
+	remote? (
+		acct-user/amule
+		media-libs/libpng:0=
+	)
+	stats? ( media-libs/gd:=[jpeg,png] )
+	upnp? ( net-libs/libupnp:0 )
+"
+DEPEND="${RDEPEND}
+	X? ( dev-util/desktop-file-utils )
+"
+BDEPEND="virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+PATCHES=(
+)
+
+pkg_setup() {
+	setup-wxwidgets
+}
+
+src_prepare() {
+	default
+
+	if [[ "${PV}" == *9999 ]]; then
+		./autogen.sh || die
+	fi
+}
+
+src_configure() {
+	local myconf=(
+		--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)
+	)
+
+	if use X; then
+		myconf+=(
+			$(use_enable remote amule-gui)
+			$(use_enable stats alc)
+			$(use_enable stats wxcas)
+		)
+	else
+		myconf+=(
+			--disable-monolithic
+			--disable-amule-gui
+			--disable-alc
+			--disable-wxcas
+		)
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+
+	if use daemon; then
+		newconfd "${FILESDIR}"/amuled.confd-r1 amuled
+		newinitd "${FILESDIR}"/amuled.initd amuled
+	fi
+	if use remote; then
+		newconfd "${FILESDIR}"/amuleweb.confd-r1 amuleweb
+		newinitd "${FILESDIR}"/amuleweb.initd amuleweb
+	fi
+
+	if use daemon || use remote; then
+		keepdir /var/lib/${PN}
+		fowners amule:amule /var/lib/${PN}
+		fperms 0750 /var/lib/${PN}
+	fi
+}
+
+pkg_postinst() {
+	local ver
+
+	if use daemon || use remote; then
+		for ver in ${REPLACING_VERSIONS}; do
+			if ver_test ${ver} -lt "2.3.2-r4"; then
+				elog "Default user under which amuled and amuleweb daemons are started"
+				elog "have been changed from p2p to amule. Default home directory have been"
+				elog "changed as well."
+				echo
+				elog "If you want to preserve old download/share location, you can create"
+				elog "symlink /var/lib/amule/.aMule pointing to the old location and adjust"
+				elog "files ownership *or* restore AMULEUSER and AMULEHOME variables in"
+				elog "/etc/conf.d/{amuled,amuleweb} to the old values."
+
+				break
+			fi
+		done
+	fi
+
+	use X && xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	use X && xdg_desktop_database_update
+}
diff --git a/net-p2p/amule/files/amule-2.3.2-Fixed-compilation-with-newer-bfd.patch b/net-p2p/amule/files/amule-2.3.2-Fixed-compilation-with-newer-bfd.patch
new file mode 100644
index 000000000000..3ef8a21fa45c
--- /dev/null
+++ b/net-p2p/amule/files/amule-2.3.2-Fixed-compilation-with-newer-bfd.patch
@@ -0,0 +1,33 @@
+From c0c28234a40b1b575ce51cdfe5ffa5dac3a7494c Mon Sep 17 00:00:00 2001
+From: Werner Mahr <werner@vollstreckernet.de>
+Date: Fri, 31 Jan 2020 17:55:24 +0100
+Subject: [PATCH] Fixed compilation with newer bfd. Fixes: #174
+
+---
+ src/libs/common/MuleDebug.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/libs/common/MuleDebug.cpp b/src/libs/common/MuleDebug.cpp
+index 5d8d75890..0ebf2ab07 100644
+--- a/src/libs/common/MuleDebug.cpp
++++ b/src/libs/common/MuleDebug.cpp
+@@ -268,14 +268,14 @@ void get_file_line_info(bfd *abfd, asection *section, void* _address)
+ 		return;
+ 	}
+ 
+-	bfd_vma vma = bfd_get_section_vma(abfd, section);
++	bfd_vma vma = section->vma;
+ 
+ 	unsigned long address = (unsigned long)_address;
+ 	if (address < vma) {
+ 		return;
+ 	}
+ 
+-	bfd_size_type size = bfd_section_size(abfd, section);
++	bfd_size_type size = section->size;
+ 	if (address > (vma + size)) {
+ 		return;
+ 	}
+-- 
+2.24.1
+