New revision with patch to disable libdv support as per bug #108570. Also, add X useflag to be able to build without X.

(Portage version: 2.0.53_rc5)

5 files changed, 52 insertions, 33 deletions

diff --git a/media-libs/libquicktime/ChangeLog b/media-libs/libquicktime/ChangeLog
index 4e7e8bb75790..a24b837fb9e8 100644
--- a/media-libs/libquicktime/ChangeLog
+++ b/media-libs/libquicktime/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-libs/libquicktime
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libquicktime/ChangeLog,v 1.41 2005/09/17 19:42:43 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libquicktime/ChangeLog,v 1.42 2005/10/16 00:27:30 flameeyes Exp $
+
+*libquicktime-0.9.7-r1 (16 Oct 2005)
+
+  16 Oct 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +files/libquicktime-0.9.7-dv.patch, -libquicktime-0.9.7.ebuild,
+  +libquicktime-0.9.7-r1.ebuild:
+  New revision with patch to disable libdv support as per bug #108570. Also,
+  add X useflag to be able to build without X.
 
 *libquicktime-0.9.7 (26 May 2005)
 
diff --git a/media-libs/libquicktime/Manifest b/media-libs/libquicktime/Manifest
index fceabd59a35d..182da971bed1 100644
--- a/media-libs/libquicktime/Manifest
+++ b/media-libs/libquicktime/Manifest
@@ -1,25 +1,17 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 b4c78b88026393e1b3e1fefb26137865 libquicktime-0.9.3-r1.ebuild 1547
-MD5 04c6e7d4ccb20b4bd86e3f5052a2a115 libquicktime-0.9.2.ebuild 1575
 MD5 5b135e9cbb01911e359400b5fb231adf ChangeLog 6114
-MD5 def6c68178313a0e1dedc14f0e12cb93 libquicktime-0.9.4.ebuild 1469
-MD5 d498ff745fbea5fa6d87f64a5a666f68 libquicktime-0.9.7.ebuild 1462
-MD5 0f8ae380dc4d39b7695928351dcc9f06 libquicktime-0.9.6-r1.ebuild 1503
-MD5 955f56e990f8c32d705708b4cc4db089 metadata.xml 251
-MD5 6bfb85c4c74898adf195a803d4715b03 files/digest-libquicktime-0.9.4 70
-MD5 d8c28d6e35d353035732b91b0ab95234 files/libquicktime-0.9.6-cflags.patch 1806
-MD5 2945e87a4f7f7263e45ea3c392895011 files/digest-libquicktime-0.9.3-r1 70
 MD5 abf06ed2bfc6e4b130b44e3818ec0c99 files/digest-libquicktime-0.9.2 70
-MD5 7431f4892f67adb233bef504876078db files/libquicktime-0.9.2-amd64.patch 2861
+MD5 2945e87a4f7f7263e45ea3c392895011 files/digest-libquicktime-0.9.3-r1 70
+MD5 6bfb85c4c74898adf195a803d4715b03 files/digest-libquicktime-0.9.4 70
 MD5 c0abede6c55083f821fd971de2a17ef1 files/digest-libquicktime-0.9.6-r1 70
 MD5 665eeaef01d9cd6ccc580202630897be files/digest-libquicktime-0.9.7 70
+MD5 665eeaef01d9cd6ccc580202630897be files/digest-libquicktime-0.9.7-r1 70
+MD5 7431f4892f67adb233bef504876078db files/libquicktime-0.9.2-amd64.patch 2861
 MD5 a1721b9ba48b6453245fce4f3fe04e0b files/libquicktime-0.9.4-cflags.patch 1455
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDLHHSj5H05b2HAEkRAkklAKCI6hUxVRvoRd8VhsuISnVOCDw64wCgpRA2
-wrihXMxIH/m44/xPqIxV3SQ=
-=Gil/
------END PGP SIGNATURE-----
+MD5 d8c28d6e35d353035732b91b0ab95234 files/libquicktime-0.9.6-cflags.patch 1806
+MD5 71fde588b024e1d8c472afa0081010b9 files/libquicktime-0.9.7-dv.patch 651
+MD5 04c6e7d4ccb20b4bd86e3f5052a2a115 libquicktime-0.9.2.ebuild 1575
+MD5 b4c78b88026393e1b3e1fefb26137865 libquicktime-0.9.3-r1.ebuild 1547
+MD5 def6c68178313a0e1dedc14f0e12cb93 libquicktime-0.9.4.ebuild 1469
+MD5 0f8ae380dc4d39b7695928351dcc9f06 libquicktime-0.9.6-r1.ebuild 1503
+MD5 40029ac2047d1c5bf465399eb27270a0 libquicktime-0.9.7-r1.ebuild 1460
+MD5 955f56e990f8c32d705708b4cc4db089 metadata.xml 251
diff --git a/media-libs/libquicktime/files/digest-libquicktime-0.9.7 b/media-libs/libquicktime/files/digest-libquicktime-0.9.7-r1
index b5c7321c0223..b5c7321c0223 100644
--- a/media-libs/libquicktime/files/digest-libquicktime-0.9.7
+++ b/media-libs/libquicktime/files/digest-libquicktime-0.9.7-r1
diff --git a/media-libs/libquicktime/files/libquicktime-0.9.7-dv.patch b/media-libs/libquicktime/files/libquicktime-0.9.7-dv.patch
new file mode 100644
index 000000000000..d248d5613d52
--- /dev/null
+++ b/media-libs/libquicktime/files/libquicktime-0.9.7-dv.patch
@@ -0,0 +1,17 @@
+Index: libquicktime-0.9.7/configure.ac
+===================================================================
+--- libquicktime-0.9.7.orig/configure.ac
++++ libquicktime-0.9.7/configure.ac
+@@ -264,7 +264,11 @@ have_libdv="false"
+ 
+ LIBDV_REQUIRED="0.102"
+ 
+-PKG_CHECK_MODULES(LIBDV, libdv >= $LIBDV_REQUIRED, have_libdv="true", have_libdv="false")
++AC_ARG_WITH([libdv], AC_HELP_STRING([--with-libdv], [Build with libdv support (default: check)]))
++
++if test "x$with_libdv" != "xno"; then
++	PKG_CHECK_MODULES(LIBDV, libdv >= $LIBDV_REQUIRED, have_libdv="true", have_libdv="false")
++fi
+ AC_SUBST(LIBDV_REQUIRED)
+ AC_SUBST(LIBDV_LIBS)
+ AC_SUBST(LIBDV_CFLAGS)
diff --git a/media-libs/libquicktime/libquicktime-0.9.7.ebuild b/media-libs/libquicktime/libquicktime-0.9.7-r1.ebuild
index 086d119408e0..13ee29337561 100644
--- a/media-libs/libquicktime/libquicktime-0.9.7.ebuild
+++ b/media-libs/libquicktime/libquicktime-0.9.7-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libquicktime/libquicktime-0.9.7.ebuild,v 1.2 2005/07/13 14:22:26 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libquicktime/libquicktime-0.9.7-r1.ebuild,v 1.1 2005/10/16 00:27:30 flameeyes Exp $
 
-inherit libtool eutils
+inherit libtool eutils autotools
 
 DESCRIPTION="A library based on quicktime4linux with extensions"
 HOMEPAGE="http://libquicktime.sourceforge.net/"
@@ -12,18 +12,19 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 
-IUSE="gtk jpeg mmx oggvorbis png dv ieee1394"
+IUSE="gtk jpeg mmx vorbis png dv ieee1394 X"
 
 DEPEND=">=sys-apps/sed-4.0.5
 	dv? ( media-libs/libdv )
 	gtk? ( =x11-libs/gtk+-1.2* )
 	png? ( media-libs/libpng )
 	jpeg? ( media-libs/jpeg )
-	oggvorbis? ( media-libs/libvorbis )
+	vorbis? ( media-libs/libvorbis )
 	ieee1394? (
 		sys-libs/libavc1394
 		sys-libs/libraw1394
 	)
+	X? ( virtual/x11 )
 	!virtual/quicktime"
 PROVIDE="virtual/quicktime"
 
@@ -38,21 +39,22 @@ src_unpack() {
 
 	cd ${S}
 	sed -i "s:\(have_libavcodec=\)true:\1false:g" configure.ac
-	ebegin "Regenerating configure script..."
-	autoconf || die
-	eend
+	epatch "${FILESDIR}/${P}-dv.patch"
 
+	eautoconf
 	elibtoolize
 }
 
 src_compile() {
 	econf --enable-shared \
-	      --enable-static \
-	      $(use_enable mmx) \
-	      $(use_enable gtk) \
-	      $(use_enable ieee1394 firewire)
+		--enable-static \
+		$(use_enable mmx) \
+		$(use_enable gtk) \
+		$(use_enable ieee1394 firewire) \
+		$(use_with dv libdv) \
+		$(use_with X x)
 
-	emake -j1 || die "make failed"
+	emake || die "make failed"
 }
 
 src_install() {