From b8b145dab0bf2ac79bb2c9a90dbffd389559dc2a Mon Sep 17 00:00:00 2001 From: Alexander Tsoy Date: Wed, 25 Mar 2026 23:06:17 +0300 Subject: [PATCH] net-p2p/amule: drop patches merged upstream Closes: https://bugs.gentoo.org/971554 Signed-off-by: Alexander Tsoy Part-of: https://codeberg.org/gentoo/gentoo/pulls/417 Merges: https://codeberg.org/gentoo/gentoo/pulls/417 Signed-off-by: Sam James --- net-p2p/amule/amule-9999.ebuild | 5 +---- .../amule/files/amule-9999-gettext-0.23.patch | 22 ------------------- 2 files changed, 1 insertion(+), 26 deletions(-) delete mode 100644 net-p2p/amule/files/amule-9999-gettext-0.23.patch diff --git a/net-p2p/amule/amule-9999.ebuild b/net-p2p/amule/amule-9999.ebuild index b1e532073c567..52e3767918396 100644 --- a/net-p2p/amule/amule-9999.ebuild +++ b/net-p2p/amule/amule-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2025 Gentoo Authors +# Copyright 1999-2026 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -52,10 +52,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}/${PN}-2.3.2-disable-version-check.patch" - "${FILESDIR}/${PN}-2.3.3-fix-exception.patch" - "${FILESDIR}/${PN}-2.3.3-backport-pr368.patch" "${FILESDIR}/${PN}-2.3.3-use-xdg-open-as-preview-default.patch" - "${FILESDIR}/${PN}-9999-gettext-0.23.patch" ) src_prepare() { diff --git a/net-p2p/amule/files/amule-9999-gettext-0.23.patch b/net-p2p/amule/files/amule-9999-gettext-0.23.patch deleted file mode 100644 index e7245ff0e25d8..0000000000000 --- a/net-p2p/amule/files/amule-9999-gettext-0.23.patch +++ /dev/null @@ -1,22 +0,0 @@ -https://github.com/amule-project/amule/pull/413 - ---- a/configure.ac -+++ b/configure.ac -@@ -318,6 +318,7 @@ AC_LANG_POP([C++]) - dnl Sets gettext version. - dnl AM_GNU_GETTEXT_VERSION *must not* be moved away from configure.ac! - AM_GNU_GETTEXT_VERSION(0.11.5) -+AM_GNU_GETTEXT([no-libtool], [need-ngettext]) - MULE_CHECK_NLS - AS_IF([test x$USE_INCLUDED_LIBINTL = xyes], [AC_CONFIG_COMMANDS([intl], [[ - test -d intl || mkdir intl ---- a/m4/nls.m4 -+++ b/m4/nls.m4 -@@ -82,7 +82,6 @@ AC_DEFUN([MULE_CHECK_NLS], - [Specify a comma-separated list of languages you want to have installed. See po/LINGUAS for available languages])], - [AS_IF([test "$withval" != "all"], [LINGUAS="`echo $withval | sed -e 's/,/ /g'`"])]) - -- AM_GNU_GETTEXT([no-libtool], [need-ngettext]) - AS_IF([test $USE_INCLUDED_LIBINTL = yes], [INCINTL=-I\${top_builddir}/intl]) - - AS_IF([test x$USE_NLS = xyes], [MULE_CHECK_AUTOPOINT(, [USE_NLS=no])])