add newer MythTV 0.22/trunk version using EAPI=2 for Qt 4.4 USE depends

Package-Manager: portage-2.2_rc7/cvs/Linux 2.6.25-gentoo-r6 x86_64

3 files changed, 22 insertions, 14 deletions

diff --git a/media-tv/mythtv/ChangeLog b/media-tv/mythtv/ChangeLog
index 983304d064ba..42cf33ebaf2d 100644
--- a/media-tv/mythtv/ChangeLog
+++ b/media-tv/mythtv/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-tv/mythtv
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/ChangeLog,v 1.249 2008/08/12 03:28:35 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/ChangeLog,v 1.250 2008/08/13 16:31:09 cardoe Exp $
+
+*mythtv-0.22_alpha18144 (13 Aug 2008)
+
+  13 Aug 2008; Doug Goldstein <cardoe@gentoo.org>
+  -mythtv-0.22_alpha17449.ebuild, +mythtv-0.22_alpha18144.ebuild:
+  add newer MythTV 0.22/trunk version using EAPI=2 for Qt 4.4 USE depends
 
 *mythtv-0.21_p18116 (12 Aug 2008)
 
diff --git a/media-tv/mythtv/Manifest b/media-tv/mythtv/Manifest
index 619531d1974e..b46b08458529 100644
--- a/media-tv/mythtv/Manifest
+++ b/media-tv/mythtv/Manifest
@@ -13,14 +13,14 @@ EBUILD mythtv-0.20.2_p15634.ebuild 10064 RMD160 ac8a64b41e79e4519ba75673a05ad4fc
 EBUILD mythtv-0.21_p17637.ebuild 9110 RMD160 1b29b3a3daebce60442915511e821c9b51b79e42 SHA1 fbe985358a1ba2a65912c706d669c89c693bdf03 SHA256 bd3ad3e72e28ea18f32ed9743e86e248c0d80914c6db24044271875bae276b9f
 EBUILD mythtv-0.21_p17722.ebuild 9110 RMD160 72c429c627978caaa913205808be2ae8e0663de7 SHA1 1893115799a48d23b3588d819a3c045e1aff50b5 SHA256 dbd31ee332d20de9c4aed587a9d8b562b02a544e8aac7a1e1dc1780ede546e7f
 EBUILD mythtv-0.21_p18116.ebuild 9110 RMD160 60fa91849fe9dd69515519e9e47d7447f659a357 SHA1 642363205b18ef8032100080e0d5c325113f0fd3 SHA256 d5da9576f1e1e4201dc2506ab5fd0cd470ea4cd1a733fa0742d296ed8f759150
-EBUILD mythtv-0.22_alpha17449.ebuild 8739 RMD160 966fb1a7d35614d5bf480b9706920ff18bc9c5cc SHA1 27f0c707c1f142ed4856d856474e26831668b9f5 SHA256 32c56a93f9266cada9e7cb231bcf004ee4de217b85fafc3877a6dc3fdb849571
 EBUILD mythtv-0.22_alpha17733.ebuild 8739 RMD160 f6d22341422457e3b0d7792149492cc1614687e6 SHA1 a5f01e29624ccd030b0be44f76ad03f09d92ca4e SHA256 0cc8f71772e58a7dfeaf1b86d2a24ff74d3bd5e067f45c9d4831586102772cd5
-MISC ChangeLog 48510 RMD160 f92a1964539d0e97dbbe7dd8289a213fcdafd8cc SHA1 caaa00929cb943454ec4c668c4c638fb499aff2d SHA256 f823a8f9f88af9884bf09f77cb692b56b076ef1b35ff1c2c800a565011593717
+EBUILD mythtv-0.22_alpha18144.ebuild 8817 RMD160 7b879ba1a937387e98dd849e966a93611bdd2651 SHA1 c757aa2494bb320ab6ff5224e3bbc45e3cd3168f SHA256 126ee18d23356490904d19e60ae1b92fea9fa54e26052152c770a57a3e6ca9a4
+MISC ChangeLog 48740 RMD160 6dcea83156674b12fb6f78f494d1beddb32c56aa SHA1 1e5e3723aef81c0588921096407188ab24ea2d4a SHA256 dc7ec3b751e0b150cca5812f8b7c8b7682958a1febe567a330960a6d33eca8cf
 MISC metadata.xml 4714 RMD160 c65d058e83e36342d6a49b63a6e9609e11242b66 SHA1 0de80f93ca1adfede5783d30a45953ec4cd27c9b SHA256 7501a841c218dd17bee56aeefcfc60194241b3a5468898850c5bedf5dafd28e5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkihA20ACgkQoeSe8B0zEfzykwCcC4nrtvM4TXt6lc5VXmwCCE1M
-yzQAn1sqALw/7OShRp0ulRYQsIheQJwr
-=BtUR
+iEYEARECAAYFAkijDFcACgkQoeSe8B0zEfwE+QCghMn8dE6N7h4kW2ZA0HPCYEUZ
+faQAmwSDjJ6IesUbHISxGx4yWTv+igNb
+=iM9I
 -----END PGP SIGNATURE-----
diff --git a/media-tv/mythtv/mythtv-0.22_alpha17449.ebuild b/media-tv/mythtv/mythtv-0.22_alpha18144.ebuild
index c0748cf480c7..4ec95b2b5e99 100644
--- a/media-tv/mythtv/mythtv-0.22_alpha17449.ebuild
+++ b/media-tv/mythtv/mythtv-0.22_alpha18144.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.22_alpha17449.ebuild,v 1.3 2008/07/07 17:31:34 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.22_alpha18144.ebuild,v 1.1 2008/08/13 16:31:09 cardoe Exp $
 
-EAPI=1
+EAPI=2_pre2
 inherit flag-o-matic multilib eutils qt4 mythtv toolchain-funcs python
 
 DESCRIPTION="Homebrew PVR project"
@@ -22,7 +22,11 @@ RDEPEND=">=media-libs/freetype-2.0
 	x11-libs/libXv
 	x11-libs/libXrandr
 	x11-libs/libXxf86vm
-	>=x11-libs/qt-4.3:4
+	x11-libs/qt-core:4[qt3support]
+	x11-libs/qt-gui:4[qt3support,tiff]
+	x11-libs/qt-sql:4[qt3support,mysql]
+	x11-libs/qt-opengl:4[qt3support]
+	x11-libs/qt-webkit:4
 	virtual/mysql
 	virtual/opengl
 	virtual/glu
@@ -58,10 +62,6 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 MYTHTV_GROUPS="video,audio,tty,uucp"
 
 pkg_setup() {
-
-	confutils_require_built_with_all =x11-libs/qt-4* gif jpeg mysql opengl \
-		png tiff
-
 	einfo "This ebuild now uses a heavily stripped down version of your CFLAGS"
 
 	if use xvmc && use video_cards_nvidia; then
@@ -89,7 +89,7 @@ src_unpack() {
 		-i "${S}"/bindings/perl/perl.pro
 }
 
-src_compile() {
+src_configure() {
 	local myconf="--prefix=/usr
 		--mandir=/usr/share/man
 		--libdir-name=$(get_libdir)"
@@ -164,7 +164,9 @@ src_compile() {
 	CXXFLAGS=""
 	einfo "Running ./configure ${myconf}"
 	./configure ${myconf} || die "configure died"
+}
 
+src_compile() {
 	eqmake4 mythtv.pro -o "Makefile" || die "eqmake4 failed"
 	emake || die "emake failed"