clean the amd64 stank off. fix frontendonly. fix xv usage.

Package-Manager: portage-2.0.51.22-r1

5 files changed, 44 insertions, 38 deletions

diff --git a/media-tv/mythtv/ChangeLog b/media-tv/mythtv/ChangeLog
index 7e3ecdae34aa..b975e6987ad5 100644
--- a/media-tv/mythtv/ChangeLog
+++ b/media-tv/mythtv/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-tv/mythtv
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/ChangeLog,v 1.67 2005/06/01 11:28:11 herbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/ChangeLog,v 1.68 2005/06/06 10:10:00 cardoe Exp $
+
+  06 Jun 2005; Doug Goldstein <cardoe@gentoo.org> mythtv-0.18.1-r1.ebuild,
+  mythtv-0.18.1-r2.ebuild:
+  clean the amd64 stank off. fix frontendonly. fix xv usage.
 
   01 Jun 2005; Herbie Hopkins <herbs@gentoo.org>
   +files/mythtv-0.18.1-x86_64-configure.patch, mythtv-0.18.1-r2.ebuild:
diff --git a/media-tv/mythtv/Manifest b/media-tv/mythtv/Manifest
index 81aa687472dc..ce622244507f 100644
--- a/media-tv/mythtv/Manifest
+++ b/media-tv/mythtv/Manifest
@@ -1,26 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 205c9b88dcccd2824f79de2465b87b6e mythtv-0.17-r1.ebuild 7323
-MD5 455cac96bf7d43f76fc1695835a15d30 mythtv-0.18.1-r1.ebuild 4493
-MD5 a35d400589bd8832dd6dcd8bab6e921f ChangeLog 12701
 MD5 f62db0df6ee8ee1d4fe7b9c3d74432a7 metadata.xml 222
-MD5 022a6e020e531643a746c21424db6bf7 mythtv-0.18.1-r2.ebuild 4941
-MD5 946d39e6c7d43c06d11d2bc6e09d5c21 files/0.18-mythbackend.rc 1606
-MD5 b288872f9393adf2b30f40b6ee01eac5 files/digest-mythtv-0.18.1-r1 67
-MD5 b288872f9393adf2b30f40b6ee01eac5 files/digest-mythtv-0.18.1-r2 67
+MD5 5e5edd016bcae56a7f6a525c1e7a47a8 ChangeLog 12866
+MD5 205c9b88dcccd2824f79de2465b87b6e mythtv-0.17-r1.ebuild 7323
+MD5 393d04db13b2c4fecfefbe8952370331 mythtv-0.18.1-r2.ebuild 5112
+MD5 8351d73450276e5d0cf4836cc4541ec3 mythtv-0.18.1-r1.ebuild 4676
 MD5 590c9a6a89442b347c3a5f52d1781351 files/digest-mythtv-0.17-r1 66
 MD5 2623cb1c902bf07fca69b846e7a0915a files/mythbackend.conf 1186
-MD5 fde2b2886b037b199cc815dbcb12617e files/mythtv-0.18.1-x86_64-configure.patch 631
-MD5 4985a61b90909b7f1c926f79a3ba34bf files/0.18-mythbackend.conf 931
 MD5 5938ea3584383e501674bf67a7f7e2a7 files/mythbackend.rc6 1776
+MD5 3632cf0ce1fad88f806ae8801316a6fc files/mythfilldatabase.cron 73
 MD5 bcfd584bc73afea9d88c8afe7d47f5be files/mythtv-0.17-qt334-dst-fix.patch 5663
+MD5 b288872f9393adf2b30f40b6ee01eac5 files/digest-mythtv-0.18.1-r1 67
+MD5 946d39e6c7d43c06d11d2bc6e09d5c21 files/0.18-mythbackend.rc 1606
+MD5 4985a61b90909b7f1c926f79a3ba34bf files/0.18-mythbackend.conf 931
 MD5 340e376a796fcc134e37222f01d705b3 files/mythtv-0.18.1-opengl-fix.patch 304
-MD5 3632cf0ce1fad88f806ae8801316a6fc files/mythfilldatabase.cron 73
+MD5 b288872f9393adf2b30f40b6ee01eac5 files/digest-mythtv-0.18.1-r2 67
+MD5 fde2b2886b037b199cc815dbcb12617e files/mythtv-0.18.1-x86_64-configure.patch 631
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFCnZyQ2G5bA0cA/ScRAkEbAJwK3gI53F4qat7QMZ1SZtKiYNWqXQCcCGUA
-7YVuOgEXPMY8NRlpqzWY7Bk=
-=KwnS
+iD4DBQFCpCDdBtvusYtCZMsRAvGXAJ9vjWbVC5X1hSK482KE6eEnOHuurgCXalMu
+tg5Gfk9cale9Dl7N9KbqIg==
+=DLKs
 -----END PGP SIGNATURE-----
diff --git a/media-tv/mythtv/mythtv-0.18.1-r1.ebuild b/media-tv/mythtv/mythtv-0.18.1-r1.ebuild
index bb828b80c0a3..dbc38e6d5cff 100644
--- a/media-tv/mythtv/mythtv-0.18.1-r1.ebuild
+++ b/media-tv/mythtv/mythtv-0.18.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.18.1-r1.ebuild,v 1.5 2005/06/01 00:39:10 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.18.1-r1.ebuild,v 1.6 2005/06/06 10:10:00 cardoe Exp $
 
 inherit flag-o-matic eutils debug
 
@@ -11,7 +11,7 @@ SRC_URI="http://www.mythtv.org/mc/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ~amd64"
-IUSE="alsa altivec arts debug dvb frontendonly jack joystick lcd lirc mmx nvidia oggvorbis opengl oss unichrome xv"
+IUSE="alsa altivec arts debug dvb frontendonly jack joystick lcd lirc mmx nvidia oggvorbis opengl oss unichrome"
 
 DEPEND=">=media-libs/freetype-2.0
 	>=media-sound/lame-3.93.1
@@ -39,6 +39,12 @@ pkg_setup() {
 		die "Qt needs MySQL support"
 	fi
 
+	if ! built_with_use x11-base/xorg-x11 xv; then
+		eerror "xorg-x11 is missing XV support. Please add"
+		eerror "'xv' to your USE flags, and re-emerge xorg-x11."
+		die "xorg-x11 needs XV support"
+	fi
+
 	if use nvidia; then
 		echo
 		ewarn "You enabled the 'nvidia' USE flag, you must have a GeForce 4 or"
@@ -82,7 +88,7 @@ src_compile() {
 		$(use_enable opengl opengl-vsync)
 		$(use_enable oggvorbis vorbis)
 		$(use_enable nvidia xvmc)
-		$(use_enable xv)
+		--enable-xv
 		--disable-firewire
 		--disable-directfb
 		--enable-x11
@@ -126,8 +132,8 @@ src_compile() {
 	if use frontendonly; then
 		##Backend Removal
 		cd ${S}
-		sed -e "s:CONFIG  += linux backend:CONFIG  += linux:" \
-			-i 'settings.pro' || die "Removal of mythbackend failed"
+		sed -e "s:CCONFIG linux backend:CCONFIG linux:" \
+			-i 'configure' || die "Removal of mythbackend failed"
 	fi
 
 	# let MythTV come up with our CFLAGS. Upstream will support this
diff --git a/media-tv/mythtv/mythtv-0.18.1-r2.ebuild b/media-tv/mythtv/mythtv-0.18.1-r2.ebuild
index bd394f6f320f..3ea158330cbc 100644
--- a/media-tv/mythtv/mythtv-0.18.1-r2.ebuild
+++ b/media-tv/mythtv/mythtv-0.18.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.18.1-r2.ebuild,v 1.3 2005/06/01 11:28:11 herbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.18.1-r2.ebuild,v 1.4 2005/06/06 10:10:00 cardoe Exp $
 
 inherit flag-o-matic eutils debug
 
@@ -11,7 +11,7 @@ SRC_URI="http://www.mythtv.org/mc/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="alsa altivec arts debug dvb frontendonly ieee1394 jack joystick lcd lirc mmx nvidia oggvorbis opengl oss unichrome xv"
+IUSE="alsa altivec arts debug dvb frontendonly ieee1394 jack joystick lcd lirc mmx nvidia oggvorbis opengl oss unichrome"
 
 DEPEND=">=media-libs/freetype-2.0
 	>=media-sound/lame-3.93.1
@@ -41,6 +41,12 @@ pkg_setup() {
 		die "Qt needs MySQL support"
 	fi
 
+	if ! built_with_use x11-base/xorg-x11 xv; then
+		eerror "xorg-x11 is missing XV support. Please add"
+		eerror "'xv' to your USE flags, and re-emerge xorg-x11."
+		die "xorg-x11 needs XV support"
+	fi
+
 	if use nvidia; then
 		echo
 		ewarn "You enabled the 'nvidia' USE flag, you must have a GeForce 4 or"
@@ -63,7 +69,7 @@ src_unpack() {
 	epatch ${FILESDIR}/${P}-opengl-fix.patch
 
 	# Add support for amd64 --arch options, bug 94664
-	use amd64 && epatch ${FILESDIR}/${P}-x86_64-configure.patch
+	epatch ${FILESDIR}/${P}-x86_64-configure.patch
 
 	if [ $(get_libdir) != "lib" ] ; then
 		sed -i -e "s:\$\${PREFIX}/lib/:\$\${PREFIX}/$(get_libdir)/:g" \
@@ -94,7 +100,7 @@ src_compile() {
 		$(use_enable opengl opengl-vsync)
 		$(use_enable oggvorbis vorbis)
 		$(use_enable nvidia xvmc)
-		$(use_enable xv)
+		--enable-xv
 		$(use_enable ieee1394 firewire)
 		--disable-directfb
 		--enable-x11
@@ -138,8 +144,8 @@ src_compile() {
 	if use frontendonly; then
 		##Backend Removal
 		cd ${S}
-		sed -e "s:CONFIG  += linux backend:CONFIG  += linux:" \
-			-i 'settings.pro' || die "Removal of mythbackend failed"
+		sed -e "s:CCONFIG linux backend:CCONFIG linux:" \
+			-i 'configure' || die "Removal of mythbackend failed"
 	fi
 
 	# let MythTV come up with our CFLAGS. Upstream will support this
diff --git a/media-tv/nuvexport/Manifest b/media-tv/nuvexport/Manifest
index 0194c1fcd6dc..1b7b124dc420 100644
--- a/media-tv/nuvexport/Manifest
+++ b/media-tv/nuvexport/Manifest
@@ -1,14 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 516f8d7cea3f3d17e232d5111c18e739 ChangeLog 4747
+MD5 c3b8ba3f2213743729d638e00bd27a3d ChangeLog 4923
 MD5 20e2255501865de5b568424821abf69d metadata.xml 161
-MD5 9d0409598b9b7ad26cb5fc5a1c37a6ed nuvexport-0.2_pre20050515.ebuild 1881
-MD5 8267cd48f027b1239df5509209b35718 files/digest-nuvexport-0.2_pre20050515 80
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCn0XMBtvusYtCZMsRAsI6AJ9DvNh83MihkwFuEs5gI0oACyijCgCeMlGo
-UaW9xEZTosznB2x/1ZAIApQ=
-=x407
------END PGP SIGNATURE-----
+MD5 89ffe4846fc98e9df2860a173a46ab7e nuvexport-0.2_pre20050605.ebuild 1852
+MD5 f515b060c3906e69095c74d5e8ca29cd files/digest-nuvexport-0.2_pre20050605 80