drop xorg 6 checks for built with use, dont try to be clever with /usr/include/quicktime by removing the files, just die

Package-Manager: portage-2.1.3.13

3 files changed, 21 insertions, 28 deletions

diff --git a/media-libs/libquicktime/ChangeLog b/media-libs/libquicktime/ChangeLog
index 759024689291..cff5e4e4eaef 100644
--- a/media-libs/libquicktime/ChangeLog
+++ b/media-libs/libquicktime/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/libquicktime
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libquicktime/ChangeLog,v 1.91 2007/10/13 23:37:53 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libquicktime/ChangeLog,v 1.92 2007/10/14 11:01:47 aballier Exp $
+
+  14 Oct 2007; Alexis Ballier <aballier@gentoo.org>
+  libquicktime-1.0.1.ebuild:
+  drop xorg 6 checks for built with use, dont try to be clever with
+  /usr/include/quicktime by removing the files, just die
 
 *libquicktime-1.0.1 (13 Oct 2007)
 
diff --git a/media-libs/libquicktime/Manifest b/media-libs/libquicktime/Manifest
index 1495a2091ac5..a475d0f07b03 100644
--- a/media-libs/libquicktime/Manifest
+++ b/media-libs/libquicktime/Manifest
@@ -50,14 +50,14 @@ EBUILD libquicktime-1.0.0.ebuild 3077 RMD160 f31b9ef7846af21b23a4265027f0a0fd3b2
 MD5 b07242da306df0e851c1894dea15e199 libquicktime-1.0.0.ebuild 3077
 RMD160 f31b9ef7846af21b23a4265027f0a0fd3b26b9d8 libquicktime-1.0.0.ebuild 3077
 SHA256 9e1c01cde08efb6644da3b7009e61efb4f9394b7d16be6453bf32d49946d47c0 libquicktime-1.0.0.ebuild 3077
-EBUILD libquicktime-1.0.1.ebuild 2905 RMD160 474fde622093487cf9300a270dc8418087f99f47 SHA1 e7f8522499032e8d2c9a4edb49f0f3f71fb17391 SHA256 05de55d1b581bf073288f332d034dfa6b67abe84899017316a1025d81922c057
-MD5 88b110bf2a5b0c2447ff2befe15fa6d3 libquicktime-1.0.1.ebuild 2905
-RMD160 474fde622093487cf9300a270dc8418087f99f47 libquicktime-1.0.1.ebuild 2905
-SHA256 05de55d1b581bf073288f332d034dfa6b67abe84899017316a1025d81922c057 libquicktime-1.0.1.ebuild 2905
-MISC ChangeLog 14432 RMD160 aa4dfc29c1b1dd57249c1608c08d7bcb0027e503 SHA1 906bccbd0041b68e1727d0907efb4526b18a8f7e SHA256 6da303f43932eaf38e3e7854638850705d64eeed5bb9164fb621204ae205539d
-MD5 17a8f1ac470f4b703a79aeee231a3d7f ChangeLog 14432
-RMD160 aa4dfc29c1b1dd57249c1608c08d7bcb0027e503 ChangeLog 14432
-SHA256 6da303f43932eaf38e3e7854638850705d64eeed5bb9164fb621204ae205539d ChangeLog 14432
+EBUILD libquicktime-1.0.1.ebuild 2537 RMD160 032aa688ac6f32b024f45efd95884f3f1ea49708 SHA1 2584a6922793e4a52e2c1cf1f2130428df2f2ebf SHA256 32a1d2d9b1dadbad5796d43c785fe59fb8567245ff30ffe41a675a6f3154b254
+MD5 18de668cb414983fd4cf609255842bed libquicktime-1.0.1.ebuild 2537
+RMD160 032aa688ac6f32b024f45efd95884f3f1ea49708 libquicktime-1.0.1.ebuild 2537
+SHA256 32a1d2d9b1dadbad5796d43c785fe59fb8567245ff30ffe41a675a6f3154b254 libquicktime-1.0.1.ebuild 2537
+MISC ChangeLog 14639 RMD160 85a088beef6a2d492c650b29447ce286ee578726 SHA1 ae7f12d640a7f432389dbf6ff03dd333abb34597 SHA256 0789f096744d960bdca3aec48e1269cfd20464ce4da6a2fc724b85196053e961
+MD5 d361266381bdf46bc84c86488d0ce47f ChangeLog 14639
+RMD160 85a088beef6a2d492c650b29447ce286ee578726 ChangeLog 14639
+SHA256 0789f096744d960bdca3aec48e1269cfd20464ce4da6a2fc724b85196053e961 ChangeLog 14639
 MISC metadata.xml 251 RMD160 11462994b78856883a805c72334300d07101713d SHA1 a8362b29138cd87a592947af33840bf3210cfc59 SHA256 0e151c0a2781f2632c75a2f2c3b1a8d187aed329467472236c65627a7e0ba42f
 MD5 955f56e990f8c32d705708b4cc4db089 metadata.xml 251
 RMD160 11462994b78856883a805c72334300d07101713d metadata.xml 251
@@ -77,7 +77,7 @@ SHA256 3bfad54a1b0e72486bae719a6acaf3baf8932543ddb799d354eccaa5065affe2 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHEVb9vFcC4BYPU0oRAqXsAKCyku3LH8x9M3KJGshI0OLILGgz5gCfUqzW
-BxN4TSfz5kgcp6liEvsJWuQ=
-=NidC
+iD8DBQFHEfdMvFcC4BYPU0oRAspGAKDEyWc+jPBYkR3NiOQ2fTljDSsOPACfS36L
+sccvV7ZMZKRbnF9j2hHMixQ=
+=UQiG
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libquicktime/libquicktime-1.0.1.ebuild b/media-libs/libquicktime/libquicktime-1.0.1.ebuild
index 0ec841f4a6fd..da57742d7fdd 100644
--- a/media-libs/libquicktime/libquicktime-1.0.1.ebuild
+++ b/media-libs/libquicktime/libquicktime-1.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libquicktime/libquicktime-1.0.1.ebuild,v 1.1 2007/10/13 23:37:53 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libquicktime/libquicktime-1.0.1.ebuild,v 1.2 2007/10/14 11:01:47 aballier Exp $
 
 inherit libtool eutils
 
@@ -43,12 +43,6 @@ DEPEND="${RDEPEND}
 
 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() {
 	local MY_OPTS=""
 	if use !encode || use !aac; then
@@ -93,14 +87,8 @@ pkg_preinst() {
 		elog "going to create a /usr/include/quicktime symlink, but for some"
 		elog "reason that is a directory on your system."
 
-		if $(has_version =media-libs/libquicktime-0.9.4); then
-			elog "It seems this directory belongs to libquicktime-0.9.4."
-			elog "We'll delete that directory now."
-			rm -rvf /usr/include/quicktime
-		else
-			elog "Please check that is empty, and remove it, or submit a bug"
-			elog "telling us which package owns the directory."
-			die "/usr/include/quicktime is a directory."
-		fi
+		elog "Please check that is empty, and remove it, or submit a bug"
+		elog "telling us which package owns the directory."
+		die "/usr/include/quicktime is a directory."
 	fi
 }