gentoo resync : 28.04.2019

5 files changed, 4 insertions, 104 deletions

diff --git a/dev-libs/libiconv/Manifest b/dev-libs/libiconv/Manifest
index 3e52919bd7f8..2a018b957cf1 100644
--- a/dev-libs/libiconv/Manifest
+++ b/dev-libs/libiconv/Manifest
@@ -3,8 +3,6 @@ AUX libiconv-1.15-no-aix-tweaks.patch 981 BLAKE2B 37d0ce998456bb2c07b249c22e8cd0
 AUX libiconv-1.15-no-gets.patch 796 BLAKE2B 19eeadf7bbfb96c5c7d2037af18d55162d81bba61b2dc022dfc19ce25534fe72eea1b29424f662c199fb6769fdd412a00cb2d5cb0e41af75f435f3ee16d83efc SHA512 39c32470cb802d74ee6f97071e74a4cedc8374cf60b50f470ca318066fe45a71ed89c5c77dc7b3e70f0a3a33ccca7beedf6e96863a431515e957883467325bde
 DIST libiconv-1.14.tar.gz 4984397 BLAKE2B 8697bbff9b929e8a30157f271ba3216aef7b2f0020f5edd273f3cec249069fb23f58ae13cbe3d3bb502c27e97e7cccae66aba23017ab4f6bce11b2ec133ef684 SHA512 b96774fefc4fa1d07948fcc667027701373c34ebf9c4101000428e048addd85a5bb5e05e59f80eb783a3054a3a8a3c0da909450053275bbbf3ffde511eb3f387
 DIST libiconv-1.15.tar.gz 5264188 BLAKE2B 2384dbf8549fa56e841b15b7e2698b83c0ee171cdff13aef48c60eae0bc4f5e7b2e937bc8d5eddf89fba11412d17bebd77bdda7060c177ce9dc9be00172c0c12 SHA512 1233fe3ca09341b53354fd4bfe342a7589181145a1232c9919583a8c9979636855839049f3406f253a9d9829908816bb71fd6d34dd544ba290d6f04251376b1a
-EBUILD libiconv-1.14-r1.ebuild 1373 BLAKE2B 629f36e0d54ec3afb2b64d4924b76ee2ccf28b8f0b7c55f657c394af02ff03e7e6335a703c1ad4ac9e2c7bb9e624fcd8f0cf6a43b95aa6b1b8148d621fd4485c SHA512 3cdaf12a9b67cf10de8aaae1b3bbc238b7f3e218d44832b1317cf9b1ded10996fa44b2bba9a7ea5b655b07afced1db3e85c42a5794baacbe91cb96ebc05c7112
-EBUILD libiconv-1.14-r2.ebuild 1503 BLAKE2B 63e874be4500aee2da3d4ebb087f7eef6d706a53a4a34041a5e1bbb0b2402a5b136f6cdfae916449f05d8d9cd42b3c432429f574cc591a8f03305d772560c56f SHA512 1d2d8226fec24e201dbeb7490b2ddbc602e1824ca77b18d058b16e013690e321852060e2e4908b0145dfe159c3f9fc54da416ccbb8a6f3ecbd3c1968aca1d16b
-EBUILD libiconv-1.14.ebuild 974 BLAKE2B f84a1b7666c247ac4a85f0ae05a1dbe5202175023ac9308b7d7af5f3083382af8df7c81d0d6d7c1e0ded4c209eec6a267eaef6092e4ee56b7628ed405e4441e2 SHA512 3d6fa4773eeab09c7c01fc0dc4bc5239556657818d9f77baaf7436c9c6746d044dd3e2131d498f5b436aeb26b997807ddf76efe320ab454a0555d6fc24e6e38b
-EBUILD libiconv-1.15.ebuild 1925 BLAKE2B 04fed0a91f55722d8e253f2558e2abd6f944996c5ef4386c6578507b9e383339bd28043cc98442c7ee02966c18a9ce5b039348bf80ba211b90c505ce3982692e SHA512 8ac083bf616cfe8ecb6aed325e1902b8296dd23f6469cc64d1f3a86efd960c654faad94b3bcbec8af2661ef8b88e52727cd3e6e710bedbc6aace5b7e0a6ddadf
+EBUILD libiconv-1.14-r1.ebuild 1382 BLAKE2B e24d9f39547e75024846685e7e43cedc826ad4a96ab37e2b4c74b146dc5d3f1a8cf38743e57846ba156b9e9d957867496278271edcb8d71b1d3650db61def39a SHA512 30a2b754f92cdb0baaa5caf7c9fb069a556aae69d8ef6f06db9f024c265a31aa1fdc2333deeffba8db465aa27cdf6ce0ffd19fcbb023d2f6701ff4f7eaf3b200
+EBUILD libiconv-1.15.ebuild 1934 BLAKE2B 39f4d790b3fb1bf82b90eb631b40671bcd5f32884a59f8e90176aafff0e80d7350914aa9be17abd8edb21a25a37c5f297a2c73287943ea5d89dd8d76895e98b5 SHA512 6f526985038c201bb7c3fadb03011fbad16f9e13526844a57c786f5b3518c08813648a033116c25874401f3fd1d9f00e4bd1ba48c655125289fced9d6b3bc7ee
 MISC metadata.xml 564 BLAKE2B 465a39f6ee306925d4eb3f616cba7e08604aff5e94024659df611d45ea96245205a6f257175e862ae63e5a6d31fc549e2104d56a3e970157d25cf315dc820ffa SHA512 7c13a258f15e61b3e5fd3e55411466f8830d83ecc25676d491635037be07b1a35b845ec5a06d56c26ecefb8865149e486e939a72111d1a3e46efc26b87d632a6
diff --git a/dev-libs/libiconv/libiconv-1.14-r1.ebuild b/dev-libs/libiconv/libiconv-1.14-r1.ebuild
index 059bc00d97ff..644bfafed5ea 100644
--- a/dev-libs/libiconv/libiconv-1.14-r1.ebuild
+++ b/dev-libs/libiconv/libiconv-1.14-r1.ebuild
@@ -9,7 +9,7 @@ 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="GPL-3"
+LICENSE="LGPL-2+ GPL-3+"
 SLOT="0"
 KEYWORDS="amd64 arm ~mips ppc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="+static-libs"
diff --git a/dev-libs/libiconv/libiconv-1.14-r2.ebuild b/dev-libs/libiconv/libiconv-1.14-r2.ebuild
deleted file mode 100644
index 54709b52977d..000000000000
--- a/dev-libs/libiconv/libiconv-1.14-r2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit libtool toolchain-funcs multilib-minimal
-
-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="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="static-libs"
-
-DEPEND="!sys-libs/glibc
-	!userland_GNU? ( !sys-apps/man-pages )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	eapply "${FILESDIR}"/${P}-no-gets.patch
-	eapply_user
-	elibtoolize
-}
-
-multilib_src_configure() {
-	# 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
-
-	# Install in /lib as utils installed in /lib like gnutar
-	# can depend on this
-	gen_usr_ldscript -a iconv charset
-
-	# 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
-}
diff --git a/dev-libs/libiconv/libiconv-1.14.ebuild b/dev-libs/libiconv/libiconv-1.14.ebuild
deleted file mode 100644
index fc464c4b6e93..000000000000
--- a/dev-libs/libiconv/libiconv-1.14.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit libtool toolchain-funcs
-
-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="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-DEPEND="!sys-libs/glibc
-	!sys-apps/man-pages"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	# Make sure that libtool support is updated to link "the linux way"
-	# on FreeBSD.
-	elibtoolize
-}
-
-src_configure() {
-	# Disable NLS support because that creates a circular dependency
-	# between libiconv and gettext
-	econf \
-		--docdir="\$(datarootdir)/doc/${PF}/html" \
-		--disable-nls \
-		--enable-shared \
-		--enable-static
-}
-
-src_install() {
-	default
-
-	# Install in /lib as utils installed in /lib like gnutar
-	# can depend on this
-	gen_usr_ldscript -a iconv charset
-}
diff --git a/dev-libs/libiconv/libiconv-1.15.ebuild b/dev-libs/libiconv/libiconv-1.15.ebuild
index c991366b8eff..5d47b69f440f 100644
--- a/dev-libs/libiconv/libiconv-1.15.ebuild
+++ b/dev-libs/libiconv/libiconv-1.15.ebuild
@@ -9,7 +9,7 @@ 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="GPL-3"
+LICENSE="LGPL-2+ GPL-3+"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="prefix static-libs"