projects / gentoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 8de877f)
Correctly detect detect libdir, #513680; fix SLOT operators
authorJustin Lecher <jlec@gentoo.org>
Sun, 22 Feb 2015 11:51:57 +0000 (11:51 +0000)
committerJustin Lecher <jlec@gentoo.org>
Sun, 22 Feb 2015 11:51:57 +0000 (11:51 +0000)
Package-Manager: portage-2.2.17/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

sci-libs/vtk/ChangeLog patch | blob | history
sci-libs/vtk/Manifest patch | blob | history
sci-libs/vtk/vtk-6.0.0.ebuild patch | blob | history
sci-libs/vtk/vtk-6.1.0-r1.ebuild patch | blob | history
sci-libs/vtk/vtk-6.1.0.ebuild patch | blob | history

diff --git a/sci-libs/vtk/ChangeLog b/sci-libs/vtk/ChangeLog
index a2a626141c0811f81daa53f399be7f6306a33bff..cc2ebdd2ed740de792c4e4cc8edec13cd793f166 100644 (file)
--- 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.125 2015/02/09 07:55:31 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v 1.126 2015/02/22 11:51:52 jlec Exp $
+
+  22 Feb 2015; Justin Lecher <jlec@gentoo.org> vtk-6.0.0.ebuild,
+  vtk-6.1.0-r1.ebuild, vtk-6.1.0.ebuild:
+  Correctly detect detect libdir, #513680; fix SLOT operators
 
   09 Feb 2015; Justin Lecher <jlec@gentoo.org> +files/vtk-6.1.0-memset.patch,
   vtk-6.1.0-r1.ebuild:
diff --git a/sci-libs/vtk/Manifest b/sci-libs/vtk/Manifest
index 20825f58fa89bd0c028224d0a4b8eed82588e07d..5f431deec4738b83bd31ecc431ae00708dd0c8f6 100644 (file)
--- a/sci-libs/vtk/Manifest
+++ b/sci-libs/vtk/Manifest
@@ -38,27 +38,27 @@ DIST VTKLargeData-6.1.0.tar.gz 166019220 SHA256 d8985508ff2b7fbfbae0aadedfbe2b29
 DIST vtk-6.0.0.tar.gz 24170173 SHA256 426df543cffeacf21154dddcd2a6efbd91a586570a07a0db4c426d3e0acd10e4 SHA512 ac238e2d228df4fc4d324826b8729af9ab3274039d5abf834f013fb4deaddc116ba2b1b24fb93aaf4b1bfc4bb321d19bc05566883cf3db1f982c9650d77583e8 WHIRLPOOL b8619e254f97392dae01b8e2376bd70a07ce21504580d29844fcf1ab5621d85ba12bfd6047b4f90afd2b648d8b6c17e4ce5d789d6e1f84b5a4f847de5ee376b9
 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 8961 SHA256 7fd0e2107abe4b83da9f3cab76ad71cc61ac31ae5c7a9ef705639c27bea85fd4 SHA512 08923e5be371a48561e16937b3b095f76a2515bd3003dca0575fa3d1e84121f12795fb72c50b4772d9e4ff005e3555d7fa6b6c6538e303e474762cf47d818ff2 WHIRLPOOL ce26d21fde342ca455a07d83d7b96ca5078794d658874cb4fa9f3ac7eb7194aa5b2ff57b8a1353955a5d91712b8777d4d425dd1427e118db418e0f23fa9c3f2f
-EBUILD vtk-6.1.0-r1.ebuild 10479 SHA256 8f89accc04fb1e2ea181ff5b71b60fae8ff801735a4c72cc97214151078f0dc1 SHA512 3a77125d7d3e5bcc4404d7d50a7066a5eeb7f0f15e110c17722d521e9d4400e3ccf70d81dc9dcf88464b554392ff30b43c7dd753140bd7e026f0c248f1aa9909 WHIRLPOOL 342d542df2ffd2c623e1c2ebc4695603316cf4af66ffe1291d8e095271aeec338f1a4b74f7e5b413cd94a0a71bcb4a2efee7dd638567c4a92606d1c9966f9c64
-EBUILD vtk-6.1.0.ebuild 10300 SHA256 cf4bfed0cb4b00789c5fc732a1f6c20589d85777378981400da4c51fdaec4db5 SHA512 9742ce91ca78ff234f1e8ff2d94cc9afba7f27aeffa56b596d663cfa868574fdd857c76fa6f249fbbde841b9a66875d9cdbc38f82da975b2262f58c3b69da378 WHIRLPOOL 297cf88da322f3f4bb278f4a0518ba663f71004081a1d7b3bdac047481e6cdb144320ca595a6f186203ded7882ff2aaa87cc7045093d260756883251e152ba96
-MISC ChangeLog 20541 SHA256 17790c0ae1e2cb09cc9552d5c2ed3e00eb5f4c9015c04edd21b1954c03ebd243 SHA512 57217a13a42d614343d1c326745261fda18ce2a63a906d169437ccd06c0d7c334b83e25e8419b496d2a8b54f2492c1f4cfb58ea419dc60fb4c4a0addfbdbdc9f WHIRLPOOL 54d9b59f466d9dcab99ccc06c1f210ba930ea8c5cca2aef308fd87002290a859359661a98872fee5b1ef1649cc3072fc0863ba3e220a5d33cf7f95e660e3c0a1
+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
 MISC metadata.xml 1135 SHA256 4ded3033a3776deccd061166fbbe5cc43dc2c2a4a2d6b6cb34e850f7cdcc8c63 SHA512 f673c721db73ad0d7e7453d9344d1daf5558ba9cb00ffd3ccbd22d2bb512f80c9259b837834f30991443eaf44fb33f5cf39f790f84b8cd3b62aec9b5d467dab0 WHIRLPOOL f8d98412e37a0e86697c8752da55c2588f92730d7f5d3dd59d7c2503af68ad0694b754f98f87a1e7239a2537807e0ee8eceb23ea089cb5f704bdcc7642e1e90b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJU2GfyXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJU6cPoXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirqk4QAJr6DbDm9uuxwP0XuxaxeCaD
-4J06SrZ+CNhe/NOumHS7kKojp0Hz5wqDrba2K9cjHVhtZc+PNC7FgQiGLLDazZVC
-pa6KJdkU6uSaSRm3kLALhKTtrMUS+X8sK8fmIqo6qPl5jhnOJ8WstDhW4SPVYdz0
-PECJlCzE9Mp9QYpvdIm1xuZcBsLr8eF1BiirWdozHoDRdOp1B4I0b7XM6g2A/Mf5
-syaAmq8Kn1vW8ii05zs+yrbmnH9F/jmvdh2Hy3X4k/T478EPoeqD+NeXSq2y8RN6
-WnGjL1u14o8DC6mgwZQg2eJKQjYjeTGpO4AhI9wFkx4+GOI7fw6/wfEQjna+rm63
-FBwlfvJyawjWr80s+aNe/NJcilVzNBPn7lYvEhM987exFykT6dXP6VAW3EK8P5Cg
-EhfVQyw94K6LOSpl9nz+yEXbc1gcQETKbfhzkDr6DX2GkyT6k0Y5LpagNWgbOXBh
-GawEehF/N1LUgLDOsqyHf1iF9f41snAtC8mlqPyGaU0h4mqMPM/Sjcg2Gj5tqzst
-ifHObEckD/bTPEdPmN3OSeICVLIfd2BeG0Hytotwy2haddlZXRWw3hZqABomQa+q
-TVv9Rzh0+h9zLgz1hxg3XI16u7tLAP3lFS1reF0I4WY3e9Tp7qL0fbUABNPZrtMS
-Tat5f0SeSffIW/WcTOCz
-=liO3
+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
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/vtk/vtk-6.0.0.ebuild b/sci-libs/vtk/vtk-6.0.0.ebuild
index 282df04bd45e27e8f6a0435deee079ee766680e0..5a89ab2bc0b7e41ff1bdc211797c8cb750766a0d 100644 (file)
--- a/sci-libs/vtk/vtk-6.0.0.ebuild
+++ b/sci-libs/vtk/vtk-6.0.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# 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.0.0.ebuild,v 1.10 2014/12/28 16:53:38 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-6.0.0.ebuild,v 1.11 2015/02/22 11:51:52 jlec Exp $
 
 EAPI=5
 
@@ -38,15 +38,15 @@ RDEPEND="
        dev-libs/expat
        dev-libs/libxml2:2
        media-libs/freetype
-       media-libs/libpng
+       media-libs/libpng:0
        media-libs/mesa
        media-libs/libtheora
-       media-libs/tiff
+       media-libs/tiff:0
        sci-libs/exodusii
        sci-libs/hdf5:=
        sci-libs/netcdf-cxx:3
        sys-libs/zlib
-       virtual/jpeg
+       virtual/jpeg:0
        virtual/opengl
        >=x11-libs/gl2ps-1.3.8
        x11-libs/libX11
@@ -60,12 +60,12 @@ RDEPEND="
                sci-libs/vtkdata
        )
        ffmpeg? ( virtual/ffmpeg )
-       java? ( >=virtual/jre-1.5 )
+       java? ( >=virtual/jre-1.5:* )
        mpi? ( virtual/mpi[cxx,romio] )
        mysql? ( virtual/mysql )
        odbc? ( dev-db/unixODBC )
        offscreen? ( media-libs/mesa[osmesa] )
-       postgres? ( dev-db/postgresql )
+       postgres? ( dev-db/postgresql:= )
        python? (
                ${PYTHON_DEPS}
                dev-python/sip[${PYTHON_USEDEP}]
@@ -254,8 +254,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-r1.ebuild b/sci-libs/vtk/vtk-6.1.0-r1.ebuild
index 3c10f7d385a3f7ecb8655d0ef3e91b3593e71395..38fc2846b8108df0f63220ffea78944f1cb6e6c2 100644 (file)
--- 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.3 2015/02/09 07:55:31 jlec Exp $
+# $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 $
 
 EAPI=5
 
@@ -50,15 +50,15 @@ RDEPEND="
        dev-libs/jsoncpp
        dev-libs/libxml2:2
        >=media-libs/freetype-2.5.4
-       media-libs/libpng
+       media-libs/libpng:0
        media-libs/mesa
        media-libs/libtheora
-       media-libs/tiff
+       media-libs/tiff:0
        sci-libs/exodusii
        sci-libs/hdf5:=
        sci-libs/netcdf-cxx:3
        sys-libs/zlib
-       virtual/jpeg
+       virtual/jpeg:0
        virtual/opengl
        >=x11-libs/gl2ps-1.3.8
        x11-libs/libX11
@@ -73,7 +73,7 @@ RDEPEND="
        )
        ffmpeg? ( virtual/ffmpeg )
        gdal? ( sci-libs/gdal )
-       java? ( >=virtual/jre-1.5 )
+       java? ( >=virtual/jre-1.5:* )
        kaapi? ( <sci-libs/xkaapi-3 )
        mpi? (
                virtual/mpi[cxx,romio]
@@ -81,7 +81,7 @@ RDEPEND="
        mysql? ( virtual/mysql )
        odbc? ( dev-db/unixODBC )
        offscreen? ( media-libs/mesa[osmesa] )
-       postgres? ( dev-db/postgresql )
+       postgres? ( dev-db/postgresql:= )
        python? (
                ${PYTHON_DEPS}
                dev-python/sip[${PYTHON_USEDEP}]
diff --git a/sci-libs/vtk/vtk-6.1.0.ebuild b/sci-libs/vtk/vtk-6.1.0.ebuild
index a9905c44cb11d15f1679c80a346096cf6fcd0bb1..4c22eb89276069253e21b802e94d02c0417d3964 100644 (file)
--- a/sci-libs/vtk/vtk-6.1.0.ebuild
+++ b/sci-libs/vtk/vtk-6.1.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# 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.3 2014/12/28 16:53:38 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-6.1.0.ebuild,v 1.4 2015/02/22 11:51:52 jlec Exp $
 
 EAPI=5
 
@@ -49,15 +49,15 @@ RDEPEND="
        dev-libs/expat
        dev-libs/libxml2:2
        >=media-libs/freetype-2.5.4
-       media-libs/libpng
+       media-libs/libpng:0
        media-libs/mesa
        media-libs/libtheora
-       media-libs/tiff
+       media-libs/tiff:0
        sci-libs/exodusii
        sci-libs/hdf5:=
        sci-libs/netcdf-cxx:3
        sys-libs/zlib
-       virtual/jpeg
+       virtual/jpeg:0
        virtual/opengl
        >=x11-libs/gl2ps-1.3.8
        x11-libs/libX11
@@ -72,7 +72,7 @@ RDEPEND="
        )
        ffmpeg? ( virtual/ffmpeg )
        gdal? ( sci-libs/gdal )
-       java? ( >=virtual/jre-1.5 )
+       java? ( >=virtual/jre-1.5:* )
        kaapi? ( <sci-libs/xkaapi-3 )
        mpi? (
                virtual/mpi[cxx,romio]
@@ -80,7 +80,7 @@ RDEPEND="
        mysql? ( virtual/mysql )
        odbc? ( dev-db/unixODBC )
        offscreen? ( media-libs/mesa[osmesa] )
-       postgres? ( dev-db/postgresql )
+       postgres? ( dev-db/postgresql:= )
        python? (
                ${PYTHON_DEPS}
                dev-python/sip[${PYTHON_USEDEP}]
Unnamed repository; edit this file 'description' to name the repository.