commit: 743db586d11a5698b385a20fad3547c17739ef8c Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sun Jan 12 17:11:30 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun Jan 12 17:11:46 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=743db586
dev-util/ostree: drop versions ... depending on old libsoup slot. Signed-off-by: Sam James <sam <AT> gentoo.org> dev-util/ostree/Manifest | 4 - .../ostree/files/ostree-2022.6-musl-allperms.patch | 17 --- ...stree-2023.3-libgpg-error-underlinked-lld.patch | 27 ----- dev-util/ostree/metadata.xml | 1 - dev-util/ostree/ostree-2023.1-r1.ebuild | 120 -------------------- dev-util/ostree/ostree-2023.2-r1.ebuild | 118 -------------------- dev-util/ostree/ostree-2023.3-r2.ebuild | 118 -------------------- dev-util/ostree/ostree-2023.3-r3.ebuild | 119 -------------------- dev-util/ostree/ostree-2023.5.ebuild | 122 --------------------- dev-util/ostree/ostree-2024.3.ebuild | 119 -------------------- 10 files changed, 765 deletions(-) diff --git a/dev-util/ostree/Manifest b/dev-util/ostree/Manifest index 2ac0b3a282d0..64086d8b9f7f 100644 --- a/dev-util/ostree/Manifest +++ b/dev-util/ostree/Manifest @@ -1,6 +1,2 @@ -DIST ostree-2023.1.tar.xz 2079904 BLAKE2B 993570624cb43684d81fff9f3789a9cee3b998f945a78bc6eb99330eed45739d1e6fb66589cefba10eea608c5cd389cc121a890c27efa773a405a5d8b1f117d9 SHA512 a6a6e47d6cb9ec6826d48a50a2abac69e4a040f2b5830d39e8a006c738a163fb15fde8630bf271d92cec9470601281669cd4bf942e4b7c4d42441bd5d1730572 -DIST ostree-2023.2.tar.xz 2081320 BLAKE2B f773bf979b4bc97b9b8f96dc4385745bc386c29952a36c07cdd33a7db7802876ce154b5ac1f3669605ab3949a539aa8e2b3a3d94608557eb65249b5188f9d012 SHA512 549a2bdf8cef93d421aaf990e2d1c534063f0314b5933db7ce123bdd138229e24cc171d541296e45a7546a91d35149c1c8f29ea90949876200c574e7ec297b98 -DIST ostree-2023.3.tar.xz 2075168 BLAKE2B 6e699420a89b36520e60a5682a421fd8f10eb20702abe6af97be9ee78a04be98e8d164157d29726de9e63b869051f7e60f199776ea3d959d4f0ad4165ff780c6 SHA512 af3b80d55e15b515e860ab0ee5f061f1a4d649b21441d5cde66e71ff4349ef480565cb795838ebce2f42784d53e349c2443159d9ee452277001d930ba814fe40 -DIST ostree-2023.5.tar.xz 2115184 BLAKE2B ac1fa6764e1b7e5cd6656f2977b2605e3d2c612e6ee426fc8dbd7c84d6aebe72159943d7c2e53a2898aee6c085814228df772edc35b93daa23cb14bbb5642a6f SHA512 0bb19f199344d8db7299cf710f2ba0b2657cdcb5b1fc6d85446cef9538b069e470b47fc0c2c1029e12b8b9adb978f32a6f44f48949ff5c97a01051a425a9f2d5 DIST ostree-2024.3.tar.xz 2141876 BLAKE2B 5a2639b99697eaf3f0a94d619c5121cb095bd21813af800041a9a4a077240ed4508c96fb67387f850a42bc4058c99d2d260ff66b0cee2fc89df64dae0b9b0508 SHA512 717e74bdaffe839acad68169d4a0290b3d81f2fb31329d02c507168b00b0b02928e2bb29c8c8fcef65a6581b98d9bad991adcde1579597b4be94822546c66573 DIST ostree-2024.8.tar.xz 2107348 BLAKE2B 933f85b122b92cf8656698bbe7cfbce8a918aca0e779185049ed6c808f194c8fb9163a08b6cf1d6b368e2bcb0f45d434d83f243fbebf06a86afefa01247dab71 SHA512 6faed3daebce443134141bbf98add459c6f0c8239cc0e050cf2517d1127f3fd6aededd4af5d8400f869683b96aea2abb93bab8869dbf2f9a4ba02324c3005e5d diff --git a/dev-util/ostree/files/ostree-2022.6-musl-allperms.patch b/dev-util/ostree/files/ostree-2022.6-musl-allperms.patch deleted file mode 100644 index 9f4f2a21eb14..000000000000 --- a/dev-util/ostree/files/ostree-2022.6-musl-allperms.patch +++ /dev/null @@ -1,17 +0,0 @@ -https://bugs.gentoo.org/879321 - -From: ernsteiswuerfel <[email protected]> - ---- a/src/libostree/ostree-repo-checkout.c -+++ b/src/libostree/ostree-repo-checkout.c -@@ -37,6 +37,10 @@ - - #define OVERLAYFS_WHITEOUT_PREFIX ".ostree-wh." - -+#if !defined(ALLPERMS) -+# define ALLPERMS (S_ISUID|S_ISGID|S_ISVTX|S_IRWXU|S_IRWXG|S_IRWXO) /* 07777 */ -+#endif -+ - /* Per-checkout call state/caching */ - typedef struct { - GString *path_buf; /* buffer for real path if filtering enabled */ diff --git a/dev-util/ostree/files/ostree-2023.3-libgpg-error-underlinked-lld.patch b/dev-util/ostree/files/ostree-2023.3-libgpg-error-underlinked-lld.patch deleted file mode 100644 index f96cb83a1e74..000000000000 --- a/dev-util/ostree/files/ostree-2023.3-libgpg-error-underlinked-lld.patch +++ /dev/null @@ -1,27 +0,0 @@ -https://bugs.gentoo.org/905623 -https://github.com/ostreedev/ostree/pull/2880 - -From c3bd439d3e9c8cfad40a8080d35c5d6b29041039 Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -Date: Mon, 12 Jun 2023 14:04:44 -0700 -Subject: [PATCH] libostree: Link with libgpg-error for gpg_strerror_r API - -With f461c02bb55bf2853a3b81ed5c8618040ab54e98 use of gpg_strerror_r -was added this symbol comes from libgpg-error however, therefore its -needed to add -lgpg-error to cmdline to resolve this symbol especially -with gold and lld linker. Fixes - -aarch64-yoe-linux-ld.lld: error: undefined reference due to --no-allow-shlib-undefined: gpg_strerror_r ->>> referenced by ./.libs/libostree-1.so ---- a/configure.ac -+++ b/configure.ac -@@ -243,8 +243,7 @@ AC_ARG_WITH(gpgme, - [], [with_gpgme=yes]) - AS_IF([test x$with_gpgme != xno], [ - have_gpgme=yes -- PKG_CHECK_MODULES([OT_DEP_GPGME], gpgme >= $LIBGPGME_DEPENDENCY, [], have_gpgme=no) -- PKG_CHECK_MODULES([OT_DEP_GPG_ERROR], [gpg-error], [], have_gpgme=no) -+ PKG_CHECK_MODULES([OT_DEP_GPGME], [gpgme >= $LIBGPGME_DEPENDENCY gpg-error], [have_gpgme=yes], [have_gpgme=no]) - ] - ) - AS_IF([test x$with_gpgme != xno && test x$have_gpgme != xyes], [ diff --git a/dev-util/ostree/metadata.xml b/dev-util/ostree/metadata.xml index 568d3a47f758..12322e128394 100644 --- a/dev-util/ostree/metadata.xml +++ b/dev-util/ostree/metadata.xml @@ -34,7 +34,6 @@ <flag name="dracut">Install dracut module</flag> <flag name="gpg">Enable GPG support</flag> <flag name="grub">Enable grub configuration generator</flag> - <flag name="httpd">Enable ostree trivial-httpd entrypoint</flag> <flag name="libmount">Use libmount</flag> <flag name="sodium">Use libsodium for ed25519</flag> <flag name="soup">Use libsoup for networking</flag> diff --git a/dev-util/ostree/ostree-2023.1-r1.ebuild b/dev-util/ostree/ostree-2023.1-r1.ebuild deleted file mode 100644 index 80a7ccd04806..000000000000 --- a/dev-util/ostree/ostree-2023.1-r1.ebuild +++ /dev/null @@ -1,120 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools systemd tmpfiles - -DESCRIPTION="Operating system and container binary deployment and upgrades" -HOMEPAGE="https://ostreedev.github.io/ostree/"; -SRC_URI="https://github.com/ostreedev/ostree/releases/download/v${PV}/lib${P}.tar.xz -> ${P}.tar.xz" - -KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" -LICENSE="LGPL-2+" -SLOT="0" - -IUSE="archive +curl doc dracut gnutls +gpg grub +http2 httpd introspection libmount selinux sodium ssl +soup systemd zeroconf" -RESTRICT="test" -REQUIRED_USE=" - dracut? ( systemd ) - http2? ( curl ) - httpd? ( || ( curl soup ) ) -" - -COMMON_DEPEND=" - app-arch/xz-utils - dev-libs/libassuan:= - dev-libs/glib:2 - sys-fs/fuse:3 - sys-libs/zlib - archive? ( app-arch/libarchive:= ) - curl? ( net-misc/curl ) - dracut? ( sys-kernel/dracut ) - gpg? ( - app-crypt/gpgme:= - dev-libs/libgpg-error - ) - grub? ( sys-boot/grub:2= ) - introspection? ( dev-libs/gobject-introspection ) - libmount? ( sys-apps/util-linux ) - selinux? ( sys-libs/libselinux ) - sodium? ( >=dev-libs/libsodium-1.0.14:= ) - soup? ( net-libs/libsoup:2.4 ) - ssl? ( - gnutls? ( net-libs/gnutls:= ) - !gnutls? ( - dev-libs/openssl:0= - ) - ) - systemd? ( sys-apps/systemd:0= ) - zeroconf? ( net-dns/avahi[dbus] )" - -DEPEND="${COMMON_DEPEND} - app-text/docbook-xsl-stylesheets - dev-libs/libxslt - doc? ( dev-util/gtk-doc )" - -RDEPEND="${COMMON_DEPEND}" -BDEPEND=" - dev-util/glib-utils - sys-devel/flex - sys-devel/bison - virtual/pkgconfig" - -S="${WORKDIR}/lib${P}" - -PATCHES=( - "${FILESDIR}"/ostree-2022.6-musl-allperms.patch -) - -src_prepare() { - default - - sed -Ee 's:(XSLT_STYLESHEET = ).*:\1/usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl:' \ - -i Makefile.in Makefile-man.am || die - - eautoreconf -} - -src_configure() { - # Needs Bison (bug #884289) - unset YACC - - local econfargs=( - --enable-man - --enable-shared - --with-grub2-mkconfig-path=grub-mkconfig - --with-modern-grub - $(use_with archive libarchive) - $(use_with curl) - $(use_with dracut dracut yesbutnoconf) #816867 - $(use_enable doc gtk-doc) - $(usex introspection --enable-introspection={,} yes no) - $(use_with gpg gpgme) - $(use_enable http2) - $(use_enable httpd trivial-httpd-cmdline) - $(use_with selinux ) - $(use_with soup) - $(use_with libmount) - $(use ssl && { use gnutls && echo --with-crypto=gnutls || echo --with-crypto=openssl; }) - $(use_with sodium ed25519-libsodium) - $(use_with systemd libsystemd) - $(use_with zeroconf avahi) - ) - - if use systemd; then - econfargs+=(--with-systemdsystemunitdir="$(systemd_get_systemunitdir)") - fi - - unset ${!XDG_*} #657346 g-ir-scanner sandbox violation - econf "${econfargs[@]}" -} - -src_install() { - default - find "${D}" -name '*.la' -delete || die -} - -pkg_postinst() { - tmpfiles_process ostree-tmpfiles.conf -} diff --git a/dev-util/ostree/ostree-2023.2-r1.ebuild b/dev-util/ostree/ostree-2023.2-r1.ebuild deleted file mode 100644 index 5a4ceedad43a..000000000000 --- a/dev-util/ostree/ostree-2023.2-r1.ebuild +++ /dev/null @@ -1,118 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools systemd tmpfiles - -DESCRIPTION="Operating system and container binary deployment and upgrades" -HOMEPAGE="https://ostreedev.github.io/ostree/"; -SRC_URI=" - https://github.com/ostreedev/ostree/releases/download/v${PV}/lib${P}.tar.xz - -> ${P}.tar.xz -" -S="${WORKDIR}/lib${P}" - -KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" -LICENSE="LGPL-2+" -SLOT="0" - -IUSE="archive +curl doc dracut gnutls +gpg grub +http2 httpd introspection libmount selinux sodium ssl +soup systemd zeroconf" -RESTRICT="test" -REQUIRED_USE=" - dracut? ( systemd ) - http2? ( curl ) - httpd? ( || ( curl soup ) ) -" - -RDEPEND=" - app-arch/xz-utils - dev-libs/libassuan:= - dev-libs/glib:2 - sys-fs/fuse:3 - sys-libs/zlib - archive? ( app-arch/libarchive:= ) - curl? ( net-misc/curl ) - dracut? ( sys-kernel/dracut ) - gpg? ( - app-crypt/gpgme:= - dev-libs/libgpg-error - ) - grub? ( sys-boot/grub:2= ) - introspection? ( dev-libs/gobject-introspection ) - libmount? ( sys-apps/util-linux ) - selinux? ( sys-libs/libselinux ) - sodium? ( >=dev-libs/libsodium-1.0.14:= ) - soup? ( net-libs/libsoup:2.4 ) - ssl? ( - gnutls? ( net-libs/gnutls:= ) - !gnutls? ( - dev-libs/openssl:0= - ) - ) - systemd? ( sys-apps/systemd:0= ) - zeroconf? ( net-dns/avahi[dbus] ) -" -DEPEND="${RDEPEND} - app-text/docbook-xsl-stylesheets - dev-libs/libxslt - doc? ( dev-util/gtk-doc ) -" -BDEPEND=" - dev-util/glib-utils - sys-devel/flex - sys-devel/bison - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}"/ostree-2022.6-musl-allperms.patch -) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - # Needs Bison (bug #884289) - unset YACC - - local econfargs=( - --enable-man - --enable-shared - --with-grub2-mkconfig-path=grub-mkconfig - --with-modern-grub - $(use_with archive libarchive) - $(use_with curl) - $(use_with dracut dracut yesbutnoconf) #816867 - $(use_enable doc gtk-doc) - $(usex introspection --enable-introspection={,} yes no) - $(use_with gpg gpgme) - $(use_enable http2) - $(use_enable httpd trivial-httpd-cmdline) - $(use_with selinux ) - $(use_with soup) - $(use_with libmount) - $(use ssl && { use gnutls && echo --with-crypto=gnutls || echo --with-crypto=openssl; }) - $(use_with sodium ed25519-libsodium) - $(use_with systemd libsystemd) - $(use_with zeroconf avahi) - ) - - if use systemd; then - econfargs+=( --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" ) - fi - - unset ${!XDG_*} #657346 g-ir-scanner sandbox violation - econf "${econfargs[@]}" -} - -src_install() { - default - find "${D}" -name '*.la' -delete || die -} - -pkg_postinst() { - tmpfiles_process ostree-tmpfiles.conf -} diff --git a/dev-util/ostree/ostree-2023.3-r2.ebuild b/dev-util/ostree/ostree-2023.3-r2.ebuild deleted file mode 100644 index 5a4ceedad43a..000000000000 --- a/dev-util/ostree/ostree-2023.3-r2.ebuild +++ /dev/null @@ -1,118 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools systemd tmpfiles - -DESCRIPTION="Operating system and container binary deployment and upgrades" -HOMEPAGE="https://ostreedev.github.io/ostree/"; -SRC_URI=" - https://github.com/ostreedev/ostree/releases/download/v${PV}/lib${P}.tar.xz - -> ${P}.tar.xz -" -S="${WORKDIR}/lib${P}" - -KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" -LICENSE="LGPL-2+" -SLOT="0" - -IUSE="archive +curl doc dracut gnutls +gpg grub +http2 httpd introspection libmount selinux sodium ssl +soup systemd zeroconf" -RESTRICT="test" -REQUIRED_USE=" - dracut? ( systemd ) - http2? ( curl ) - httpd? ( || ( curl soup ) ) -" - -RDEPEND=" - app-arch/xz-utils - dev-libs/libassuan:= - dev-libs/glib:2 - sys-fs/fuse:3 - sys-libs/zlib - archive? ( app-arch/libarchive:= ) - curl? ( net-misc/curl ) - dracut? ( sys-kernel/dracut ) - gpg? ( - app-crypt/gpgme:= - dev-libs/libgpg-error - ) - grub? ( sys-boot/grub:2= ) - introspection? ( dev-libs/gobject-introspection ) - libmount? ( sys-apps/util-linux ) - selinux? ( sys-libs/libselinux ) - sodium? ( >=dev-libs/libsodium-1.0.14:= ) - soup? ( net-libs/libsoup:2.4 ) - ssl? ( - gnutls? ( net-libs/gnutls:= ) - !gnutls? ( - dev-libs/openssl:0= - ) - ) - systemd? ( sys-apps/systemd:0= ) - zeroconf? ( net-dns/avahi[dbus] ) -" -DEPEND="${RDEPEND} - app-text/docbook-xsl-stylesheets - dev-libs/libxslt - doc? ( dev-util/gtk-doc ) -" -BDEPEND=" - dev-util/glib-utils - sys-devel/flex - sys-devel/bison - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}"/ostree-2022.6-musl-allperms.patch -) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - # Needs Bison (bug #884289) - unset YACC - - local econfargs=( - --enable-man - --enable-shared - --with-grub2-mkconfig-path=grub-mkconfig - --with-modern-grub - $(use_with archive libarchive) - $(use_with curl) - $(use_with dracut dracut yesbutnoconf) #816867 - $(use_enable doc gtk-doc) - $(usex introspection --enable-introspection={,} yes no) - $(use_with gpg gpgme) - $(use_enable http2) - $(use_enable httpd trivial-httpd-cmdline) - $(use_with selinux ) - $(use_with soup) - $(use_with libmount) - $(use ssl && { use gnutls && echo --with-crypto=gnutls || echo --with-crypto=openssl; }) - $(use_with sodium ed25519-libsodium) - $(use_with systemd libsystemd) - $(use_with zeroconf avahi) - ) - - if use systemd; then - econfargs+=( --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" ) - fi - - unset ${!XDG_*} #657346 g-ir-scanner sandbox violation - econf "${econfargs[@]}" -} - -src_install() { - default - find "${D}" -name '*.la' -delete || die -} - -pkg_postinst() { - tmpfiles_process ostree-tmpfiles.conf -} diff --git a/dev-util/ostree/ostree-2023.3-r3.ebuild b/dev-util/ostree/ostree-2023.3-r3.ebuild deleted file mode 100644 index 48eb2de51fc0..000000000000 --- a/dev-util/ostree/ostree-2023.3-r3.ebuild +++ /dev/null @@ -1,119 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools systemd tmpfiles - -DESCRIPTION="Operating system and container binary deployment and upgrades" -HOMEPAGE="https://ostreedev.github.io/ostree/"; -SRC_URI=" - https://github.com/ostreedev/ostree/releases/download/v${PV}/lib${P}.tar.xz - -> ${P}.tar.xz -" -S="${WORKDIR}/lib${P}" - -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" -LICENSE="LGPL-2+" -SLOT="0" - -IUSE="archive +curl doc dracut gnutls +gpg grub +http2 httpd introspection libmount selinux sodium ssl +soup systemd zeroconf" -RESTRICT="test" -REQUIRED_USE=" - dracut? ( systemd ) - http2? ( curl ) - httpd? ( || ( curl soup ) ) -" - -RDEPEND=" - app-arch/xz-utils - dev-libs/libassuan:= - dev-libs/glib:2 - sys-fs/fuse:3 - sys-libs/zlib - archive? ( app-arch/libarchive:= ) - curl? ( net-misc/curl ) - dracut? ( sys-kernel/dracut ) - gpg? ( - app-crypt/gpgme:= - dev-libs/libgpg-error - ) - grub? ( sys-boot/grub:2= ) - introspection? ( dev-libs/gobject-introspection ) - libmount? ( sys-apps/util-linux ) - selinux? ( sys-libs/libselinux ) - sodium? ( >=dev-libs/libsodium-1.0.14:= ) - soup? ( net-libs/libsoup:2.4 ) - ssl? ( - gnutls? ( net-libs/gnutls:= ) - !gnutls? ( - dev-libs/openssl:0= - ) - ) - systemd? ( sys-apps/systemd:0= ) - zeroconf? ( net-dns/avahi[dbus] ) -" -DEPEND="${RDEPEND} - app-text/docbook-xsl-stylesheets - dev-libs/libxslt - doc? ( dev-util/gtk-doc ) -" -BDEPEND=" - dev-util/glib-utils - sys-devel/flex - sys-devel/bison - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}"/ostree-2023.3-libgpg-error-underlinked-lld.patch - "${FILESDIR}"/ostree-2023.3-dont-force-clang-introspection.patch -) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - # Needs Bison (bug #884289) - unset YACC - - local econfargs=( - --enable-man - --enable-shared - --with-grub2-mkconfig-path=grub-mkconfig - --with-modern-grub - $(use_with archive libarchive) - $(use_with curl) - $(use_with dracut dracut yesbutnoconf) #816867 - $(use_enable doc gtk-doc) - $(usex introspection --enable-introspection={,} yes no) - $(use_with gpg gpgme) - $(use_enable http2) - $(use_enable httpd trivial-httpd-cmdline) - $(use_with selinux ) - $(use_with soup) - $(use_with libmount) - $(use ssl && { use gnutls && echo --with-crypto=gnutls || echo --with-crypto=openssl; }) - $(use_with sodium ed25519-libsodium) - $(use_with systemd libsystemd) - $(use_with zeroconf avahi) - ) - - if use systemd; then - econfargs+=( --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" ) - fi - - unset ${!XDG_*} #657346 g-ir-scanner sandbox violation - econf "${econfargs[@]}" -} - -src_install() { - default - find "${D}" -name '*.la' -delete || die -} - -pkg_postinst() { - tmpfiles_process ostree-tmpfiles.conf -} diff --git a/dev-util/ostree/ostree-2023.5.ebuild b/dev-util/ostree/ostree-2023.5.ebuild deleted file mode 100644 index bd78accab71b..000000000000 --- a/dev-util/ostree/ostree-2023.5.ebuild +++ /dev/null @@ -1,122 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools systemd tmpfiles - -DESCRIPTION="Operating system and container binary deployment and upgrades" -HOMEPAGE="https://ostreedev.github.io/ostree/"; -SRC_URI=" - https://github.com/ostreedev/ostree/releases/download/v${PV}/lib${P}.tar.xz - -> ${P}.tar.xz -" -S="${WORKDIR}/lib${P}" - -KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" -LICENSE="LGPL-2+" -SLOT="0" - -IUSE="archive +curl doc dracut gnutls +gpg grub +http2 httpd introspection libmount selinux sodium ssl +soup systemd zeroconf" -RESTRICT="test" -REQUIRED_USE=" - dracut? ( systemd ) - http2? ( curl ) - httpd? ( || ( curl soup ) ) -" - -RDEPEND=" - app-arch/xz-utils - dev-libs/glib:2 - sys-fs/fuse:3 - sys-libs/zlib - archive? ( app-arch/libarchive:= ) - curl? ( net-misc/curl ) - dracut? ( sys-kernel/dracut ) - gpg? ( - app-crypt/gpgme:= - dev-libs/libgpg-error - ) - grub? ( sys-boot/grub:2= ) - introspection? ( dev-libs/gobject-introspection ) - libmount? ( sys-apps/util-linux ) - selinux? ( sys-libs/libselinux ) - sodium? ( >=dev-libs/libsodium-1.0.14:= ) - soup? ( net-libs/libsoup:3.0 ) - ssl? ( - gnutls? ( net-libs/gnutls:= ) - !gnutls? ( - dev-libs/openssl:0= - ) - ) - systemd? ( sys-apps/systemd:0= ) - zeroconf? ( net-dns/avahi[dbus] ) -" -DEPEND="${RDEPEND} - app-text/docbook-xml-dtd:4.2 - app-text/docbook-xsl-stylesheets - doc? ( - dev-util/gtk-doc - app-text/docbook-xml-dtd:4.3 - ) -" -BDEPEND=" - dev-libs/libxslt - dev-util/glib-utils - sys-devel/flex - sys-devel/bison - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}"/ostree-2023.3-dont-force-clang-introspection.patch -) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - # Needs Bison (bug #884289) - unset YACC - - local econfargs=( - --enable-man - --enable-shared - --with-grub2-mkconfig-path=grub-mkconfig - --with-modern-grub - $(use_with archive libarchive) - $(use_with curl) - $(use_with dracut dracut yesbutnoconf) #816867 - $(use_enable doc gtk-doc) - $(usex introspection --enable-introspection={,} yes no) - $(use_with gpg gpgme) - $(use_enable http2) - $(use_enable httpd trivial-httpd-cmdline) - $(use_with selinux ) - $(use_with soup soup3) - --without-soup # libsoup:2.4 - $(use_with libmount) - $(use ssl && { use gnutls && echo --with-crypto=gnutls || echo --with-crypto=openssl; }) - $(use_with sodium ed25519-libsodium) - $(use_with systemd libsystemd) - $(use_with zeroconf avahi) - ) - - if use systemd; then - econfargs+=( --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" ) - fi - - unset ${!XDG_*} #657346 g-ir-scanner sandbox violation - econf "${econfargs[@]}" -} - -src_install() { - default - find "${D}" -name '*.la' -delete || die -} - -pkg_postinst() { - tmpfiles_process ostree-tmpfiles.conf -} diff --git a/dev-util/ostree/ostree-2024.3.ebuild b/dev-util/ostree/ostree-2024.3.ebuild deleted file mode 100644 index bc45f57a3635..000000000000 --- a/dev-util/ostree/ostree-2024.3.ebuild +++ /dev/null @@ -1,119 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools systemd tmpfiles - -DESCRIPTION="Operating system and container binary deployment and upgrades" -HOMEPAGE="https://ostreedev.github.io/ostree/"; -SRC_URI=" - https://github.com/ostreedev/ostree/releases/download/v${PV}/lib${P}.tar.xz - -> ${P}.tar.xz -" -S="${WORKDIR}/lib${P}" - -LICENSE="LGPL-2+" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" -IUSE="archive +curl doc dracut gnutls +gpg grub +http2 introspection libmount selinux sodium ssl +soup systemd zeroconf" -RESTRICT="test" -REQUIRED_USE=" - dracut? ( systemd ) - http2? ( curl ) -" - -RDEPEND=" - app-arch/xz-utils - dev-libs/glib:2 - sys-fs/fuse:3 - sys-libs/zlib - archive? ( app-arch/libarchive:= ) - curl? ( net-misc/curl ) - dracut? ( sys-kernel/dracut ) - gpg? ( - app-crypt/gpgme:= - dev-libs/libgpg-error - ) - grub? ( sys-boot/grub:2= ) - introspection? ( dev-libs/gobject-introspection ) - libmount? ( sys-apps/util-linux ) - selinux? ( sys-libs/libselinux ) - sodium? ( >=dev-libs/libsodium-1.0.14:= ) - soup? ( net-libs/libsoup:3.0 ) - ssl? ( - gnutls? ( net-libs/gnutls:= ) - !gnutls? ( - dev-libs/openssl:0= - ) - ) - systemd? ( sys-apps/systemd:0= ) - zeroconf? ( net-dns/avahi[dbus] ) -" -DEPEND="${RDEPEND} - app-text/docbook-xml-dtd:4.2 - app-text/docbook-xsl-stylesheets - doc? ( - dev-util/gtk-doc - app-text/docbook-xml-dtd:4.3 - ) -" -BDEPEND=" - dev-libs/libxslt - dev-util/glib-utils - sys-devel/flex - sys-devel/bison - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}"/ostree-2023.3-dont-force-clang-introspection.patch -) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - # Needs Bison (bug #884289) - unset YACC - - local econfargs=( - --enable-man - --enable-shared - --with-grub2-mkconfig-path=grub-mkconfig - --with-modern-grub - $(use_with archive libarchive) - $(use_with curl) - $(use_with dracut dracut yesbutnoconf) #816867 - $(use_enable doc gtk-doc) - $(usex introspection --enable-introspection={,} yes no) - $(use_with gpg gpgme) - $(use_enable http2) - $(use_with selinux ) - $(use_with soup soup3) - --without-soup # libsoup:2.4 - $(use_with libmount) - $(use ssl && { use gnutls && echo --with-crypto=gnutls || echo --with-crypto=openssl; }) - $(use_with sodium ed25519-libsodium) - $(use_with systemd libsystemd) - $(use_with zeroconf avahi) - ) - - if use systemd; then - econfargs+=( --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" ) - fi - - unset ${!XDG_*} #657346 g-ir-scanner sandbox violation - econf "${econfargs[@]}" -} - -src_install() { - default - find "${D}" -name '*.la' -delete || die -} - -pkg_postinst() { - tmpfiles_process ostree-tmpfiles.conf -}
