From 2cd907d16458ba3a99ec82155d7268e2d991a078 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 7 Sep 2023 16:28:34 +0100 Subject: gentoo auto-resync : 07:09:2023 - 16:28:34 --- sys-libs/libblockdev/Manifest | 3 +- sys-libs/libblockdev/libblockdev-3.0.3.ebuild | 131 ++++++++++++++++++++++++++ sys-libs/libblockdev/libblockdev-9999.ebuild | 125 ------------------------ 3 files changed, 133 insertions(+), 126 deletions(-) create mode 100644 sys-libs/libblockdev/libblockdev-3.0.3.ebuild delete mode 100644 sys-libs/libblockdev/libblockdev-9999.ebuild (limited to 'sys-libs/libblockdev') diff --git a/sys-libs/libblockdev/Manifest b/sys-libs/libblockdev/Manifest index c7ea0348eb38..0abd00d0e6c4 100644 --- a/sys-libs/libblockdev/Manifest +++ b/sys-libs/libblockdev/Manifest @@ -1,7 +1,8 @@ AUX libblockdev-2.28-sh_tests.patch 1552 BLAKE2B 3b26cf271a0cb2a0f51ecffe51c9caf9a0ac1c65aecb5adc845a2721f3ac7178df7c994b7647b4fa1bbfd27baf072325bffedf723555c39e164f7d7645163090 SHA512 11fc498db4ed1d3a9e5a9288e1137d64f7581cc7b2d265292f7a3899ef5cfc6d63138fef7f87695abd9d518fa1c74a8bd98ebb54038211eeb0afe7964d85c6c4 DIST libblockdev-2.28.tar.gz 925698 BLAKE2B 63ac7ab5bd02c1ef1848d0b252e09fe721cfe86258f063b7bab616766cbc56311707dcb2dd3a1fadf0e0840187f121aa178fd5959500cd590b846238a9d3e36e SHA512 9e01c41db4f728c8e81e710c6bb4725bbe34b3a7de25ff7f57b7b88ca6b7b5debbe858947585d314770036b2c3c533f9f8ff3d038b7ca50eee3d18f9fbe0d392 DIST libblockdev-3.0.2.tar.gz 1067300 BLAKE2B 97170434d98a66b90ff3da3d094ce6cbf29b338967e9b2dbc9edee9bdd730a63678efbd15c94c4c6604b1499956d744c102d26c116794c4e44fcfb871afd252d SHA512 5285aaa4a8e66aacc70461b2c0b0ffe57121ee6136bfa7c46c3ebbd1da517278f8760207f983d69707096c8293e6f7a1d59caf03e742c3d8009ceed25b8c3e89 +DIST libblockdev-3.0.3.tar.gz 1048628 BLAKE2B c26a806797effc7231a0eb92f1b8cd74e548da5b1800cddd75a21e7df327be8371edabc2e9a39a727291f365b6a4f6242f78b66396adc4526b41749219f0429f SHA512 f2cc6fbe1df6fd9886016177a4a94984d704f3b402c7090344c581afb89f7cb050c9516c52974157a99ea6c6239f6a1f6079cde0b43a2336af0daca7311ca788 EBUILD libblockdev-2.28-r1.ebuild 3025 BLAKE2B 7f74654f050b758ba445aff5964a1933b128d578f43f4ecf89b1fcb4c6ec933d0fee28d7fdc660896760886d658bc66f74f58a8ff9a0dcf0220d6d8138d088a8 SHA512 503f8d3410241d0f24bfb9708f8262ad5fca2ac982829c07c35f76fb3c2fcb1055cb46d0c207b3019e7fe226109f01e08830686d66adb6f8abdaf75592408857 EBUILD libblockdev-3.0.2-r1.ebuild 2934 BLAKE2B cdd1b66b674883427b57769ac6710285aa8df594f83366c680307cf230d76b32ae761abbed25531c100e099cdcbe716be78eb96648563b84998df7f128081143 SHA512 46735dadfa76446d570635a9552292dabc26fb86274884a6243c41eecade81420c617bb4d74617d686f79b6c2e0b0d222f761f3275c4a5c3dda864b3e8a995f5 -EBUILD libblockdev-9999.ebuild 2803 BLAKE2B 2f253de229e5d93466babc7ae69bcc121f7a2c8342f734b1fdc37f5e5f5243b609bb17ebe5d72d3d93885db662a9b6b55f7fa8188ac5f7d9ddf4421fb459f1f1 SHA512 8179778311125fed76869a7ef3a7658f77a71b368c84ee58441442f3b84587c64056ed2e4f7a57ab463eeefa230f42fee9e92cceee05e284e9c40e278bdf999d +EBUILD libblockdev-3.0.3.ebuild 2931 BLAKE2B 1fa1c65096d35a95d28aba10dd2841a14e7834f040f61aa9b6eeadb27b72e474fc0990159a62695fbd851af176089a429546571c8ed16676051d964cd0700fab SHA512 389d13fda89a684c2e8f40766d8bf4c5565a3db9d4344f9251399873557874ddaa0f3b0fc4004eb75fa24d9ef5efeeb60e30df378b9ab00d92a7744de265023a MISC metadata.xml 1120 BLAKE2B 1a323b7d5b61c6404578f58a880ff7825f818d1efcdf3f78954959cab3906be29651320aad097af181f988b537b8997412c24fec958207b22921462287e8a8cd SHA512 d531b6b1c0fc2e5996b11a16c211c29daa05da580e92ddf01e0ca672dba032a1ce8c5c66c44fa36e10397eec8379690a7299f3dfd811c2a2a8d464af69b3c649 diff --git a/sys-libs/libblockdev/libblockdev-3.0.3.ebuild b/sys-libs/libblockdev/libblockdev-3.0.3.ebuild new file mode 100644 index 000000000000..7d50d311061b --- /dev/null +++ b/sys-libs/libblockdev/libblockdev-3.0.3.ebuild @@ -0,0 +1,131 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..11} ) +inherit autotools python-single-r1 toolchain-funcs 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" + SRC_URI="https://github.com/storaged-project/${PN}/releases/download/${MY_PV}/${P}.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc64 ~riscv ~x86" +fi +LICENSE="LGPL-2+" +SLOT="0/3" # subslot is SOVERSION +IUSE="+cryptsetup device-mapper escrow gtk-doc introspection lvm +nvme test +tools" +# 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/gptfdisk + >=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-apps/keyutils-1.5.0:= + >=sys-fs/cryptsetup-2.3.0:= + ) + device-mapper? ( sys-fs/lvm2 ) + lvm? ( + sys-fs/lvm2 + virtual/udev + ) + nvme? ( sys-libs/libnvme ) + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-python/pygobject:3[${PYTHON_USEDEP}] + ') +" + +DEPEND="${RDEPEND}" + +BDEPEND+=" + dev-util/gtk-doc-am + gtk-doc? ( dev-util/gtk-doc ) + introspection? ( >=dev-libs/gobject-introspection-1.3.0 ) + test? ( + $(python_gen_cond_dep ' + dev-libs/libbytesize[python,${PYTHON_USEDEP}] + ') + sys-block/targetcli-fb + ) +" + +REQUIRED_USE="${PYTHON_REQUIRED_USE} + escrow? ( cryptsetup )" + +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() { + # Bug #910487 + if tc-ld-is-lld; then + tc-ld-force-bfd + fi + + local myeconfargs=( + --with-btrfs + --with-fs + --with-part + --with-python3 + --without-mpath + --without-nvdimm + $(use_enable introspection) + $(use_enable test tests) + $(use_with cryptsetup crypto) + $(use_with device-mapper dm) + $(use_with escrow) + $(use_with gtk-doc) + $(use_with lvm lvm) + $(use_with lvm lvm-dbus) + $(use_with nvme) + $(use_with tools) + ) + 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/libblockdev-9999.ebuild b/sys-libs/libblockdev/libblockdev-9999.ebuild deleted file mode 100644 index 59bd04d7fe4e..000000000000 --- a/sys-libs/libblockdev/libblockdev-9999.ebuild +++ /dev/null @@ -1,125 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..11} ) -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" - SRC_URI="https://github.com/storaged-project/${PN}/releases/download/${MY_PV}/${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" -fi -LICENSE="LGPL-2+" -SLOT="0/3" # subslot is SOVERSION -IUSE="+cryptsetup device-mapper escrow gtk-doc introspection lvm +nvme test +tools" -# 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/gptfdisk - >=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-apps/keyutils-1.5.0:= - >=sys-fs/cryptsetup-2.3.0:= - ) - device-mapper? ( sys-fs/lvm2 ) - lvm? ( - sys-fs/lvm2 - virtual/udev - ) - nvme? ( sys-libs/libnvme ) - ${PYTHON_DEPS} -" - -DEPEND=" - ${RDEPEND} -" - -BDEPEND+=" - dev-util/gtk-doc-am - gtk-doc? ( dev-util/gtk-doc ) - introspection? ( >=dev-libs/gobject-introspection-1.3.0 ) - test? ( - $(python_gen_cond_dep ' - dev-libs/libbytesize[python,${PYTHON_USEDEP}] - ') - sys-block/targetcli-fb - ) -" - -REQUIRED_USE="${PYTHON_REQUIRED_USE} - escrow? ( cryptsetup )" - -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 - $(use_enable introspection) - $(use_enable test tests) - $(use_with cryptsetup crypto) - $(use_with device-mapper dm) - $(use_with escrow) - $(use_with gtk-doc) - $(use_with lvm lvm) - $(use_with lvm lvm-dbus) - $(use_with nvme) - $(use_with tools) - ) - 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 -} -- cgit v1.2.3