gentoo resync : 25.09.2021

8 files changed, 62 insertions, 157 deletions

diff --git a/games-arcade/Manifest.gz b/games-arcade/Manifest.gz
index 05bac14751f9..625460987053 100644
--- a/games-arcade/Manifest.gz
+++ b/games-arcade/Manifest.gz
diff --git a/games-arcade/apricots/Manifest b/games-arcade/apricots/Manifest
index bc64e87e3bb7..fc50c407ee71 100644
--- a/games-arcade/apricots/Manifest
+++ b/games-arcade/apricots/Manifest
@@ -1,5 +1,5 @@
-AUX apricots-0.2.6-freealut.patch 1608 BLAKE2B 4437952b0fa7b177e02d36f0bd32578265e0d3c2bd7207c55824b1a25086f98a3ee3cb0f883d552d703ea1fdaaa7a61dd619ea92d569b45fd5c69c9de428f5a4 SHA512 cb29fea3ba109f5bae09ad1673aa0ccc81904f09cb2775cc2453c01ea839ad5f5b07639d81bb3804aa3b21a2d417597e2ab5377dcd944763a1de4b20ca68680c
-AUX apricots-0.2.6-ldflags.patch 833 BLAKE2B 3d5f68a96673ef5ecfd022ff18dcf43ac3203e275b682f37aa9f42270e2a64d87f5b3cef24c2fa238aee66aa37d68a23aa0981230e8a56e5f9f2376097231134 SHA512 532c0912dbddd8890829e717d6a062df80cb2d3a51131370062c2cbfd358e987872c5a53948dd1339f0ec820e56fad0696969c286f2da72a956f2d7f01589a80
-DIST apricots-0.2.6.tar.gz 768568 BLAKE2B 82fa6d4be5f1a9ed86e968a4645822cbf558ea37df956d54d0f07e3260ca2e7ff561ae6ea357dabb2c35b7bfd4ff0d806dda5cf51cbb3a956ebdba52f6ef526a SHA512 cf8a988d316382469e4b13a86315c760b702b3d490398cf2fe96f119ba743c1ff707c09228dbbf4eb601189fece708913a621b04c44e9d93162639ccbd502cf5
-EBUILD apricots-0.2.6-r2.ebuild 1360 BLAKE2B f21abb40012c30e743c3c0242858c5253dd8de482894b00bc44e75d38c00e2d7219f6df207a6099c7c46972d7aa44131f9cde576653f5e3149fd996ef3a23e07 SHA512 0daf70bb4ef52a08ba105bff668f479dc144811462e0d0cb07fb653716c2e21306abc79ba816875658d518b9d51936c08e77e35121e44df519dea177d7042afb
-MISC metadata.xml 250 BLAKE2B 8d44bd4c6e7d6491273e2015e36ddac74af7b94a124fd240ff030e16430f5c85e53ab812f0e3e94bb2e6d138f39b512bbe01ff98b0081cacc21a02d648ec7643 SHA512 80ac07a3cac10ad2e72e9989a130b7d2073934fe92914a9db2af4d0e769d4bf537770f8faba0654bbd64a7e85ee38cf1f9d03b4b9cd322864b1b2bb35087d610
+AUX apricots-0.2.7-sign-undef.patch 317 BLAKE2B 6da5e699faed3e21f31eb037e7bfb132d0ab06a6959cd17a9f604e649be4d0dd72ebb862ed3874f04d591ab984ebb19dda5d75e169e2534ce8f0e697abd30960 SHA512 b3f2f2b401a6ab54feb0cf5d004908b3da7b5a27df6028bba170c80fabb3f43a0e655fad180690b3ce01666b939d1928d2778fe5dd83d4c54b85b197159daab6
+DIST apricots-0.2.7.tar.gz 388024 BLAKE2B 5d16cb2637580ae728aa4f1b3911801effa6c79faabf7f3a1c026de8d91aaa582c8063ae33152c44fc9878ae0f7126fdb6ab0363b562e90c7359bcfe6ac78391 SHA512 7f97759402703962f660cdf609f50bb9a4465cc727d3fd17751eb5863b0b9131d9014eab50632c1638130f7e4223c89c45c12cecbc9fe2639943def2ce80ae25
+DIST apricots.png 1965 BLAKE2B 164e06ec9856273077636b347cac555cc49f5f38faffeea6f43b9032edee9dfebedce24470f70b185707ee2e467d861164a9c90c370ada5ff89d5c4854b99e7c SHA512 5d637707d7cfa775e5f3d3416a51abbbb39369cf0bfd9be871295ca3079530c25b893076c2cb6a6621586d67860920e079cb4f491d2c67ff13ce80e56a2cf4e5
+EBUILD apricots-0.2.7.ebuild 901 BLAKE2B cf5f20aff3f188dd71146b26ab8fcc21ff708228baaca4d9c9d9dbe517dd6a6ec1420906cdbdaedfc41e4ac6d3fe5ca9d2a077f2943c356e8eee46808ff8f60c SHA512 3910879391097204685a7baff93815aa9d3625b23d3dbf77d14578b63c0b083f0f91e801c6caa6dcf663a4f755bd0c5fb34155431fa86e78506663800e6433e4
+MISC metadata.xml 337 BLAKE2B 014f0069164d36765b42a9673ee35aaa3b4a945f9daa5d8fa392a6a661f0b3d2ab8f154da50bc56a557e789626c42e37f3b0ca9e688ca060d473aabf530f972e SHA512 652ade1e3b2a8fb19531e6c51eee0541de579a70f3979eee57b2535d79f63b1ebc681f856576dfbe8d12614c102b2126cd2a76539bcf5c6009157f7896624197
diff --git a/games-arcade/apricots/apricots-0.2.6-r2.ebuild b/games-arcade/apricots/apricots-0.2.6-r2.ebuild
deleted file mode 100644
index 32117603fb82..000000000000
--- a/games-arcade/apricots/apricots-0.2.6-r2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools desktop
-
-DESCRIPTION="Fly a plane around bomb/shoot the enemy. Port of Planegame from Amiga"
-HOMEPAGE="http://www.fishies.org.uk/apricots.html"
-SRC_URI="http://www.fishies.org.uk/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="media-libs/libsdl[sound,video]
-	media-libs/openal
-	media-libs/freealut"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-
-	eapply "${FILESDIR}"/${P}-freealut.patch \
-		"${FILESDIR}"/${P}-ldflags.patch
-
-	cp admin/acinclude.m4.in acinclude.m4
-
-	sed -i \
-		-e 's:-DAP_PATH=\\\\\\"$prefix.*":-DAP_PATH=\\\\\\"/usr/share/${PN}/\\\\\\"":' \
-		-e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' \
-		configure.in || die
-	sed -i \
-		-e "s:filename(AP_PATH):filename(\"/etc/${PN}/\"):" \
-		${PN}/init.cpp || die
-	sed -i \
-		-e "s:apricots.cfg:/etc/${PN}/apricots.cfg:" \
-		README apricots.html || die
-	sed -i \
-		-e 's/-Wmissing-prototypes//' \
-		acinclude.m4 || die
-
-	mv configure.in configure.ac || die
-	eautoreconf
-}
-
-src_compile() {
-	emake LIBTOOL="/usr/bin/libtool"
-}
-
-src_install() {
-	HTML_DOCS="apricots.html"
-	einstalldocs
-
-	cd ${PN}
-	dobin apricots
-	insinto /usr/share/${PN}
-	doins *.wav *.psf *.shapes
-	insinto /etc/${PN}
-	doins apricots.cfg
-
-	make_desktop_entry ${PN} Apricots
-}
diff --git a/games-arcade/apricots/apricots-0.2.7.ebuild b/games-arcade/apricots/apricots-0.2.7.ebuild
new file mode 100644
index 000000000000..b7c7ed818813
--- /dev/null
+++ b/games-arcade/apricots/apricots-0.2.7.ebuild
@@ -0,0 +1,40 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop
+
+DESCRIPTION="Fly a plane around and bomb/shoot the enemy (port of Planegame from Amiga)"
+HOMEPAGE="https://github.com/moggers87/apricots"
+SRC_URI="
+	https://github.com/moggers87/apricots/releases/download/v${PV}/${P}.tar.gz
+	https://dev.gentoo.org/~ionen/distfiles/${PN}.png"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RESTRICT="test" # this is only static analysis / linter tests
+
+RDEPEND="
+	media-libs/freealut
+	media-libs/libsdl2[sound,video]
+	media-libs/openal"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-sign-undef.patch
+)
+
+src_install() {
+	emake DESTDIR="${D}" datadir="${ED}/usr/share" install
+	einstalldocs
+
+	insinto /etc
+	doins ${PN}/${PN}.cfg
+	rm "${ED}"/usr/share/${PN}/apricots.cfg
+
+	doicon "${DISTDIR}"/${PN}.png
+	make_desktop_entry ${PN} ${PN^}
+}
diff --git a/games-arcade/apricots/files/apricots-0.2.6-freealut.patch b/games-arcade/apricots/files/apricots-0.2.6-freealut.patch
deleted file mode 100644
index d2e1b27f6f34..000000000000
--- a/games-arcade/apricots/files/apricots-0.2.6-freealut.patch
+++ /dev/null
@@ -1,65 +0,0 @@
---- a/apricots/apricots.cpp
-+++ b/apricots/apricots.cpp
-@@ -16,6 +16,7 @@
- int main(int, char**){

- #endif

- 

-+atexit(SDL_Quit);

-   // Initialize data

-   gamedata g;

-   init_data(g);

-
---- a/apricots/sampleio.cpp
-+++ b/apricots/sampleio.cpp
-@@ -74,12 +74,9 @@
-   alListenerfv(AL_ORIENTATION, front );

- 

-   // Load in samples

--  ALvoid* data = malloc(5 * (512 * 3) * 1024);

-   alGenBuffers(numsamples, samples);

- 

-   for (int i = 0; i < numsamples; i++){

--    ALsizei freq;

--    ALboolean fileok;

-     // Evil OpenAL portability fix done here

- #ifdef _WIN32

-     ALenum format;

-@@ -87,15 +84,12 @@
-     alutLoadWAVFile(filenames[i],&format,&data,&filelen,&freq,&trash);

-     fileok = (alGetError() == AL_NO_ERROR);

- #else

--    ALsizei format;

--    ALsizei trash;

--    fileok = alutLoadWAV(filenames[i],&data,&format,&filelen,&trash,&freq);

-+	samples[i] = alutCreateBufferFromFile(filenames[i]);

- #endif

--    if (!fileok){

-+    if (samples[i] == AL_NONE){

-       cerr << "sampleio: could not open " << filenames[i] << endl;

-       exit(1);

-     }         

--    alBufferData(samples[i], format, data, filelen, freq);

-   }

- 

-   // Generate Sources

-@@ -107,7 +101,6 @@
-     alSourcefv(sources[j], AL_ORIENTATION, back );

-   }

-   

--  free(data);

-   

- }

- 

-
---- a/configure.in
-+++ b/configure.in
-@@ -100,7 +100,8 @@
- 
- dnl Check for OpenAL
- AC_CHECK_HEADER(AL/al.h,[CXXFLAGS="$CXXFLAGS -DAP_AUDIO_OPENAL"])
--AC_CHECK_LIB( openal, alutInit)
-+AC_CHECK_LIB( openal, alGetError)
-+AC_CHECK_LIB( alut, alutInit)
- 
- KDE_CHECK_EXTRA_LIBS
- all_libraries="$all_libraries $USER_LDFLAGS"
diff --git a/games-arcade/apricots/files/apricots-0.2.6-ldflags.patch b/games-arcade/apricots/files/apricots-0.2.6-ldflags.patch
deleted file mode 100644
index 8a7b4a9f9a8c..000000000000
--- a/games-arcade/apricots/files/apricots-0.2.6-ldflags.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/apricots/Makefile.am.old	2010-10-11 15:58:18.000000000 +0200
-+++ b/apricots/Makefile.am	2010-10-11 15:59:21.000000000 +0200
-@@ -4,7 +4,8 @@
- ## INCLUDES were found outside kdevelop specific part
- 
- apricots_SOURCES = SDLfont.cpp shape.cpp setup.cpp sampleio.cpp init.cpp game.cpp finish.cpp fall.cpp drawall.cpp drak.cpp collide.cpp apricots.cpp all.cpp ai.cpp 
--apricots_LDADD   = 
-+apricots_LDADD   = $(all_libraries) 
-+                                                                                
- 
- SUBDIRS = docs 
- 
-@@ -68,7 +69,3 @@
- ####### kdevelop will overwrite this part!!! (end)############
- # set the include path found by configure
- INCLUDES= $(all_includes)
-- 
--# the library search path.
--apricots_LDFLAGS = $(all_libraries) 
--                                                                                
diff --git a/games-arcade/apricots/files/apricots-0.2.7-sign-undef.patch b/games-arcade/apricots/files/apricots-0.2.7-sign-undef.patch
new file mode 100644
index 000000000000..c1904ea9f8be
--- /dev/null
+++ b/games-arcade/apricots/files/apricots-0.2.7-sign-undef.patch
@@ -0,0 +1,10 @@
+Undefined reference to sign() when using -O1 or above.
+--- a/apricots/all.cpp
++++ b/apricots/all.cpp
+@@ -19,5 +19,5 @@
+ // Sign function
+ 
+-inline int sign(int n) { return (0 < n) - (n < 0); }
++int sign(int n) { return (0 < n) - (n < 0); }
+ 
+ // Error message for switch statements that shouldn't ever get to default
diff --git a/games-arcade/apricots/metadata.xml b/games-arcade/apricots/metadata.xml
index 1c3ba213c494..c470ad8c5978 100644
--- a/games-arcade/apricots/metadata.xml
+++ b/games-arcade/apricots/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">moggers87/apricots</remote-id>
+	</upstream>
 </pkgmetadata>