switch trunk builds to qt4

Package-Manager: portage-2.1.4.4

3 files changed, 44 insertions, 25 deletions

diff --git a/media-tv/mythtv/ChangeLog b/media-tv/mythtv/ChangeLog
index 9beae92ddbaf..b949a1949c3e 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.226 2008/03/18 14:46:04 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/ChangeLog,v 1.227 2008/03/25 20:03:51 cardoe Exp $
+
+*mythtv-0.22_alpha16791 (25 Mar 2008)
+
+  25 Mar 2008; Doug Goldstein <cardoe@gentoo.org>
+  -mythtv-0.22_alpha16508.ebuild, +mythtv-0.22_alpha16791.ebuild:
+  switch trunk builds to qt4
 
   18 Mar 2008; Doug Goldstein <cardoe@gentoo.org> mythtv-0.21_p16658.ebuild:
   Add aac support via faad2
diff --git a/media-tv/mythtv/Manifest b/media-tv/mythtv/Manifest
index 1e8d4d6fc47b..4e511de08067 100644
--- a/media-tv/mythtv/Manifest
+++ b/media-tv/mythtv/Manifest
@@ -13,13 +13,13 @@ EBUILD mythtv-0.20.2_p14972.ebuild 10237 RMD160 eae5584cc1f21c609f08b860dd36ffcb
 EBUILD mythtv-0.20.2_p15634.ebuild 10065 RMD160 e06d1f91993fd6f35d35b7d1bd09650e36859b39 SHA1 0a8704af4aace69312f8b36d9c01b75367cc9be3 SHA256 472862f7f583f7c3e1d4fb98713640596818a2dd61ea9bc70510db926e16e3e1
 EBUILD mythtv-0.21_p16483.ebuild 9498 RMD160 c8c103deda48996a7729678a77b8ab1c8596e96f SHA1 42ec1efe5a3c7c1504f1d7dde4f7de58ec6e6552 SHA256 00582b2d00ea8c2bc44f11f18d1977971d18fcf3e7ba800e8ae3657daa40586e
 EBUILD mythtv-0.21_p16658.ebuild 9577 RMD160 73385db2e9c60040f2a03eb8ae65a6e9a1035394 SHA1 d771200b16629325c3a85b9050aeedcb7517178a SHA256 256eba1ebfa9fdb4d0597eb1f22e09fdc790871945b6eb7c10a97233e3829617
-EBUILD mythtv-0.22_alpha16508.ebuild 9502 RMD160 d58e916ffd6605ad3978092789b54b31819e9938 SHA1 22684010cea5cab8b633a2612455a45bb439502b SHA256 93a722d901f3766b523dbd973ace1c2acb35f5111831e54262500336f5cff782
-MISC ChangeLog 43005 RMD160 fd9fecd644aa5a5951e23140a8a4f327ed29ff71 SHA1 a9e32a96f455041b3d500018dbb50df4cae4c168 SHA256 a91f58761dd436e29ddd288f1a008d75fca7f6820a704f6b280f5a1ea569f496
+EBUILD mythtv-0.22_alpha16791.ebuild 10094 RMD160 8a7a16088a3fda315c131603d675f246c3a8ff5d SHA1 b4eed27322722a60554e1dea541ab8ce0e0abfed SHA256 10338b04a58acfbc8322e68abb8d8f3b8f847527ae137dd3900784eca11ca88e
+MISC ChangeLog 43190 RMD160 8eb4e807862115a583890bfbf54c33214b7fe414 SHA1 f7e587d7d1cfe70a51dbe1c3731f1f2fbf1c27fa SHA256 7b6f60217c813468ce90bff5fb4965d826ec632f2d5a6a6fe288f478fd5f216c
 MISC metadata.xml 4714 RMD160 c65d058e83e36342d6a49b63a6e9609e11242b66 SHA1 0de80f93ca1adfede5783d30a45953ec4cd27c9b SHA256 7501a841c218dd17bee56aeefcfc60194241b3a5468898850c5bedf5dafd28e5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFH39W2oeSe8B0zEfwRAvq2AJ9ObG29QHvA2FVzZUmfPk7j7dh1YgCfUTGr
-UTdsUnVibE9srNWVt8+T828=
-=4vC+
+iD8DBQFH6VqwoeSe8B0zEfwRAg6oAJ9aoa6KXuLCPdStIbN3zJGAHuCXdACfdnbL
+Q17pXppykirqr/TTgy5TaWY=
+=Kn9D
 -----END PGP SIGNATURE-----
diff --git a/media-tv/mythtv/mythtv-0.22_alpha16508.ebuild b/media-tv/mythtv/mythtv-0.22_alpha16791.ebuild
index 367a944c27cb..c71ed07f3d30 100644
--- a/media-tv/mythtv/mythtv-0.22_alpha16508.ebuild
+++ b/media-tv/mythtv/mythtv-0.22_alpha16791.ebuild
@@ -1,18 +1,17 @@
-# 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_alpha16508.ebuild,v 1.1 2008/03/11 19:56:58 cardoe Exp $
+# 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_alpha16791.ebuild,v 1.1 2008/03/25 20:03:51 cardoe Exp $
 
 EAPI=1
-inherit flag-o-matic multilib eutils qt3 mythtv toolchain-funcs python
+inherit flag-o-matic multilib eutils qt4 mythtv toolchain-funcs python
 
 DESCRIPTION="Homebrew PVR project"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 
 IUSE_VIDEO_CARDS="video_cards_nvidia video_cards_via"
-IUSE="alsa altivec autostart dbox2 debug directv dvb dvd hdhomerun ieee1394 iptv \
-ivtv jack joystick lcd lirc mmx opengl opengl-video opengl-xvmc perl python \
-vorbis xvmc ${IUSE_VIDEO_CARDS}"
+IUSE="aac alsa altivec autostart dbox2 debug directv dvb dvd hdhomerun \
+ieee1394 iptv ivtv jack joystick lcd lirc mmx opengl opengl-video
+opengl-xvmc perl python vorbis xvmc ${IUSE_VIDEO_CARDS}"
 
 RDEPEND=">=media-libs/freetype-2.0
 	>=media-sound/lame-3.93.1
@@ -22,11 +21,12 @@ RDEPEND=">=media-libs/freetype-2.0
 	x11-libs/libXv
 	x11-libs/libXrandr
 	x11-libs/libXxf86vm
-	>=x11-libs/qt-3.3:3
+	>=x11-libs/qt-4.3:4
 	virtual/mysql
 	virtual/opengl
 	virtual/glu
 	|| ( >=net-misc/wget-1.9.1 >=media-tv/xmltv-0.5.43 )
+	aac? ( media-libs/faad2 )
 	alsa? ( >=media-libs/alsa-lib-0.9 )
 	autostart? ( net-dialup/mingetty
 				x11-wm/evilwm
@@ -68,6 +68,15 @@ pkg_setup() {
 		die "Please fix the above issues, before continuing."
 	fi
 
+	if ! built_with_use -a =x11-libs/qt-4* gif jpeg mysql opengl png tiff; then
+		echo
+		eerror "MythTV requires Qt to be built with gif, jpeg, mysql, opengl,"
+		eerror "png, and tiff use flags enabled."
+		eerror "Please re-emerge =x11-libs/qt-4*, after having the use flags set."
+		echo
+		die "Please fix the above issues, before continuing."
+	fi
+
 	echo
 	einfo "This ebuild now uses a heavily stripped down version of your CFLAGS"
 	einfo "Don't complain because your -momfg-fast-speed CFLAG is being stripped"
@@ -112,6 +121,7 @@ src_compile() {
 	local myconf="--prefix=/usr
 		--mandir=/usr/share/man
 		--libdir-name=$(get_libdir)"
+	use aac && myconf="${myconf} --enable-libfaad2"
 	use alsa || myconf="${myconf} --disable-audio-alsa"
 	use altivec || myconf="${myconf} --disable-altivec"
 	use dbox2 || myconf="${myconf} --disable-dbox2"
@@ -183,28 +193,31 @@ src_compile() {
 	einfo "Running ./configure ${myconf}"
 	./configure ${myconf} || die "configure died"
 
-	eqmake3 mythtv.pro -o "Makefile" || die "eqmake3 failed"
+	eqmake4 mythtv.pro -o "Makefile" || die "eqmake4 failed"
 	emake || die "emake failed"
 
 	# firewire support should build the tester
 	if use ieee1394; then
 		cd contrib
-		$(tc-getCC) ${CFLAGS} ${CPPFLAGS} -o ../firewire_tester firewire_tester.c \
+		$(tc-getCC) ${CFLAGS} ${CPPFLAGS} -o ../firewire_tester \
+			development/firewire_tester/firewire_tester.c \
 			${LDFLAGS} -liec61883 -lraw1394 || \
 			die "failed to compile firewire_tester"
 
 		cd channel_changers
-		$(tc-getCC) ${CFLAGS} ${CPPFLAGS} -std=gnu99 -o ../../6200ch 6200ch.c \
+		$(tc-getCC) ${CFLAGS} ${CPPFLAGS} -std=gnu99 -o ../../6200ch \
+			6200ch/6200ch.c
 			${LDFLAGS} -lrom1394 -lavc1394 -lraw1394 || \
 			die "failed to compile 6200ch"
-		$(tc-getCC) ${CFLAGS} ${CPPFLAGS} -o ../../sa3250ch sa3250ch.c \
+		$(tc-getCC) ${CFLAGS} ${CPPFLAGS} -o ../../sa3250ch \
+			sa3250ch/sa3250ch.c \
 			${LDFLAGS} -lrom1394 -lavc1394 -lraw1394 || \
 			die "failed to compile sa3250ch"
 	fi
 
 	cd "${S}"/contrib/channel_changers
-	$(tc-getCC) ${CFLAGS} ${CPPFLAGS} -o ../../red_eye red_eye.c ${LDFLAGS} || \
-		die "failed to compile red_eye"
+	$(tc-getCC) ${CFLAGS} ${CPPFLAGS} -o ../../red_eye red_eye/red_eye.c \
+		${LDFLAGS} || die "failed to compile red_eye"
 }
 
 src_install() {
@@ -248,21 +261,21 @@ src_install() {
 
 	if use ieee1394; then
 		dobin firewire_tester || die "failed to install firewire_tester"
-		dodoc contrib/firewire_tester-README
+		newdoc contrib/development/firewire_tester/README README.firewire_tester
 
 		dobin 6200ch || die "failed to install 6200ch"
-		dodoc contrib/channel_changers/6200ch-README
+		newdoc contrib/channel_changers/6200ch/README README.6200ch
 
 		dobin sa3250ch || die "failed to install sa3250ch"
-		dodoc contrib/channel_changers/sa3250ch-README
+		newdoc contrib/channel_changers/sa3250ch/README README.sa3250ch
 	fi
 
 	dobin red_eye || die "failed to install red_eye"
-	dodoc contrib/channel_changers/red_eye-README
+	newdoc contrib/channel_changers/red_eye/README README.red_eye
 
 	if use directv; then
 		dobin contrib/channel_changers/d10control.pl || die "failed to install d10control"
-		dodoc contrib/channel_changers/d10control-README
+		newdoc contrib/channel_changers/d10control/README README.d10control
 	fi
 }