From e52012895af4c92f008daac78c3d8b6d691a5dd1 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 26 Jun 2023 19:33:08 +0100 Subject: gentoo auto-resync : 26:06:2023 - 19:33:07 --- net-p2p/amule/Manifest | 6 +- net-p2p/amule/amule-2.3.3-r1.ebuild | 153 +++++++++++++++++++++ net-p2p/amule/amule-9999.ebuild | 10 +- .../amule/files/amule-2.3.3-autoconf-2.70.patch | 28 ++++ net-p2p/amule/metadata.xml | 1 + 5 files changed, 194 insertions(+), 4 deletions(-) create mode 100644 net-p2p/amule/amule-2.3.3-r1.ebuild create mode 100644 net-p2p/amule/files/amule-2.3.3-autoconf-2.70.patch (limited to 'net-p2p/amule') diff --git a/net-p2p/amule/Manifest b/net-p2p/amule/Manifest index 853afa032e6b..863f23f29af1 100644 --- a/net-p2p/amule/Manifest +++ b/net-p2p/amule/Manifest @@ -1,10 +1,12 @@ AUX amule-2.3.2-disable-version-check.patch 419 BLAKE2B e4ca791348ba80eb34cb876fe05c2b85a70e2d704ecb3dd14ec6fc47550d4a677fcdd071906b93c56652c133462d5065b5907564e91c092430e310e2dd8c2523 SHA512 6d98c1a78b16778ad94ef9d70e87fe7ded2228b101bdb961565c3f2a0f2687e55c97bd824e331b53cbd45fbafbfa5803ce4c2f1fa8e245a3ebc97cdd7f282b65 +AUX amule-2.3.3-autoconf-2.70.patch 956 BLAKE2B 2e7bde0e6be3e392555e4a5420ae3736762939150ce1aee39c052a56fbaa2c4192aa43f34b73f9810ad6e3b9a5e06311d374ca1d26ed289f91eaf2acb77f616a SHA512 36918f134eaaae17463ceac3d06e6fdf48d3913212564792067c15c946dd7536bf67772d777734d80f1f833b378e0c212932d5bd564f201aeb9545070d890b78 AUX amule-2.3.3-fix-exception.patch 259 BLAKE2B 9a9ebb025ac3f553432215bc0f2c34bd1b6eeaaf9b436bd19870ba4412326dd37ce372bd5a3866e6cd65f0e98e8aea09025dd751d6b6849c37dd527b1af56da0 SHA512 5c8580f0d294a828b2ce42c59bd3079d9bf9735a88337d2cb3aa2b014c6bb8cecee891e35431b9e22a6ae8ca91f816de89a532fe6c10eae2ecbed33212e4604d 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-r1.ebuild 3268 BLAKE2B 9b4d878255399027125fa61d59e5c6b29cf6bd1aa21cdaa78911521072bb046a11a8f158a2a255d052087207f202f8acb82f7d13b94b6e59b9b71d37b359c07b SHA512 c362c674bedad9ac4033bf1aae31ff91ddb3d231715c68c5c6543f132fba049058684d39ede4d26c4d499f2ecd2d1a57ada9c53c51fbb72d9871685b95b68f92 EBUILD amule-2.3.3.ebuild 3098 BLAKE2B f0205804d79db0f9c72a7df5ac44a0a85d308669011d6dde820a8a6a084e00f81ae04a3c98b01521ff43471968a42a3148be005140110b94360d8ba908437cfa SHA512 97d37e98bf7811d83bbd0e4d90d60105eca0a35a4ab316c6330022d64f77604c727a42e9adfbd31d023ffd653ed94eb160396f6e9a1321826484c99291c2ba0f -EBUILD amule-9999.ebuild 3095 BLAKE2B 37bddf35f3418d98e9f2c4197de85bcc732663d5b426e319c628d2cd6b79fb8f07c52fd65aea5a209d5aa113dafc2d1c14e908d20eacf04d97c17ab57929a075 SHA512 62c8a5d91fe9a800117a9dc048e0bb0f07ffeffa04bc2d0725e995d952cf1903e2eb0692b785df31043da2477e7145c34571e217ad5b3137b57f449baa776f45 -MISC metadata.xml 667 BLAKE2B 02d50ed48afb0a80ae7f2642c2dcdb41b78f720abb63235a7f7461e6799d2ad59dbb93d298cbd4489a89d93b7d9aaa1bba26762ce0cd331dcf3af6fac4a06301 SHA512 17f85058c777a354b83cd63cf54971cb6c01b6e57c54b2681759b5257afb64698302c4b47c17e59c7ea3de3f46cf3769bf69f9659f0b10f9c47362cb92b8979f +EBUILD amule-9999.ebuild 3218 BLAKE2B f523b4ebeaa0b5e6cbe4cfb5e1f35aae20029112540d2bef75394459cd059f1ad401c771fc20b075f4df0a5654d4c20c98831abbd190acd8333ab7cec03131be SHA512 5fe1c5ada21339705c42a848195094c3d402d2c83b0a434a1a74b5e352e0934a22cd3a4a2e68d20fe3a739a5a2d32bbdc0090a25930ebc8e7a3b0b0e7a80b99a +MISC metadata.xml 717 BLAKE2B 104a91afec9919613f9897f655886e7d51f3c2f69af4efe47aab38b1c31982f6f97f8fb117ceffe2b53c5ba3bdc6fcef332dc4bf4cd956430187dcc374b3f473 SHA512 37b08e9a0376417b2e8c2372d5a59564ae23b522e36b97c163cb0d5c5113298eeac11b181f129854b983276ec8b8958b3df9599296152fecc5504d34c9554515 diff --git a/net-p2p/amule/amule-2.3.3-r1.ebuild b/net-p2p/amule/amule-2.3.3-r1.ebuild new file mode 100644 index 000000000000..e5e37d05e9dc --- /dev/null +++ b/net-p2p/amule/amule-2.3.3-r1.ebuild @@ -0,0 +1,153 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +WX_GTK_VER="3.0-gtk3" + +inherit autotools flag-o-matic 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/readline: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 + >=sys-devel/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" +) + +pkg_setup() { + setup-wxwidgets +} + +src_prepare() { + default + rm m4/boost.m4 || die + + if [[ ${PV} == 9999 ]]; then + ./autogen.sh || die + else + eautoreconf + fi +} + +src_configure() { + 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_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 392ddb148410..1dc6203a5561 100644 --- a/net-p2p/amule/amule-9999.ebuild +++ b/net-p2p/amule/amule-9999.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 WX_GTK_VER="3.0-gtk3" -inherit wxwidgets xdg-utils +inherit flag-o-matic wxwidgets xdg-utils if [[ ${PV} == 9999 ]] ; then EGIT_REPO_URI="https://github.com/amule-project/amule" @@ -45,6 +45,7 @@ DEPEND="${RDEPEND} " BDEPEND=" virtual/pkgconfig + >=sys-devel/boost-m4-0.4_p20221019 nls? ( sys-devel/gettext ) " @@ -59,13 +60,18 @@ pkg_setup() { src_prepare() { default + rm m4/boost.m4 || die if [[ ${PV} == 9999 ]]; then ./autogen.sh || die + else + eautoreconf fi } src_configure() { + append-cxxflags -std=gnu++14 + local myconf=( --with-denoise-level=0 --with-wx-config="${WX_CONFIG}" diff --git a/net-p2p/amule/files/amule-2.3.3-autoconf-2.70.patch b/net-p2p/amule/files/amule-2.3.3-autoconf-2.70.patch new file mode 100644 index 000000000000..e52cfd6ae545 --- /dev/null +++ b/net-p2p/amule/files/amule-2.3.3-autoconf-2.70.patch @@ -0,0 +1,28 @@ +From 0d3e85ea46b52685c5b198fbade3a82f38071ca4 Mon Sep 17 00:00:00 2001 +From: Pablo Barciela +Date: Sun, 19 Sep 2021 13:55:07 +0200 +Subject: [PATCH] allow to build with autoconf 2.70 and later + +Closes https://github.com/amule-project/amule/issues/232 +--- + configure.ac | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 93a918c03..9c57668c6 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -30,10 +30,6 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES]) + + AC_PREREQ(2.62) + +-# autoconf 2.70 introduced some incompatibilities that will make the build fail +-# As a "workaround" reject 2.70 and above for now. +-m4_if(m4_version_compare(m4_defn([AC_AUTOCONF_VERSION]), [2.70]), [-1],, [m4_fatal([autoconf ]m4_defn([AC_AUTOCONF_VERSION])[ is known to not work with aMule. Please use 2.69 instead.])]) +- + AC_CONFIG_SRCDIR([src/amule.cpp]) + AC_CONFIG_HEADERS([config.h]) + AC_CONFIG_MACRO_DIR([m4]) +-- +2.39.3 + diff --git a/net-p2p/amule/metadata.xml b/net-p2p/amule/metadata.xml index 32fc55855071..8d9b90c9f6f6 100644 --- a/net-p2p/amule/metadata.xml +++ b/net-p2p/amule/metadata.xml @@ -11,6 +11,7 @@ amule-project/amule + amule Enable amule daemon -- cgit v1.2.3