gentoo resync : 24.09.2020

5 files changed, 18 insertions, 168 deletions

diff --git a/sys-libs/libblockdev/Manifest b/sys-libs/libblockdev/Manifest
index 6d6455a80a71..825edb672663 100644
--- a/sys-libs/libblockdev/Manifest
+++ b/sys-libs/libblockdev/Manifest
@@ -1,7 +1,4 @@
-AUX libblockdev-2.23-avoid_bashisms.patch 1760 BLAKE2B 37cdc9ca0a002525646f6a9de162b6a30f3ae9fd331232e3c5bbe287fac687a1ccc496036f94cfa568100c095b7e947e6f6b5ed00a8d926857c102de7b8ce53b SHA512 abba5f533c35e5be47e83e86d3ccc630e122adb465741bfc888d0f6bee2fdcc96ec820626dd02e08fc46a01d30a04652f1d587a9ddef7bb9c58bec7b9053f767
-DIST libblockdev-2.23.tar.gz 856829 BLAKE2B 131bf429e530fc9dd44fade4f5bc937ec220365b1ee2ae46818a6fa3ec7591775fdc3ed531350cc2546f4151e41551dfd3e331b0a6d5777769a7b54c5c15ed42 SHA512 ecc4d5a3cb977fbbe176bf6872b6754833d2869e927c32f8466685916ee4550cf806e0b0c8f5e8e76de3839ae591a4eec502ff974c2f0678af6cfd46dd3016f3
 DIST libblockdev-2.24.tar.gz 905838 BLAKE2B dcc31021d72c2a4f92d8f70387537ec409302e85a9bdb338a09449b02318113d40cabf7fc2f6b4aca819400baccba69a9f67a616b30c744cf843eeac785875e4 SHA512 92b7d734ea2cefbb67e626bef369d6785ba2a4bbbf09a4f59345febe977bc32319fb44f38b3c3177b8652abbc1f87b6cc76d41fdd2d70783c1c168049bdcb1d6
-EBUILD libblockdev-2.23-r1.ebuild 2512 BLAKE2B d47de2cc84c6cfca8e68e6539c072d9932aa8d7ff2cc46450c902227092c2b3128933e6a0ce547353fe1d3d9186cdf0528713535b989a29c52658d924cf42ef8 SHA512 04bd40bf41e1b211ad6c308f1d63439af274e512e290f8fb1d1641a120aecb5e635314a2445882c5a9990afd58c0c16c6e00eb6d2bc914cc8f3aa67aefce068a
-EBUILD libblockdev-2.24.ebuild 2477 BLAKE2B ff1c9978db9683397c24ebf3b42c821236d2e9126e707723cd358f4cd57fefd994facf6363e41c1a8a20471216e8d6438c2cd8e35c0e301844d67f92d6a57eca SHA512 2f7c2e978fe914d5938c5e673e41d3ff0951a3f01b8018a003e1776573a2658663b480d6839b00dab119cd20b29607f6deaed26628b0e84cd2bb45f1dd29ab2d
-EBUILD libblockdev-9999.ebuild 2484 BLAKE2B da622bb77661e14833e82443b0bf382e631339fe770f236b48e0a54e2cee53c4eb6748b9c3432ebdfaa3209db5223051528ef89e66d26691f952f1341d836834 SHA512 26cf1d35b8156fc71aabddc47f7224757d82786704fe2c6a6b36481a2595c43e46b26de5edc01832db3c337f61f1a01d659fe525070bdd524995f4fab8f594d1
+EBUILD libblockdev-2.24.ebuild 2607 BLAKE2B bcbea123737ddc41ba5811b1aff290888761783d886f269d0bb42961a6799fd4171fa48ebc93fbef04413678ea153ecd4c405713a2963160e1b813317efa4796 SHA512 0f153da86f4581df17fe70e35486d6f798cb5ee219bc22b4aa6739f5882efeb1d36ee5895b1effbcee8e36c3008e8e22336b31452931e5c788a260bbc0e66755
+EBUILD libblockdev-9999.ebuild 2614 BLAKE2B 2564de34bbb1d7d376b638f8b095614115d0dad98bf9678cb6edbbd48b2257bc7c1517c9564d48fcf20a1c421afb7656686173f6efe14058b07f5871b237247d SHA512 4a1fc6d0795f14ff69971396a9f174da7a6e82d38866fc3e094457ce2e2a0ccb730944e3f22382227191f980cbba2f1a76b849d866fcf85268442f852a24b332
 MISC metadata.xml 1079 BLAKE2B 927991dfdfefd599210651f76fa8bffbd5a54700791b57847a9ecf85cd1aa04a449eea84c4e1ee3e9eb50e541eab3d97a6218c814a018439aa6f520970a8acca SHA512 492cabe5b464c0bae48e8def1e771a27f28bcd03a47276be26a4351367bcd53e198358f8c0cbf25cd0c6c8e841ee67435b22fbe669bde1a6aa74668e70fa8fc9
diff --git a/sys-libs/libblockdev/files/libblockdev-2.23-avoid_bashisms.patch b/sys-libs/libblockdev/files/libblockdev-2.23-avoid_bashisms.patch
deleted file mode 100644
index 9c4f94bd841d..000000000000
--- a/sys-libs/libblockdev/files/libblockdev-2.23-avoid_bashisms.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From e6ab6918ffac65da2d562cb286c6ab50eaf62ca2 Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Mon, 11 May 2020 22:14:26 +0200
-Subject: [PATCH] configure.ac: Avoid bashisms
-
-or else we get unpredictable results with shells != /bin/bash like:
-
-checking for gobject-introspection... no (disabled, use --enable-introspection to enable)
-./configure: 13672: test: xno: unexpected operator
-checking for python3... /var/tmp/portage/sys-libs/libblockdev-2.23-r1/temp/python3.8/bin/python3
-./configure: 13838: test: x/var/tmp/portage/sys-libs/libblockdev-2.23-r1/temp/python3.8/bin/python3: unexpected operator
-
-Reported-by: Matt Whitlock <gentoo@mattwhitlock.name>
-Gentoo-bug: https://bugs.gentoo.org/719442
-Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
----
- configure.ac | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index ded64259..bbdff5e7 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -60,7 +60,7 @@ AC_ARG_WITH([python3],
- AC_SUBST(WITH_PYTHON3, 0)
- if test "x$with_python3" != "xno"; then
-     AC_PATH_PROG([python3], [python3], [no])
--    AS_IF([test "x$python3" == "xno"],
-+    AS_IF([test "x$python3" = "xno"],
-     [if test "x$with_python3" = "xyes"; then
-       LIBBLOCKDEV_SOFT_FAILURE([Python3 support requested, but python3 is not available])
-       fi],
-@@ -77,7 +77,7 @@ AC_ARG_WITH([gtk-doc],
- AC_SUBST(WITH_GTK_DOC, 0)
- if test "x$with_gtk_doc" != "xno"; then
-     AC_PATH_PROG([gtkdoc_scan], [gtkdoc-scan], [no])
--    AS_IF([test "x$gtkdoc_scan" == "xno"],
-+    AS_IF([test "x$gtkdoc_scan" = "xno"],
-     [if test "x$with_gtk_doc" = "xyes"; then
-       LIBBLOCKDEV_SOFT_FAILURE([Building documentation with gtk-doc requested, but not available])
-       fi],
diff --git a/sys-libs/libblockdev/libblockdev-2.23-r1.ebuild b/sys-libs/libblockdev/libblockdev-2.23-r1.ebuild
deleted file mode 100644
index 6007c32f473d..000000000000
--- a/sys-libs/libblockdev/libblockdev-2.23-r1.ebuild
+++ /dev/null
@@ -1,116 +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 autotools python-single-r1 xdg-utils
-
-DESCRIPTION="A library for manipulating block devices"
-HOMEPAGE="https://github.com/storaged-project/libblockdev"
-if [[ "${PV}" == *9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/storaged-project/libblockdev.git"
-	BDEPEND="
-		sys-devel/autoconf-archive
-	"
-else
-	MY_PV="${PV}-1"
-	#MY_P="${PN}-${MY_PV}"
-	#SRC_URI="https://github.com/storaged-project/${PN}/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
-	SRC_URI="https://github.com/storaged-project/${PN}/releases/download/${MY_PV}/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86"
-	#S="${WORKDIR}/${MY_P}"
-fi
-LICENSE="LGPL-2+"
-SLOT="0"
-IUSE="bcache +cryptsetup device-mapper dmraid escrow gtk-doc introspection lvm kbd test +tools vdo"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/glib-2.42.2
-	dev-libs/libbytesize
-	>=sys-apps/kmod-19
-	>=sys-apps/util-linux-2.27
-	>=sys-block/parted-3.1
-	cryptsetup? (
-		escrow? (
-			>=dev-libs/nss-3.18.0
-			dev-libs/volume_key
-		)
-		>=sys-fs/cryptsetup-1.6.7:=
-	)
-	device-mapper? ( sys-fs/lvm2 )
-	dmraid? (
-		sys-fs/dmraid
-		sys-fs/lvm2
-	)
-	lvm? (
-		sys-fs/lvm2
-		virtual/udev
-	)
-	vdo? ( dev-libs/libyaml )
-	${PYTHON_DEPS}
-"
-
-DEPEND="
-	${RDEPEND}
-"
-
-BDEPEND+="
-	dev-util/gtk-doc-am
-	gtk-doc? ( dev-util/gtk-doc )
-	introspection? ( >=dev-libs/gobject-introspection-1.3.0 )
-"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-		escrow? ( cryptsetup )"
-
-PATCHES=( "${FILESDIR}/${P}-avoid_bashisms.patch" ) #719442
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	xdg_environment_reset #623992
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--with-btrfs
-		--with-fs
-		--with-part
-		--without-mpath
-		--without-nvdimm
-		$(use_enable introspection)
-		$(use_enable test tests)
-		$(use_with bcache)
-		$(use_with cryptsetup crypto)
-		$(use_with device-mapper dm)
-		$(use_with dmraid)
-		$(use_with escrow)
-		$(use_with gtk-doc)
-		$(use_with kbd)
-		$(use_with lvm lvm)
-		$(use_with lvm lvm-dbus)
-		$(use_with tools)
-		$(use_with vdo)
-		--without-python2
-		--with-python3
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	find "${ED}" -type f -name "*.la" -delete || die
-	# This is installed even with USE=-lvm, but libbd_lvm are omitted so it
-	# doesn't work at all.
-	if ! use lvm; then
-		rm -f "${ED}"/usr/bin/lvm-cache-stats || die
-	fi
-	python_optimize #718576
-}
diff --git a/sys-libs/libblockdev/libblockdev-2.24.ebuild b/sys-libs/libblockdev/libblockdev-2.24.ebuild
index 2d41db827580..04aa60d48088 100644
--- a/sys-libs/libblockdev/libblockdev-2.24.ebuild
+++ b/sys-libs/libblockdev/libblockdev-2.24.ebuild
@@ -4,12 +4,12 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8} )
-inherit python-single-r1 xdg-utils
+inherit autotools python-single-r1 xdg-utils
 
 DESCRIPTION="A library for manipulating block devices"
 HOMEPAGE="https://github.com/storaged-project/libblockdev"
 if [[ "${PV}" == *9999 ]] ; then
-	inherit autotools git-r3
+	inherit git-r3
 	EGIT_REPO_URI="https://github.com/storaged-project/libblockdev.git"
 	BDEPEND="
 		sys-devel/autoconf-archive
@@ -73,7 +73,12 @@ pkg_setup() {
 src_prepare() {
 	xdg_environment_reset #623992
 	default
-	[[ "${PV}" == *9999 ]] && eautoreconf
+
+	# https://bugs.gentoo.org/744289
+	find -type f \( -name "Makefile.am" -o -name "configure.ac" \) -print0 \
+		| xargs --null sed "s@ -Werror@@" -i || die
+
+	eautoreconf
 }
 
 src_configure() {
diff --git a/sys-libs/libblockdev/libblockdev-9999.ebuild b/sys-libs/libblockdev/libblockdev-9999.ebuild
index 214de07c57c9..1ad37598e5fe 100644
--- a/sys-libs/libblockdev/libblockdev-9999.ebuild
+++ b/sys-libs/libblockdev/libblockdev-9999.ebuild
@@ -4,12 +4,12 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8} )
-inherit python-single-r1 xdg-utils
+inherit autotools python-single-r1 xdg-utils
 
 DESCRIPTION="A library for manipulating block devices"
 HOMEPAGE="https://github.com/storaged-project/libblockdev"
 if [[ "${PV}" == *9999 ]] ; then
-	inherit autotools git-r3
+	inherit git-r3
 	EGIT_REPO_URI="https://github.com/storaged-project/libblockdev.git"
 	BDEPEND="
 		sys-devel/autoconf-archive
@@ -73,7 +73,12 @@ pkg_setup() {
 src_prepare() {
 	xdg_environment_reset #623992
 	default
-	[[ "${PV}" == *9999 ]] && eautoreconf
+
+	# https://bugs.gentoo.org/744289
+	find -type f \( -name "Makefile.am" -o -name "configure.ac" \) -print0 \
+		| xargs --null sed "s@ -Werror@@" -i || die
+
+	eautoreconf
 }
 
 src_configure() {