Use qt3 eclass

Package-Manager: portage-2.1.2_pre2-r5

3 files changed, 35 insertions, 39 deletions

diff --git a/games-action/chromium/ChangeLog b/games-action/chromium/ChangeLog
index 8aec20ef4f65..0469aa4f06df 100644
--- a/games-action/chromium/ChangeLog
+++ b/games-action/chromium/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-action/chromium
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/chromium/ChangeLog,v 1.23 2006/08/09 17:00:40 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/chromium/ChangeLog,v 1.24 2006/10/06 22:06:36 nyhm Exp $
+
+  06 Oct 2006; Tristan Heaven <nyhm@gentoo.org> chromium-0.9.12-r6.ebuild:
+  Use qt3 eclass
 
   09 Aug 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   -chromium-0.9.12-r5.ebuild:
diff --git a/games-action/chromium/Manifest b/games-action/chromium/Manifest
index a444a1bec5d6..43de5621b99f 100644
--- a/games-action/chromium/Manifest
+++ b/games-action/chromium/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 0.9.12-configure.patch 323 RMD160 19cee25d368692c5aa6214f55eea7a640cbdd6c9 SHA1 c92698b0791e744f9e005657a560e8c095e650c0 SHA256 51dd41f1aaf7dccb5f25dd88f931f5142339c629836cc5256a2b0ddc65f658a3
 MD5 78d6e86e35c196199788c0550b6cfc51 files/0.9.12-configure.patch 323
 RMD160 19cee25d368692c5aa6214f55eea7a640cbdd6c9 files/0.9.12-configure.patch 323
@@ -23,14 +20,14 @@ RMD160 efe12c75b8d83b85292d974b0b4fe17f554a463b files/0.9.12-qt3.patch 979
 SHA256 3671171967c89b6ab675e49fd228cef0398bb01b9b60f77d26f749e4ea4f9861 files/0.9.12-qt3.patch 979
 DIST chromium-data-0.9.12.tar.gz 1111134 RMD160 b05510d8b4a5a868b632108f688ec187a89ed805 SHA1 7828f54f8570b27736a9bf1da004ac297bbd0dfb SHA256 749d10bcedeff7a82701da97701f9d31b4a057dfa84f33e197085ac71975b195
 DIST chromium-src-0.9.12.tar.gz 640283 RMD160 f422098a67efedb53fafbbb08119596c6b87a1d8 SHA1 d333f4100c9b5b4eb6d6bdf4bc4ebd3a7066c5a0 SHA256 a4a2c929dfd462a9281d8c0dae485c70362140e038f532608550f6528b6ab745
-EBUILD chromium-0.9.12-r6.ebuild 2320 RMD160 2162e2040c7371c56ca59603056bab1260306424 SHA1 4241f1f5b7b45b822948c04510cb16ffc88e6583 SHA256 11eeb4990ce90a75b738af39e02fbea88237cb7142eb316c325c6e9ff33e8063
-MD5 e37d7b819ca4d06e6f441b5ea12a9408 chromium-0.9.12-r6.ebuild 2320
-RMD160 2162e2040c7371c56ca59603056bab1260306424 chromium-0.9.12-r6.ebuild 2320
-SHA256 11eeb4990ce90a75b738af39e02fbea88237cb7142eb316c325c6e9ff33e8063 chromium-0.9.12-r6.ebuild 2320
-MISC ChangeLog 4690 RMD160 0519ca9f21f7216258cc2ed6a88e51434397b2a8 SHA1 444660f18ce3e4e3c5513ce1d7d0424eeeeb1db6 SHA256 137fc2ab8e5e0bb7d8d5e52984b20defaa4e7ae57e02732465ed6e6ee75530d5
-MD5 60187465be201dadca347fc1f9bfb41c ChangeLog 4690
-RMD160 0519ca9f21f7216258cc2ed6a88e51434397b2a8 ChangeLog 4690
-SHA256 137fc2ab8e5e0bb7d8d5e52984b20defaa4e7ae57e02732465ed6e6ee75530d5 ChangeLog 4690
+EBUILD chromium-0.9.12-r6.ebuild 2384 RMD160 a734989907e6be3366cff3f1086b1dfe1d8f4ce0 SHA1 9b9e6ef22da0aa4255f97a76b412a4a6d3e80e51 SHA256 eb7ddd4098adfc986f423be211b09821c6b9c64f582a8e415a668bd5b5cd4863
+MD5 14317f5e934c3f94680930466ba64375 chromium-0.9.12-r6.ebuild 2384
+RMD160 a734989907e6be3366cff3f1086b1dfe1d8f4ce0 chromium-0.9.12-r6.ebuild 2384
+SHA256 eb7ddd4098adfc986f423be211b09821c6b9c64f582a8e415a668bd5b5cd4863 chromium-0.9.12-r6.ebuild 2384
+MISC ChangeLog 4779 RMD160 b257f45701a17fda0e3e14b480962c769e802b16 SHA1 48e6d0a7f13c560fc093b7b88075f431edca0df8 SHA256 999caef5241c86008854e1b45d0283a7fd6481c36891ecfb0cda79c17c4c3c41
+MD5 0f06b9ddf869a75eec59f39e3cfe74de ChangeLog 4779
+RMD160 b257f45701a17fda0e3e14b480962c769e802b16 ChangeLog 4779
+SHA256 999caef5241c86008854e1b45d0283a7fd6481c36891ecfb0cda79c17c4c3c41 ChangeLog 4779
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
@@ -38,10 +35,3 @@ SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata
 MD5 1091ea4475a76a7d4c9ece5a6d7d9ffa files/digest-chromium-0.9.12-r6 524
 RMD160 f81a71dfef00a132ebd52a1bc7b545483715672e files/digest-chromium-0.9.12-r6 524
 SHA256 e15835fb5548e4a00ad3f117321c25681586d4b65569d538f3d9454ea6edbbcc files/digest-chromium-0.9.12-r6 524
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-iD8DBQFE2hS/kT4lNIS36YERAtp1AJ4sa+AeYvMlETdMVQgcrFwKqxxsQQCgp8E8
-arLCHcHn5JF3lrMWqcQZRFQ=
-=i4fy
------END PGP SIGNATURE-----
diff --git a/games-action/chromium/chromium-0.9.12-r6.ebuild b/games-action/chromium/chromium-0.9.12-r6.ebuild
index ce00641d186e..50dd8a6e354e 100644
--- a/games-action/chromium/chromium-0.9.12-r6.ebuild
+++ b/games-action/chromium/chromium-0.9.12-r6.ebuild
@@ -1,36 +1,36 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/chromium/chromium-0.9.12-r6.ebuild,v 1.6 2006/07/16 22:19:55 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/chromium/chromium-0.9.12-r6.ebuild,v 1.7 2006/10/06 22:06:36 nyhm Exp $
 
-inherit flag-o-matic eutils games
+inherit eutils flag-o-matic qt3 toolchain-funcs versionator games
 
+MY_PV=$(get_version_component_range -2)
 DESCRIPTION="Chromium B.S.U. - an arcade game"
 HOMEPAGE="http://www.reptilelabour.com/software/chromium/"
-SRC_URI="http://www.reptilelabour.com/software/files/chromium/chromium-src-${PV}.tar.gz
-	 http://www.reptilelabour.com/software/files/chromium/chromium-data-${PV}.tar.gz"
+SRC_URI="http://www.reptilelabour.com/software/files/${PN}/${PN}-src-${PV}.tar.gz
+	 http://www.reptilelabour.com/software/files/${PN}/${PN}-data-${PV}.tar.gz"
 
 LICENSE="Artistic"
 SLOT="0"
 KEYWORDS="amd64 ppc sparc x86"
-IUSE="vorbis qt3 sdl"
+IUSE="sdl qt3 vorbis"
 
-DEPEND="|| ( x11-libs/libXext virtual/x11 )
-	|| (
-		sdl? ( media-libs/libsdl
-			media-libs/smpeg )
-		virtual/glut
-	)
+DEPEND="virtual/opengl
+	virtual/glu
+	x11-libs/libXmu
+	sdl? ( media-libs/libsdl
+		media-libs/smpeg )
+	!sdl? ( virtual/glut )
 	vorbis? ( media-libs/libvorbis )
-	qt3? ( =x11-libs/qt-3* )
-	~media-libs/openal-0.0.8
+	qt3? ( $(qt_min_version 3.3) )
+	media-libs/openal
 	media-libs/freealut"
 
-S=${WORKDIR}/Chromium-0.9
+S=${WORKDIR}/Chromium-${MY_PV}
 
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	cp data/png/hero.png "${T}/chromium.png" || die "cp failed"
 	epatch \
 		"${FILESDIR}"/${PV}-gcc3-gentoo.patch \
 		"${FILESDIR}"/${PV}-freealut.patch \
@@ -41,10 +41,10 @@ src_unpack() {
 	append-flags -DPKGDATADIR="'\"${GAMES_DATADIR}/${PN}\"'"
 	append-flags -DPKGBINDIR="'\"${GAMES_BINDIR}\"'"
 	sed -i \
-		-e "s:-O2 -DOLD_OPENAL:${CFLAGS}:" src/Makefile \
+		-e "s:-O2 -DOLD_OPENAL:${CXXFLAGS}:" src/Makefile \
 			|| die "sed src/Makefile failed"
 	sed -i \
-		-e "s:-g:${CFLAGS}:" src-setup/Makefile \
+		-e "s:-g:${CXXFLAGS}:" src-setup/Makefile \
 			|| die "sed src-setup/Makefile failed"
 	sed -i \
 		-e "s:-O2:${CFLAGS}:" support/glpng/src/Makefile \
@@ -65,12 +65,15 @@ src_compile() {
 		|| export ENABLE_VORBIS="no"
 	if use qt3 ; then
 		export ENABLE_SETUP="yes"
-		export QTDIR=/usr/qt/3
 	else
 		export ENABLE_SETUP="no"
 	fi
 	./configure || die "configure failed"
-	emake -j1 || die "make failed"
+	emake -j1 \
+		CC=$(tc-getCC) \
+		CXX=$(tc-getCXX) \
+		LINK=$(tc-getCXX) \
+		|| die "emake failed"
 }
 
 src_install() {
@@ -78,7 +81,7 @@ src_install() {
 	insinto "${GAMES_DATADIR}/${PN}"
 	rm -rf data/png/.xvpics
 	doins -r data || die "doins failed"
-	doicon "${T}"/chromium.png
+	newicon data/png/hero.png ${PN}.png
 	make_desktop_entry chromium "Chromium B.S.U"
 	prepgamesdirs
 }