commit: d0e2d9e4856159e62f6122fcc7a03585a44e6fc8 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Tue Nov 25 01:01:47 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Tue Nov 25 01:02:13 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0e2d9e4
sys-libs/libblockdev: drop 2.29 Bug: https://bugs.gentoo.org/962126 Signed-off-by: Sam James <sam <AT> gentoo.org> sys-libs/libblockdev/Manifest | 1 - .../files/libblockdev-2.28-sh_tests.patch | 23 ---- sys-libs/libblockdev/libblockdev-2.29.ebuild | 135 --------------------- sys-libs/libblockdev/metadata.xml | 4 - 4 files changed, 163 deletions(-) diff --git a/sys-libs/libblockdev/Manifest b/sys-libs/libblockdev/Manifest index f502404cf8f6..0ea8f6658c31 100644 --- a/sys-libs/libblockdev/Manifest +++ b/sys-libs/libblockdev/Manifest @@ -1,3 +1,2 @@ -DIST libblockdev-2.29.tar.gz 935117 BLAKE2B 774062459602a6f3730ac6e694b3f535daf0258cc5f509ff138bb8c15f44ff46bdc08e32ae1957909b51a191726cf5e9cb418c0317e5178300687947704cf5e0 SHA512 0d9637800b189f3824483010d2ff079da11b15ed0b42c578352a0d3cd9c35dab4e5945a3cc31c17ea6f88637548151fc7cf237ac8e9c98edfc7b7bce1a756e01 DIST libblockdev-3.3.1.tar.gz 1160139 BLAKE2B 4baf4f980df4a71faf085f9e94cd18b0eb64f3f8f0fd68c3bd20b54109709c7cd3aca26cedfa1a8ec9ae4fd44df55a5d4237c3d3fc61a58dbd5288da6f0c0189 SHA512 f9cc15bf19120a8bb77efe82889b15c9435f4c94a1ed677839a1bcfe5bd242719f40221ba2685f4376cc52ec1e8a044f93840cb504fd7574fff1a8dd5e85d477 DIST libblockdev-3.4.0.tar.gz 1161068 BLAKE2B 330efc4792465b7fd74a6028cd90274b95333c2e3b449e0ed965eb663e59ac2e77e5fcda755a74f7a775fc217a21344440b9d18bed08bd2e6726da93187ea811 SHA512 d722ee1f41b76158b41f57ea4062adaba274c5ffdd88fa40b0b605a8557e68ba095e6a6649b8f6efeff9ad814532b5b19aa541a1688ef4b34ea23078d946c1d3 diff --git a/sys-libs/libblockdev/files/libblockdev-2.28-sh_tests.patch b/sys-libs/libblockdev/files/libblockdev-2.28-sh_tests.patch deleted file mode 100644 index 2fbeaf49f233..000000000000 --- a/sys-libs/libblockdev/files/libblockdev-2.28-sh_tests.patch +++ /dev/null @@ -1,23 +0,0 @@ -bash is fine with "test . == ." but e.g. dash fails on not having -the two dots quoted as strings. - ---- a/docs/Makefile.am -+++ b/docs/Makefile.am -@@ -2,7 +2,7 @@ - - html-doc.stamp: ${srcdir}/libblockdev-docs.xml ${srcdir}/libblockdev-sections.txt $(wildcard ${srcdir}/../src/plugins/*.[ch]) $(wildcard ${srcdir}/../src/lib/*.[ch]) $(wildcard ${srcdir}/../src/utils/*.[ch]) - touch ${builddir}/html-doc.stamp -- test ${builddir} == ${srcdir} || cp ${srcdir}/libblockdev-sections.txt ${srcdir}/libblockdev-docs.xml ${builddir} -+ test "${builddir}" == "${srcdir}" || cp ${srcdir}/libblockdev-sections.txt ${srcdir}/libblockdev-docs.xml ${builddir} - gtkdoc-scan --rebuild-types --module=libblockdev --source-dir=${srcdir}/../src/plugins/ --source-dir=${srcdir}/../src/lib/ --source-dir=${srcdir}/../src/utils/ - gtkdoc-mkdb --module=libblockdev --output-format=xml --source-dir=${srcdir}/../src/plugins/ --source-dir=${srcdir}/../src/lib/ --source-dir=${srcdir}/../src/utils/ --source-suffixes=c,h - test -d ${builddir}/html || mkdir ${builddir}/html -@@ -13,7 +13,7 @@ - -rm -rf ${builddir}/html - -rm -rf ${builddir}/xml - test ! -f ${builddir}/html-doc.stamp || rm ${builddir}/html-doc.stamp -- test ${builddir} == ${srcdir} || rm -f ${builddir}/libblockdev-sections.txt ${builddir}/libblockdev-docs.xml -+ test "${builddir}" == "${srcdir}" || rm -f ${builddir}/libblockdev-sections.txt ${builddir}/libblockdev-docs.xml - - install-data-local: - test -d ${DESTDIR}${datadir}/gtk-doc/html/libblockdev || mkdir -p ${DESTDIR}${datadir}/gtk-doc/html/libblockdev diff --git a/sys-libs/libblockdev/libblockdev-2.29.ebuild b/sys-libs/libblockdev/libblockdev-2.29.ebuild deleted file mode 100644 index 720350a5fabd..000000000000 --- a/sys-libs/libblockdev/libblockdev-2.29.ebuild +++ /dev/null @@ -1,135 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) -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=" - dev-build/autoconf-archive - " -else - MY_PV="${PV}-1" - SRC_URI="https://github.com/storaged-project/${PN}/releases/download/${MY_PV}/${P}.tar.gz"; - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ppc ~ppc64 ~riscv ~sparc ~x86" -fi -LICENSE="LGPL-2+" -SLOT="0/2" # subslot is SOVERSION -IUSE="bcache +cryptsetup device-mapper dmraid escrow gtk-doc introspection lvm kbd test +tools vdo" -# Tests require root. In a future release, we may be able to run a smaller -# subset with new run_tests.py arguments. -RESTRICT="!test? ( 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-build/gtk-doc-am - gtk-doc? ( dev-util/gtk-doc ) - introspection? ( >=dev-libs/gobject-introspection-1.82.0-r2 ) - test? ( - $(python_gen_cond_dep ' - dev-libs/libbytesize[python,${PYTHON_USEDEP}] - ') - sys-block/targetcli-fb - ) -" - -REQUIRED_USE="${PYTHON_REQUIRED_USE} - escrow? ( cryptsetup )" - -PATCHES=( - "${FILESDIR}"/${PN}-2.28-sh_tests.patch -) - -pkg_setup() { - python-single-r1_pkg_setup -} - -src_prepare() { - xdg_environment_reset #623992 - default - - # 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() { - local myeconfargs=( - --with-btrfs - --with-fs - --with-part - --with-python3 - --without-mpath - --without-nvdimm - --without-python2 - $(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) - ) - econf "${myeconfargs[@]}" -} - -src_test() { - # See http://storaged.org/libblockdev/ch03.html - # The 'check' target just does Pylint. - # ... but it needs root. - emake test -} - -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/metadata.xml b/sys-libs/libblockdev/metadata.xml index a2844378febd..487b0fb60f49 100644 --- a/sys-libs/libblockdev/metadata.xml +++ b/sys-libs/libblockdev/metadata.xml @@ -3,17 +3,13 @@ <pkgmetadata> <!-- maintainer-needed --> <use> - <flag name="bcache">Enable block device cache support.</flag> <flag name="cryptsetup">Enable <pkg>sys-fs/cryptsetup</pkg> support</flag> <flag name="device-mapper">Enable support for device-mapper from <pkg>sys-fs/lvm2</pkg></flag> - <flag name="dmraid">Support for dmraid devices, also known as ATA-RAID, or Fake RAID.</flag> <flag name="escrow">Support for building crypto plugin with escrow device support</flag> - <flag name="kbd">Enable kernel block device support.</flag> <flag name="lvm">Enable support for Logical Volume Management via <pkg>sys-fs/lvm2</pkg>.</flag> <flag name="nvme">Add nvme support via <pkg>sys-libs/libnvme</pkg></flag> <flag name="smart">Add SMART support via <pkg>sys-apps/smartmontools</pkg></flag> <flag name="tools">Build tools</flag> - <flag name="vdo">Enable Virtual Data Optimizer support.</flag> </use> <upstream> <remote-id type="github">storaged-project/libblockdev</remote-id>
