summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2005-12-19 12:03:29 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2005-12-19 12:03:29 +0000
commit7c8df391d19ede02a3dc91e61ce40f43799e8937 (patch)
treea9381476c2bb95e108686b69fb5763d3d84ec139 /media-libs
parentMove block on pre-r8 versions of faad2, that now depends on this. (diff)
downloadgentoo-2-7c8df391d19ede02a3dc91e61ce40f43799e8937.tar.gz
gentoo-2-7c8df391d19ede02a3dc91e61ce40f43799e8937.tar.bz2
gentoo-2-7c8df391d19ede02a3dc91e61ce40f43799e8937.zip
Add a check to make sure that /usr/include/quicktime is not a real directory in pkg_preinst.
(Portage version: 2.1_pre1)
Diffstat (limited to 'media-libs')
-rw-r--r--media-libs/libquicktime/ChangeLog7
-rw-r--r--media-libs/libquicktime/libquicktime-0.9.7-r1.ebuild13
2 files changed, 18 insertions, 2 deletions
diff --git a/media-libs/libquicktime/ChangeLog b/media-libs/libquicktime/ChangeLog
index c3f3d255611f..202afe89d793 100644
--- a/media-libs/libquicktime/ChangeLog
+++ b/media-libs/libquicktime/ChangeLog
@@ -1,6 +1,11 @@
# 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.48 2005/12/12 05:02:10 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libquicktime/ChangeLog,v 1.49 2005/12/19 12:03:29 flameeyes Exp $
+
+ 19 Dec 2005; Diego Pettenò <flameeyes@gentoo.org>
+ libquicktime-0.9.7-r1.ebuild:
+ Add a check to make sure that /usr/include/quicktime is not a real directory
+ in pkg_preinst.
12 Dec 2005; Donnie Berkholz <spyderous@gentoo.org>;
libquicktime-0.9.7-r1.ebuild:
diff --git a/media-libs/libquicktime/libquicktime-0.9.7-r1.ebuild b/media-libs/libquicktime/libquicktime-0.9.7-r1.ebuild
index a338ea89d3ab..93719a81ce2e 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-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-r1.ebuild,v 1.6 2005/12/12 05:02:10 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libquicktime/libquicktime-0.9.7-r1.ebuild,v 1.7 2005/12/19 12:03:29 flameeyes Exp $
inherit libtool eutils autotools
@@ -72,3 +72,14 @@ src_install() {
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/lib/quicktime symlink, but for some,"
+ einfo "on your system, that is a directory."
+ 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
+}
+