gentoo resync : 29.12.2022

4 files changed, 2 insertions, 220 deletions

diff --git a/dev-util/ostree/Manifest b/dev-util/ostree/Manifest
index 06d2a95b2669..b4e675b3e6f3 100644
--- a/dev-util/ostree/Manifest
+++ b/dev-util/ostree/Manifest
@@ -1,11 +1,7 @@
 DIST ostree-2021.3.tar.xz 2089804 BLAKE2B 5df33b676173b1ec08ac7592d4ddf8e3bfdcd84df1b3ce19e2f24c85780fed1f210b8adce1baf4ec87869c72984502276bf6e5a72268daaae6ce9b3d6dc6f88b SHA512 0df0d8f9bd82b16562dd5146997eddfb7cb6cffc1886601307d97a1cb1dc926bda7d0c899db26c974ed0dff1012dee11937e47c11c4d03307fa3d2d430adc60e
-DIST ostree-2021.4.tar.xz 2048424 BLAKE2B 386ed38f6dc8035a429505d8392682f739bc9a57a8cf9d7960942cd0ff0b61eee314116866c3b520d802a3f16f6dfecd1ea45a7b1d44cac8d065ad56a1ed2c2f SHA512 9bde7281afa456b30253149639854f579c1f1bdf6c429059eeb69042515b5ebfdf6426b4c9780ca8e700a11f0ec05cfc03e48baa8d0858ddbca7d3942aab9bbd
-DIST ostree-2021.5.tar.xz 2049572 BLAKE2B 946e863470e53a27f9936e224e2fdf00aa70c47d141b4101e00935f597aee037fd60d0d5660e7f41cb7a3fc7051a5f286a96e10a16b7f35da2be26c29c745346 SHA512 73d463e9cfaa027ac640051615b312c1800e71b2587e33cbae1e60356cb3c3f5d4afcda8ace680636ebd1d112061f2a8a7c25c46aa24a1b260244451157ffe8a
-DIST ostree-2022.1.tar.xz 2101172 BLAKE2B 52f6723acfb2889ef232f0fdec39fc50a879b110fcc89aa318dc0eb336e50ef2c3cc0d4df4319601b6198b7789da3605a55979d0c9ee31029ae47832b0cb385f SHA512 73da367d3b9b5facc5ba894bd0f9297a7fc688fa69871b668e6568663fefc1f44433c8be352d57c23153b09144c6535e52d8c184a2ab103190ec37dc1abc2818
 DIST ostree-2022.2.tar.xz 2059592 BLAKE2B 73bb563be473f3f62ab2d0e1ec6e2b659c8c12aaba828ae6fd5bab4b6bd3a978ffe5d76e17734e40c0569e3e74f13b85aaf9ae467747c5bbb309c73b373e9909 SHA512 07be16101aa00f541833dc6123f015ee1af65e40e2c237322a129e944fa19791e7cad6f0b29ced3c128adbe23bdb3c8708688fadd4ed80b160acab584b84abfe
+DIST ostree-2022.4.tar.xz 2066276 BLAKE2B 67fe73babe11dac93f8e035f7baf39e98aa2be2d797d3831a30999de2f7205b33c3d0892d2ec007807f8720e15161ecccb7e5f3c047d07cb5763bfcac2170bd8 SHA512 a7745b951b1f36f483c215b311f86d860b988ebb06612e7eef2797fc34322c256ae83177337d918f3e8e3833fe9802f7d53131db59df73d29fb6c305b78879e5
 EBUILD ostree-2021.3-r3.ebuild 2602 BLAKE2B ded68dcb03e707c7ff8cd573441e71152b18d8ed644488828821edce67f2c278e097ea85018251679fe708ea3500959b0848511640bf2d51abb220ab4a69dca8 SHA512 2cae33883d20ea5f29c468e086040f87c97e1168bcc31913fe5adfe25d4f6e6a915e1f6112d77e14d4f69a86e572ada54982a5afd947ca43e8aad82362f7ef18
-EBUILD ostree-2021.4-r2.ebuild 2656 BLAKE2B 3c72aec826b9cac51d78517419f2d4f68a6d36dd3ba711b13db8b1bae42fbc21c6b05ea509469086b2966091f57b807d1eb3ee58b0a8952a3f2b1726469791d3 SHA512 96631a2cab895f7be2d23f4b5d5dee20c0271708afcf7c0993601e19146421677143a45ec6ccba998a40d8f5eb4863e1874d01e0644a5ac65db78bcfd22db181
-EBUILD ostree-2021.5-r1.ebuild 2656 BLAKE2B 3c72aec826b9cac51d78517419f2d4f68a6d36dd3ba711b13db8b1bae42fbc21c6b05ea509469086b2966091f57b807d1eb3ee58b0a8952a3f2b1726469791d3 SHA512 96631a2cab895f7be2d23f4b5d5dee20c0271708afcf7c0993601e19146421677143a45ec6ccba998a40d8f5eb4863e1874d01e0644a5ac65db78bcfd22db181
-EBUILD ostree-2022.1-r1.ebuild 2648 BLAKE2B 2eb78554d9fd0c1ff38ff832823209e7556ff645e8e1cd225b0f693db813d6a105fedcfff8e63fc2d9c8e63955ba181d425ac7891adf107028a51b45013ea0a5 SHA512 c01f1c3646553d4c227e7f414361ef731b528be5a2b31e9bfa02329dff6304e0ea46236775c4a79a6f52561c7c000ed2b520990e42648e99e55e54e3ada4d38a
 EBUILD ostree-2022.2.ebuild 2645 BLAKE2B 03f4a898d2553dc8fbd055c51b834270266237cf92e2fe06e614187e91ce84c276513f8bfb3d145b6786f12024a2997a6d4ded5850a875b45e1e9cb35d13ecde SHA512 e93f32725b1ab23082729e76f176c3563a0c65527dab55e090167d6a522441b3f5d9356e9809c2c2a7cb9a09fedf4390632c0791be63d54742eadb5e5b3439d4
+EBUILD ostree-2022.4.ebuild 2648 BLAKE2B 2eb78554d9fd0c1ff38ff832823209e7556ff645e8e1cd225b0f693db813d6a105fedcfff8e63fc2d9c8e63955ba181d425ac7891adf107028a51b45013ea0a5 SHA512 c01f1c3646553d4c227e7f414361ef731b528be5a2b31e9bfa02329dff6304e0ea46236775c4a79a6f52561c7c000ed2b520990e42648e99e55e54e3ada4d38a
 MISC metadata.xml 1990 BLAKE2B 1c3e6400d24f0701211c0b8dcfba8d31c06b7c493cbe6eb2c5432ea818d0a0fbe863f8f1661eb386d179bb186cb7c970f7d7a3f8c9c42ea4b03b3d4ea0472a57 SHA512 04e37ddcd7348d43d475e04c996ee8b2e94c64143325dcfb21c5738b75f71ecd2c2ec64c8f91fbd06f5a6228671e90fdf10a939d4457abe4d0f88492435b4601
diff --git a/dev-util/ostree/ostree-2021.4-r2.ebuild b/dev-util/ostree/ostree-2021.4-r2.ebuild
deleted file mode 100644
index 68a663e35584..000000000000
--- a/dev-util/ostree/ostree-2021.4-r2.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2022 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 ~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-2.9.2:0
-	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}"
-
-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
-		--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
-}
diff --git a/dev-util/ostree/ostree-2021.5-r1.ebuild b/dev-util/ostree/ostree-2021.5-r1.ebuild
deleted file mode 100644
index 68a663e35584..000000000000
--- a/dev-util/ostree/ostree-2021.5-r1.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2022 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 ~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-2.9.2:0
-	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}"
-
-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
-		--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
-}
diff --git a/dev-util/ostree/ostree-2022.1-r1.ebuild b/dev-util/ostree/ostree-2022.4.ebuild
index 43f60e37b878..43f60e37b878 100644
--- a/dev-util/ostree/ostree-2022.1-r1.ebuild
+++ b/dev-util/ostree/ostree-2022.4.ebuild