Fix underlink. Bug #369113

Package-Manager: portage-2.1.10.3/cvs/Linux x86_64

4 files changed, 64 insertions, 15 deletions

diff --git a/games-arcade/tomatoes/ChangeLog b/games-arcade/tomatoes/ChangeLog
index b1b0119c9bc5..cfb2f87554b3 100644
--- a/games-arcade/tomatoes/ChangeLog
+++ b/games-arcade/tomatoes/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-arcade/tomatoes
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/tomatoes/ChangeLog,v 1.17 2010/08/20 16:27:02 mr_bones_ Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/tomatoes/ChangeLog,v 1.18 2011/06/18 15:41:59 tupone Exp $
+
+  18 Jun 2011; Tupone Alfredo <tupone@gentoo.org> tomatoes-1.55-r2.ebuild,
+  +files/tomatoes-1.55-underlink.patch:
+  Fix underlink. Bug #369113 by Diego Elio Pettenò
 
   20 Aug 2010; Michael Sterrett <mr_bones_@gentoo.org>
   tomatoes-1.55-r2.ebuild:
diff --git a/games-arcade/tomatoes/Manifest b/games-arcade/tomatoes/Manifest
index bdc21cba8830..b1002093d144 100644
--- a/games-arcade/tomatoes/Manifest
+++ b/games-arcade/tomatoes/Manifest
@@ -1,7 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX tomatoes-1.55-c_str.patch 573 RMD160 a54c2ef6b5e5c25a31b11125cac2ea2414aae490 SHA1 2a5b04f72f2b4883d5bff8a6c392c2fa1b23055c SHA256 edc5f1804f4e287473a21d514f52f52cd020215878d8f22a7e5c51dc5a332499
 AUX tomatoes-1.55-gcc43.patch 278 RMD160 0b044049e09e577f3aaadb5078d178ed56ec1d1e SHA1 ab01a9966feb84c4409c1699af22574751396c5d SHA256 0f1b0962a9620e5b28fccf96f1a13762ed54f94b5c1b4597e0ae2c032ff6ea5d
+AUX tomatoes-1.55-underlink.patch 977 RMD160 b08c4011c3572be7631c21b11a862b97c546d7b3 SHA1 c45e338bb3e01f256050e5ee6d7ecce2b93126c0 SHA256 6618c1aed9f9b65ed71bdccc50c9bd5f1de8266537f07094c66c5774f30043f3
 DIST tomatoes-linux-1.5.tar.bz2 8807421 RMD160 454591162df5266a6ecb88b0b67914a5c0348a04 SHA1 8dc306617800f7ccc1e8610fb39e87d8181c482d SHA256 69a3af1994cb58409be9b469e1aa4bdb91c405d99071c7431526640ec53d1300
 DIST tomatoes-linux-src-1.55.tar.bz2 62947 RMD160 a57881902e3c917733058e3b9c936d2db5ca0e3a SHA1 aa123a5fa9c8c0223c602c0cffe8a5bb0ebad60c SHA256 126d001532ee5b81cc95e1a86a274d11669b8c8f65c8235ae2e9b8fbdfab4a60
-EBUILD tomatoes-1.55-r2.ebuild 1906 RMD160 b9347c803518dc2ff2b88dd6b03fa539fb988647 SHA1 66cc7590c52b02bb878cfc6d354a90334bc295ed SHA256 92a70bd993b3b93b1890eda73cb8c7f26b8e2438f2fff76eebe6c2bf7801569a
-MISC ChangeLog 2778 RMD160 980ccd1d9042fdb3d94bdaf4e22fda0247ff34e3 SHA1 bb89ec75a06b5553459a41e0c4a7c29fe2f9d13a SHA256 f45139d1ebf4d6e696418fb4a14a9c961821b7ea059027c34ab20752a3387570
+EBUILD tomatoes-1.55-r2.ebuild 1787 RMD160 7109ef281d8faebf9e83ed132f9a1d96c8a9bff8 SHA1 4ab389609e338c692c957624e378be91e2757d42 SHA256 eb388320d35e234d92a9d02de4896fa9149aaec8bd9aca329abd4d0c631910b2
+MISC ChangeLog 2943 RMD160 9b0ca54046bb3b0f5028cc87617fb6acc915f438 SHA1 1115bcc4712c7c659d455066cd82e83f44f81635 SHA256 93d39d3235b0b73a0b61ff224cbf659d97d06bc95a0be93ee3c982a8e24ead7e
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk38x1QACgkQIY77eQFFFC1GQQCgmCuTEUU5LyzlVCIaEqUI+3nA
+32UAn1hwY/wUjz+lbK46ZjTo+xYCXvgp
+=1nW8
+-----END PGP SIGNATURE-----
diff --git a/games-arcade/tomatoes/files/tomatoes-1.55-underlink.patch b/games-arcade/tomatoes/files/tomatoes-1.55-underlink.patch
new file mode 100644
index 000000000000..c028c79ba4a7
--- /dev/null
+++ b/games-arcade/tomatoes/files/tomatoes-1.55-underlink.patch
@@ -0,0 +1,38 @@
+--- makefile.old	2011-06-18 17:35:38.947020335 +0200
++++ makefile	2011-06-18 17:37:42.337811088 +0200
+@@ -48,7 +47,7 @@
+ LDFLAGS = `sdl-config --libs` -lSDL_image -lSDL_mixer -lGL -lGLU -pg
+ else
+ CFLAGS = -MMD -O3 -march=$(MARCH) -Wall $(SDL_FLAGS)
+-LDFLAGS = `sdl-config --libs` -lSDL_image -lSDL_mixer -lGL -lGLU -s
++LDLIBS = `sdl-config --libs` -lSDL_image -lSDL_mixer -lGL -lGLU -lm
+ endif
+ endif
+ 
+@@ -58,7 +57,7 @@
+ OBJS := $(subst src/,obj/,$(OBJS))
+ 
+ # Include directories
+-INCLUDES = -I./include
++INCLUDES = -I./include $(SDL_FLAGS)
+ 
+ 
+ # Targets
+@@ -69,7 +68,7 @@
+ -include $(DEPS)
+ 
+ $(TARGET): $(OBJS)
+-	$(CC) -o $(TARGET) $(OBJS) $(LDFLAGS)
++	$(CXX) -o $(TARGET) $(OBJS) $(LDFLAGS) $(LDLIBS)
+ 
+ clean:
+ 	rm -f $(OBJS) $(TARGET)
+@@ -80,7 +79,7 @@
+ rebuild: veryclean all
+ 
+ obj/%.o: src/%.cpp
+-	$(CC) $(CFLAGS) $(INCLUDES) $(DIR_DEFINES) -c $< -o $@
++	$(CXX) $(CXXFLAGS) $(INCLUDES) $(DIR_DEFINES) -c $< -o $@
+ 
+ # Compress the exe with UPX
+ compress: $(TARGET)
diff --git a/games-arcade/tomatoes/tomatoes-1.55-r2.ebuild b/games-arcade/tomatoes/tomatoes-1.55-r2.ebuild
index 71e9e657a014..1ab98105fa42 100644
--- a/games-arcade/tomatoes/tomatoes-1.55-r2.ebuild
+++ b/games-arcade/tomatoes/tomatoes-1.55-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/tomatoes/tomatoes-1.55-r2.ebuild,v 1.7 2010/08/20 16:27:02 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/tomatoes/tomatoes-1.55-r2.ebuild,v 1.8 2011/06/18 15:41:59 tupone Exp $
 
 EAPI=2
 inherit eutils games
@@ -26,12 +26,12 @@ src_prepare() {
 	mv ../tomatoes-1.5/* . || die "mv failed"
 	mv icon.png ${PN}.png
 
+	epatch \
+		"${FILESDIR}"/${P}-c_str.patch \
+		"${FILESDIR}"/${P}-underlink.patch \
+		"${FILESDIR}"/${P}-gcc43.patch
+
 	sed -i \
-		-e '/^CC/d' \
-		-e '/^MARCH/d' \
-		-e "/(CFLAGS)/s/CC/CXX/" \
-		-e "/^CFLAGS/s/=.*$/= ${CXXFLAGS} \$(SDL_FLAGS)/" \
-		-e "/^LDFLAGS/s/-s$/${LDFLAGS}/" \
 		-e "/^MPKDIR = /s:./:${GAMES_DATADIR}/${PN}/:" \
 		-e "/^MUSICDIR = /s:./music/:${GAMES_DATADIR}/${PN}/music/:" \
 		-e "/^HISCOREDIR = /s:./:${GAMES_STATEDIR}/${PN}/:" \
@@ -39,10 +39,6 @@ src_prepare() {
 		-e "/^OVERRIDEDIR = /s:./data/:${GAMES_DATADIR}/${PN}/data/:" \
 		makefile \
 		|| die "sed failed"
-
-	epatch \
-		"${FILESDIR}"/${P}-c_str.patch \
-		"${FILESDIR}"/${P}-gcc43.patch
 }
 
 src_install() {