5 files changed, 118 insertions, 3 deletions
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 30f4645c7e49..82c5e660c838 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/oprofile/Manifest b/dev-util/oprofile/Manifest
index bef0d4cd4dcf..d2d4d4200053 100644
--- a/dev-util/oprofile/Manifest
+++ b/dev-util/oprofile/Manifest
@@ -1,5 +1,5 @@
 AUX gcc12.patch 904 BLAKE2B d71bd4c721f2720a54254bba39a5683c8e9945da31eb879f421f4d24c198334a3ec2a8eca3059a21152adec825e620f93398ba2bb49f503e233af653f8bb0e52 SHA512 4dcb8894ba19fd5fa03d5dcbc2f23933d5909cf4f1a325569020ad2d20ccdc7fb0e56fdb81d2856997dba1665f15cc591fd74ca1086770423c206cb3871618fa
 AUX musl.patch 632 BLAKE2B fcaff5d665639ee365d51171024b98f58a431668dc36e829267ca7773b53b0efd1557f3e2366110685d673e2140e15855bee4220c6306a06d9ff1358bf6cbfd2 SHA512 fb9515de16bfa621fbb2f83a446b976ea8c123f779c2955a8740234310fdca66e1ea005d1c5a643b785ecf3797f658eec1a96b673b3cb534a55f30b182444a72
 DIST oprofile-1.4.0.tar.gz 1557625 BLAKE2B fe1a725b713da0e06d3876c52f001163965c1b0dd8ccbb271ef6924525ac6ca342d55172c06cc21681b441c744780d5cb523be08562952c5916005ec67734221 SHA512 44c0ae55d20d623ea8b4245bfe3e208813dbb8778d7e320378ffe70538ef6af1a6ddaf5d110e29751c216879543f13121dd71cb320023205622b3f0cd6b157df
-EBUILD oprofile-1.4.0.ebuild 2052 BLAKE2B be1fdf0346db9e922ad27d542e483a970662c8a3e0dcd8985b6b31634e6abd662876e6971d83d15b19ecf273726367baade7b79cf16d78d0a92af696bed031a3 SHA512 af0c59fad980f849b03c352b79652b86298ee9786841097ecea00a85714421c9e0777cc27364d40a4055e96d03c236f90e2f92fdf66c3a3b808c2e55249da145
+EBUILD oprofile-1.4.0.ebuild 2053 BLAKE2B 3fb6b85ea91b7291b2f119ae194fb27189a1344b8b755c690a3fda2d3e241aa47df1573af79764f27bc09d5b434fd64b299aab42e9aa7b923260c0953c394e7c SHA512 612821e6184112b10bd6cb954bc0e5f22d5a88899252995ca66e363dc4efac5d1e33a73e75ba96e227e1580eb2f76449899f1f6a76cbc9aff8723c1af2a6e720
 MISC metadata.xml 424 BLAKE2B 5a4c680f4d2201dbbecc1af9e7706c94d76b3a2400d2c8003d86578004762dac43340ec8d6f642db45da9ffa4723eb51c8e7f8f8f5887562ca4798b329944d2c SHA512 e6f305a38a8906a6cf493f8920caed471781ee0f54914625c5bb1fa5a0a0859f87aff56eeeaa6a85b54da36b3dc30ce2ac156d69e8535212933eab188058997e
diff --git a/dev-util/oprofile/oprofile-1.4.0.ebuild b/dev-util/oprofile/oprofile-1.4.0.ebuild
index 8c623f03696c..a2eba4e7291c 100644
--- a/dev-util/oprofile/oprofile-1.4.0.ebuild
+++ b/dev-util/oprofile/oprofile-1.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -31,7 +31,7 @@ RDEPEND="${CDEPEND}
 	acct-group/oprofile
 "
 
-CONFIG_CHECK="PERF_EVENTS"
+CONFIG_CHECK="~PERF_EVENTS"
 ERROR_PERF_EVENTS="CONFIG_PERF_EVENTS is mandatory for ${PN} to work."
 
 pkg_setup() {
diff --git a/dev-util/ostree/Manifest b/dev-util/ostree/Manifest
index 716cfcb56a8e..eee8d6a5b3e9 100644
--- a/dev-util/ostree/Manifest
+++ b/dev-util/ostree/Manifest
@@ -5,8 +5,10 @@ DIST ostree-2021.3.tar.xz 2089804 BLAKE2B 5df33b676173b1ec08ac7592d4ddf8e3bfdcd8
 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
 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.ebuild 2719 BLAKE2B e3b25695fd2cc080f196993ea0e64d21e58489f8411d19d00e9c9a5c76ff7c36b4b211dff3da692e0bf26565783ef3051ad84cd42c65e42168fb98310fa335f4 SHA512 3219f32c5b4917079c1aefdf9edd143708a0ee85314dbdb5578c6f6abd1726239fabc39c008c04ac774715c7126d0d16caf836aac553e26b4f163ca66993297e
 MISC metadata.xml 1990 BLAKE2B 1c3e6400d24f0701211c0b8dcfba8d31c06b7c493cbe6eb2c5432ea818d0a0fbe863f8f1661eb386d179bb186cb7c970f7d7a3f8c9c42ea4b03b3d4ea0472a57 SHA512 04e37ddcd7348d43d475e04c996ee8b2e94c64143325dcfb21c5738b75f71ecd2c2ec64c8f91fbd06f5a6228671e90fdf10a939d4457abe4d0f88492435b4601
diff --git a/dev-util/ostree/ostree-2022.7.ebuild b/dev-util/ostree/ostree-2022.7.ebuild
new file mode 100644
index 000000000000..87bec56cdc45
--- /dev/null
+++ b/dev-util/ostree/ostree-2022.7.ebuild
@@ -0,0 +1,113 @@
+# 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 ~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() {
+	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
+}