add use-based dep; add build patch to use the toolchain programs

Package-Manager: portage-2.1.6.4/cvs/Linux 2.6.27.8 i686

4 files changed, 72 insertions, 7 deletions

diff --git a/games-arcade/sable/ChangeLog b/games-arcade/sable/ChangeLog
index 07fe72946a95..cdffafb01939 100644
--- a/games-arcade/sable/ChangeLog
+++ b/games-arcade/sable/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-arcade/sable
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/sable/ChangeLog,v 1.4 2007/04/25 22:11:06 tupone Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/sable/ChangeLog,v 1.5 2009/01/21 20:22:08 mr_bones_ Exp $
+
+  21 Jan 2009; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/sable-1.0-gentoo.patch, sable-1.0.ebuild:
+  add use-based dep; add build patch to use the toolchain programs
 
   16 Apr 2007; <tupone@gentoo.org> -files/sable.png, sable-1.0.ebuild:
   icon sable.png moved to mirrors
diff --git a/games-arcade/sable/Manifest b/games-arcade/sable/Manifest
index 6daccef84dfb..d849e3b4b383 100644
--- a/games-arcade/sable/Manifest
+++ b/games-arcade/sable/Manifest
@@ -1,5 +1,6 @@
+AUX sable-1.0-gentoo.patch 1424 RMD160 b88eec00224a49d9a4d625d89f988d42363ea208 SHA1 86f13e91aa9c7b732ba9080f9468bb3e394be2e7 SHA256 3851e6dd970568f7a569ad50b492eb2ef3ee554fed5c5a16e146a9c5d83179b5
 DIST sable-1.0-src.tgz 247200 RMD160 baf96317f4036e222807877724fb8a11ccfe26e0 SHA1 2f597d3b517642c4bf0f0e1cbb6d31ca13f4efb7 SHA256 fb7864633fc5ef5c4999410929a9401deaf2f95b15cdd49f4a3c4823f6b1353b
 DIST sable.png 1669 RMD160 80b5a3ef322a2dff635c4f2fc4e20d0c668a7f27 SHA1 d5e59298b261ff4bcb42ed12bb51c93337fcedb8 SHA256 94f535353e0bcdb7018126ca8e422694484479515484c3499a24931aa00eae86
-EBUILD sable-1.0.ebuild 922 RMD160 5a1455bbf46d6c88ee3cca2b25913f4150edb744 SHA1 7b31e655060ce7ce8da4bd8581ce525db2d5992a SHA256 f09c547fec6ca8de52bedbfb3357d14848938dfa44dd7567fefb11f138012d97
-MISC ChangeLog 580 RMD160 b9ae22298ad898fdee214f891a8954e076c0e001 SHA1 22cb120489875ae8860377f86cf8acbe37b7af3c SHA256 33d5502a0272b2abcbc6b4b8b04d0f6a0eb99e17e817cd3c76d0bc09b296892f
+EBUILD sable-1.0.ebuild 984 RMD160 d4eee169126fcd7256f1e233dbcfa67763ba2d1f SHA1 c404f4c11e40a80007929d622b5362ed1f545e06 SHA256 c3347689c0c68059312e01c983a4ea56e8d17e7ec317027707790137e7de78c5
+MISC ChangeLog 757 RMD160 18ba49032e0f1c1ebaee442167696d1bcc702f18 SHA1 8d7cb074c38776839585492fc736b7a78037b931 SHA256 c3800359a844f32522369407dc6ba01098469fc2c96be2397aef1e9b5856df54
 MISC metadata.xml 670 RMD160 36c06ea2cf0786d00a576cb741f3a5c69459eaed SHA1 02c022b441c210385c7295b600ed5741df524ed2 SHA256 ab2d8f3053075830a46352bf6a3c2c6db46a88b372f479abd96c0b0fc9a038f4
diff --git a/games-arcade/sable/files/sable-1.0-gentoo.patch b/games-arcade/sable/files/sable-1.0-gentoo.patch
new file mode 100644
index 000000000000..b809936ff964
--- /dev/null
+++ b/games-arcade/sable/files/sable-1.0-gentoo.patch
@@ -0,0 +1,57 @@
+diff -ru sable.orig/src/Makefile sable/src/Makefile
+--- sable.orig/src/Makefile	2006-03-14 00:57:31.000000000 -0500
++++ sable/src/Makefile	2009-01-21 15:15:02.000000000 -0500
+@@ -1,30 +1,10 @@
+-# are we on OSX?
+-ifeq ($(shell uname), Darwin)
+-OSX:=1
+-endif
+-
+-# C options
+-CC = gcc
+-NOOSXFLAGS = -c `sdl-config --cflags` -O2 -Wall -DSABLE_RESOURCEDIR=\"$(INSTALL_RESDIR)/sable/\" -Iinclude $(CFLAGS)
+-ifdef OSX
+-FLAGS = $(NOOSXFLAGS) -D_SABLE_OSX_
+-else
+-FLAGS = $(NOOSXFLAGS)
+-endif
+-
+-# C++ options.
+-CXX = g++
+-CXXFLAGS = $(FLAGS)
++NOOSXFLAGS = -c `sdl-config --cflags` -DSABLE_RESOURCEDIR=\"$(INSTALL_RESDIR)/sable/\" -Iinclude
++
++CFLAGS += $(NOOSXFLAGS)
++CXXFLAGS += $(NOOSXFLAGS)
+ 
+ # Linker options.
+-LD = g++
+-LDFLAGS = 
+-NOOSXLIBS =  -lSDL_image -lSDL_mixer
+-ifdef OSX
+-LIBS = `sdl-config --static-libs` $(NOOSXLIBS)
+-else
+-LIBS = `sdl-config --libs` $(NOOSXLIBS) -lGL -lGLU
+-endif
++LIBS = `sdl-config --libs` -lSDL_image -lSDL_mixer -lGL -lGLU
+ 
+ COBJS = vcontrol/vcontrol.o \
+ 	bcplrandom.o \
+@@ -35,7 +15,7 @@
+ OBJS = $(COBJS) $(CXXOBJS)
+ 
+ sable: $(OBJS)
+-	$(LD) $(LDFLAGS) -o sable $(OBJS) $(LIBS)
++	$(CXX) $(LDFLAGS) -o sable $(OBJS) $(LIBS)
+ 
+ clean:
+ 	rm -f sable *.o vcontrol/*.o svaf/*.o
+@@ -44,7 +24,7 @@
+ 	find . -name \*.c\* | xargs makedepend -Y. -Iinclude >& /dev/null
+ 
+ $(COBJS): %.o: %.c
+-	$(CC) $(FLAGS) -o $@ $<
++	$(CC) $(CFLAGS) -o $@ $<
+ 
+ $(CXXOBJS): %.o: %.cpp
+ 	$(CXX) $(CXXFLAGS) -o $@ $<
diff --git a/games-arcade/sable/sable-1.0.ebuild b/games-arcade/sable/sable-1.0.ebuild
index 57f9cc2eb35e..a67465ef2722 100644
--- a/games-arcade/sable/sable-1.0.ebuild
+++ b/games-arcade/sable/sable-1.0.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/sable/sable-1.0.ebuild,v 1.4 2007/04/21 10:39:15 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/sable/sable-1.0.ebuild,v 1.5 2009/01/21 20:22:08 mr_bones_ Exp $
 
+EAPI=2
 inherit eutils games
 
 DESCRIPTION="A frantic 3D space shooter"
@@ -16,11 +17,13 @@ IUSE=""
 
 DEPEND="virtual/opengl
 	media-libs/libsdl
-	media-libs/sdl-image
+	media-libs/sdl-image[png]
 	media-libs/sdl-mixer"
 
 S=${WORKDIR}/${PN}
 
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+
 src_compile() {
 	emake INSTALL_RESDIR="${GAMES_DATADIR}" || die "emake failed"
 }