From 876c083eddbb82ff548acc67de7e481a6f00ec1b Mon Sep 17 00:00:00 2001
From: Sam James <sam@gentoo.org>
Date: Wed, 18 Aug 2021 15:55:28 +0100
Subject: dev-util/ostree: add missing subslot deps (mainly libsodium)
Signed-off-by: Sam James <sam@gentoo.org>
---
dev-util/ostree/ostree-2019.5-r1.ebuild | 90 ++++++++++++++++++++++++++++
dev-util/ostree/ostree-2019.5.ebuild | 90 ----------------------------
dev-util/ostree/ostree-2020.6-r1.ebuild | 90 ++++++++++++++++++++++++++++
dev-util/ostree/ostree-2020.6.ebuild | 90 ----------------------------
dev-util/ostree/ostree-2020.7-r1.ebuild | 102 ++++++++++++++++++++++++++++++++
dev-util/ostree/ostree-2020.7.ebuild | 102 --------------------------------
dev-util/ostree/ostree-2020.8-r1.ebuild | 102 ++++++++++++++++++++++++++++++++
dev-util/ostree/ostree-2020.8.ebuild | 102 --------------------------------
dev-util/ostree/ostree-2021.3-r1.ebuild | 102 ++++++++++++++++++++++++++++++++
dev-util/ostree/ostree-2021.3.ebuild | 102 --------------------------------
10 files changed, 486 insertions(+), 486 deletions(-)
create mode 100644 dev-util/ostree/ostree-2019.5-r1.ebuild
delete mode 100644 dev-util/ostree/ostree-2019.5.ebuild
create mode 100644 dev-util/ostree/ostree-2020.6-r1.ebuild
delete mode 100644 dev-util/ostree/ostree-2020.6.ebuild
create mode 100644 dev-util/ostree/ostree-2020.7-r1.ebuild
delete mode 100644 dev-util/ostree/ostree-2020.7.ebuild
create mode 100644 dev-util/ostree/ostree-2020.8-r1.ebuild
delete mode 100644 dev-util/ostree/ostree-2020.8.ebuild
create mode 100644 dev-util/ostree/ostree-2021.3-r1.ebuild
delete mode 100644 dev-util/ostree/ostree-2021.3.ebuild
(limited to 'dev-util/ostree')
diff --git a/dev-util/ostree/ostree-2019.5-r1.ebuild b/dev-util/ostree/ostree-2019.5-r1.ebuild
new file mode 100644
index 000000000000..657cfbb03ad7
--- /dev/null
+++ b/dev-util/ostree/ostree-2019.5-r1.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools systemd
+
+DESCRIPTION="Operating system and container binary deployment and upgrades"
+HOMEPAGE="https://ostree.readthedocs.io/en/latest/"
+SRC_URI="https://github.com/ostreedev/ostree/releases/download/v${PV}/lib${P}.tar.xz -> ${P}.tar.xz"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="LGPL-2+"
+SLOT="0"
+
+IUSE="archive curl doc dracut gnutls grub http2 httpd introspection libmount selinux ssl +soup systemd zeroconf"
+RESTRICT="test"
+REQUIRED_USE="httpd? ( || ( curl soup ) )"
+
+COMMON_DEPEND="
+ archive? ( app-arch/libarchive:= )
+ app-crypt/gpgme
+ app-arch/xz-utils
+ curl? ( net-misc/curl )
+ soup? ( net-libs/libsoup )
+ dev-libs/libassuan
+ dev-libs/libgpg-error
+ dev-libs/glib:2
+ dracut? ( sys-kernel/dracut )
+ grub? ( sys-boot/grub:2= )
+ introspection? ( dev-libs/gobject-introspection )
+ ssl? (
+ gnutls? ( net-libs/gnutls:= )
+ !gnutls? ( dev-libs/openssl:0= ) )
+ >=sys-fs/fuse-2.9.2:0
+ sys-libs/zlib
+ libmount? ( sys-apps/util-linux )
+ selinux? ( sys-libs/libselinux )
+ 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}"
+
+src_prepare() {
+ sed -Ee 's:(XSLT_STYLESHEET = ).*:\1/usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl:' \
+ -i Makefile.in Makefile-man.am || die
+
+ eautoreconf
+ default
+}
+
+src_configure() {
+ local econfargs=(
+ --enable-man
+ --enable-shared
+ $(use_with archive libarchive)
+ $(use_with curl)
+ $(use_with dracut)
+ $(use_enable doc gtk-doc)
+ $(use_enable introspection)
+ $(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 systemd libsystemd)
+ $(use_with zeroconf avahi)
+ )
+
+ unset ${!XDG_*} #657346 g-ir-scanner sandbox violation
+ econf ${econfargs[*]}
+}
+
+src_install() {
+ default
+ find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-util/ostree/ostree-2019.5.ebuild b/dev-util/ostree/ostree-2019.5.ebuild
deleted file mode 100644
index d06c2895971c..000000000000
--- a/dev-util/ostree/ostree-2019.5.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools systemd
-
-DESCRIPTION="Operating system and container binary deployment and upgrades"
-HOMEPAGE="https://ostree.readthedocs.io/en/latest/"
-SRC_URI="https://github.com/ostreedev/ostree/releases/download/v${PV}/lib${P}.tar.xz -> ${P}.tar.xz"
-
-KEYWORDS="~amd64 ~x86"
-LICENSE="LGPL-2+"
-SLOT="0"
-
-IUSE="archive curl doc dracut gnutls grub http2 httpd introspection libmount selinux ssl +soup systemd zeroconf"
-RESTRICT="test"
-REQUIRED_USE="httpd? ( || ( curl soup ) )"
-
-COMMON_DEPEND="
- archive? ( app-arch/libarchive )
- app-crypt/gpgme
- app-arch/xz-utils
- curl? ( net-misc/curl )
- soup? ( net-libs/libsoup )
- dev-libs/libassuan
- dev-libs/libgpg-error
- dev-libs/glib:2
- dracut? ( sys-kernel/dracut )
- grub? ( sys-boot/grub:2= )
- introspection? ( dev-libs/gobject-introspection )
- ssl? (
- gnutls? ( net-libs/gnutls )
- !gnutls? ( dev-libs/openssl:0= ) )
- >=sys-fs/fuse-2.9.2:0
- sys-libs/zlib
- libmount? ( sys-apps/util-linux )
- selinux? ( sys-libs/libselinux )
- 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}"
-
-src_prepare() {
- sed -Ee 's:(XSLT_STYLESHEET = ).*:\1/usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl:' \
- -i Makefile.in Makefile-man.am || die
-
- eautoreconf
- default
-}
-
-src_configure() {
- local econfargs=(
- --enable-man
- --enable-shared
- $(use_with archive libarchive)
- $(use_with curl)
- $(use_with dracut)
- $(use_enable doc gtk-doc)
- $(use_enable introspection)
- $(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 systemd libsystemd)
- $(use_with zeroconf avahi)
- )
-
- unset ${!XDG_*} #657346 g-ir-scanner sandbox violation
- econf ${econfargs[*]}
-}
-
-src_install() {
- default
- find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-util/ostree/ostree-2020.6-r1.ebuild b/dev-util/ostree/ostree-2020.6-r1.ebuild
new file mode 100644
index 000000000000..1becdf339f83
--- /dev/null
+++ b/dev-util/ostree/ostree-2020.6-r1.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools systemd
+
+DESCRIPTION="Operating system and container binary deployment and upgrades"
+HOMEPAGE="https://ostree.readthedocs.io/en/latest/"
+SRC_URI="https://github.com/ostreedev/ostree/releases/download/v${PV}/lib${P}.tar.xz -> ${P}.tar.xz"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="LGPL-2+"
+SLOT="0"
+
+IUSE="archive curl doc dracut gnutls grub http2 httpd introspection libmount selinux ssl +soup systemd zeroconf"
+RESTRICT="test"
+REQUIRED_USE="httpd? ( || ( curl soup ) )"
+
+COMMON_DEPEND="
+ archive? ( app-arch/libarchive:= )
+ app-crypt/gpgme
+ app-arch/xz-utils
+ curl? ( net-misc/curl )
+ soup? ( net-libs/libsoup )
+ dev-libs/libassuan
+ dev-libs/libgpg-error
+ dev-libs/glib:2
+ dracut? ( sys-kernel/dracut )
+ grub? ( sys-boot/grub:2= )
+ introspection? ( dev-libs/gobject-introspection )
+ ssl? (
+ gnutls? ( net-libs/gnutls:= )
+ !gnutls? ( dev-libs/openssl:0= ) )
+ >=sys-fs/fuse-2.9.2:0
+ sys-libs/zlib
+ libmount? ( sys-apps/util-linux )
+ selinux? ( sys-libs/libselinux )
+ 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}"
+
+src_prepare() {
+ sed -Ee 's:(XSLT_STYLESHEET = ).*:\1/usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl:' \
+ -i Makefile.in Makefile-man.am || die
+
+ eautoreconf
+ default
+}
+
+src_configure() {
+ local econfargs=(
+ --enable-man
+ --enable-shared
+ $(use_with archive libarchive)
+ $(use_with curl)
+ $(use_with dracut)
+ $(use_enable doc gtk-doc)
+ $(usex introspection --enable-introspection={,} yes no)
+ $(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 systemd libsystemd)
+ $(use_with zeroconf avahi)
+ )
+
+ unset ${!XDG_*} #657346 g-ir-scanner sandbox violation
+ econf ${econfargs[*]}
+}
+
+src_install() {
+ default
+ find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-util/ostree/ostree-2020.6.ebuild b/dev-util/ostree/ostree-2020.6.ebuild
deleted file mode 100644
index 5fd21f9d1b6d..000000000000
--- a/dev-util/ostree/ostree-2020.6.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools systemd
-
-DESCRIPTION="Operating system and container binary deployment and upgrades"
-HOMEPAGE="https://ostree.readthedocs.io/en/latest/"
-SRC_URI="https://github.com/ostreedev/ostree/releases/download/v${PV}/lib${P}.tar.xz -> ${P}.tar.xz"
-
-KEYWORDS="~amd64 ~x86"
-LICENSE="LGPL-2+"
-SLOT="0"
-
-IUSE="archive curl doc dracut gnutls grub http2 httpd introspection libmount selinux ssl +soup systemd zeroconf"
-RESTRICT="test"
-REQUIRED_USE="httpd? ( || ( curl soup ) )"
-
-COMMON_DEPEND="
- archive? ( app-arch/libarchive )
- app-crypt/gpgme
- app-arch/xz-utils
- curl? ( net-misc/curl )
- soup? ( net-libs/libsoup )
- dev-libs/libassuan
- dev-libs/libgpg-error
- dev-libs/glib:2
- dracut? ( sys-kernel/dracut )
- grub? ( sys-boot/grub:2= )
- introspection? ( dev-libs/gobject-introspection )
- ssl? (
- gnutls? ( net-libs/gnutls )
- !gnutls? ( dev-libs/openssl:0= ) )
- >=sys-fs/fuse-2.9.2:0
- sys-libs/zlib
- libmount? ( sys-apps/util-linux )
- selinux? ( sys-libs/libselinux )
- 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}"
-
-src_prepare() {
- sed -Ee 's:(XSLT_STYLESHEET = ).*:\1/usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl:' \
- -i Makefile.in Makefile-man.am || die
-
- eautoreconf
- default
-}
-
-src_configure() {
- local econfargs=(
- --enable-man
- --enable-shared
- $(use_with archive libarchive)
- $(use_with curl)
- $(use_with dracut)
- $(use_enable doc gtk-doc)
- $(usex introspection --enable-introspection={,} yes no)
- $(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 systemd libsystemd)
- $(use_with zeroconf avahi)
- )
-
- unset ${!XDG_*} #657346 g-ir-scanner sandbox violation
- econf ${econfargs[*]}
-}
-
-src_install() {
- default
- find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-util/ostree/ostree-2020.7-r1.ebuild b/dev-util/ostree/ostree-2020.7-r1.ebuild
new file mode 100644
index 000000000000..db88053bf6da
--- /dev/null
+++ b/dev-util/ostree/ostree-2020.7-r1.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools systemd
+
+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 ~ppc64 ~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="httpd? ( || ( curl soup ) )"
+
+COMMON_DEPEND="
+ archive? ( app-arch/libarchive:= )
+ app-arch/xz-utils
+ curl? ( net-misc/curl )
+ soup? ( net-libs/libsoup )
+ dev-libs/libassuan
+ dev-libs/glib:2
+ dracut? ( sys-kernel/dracut )
+ gpg? (
+ app-crypt/gpgme
+ dev-libs/libgpg-error
+ )
+ grub? ( sys-boot/grub:2= )
+ introspection? ( dev-libs/gobject-introspection )
+ ssl? (
+ gnutls? ( net-libs/gnutls:= )
+ !gnutls? (
+ dev-libs/openssl:0=
+ )
+ )
+ >=sys-fs/fuse-2.9.2:0
+ sys-libs/zlib
+ libmount? ( sys-apps/util-linux )
+ selinux? ( sys-libs/libselinux )
+ sodium? ( >=dev-libs/libsodium-1.0.14:= )
+ 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}"
+
+src_prepare() {
+ sed -Ee 's:(XSLT_STYLESHEET = ).*:\1/usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl:' \
+ -i Makefile.in Makefile-man.am || die
+ eautoreconf
+ default
+}
+
+src_configure() {
+ local econfargs=(
+ --enable-man
+ --enable-shared
+ $(use_with archive libarchive)
+ $(use_with curl)
+ $(use_with dracut)
+ $(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
+ rm -f "${ED}/etc/grub.d/15_ostree"
+}
diff --git a/dev-util/ostree/ostree-2020.7.ebuild b/dev-util/ostree/ostree-2020.7.ebuild
deleted file mode 100644
index 20c372540e27..000000000000
--- a/dev-util/ostree/ostree-2020.7.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools systemd
-
-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 ~ppc64 ~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="httpd? ( || ( curl soup ) )"
-
-COMMON_DEPEND="
- archive? ( app-arch/libarchive )
- app-arch/xz-utils
- curl? ( net-misc/curl )
- soup? ( net-libs/libsoup )
- dev-libs/libassuan
- dev-libs/glib:2
- dracut? ( sys-kernel/dracut )
- gpg? (
- app-crypt/gpgme
- dev-libs/libgpg-error
- )
- grub? ( sys-boot/grub:2= )
- introspection? ( dev-libs/gobject-introspection )
- ssl? (
- gnutls? ( net-libs/gnutls )
- !gnutls? (
- dev-libs/openssl:0=
- )
- )
- >=sys-fs/fuse-2.9.2:0
- sys-libs/zlib
- libmount? ( sys-apps/util-linux )
- selinux? ( sys-libs/libselinux )
- sodium? ( >=dev-libs/libsodium-1.0.14 )
- 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}"
-
-src_prepare() {
- sed -Ee 's:(XSLT_STYLESHEET = ).*:\1/usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl:' \
- -i Makefile.in Makefile-man.am || die
- eautoreconf
- default
-}
-
-src_configure() {
- local econfargs=(
- --enable-man
- --enable-shared
- $(use_with archive libarchive)
- $(use_with curl)
- $(use_with dracut)
- $(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
- rm -f "${ED}/etc/grub.d/15_ostree"
-}
diff --git a/dev-util/ostree/ostree-2020.8-r1.ebuild b/dev-util/ostree/ostree-2020.8-r1.ebuild
new file mode 100644
index 000000000000..01da470775d6
--- /dev/null
+++ b/dev-util/ostree/ostree-2020.8-r1.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools systemd
+
+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 ~ppc64 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="httpd? ( || ( curl soup ) )"
+
+COMMON_DEPEND="
+ archive? ( app-arch/libarchive:= )
+ app-arch/xz-utils
+ curl? ( net-misc/curl )
+ soup? ( net-libs/libsoup )
+ dev-libs/libassuan
+ dev-libs/glib:2
+ dracut? ( sys-kernel/dracut )
+ gpg? (
+ app-crypt/gpgme
+ dev-libs/libgpg-error
+ )
+ grub? ( sys-boot/grub:2= )
+ introspection? ( dev-libs/gobject-introspection )
+ ssl? (
+ gnutls? ( net-libs/gnutls:= )
+ !gnutls? (
+ dev-libs/openssl:0=
+ )
+ )
+ >=sys-fs/fuse-2.9.2:0
+ sys-libs/zlib
+ libmount? ( sys-apps/util-linux )
+ selinux? ( sys-libs/libselinux )
+ sodium? ( >=dev-libs/libsodium-1.0.14:= )
+ 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}"
+
+src_prepare() {
+ sed -Ee 's:(XSLT_STYLESHEET = ).*:\1/usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl:' \
+ -i Makefile.in Makefile-man.am || die
+ eautoreconf
+ default
+}
+
+src_configure() {
+ local econfargs=(
+ --enable-man
+ --enable-shared
+ $(use_with archive libarchive)
+ $(use_with curl)
+ $(use_with dracut)
+ $(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
+ rm -f "${ED}/etc/grub.d/15_ostree"
+}
diff --git a/dev-util/ostree/ostree-2020.8.ebuild b/dev-util/ostree/ostree-2020.8.ebuild
deleted file mode 100644
index c01961c4902d..000000000000
--- a/dev-util/ostree/ostree-2020.8.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools systemd
-
-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 ~ppc64 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="httpd? ( || ( curl soup ) )"
-
-COMMON_DEPEND="
- archive? ( app-arch/libarchive )
- app-arch/xz-utils
- curl? ( net-misc/curl )
- soup? ( net-libs/libsoup )
- dev-libs/libassuan
- dev-libs/glib:2
- dracut? ( sys-kernel/dracut )
- gpg? (
- app-crypt/gpgme
- dev-libs/libgpg-error
- )
- grub? ( sys-boot/grub:2= )
- introspection? ( dev-libs/gobject-introspection )
- ssl? (
- gnutls? ( net-libs/gnutls )
- !gnutls? (
- dev-libs/openssl:0=
- )
- )
- >=sys-fs/fuse-2.9.2:0
- sys-libs/zlib
- libmount? ( sys-apps/util-linux )
- selinux? ( sys-libs/libselinux )
- sodium? ( >=dev-libs/libsodium-1.0.14 )
- 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}"
-
-src_prepare() {
- sed -Ee 's:(XSLT_STYLESHEET = ).*:\1/usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl:' \
- -i Makefile.in Makefile-man.am || die
- eautoreconf
- default
-}
-
-src_configure() {
- local econfargs=(
- --enable-man
- --enable-shared
- $(use_with archive libarchive)
- $(use_with curl)
- $(use_with dracut)
- $(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
- rm -f "${ED}/etc/grub.d/15_ostree"
-}
diff --git a/dev-util/ostree/ostree-2021.3-r1.ebuild b/dev-util/ostree/ostree-2021.3-r1.ebuild
new file mode 100644
index 000000000000..db88053bf6da
--- /dev/null
+++ b/dev-util/ostree/ostree-2021.3-r1.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools systemd
+
+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 ~ppc64 ~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="httpd? ( || ( curl soup ) )"
+
+COMMON_DEPEND="
+ archive? ( app-arch/libarchive:= )
+ app-arch/xz-utils
+ curl? ( net-misc/curl )
+ soup? ( net-libs/libsoup )
+ dev-libs/libassuan
+ dev-libs/glib:2
+ dracut? ( sys-kernel/dracut )
+ gpg? (
+ app-crypt/gpgme
+ dev-libs/libgpg-error
+ )
+ grub? ( sys-boot/grub:2= )
+ introspection? ( dev-libs/gobject-introspection )
+ ssl? (
+ gnutls? ( net-libs/gnutls:= )
+ !gnutls? (
+ dev-libs/openssl:0=
+ )
+ )
+ >=sys-fs/fuse-2.9.2:0
+ sys-libs/zlib
+ libmount? ( sys-apps/util-linux )
+ selinux? ( sys-libs/libselinux )
+ sodium? ( >=dev-libs/libsodium-1.0.14:= )
+ 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}"
+
+src_prepare() {
+ sed -Ee 's:(XSLT_STYLESHEET = ).*:\1/usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl:' \
+ -i Makefile.in Makefile-man.am || die
+ eautoreconf
+ default
+}
+
+src_configure() {
+ local econfargs=(
+ --enable-man
+ --enable-shared
+ $(use_with archive libarchive)
+ $(use_with curl)
+ $(use_with dracut)
+ $(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
+ rm -f "${ED}/etc/grub.d/15_ostree"
+}
diff --git a/dev-util/ostree/ostree-2021.3.ebuild b/dev-util/ostree/ostree-2021.3.ebuild
deleted file mode 100644
index 20c372540e27..000000000000
--- a/dev-util/ostree/ostree-2021.3.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools systemd
-
-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 ~ppc64 ~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="httpd? ( || ( curl soup ) )"
-
-COMMON_DEPEND="
- archive? ( app-arch/libarchive )
- app-arch/xz-utils
- curl? ( net-misc/curl )
- soup? ( net-libs/libsoup )
- dev-libs/libassuan
- dev-libs/glib:2
- dracut? ( sys-kernel/dracut )
- gpg? (
- app-crypt/gpgme
- dev-libs/libgpg-error
- )
- grub? ( sys-boot/grub:2= )
- introspection? ( dev-libs/gobject-introspection )
- ssl? (
- gnutls? ( net-libs/gnutls )
- !gnutls? (
- dev-libs/openssl:0=
- )
- )
- >=sys-fs/fuse-2.9.2:0
- sys-libs/zlib
- libmount? ( sys-apps/util-linux )
- selinux? ( sys-libs/libselinux )
- sodium? ( >=dev-libs/libsodium-1.0.14 )
- 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}"
-
-src_prepare() {
- sed -Ee 's:(XSLT_STYLESHEET = ).*:\1/usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl:' \
- -i Makefile.in Makefile-man.am || die
- eautoreconf
- default
-}
-
-src_configure() {
- local econfargs=(
- --enable-man
- --enable-shared
- $(use_with archive libarchive)
- $(use_with curl)
- $(use_with dracut)
- $(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
- rm -f "${ED}/etc/grub.d/15_ostree"
-}
--
cgit v1.2.3-65-gdbad