diff options
| author |   Jonathan Callen <abcd@gentoo.org> | 2011-04-11 04:41:26 +0000 |
|---|---|---|
| committer | Jonathan Callen <abcd@gentoo.org> | 2011-04-11 04:41:26 +0000 |
| commit | 6b46488646ce6b778bdb06b1dced9a425335622e (patch) | |
| tree | 998f82c536e2ead17badd9bd8330a4ff9c132d3a /kde-base | |
| parent | Re-keyword ~mips, bug 323831; remove old (diff) | |
| download | gentoo-2-6b46488646ce6b778bdb06b1dced9a425335622e.tar.gz gentoo-2-6b46488646ce6b778bdb06b1dced9a425335622e.tar.bz2 gentoo-2-6b46488646ce6b778bdb06b1dced9a425335622e.zip | |
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)
Diffstat (limited to 'kde-base')
| -rw-r--r-- | kde-base/krossjava/ChangeLog | 7 | ||||
| -rw-r--r-- | kde-base/krossjava/krossjava-4.4.5.ebuild | 15 | ||||
| -rw-r--r-- | kde-base/krossjava/krossjava-4.6.2.ebuild | 13 |
3 files changed, 29 insertions, 6 deletions
diff --git a/kde-base/krossjava/ChangeLog b/kde-base/krossjava/ChangeLog index 93f8667e0c87..d76c0fa78543 100644 --- a/kde-base/krossjava/ChangeLog +++ b/kde-base/krossjava/ChangeLog @@ -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) diff --git a/kde-base/krossjava/krossjava-4.4.5.ebuild b/kde-base/krossjava/krossjava-4.4.5.ebuild index 55ce5e963e49..adeb28f6256a 100644 --- a/kde-base/krossjava/krossjava-4.4.5.ebuild +++ b/kde-base/krossjava/krossjava-4.4.5.ebuild @@ -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 @@ 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-4.6.2.ebuild b/kde-base/krossjava/krossjava-4.6.2.ebuild index 6c4700f4e23f..3b54aea95ea4 100644 --- a/kde-base/krossjava/krossjava-4.6.2.ebuild +++ b/kde-base/krossjava/krossjava-4.6.2.ebuild @@ -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 @@ 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 +} |