gentoo resync : 15.01.2020

5 files changed, 107 insertions, 9 deletions

diff --git a/sys-libs/talloc/Manifest b/sys-libs/talloc/Manifest
index a4c301c30bb8..4bf4d84cbe0e 100644
--- a/sys-libs/talloc/Manifest
+++ b/sys-libs/talloc/Manifest
@@ -3,9 +3,11 @@ DIST talloc-2.1.16.tar.gz 634906 BLAKE2B 5f9f2e5ad53944d9a7b5bdb990aa6ab65a3f0d9
 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
+DIST talloc-2.3.1.tar.gz 638878 BLAKE2B 3d014a47639434c65f5dda2c51da3c6c28d5d60dbc9afdaca27b8ec903cde3433a8fa4ca33305750ff60911f7e43171d0d932d98c2d30ea38494aa532d6d9626 SHA512 064fc39a9aaace6e0209f3251c8ff198d8a318b4cf4198006ff9892ca6e15e7d817b2fda43e0444fbbf04d2c3e70d06523dff5d57cbb796d27317ef4759e062e
 EBUILD talloc-2.1.14.ebuild 2406 BLAKE2B e47759baa6f8b010122d558ddc662fe137d95b778698acc50727d313161aa48c628c91be7fa8b07d936687e3a161ae200047865beedc48264fca3f684c990741 SHA512 faa3d8c4980117f8f9f4ea4f74354a1fc1b053d2ead9c0af9c42b8a722d15d00a654aa7cb622d2c6280475a755a0f156ba70a819804ff3c52e3708c218fe805b
-EBUILD talloc-2.1.16.ebuild 2491 BLAKE2B c0b6dff8e854ff435102c3c110c5ccc4219f235f2faa306e5bc65110529b4713f8c15dcb6f29abf230ed0a2a291c8b4e4b76f64cc1329f81ffda295941006caa SHA512 c97996251c1c6259118aae3751ae33af205db7529840c0c41a79583ea1479b1b5c46e14bbf2f726d154a70eaaea8c384abc97275fbce5f01f2ebde856f86eba4
+EBUILD talloc-2.1.16.ebuild 2489 BLAKE2B 848188f578dd882a44dfbe2ec34b5abac2a67b60014aac22aee172ff3f49031a7a142084d49754e127e601e7ff535c4ee316fb39f8edc545f26386a24cc7445a SHA512 9eb807f48e33dc7f872c1fec3ab3dd0aefc6266cbdba67047273d6a83d0b6f917e4a5395116d384887f338cad2b57d9132c0da00517aba87ff3999d8c40a80fd
 EBUILD talloc-2.1.9.ebuild 2442 BLAKE2B e0dfd5acb21db0e2b30964b8f044a4ead59bbb88b4f137677b16447d5335bd7e1669df66e4ff3bd8af3a301c8c89d17f0f50f18764821ef305b1a4e5d561da1c SHA512 5ba1bcefa06d03a291fd8d27a2035f7c99b7c25bbe938e24eb6d2fba5e677b3c166c2ce5e632cf33017d5e45579ad854535a6fdc8017f92a454aeaa4b789fa69
-EBUILD talloc-2.2.0.ebuild 2555 BLAKE2B 70bb4477604f93036452abd70bb4e2dbfd8c67c0c7870cf120b260e02bb2cc2e94a764e4d4999016e1bb37be9243b7e2a971d0ba14277ac1246a31d0d0c2f18a SHA512 d4bf630e2ffeded1a10dab5af367324565d26cc5b780463e0e169e1251bfc4bca98a8b524e4ec18927a850c6ccb50ca5d638c1ec03bb59900f34d8551ba96a9b
-EBUILD talloc-2.3.0.ebuild 2556 BLAKE2B 28920b24e7d276b3b42f1fa0a85a35166287aefa2bbe2d16b883e23661da8f59744b0ee957c8e3129a0797ff0b3106b608fee6ab795d48c1a65aa80aec0dc39b SHA512 4ad8901d9aa82d1d8ff7aeb939fe67364161321752787575fd6f0e3b48fbcc1621a51cf800471aeb7e2dd495f55f3c9d39b05ae61b9d565a250f07e03440d72c
+EBUILD talloc-2.2.0.ebuild 2553 BLAKE2B fc33206c51c71db381a7dce3e7e973103b58787b7b1c4cd226c781be8aa0f674cc71d278cc84f3f529e375281ba44a83f06a834e05fddccbd2b9393c66aca812 SHA512 206c8d165f2852a56d893a95faa2809049638ea0a5c1d3eb6e4cced6a379c5e0a52886d543ee3e6184344e28416963bedf12098b35452bfd797a6a46571e96cd
+EBUILD talloc-2.3.0.ebuild 2554 BLAKE2B dc3077a2c115fcf39cc7f64a98c0e69b1b1ecab7b5ba489d8d6e8e8e1ac8956f373680c44db971366c1acfaf85b3717d75ce56724b21c658b4b3bec741716ba1 SHA512 7c1d0ae309dc12eeaee9c93551dc1d2dc60d3e0d489d0a540ac4e4d8e0668ea6fcacf591df37be8d3d475b548f421a1a58f50e8a632153c33eb592451089fb8f
+EBUILD talloc-2.3.1.ebuild 2556 BLAKE2B 1840f2cbecd04657b7fd7387a3456bd82f22c075b8c554acc52fc6a9d17d15701b097e76fd90dae201333c7262df2d42ecef34014dc0d7b95ca3fc8959c7fd88 SHA512 913c31fd91290e6e2e56b0396fa1c099ac65a8469f7efe80dfd4e3b5674160adb78b3712113e7ed6b28655f21cd2c3feb46162d2ad07bfdcbb10b018fb296da2
 MISC metadata.xml 439 BLAKE2B 06eae26083fdab237958e15ac7e59ae728e1741eef080e2dbd47a9725a88f9120bfd03bcd98ec32a84bf8ee69d5721c7f3978c2c11d018136647d8f1778a1ab8 SHA512 e583aa7aa9a641067b3b38bf398ad6266980ee961e11d81b5d7c6d32cb8948879e27777a33a72376f79beca6f71aa79613db65049e6a1221922869239de9ccf3
diff --git a/sys-libs/talloc/talloc-2.1.16.ebuild b/sys-libs/talloc/talloc-2.1.16.ebuild
index 4371686a3c75..04c594c54c94 100644
--- a/sys-libs/talloc/talloc-2.1.16.ebuild
+++ b/sys-libs/talloc/talloc-2.1.16.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit waf-utils python-single-r1 multilib multilib-minimal
diff --git a/sys-libs/talloc/talloc-2.2.0.ebuild b/sys-libs/talloc/talloc-2.2.0.ebuild
index 6a68ab00a0fa..5dbf3a739811 100644
--- a/sys-libs/talloc/talloc-2.2.0.ebuild
+++ b/sys-libs/talloc/talloc-2.2.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit waf-utils python-single-r1 multilib multilib-minimal
diff --git a/sys-libs/talloc/talloc-2.3.0.ebuild b/sys-libs/talloc/talloc-2.3.0.ebuild
index 50742d617000..c5c76d2f1419 100644
--- a/sys-libs/talloc/talloc-2.3.0.ebuild
+++ b/sys-libs/talloc/talloc-2.3.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit waf-utils python-single-r1 multilib multilib-minimal
diff --git a/sys-libs/talloc/talloc-2.3.1.ebuild b/sys-libs/talloc/talloc-2.3.1.ebuild
new file mode 100644
index 000000000000..93d82cc4c0fa
--- /dev/null
+++ b/sys-libs/talloc/talloc-2.3.1.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+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 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x64-solaris"
+IUSE="compat +python"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="!elibc_FreeBSD? (
+			!elibc_SunOS? (
+				!elibc_Darwin? (
+					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
+)
+
+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=(
+		$(usex compat --enable-talloc-compat1 '')
+		$(multilib_native_usex python '' --disable-python)
+		$([[ ${CHOST} == *-solaris* ]] && echo '--disable-symbol-versions')
+	)
+	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
+}