summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorJames Le Cuirot <chewi@gentoo.org>2015-05-24 22:44:37 +0000
committerJames Le Cuirot <chewi@gentoo.org>2015-05-24 22:44:37 +0000
commitb5929b9fc25c16cbf16bbd517f74adf37817829a (patch)
treed660a9b0a24947ad32dd1880b2b9eccc7d52e3bc /eclass
parentVersion bump, see http://webkitgtk.org/2015/05/20/webkitgtk2.4.9-released.htm... (diff)
downloadgentoo-2-b5929b9fc25c16cbf16bbd517f74adf37817829a.tar.gz
gentoo-2-b5929b9fc25c16cbf16bbd517f74adf37817829a.tar.bz2
gentoo-2-b5929b9fc25c16cbf16bbd517f74adf37817829a.zip
The depend-java-query wrapper is raising readonly variable warnings
for USE in Portage 2.2.20. As best I can tell, this wrapper just isn't needed any more because USE is already exported. I guess it wasn't back in 2006?
Diffstat (limited to 'eclass')
-rw-r--r--eclass/ChangeLog7
-rw-r--r--eclass/java-utils-2.eclass14
2 files changed, 7 insertions, 14 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog
index aaaa5578e53d..e972c319efb0 100644
--- a/eclass/ChangeLog
+++ b/eclass/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1620 2015/05/24 20:40:40 chewi Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1621 2015/05/24 22:44:37 chewi Exp $
+
+ 24 May 2015; James Le Cuirot <chewi@gentoo.org> java-utils-2.eclass:
+ The depend-java-query wrapper is raising readonly variable warnings for USE
+ in Portage 2.2.20. As best I can tell, this wrapper just isn't needed any
+ more because USE is already exported. I guess it wasn't back in 2006?
24 May 2015; James Le Cuirot <chewi@gentoo.org> java-pkg-simple.eclass:
Remove annoying java-pkg-simple build script check. Most people only use
diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass
index 2eacd19283fc..15a0bf20fd7c 100644
--- a/eclass/java-utils-2.eclass
+++ b/eclass/java-utils-2.eclass
@@ -6,7 +6,7 @@
#
# Licensed under the GNU General Public License, v2
#
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.161 2015/05/09 22:20:44 chewi Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.162 2015/05/24 22:44:37 chewi Exp $
# @ECLASS: java-utils-2.eclass
# @MAINTAINER:
@@ -282,18 +282,6 @@ java-pkg_dojar() {
java-pkg_do_write_
}
-# @FUNCTION: depend-java-query
-# @INTERNAL
-# @DESCRIPTION:
-# Wrapper for the depend-java-query binary to enable passing USE in env.
-# Using env variables keeps this eclass working with java-config versions that
-# do not handle use flags.
-depend-java-query() {
- # Used to have a which call here but it caused endless loops for some people
- # that had some weird bashrc voodoo for which.
- USE="${USE}" /usr/bin/depend-java-query "${@}"
-}
-
# @FUNCTION: java-pkg_regjar
# @USAGE: </path/to/installed/jar>
# @DESCRIPTION: