gentoo resync : 03.11.2019

5 files changed, 13 insertions, 267 deletions

diff --git a/dev-python/dbus-python/Manifest b/dev-python/dbus-python/Manifest
index 1d902383ba0c..1ff43606e8c3 100644
--- a/dev-python/dbus-python/Manifest
+++ b/dev-python/dbus-python/Manifest
@@ -1,10 +1,5 @@
-DIST dbus-python-1.2.0.tar.gz 602426 BLAKE2B 86f5ba9283256b83d268ff7c27368e587896d58f87b15aefe9d29a90530ced591a2c6814dd37b91274910ed131fe031846071311bc6cc07c11d1f9cdda9e4602 SHA512 013b23e08fa1ed43f53a756587fefbc9770f7c51e93510e555acbd77230b7200693419bba9a69680d790bbaf123f4a195afa38b3eee1143da950fee0b5130bce
+DIST dbus-python-1.2.12.tar.gz 574727 BLAKE2B e5516e7109fad089af51d3e5db3921d056f327c27f9b74a870b1b31b04ba952ad3c9ba5916a18d674ab1179b94cf516b24e046feded8f2e542b196d162038944 SHA512 6f90eaeeb74ea71a026a331d4c611911eda6dfb6c9086a0a80352f9963a9ae126db6f3e32d183916b8517f177fc947f1ddb15df83ff0b5c886532116868383b4
 DIST dbus-python-1.2.4.tar.gz 612112 BLAKE2B cccd3e2f5d700c0d228e7d21fd85e2307357778371742a7fe26a0e419af41886efebb27a73f642d2ecd4603c79f4afe6e7002af95c831180e0e7844c079b2c8c SHA512 efdd9d96a8b56e813c93208d34777f1ca2db96c076d31f13afbcaec3c7770a16a623d5531fe23443130c555240949802503f171f2064d45eee97546d6251304b
-DIST dbus-python-1.2.6.tar.gz 778893 BLAKE2B 1587bc9b1795e5c416397468b2061c869d923aea0983e604862342b27d37b946b1fcdd3bf07a612dba30087bdc6a5fa734906188c55756edf38d50eb67b7eef6 SHA512 6f2aec81defd2528d9876ec9a83843f8767275a5d6cf1b2b7b7a094f892f552f9a7b3d7b5006465254d410e503108e10138d7dd4cb3f1a4035d7f8d58c4d0684
-DIST dbus-python-1.2.8.tar.gz 787426 BLAKE2B 186cb8b1b25b2d2d12ab24ed304819ef18f953232d321bd425e7fda632c79a5a94f7b4118cc09f1bb13a0621980af67b4b55599fbbbcaf0e95f7912f4afd0a2e SHA512 6e486fd560944fc1461a27e6798e2c348c7fdf351602c082a0614c0a6822ff147875212bdcb1f818c0ab12470cffc613c0ffbd292cd9d445d3429bee65765905
-EBUILD dbus-python-1.2.0-r1.ebuild 2183 BLAKE2B 8b6176fce8df586d1e84bbe0d0d59d5036968ba78734fc1fb33dc652737079f5fd6a4cbb3e3ef88467f813b91416e7ada72fd59781c15e991627a5e93270385e SHA512 5a01c3faf9c94857ed0e961f60a64b48252c5ee3e479361cd3e7e021c859c47142fbb5aa8186d6b31a02288858af6ec0aebcd5f6ad5d086221626742d0779fc5
+EBUILD dbus-python-1.2.12.ebuild 1744 BLAKE2B 253744a2dccb166c992f3df8815fae42a42e1e3dec030328abc951119ceeda758978997947ddf9a7addb6ded06e58e828d38a953c6b718f55a758bc01d39b8f6 SHA512 3c7476d76ea82481d4b10c624bc4f01477ec26b24b1d7ae853d0ff24f848fe6a43459b3ef56ca0104f3c2c6a8db7e9e26e9694c2cabd785264c06fe4358df66a
 EBUILD dbus-python-1.2.4.ebuild 2200 BLAKE2B db58aeabcab8353407f051d88ce1c97fcb6b5b471647cec855238ebe28dde86519b564caccbcb2df74e2d0abd0f202122e71eead1e2f66681a0819415348e60b SHA512 6c03a6da3445b81b82a6d741c51ebb8cdd1ee686ba271cda0c0ef651fc1bd3d05a40f6da81eceb242d068e81660d97b472f4139b24c3dd47e73923f9d37ebf3e
-EBUILD dbus-python-1.2.6-r1.ebuild 2327 BLAKE2B 326f11176304c84a38a25de2a1455372e2c7d0cfeace345e6041f7a7473a2a517e1bb07df8c496c30b0508402beeb0e39c8ee97eaf2f165418655ca28bd4cf67 SHA512 ae968741c889da8dbfbdb013b36d69c1442ae79b1d076e33f762b059a8bdc04320aa9cd758cf008f86498a0e067f1f31b7cb6333fe63f6901e10e3b8ba631c13
-EBUILD dbus-python-1.2.6-r2.ebuild 1890 BLAKE2B 8a097ba7667768f84768548d493b25b7fda6c1cbf408749b82b20f97d5b1e4f8c56aa69f3dce58d787dcedfdb41f11ab33841be94b5e64cf26bc072dd48fbf07 SHA512 46d81d1c9cc7ab4b10d99a99718d90780a1e6404e0b4c65bf10aa870b138fadc6475519652d3b53c4d8b6a89b38d941355ae13f5696e4ee35f54d32c6164d25a
-EBUILD dbus-python-1.2.8.ebuild 1682 BLAKE2B cf378e2390263122e00ebf5d594f0faf8523cde1da2efba4de040d42b2c25fdedd3ef65a74b065da15dd8651b5c5fd7c3395d2afc31115949ab1c1894ca03eae SHA512 31a07c9b0f34749d0853a190a72cf1a6e999e49c7cdad1a0057536f4416cb590aba687f856d6e71a29e11d7c0778e0a8471bcf7090a228ad285a007337e13d19
 MISC metadata.xml 337 BLAKE2B 96d3f5d7c37edb1a63791e013c39cf5b10c94d621ad851f9975d9d5e36519da135bf963f2a0e38c2c098fa48c2056bf210bdfcebc12bb10a88c9e9f85c55eb2a SHA512 633761250e946af99fcbcbf813b70fa0b1e03a0d89102faa3f324c418f0e749371aa931d253dc5a6f69369c25acc2d50a0f5e2155bd727766bc70f4bc3933d65
diff --git a/dev-python/dbus-python/dbus-python-1.2.0-r1.ebuild b/dev-python/dbus-python/dbus-python-1.2.0-r1.ebuild
deleted file mode 100644
index 7f52d95af98c..000000000000
--- a/dev-python/dbus-python/dbus-python-1.2.0-r1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit autotools eutils python-r1
-
-DESCRIPTION="Python bindings for the D-Bus messagebus"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/DBusBindings https://dbus.freedesktop.org/doc/dbus-python/"
-SRC_URI="https://dbus.freedesktop.org/releases/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~m68k-mint"
-IUSE="doc examples test"
-# API docs generated with epydoc, which is python2-only
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	doc? ( python_targets_python2_7 )"
-
-RDEPEND="
-	>=dev-libs/dbus-glib-0.100:=
-	>=sys-apps/dbus-1.6:=
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? (
-		dev-python/docutils[python_targets_python2_7?]
-		=dev-python/epydoc-3*[python_targets_python2_7?] )
-	test? ( dev-python/pygobject:3[${PYTHON_USEDEP}] )"
-
-src_prepare() {
-	# Update py-compile, bug 529502.
-	eautoreconf
-	python_copy_sources
-}
-
-src_configure() {
-	configuring() {
-		local PYTHON_CONFIG
-		python_export PYTHON_CONFIG
-
-		# epydoc is python2-only, bug #447642
-		local apidocs=--disable-api-docs
-		[[ ${EPYTHON/.*} = "python2" ]] && apidocs=$(use_enable doc api-docs)
-
-		econf \
-			--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-			--disable-html-docs \
-			${apidocs} \
-			PYTHON_INCLUDES="$(${PYTHON_CONFIG} --includes)" \
-			PYTHON_LIBS="$(${PYTHON_CONFIG} --ldflags)"
-		# configure assumes that ${PYTHON}-config executable exists :/
-	}
-	python_foreach_impl run_in_build_dir configuring
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir default
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	python_foreach_impl run_in_build_dir default
-}
-
-src_install() {
-	installing() {
-		default
-		[[ ${EPYTHON/.*} = "python2" ]] && use doc && dohtml -r api/*
-	}
-	python_foreach_impl run_in_build_dir installing
-	prune_libtool_files --modules
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}
-
-run_in_build_dir() {
-	pushd "${BUILD_DIR}" > /dev/null || die
-	"$@"
-	popd > /dev/null
-}
diff --git a/dev-python/dbus-python/dbus-python-1.2.8.ebuild b/dev-python/dbus-python/dbus-python-1.2.12.ebuild
index 924443010d05..1fb2cae012c7 100644
--- a/dev-python/dbus-python/dbus-python-1.2.8.ebuild
+++ b/dev-python/dbus-python/dbus-python-1.2.12.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 PYTHON_REQ_USE="threads(+)"
@@ -15,19 +15,24 @@ SRC_URI="https://dbus.freedesktop.org/releases/${PN}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
 IUSE="doc examples test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
 RESTRICT="!test? ( test )"
 
-RDEPEND="
+RDEPEND="${PYTHON_DEPS}
 	>=sys-apps/dbus-1.8:=
 	>=dev-libs/glib-2.40
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
 	virtual/pkgconfig
 	doc? ( $(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]') )
 	test? ( dev-python/pygobject:3[${PYTHON_USEDEP}]
-		dev-python/tappy[${PYTHON_USEDEP}] )"
+		dev-python/tappy[${PYTHON_USEDEP}] )
+"
 
 python_check_deps() {
 	has_version "dev-python/sphinx[${PYTHON_USEDEP}]"
@@ -67,7 +72,7 @@ src_test() {
 
 src_install() {
 	python_foreach_impl run_in_build_dir default
-	find "${D}" -name "*.la" -delete || die
+	find "${D}" -name '*.la' -type f -delete || die
 
 	use examples && dodoc -r examples
 }
diff --git a/dev-python/dbus-python/dbus-python-1.2.6-r1.ebuild b/dev-python/dbus-python/dbus-python-1.2.6-r1.ebuild
deleted file mode 100644
index d232d1e47965..000000000000
--- a/dev-python/dbus-python/dbus-python-1.2.6-r1.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit autotools eutils python-r1
-
-DESCRIPTION="Python bindings for the D-Bus messagebus"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/DBusBindings https://dbus.freedesktop.org/doc/dbus-python/"
-SRC_URI="https://dbus.freedesktop.org/releases/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~m68k-mint"
-IUSE="doc examples test"
-# API docs generated with epydoc, which is python2-only
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	doc? ( python_targets_python2_7 )"
-
-RDEPEND="
-	>=sys-apps/dbus-1.8:=
-	>=dev-libs/glib-2.40
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? (
-		dev-python/docutils[python_targets_python2_7?]
-		=dev-python/epydoc-3*[python_targets_python2_7?] )
-	test? ( dev-python/pygobject:3[${PYTHON_USEDEP}] )"
-# TODO: Half the tests require tap.py from PyPI now, which we didn't have packaged; those tests just get skipped then though
-
-src_prepare() {
-	default
-	# Update py-compile, bug 529502.
-	eautoreconf
-	python_copy_sources
-}
-
-src_configure() {
-	configuring() {
-		local PYTHON_CONFIG
-		python_export PYTHON_CONFIG
-
-		# epydoc is python2-only, bug #447642
-		local apidocs=--disable-api-docs
-		[[ ${EPYTHON/.*} = "python2" ]] && apidocs=$(use_enable doc api-docs)
-
-		econf \
-			--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-			--disable-html-docs \
-			${apidocs} \
-			PYTHON_INCLUDES="$(${PYTHON_CONFIG} --includes)" \
-			PYTHON_LIBS="$(${PYTHON_CONFIG} --ldflags)"
-		# configure assumes that ${PYTHON}-config executable exists :/
-	}
-	python_foreach_impl run_in_build_dir configuring
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir default
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	python_foreach_impl run_in_build_dir default
-}
-
-src_install() {
-	installing() {
-		default
-		[[ ${EPYTHON/.*} = "python2" ]] && use doc && dohtml -r api/*
-	}
-	python_foreach_impl run_in_build_dir installing
-	prune_libtool_files --modules
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}
-
-run_in_build_dir() {
-	pushd "${BUILD_DIR}" > /dev/null || die
-	"$@"
-	popd > /dev/null
-}
diff --git a/dev-python/dbus-python/dbus-python-1.2.6-r2.ebuild b/dev-python/dbus-python/dbus-python-1.2.6-r2.ebuild
deleted file mode 100644
index 141df4dd8551..000000000000
--- a/dev-python/dbus-python/dbus-python-1.2.6-r2.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit autotools python-r1
-
-DESCRIPTION="Python bindings for the D-Bus messagebus"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/DBusBindings https://dbus.freedesktop.org/doc/dbus-python/"
-SRC_URI="https://dbus.freedesktop.org/releases/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples test"
-# API docs generated with epydoc, which is python2-only
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	doc? ( python_targets_python2_7 )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=sys-apps/dbus-1.8:=
-	>=dev-libs/glib-2.40
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? (
-		dev-python/docutils[python_targets_python2_7?]
-		=dev-python/epydoc-3*[python_targets_python2_7?] )
-	test? ( dev-python/pygobject:3[${PYTHON_USEDEP}]
-		dev-python/tappy[${PYTHON_USEDEP}] )"
-# TODO: Half the tests require tap.py from PyPI now, which we didn't have packaged; those tests just get skipped then though
-
-src_prepare() {
-	default
-	# Update py-compile, bug 529502.
-	eautoreconf
-	python_copy_sources
-}
-
-src_configure() {
-	configuring() {
-		# epydoc is python2-only, bug #447642
-		local apidocs=--disable-api-docs
-		[[ ${EPYTHON/.*} = "python2" ]] && apidocs=$(use_enable doc api-docs)
-
-		econf \
-			--disable-html-docs \
-			${apidocs}
-	}
-	python_foreach_impl run_in_build_dir configuring
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir default
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	python_foreach_impl run_in_build_dir default
-}
-
-src_install() {
-	installing() {
-		default
-		[[ ${EPYTHON/.*} = "python2" ]] && use doc && dodoc -r api
-	}
-	python_foreach_impl run_in_build_dir installing
-	find "${D}" -name "*.la" -delete || die
-
-	use examples && dodoc -r examples
-}