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

Package-Manager: portage-2.1.1_pre3-r1

5 files changed, 117 insertions, 15 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/Manifest b/media-libs/libquicktime/Manifest
index 448ed5f6f14d..cb1f416748bc 100644
--- a/media-libs/libquicktime/Manifest
+++ b/media-libs/libquicktime/Manifest
@@ -14,9 +14,10 @@ AUX libquicktime-0.9.7-unrice.patch 871 RMD160 00db7ed14972216f37b79903120539cff
 MD5 bafb8667d95f5399ac28bdb66161035d files/libquicktime-0.9.7-unrice.patch 871
 RMD160 00db7ed14972216f37b79903120539cff7d69c10 files/libquicktime-0.9.7-unrice.patch 871
 SHA256 d21e8f756f2c4f6465b63923594b26ae88ee167600bcb7fe01fddb005bb1457a files/libquicktime-0.9.7-unrice.patch 871
-DIST libquicktime-0.9.2.tar.gz 666586 RMD160 d0a4e3856f3617ec5473d2e03d39836df738561b SHA256 4010890586da8d84ba5bdfb387d9faf7f2ae6ddc4227c60802537a7b3bfd10d3
+DIST libquicktime-0.9.2.tar.gz 666586 RMD160 d0a4e3856f3617ec5473d2e03d39836df738561b SHA1 896758aa295b81eaa1f45ddc4ef0b8ed40006be2 SHA256 4010890586da8d84ba5bdfb387d9faf7f2ae6ddc4227c60802537a7b3bfd10d3
 DIST libquicktime-0.9.4.tar.gz 782651 RMD160 93a8098770a860cba31d71f876b782c2a7b00fdf SHA1 8835cd89434f4d7da540ca50e629d18cc7d5c24b SHA256 344e9308cb6655cb6d3a8eba0abd824a8c157943739b18762aee64c0d50cb8aa
 DIST libquicktime-0.9.7.tar.gz 765719 RMD160 a886cbc714306d94977616de7221a19298fa251d SHA1 93346b8a9a411a4bdf97283fbf3ac8ed52252c73 SHA256 43b3b1b3a4ca24c2017f1fa0470425e522b59346b74203b39f9991f6a7b6085e
+DIST libquicktime-0.9.9.tar.gz 926280 RMD160 c345f54d949f29a9f5be42ca5fbdc80be781a3d4 SHA1 6221879c61bda6a695ffbc46c85e39db1b3ded65 SHA256 b92f08e8e9a9e4be36dd5cdd4b1c5d31f0cc821569623b2f5f79b3e7ba8ed3da
 EBUILD libquicktime-0.9.2.ebuild 1566 RMD160 1bce5fe7dfcec05aa53f213c7c4caf42daf06275 SHA1 46fd5023f254793e029f4dd8f1bbe844849407ac SHA256 89d34c1ccfe6f9aeed1ff7206b3fca953dc50e877adacac056f59ac0148e54ee
 MD5 9a1d33daffe2ec7e701e22c08d8f0820 libquicktime-0.9.2.ebuild 1566
 RMD160 1bce5fe7dfcec05aa53f213c7c4caf42daf06275 libquicktime-0.9.2.ebuild 1566
@@ -25,14 +26,18 @@ EBUILD libquicktime-0.9.4.ebuild 1462 RMD160 b3bc6483c77db14b16d78e2beef3c7f8cb2
 MD5 0ade7c6881acc1fc0a5dc331b2061844 libquicktime-0.9.4.ebuild 1462
 RMD160 b3bc6483c77db14b16d78e2beef3c7f8cb232dca libquicktime-0.9.4.ebuild 1462
 SHA256 7911c00aa99514ac43ab297c0d5130481ebc348ee5b3f2f486afd5d398e1eee0 libquicktime-0.9.4.ebuild 1462
-EBUILD libquicktime-0.9.7-r1.ebuild 2299 RMD160 c26c3675cf9de631db6c698518323f2b1a4b23b4 SHA1 5bb6d68ed35bbed61b1d82adda285d8df3af4c5a SHA256 6b0496fdafdd7a92e8a264efea58e48af6e9b92a5cd6298e8febd36ef8467077
-MD5 10e12ec5d01c9e099f76c744b9194593 libquicktime-0.9.7-r1.ebuild 2299
-RMD160 c26c3675cf9de631db6c698518323f2b1a4b23b4 libquicktime-0.9.7-r1.ebuild 2299
-SHA256 6b0496fdafdd7a92e8a264efea58e48af6e9b92a5cd6298e8febd36ef8467077 libquicktime-0.9.7-r1.ebuild 2299
-MISC ChangeLog 8852 RMD160 f07f85c5e80ab32eeb58afcca268432413f2d8a3 SHA1 0bba6181e86036d3425e1aa7e8db1a87212192fa SHA256 602827b728331d2d88dc86a432b3788f5b9373025f671954a490b717018757c6
-MD5 0c8473cbcd8b2dc17308eef9f8242097 ChangeLog 8852
-RMD160 f07f85c5e80ab32eeb58afcca268432413f2d8a3 ChangeLog 8852
-SHA256 602827b728331d2d88dc86a432b3788f5b9373025f671954a490b717018757c6 ChangeLog 8852
+EBUILD libquicktime-0.9.7-r1.ebuild 2519 RMD160 d1972f710e91396ff02de3b8bdc59b68d892bb6a SHA1 f7625ebc55b8cf5751a98e9e1a18feade5139555 SHA256 ac125b064474666f44285bef7ff9b08e7873b15d2b87b67101392f599bca8993
+MD5 16a3869ee27aff3412cf978e34fc4cf4 libquicktime-0.9.7-r1.ebuild 2519
+RMD160 d1972f710e91396ff02de3b8bdc59b68d892bb6a libquicktime-0.9.7-r1.ebuild 2519
+SHA256 ac125b064474666f44285bef7ff9b08e7873b15d2b87b67101392f599bca8993 libquicktime-0.9.7-r1.ebuild 2519
+EBUILD libquicktime-0.9.9.ebuild 2104 RMD160 894d0837329848897420bc583dfc3d1f0689d2a9 SHA1 22b70b6f98d0fa27cf46217cda13482a221b031b SHA256 c2e515ee909c1543e9e030a5baacd07c6655a7565bc34224fb8cf90f11ba43c4
+MD5 d7972d40b1e686c4f1625ca6d7bc428a libquicktime-0.9.9.ebuild 2104
+RMD160 894d0837329848897420bc583dfc3d1f0689d2a9 libquicktime-0.9.9.ebuild 2104
+SHA256 c2e515ee909c1543e9e030a5baacd07c6655a7565bc34224fb8cf90f11ba43c4 libquicktime-0.9.9.ebuild 2104
+MISC ChangeLog 9172 RMD160 c02982d8d82abc1df81b397339a5eb20bd1552d1 SHA1 27baf78f001c5af3fcffaeed40e8d2eae07b54e2 SHA256 10967d045ace1934c86163a59c168145bb7723d6fb8bf50cc18a9109f97b6120
+MD5 6732a2257a09f6042507a579ba4d40d0 ChangeLog 9172
+RMD160 c02982d8d82abc1df81b397339a5eb20bd1552d1 ChangeLog 9172
+SHA256 10967d045ace1934c86163a59c168145bb7723d6fb8bf50cc18a9109f97b6120 ChangeLog 9172
 MISC metadata.xml 251 RMD160 11462994b78856883a805c72334300d07101713d SHA1 a8362b29138cd87a592947af33840bf3210cfc59 SHA256 0e151c0a2781f2632c75a2f2c3b1a8d187aed329467472236c65627a7e0ba42f
 MD5 955f56e990f8c32d705708b4cc4db089 metadata.xml 251
 RMD160 11462994b78856883a805c72334300d07101713d metadata.xml 251
@@ -46,3 +51,6 @@ SHA256 b043300b9aae15bb78dee72511f4700b9fc6aa2c7db31b9eeda2e6f83f31e55d files/di
 MD5 630f7e275f87dd0267c776c2200e7ba5 files/digest-libquicktime-0.9.7-r1 256
 RMD160 152d8cbe8500b984ea151f9753a137ce879b1dee files/digest-libquicktime-0.9.7-r1 256
 SHA256 472a7162078a0d4d6a44ae9a25a92be60a484c20dbeb4759ca0378b775782d38 files/digest-libquicktime-0.9.7-r1 256
+MD5 724a301e45d8d08f65e454647ead84ae files/digest-libquicktime-0.9.9 256
+RMD160 a564e03f1dcb0cb4bb3352579c12b96a3eee61d5 files/digest-libquicktime-0.9.9 256
+SHA256 6091518a14516ef99b1505679439e1678f35c617d15df3dfc740210c4822f518 files/digest-libquicktime-0.9.9 256
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
+}
+