gentoo auto-resync : 10:05:2023 - 23:44:41

3 files changed, 18 insertions, 138 deletions

diff --git a/dev-util/ostree/Manifest b/dev-util/ostree/Manifest
index 3a008501f8ad..abe263e0758f 100644
--- a/dev-util/ostree/Manifest
+++ b/dev-util/ostree/Manifest
@@ -1,8 +1,6 @@
 AUX ostree-2022.6-musl-allperms.patch 478 BLAKE2B 95191befc9281591480f3a80717817e262798b7d6fc3abf35cb5c0462267822092a102de446f5334e3807816418e7b2b5b4dd59cd66796734b85131873e2dc9a SHA512 275e4fd6c1547c852ec9d2a8649c45c5bec6fdc2351e9333adfc3ed31b0cbedefaca6db95ba97ec8a65fa16bd550827909f7172b46a6b64a184840272578b7cc
-DIST ostree-2022.6.tar.xz 2124464 BLAKE2B c6ea1f11d08261e8532345ffc18bec9e77d04e63aab0c8e2eb03a4b3d3c2c594bcc9e6c5341e4caefe81fbd06a055cd39b0f2f2b43d3e876837a9bac43c704f5 SHA512 03f6b6947a372e36d3a1ae3bbe47543c562113039ce10db9c6f26a7b4015afb41950bd00bd1931937a5fb3043689ca1046eb87afd890571cfedbfa1ef36219a7
-DIST ostree-2022.7.tar.xz 2076728 BLAKE2B 7308be450e4aa9bebe3e8b86031bf75b7d0cd07a2e36d6d11d01aa8e8d19ed02e8560931a83f18856c7d4fc7ae6045d22b6aa4d7f577f3df9e704ae9d7562d3e SHA512 725eff027b2c4c1aec0c222a5fa6059f3a777f4d0c831b82a4021befba0078692aa5ced2c4c609530c70462b4148a3cc33152e3d9dc4a5d6f8cf98f61ef09c2a
 DIST ostree-2023.1.tar.xz 2079904 BLAKE2B 993570624cb43684d81fff9f3789a9cee3b998f945a78bc6eb99330eed45739d1e6fb66589cefba10eea608c5cd389cc121a890c27efa773a405a5d8b1f117d9 SHA512 a6a6e47d6cb9ec6826d48a50a2abac69e4a040f2b5830d39e8a006c738a163fb15fde8630bf271d92cec9470601281669cd4bf942e4b7c4d42441bd5d1730572
-EBUILD ostree-2022.6.ebuild 2749 BLAKE2B 19b1bb11064d08c7feb4d174f449d72e76079817fd22652a94e39ebad8b0f3ef49a7e87bba80edbaa07c166f6ddadd90f95b12796e646a905ec17da5e4e2f119 SHA512 4116942743ddfa37219d4f2a6fe2c3a5bd1c75e2a6b67fd80270574750c562a950bbf524e9337664e14188b7fc80b16c5650ec7e7dcce85312403530beb592a3
-EBUILD ostree-2022.7-r1.ebuild 2829 BLAKE2B e8334a9adf020f19cf780dca768796888afd4972d979e85b95f5e01258a6b1d0f4b23c3a598d7469e73459bb55a993ab23d699a6c07ca71523a9207cfc8f7e3b SHA512 5e14b237243c390d1bc63735b7eb6b5c6ca40ff27efa478cd5e36c418c0f6c5fb7707f1fe20b4b681d75dbf891a6a687f1b10a5e5d79b5052669e31a11f03101
+DIST ostree-2023.2.tar.xz 2081320 BLAKE2B f773bf979b4bc97b9b8f96dc4385745bc386c29952a36c07cdd33a7db7802876ce154b5ac1f3669605ab3949a539aa8e2b3a3d94608557eb65249b5188f9d012 SHA512 549a2bdf8cef93d421aaf990e2d1c534063f0314b5933db7ce123bdd138229e24cc171d541296e45a7546a91d35149c1c8f29ea90949876200c574e7ec297b98
 EBUILD ostree-2023.1.ebuild 2824 BLAKE2B 144f93d943f0879e9104d78996600c50c7e6f936a578baf15b13f65191f8299ef45805008111443d00ac6dc85d270c48403d1bcf8bfbb090be8ce899e49f32aa SHA512 7b44a33dfbd808708009cb3c7e6f4b92bdf9d6a6c7f657bc86033451435ad5907f7e1dbeca45a7eaab24e394159ef0e96a3a9f691bfc7b093c92f5158d3a58e9
+EBUILD ostree-2023.2.ebuild 2651 BLAKE2B 1c2e921eabf6ba07731654af72e28c6e4d58aa7571b39edfcc253df2eab833430e19365a0e0db11c1b5a51e71438f4e8d2692f0802672b9fe9821d7c1ff22202 SHA512 f4919163f99fa1de99ee307ec5c03eff49cf684fea5a727b2a8cbac88e4b6dc2a8368b5d5fe8b1b5501148a475a3d83759a818be56495065538120fb22b34faa
 MISC metadata.xml 1990 BLAKE2B 1c3e6400d24f0701211c0b8dcfba8d31c06b7c493cbe6eb2c5432ea818d0a0fbe863f8f1661eb386d179bb186cb7c970f7d7a3f8c9c42ea4b03b3d4ea0472a57 SHA512 04e37ddcd7348d43d475e04c996ee8b2e94c64143325dcfb21c5738b75f71ecd2c2ec64c8f91fbd06f5a6228671e90fdf10a939d4457abe4d0f88492435b4601
diff --git a/dev-util/ostree/ostree-2022.6.ebuild b/dev-util/ostree/ostree-2022.6.ebuild
deleted file mode 100644
index 030a24150f38..000000000000
--- a/dev-util/ostree/ostree-2022.6.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2023 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 ~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}"/${P}-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
-}
diff --git a/dev-util/ostree/ostree-2022.7-r1.ebuild b/dev-util/ostree/ostree-2023.2.ebuild
index 8affb7d1e501..32ce2d1f9766 100644
--- a/dev-util/ostree/ostree-2022.7-r1.ebuild
+++ b/dev-util/ostree/ostree-2023.2.ebuild
@@ -1,27 +1,31 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+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"
+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"
+RESTRICT="test"
 REQUIRED_USE="
 	dracut? ( systemd )
 	http2? ( curl )
 	httpd? ( || ( curl soup ) )
 "
 
-COMMON_DEPEND="
+RDEPEND="
 	app-arch/xz-utils
 	dev-libs/libassuan
 	dev-libs/glib:2
@@ -47,21 +51,19 @@ COMMON_DEPEND="
 		)
 	)
 	systemd? ( sys-apps/systemd:0= )
-	zeroconf? ( net-dns/avahi[dbus] )"
-
-DEPEND="${COMMON_DEPEND}
+	zeroconf? ( net-dns/avahi[dbus] )
+"
+DEPEND="${RDEPEND}
 	app-text/docbook-xsl-stylesheets
 	dev-libs/libxslt
-	doc? ( dev-util/gtk-doc )"
-
-RDEPEND="${COMMON_DEPEND}"
+	doc? ( dev-util/gtk-doc )
+"
 BDEPEND="
 	dev-util/glib-utils
 	sys-devel/flex
 	sys-devel/bison
-	virtual/pkgconfig"
-
-S="${WORKDIR}/lib${P}"
+	virtual/pkgconfig
+"
 
 PATCHES=(
 	"${FILESDIR}"/ostree-2022.6-musl-allperms.patch
@@ -69,10 +71,6 @@ PATCHES=(
 
 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
 }
 
@@ -103,7 +101,7 @@ src_configure() {
 	)
 
 	if use systemd; then
-		econfargs+=(--with-systemdsystemunitdir="$(systemd_get_systemunitdir)")
+		econfargs+=( --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" )
 	fi
 
 	unset ${!XDG_*} #657346 g-ir-scanner sandbox violation