gentoo auto-resync : 17:03:2023 - 06:26:48

2 files changed, 29 insertions, 18 deletions

diff --git a/dev-util/ostree/Manifest b/dev-util/ostree/Manifest
index 19f12cabb476..dbb63fc13784 100644
--- a/dev-util/ostree/Manifest
+++ b/dev-util/ostree/Manifest
@@ -1,14 +1,14 @@
 AUX ostree-2022.5-bashism.patch 1314 BLAKE2B ded18475b1ecfe381fbe9e763ae7ff2e30875055c4d491f819427065985d7dfc69b3fe280f2efe1f8a51725e7965d73647434ab130ef1d6b30822e4cbcfb725e SHA512 4e053eba1fe1d494d5bf0565a9ee076e8d01834c63d043b1c260ca2bbb9baa95f4903f6413b81cc12eaa0047de2c8c8061cd1a21a6f96ff153557487764baaf1
 AUX ostree-2022.5-glibc-2.36.patch 4381 BLAKE2B 66fce177399ad249ad22f62ffaddd780c57d87864fdef5cb9347e553e9fdb6fa1e94b12768a2bdd832a9968d29c77f49b83263b6d53428306efd73854bd77e23 SHA512 deb822f25ed0c7d14d4102766a5a4840e5f43193a7cedfbda20e8467c8df06e2fc6248bbf9c658ab5723330d5fcd96814bc3d0774c2b3d9e38611d1e34d0ca3a
 AUX ostree-2022.6-musl-allperms.patch 478 BLAKE2B 95191befc9281591480f3a80717817e262798b7d6fc3abf35cb5c0462267822092a102de446f5334e3807816418e7b2b5b4dd59cd66796734b85131873e2dc9a SHA512 275e4fd6c1547c852ec9d2a8649c45c5bec6fdc2351e9333adfc3ed31b0cbedefaca6db95ba97ec8a65fa16bd550827909f7172b46a6b64a184840272578b7cc
-DIST ostree-2021.3.tar.xz 2089804 BLAKE2B 5df33b676173b1ec08ac7592d4ddf8e3bfdcd84df1b3ce19e2f24c85780fed1f210b8adce1baf4ec87869c72984502276bf6e5a72268daaae6ce9b3d6dc6f88b SHA512 0df0d8f9bd82b16562dd5146997eddfb7cb6cffc1886601307d97a1cb1dc926bda7d0c899db26c974ed0dff1012dee11937e47c11c4d03307fa3d2d430adc60e
 DIST ostree-2022.2.tar.xz 2059592 BLAKE2B 73bb563be473f3f62ab2d0e1ec6e2b659c8c12aaba828ae6fd5bab4b6bd3a978ffe5d76e17734e40c0569e3e74f13b85aaf9ae467747c5bbb309c73b373e9909 SHA512 07be16101aa00f541833dc6123f015ee1af65e40e2c237322a129e944fa19791e7cad6f0b29ced3c128adbe23bdb3c8708688fadd4ed80b160acab584b84abfe
 DIST ostree-2022.5.tar.xz 2072208 BLAKE2B be12432c87da82362ceb49b61b0cfc2ab77fdd7e55dfd3ca238d3c0f6fa5e64dd953d709c39727a46f82b99ef07bfbebf83b581f5e96a10a08322854e9a0e1f9 SHA512 39abd076491ebab5cd6e23bff6ce0a346fe8d1e6a372abb42626ef5a8643411070b272637513b37393dc37af9b8eaaa42c19e2f1c16b98d441358c2046653654
 DIST ostree-2022.6.tar.xz 2124464 BLAKE2B c6ea1f11d08261e8532345ffc18bec9e77d04e63aab0c8e2eb03a4b3d3c2c594bcc9e6c5341e4caefe81fbd06a055cd39b0f2f2b43d3e876837a9bac43c704f5 SHA512 03f6b6947a372e36d3a1ae3bbe47543c562113039ce10db9c6f26a7b4015afb41950bd00bd1931937a5fb3043689ca1046eb87afd890571cfedbfa1ef36219a7
 DIST ostree-2022.7.tar.xz 2076728 BLAKE2B 7308be450e4aa9bebe3e8b86031bf75b7d0cd07a2e36d6d11d01aa8e8d19ed02e8560931a83f18856c7d4fc7ae6045d22b6aa4d7f577f3df9e704ae9d7562d3e SHA512 725eff027b2c4c1aec0c222a5fa6059f3a777f4d0c831b82a4021befba0078692aa5ced2c4c609530c70462b4148a3cc33152e3d9dc4a5d6f8cf98f61ef09c2a
-EBUILD ostree-2021.3-r3.ebuild 2602 BLAKE2B ded68dcb03e707c7ff8cd573441e71152b18d8ed644488828821edce67f2c278e097ea85018251679fe708ea3500959b0848511640bf2d51abb220ab4a69dca8 SHA512 2cae33883d20ea5f29c468e086040f87c97e1168bcc31913fe5adfe25d4f6e6a915e1f6112d77e14d4f69a86e572ada54982a5afd947ca43e8aad82362f7ef18
+DIST ostree-2023.1.tar.xz 2079904 BLAKE2B 993570624cb43684d81fff9f3789a9cee3b998f945a78bc6eb99330eed45739d1e6fb66589cefba10eea608c5cd389cc121a890c27efa773a405a5d8b1f117d9 SHA512 a6a6e47d6cb9ec6826d48a50a2abac69e4a040f2b5830d39e8a006c738a163fb15fde8630bf271d92cec9470601281669cd4bf942e4b7c4d42441bd5d1730572
 EBUILD ostree-2022.2.ebuild 2645 BLAKE2B 03f4a898d2553dc8fbd055c51b834270266237cf92e2fe06e614187e91ce84c276513f8bfb3d145b6786f12024a2997a6d4ded5850a875b45e1e9cb35d13ecde SHA512 e93f32725b1ab23082729e76f176c3563a0c65527dab55e090167d6a522441b3f5d9356e9809c2c2a7cb9a09fedf4390632c0791be63d54742eadb5e5b3439d4
 EBUILD ostree-2022.5-r1.ebuild 2734 BLAKE2B 3207e4271ee037096ca6f6ededc1a6b809469881ab8783afe9e611b89056ead85218dce7737c3d47612cbb489e986b4ca0099808ca5e872fafcc67355b7a4ece SHA512 a35f7529d14f7fad61231dec92f8c9bc8d68e007e943e5c9df938265153a0ae74e2d73790649781824c59e65337e04c69a76e6c8d00b656256ced11646097ca5
 EBUILD ostree-2022.6.ebuild 2707 BLAKE2B fa93a723c40519dd94489574ca7930c4bcb05027b3bbab37507ef9ff91f2de0a6ec30214a5fa6cd38ae40f7f0662697b8f82164b94bd09d49a0f7ae8eeaa80c9 SHA512 6b262393e11f797fac5c29b70f1daf40032dd07d41741fa802064e5bca5efb2e600c0d5a33d520d17cc8c2e5e21eceff4c8171ed9722adfbb936902f81558cab
 EBUILD ostree-2022.7-r1.ebuild 2787 BLAKE2B 457bfaf6e4413f570e9d57d22da646cb36180c2bf3c585bbae39c8590c275cc34675533e2b6132bfdcb3fbeccb326c36ec67a6e197d273193b6df98ee31aa08d SHA512 4cfbb3df5f87f7510a6bfb158e92f2e388403c4db18758f7a4f0540fe740acb9fcb44cbcbce5f2825065355eadea41bb0890e66378ea4d27bc5d6a6b26a4e008
+EBUILD ostree-2023.1.ebuild 2785 BLAKE2B b3781d6f39968226dc7f5d985c69d0dbbaed7fcc0065694266a70745ad3feac1193ff3d9731d076a2ad43319dae6a3ae3eae21e2b5ffd4eb3563af860b5eff2f SHA512 ab31310f5423d2a11220ae2164f3a4043456ddadcb9779f99a50cec3550560031b88f581cc7cfe513182ef294727a36bf599ef4fd88ec4ce7d62b2314cffa358
 MISC metadata.xml 1990 BLAKE2B 1c3e6400d24f0701211c0b8dcfba8d31c06b7c493cbe6eb2c5432ea818d0a0fbe863f8f1661eb386d179bb186cb7c970f7d7a3f8c9c42ea4b03b3d4ea0472a57 SHA512 04e37ddcd7348d43d475e04c996ee8b2e94c64143325dcfb21c5738b75f71ecd2c2ec64c8f91fbd06f5a6228671e90fdf10a939d4457abe4d0f88492435b4601
diff --git a/dev-util/ostree/ostree-2021.3-r3.ebuild b/dev-util/ostree/ostree-2023.1.ebuild
index 424f7319c6e0..216bb923eea8 100644
--- a/dev-util/ostree/ostree-2021.3-r3.ebuild
+++ b/dev-util/ostree/ostree-2023.1.ebuild
@@ -1,32 +1,34 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit autotools systemd
+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 ~ppc64 ~riscv x86"
+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"
+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="
-	archive? ( app-arch/libarchive:= )
 	app-arch/xz-utils
-	curl? ( net-misc/curl )
-	soup? ( net-libs/libsoup:2.4 )
 	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:=
@@ -34,17 +36,16 @@ COMMON_DEPEND="
 	)
 	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=
 		)
 	)
-	>=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] )"
 
@@ -62,11 +63,17 @@ BDEPEND="
 
 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
-	default
 }
 
 src_configure() {
@@ -77,7 +84,7 @@ src_configure() {
 		--with-modern-grub
 		$(use_with archive libarchive)
 		$(use_with curl)
-		$(use_with dracut)
+		$(use_with dracut dracut yesbutnoconf) #816867
 		$(use_enable doc gtk-doc)
 		$(usex introspection --enable-introspection={,} yes no)
 		$(use_with gpg gpgme)
@@ -97,10 +104,14 @@ src_configure() {
 	fi
 
 	unset ${!XDG_*} #657346 g-ir-scanner sandbox violation
-	econf ${econfargs[*]}
+	econf "${econfargs[@]}"
 }
 
 src_install() {
 	default
 	find "${D}" -name '*.la' -delete || die
 }
+
+pkg_postinst() {
+	tmpfiles_process ostree-tmpfiles.conf
+}