gentoo auto-resync : 12:12:2023 - 17:29:30

5 files changed, 45 insertions, 6 deletions

diff --git a/games-arcade/Manifest.gz b/games-arcade/Manifest.gz
index aa2d7cdc230e..761f4c7beb52 100644
--- a/games-arcade/Manifest.gz
+++ b/games-arcade/Manifest.gz
diff --git a/games-arcade/abe/Manifest b/games-arcade/abe/Manifest
index 03ea10a10cc3..e46441eda208 100644
--- a/games-arcade/abe/Manifest
+++ b/games-arcade/abe/Manifest
@@ -1,8 +1,9 @@
 AUX abe-1.1-doublefree.patch 267 BLAKE2B 67b66d4bbca2cfc18630ad7bc9c456e7737a442566049e614676744d83e1fc6d0811b9adb82d9ea715ccfbb70bfadf94b3b111755083fd855dc10775f64bf4e6 SHA512 d6eb436272c3b14cdeb543ca7379c07f656478788e0cc189e31332cf077e1bc0def4efdbfff79c63b825ba32efa428d1b9bb21d14fb31b0eeec75007b004951a
 AUX abe-1.1-format-security.patch 2571 BLAKE2B b8c4ffb1db42b6f5fcf0881d3b1ebac4d35da3d9c5922964ed4cf14c34e0df2488505b2be675a6d0c96621d1abb3a31dc14652d942d3e534314ebaa80fc6bc75 SHA512 94523134c4ad3bb840d9dd8fd216e16a60912c7d82c975c860a15c8cf82a5f8c3c796863926e19b1c82eabbfb15089f2a144142c92a64d3effb768b55dd57204
 AUX abe-1.1-format.patch 539 BLAKE2B 21ca61c24861ed4daace9fa9b87eba30154e5287f0798141f3edafb0db1b5a3014c825aab225a9c146dcbbebb34baa89c660f8e11b3db4d8bdebd1d45953cfd3 SHA512 3a366be92a54b5727bae3783be38550d77efb289f39bc0bb9b6be0a8516f0e28db6b0c7aac84c9a96c3115f2d350681abab26514f9bea434a2b1d9446d1069ba
+AUX abe-1.1-no-x-check.patch 954 BLAKE2B a6d7b73beaf9c3a559e2f3a336a0daa55bf6e96a181c28be0c71d1be2ad93a1390b61eb4c444932e21afe3821e9151364de4ea5f5849dcfa543e8a74bf1dd304 SHA512 58e254783fc7588c023de1b7276841741ac843b53d263aa3cbffdcac4f8b9205e4831b0b37a31c1b4b03124bad2d684a8d622bb1a84d862ca32ae3dbd45210e1
 AUX abe-1.1-settings.patch 289 BLAKE2B e4500e3a13b9f9e73f6dc27c7eae887d922dc71124bf12f934ed576a2d21cd73eb876e144f944d974a8a0422c902e0962fb58eefd71c0e388fa9fa768e109eb6 SHA512 f6feb687ab7c658dd5a084b75ff300f3ff755959cf0aee8d0859a008d37d90a82715b405fba45b5c5d8538f4df2fd0ea52c77cd2b9c7cd3b1c3774cb3b2e7aa6
 DIST abe-1.1.tar.gz 3321075 BLAKE2B 2ab51bd9103e8954bbc27eceb81b4bb845ec84ee249f21aaefdc59df87689f865d3b62a8c2db9584b8361303028174b1a96b60e0caf88ee857f8ad0d3cd3d920 SHA512 6106fce9c72554596ac3f94551326381e98c0d40f7a5aa8ae7aeadaa234c113733e8df717bd1b18d2ba835f689982e859607c9d88ab2d59790ec00833a4e48c7
 DIST abe.png 3303 BLAKE2B a99f8a1c31b9f8704b201ca9edd7ab67b685bde4bd43f675e62f1ba3a5554a63dba009634cdc63a2855a51f82de8ea2818bfe5f390b2f9e176d55cd4476547b6 SHA512 421d87248d91bb315d9d02955271cad096c842857819fc7a91ad77571047770eb9487722cb1b2e43d602ad61e3c7eca4fd834e955724905b8b870a5dd66d2e2b
-EBUILD abe-1.1-r1.ebuild 1064 BLAKE2B 92b4b93f7127413823f58f48dba0dc89f1f51ee79c1f9cc0b2502e9aa0990e2c97275e7683e046a4a77589712c0d39f3df1f70ec7e0d11f17d1892a93039040e SHA512 e1e0a1e8923813674c683013e23b4c262f9e6285e472346d4d1225ed79de07fc2c1c74924494bc325c230539665dd7c478df7192b187e46c04b82f31de1e1fcb
-MISC metadata.xml 327 BLAKE2B e1ae104d24aab6000812591a3f06ffd11b5f992108dc0f1091e694df8c08dcbc0897c6f39df8ac2879da441679dc8c53b7b6b4bf5b19ea424f9863b986d9a9ee SHA512 fdbe72fd1a58ef33c214deb7267cd49edd89e5edb80201cb9c777301902760718c10b713ffe4ed49fb93e40e93d6524fa1c7c09b7e7816949fe2aa65828756ff
+EBUILD abe-1.1-r2.ebuild 1288 BLAKE2B c5ffee39207cc25e123d27c1ef4b757dbaab9a54a1d6691300c5e34409d47aadbe0d3dc6a186044d9b40ac3aacddbc03b2fa999f70f3fa89f29bcfa8b93c760b SHA512 5f1514cb7e14615b7bc5e151a957e38778777d15b24475eb2f006f0e9be7972bd4064fa763dd5a1416b5a036f7ca2974aba544a5a029049791af9a9f69bef1da
+MISC metadata.xml 418 BLAKE2B b55891cf65f4a2f2e017b5c913021665f244d56e5a10113e0e7ea2d8cf589a4948a577b4568b96ecaa9d5ccd82a529eed40306ca124553c7d16183eb65f807d5 SHA512 3032338f972d0d75f7e2e8704263f8d493c08cbdd35ff442ed2568fb1b57ef2d37984cf58cbd56f6896d9e4fc4a59686a888a3c85add4a79bb2bfd9421a50e89
diff --git a/games-arcade/abe/abe-1.1-r1.ebuild b/games-arcade/abe/abe-1.1-r2.ebuild
index 4dbe4a24dfaa..a833efa73b21 100644
--- a/games-arcade/abe/abe-1.1-r1.ebuild
+++ b/games-arcade/abe/abe-1.1-r2.ebuild
@@ -3,10 +3,13 @@
 
 EAPI=8
 
-inherit desktop toolchain-funcs
+inherit autotools desktop toolchain-funcs
 
 DESCRIPTION="Scrolling, platform-jumping, key-collecting, ancient pyramid exploring game"
-HOMEPAGE="https://abe.sourceforge.net/"
+HOMEPAGE="
+	https://abe.sourceforge.net/
+	https://github.com/OSSGames/GAME-SDL-ADVENTURE-Abe-s_Amazing_Adventure
+"
 SRC_URI="
 	mirror://sourceforge/abe/${P}.tar.gz
 	https://dev.gentoo.org/~ionen/distfiles/${PN}.png"
@@ -18,7 +21,7 @@ KEYWORDS="~amd64 ~x86"
 RDEPEND="
 	media-libs/libsdl[sound,video]
 	media-libs/sdl-mixer[vorbis]
-	x11-libs/libXi"
+"
 DEPEND="${RDEPEND}"
 
 PATCHES=(
@@ -26,12 +29,17 @@ PATCHES=(
 	"${FILESDIR}"/${P}-doublefree.patch
 	"${FILESDIR}"/${P}-format.patch
 	"${FILESDIR}"/${P}-format-security.patch
+	"${FILESDIR}"/${P}-no-x-check.patch
 )
 
 src_prepare() {
 	default
 
-	sed -i '/^TR_CFLAGS/d;/^TR_CXXFLAGS/d' configure || die
+	sed -i '/^TR_CFLAGS/d;/^TR_CXXFLAGS/d' configure.in || die
+
+	# original configure contains problematic detections with modern compilers
+	# see #883287, #898794
+	eautoreconf
 }
 
 src_configure() {
diff --git a/games-arcade/abe/files/abe-1.1-no-x-check.patch b/games-arcade/abe/files/abe-1.1-no-x-check.patch
new file mode 100644
index 000000000000..a02eaa4b898c
--- /dev/null
+++ b/games-arcade/abe/files/abe-1.1-no-x-check.patch
@@ -0,0 +1,29 @@
+Remove check for X.
+
+The game uses only SDL library. There is no need to check for X.
+
+diff --git a/configure.in b/configure.in
+index 2270cb4..f0a93c6 100644
+--- a/configure.in
++++ b/configure.in
+@@ -98,17 +98,6 @@ if test "x$is_win32" = "xyes" ; then
+     TR_LIBS="$TR_LIBS -luser32 -lgdi32"
+ fi
+ 
+-dnl --------------------------------------------------------------------------
+-dnl Check for X  
+-dnl Note that we only need libs (so that glut links properly on all systems).
+-dnl --------------------------------------------------------------------------
+-if test "x$is_win32" = "xno" ; then
+-    AC_PATH_XTRA
+-    if test "x$no_x" = "x" ; then
+-	TR_LIBS="$X_PRE_LIBS $X_LIBS -lX11 -lXi -lXext -lXmu -lXt $X_EXTRA_LIBS $TR_LIBS"
+-    fi
+-fi
+-
+ dnl --------------------------------------------------------------------------
+ dnl Check for some common libraries
+ dnl --------------------------------------------------------------------------
+-- 
+2.41.0
+
diff --git a/games-arcade/abe/metadata.xml b/games-arcade/abe/metadata.xml
index 00310cfe239c..850b37f9125e 100644
--- a/games-arcade/abe/metadata.xml
+++ b/games-arcade/abe/metadata.xml
@@ -6,6 +6,7 @@
 		<name>Gentoo Games Project</name>
 	</maintainer>
 	<upstream>
+		<remote-id type="github">OSSGames/GAME-SDL-ADVENTURE-Abe-s_Amazing_Adventure</remote-id>
 		<remote-id type="sourceforge">abe</remote-id>
 	</upstream>
 </pkgmetadata>