enabling java plugin.

Package-Manager: portage-2.1.8.3/cvs/Linux i686

diff --git a/dev-games/crystalspace/ChangeLog b/dev-games/crystalspace/ChangeLog
index f33a2ad97f802ea287d6742a487b8f537e67afe1..1e1de493019ffc6b5f723bc224911fcee7b25323 100644 (file)
--- a/dev-games/crystalspace/ChangeLog
+++ b/dev-games/crystalspace/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-games/crystalspace
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/crystalspace/ChangeLog,v 1.45 2010/06/20 16:53:01 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/crystalspace/ChangeLog,v 1.46 2010/06/21 15:59:06 tupone Exp $
+
+  21 Jun 2010; Tupone Alfredo <tupone@gentoo.org> crystalspace-1.4.0.ebuild:
+  enabling java plugin. 
 
   20 Jun 2010; Tupone Alfredo <tupone@gentoo.org> crystalspace-1.4.0.ebuild,
   +files/crystalspace-1.4.0-bullet.patch, metadata.xml:

diff --git a/dev-games/crystalspace/Manifest b/dev-games/crystalspace/Manifest
index c23710426a6f3f0fdc6e415c7b550e8aa2c7a0fe..87b42a6c7aa666ab56fc031c75ed9ef44bde1629 100644 (file)
--- a/dev-games/crystalspace/Manifest
+++ b/dev-games/crystalspace/Manifest
@@ -3,6 +3,6 @@ AUX crystalspace-1.4.0-bullet.patch 501 RMD160 8a5c37029c5c1470d1c73b5e0b38df093
 DIST crystalspace-src-1.2.1.tar.bz2 47313388 RMD160 0f6582a9c68694189811a574bc63b5ce1a6a1166 SHA1 0f1b5604b217dfd9f65f54caeef5362d0ab92203 SHA256 23312a5a0330b281f517555207fed151e3d08c1096bb0cc9dd72dcabdced1b10
 DIST crystalspace-src-1.4.0.tar.bz2 45670477 RMD160 af89e74a96bac7f55079a6cdad7fd938a38af602 SHA1 10f4dd50c654ad9292602a91189a0ee78a8fe353 SHA256 a8e1bfc9328470121bfbc6cf98f2c310a34f6998978065aa2f6df7e02a0101ba
 EBUILD crystalspace-1.2.1.ebuild 3403 RMD160 1269f0e0b83fbb5abad0594854e414f051c66e16 SHA1 1e7d3a10e630ed6858e29cbd26281bb61d9f1a91 SHA256 62a51af9706cd00625406917e73bd0f73a22e0e2855183c1852779f19ace357f
-EBUILD crystalspace-1.4.0.ebuild 3514 RMD160 3897595ff2813ff4686e9d8d405d1100bd144188 SHA1 bc3f84c556ce5542e9d02f4256fddcf13f03a7c4 SHA256 167a334461d6d5665a00749e580b8739288adb3e983aa58210612ff50de66817
-MISC ChangeLog 7083 RMD160 a2157de7267249e2d010ebd0b540be9f51de6424 SHA1 6a77f515b6065bab65ed9a53fe1bfd74096dcf54 SHA256 872293189fe685a90f7d265bbe5c6165a416889811ce568943c0413a54cd9f57
+EBUILD crystalspace-1.4.0.ebuild 3618 RMD160 690bf46834d5bc0279f2d670a03dcfaf2bf8c544 SHA1 0425fbdc23ce8864408cca5295bd950c9d911a26 SHA256 d3c0361c9b53233a1b68018bc380e7e90c9d648b3f34b169a64dadb60c960d2c
+MISC ChangeLog 7186 RMD160 7ca05635d0f93fcc18405c10fe5bdfe333e68374 SHA1 787188e9f91fc51a4e8e905c4816560246783b5a SHA256 cd59c8f02a1aa7b2ebfe52d12fa4abfcc96edd35648071762a81d5bdab90287c
 MISC metadata.xml 1309 RMD160 4ec4d408ea75402333583b2b19d91dcd95b2be9c SHA1 4ed88885584d54c8dd3ddaad2ae7aefb972b180b SHA256 94be39659027a6759ea4645650771553d5982ee01253f860bc526270e83cc283

diff --git a/dev-games/crystalspace/crystalspace-1.4.0.ebuild b/dev-games/crystalspace/crystalspace-1.4.0.ebuild
index 9087c3ba529a248c2cc57b3e80a9597481ff1ce1..a1fdfa159e36dcf56330358edbfd5406a564e07a 100644 (file)
--- a/dev-games/crystalspace/crystalspace-1.4.0.ebuild
+++ b/dev-games/crystalspace/crystalspace-1.4.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/crystalspace/crystalspace-1.4.0.ebuild,v 1.4 2010/06/20 16:53:01 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/crystalspace/crystalspace-1.4.0.ebuild,v 1.5 2010/06/21 15:59:07 tupone Exp $
 
 EAPI=2
-inherit eutils flag-o-matic multilib autotools wxwidgets
+inherit eutils flag-o-matic multilib java-pkg-opt-2 autotools wxwidgets
 
 MY_P=${PN}-src-${PV}
 DESCRIPTION="Portable 3D Game Development Kit written in C++"
@@ -13,10 +13,10 @@ SRC_URI="mirror://sourceforge/crystal/${MY_P}.tar.bz2"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="3ds alsa bullet cal3d cegui cg doc jpeg mng ode png python
+IUSE="3ds alsa bullet cal3d cegui cg doc java jpeg mng ode png python
 sdl speex truetype vorbis wxwidgets"
 
-RDEPEND="virtual/opengl
+COMMON_DEP="virtual/opengl
        media-libs/openal
        x11-libs/libXt
        x11-libs/libXxf86vm
@@ -37,7 +37,12 @@ RDEPEND="virtual/opengl
        cegui? ( >=dev-games/cegui-0.5.0 )
        3ds? ( media-libs/lib3ds )"
 
-DEPEND="${RDEPEND}
+RDEPEND="${COMMON_DEP}
+       java? ( >=virtual/jre-1.5 )"
+
+DEPEND="${COMMON_DEP}
+       java? ( >=virtual/jdk-1.5
+               dev-java/ant-core )
        dev-util/ftjam
        dev-lang/swig
        dev-util/pkgconfig"
@@ -72,7 +77,7 @@ src_configure() {
                --without-caca \
                --without-jackasyn \
                --without-perl \
-               --without-java \
+               $(use_with java) \
                --disable-make-emulation \
                $(use_with bullet) \
                $(use_with python) \
@@ -102,11 +107,10 @@ src_compile() {
 }
 
 src_install() {
-       for installTarget in install_bin install_plugin install_lib \
-               install_include install_data install_config
+       for installTarget in bin plugin lib include data config bindings
        do
-               jam -q -s DESTDIR="${D}" ${installTarget} \
-                       || die "jam ${installTarget} failed"
+               jam -q -s DESTDIR="${D}" install_${installTarget} \
+                       || die "jam install_${installTarget} failed"
        done
        if use doc; then
                jam -q -s DESTDIR="${D}" install_doc || die "jam install_doc failed"