gentoo resync : 28.04.2021

5 files changed, 4 insertions, 123 deletions

diff --git a/net-dns/idnkit/Manifest b/net-dns/idnkit/Manifest
index 8ddf11ec06da..c8bc1f5721de 100644
--- a/net-dns/idnkit/Manifest
+++ b/net-dns/idnkit/Manifest
@@ -1,7 +1,3 @@
-AUX idnkit-1.0-autotools.patch 1843 BLAKE2B 75043eeccb34f00b9faab57d7db7ec6081192090afa4438e83df7bf02dc5ae047c4597153649aa0d4b1f658a37809687d91602d2ce61bf8cc7b3e878ed21b993 SHA512 1c405d1b72d678394284936d9130450b366f7a53bdf586fb6d4331b72c2d6672a19f2322a7f284067259ed0c0dd973865d9b117ae6c15cc8a1d41c734ef0a4ce
-AUX idnkit-1.0-test-subdirs.patch 289 BLAKE2B 6c9237cd1d17785a5d0a379d610ddc6b6e7b604c14a5680e24b80f5d9188413fe4e8f5dbbc55e72fe5d4c453c94efd231110238f68ced316986abeb6134f8173 SHA512 63d76f9ad95fc83c00259d41dcfdd47442bfda6f1dfe861a824146ded113d18284c1fe6f0f5ff1eba05a9a38055e7e8fdc3579fc14a3b441d831a9bd5b75af7a
-DIST idnkit-1.0-src.tar.gz 432823 BLAKE2B 4e96bed174ea704ec0eb5c6655cb65145ed808b2bf9582ec9b6dcb8606de7a006937a2f8d8fce386dbc328e074b95ca504464c1ed6d16acc7be82d9904f2c2b4 SHA512 74f2db007a1991610f62a7a060d534f724f08395a16a7d76fda0824e9017aa47ffe4e251c90d0481218b70534fcd2b32724a66223042f59c1e16c1ff39f3be19
 DIST idnkit-2.3.tar.bz2 1473267 BLAKE2B efc2a93527c217b32bfd0e2546944b30d39c3fa046e17c11f2084721f966dc838bfa821c88378c0604cbeafb8d4970cf3c19122182448d5e48c2d392a42225c6 SHA512 a0cbc111d4b7d5f444c9b79ae76378fd2edf18097adca27d5ebf811e12091f609ec45d2c62a95b1e295bd1fa644bd8a38d79841f7f4e85dcd1f6a1cd5ca622e4
-EBUILD idnkit-1.0-r2.ebuild 1036 BLAKE2B 41db47d4fa6717da6ae4dabf58c97562060370196e102b0f6e9b66e4fb9194f27345f2b261451867680d917364702993960c313d7f64c1cda525261cde7b5553 SHA512 5670bba89b798fcad610329adbfd0b19f44173a327620a27f99f73a5300fd96f2de5f7fd53883d963a178a777546ae5155bc9a50b26db26bf301941b15ee13cd
-EBUILD idnkit-2.3.ebuild 635 BLAKE2B b510282bbfaa8d659515ec5a00393e37fc5bfc490e277d52e3ccfdaeccf5178bf440c29fb6ad5610c39d52fd4313aeea46d3eb1989f68a7657fd991f927898c4 SHA512 63ef55ddb1dd9d9e14bde80d836b9ed28201ec918b6c7b00c33d08bda6fdd71fda6c43ba8a627d49577f8f6698e31f3d50c5d7809d0ce926d15a9424d2cd887c
+EBUILD idnkit-2.3.ebuild 637 BLAKE2B 90539a6b659a6194942777f1d7bc52f88d3f8ef4f33d98785ae66474be7e29a3b8e59a8b3acb306bf07509d2835b9daa72b89127f204f57918a5dd58a8b41670 SHA512 b732cb49fd3914231f4cdc4d05d958e8b044c59265012872b96123c7838dfce1490d0f304b2436125eec90b0ee43e2e966d2935bf9182d533e6665df699eb1b9
 MISC metadata.xml 246 BLAKE2B 053eb1eb0345156eb262d7eb10e70636fda57808641af19b715d4d323f19127491fe53e1dc7028454bc4af3f5ed282acd8d8632617b65c2003382193716510ca SHA512 02003cbc53a83f024e07311dc98a6255bcaa23c879f9b7da1263261e323c678bcb80fb0f9c3025076eafedaa0a85a52a98e963d37a692e8902bb9c6d68b54390
diff --git a/net-dns/idnkit/files/idnkit-1.0-autotools.patch b/net-dns/idnkit/files/idnkit-1.0-autotools.patch
deleted file mode 100644
index d0918bc9184a..000000000000
--- a/net-dns/idnkit/files/idnkit-1.0-autotools.patch
+++ /dev/null
@@ -1,64 +0,0 @@
---- a/configure.in	2003-03-11 00:53:20.000000000 +0100
-+++ b/configure.in	2010-03-12 14:15:24.000000000 +0100
-@@ -629,6 +629,41 @@
-     fi
- fi
- 
-+AC_DEFUN(AC_FIND_SYSTEM_SHOBJ,[
-+AC_MSG_CHECKING(for $1 shared object)
-+shobj_name=$1
-+shobj_path=
-+case "$host" in
-+*-hpux*)
-+    SOEXT=sl
-+    ;;
-+*)
-+    SOEXT=so
-+    ;;
-+esac
-+for shobj_libdir in /lib /usr/lib; do
-+    if test -f $shobj_libdir/$shobj_name.$SOEXT; then
-+        shobj_path=$shobj_libdir/$shobj_name.$SOEXT
-+    else
-+        shobj_path=`ls -r $shobj_libdir/$shobj_name.$SOEXT* 2>/dev/null | head -1`
-+	if test "$shobj_path" != "" -a -f "$shobj_path"; then
-+	    :
-+	else
-+	    shobj_path=
-+	fi
-+    fi
-+    if test "$shobj_path" != ""; then
-+	AC_MSG_RESULT($shobj_path)
-+        shobj_pathsymbol=SOPATH_`echo $shobj_name | sed 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
-+	AC_DEFINE_UNQUOTED($shobj_pathsymbol, "$shobj_path")
-+	break
-+    fi
-+done
-+if test "$shobj_path" = ""; then
-+    AC_MSG_RESULT(no)
-+fi
-+])dnl
-+
- dnl Find system shared object paths.
- AC_FIND_SYSTEM_SHOBJ(libc)
- if test "$install_runidn" = yes ; then
---- a/lib/Makefile.in	2003-03-12 17:14:41.000000000 +0100
-+++ b/lib/Makefile.in	2010-03-12 15:54:35.000000000 +0100
-@@ -241,7 +241,7 @@
- 
- install-common:
- 	$(MKINSTALLDIRS) $(DESTDIR)$(libdir)
--	$(LIBTOOL) $(INSTALL_DATA) $(LITELIB).la \
-+	$(LIBTOOL) --mode=install $(INSTALL_DATA) $(LITELIB).la \
- 	    $(DESTDIR)$(libdir)/$(LITELIB).la
- 	-[ -f $(DESTDIR)$(libdir)/$(LITELIB).a ] \
- 	    && $(RANLIB) $(DESTDIR)$(libdir)/$(LITELIB).a
-@@ -262,7 +262,7 @@
- 
- install-nolite:
- 	$(MKINSTALLDIRS) $(DESTDIR)$(libdir)
--	$(LIBTOOL) $(INSTALL_DATA) $(LIB).la \
-+	$(LIBTOOL) --mode=install $(INSTALL_DATA) $(LIB).la \
- 	    $(DESTDIR)$(libdir)/$(LIB).la
- 	-[ -f $(DESTDIR)$(libdir)/$(LIB).a ] \
- 	    && $(RANLIB) $(DESTDIR)$(libdir)/$(LIB).a
diff --git a/net-dns/idnkit/files/idnkit-1.0-test-subdirs.patch b/net-dns/idnkit/files/idnkit-1.0-test-subdirs.patch
deleted file mode 100644
index 3e6dcf13b15e..000000000000
--- a/net-dns/idnkit/files/idnkit-1.0-test-subdirs.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/lib/Makefile.in
-+++ b/lib/Makefile.in
-@@ -296,6 +296,7 @@
- 	rm -f Makefile
- 
- test check: test-localdir test-subdirs
-+test-subdirs: test-localdir
- 
- @LITEONLY_TRUE@test-localdir: $(TESTLITELIB).la $(SAMPLES)
- @LITEONLY_FALSE@test-localdir: $(TESTLIB).la $(TESTLITELIB).la $(SAMPLES)
diff --git a/net-dns/idnkit/idnkit-1.0-r2.ebuild b/net-dns/idnkit/idnkit-1.0-r2.ebuild
deleted file mode 100644
index 609d5068ddd8..000000000000
--- a/net-dns/idnkit/idnkit-1.0-r2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit autotools eutils
-
-DESCRIPTION="Toolkit for Internationalized Domain Names (IDN)"
-HOMEPAGE="https://www.nic.ad.jp/ja/idn/idnkit/download/"
-SRC_URI="https://www.nic.ad.jp/ja/idn/idnkit/download/sources/${P}-src.tar.gz"
-
-LICENSE="JNIC"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
-IUSE="static-libs"
-
-DEPEND="virtual/libiconv"
-
-S=${WORKDIR}/${P}-src
-
-src_prepare() {
-	# Bug 263135, old broken libtool bundled
-	rm -f aclocal.m4 || die "rm failed"
-	epatch "${FILESDIR}"/${P}-autotools.patch
-	epatch "${FILESDIR}"/${P}-test-subdirs.patch
-	mv configure.{in,ac} || die
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=""
-	if has_version dev-libs/libiconv; then
-		myconf="--with-iconv"
-	fi
-	econf $(use_enable static-libs static) ${myconf}
-}
-
-src_install() {
-	default
-	use static-libs || find "${ED}" -name 'lib*.la' -delete
-	dodoc ChangeLog DISTFILES NEWS README README.ja
-}
diff --git a/net-dns/idnkit/idnkit-2.3.ebuild b/net-dns/idnkit/idnkit-2.3.ebuild
index e80d11bc44b0..ac05ac80ed0f 100644
--- a/net-dns/idnkit/idnkit-2.3.ebuild
+++ b/net-dns/idnkit/idnkit-2.3.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
+
 inherit ltprune
 
 DESCRIPTION="Toolkit for Internationalized Domain Names (IDN)"
@@ -10,7 +11,7 @@ SRC_URI="https://jprs.co.jp/idn/${P}.tar.bz2"
 
 LICENSE="JPRS"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="liteonly static-libs"
 RDEPEND="
 	virtual/libiconv