gentoo auto-resync : 14:07:2024 - 12:27:13

5 files changed, 185 insertions, 8 deletions

diff --git a/net-p2p/amule/Manifest b/net-p2p/amule/Manifest
index 715250009ca1..b05b29455592 100644
--- a/net-p2p/amule/Manifest
+++ b/net-p2p/amule/Manifest
@@ -2,12 +2,14 @@ AUX amule-2.3.2-disable-version-check.patch 419 BLAKE2B e4ca791348ba80eb34cb876f
 AUX amule-2.3.3-autoconf-2.70.patch 956 BLAKE2B 2e7bde0e6be3e392555e4a5420ae3736762939150ce1aee39c052a56fbaa2c4192aa43f34b73f9810ad6e3b9a5e06311d374ca1d26ed289f91eaf2acb77f616a SHA512 36918f134eaaae17463ceac3d06e6fdf48d3913212564792067c15c946dd7536bf67772d777734d80f1f833b378e0c212932d5bd564f201aeb9545070d890b78
 AUX amule-2.3.3-backport-pr368.patch 1696 BLAKE2B 9d52b6192f4a4cbb7d73be34c23fe59db51f321c3f07412801721d47d9ecb12e0098b7b211766934a5545ed01b330974e56188773e5c844d1bd01fedd1edd454 SHA512 b4cd302c1003720aa4bcd4c1a17233b0303d2d614e359ba7f3da685f520817d58f5056f11437a87e85aaefa74f053d769aacfabdc96621a76bb648d456dfcb17
 AUX amule-2.3.3-fix-exception.patch 259 BLAKE2B 9a9ebb025ac3f553432215bc0f2c34bd1b6eeaaf9b436bd19870ba4412326dd37ce372bd5a3866e6cd65f0e98e8aea09025dd751d6b6849c37dd527b1af56da0 SHA512 5c8580f0d294a828b2ce42c59bd3079d9bf9735a88337d2cb3aa2b014c6bb8cecee891e35431b9e22a6ae8ca91f816de89a532fe6c10eae2ecbed33212e4604d
+AUX amule-2.3.3-use-xdg-open-as-preview-default.patch 754 BLAKE2B 5dfa4ef482dd42768140fffbc5d9f13f4bf9a017fdb819f2e749d2a68f6a2bee5e6a1af381f579b8b6564f2e87861640dfb0be4a501e26a517894cea4a7e96a4 SHA512 8e04d0a43ca739956c2e77afa4356256553ef5299822d0761b3ffbf966e4d1251c4822dba756484ab08dd3b97ed9a8f0e69112230f7b229d27e063478f9793bf
 AUX amule-2.3.3-wx3.2.patch 17509 BLAKE2B b14471083d825beb68b65938308c5df265a831ea48a37abd8d2b92e38232c52aa4cc875f703531d388f091e7af0f1d634e4e5394b5f1522297ace0274ec65f93 SHA512 bde8a0db21c5650172084dfbfea155b88c6b44766034cc83738bfe77cd343b389296cbc0069c09066fbbba1df7951bb8763f1b2dd0c63375a1b67f615093902b
 AUX amuled.confd-r1 199 BLAKE2B e018a8827749b0b5266533adfc549d0c40b339470439fd5a04c9380b5489e3d58b49478c6a1fcc4954d97816e66bdbf8a6105de0aee7991defd1df553db46e27 SHA512 4b82864f874ea5ede360a88aa589baa4336d16074ed10e2841ea5e2cb0961fe8553c28368f3a9b31d19ccaf688d77ac636219e3693e044c735bbd9de5de96bd6
 AUX amuled.initd 1105 BLAKE2B 16525a9c5ad8c158d0d4f1ba316fb493cb438b985a0a4d52672b4067acdfae6dd4897d7c37459515ce4a0e6b0b89665b9feaea6b15e3535c8f46b83ce0c16d05 SHA512 3ec351e84da4e33918747de4ccd9ec86895b60f9d94836fc92112489edcfe14af7a21efb79194b80bb81aa666714bd5a21873c954b36948e31369727e71143b6
 AUX amuleweb.confd-r1 619 BLAKE2B 7140f6d957760f8184c3c73db0a58a3b7b308a6d8548700cab8517bba5274fbad35ebb940ea11f96527553807b1365b7f7c27a6e7d8b656b51f60072cabe5ab8 SHA512 d9fcfc96f4c1bcd7bdae8ed4da19b4edec05e1b55149c664589c267539d183500a732f70670f0cde935c5f509f9dfbc97fd0e92b7047e1690f1342fa6504994d
 AUX amuleweb.initd 1149 BLAKE2B ef29bae12cf72764798eecb6866405525b601ee6ea869b6191954799805f47b75976884ee566ecb03eca907b3b13ff7870541b7682a70d5db058fb1257d6f00d SHA512 4cc944af90ad81f09d74d79dede57d1ff26c1b87649432d14ed294770b04f6ea256c25c194edfdc8f9d0c85929b1c576c31eba9228703e5a21259d83968289b0
 DIST aMule-2.3.3.tar.xz 3699376 BLAKE2B 4b1fb98bd52e4c75f81773020d4fc258f8e7c4d7a5d40a7aadabc8fd27b3079705761650fdcd7cd089da77575a74f1950f02039ee14bf4b9894550b8b3d9191b SHA512 a5a80c5ddd1e107d92070c1d8e232c2762c4c54791abc067c739eef7c690062ed164dd7733808f80c762719261162aeb3d602308964dda2670a0bb059d87b74e
-EBUILD amule-2.3.3-r3.ebuild 3423 BLAKE2B 0753a424453dadc2d413b96f9db84c525ef17e6f244c974575f69ea6e8ccf0bf52e021704c1259af73aa217372d9b50e449b2c9797c59cfdee986d5d7cd59ab0 SHA512 d0176ea540457ea669b263f7ab04815a8071179959c3fd16b473be6b3145206b539e3d43a082a423e90dd70fd4969b0258f015acdcdbe7c04f3d3440737869a0
-EBUILD amule-9999.ebuild 3387 BLAKE2B 263ffb19a287384e63b05b993d8c6d848076b5800580e9081ce1c1940cf6d61e2f400dadd46cb4f7c7d1cf926ccc347b372444b3d312db1f2c06424392cf6e66 SHA512 4a5f34a8699c4d5e3b4750dc6e02583ba9e3ba9c5d517dccb35c7435b742e20bf8bd14fd162948fe05be14d304f3e04d920962ac8749384f2dffd532f4cdbb20
+EBUILD amule-2.3.3-r3.ebuild 3424 BLAKE2B 045bb453a8be13a8ca6717cf9b5c509b10bf18d3eb0f168ce8f8ca38261827e31a23c37a3332bab5a4f71a5cf6ff32f6e02e0c5916b6bee915d954f5834baf51 SHA512 27d9c697edc564893b17d093edb59cc6d03b1c4f69b57c3e957c043bfb9f6b9d48ebc0cb98d0687cb73652934048a369ed90844ac9a399b3ec5c9297c87d47da
+EBUILD amule-2.3.3-r4.ebuild 3477 BLAKE2B 7925e0626838c9a46185fcb20229571e448c8641100746757fa9026702a87fb8fd8df24474f679f8fb965e0188317c015779c6fda7158bd14f604d6248fd5637 SHA512 00a673912d46d21cbd634ea8223c60b12c151760069b169a9c23e5d606c80efcae48b5a00f9ae79a21207000127563a25de39e623af625f4476a4f9a86ca43f0
+EBUILD amule-9999.ebuild 3437 BLAKE2B d89a4824ebbd24a571122adeb563126f12c0156929af561f031380bf8eb3f81a20a6d4fad9738e77b9f1bb03060edb70b69f5880a7328eeb3b41b282670c0f5a SHA512 6cca5f143e0c9c344afe0d8c548a878d2b9a9cb2948ba8458df8f8465fb00233ac7c3f517d66b416281c4a2525ed0c7f71471eef296baabddbde6d11ffbcfe82
 MISC metadata.xml 717 BLAKE2B 104a91afec9919613f9897f655886e7d51f3c2f69af4efe47aab38b1c31982f6f97f8fb117ceffe2b53c5ba3bdc6fcef332dc4bf4cd956430187dcc374b3f473 SHA512 37b08e9a0376417b2e8c2372d5a59564ae23b522e36b97c163cb0d5c5113298eeac11b181f129854b983276ec8b8958b3df9599296152fecc5504d34c9554515
diff --git a/net-p2p/amule/amule-2.3.3-r3.ebuild b/net-p2p/amule/amule-2.3.3-r3.ebuild
index edc3de4268ce..f67a6e764603 100644
--- a/net-p2p/amule/amule-2.3.3-r3.ebuild
+++ b/net-p2p/amule/amule-2.3.3-r3.ebuild
@@ -17,7 +17,7 @@ else
 fi
 
 DESCRIPTION="aMule, the all-platform eMule p2p client"
-HOMEPAGE="http://www.amule.org/"
+HOMEPAGE="https://www.amule.org/"
 
 LICENSE="GPL-2+"
 SLOT="0"
diff --git a/net-p2p/amule/amule-2.3.3-r4.ebuild b/net-p2p/amule/amule-2.3.3-r4.ebuild
new file mode 100644
index 000000000000..40687025dc71
--- /dev/null
+++ b/net-p2p/amule/amule-2.3.3-r4.ebuild
@@ -0,0 +1,159 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+WX_GTK_VER="3.2-gtk3"
+
+inherit autotools flag-o-matic wxwidgets xdg-utils
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/amule-project/amule"
+	inherit 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 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+DESCRIPTION="aMule, the all-platform eMule p2p client"
+HOMEPAGE="https://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/readline:0=
+	sys-libs/zlib
+	x11-libs/wxGTK:${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
+	>=dev-build/boost-m4-0.4_p20221019
+	nls? ( sys-devel/gettext )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.3.2-disable-version-check.patch"
+	"${FILESDIR}/${PN}-2.3.3-fix-exception.patch"
+	"${FILESDIR}/${P}-autoconf-2.70.patch"
+	"${FILESDIR}/${PN}-2.3.3-backport-pr368.patch"
+	"${FILESDIR}/${PN}-2.3.3-wx3.2.patch"
+	"${FILESDIR}/${PN}-2.3.3-use-xdg-open-as-preview-default.patch"
+)
+
+src_prepare() {
+	default
+	rm m4/boost.m4 || die
+
+	if [[ ${PV} == 9999 ]]; then
+		./autogen.sh || die
+	else
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	setup-wxwidgets
+
+	use debug || append-cppflags -DwxDEBUG_LEVEL=0
+	append-cxxflags -std=gnu++14
+
+	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_test() {
+	emake check
+}
+
+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/amule-9999.ebuild b/net-p2p/amule/amule-9999.ebuild
index 80d5beab4994..581dd72dc6dd 100644
--- a/net-p2p/amule/amule-9999.ebuild
+++ b/net-p2p/amule/amule-9999.ebuild
@@ -17,7 +17,7 @@ else
 fi
 
 DESCRIPTION="aMule, the all-platform eMule p2p client"
-HOMEPAGE="http://www.amule.org/"
+HOMEPAGE="https://www.amule.org/"
 
 LICENSE="GPL-2+"
 SLOT="0"
@@ -54,12 +54,9 @@ PATCHES=(
 	"${FILESDIR}/${PN}-2.3.3-fix-exception.patch"
 	"${FILESDIR}/${PN}-2.3.3-backport-pr368.patch"
 	"${FILESDIR}/${PN}-2.3.3-wx3.2.patch"
+	"${FILESDIR}/${PN}-2.3.3-use-xdg-open-as-preview-default.patch"
 )
 
-pkg_setup() {
-	setup-wxwidgets
-}
-
 src_prepare() {
 	default
 	rm m4/boost.m4 || die
@@ -72,6 +69,8 @@ src_prepare() {
 }
 
 src_configure() {
+	setup-wxwidgets
+
 	use debug || append-cppflags -DwxDEBUG_LEVEL=0
 	append-cxxflags -std=gnu++14
 
diff --git a/net-p2p/amule/files/amule-2.3.3-use-xdg-open-as-preview-default.patch b/net-p2p/amule/files/amule-2.3.3-use-xdg-open-as-preview-default.patch
new file mode 100644
index 000000000000..816f44f00dd0
--- /dev/null
+++ b/net-p2p/amule/files/amule-2.3.3-use-xdg-open-as-preview-default.patch
@@ -0,0 +1,17 @@
+commit f54a851586ff3762e0426ea9265ffb3499f93ad5
+Author: Adeodato Simó <dato@net.com.org.es>
+Date:   Sun Mar 1 14:10:15 2009 +0100
+
+    src/DownloadListCtrl.cpp: use xdg-open as default instead of mplayer.
+
+--- a/src/DownloadListCtrl.cpp
++++ b/src/DownloadListCtrl.cpp
+@@ -1429,7 +1429,7 @@ void CDownloadListCtrl::PreviewFile(CPar
+ 			_("File preview"), wxOK, this);
+ 		// Since newer versions for some reason mplayer does not automatically
+ 		// select video output device and needs a parameter, go figure...
+-		command = wxT("xterm -T \"aMule Preview\" -iconic -e mplayer ") QUOTE wxT("$file") QUOTE;
++		command = wxT("xterm -T \"aMule Preview\" -iconic -e xdg-open ") QUOTE wxT("$file") QUOTE;
+ 	} else {
+ 		command = thePrefs::GetVideoPlayer();
+ 	}