5 files changed, 36 insertions, 100 deletions
diff --git a/dev-libs/volume_key/Manifest b/dev-libs/volume_key/Manifest
index 300bb83d487d..0272b102308e 100644
--- a/dev-libs/volume_key/Manifest
+++ b/dev-libs/volume_key/Manifest
@@ -1,2 +1 @@
-DIST volume_key-0.3.11.tar.xz 484936 BLAKE2B f7bde79d290617a82de60a2105b6374dd03c2203804e3748336c8d09fbf749bf47157cf5e6b856477475d0074f3e4475dc85e0765308d60b9c6d0525685f73ea SHA512 b9da00578b31c96231ebde55fd91c9aafbd663e541c560460fb6c3305e1a0e1fb3115a95682dc4713027d084e14ffa39d638653384a18d69f5dc892fc4855a97
 DIST volume_key-0.3.12.tar.xz 490432 BLAKE2B 4a0424d51878855c69bdf969b616f3a563074976ad7b07aa848140266d97f66de9c52e1a6ed8913df93077d5966c3ab99afc78c3b22c410f1eadf5447ca2f416 SHA512 d056154c9b9d23e4eb661946dd59ed97e116903a3afcff9d9e29258408082f33dcbb69958724143f6bf191a3da488a03b6c02af287790990ed6459e29d66553c
diff --git a/dev-libs/volume_key/files/volume_key-0.3.12-find_python3.patch b/dev-libs/volume_key/files/volume_key-0.3.12-find_python3.patch
new file mode 100644
index 000000000000..3f7d6da69366
--- /dev/null
+++ b/dev-libs/volume_key/files/volume_key-0.3.12-find_python3.patch
@@ -0,0 +1,27 @@
+From d64fcc43ad740c91f4f1e1a6827663b2485f127a Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Thu, 7 Jan 2021 13:23:28 +0100
+Subject: [PATCH] configure.ac: Don't look for old python3 versions
+
+Gentoo-bug: https://bugs.gentoo.org/764230
+Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 4eda5eb..2dce575 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -101,7 +101,7 @@ if test "x$use_python3" = xno; then
+ else
+     AC_MSG_RESULT([testing])
+     # Try to find Python 3 interpreter:
+-    AC_PATH_PROGS([PYTHON3], [python3.6 python3.5 python3 python], [no])
++    AC_PATH_PROGS([PYTHON3], [python3], [no])
+     if test "x$PYTHON3" != xno; then
+         AC_MSG_CHECKING([whether $PYTHON3 version is >= 3.5])
+         python3_found=old
+-- 
+2.30.0
+
diff --git a/dev-libs/volume_key/volume_key-0.3.11.ebuild b/dev-libs/volume_key/volume_key-0.3.11.ebuild
deleted file mode 100644
index 0bc012004f6e..000000000000
--- a/dev-libs/volume_key/volume_key-0.3.11.ebuild
+++ /dev/null
@@ -1,45 +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,9,10} )
-
-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] )
-	"
-
-#RESTRICT="test" # possible gpgme issue
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_install() {
-	default
-	find "${ED}" -name "*.la" -delete || die
-}
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 a29fdf2f690f..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,9,10} )
-
-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-r3.ebuild
index 597d8ded0ed4..9c135346c23f 100644
--- a/dev-libs/volume_key/volume_key-0.3.12-r2.ebuild
+++ b/dev-libs/volume_key/volume_key-0.3.12-r3.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 
-inherit python-single-r1
+inherit autotools python-single-r1
 
 DESCRIPTION="Library for manipulating and storing storage volume encryption keys"
 HOMEPAGE="https://pagure.io/volume_key"
@@ -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 )"
 
@@ -36,12 +36,18 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}/${P}-support_higher_LUKS_versions.patch"
+	"${FILESDIR}/${PN}-0.3.12-find_python3.patch" #764230
 )
 
 pkg_setup() {
 	python-single-r1_pkg_setup
 }
 
+src_prepare() {
+	default
+	eautoreconf #764230
+}
+
 src_configure() {
 	# --without-python disables python2
 	econf --without-python --with-python3