Fix check for xv useflag on xorg-x11 so that it's done only for 6.x series, fixes bug #135761. Fix quoting, use emake for installing, add patch to respect CFLAGS and not add extra CFLAGS that are unrequested.

(Portage version: 2.1.1_pre1-r5)

4 files changed, 54 insertions, 19 deletions

diff --git a/media-libs/libquicktime/ChangeLog b/media-libs/libquicktime/ChangeLog
index 6f28a456d844..c292aff06b56 100644
--- a/media-libs/libquicktime/ChangeLog
+++ b/media-libs/libquicktime/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/libquicktime
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libquicktime/ChangeLog,v 1.53 2006/04/27 23:09:48 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libquicktime/ChangeLog,v 1.54 2006/06/29 18:09:29 flameeyes Exp $
+
+  29 Jun 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/libquicktime-0.9.7-unrice.patch, libquicktime-0.9.4.ebuild,
+  libquicktime-0.9.7-r1.ebuild:
+  Fix check for xv useflag on xorg-x11 so that it's done only for 6.x series,
+  fixes bug #135761. Fix quoting, use emake for installing, add patch to
+  respect CFLAGS and not add extra CFLAGS that are unrequested.
 
   27 Apr 2006; Marien Zwart <marienz@gentoo.org>
   files/digest-libquicktime-0.9.2, files/digest-libquicktime-0.9.4,
diff --git a/media-libs/libquicktime/files/libquicktime-0.9.7-unrice.patch b/media-libs/libquicktime/files/libquicktime-0.9.7-unrice.patch
new file mode 100644
index 000000000000..825b98c96219
--- /dev/null
+++ b/media-libs/libquicktime/files/libquicktime-0.9.7-unrice.patch
@@ -0,0 +1,27 @@
+Index: libquicktime-0.9.7/configure.ac
+===================================================================
+--- libquicktime-0.9.7.orig/configure.ac
++++ libquicktime-0.9.7/configure.ac
+@@ -581,11 +581,11 @@ dnl
+ dnl Build CFLAGS
+ dnl
+ 
+-COMMON_CFLAGS="-finline-functions -Wall -Winline"
++COMMON_CFLAGS="-Wall -Winline"
+ 
+ dnl Optimizing flags
+ 
+-LQT_OPT_CFLAGS($host_cpu, ["-O3 -funroll-all-loops -fomit-frame-pointer"])
++LQT_OPT_CFLAGS($host_cpu)
+ 
+ AH_TEMPLATE([NDEBUG],
+             [Causes debug code to e removed])
+@@ -594,7 +594,7 @@ if test x$LQT_DEBUG != xtrue; then
+ AC_DEFINE(NDEBUG)
+ fi
+ 
+-CFLAGS="$OPT_CFLAGS $COMMON_CFLAGS"
++CFLAGS="$CFLAGS $OPT_CFLAGS $COMMON_CFLAGS"
+ 
+ # -L is required so that linker can find libquicktime when DESTDIR is used.
+ # libtool bug, documented at: http://www.geocrawler.com/mail/thread.php3?subject=install+phase+fails&list=404
diff --git a/media-libs/libquicktime/libquicktime-0.9.4.ebuild b/media-libs/libquicktime/libquicktime-0.9.4.ebuild
index e2eb558f1ef8..498446987048 100644
--- a/media-libs/libquicktime/libquicktime-0.9.4.ebuild
+++ b/media-libs/libquicktime/libquicktime-0.9.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libquicktime/libquicktime-0.9.4.ebuild,v 1.10 2005/12/26 12:34:58 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libquicktime/libquicktime-0.9.4.ebuild,v 1.11 2006/06/29 18:09:29 flameeyes Exp $
 
 inherit libtool eutils
 
@@ -28,7 +28,7 @@ DEPEND=">=sys-apps/sed-4.0.5
 PROVIDE="virtual/quicktime"
 
 pkg_setup() {
-	if has_version x11-base/xorg-x11 && ! built_with_use x11-base/xorg-x11 opengl; then
+	if has_version '=x11-base/xorg-x11-6*' && ! built_with_use x11-base/xorg-x11 xv; then
 		die "You need xv support to compile ${PN}."
 	fi
 }
@@ -36,10 +36,10 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A}
 
-	cd ${S}
-	epatch ${FILESDIR}/${P}-cflags.patch
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-cflags.patch"
 
-	sed -i "s:\(have_libavcodec=\)true:\1false:g" configure.ac
+	sed -i -e "s:\(have_libavcodec=\)true:\1false:g" configure.ac
 
 	ebegin "Regenerating configure script..."
 	autoconf || die
@@ -50,10 +50,10 @@ src_unpack() {
 
 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)
 
 	emake -j1 || die "make failed"
 }
diff --git a/media-libs/libquicktime/libquicktime-0.9.7-r1.ebuild b/media-libs/libquicktime/libquicktime-0.9.7-r1.ebuild
index f6ec279e186a..32ca9390ebdb 100644
--- a/media-libs/libquicktime/libquicktime-0.9.7-r1.ebuild
+++ b/media-libs/libquicktime/libquicktime-0.9.7-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-libs/libquicktime/libquicktime-0.9.7-r1.ebuild,v 1.9 2006/04/02 11:15:03 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libquicktime/libquicktime-0.9.7-r1.ebuild,v 1.10 2006/06/29 18:09:29 flameeyes Exp $
 
 inherit libtool eutils autotools
 
@@ -35,7 +35,7 @@ DEPEND=">=sys-apps/sed-4.0.5
 PROVIDE="virtual/quicktime"
 
 pkg_setup() {
-	if has_version x11-base/xorg-x11 && ! built_with_use x11-base/xorg-x11 opengl; then
+	if has_version '=x11-base/xorg-x11-6*' && ! built_with_use x11-base/xorg-x11 xv; then
 		die "You need xv support to compile ${PN}."
 	fi
 }
@@ -43,11 +43,12 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A}
 
-	cd ${S}
-	sed -i "s:\(have_libavcodec=\)true:\1false:g" configure.ac
+	cd "${S}"
+	sed -i -e "s:\(have_libavcodec=\)true:\1false:g" configure.ac
 	epatch "${FILESDIR}/${P}-dv.patch"
+	epatch "${FILESDIR}/${P}-unrice.patch"
 
-	eautoconf
+	AT_M4DIR="m4" eautoreconf
 	elibtoolize
 }
 
@@ -58,13 +59,13 @@ src_compile() {
 		$(use_enable ieee1394 firewire) \
 		$(use_with dv libdv) \
 		$(use_with X x) \
-		--without-cpuflags
+		--without-cpuflags || die "econf failed"
 
-	emake || die "make failed"
+	emake || die "emake failed"
 }
 
 src_install() {
-	make DESTDIR=${D} install || die "make install failed"
+	emake DESTDIR="${D}" install || die "emake install failed"
 
 	# Compatibility with software that uses quicktime prefix, but
 	# don't do that when building for Darwin/MacOS