commit: 1ee85f3a9dd02091f3dcc89820381f281518eed1 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> AuthorDate: Wed Sep 23 12:54:14 2020 +0000 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> CommitDate: Wed Sep 23 13:06:02 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ee85f3a
sys-libs/libblockdev: Removed old Package-Manager: Portage-3.0.8, Repoman-3.0.1 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> sys-libs/libblockdev/Manifest | 1 - .../files/libblockdev-2.23-avoid_bashisms.patch | 41 -------- sys-libs/libblockdev/libblockdev-2.23-r1.ebuild | 116 --------------------- 3 files changed, 158 deletions(-) diff --git a/sys-libs/libblockdev/Manifest b/sys-libs/libblockdev/Manifest index 46f8638f2d6..be8c801a203 100644 --- a/sys-libs/libblockdev/Manifest +++ b/sys-libs/libblockdev/Manifest @@ -1,2 +1 @@ -DIST libblockdev-2.23.tar.gz 856829 BLAKE2B 131bf429e530fc9dd44fade4f5bc937ec220365b1ee2ae46818a6fa3ec7591775fdc3ed531350cc2546f4151e41551dfd3e331b0a6d5777769a7b54c5c15ed42 SHA512 ecc4d5a3cb977fbbe176bf6872b6754833d2869e927c32f8466685916ee4550cf806e0b0c8f5e8e76de3839ae591a4eec502ff974c2f0678af6cfd46dd3016f3 DIST libblockdev-2.24.tar.gz 905838 BLAKE2B dcc31021d72c2a4f92d8f70387537ec409302e85a9bdb338a09449b02318113d40cabf7fc2f6b4aca819400baccba69a9f67a616b30c744cf843eeac785875e4 SHA512 92b7d734ea2cefbb67e626bef369d6785ba2a4bbbf09a4f59345febe977bc32319fb44f38b3c3177b8652abbc1f87b6cc76d41fdd2d70783c1c168049bdcb1d6 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 9c4f94bd841..00000000000 --- 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 <[email protected]> -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 <[email protected]> -Gentoo-bug: https://bugs.gentoo.org/719442 -Signed-off-by: Lars Wendler <[email protected]> ---- - 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 6007c32f473..00000000000 --- 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 -}
