summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetteri Räty <betelgeuse@gentoo.org>2007-08-05 08:17:05 +0000
committerPetteri Räty <betelgeuse@gentoo.org>2007-08-05 08:17:05 +0000
commitcb5fdf01a7caf0685f111f359bfe486156b9ad61 (patch)
treed544db7fc7cb96723f506d9a94abca622cf5dadc /eclass/java-pkg-opt-2.eclass
parentMask dev-ruby/switchtower as it will be removed shortly (diff)
downloadgentoo-2-cb5fdf01a7caf0685f111f359bfe486156b9ad61.tar.gz
gentoo-2-cb5fdf01a7caf0685f111f359bfe486156b9ad61.tar.bz2
gentoo-2-cb5fdf01a7caf0685f111f359bfe486156b9ad61.zip
Remove eclass hooks to resolve bug #163262.
Diffstat (limited to 'eclass/java-pkg-opt-2.eclass')
-rw-r--r--eclass/java-pkg-opt-2.eclass45
1 files changed, 6 insertions, 39 deletions
diff --git a/eclass/java-pkg-opt-2.eclass b/eclass/java-pkg-opt-2.eclass
index e6ef94cf4a1c..a98fb2ed94e0 100644
--- a/eclass/java-pkg-opt-2.eclass
+++ b/eclass/java-pkg-opt-2.eclass
@@ -5,7 +5,12 @@
#
# Licensed under the GNU General Public License, v2
#
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-pkg-opt-2.eclass,v 1.5 2006/12/03 13:05:06 betelgeuse Exp $
+# Major changes:
+# 20070855:
+# Removed phase hooks because Portage does proper env saving now.
+# <betelgeuse@gentoo.org>
+#
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-pkg-opt-2.eclass,v 1.6 2007/08/05 08:17:05 betelgeuse Exp $
inherit java-utils-2
@@ -37,41 +42,3 @@ EXPORT_FUNCTIONS pkg_setup
java-pkg-opt-2_pkg_setup() {
use ${JAVA_PKG_OPT_USE} && java-pkg_init
}
-
-# ------------------------------------------------------------------------------
-# @note
-#
-# We need to initialize the environment in every function because Portage
-# will source /etc/profile between phases and trample all over the env.
-# This is accomplished by phase hooks, which is available with newer versions of
-# portage.
-# ------------------------------------------------------------------------------
-
-pre_pkg_setup() {
- java-pkg-opt-2_pkg_setup
-}
-
-pre_src_unpack() {
- java-pkg-opt-2_pkg_setup
- use "${JAVA_PKG_OPT_USE}" || JAVA_PKG_BSFIX="off"
-}
-
-pre_src_compile() {
- java-pkg-opt-2_pkg_setup
-}
-
-pre_src_install() {
- java-pkg-opt-2_pkg_setup
-}
-
-pre_src_test() {
- java-pkg-opt-2_pkg_setup
-}
-
-pre_pkg_preinst() {
- java-pkg-opt-2_pkg_setup
-}
-
-pre_pkg_postinst() {
- java-pkg-opt-2_pkg_setup
-}