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 | 2f31570671c05eecd0c94d342dec78d870b5f369 (patch) | |
| tree | 7959605eaf956d499b99d9cf03ce9cb7041f5197 /media-libs/qhull | |
| parent | Stable for x86, wrt bug #434884 (diff) | |
| download | historical-2f31570671c05eecd0c94d342dec78d870b5f369.tar.gz historical-2f31570671c05eecd0c94d342dec78d870b5f369.tar.bz2 historical-2f31570671c05eecd0c94d342dec78d870b5f369.zip | |
Fix /usr/include/qhull symlink (bug 435006)
Package-Manager: portage-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/Manifest | 16 | ||||
| -rw-r--r-- | media-libs/qhull/qhull-2010.1-r2.ebuild | 8 | ||||
| -rw-r--r-- | media-libs/qhull/qhull-2012.1-r1.ebuild | 9 |
4 files changed, 33 insertions, 6 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/Manifest b/media-libs/qhull/Manifest index 3c8f73ef3c8b..7b3d8cfebaf3 100644 --- a/media-libs/qhull/Manifest +++ b/media-libs/qhull/Manifest @@ -1,11 +1,21 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + AUX qhull-2010.1-cmake-install.patch 3343 SHA256 865b27a10d878d7ded45446e7dffc9369fdafa021e49bafe5575a32fbed1e200 SHA512 20c1805287884f3a8de0924c4cb370110355c2c4804ecd8dfe58985a9751d7eddbcb911c4ea1104b3ab6aef17e5817381d679491ce1954dea8941f2200f16032 WHIRLPOOL ae3b2c5e8c998382dfee9a82f802eb2809ce0dc618b86092e344da2ce5880d517d304a71182837572f8cfabff41e6c90f407fd9ed8d3f7695fad29b85325efe3 AUX qhull-2010.1-overflows.patch 1884 SHA256 8f49ad703f47467fd74d88614e1bbf7927b57c9c2af3c492fc2848f27a5f3181 SHA512 4246397abba98ea5163bca70ccf30575611d25c86d17172687b9adb7e5a6faeba2075f7e6a59ed86cb6d4b7507c694a4f6f4d4608e7bf13f93374f582a7abff1 WHIRLPOOL 1828f2b523090f309a1591fe16e70ddeb69cb8de5cd9f2af80d19779d1cc3a7485d158b8117c31590e756f2554383e1860b0afb7ed80cbfb27a06f0913cf8740 AUX qhull-3.1-makefile.patch 2516 SHA256 5685cad5fb45b05444ebb6c2867974aad3391a9936070f976a5b58aeb52c27a7 SHA512 9ca6be4d35deae3a77a18dd78c881f2e41886ef345207a46a2888fb503ee6e1c27da7146254ccc35bfa626e14e878cdbd9854e8da4e213a641266f54a6ed370a WHIRLPOOL dc555ee9ebc50a8db7a2524d1bfeb6e9088ee8beb2fe93ed06a35c1632de20f47c2cfe1f687c70f19b0f06598c42a1508fb034cc1f4f7e918afa0b458a1ac9a8 DIST qhull-2010.1-src.tgz 674457 SHA256 557085fb441b9b5a24589e08d7b1ae71ecd234fcb43ef4f8ffde141d22e316be SHA512 aa87a6041f63e05418cefd73109c459909ef5860184496a881a46dc840de9b0182d65a88960ac3bfd1e770e9c64ee554916d02bf30d8039c82b8f8f6a889cc64 WHIRLPOOL f3a3c0c653d067a66efddf7d20a2b99a49a60bbd125208b629765108eb03b72d6a84dedf1ac1fa72f22c664e79768374bf338595544e600a29198dd933e6e060 DIST qhull-2012.1-src.tgz 716665 SHA256 a35ecaa610550b7f05c3ce373d89c30cf74b059a69880f03080c556daebcff88 SHA512 e35ea2cb73ef32b23b64a6594a8b5ea22ed8e2ea7535cfd72dca44331602368dfcb681600a0d2b090e80e67e6be7b32272244b9083d4805f2fbcf5897eb73240 WHIRLPOOL 37704b3f94b6d20c02886598cc2e862f47feb910e0d3259d686b1356242206b77640871509818c56530161720954214d41c295dfe740faa4ed575379b05259f6 DIST qhull3.1.tgz 442679 SHA256 c4bf2035b2bdc86094b244fbe5a9ae0df9fdc2af4d96a4d0ba93a7060af2b30e -EBUILD qhull-2010.1-r2.ebuild 977 SHA256 b23289fdb24671d183cbedb8a4e91f7836cd7e94d5669969b3114c12d74c94e1 SHA512 a5ca0047907a852032d1e7c0fe6ab125fb5672abc50a4e3e0906abd9036e42fc0e03ed062dfbbe7607c93014a0fa4386b9b03611739a7e1d73ea5020b547e533 WHIRLPOOL 0069521220bcaa081076ea0a8e5c9748cf92ce7cd36d64d72e8027035bc094cd1c524b52cf8a8126c832a6dcd9825ab177c6177a00b9419081a31ebdca9a0d19 -EBUILD qhull-2012.1-r1.ebuild 1090 SHA256 9445934b560a73b7b65663aeeccacf77105e592cea6f0fbf26b1af7e4ff9d711 SHA512 9ad9354f5141338a43bfab9eb867636bd7dc66ed24838f7aee2773ca3f0efb5c7723032a9356a9b41cd92817bf25177e3712825ac0400b52ef689859a61ae95c WHIRLPOOL 17e92e66797dfde078bca8c96ca3dbfb535f6d330b5a3d23c86ce3f0c42b1e61ff165a46804aa5ad7dab912ff95f1f5c4792cd3b7314092220a1dc4b1c13bed3 +EBUILD qhull-2010.1-r2.ebuild 1158 SHA256 cc792e096ec283e89cec62fc851730381ae4f4edc176776759e74d6aa14629b9 SHA512 ca7ceb4ba5db7d99994db3bbc703e25ed1a7456b86e9cd2cbf67ebcb657bd6507e011c7aa03223f63b9e26af4e00048deb70089df9032ed84dabd82d929c7481 WHIRLPOOL f105899f1d8e4feca99518824df40d71787bef1281c52a985932dcdeb9bf57eb5c80b869c11bad026a39952b3d88ad5c7711b3eb71e8fd9231671d1c91e8aefd +EBUILD qhull-2012.1-r1.ebuild 1328 SHA256 de635ad05c855aa7329d0fc04ac9298d565eda6dc5885c4af5005137b43cdce7 SHA512 c1756e6999b22d0fe7963441f8e98037b3c0eac9c0807b3accca4abd76560860b18f1bd710fdda316161d524ae8fe070fc2fddc6278fe2ba7f59b75e7f2d70f3 WHIRLPOOL 3cbbd8735497ef0e5621ca278916a7e4a59399afc95becb3953f9667ea4431a2c28b3af749155bb0d2dcd5f4bc14d7fb99dcba1c8bbb391b973fc6d21bc8c94f EBUILD qhull-3.1-r1.ebuild 1190 SHA256 6b6c6a8dfe431c074063e597ed27a10a5f317ef07ecc32fba2bb67e26d91183b SHA512 793192319c42992e4a4314a8027bfe666a11a741840170d8d639c324d0c231ff25aabff13aed13c873b9f6859cb661a3a3def0d5b1ba3fe22b20bf472ee36752 WHIRLPOOL 255db4b662565bf8d17cae909945c6f401d2b10c40df1533c992e52b43957fe84ebef22227af445d21b91a5dc231432d68f29ea73887a22d3f68597ba8131448 -MISC ChangeLog 7163 SHA256 6f7fa3992ec726aa869218a6259060cb3f3855c2bf23b1a9e9aa4d22d8f97f5d SHA512 a9d7b95cda0e6b2855c1c8acaafa0e77e9e124452c1eab28d1e70c4a3a588851978f5139f0c120b701ef8621d77ac9967a1391ff38ac7214813b0ed76f00b697 WHIRLPOOL 61a5312d5153bb43dd86c4e4c0e4e2993ba5871f69b5e9b5bbd7c216b075d45fa6e5a23964aadfaa69b22f06bf9e0a38b6daff81ac825699f917b411be22102d +MISC ChangeLog 7309 SHA256 805ef0a6ef9b2f0ae34ea75d76d4d579573d522cbc60ab542f8fdfeb44e5b92b SHA512 01277fc1a1224ead3856904d96a36125037cac5976c21b61e12ae919e1eeb9df8a3fc4bbec2234d4603dcca7ecd493d6f681f1b6458c557c2fc770191bebb7da WHIRLPOOL 962e8a9e760b7ea7e596cfef09098793decf6b19458a54ba9ae7ffd9a3d3e8cf815e1c9b4faa414ad8772cdce32b83e9cc4eb5352b27447f06282d01ad1e17d8 MISC metadata.xml 868 SHA256 70f5b10b77085086e04610e478a4c3dc68af409f0fb5ceafdd5076c8d054fe8b SHA512 0e9e404e0a7d940fe9e4aff6301bd0bb443d60f1ddc6a944d975e06584f0601dfdf85d6726b41c5f6abeb8e1a6af17e046a89a2c0a59fd96311e7ed47e2da81e WHIRLPOOL d0123c6319c408dccd91e1b52dd1528cc8a506a26561026418c441c9872813bcc68799497cb1d3b363a4f8472c44cc061bf4a609916709e166872fd79ba768c1 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.19 (GNU/Linux) + +iF4EAREIAAYFAlBYorgACgkQid6yGVZcMrzRAQD/cvh5uNLCu3FBdV+QsRaUoTZs +6rV28bQPNU8/aVvHU04BAODOmIqStrd2CZQygxLdkDVsOzUGIS1u8hnc5ydQBRwv +=QdYP +-----END PGP SIGNATURE----- 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 |