jlec 15/02/22 11:51:52
Modified: vtk-6.1.0-r1.ebuild vtk-6.1.0.ebuild
vtk-6.0.0.ebuild ChangeLog
Log:
Correctly detect detect libdir, #513680; fix SLOT operators
(Portage version: 2.2.17/cvs/Linux x86_64, signed Manifest commit with key
B9D4F231BD1558AB!)
Revision Changes Path
1.4 sci-libs/vtk/vtk-6.1.0-r1.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/vtk/vtk-6.1.0-r1.ebuild?rev=1.4&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/vtk/vtk-6.1.0-r1.ebuild?rev=1.4&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/vtk/vtk-6.1.0-r1.ebuild?r1=1.3&r2=1.4
Index: vtk-6.1.0-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-6.1.0-r1.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- vtk-6.1.0-r1.ebuild 9 Feb 2015 07:55:31 -0000 1.3
+++ vtk-6.1.0-r1.ebuild 22 Feb 2015 11:51:52 -0000 1.4
@@ -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 @@
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 @@
)
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 @@
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}]
1.4 sci-libs/vtk/vtk-6.1.0.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/vtk/vtk-6.1.0.ebuild?rev=1.4&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/vtk/vtk-6.1.0.ebuild?rev=1.4&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/vtk/vtk-6.1.0.ebuild?r1=1.3&r2=1.4
Index: vtk-6.1.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-6.1.0.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- vtk-6.1.0.ebuild 28 Dec 2014 16:53:38 -0000 1.3
+++ vtk-6.1.0.ebuild 22 Feb 2015 11:51:52 -0000 1.4
@@ -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 @@
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 @@
)
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 @@
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}]
1.11 sci-libs/vtk/vtk-6.0.0.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/vtk/vtk-6.0.0.ebuild?rev=1.11&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/vtk/vtk-6.0.0.ebuild?rev=1.11&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/vtk/vtk-6.0.0.ebuild?r1=1.10&r2=1.11
Index: vtk-6.0.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-6.0.0.ebuild,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- vtk-6.0.0.ebuild 28 Dec 2014 16:53:38 -0000 1.10
+++ vtk-6.0.0.ebuild 22 Feb 2015 11:51:52 -0000 1.11
@@ -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 @@
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 @@
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 @@
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
1.126 sci-libs/vtk/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/vtk/ChangeLog?rev=1.126&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/vtk/ChangeLog?rev=1.126&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/vtk/ChangeLog?r1=1.125&r2=1.126
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -r1.125 -r1.126
--- ChangeLog 9 Feb 2015 07:55:31 -0000 1.125
+++ ChangeLog 22 Feb 2015 11:51:52 -0000 1.126
@@ -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 <[email protected]> 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 <[email protected]> +files/vtk-6.1.0-memset.patch,
vtk-6.1.0-r1.ebuild:
