gentoo resync : 14.07.2018

5 files changed, 161 insertions, 0 deletions

diff --git a/games-arcade/apricots/Manifest b/games-arcade/apricots/Manifest
new file mode 100644
index 000000000000..85580776e0e7
--- /dev/null
+++ b/games-arcade/apricots/Manifest
@@ -0,0 +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 1370 BLAKE2B b8beb3effe2c18b3b862700fd11ab6ec241f0fb57158ac3bf86f6a73751648ce4d1413a6657d4fe2ee291d885f307fc3e6b39a0e50d4e2410c08040d3cd69ce8 SHA512 e08f4aa491764b431de1a2a569fcda99363b6a70c0733e0da844e81a8172146d15eeba1133478a4abe9fd1c95740142c111dce1c2b29ba477d7f19de04bdef79
+MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/apricots/apricots-0.2.6-r2.ebuild b/games-arcade/apricots/apricots-0.2.6-r2.ebuild
new file mode 100644
index 000000000000..b0a37bd7912b
--- /dev/null
+++ b/games-arcade/apricots/apricots-0.2.6-r2.ebuild
@@ -0,0 +1,63 @@
+# 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 ~x86-fbsd"
+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
new file mode 100644
index 000000000000..d2e1b27f6f34
--- /dev/null
+++ b/games-arcade/apricots/files/apricots-0.2.6-freealut.patch
@@ -0,0 +1,65 @@
+--- 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
new file mode 100644
index 000000000000..8a7b4a9f9a8c
--- /dev/null
+++ b/games-arcade/apricots/files/apricots-0.2.6-ldflags.patch
@@ -0,0 +1,20 @@
+--- 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/metadata.xml b/games-arcade/apricots/metadata.xml
new file mode 100644
index 000000000000..78274e0fa550
--- /dev/null
+++ b/games-arcade/apricots/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
+</pkgmetadata>