jlec 15/03/11 08:30:12
Modified: vtk-6.1.0-r1.ebuild vtk-6.1.0.ebuild
vtk-6.0.0.ebuild ChangeLog
Log:
Use qmake-utils.eclass to determine qt tools, #542832
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key
B9D4F231BD1558AB!)
Revision Changes Path
1.8 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.8&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/vtk/vtk-6.1.0-r1.ebuild?rev=1.8&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/vtk/vtk-6.1.0-r1.ebuild?r1=1.7&r2=1.8
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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- vtk-6.1.0-r1.ebuild 9 Mar 2015 00:05:43 -0000 1.7
+++ vtk-6.1.0-r1.ebuild 11 Mar 2015 08:30:12 -0000 1.8
@@ -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.7
2015/03/09 00:05:43 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-6.1.0-r1.ebuild,v 1.8
2015/03/11 08:30:12 jlec Exp $
EAPI=5
@@ -9,7 +9,7 @@
WEBAPP_OPTIONAL=yes
WEBAPP_MANUAL_SLOT=yes
-inherit eutils flag-o-matic java-pkg-opt-2 python-single-r1 qt4-r2 versionator
toolchain-funcs cmake-utils virtualx webapp
+inherit eutils flag-o-matic java-pkg-opt-2 python-single-r1 qmake-utils
versionator toolchain-funcs cmake-utils virtualx webapp
# Short package version
SPV="$(get_version_component_range 1-2)"
@@ -305,10 +305,10 @@
-DVTK_INSTALL_QT_DIR=/$(get_libdir)/qt4/plugins/designer
-DDESIRED_QT_VERSION=4
-DVTK_QT_VERSION=4
- -DQT_MOC_EXECUTABLE="${EPREFIX}/usr/bin/moc"
- -DQT_UIC_EXECUTABLE="${EPREFIX}/usr/bin/uic"
+ -DQT_MOC_EXECUTABLE="$(qt4_get_bindir)/moc"
+ -DQT_UIC_EXECUTABLE="$(qt4_get_bindir)/uic"
-DQT_INCLUDE_DIR="${EPREFIX}/usr/include/qt4"
- -DQT_QMAKE_EXECUTABLE="${EPREFIX}/usr/bin/qmake"
+ -DQT_QMAKE_EXECUTABLE="$(qt4_get_bindir)/qmake"
)
fi
1.6 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.6&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/vtk/vtk-6.1.0.ebuild?rev=1.6&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/vtk/vtk-6.1.0.ebuild?r1=1.5&r2=1.6
Index: vtk-6.1.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-6.1.0.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- vtk-6.1.0.ebuild 23 Feb 2015 08:16:14 -0000 1.5
+++ vtk-6.1.0.ebuild 11 Mar 2015 08:30:12 -0000 1.6
@@ -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.5
2015/02/23 08:16:14 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-6.1.0.ebuild,v 1.6
2015/03/11 08:30:12 jlec Exp $
EAPI=5
@@ -9,7 +9,7 @@
WEBAPP_OPTIONAL=yes
WEBAPP_MANUAL_SLOT=yes
-inherit eutils flag-o-matic java-pkg-opt-2 python-single-r1 qt4-r2 versionator
toolchain-funcs cmake-utils virtualx webapp
+inherit eutils flag-o-matic java-pkg-opt-2 python-single-r1 qmake-utils
versionator toolchain-funcs cmake-utils virtualx webapp
# Short package version
SPV="$(get_version_component_range 1-2)"
@@ -304,10 +304,10 @@
-DVTK_INSTALL_QT_DIR=/$(get_libdir)/qt4/plugins/designer
-DDESIRED_QT_VERSION=4
-DVTK_QT_VERSION=4
- -DQT_MOC_EXECUTABLE="${EPREFIX}/usr/bin/moc"
- -DQT_UIC_EXECUTABLE="${EPREFIX}/usr/bin/uic"
+ -DQT_MOC_EXECUTABLE="$(qt4_get_bindir)/moc"
+ -DQT_UIC_EXECUTABLE="$(qt4_get_bindir)/uic"
-DQT_INCLUDE_DIR="${EPREFIX}/usr/include/qt4"
- -DQT_QMAKE_EXECUTABLE="${EPREFIX}/usr/bin/qmake"
+ -DQT_QMAKE_EXECUTABLE="$(qt4_get_bindir)/qmake"
)
fi
1.12 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.12&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/vtk/vtk-6.0.0.ebuild?rev=1.12&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/vtk/vtk-6.0.0.ebuild?r1=1.11&r2=1.12
Index: vtk-6.0.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-6.0.0.ebuild,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- vtk-6.0.0.ebuild 22 Feb 2015 11:51:52 -0000 1.11
+++ vtk-6.0.0.ebuild 11 Mar 2015 08:30:12 -0000 1.12
@@ -1,13 +1,13 @@
# 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.11
2015/02/22 11:51:52 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-6.0.0.ebuild,v 1.12
2015/03/11 08:30:12 jlec Exp $
EAPI=5
PYTHON_COMPAT=( python{2_6,2_7} )
CMAKE_MAKEFILE_GENERATOR=ninja
-inherit eutils flag-o-matic java-pkg-opt-2 python-single-r1 qt4-r2 versionator
toolchain-funcs cmake-utils virtualx
+inherit eutils flag-o-matic java-pkg-opt-2 python-single-r1 qmake-utils
versionator toolchain-funcs cmake-utils virtualx
# Short package version
SPV="$(get_version_component_range 1-2)"
@@ -243,10 +243,10 @@
-DQT_WRAP_UI=ON
-DVTK_INSTALL_QT_DIR=/$(get_libdir)/qt4/plugins/designer
-DDESIRED_QT_VERSION=4
- -DQT_MOC_EXECUTABLE="${EPREFIX}/usr/bin/moc"
- -DQT_UIC_EXECUTABLE="${EPREFIX}/usr/bin/uic"
+ -DQT_MOC_EXECUTABLE="$(qt4_get_bindir)/moc"
+ -DQT_UIC_EXECUTABLE="$(qt4_get_bindir)/uic"
-DQT_INCLUDE_DIR="${EPREFIX}/usr/include/qt4"
- -DQT_QMAKE_EXECUTABLE="${EPREFIX}/usr/bin/qmake"
+ -DQT_QMAKE_EXECUTABLE="$(qt4_get_bindir)/qmake"
)
fi
1.130 sci-libs/vtk/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/vtk/ChangeLog?rev=1.130&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/vtk/ChangeLog?rev=1.130&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/vtk/ChangeLog?r1=1.129&r2=1.130
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -r1.129 -r1.130
--- ChangeLog 9 Mar 2015 00:05:43 -0000 1.129
+++ ChangeLog 11 Mar 2015 08:30:12 -0000 1.130
@@ -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.129 2015/03/09
00:05:43 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v 1.130 2015/03/11
08:30:12 jlec Exp $
+
+ 11 Mar 2015; Justin Lecher <[email protected]> vtk-6.0.0.ebuild,
+ vtk-6.1.0-r1.ebuild, vtk-6.1.0.ebuild:
+ Use qmake-utils.eclass to determine qt tools, #542832
09 Mar 2015; Pacho Ramos <[email protected]> vtk-6.1.0-r1.ebuild:
x86 stable, bug 540290
