gentoo auto-resync : 13:10:2022 - 13:42:21

3 files changed, 54 insertions, 13 deletions

diff --git a/x11-libs/neXtaw/Manifest b/x11-libs/neXtaw/Manifest
index 3a78e546da68..f8fc5a23a398 100644
--- a/x11-libs/neXtaw/Manifest
+++ b/x11-libs/neXtaw/Manifest
@@ -1,3 +1,4 @@
+AUX neXtaw-0.15.1-clang16.patch 467 BLAKE2B 9422eb7366a094f7107162acb7a13baac58c21774b22c4d9967501150e37d091c6451226286d05f9f41fbaf560b288ff5960d1af686a3d743a2d70cc8692422b SHA512 13d03abb9079d3fd37d3212ed1b0ec4e3eff6c3ccb459cc1e933ed433dcf2c574e069a38107124c8a605d1b97fa7c4954f4c0f6a73047969dab4c86dbd9047be
 DIST neXtaw-0.15.1.tar.gz 577459 BLAKE2B c38e8fe482bf0f51a2f387ab76d62666778d569982e153dbe32988d557dad91876122cfe4d0e8940e5c1d8ca7a8a3af09c09631b8ed656bd6a11db21d16ae331 SHA512 5250b2ac6fc746b8de19d0c2504e6c21e0b6c6ac4ef1a841a9793a2fd2dff082b86a987f54f68e0e35ed8f798900a701e6fd9c6cf7b1412a4bd53179fd07cbf1
-EBUILD neXtaw-0.15.1-r3.ebuild 732 BLAKE2B c796b85364a2a333512e60bbe054b4e86cd7b466f4b39055e75ba62eefe0ec9c86ac6de1f11a88da3d03c349797f91af35e6115d512b118a130bffabd7a753f1 SHA512 8730d3b5b85d4b1b3ef8c5efd2556a225af6bbd65eec07bbafe1ced96d3b5c3fefb3f86f5eccac3c1b3215f6836ce826311f6b58d3571dbc82cb06734b45809e
+EBUILD neXtaw-0.15.1-r4.ebuild 912 BLAKE2B b18a5d301a064fbfbe1af8b41fd7090a45370dc59c90dacbd6d28bf1bd88b5549ff216b1bf96c78b02af4b09f01ebabff20169046c4f19186cf47cb675bb555f SHA512 0f950c04c3c2914e0f189904e01f1efba17f9ccd97007cfcd74b290f695d7ff9ffd53f9c2218d8a5995ef0aaf38bf0b4b4df2e2ab06fc403abe5a921c484d2c1
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/x11-libs/neXtaw/files/neXtaw-0.15.1-clang16.patch b/x11-libs/neXtaw/files/neXtaw-0.15.1-clang16.patch
new file mode 100644
index 000000000000..a1f5bf27922c
--- /dev/null
+++ b/x11-libs/neXtaw/files/neXtaw-0.15.1-clang16.patch
@@ -0,0 +1,27 @@
+https://bugs.gentoo.org/871489
+--- a/X11/neXtaw/XawIm.c
++++ b/X11/neXtaw/XawIm.c
+@@ -61,2 +61,3 @@
+ #include <X11/StringDefs.h>
++#include <X11/ResourceI.h>
+ #include <X11/Xos.h>
+--- a/X11/neXtaw/laygram.y
++++ b/X11/neXtaw/laygram.y
+@@ -16,2 +16,7 @@
+ 
++%code provides {
++    void yyerror(char *s);
++    int yylex(void);
++}
++
+ %union {
+--- a/X11/neXtaw/laylex.l
++++ b/X11/neXtaw/laylex.l
+@@ -88,2 +88,3 @@
+ 
++void
+ yysetsource(s)
+@@ -94,2 +95,3 @@
+ 
++void
+ yyerror(s)
diff --git a/x11-libs/neXtaw/neXtaw-0.15.1-r3.ebuild b/x11-libs/neXtaw/neXtaw-0.15.1-r4.ebuild
index f89f61178319..db8f5d2fd8ee 100644
--- a/x11-libs/neXtaw/neXtaw-0.15.1-r3.ebuild
+++ b/x11-libs/neXtaw/neXtaw-0.15.1-r4.ebuild
@@ -1,34 +1,47 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
+
+inherit flag-o-matic
 
 DESCRIPTION="Athena Widgets with N*XTSTEP appearance"
-HOMEPAGE="http://siag.nu/neXtaw/"
-SRC_URI="http://siag.nu/pub/neXtaw/${P}.tar.gz"
+HOMEPAGE="https://siag.nu/neXtaw/"
+SRC_URI="https://siag.nu/pub/neXtaw/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 
 RDEPEND="
-	x11-base/xorg-proto
 	x11-libs/libICE
-	x11-libs/libXext
-	x11-libs/libXt
-	x11-libs/libX11
 	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXext
 	x11-libs/libXmu
-	x11-libs/libxkbfile
 	x11-libs/libXpm
-	!<x11-libs/neXtaw-0.15.1-r1"
-DEPEND="${RDEPEND}"
+	x11-libs/libXt
+	x11-libs/libxkbfile"
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto"
+BDEPEND="
+	sys-devel/flex
+	virtual/yacc"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-clang16.patch
+)
 
 src_configure() {
-	econf --disable-static
+	append-cflags -std=gnu89 # old codebase, incompatible with c2x
+	append-cflags -fno-strict-aliasing #864535
+
+	default
 }
 
 src_install() {
 	default
+
 	find "${ED}" -name '*.la' -delete || die
 }