* [gentoo-commits] repo/gentoo:master commit in: games-arcade/rockdodger/, games-arcade/rockdodger/files/
@ 2021-04-07 9:38 Sam James
0 siblings, 0 replies; 2+ messages in thread
From: Sam James @ 2021-04-07 9:38 UTC (permalink / raw
To: gentoo-commits
commit: aa35d6d67d8c2de1b3458243f12aa8aba1adbe4a
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 7 09:31:26 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Apr 7 09:38:30 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa35d6d6
games-arcade/rockdodger: port to EAPI 7, games.eclass--, respect CC
Signed-off-by: Sam James <sam <AT> gentoo.org>
games-arcade/rockdodger/files/0.6.0a-sec.patch | 4 +-
.../rockdodger/files/rockdodger-0.6.0a-gcc41.patch | 4 +-
.../files/rockdodger-0.6.0a-underlink.patch | 4 +-
.../rockdodger/rockdodger-0.6.0a-r1.ebuild | 57 ------------------
.../rockdodger/rockdodger-0.6.0a-r2.ebuild | 70 ++++++++++++++++++++++
5 files changed, 76 insertions(+), 63 deletions(-)
diff --git a/games-arcade/rockdodger/files/0.6.0a-sec.patch b/games-arcade/rockdodger/files/0.6.0a-sec.patch
index e870cf2d297..b7af24f160a 100644
--- a/games-arcade/rockdodger/files/0.6.0a-sec.patch
+++ b/games-arcade/rockdodger/files/0.6.0a-sec.patch
@@ -1,5 +1,5 @@
---- main.c.old 2002-11-17 23:56:12.000000000 +0100
-+++ main.c 2004-10-29 22:32:00.000000000 +0200
+--- a/main.c
++++ b/main.c
@@ -459,7 +459,7 @@ FILE *hs_fopen(char *mode) {/*{{{*/
else {
char s[1024];
diff --git a/games-arcade/rockdodger/files/rockdodger-0.6.0a-gcc41.patch b/games-arcade/rockdodger/files/rockdodger-0.6.0a-gcc41.patch
index 59e01bba17c..f6979752097 100644
--- a/games-arcade/rockdodger/files/rockdodger-0.6.0a-gcc41.patch
+++ b/games-arcade/rockdodger/files/rockdodger-0.6.0a-gcc41.patch
@@ -1,5 +1,5 @@
---- main.c.old 2006-04-24 16:16:13.000000000 +0200
-+++ main.c 2006-04-24 16:16:21.000000000 +0200
+--- a/main.c
++++ b/main.c
@@ -206,7 +206,6 @@
struct bangdots bdot[MAX_BANG_DOTS], *bdotptr=bdot;
struct spacedot sdot[MAX_SPACE_DOTS];
diff --git a/games-arcade/rockdodger/files/rockdodger-0.6.0a-underlink.patch b/games-arcade/rockdodger/files/rockdodger-0.6.0a-underlink.patch
index 87cd8453476..3ee7d9c5cc7 100644
--- a/games-arcade/rockdodger/files/rockdodger-0.6.0a-underlink.patch
+++ b/games-arcade/rockdodger/files/rockdodger-0.6.0a-underlink.patch
@@ -1,5 +1,5 @@
---- Makefile.old 2011-06-20 21:25:56.788323912 +0200
-+++ Makefile 2011-06-20 21:26:11.970287694 +0200
+--- a/Makefile
++++ b/Makefile
@@ -27,7 +27,7 @@
#SOUNDLIBRARIES=
SOUNDLIBRARIES=-lSDL_mixer
diff --git a/games-arcade/rockdodger/rockdodger-0.6.0a-r1.ebuild b/games-arcade/rockdodger/rockdodger-0.6.0a-r1.ebuild
deleted file mode 100644
index 5e0cd21a685..00000000000
--- a/games-arcade/rockdodger/rockdodger-0.6.0a-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils games
-
-DESCRIPTION="Dodge the rocks for as long as possible until you die"
-HOMEPAGE="http://spacerocks.sourceforge.net/"
-SRC_URI="mirror://sourceforge/spacerocks/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="media-libs/libsdl[sound,video]
- media-libs/sdl-image[png]
- media-libs/sdl-mixer"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- # Modify highscores & data directory and add our CFLAGS to the Makefile
- sed -i \
- -e "s:\./data:${GAMES_DATADIR}/${PN}:" \
- -e "s:/usr/share/rockdodger/\.highscore:${GAMES_STATEDIR}/rockdodger.scores:" \
- -e 's:umask(0111):umask(0117):' main.c \
- || die " sed main.c failed"
- sed -i \
- -e "s:-g:${CFLAGS}:" \
- -e 's:cc:$(CC):' \
- -e '/-o/s:\$+:$(LDFLAGS) $+:' \
- Makefile \
- || die "sed Makefile failed"
-
- # The 512 chunksize makes the music skip
- sed -i \
- -e "s:512:1024:" sound.c \
- || die "sed sound.c failed"
- epatch \
- "${FILESDIR}"/${PV}-sec.patch \
- "${FILESDIR}"/${P}-gcc41.patch \
- "${FILESDIR}"/${P}-underlink.patch
-}
-
-src_install() {
- dogamesbin ${PN}
- insinto "${GAMES_DATADIR}"/${PN}
- doins data/*
-
- newicon spacerocks.xpm ${PN}.xpm
- make_desktop_entry ${PN} "Rock Dodger" ${PN}
-
- dodir "${GAMES_STATEDIR}"
- touch "${D}/${GAMES_STATEDIR}"/${PN}.scores
- fperms 660 "${GAMES_STATEDIR}"/${PN}.scores
- prepgamesdirs
-}
diff --git a/games-arcade/rockdodger/rockdodger-0.6.0a-r2.ebuild b/games-arcade/rockdodger/rockdodger-0.6.0a-r2.ebuild
new file mode 100644
index 00000000000..d446d78f27b
--- /dev/null
+++ b/games-arcade/rockdodger/rockdodger-0.6.0a-r2.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop toolchain-funcs
+
+DESCRIPTION="Dodge the rocks for as long as possible until you die"
+HOMEPAGE="http://spacerocks.sourceforge.net/"
+SRC_URI="mirror://sourceforge/spacerocks/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+ media-libs/libsdl[sound,video]
+ media-libs/sdl-image[png]
+ media-libs/sdl-mixer
+"
+RDEPEND="
+ ${DEPEND}
+ acct-group/gamestat
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PV}-sec.patch
+ "${FILESDIR}"/${P}-gcc41.patch
+ "${FILESDIR}"/${P}-underlink.patch
+)
+
+src_prepare() {
+ default
+
+ # Modify highscores & data directory and add our CFLAGS to the Makefile
+ sed -i \
+ -e "s:\./data:/var/games/${PN}:" \
+ -e "s:/usr/share/rockdodger/\.highscore:/var/games/${PN}/rockdodger.scores:" \
+ -e 's:umask(0111):umask(0117):' \
+ main.c || die " sed main.c failed"
+
+ sed -i \
+ -e "s:-g:${CFLAGS}:" \
+ -e 's:cc:${CC}:' \
+ -e '/-o/s:\$+:$(LDFLAGS) $+:' \
+ Makefile || die "sed Makefile failed"
+
+ # The 512 chunksize makes the music skip
+ sed -i -e "s:512:1024:" sound.c || die "sed sound.c failed"
+}
+
+src_configure() {
+ tc-export CC
+}
+
+src_install() {
+ dobin ${PN}
+ insinto /usr/share/${PN}
+ doins data/*
+
+ newicon spacerocks.xpm ${PN}.xpm
+ make_desktop_entry ${PN} "Rock Dodger" ${PN}
+
+ dodir /var/games/${PN}
+ touch "${ED}"/var/games/${PN}/${PN}.scores || die
+
+ fperms 660 /var/games/${PN}/${PN}.scores
+ fowners -R root:gamestat /var/games/${PN}
+ fperms g+s /usr/bin/${PN}
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-arcade/rockdodger/, games-arcade/rockdodger/files/
@ 2021-06-01 23:44 Ionen Wolkens
0 siblings, 0 replies; 2+ messages in thread
From: Ionen Wolkens @ 2021-06-01 23:44 UTC (permalink / raw
To: gentoo-commits
commit: ac1198365fed3a4faf25883ab730c392e34abdbe
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 1 12:01:27 2021 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Jun 1 23:19:16 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac119836
games-arcade/rockdodger: drop 0.6.0a-r2
This revision was unusable.
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
games-arcade/rockdodger/Manifest | 1 -
games-arcade/rockdodger/files/0.6.0a-sec.patch | 20 -------
.../rockdodger/files/rockdodger-0.6.0a-gcc41.patch | 18 ------
.../files/rockdodger-0.6.0a-underlink.patch | 11 ----
.../rockdodger/rockdodger-0.6.0a-r2.ebuild | 70 ----------------------
5 files changed, 120 deletions(-)
diff --git a/games-arcade/rockdodger/Manifest b/games-arcade/rockdodger/Manifest
index 11d90d34984..6cdc22adfe8 100644
--- a/games-arcade/rockdodger/Manifest
+++ b/games-arcade/rockdodger/Manifest
@@ -1,2 +1 @@
-DIST rockdodger-0.6.0a.tar.gz 410223 BLAKE2B 5ccda4400468d6a7209adfdad3045773bf31581e34dfb77bff7d314ca9d9fa18e6c5a24996259782c002cf8ea611f92388c9ca46be4e0c7492a526421e8e8163 SHA512 d517cc844df21e8772b13d0226841a64bede0cc2f5461fb83d313f49cd99192dcf6af4597e3d1f3e1c60f578437e355ce665e0288415da803a503fb12d8462eb
DIST rockdodger-1.1.4.tar.gz 1026184 BLAKE2B 08885155508adb878908d3cf9201c98cffded37dea051cb9a668ddb63891a19369648964f3f19d94b72a08626d3d1dea73686b190898d8b59c3b91805e08677c SHA512 542a8b5b1a9dc7fc8e61d3183c14c3f45952614f2e00f71383dfd42ddcf275cbc14520797d4555f2f19f354a4f1819d8527a587598c9dbc06a75b21643a8b019
diff --git a/games-arcade/rockdodger/files/0.6.0a-sec.patch b/games-arcade/rockdodger/files/0.6.0a-sec.patch
deleted file mode 100644
index b7af24f160a..00000000000
--- a/games-arcade/rockdodger/files/0.6.0a-sec.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/main.c
-+++ b/main.c
-@@ -459,7 +459,7 @@ FILE *hs_fopen(char *mode) {/*{{{*/
- else {
- char s[1024];
- umask(0177);
-- sprintf(s,"%s/.rockdodger_high",getenv("HOME"));
-+ snprintf(s,1024,"%s/.rockdodger_high",getenv("HOME"));
- if (f=fopen(s,mode)) {
- umask(mask);
- return f;
-@@ -478,7 +478,7 @@ void read_high_score_table() {/*{{{*/
- for (i=0; i<8; i++) {
- char s[1024];
- int highscore;
-- if (fscanf (f, "%d %[^\n]", &highscore, s)!=2)
-+ if (fscanf (f, "%d %1023[^\n]", &highscore, s)!=2)
- break;
- if (high[i].allocated)
- free(high[i].name);
diff --git a/games-arcade/rockdodger/files/rockdodger-0.6.0a-gcc41.patch b/games-arcade/rockdodger/files/rockdodger-0.6.0a-gcc41.patch
deleted file mode 100644
index f6979752097..00000000000
--- a/games-arcade/rockdodger/files/rockdodger-0.6.0a-gcc41.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/main.c
-+++ b/main.c
-@@ -206,7 +206,6 @@
- struct bangdots bdot[MAX_BANG_DOTS], *bdotptr=bdot;
- struct spacedot sdot[MAX_SPACE_DOTS];
-
--struct greeble greeb[MAX_GREEBLES];
- struct greeble {
- int active;
- float x,y; // When landed, these represent an offset from the host rock
-@@ -214,6 +213,7 @@
- int landed;
- int boredom; // Goes up while landed
- };
-+struct greeble greeb[MAX_GREEBLES];
- // }}}
-
- void init_greeblies() {
diff --git a/games-arcade/rockdodger/files/rockdodger-0.6.0a-underlink.patch b/games-arcade/rockdodger/files/rockdodger-0.6.0a-underlink.patch
deleted file mode 100644
index 3ee7d9c5cc7..00000000000
--- a/games-arcade/rockdodger/files/rockdodger-0.6.0a-underlink.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -27,7 +27,7 @@
- #SOUNDLIBRARIES=
- SOUNDLIBRARIES=-lSDL_mixer
-
--LIBRARIES=`sdl-config --libs` -lSDL_image $(SOUNDLIBRARIES)
-+LIBRARIES=`sdl-config --libs` -lSDL_image $(SOUNDLIBRARIES) -lm
-
- all: $(EXENAME)
-
diff --git a/games-arcade/rockdodger/rockdodger-0.6.0a-r2.ebuild b/games-arcade/rockdodger/rockdodger-0.6.0a-r2.ebuild
deleted file mode 100644
index d446d78f27b..00000000000
--- a/games-arcade/rockdodger/rockdodger-0.6.0a-r2.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop toolchain-funcs
-
-DESCRIPTION="Dodge the rocks for as long as possible until you die"
-HOMEPAGE="http://spacerocks.sourceforge.net/"
-SRC_URI="mirror://sourceforge/spacerocks/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="
- media-libs/libsdl[sound,video]
- media-libs/sdl-image[png]
- media-libs/sdl-mixer
-"
-RDEPEND="
- ${DEPEND}
- acct-group/gamestat
-"
-
-PATCHES=(
- "${FILESDIR}"/${PV}-sec.patch
- "${FILESDIR}"/${P}-gcc41.patch
- "${FILESDIR}"/${P}-underlink.patch
-)
-
-src_prepare() {
- default
-
- # Modify highscores & data directory and add our CFLAGS to the Makefile
- sed -i \
- -e "s:\./data:/var/games/${PN}:" \
- -e "s:/usr/share/rockdodger/\.highscore:/var/games/${PN}/rockdodger.scores:" \
- -e 's:umask(0111):umask(0117):' \
- main.c || die " sed main.c failed"
-
- sed -i \
- -e "s:-g:${CFLAGS}:" \
- -e 's:cc:${CC}:' \
- -e '/-o/s:\$+:$(LDFLAGS) $+:' \
- Makefile || die "sed Makefile failed"
-
- # The 512 chunksize makes the music skip
- sed -i -e "s:512:1024:" sound.c || die "sed sound.c failed"
-}
-
-src_configure() {
- tc-export CC
-}
-
-src_install() {
- dobin ${PN}
- insinto /usr/share/${PN}
- doins data/*
-
- newicon spacerocks.xpm ${PN}.xpm
- make_desktop_entry ${PN} "Rock Dodger" ${PN}
-
- dodir /var/games/${PN}
- touch "${ED}"/var/games/${PN}/${PN}.scores || die
-
- fperms 660 /var/games/${PN}/${PN}.scores
- fowners -R root:gamestat /var/games/${PN}
- fperms g+s /usr/bin/${PN}
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-06-01 23:44 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-06-01 23:44 [gentoo-commits] repo/gentoo:master commit in: games-arcade/rockdodger/, games-arcade/rockdodger/files/ Ionen Wolkens
-- strict thread matches above, loose matches on Subject: below --
2021-04-07 9:38 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox