gentoo Easter resync : 12.04.2020

3 files changed, 2 insertions, 92 deletions

diff --git a/dev-util/dput-ng/Manifest b/dev-util/dput-ng/Manifest
index 14e3689fc661..be3a66cb15ea 100644
--- a/dev-util/dput-ng/Manifest
+++ b/dev-util/dput-ng/Manifest
@@ -1,5 +1,3 @@
-DIST dput-ng_1.10.tar.xz 82608 BLAKE2B e7b3769490ec0bf4de4f763380e9a50fd2c76778c2864a4ba45eb754f2dc4aa896e556ad86939f9bf003a68b1e185b51507dd0a015453dfb39965c63beab4964 SHA512 4a883350e7a0b47c121b752d1e0ab1470924319ef895f55742fc4d8f8a0cb3a0ab4ae18d54495ebc9229b0cbf18fa375848fcdcd2431ee1f66bff6433b9a3b08
 DIST dput-ng_1.28.tar.xz 85276 BLAKE2B d205d15aad1b81dcf2cc0b765c9724b21add32df39102b63502d99e5da73aa95efdf66e94f6226105ab2ae97a4bf8c43963784f3ddf2d03217ab5023a7a98f22 SHA512 cfd4a6143b33f29eb32b88972a204ab7a6c2f062299c76167434322ae5d6d2cf8654c5b4d1e96db90dbffe372a04e2a7691694ecf46787c7743dd9ac2b7b317e
-EBUILD dput-ng-1.10-r1.ebuild 1807 BLAKE2B 6adc79ad7d463efaca3a1f2763d05b79380dab0ffad73f0079452eebc721396f4270345bda5288fc9e035f830a95338a8f3d3c0236d09404cf801910fe1de4ad SHA512 83dbafe37dfc865e767c94782bebaf0a85eba80bfe625517816e3e674139cdbeb2f6cc48457c054601033f7224c389d3a874245acdf4c50235f598e0902a0803
-EBUILD dput-ng-1.28-r1.ebuild 1885 BLAKE2B 58f773f840fefd7e4e344c9cb656dedec68260c15e5cf54c5d6f083acfc634a20609b2822a169f3e2006cac3314fa29016c99cb371b8f1a011680525577ca80c SHA512 02a496a285f40afee0a9c9065176a02e55a8692363e9d2c93fc789536ee65c222092a187844e2cafb2f26c32809b64c3e9463fc35b52de3fbd683a035cec56fb
+EBUILD dput-ng-1.28-r1.ebuild 1883 BLAKE2B 73883e273808ffd9480275b23d49034629b2b86c9d9286d0d9b0f38c915cad21d0d04f97c2f11a5831d6d17661171373aeae22a9dacc6c868798536f2154ccdc SHA512 c5535c3641a48504493e8879dd1df84135315d8fdcedbcd8947ce9e143bfd44ebafab2de3a18175b888b8603759378282523ce0e63bda21c684388662d92b335
 MISC metadata.xml 367 BLAKE2B 867a3664c5bbd444d69af80af19994e07e3810349258e85c2afd0c838cb140aa3f3342ee1aa5e6862d1fd5130e7e09c1f9f30443827fe7df705f4273694c0784 SHA512 3eb0be47e7eb6bfb6d8eecee66a25183da436c38272e226e7819c8748774f3aae620eab7227414cb862734d4baf8fa060290c1b2371233141abcffd7b489c7b8
diff --git a/dev-util/dput-ng/dput-ng-1.10-r1.ebuild b/dev-util/dput-ng/dput-ng-1.10-r1.ebuild
deleted file mode 100644
index eef660cec5b5..000000000000
--- a/dev-util/dput-ng/dput-ng-1.10-r1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit bash-completion-r1 distutils-r1
-
-DESCRIPTION="Next generation Debian package upload tool"
-HOMEPAGE="https://people.debian.org/~paultag/dput-ng/"
-SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/python-debian[${PYTHON_MULTI_USEDEP}]
-		dev-python/paramiko[${PYTHON_MULTI_USEDEP}]
-		dev-util/distro-info[python,${PYTHON_MULTI_USEDEP}]
-	')
-"
-DEPEND="${RDEPEND}
-	app-text/asciidoc
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/nose[${PYTHON_MULTI_USEDEP}]
-			dev-python/python-debian[${PYTHON_MULTI_USEDEP}]
-		')
-	)"
-
-RESTRICT="test"
-
-S="${WORKDIR}/${PN/-/}"
-
-src_compile() {
-	distutils-r1_src_compile
-
-	mkdir man || die
-	for file in docs/man/*.man; do
-		a2x --doctype manpage --format manpage -D man \
-			"${file}" || die
-	done
-}
-
-src_install() {
-	local DPUT_BINARIES=( dcut dirt dput )
-	local DPUT_ETC=( metas profiles )
-	local DPUT_SHARE=(
-		codenames
-		commands
-		hooks
-		interfaces
-		schemas
-		uploaders
-	)
-
-	distutils-r1_src_install
-
-	for binary in ${DPUT_BINARIES[@]}; do
-		dobin bin/"${binary}"
-	done
-	python_fix_shebang "${D}"/usr/bin
-
-	insinto /etc/dput.d
-	for dir in ${DPUT_ETC[@]}; do
-		doins -r skel/"${dir}"
-	done
-
-	insinto /usr/share/"${PN}"
-	for dir in ${DPUT_SHARE[@]}; do
-		doins -r skel/"${dir}"
-	done
-
-	# doman incorrectly treats "cf" in dput.cf.5 as a lang code
-	doman -i18n="" man/*
-
-	newbashcomp debian/"${PN}".bash-completion dput
-}
-
-python_test() {
-	# test_configs.py failing
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=824652
-	nosetests || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-util/dput-ng/dput-ng-1.28-r1.ebuild b/dev-util/dput-ng/dput-ng-1.28-r1.ebuild
index 573ed24b99a4..fb1de4c9d3f1 100644
--- a/dev-util/dput-ng/dput-ng-1.28-r1.ebuild
+++ b/dev-util/dput-ng/dput-ng-1.28-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 RDEPEND="