gentoo resync : 06.08.2019

3 files changed, 10 insertions, 89 deletions

diff --git a/sys-libs/talloc/Manifest b/sys-libs/talloc/Manifest
index f68be02e5794..1be4a20c68a2 100644
--- a/sys-libs/talloc/Manifest
+++ b/sys-libs/talloc/Manifest
@@ -1,13 +1,11 @@
 DIST talloc-2.1.14.tar.gz 444589 BLAKE2B 3e47126eb41dc08befd22d7d41443dc5502d0bed239fa0fd32d63fe5374b4422165a7b364a8ad4a9f6e2d73b2db1dd4bada6aec3271c7b264f148d32974adcff SHA512 1fcc70bf283a4d9fb61faf1c57f80a9c158efbe996452740db9755e879ad72ee7bff6f6c9bed358e085c5c7f97c78800bb903161143af2202952b702141cc130
-DIST talloc-2.1.15.tar.gz 634092 BLAKE2B e7dfad56e0f6325f50a025e4c92bb1d3d2b1d93897ebef59103c3ca40065c2724a47bb2d1104238b368870d2a944aacabb5f686f20e55134fa83dd68b2e27f6f SHA512 41896f8877e9a52e70b9881c41667dc52d7c1b03c3b248020fd909b794a4c5a4addee3eb944aa80ecfa3b03e6e5e1f67a62b5f3a5dcdc412b3e975352057ff40
 DIST talloc-2.1.16.tar.gz 634906 BLAKE2B 5f9f2e5ad53944d9a7b5bdb990aa6ab65a3f0d90cd9e368c16b11192e90fdecc873d59618dbf3e15896ecf7bbbbb2deaac91df6e231ad6b22b8e7c14bd382956 SHA512 a1affe4ad2a4cf19d4494017e0e6e37cdf9f8e6a98839c9e4e5c02758a7da7ea0040518de9b26707a60eb0a0eab29f939c6823e5840096dc124d351993e05c74
-DIST talloc-2.1.5.tar.gz 436193 BLAKE2B 88a9ca32b6c6ae869e1761cb027847797e4ef3bb58dc618bae4b00f95637a0a8511f8704fa03ca1ca935127413a10d5297ba3843f0ea6992a97ce586f66cb705 SHA512 b938d67fcf4c6618f1149b4ec665957a604e3b07ee26e96ed36d94312db8f56b50498f69f9a07782f7f10a25047604e32b0d1786e1051d5f36b696c2755f8741
 DIST talloc-2.1.9.tar.gz 440335 BLAKE2B dde37d99b3cfb63209cdb832444f0416b7c05151cec537e220e13b1148d59b89fb712b4211e078b23f1c6608c8be6df6055d5f394b091ccdea3966c04cbb73be SHA512 a8f051bb15aba769ca286acad0946605d0053b0d149b4da2e6ecc333345f3e603d13a7f062452ae0f165615a4170ebdd7f41fc1b46c7a360000d5308bc304cbb
 DIST talloc-2.2.0.tar.gz 633467 BLAKE2B efdb53dbd4d43ce5d682faec01fb53d9c4b5dd7e97cf125e12661e7432bb968f577416cccbd8ee5003811bdd03dcc949b2e7a06312c497fb9eef54667209a653 SHA512 e762c6443ff2c0c35a9dbf7ac6e64a9182c04a218ad0f26fd67ac9620d9ae26d68b8dd2b21ff37e1df0e53748c84bece27890c5c4939eaeb61c502a698802388
+DIST talloc-2.3.0.tar.gz 642364 BLAKE2B 148ad3b478617c34c16c2ef454796a5dc918fc0a3e91bd965943ba66860b9b7df21fd2b69f5481f46a712a55a8f1a5e39db9f4ac779896d17d090290292b2ed6 SHA512 f0020d83520ea24711040c44600180fabae7b0e0668a961a66f5d4f77d89b09d799ddadf781ee2d044ad059b2d6a2e5232068fd77b300a8366592c0ce2289837
 EBUILD talloc-2.1.14.ebuild 2428 BLAKE2B 1c2e8e21042957a9d95ed3d70b60708e66764d488781aa7c022d5b85c1707983a3dd7053cfc747f41651c5351f423f2c5d3f350059b5b9abea39472eb1a44193 SHA512 742db47be8ccfbd887c9de07425df86de883b2d06c9a626404c4cf5e4b896f4e4c97451d8f47dbd5abee670df0e87bef880b3205a075773265a765a6dc3cca26
-EBUILD talloc-2.1.15.ebuild 2513 BLAKE2B e964cab897cdb8c81026453b5e93be852bfbc18bd905e1cc33d8fb6ce385cf9d29792f373da0158e54812a100e4c501d46115dedf59dc6f13be1792387fa279a SHA512 c3cfa0e4680e6d6c34d79e4e569f92fc719cbff4763ccaeafd31f495308a1f2849b0fcf4dde853089dbd7850236fccf164d91d647cccadf07dd620d164298400
 EBUILD talloc-2.1.16.ebuild 2513 BLAKE2B e964cab897cdb8c81026453b5e93be852bfbc18bd905e1cc33d8fb6ce385cf9d29792f373da0158e54812a100e4c501d46115dedf59dc6f13be1792387fa279a SHA512 c3cfa0e4680e6d6c34d79e4e569f92fc719cbff4763ccaeafd31f495308a1f2849b0fcf4dde853089dbd7850236fccf164d91d647cccadf07dd620d164298400
-EBUILD talloc-2.1.5.ebuild 2282 BLAKE2B 9e895c62d6c90cf1556167492fdf5b3b4c08c138d7ee587ab8bedbeca5b5d01058022ed1c3eefc501dfb1a73bfb08757c6fdd199093f23be56f27c6ec44cb46e SHA512 8fbcffaa4ed36ae6dc507344f67dccbcf971baafdc71bde8b374ee60db36d7f5798a3278f62454bc15bee84f0505b336272b2823cd3002a74d185cefb5037806
 EBUILD talloc-2.1.9.ebuild 2464 BLAKE2B 45c4b0941d72cca82bc5b1ed376cdc55268b064ea5de412e19aff23c7c230b00997ed8673637025a4377283de06646e02bcd5df1047018a493f8ba10d4a42eb5 SHA512 2cfcbe1828a508e6e0c4ea0136f1896e7767c2e8a7493c28c269cfe7ce52e24c97e238946ded2aafbc43a36520010bd7351e5b98a693ca411d0dd6d686337138
 EBUILD talloc-2.2.0.ebuild 2577 BLAKE2B 497e92e4cfb306e9c6d3058bd8069e0b1f855bb0b672a717c607e31b939b55964b51a030a0f2fbf5e2a9af931adb3ddbde3e80ec2f58c27d07d92fefdcc152f9 SHA512 82e354452f3d80cd8be969d12e14509f37343708ca573ac8957cc4c9538e0477a397693351d2c9c9490644ae8d722f19602032c1fbcc8de11ddd0f3383533c3b
+EBUILD talloc-2.3.0.ebuild 2578 BLAKE2B 394e9c02640c54af327edebcda7afb7ff2c33257156975974f5403982b7d987d00f5c8e58413b0cad39bf5e43167a42e604167b92955960a0f8f6ec124394117 SHA512 41bcc9d45cbd3125957816f6e5fa5ff57b6cb73aeb66a084cb70746b985b330e2c221b6e8d66e1d0dc2c4526e62f0f63237cb6953331dee8c205e61c7b7a22a5
 MISC metadata.xml 439 BLAKE2B 06eae26083fdab237958e15ac7e59ae728e1741eef080e2dbd47a9725a88f9120bfd03bcd98ec32a84bf8ee69d5721c7f3978c2c11d018136647d8f1778a1ab8 SHA512 e583aa7aa9a641067b3b38bf398ad6266980ee961e11d81b5d7c6d32cb8948879e27777a33a72376f79beca6f71aa79613db65049e6a1221922869239de9ccf3
diff --git a/sys-libs/talloc/talloc-2.1.5.ebuild b/sys-libs/talloc/talloc-2.1.5.ebuild
deleted file mode 100644
index b98d2dfa5797..000000000000
--- a/sys-libs/talloc/talloc-2.1.5.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-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 ~x86-linux ~x64-macos ~sparc-solaris"
-IUSE="compat +python"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="!elibc_FreeBSD? ( dev-libs/libbsd[${MULTILIB_USEDEP}] )
-	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
-)
-
-src_prepare() {
-	# 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.15.ebuild b/sys-libs/talloc/talloc-2.3.0.ebuild
index 077f0c05371a..320f1bbb31d1 100644
--- a/sys-libs/talloc/talloc-2.1.15.ebuild
+++ b/sys-libs/talloc/talloc-2.3.0.ebuild
@@ -14,12 +14,18 @@ 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 ~x86-linux ~x64-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x64-solaris"
 IUSE="compat +python"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-RDEPEND="!elibc_FreeBSD? ( dev-libs/libbsd[${MULTILIB_USEDEP}] )
+RDEPEND="!elibc_FreeBSD? (
+			!elibc_SunOS? (
+				!elibc_Darwin? (
+					dev-libs/libbsd[${MULTILIB_USEDEP}]
+				)
+			)
+		)
 	python? ( ${PYTHON_DEPS} )
 	!!<sys-libs/talloc-2.0.5"
 DEPEND="${RDEPEND}