gentoo resync : 14.07.2018

3 files changed, 7 insertions, 105 deletions

diff --git a/sys-libs/talloc/Manifest b/sys-libs/talloc/Manifest
index bd76e8e8fe1a..6da68b8f228a 100644
--- a/sys-libs/talloc/Manifest
+++ b/sys-libs/talloc/Manifest
@@ -1,11 +1,9 @@
-DIST talloc-2.1.10.tar.gz 441645 BLAKE2B fdc1f6b4ab6c95b461652ac5138e8f4e0db7161792b4cd7af8d80178b99404f844dd8352fb8820dcaedd0d96251025a8ebefc6bd1cff451e6bdf559617c964e3 SHA512 215e70056f37ade8f67c20ab2b79dcb40f071989ec908de81144f8a0160637bbdec9a94123dea73475ba42425415df4c1eb8c1986485a00e2e03323719a03ce3
-DIST talloc-2.1.11.tar.gz 443320 BLAKE2B 6234808d3a37dd1b9cd29121c20e003637da460d652769f9e85356b66aee285f3706377de4f507adfaaf91243a452a27bdab2377749d43937e140c3f8c69c417 SHA512 e0c7e44f21b0b6510e04e09ce325d50323a0c6466acb6f301676e82f8812c61ed7f6faadac62380aa6338d54679fdf7afba7fb9ac774d0def96efbcf49d00523
 DIST talloc-2.1.13.tar.gz 444608 BLAKE2B ac905d984e9ec438e8d7af473b37d7ccf8e4cf98d96b5a3b621f6c8203e7f5cd4d656602ac1fdfd22e0cab5853a8b54398c0c2ab4202517c4de73c5c90106d63 SHA512 003588fbcde340096b069ed4de0dc6c3e6a489b72abec83e9d3dedf40571a1bf07232d410cc86d8ca505ee49f7483a0043360e913de69106493346fae16a0e2b
+DIST talloc-2.1.14.tar.gz 444589 BLAKE2B 3e47126eb41dc08befd22d7d41443dc5502d0bed239fa0fd32d63fe5374b4422165a7b364a8ad4a9f6e2d73b2db1dd4bada6aec3271c7b264f148d32974adcff SHA512 1fcc70bf283a4d9fb61faf1c57f80a9c158efbe996452740db9755e879ad72ee7bff6f6c9bed358e085c5c7f97c78800bb903161143af2202952b702141cc130
 DIST talloc-2.1.5.tar.gz 436193 BLAKE2B 88a9ca32b6c6ae869e1761cb027847797e4ef3bb58dc618bae4b00f95637a0a8511f8704fa03ca1ca935127413a10d5297ba3843f0ea6992a97ce586f66cb705 SHA512 b938d67fcf4c6618f1149b4ec665957a604e3b07ee26e96ed36d94312db8f56b50498f69f9a07782f7f10a25047604e32b0d1786e1051d5f36b696c2755f8741
 DIST talloc-2.1.9.tar.gz 440335 BLAKE2B dde37d99b3cfb63209cdb832444f0416b7c05151cec537e220e13b1148d59b89fb712b4211e078b23f1c6608c8be6df6055d5f394b091ccdea3966c04cbb73be SHA512 a8f051bb15aba769ca286acad0946605d0053b0d149b4da2e6ecc333345f3e603d13a7f062452ae0f165615a4170ebdd7f41fc1b46c7a360000d5308bc304cbb
-EBUILD talloc-2.1.10.ebuild 2443 BLAKE2B 39e7c6e9cf12095d28a79bd8bf1feb3496a654a717de88f0b452c779384cc11295ee7e4804fe998876200aae3c85eff1e8f799581ee0551ab5be28a4565ddcd7 SHA512 9b2505168c051eb44e4c9e628800859f729ea9bac24b0e4a6daa80cd5d5036e8ac0733c5ec47b070f59b9791d1e822e53ae6df8d3a91c99176b1cb01e670e1ff
-EBUILD talloc-2.1.11.ebuild 2443 BLAKE2B 723f4a38dc2f2b83abfeb2ec98751bf2fffb5e82083c69296a9c2a6d794172dcfb0b59e7de974746f8e0542e63db1bf3deb8d882743113222869326b9a64b026 SHA512 2a1d66cba8c387c9c5dda890b646fcc1bdf50eb84d199990ccc5a28efc0d3cbd63540809579a3036f1af43441b0655bd7ff94ae5b3e71008c7b3cee9536a093b
 EBUILD talloc-2.1.13.ebuild 2391 BLAKE2B 0f57ea30c0afcc441bf4803f146793455ec5250f09f6746317d98c7e57b64e61fc7d55fff2f8103659d30d3e1d31ec04c869d9c50165452bf0bbf3f2420a3278 SHA512 49b6f5f91791263fc99550367b1f31e817f46741e164d9862a732022d071f6581daf2e79e3b91c1391bcca73d938d302c13762659ad4b8dfc495d1d37e3d0f7a
+EBUILD talloc-2.1.14.ebuild 2391 BLAKE2B 0f57ea30c0afcc441bf4803f146793455ec5250f09f6746317d98c7e57b64e61fc7d55fff2f8103659d30d3e1d31ec04c869d9c50165452bf0bbf3f2420a3278 SHA512 49b6f5f91791263fc99550367b1f31e817f46741e164d9862a732022d071f6581daf2e79e3b91c1391bcca73d938d302c13762659ad4b8dfc495d1d37e3d0f7a
 EBUILD talloc-2.1.5.ebuild 2239 BLAKE2B e396e068f44c250ac72178473fd281541a903979c489d10ea66e997f5bee0bbdedc4d5b6e7c4bccdb799e7714190da85923702f27868a0f77dfff771b02c27f8 SHA512 ed9f0f10bd331f589b560c0563f1ca2b5e16fdf12121fca83a34cd2965b48f9d0f0374b12db9b655b5742839260d2fa794b70e6792402b4e0aac0e3ee0d72ed2
 EBUILD talloc-2.1.9.ebuild 2422 BLAKE2B d2cfc6930fffc5ea5cca67418be4a3a0c891cfa1025e2c331a4e410cecfa2d11c76f89b030eec58bc5b7bddf05c19f6efca790989ed6f2e08ec7aa6f54befea2 SHA512 8b48f388e6760c09fa5e9487d089f0198aa17f086d7a9877eb508aee7a7fb9c2c181a94af01f2993b3a623819aedbd3b19e920b5e68fb0863457339c8b4a3822
 MISC metadata.xml 439 BLAKE2B 06eae26083fdab237958e15ac7e59ae728e1741eef080e2dbd47a9725a88f9120bfd03bcd98ec32a84bf8ee69d5721c7f3978c2c11d018136647d8f1778a1ab8 SHA512 e583aa7aa9a641067b3b38bf398ad6266980ee961e11d81b5d7c6d32cb8948879e27777a33a72376f79beca6f71aa79613db65049e6a1221922869239de9ccf3
diff --git a/sys-libs/talloc/talloc-2.1.10.ebuild b/sys-libs/talloc/talloc-2.1.10.ebuild
deleted file mode 100644
index c1002e8e76e9..000000000000
--- a/sys-libs/talloc/talloc-2.1.10.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads"
-
-inherit waf-utils python-single-r1 multilib multilib-minimal
-
-DESCRIPTION="Samba talloc library"
-HOMEPAGE="https://talloc.samba.org/"
-SRC_URI="https://www.samba.org/ftp/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3 LGPL-3+ LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~sparc-solaris ~x64-solaris"
-IUSE="compat +python"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="python? ( ${PYTHON_DEPS} )
-	!!<sys-libs/talloc-2.0.5"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	dev-libs/libxslt
-	${PYTHON_DEPS}"
-
-WAF_BINARY="${S}/buildtools/bin/waf"
-
-RESTRICT="test"
-
-MULTILIB_WRAPPED_HEADERS=(
-	# python goes only for native
-	/usr/include/pytalloc.h
-)
-
-pkg_setup() {
-	# try to turn off distcc and ccache for people that have a problem with it
-	export DISTCC_DISABLE=1
-	export CCACHE_DISABLE=1
-
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# what would you expect of waf? i won't even waste time trying.
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	local extra_opts=()
-
-	use compat && extra_opts+=( --enable-talloc-compat1 )
-	if ! multilib_is_native_abi || ! use python; then
-		extra_opts+=( --disable-python )
-	fi
-
-	waf-utils_src_configure \
-		"${extra_opts[@]}"
-}
-
-multilib_src_compile() {
-	waf-utils_src_compile
-}
-
-multilib_src_install() {
-	waf-utils_src_install
-
-	# waf is stupid, and no, we can't fix the build-system, since it's provided
-	# as a brilliant binary blob thats decompressed on the fly
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		install_name_tool \
-			-id "${EPREFIX}"/usr/$(get_libdir)/libtalloc.2.dylib \
-			"${ED}"/usr/$(get_libdir)/libtalloc.2.0.5.dylib || die
-		if use python ; then
-			install_name_tool \
-				-id "${EPREFIX}"/usr/$(get_libdir)/libpytalloc-util.2.dylib \
-				"${ED}"/usr/$(get_libdir)/libpytalloc-util.2.0.5.dylib || die
-			install_name_tool \
-				-change "${S}/bin/default/libtalloc.dylib" \
-					"${EPREFIX}"/usr/$(get_libdir)/libtalloc.2.dylib \
-				"${ED}"/usr/$(get_libdir)/libpytalloc-util.2.0.5.dylib || die
-			install_name_tool \
-				-change "${S}/bin/default/libtalloc.dylib" \
-					"${EPREFIX}"/usr/$(get_libdir)/libtalloc.2.dylib \
-				"${D}"$(python_get_sitedir)/talloc.bundle || die
-		fi
-	fi
-}
diff --git a/sys-libs/talloc/talloc-2.1.11.ebuild b/sys-libs/talloc/talloc-2.1.14.ebuild
index e0ced08be51f..65fd07167cb9 100644
--- a/sys-libs/talloc/talloc-2.1.11.ebuild
+++ b/sys-libs/talloc/talloc-2.1.14.ebuild
@@ -51,15 +51,11 @@ src_prepare() {
 }
 
 multilib_src_configure() {
-	local extra_opts=()
-
-	use compat && extra_opts+=( --enable-talloc-compat1 )
-	if ! multilib_is_native_abi || ! use python; then
-		extra_opts+=( --disable-python )
-	fi
-
-	waf-utils_src_configure \
-		"${extra_opts[@]}"
+	local extra_opts=(
+		$(usex compat --enable-talloc-compat1 '')
+		$(multilib_native_usex python '' --disable-python)
+	)
+	waf-utils_src_configure "${extra_opts[@]}"
 }
 
 multilib_src_compile() {