Correct dependency to gtk+-2, Bug #150344. Changed configure-argument for libdv to actually work :).

Package-Manager: portage-2.1.2_rc1-r3

3 files changed, 20 insertions, 16 deletions

diff --git a/media-video/mjpegtools/ChangeLog b/media-video/mjpegtools/ChangeLog
index adbd1899ace7..c0ef92a94e10 100644
--- a/media-video/mjpegtools/ChangeLog
+++ b/media-video/mjpegtools/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/mjpegtools
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/ChangeLog,v 1.121 2006/11/03 16:07:48 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/ChangeLog,v 1.122 2006/11/03 16:27:53 zzam Exp $
+
+  03 Nov 2006; Matthias Schwarzott <zzam@gentoo.org>
+  mjpegtools-1.8.0-r1.ebuild:
+  Correct dependency to gtk+-2, Bug #150344. Changed configure-argument for
+  libdv to actually work :).
 
   03 Nov 2006; Matthias Schwarzott <zzam@gentoo.org>
   mjpegtools-1.8.0-r1.ebuild:
diff --git a/media-video/mjpegtools/Manifest b/media-video/mjpegtools/Manifest
index 3ea7299c93ee..0452142fab08 100644
--- a/media-video/mjpegtools/Manifest
+++ b/media-video/mjpegtools/Manifest
@@ -23,14 +23,14 @@ RMD160 2d3d55fb7561a9c0ceeb7ce880953cb12662489c files/mjpegtools-1.8.0-pkg-confi
 SHA256 3b26122803c1ea805534308137323ee119fbc29777fa4a588ebe6dade0a8d490 files/mjpegtools-1.8.0-pkg-config.patch 423
 DIST mjpegtools-1.8.0.tar.gz 1475998 RMD160 4d97a6a721f29223975605e2a5e645b4d7d129b5 SHA1 e11d68298a64b52f98724dbf3fd14f168e140290 SHA256 d841575c72cd0e587c1bab703d0906e3d23bf428424000557739cf5d6097209a
 DIST mjpegtools-m4-1.tar.bz2 4547 RMD160 b81b89bb6364023606a1d3ca9519e143fe053ab4 SHA1 4c69f9918dcc56fc544fef9af9aaed968da1ae67 SHA256 10de1e206ee9c84aae111e95f655ad9394be749bfed01d337f7ff9a983aab522
-EBUILD mjpegtools-1.8.0-r1.ebuild 3328 RMD160 ce594b517b6a5c9e20b381aeb9555f601f945f91 SHA1 1e86d6e6292a719c772ea9eedbce798ddc8af0d5 SHA256 7ce05f8a776f9997d647717d1b4fbff778973ddbb2cb6bcb170cfad8e136d00d
-MD5 556e609e7ddb2031194c9524de637e71 mjpegtools-1.8.0-r1.ebuild 3328
-RMD160 ce594b517b6a5c9e20b381aeb9555f601f945f91 mjpegtools-1.8.0-r1.ebuild 3328
-SHA256 7ce05f8a776f9997d647717d1b4fbff778973ddbb2cb6bcb170cfad8e136d00d mjpegtools-1.8.0-r1.ebuild 3328
-MISC ChangeLog 21542 RMD160 e4a85f9066ce4f9368e2628f3217393930bab5b9 SHA1 8815a4b1429d9eb6951a7b97eae45e717522ae09 SHA256 f90e3ccbe9f1470a5fac787e376351a6df9b1a18d1a534898af1960c8ea3aaac
-MD5 0e6816481837d94c33390b25a7bcf98a ChangeLog 21542
-RMD160 e4a85f9066ce4f9368e2628f3217393930bab5b9 ChangeLog 21542
-SHA256 f90e3ccbe9f1470a5fac787e376351a6df9b1a18d1a534898af1960c8ea3aaac ChangeLog 21542
+EBUILD mjpegtools-1.8.0-r1.ebuild 3309 RMD160 b72c395ba7135802fdedae5a3597bf66f40b2433 SHA1 174f4c8e3bcac987ab3f8b691511d23810b767f5 SHA256 5c398a88ef4955738b3f88a75c9e09b175f522c6412bd2f2f5a5c60f8c5c838a
+MD5 92ccc0b116ccbc9275bec99c0aaa8df7 mjpegtools-1.8.0-r1.ebuild 3309
+RMD160 b72c395ba7135802fdedae5a3597bf66f40b2433 mjpegtools-1.8.0-r1.ebuild 3309
+SHA256 5c398a88ef4955738b3f88a75c9e09b175f522c6412bd2f2f5a5c60f8c5c838a mjpegtools-1.8.0-r1.ebuild 3309
+MISC ChangeLog 21731 RMD160 057a0a5b10a59e733172d2a453cee1ca7338d207 SHA1 25e5d38a9570a5c0d1bce6d6f1303f0d1e0796b8 SHA256 18f1cb13a766b52787a2f9688f110e0073824a388f7667b80814516c48a6131f
+MD5 62e5a7fd2bf4df3456732a9933eb3143 ChangeLog 21731
+RMD160 057a0a5b10a59e733172d2a453cee1ca7338d207 ChangeLog 21731
+SHA256 18f1cb13a766b52787a2f9688f110e0073824a388f7667b80814516c48a6131f ChangeLog 21731
 MISC metadata.xml 311 RMD160 5d2d2fac1a97018f75e5ff1e8e7c90fb02511cb9 SHA1 228093feb5989936d0480ac2bc543df959b06dfa SHA256 74869f2267904c0a7409e16cc0d2e54f41b186683c4f5bb6e0127b275e66b4b0
 MD5 fe49014257499366bdc6903a9aa33fe5 metadata.xml 311
 RMD160 5d2d2fac1a97018f75e5ff1e8e7c90fb02511cb9 metadata.xml 311
@@ -41,7 +41,7 @@ SHA256 4b2cc5ce3875c7bd8e06e9dda7c0e3cc89ccd78dc4c8e163c42066537a25d175 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFS2lft2vP6XvVdOcRAkpQAKCrsLl+Iu5Hx149WN/AhvGU7ecLKwCgkm6t
-fgL6+CQYRxouW68+0Tukrpc=
-=RoIA
+iD8DBQFFS24Qt2vP6XvVdOcRAgmqAKDhSFeS+pQiAOt+GA2tdKqLb22v2ACfVNTz
+iAkj3CoFKyDFAoNzCYNcVFM=
+=jaq0
 -----END PGP SIGNATURE-----
diff --git a/media-video/mjpegtools/mjpegtools-1.8.0-r1.ebuild b/media-video/mjpegtools/mjpegtools-1.8.0-r1.ebuild
index 9f18bc48f2ed..27946f16d294 100644
--- a/media-video/mjpegtools/mjpegtools-1.8.0-r1.ebuild
+++ b/media-video/mjpegtools/mjpegtools-1.8.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-1.8.0-r1.ebuild,v 1.21 2006/11/03 16:07:48 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-1.8.0-r1.ebuild,v 1.22 2006/11/03 16:27:53 zzam Exp $
 
 WANT_AUTOMAKE="latest"
 WANT_AUTOCONF="latest"
@@ -19,8 +19,7 @@ IUSE="gtk dv quicktime sdl X yv12 3dnow mmx sse v4l dga png"
 
 RDEPEND="media-libs/jpeg
 	x86? ( mmx? ( >=media-libs/jpeg-mmx-0.1.6 ) )
-	gtk? ( =x11-libs/gtk+-1.2*
-		=dev-libs/glib-1.2* )
+	gtk? ( >=x11-libs/gtk+-2.0 )
 	dv? ( >=media-libs/libdv-0.99 )
 	quicktime? ( virtual/quicktime )
 	png? ( media-libs/libpng )
@@ -100,7 +99,7 @@ src_compile() {
 		$(use_with v4l) \
 		$(use_with gtk) \
 		$(use_with sdl) \
-		$(use_with dv dv /usr) \
+		$(use_with dv libdv /usr) \
 		--enable-largefile \
 		${myconf} || die "configure failed"