[gentoo-commits] repo/gentoo:master commit in: games-arcade/apricots/files/, games-arcade/apricots/

[Ionen Wolkens]

commit:     d5dd056a01154266b8ccd52e13caf31e0f350a4d
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 22 21:43:08 2021 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Wed Sep 22 22:25:34 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5dd056a

games-arcade/apricots: drop 0.2.6-r2

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-arcade/apricots/Manifest                     |  1 -
 games-arcade/apricots/apricots-0.2.6-r2.ebuild     | 63 ---------------------
 .../apricots/files/apricots-0.2.6-freealut.patch   | 65 ----------------------
 .../apricots/files/apricots-0.2.6-ldflags.patch    | 20 -------
 4 files changed, 149 deletions(-)

diff --git a/games-arcade/apricots/Manifest b/games-arcade/apricots/Manifest
index b2b36ece927..777ad348f17 100644
--- a/games-arcade/apricots/Manifest
+++ b/games-arcade/apricots/Manifest
@@ -1,3 +1,2 @@
-DIST apricots-0.2.6.tar.gz 768568 BLAKE2B 82fa6d4be5f1a9ed86e968a4645822cbf558ea37df956d54d0f07e3260ca2e7ff561ae6ea357dabb2c35b7bfd4ff0d806dda5cf51cbb3a956ebdba52f6ef526a SHA512 cf8a988d316382469e4b13a86315c760b702b3d490398cf2fe96f119ba743c1ff707c09228dbbf4eb601189fece708913a621b04c44e9d93162639ccbd502cf5
 DIST apricots-0.2.7.tar.gz 388024 BLAKE2B 5d16cb2637580ae728aa4f1b3911801effa6c79faabf7f3a1c026de8d91aaa582c8063ae33152c44fc9878ae0f7126fdb6ab0363b562e90c7359bcfe6ac78391 SHA512 7f97759402703962f660cdf609f50bb9a4465cc727d3fd17751eb5863b0b9131d9014eab50632c1638130f7e4223c89c45c12cecbc9fe2639943def2ce80ae25
 DIST apricots.png 1965 BLAKE2B 164e06ec9856273077636b347cac555cc49f5f38faffeea6f43b9032edee9dfebedce24470f70b185707ee2e467d861164a9c90c370ada5ff89d5c4854b99e7c SHA512 5d637707d7cfa775e5f3d3416a51abbbb39369cf0bfd9be871295ca3079530c25b893076c2cb6a6621586d67860920e079cb4f491d2c67ff13ce80e56a2cf4e5

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 32117603fb8..00000000000
--- 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/files/apricots-0.2.6-freealut.patch b/games-arcade/apricots/files/apricots-0.2.6-freealut.patch
deleted file mode 100644
index d2e1b27f6f3..00000000000
--- 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 8a7b4a9f9a8..00000000000
--- 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) 
--