diff options
author | V3n3RiX <venerix@koprulu.sector> | 2022-12-03 14:59:59 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2022-12-03 14:59:59 +0000 |
commit | 529abfa74a08ae5099db9780bcdf8250aa52ecb6 (patch) | |
tree | 2e2d1a9fd6e89b4872499afea3dc57490271e69c /sys-block | |
parent | e6ba529df30e3fc9dfdf55ec5797f2f764df6e54 (diff) |
gentoo auto-resync : 03:12:2022 - 14:59:58
Diffstat (limited to 'sys-block')
-rw-r--r-- | sys-block/Manifest.gz | bin | 10676 -> 10840 bytes | |||
-rw-r--r-- | sys-block/nbdkit/Manifest | 4 | ||||
-rw-r--r-- | sys-block/nbdkit/files/nbdkit-1.32.4-automagics.patch | 153 | ||||
-rw-r--r-- | sys-block/nbdkit/metadata.xml | 24 | ||||
-rw-r--r-- | sys-block/nbdkit/nbdkit-1.32.4.ebuild | 114 | ||||
-rw-r--r-- | sys-block/partitionmanager/Manifest | 2 | ||||
-rw-r--r-- | sys-block/partitionmanager/partitionmanager-22.04.3.ebuild | 36 |
7 files changed, 295 insertions, 38 deletions
diff --git a/sys-block/Manifest.gz b/sys-block/Manifest.gz Binary files differindex ec4fda97a57b..c7a09d8f0ab6 100644 --- a/sys-block/Manifest.gz +++ b/sys-block/Manifest.gz diff --git a/sys-block/nbdkit/Manifest b/sys-block/nbdkit/Manifest new file mode 100644 index 000000000000..445825c614f8 --- /dev/null +++ b/sys-block/nbdkit/Manifest @@ -0,0 +1,4 @@ +AUX nbdkit-1.32.4-automagics.patch 5620 BLAKE2B dca814d7d72607dd55284a58261820cf1b065ae1047846158a1e71d78c5182c060e653b89cf786ca9d7fe72514d5f034a2d4350b97a1b007f03eca7834c97e71 SHA512 52741eb9f04e5c40db0cc80e81000dd272d755de311d8ebe42ae16fa373e87ae887afc2153d0e51ff6676200ecaca31ecdab34704957e1090de0a645e8f39ce9 +DIST nbdkit-1.32.4.tar.gz 2342420 BLAKE2B 3ea6692a534548707bc488560b0f0bd0ddeb0daa4b2432da5de18a9a735408370c61b8c0a30d7d4ed6c915eb118948d2462ff4565036bec8a77c2c2fb712f4da SHA512 0eb1f0f492ce3558fba8d472b26f7ca3db7beeba411c98e7e06b55c5456399be56f6b4cd4adb54567f744f8e07986af9f676a983da052d174ce2e3c28109dbc5 +EBUILD nbdkit-1.32.4.ebuild 2620 BLAKE2B 0c3b240a12fe6f0b2218b48776726ff3e981212681c0c4e0e7179dc253c65482da93f51489297d585c206f978d177810a6b8c1343ce7607bdac9a25f24f8be5e SHA512 28e718cd428861890df5784bb00eaefaf38cd6f3e280c0ef28f4f4a052dfe4a991308594659162cd2c7ff5fd32cec0a8e93e1be250c1223f75c6926de54ff657 +MISC metadata.xml 1063 BLAKE2B 8472003768a9a7470d5c3eb33e69e0b1dd967355177df727f907014c9cc3ff400cc3ac3d292638ca2c8ae08316b6d6ab69ca86797f3cfc51572cd2f623b494bf SHA512 5789c2f41052bf96af87b4194f1f7e8af7bca7074ce93936e7c17db8b4edb90f825ac342e75f092064fa6baf1d818301b76d444900db407261e3235be7481c47 diff --git a/sys-block/nbdkit/files/nbdkit-1.32.4-automagics.patch b/sys-block/nbdkit/files/nbdkit-1.32.4-automagics.patch new file mode 100644 index 000000000000..98b734fb7eb2 --- /dev/null +++ b/sys-block/nbdkit/files/nbdkit-1.32.4-automagics.patch @@ -0,0 +1,153 @@ +From acf0b5e279d7a5154c32cac5e0ca820685bd01de Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Arsen=20Arsenovi=C4=87?= <arsen@aarsen.me> +Date: Sun, 27 Nov 2022 16:08:38 +0100 +Subject: [PATCH] configure: Add --with s for automagic dependencies + +--- +Upstreamed after release, see +https://gitlab.com/nbdkit/nbdkit/-/merge_requests/18/pipelines + +configure.ac | 109 +++++++++++++++++++++++++++++++++++---------------- + 1 file changed, 76 insertions(+), 33 deletions(-) + +diff --git a/configure.ac b/configure.ac +index c379edfb..5a64ed88 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -604,22 +604,40 @@ AC_MSG_RESULT([$is_glibc_234]) + AM_CONDITIONAL([HAVE_GLIBC_234], [test "x$is_glibc_234" = "xyes"]) + + dnl Check for SELinux socket labelling (optional). +-PKG_CHECK_MODULES([LIBSELINUX], [libselinux], [ +- AC_SUBST([LIBSELINUX_CFLAGS]) +- AC_SUBST([LIBSELINUX_LIBS]) +- AC_DEFINE([HAVE_LIBSELINUX],[1],[libselinux found at compile time.]) +-], [ +- AC_MSG_WARN([libselinux not found, SELinux socket labelling support will be disabled.]) ++AC_ARG_WITH([selinux], ++ AS_HELP_STRING([--without-selinux], [disable SELinux support, used for socket labelling @<:@default=check@:>@])) ++AS_IF([test "x$with_selinux" != xno], [ ++ PKG_CHECK_MODULES([LIBSELINUX], [libselinux], [ ++ AC_SUBST([LIBSELINUX_CFLAGS]) ++ AC_SUBST([LIBSELINUX_LIBS]) ++ AC_DEFINE([HAVE_LIBSELINUX],[1],[libselinux found at compile time.]) ++ ], [AC_MSG_WARN([libselinux not found, sockets will not be labeled.])]) ++]) ++ ++AS_IF([test "x$with_selinux" = xyes && test "x$LIBSELINUX_LIBS" = x], [ ++ AC_MSG_ERROR([selinux requested but not found]) + ]) + + dnl Check for GnuTLS (optional, for TLS support). +-PKG_CHECK_MODULES([GNUTLS], [gnutls >= 3.3.0], [ +- AC_SUBST([GNUTLS_CFLAGS]) +- AC_SUBST([GNUTLS_LIBS]) +- AC_DEFINE([HAVE_GNUTLS],[1],[gnutls found at compile time.]) +-], [ +- AC_MSG_WARN([gnutls not found or < 3.3.0, TLS support will be disabled.]) ++AC_ARG_WITH([gnutls], ++ [AS_HELP_STRING([--without-gnutls], [disable TLS support via GnuTLS @<:@default=check@:>@])], ++ [], ++ [: m4_divert_text([DEFAULTS], [with_manpages=check])]) ++ ++AS_IF([test "x$with_gnutls" != xno], [ ++ PKG_CHECK_MODULES([GNUTLS], [gnutls >= 3.3.0], [ ++ AC_SUBST([GNUTLS_CFLAGS]) ++ AC_SUBST([GNUTLS_LIBS]) ++ AC_DEFINE([HAVE_GNUTLS],[1],[gnutls found at compile time.]) ++ ], [ ++ AC_MSG_WARN([gnutls not found or < 3.3.0, TLS support will be disabled.]) ++ ]) + ]) ++ ++AS_IF([test "x$with_gnutls" = xyes && test x"$GNUTLS_LIBS" = x], [ ++ AC_MSG_ERROR([gnutls requested but not found]) ++]) ++ + AM_CONDITIONAL([HAVE_GNUTLS], [test "x$GNUTLS_LIBS" != "x"]) + + AS_IF([test "x$GNUTLS_LIBS" != "x"],[ +@@ -733,34 +751,59 @@ AM_CONDITIONAL([USE_LINKER_SCRIPT], + [test "x$use_linker_script" = "xyes"]) + + dnl Bash completion. +-PKG_CHECK_MODULES([BASH_COMPLETION], [bash-completion >= 2.0], [ +- bash_completion=yes +- AC_MSG_CHECKING([for bash-completions directory]) +- m4_ifdef([PKG_CHECK_VAR],[ +- PKG_CHECK_VAR(bashcompdir, [bash-completion], [completionsdir]) ++AC_ARG_WITH([bash-completions], ++ [AS_HELP_STRING([--without-bash-completions], [disable installing bash completions @<:@default=check@:>@])], ++ [], ++ [: m4_divert_text([DEFAULTS], [with_readline=check])]) ++ ++AS_IF([test "x$with_bash_completions" != xno], [ ++ PKG_CHECK_MODULES([BASH_COMPLETION], [bash-completion >= 2.0], [ ++ bash_completion=yes ++ AC_MSG_CHECKING([for bash-completions directory]) ++ m4_ifdef([PKG_CHECK_VAR],[ ++ PKG_CHECK_VAR(bashcompdir, [bash-completion], [completionsdir]) ++ ]) ++ AS_IF([test -z "$bashcompdir"], [ ++ bashcompdir="${sysconfdir}/bash_completion.d" ++ ]) ++ AC_MSG_RESULT([$bashcompdir]) ++ AC_SUBST([bashcompdir]) ++ ],[ ++ bash_completion=no ++ AC_MSG_WARN([bash-completion not installed]) + ]) +- AS_IF([test -z "$bashcompdir"], [ +- bashcompdir="${sysconfdir}/bash_completion.d" +- ]) +- AC_MSG_RESULT([$bashcompdir]) +- AC_SUBST([bashcompdir]) +-],[ +- bash_completion=no +- AC_MSG_WARN([bash-completion not installed]) + ]) ++ ++AS_IF([test "x$bash_completion" = xno && test "x$with_bash_completions" = xyes], [ ++ AC_MSG_ERROR([bash-completions requested but required packages not found]) ++]) ++ + AM_CONDITIONAL([HAVE_BASH_COMPLETION],[test "x$bash_completion" = "xyes"]) + + dnl Check we have enough to run podwrapper. +-AC_CHECK_PROG([PERL],[perl],[perl],[no]) +-AS_IF([test "x$PERL" != "xno"],[ +- AC_MSG_CHECKING([if we have perl Pod::Man and Pod::Simple]) +- AS_IF([$PERL -MPod::Man -MPod::Simple -e 1 >&AS_MESSAGE_LOG_FD 2>&1],[ +- enable_pod=yes +- ],[ +- enable_pod=no ++ ++AC_ARG_WITH([manpages], ++ [AS_HELP_STRING([--without-manpages], [Do not build man pages @<:@default=check@:>@])], ++ [], ++ [: m4_divert_text([DEFAULTS], [with_manpages=check])]) ++ ++enable_pod=no ++AC_CHECK_PROGS([PERL], [perl], []) ++ ++AS_IF([test "x$enable_manpages" != xno], [ ++ AS_IF([test "x$PERL" != "x"],[ ++ AC_MSG_CHECKING([if we have perl Pod::Man and Pod::Simple]) ++ AS_IF([$PERL -MPod::Man -MPod::Simple -e 1 >&AS_MESSAGE_LOG_FD 2>&1],[ ++ enable_pod=yes ++ ]) ++ AC_MSG_RESULT([$enable_pod]) + ]) +- AC_MSG_RESULT([$enable_pod]) + ]) ++ ++AS_IF([test "x$enable_pod" = xno && test "x$enable_manpages" = xyes], [ ++ AC_MSG_ERROR([man-pages requested but required packages not found]) ++]) ++ + AM_CONDITIONAL([HAVE_POD], + [test "x$PERL" != "xno" && test "x$enable_pod" = "xyes"]) + +-- +2.38.1 + diff --git a/sys-block/nbdkit/metadata.xml b/sys-block/nbdkit/metadata.xml new file mode 100644 index 000000000000..ec79ea16ce62 --- /dev/null +++ b/sys-block/nbdkit/metadata.xml @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person" proxied="yes"> + <email>arsen@aarsen.me</email> + <name>Arsen Arsenović</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <upstream> + <remote-id type="gitlab">nbdkit/nbdkit</remote-id> + <remote-id type="github">libguestfs/nbdkit</remote-id> + </upstream> + <use> + <flag name="ext2">Enable the ext2 filter via <pkg>sys-fs/e2fsprogs</pkg>.</flag> + <flag name="libguestfs">Enable the <pkg>app-emulation/libguestfs</pkg> plugin.</flag> + <flag name="libssh">Enable the SSH plugin via <pkg>net-libs/libssh</pkg>.</flag> + <flag name="libvirt">Enable the <pkg>app-emulation/libvirt</pkg> plugin.</flag> + <flag name="nbd">Enable the nbd plugin via <pkg>sys-libs/libnbd</pkg>.</flag> + <flag name="torrent">Enable the torrent plugin via <pkg>net-libs/libtorrent-rasterbar</pkg>.</flag> + </use> +</pkgmetadata> diff --git a/sys-block/nbdkit/nbdkit-1.32.4.ebuild b/sys-block/nbdkit/nbdkit-1.32.4.ebuild new file mode 100644 index 000000000000..6f5ddf48b7fa --- /dev/null +++ b/sys-block/nbdkit/nbdkit-1.32.4.ebuild @@ -0,0 +1,114 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +WANT_LIBTOOL=none +inherit autotools optfeature + +DESCRIPTION="NBD server with stable plugin ABI and permissive license" +HOMEPAGE="https://gitlab.com/nbdkit/nbdkit" +SRC_URI="https://download.libguestfs.org/nbdkit/$(ver_cut 1-2)-stable/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64" +IUSE="curl ext2 nbd gnutls libguestfs libssh libvirt lzma selinux torrent zlib zstd" + +RDEPEND=" + virtual/libiconv + selinux? ( sys-libs/libselinux ) + gnutls? ( net-libs/gnutls:= ) + curl? ( net-misc/curl ) + libssh? ( net-libs/libssh:= ) + libvirt? ( app-emulation/libvirt:= ) + zlib? ( sys-libs/zlib ) + nbd? ( sys-libs/libnbd ) + lzma? ( app-arch/xz-utils ) + zstd? ( app-arch/zstd:= ) + libguestfs? ( app-emulation/libguestfs:= ) + ext2? ( sys-fs/e2fsprogs ) + torrent? ( net-libs/libtorrent-rasterbar:= ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-lang/perl +" + +PATCHES=( + "${FILESDIR}/${P}-automagics.patch" +) + +src_prepare() { + default + + # TODO(arsen): This test fails for some reason. + cat <<-HACK > tests/test-file-extents.sh || die + #!/bin/sh + echo Gentoo: This test is skipped + exit 77 + HACK + + eautoreconf +} + +src_configure() { + local myeconfargs=( + --with-extra=Gentoo + + --with-iconv + --with-manpages + + $(use_with selinux) + $(use_with gnutls) + $(use_with curl) + $(use_with libvirt) + $(use_with zlib) + $(use_with nbd libnbd) + $(use_with lzma liblzma) + $(use_with zstd libzstd) + $(use_with libguestfs) + $(use_with ext2) + $(use_enable torrent) + + --disable-linuxdisk # Not in Gentoo. + --disable-valgrind # Seems to not do anything? + --disable-libfuzzer # Should not be used normally according to upstream + + # TODO(arsen): Bindings left out + --disable-perl + --disable-python + --disable-ocaml + --disable-rust + --disable-ruby + --disable-tcl + --disable-lua + --disable-golang + + # This just enabled a few code paths with no extra library + # dependencies, but it does have an extra xorriso runtime + # dependency. Seeing as it's optional, and it conflates BDEPEND + # and RDEPEND; I think it's okay to just specify that it uses + # XORRISO installed as xorriso. Maybe the user should be able + # to override this in the future if they prefer one of the other + # ISOPROGs? + --with-iso + ac_cv_prog_XORRISO=xorriso + + # Involves proprietary code and a dlopen mess, see + # plugins/vddk/README.VDDK. + --disable-vddk + ) + + econf "${myeconfargs[@]}" +} + +src_install() { + default + + find "${ED}" -name '*.la' -delete || die +} + +pkg_postinst() { + optfeature "virtual ISO plugin via xorriso" dev-libs/libisoburn +} diff --git a/sys-block/partitionmanager/Manifest b/sys-block/partitionmanager/Manifest index 5dabc12c4a8f..2709de82e434 100644 --- a/sys-block/partitionmanager/Manifest +++ b/sys-block/partitionmanager/Manifest @@ -1,5 +1,3 @@ -DIST partitionmanager-22.04.3.tar.xz 2108444 BLAKE2B 768aed2061ee48349e7b048a8aa73f52ec8a0edd0a32a1f3352b3894d557600f9c82a034ebb1b3eb0d391512883cedf3ccb8f4ed920d5f4af0d225e19591e5f4 SHA512 36265e727d0035146ad96e773e369b8f2fe70b21a4a102c1f47ae8f56bb3ae8364fd9804f0a53812de871d82206def1ab81913f134799a3320a662def7872260 DIST partitionmanager-22.08.3.tar.xz 2101520 BLAKE2B a83c1ce18e19e0f19293c57866a8429bfd15b4f03eafe934ca11637c76c50780228117598efec11e77c2d5759dc42274ed4c604f48edbf23325599b033dc2c06 SHA512 ec287a1cb9456253e40ba61a6844f82e2dcda8f1a87f7850f71c255d9aaa6f0b6d0008d1f1299bdfa989e80fb57b21fd962940ca3ba061d9c22f26370d1c0a29 -EBUILD partitionmanager-22.04.3.ebuild 939 BLAKE2B 6bb704980f33ede73dde477f588944f4b7ac151d97f2b3198ec3054d59a37bce65ef36fe713743b529884fb5f60cd64fb13fc8a1a5b4378d3b2518b480e75a9e SHA512 1aec13ae8169d31b35119ea157e18d92a00e960007a0c38605e475a743799e8ee746a03aadebab2ab4f64100357ccbafd089c21c83ae190889322f0bb9bb92fe EBUILD partitionmanager-22.08.3.ebuild 1007 BLAKE2B 33dc1420f8d4c53fefd41810592d7e92392cddc9ad2e8b15d22ccc77643313e14785e6c5148e10e325cee8e15585855aefc0e59509c7217118de47687f45a9da SHA512 68249227ca35714b029b7bfdefa1b5d6446679c1307f8bb746288b0ad7e197475b36e4d395609d4045a6652d50e14fcf1c5b5921255febca4fa1e0a641466d36 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6 diff --git a/sys-block/partitionmanager/partitionmanager-22.04.3.ebuild b/sys-block/partitionmanager/partitionmanager-22.04.3.ebuild deleted file mode 100644 index 389d3e1a54e0..000000000000 --- a/sys-block/partitionmanager/partitionmanager-22.04.3.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_HANDBOOK="optional" -KFMIN=5.92.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.15.4 -inherit ecm gear.kde.org - -DESCRIPTION="Utility for management of disks, partitions and file systems" -HOMEPAGE="https://apps.kde.org/partitionmanager/" - -LICENSE="GPL-3" -SLOT="5" -KEYWORDS="amd64 ~arm arm64 ~ppc64 x86" -IUSE="" - -DEPEND=" - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kcrash-${KFMIN}:5 - >=kde-frameworks/kdbusaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/kjobwidgets-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kxmlgui-${KFMIN}:5 - sys-auth/polkit-qt - >=sys-libs/kpmcore-${PVCUT}:5= -" -RDEPEND="${DEPEND}" |