[gentoo-commits] repo/gentoo:master commit in: games-arcade/pacmanarena/files/, games-arcade/pacmanarena/
commit: a229976dffa2a8ae85c872761b15918a04280ddc
Author: Alexey Sokolov google com>
AuthorDate: Sun Sep 13 22:42:01 2020 +
Commit: James Le Cuirot gentoo org>
CommitDate: Mon Sep 21 21:14:13 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a229976d
games-arcade/pacmanarena: fix build on gcc 10
Fix removing of -g from CFLAGS
Closes: https://bugs.gentoo.org/708066
Package-Manager: Portage-3.0.4, Repoman-2.3.23
Signed-off-by: Alexey Sokolov asokolov.org>
Signed-off-by: James Le Cuirot gentoo.org>
.../files/pacmanarena-0.15-fnocommon.patch | 15 ++
.../pacmanarena/pacmanarena-0.15-r2.ebuild | 59 ++
2 files changed, 74 insertions(+)
diff --git a/games-arcade/pacmanarena/files/pacmanarena-0.15-fnocommon.patch
b/games-arcade/pacmanarena/files/pacmanarena-0.15-fnocommon.patch
new file mode 100644
index 000..103976f4c48
--- /dev/null
+++ b/games-arcade/pacmanarena/files/pacmanarena-0.15-fnocommon.patch
@@ -0,0 +1,15 @@
+Fix build. https://bugs.gentoo.org/708066#c8
+
+diff --git a/include/input.h b/include/input.h
+index 08a4aee..491c01d 100644
+--- a/include/input.h
b/include/input.h
+@@ -22,8 +22,6 @@
+ #ifndef _INPUT_H
+ #define _INPUT_H
+
+-char *keyboard_map;
+-
+ void input_reset(void);
+ void input_update(void);
+ int input_kstate(int ksym);
diff --git a/games-arcade/pacmanarena/pacmanarena-0.15-r2.ebuild
b/games-arcade/pacmanarena/pacmanarena-0.15-r2.ebuild
new file mode 100644
index 000..4b16585222e
--- /dev/null
+++ b/games-arcade/pacmanarena/pacmanarena-0.15-r2.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools desktop
+
+DESCRIPTION="3D Pacman clone with a few surprises. Rockets, bombs and
explosions abound"
+HOMEPAGE="http://pacmanarena.sourceforge.net/;
+SRC_URI="mirror://sourceforge/${PN}/pacman-arena-${PV}.tar.bz2
+ mirror://sourceforge/${PN}/pacman-data-0.0.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~x86"
+
+RDEPEND="
+ media-libs/libsdl[sound]
+ media-libs/sdl-mixer[vorbis]
+ media-libs/sdl-net
+ virtual/glu
+ virtual/opengl
+"
+DEPEND="${RDEPEND}"
+BDEPEND="app-arch/unzip"
+
+S="${WORKDIR}/pacman"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-underlink.patch
+ "${FILESDIR}"/${P}-fnocommon.patch
+)
+
+src_unpack() {
+ unpack pacman-arena-${PV}.tar.bz2
+ cd "${S}"
+ unpack pacman-data-0.0.zip
+}
+
+src_prepare() {
+ default
+ sed -i \
+ -e "/^CFLAGS/ s:pacman:${PN}:" \
+ -e '1i CC=@CC@' \
+ Makefile.in || die
+ sed -i \
+ -e '/CFLAGS/s:-g::' \
+ configure.ac || die
+ eautoreconf
+}
+
+src_install() {
+ newbin pacman ${PN}
+ insinto /usr/share/${PN}
+ doins -r gfx sfx
+ newicon gfx/pacman_arena1.tga ${PN}.tga
+ make_desktop_entry ${PN} "Pacman Arena" /usr/share/pixmaps/${PN}.tga
+ einstalldocs
+}
[gentoo-commits] repo/gentoo:master commit in: games-arcade/pacmanarena/
commit: efead96e62e48296ba4941834aa29d7aca279ce5
Author: Alexey Sokolov google com>
AuthorDate: Sun Sep 20 21:33:52 2020 +
Commit: James Le Cuirot gentoo org>
CommitDate: Mon Sep 21 21:14:16 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=efead96e
games-arcade/pacmanarena: drop old 0.15-r1
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Alexey Sokolov asokolov.org>
Closes: https://github.com/gentoo/gentoo/pull/17532
Signed-off-by: James Le Cuirot gentoo.org>
.../pacmanarena/pacmanarena-0.15-r1.ebuild | 56 --
1 file changed, 56 deletions(-)
diff --git a/games-arcade/pacmanarena/pacmanarena-0.15-r1.ebuild
b/games-arcade/pacmanarena/pacmanarena-0.15-r1.ebuild
deleted file mode 100644
index e803d774835..000
--- a/games-arcade/pacmanarena/pacmanarena-0.15-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools desktop
-
-DESCRIPTION="3D Pacman clone with a few surprises. Rockets, bombs and
explosions abound"
-HOMEPAGE="http://pacmanarena.sourceforge.net/;
-SRC_URI="mirror://sourceforge/${PN}/pacman-arena-${PV}.tar.bz2
- mirror://sourceforge/${PN}/pacman-data-0.0.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
- virtual/opengl
- virtual/glu
- media-libs/libsdl[sound]
- media-libs/sdl-mixer[vorbis]
- media-libs/sdl-net
-"
-DEPEND="${RDEPEND}
- app-arch/unzip
-"
-
-S="${WORKDIR}/pacman"
-
-src_unpack() {
- unpack pacman-arena-${PV}.tar.bz2
- cd "${S}"
- unpack pacman-data-0.0.zip
-}
-
-src_prepare() {
- default
- sed -i \
- -e "/^CFLAGS/ s:pacman:${PN}:" \
- -e '1i CC=@CC@' \
- Makefile.in || die
- sed -i \
- -e '/CFLAGS/s:-g::' \
- configure || die
- eapply "${FILESDIR}"/${P}-underlink.patch
- eautoreconf
-}
-
-src_install() {
- newbin pacman ${PN}
- insinto /usr/share/${PN}
- doins -r gfx sfx
- newicon gfx/pacman_arena1.tga ${PN}.tga
- make_desktop_entry ${PN} "Pacman Arena" /usr/share/pixmaps/${PN}.tga
- einstalldocs
-}
[gentoo-commits] repo/gentoo:master commit in: games-arcade/pacmanarena/, games-arcade/pacmanarena/files/
commit: bf2a9ad5179cc48817e2a42f7dd5902680b3ea41
Author: Pacho Ramos gentoo org>
AuthorDate: Mon Apr 23 18:07:10 2018 +
Commit: Pacho Ramos gentoo org>
CommitDate: Mon Apr 23 19:16:56 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf2a9ad5
games-arcade/pacmanarena: Stop using games.eclass
Package-Manager: Portage-2.3.31, Repoman-2.3.9
.../files/pacmanarena-0.15-underlink.patch | 4 +--
...rena-0.15.ebuild => pacmanarena-0.15-r1.ebuild} | 29 --
2 files changed, 18 insertions(+), 15 deletions(-)
diff --git a/games-arcade/pacmanarena/files/pacmanarena-0.15-underlink.patch
b/games-arcade/pacmanarena/files/pacmanarena-0.15-underlink.patch
index 08c2a54dd1f..6c32d8793be 100644
--- a/games-arcade/pacmanarena/files/pacmanarena-0.15-underlink.patch
+++ b/games-arcade/pacmanarena/files/pacmanarena-0.15-underlink.patch
@@ -1,5 +1,5 @@
configure.ac.old 2011-05-24 08:45:49.197656941 +0200
-+++ configure.ac 2011-05-24 08:46:13.685193761 +0200
+--- a/configure.ac.old 2011-05-24 08:45:49.197656941 +0200
b/configure.ac 2011-05-24 08:46:13.685193761 +0200
@@ -101,6 +101,7 @@
AC_CHECK_LIB(GLU, gluNewQuadric, [ LDFLAGS="$LDFLAGS -lGLU" ],
[AC_MSG_ERROR([OpenGL libraries not found])
diff --git a/games-arcade/pacmanarena/pacmanarena-0.15.ebuild
b/games-arcade/pacmanarena/pacmanarena-0.15-r1.ebuild
similarity index 72%
rename from games-arcade/pacmanarena/pacmanarena-0.15.ebuild
rename to games-arcade/pacmanarena/pacmanarena-0.15-r1.ebuild
index 1d57629a1ff..e803d774835 100644
--- a/games-arcade/pacmanarena/pacmanarena-0.15.ebuild
+++ b/games-arcade/pacmanarena/pacmanarena-0.15-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
-inherit eutils autotools games
+EAPI=6
+inherit autotools desktop
DESCRIPTION="3D Pacman clone with a few surprises. Rockets, bombs and
explosions abound"
HOMEPAGE="http://pacmanarena.sourceforge.net/;
@@ -14,15 +14,18 @@ SLOT="0"
KEYWORDS="~alpha ~amd64 ~x86"
IUSE=""
-RDEPEND="virtual/opengl
+RDEPEND="
+ virtual/opengl
virtual/glu
media-libs/libsdl[sound]
media-libs/sdl-mixer[vorbis]
- media-libs/sdl-net"
+ media-libs/sdl-net
+"
DEPEND="${RDEPEND}
- app-arch/unzip"
+ app-arch/unzip
+"
-S=${WORKDIR}/pacman
+S="${WORKDIR}/pacman"
src_unpack() {
unpack pacman-arena-${PV}.tar.bz2
@@ -31,6 +34,7 @@ src_unpack() {
}
src_prepare() {
+ default
sed -i \
-e "/^CFLAGS/ s:pacman:${PN}:" \
-e '1i CC=@CC@' \
@@ -38,16 +42,15 @@ src_prepare() {
sed -i \
-e '/CFLAGS/s:-g::' \
configure || die
- epatch "${FILESDIR}"/${P}-underlink.patch
+ eapply "${FILESDIR}"/${P}-underlink.patch
eautoreconf
}
src_install() {
- newgamesbin pacman ${PN} || die
- insinto "${GAMES_DATADIR}"/${PN}
- doins -r gfx sfx || die
+ newbin pacman ${PN}
+ insinto /usr/share/${PN}
+ doins -r gfx sfx
newicon gfx/pacman_arena1.tga ${PN}.tga
make_desktop_entry ${PN} "Pacman Arena" /usr/share/pixmaps/${PN}.tga
- dodoc README
- prepgamesdirs
+ einstalldocs
}
