gentoo resync : 08.01.2021

3 files changed, 54 insertions, 11 deletions

diff --git a/dev-libs/volume_key/Manifest b/dev-libs/volume_key/Manifest
index 0aa41c591b2f..d7f19c826d00 100644
--- a/dev-libs/volume_key/Manifest
+++ b/dev-libs/volume_key/Manifest
@@ -1,7 +1,7 @@
+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.11.tar.xz 484936 BLAKE2B f7bde79d290617a82de60a2105b6374dd03c2203804e3748336c8d09fbf749bf47157cf5e6b856477475d0074f3e4475dc85e0765308d60b9c6d0525685f73ea SHA512 b9da00578b31c96231ebde55fd91c9aafbd663e541c560460fb6c3305e1a0e1fb3115a95682dc4713027d084e14ffa39d638653384a18d69f5dc892fc4855a97
 DIST volume_key-0.3.12.tar.xz 490432 BLAKE2B 4a0424d51878855c69bdf969b616f3a563074976ad7b07aa848140266d97f66de9c52e1a6ed8913df93077d5966c3ab99afc78c3b22c410f1eadf5447ca2f416 SHA512 d056154c9b9d23e4eb661946dd59ed97e116903a3afcff9d9e29258408082f33dcbb69958724143f6bf191a3da488a03b6c02af287790990ed6459e29d66553c
-EBUILD volume_key-0.3.11.ebuild 883 BLAKE2B 08ea62d2a68987cca931a9c561787d3594764b6b9ac452f45d71c5b7a102eba24807ed878a6ae8aa79a3d4f4efc9baceed974d00f2c0e2491a4de90d43e8cf3e SHA512 6a67cab22720560ceb03e54bd4d4614dc5f3ab561a508557df71465d375f4ab4c9a5bbbb096570c2e52f4e6c8197f9addf288488e1aeaceb3dbe6c3020b0f78a
 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
 MISC metadata.xml 257 BLAKE2B 35c1b06807230338ceb9de70f79760d55e93dcdba508da3c663e785ab3966781edc2098abd8df084b2ecabbf40ff8e8e4a0d0a6e131daf648ff58e101cf27587 SHA512 ff078cacb115b8f3624b45d883d8ed72701e3d2fccae06c04c633eb60821b23681cc151e00689d1b6035c94570535e7ac0de51a55dae99f606886164883185ea
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.12-r3.ebuild
index a1a62fa87da7..b2c7c39f30b4 100644
--- a/dev-libs/volume_key/volume_key-0.3.11.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} )
+PYTHON_COMPAT=( python3_{6..9} )
 
-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,9 +13,10 @@ 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 )"
+
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
@@ -27,19 +28,34 @@ RDEPEND="
 	sys-apps/util-linux
 	sys-fs/cryptsetup:=
 "
-DEPEND="
-	${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	sys-devel/gettext
 	test? ( dev-libs/nss[utils] )
-	"
+"
 
-#RESTRICT="test" # possible gpgme issue
+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
+}
+
 src_install() {
 	default
-	find "${ED}" -name "*.la" -delete || die
+	find "${ED}" -type f -name "*.la" -delete || die
+
+	python_optimize
 }