11 files changed, 38 insertions, 131 deletions
diff --git a/media-tv/nuvexport/ChangeLog b/media-tv/nuvexport/ChangeLog
index 60e4cfebea69..58cd594d8e5b 100644
--- a/media-tv/nuvexport/ChangeLog
+++ b/media-tv/nuvexport/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for media-tv/nuvexport
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/nuvexport/ChangeLog,v 1.16 2005/03/11 06:32:57 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/nuvexport/ChangeLog,v 1.17 2005/03/15 05:37:58 cardoe Exp $
+
+*nuvexport-0.2_pre20050311 (15 Mar 2005)
+
+  15 Mar 2005; Doug Goldstein <cardoe@gentoo.org>
+  -nuvexport-0.2_pre20050207.ebuild, -nuvexport-0.2_pre20050212.ebuild,
+  -nuvexport-0.2_pre20050221.ebuild, -nuvexport-0.2_pre20050309.ebuild,
+  +nuvexport-0.2_pre20050311.ebuild:
+  rev bump
+  update ebuild to check USE flags for ffmpeg
+  require version of ffmpeg that actually works
 
 *nuvexport-0.2_pre20050309 (11 Mar 2005)
 
diff --git a/media-tv/nuvexport/Manifest b/media-tv/nuvexport/Manifest
index fa6d538386d9..379127572855 100644
--- a/media-tv/nuvexport/Manifest
+++ b/media-tv/nuvexport/Manifest
@@ -1,20 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+MD5 97139eae062dfd5ef82d516e30098593 nuvexport-0.2_pre20050311.ebuild 1825
 MD5 20e2255501865de5b568424821abf69d metadata.xml 161
-MD5 e7fdb7fa40ae28d4c025f02543e7f0fa ChangeLog 3107
-MD5 b52d606841f582893f9f7c38209e3a0a nuvexport-0.2_pre20050212.ebuild 1166
-MD5 4a10f662acd00064fb67078a605c5143 nuvexport-0.2_pre20050221.ebuild 1187
-MD5 dd4199573aae22d6d175b1a6d2cf3abf nuvexport-0.2_pre20050309.ebuild 1187
-MD5 e47b91601d77245f4f9b51bd018ec03b nuvexport-0.2_pre20050207.ebuild 1127
-MD5 30398b02335ab2010991aa60872b8239 files/digest-nuvexport-0.2_pre20050221 77
-MD5 7fcd69cc7cc7a9048503fc081b42f5b5 files/digest-nuvexport-0.2_pre20050207 77
-MD5 8e96fde6ce0a955f11d9cc8984f20017 files/digest-nuvexport-0.2_pre20050212 77
-MD5 84c3b28a1e8761db536963f6ea9e27a9 files/digest-nuvexport-0.2_pre20050309 77
+MD5 a4172f14138ff97db963a0202c1a0cac ChangeLog 3486
+MD5 e9b2eb11695acadcaa094f7d15312e0f files/digest-nuvexport-0.2_pre20050311 77
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.0 (GNU/Linux)
 
-iD8DBQFCMTui5+pdB4IBr0URArTDAJ9gQXo54pgxYyEz9I83S4q/k0C2PwCeMceY
-jb+ui7XV6BaPs2PS/i6EOkk=
-=yqFc
+iD8DBQFCNnTD5+pdB4IBr0URAvvkAJ9Ln2RuDtiT8et2JG4HZ2v6LvOhhQCgjOau
+YHIDnT2U0tPgSIFgbvhKopI=
+=xqSr
 -----END PGP SIGNATURE-----
diff --git a/media-tv/nuvexport/files/digest-nuvexport-0.2_pre20050207 b/media-tv/nuvexport/files/digest-nuvexport-0.2_pre20050207
deleted file mode 100644
index 4a71611da4ae..000000000000
--- a/media-tv/nuvexport/files/digest-nuvexport-0.2_pre20050207
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4969507d150a46e191dcd3d53576a864 nuvexport-0.2-cvs20050207.tar.bz2 30652
diff --git a/media-tv/nuvexport/files/digest-nuvexport-0.2_pre20050212 b/media-tv/nuvexport/files/digest-nuvexport-0.2_pre20050212
deleted file mode 100644
index 98ee68f0ebb7..000000000000
--- a/media-tv/nuvexport/files/digest-nuvexport-0.2_pre20050212
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6e09be8a84ae643771141e75ec36d334 nuvexport-0.2-cvs20050212.tar.bz2 30918
diff --git a/media-tv/nuvexport/files/digest-nuvexport-0.2_pre20050221 b/media-tv/nuvexport/files/digest-nuvexport-0.2_pre20050221
deleted file mode 100644
index 146cee69d5e3..000000000000
--- a/media-tv/nuvexport/files/digest-nuvexport-0.2_pre20050221
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c854cf2440fd7e4dbde228e6293c4c6a nuvexport-0.2-cvs20050221.tar.bz2 31510
diff --git a/media-tv/nuvexport/files/digest-nuvexport-0.2_pre20050309 b/media-tv/nuvexport/files/digest-nuvexport-0.2_pre20050309
deleted file mode 100644
index de2671bd9f0b..000000000000
--- a/media-tv/nuvexport/files/digest-nuvexport-0.2_pre20050309
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f997122f03299121363dd429e719e46f nuvexport-0.2-cvs20050309.tar.bz2 35300
diff --git a/media-tv/nuvexport/files/digest-nuvexport-0.2_pre20050311 b/media-tv/nuvexport/files/digest-nuvexport-0.2_pre20050311
new file mode 100644
index 000000000000..5c1fe82be062
--- /dev/null
+++ b/media-tv/nuvexport/files/digest-nuvexport-0.2_pre20050311
@@ -0,0 +1 @@
+MD5 1e281af6ae86cff008f8cfe2c822a88f nuvexport-0.2-cvs20050311.tar.bz2 35397
diff --git a/media-tv/nuvexport/nuvexport-0.2_pre20050207.ebuild b/media-tv/nuvexport/nuvexport-0.2_pre20050207.ebuild
deleted file mode 100644
index 3143277b32b6..000000000000
--- a/media-tv/nuvexport/nuvexport-0.2_pre20050207.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/nuvexport/nuvexport-0.2_pre20050207.ebuild,v 1.1 2005/02/09 06:06:47 cardoe Exp $
-
-S=${WORKDIR}/nuvexport-0.2
-DESCRIPTION="Export from mythtv recorded NuppelVideo files"
-HOMEPAGE="http://www.forevermore.net/mythtv/"
-SRC_URI="http://www.forevermore.net/files/nuvexport/nuvexport-0.2-cvs20050207.tar.bz2
-	http://www.forevermore.net/files/nuvexport/archive/nuvexport-0.2-cvs20050207.tar.bz2"
-LICENSE="as-is"
-SLOT="0"
-
-IUSE=""
-
-KEYWORDS="~x86"
-DEPEND=""
-RDEPEND="dev-perl/DBI
-	dev-perl/DBD-mysql
-	media-video/ffmpeg
-	media-video/mjpegtools
-	media-video/transcode
-	|| ( media-tv/mythtv media-tv/mythtv-cvs )"
-
-pkg_setup() {
-	local trans_use="$(</var/db/pkg/`best_version media-video/transcode`/USE)"
-	if ! has mjpeg ${trans_use} ; then
-		eerror "media-video/transcode is missing mjpeg support. Please add"
-		eerror "'mjpeg' to your USE flags, and re-emerge media-video/transcode."
-		die "transcode needs mjpeg support"
-	fi
-}
-
-src_install() {
-	einstall || die "failed to install"
-}
diff --git a/media-tv/nuvexport/nuvexport-0.2_pre20050212.ebuild b/media-tv/nuvexport/nuvexport-0.2_pre20050212.ebuild
deleted file mode 100644
index 9161fe5553f0..000000000000
--- a/media-tv/nuvexport/nuvexport-0.2_pre20050212.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/nuvexport/nuvexport-0.2_pre20050212.ebuild,v 1.1 2005/02/12 21:41:14 cardoe Exp $
-
-S=${WORKDIR}/nuvexport-0.2
-DESCRIPTION="Export from mythtv recorded NuppelVideo files"
-HOMEPAGE="http://www.forevermore.net/mythtv/"
-SRC_URI="http://www.forevermore.net/files/nuvexport/nuvexport-0.2-cvs20050212.tar.bz2
-	http://www.forevermore.net/files/nuvexport/archive/nuvexport-0.2-cvs20050212.tar.bz2"
-LICENSE="as-is"
-SLOT="0"
-
-IUSE=""
-
-KEYWORDS="~x86"
-DEPEND=""
-RDEPEND="dev-perl/DBI
-	dev-perl/DBD-mysql
-	media-video/ffmpeg
-	media-video/mjpegtools
-	media-video/transcode
-	media-video/avidemux
-	media-video/lve
-	|| ( media-tv/mythtv media-tv/mythtv-cvs )"
-
-pkg_setup() {
-	local trans_use="$(</var/db/pkg/`best_version media-video/transcode`/USE)"
-	if ! has mjpeg ${trans_use} ; then
-		eerror "media-video/transcode is missing mjpeg support. Please add"
-		eerror "'mjpeg' to your USE flags, and re-emerge media-video/transcode."
-		die "transcode needs mjpeg support"
-	fi
-}
-
-src_install() {
-	einstall || die "failed to install"
-}
diff --git a/media-tv/nuvexport/nuvexport-0.2_pre20050309.ebuild b/media-tv/nuvexport/nuvexport-0.2_pre20050309.ebuild
deleted file mode 100644
index 20aa58f702f0..000000000000
--- a/media-tv/nuvexport/nuvexport-0.2_pre20050309.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/nuvexport/nuvexport-0.2_pre20050309.ebuild,v 1.1 2005/03/11 06:32:57 cardoe Exp $
-
-S=${WORKDIR}/nuvexport-0.2
-DESCRIPTION="Export from mythtv recorded NuppelVideo files"
-HOMEPAGE="http://www.forevermore.net/mythtv/"
-SRC_URI="http://www.forevermore.net/files/nuvexport/nuvexport-0.2-cvs20050309.tar.bz2
-	http://www.forevermore.net/files/nuvexport/archive/nuvexport-0.2-cvs20050309.tar.bz2"
-LICENSE="as-is"
-SLOT="0"
-
-IUSE=""
-
-KEYWORDS="~x86"
-DEPEND=""
-RDEPEND="dev-perl/DBI
-	dev-perl/DBD-mysql
-	media-video/ffmpeg
-	media-video/mjpegtools
-	media-video/transcode
-	media-video/avidemux
-	media-video/lve
-	media-video/mplayer
-	|| ( media-tv/mythtv media-tv/mythtv-cvs )"
-
-pkg_setup() {
-	local trans_use="$(</var/db/pkg/`best_version media-video/transcode`/USE)"
-	if ! has mjpeg ${trans_use} ; then
-		eerror "media-video/transcode is missing mjpeg support. Please add"
-		eerror "'mjpeg' to your USE flags, and re-emerge media-video/transcode."
-		die "transcode needs mjpeg support"
-	fi
-}
-
-src_install() {
-	einstall || die "failed to install"
-}
diff --git a/media-tv/nuvexport/nuvexport-0.2_pre20050221.ebuild b/media-tv/nuvexport/nuvexport-0.2_pre20050311.ebuild
index 13a2b08c47a0..9d0e27018609 100644
--- a/media-tv/nuvexport/nuvexport-0.2_pre20050221.ebuild
+++ b/media-tv/nuvexport/nuvexport-0.2_pre20050311.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/nuvexport/nuvexport-0.2_pre20050221.ebuild,v 1.1 2005/02/24 04:39:01 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/nuvexport/nuvexport-0.2_pre20050311.ebuild,v 1.1 2005/03/15 05:37:58 cardoe Exp $
 
 S=${WORKDIR}/nuvexport-0.2
 DESCRIPTION="Export from mythtv recorded NuppelVideo files"
 HOMEPAGE="http://www.forevermore.net/mythtv/"
-SRC_URI="http://www.forevermore.net/files/nuvexport/nuvexport-0.2-cvs20050221.tar.bz2
-	http://www.forevermore.net/files/nuvexport/archive/nuvexport-0.2-cvs20050221.tar.bz2"
+SRC_URI="http://www.forevermore.net/files/nuvexport/nuvexport-0.2-cvs20050311.tar.bz2
+	http://www.forevermore.net/files/nuvexport/archive/nuvexport-0.2-cvs20050311.tar.bz2"
 LICENSE="as-is"
 SLOT="0"
 
@@ -16,7 +16,7 @@ KEYWORDS="~x86"
 DEPEND=""
 RDEPEND="dev-perl/DBI
 	dev-perl/DBD-mysql
-	media-video/ffmpeg
+	>=media-video/ffmpeg-0.4.9_p20050226-r1
 	media-video/mjpegtools
 	media-video/transcode
 	media-video/avidemux
@@ -31,6 +31,22 @@ pkg_setup() {
 		eerror "'mjpeg' to your USE flags, and re-emerge media-video/transcode."
 		die "transcode needs mjpeg support"
 	fi
+
+	local ffmpeg_use="$(</var/db/pkg/`best_version media-video/ffmpeg`/USE)"
+	ffmpeg_need="aac dvd encode threads xvid"
+	for flag in ${ffmpeg_need} ; do
+		if ! has ${flag} ${ffmpeg_use} ; then
+			eerror "media-video/ffmpeg is missing ${flag} support. Please add"
+			eerror "'${flag}' to your USE flags, and re-emerge media-video/ffmpeg."
+			die "ffmpeg needs ${flag} support"
+		fi
+	done
+
+	if has pic ${ffmpeg_use} ; then
+		ewarn "You have 'pic' enabled in your USE for your ffmpeg build. This is NOT"
+		ewarn "recommended as it will hurt your performance badly. Only use this if"
+		ewarn "necessary for your arch."
+	fi
 }
 
 src_install() {