gentoo resync : 02.08.2019

6 files changed, 5 insertions, 200 deletions

diff --git a/app-misc/votrify/Manifest b/app-misc/votrify/Manifest
index 85aaa6ad3b24..dcbe9324867f 100644
--- a/app-misc/votrify/Manifest
+++ b/app-misc/votrify/Manifest
@@ -1,11 +1,3 @@
-DIST votrify-1.tar.gz 6936 BLAKE2B 7c9a5668842c5b1783e5c8b2341d42aa21257b96a82210c16e44bee8f71b690c7dba5acf48a39beff0189106db1fe141ef1ec30d68f25573a19a53c12618d346 SHA512 14fdb4ee185d96f416b47df7b29175cebc6e003aca7c1faf927b258f7dbe39b7ed69c4defb25900c6856b6e9abde3b03a69ca02152755d8532708b6cfb7f51a0
-DIST votrify-2.tar.gz 9095 BLAKE2B 801c9ad89f93349ce6ad0d9421e9a968a511d9699454c91cc713dd3a133c4f87666de3bc3905041999a5090eb5794d6ceed89aabc997e6950d2b5a4b4bb185cc SHA512 8c3795520d6ee5d34c8aa649a24309e30da8843bcddbfc8ff0b822eab5529a621d9fa475dc6714a6de0ed1d229d3a949870666967448a23036d28af5e7da00ab
-DIST votrify-3.tar.gz 9153 BLAKE2B fdff14dd7332bd6688cb2d04d87e7cf0888aa881cac6a98961cc544182869b190ac8591545c773e7a14293ff0fac7efd646be3cc7f8d059a8e45b709051eae69 SHA512 bde636cb238e114814f1246f49c9b5f363d7c9255da4cf2f5da6cb8da19f1b970e0027b630f21b0166c73de770e5bc931b811c3326ccc790db6d1d873731ef9e
-DIST votrify-4.tar.gz 9184 BLAKE2B 78149b3e53a830c405de70b0dff301eb4467489a59af8de76fade98eeeacc9ae78cc229db23eef26355579a9944917074419e2f38eb59eb0cae6d314985d0383 SHA512 1639fd6b6e96fb767088fb4b3be4d2d09cb0f6a12bdd745d610b6853ff2f585f8100523e92ee75d7800fe54cb42a5c716bbefe57d85395627e8c67d75e45aae1
 DIST votrify-5.tar.gz 9192 BLAKE2B 5df0ccd0b5a843b384e002c2bd1001df06cb5bcf039f10c689abeda07f1a05c545a917b0a42bd78c06c537eacca58ef7b4c2920a0fe6809f4450d4c98ee2fade SHA512 3d441eb42f860e4e571541300a04c1a52a01abbe20f76615adc1c9764bafbff35faf0f1dbe9f9267ad3c4dc0e4cb4bc715b87e2104cdef8997e7918ab834bb5d
-EBUILD votrify-1.ebuild 922 BLAKE2B c5432dc33657da9ba22fdaad4b19d1e2d601e3b9e8b54198d0552d29cb857d7d73ee8034e7691cfbdf4217bb38c5b4a9a6e07da67fa5d0f59eb20408712f9109 SHA512 e43e607cb3bf8e8aa62dab8e96a7da93f1b874760125e8486af376f831e565bae66c9b7c97e3087b3c9811b9e7c52ec03610e7c8da18ba803788978f455373a4
-EBUILD votrify-2.ebuild 1304 BLAKE2B 03762baab61fe724840ea6c15bf5c30f38fac2fe501cdde9a5fdde696e516fbcedd5d342d0269b474f5cfdc62a8ac90155d4d4cc9bbd65a58ca60de62ba017b3 SHA512 2a47c5e98f3e5ee0e96935ab113fc4e375e93d38f595f7b3ec2c0efbe72b34e5be4a4008a97ad9739741c0089b37c384907e954e1c29e82d3228cee1d2763924
-EBUILD votrify-3.ebuild 1304 BLAKE2B 03762baab61fe724840ea6c15bf5c30f38fac2fe501cdde9a5fdde696e516fbcedd5d342d0269b474f5cfdc62a8ac90155d4d4cc9bbd65a58ca60de62ba017b3 SHA512 2a47c5e98f3e5ee0e96935ab113fc4e375e93d38f595f7b3ec2c0efbe72b34e5be4a4008a97ad9739741c0089b37c384907e954e1c29e82d3228cee1d2763924
-EBUILD votrify-4.ebuild 1304 BLAKE2B 03762baab61fe724840ea6c15bf5c30f38fac2fe501cdde9a5fdde696e516fbcedd5d342d0269b474f5cfdc62a8ac90155d4d4cc9bbd65a58ca60de62ba017b3 SHA512 2a47c5e98f3e5ee0e96935ab113fc4e375e93d38f595f7b3ec2c0efbe72b34e5be4a4008a97ad9739741c0089b37c384907e954e1c29e82d3228cee1d2763924
-EBUILD votrify-5.ebuild 1304 BLAKE2B 03762baab61fe724840ea6c15bf5c30f38fac2fe501cdde9a5fdde696e516fbcedd5d342d0269b474f5cfdc62a8ac90155d4d4cc9bbd65a58ca60de62ba017b3 SHA512 2a47c5e98f3e5ee0e96935ab113fc4e375e93d38f595f7b3ec2c0efbe72b34e5be4a4008a97ad9739741c0089b37c384907e954e1c29e82d3228cee1d2763924
+EBUILD votrify-5.ebuild 1354 BLAKE2B be732a8b947c533bc57653b1d60e8d980ccf2fb6734a7201086e735ba53b8ab82017f04630b41e19ba773426129e760720100fde0b20e3fd2fdabf99078aef9d SHA512 aa0f0325d0c16cb6dcaad7bbf94c688c3789ed3008f1a9770097ce1e09598effc1c1c33b436ab56c8cda2acfc1291f270a39508be1dcdb65141bc653dd51a34a
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/app-misc/votrify/votrify-1.ebuild b/app-misc/votrify/votrify-1.ebuild
deleted file mode 100644
index f067073ac0cc..000000000000
--- a/app-misc/votrify/votrify-1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit python-single-r1
-
-DESCRIPTION="Tool for community verification of Gentoo elections"
-HOMEPAGE="https://github.com/mgorny/votrify"
-SRC_URI="https://github.com/mgorny/votrify/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="app-misc/gentoo-elections"
-
-src_configure() {
-	# update default location for election scripts
-	sed -i -e "s^os.path.dirname(__file__)^'${EPREFIX}/usr/lib'^" \
-		make-confirmation.py || die
-
-	# update script names
-	sed -i -e 's:\(./\)\?\(make-confirmation\|verify-confirmations\).py:votrify-\2:g' \
-		README.rst || die
-
-	python_fix_shebang *.py
-}
-
-src_install() {
-	newbin make-confirmation.py votrify-make-confirmation
-	newbin verify-confirmations.py votrify-verify-confirmations
-	einstalldocs
-}
diff --git a/app-misc/votrify/votrify-2.ebuild b/app-misc/votrify/votrify-2.ebuild
deleted file mode 100644
index 278667874da3..000000000000
--- a/app-misc/votrify/votrify-2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit python-single-r1
-
-DESCRIPTION="Tool for community verification of Gentoo elections"
-HOMEPAGE="https://github.com/mgorny/votrify"
-SRC_URI="https://github.com/mgorny/votrify/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="app-misc/gentoo-elections"
-
-src_configure() {
-	# update default location for election scripts
-	sed -i -e "s^os.path.dirname(__file__)^'${EPREFIX}/usr/lib'^" \
-		votrify-make-confirmation || die
-
-	python_fix_shebang votrify-{make,verify}-*
-}
-
-make_wrappers() {
-	local election=${1}
-
-	newbin - "votrify-${election}-make" \
-		< <(sed -e "s^@ELECTION@^${election}^" \
-			votrify-wrapper-make.bash.in || die)
-	newbin - "votrify-${election}-verify" \
-		< <(sed -e "s^@ELECTION@^${election}^" \
-			votrify-wrapper-verify.bash.in || die)
-}
-
-src_install() {
-	dobin votrify-{make,verify}-*
-	make_wrappers council-201906
-	einstalldocs
-}
-
-pkg_postinst() {
-	elog "In order to interactively create confirmation for Council 2019 election:"
-	elog "  votrify-council-201906-make"
-	elog
-	elog "In order to verify the results for Council 2019 election:"
-	elog "  votrify-council-201906-verify"
-}
diff --git a/app-misc/votrify/votrify-3.ebuild b/app-misc/votrify/votrify-3.ebuild
deleted file mode 100644
index 278667874da3..000000000000
--- a/app-misc/votrify/votrify-3.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit python-single-r1
-
-DESCRIPTION="Tool for community verification of Gentoo elections"
-HOMEPAGE="https://github.com/mgorny/votrify"
-SRC_URI="https://github.com/mgorny/votrify/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="app-misc/gentoo-elections"
-
-src_configure() {
-	# update default location for election scripts
-	sed -i -e "s^os.path.dirname(__file__)^'${EPREFIX}/usr/lib'^" \
-		votrify-make-confirmation || die
-
-	python_fix_shebang votrify-{make,verify}-*
-}
-
-make_wrappers() {
-	local election=${1}
-
-	newbin - "votrify-${election}-make" \
-		< <(sed -e "s^@ELECTION@^${election}^" \
-			votrify-wrapper-make.bash.in || die)
-	newbin - "votrify-${election}-verify" \
-		< <(sed -e "s^@ELECTION@^${election}^" \
-			votrify-wrapper-verify.bash.in || die)
-}
-
-src_install() {
-	dobin votrify-{make,verify}-*
-	make_wrappers council-201906
-	einstalldocs
-}
-
-pkg_postinst() {
-	elog "In order to interactively create confirmation for Council 2019 election:"
-	elog "  votrify-council-201906-make"
-	elog
-	elog "In order to verify the results for Council 2019 election:"
-	elog "  votrify-council-201906-verify"
-}
diff --git a/app-misc/votrify/votrify-4.ebuild b/app-misc/votrify/votrify-4.ebuild
deleted file mode 100644
index 278667874da3..000000000000
--- a/app-misc/votrify/votrify-4.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit python-single-r1
-
-DESCRIPTION="Tool for community verification of Gentoo elections"
-HOMEPAGE="https://github.com/mgorny/votrify"
-SRC_URI="https://github.com/mgorny/votrify/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="app-misc/gentoo-elections"
-
-src_configure() {
-	# update default location for election scripts
-	sed -i -e "s^os.path.dirname(__file__)^'${EPREFIX}/usr/lib'^" \
-		votrify-make-confirmation || die
-
-	python_fix_shebang votrify-{make,verify}-*
-}
-
-make_wrappers() {
-	local election=${1}
-
-	newbin - "votrify-${election}-make" \
-		< <(sed -e "s^@ELECTION@^${election}^" \
-			votrify-wrapper-make.bash.in || die)
-	newbin - "votrify-${election}-verify" \
-		< <(sed -e "s^@ELECTION@^${election}^" \
-			votrify-wrapper-verify.bash.in || die)
-}
-
-src_install() {
-	dobin votrify-{make,verify}-*
-	make_wrappers council-201906
-	einstalldocs
-}
-
-pkg_postinst() {
-	elog "In order to interactively create confirmation for Council 2019 election:"
-	elog "  votrify-council-201906-make"
-	elog
-	elog "In order to verify the results for Council 2019 election:"
-	elog "  votrify-council-201906-verify"
-}
diff --git a/app-misc/votrify/votrify-5.ebuild b/app-misc/votrify/votrify-5.ebuild
index 278667874da3..179f0affaf98 100644
--- a/app-misc/votrify/votrify-5.ebuild
+++ b/app-misc/votrify/votrify-5.ebuild
@@ -12,10 +12,12 @@ SRC_URI="https://github.com/mgorny/votrify/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
 
-RDEPEND="app-misc/gentoo-elections"
+RDEPEND="${PYTHON_DEPS}
+	app-misc/gentoo-elections"
 
 src_configure() {
 	# update default location for election scripts