gentoo resync : 31.05.2021

3 files changed, 1 insertions, 125 deletions

diff --git a/sys-libs/talloc/Manifest b/sys-libs/talloc/Manifest
index 551e6a12b25c..e28bbbcb9b5e 100644
--- a/sys-libs/talloc/Manifest
+++ b/sys-libs/talloc/Manifest
@@ -1,5 +1,3 @@
-DIST talloc-2.3.1.tar.gz 638878 BLAKE2B 3d014a47639434c65f5dda2c51da3c6c28d5d60dbc9afdaca27b8ec903cde3433a8fa4ca33305750ff60911f7e43171d0d932d98c2d30ea38494aa532d6d9626 SHA512 064fc39a9aaace6e0209f3251c8ff198d8a318b4cf4198006ff9892ca6e15e7d817b2fda43e0444fbbf04d2c3e70d06523dff5d57cbb796d27317ef4759e062e
 DIST talloc-2.3.2.tar.gz 661344 BLAKE2B 957eedc4a367051cb99fa4d2edb8e778de8e0187bb5c0d84a1afef20aab122a8b7310d10c694e15ddd6a0a45194889fe3d26dae0ceb8e406d51512af95a23014 SHA512 c851a6f43025720453a3bff8734bfcfff0e29fb7cf2ffcc6c03b6ab8589098daf01d668deec61aa2f238d4df3eb3c47bd080e26eec760cf04a70e1afcad5c5e1
-EBUILD talloc-2.3.1.ebuild 3424 BLAKE2B 560a71b2392812d40361647d548ed8b5e99f4fa40ba85ee8d1fa88194b4f63722b28209247ac05b05fc5252c6fbcaa37ff934debe3a9c4604b69f4f4f7ca4c12 SHA512 de4dff8f5d23a3ea40ad1dfbfcb4d4766d34779a9884bad411559c91ec12dd2cff0e08a020a5e62e32bd3b96efc0328624ab3ee650ffa3b41b1b8640e8bf0097
 EBUILD talloc-2.3.2.ebuild 3424 BLAKE2B 560a71b2392812d40361647d548ed8b5e99f4fa40ba85ee8d1fa88194b4f63722b28209247ac05b05fc5252c6fbcaa37ff934debe3a9c4604b69f4f4f7ca4c12 SHA512 de4dff8f5d23a3ea40ad1dfbfcb4d4766d34779a9884bad411559c91ec12dd2cff0e08a020a5e62e32bd3b96efc0328624ab3ee650ffa3b41b1b8640e8bf0097
-MISC metadata.xml 439 BLAKE2B 06eae26083fdab237958e15ac7e59ae728e1741eef080e2dbd47a9725a88f9120bfd03bcd98ec32a84bf8ee69d5721c7f3978c2c11d018136647d8f1778a1ab8 SHA512 e583aa7aa9a641067b3b38bf398ad6266980ee961e11d81b5d7c6d32cb8948879e27777a33a72376f79beca6f71aa79613db65049e6a1221922869239de9ccf3
+MISC metadata.xml 325 BLAKE2B 9c8711270f9afc5d7ec24204c9d74ab94fb2fb3ebccc65d77386725e9f9694838aa71c068c9754971bd6e404dc4ed1bc8bc40b1a4277ffe78415cae6d64c30c2 SHA512 a87ba9777fd7d2007cce3e495ccff8a6f0a7e86379f28dede1e1940c0da95f4690319cf7212b683464a4b265c043f80e80070dc306a0c9cb625080f6e1e85d68
diff --git a/sys-libs/talloc/metadata.xml b/sys-libs/talloc/metadata.xml
index afa647617059..72b988ab3e33 100644
--- a/sys-libs/talloc/metadata.xml
+++ b/sys-libs/talloc/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>patrick@gentoo.org</email>
-    <name>Patrick Lauer</name>
-  </maintainer>
   <maintainer type="project">
     <email>samba@gentoo.org</email>
     <name>Samba</name>
diff --git a/sys-libs/talloc/talloc-2.3.1.ebuild b/sys-libs/talloc/talloc-2.3.1.ebuild
deleted file mode 100644
index 851fdbb724c4..000000000000
--- a/sys-libs/talloc/talloc-2.3.1.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-PYTHON_REQ_USE="threads(+)"
-inherit waf-utils python-single-r1 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 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x64-solaris"
-IUSE="compat +python"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="test"
-
-RDEPEND="
-	!elibc_FreeBSD? (
-		!elibc_SunOS? (
-			!elibc_Darwin? (
-				dev-libs/libbsd[${MULTILIB_USEDEP}]
-			)
-		)
-	)
-	python? ( ${PYTHON_DEPS} )
-	!!<sys-libs/talloc-2.0.5
-"
-DEPEND="${RDEPEND}"
-BDEPEND="${PYTHON_DEPS}
-	dev-libs/libxslt
-	sys-devel/gettext
-"
-
-WAF_BINARY="${S}/buildtools/bin/waf"
-
-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
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# Drop irritating ABI names (e.g. cpython-37m)
-		# We're only installing one implementation anyway
-		sed -i "s/+ conf.all_envs\['default'\]\['PYTHON_SO_ABI_FLAG'\]//" wscript || die
-		sed -i "s/name = bld.pyembed_libname('pytalloc-util')/name = 'pytalloc-util'/" wscript || die
-	fi
-
-	# 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.${PV}.dylib || die
-
-		if use python ; then
-			install_name_tool \
-				-id "${EPREFIX}"/usr/$(get_libdir)/libpytalloc-util.2.dylib \
-				"${ED}"/usr/$(get_libdir)/libpytalloc-util.${PV}.dylib || die
-			install_name_tool \
-				-change "${BUILD_DIR}/bin/default/libtalloc.dylib" \
-				"${EPREFIX}"/usr/$(get_libdir)/libtalloc.2.dylib \
-				"${ED}"/usr/$(get_libdir)/libpytalloc-util.${PV}.dylib || die
-
-			install_name_tool \
-				-id "${EPREFIX}"/usr/$(get_libdir)/libpytalloc-util.dylib \
-				"${ED}"/usr/$(get_libdir)/libpytalloc-util.dylib || die
-			install_name_tool \
-				-change "${BUILD_DIR}/bin/default/libtalloc.dylib" \
-				"${EPREFIX}"/usr/$(get_libdir)/libtalloc.2.dylib \
-				"${ED}"/usr/$(get_libdir)/libpytalloc-util.dylib || die
-
-			install_name_tool \
-				-change "${BUILD_DIR}/bin/default/libpytalloc-util.dylib" \
-				"${EPREFIX}"/usr/$(get_libdir)/libpytalloc-util.dylib \
-				"${D}"$(python_get_sitedir)/talloc*.bundle || die
-			install_name_tool \
-				-change "${BUILD_DIR}/bin/default/libtalloc.dylib" \
-				"${EPREFIX}"/usr/$(get_libdir)/libtalloc.2.dylib \
-				"${D}"$(python_get_sitedir)/talloc*.bundle || die
-		fi
-	fi
-}