fixing via ezra. closes 48160

4 files changed, 28 insertions, 21 deletions

diff --git a/media-video/mjpegtools/ChangeLog b/media-video/mjpegtools/ChangeLog
index 6462c352453e..0af8f0f9fba4 100644
--- a/media-video/mjpegtools/ChangeLog
+++ b/media-video/mjpegtools/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/mjpegtools
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/ChangeLog,v 1.56 2004/04/15 10:23:01 swtaylor Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/ChangeLog,v 1.57 2004/04/19 06:43:50 mholzer Exp $
+
+  19 Apr 2004; Martin Holzer <mholzer@gentoo.org> mjpegtools-1.6.2-r1.ebuild:
+  fixing via ezra. closes 48160
 
   15 Apr 2004; Scott W Taylor <swtaylor@gentoo.org>
   mjpegtools-1.6.2-r1.ebuild:
diff --git a/media-video/mjpegtools/Manifest b/media-video/mjpegtools/Manifest
index 111eee2afbf1..2dcf59628db3 100644
--- a/media-video/mjpegtools/Manifest
+++ b/media-video/mjpegtools/Manifest
@@ -1,28 +1,28 @@
-MD5 409ccaec1fbc6338b929d137cb107e75 mjpegtools-1.6.1.91.ebuild 1931
+MD5 af790157078d811fa5afbcd1c0874437 ChangeLog 10223
+MD5 5e540d7e76784978e6cb78d4950e2481 metadata.xml 284
+MD5 41f7f2da5ee7f66ef90bc15f55ddf645 mjpegtools-1.6.0-r7.ebuild 2866
 MD5 20b80eb26c1d330a3aecb5cca5f7a187 mjpegtools-1.6.1.90-r1.ebuild 1878
+MD5 409ccaec1fbc6338b929d137cb107e75 mjpegtools-1.6.1.91.ebuild 1931
+MD5 ec08659600465af5dba80dec81f38d15 mjpegtools-1.6.1.ebuild 2416
+MD5 8ddc4d9512dfb01b6325d5c56b37fc92 mjpegtools-1.6.1.92.ebuild 2121
 MD5 97f9f596b801a8b4741b249f5a40a8e9 mjpegtools-1.6.1.93.ebuild 2131
-MD5 07856f6e62737ed42362d6fc58ad1e85 mjpegtools-1.6.2-r1.ebuild 2508
 MD5 aa0ffb4f0f4b0285f36d049f165995ed mjpegtools-1.6.2.ebuild 2150
-MD5 41f7f2da5ee7f66ef90bc15f55ddf645 mjpegtools-1.6.0-r7.ebuild 2866
-MD5 8ddc4d9512dfb01b6325d5c56b37fc92 mjpegtools-1.6.1.92.ebuild 2121
-MD5 19019f518ce8a08ae8c6ceb797d98b4a ChangeLog 10113
-MD5 c9bb82e3c4de92ad8ed6ce7470250e6b metadata.xml 180
 MD5 9d67976a581eca8b2eb5ebc80b07a376 mjpegtools-1.6.1.90-r2.ebuild 2192
-MD5 ec08659600465af5dba80dec81f38d15 mjpegtools-1.6.1.ebuild 2416
-MD5 6f4bc7cb8bdf27f1ba2d5a69e8fff635 files/mjpegtools-1.6.2-fPIC.patch 555
+MD5 a97cddacfad6eae6df3438c976f544b7 mjpegtools-1.6.2-r1.ebuild 2519
+MD5 94b45a7608327840f696deb03ebc5ffc files/1.6.0-r7-ppc.patch 443
+MD5 961944a5d3c12bdac7baf7d12ea995d7 files/digest-mjpegtools-1.6.0-r7 147
+MD5 4a594198579130cfe453fffb532b2aef files/digest-mjpegtools-1.6.1 147
 MD5 0a37dfb174825ed9a9aeee24b8e3da84 files/digest-mjpegtools-1.6.1.90-r1 72
-MD5 0a37dfb174825ed9a9aeee24b8e3da84 files/digest-mjpegtools-1.6.1.90-r2 72
+MD5 acf58bbe360d5fdd1242419be02ef981 files/digest-mjpegtools-1.6.1.91 72
 MD5 0d5f90e8ac4023e403bf79d2e14314cb files/mjpegtools-1.6.0-gcc3.patch 5086
-MD5 cbcc90f9de3aaf0ac12aa6bd1c4db025 files/no-x11-lib-2.patch 469
+MD5 81c49bb48a8d8e3ea4eb360811c01f67 files/no-x11-lib.patch 497
 MD5 6f4bc7cb8bdf27f1ba2d5a69e8fff635 files/mjpegtools-1.6.1.91-fPIC.patch 555
-MD5 6f4bc7cb8bdf27f1ba2d5a69e8fff635 files/mjpegtools-1.6.1.92-fPIC.patch 555
-MD5 4a594198579130cfe453fffb532b2aef files/digest-mjpegtools-1.6.1 147
-MD5 094ac8c3e42a24141ae45bfa0d5d029d files/digest-mjpegtools-1.6.2 69
-MD5 961944a5d3c12bdac7baf7d12ea995d7 files/digest-mjpegtools-1.6.0-r7 147
-MD5 acf58bbe360d5fdd1242419be02ef981 files/digest-mjpegtools-1.6.1.91 72
 MD5 787b556d11610020108eae81c18d66a9 files/digest-mjpegtools-1.6.1.92 72
 MD5 f27165f55fa5a3a8f582b362a1331074 files/digest-mjpegtools-1.6.1.93 72
-MD5 094ac8c3e42a24141ae45bfa0d5d029d files/digest-mjpegtools-1.6.2-r1 69
+MD5 094ac8c3e42a24141ae45bfa0d5d029d files/digest-mjpegtools-1.6.2 69
+MD5 6f4bc7cb8bdf27f1ba2d5a69e8fff635 files/mjpegtools-1.6.2-fPIC.patch 555
+MD5 6f4bc7cb8bdf27f1ba2d5a69e8fff635 files/mjpegtools-1.6.1.92-fPIC.patch 555
 MD5 6f4bc7cb8bdf27f1ba2d5a69e8fff635 files/mjpegtools-1.6.1.93-fPIC.patch 555
-MD5 81c49bb48a8d8e3ea4eb360811c01f67 files/no-x11-lib.patch 497
-MD5 94b45a7608327840f696deb03ebc5ffc files/1.6.0-r7-ppc.patch 443
+MD5 0a37dfb174825ed9a9aeee24b8e3da84 files/digest-mjpegtools-1.6.1.90-r2 72
+MD5 094ac8c3e42a24141ae45bfa0d5d029d files/digest-mjpegtools-1.6.2-r1 69
+MD5 cbcc90f9de3aaf0ac12aa6bd1c4db025 files/no-x11-lib-2.patch 469
diff --git a/media-video/mjpegtools/metadata.xml b/media-video/mjpegtools/metadata.xml
index 9c40384d9ae5..f026b702cf25 100644
--- a/media-video/mjpegtools/metadata.xml
+++ b/media-video/mjpegtools/metadata.xml
@@ -3,4 +3,8 @@
 <pkgmetadata>
 <herd>video</herd>
 <herd>media-tv</herd>
+<maintainer>
+  <email>media-video@gentoo.org</email>
+  <email>media-tv@gentoo.org</email>
+</maintainer>
 </pkgmetadata>
diff --git a/media-video/mjpegtools/mjpegtools-1.6.2-r1.ebuild b/media-video/mjpegtools/mjpegtools-1.6.2-r1.ebuild
index 02953ddf3bf3..74dca5c26d30 100644
--- a/media-video/mjpegtools/mjpegtools-1.6.2-r1.ebuild
+++ b/media-video/mjpegtools/mjpegtools-1.6.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-1.6.2-r1.ebuild,v 1.5 2004/04/15 10:23:01 swtaylor Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-1.6.2-r1.ebuild,v 1.6 2004/04/19 06:43:50 mholzer Exp $
 
 inherit flag-o-matic gcc eutils
 
@@ -49,7 +49,7 @@ src_compile() {
 	myconf="${myconf} `use_enable x86 cmov-extensions`"
 
 	# Fix for Via C3-1, see #30345
-	grep -q cmov /proc/cpuinfo || myconf="${myconf} --disable-cmov"
+	grep -q cmov /proc/cpuinfo || myconf="${myconf} --enable-cmov-extension=no"
 
 	if [ "`use dv`" ] ; then
 		myconf="${myconf} --with-dv=/usr"