summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorRalph Sennhauser <sera@gentoo.org>2012-01-13 09:59:10 +0000
committerRalph Sennhauser <sera@gentoo.org>2012-01-13 09:59:10 +0000
commit46b4a5de84dbda1dbcee1320212699e9ef20110e (patch)
treeffb5c4dffe5fca8ab39d7d38c126840bac1c52b0 /eclass
parentMake networkmanager optional (bug #398593, reported by Florian Klink; patch b... (diff)
downloadgentoo-2-46b4a5de84dbda1dbcee1320212699e9ef20110e.tar.gz
gentoo-2-46b4a5de84dbda1dbcee1320212699e9ef20110e.tar.bz2
gentoo-2-46b4a5de84dbda1dbcee1320212699e9ef20110e.zip
Set S= for java-virtuals as EAPI-4 doesn't permit the S-to-WORKDIR fallback anymore.
Diffstat (limited to 'eclass')
-rw-r--r--eclass/ChangeLog6
-rw-r--r--eclass/java-virtuals-2.eclass6
2 files changed, 9 insertions, 3 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog
index 6b17c6be9d05..532f677dd748 100644
--- a/eclass/ChangeLog
+++ b/eclass/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.75 2012/01/09 10:16:25 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.76 2012/01/13 09:59:10 sera Exp $
+
+ 13 Jan 2012; Ralph Sennhauser <sera@gentoo.org> java-virtuals-2.eclass:
+ Set S="${WORKDIR}" for java-virtuals as EAPI-4 doesn't permit the
+ S-to-WORKDIR fallback anymore.
09 Jan 2012; Justin Lecher <jlec@gentoo.org> autotools-utils.eclass:
Correct typo in autotools-utils.eclass: @DEFAULT-UNSET -> @DEFAULT_UNSET
diff --git a/eclass/java-virtuals-2.eclass b/eclass/java-virtuals-2.eclass
index cf7c43167110..0b262dc331da 100644
--- a/eclass/java-virtuals-2.eclass
+++ b/eclass/java-virtuals-2.eclass
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-virtuals-2.eclass,v 1.7 2011/12/27 17:55:12 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-virtuals-2.eclass,v 1.8 2012/01/13 09:59:10 sera Exp $
# Original Author: Alistair John Bush <ali_bush@gentoo.org>
# Purpose: To provide a default (and only) src_install function
@@ -11,6 +11,8 @@ inherit java-utils-2
DEPEND=">=dev-java/java-config-2.1.6"
RDEPEND="${DEPEND}"
+S="${WORKDIR}"
+
EXPORT_FUNCTIONS src_install
java-virtuals-2_src_install() {