gentoo auto-resync : 08:10:2022 - 07:29:32

7 files changed, 24 insertions, 113 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 4f128ed30316..9b7401bba968 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/min-cscope/Manifest b/dev-util/min-cscope/Manifest
index 85081e3dd177..c5f16bdf364b 100644
--- a/dev-util/min-cscope/Manifest
+++ b/dev-util/min-cscope/Manifest
@@ -1,4 +1,5 @@
+AUX min-cscope-16.1.0-pointer-type.patch 294 BLAKE2B 4f58f042ef618c42b6c1688887b72853b82401419f2604ac6fcf6165b665efd250d854085abfdd8c6b7ff5c1dc7185beb2734a947e0c8c8a5a79401a2afde554 SHA512 9622b37e12091ed66e0eda033659c0bee777dae23c07b10bba58e84f165c1e323aa29bb67a2fb08105aa84e723580ace3dec15be7c61c73fa36b52fa4a4f8e75
 AUX min-cscope-16.1.0-tinfo.patch 1092 BLAKE2B 667ef81f62882781450fbc3445c858c8007a5d49904935ef549534bfbeb73b5e5cd18afa118260e8f34f1c0e035554e77ceab2abfd169ee57b59e9258b51f4a4 SHA512 1b6109add7cb38f60a557f2b7ecbf5ea8de0defe9bab8dc5a8e62f014d5b0833aa4a3646aec2b6c1fbff84e2692836066cfd755a7af3d28ccb3557dc3287919a
 DIST min-cscope-16.1.0.tar.gz 382326 BLAKE2B 7d45df20c5d2decd9ee5127893cb97506420a19b42b371fbcc6bfae1ada2726deaef1ddf2750ed7c1744e5d90f6c65fd99ad71f5609de04d1afa03795ebb61d7 SHA512 434d6333758dbf72c320e08b3b705bbff6c67de8a1380295fe5971af1a2c4659dd3201c726fd318d7715b90f8a693a76599a8659ac45c76568e5a29a399a9c0a
-EBUILD min-cscope-16.1.0-r1.ebuild 672 BLAKE2B 27939ca0666d314c87bc8b6bd6f841e920432d3d7731ea196bb5208f359a977b711558071cdc90aa4e5b3d874c28eec38f4159ba6df4bbc88c89e0eaa7e8af4a SHA512 dcf7bf83ff892ec589492c62c75a3573ddf2a33c60dec8428b431ea079d64dd5c27c53b7e4f9674b2eed53a91a0249097fc5a0cc8da0b16489d0ff38adf65009
+EBUILD min-cscope-16.1.0-r2.ebuild 820 BLAKE2B 3a3777072c9e73396618f553fa0ac922de3ae2320bd8fc1d1e5e690663237d92b8bab538117ca7c340ed36184a06f48253797285eb8f4efa9958694df2049a0d SHA512 8a42bf2d63c9a77242f2109b6b82da802e1e0fcf83b1491ac4f6946c5aad5fd875f437e956c24b6bdb1bf6080093f7f3db2d168848f204f19a052142216382d0
 MISC metadata.xml 249 BLAKE2B 9c3d74959e601021855d2c346b6fb1b08e25306703e25f9727e3ffbba5e02e7c5c70dce1e4bd380c340101bdcdfc6be04cc400ecfccc3cb79a0850db62fc96c7 SHA512 b953d3857d61743d96e7eb1bea68e137ddceaada089934c5714fbdfbfad6b7b34a9f4b56a0ee2ea0adc316c17af850f5f5223894c9e99da3344bb34816d7886d
diff --git a/dev-util/min-cscope/files/min-cscope-16.1.0-pointer-type.patch b/dev-util/min-cscope/files/min-cscope-16.1.0-pointer-type.patch
new file mode 100644
index 000000000000..6d54b253b501
--- /dev/null
+++ b/dev-util/min-cscope/files/min-cscope-16.1.0-pointer-type.patch
@@ -0,0 +1,11 @@
+Fix build with -Werror=incompatible-pointer-types that's due
+to become a default on clang16.
+
+https://bugs.gentoo.org/871162
+--- a/src/exec.c
++++ b/src/exec.c
+@@ -75,3 +75,3 @@
+ 	int	exitcode = -1;	/* initialize, to avoid warning */
+-	const char	*argv[BUFSIZ];
++	char	*argv[BUFSIZ];
+ 	pid_t	p;
diff --git a/dev-util/min-cscope/min-cscope-16.1.0-r1.ebuild b/dev-util/min-cscope/min-cscope-16.1.0-r2.ebuild
index 0d3a3575f8b8..1dd28afb54b3 100644
--- a/dev-util/min-cscope/min-cscope-16.1.0-r1.ebuild
+++ b/dev-util/min-cscope/min-cscope-16.1.0-r2.ebuild
@@ -15,10 +15,14 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="debug"
 
+RDEPEND="sys-libs/ncurses:="
+DEPEND="${RDEPEND}"
+
 DOCS=( AUTHORS README{,.cscope} TODO )
 
 PATCHES=(
 	"${FILESDIR}/${P}-tinfo.patch" # bug #678886
+	"${FILESDIR}/${P}-pointer-type.patch"
 )
 
 src_prepare() {
@@ -29,7 +33,8 @@ src_prepare() {
 }
 
 src_configure() {
-	append-flags -I"${S}"/sort
+	# -D_GNU_SOURCE for qsort_r, bug #871162
+	append-cppflags -I"${S}"/sort -D_GNU_SOURCE
 
 	cmake_src_configure
 }
diff --git a/dev-util/ostree/Manifest b/dev-util/ostree/Manifest
index b04250caac89..2ce6472bbb21 100644
--- a/dev-util/ostree/Manifest
+++ b/dev-util/ostree/Manifest
@@ -2,11 +2,10 @@ AUX ostree-2022.5-bashism.patch 1314 BLAKE2B ded18475b1ecfe381fbe9e763ae7ff2e308
 AUX ostree-2022.5-glibc-2.36.patch 4381 BLAKE2B 66fce177399ad249ad22f62ffaddd780c57d87864fdef5cb9347e553e9fdb6fa1e94b12768a2bdd832a9968d29c77f49b83263b6d53428306efd73854bd77e23 SHA512 deb822f25ed0c7d14d4102766a5a4840e5f43193a7cedfbda20e8467c8df06e2fc6248bbf9c658ab5723330d5fcd96814bc3d0774c2b3d9e38611d1e34d0ca3a
 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.4.tar.xz 2066276 BLAKE2B 67fe73babe11dac93f8e035f7baf39e98aa2be2d797d3831a30999de2f7205b33c3d0892d2ec007807f8720e15161ecccb7e5f3c047d07cb5763bfcac2170bd8 SHA512 a7745b951b1f36f483c215b311f86d860b988ebb06612e7eef2797fc34322c256ae83177337d918f3e8e3833fe9802f7d53131db59df73d29fb6c305b78879e5
 DIST ostree-2022.5.tar.xz 2072208 BLAKE2B be12432c87da82362ceb49b61b0cfc2ab77fdd7e55dfd3ca238d3c0f6fa5e64dd953d709c39727a46f82b99ef07bfbebf83b581f5e96a10a08322854e9a0e1f9 SHA512 39abd076491ebab5cd6e23bff6ce0a346fe8d1e6a372abb42626ef5a8643411070b272637513b37393dc37af9b8eaaa42c19e2f1c16b98d441358c2046653654
+DIST ostree-2022.6.tar.xz 2124464 BLAKE2B c6ea1f11d08261e8532345ffc18bec9e77d04e63aab0c8e2eb03a4b3d3c2c594bcc9e6c5341e4caefe81fbd06a055cd39b0f2f2b43d3e876837a9bac43c704f5 SHA512 03f6b6947a372e36d3a1ae3bbe47543c562113039ce10db9c6f26a7b4015afb41950bd00bd1931937a5fb3043689ca1046eb87afd890571cfedbfa1ef36219a7
 EBUILD ostree-2021.3-r3.ebuild 2602 BLAKE2B ded68dcb03e707c7ff8cd573441e71152b18d8ed644488828821edce67f2c278e097ea85018251679fe708ea3500959b0848511640bf2d51abb220ab4a69dca8 SHA512 2cae33883d20ea5f29c468e086040f87c97e1168bcc31913fe5adfe25d4f6e6a915e1f6112d77e14d4f69a86e572ada54982a5afd947ca43e8aad82362f7ef18
 EBUILD ostree-2022.2.ebuild 2645 BLAKE2B 03f4a898d2553dc8fbd055c51b834270266237cf92e2fe06e614187e91ce84c276513f8bfb3d145b6786f12024a2997a6d4ded5850a875b45e1e9cb35d13ecde SHA512 e93f32725b1ab23082729e76f176c3563a0c65527dab55e090167d6a522441b3f5d9356e9809c2c2a7cb9a09fedf4390632c0791be63d54742eadb5e5b3439d4
-EBUILD ostree-2022.4.ebuild 2648 BLAKE2B 2eb78554d9fd0c1ff38ff832823209e7556ff645e8e1cd225b0f693db813d6a105fedcfff8e63fc2d9c8e63955ba181d425ac7891adf107028a51b45013ea0a5 SHA512 c01f1c3646553d4c227e7f414361ef731b528be5a2b31e9bfa02329dff6304e0ea46236775c4a79a6f52561c7c000ed2b520990e42648e99e55e54e3ada4d38a
 EBUILD ostree-2022.5-r1.ebuild 2734 BLAKE2B 3207e4271ee037096ca6f6ededc1a6b809469881ab8783afe9e611b89056ead85218dce7737c3d47612cbb489e986b4ca0099808ca5e872fafcc67355b7a4ece SHA512 a35f7529d14f7fad61231dec92f8c9bc8d68e007e943e5c9df938265153a0ae74e2d73790649781824c59e65337e04c69a76e6c8d00b656256ced11646097ca5
-EBUILD ostree-2022.5.ebuild 2648 BLAKE2B 2eb78554d9fd0c1ff38ff832823209e7556ff645e8e1cd225b0f693db813d6a105fedcfff8e63fc2d9c8e63955ba181d425ac7891adf107028a51b45013ea0a5 SHA512 c01f1c3646553d4c227e7f414361ef731b528be5a2b31e9bfa02329dff6304e0ea46236775c4a79a6f52561c7c000ed2b520990e42648e99e55e54e3ada4d38a
+EBUILD ostree-2022.6.ebuild 2650 BLAKE2B 85433897e4efb14eae1a1a61871d8d94aff5941ffe8d5ca46b43586f295e5d37df9185cd3073f5281e719aa5e65a78e716e4f59357ae4072fbc2739ab14726b7 SHA512 615c6082271f4c4ee2e3100312f5a28f6c725d2b0958953072541d30591eee292910b39c8f807cdf24c088740f9153b374a85403dad99071e82235c3fa86ae58
 MISC metadata.xml 1990 BLAKE2B 1c3e6400d24f0701211c0b8dcfba8d31c06b7c493cbe6eb2c5432ea818d0a0fbe863f8f1661eb386d179bb186cb7c970f7d7a3f8c9c42ea4b03b3d4ea0472a57 SHA512 04e37ddcd7348d43d475e04c996ee8b2e94c64143325dcfb21c5738b75f71ecd2c2ec64c8f91fbd06f5a6228671e90fdf10a939d4457abe4d0f88492435b4601
diff --git a/dev-util/ostree/ostree-2022.5.ebuild b/dev-util/ostree/ostree-2022.5.ebuild
deleted file mode 100644
index 43f60e37b878..000000000000
--- a/dev-util/ostree/ostree-2022.5.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.4.ebuild b/dev-util/ostree/ostree-2022.6.ebuild
index 43f60e37b878..eb5a1bf3c90e 100644
--- a/dev-util/ostree/ostree-2022.4.ebuild
+++ b/dev-util/ostree/ostree-2022.6.ebuild
@@ -64,10 +64,12 @@ BDEPEND="
 S="${WORKDIR}/lib${P}"
 
 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() {