Add split qt-4 dependencies, bug #217170

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.25.9 x86_64

3 files changed, 35 insertions, 22 deletions

diff --git a/games-strategy/attal/ChangeLog b/games-strategy/attal/ChangeLog
index f177bf7ebed3..65a68190bead 100644
--- a/games-strategy/attal/ChangeLog
+++ b/games-strategy/attal/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-strategy/attal
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/attal/ChangeLog,v 1.23 2008/01/23 18:26:18 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/attal/ChangeLog,v 1.24 2008/06/30 15:44:09 nyhm Exp $
+
+  30 Jun 2008; Tristan Heaven <nyhm@gentoo.org> attal-0.10.1.ebuild:
+  Add split qt-4 dependencies, bug #217170
 
   23 Jan 2008; Michael Sterrett <mr_bones_@gentoo.org> attal-0.10.1.ebuild:
   add QT4_BUILT_WITH_USE_CHECK for bug #206420
diff --git a/games-strategy/attal/Manifest b/games-strategy/attal/Manifest
index 6a446ef2616b..f587d4e1092b 100644
--- a/games-strategy/attal/Manifest
+++ b/games-strategy/attal/Manifest
@@ -1,10 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX attal-0.10.1-gcc41.patch 1135 RMD160 4c1da4b6cc226d8383069fdb4d63bfe9786318a9 SHA1 73ca903436d6e950ebc2808b962b3fcf4c3018ac SHA256 e51d7720d77c3dfea2d43aa20c34052b99d8a977f2c7ea977fc59a305dd1902e
 AUX attal-0.10.1-gentoo.patch 1239 RMD160 1e944045ebfdd78c26c4a1b24230c21bd8fc10fb SHA1 7e2710a2cbe22db0da37a51d09d620d92a7c7ff3 SHA256 7baae299bbfa6bfb018bdfdc0d2f349b4d1b0fd0e771e6b247ac3a82c95b4942
 DIST attal-src-0.10.1.tar.bz2 283704 RMD160 86c92158aacd20f6dc9af22bbd31c7543ae1d953 SHA1 2ed160a273029b7770b0c692282946bae0beca57 SHA256 9dd692daa99dbf3ec14c178b5b3334a6a4085f790749aa58cf45ddf8c5e8649b
 DIST attal-src-0.9.3.tar.bz2 264443 RMD160 6f3501a78ebdb6ea4844d8e113472fcf2e72c2f2 SHA1 f48b788835bc0ff1674a0c53a77cbd544c823629 SHA256 4c220c0bde9a6bf48a725ec26eac0c7d5a5c4e1f785f1a8d6f6ef5312006d9dc
 DIST themes-0.10.1.tar.bz2 30744206 RMD160 7ac400bb73580efdbd8082268b3e1bd7b745f37b SHA1 b6f8fb07630d07db2c6e09c6c6f2ac21512b5aba SHA256 1f0e9c8b70ac8fd50cf7af492177b88383b230fe400f6ffa4b5641badac5a002
 DIST themes-0.9.3.tar.bz2 28763653 RMD160 716eeaa63bf015369709a4e5614818614e37e9b7 SHA1 4921297ec7c43867ad6529e2dbbeb3b0a8fa72b7 SHA256 5c5c01b6aceee8c3d748eef3884ef70d3614abffa28d5d6a396324e2c0653894
-EBUILD attal-0.10.1.ebuild 1559 RMD160 9c3f28411562308b6faa2d98314df903f35f3d8e SHA1 4c8512b6f40f7dff1b9e763156327a292ec46037 SHA256 e6061066ab5ac1ae677ae0afa6b022b70f98d5bc1fa8965a627c34c812ca75f0
+EBUILD attal-0.10.1.ebuild 1404 RMD160 a1aa8f00e0ef16755d0a837459713f18607443f8 SHA1 1704e144ee39663da1d489850700e8513d6c7665 SHA256 c7f863850b9d76f228965d24267d879c216860225433968363cca10362c3ead5
 EBUILD attal-0.9.3.ebuild 1894 RMD160 a3c34d75bcd7699cfe33cc8b1ad1f1cf7bbb3b90 SHA1 5a9485c1e04a6ba7ea9a23dfcb3ed0fcc140a673 SHA256 639687ac0b303585894579145039be05e248618bc72a37f9c6e1d7b5da59779a
-MISC ChangeLog 2965 RMD160 cbb2a88717cdc5e54e52eaf92a85e9d3de1cb6ba SHA1 84a41c3d04bcb40b52665090ee284792fee30df1 SHA256 4d49e0cf58b48f8dbb892aa48cd0a7d35c0a7808612463bb6e4026d5aa87acd9
+MISC ChangeLog 3073 RMD160 cc473fb2e03682dcadc67dd9e3a6b4d2ab8900e6 SHA1 43c9b1da48d1e0fde5d08f4a576537ce48fb2256 SHA256 1afd217c8ad4efb68a12bc59f149a99e506b00852ec92489e1d0e846b32941b5
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkho/1AACgkQdz7hIScOURFd8gCcCkZK9WNdFOOmhDZy3YORxA3E
+3vQAoOprs6ncWWJbEmhA/33tSFsIGxqu
+=B/+U
+-----END PGP SIGNATURE-----
diff --git a/games-strategy/attal/attal-0.10.1.ebuild b/games-strategy/attal/attal-0.10.1.ebuild
index a30a74f44eba..2db490d1e369 100644
--- a/games-strategy/attal/attal-0.10.1.ebuild
+++ b/games-strategy/attal/attal-0.10.1.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/attal/attal-0.10.1.ebuild,v 1.4 2008/01/23 18:26:18 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/attal/attal-0.10.1.ebuild,v 1.5 2008/06/30 15:44:09 nyhm Exp $
 
-inherit eutils toolchain-funcs qt4 games
+EAPI=1
+inherit eutils qt4 games
 
 MY_P="${PN}-src-${PV}"
 DESCRIPTION="turn-based strategy game project"
@@ -15,47 +16,46 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
-DEPEND="$(qt4_min_version 4)
+DEPEND="|| (
+		( x11-libs/qt-gui:4 x11-libs/qt-qt3support:4 )
+		x11-libs/qt:4
+	)
+	media-libs/libsdl
 	media-libs/sdl-mixer"
 
 S=${WORKDIR}/${MY_P}
 
-QT4_BUILT_WITH_USE_CHECK="qt3support"
+pkg_setup() {
+	QT4_BUILT_WITH_USE_CHECK="qt3support" qt4_pkg_setup
+	games_pkg_setup
+}
 
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	mv ../themes .
-	find . -name .cvsignore -print0 | xargs -0 rm -f
-	epatch "${FILESDIR}"/${P}-{gcc41,gentoo}.patch
+	ecvs_clean
+	epatch \
+		"${FILESDIR}"/${P}-gcc41.patch \
+		"${FILESDIR}"/${P}-gentoo.patch
 	sed -i \
 		-e "s:@GENTOO_DATADIR@:${GAMES_DATADIR}/${PN}:" \
 		libCommon/displayHelp.cpp \
 		libCommon/attalCommon.cpp \
 		server/duel.cpp \
 		|| die "sed failed"
-
-	sed -i \
-		-e "1i QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}" \
-		-e "1i QMAKE_LFLAGS_RELEASE=${LDFLAGS}" \
-		$(find . -type f -name '*.pro') \
-		|| die "sed failed"
-	qmake -o Makefile Makefile.pro || die "qmake failed"
 }
 
 src_compile() {
-	emake -j1 \
-		CXX=$(tc-getCXX) \
-		LINK=$(tc-getCXX) \
-		|| die "emake failed"
+	eqmake4 Makefile.pro
+	emake -j1 || die "emake failed"
 }
 
 src_install() {
 	dogamesbin attal-* || die "dogamesbin failed"
 	dogameslib.so lib*.so* || die "dogameslib.so failed"
 	insinto "${GAMES_DATADIR}"/${PN}
-	doins HOWTOPLAY.html
-	doins -r themes || die "doins themes failed"
+	doins -r themes HOWTOPLAY.html || die "doins failed"
 	dodoc AUTHORS NEWS README TODO
 	prepgamesdirs
 }