Use system ode instead of the bundled version

Package-Manager: portage-2.1.2_rc2

4 files changed, 74 insertions, 27 deletions

diff --git a/games-arcade/ssc/ChangeLog b/games-arcade/ssc/ChangeLog
index 4bc7948306e2..0e7f4e62b4fc 100644
--- a/games-arcade/ssc/ChangeLog
+++ b/games-arcade/ssc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-arcade/ssc
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/ssc/ChangeLog,v 1.6 2006/04/24 15:39:21 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/ssc/ChangeLog,v 1.7 2006/11/19 20:27:13 nyhm Exp $
+
+  19 Nov 2006; Tristan Heaven <nyhm@gentoo.org> +files/ssc-0.8-ode.patch,
+  ssc-0.8.ebuild:
+  Use system ode instead of the bundled version
 
   24 Apr 2006; <Tupone@gentoo.org> ssc-0.8.ebuild:
   Fix for gcc-4.1
diff --git a/games-arcade/ssc/Manifest b/games-arcade/ssc/Manifest
index b90b0a30d7f3..fb3067c2d786 100644
--- a/games-arcade/ssc/Manifest
+++ b/games-arcade/ssc/Manifest
@@ -1,25 +1,34 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 decc61529e24d71d9af1aef0be2d1880 ChangeLog 740
-RMD160 3f349cf0e4119be7554c4d0c9e5a2b675a7e408d ChangeLog 740
-SHA256 9132f14215d00b485692bb1080165b210c911030f3d4d62820ac04e82af30731 ChangeLog 740
-MD5 e8824bb154b23c2156f30250c3bfd30e files/digest-ssc-0.8 226
-RMD160 9c1b8968813a013d4691fbb789c513621d98c2e0 files/digest-ssc-0.8 226
-SHA256 e41406e90d01eab80c8d1658856150a22a5544ebaa6d293479c68bb7162c8212 files/digest-ssc-0.8 226
+AUX ssc-0.8-gcc34.patch 1514 RMD160 c2b939b3f7dbbd6bb5c378e3da6103740801597b SHA1 9969e725bffe0faa3280629e8ca319c0a6929eeb SHA256 062c262d5aa8579ca7c83c69fb1a8f4baa0f1bf6431860f544a0b736f2202066
 MD5 70c8a2536f9972301c9e1f5ad83e1220 files/ssc-0.8-gcc34.patch 1514
 RMD160 c2b939b3f7dbbd6bb5c378e3da6103740801597b files/ssc-0.8-gcc34.patch 1514
 SHA256 062c262d5aa8579ca7c83c69fb1a8f4baa0f1bf6431860f544a0b736f2202066 files/ssc-0.8-gcc34.patch 1514
+AUX ssc-0.8-ode.patch 653 RMD160 e2eea068dd1cf8456f32063200b14b93d37d780b SHA1 a17aa2b08ef8cbb52ac1b851d7dc90bb075e0dc4 SHA256 5618177fa98da2e5ae88b00a0328c66469de3e139d134a5ee6b63a9f636c0c55
+MD5 6bc137166fd091c4ffb369fade074222 files/ssc-0.8-ode.patch 653
+RMD160 e2eea068dd1cf8456f32063200b14b93d37d780b files/ssc-0.8-ode.patch 653
+SHA256 5618177fa98da2e5ae88b00a0328c66469de3e139d134a5ee6b63a9f636c0c55 files/ssc-0.8-ode.patch 653
+DIST ssc-0.8.tar.bz2 810870 RMD160 12b9123b747b352dc595f555cf32dda7e1e67fe1 SHA1 a46584e4aa07a198ea1de8fb7cfd99fa1e7d542b SHA256 2bd29ce23fce9fe1530d2a6f756fe541aae27ebccb6585fdd2240e5c54eee4c7
+EBUILD ssc-0.8.ebuild 1370 RMD160 4d1b0b448358e771060cc56928522d32dd534bf3 SHA1 faf35b3d8283c4c39bc4516420b2c1adb76ddf36 SHA256 27787c43b215a5a9991238dc2d8daedb5ff2b6e45ffd7c04aa9d0876d57846c1
+MD5 5d1f7441df513804518255564203d0c8 ssc-0.8.ebuild 1370
+RMD160 4d1b0b448358e771060cc56928522d32dd534bf3 ssc-0.8.ebuild 1370
+SHA256 27787c43b215a5a9991238dc2d8daedb5ff2b6e45ffd7c04aa9d0876d57846c1 ssc-0.8.ebuild 1370
+MISC ChangeLog 879 RMD160 69a5c410a57191ad5527e98955f3b1cd4d3b7b9f SHA1 8823259b73d407b388268f6732b82ea58b13cbc4 SHA256 3183b9318e392f817c8e9ec1115d81e948cb4ec671c061731a0c24dae52b9c7c
+MD5 389bd58a97946253aa1cf4aff928d2ef ChangeLog 879
+RMD160 69a5c410a57191ad5527e98955f3b1cd4d3b7b9f ChangeLog 879
+SHA256 3183b9318e392f817c8e9ec1115d81e948cb4ec671c061731a0c24dae52b9c7c ChangeLog 879
+MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158
-MD5 6c7e467f6f2194d292952baf4eef4a50 ssc-0.8.ebuild 1282
-RMD160 eb5179f4cb200c14915f93cdfde0a6a8ccdc7e48 ssc-0.8.ebuild 1282
-SHA256 e715db413785d7d4ef461e1d7c8d840f1be4ed6e5b9df9b1c00f2cee9feb0ffb ssc-0.8.ebuild 1282
+MD5 e8824bb154b23c2156f30250c3bfd30e files/digest-ssc-0.8 226
+RMD160 9c1b8968813a013d4691fbb789c513621d98c2e0 files/digest-ssc-0.8 226
+SHA256 e41406e90d01eab80c8d1658856150a22a5544ebaa6d293479c68bb7162c8212 files/digest-ssc-0.8 226
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFETPE92CTtIKiFlQIRAodkAKCrd9xnz7i6yjzo0fg0hignL22rqwCfZw9C
-QgGZt/867187ShAmJyh58Y8=
-=zhmh
+iD8DBQFFYL4pdz7hIScOURERAn+QAKDB0Qq33IkfujD1kVfjbZUO1lmIbACg4mxQ
+38guZC0LQH671Uv5Ys7a4FM=
+=6cez
 -----END PGP SIGNATURE-----
diff --git a/games-arcade/ssc/files/ssc-0.8-ode.patch b/games-arcade/ssc/files/ssc-0.8-ode.patch
new file mode 100644
index 000000000000..5518392b82f8
--- /dev/null
+++ b/games-arcade/ssc/files/ssc-0.8-ode.patch
@@ -0,0 +1,31 @@
+--- Makefile.in
++++ Makefile.in
+@@ -109,7 +109,7 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-SUBDIRS = support src data
++SUBDIRS = src data
+ 
+ pkgdata_DATA = ssc.conf
+ 
+--- src/Makefile.in
++++ src/Makefile.in
+@@ -67,7 +67,7 @@
+ LIBOBJS = @LIBOBJS@
+ 
+ LIBS = \
+-	../support/ode/lib/libode.a \
++	`ode-config --libs` \
+ 	`freetype-config --libs` \
+ 	-lGLU -lGL -lSDL_mixer \
+ 	`sdl-config --libs` \
+@@ -117,7 +117,7 @@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+ INCLUDES = \
+-	-I../support/ode/include \
++	`ode-config --cflags` \
+ 	`freetype-config --cflags` \
+ 	`sdl-config --cflags`
+ 
diff --git a/games-arcade/ssc/ssc-0.8.ebuild b/games-arcade/ssc/ssc-0.8.ebuild
index 414b86592d86..1ef287687089 100644
--- a/games-arcade/ssc/ssc-0.8.ebuild
+++ b/games-arcade/ssc/ssc-0.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/ssc/ssc-0.8.ebuild,v 1.9 2006/04/24 15:39:21 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/ssc/ssc-0.8.ebuild,v 1.10 2006/11/19 20:27:13 nyhm Exp $
 
 inherit eutils games
 
@@ -17,24 +17,27 @@ DEPEND="virtual/opengl
 	virtual/glu
 	media-libs/libsdl
 	media-libs/sdl-mixer
-	media-libs/freetype"
+	dev-games/ode
+	>=media-libs/freetype-2"
 
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-
 	sed -i \
 		-e "s:/usr/local/share/:${GAMES_DATADIR}/:" \
 		src/{asteroid.cc,audio.cc,config.cc,menu.cc} \
 		|| die "sed failed"
 	sed -i \
-		-e "/CXXFLAGS/s:-Werror::" \
-		configure
-	epatch "${FILESDIR}/${P}-gcc34.patch"
+		-e '/CXXFLAGS=$OPT_CXXFLAGS/d' \
+		configure \
+		|| die "sed configure failed"
+	epatch \
+		"${FILESDIR}"/${P}-gcc34.patch \
+		"${FILESDIR}"/${P}-ode.patch
 }
 
 src_install () {
-	make DESTDIR="${D}" install || die "make install failed"
+	emake DESTDIR="${D}" install || die "emake install failed"
 	dodoc AUTHORS ChangeLog NEWS README TODO
 	prepgamesdirs
 }
@@ -42,12 +45,12 @@ src_install () {
 pkg_postinst() {
 	games_pkg_postinst
 	echo
-	einfo "You may need to copy ${GAMES_DATADIR}/ssc/ssc.conf to"
-	einfo "~/.ssc/ssc.conf and modify it to suit your needs before"
-	einfo "the game will work on your system.  You should be able"
-	einfo "to cut and paste the commands below:"
+	elog "You may need to copy ${GAMES_DATADIR}/ssc/ssc.conf to"
+	elog "~/.ssc/ssc.conf and modify it to suit your needs before"
+	elog "the game will work on your system.  You should be able"
+	elog "to cut and paste the commands below:"
 	echo
-	einfo "mkdir ~/.ssc/"
-	einfo "cp ${GAMES_DATADIR}/ssc/ssc.conf ~/.ssc/"
+	elog "mkdir ~/.ssc/"
+	elog "cp ${GAMES_DATADIR}/ssc/ssc.conf ~/.ssc/"
 	echo
 }