[gentoo-commits] proj/kde:master commit in: kde-base/krossjava/

[gentoo-commits] proj/kde:master commit in: kde-base/krossjava/

[Jonathan Callen]

commit:     c13fb353d0394fb8426cc2e5b76f34101c39e25d
Author:     abcd <abcd <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 11 04:43:18 2011 +0000
Commit:     Jonathan Callen <abcd <AT> gentoo <DOT> org>
CommitDate: Mon Apr 11 04:46:27 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=c13fb353

[kde-base/krossjava] Include fixes from gx86

(Portage version: 2.2.0_alpha29_p11/git/Linux i686, signed Manifest commit with key 229E5838)

---
 kde-base/krossjava/krossjava-4.6.9999.ebuild |   11 ++++++++++-
 kde-base/krossjava/krossjava-9999.ebuild     |   11 ++++++++++-
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/kde-base/krossjava/krossjava-4.6.9999.ebuild b/kde-base/krossjava/krossjava-4.6.9999.ebuild
index b7bae3f..ec603a9 100644
--- a/kde-base/krossjava/krossjava-4.6.9999.ebuild
+++ b/kde-base/krossjava/krossjava-4.6.9999.ebuild
@@ -23,6 +23,11 @@ RESTRICT="test"
 
 PATCHES=( "${FILESDIR}/${PN}-4.2.3_includes.patch" )
 
+pkg_setup() {
+	kde4-meta_pkg_setup
+	java-pkg-2_pkg_setup
+}
+
 src_prepare() {
 	find "${S}" -iname '*.jar' | xargs rm -v
 	kde4-meta_src_prepare
@@ -31,7 +36,6 @@ src_prepare() {
 
 src_configure() {
 	mycmakeargs=(-DENABLE_KROSSJAVA=ON)
-	export JAVA_HOME=$(java-config -g JAVA_HOME)
 	kde4-meta_src_configure
 	java-ant-2_src_configure
 }
@@ -57,3 +61,8 @@ src_install() {
 		"${KDEDIR}/$(get_libdir)/kde4/kross/kross.jar"
 	java-pkg_regso "${ED}/${KDEDIR}/$(get_libdir)/kde4/libkrossjava.so"
 }
+
+pkg_preinst() {
+	kde4-meta_pkg_preinst
+	java-pkg-2_pkg_preinst
+}

diff --git a/kde-base/krossjava/krossjava-9999.ebuild b/kde-base/krossjava/krossjava-9999.ebuild
index b7bae3f..ec603a9 100644
--- a/kde-base/krossjava/krossjava-9999.ebuild
+++ b/kde-base/krossjava/krossjava-9999.ebuild
@@ -23,6 +23,11 @@ RESTRICT="test"
 
 PATCHES=( "${FILESDIR}/${PN}-4.2.3_includes.patch" )
 
+pkg_setup() {
+	kde4-meta_pkg_setup
+	java-pkg-2_pkg_setup
+}
+
 src_prepare() {
 	find "${S}" -iname '*.jar' | xargs rm -v
 	kde4-meta_src_prepare
@@ -31,7 +36,6 @@ src_prepare() {
 
 src_configure() {
 	mycmakeargs=(-DENABLE_KROSSJAVA=ON)
-	export JAVA_HOME=$(java-config -g JAVA_HOME)
 	kde4-meta_src_configure
 	java-ant-2_src_configure
 }
@@ -57,3 +61,8 @@ src_install() {
 		"${KDEDIR}/$(get_libdir)/kde4/kross/kross.jar"
 	java-pkg_regso "${ED}/${KDEDIR}/$(get_libdir)/kde4/libkrossjava.so"
 }
+
+pkg_preinst() {
+	kde4-meta_pkg_preinst
+	java-pkg-2_pkg_preinst
+}

[gentoo-commits] proj/kde:master commit in: kde-base/krossjava/

[Jonathan Callen]

commit:     25565cdfc8138e43d2b945a763248c67a30c066f
Author:     Jonathan Callen <abcd <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 13 00:15:47 2011 +0000
Commit:     Jonathan Callen <abcd <AT> gentoo <DOT> org>
CommitDate: Mon Jun 13 00:15:47 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=25565cdf

[kde-base/krossjava] Simplify symlink a bit

---
 kde-base/krossjava/krossjava-4.6.49.9999.ebuild |    2 +-
 kde-base/krossjava/krossjava-4.6.80.ebuild      |    2 +-
 kde-base/krossjava/krossjava-9999.ebuild        |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/kde-base/krossjava/krossjava-4.6.49.9999.ebuild b/kde-base/krossjava/krossjava-4.6.49.9999.ebuild
index c5124cd..1e2a960 100644
--- a/kde-base/krossjava/krossjava-4.6.49.9999.ebuild
+++ b/kde-base/krossjava/krossjava-4.6.49.9999.ebuild
@@ -50,7 +50,7 @@ src_install() {
 	kde4-meta_src_install
 	java-pkg_dojar "${ED}/usr/$(get_libdir)/kde4/kross/kross.jar"
 
-	dosym ../../../../usr/share/${PN}-${SLOT}/lib/kross.jar \
+	dosym ../../../share/${PN}-${SLOT}/lib/kross.jar \
 		/usr/$(get_libdir)/kde4/kross/kross.jar
 	java-pkg_regso "${ED}/usr/$(get_libdir)/kde4/libkrossjava.so"
 }

diff --git a/kde-base/krossjava/krossjava-4.6.80.ebuild b/kde-base/krossjava/krossjava-4.6.80.ebuild
index 0eb837e..d883a90 100644
--- a/kde-base/krossjava/krossjava-4.6.80.ebuild
+++ b/kde-base/krossjava/krossjava-4.6.80.ebuild
@@ -50,7 +50,7 @@ src_install() {
 	kde4-meta_src_install
 	java-pkg_dojar "${ED}/usr/$(get_libdir)/kde4/kross/kross.jar"
 
-	dosym ../../../../usr/share/${PN}-${SLOT}/lib/kross.jar \
+	dosym ../../../share/${PN}-${SLOT}/lib/kross.jar \
 		/usr/$(get_libdir)/kde4/kross/kross.jar
 	java-pkg_regso "${ED}/usr/$(get_libdir)/kde4/libkrossjava.so"
 }

diff --git a/kde-base/krossjava/krossjava-9999.ebuild b/kde-base/krossjava/krossjava-9999.ebuild
index c5124cd..1e2a960 100644
--- a/kde-base/krossjava/krossjava-9999.ebuild
+++ b/kde-base/krossjava/krossjava-9999.ebuild
@@ -50,7 +50,7 @@ src_install() {
 	kde4-meta_src_install
 	java-pkg_dojar "${ED}/usr/$(get_libdir)/kde4/kross/kross.jar"
 
-	dosym ../../../../usr/share/${PN}-${SLOT}/lib/kross.jar \
+	dosym ../../../share/${PN}-${SLOT}/lib/kross.jar \
 		/usr/$(get_libdir)/kde4/kross/kross.jar
 	java-pkg_regso "${ED}/usr/$(get_libdir)/kde4/libkrossjava.so"
 }

[gentoo-commits] proj/kde:master commit in: kde-base/krossjava/

[Michael Palimaka]

commit:     6ddfe81c519d53e4b05a9c4dfdc7384c14b36e4d
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed May 23 14:03:42 2012 +0000
Commit:     Michael Palimaka <kensington <AT> astralcloak <DOT> net>
CommitDate: Wed May 23 14:03:42 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=6ddfe81c

[kde-base/krossjava] Switch from inherit eutils -> multilib.

(Portage version: 2.1.10.62/git/Linux x86_64, unsigned Manifest commit)

---
 kde-base/krossjava/krossjava-4.8.49.9999.ebuild |    2 +-
 kde-base/krossjava/krossjava-9999.ebuild        |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/kde-base/krossjava/krossjava-4.8.49.9999.ebuild b/kde-base/krossjava/krossjava-4.8.49.9999.ebuild
index 5cf2000..a2482ec 100644
--- a/kde-base/krossjava/krossjava-4.8.49.9999.ebuild
+++ b/kde-base/krossjava/krossjava-4.8.49.9999.ebuild
@@ -7,7 +7,7 @@ EAPI=4
 KMNAME="kross-interpreters"
 KMMODULE="java"
 KDE_SCM="git"
-inherit java-pkg-2 java-ant-2 kde4-meta eutils
+inherit java-pkg-2 java-ant-2 kde4-meta multilib
 
 DESCRIPTION="Java plugin for the kdelibs/kross scripting framework."
 KEYWORDS=""

diff --git a/kde-base/krossjava/krossjava-9999.ebuild b/kde-base/krossjava/krossjava-9999.ebuild
index 5cf2000..a2482ec 100644
--- a/kde-base/krossjava/krossjava-9999.ebuild
+++ b/kde-base/krossjava/krossjava-9999.ebuild
@@ -7,7 +7,7 @@ EAPI=4
 KMNAME="kross-interpreters"
 KMMODULE="java"
 KDE_SCM="git"
-inherit java-pkg-2 java-ant-2 kde4-meta eutils
+inherit java-pkg-2 java-ant-2 kde4-meta multilib
 
 DESCRIPTION="Java plugin for the kdelibs/kross scripting framework."
 KEYWORDS=""

[gentoo-commits] proj/kde:master commit in: kde-base/krossjava/

[Michael Palimaka]

commit:     3fe3127c3c1b710e1ee6fd07664a20cb8248f8e3
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu May 24 15:52:37 2012 +0000
Commit:     Michael Palimaka <kensington <AT> astralcloak <DOT> net>
CommitDate: Thu May 24 15:53:29 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=3fe3127c

[kde-base/krossjava] Unrestrict tests, since there is no test suite to fail.

There is a indeed a test program included, but it's more of a test utility rather than something to be run during src_test.

(Portage version: 2.1.10.62/git/Linux x86_64, unsigned Manifest commit)

---
 kde-base/krossjava/krossjava-4.8.49.9999.ebuild |    2 --
 kde-base/krossjava/krossjava-9999.ebuild        |    2 --
 2 files changed, 0 insertions(+), 4 deletions(-)

diff --git a/kde-base/krossjava/krossjava-4.8.49.9999.ebuild b/kde-base/krossjava/krossjava-4.8.49.9999.ebuild
index a2482ec..6fe12a5 100644
--- a/kde-base/krossjava/krossjava-4.8.49.9999.ebuild
+++ b/kde-base/krossjava/krossjava-4.8.49.9999.ebuild
@@ -20,8 +20,6 @@ RDEPEND="
 	>=virtual/jre-1.5
 "
 
-RESTRICT="test"
-
 pkg_setup() {
 	kde4-meta_pkg_setup
 	java-pkg-2_pkg_setup

diff --git a/kde-base/krossjava/krossjava-9999.ebuild b/kde-base/krossjava/krossjava-9999.ebuild
index a2482ec..6fe12a5 100644
--- a/kde-base/krossjava/krossjava-9999.ebuild
+++ b/kde-base/krossjava/krossjava-9999.ebuild
@@ -20,8 +20,6 @@ RDEPEND="
 	>=virtual/jre-1.5
 "
 
-RESTRICT="test"
-
 pkg_setup() {
 	kde4-meta_pkg_setup
 	java-pkg-2_pkg_setup

[gentoo-commits] proj/kde:master commit in: kde-base/krossjava/

[Johannes Huber]

commit:     4bf38af979fa406bf3b80aaf5f07de85d905ddfa
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 23 16:56:41 2013 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sat Nov 23 16:56:50 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=4bf38af9

[kde-base/krossjava] Block incompatible ibm jdk, fixes bug #446273

Package-Manager: portage-2.2.7

---
 kde-base/krossjava/krossjava-4.11.49.9999.ebuild | 4 ++--
 kde-base/krossjava/krossjava-9999.ebuild         | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/kde-base/krossjava/krossjava-4.11.49.9999.ebuild b/kde-base/krossjava/krossjava-4.11.49.9999.ebuild
index 7ab3e49..48db709 100644
--- a/kde-base/krossjava/krossjava-4.11.49.9999.ebuild
+++ b/kde-base/krossjava/krossjava-4.11.49.9999.ebuild
@@ -15,8 +15,8 @@ IUSE="debug"
 DEPEND="
 	>=virtual/jdk-1.5
 "
-RDEPEND="
-	>=virtual/jre-1.5
+RDEPEND="${DEPEND}
+	!!dev-java/ibm-jdk-bin
 "
 
 pkg_setup() {

diff --git a/kde-base/krossjava/krossjava-9999.ebuild b/kde-base/krossjava/krossjava-9999.ebuild
index 7ab3e49..48db709 100644
--- a/kde-base/krossjava/krossjava-9999.ebuild
+++ b/kde-base/krossjava/krossjava-9999.ebuild
@@ -15,8 +15,8 @@ IUSE="debug"
 DEPEND="
 	>=virtual/jdk-1.5
 "
-RDEPEND="
-	>=virtual/jre-1.5
+RDEPEND="${DEPEND}
+	!!dev-java/ibm-jdk-bin
 "
 
 pkg_setup() {

[gentoo-commits] proj/kde:master commit in: kde-base/krossjava/

[Johannes Huber]

commit:     0d2f40f6931c75ed9c93d0108f97a6cfa526610b
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 13 18:00:25 2014 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Thu Mar 13 18:00:25 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=0d2f40f6

[kde-base/krossjava] Fix symlink generation in src_install, bug #502190.

Package-Manager: portage-2.2.8-r1

---
 kde-base/krossjava/krossjava-4.12.49.9999.ebuild                        | 2 +-
 .../krossjava/{krossjava-4.12.80.ebuild => krossjava-4.12.80-r1.ebuild} | 2 +-
 kde-base/krossjava/krossjava-4.13.49.9999.ebuild                        | 2 +-
 kde-base/krossjava/krossjava-9999.ebuild                                | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/kde-base/krossjava/krossjava-4.12.49.9999.ebuild b/kde-base/krossjava/krossjava-4.12.49.9999.ebuild
index 1b4ac21..42c4eec 100644
--- a/kde-base/krossjava/krossjava-4.12.49.9999.ebuild
+++ b/kde-base/krossjava/krossjava-4.12.49.9999.ebuild
@@ -45,7 +45,7 @@ src_install() {
 	kde4-meta_src_install
 	java-pkg_dojar "${ED}/usr/$(get_libdir)/kde4/kross/kross.jar"
 
-	dosym ../../../share/${PN}-${SLOT}/lib/kross.jar \
+	dosym ../../../share/${PN}-$(get_major_version ${SLOT})/lib/kross.jar \
 		/usr/$(get_libdir)/kde4/kross/kross.jar
 	java-pkg_regso "${ED}/usr/$(get_libdir)/kde4/krossjava.so"
 }

diff --git a/kde-base/krossjava/krossjava-4.12.80.ebuild b/kde-base/krossjava/krossjava-4.12.80-r1.ebuild
similarity index 93%
rename from kde-base/krossjava/krossjava-4.12.80.ebuild
rename to kde-base/krossjava/krossjava-4.12.80-r1.ebuild
index e6ce24f..9cda464 100644
--- a/kde-base/krossjava/krossjava-4.12.80.ebuild
+++ b/kde-base/krossjava/krossjava-4.12.80-r1.ebuild
@@ -45,7 +45,7 @@ src_install() {
 	kde4-meta_src_install
 	java-pkg_dojar "${ED}/usr/$(get_libdir)/kde4/kross/kross.jar"
 
-	dosym ../../../share/${PN}-${SLOT}/lib/kross.jar \
+	dosym ../../../share/${PN}-$(get_major_version ${SLOT})/lib/kross.jar \
 		/usr/$(get_libdir)/kde4/kross/kross.jar
 	java-pkg_regso "${ED}/usr/$(get_libdir)/kde4/krossjava.so"
 }

diff --git a/kde-base/krossjava/krossjava-4.13.49.9999.ebuild b/kde-base/krossjava/krossjava-4.13.49.9999.ebuild
index 1b4ac21..42c4eec 100644
--- a/kde-base/krossjava/krossjava-4.13.49.9999.ebuild
+++ b/kde-base/krossjava/krossjava-4.13.49.9999.ebuild
@@ -45,7 +45,7 @@ src_install() {
 	kde4-meta_src_install
 	java-pkg_dojar "${ED}/usr/$(get_libdir)/kde4/kross/kross.jar"
 
-	dosym ../../../share/${PN}-${SLOT}/lib/kross.jar \
+	dosym ../../../share/${PN}-$(get_major_version ${SLOT})/lib/kross.jar \
 		/usr/$(get_libdir)/kde4/kross/kross.jar
 	java-pkg_regso "${ED}/usr/$(get_libdir)/kde4/krossjava.so"
 }

diff --git a/kde-base/krossjava/krossjava-9999.ebuild b/kde-base/krossjava/krossjava-9999.ebuild
index 1b4ac21..42c4eec 100644
--- a/kde-base/krossjava/krossjava-9999.ebuild
+++ b/kde-base/krossjava/krossjava-9999.ebuild
@@ -45,7 +45,7 @@ src_install() {
 	kde4-meta_src_install
 	java-pkg_dojar "${ED}/usr/$(get_libdir)/kde4/kross/kross.jar"
 
-	dosym ../../../share/${PN}-${SLOT}/lib/kross.jar \
+	dosym ../../../share/${PN}-$(get_major_version ${SLOT})/lib/kross.jar \
 		/usr/$(get_libdir)/kde4/kross/kross.jar
 	java-pkg_regso "${ED}/usr/$(get_libdir)/kde4/krossjava.so"
 }

[gentoo-commits] proj/kde:master commit in: kde-base/krossjava/

[Michael Palimaka]

commit:     43576e2028f0908f92dd0fd4106aab62c412eba0
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 21 15:47:52 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Feb 21 15:47:52 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=43576e20

[kde-base/krossjava] Explicitly state that any slot is acceptable.

Package-Manager: portage-2.2.17

---
 kde-base/krossjava/krossjava-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kde-base/krossjava/krossjava-9999.ebuild b/kde-base/krossjava/krossjava-9999.ebuild
index 4182d04..dc921c7 100644
--- a/kde-base/krossjava/krossjava-9999.ebuild
+++ b/kde-base/krossjava/krossjava-9999.ebuild
@@ -13,7 +13,7 @@ KEYWORDS=""
 IUSE="debug"
 
 DEPEND="
-	>=virtual/jdk-1.5
+	>=virtual/jdk-1.5:*
 "
 RDEPEND="${DEPEND}
 	!!dev-java/ibm-jdk-bin