4 files changed, 17 insertions, 17 deletions
diff --git a/media-video/mpeg4ip/ChangeLog b/media-video/mpeg4ip/ChangeLog
index c6da57ae62e7..9dc26617b9bf 100644
--- a/media-video/mpeg4ip/ChangeLog
+++ b/media-video/mpeg4ip/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/mpeg4ip
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg4ip/ChangeLog,v 1.7 2004/05/21 03:52:12 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg4ip/ChangeLog,v 1.8 2004/06/01 15:25:04 tester Exp $
+
+  01 Jun 2004; <tester@gentoo.org> mpeg4ip-1.0.ebuild, mpeg4ip-1.1.ebuild:
+  only --disable-v4l2 is valid, fixes bug #52649, removed useless cruft from
+  pre-releases
 
 *mpeg4ip-1.1 (20 May 2004)
 
diff --git a/media-video/mpeg4ip/Manifest b/media-video/mpeg4ip/Manifest
index 9fde71aa9132..3b58557288b8 100644
--- a/media-video/mpeg4ip/Manifest
+++ b/media-video/mpeg4ip/Manifest
@@ -1,6 +1,6 @@
-MD5 421342fb3fd5d4feb920e0beb1cff103 ChangeLog 1635
+MD5 b79546362aeeb90c04e462e02c81aa24 mpeg4ip-1.0.ebuild 2235
+MD5 aa5c220c6150d2880ff821aafdb604c1 ChangeLog 1807
 MD5 1b1b7046bccf0f835f8e3c5b68063d8e metadata.xml 255
-MD5 4d0b9409924fbbc400377aafd9145d20 mpeg4ip-1.0.ebuild 2283
-MD5 6a521802d8bd4c2b4a81a0cf3d18b098 mpeg4ip-1.1.ebuild 1171
-MD5 a00452dc115e6e8ddb761e17ccfb0a5a files/digest-mpeg4ip-1.0 64
+MD5 aa20cc1c3b38e60d72bbc6d9647f963a mpeg4ip-1.1.ebuild 1132
 MD5 bf208b3fef7857814d19fd17e38cbd66 files/digest-mpeg4ip-1.1 64
+MD5 a00452dc115e6e8ddb761e17ccfb0a5a files/digest-mpeg4ip-1.0 64
diff --git a/media-video/mpeg4ip/mpeg4ip-1.0.ebuild b/media-video/mpeg4ip/mpeg4ip-1.0.ebuild
index 97679894c418..ead5f538da4a 100644
--- a/media-video/mpeg4ip/mpeg4ip-1.0.ebuild
+++ b/media-video/mpeg4ip/mpeg4ip-1.0.ebuild
@@ -1,14 +1,12 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg4ip/mpeg4ip-1.0.ebuild,v 1.5 2004/02/27 13:38:34 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg4ip/mpeg4ip-1.0.ebuild,v 1.6 2004/06/01 15:25:04 tester Exp $
 
 DESCRIPTION="MPEG 4 implementation library"
 
 HOMEPAGE="http://www.mpeg4ip.net/"
 
-PV2=`echo $PV | sed s/_rc/RC/`
-
-SRC_URI="mirror://sourceforge/${PN}/${PN}-${PV2}.tar.gz"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="MPL-1.1 LGPL-2 GPL-2 LGPL-2.1 BSD UCL MPEG4"
 
@@ -29,7 +27,7 @@ DEPEND="sys-devel/libtool
 		media-video/ffmpeg
 		!media-libs/faad2"
 
-S="${WORKDIR}/${PN}-${PV2}"
+S="${WORKDIR}/${P}"
 
 src_unpack() {
 	unpack ${A}
diff --git a/media-video/mpeg4ip/mpeg4ip-1.1.ebuild b/media-video/mpeg4ip/mpeg4ip-1.1.ebuild
index 78b7873920f3..1f3a41d91b17 100644
--- a/media-video/mpeg4ip/mpeg4ip-1.1.ebuild
+++ b/media-video/mpeg4ip/mpeg4ip-1.1.ebuild
@@ -1,21 +1,18 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg4ip/mpeg4ip-1.1.ebuild,v 1.1 2004/05/21 03:52:12 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg4ip/mpeg4ip-1.1.ebuild,v 1.2 2004/06/01 15:25:04 tester Exp $
 
 DESCRIPTION="MPEG 4 implementation library"
 
 HOMEPAGE="http://www.mpeg4ip.net/"
 
-PV2=`echo $PV | sed s/_rc/RC/`
-
-SRC_URI="mirror://sourceforge/${PN}/${PN}-${PV2}.tar.gz"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="MPL-1.1 LGPL-2 GPL-2 LGPL-2.1 BSD UCL MPEG4"
 
 SLOT="0"
 
 KEYWORDS="~x86 ~amd64"
-# not 64 bit safe yet
 
 IUSE="ipv6 mmx gtk v4l2"
 
@@ -29,7 +26,7 @@ DEPEND="sys-devel/libtool
 		media-video/ffmpeg
 		media-libs/libid3tag"
 
-S="${WORKDIR}/${PN}-${PV2}"
+S="${WORKDIR}/${P}"
 
 src_compile() {
 
@@ -38,8 +35,9 @@ src_compile() {
 	local myconf
 	myconf=" `use_enable ipv6`
 			`use_enable mmx`
-			`use_enable v4l2`
 			` use_enable ppc`"
+	use v4l2 || myconf="${myconf} --disable-v4l2"
+
 	use amd64 && myconf="$myconf --disable-mp4live" && \
 		ewarn "mp4live disabled on amd64"