1.7 stable on amd64 and x86, fixes #93821. new stable upstream version added, fixes #92904

Package-Manager: portage-2.0.51.22-r1

7 files changed, 32 insertions, 41 deletions

diff --git a/media-video/dvgrab/ChangeLog b/media-video/dvgrab/ChangeLog
index 5ad6e15ad733..6dc6dc7fd4bc 100644
--- a/media-video/dvgrab/ChangeLog
+++ b/media-video/dvgrab/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/dvgrab
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/dvgrab/ChangeLog,v 1.8 2005/01/22 12:53:24 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/dvgrab/ChangeLog,v 1.9 2005/05/25 18:27:46 luckyduck Exp $
+
+*dvgrab-1.8 (25 May 2005)
+
+  25 May 2005; Jan Brinkmann <luckyduck@gentoo.org> -files/dvgrab_gcc34_fix,
+  -dvgrab-1.5.ebuild, dvgrab-1.7.ebuild, +dvgrab-1.8.ebuild:
+  1.7 stable on amd64 and x86, fixes #93821. new stable upstream version
+  added, fixes #92904
 
   22 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org> dvgrab-1.7.ebuild:
   updated dependency. fixes #79073
diff --git a/media-video/dvgrab/Manifest b/media-video/dvgrab/Manifest
index e5a2bd554e52..7f1173a5611d 100644
--- a/media-video/dvgrab/Manifest
+++ b/media-video/dvgrab/Manifest
@@ -1,7 +1,16 @@
-MD5 e014cc7c2ab9a68bdf5db0bb94ebf135 dvgrab-1.5.ebuild 1020
-MD5 d05139c8ce8458f0b82cef8517a0c241 dvgrab-1.7.ebuild 1027
-MD5 780127410a5144bfe851df4232020f98 ChangeLog 1257
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 2d26b1d53af75b6a768b59af131f14c1 dvgrab-1.8.ebuild 898
+MD5 c0a0deba62c29da321d70e20c22923d6 dvgrab-1.7.ebuild 921
+MD5 29841b51f87e09fb346df8e5b3861047 ChangeLog 1518
 MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225
-MD5 ec8a599b8a5508fbe911ca55c2e18b4d files/digest-dvgrab-1.5 62
 MD5 db7e9be0f32a0c3572d08c1576fa69ad files/digest-dvgrab-1.7 62
-MD5 a08ba987defdbb8b7889fb778ef01033 files/dvgrab_gcc34_fix 383
+MD5 3670e0aa1ecf6c4c161d949b330c59b6 files/digest-dvgrab-1.8 62
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iD8DBQFClMPB06ebR+OMO78RAqDNAJ4jfD5w1qq3VVf1iGiX3En3WfXMdQCfQiJQ
+nu809O1/bnWNbPmU+aTldOo=
+=KXVf
+-----END PGP SIGNATURE-----
diff --git a/media-video/dvgrab/dvgrab-1.7.ebuild b/media-video/dvgrab/dvgrab-1.7.ebuild
index d327d4ff9c86..c2478cdf9d46 100644
--- a/media-video/dvgrab/dvgrab-1.7.ebuild
+++ b/media-video/dvgrab/dvgrab-1.7.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-video/dvgrab/dvgrab-1.7.ebuild,v 1.3 2005/01/22 12:53:24 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/dvgrab/dvgrab-1.7.ebuild,v 1.4 2005/05/25 18:27:46 luckyduck Exp $
 
 inherit eutils
 
@@ -11,7 +11,7 @@ LICENSE="GPL-2"
 IUSE="jpeg quicktime"
 
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="x86 amd64"
 
 DEPEND="sys-libs/libavc1394
 	>=media-libs/libdv-0.102
@@ -23,13 +23,7 @@ DEPEND="sys-libs/libavc1394
 # (-ldl -lglib)
 #	quicktime? ( virtual/quicktime )"
 
-src_compile() {
-	econf ${myconf} || die "./configure failed"
-	emake || die "make failed"
-}
-
 src_install () {
 	make DESTDIR=${D} install || die "make install failed"
-	dodoc AUTHORS COPYING ChangeLog README INSTALL TODO NEWS \
-		|| die "dodoc failed"
+	dodoc AUTHORS ChangeLog README INSTALL TODO NEWS || die "dodoc failed"
 }
diff --git a/media-video/dvgrab/dvgrab-1.5.ebuild b/media-video/dvgrab/dvgrab-1.8.ebuild
index ef367288bd3e..60d3a48fdba8 100644
--- a/media-video/dvgrab/dvgrab-1.5.ebuild
+++ b/media-video/dvgrab/dvgrab-1.8.ebuild
@@ -1,20 +1,20 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/dvgrab/dvgrab-1.5.ebuild,v 1.6 2005/01/20 13:44:33 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/dvgrab/dvgrab-1.8.ebuild,v 1.1 2005/05/25 18:27:46 luckyduck Exp $
 
 inherit eutils
 
 DESCRIPTION="Digital Video (DV) grabber for GNU/Linux"
 HOMEPAGE="http://kino.schirmacher.de/"
-SRC_URI="http://kino.schirmacher.de/filemanager/download/20/${P}.tar.gz"
-LICENSE="GPL-2"
-IUSE="jpeg quicktime"
+SRC_URI="mirror://sourceforge/kino/${P}.tar.gz"
 
+LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~amd64"
+IUSE="jpeg quicktime"
 
 DEPEND="sys-libs/libavc1394
-	<=media-libs/libdv-0.102
+	>=media-libs/libdv-0.102
 	jpeg? ( media-libs/jpeg )
 	quicktime? ( media-libs/libquicktime )"
 
@@ -23,15 +23,7 @@ DEPEND="sys-libs/libavc1394
 # (-ldl -lglib)
 #	quicktime? ( virtual/quicktime )"
 
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	epatch ${FILESDIR}/dvgrab_gcc34_fix || die
-}
-
 src_install () {
 	make DESTDIR=${D} install || die "make install failed"
-	dodoc AUTHORS COPYING ChangeLog README INSTALL TODO NEWS \
-		|| die "dodoc failed"
+	dodoc AUTHORS ChangeLog README INSTALL TODO NEWS || die "dodoc failed"
 }
diff --git a/media-video/dvgrab/files/digest-dvgrab-1.5 b/media-video/dvgrab/files/digest-dvgrab-1.5
deleted file mode 100644
index 878d637ad6a2..000000000000
--- a/media-video/dvgrab/files/digest-dvgrab-1.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1bddb6bcda3835d96b96b5c440991114 dvgrab-1.5.tar.gz 152654
diff --git a/media-video/dvgrab/files/digest-dvgrab-1.8 b/media-video/dvgrab/files/digest-dvgrab-1.8
new file mode 100644
index 000000000000..2f9ec09aee9a
--- /dev/null
+++ b/media-video/dvgrab/files/digest-dvgrab-1.8
@@ -0,0 +1 @@
+MD5 a971b283a83c7a93d882ac1d7f9c8bac dvgrab-1.8.tar.gz 163695
diff --git a/media-video/dvgrab/files/dvgrab_gcc34_fix b/media-video/dvgrab/files/dvgrab_gcc34_fix
deleted file mode 100644
index aaf4c5859481..000000000000
--- a/media-video/dvgrab/files/dvgrab_gcc34_fix
+++ /dev/null
@@ -1,11 +0,0 @@
---- dvgrab-1.5/work/dvgrab-1.5/ieee1394io.h	2004-01-04 21:46:21.000000000 +0000
-+++ dvgrab-1.5_patched/work/dvgrab-1.5/ieee1394io.h	2004-07-31 18:50:28.246428088 +0100
-@@ -33,7 +33,7 @@
- 
- class IEEE1394Reader
- {
--private:
-+protected:
- 	/// the number of frames that had to be thrown away because
- 	/// our inFrames queue did not contain available frames
- 	static int droppedFrames;