Fix patch to detect libXv properly and trim some DEPENDs.

4 files changed, 26 insertions, 12 deletions

diff --git a/media-libs/libdv/ChangeLog b/media-libs/libdv/ChangeLog
index 08fecdbd0d3f..b0da53d0dd55 100644
--- a/media-libs/libdv/ChangeLog
+++ b/media-libs/libdv/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/libdv
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libdv/ChangeLog,v 1.18 2003/08/21 21:34:21 max Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdv/ChangeLog,v 1.19 2003/08/25 18:47:05 max Exp $
+
+  25 Aug 2003; Max Kalika <max@gentoo.org> libdv-0.99-r1.ebuild,
+  files/libdv-0.99-disablegtk.patch:
+  Fix patch to detect libXv properly. Remove dependency on pkgconfig. Remove
+  dependency on glib (pulled by gtk+ already). Add debug to IUSE.
 
   21 Aug 2003; Max Kalika <max@gentoo.org> libdv-0.99-r1.ebuild:
   Use more portage internals.
diff --git a/media-libs/libdv/Manifest b/media-libs/libdv/Manifest
index aa93a0092530..850a491b1a4b 100644
--- a/media-libs/libdv/Manifest
+++ b/media-libs/libdv/Manifest
@@ -1,10 +1,10 @@
 MD5 55706adc4e35f4c4402d2b93bbe1379f libdv-0.9.5-r1.ebuild 805
 MD5 d007c88d554ddc43791b174155f90069 libdv-0.99.ebuild 923
 MD5 5e11191017e9473641ac1a378b2afb96 libdv-0.98.ebuild 1049
-MD5 7077bd64f60f0a41519db4e67ac99435 ChangeLog 2497
+MD5 9d356048b2ce7dc32124cc9808c77ae1 ChangeLog 2743
 MD5 2fdf7d119ea8a49fe28913e77b44dfc0 metadata.xml 333
-MD5 687ca7a25d7d99a50b31fc73232fdbf6 libdv-0.99-r1.ebuild 1104
-MD5 65d548197c98dd25eca308b025f0cc07 files/libdv-0.99-disablegtk.patch 2948
+MD5 a397f28cb4fecb3e3a00cf354453b632 libdv-0.99-r1.ebuild 1060
+MD5 7c723a6fa5d934edd24e19d114121d49 files/libdv-0.99-disablegtk.patch 3302
 MD5 a880f41dce1a820076b48ca914ac5e8b files/digest-libdv-0.9.5-r1 63
 MD5 d79d611e171b21dfe5e1f5d1534576e5 files/digest-libdv-0.98 62
 MD5 108d55b61056533255db29dbed106beb files/digest-libdv-0.99 123
diff --git a/media-libs/libdv/files/libdv-0.99-disablegtk.patch b/media-libs/libdv/files/libdv-0.99-disablegtk.patch
index 80ab5200dd83..b3329d831182 100644
--- a/media-libs/libdv/files/libdv-0.99-disablegtk.patch
+++ b/media-libs/libdv/files/libdv-0.99-disablegtk.patch
@@ -1,5 +1,6 @@
---- libdv-0.99/Makefile.in	2003-05-13 10:47:47.000000000 +0200
-+++ libdv-0.99/Makefile.in	2003-05-13 10:47:54.000000000 +0200
+diff -ruN libdv-0.99/Makefile.in libdv-0.99/Makefile.in
+--- libdv-0.99/Makefile.in	2003-01-02 09:40:44.000000000 -0800
++++ libdv-0.99/Makefile.in	2003-08-25 11:16:40.000000000 -0700
 @@ -101,7 +101,7 @@
  am__include = @am__include@
  am__quote = @am__quote@
@@ -9,8 +10,9 @@
  
  AUX_DIST = $(ac_aux_dir)/config.guess \
                                     $(ac_aux_dir)/config.sub \
---- libdv-0.99/configure	2003-05-20 11:01:08.000000000 +0200
-+++ libdv-0.99/configure	2003-05-20 11:03:23.000000000 +0200
+diff -ruN libdv-0.99/configure libdv-0.99/configure
+--- libdv-0.99/configure	2003-01-02 09:40:46.000000000 -0800
++++ libdv-0.99/configure	2003-08-25 11:17:30.000000000 -0700
 @@ -7651,6 +7651,7 @@
  
  
@@ -35,6 +37,15 @@
  
  
  
+@@ -8362,7 +8367,7 @@
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lXv $GTK_LIBS $LIBS"
++LIBS="-lXv -L/usr/X11R6/lib $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+ #include "confdefs.h"
 @@ -9978,8 +9983,11 @@
  
  
diff --git a/media-libs/libdv/libdv-0.99-r1.ebuild b/media-libs/libdv/libdv-0.99-r1.ebuild
index ef5f950f135c..4050a4cd08bc 100644
--- a/media-libs/libdv/libdv-0.99-r1.ebuild
+++ b/media-libs/libdv/libdv-0.99-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libdv/libdv-0.99-r1.ebuild,v 1.2 2003/08/21 21:34:21 max Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdv/libdv-0.99-r1.ebuild,v 1.3 2003/08/25 18:47:05 max Exp $
 
 DESCRIPTION="Software codec for dv-format video (camcorders etc)."
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
@@ -9,12 +9,10 @@ HOMEPAGE="http://libdv.sourceforge.net/"
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64"
-IUSE="sdl gtk xv"
+IUSE="debug gtk sdl xv"
 
 DEPEND="dev-libs/popt
-	dev-util/pkgconfig
 	gtk? ( =x11-libs/gtk+-1.2* )
-	gtk? ( =dev-libs/glib-1.2* )
 	sdl? ( >=media-libs/libsdl-1.2.4.20020601 )
 	xv? ( virtual/x11 )"