Use autotools eclass; fix dependencies

Package-Manager: portage-2.1.2_pre3-r2

3 files changed, 28 insertions, 27 deletions

diff --git a/games-sports/trigger/ChangeLog b/games-sports/trigger/ChangeLog
index e1ff5b43a2e9..b315f3ee30ad 100644
--- a/games-sports/trigger/ChangeLog
+++ b/games-sports/trigger/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-sports/trigger
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-sports/trigger/ChangeLog,v 1.14 2006/07/23 03:36:30 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-sports/trigger/ChangeLog,v 1.15 2006/10/17 01:39:31 nyhm Exp $
+
+  17 Oct 2006; Tristan Heaven <nyhm@gentoo.org> trigger-0.5.2-r1.ebuild:
+  Use autotools eclass; fix dependencies
 
   23 Jul 2006; Michael Sterrett <mr_bones_@gentoo.org>
   +files/trigger-0.5.2-physfs.patch, trigger-0.5.2.ebuild,
diff --git a/games-sports/trigger/Manifest b/games-sports/trigger/Manifest
index 20717f4bd4f8..1ea2f07c3d49 100644
--- a/games-sports/trigger/Manifest
+++ b/games-sports/trigger/Manifest
@@ -12,14 +12,14 @@ RMD160 4772478f7e60fc3ee36c5e9a1c3b8a5e190c43e2 files/trigger-0.5.2-physfs.patch
 SHA256 6fa7629c1fda6ebeddb7994afc52f3d6902b9bb4db11e5082af3f8583d2c9aad files/trigger-0.5.2-physfs.patch 682
 DIST trigger-0.5.2-data.tar.bz2 6189856 RMD160 945a6c491c3f490d5acdfe3ac3633d3ec839466c SHA1 2016262e3cbf4c8808c765c1e317fb3dda2a2a34 SHA256 2e922aa8117722c8524e4c63c3df79c368bae0fd1aeada6005c27c81d27de7a6
 DIST trigger-0.5.2-src.tar.bz2 333942 RMD160 af71c1e343d3eac20abe0c00257080fb592819b0 SHA1 57589368606ec1b4b972bb32fc62cca09af049b1 SHA256 0fbb4f62e8c6b09e268a523cc9dbdd211fbbe94e2a316961c3ea5c79fb327aca
-EBUILD trigger-0.5.2-r1.ebuild 1706 RMD160 8ac132dd7488ab22626975aaffc06c544b0004aa SHA1 ac156ccb4c90b1ba4b59f6d206f22e92f427fd30 SHA256 82c3e05ab8d8f381064e265663c6b83fe9c8ae1724629a527eebb4733f41c1fc
-MD5 b29eaec18823ec29031b096a7bcb1d21 trigger-0.5.2-r1.ebuild 1706
-RMD160 8ac132dd7488ab22626975aaffc06c544b0004aa trigger-0.5.2-r1.ebuild 1706
-SHA256 82c3e05ab8d8f381064e265663c6b83fe9c8ae1724629a527eebb4733f41c1fc trigger-0.5.2-r1.ebuild 1706
-MISC ChangeLog 2371 RMD160 a3eed193f9363e6b8e53857d86fbe08307eeb4c4 SHA1 c819e3a32635e6712de164ef15a25d751f48c727 SHA256 bf919958590203aca2867d79e2b8b06f01c2376d5d5acbc13675e14b3c6b7761
-MD5 d288f02af06f551dcecc67981846f7f7 ChangeLog 2371
-RMD160 a3eed193f9363e6b8e53857d86fbe08307eeb4c4 ChangeLog 2371
-SHA256 bf919958590203aca2867d79e2b8b06f01c2376d5d5acbc13675e14b3c6b7761 ChangeLog 2371
+EBUILD trigger-0.5.2-r1.ebuild 1731 RMD160 6f16a4c5e29ad2ab1fdbd7e213d45145ba0534ad SHA1 e44e2bb596c8044354e535a6fff985e9876f3974 SHA256 032cd66d0d5284a1d28f636189c57417567f547c2e7ab302a3cc8315abdc2356
+MD5 0d244c33e152361de1241534913d24b8 trigger-0.5.2-r1.ebuild 1731
+RMD160 6f16a4c5e29ad2ab1fdbd7e213d45145ba0534ad trigger-0.5.2-r1.ebuild 1731
+SHA256 032cd66d0d5284a1d28f636189c57417567f547c2e7ab302a3cc8315abdc2356 trigger-0.5.2-r1.ebuild 1731
+MISC ChangeLog 2481 RMD160 c6a52e1c2194ee86263ae95d600f2a9c73ed3ab1 SHA1 988cf5dee82ee2cba2dbd9ec7b4e51be366f72e7 SHA256 e2bdf9220449d1f59407dec2be372065104d147d32872f4b912a9f72a9428de4
+MD5 588d12e606cb2e2601ff8734a63ddc98 ChangeLog 2481
+RMD160 c6a52e1c2194ee86263ae95d600f2a9c73ed3ab1 ChangeLog 2481
+SHA256 e2bdf9220449d1f59407dec2be372065104d147d32872f4b912a9f72a9428de4 ChangeLog 2481
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
diff --git a/games-sports/trigger/trigger-0.5.2-r1.ebuild b/games-sports/trigger/trigger-0.5.2-r1.ebuild
index 73eeead06d79..7a6a0bc3bb1e 100644
--- a/games-sports/trigger/trigger-0.5.2-r1.ebuild
+++ b/games-sports/trigger/trigger-0.5.2-r1.ebuild
@@ -1,8 +1,10 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-sports/trigger/trigger-0.5.2-r1.ebuild,v 1.5 2006/07/23 03:36:30 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-sports/trigger/trigger-0.5.2-r1.ebuild,v 1.6 2006/10/17 01:39:31 nyhm Exp $
 
-inherit eutils games
+WANT_AUTOCONF=latest
+WANT_AUTOMAKE=latest
+inherit autotools eutils games
 
 DESCRIPTION="Free OpenGL rally car racing game"
 HOMEPAGE="http://www.positro.net/trigger/"
@@ -15,21 +17,17 @@ KEYWORDS="~amd64 ~ppc x86"
 IUSE=""
 
 RDEPEND="virtual/opengl
-	|| (
-		( x11-libs/libX11 )
-		virtual/x11 )
-	>=media-libs/libsdl-1.2.5
-	>=media-libs/sdl-image-1.2
+	virtual/glu
+	x11-libs/libX11
+	x11-libs/libXt
+	media-libs/libsdl
+	media-libs/sdl-image
 	media-libs/sdl-mixer
-	~media-libs/openal-0.0.8
+	media-libs/openal
 	media-libs/freealut
 	dev-games/physfs"
 DEPEND="${RDEPEND}
-	|| (
-		( x11-libs/libXt
-			x11-proto/xproto )
-		virtual/x11
-	)
+	x11-proto/xproto
 	dev-util/jam"
 
 S=${WORKDIR}/${P}-src
@@ -46,11 +44,10 @@ src_unpack() {
 	epatch "${FILESDIR}"/${P}-freealut.patch \
 		"${FILESDIR}/${P}"-gcc41.patch \
 		"${FILESDIR}/${P}"-physfs.patch
-
+	AT_M4DIR=mk/autoconf eautoreconf
 }
 
 src_compile() {
-	./autogen.sh
 	egamesconf --datadir="${GAMES_DATADIR}/${PN}" || die
 	jam || die "jam failed"
 }
@@ -60,7 +57,8 @@ src_install() {
 
 	cd ../${P}-data
 	insinto "${GAMES_DATADIR}/${PN}"
-	doins -r events maps plugins sounds textures vehicles trigger.config.defs
+	doins -r events maps plugins sounds textures vehicles trigger.config.defs \
+		|| die "doins failed"
 
 	dodoc README.txt README-stereo.txt
 	prepgamesdirs
@@ -68,7 +66,7 @@ src_install() {
 
 pkg_postinst() {
 	games_pkg_postinst
-	einfo "After running ${PN} for the first time, a config file is"
-	einfo "available in ~/.trigger/trigger.config"
+	elog "After running ${PN} for the first time, a config file is"
+	elog "available in ~/.trigger/trigger.config"
 	echo
 }