Moved to new java system. Removed -j1 from emake since it works fine here with -j2.

Package-Manager: portage-2.1.1_pre3-r1

3 files changed, 18 insertions, 13 deletions

diff --git a/sci-libs/vtk/ChangeLog b/sci-libs/vtk/ChangeLog
index 9e5d5410f504..41cc336d95d8 100644
--- a/sci-libs/vtk/ChangeLog
+++ b/sci-libs/vtk/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-libs/vtk
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v 1.20 2006/07/10 12:41:27 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v 1.21 2006/07/21 02:09:59 markusle Exp $
+
+  20 Jul 2006; Markus Dittrich <markusle@gentoo.org> vtk-5.0.1.ebuild:
+  Moved to new java system. Removed -j1 from emake since it works 
+  fine here with -j2.
 
 *vtk-5.0.1 (09 Jul 2006)
 
diff --git a/sci-libs/vtk/Manifest b/sci-libs/vtk/Manifest
index cf621ec91656..00afc1bbaab1 100644
--- a/sci-libs/vtk/Manifest
+++ b/sci-libs/vtk/Manifest
@@ -21,14 +21,14 @@ EBUILD vtk-5.0.0.ebuild 8303 RMD160 30fe10485f8e4832bb00a3ca5719b1f68da64145 SHA
 MD5 649790c3bfd3fffd6a4973ebc1a58591 vtk-5.0.0.ebuild 8303
 RMD160 30fe10485f8e4832bb00a3ca5719b1f68da64145 vtk-5.0.0.ebuild 8303
 SHA256 c0c11e198c8bc0038a9f3bac2e77f744f724572751c5c8837e0b65af25784016 vtk-5.0.0.ebuild 8303
-EBUILD vtk-5.0.1.ebuild 8334 RMD160 95f4af4dc4447b58ae1d79c74d1333d3d96f78c0 SHA1 2a6504237ead9d9eeb36cf3bce4daadf2f4c865e SHA256 79b44815d45a5ab3206eb9ef48929db84d7432505b1ce9dd48a53a5da712c08f
-MD5 41be839264f069b7849d22e25b7f6391 vtk-5.0.1.ebuild 8334
-RMD160 95f4af4dc4447b58ae1d79c74d1333d3d96f78c0 vtk-5.0.1.ebuild 8334
-SHA256 79b44815d45a5ab3206eb9ef48929db84d7432505b1ce9dd48a53a5da712c08f vtk-5.0.1.ebuild 8334
-MISC ChangeLog 3658 RMD160 f829e4145f2d26ce223a68ffc3f6989656626686 SHA1 3c957980d82e18451b3cbf85cd9305579001a17a SHA256 1f9d807e0e168dfe7a5005a2cf19fb375a830089a0157a272ed8d1cc97d2e422
-MD5 029feb1c98a257d88b59a854d70b9b08 ChangeLog 3658
-RMD160 f829e4145f2d26ce223a68ffc3f6989656626686 ChangeLog 3658
-SHA256 1f9d807e0e168dfe7a5005a2cf19fb375a830089a0157a272ed8d1cc97d2e422 ChangeLog 3658
+EBUILD vtk-5.0.1.ebuild 8357 RMD160 949e9d2d7e8761b6346b081b84d3a2f4764d0455 SHA1 582f6e3926fe9e909b5d7824dd13c06f456b35c3 SHA256 faede8e9e25d0a8d55adfa2535fb3c0dd2982b0e96fccfc2cee2da4beb0fc0d4
+MD5 12d12ee568dcae16e7939e97ae02f716 vtk-5.0.1.ebuild 8357
+RMD160 949e9d2d7e8761b6346b081b84d3a2f4764d0455 vtk-5.0.1.ebuild 8357
+SHA256 faede8e9e25d0a8d55adfa2535fb3c0dd2982b0e96fccfc2cee2da4beb0fc0d4 vtk-5.0.1.ebuild 8357
+MISC ChangeLog 3819 RMD160 7a2051f645de47ab073c9b2b6d9f006516d331db SHA1 897ebeb3c4453929a4fc25a3b666aeb497cb4dc4 SHA256 bd9a9a09d6faa7f7be46f5925c558d2ba425358e89dae815cc58eb7009cb34f7
+MD5 5a2f3b79ea2a86e9462d58292a4ec656 ChangeLog 3819
+RMD160 7a2051f645de47ab073c9b2b6d9f006516d331db ChangeLog 3819
+SHA256 bd9a9a09d6faa7f7be46f5925c558d2ba425358e89dae815cc58eb7009cb34f7 ChangeLog 3819
 MISC metadata.xml 254 RMD160 8e9562c9dd3bd05fdf2dd40bcc5b2ed3dbe9ab75 SHA1 53acb8f334765223c1030a8eb242d584ad376706 SHA256 131c089c8a699c3fb7e8b914f68af259e0b0ad341fba3a8f87827871fc7be701
 MD5 faca3b9ef12d38400a0b53e1818ce89d metadata.xml 254
 RMD160 8e9562c9dd3bd05fdf2dd40bcc5b2ed3dbe9ab75 metadata.xml 254
diff --git a/sci-libs/vtk/vtk-5.0.1.ebuild b/sci-libs/vtk/vtk-5.0.1.ebuild
index c7530c484703..8f697d2c95fd 100644
--- a/sci-libs/vtk/vtk-5.0.1.ebuild
+++ b/sci-libs/vtk/vtk-5.0.1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.0.1.ebuild,v 1.1 2006/07/10 12:41:27 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.0.1.ebuild,v 1.2 2006/07/21 02:09:59 markusle Exp $
 
 # TODO: need to fix Examples/CMakeLists.txt to build other examples
 
-inherit distutils eutils flag-o-matic toolchain-funcs versionator java-pkg python qt3
+inherit distutils eutils flag-o-matic toolchain-funcs versionator java-pkg-opt-2 python qt3
 
 # Short package version
 SPV="$(get_version_component_range 1-2)"
@@ -17,7 +17,7 @@ SRC_URI="http://www.${PN}.org/files/release/${SPV}/${P}.tar.gz
 LICENSE="BSD"
 KEYWORDS="~x86"
 SLOT="0"
-IUSE="doc examples java mpi patented python tcl tk threads qt3 qt4"
+IUSE="doc examples mpi patented python tcl tk threads qt3 qt4"
 RDEPEND="java? ( =virtual/jdk-1.4* )
 	mpi? ( sys-cluster/mpich )
 	python? ( >=dev-lang/python-2.0 )
@@ -39,6 +39,7 @@ S="${WORKDIR}"/VTK
 
 
 pkg_setup() {
+	java-pkg-opt-2_pkg_setup
 	if use qt3 && use qt4; then
 		echo
 		ewarn "qt3 and qt4 support for vtk are mutually exclusive and"
@@ -161,7 +162,7 @@ src_compile() {
 		|| die "Failed to patch javac"
 	fi
 
-	emake -j1 || die "emake failed"
+	emake || die "emake failed"
 }
 
 src_install() {