games-arcade/retrobattle: Fix issues with games-arcade/retrobattle

diff --git a/games-arcade/retrobattle/ChangeLog b/games-arcade/retrobattle/ChangeLog
index d947af08a9341632799c13928e5daf2cb7253beb..91cd471915a96bce7b6402ea2bf9b909ddc67b6c 100644 (file)
--- a/games-arcade/retrobattle/ChangeLog
+++ b/games-arcade/retrobattle/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  04 Aug 2012; Alexander Berntsen (alexander__b) <alexanderberntsen@linux.com>
+  retrobattle-1.0.0.ebuild, +files/retrobattle-1.0.0-build.patch:
+  Fix issues with games-arcade/retrobattle
+
 *retrobattle-1.0.0 (02 Aug 2012)
 
   02 Aug 2012; Alexander Berntsen (alexander__b) <alexanderberntsen@linux.com>

diff --git a/games-arcade/retrobattle/Manifest b/games-arcade/retrobattle/Manifest
index 33174cec612df3edf10a18a0b97b3ff0f6b42d40..9e1b0ae6bf5b436c9387f0e96d375329d7442276 100644 (file)
--- a/games-arcade/retrobattle/Manifest
+++ b/games-arcade/retrobattle/Manifest
@@ -1,4 +1,5 @@
+AUX retrobattle-1.0.0-build.patch 707 SHA256 4ff9bd674694b0d8d0f66b785401ab05cd1145d0c84fc78dc1dc9e7615f5a04c SHA512 49bfb4618c1f1b6c6e526e190b7306a047fe4ac346953bdcb640450ff1f2f081f7e3c729cd2c6e71bf91cefb231dfd1ee55fff49df63e289ae66923b820bbd4a WHIRLPOOL 71851eb05564e5f77f4db48aa8a1cd9403c900c9fb9ffdef873a4962c35ca247952113fbf9be79f98a63f47be4b59aeaafe163630a6e1e8b8261a00a12f2fe80
 DIST retrobattle-src-1.0.0.tar.bz2 4007959 SHA256 0d184c6d7afc2865687fb9323754268692db165799f617422aafd57096540d68 SHA512 2d006fc9a62e57d7fb3c0f0e535a5c702204b6341566064d7683526923839e8a43e14b308e76a8a1f6794f7c682f6344975956877f80bbcbc33ee61cd640ff9e WHIRLPOOL 0af965622d322a65ff3521ab816d208e4f8875a1620b9da51ddb1a4b39c97cbf7e305cf51ac3d27773b1bea43f254648dd846964fc9cec9eb3716f766e1f44cc
-EBUILD retrobattle-1.0.0.ebuild 751 SHA256 273426cedb8c489868d27bbc0a7187142290b3b99643d6add6b3287184b37150 SHA512 4eee7c77053de2d57b14e91ae752b9ab2dc8e2ec193aacf79d7631da55050ffb9d89bafc335414aca36e71cb56919d9610391274f627b108e9764c4995efc615 WHIRLPOOL b7258fa2c83a7fb867d76ca27b10c3a90995fbb0e5ea7d25a0f2b510bfeb2c7c127f2435b42c2c1ba48e14590b3294a362683644dbcd572d1d40d60041582927
-MISC ChangeLog 336 SHA256 032ae441ed078a50bb229d30970215f7aecac4298c1abd7688df3f278ee4bab5 SHA512 80f2e63085f676f2f8b86032f0753e5a38af1a8d29245a6f434723128a1a0d10853faedab22b07d5cdfbc5b1dc07e5f164596ddd0a995ebfd0727dac8539855a WHIRLPOOL bd5e5c1f7ac6f634b6d63a3e3fe4d324933355ebbde7eb8fb10532648cd96829acc3989e79af60a58f4d0c6b62ad8d689bc8d330382cd3be2c83f34deb2e0bad
+EBUILD retrobattle-1.0.0.ebuild 853 SHA256 0debdb916b74cfd85ac2062c5f903ba5b5220de5e5cec99ff7b7a0dd306fa64e SHA512 79e21cc81b7a7863df602b12b6fee7186b387825766590ce4ce2e3165345b28439a31a71bc6bf5f3fcb490e395a7ed4b5f4e150751d729aeb6833d0e47cda887 WHIRLPOOL 2e8249adaa3cd13f1505647d7f0653bcb8c4b8a6516eb0ed341eac5ee7bc21b2b9908703f23d6b9ecd7a24997545d2a4ac7e21c8d6eaf5b0b0436caddf339472
+MISC ChangeLog 525 SHA256 103dda11b7f25d7aadbe74267449a49119cdc952faf6307aa32353397c1bca6d SHA512 39d313a65a263c7ae4ebe2232cde3972e94b000cf3396a72ab670603f1a385cce16acfcc9df3b29fcd9a3ed160dd61a0bf4d65053fd7c36b28e875d5fb6e597e WHIRLPOOL 646e2b91d554098060be5e698806c9bb7c312202644f939f05dbede56180371f9d912653de509f824d1dcd2fa2143432fab1be938d23c71e004d3ccd79fbe278
 MISC metadata.xml 214 SHA256 c1f09dc7d5313cd2da7b82259c7846ed23144d62b15e59680ada90e2b6b4d154 SHA512 aeb2fb354a9ddf41c45a071091a58b91eaf8b25d6d2c49e3e3daa547b591a54530144de4533573160b48dc356289c909612c4e3c80e387f081f88cb39263e130 WHIRLPOOL 54d8861daedd18ca38e4ada0fb71026c612b63946d47a9b34de90d1d6d85c8ce05c0a4b97730f554ea637d73ccce8ed207d33e707c2b8c1dd28af24cf44dd186

diff --git a/games-arcade/retrobattle/files/retrobattle-1.0.0-build.patch b/games-arcade/retrobattle/files/retrobattle-1.0.0-build.patch
new file mode 100644 (file)
index 0000000..8ffa83a
--- /dev/null
+++ b/games-arcade/retrobattle/files/retrobattle-1.0.0-build.patch
@@ -0,0 +1,29 @@
+Author: hasufell <hasufell@gentoo.org>
+Date:   Sat Aug 4 12:15:53 2012 +0200
+
+    respect CXX, CFLAGS and LDFLAGS
+
+--- src/Makefile
++++ src/Makefile
+@@ -1,10 +1,9 @@
+-CFLAGS =      `sdl-config --cflags` -g -Wall -I. -DENABLE_BINRELOC
+-CPPFLAGS =    $(CFLAGS)
++CXXFLAGS +=   $(shell sdl-config --cflags) -I. -DENABLE_BINRELOC
+ 
+ # Uncomment the first LIBS line and comment out the other LIBS line to
+ # compile without SDL_Mixer
+ #LIBS =               `sdl-config --libs`
+-LIBS =                `sdl-config --libs` -lSDL_mixer
++LIBS =                $(shell sdl-config --libs) -lSDL_mixer
+ 
+ RETROINSTALLDIR ?= /opt
+ 
+@@ -25,7 +24,7 @@
+ 
+ 
+ retrobattle:  $(RETRO)
+-              g++ -o $@ $^ $(LIBS)
++              $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
+               mv $@ ..
+ 
+ clean:

diff --git a/games-arcade/retrobattle/retrobattle-1.0.0.ebuild b/games-arcade/retrobattle/retrobattle-1.0.0.ebuild
index 5fda1040998e0f572d6aaf1fe23728ebe86f2779..98863eea5bbc23ef8e7e681aee5ff79d66ee0b11 100644 (file)
--- a/games-arcade/retrobattle/retrobattle-1.0.0.ebuild
+++ b/games-arcade/retrobattle/retrobattle-1.0.0.ebuild
@@ -12,21 +12,31 @@ SRC_URI="${HOMEPAGE}files/${PN}-src-${PV}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
+RESTRICT="test"
 
 RDEPEND="
-       media-libs/libsdl
+       media-libs/libsdl[X,audio,video]
        media-libs/sdl-mixer
        "
 DEPEND="${RDEPEND}"
 
 S=${WORKDIR}/${PN}-src-${PV}/src/
 
+src_prepare() {
+       epatch "${FILESDIR}"/${P}-build.patch
+}
+
 src_install() {
-       emake RETROINSTALLDIR="${D}/${GAMES_DATADIR}" install || die "emake failed"
-       prepgamesdirs
-       # Following games.eclass the binary should be in /usr/games/bin/
-       dosym "${GAMES_DATADIR}/${PN}/${PN}" "${GAMES_PREFIX}/bin/${PN}" || die "dosym failed"
+       insinto "${GAMES_DATADIR}"/${PN}
+       doins -r "${WORKDIR}"/${PN}-src-${PV}/data
+
+       newgamesbin "${WORKDIR}"/${PN}-src-${PV}/${PN} ${PN}.bin
+       games_make_wrapper ${PN} "${PN}.bin \"${GAMES_DATADIR}/${PN}\""
+       make_desktop_entry ${PN} &{PN} ""
+
        dodoc "../manual.txt" "../README"
+
+       prepgamesdirs
 }