gentoo resync : 02.06.2018

3 files changed, 22 insertions, 48 deletions

diff --git a/dev-libs/libunistring/Manifest b/dev-libs/libunistring/Manifest
index beae67307d59..6e4391759798 100644
--- a/dev-libs/libunistring/Manifest
+++ b/dev-libs/libunistring/Manifest
@@ -1,11 +1,9 @@
 AUX libunistring-nodocs.patch 287 BLAKE2B b351d572e702a17cc4b1df97f182b6fa5ca232c77a4775572097043814a868e16adb7e6dc4022ea07c614d6accac255a6c0262916e5a36275949e069a17b4a80 SHA512 f7bded4ec621039121c93c9808e384822613c670df886c125b00d8add6ab8257a5152298fa483cbed21222da78097a98433a2f0b364467ed82bda5f98a8c1847
-DIST libunistring-0.9.5.tar.gz 3487957 BLAKE2B 31c345d503476467ac0178cb127d85d2af343bc7d65504600b2950d44e50996d84d77750cc89af643667568f1d01beb2742aba5122bd4e4a50ab8c8225f1cf63 SHA512 89404b8f0fde264c3faa4285e4717487f2b6c348fa9374ccff2251eb3db6dda208fe013056a22f496c1fb099abe7e79b72a203d15499c641e3ac48e7957ba1b4
-DIST libunistring-0.9.6.tar.gz 3565883 BLAKE2B 8cd9e05f78e37246036ae134ae7d6c570da46c04822f749297ffeec7ec529ad17cee22a9d9ebbf3f1e36398efde41714c3953efdc3859d3f1e454281ad591249 SHA512 244f4ef6343047d2dedfdbe536a7a29584a58f668a41ba3183fc86d2f167186acf120708e024e31551ee2f035b9bee35e9ed24a276a4de9359cf08aec198c20a
+DIST libunistring-0.9.10.tar.gz 3744814 BLAKE2B 3ddc55b8021c0f4822beb83b807bb21dbbf10bbb866747f64e060df3ab822a4143528855e1ce6a13144630bc8daa14f1fa830db77fb605e57cae21d46de804d6 SHA512 690082732fbbd47ab4ffbd6f21d85afece0f8e2ded24982f949f4ae52bf0a981b75ea9bc14ab289e0954cde07f31a7a4c2bb65615a8eb5b2bfa65720310b6fc9
 DIST libunistring-0.9.7.tar.gz 3589989 BLAKE2B 5ba029be96adf3804e9591ee0c271f41111a9c48c773d50adbf2408577e98ddd06d54dc665d3791a835698012021384c9290da0e3ce3d331f20283462c6a3c75 SHA512 43cb60163299a781b57bca326ddeb6333cde0b12d274fcd2b176971c8080ee8868f8c11bf9c524596d3a56dc0213ed1d3246fb805db1de950257c3764eb34ae0
 DIST libunistring-0.9.8.tar.gz 3720294 BLAKE2B 873dbccbe869c9dd6fe72f17759aefadc6495f97ba26e2cc62a1d94c9ca966a5f35d8d40a480077b90018602abf04342de51dfd64a4034db2ef0ff8a0f102c03 SHA512 91c0da429cc13272bf94cc1afa2bcc6cb0afa2af8b9c05fde2c1cd3ed0f54c6571803c303e20579bba51600d0e63fe917b415ccbb3751353cd8310388dddb72f
 DIST libunistring-0.9.9.tar.gz 3736674 BLAKE2B cb328e2378aeabd8f1282ed6f66f556c6301a88bdbb11d1a7ea73569700a8af9bbbfa9336faa7b390e5f5df628001d5e9bf2081f0c36d139296f16d657e70de6 SHA512 dbf067ba5c748e198f8837e603710ff63714d1bb4642a2cd2facb8f1034b617250c8695f4e1caad77c417bdcb0f1e1664eafa5a18eca77126741a4363a1c9cf4
-EBUILD libunistring-0.9.5.ebuild 795 BLAKE2B 145d00d7494f389ca53e39519541db49c39172a2938ce0af435d2446ac4eec21442f26c6cf49066214f938ddbdc05d566c94016f43c788cbf70b428059339e60 SHA512 6e1b1580c92232f461c186effcc67ee340a3b8b47eaa7361fe57532a4cf4f451c9f46375fb7b488cf113787270ad80d420be0742b552396f6849a714a88366e6
-EBUILD libunistring-0.9.6.ebuild 719 BLAKE2B 47f5e802086e99639a9caa845a37982c1cc62e4f873575c72ba6ba06372c9b4cc529b0f224f6cd9e26531dc3b82682a04c0a1b9900d636f6da51e0d760deb504 SHA512 2d057f8397697b6bb8212fc4ed47b44c09607f8e8cd44cebb5da617a1aa91c77bb29636fb90eb6969bd23906cc924d574f5a6a8e2f43cae85e336352427630a9
+EBUILD libunistring-0.9.10.ebuild 1011 BLAKE2B 1dcbc1efc9937a5a225a1b26c25df2162a304f7fe1d6834adb47aeba2998ae0404449a14c59866deaf652fe860c50623a34edd82c683321c891212fe13a140b2 SHA512 4282f418c75273ceb2fcbf52109e460c60ac278e5ca126affd5d363b9d31f1abc74e5598fecedcce8c33300d9271b447dac962f23e8d8c58bd1901ca09849f6a
 EBUILD libunistring-0.9.7.ebuild 998 BLAKE2B 75ab1eb5ac3e5099677cfb03dfac09c9b1a4851754a5633d94de4c925c8f44b56ed23a06b4b39a6fb8b4329eeb0344887a4f1582fe77987670f27c4bf75e25b1 SHA512 fe39a9540299c3cf1d8538aa8eecb0f9824e67ea460d05abe458df6cc7f9ac0f8a239d944e2f1029566c8f26d610529ea90002beb6856e545e323945a3949bf0
 EBUILD libunistring-0.9.8.ebuild 1011 BLAKE2B 1dcbc1efc9937a5a225a1b26c25df2162a304f7fe1d6834adb47aeba2998ae0404449a14c59866deaf652fe860c50623a34edd82c683321c891212fe13a140b2 SHA512 4282f418c75273ceb2fcbf52109e460c60ac278e5ca126affd5d363b9d31f1abc74e5598fecedcce8c33300d9271b447dac962f23e8d8c58bd1901ca09849f6a
 EBUILD libunistring-0.9.9.ebuild 1011 BLAKE2B 1dcbc1efc9937a5a225a1b26c25df2162a304f7fe1d6834adb47aeba2998ae0404449a14c59866deaf652fe860c50623a34edd82c683321c891212fe13a140b2 SHA512 4282f418c75273ceb2fcbf52109e460c60ac278e5ca126affd5d363b9d31f1abc74e5598fecedcce8c33300d9271b447dac962f23e8d8c58bd1901ca09849f6a
diff --git a/dev-libs/libunistring/libunistring-0.9.6.ebuild b/dev-libs/libunistring/libunistring-0.9.10.ebuild
index b0c96cbf1033..ba7327e2d797 100644
--- a/dev-libs/libunistring/libunistring-0.9.6.ebuild
+++ b/dev-libs/libunistring/libunistring-0.9.10.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=6
 
-inherit eutils
+inherit eutils multilib-minimal libtool
 
 DESCRIPTION="Library for manipulating Unicode and C strings according to Unicode standard"
 HOMEPAGE="https://www.gnu.org/software/libunistring/"
@@ -11,23 +11,34 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3 GPL-3"
 SLOT="0/2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-nodocs.patch
+)
+
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-nodocs.patch
+	default
+	elibtoolize  # for Solaris shared libraries
 }
 
-src_configure() {
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" \
 	econf $(use_enable static-libs static)
 }
 
-src_install() {
+multilib_src_install() {
+	default
+
+	prune_libtool_files
+}
+
+multilib_src_install_all() {
 	default
+
 	if use doc; then
 		dohtml doc/*.html
 		doinfo doc/*.info
 	fi
-
-	prune_libtool_files
 }
diff --git a/dev-libs/libunistring/libunistring-0.9.5.ebuild b/dev-libs/libunistring/libunistring-0.9.5.ebuild
deleted file mode 100644
index 27f51500592b..000000000000
--- a/dev-libs/libunistring/libunistring-0.9.5.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils
-
-DESCRIPTION="Library for manipulating Unicode and C strings according to Unicode standard"
-HOMEPAGE="https://www.gnu.org/software/libunistring/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3 GPL-3"
-SLOT="0/2"
-KEYWORDS="amd64 arm x86 ~amd64-linux"
-IUSE="doc static-libs"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-nodocs.patch
-}
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	dodoc AUTHORS README ChangeLog || die "dodoc failed"
-	if use doc; then
-		dohtml doc/*.html || die "dohtml failed"
-		doinfo doc/*.info || die "doinfo failed"
-	fi
-
-	emake DESTDIR="${D}" install || die "Install failed"
-
-	prune_libtool_files
-}