diff options
| author |   Thomas Kahle <tomka@gentoo.org> | 2012-09-18 16:34:54 +0000 |
|---|---|---|
| committer | Thomas Kahle <tomka@gentoo.org> | 2012-09-18 16:34:54 +0000 |
| commit | 4bfe2b1c5f7353ab9f59da32126a7babd99ae919 (patch) | |
| tree | 75ba18eb69ed7f510c85446d1c244473bdb82839 /media-libs/qhull | |
| parent | Stable for x86, wrt bug #434884 (diff) | |
| download | gentoo-2-4bfe2b1c5f7353ab9f59da32126a7babd99ae919.tar.gz gentoo-2-4bfe2b1c5f7353ab9f59da32126a7babd99ae919.tar.bz2 gentoo-2-4bfe2b1c5f7353ab9f59da32126a7babd99ae919.zip | |
Fix /usr/include/qhull symlink (bug 435006)
(Portage version: 2.1.11.18/cvs/Linux x86_64)
Diffstat (limited to 'media-libs/qhull')
| -rw-r--r-- | media-libs/qhull/ChangeLog | 6 | ||||
| -rw-r--r-- | media-libs/qhull/qhull-2010.1-r2.ebuild | 8 | ||||
| -rw-r--r-- | media-libs/qhull/qhull-2012.1-r1.ebuild | 9 |
3 files changed, 20 insertions, 3 deletions
diff --git a/media-libs/qhull/ChangeLog b/media-libs/qhull/ChangeLog index cf8e890e4167..512fa471f1ee 100644 --- a/media-libs/qhull/ChangeLog +++ b/media-libs/qhull/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/qhull # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/qhull/ChangeLog,v 1.49 2012/09/13 10:16:58 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/qhull/ChangeLog,v 1.50 2012/09/18 16:34:54 tomka Exp $ + + 18 Sep 2012; Thomas Kahle <tomka@gentoo.org> qhull-2010.1-r2.ebuild, + qhull-2012.1-r1.ebuild: + Fix /usr/include/qhull symlink (bug 435006) 13 Sep 2012; Agostino Sarubbo <ago@gentoo.org> qhull-2012.1-r1.ebuild: Stable for amd64, wrt bug #429128 diff --git a/media-libs/qhull/qhull-2010.1-r2.ebuild b/media-libs/qhull/qhull-2010.1-r2.ebuild index d5525ccf1c54..e86e82213240 100644 --- a/media-libs/qhull/qhull-2010.1-r2.ebuild +++ b/media-libs/qhull/qhull-2010.1-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/qhull/qhull-2010.1-r2.ebuild,v 1.8 2012/01/14 10:48:44 xarthisius Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/qhull/qhull-2010.1-r2.ebuild,v 1.9 2012/09/18 16:34:54 tomka Exp $ EAPI=3 @@ -28,3 +28,9 @@ src_configure() { $(cmake-utils_use_with doc DOCS)" cmake-utils_src_configure } + +pkg_preinst() { + # remove potential symlink to avoid triggering collision-protect or + # protect-owned (https://bugs.gentoo.org/show_bug.cgi?id=435006) + rm "${ROOT}"/usr/include/qhull +} diff --git a/media-libs/qhull/qhull-2012.1-r1.ebuild b/media-libs/qhull/qhull-2012.1-r1.ebuild index 5310876d079d..009bc8ff01d9 100644 --- a/media-libs/qhull/qhull-2012.1-r1.ebuild +++ b/media-libs/qhull/qhull-2012.1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/qhull/qhull-2012.1-r1.ebuild,v 1.3 2012/09/13 10:16:58 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/qhull/qhull-2012.1-r1.ebuild,v 1.4 2012/09/18 16:34:54 tomka Exp $ EAPI=4 @@ -27,6 +27,13 @@ src_configure() { cmake-utils_src_configure } +pkg_preinst() { + # See https://bugs.gentoo.org/show_bug.cgi?id=435006 + # If qhull-2010 is installed we need to remove its include dir so + # that it can be replaced with a symlink in this version. + rm -rf "${ROOT}"usr/include/qhull + } + src_install() { cmake-utils_src_install # compatibility with previous installs |