summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Seifert <soap@gentoo.org>2018-06-30 13:12:53 +0200
committerDavid Seifert <soap@gentoo.org>2018-06-30 13:13:48 +0200
commit1c1cdc8aacaf2fd38d081238b87442247fe99e4e (patch)
tree3b83afda8bc37db454567b05ee52fb984fa7588b
parentsys-devel/gdb: fix build failure on ia64, bug #658014 (diff)
downloadgentoo-1c1cdc8aacaf2fd38d081238b87442247fe99e4e.tar.gz
gentoo-1c1cdc8aacaf2fd38d081238b87442247fe99e4e.tar.bz2
gentoo-1c1cdc8aacaf2fd38d081238b87442247fe99e4e.zip
games-arcade/grande-KXL: Fix botched games.eclass conversion
* The games.eclass conversion was broken from the start in commit b4a70d4715f7. Closes: https://bugs.gentoo.org/653402 Package-Manager: Portage-2.3.41, Repoman-2.3.9
-rw-r--r--games-arcade/grande-KXL/files/grande-KXL-0.6-cflags.patch4
-rw-r--r--games-arcade/grande-KXL/files/grande-KXL-0.6-configure.in.patch4
-rw-r--r--games-arcade/grande-KXL/grande-KXL-0.6-r1.ebuild16
3 files changed, 15 insertions, 9 deletions
diff --git a/games-arcade/grande-KXL/files/grande-KXL-0.6-cflags.patch b/games-arcade/grande-KXL/files/grande-KXL-0.6-cflags.patch
index ff51e562bcb3..94f6ce759b75 100644
--- a/games-arcade/grande-KXL/files/grande-KXL-0.6-cflags.patch
+++ b/games-arcade/grande-KXL/files/grande-KXL-0.6-cflags.patch
@@ -4,8 +4,8 @@ Subject: build system
respect CFLAGS
---- src/Makefile.am
-+++ src/Makefile.am
+--- a/src/Makefile.am
++++ b/src/Makefile.am
@@ -8,7 +8,7 @@
SUBDIRS = bmp wav stg
diff --git a/games-arcade/grande-KXL/files/grande-KXL-0.6-configure.in.patch b/games-arcade/grande-KXL/files/grande-KXL-0.6-configure.in.patch
index 80cdcd83b898..19fec93f61a5 100644
--- a/games-arcade/grande-KXL/files/grande-KXL-0.6-configure.in.patch
+++ b/games-arcade/grande-KXL/files/grande-KXL-0.6-configure.in.patch
@@ -1,5 +1,5 @@
---- configure.in
-+++ configure.in
+--- a/configure.in
++++ b/configure.in
@@ -17,12 +17,8 @@
AC_CHECK_HEADERS(unistd.h)
diff --git a/games-arcade/grande-KXL/grande-KXL-0.6-r1.ebuild b/games-arcade/grande-KXL/grande-KXL-0.6-r1.ebuild
index b256aa384205..899a615e6527 100644
--- a/games-arcade/grande-KXL/grande-KXL-0.6-r1.ebuild
+++ b/games-arcade/grande-KXL/grande-KXL-0.6-r1.ebuild
@@ -2,6 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=6
+
inherit autotools desktop
DESCRIPTION="ZANAC type game"
@@ -15,20 +16,25 @@ IUSE=""
DEPEND="dev-games/KXL"
RDEPEND="${DEPEND}
- media-fonts/font-adobe-100dpi
-"
+ media-fonts/font-adobe-100dpi"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-configure.in.patch
+ "${FILESDIR}"/${P}-cflags.patch
+)
src_prepare() {
default
- eapply "${FILESDIR}"/${P}-{configure.in,cflags}.patch
- mv configure.{in,ac}
- rm aclocal.m4
+
+ mv configure.{in,ac} || die
+ rm aclocal.m4 || die
eautoreconf
}
src_install() {
dodir /var/lib
default
+
newicon src/bmp/boss1.bmp ${PN}.bmp
make_desktop_entry grande Grande /usr/share/pixmaps/${PN}.bmp
}