Version bump. Added removal of blocking dir /usr/include/quicktime in pkg_preinst. Solves bug #128807.

(Portage version: 2.1.1_pre3-r1)

4 files changed, 100 insertions, 6 deletions

diff --git a/media-libs/libquicktime/ChangeLog b/media-libs/libquicktime/ChangeLog
index 3e16611326f0..f6b1d8f53d6e 100644
--- a/media-libs/libquicktime/ChangeLog
+++ b/media-libs/libquicktime/ChangeLog
@@ -1,6 +1,16 @@
 # 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.57 2006/07/15 18:13:14 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libquicktime/ChangeLog,v 1.58 2006/07/17 20:20:39 zypher Exp $
+
+*libquicktime-0.9.9 (29 Jun 2006)
+
+  17 Jul 2006; Marc Hildebrand <zypher@gentoo.org>
+  +libquicktime-0.9.9.ebuild:
+  version bump, removed some USE flags..
+
+  17 Jul 2006; Marc Hildebrand <zypher@gentoo.org>
+  libquicktime-0.9.7-r1.ebuild:
+  Added removal of /usr/include/quicktime ind pkg_preinst to solve bug #128807
 
   15 Jul 2006; Markus Rothe <corsair@gentoo.org>
   libquicktime-0.9.7-r1.ebuild:
diff --git a/media-libs/libquicktime/files/digest-libquicktime-0.9.9 b/media-libs/libquicktime/files/digest-libquicktime-0.9.9
new file mode 100644
index 000000000000..f515872f62a6
--- /dev/null
+++ b/media-libs/libquicktime/files/digest-libquicktime-0.9.9
@@ -0,0 +1,3 @@
+MD5 4ac23264f22a22ff013722aa9d188190 libquicktime-0.9.9.tar.gz 926280
+RMD160 c345f54d949f29a9f5be42ca5fbdc80be781a3d4 libquicktime-0.9.9.tar.gz 926280
+SHA256 b92f08e8e9a9e4be36dd5cdd4b1c5d31f0cc821569623b2f5f79b3e7ba8ed3da libquicktime-0.9.9.tar.gz 926280
diff --git a/media-libs/libquicktime/libquicktime-0.9.7-r1.ebuild b/media-libs/libquicktime/libquicktime-0.9.7-r1.ebuild
index bb52cf160e65..1c3b415b8505 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.13 2006/07/15 18:13:14 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libquicktime/libquicktime-0.9.7-r1.ebuild,v 1.14 2006/07/17 20:20:39 zypher Exp $
 
 inherit libtool eutils autotools
 
@@ -78,9 +78,14 @@ pkg_preinst() {
 		einfo "For compatibility with other quicktime libraries, ${PN} was"
 		einfo "going to create a /usr/include/quicktime symlink, but for some"
 		einfo "reason that is a directory on your system."
-		einfo "Please check that is empty, and remove it, or submit a bug"
-		einfo "telling us which package owns the directory."
-		die "/usr/include/quicktime is a directory."
+		if $(has_version =media-libs/libquicktime-0.9.4); then
+			einfo "It seems this directory belongs to libquicktime-0.9.4."
+			einfo "We'll delete that directory now."
+			rm -rvf /usr/include/quicktime
+	    else
+			einfo "Please check that is empty, and remove it, or submit a bug"
+			einfo "telling us which package owns the directory."
+			die "/usr/include/quicktime is a directory."
+	    fi
 	fi
 }
-
diff --git a/media-libs/libquicktime/libquicktime-0.9.9.ebuild b/media-libs/libquicktime/libquicktime-0.9.9.ebuild
new file mode 100644
index 000000000000..8833f9750067
--- /dev/null
+++ b/media-libs/libquicktime/libquicktime-0.9.9.ebuild
@@ -0,0 +1,76 @@
+# 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.9.ebuild,v 1.1 2006/07/17 20:20:39 zypher Exp $
+
+inherit libtool eutils autotools
+
+DESCRIPTION="A library based on quicktime4linux with extensions"
+HOMEPAGE="http://libquicktime.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+IUSE="mmx X"
+
+DEPEND="media-libs/libdv
+	>=x11-libs/gtk+-2.4.0
+	media-libs/libpng
+	media-libs/jpeg
+	media-libs/libvorbis
+	media-libs/libogg
+	media-libs/x264-svn
+	X? ( || ( ( x11-libs/libXaw
+				x11-libs/libXv
+				x11-proto/xextproto
+			)
+			virtual/x11
+		)
+	)
+	!virtual/quicktime"
+PROVIDE="virtual/quicktime"
+
+pkg_setup() {
+	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
+}
+
+src_compile() {
+	econf --enable-shared \
+		--enable-static \
+		--enable-gpl \
+		$(use_enable mmx) \
+		$(use_with X x) \
+		--without-cpuflags || die "econf failed"
+		emake || die "emake failed"
+}
+
+src_install() {
+	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
+	[[ ${CHOST} != *-darwin* ]] && \
+	dosym /usr/include/lqt /usr/include/quicktime
+}
+
+pkg_preinst() {
+	if [[ -d /usr/include/quicktime && ! -L /usr/include/quicktime ]]; then
+		einfo "For compatibility with other quicktime libraries, ${PN} was"
+		einfo "going to create a /usr/include/quicktime symlink, but for some"
+		einfo "reason that is a directory on your system."
+
+		if $(has_version =media-libs/libquicktime-0.9.4); then
+			einfo "It seems this directory belongs to libquicktime-0.9.4."
+			einfo "We'll delete that directory now."
+			rm -rvf /usr/include/quicktime
+		else
+			einfo "Please check that is empty, and remove it, or submit a bug"
+			einfo "telling us which package owns the directory."
+			die "/usr/include/quicktime is a directory."
+		fi
+	fi
+}
+