commit: 4d0304347f57f44cb1ba4f015aad75ca12e1596a Author: Marek Szuba <marecki <AT> gentoo <DOT> org> AuthorDate: Sun Jul 9 01:00:46 2023 +0000 Commit: Marek Szuba <marecki <AT> gentoo <DOT> org> CommitDate: Sun Jul 9 01:03:29 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d030434
sys-libs/libblockdev: add 3.0.1 Note that this version is not presently keyworded for arm, ia64, ppc and sparc due to missing keywords on sys-libs/libnvme. Closes: https://bugs.gentoo.org/910056 Signed-off-by: Marek Szuba <marecki <AT> gentoo.org> sys-libs/libblockdev/Manifest | 1 + .../files/libblockdev-3.0.1-sh_tests.patch | 23 ++++++++++++++++++++++ ...ockdev-9999.ebuild => libblockdev-3.0.1.ebuild} | 7 ++++++- sys-libs/libblockdev/libblockdev-9999.ebuild | 1 + 4 files changed, 31 insertions(+), 1 deletion(-) diff --git a/sys-libs/libblockdev/Manifest b/sys-libs/libblockdev/Manifest index 4df36cdc8961..4046bb32be93 100644 --- a/sys-libs/libblockdev/Manifest +++ b/sys-libs/libblockdev/Manifest @@ -1 +1,2 @@ DIST libblockdev-2.28.tar.gz 925698 BLAKE2B 63ac7ab5bd02c1ef1848d0b252e09fe721cfe86258f063b7bab616766cbc56311707dcb2dd3a1fadf0e0840187f121aa178fd5959500cd590b846238a9d3e36e SHA512 9e01c41db4f728c8e81e710c6bb4725bbe34b3a7de25ff7f57b7b88ca6b7b5debbe858947585d314770036b2c3c533f9f8ff3d038b7ca50eee3d18f9fbe0d392 +DIST libblockdev-3.0.1.tar.gz 1066201 BLAKE2B bc213683fcfe78fcbeb494be90a5974911603f301152095b7aa6e0f14c0acfcaf946e8ef175b201d04d47de9d7743d9feaff5a31b23086b0253b5cab9cab24ee SHA512 b45e2f26691fe4016c8a161e1300f1edfca7a810e7535dd1eb787ad88a0d3110f75e0da289027eaed16bad275bfbb709b29b946e5fc3750a56e86c6453aa3a6d diff --git a/sys-libs/libblockdev/files/libblockdev-3.0.1-sh_tests.patch b/sys-libs/libblockdev/files/libblockdev-3.0.1-sh_tests.patch new file mode 100644 index 000000000000..c57464c39d86 --- /dev/null +++ b/sys-libs/libblockdev/files/libblockdev-3.0.1-sh_tests.patch @@ -0,0 +1,23 @@ +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 ${srcdir}/3.0-api-changes.xml $(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/ --ignore-headers="${srcdir}/../src/plugins/check_deps.h ${srcdir}/../src/plugins/dm_logging.h ${srcdir}/../src/plugins/vdo_stats.h ${srcdir}/../src/plugins/fs/common.h" + 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 ${builddir}/3.0-api-changes.xml ++ test "${builddir}" = "${srcdir}" || rm -f ${builddir}/libblockdev-sections.txt ${builddir}/libblockdev-docs.xml ${builddir}/3.0-api-changes.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-9999.ebuild b/sys-libs/libblockdev/libblockdev-3.0.1.ebuild similarity index 94% copy from sys-libs/libblockdev/libblockdev-9999.ebuild copy to sys-libs/libblockdev/libblockdev-3.0.1.ebuild index c44cfbc5a2a4..c2034e0c7802 100644 --- a/sys-libs/libblockdev/libblockdev-9999.ebuild +++ b/sys-libs/libblockdev/libblockdev-3.0.1.ebuild @@ -17,7 +17,7 @@ if [[ "${PV}" == *9999 ]] ; then 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" + KEYWORDS="~alpha ~amd64 ~arm64 ~loong ~mips ~ppc64 ~riscv ~x86" fi LICENSE="LGPL-2+" SLOT="0/3" # subslot is SOVERSION @@ -38,6 +38,7 @@ RDEPEND=" >=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 ) @@ -68,6 +69,10 @@ BDEPEND+=" REQUIRED_USE="${PYTHON_REQUIRED_USE} escrow? ( cryptsetup )" +PATCHES=( + "${FILESDIR}"/${PN}-3.0.1-sh_tests.patch +) + pkg_setup() { python-single-r1_pkg_setup } diff --git a/sys-libs/libblockdev/libblockdev-9999.ebuild b/sys-libs/libblockdev/libblockdev-9999.ebuild index c44cfbc5a2a4..59bd04d7fe4e 100644 --- a/sys-libs/libblockdev/libblockdev-9999.ebuild +++ b/sys-libs/libblockdev/libblockdev-9999.ebuild @@ -38,6 +38,7 @@ RDEPEND=" >=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 )
