From f1c9332718031d46eae97171472e15c7f50cf7fa Mon Sep 17 00:00:00 2001
From: Alfredo Tupone <tupone@gentoo.org>
Date: Sat, 18 Jun 2011 15:41:59 +0000
Subject: Fix underlink. Bug #369113

(Portage version: 2.1.10.3/cvs/Linux x86_64)
---
 games-arcade/tomatoes/ChangeLog                    |  8 +++--
 .../tomatoes/files/tomatoes-1.55-underlink.patch   | 38 ++++++++++++++++++++++
 games-arcade/tomatoes/tomatoes-1.55-r2.ebuild      | 18 ++++------
 3 files changed, 51 insertions(+), 13 deletions(-)
 create mode 100644 games-arcade/tomatoes/files/tomatoes-1.55-underlink.patch

(limited to 'games-arcade')

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/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() {
-- 
cgit v1.2.3-65-gdbad