gentoo resync : 22.05.2021

3 files changed, 72 insertions, 0 deletions

diff --git a/dev-libs/libiconv/Manifest b/dev-libs/libiconv/Manifest
index f78819fb2228..ca77d4d923f2 100644
--- a/dev-libs/libiconv/Manifest
+++ b/dev-libs/libiconv/Manifest
@@ -1,5 +1,8 @@
 AUX libiconv-1.15-no-aix-tweaks.patch 981 BLAKE2B 37d0ce998456bb2c07b249c22e8cd0d1eaad48c1d5b40e774d368923f764b6030a090e414fcb9851e32a9d582691dc70fc04da4d67386db53489db2feaed6895 SHA512 0318b24af8671043ee9e5c547734f6f768ef21b122b23ab95f7d1a5dcfe6c2c9579db87633a765e9bc83915d2097d3e2f3b6320cdf094106e3bf87b72d05d461
 AUX libiconv-1.15-no-gets.patch 796 BLAKE2B 19eeadf7bbfb96c5c7d2037af18d55162d81bba61b2dc022dfc19ce25534fe72eea1b29424f662c199fb6769fdd412a00cb2d5cb0e41af75f435f3ee16d83efc SHA512 39c32470cb802d74ee6f97071e74a4cedc8374cf60b50f470ca318066fe45a71ed89c5c77dc7b3e70f0a3a33ccca7beedf6e96863a431515e957883467325bde
+AUX libiconv-1.16-fix-link-install.patch 968 BLAKE2B 29d67eb01de00f68b1245a8fe521caf3da262ac0d78da615aeec1e67e08220e6366e1cf708775217e94e282a7b6c236edc322016c3ebdb37486f5e789e4655a1 SHA512 fe5b5376f491df5ef2d01496232e56742b86d52ef043dad21993cb4f463b404c0b8bfaf46ef7fb0d3d8f19504af9875b5096c6a4392ec0666416e0389b1d1923
 DIST libiconv-1.15.tar.gz 5264188 BLAKE2B 2384dbf8549fa56e841b15b7e2698b83c0ee171cdff13aef48c60eae0bc4f5e7b2e937bc8d5eddf89fba11412d17bebd77bdda7060c177ce9dc9be00172c0c12 SHA512 1233fe3ca09341b53354fd4bfe342a7589181145a1232c9919583a8c9979636855839049f3406f253a9d9829908816bb71fd6d34dd544ba290d6f04251376b1a
+DIST libiconv-1.16.tar.gz 5166734 BLAKE2B 8e7f4d64d757db6c3ffa973c9cebcf20b34f9859a547dbba8cebe3a4865bda86f33c5be197951877c46eff5a7fc00b1b11474fb3baa036f08ac2faf97eca138c SHA512 365dac0b34b4255a0066e8033a8b3db4bdb94b9b57a9dca17ebf2d779139fe935caf51a465d17fd8ae229ec4b926f3f7025264f37243432075e5583925bb77b7
 EBUILD libiconv-1.15.ebuild 1883 BLAKE2B 6465ea829fb9c274e600dec8d0b8f382f20a09acd096e25a78ac1935ffe0e1660fdda712605939e88d3b36edb059f9169af00e2fbff77ed8fd2bf5ca4d88b092 SHA512 185a8b821546553392393034c8b926792db378668b88b9756bda5716c949edd49f6eac2315e408ce7e0cc9e6be875ccbcc7a82d235824db035aeec8dbf82a745
+EBUILD libiconv-1.16.ebuild 1731 BLAKE2B 0982de773367eb76cb0a3af53abeac7ec008900070311eec938e8854a4e374a483cc9c4fcdbd86eca68ef8d34254a3f23d7e24721efa7a1f5295b3e30a097e8f SHA512 7ae0e738562c546e6b02a595b43114c0efe685165e92969360d30746fc8fa62d87b50bacf90191de4eae14226d01021e2778de369d9eff93ec64bf60136b3747
 MISC metadata.xml 465 BLAKE2B a9451430b40c62c22fa244871d26561960f697d360e3e46300f0512556d07988d73beb7e2eb468b94c9df71aae8aef6bb61c9e59ca9ea451bd86d1acfdbb8ce3 SHA512 a7f901242b5bcc60c070d40e4271e6d6a8dbd2e152a29c0b408ef43d5140a3ef89e90062853066532cd6d64db687aaf41ff553a56449865f1b84f37158cc389a
diff --git a/dev-libs/libiconv/files/libiconv-1.16-fix-link-install.patch b/dev-libs/libiconv/files/libiconv-1.16-fix-link-install.patch
new file mode 100644
index 000000000000..022613463a7b
--- /dev/null
+++ b/dev-libs/libiconv/files/libiconv-1.16-fix-link-install.patch
@@ -0,0 +1,12 @@
+don't link against the libtool archive to avoid recording ${D} in RUNPATH
+
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -113,6 +113,7 @@
+ 	if [ ! -d $(DESTDIR)$(bindir) ] ; then $(mkinstalldirs) $(DESTDIR)$(bindir) ; fi
+ 	case "@host_os@" in \
+ 	  hpux*) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a -L$(DESTDIR)$(libdir) -liconv @LIBINTL@ $(OBJECTS_RES_@WOE32@) `if test -n '$(DESTDIR)'; then echo " -Wl,+b -Wl,$(libdir)"; fi` -o iconv$(EXEEXT);; \
++	  *) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a -L$(DESTDIR)$(libdir) -liconv @LIBINTL@ $(OBJECTS_RES_@WOE32@) -o iconv$(EXEEXT);; \
+ 	  *) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a $(DESTDIR)$(libdir)/libiconv.la @LTLIBINTL@ $(OBJECTS_RES_@WOE32@) -o iconv$(EXEEXT);; \
+ 	esac
+ 	$(INSTALL_PROGRAM_ENV) $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) iconv$(EXEEXT) $(DESTDIR)$(bindir)/iconv$(EXEEXT)
diff --git a/dev-libs/libiconv/libiconv-1.16.ebuild b/dev-libs/libiconv/libiconv-1.16.ebuild
new file mode 100644
index 000000000000..6962ed176257
--- /dev/null
+++ b/dev-libs/libiconv/libiconv-1.16.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit libtool multilib-minimal usr-ldscript
+
+DESCRIPTION="GNU charset conversion library for libc which doesn't implement it"
+HOMEPAGE="https://www.gnu.org/software/libiconv/"
+SRC_URI="mirror://gnu/libiconv/${P}.tar.gz"
+
+LICENSE="LGPL-2+ GPL-3+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE="prefix static-libs"
+
+DEPEND="!sys-libs/glibc
+	!sys-libs/musl
+	!userland_GNU? ( !sys-apps/man-pages )"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.15-no-gets.patch"
+	"${FILESDIR}/${PN}-1.16-fix-link-install.patch"
+)
+
+multilib_src_configure() {
+	if use prefix ; then
+		# In Prefix we want to have the same header declaration on every
+		# platform, so make configure find that it should do
+		# "const char * *inbuf"
+		export am_cv_func_iconv=no
+	fi
+	# Disable NLS support because that creates a circular dependency
+	# between libiconv and gettext
+	ECONF_SOURCE="${S}" \
+	econf \
+		--docdir="\$(datarootdir)/doc/${PF}/html" \
+		--disable-nls \
+		--enable-shared \
+		$(use_enable static-libs static)
+}
+
+multilib_src_install_all() {
+	use static-libs || find "${ED}" -name 'lib*.la' -delete
+
+	# If we have a GNU userland, we probably have sys-apps/man-pages
+	# installed, which means we want to rename our copies #503162.
+	# The use of USELAND=GNU is kind of a hack though ...
+	if use userland_GNU ; then
+		cd "${ED}"/usr/share/man || die
+		local f
+		for f in man*/*.[0-9] ; do
+			mv "${f}" "${f%/*}/${PN}-${f#*/}" || die
+		done
+	fi
+}