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

4 files changed, 67 insertions, 55 deletions

diff --git a/dev-libs/9libs/9libs-1.0-r4.ebuild b/dev-libs/9libs/9libs-1.0-r4.ebuild
deleted file mode 100644
index bb14ac5ccbf2..000000000000
--- a/dev-libs/9libs/9libs-1.0-r4.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools toolchain-funcs
-
-DESCRIPTION="A package of Plan 9 compatibility libraries"
-HOMEPAGE="https://www.netlib.org/research/9libs/9libs-1.0.README"
-SRC_URI="https://www.netlib.org/research/9libs/${P}.tar.bz2"
-
-LICENSE="PLAN9"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-
-DEPEND="
-	>=x11-libs/libX11-1.0.0
-	>=x11-libs/libXt-1.0.0
-"
-RDEPEND="
-	${DEPEND}
-"
-DOCS=(
-	README
-)
-PATCHES=(
-	"${FILESDIR}"/${PN}-va_list.patch # Bug 385387
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	tc-export CC
-
-	econf \
-		--enable-shared \
-		--disable-static \
-		--includedir=/usr/include/9libs \
-		--with-x
-}
-
-src_install() {
-	default
-
-	# rename some man pages to avoid collisions with dev-libs/libevent
-	local f
-	for f in add balloc bitblt cachechars event frame graphics rgbpix; do
-		mv "${D}"/usr/share/man/man3/${f}.{3,3g} || die
-	done
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/9libs/9libs-1.0-r5.ebuild b/dev-libs/9libs/9libs-1.0-r5.ebuild
new file mode 100644
index 000000000000..21a9175d21dd
--- /dev/null
+++ b/dev-libs/9libs/9libs-1.0-r5.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic
+
+DESCRIPTION="Plan 9 compatibility libraries"
+HOMEPAGE="https://netlib.org/research/9libs/9libs-1.0.README"
+SRC_URI="https://netlib.org/research/9libs/${P}.tar.bz2"
+
+LICENSE="PLAN9"
+SLOT="0"
+KEYWORDS="amd64 ~riscv x86"
+RESTRICT="test" # interactive, hangs with virtx and fails without (bug #403539)
+
+RDEPEND="
+	x11-libs/libX11
+	x11-libs/libXt"
+DEPEND="
+	${DEPEND}
+	x11-base/xorg-proto"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-va_list.patch # Bug 385387
+	"${FILESDIR}"/${P}-clang16.patch
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	append-flags -fno-strict-aliasing #855665
+
+	local econfargs=(
+		--enable-shared
+		--includedir="${EPREFIX}"/usr/include/9libs
+		--with-x
+	)
+
+	econf "${econfargs[@]}"
+}
+
+src_install() {
+	default
+
+	# rename some man pages to avoid collisions with dev-libs/libevent
+	local f
+	for f in add balloc bitblt cachechars event frame graphics rgbpix; do
+		mv "${ED}"/usr/share/man/man3/${f}.{3,3g} || die
+	done
+
+	find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/dev-libs/9libs/Manifest b/dev-libs/9libs/Manifest
index 76cb4c841148..8789a9376dfc 100644
--- a/dev-libs/9libs/Manifest
+++ b/dev-libs/9libs/Manifest
@@ -1,4 +1,5 @@
+AUX 9libs-1.0-clang16.patch 165 BLAKE2B f0b6dfebe0a556cbc5261e8c0e791d26ff17b90b009f22396b9a73b171fc19afdc81511f7c29c89a2e7768142eb14e07a173e4e39ccdb793d24e9c2643678f05 SHA512 3773503fa91686d48350e2f81a8b55f8dca1bc96eb6ec2743e5d60094e2eed7a8516c869a81c15079b336ae2dbc64cbd579e12dace1c2a837547cd34c33de81b
 AUX 9libs-va_list.patch 2819 BLAKE2B 641d1a22c9feecb635d470c072ee28fb4e3fd0fb54d2db3c667bf6907d38f4928cc951057df1b1dc2bc0dd4c98d2d5ff16d1b94243df9db1d96d2f52608db804 SHA512 3c441f0bca520baebe06b63e099ee4ba138257c40d3870894c910173379f0d1e52f1627e984ceac61dca76ec68ac68e75cffa919895cebd4b38d09e12f271783
 DIST 9libs-1.0.tar.bz2 163744 BLAKE2B 3cc984ff83ff48969148f8fb3b78e6b85b32280634e99f552c869e650d4893a18ea2164c10ea7662a704c7d55a49bf7434caa219c3a716637895d1f3df4d2ad8 SHA512 35fdd874dbf9aca07e681d7c3f707d22a45cc8cadb2c273a1fbc5f8303886a6b512eb16fc1b81d64d7f665b16a3b19a8d678a540cd4ad453de853b90905d98d2
-EBUILD 9libs-1.0-r4.ebuild 997 BLAKE2B ec06e573a5cbe3505f9052faf8100c8c3b4873347579da9f0c46c479c929f6ec44cd4451056dd480b69d99b2f94b86d1b8d3dc977a217ec364bca045dd9eb99b SHA512 39b0ead30b4f97cd83dc8d990ff12e13e2c213c0ab288cdb97370110b19571827e6c7247ffb0bb826b844c7fafcb4d3503cc40adb93062f41d2a8349badd2673
+EBUILD 9libs-1.0-r5.ebuild 1140 BLAKE2B c471a2761b3c5eff55ecd3dfe8925d7ea2ca95a4c6b4e49cadbacd03b937dd19ee7a34d7f3f9edec7fa91242ce1341b2fbad4fa444888265f3fd014c98d279bc SHA512 2285a98ea31e4fcc7ba441b720348902d94deb2db02fbeab807a72cd637561620b1888b76930769f5b381fe81cf372425a168c70a8da38863d48eaccffe36dd0
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/dev-libs/9libs/files/9libs-1.0-clang16.patch b/dev-libs/9libs/files/9libs-1.0-clang16.patch
new file mode 100644
index 000000000000..237cfc0c70c9
--- /dev/null
+++ b/dev-libs/9libs/files/9libs-1.0-clang16.patch
@@ -0,0 +1,8 @@
+https://bugs.gentoo.org/871183
+--- a/libXg/gcs.c
++++ b/libXg/gcs.c
+@@ -163,3 +163,3 @@
+ 	static GC gc0, gcn;
+-	static clipset = 0;
++	static int clipset = 0;
+ 	GC g;