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

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

[Pacho Ramos]

commit:     dc9b81e1766fb34331fc7064a75574268d8358ec
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 15 08:59:33 2018 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sun Apr 15 09:11:23 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc9b81e1

games-arcade/apricots: Stop using games.eclass

Package-Manager: Portage-2.3.28, Repoman-2.3.9

 games-arcade/apricots/apricots-0.2.6-r2.ebuild     | 63 ++++++++++++++++++++++
 .../apricots/files/apricots-0.2.6-freealut.patch   | 12 ++---
 .../apricots/files/apricots-0.2.6-ldflags.patch    |  4 +-
 3 files changed, 71 insertions(+), 8 deletions(-)

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 00000000000..b0a37bd7912
--- /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
index 4f663071340..d2e1b27f6f3 100644
--- a/games-arcade/apricots/files/apricots-0.2.6-freealut.patch
+++ b/games-arcade/apricots/files/apricots-0.2.6-freealut.patch
@@ -1,5 +1,5 @@
---- apricots/apricots.cpp
-+++ apricots/apricots.cpp
+--- a/apricots/apricots.cpp
++++ b/apricots/apricots.cpp
 @@ -16,6 +16,7 @@
  int main(int, char**){
  #endif
@@ -9,8 +9,8 @@
    gamedata g;
    init_data(g);
 
---- apricots/sampleio.cpp
-+++ apricots/sampleio.cpp
+--- a/apricots/sampleio.cpp
++++ b/apricots/sampleio.cpp
 @@ -74,12 +74,9 @@
    alListenerfv(AL_ORIENTATION, front );
  
@@ -51,8 +51,8 @@
  }
  
 
---- configure.in
-+++ configure.in
+--- a/configure.in
++++ b/configure.in
 @@ -100,7 +100,8 @@
  
  dnl Check for OpenAL

diff --git a/games-arcade/apricots/files/apricots-0.2.6-ldflags.patch b/games-arcade/apricots/files/apricots-0.2.6-ldflags.patch
index 5a2a34490b7..8a7b4a9f9a8 100644
--- a/games-arcade/apricots/files/apricots-0.2.6-ldflags.patch
+++ b/games-arcade/apricots/files/apricots-0.2.6-ldflags.patch
@@ -1,5 +1,5 @@
---- apricots/Makefile.am.old	2010-10-11 15:58:18.000000000 +0200
-+++ apricots/Makefile.am	2010-10-11 15:59:21.000000000 +0200
+--- 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
  

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

[James Le Cuirot]

commit:     9637d0559dbaeabbd958ca6e0f92beb3def82dd5
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Wed Aug  7 20:43:27 2024 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Wed Aug  7 20:43:27 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9637d055

games-arcade/apricots: Drop old 0.2.7

Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 games-arcade/apricots/Manifest                     |  1 -
 games-arcade/apricots/apricots-0.2.7.ebuild        | 40 ----------------------
 .../apricots/files/apricots-0.2.7-sign-undef.patch | 10 ------
 3 files changed, 51 deletions(-)

diff --git a/games-arcade/apricots/Manifest b/games-arcade/apricots/Manifest
index 562502297719..1093fc52a3d4 100644
--- a/games-arcade/apricots/Manifest
+++ b/games-arcade/apricots/Manifest
@@ -1,3 +1,2 @@
-DIST apricots-0.2.7.tar.gz 388024 BLAKE2B 5d16cb2637580ae728aa4f1b3911801effa6c79faabf7f3a1c026de8d91aaa582c8063ae33152c44fc9878ae0f7126fdb6ab0363b562e90c7359bcfe6ac78391 SHA512 7f97759402703962f660cdf609f50bb9a4465cc727d3fd17751eb5863b0b9131d9014eab50632c1638130f7e4223c89c45c12cecbc9fe2639943def2ce80ae25
 DIST apricots-0.2.8.tar.gz 407430 BLAKE2B 7ae24c5d068ef528ee5352088ffea6f747b01e418e94e93b87795f6ccda5101ebf27cfb7d7c51f1e076cec71c39fce5f06ff16644d924a03df7bd5c24f4e56aa SHA512 4d08ba96087ef811bc30a70ce3963c1c0633fd7fcb2d628d0986f2a35eb89284e78be26a3cccc133cb0beaaeb7923630aeba81b02ad752dcd46d31bcb1165322
 DIST apricots.png 1965 BLAKE2B 164e06ec9856273077636b347cac555cc49f5f38faffeea6f43b9032edee9dfebedce24470f70b185707ee2e467d861164a9c90c370ada5ff89d5c4854b99e7c SHA512 5d637707d7cfa775e5f3d3416a51abbbb39369cf0bfd9be871295ca3079530c25b893076c2cb6a6621586d67860920e079cb4f491d2c67ff13ce80e56a2cf4e5

diff --git a/games-arcade/apricots/apricots-0.2.7.ebuild b/games-arcade/apricots/apricots-0.2.7.ebuild
deleted file mode 100644
index b7c7ed818813..000000000000
--- a/games-arcade/apricots/apricots-0.2.7.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# 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.7-sign-undef.patch b/games-arcade/apricots/files/apricots-0.2.7-sign-undef.patch
deleted file mode 100644
index c1904ea9f8be..000000000000
--- a/games-arcade/apricots/files/apricots-0.2.7-sign-undef.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-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