gentoo auto-resync : 10:05:2023 - 05:42:48

9 files changed, 13 insertions, 393 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 28e06e82645d..d644d15debfd 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/ostree/Manifest b/dev-util/ostree/Manifest
index 11024c7bb667..3a008501f8ad 100644
--- a/dev-util/ostree/Manifest
+++ b/dev-util/ostree/Manifest
@@ -1,14 +1,8 @@
-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-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
 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 2782 BLAKE2B 24f1aaaf7798a7476bda04a02b196ed6110abe549a12f8241c2bca9e9c0d6c4a20eb5e8c54c56898a838353206825acc2725933073447f9f4f8db913f2d265d2 SHA512 06d4b96e908ca2cb8c2807f24bd3a654e324c8a2309d25f130a6526d8dff336c373910c498624909fc9bc38ffb4c7f1f33fca919617797cdd52b5833a1abb9d3
+EBUILD ostree-2022.6.ebuild 2749 BLAKE2B 19b1bb11064d08c7feb4d174f449d72e76079817fd22652a94e39ebad8b0f3ef49a7e87bba80edbaa07c166f6ddadd90f95b12796e646a905ec17da5e4e2f119 SHA512 4116942743ddfa37219d4f2a6fe2c3a5bd1c75e2a6b67fd80270574750c562a950bbf524e9337664e14188b7fc80b16c5650ec7e7dcce85312403530beb592a3
+EBUILD ostree-2022.7-r1.ebuild 2829 BLAKE2B e8334a9adf020f19cf780dca768796888afd4972d979e85b95f5e01258a6b1d0f4b23c3a598d7469e73459bb55a993ab23d699a6c07ca71523a9207cfc8f7e3b SHA512 5e14b237243c390d1bc63735b7eb6b5c6ca40ff27efa478cd5e36c418c0f6c5fb7707f1fe20b4b681d75dbf891a6a687f1b10a5e5d79b5052669e31a11f03101
+EBUILD ostree-2023.1.ebuild 2824 BLAKE2B 144f93d943f0879e9104d78996600c50c7e6f936a578baf15b13f65191f8299ef45805008111443d00ac6dc85d270c48403d1bcf8bfbb090be8ce899e49f32aa SHA512 7b44a33dfbd808708009cb3c7e6f4b92bdf9d6a6c7f657bc86033451435ad5907f7e1dbeca45a7eaab24e394159ef0e96a3a9f691bfc7b093c92f5158d3a58e9
 MISC metadata.xml 1990 BLAKE2B 1c3e6400d24f0701211c0b8dcfba8d31c06b7c493cbe6eb2c5432ea818d0a0fbe863f8f1661eb386d179bb186cb7c970f7d7a3f8c9c42ea4b03b3d4ea0472a57 SHA512 04e37ddcd7348d43d475e04c996ee8b2e94c64143325dcfb21c5738b75f71ecd2c2ec64c8f91fbd06f5a6228671e90fdf10a939d4457abe4d0f88492435b4601
diff --git a/dev-util/ostree/files/ostree-2022.5-bashism.patch b/dev-util/ostree/files/ostree-2022.5-bashism.patch
deleted file mode 100644
index 1cf217de744b..000000000000
--- a/dev-util/ostree/files/ostree-2022.5-bashism.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-https://github.com/ostreedev/ostree/pull/2702
-
-From c568073d1e6a5e602a6df29eaa5b7392e076f5d6 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Tue, 23 Aug 2022 23:37:06 +0100
-Subject: [PATCH] buildutil/glibtests.m4: fix bashism
-
-configure scripts need to be runnable with a POSIX-compliant /bin/sh.
-
-On many (but not all!) systems, /bin/sh is provided by Bash, so errors
-like this aren't spotted. Notably Debian defaults to /bin/sh provided
-by dash which doesn't tolerate such bashisms as '=='.
-
-This retains compatibility with bash.
-
-Fixes configure warnings/errors like:
-```
-
-checking whether to build static libraries... no
-./configure: 14795: test: unexpected operator
-```
-
-Signed-off-by: Sam James <sam@gentoo.org>
---- a/buildutil/glibtests.m4
-+++ b/buildutil/glibtests.m4
-@@ -25,7 +25,7 @@ AC_DEFUN([GLIB_TESTS],
-                   *) AC_MSG_ERROR([bad value ${enableval} for --enable-always-build-tests]) ;;
-                  esac])
-   AM_CONDITIONAL([ENABLE_ALWAYS_BUILD_TESTS], test "$ENABLE_ALWAYS_BUILD_TESTS" = "1")
--  if test "$ENABLE_INSTALLED_TESTS" == "1"; then
-+  if test "$ENABLE_INSTALLED_TESTS" = "1"; then
-     AC_SUBST(installed_test_metadir, [${datadir}/installed-tests/]AC_PACKAGE_NAME)
-     AC_SUBST(installed_testdir, [${libexecdir}/installed-tests/]AC_PACKAGE_NAME)
-   fi
-
diff --git a/dev-util/ostree/files/ostree-2022.5-glibc-2.36.patch b/dev-util/ostree/files/ostree-2022.5-glibc-2.36.patch
deleted file mode 100644
index 6d01e96a09c8..000000000000
--- a/dev-util/ostree/files/ostree-2022.5-glibc-2.36.patch
+++ /dev/null
@@ -1,127 +0,0 @@
-https://bugs.gentoo.org/863689
-https://github.com/ostreedev/ostree/commit/edba4b33be10c05253bfa94895dfbc8477e44d76
-https://github.com/ostreedev/ostree/commit/0a908a180fcce98c2565b9fb34470e5953918260
-
-From edba4b33be10c05253bfa94895dfbc8477e44d76 Mon Sep 17 00:00:00 2001
-From: Colin Walters <walters@verbum.org>
-Date: Wed, 3 Aug 2022 10:37:40 -0400
-Subject: [PATCH] Remove unused `linux/fs.h` includes
-
-Prep for fixing conflicts introduced by newer glibc.
-cc https://github.com/ostreedev/ostree/issues/2685
---- a/src/libostree/ostree-repo-commit.c
-+++ b/src/libostree/ostree-repo-commit.c
-@@ -30,7 +30,6 @@
- #include <sys/xattr.h>
- #include <glib/gprintf.h>
- #include <sys/ioctl.h>
--#include <linux/fs.h>
- #include <ext2fs/ext2_fs.h>
- 
- #include "otutil.h"
---- a/src/ostree/ot-main.c
-+++ b/src/ostree/ot-main.c
-@@ -28,7 +28,6 @@
- #include <string.h>
- #include <sys/statvfs.h>
- #include <sys/mount.h>
--#include <linux/fs.h>
- 
- #include "ot-main.h"
- #include "ostree.h"
-
-From 0a908a180fcce98c2565b9fb34470e5953918260 Mon Sep 17 00:00:00 2001
-From: Colin Walters <walters@verbum.org>
-Date: Wed, 3 Aug 2022 10:43:43 -0400
-Subject: [PATCH] Move FIFREEZE/FITHAW ioctl invocations into linuxfsutil.c
-
-Should help avoid conflicts between glibc and linux headers.
-
-Closes: https://github.com/ostreedev/ostree/issues/2685
---- a/src/libostree/ostree-linuxfsutil.c
-+++ b/src/libostree/ostree-linuxfsutil.c
-@@ -24,10 +24,12 @@
- 
- #include <fcntl.h>
- #include <sys/ioctl.h>
-+// This should be the only file including linux/fs.h; see
-+// https://sourceware.org/glibc/wiki/Release/2.36#Usage_of_.3Clinux.2Fmount.h.3E_and_.3Csys.2Fmount.h.3E
-+// https://github.com/ostreedev/ostree/issues/2685
-+#include <linux/fs.h>
- #include <ext2fs/ext2_fs.h>
- 
--#include "otutil.h"
--
- /**
-  * _ostree_linuxfs_fd_alter_immutable_flag:
-  * @fd: A file descriptor
-@@ -88,3 +90,21 @@ _ostree_linuxfs_fd_alter_immutable_flag (int            fd,
- 
-   return TRUE;
- }
-+
-+/* Wrapper for FIFREEZE ioctl.
-+ * This is split into a separate wrapped API for
-+ * reasons around conflicts between glibc and linux/fs.h
-+ * includes; see above.
-+ */
-+int
-+_ostree_linuxfs_filesystem_freeze (int fd)
-+{
-+  return TEMP_FAILURE_RETRY (ioctl (fd, FIFREEZE, 0));
-+}
-+
-+/* Wrapper for FITHAW ioctl.  See above. */
-+int
-+_ostree_linuxfs_filesystem_thaw (int fd)
-+{
-+  return TEMP_FAILURE_RETRY (ioctl (fd, FITHAW, 0));
-+}
---- a/src/libostree/ostree-linuxfsutil.h
-+++ b/src/libostree/ostree-linuxfsutil.h
-@@ -29,4 +29,7 @@ _ostree_linuxfs_fd_alter_immutable_flag (int            fd,
-                                          GCancellable  *cancellable,
-                                          GError       **error);
- 
-+int _ostree_linuxfs_filesystem_freeze (int fd);
-+int _ostree_linuxfs_filesystem_thaw (int fd);
-+
- G_END_DECLS
---- a/src/libostree/ostree-sysroot-deploy.c
-+++ b/src/libostree/ostree-sysroot-deploy.c
-@@ -29,7 +29,6 @@
- #include <sys/ioctl.h>
- #include <stdbool.h>
- #include <sys/poll.h>
--#include <linux/fs.h>
- #include <err.h>
- 
- #ifdef HAVE_LIBMOUNT
-@@ -1476,7 +1475,7 @@ fsfreeze_thaw_cycle (OstreeSysroot *self,
-            * EOPNOTSUPP: If the filesystem doesn't support it
-            */
-           int saved_errno = errno;
--          (void) TEMP_FAILURE_RETRY (ioctl (rootfs_dfd, FITHAW, 0));
-+          _ostree_linuxfs_filesystem_thaw (rootfs_dfd);
-           errno = saved_errno;
-           /* But if we got an error from poll, let's log it */
-           if (r < 0)
-@@ -1517,7 +1516,7 @@ fsfreeze_thaw_cycle (OstreeSysroot *self,
-           return glnx_throw (error, "aborting due to test-fifreeze");
-         }
-       /* Do a freeze/thaw cycle; TODO add a FIFREEZETHAW ioctl */
--      if (ioctl (rootfs_dfd, FIFREEZE, 0) != 0)
-+      if (_ostree_linuxfs_filesystem_freeze (rootfs_dfd) != 0)
-         {
-           /* Not supported, we're running in the unit tests (as non-root), or
-            * the filesystem is already frozen (EBUSY).
-@@ -1539,7 +1538,7 @@ fsfreeze_thaw_cycle (OstreeSysroot *self,
-             return glnx_throw_errno_prefix (error, "ioctl(FIFREEZE)");
-         }
-       /* And finally thaw, then signal our completion to the watchdog */
--      if (TEMP_FAILURE_RETRY (ioctl (rootfs_dfd, FITHAW, 0)) != 0)
-+      if (_ostree_linuxfs_filesystem_thaw (rootfs_dfd) != 0)
-         {
-           /* Warn but don't error if the filesystem was already thawed */
-           if (errno == EINVAL)
-
diff --git a/dev-util/ostree/ostree-2022.2.ebuild b/dev-util/ostree/ostree-2022.2.ebuild
deleted file mode 100644
index ffd7127f1a9e..000000000000
--- a/dev-util/ostree/ostree-2022.2.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: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}"
-
-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.5-r1.ebuild b/dev-util/ostree/ostree-2022.5-r1.ebuild
deleted file mode 100644
index 5500d617d7b6..000000000000
--- a/dev-util/ostree/ostree-2022.5-r1.ebuild
+++ /dev/null
@@ -1,114 +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: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}-glibc-2.36.patch
-	"${FILESDIR}"/${P}-bashism.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
-}
diff --git a/dev-util/ostree/ostree-2022.6.ebuild b/dev-util/ostree/ostree-2022.6.ebuild
index f5456a6e416e..030a24150f38 100644
--- a/dev-util/ostree/ostree-2022.6.ebuild
+++ b/dev-util/ostree/ostree-2022.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -77,6 +77,9 @@ src_prepare() {
 }
 
 src_configure() {
+	# Needs Bison (bug #884289)
+	unset YACC
+
 	local econfargs=(
 		--enable-man
 		--enable-shared
diff --git a/dev-util/ostree/ostree-2022.7-r1.ebuild b/dev-util/ostree/ostree-2022.7-r1.ebuild
index 0bcffeafb6bb..8affb7d1e501 100644
--- a/dev-util/ostree/ostree-2022.7-r1.ebuild
+++ b/dev-util/ostree/ostree-2022.7-r1.ebuild
@@ -77,6 +77,9 @@ src_prepare() {
 }
 
 src_configure() {
+	# Needs Bison (bug #884289)
+	unset YACC
+
 	local econfargs=(
 		--enable-man
 		--enable-shared
diff --git a/dev-util/ostree/ostree-2023.1.ebuild b/dev-util/ostree/ostree-2023.1.ebuild
index 8e2cb1c035f1..94174a9acdaf 100644
--- a/dev-util/ostree/ostree-2023.1.ebuild
+++ b/dev-util/ostree/ostree-2023.1.ebuild
@@ -77,6 +77,9 @@ src_prepare() {
 }
 
 src_configure() {
+	# Needs Bison (bug #884289)
+	unset YACC
+
 	local econfargs=(
 		--enable-man
 		--enable-shared