[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog java-utils-2.eclass
chewi 15/08/02 23:12:16
Modified: ChangeLog java-utils-2.eclass
Log:
Allow java-pkg_get-javac to be called alone. Fixes bug #172594. Thanks
to sping for the patch. Also simplify die logic around
java-pkg_javac-args. die handling has improved since this was written.
Revision ChangesPath
1.1742 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1742view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1742content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1741r2=1.1742
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1741
retrieving revision 1.1742
diff -u -r1.1741 -r1.1742
--- ChangeLog 31 Jul 2015 07:56:17 - 1.1741
+++ ChangeLog 2 Aug 2015 23:12:16 - 1.1742
@@ -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.1741 2015/07/31
07:56:17 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1742 2015/08/02
23:12:16 chewi Exp $
+
+ 02 Aug 2015; James Le Cuirot ch...@gentoo.org java-utils-2.eclass:
+ Allow java-pkg_get-javac to be called alone. Fixes bug #172594. Thanks to
+ sping for the patch. Also simplify die logic around java-pkg_javac-args. die
+ handling has improved since this was written.
31 Jul 2015; Patrice Clement monsie...@gentoo.org java-utils-2.eclass:
Document JAVA_RM_FILES variable. Also, fix documentation and correct typos in
1.169eclass/java-utils-2.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?rev=1.169view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?rev=1.169content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?r1=1.168r2=1.169
Index: java-utils-2.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -r1.168 -r1.169
--- java-utils-2.eclass 31 Jul 2015 07:56:17 - 1.168
+++ java-utils-2.eclass 2 Aug 2015 23:12:16 - 1.169
@@ -6,7 +6,7 @@
#
# Licensed under the GNU General Public License, v2
#
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.168
2015/07/31 07:56:17 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.169
2015/08/02 23:12:16 chewi Exp $
# @ECLASS: java-utils-2.eclass
# @MAINTAINER:
@@ -262,14 +262,14 @@
popd /dev/null || die popd failed
}
-# @FUNCTION: java-pkg_rm_files
+# @FUNCTION: java-pkg_rm_files
# @USAGE: java-pkg_rm_files File1.java File2.java ...
# @DESCRIPTION:
# Remove unneeded files in ${S}.
#
# Every now and then, you'll run into situations whereby a file needs removing,
# be it a unit test or a regular java class.
-#
+#
# You can use this function by either:
# - calling it yourself in java_prepare() and feeding java-pkg_rm_files with
# the list of files you wish to remove.
@@ -1583,7 +1583,7 @@
java-pkg_get-javac() {
debug-print-function ${FUNCNAME} $*
-
+ java-pkg_init-compiler_
local compiler=${GENTOO_COMPILER}
local compiler_executable
@@ -1602,18 +1602,15 @@
export JAVAC=${old_javac}
if [[ -z ${compiler_executable} ]]; then
- echo JAVAC is empty or undefined in
${compiler_env}
- return 1
+ die JAVAC is empty or undefined in
${compiler_env}
fi
# check that it's executable
if [[ ! -x ${compiler_executable} ]]; then
- echo ${compiler_executable} doesn't exist, or
isn't executable
- return 1
+ die ${compiler_executable} doesn't exist, or
isn't executable
fi
else
- echo Could not find environment file for ${compiler}
- return 1
+ die Could not find environment file for ${compiler}
fi
fi
echo ${compiler_executable}
@@ -1638,9 +1635,7 @@
debug-print want target: ${want_target}
if [[ -z ${want_source} || -z ${want_target} ]]; then
- debug-print could not find valid -source/-target values for
javac
- echo Could not find valid -source/-target values for javac
- return 1
+ die Could not find valid -source/-target values for javac
else
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog java-utils-2.eclass
monsieurp15/07/31 07:56:17
Modified: ChangeLog java-utils-2.eclass
Log:
Document JAVA_RM_FILES variable. Also, fix documentation and correct typos in
java-pkg_rm_files.
Revision ChangesPath
1.1741 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1741view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1741content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1740r2=1.1741
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1740
retrieving revision 1.1741
diff -u -r1.1740 -r1.1741
--- ChangeLog 30 Jul 2015 22:17:08 - 1.1740
+++ ChangeLog 31 Jul 2015 07:56:17 - 1.1741
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1740 2015/07/30
22:17:08 chewi Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1741 2015/07/31
07:56:17 monsieurp Exp $
+
+ 31 Jul 2015; Patrice Clement monsie...@gentoo.org java-utils-2.eclass:
+ Document JAVA_RM_FILES variable. Also, fix documentation and correct typos in
+ java-pkg_rm_files.
30 Jul 2015; James Le Cuirot ch...@gentoo.org java-utils-2.eclass:
Fix JAVA_RM_FILES by simplifying java-utils-2_src_prepare on the basis that
1.168eclass/java-utils-2.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?rev=1.168view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?rev=1.168content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?r1=1.167r2=1.168
Index: java-utils-2.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -r1.167 -r1.168
--- java-utils-2.eclass 30 Jul 2015 22:17:08 - 1.167
+++ java-utils-2.eclass 31 Jul 2015 07:56:17 - 1.168
@@ -6,7 +6,7 @@
#
# Licensed under the GNU General Public License, v2
#
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.167
2015/07/30 22:17:08 chewi Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.168
2015/07/31 07:56:17 monsieurp Exp $
# @ECLASS: java-utils-2.eclass
# @MAINTAINER:
@@ -126,6 +126,20 @@
# JAVA_PKG_WANT_TARGET=1.3 emerge bar
# @CODE
+# @ECLASS-VARIABLE: JAVA_RM_FILES
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# An array containing a list of files to remove. If defined, this array will be
+# automatically handed over to java-pkg_rm_files for processing during the
+# src_prepare phase.
+#
+# @CODE
+# JAVA_RM_FILES=(
+# path/to/File1.java
+# DELETEME.txt
+# )
+# @CODE
+
# @VARIABLE: JAVA_PKG_COMPILER_DIR
# @INTERNAL
# @DESCRIPTION:
@@ -263,29 +277,25 @@
# you wish to remove.
#
# Both way work and it is left to the developer's preferences. If the
-# JAVA_RM_FILES array is defined, it is will be automatically handed over to
-# java-pkg_rm_files.
+# JAVA_RM_FILES array is defined, it will be automatically handed over to
+# java-pkg_rm_files during the src_prepare phase.
#
# See java-utils-2_src_prepare.
#
# @CODE
+# java-pkg_rm_files File1.java File2.java
+# @CODE
#
# @param $* - list of files to remove.
-# JAVA_RM_FILES - array containing files to remove.
-# if defined, automatically handed over to java-pkg_rm_files in
java-utils-2_src_prepare.
-#
-# @CODE
java-pkg_rm_files() {
debug-print-function ${FUNCNAME} $*
- OIFS=$IFS
- IFS=\n
+ local IFS=\n
for filename in $@; do
[[ ! -f ${filename} ]] die ${filename} is not a regular
file. Aborting.
einfo Removing unneeded file ${filename}
rm -f ${S}/${filename} || die cannot remove ${filename}
eend $?
done
- IFS=$OIFS
}
# @FUNCTION: java-pkg_dojar
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog java-utils-2.eclass
chewi 15/07/30 22:17:09
Modified: ChangeLog java-utils-2.eclass
Log:
Fix JAVA_RM_FILES by simplifying java-utils-2_src_prepare on the basis
that we won't be committing EAPI 0|1 ebuilds any more.
Revision ChangesPath
1.1740 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1740view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1740content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1739r2=1.1740
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1739
retrieving revision 1.1740
diff -u -r1.1739 -r1.1740
--- ChangeLog 30 Jul 2015 20:34:57 - 1.1739
+++ ChangeLog 30 Jul 2015 22:17:08 - 1.1740
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1739 2015/07/30
20:34:57 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1740 2015/07/30
22:17:08 chewi Exp $
+
+ 30 Jul 2015; James Le Cuirot ch...@gentoo.org java-utils-2.eclass:
+ Fix JAVA_RM_FILES by simplifying java-utils-2_src_prepare on the basis that
+ we won't be committing EAPI 0|1 ebuilds any more.
30 Jul 2015; Brian Evans grkni...@gentoo.org mysql-multilib.eclass:
Revert bad mycmakeargs changes and introduce 3 eclass variables to have extra
1.167eclass/java-utils-2.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?rev=1.167view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?rev=1.167content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?r1=1.166r2=1.167
Index: java-utils-2.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -r1.166 -r1.167
--- java-utils-2.eclass 22 Jul 2015 09:20:07 - 1.166
+++ java-utils-2.eclass 30 Jul 2015 22:17:08 - 1.167
@@ -6,7 +6,7 @@
#
# Licensed under the GNU General Public License, v2
#
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.166
2015/07/22 09:20:07 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.167
2015/07/30 22:17:08 chewi Exp $
# @ECLASS: java-utils-2.eclass
# @MAINTAINER:
@@ -1819,8 +1819,7 @@
# src_prepare Searches for bundled jars
# Don't call directly, but via java-pkg-2_src_prepare!
java-utils-2_src_prepare() {
- [[ ${EBUILD_PHASE} == prepare ]]
- java-pkg_func-exists java_prepare java_prepare
+ java-pkg_func-exists java_prepare java_prepare
# Check for files in JAVA_RM_FILES array.
if [[ ${JAVA_RM_FILES[@]} ]]; then
@@ -1828,15 +1827,13 @@
java-pkg_rm_files ${JAVA_RM_FILES[@]}
fi
- # Remember that eant will call this unless called via Portage
- if [[ ! -e ${T}/java-utils-2_src_prepare-run ]] is-java-strict;
then
+ if is-java-strict; then
echo Searching for bundled jars:
java-pkg_find-normal-jars || echo None found.
echo Searching for bundled classes (no output if none found):
find ${WORKDIR} -name *.class
echo Search done.
fi
- touch ${T}/java-utils-2_src_prepare-run
}
# @FUNCTION: java-utils-2_pkg_preinst
@@ -1879,7 +1876,6 @@
if [[ ${EBUILD_PHASE} = compile ]]; then
java-ant-2_src_configure
- java-utils-2_src_prepare
fi
if ! has java-ant-2 ${INHERITED}; then
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog java-utils-2.eclass
monsieurp15/07/22 09:20:07
Modified: ChangeLog java-utils-2.eclass
Log:
Introduce java-pkg_rm_files as a helper function along with JAVA_RM_FILES
array to readily get rid of useless files. Derived from perl_rm_files by Kent
Fredric.
Revision ChangesPath
1.1724 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1724view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1724content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1723r2=1.1724
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1723
retrieving revision 1.1724
diff -u -r1.1723 -r1.1724
--- ChangeLog 20 Jul 2015 15:05:49 - 1.1723
+++ ChangeLog 22 Jul 2015 09:20:07 - 1.1724
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1723 2015/07/20
15:05:49 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1724 2015/07/22
09:20:07 monsieurp Exp $
+
+ 22 Jul 2015; Patrice Clement monsie...@gentoo.org java-utils-2.eclass:
+ Introduce java-pkg_rm_files as a helper function along with JAVA_RM_FILES
+ array to readily get rid of useless files.
20 Jul 2015; Sergei Trofimovich sly...@gentoo.org haskell-cabal.eclass:
Workaround upstream cabal tests hangup bug #537500 by Michael Orlitzky; use
1.166eclass/java-utils-2.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?rev=1.166view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?rev=1.166content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?r1=1.165r2=1.166
Index: java-utils-2.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -r1.165 -r1.166
--- java-utils-2.eclass 28 Jun 2015 13:33:48 - 1.165
+++ java-utils-2.eclass 22 Jul 2015 09:20:07 - 1.166
@@ -6,7 +6,7 @@
#
# Licensed under the GNU General Public License, v2
#
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.165
2015/06/28 13:33:48 chewi Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.166
2015/07/22 09:20:07 monsieurp Exp $
# @ECLASS: java-utils-2.eclass
# @MAINTAINER:
@@ -248,6 +248,46 @@
popd /dev/null || die popd failed
}
+# @FUNCTION: java-pkg_rm_files
+# @USAGE: java-pkg_rm_files File1.java File2.java ...
+# @DESCRIPTION:
+# Remove unneeded files in ${S}.
+#
+# Every now and then, you'll run into situations whereby a file needs removing,
+# be it a unit test or a regular java class.
+#
+# You can use this function by either:
+# - calling it yourself in java_prepare() and feeding java-pkg_rm_files with
+# the list of files you wish to remove.
+# - defining an array in the ebuild named JAVA_RM_FILES with the list of files
+# you wish to remove.
+#
+# Both way work and it is left to the developer's preferences. If the
+# JAVA_RM_FILES array is defined, it is will be automatically handed over to
+# java-pkg_rm_files.
+#
+# See java-utils-2_src_prepare.
+#
+# @CODE
+#
+# @param $* - list of files to remove.
+# JAVA_RM_FILES - array containing files to remove.
+# if defined, automatically handed over to java-pkg_rm_files in
java-utils-2_src_prepare.
+#
+# @CODE
+java-pkg_rm_files() {
+ debug-print-function ${FUNCNAME} $*
+ OIFS=$IFS
+ IFS=\n
+ for filename in $@; do
+ [[ ! -f ${filename} ]] die ${filename} is not a regular
file. Aborting.
+ einfo Removing unneeded file ${filename}
+ rm -f ${S}/${filename} || die cannot remove ${filename}
+ eend $?
+ done
+ IFS=$OIFS
+}
+
# @FUNCTION: java-pkg_dojar
# @USAGE: jar1 [jar2 ...]
# @DESCRIPTION:
@@ -1782,6 +1822,12 @@
[[ ${EBUILD_PHASE} == prepare ]]
java-pkg_func-exists java_prepare java_prepare
+ # Check for files in JAVA_RM_FILES array.
+ if [[ ${JAVA_RM_FILES[@]} ]]; then
+ debug-print $FUNCNAME: removing unneeded files
+ java-pkg_rm_files ${JAVA_RM_FILES[@]}
+ fi
+
# Remember that eant will call this unless called via Portage
if [[ ! -e ${T}/java-utils-2_src_prepare-run ]] is-java-strict;
then
echo Searching for bundled jars:
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog java-utils-2.eclass
chewi 15/06/28 13:33:48
Modified: ChangeLog java-utils-2.eclass
Log:
The -source flag was added in 1.3 or 1.4 (not sure) and we have
special code to handle this but no one in their right mind would build
with 1.2 or 1.3 now. Removing this code allows the ecj-gcj ebuild to
call java-pkg_javac-args without a proper VM present.
Revision ChangesPath
1.1693 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1693view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1693content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1692r2=1.1693
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1692
retrieving revision 1.1693
diff -u -r1.1692 -r1.1693
--- ChangeLog 28 Jun 2015 13:12:52 - 1.1692
+++ ChangeLog 28 Jun 2015 13:33:48 - 1.1693
@@ -1,6 +1,12 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1692 2015/06/28
13:12:52 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1693 2015/06/28
13:33:48 chewi Exp $
+
+ 28 Jun 2015; James Le Cuirot ch...@gentoo.org java-utils-2.eclass:
+ The -source flag was added in 1.3 or 1.4 (not sure) and we have special code
+ to handle this but no one in their right mind would build with 1.2 or 1.3
+ now. Removing this code allows the ecj-gcj ebuild to call java-pkg_javac-args
+ without a proper VM present.
28 Jun 2015; Johannes Huber j...@gentoo.org kde5.eclass:
Loop optimization as suggested by Michal Górny mgo...@gentoo.org on -dev
1.165eclass/java-utils-2.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?rev=1.165view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?rev=1.165content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?r1=1.164r2=1.165
Index: java-utils-2.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -r1.164 -r1.165
--- java-utils-2.eclass 19 Jun 2015 14:11:24 - 1.164
+++ java-utils-2.eclass 28 Jun 2015 13:33:48 - 1.165
@@ -6,7 +6,7 @@
#
# Licensed under the GNU General Public License, v2
#
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.164
2015/06/19 14:11:24 chewi Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.165
2015/06/28 13:33:48 chewi Exp $
# @ECLASS: java-utils-2.eclass
# @MAINTAINER:
@@ -1592,11 +1592,7 @@
echo Could not find valid -source/-target values for javac
return 1
else
- if java-pkg_is-vm-version-ge 1.4; then
- echo ${source_str} ${target_str}
- else
- echo ${target_str}
- fi
+ echo ${source_str} ${target_str}
fi
}
@@ -2190,14 +2186,11 @@
continue
fi
- # -source was introduced in 1.3, so only check 1.3 and
on
- if version_is_at_least ${desired_soure} 1.3; then
- # Verify that the compiler supports source
- local supported_source=$(source ${compiler_env}
1/dev/null 21; echo ${SUPPORTED_SOURCE})
- if ! has ${desired_source} ${supported_source};
then
- ewarn ${compiler} does not support
-source ${desired_source}, skipping
- continue
- fi
+ # Verify that the compiler supports source
+ local supported_source=$(source ${compiler_env}
1/dev/null 21; echo ${SUPPORTED_SOURCE})
+ if ! has ${desired_source} ${supported_source}; then
+ ewarn ${compiler} does not support -source
${desired_source}, skipping
+ continue
fi
# if you get here, then the compiler should be good to
go
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog java-utils-2.eclass
chewi 15/06/19 14:11:24
Modified: ChangeLog java-utils-2.eclass
Log:
Allow EANT_GENTOO_CLASSPATH_EXTRA to work when EANT_GENTOO_CLASSPATH
is unset.
Revision ChangesPath
1.1676 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1676view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1676content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1675r2=1.1676
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1675
retrieving revision 1.1676
diff -u -r1.1675 -r1.1676
--- ChangeLog 18 Jun 2015 15:19:04 - 1.1675
+++ ChangeLog 19 Jun 2015 14:11:24 - 1.1676
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1675 2015/06/18
15:19:04 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1676 2015/06/19
14:11:24 chewi Exp $
+
+ 19 Jun 2015; James Le Cuirot ch...@gentoo.org java-utils-2.eclass:
+ Allow EANT_GENTOO_CLASSPATH_EXTRA to work when EANT_GENTOO_CLASSPATH is
+ unset.
18 Jun 2015; William Hubbs willi...@gentoo.org golang-vcs.eclass:
Add the EGO_SRC variable for repositories that contain multiple Go
1.164eclass/java-utils-2.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?rev=1.164view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?rev=1.164content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?r1=1.163r2=1.164
Index: java-utils-2.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -r1.163 -r1.164
--- java-utils-2.eclass 15 Jun 2015 21:09:06 - 1.163
+++ java-utils-2.eclass 19 Jun 2015 14:11:24 - 1.164
@@ -6,7 +6,7 @@
#
# Licensed under the GNU General Public License, v2
#
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.163
2015/06/15 21:09:06 chewi Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.164
2015/06/19 14:11:24 chewi Exp $
# @ECLASS: java-utils-2.eclass
# @MAINTAINER:
@@ -1934,17 +1934,15 @@
local cp
for atom in ${gcp}; do
- cp=${cp}:$(java-pkg_getjars ${getjarsarg} ${atom})
+ cp+=:$(java-pkg_getjars ${getjarsarg} ${atom})
done
- [[ -n ${EANT_NEEDS_TOOLS} ]] cp=${cp}:$(java-config --tools)
+ [[ ${EANT_NEEDS_TOOLS} ]] cp+=:$(java-config --tools)
+ [[ ${EANT_GENTOO_CLASSPATH_EXTRA} ]]
cp+=:${EANT_GENTOO_CLASSPATH_EXTRA}
- if [[ ${cp} ]]; then
+ if [[ ${cp#:} ]]; then
# It seems ant does not like single quotes around ${cp}
- cp=${cp#:}
- [[ ${EANT_GENTOO_CLASSPATH_EXTRA} ]] \
- cp=${cp}:${EANT_GENTOO_CLASSPATH_EXTRA}
- antflags=${antflags} -Dgentoo.classpath=\${cp}\
+ antflags=${antflags} -Dgentoo.classpath=\${cp#:}\
fi
[[ -n ${JAVA_PKG_DEBUG} ]] echo ant ${antflags} ${@}
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog java-utils-2.eclass
chewi 15/06/15 21:09:06
Modified: ChangeLog java-utils-2.eclass
Log:
Add java-pkg_addres function for adding resource files to an existing
jar.
Revision ChangesPath
1.1665 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1665view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1665content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1664r2=1.1665
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1664
retrieving revision 1.1665
diff -u -r1.1664 -r1.1665
--- ChangeLog 15 Jun 2015 19:09:28 - 1.1664
+++ ChangeLog 15 Jun 2015 21:09:06 - 1.1665
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1664 2015/06/15
19:09:28 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1665 2015/06/15
21:09:06 chewi Exp $
+
+ 15 Jun 2015; James Le Cuirot ch...@gentoo.org java-utils-2.eclass:
+ Add java-pkg_addres function for adding resource files to an existing jar.
15 Jun 2015; Justin Lecher j...@gentoo.org intel-sdp.eclass:
Don't install uninstall informations, bug 551638; make use of path_exists()
1.163eclass/java-utils-2.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?rev=1.163view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?rev=1.163content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?r1=1.162r2=1.163
Index: java-utils-2.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -r1.162 -r1.163
--- java-utils-2.eclass 24 May 2015 22:44:37 - 1.162
+++ java-utils-2.eclass 15 Jun 2015 21:09:06 - 1.163
@@ -6,7 +6,7 @@
#
# Licensed under the GNU General Public License, v2
#
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.162
2015/05/24 22:44:37 chewi Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.163
2015/06/15 21:09:06 chewi Exp $
# @ECLASS: java-utils-2.eclass
# @MAINTAINER:
@@ -217,6 +217,37 @@
dosym ${dest} ${JAVA_PKG_SHAREPATH}/examples || die
}
+# @FUNCTION: java-pkg_addres
+# @USAGE: jar dir [find arguments ...]
+# @DESCRIPTION:
+# Adds resource files to an existing jar.
+# It is important that the directory given is actually the root of the
+# corresponding resource tree. The target directory as well as
+# sources.lst, MANIFEST.MF, *.class, *.jar, and *.java files are
+# automatically excluded. Symlinks are always followed. Additional
+# arguments are passed through to find.
+#
+# @CODE
+# java-pkg_addres ${PN}.jar resources ! -name *.html
+# @CODE
+#
+# @param $1 - jar file
+# @param $2 - resource tree directory
+# @param $* - arguments to pass to find
+java-pkg_addres() {
+ debug-print-function ${FUNCNAME} $*
+
+ [[ ${#} -lt 2 ]] die at least two arguments needed
+
+ local jar=$(realpath $1 || die realpath $1 failed)
+ local dir=$2
+ shift 2
+
+ pushd ${dir} /dev/null || die pushd ${dir} failed
+ find -L -type f ! -path ./target/* ! -path ./sources.lst ! -name
MANIFEST.MF ! -regex .*\.\(class\|jar\|java\) ${@} -print0 | xargs -0 jar
uf ${jar} || die jar failed
+ popd /dev/null || die popd failed
+}
+
# @FUNCTION: java-pkg_dojar
# @USAGE: jar1 [jar2 ...]
# @DESCRIPTION:
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog java-utils-2.eclass
chewi 15/05/24 22:44:37
Modified: ChangeLog java-utils-2.eclass
Log:
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?
Revision ChangesPath
1.1621 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1621view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1621content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1620r2=1.1621
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1620
retrieving revision 1.1621
diff -u -r1.1620 -r1.1621
--- ChangeLog 24 May 2015 20:40:40 - 1.1620
+++ ChangeLog 24 May 2015 22:44:37 - 1.1621
@@ -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 ch...@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 ch...@gentoo.org java-pkg-simple.eclass:
Remove annoying java-pkg-simple build script check. Most people only use
1.162eclass/java-utils-2.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?rev=1.162view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?rev=1.162content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?r1=1.161r2=1.162
Index: java-utils-2.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -r1.161 -r1.162
--- java-utils-2.eclass 9 May 2015 22:20:44 - 1.161
+++ java-utils-2.eclass 24 May 2015 22:44:37 - 1.162
@@ -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_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:
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog java-utils-2.eclass java-virtuals-2.eclass java-vm-2.eclass
chewi 15/05/09 22:20:44
Modified: ChangeLog java-utils-2.eclass
java-virtuals-2.eclass java-vm-2.eclass
Log:
Bump everyone to java-config 2.2.
Revision ChangesPath
1.1610 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1610view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1610content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1609r2=1.1610
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1609
retrieving revision 1.1610
diff -u -r1.1609 -r1.1610
--- ChangeLog 9 May 2015 19:51:00 - 1.1609
+++ ChangeLog 9 May 2015 22:20:44 - 1.1610
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1609 2015/05/09
19:51:00 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1610 2015/05/09
22:20:44 chewi Exp $
+
+ 09 May 2015; James Le Cuirot ch...@gentoo.org java-utils-2.eclass,
+ java-virtuals-2.eclass, java-vm-2.eclass:
+ Bump everyone to java-config 2.2.
09 May 2015; Davide Pesavento p...@gentoo.org qt4-build-multilib.eclass:
graphite support was dropped from gcc-4.7
1.161eclass/java-utils-2.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?rev=1.161view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?rev=1.161content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?r1=1.160r2=1.161
Index: java-utils-2.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -r1.160 -r1.161
--- java-utils-2.eclass 2 May 2015 20:23:56 - 1.160
+++ java-utils-2.eclass 9 May 2015 22:20:44 - 1.161
@@ -6,7 +6,7 @@
#
# Licensed under the GNU General Public License, v2
#
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.160
2015/05/02 20:23:56 chewi Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.161
2015/05/09 22:20:44 chewi Exp $
# @ECLASS: java-utils-2.eclass
# @MAINTAINER:
@@ -43,7 +43,7 @@
# This is a convience variable to be used from the other java eclasses. This is
# the version of java-config we want to use. Usually the latest stable version
# so that ebuilds can use new features without depending on specific versions.
-JAVA_PKG_E_DEPEND==dev-java/java-config-2.1.9-r1 ${JAVA_PKG_PORTAGE_DEP}
+JAVA_PKG_E_DEPEND==dev-java/java-config-2.2.0 ${JAVA_PKG_PORTAGE_DEP}
has source ${JAVA_PKG_IUSE} JAVA_PKG_E_DEPEND=${JAVA_PKG_E_DEPEND} source?
( app-arch/zip )
# @ECLASS-VARIABLE: JAVA_PKG_WANT_BOOTCLASSPATH
1.10 eclass/java-virtuals-2.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-virtuals-2.eclass?rev=1.10view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-virtuals-2.eclass?rev=1.10content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-virtuals-2.eclass?r1=1.9r2=1.10
Index: java-virtuals-2.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/java-virtuals-2.eclass,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- java-virtuals-2.eclass 18 Jul 2012 19:13:23 - 1.9
+++ java-virtuals-2.eclass 9 May 2015 22:20:44 - 1.10
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2015 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.9
2012/07/18 19:13:23 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-virtuals-2.eclass,v 1.10
2015/05/09 22:20:44 chewi Exp $
# @ECLASS: java-virtuals-2.eclass
# @MAINTAINER:
@@ -14,7 +14,7 @@
inherit java-utils-2
-DEPEND==dev-java/java-config-2.1.6
+DEPEND==dev-java/java-config-2.2.0
RDEPEND=${DEPEND}
S=${WORKDIR}
1.49 eclass/java-vm-2.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-vm-2.eclass?rev=1.49view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-vm-2.eclass?rev=1.49content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-vm-2.eclass?r1=1.48r2=1.49
Index: java-vm-2.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/java-vm-2.eclass,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
---
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog java-utils-2.eclass
chewi 15/05/02 20:23:56
Modified: ChangeLog java-utils-2.eclass
Log:
Make java-pkg_doso always install with mode 0755, which is more like
dolib.so. Closes bug #225729.
Revision ChangesPath
1.1600 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1600view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1600content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1599r2=1.1600
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1599
retrieving revision 1.1600
diff -u -r1.1599 -r1.1600
--- ChangeLog 1 May 2015 12:34:31 - 1.1599
+++ ChangeLog 2 May 2015 20:23:56 - 1.1600
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1599 2015/05/01
12:34:31 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1600 2015/05/02
20:23:56 chewi Exp $
+
+ 02 May 2015; James Le Cuirot ch...@gentoo.org java-utils-2.eclass:
+ Make java-pkg_doso always install with mode 0755, which is more like
+ dolib.so. Closes bug #225729.
01 May 2015; grkni...@gentoo.org mysql.eclass, mysql-multilib.eclass,
mysql-v2.eclass:
1.160eclass/java-utils-2.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?rev=1.160view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?rev=1.160content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?r1=1.159r2=1.160
Index: java-utils-2.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -r1.159 -r1.160
--- java-utils-2.eclass 28 Apr 2015 20:35:40 - 1.159
+++ java-utils-2.eclass 2 May 2015 20:23:56 - 1.160
@@ -6,7 +6,7 @@
#
# Licensed under the GNU General Public License, v2
#
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.159
2015/04/28 20:35:40 chewi Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.160
2015/05/02 20:23:56 chewi Exp $
# @ECLASS: java-utils-2.eclass
# @MAINTAINER:
@@ -412,7 +412,7 @@
# install if it isn't a symlink
if [[ ! -L ${lib} ]] ; then
INSDESTTREE=${JAVA_PKG_LIBDEST} \
- INSOPTIONS=${LIBOPTIONS} \
+ INSOPTIONS=-m0755 \
doins ${lib} || die failed to
install ${lib}
java-pkg_append_ JAVA_PKG_LIBRARY
${JAVA_PKG_LIBDEST}
debug-print Installing ${lib} to
${JAVA_PKG_LIBDEST}
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog java-utils-2.eclass
chewi 15/04/14 14:08:34
Modified: ChangeLog java-utils-2.eclass
Log:
Consider SLOTs when checking Java dependencies. Comment out the longer
error message for now to avoid spamming both users and ourselves
because this issue is currently widespread.
Revision ChangesPath
1.1587 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1587view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1587content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1586r2=1.1587
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1586
retrieving revision 1.1587
diff -u -r1.1586 -r1.1587
--- ChangeLog 11 Apr 2015 17:11:22 - 1.1586
+++ ChangeLog 14 Apr 2015 14:08:34 - 1.1587
@@ -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.1586 2015/04/11
17:11:22 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1587 2015/04/14
14:08:34 chewi Exp $
+
+ 14 Apr 2015; James Le Cuirot ch...@gentoo.org java-utils-2.eclass:
+ Consider SLOTs when checking Java dependencies. Comment out the longer error
+ message for now to avoid spamming both users and ourselves because this issue
+ is currently widespread.
11 Apr 2015; Michael Palimaka kensing...@gentoo.org kde5-functions.eclass,
kde5.eclass:
1.158eclass/java-utils-2.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?rev=1.158view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?rev=1.158content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?r1=1.157r2=1.158
Index: java-utils-2.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -r1.157 -r1.158
--- java-utils-2.eclass 4 Apr 2015 21:04:49 - 1.157
+++ java-utils-2.eclass 14 Apr 2015 14:08:34 - 1.158
@@ -2,11 +2,11 @@
#
# Copyright (c) 2004-2005, Thomas Matthijs a...@gentoo.org
# Copyright (c) 2004, Karl Trygve Kalleberg kar...@gentoo.org
-# Copyright (c) 2004-2011, Gentoo Foundation
+# Copyright (c) 2004-2015, Gentoo Foundation
#
# Licensed under the GNU General Public License, v2
#
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.157
2015/04/04 21:04:49 chewi Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.158
2015/04/14 14:08:34 chewi Exp $
# @ECLASS: java-utils-2.eclass
# @MAINTAINER:
@@ -2687,42 +2687,54 @@
local target_pkg=${2}
local dev_error=
- # remove the version specification, which may include globbing (* and
[123])
- local stripped_pkg=$(echo ${target_pkg} | sed \
-
's/-\([0-9*]*\(\[[0-9]*\]\)*\)*\(\.\([0-9*]*\(\[[0-9]*\]\)*\)*\)*$//')
+ # Transform into a regular expression to look for a matching package
+ # and SLOT. SLOTs don't have to be numeric so foo-bar could either
+ # mean foo-bar:0 or foo:bar. So you want to get your head around the
+ # line below?
+ #
+ # * The target package first has any dots escaped, e.g. foo-1.2
+ # becomes foo-1\.2.
+ #
+ # * sed then looks at the component following the last - character,
+ # or the whole string if there is no - character. It uses this to
+ # build a new regexp with two significant branches.
+ #
+ # * The first checks for the whole target package string, optionally
+ # followed by a version number, and then :0.
+ #
+ # * The second checks for the first part of the target package
+ # string, optionally followed by a version number, followed by the
+ # aforementioned component, treating that as a SLOT.
+ #
+ local stripped_pkg=/$(sed -r
's/-?([^-]+)$/(\0(-[^:]+)?:0|(-[^:]+)?:\1)/' ${target_pkg//./\\.})\\b
debug-print Matching against: ${stripped_pkg}
- if [[ ${limit_to} != runtime ! ( ${DEPEND} =~ $stripped_pkg )
]]; then
- dev_error=The ebuild is attempting to use ${target_pkg} that
is not
- dev_error=${dev_error} declared in DEPEND.
+ if [[ ${limit_to} != runtime ! ( ${DEPEND} =~ $stripped_pkg ) ]];
then
+ dev_error=The ebuild is attempting to use ${target_pkg}, which
is not
+ dev_error+=declared with a SLOT in DEPEND.
if is-java-strict; then
- eerror ${dev_error}
die ${dev_error}
- elif [[ ${BASH_SUBSHELL} = 0 ]]; then
-
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog java-utils-2.eclass
radhermit14/04/09 21:55:12
Modified: ChangeLog java-utils-2.eclass
Log:
Only refer to DESTTREE within the src_install phase.
Revision ChangesPath
1.1202 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1202view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1202content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1201r2=1.1202
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1201
retrieving revision 1.1202
diff -u -r1.1201 -r1.1202
--- ChangeLog 9 Apr 2014 21:34:10 - 1.1201
+++ ChangeLog 9 Apr 2014 21:55:12 - 1.1202
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1201 2014/04/09
21:34:10 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1202 2014/04/09
21:55:12 radhermit Exp $
+
+ 09 Apr 2014; Tim Harder radher...@gentoo.org java-utils-2.eclass:
+ Only refer to DESTTREE within the src_install phase.
09 Apr 2014; Michał Górny mgo...@gentoo.org python-r1.eclass:
Re-enable the python_gen_usedep empty argument check.
1.156eclass/java-utils-2.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?rev=1.156view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?rev=1.156content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?r1=1.155r2=1.156
Index: java-utils-2.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -r1.155 -r1.156
--- java-utils-2.eclass 6 Oct 2013 14:37:31 - 1.155
+++ java-utils-2.eclass 9 Apr 2014 21:55:12 - 1.156
@@ -6,7 +6,7 @@
#
# Licensed under the GNU General Public License, v2
#
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.155
2013/10/06 14:37:31 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.156
2014/04/09 21:55:12 radhermit Exp $
# @ECLASS: java-utils-2.eclass
# @MAINTAINER:
@@ -192,6 +192,7 @@
[[ ${#} -lt 1 ]] die At least one argument needed
java-pkg_check-phase install
+ java-pkg_init_paths_
local dest=/usr/share/doc/${PF}/examples
if [[ ${1} == --subdir ]]; then
@@ -543,6 +544,7 @@
# QA checks
java-pkg_check-phase install
+ java-pkg_init_paths_
[[ -z ${dir} ]] die Must specify a directory!
[[ ! -d ${dir} ]] die ${dir} does not exist, or isn't a
directory!
@@ -2060,7 +2062,6 @@
java-pkg_announce-qa-violation Using old ant_src_unpack.
Should be src_unpack
fi
- java-pkg_init_paths_
java-pkg_switch-vm
PATH=${JAVA_HOME}/bin:${PATH}
@@ -,7 +2223,6 @@
[[ -z ${JAVA_PKG_LIBDEST} ]]
JAVA_PKG_LIBDEST=${DESTTREE}/$(get_libdir)/${JAVA_PKG_NAME}
[[ -z ${JAVA_PKG_WARDEST} ]]
JAVA_PKG_WARDEST=${JAVA_PKG_SHAREPATH}/webapps
-
# TODO maybe only print once?
debug-print JAVA_PKG_SHAREPATH: ${JAVA_PKG_SHAREPATH}
debug-print JAVA_PKG_ENV: ${JAVA_PKG_ENV}
