gentoo resync : 22.01.2021

4 files changed, 2 insertions, 110 deletions

diff --git a/dev-libs/volume_key/Manifest b/dev-libs/volume_key/Manifest
index d7f19c826d00..7de60d794689 100644
--- a/dev-libs/volume_key/Manifest
+++ b/dev-libs/volume_key/Manifest
@@ -1,7 +1,5 @@
 AUX volume_key-0.3.12-find_python3.patch 894 BLAKE2B 7173a00937a78c2b883d554e7c14ced4502088c5dee3af0378f13091aaf4133e4c899df60d4ebafd8c3f629c6020fdb17c0d61afda7e6d87a9c05b15803a4361 SHA512 bdbdf24f9a7e6b0db28cb22e831af898e4faca26b51c386835ab8dd74c0d0d79d261fa47ebd18213fe24424fd0bed54836fec5f3993a908ca88a720168768c7d
 AUX volume_key-0.3.12-support_higher_LUKS_versions.patch 917 BLAKE2B a637ba7d7761032bbbae34378a1cd8da57cd96c762ebeb50fce0ca28b7b154df11bda89af203d18833e7841fbd9181c01ee5fcb11d80d765fd147e82440becca SHA512 e784115d85f782db46dbd67c40c3a6b0864b69ce8d13b6a67d70471d39079e9fc0d9d263bd543556d645d7dc922ef22f641491051dd736128cdaecd63df2ff22
 DIST volume_key-0.3.12.tar.xz 490432 BLAKE2B 4a0424d51878855c69bdf969b616f3a563074976ad7b07aa848140266d97f66de9c52e1a6ed8913df93077d5966c3ab99afc78c3b22c410f1eadf5447ca2f416 SHA512 d056154c9b9d23e4eb661946dd59ed97e116903a3afcff9d9e29258408082f33dcbb69958724143f6bf191a3da488a03b6c02af287790990ed6459e29d66553c
-EBUILD volume_key-0.3.12-r1.ebuild 968 BLAKE2B 1f76e10a057318f71cfeccd60aee0de8b43f22888476bb9580361dc1bdec0c1027965f3d5e1f3469a059b8c3d5658f7a9be72a5b8523efe9099c73b387f9e114 SHA512 3c75c5090b02268e3a72da218a210e57158941f5a926e6cce9b02975398978a945721b541249f015fbd28044d2ad8216c5763fb53f0951c09ed8d4c5a4b84a5f
-EBUILD volume_key-0.3.12-r2.ebuild 1050 BLAKE2B a728cf5978b592976ece161d05e1d20a502beaf31668ade53125dd42ed950f856adef9ce4d0cace156dd55f4a5e211d29c5a0fd1ce6b25966313962995a9bff4 SHA512 093b7b8e1eea57b0452acec1992c53182d221fdd5cb40df3f4730746d8021d8b12ea3c279de57e39433a56174232a32728d5117a53a8c5283331e325afee4d36
-EBUILD volume_key-0.3.12-r3.ebuild 1160 BLAKE2B 09eadb785dced76513425bbd9fe6ab2637187842c8b0c4eeac5a8a6b60fd18022c640edd88c93dfe9b7ebc2d620c16a08f76cd8ee2bae93335a7bc14e67ce21b SHA512 6f6917816292a47f3791c1aee29ac39d185fa211407bc65f9d589a97bfbb49c6654403f0ec2a953e3198ad76e235aa0c7d3377c5e335bd15eef1b9d5b75350e9
+EBUILD volume_key-0.3.12-r3.ebuild 1157 BLAKE2B 4d9c7a54de611857170a9ac06cd818ad342254414215a34e688e36aa8697988799e22a81735e7bf131d4a65b5de89ead56041da5e59e190fcafa53166ea97ae6 SHA512 da690a480ed58e8e08601244649ba5fe7d620067db983e033ca3e88cd6d26bbac6672046c47c1bd66e102e3e86110cf151491a01f54da9d1c3ef08c0b033042f
 MISC metadata.xml 257 BLAKE2B 35c1b06807230338ceb9de70f79760d55e93dcdba508da3c663e785ab3966781edc2098abd8df084b2ecabbf40ff8e8e4a0d0a6e131daf648ff58e101cf27587 SHA512 ff078cacb115b8f3624b45d883d8ed72701e3d2fccae06c04c633eb60821b23681cc151e00689d1b6035c94570535e7ac0de51a55dae99f606886164883185ea
diff --git a/dev-libs/volume_key/volume_key-0.3.12-r1.ebuild b/dev-libs/volume_key/volume_key-0.3.12-r1.ebuild
deleted file mode 100644
index 9eb5fb16e7a9..000000000000
--- a/dev-libs/volume_key/volume_key-0.3.12-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit python-single-r1
-
-DESCRIPTION="Library for manipulating and storing storage volume encryption keys"
-HOMEPAGE="https://pagure.io/volume_key"
-SRC_URI="http://releases.pagure.org/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	app-crypt/gpgme
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	sys-apps/util-linux
-	sys-fs/cryptsetup:=
-"
-DEPEND="
-	${RDEPEND}
-	sys-devel/gettext
-	test? ( dev-libs/nss[utils] )
-	"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_configure() {
-	# --without-python disables python2
-	econf --without-python --with-python3
-}
-
-src_install() {
-	default
-	find "${ED}" -type f -name "*.la" -delete || die
-
-	python_optimize
-}
diff --git a/dev-libs/volume_key/volume_key-0.3.12-r2.ebuild b/dev-libs/volume_key/volume_key-0.3.12-r2.ebuild
deleted file mode 100644
index 90c67ed022e2..000000000000
--- a/dev-libs/volume_key/volume_key-0.3.12-r2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6..9} )
-
-inherit python-single-r1
-
-DESCRIPTION="Library for manipulating and storing storage volume encryption keys"
-HOMEPAGE="https://pagure.io/volume_key"
-SRC_URI="http://releases.pagure.org/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	app-crypt/gpgme
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	sys-apps/util-linux
-	sys-fs/cryptsetup:=
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	sys-devel/gettext
-	test? ( dev-libs/nss[utils] )
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-support_higher_LUKS_versions.patch"
-)
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_configure() {
-	# --without-python disables python2
-	econf --without-python --with-python3
-}
-
-src_install() {
-	default
-	find "${ED}" -type f -name "*.la" -delete || die
-
-	python_optimize
-}
diff --git a/dev-libs/volume_key/volume_key-0.3.12-r3.ebuild b/dev-libs/volume_key/volume_key-0.3.12-r3.ebuild
index b2c7c39f30b4..013f54d6bbd1 100644
--- a/dev-libs/volume_key/volume_key-0.3.12-r3.ebuild
+++ b/dev-libs/volume_key/volume_key-0.3.12-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://releases.pagure.org/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"