diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2015-02-23 08:16:16 +0000 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2015-02-23 08:16:16 +0000 |
| commit | 0581cad62bac14534a1cf048d69fdb06fbd3fdd0 (patch) | |
| tree | e59907c849a3977c67871e1e954ea265353fecdd /sci-libs | |
| parent | Bump to latest aufs3 release (diff) | |
| download | historical-0581cad62bac14534a1cf048d69fdb06fbd3fdd0.tar.gz historical-0581cad62bac14534a1cf048d69fdb06fbd3fdd0.tar.bz2 historical-0581cad62bac14534a1cf048d69fdb06fbd3fdd0.zip | |
Fix libdir detection in all versions, #513680
Package-Manager: portage-2.2.17/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!
Diffstat (limited to 'sci-libs')
| -rw-r--r-- | sci-libs/vtk/ChangeLog | 6 | ||||
| -rw-r--r-- | sci-libs/vtk/Manifest | 34 | ||||
| -rw-r--r-- | sci-libs/vtk/vtk-6.1.0-r1.ebuild | 6 | ||||
| -rw-r--r-- | sci-libs/vtk/vtk-6.1.0.ebuild | 6 |
4 files changed, 28 insertions, 24 deletions
diff --git a/sci-libs/vtk/ChangeLog b/sci-libs/vtk/ChangeLog index cc2ebdd2ed74..b4eebffadadd 100644 --- a/sci-libs/vtk/ChangeLog +++ b/sci-libs/vtk/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sci-libs/vtk # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v 1.126 2015/02/22 11:51:52 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v 1.127 2015/02/23 08:16:14 jlec Exp $ + + 23 Feb 2015; Justin Lecher <jlec@gentoo.org> vtk-6.1.0-r1.ebuild, + vtk-6.1.0.ebuild: + Fix libdir detection in all versions, #513680 22 Feb 2015; Justin Lecher <jlec@gentoo.org> vtk-6.0.0.ebuild, vtk-6.1.0-r1.ebuild, vtk-6.1.0.ebuild: diff --git a/sci-libs/vtk/Manifest b/sci-libs/vtk/Manifest index 5f431deec473..3754114e29b4 100644 --- a/sci-libs/vtk/Manifest +++ b/sci-libs/vtk/Manifest @@ -39,26 +39,26 @@ DIST vtk-6.0.0.tar.gz 24170173 SHA256 426df543cffeacf21154dddcd2a6efbd91a586570a DIST vtkDocHtml-6.0.0.tar.gz 204228463 SHA256 f5324c4c197b0cacd19bf1e5721bb012d753d49526e224d9f2dd7412f34e4434 SHA512 b6d5660f3ae6046c63b22b613cab6822f45f6b30a09522277e32f941c75dc48e8c92abc4d7f02b17e3f4d8e625de6dce7f000acc79e2d588a13d1577c139291a WHIRLPOOL b951c4ee62639c6bada2e02c2fceddbdb730c76d80c61a6ed013d8d9878b78a697158f41f53d68b5d62e4baa1f9ecb88e2437490da7610970622a40ecb14db1f DIST vtkDocHtml-6.1.0.tar.gz 230827905 SHA256 e35d0f5b7905e5c827d8daa71ee61b14dc080445efad91f97583a2b9303c1813 SHA512 fcae74a65157d87b39a162facdecbb0ab0a9b95b9f2555ed2b15d635b82034bfc62181eea441caf0b1edbe036b792a8231d409908b943398ce7f662c149d3a60 WHIRLPOOL bc1714223259953a605612c0da124ece60604989458b7de5cf24b37d0f4c339f50c07a13d899f218364e61a35f8e1ace126eda5e83acbc3fe4930b041df0f55d EBUILD vtk-6.0.0.ebuild 8981 SHA256 a1e2d5cd24980d763b5d89294282256247d5f5031bd5a825b3bf29c647580890 SHA512 eb5290dd55622cf366fa34cb5bef1141c3e6b5aeacefc206e36d976247ea566de22e4025236895720ceaf9ed47b4311bf9bd75c9b4f728b646172d03c8859897 WHIRLPOOL 77eaedaef94a5a5806a8409fbfc91bbbe760902982db606cd4186a5396ee7b49890ab1892eb0ff5af3fa1e4759a1ae413232dcf4dae6c63a1a3cac3ee3c75879 -EBUILD vtk-6.1.0-r1.ebuild 10489 SHA256 fe069aaa0840aa9e632fe9276074b70ed46b061bbed9987cd291c053505c8ff1 SHA512 e591161a6c050191f71c126bf746caafba8218c8ba0b17e2954fac902ec8f61f053b25ab56b648e50c883d2406813ff087defcf40f466c31a1b844ca3e66b917 WHIRLPOOL bbd4b5fc91a4cbdf4797ceba006e60704927f5bb8d3cc5be094e486d16522947b3a04790da4b7d766bb5a4bdbb8b80f3d24e913ea35f46be74a441885c12d8de -EBUILD vtk-6.1.0.ebuild 10304 SHA256 14d3a4124e25e5c6709c746b3402d951e9abb6375743cc2404d012e2172c9b0b SHA512 03595b6fa748283cb28498406c5176eacb25a75f0753b73aac4b95d742b72084cbb8b6505f1b19c694722cf9cf4c36b7df30154ca7c1b4067018c49f891c31cb WHIRLPOOL 57e0ecf4227b1f17f42acb12760e783ae420553863cea603c4d896a817c5af215444547d11c7588d18aaf0473cf4a186d8f73a65e7953bbeea53ce00f3596d0d -MISC ChangeLog 20710 SHA256 23b400e9092e7d8e1f5e8211739be33c7c8a105518e8a9524f124ea4bb230f15 SHA512 a1f9c31caa6e185ae72420bb77c7f8626e3b8129dd6f41522b8c3b4616e35897decda05e39c12fa7e4ebe0e6072985abc19be606fca7b3f691f8f81ded8979cf WHIRLPOOL df32552715bd05dd47bb7bba4d951c87bfc7b66e264173f631080ad86df1c344c8eb532ac5255a7b3598a180eefef98591b20744ae5a61cf0ebd179ebad1b3f9 +EBUILD vtk-6.1.0-r1.ebuild 10505 SHA256 7ef74c11f2be8dee9cf827c915761e9828bb2b8828208890340055e03c00a1a9 SHA512 af7f53fb82e80faf42fc7128c27ef8ef15140bda5972b1b26c3b4f14cbd881f4de0aba5ba71f88a8968f043b7cf24f8c13f9f9ca9a8034bf05c11f0af79e996d WHIRLPOOL c6794d48e2b16f2e7bd7940507cef444f24019633573fb0877f80b23688aaf5480bcf857c70ecb83114ab390d50a51c5a3e1a0911d4d0fc1c50959818a374969 +EBUILD vtk-6.1.0.ebuild 10320 SHA256 28b9c3e12ad71ae35de85bc0332fab3f0e618bcedc88200e90b2cd9ad5056506 SHA512 1a5cc64d264007912625d5524b94ebad9251f64936a133501e6217dcef205176ee04d98c3f438620e1e467068fcf629063f8f140d2acb4ea56158c412563fcc8 WHIRLPOOL f195abfeaab45be26f30fc66fad214bd49ad86d97e1a59da4ed56250ed7b4b5d352ac8b7c56425eb9dd284a34a9dc2639789e8e1a37e15f17fc426c3b441c268 +MISC ChangeLog 20847 SHA256 964f39bd643de1b4dc28415eb6070c26de1ab0ed0a9db535bbde3074e1621666 SHA512 3ae95b5efbffd12eda6a421521b0cd77fd50a2a5a8edbd977638cfae5f950aa15cca2c8d1ee27583e1691fb6d2e2360a6a1cb1353926d427156dc790ef93c824 WHIRLPOOL ff97b70935cbd21f3c32a7322f60de5dec114915d8547cdc4a194cff676156e16be392db9c9faca3642ea25ae15d40ad4bd9e5c6b49e40b54f27af3f74688e10 MISC metadata.xml 1135 SHA256 4ded3033a3776deccd061166fbbe5cc43dc2c2a4a2d6b6cb34e850f7cdcc8c63 SHA512 f673c721db73ad0d7e7453d9344d1daf5558ba9cb00ffd3ccbd22d2bb512f80c9259b837834f30991443eaf44fb33f5cf39f790f84b8cd3b62aec9b5d467dab0 WHIRLPOOL f8d98412e37a0e86697c8752da55c2588f92730d7f5d3dd59d7c2503af68ad0694b754f98f87a1e7239a2537807e0ee8eceb23ea089cb5f704bdcc7642e1e90b -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0 -iQJ8BAEBCgBmBQJU6cPoXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +iQJ8BAEBCgBmBQJU6uHNXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC -OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirtQwP/i9mqRzo+EToeH9QeH9tGHz7 -N4RoZAABGjrUztoQH9TiyCmBL7VoMTC6UyG+LF8wKs9Jsl9ObPFisqaYZ6RWhEyh -IgXPAYmKMSHi7ePa4PDuAaBitcNUO8HrlY/pOJAuogFCTPYl6Dr/ovzWWQ6i7Zer -6s42ktyoBtYzFzR3pbBG/DSOWIjStiLzQoZHy6Av4DvgqsQ9jMfVWSJn6ofW9EGt -mldWenpKUdovoOK3hwQ2mPfWyqcGMfC93jXs98LPg1tpvjltJH/2qFfoqYIN3cH2 -BBrAqmC7GeLBKjdkCv57OQxdGynItrOpBwYod6t+sgWbg3XSAj/6sdG48uNQYUh1 -C+ZdAipw8HAHxilvQwTjPCgIic4csJ8x00WjSfNVhzozNjB/RDpHc+0wG5tnoDnH -zfkxMAGwuN5yHxU5jT2s4enhMSQrjkXszZ9oc7Rix6me6kWSvMMXaO1jb1jP43Ab -y/clGHL723nNGEqMjrC1GIm0gnCq/RceWz8KvcUms2B5Rv2bO0W31G8akXkUNdHn -oO+U5Ey8r0KPIgrrCslSP2AABLhb+bhyHZK2XJnOAcawFwUVcmzms7K2m+n29dJR -ar9hqQlSYjeqjWq+Gyo0LGyOWtvkL7jBL37Ubb16zhYlhpIXLbniuYCM6m+skDMS -pv7ZwnB5iLIJc0Olcyzl -=fbmv +OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirxpoP/0qNB9x3DiDZqUKnPCPUvVvd +dF1m+A8p6DjKNSyGD4CHs2h8YO5UD15NU2KkIFCyHQJO+OyMowAOhJNePGPCNdfx +bOYDASwBCeWNKHaYkoNPc6mbZDEFb8cwAVwgfXjn5jghp2VhZICHUTBMh70SwNYZ +ZXfVG5k7u6UvhQRgRYn/xzGVWnUj0e2oenDhhQbytXORr3WYNDTwuJNQb8I+PEbl +eMfZHTfMAtQnaoeXHbejO97QpO3nbtw0IYq/ONzIC99NKK6SUeC63LSyc70ZO7Hp +9QjdcLd50TKECIie1ToIa4UgkAvvVP+23rj3vd4tzW0xkjKPbTwGcfpcTywaajBy +8rq70lBwQmTV2fyfvnorWSVuv0iE/wTdbM+J18McQ3NTasRVRbX0DQhc4OlxHQjX +SfZIpWt7b7KnQ2PGBgZuQcBCRUIO583QtkpKaMqV51Z89g5NfvnwKDI3ZAYeWrV5 +Koubq1bD8BBNrMyI6caFWdkr6/2gC0TJ4+Wp1JLykCSyy9sOEw4dJEa1BoNnpLB2 +ktl0ewgssDBHuR1hFk3LUxtSffzDrB3HKH730/dJMRFVB2CXpkpAFI4yFAw8Z84M +8ECeKKUZZw3nBTfkO7sVKe6hRx8ESgxZWR4uvaDr4NhBpZ7gzwwc4v4eYRDRVRre +zhAjVp79VfbKl+4GCKg1 +=1ukn -----END PGP SIGNATURE----- diff --git a/sci-libs/vtk/vtk-6.1.0-r1.ebuild b/sci-libs/vtk/vtk-6.1.0-r1.ebuild index 38fc2846b810..4a29adcec912 100644 --- a/sci-libs/vtk/vtk-6.1.0-r1.ebuild +++ b/sci-libs/vtk/vtk-6.1.0-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-6.1.0-r1.ebuild,v 1.4 2015/02/22 11:51:52 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-6.1.0-r1.ebuild,v 1.5 2015/02/23 08:16:14 jlec Exp $ EAPI=5 @@ -316,8 +316,8 @@ src_configure() { mycmakeargs+=( # -DR_LIBRARY_BLAS=$($(tc-getPKG_CONFIG) --libs blas) # -DR_LIBRARY_LAPACK=$($(tc-getPKG_CONFIG) --libs lapack) - -DR_LIBRARY_BLAS=/usr/lib64/R/lib/libR.so - -DR_LIBRARY_LAPACK=/usr/lib64/R/lib/libR.so + -DR_LIBRARY_BLAS=/usr/$(get_libdir)/R/lib/libR.so + -DR_LIBRARY_LAPACK=/usr/$(get_libdir)/R/lib/libR.so ) fi diff --git a/sci-libs/vtk/vtk-6.1.0.ebuild b/sci-libs/vtk/vtk-6.1.0.ebuild index 4c22eb892760..9970054aab16 100644 --- a/sci-libs/vtk/vtk-6.1.0.ebuild +++ b/sci-libs/vtk/vtk-6.1.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-6.1.0.ebuild,v 1.4 2015/02/22 11:51:52 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-6.1.0.ebuild,v 1.5 2015/02/23 08:16:14 jlec Exp $ EAPI=5 @@ -315,8 +315,8 @@ src_configure() { mycmakeargs+=( # -DR_LIBRARY_BLAS=$($(tc-getPKG_CONFIG) --libs blas) # -DR_LIBRARY_LAPACK=$($(tc-getPKG_CONFIG) --libs lapack) - -DR_LIBRARY_BLAS=/usr/lib64/R/lib/libR.so - -DR_LIBRARY_LAPACK=/usr/lib64/R/lib/libR.so + -DR_LIBRARY_BLAS=/usr/$(get_libdir)/R/lib/libR.so + -DR_LIBRARY_LAPACK=/usr/$(get_libdir)/R/lib/libR.so ) fi |