From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Q991V-0007Oh-2N for garchives@archives.gentoo.org; Mon, 11 Apr 2011 04:46:49 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C6EC9E01DC; Mon, 11 Apr 2011 04:46:41 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 9329CE01DC for ; Mon, 11 Apr 2011 04:46:41 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1A6571B4093 for ; Mon, 11 Apr 2011 04:46:41 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 65D0B80065 for ; Mon, 11 Apr 2011 04:46:40 +0000 (UTC) From: "Jonathan Callen" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jonathan Callen" Message-ID: Subject: [gentoo-commits] proj/kde:master commit in: kde-base/krossjava/ X-VCS-Repository: proj/kde X-VCS-Files: kde-base/krossjava/krossjava-4.6.9999.ebuild kde-base/krossjava/krossjava-9999.ebuild X-VCS-Directories: kde-base/krossjava/ X-VCS-Committer: abcd X-VCS-Committer-Name: Jonathan Callen X-VCS-Revision: c13fb353d0394fb8426cc2e5b76f34101c39e25d Date: Mon, 11 Apr 2011 04:46:40 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 3df88b122be4520ee3ad6e7c8e950102 commit: c13fb353d0394fb8426cc2e5b76f34101c39e25d Author: abcd gentoo org> AuthorDate: Mon Apr 11 04:43:18 2011 +0000 Commit: Jonathan Callen gentoo org> CommitDate: Mon Apr 11 04:46:27 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/kde.git;a=3Dc= ommit;h=3Dc13fb353 [kde-base/krossjava] Include fixes from gx86 (Portage version: 2.2.0_alpha29_p11/git/Linux i686, signed Manifest commi= t 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/kros= sjava/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=3D"test" =20 PATCHES=3D( "${FILESDIR}/${PN}-4.2.3_includes.patch" ) =20 +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() { =20 src_configure() { mycmakeargs=3D(-DENABLE_KROSSJAVA=3DON) - export JAVA_HOME=3D$(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/krossjav= a/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=3D"test" =20 PATCHES=3D( "${FILESDIR}/${PN}-4.2.3_includes.patch" ) =20 +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() { =20 src_configure() { mycmakeargs=3D(-DENABLE_KROSSJAVA=3DON) - export JAVA_HOME=3D$(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 +}