[gentoo-commits] gentoo-x86 commit in kde-base/krossjava: krossjava-4.6.2.ebuild ChangeLog krossjava-4.4.5.ebuild

[gentoo-commits] gentoo-x86 commit in kde-base/krossjava: krossjava-4.6.2.ebuild ChangeLog krossjava-4.4.5.ebuild

[Jonathan Callen (abcd)]

abcd        11/04/11 04:41:26

  Modified:             krossjava-4.6.2.ebuild ChangeLog
                        krossjava-4.4.5.ebuild
  Log:
  Make sure pkg_setup and pkg_preinst from both kde4-meta and java-pkg-2 are called
  
  (Portage version: 2.2.0_alpha29_p11/cvs/Linux i686)

Revision  Changes    Path
1.2                  kde-base/krossjava/krossjava-4.6.2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/krossjava/krossjava-4.6.2.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/krossjava/krossjava-4.6.2.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/krossjava/krossjava-4.6.2.ebuild?r1=1.1&r2=1.2

Index: krossjava-4.6.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/kde-base/krossjava/krossjava-4.6.2.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- krossjava-4.6.2.ebuild	6 Apr 2011 14:19:27 -0000	1.1
+++ krossjava-4.6.2.ebuild	11 Apr 2011 04:41:26 -0000	1.2
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/krossjava/krossjava-4.6.2.ebuild,v 1.1 2011/04/06 14:19:27 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/krossjava/krossjava-4.6.2.ebuild,v 1.2 2011/04/11 04:41:26 abcd Exp $
 
 EAPI=3
 
@@ -23,6 +23,11 @@
 
 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_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 @@
 		"${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
+}



1.49                 kde-base/krossjava/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/krossjava/ChangeLog?rev=1.49&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/krossjava/ChangeLog?rev=1.49&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/krossjava/ChangeLog?r1=1.48&r2=1.49

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/kde-base/krossjava/ChangeLog,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- ChangeLog	6 Apr 2011 14:19:27 -0000	1.48
+++ ChangeLog	11 Apr 2011 04:41:26 -0000	1.49
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/krossjava
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/krossjava/ChangeLog,v 1.48 2011/04/06 14:19:27 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/krossjava/ChangeLog,v 1.49 2011/04/11 04:41:26 abcd Exp $
+
+  11 Apr 2011; Jonathan Callen <abcd@gentoo.org> krossjava-4.4.5.ebuild,
+  krossjava-4.6.2.ebuild:
+  Make sure pkg_setup and pkg_preinst from both kde4-meta and java-pkg-2 are
+  called
 
 *krossjava-4.6.2 (06 Apr 2011)
 



1.5                  kde-base/krossjava/krossjava-4.4.5.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/krossjava/krossjava-4.4.5.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/krossjava/krossjava-4.4.5.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/krossjava/krossjava-4.4.5.ebuild?r1=1.4&r2=1.5

Index: krossjava-4.4.5.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/kde-base/krossjava/krossjava-4.4.5.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- krossjava-4.4.5.ebuild	9 Aug 2010 09:16:49 -0000	1.4
+++ krossjava-4.4.5.ebuild	11 Apr 2011 04:41:26 -0000	1.5
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/krossjava/krossjava-4.4.5.ebuild,v 1.4 2010/08/09 09:16:49 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/krossjava/krossjava-4.4.5.ebuild,v 1.5 2011/04/11 04:41:26 abcd Exp $
 
 EAPI="3"
 
@@ -23,6 +23,11 @@
 
 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_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 @@
 		"${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
+}