| 1 |
monsieurp 15/07/31 07:56:17 |
| 2 |
|
| 3 |
Modified: ChangeLog java-utils-2.eclass |
| 4 |
Log: |
| 5 |
Document JAVA_RM_FILES variable. Also, fix documentation and correct typos in java-pkg_rm_files. |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.1741 eclass/ChangeLog |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1741&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1741&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1740&r2=1.1741 |
| 13 |
|
| 14 |
Index: ChangeLog |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v |
| 17 |
retrieving revision 1.1740 |
| 18 |
retrieving revision 1.1741 |
| 19 |
diff -u -r1.1740 -r1.1741 |
| 20 |
--- ChangeLog 30 Jul 2015 22:17:08 -0000 1.1740 |
| 21 |
+++ ChangeLog 31 Jul 2015 07:56:17 -0000 1.1741 |
| 22 |
@@ -1,6 +1,10 @@ |
| 23 |
# ChangeLog for eclass directory |
| 24 |
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 |
| 25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1740 2015/07/30 22:17:08 chewi Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1741 2015/07/31 07:56:17 monsieurp Exp $ |
| 27 |
+ |
| 28 |
+ 31 Jul 2015; Patrice Clement <monsieurp@g.o> java-utils-2.eclass: |
| 29 |
+ Document JAVA_RM_FILES variable. Also, fix documentation and correct typos in |
| 30 |
+ java-pkg_rm_files. |
| 31 |
|
| 32 |
30 Jul 2015; James Le Cuirot <chewi@g.o> java-utils-2.eclass: |
| 33 |
Fix JAVA_RM_FILES by simplifying java-utils-2_src_prepare on the basis that |
| 34 |
|
| 35 |
|
| 36 |
|
| 37 |
1.168 eclass/java-utils-2.eclass |
| 38 |
|
| 39 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?rev=1.168&view=markup |
| 40 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?rev=1.168&content-type=text/plain |
| 41 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?r1=1.167&r2=1.168 |
| 42 |
|
| 43 |
Index: java-utils-2.eclass |
| 44 |
=================================================================== |
| 45 |
RCS file: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v |
| 46 |
retrieving revision 1.167 |
| 47 |
retrieving revision 1.168 |
| 48 |
diff -u -r1.167 -r1.168 |
| 49 |
--- java-utils-2.eclass 30 Jul 2015 22:17:08 -0000 1.167 |
| 50 |
+++ java-utils-2.eclass 31 Jul 2015 07:56:17 -0000 1.168 |
| 51 |
@@ -6,7 +6,7 @@ |
| 52 |
# |
| 53 |
# Licensed under the GNU General Public License, v2 |
| 54 |
# |
| 55 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.167 2015/07/30 22:17:08 chewi Exp $ |
| 56 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.168 2015/07/31 07:56:17 monsieurp Exp $ |
| 57 |
|
| 58 |
# @ECLASS: java-utils-2.eclass |
| 59 |
# @MAINTAINER: |
| 60 |
@@ -126,6 +126,20 @@ |
| 61 |
# JAVA_PKG_WANT_TARGET=1.3 emerge bar |
| 62 |
# @CODE |
| 63 |
|
| 64 |
+# @ECLASS-VARIABLE: JAVA_RM_FILES |
| 65 |
+# @DEFAULT_UNSET |
| 66 |
+# @DESCRIPTION: |
| 67 |
+# An array containing a list of files to remove. If defined, this array will be |
| 68 |
+# automatically handed over to java-pkg_rm_files for processing during the |
| 69 |
+# src_prepare phase. |
| 70 |
+# |
| 71 |
+# @CODE |
| 72 |
+# JAVA_RM_FILES=( |
| 73 |
+# path/to/File1.java |
| 74 |
+# DELETEME.txt |
| 75 |
+# ) |
| 76 |
+# @CODE |
| 77 |
+ |
| 78 |
# @VARIABLE: JAVA_PKG_COMPILER_DIR |
| 79 |
# @INTERNAL |
| 80 |
# @DESCRIPTION: |
| 81 |
@@ -263,29 +277,25 @@ |
| 82 |
# you wish to remove. |
| 83 |
# |
| 84 |
# Both way work and it is left to the developer's preferences. If the |
| 85 |
-# JAVA_RM_FILES array is defined, it is will be automatically handed over to |
| 86 |
-# java-pkg_rm_files. |
| 87 |
+# JAVA_RM_FILES array is defined, it will be automatically handed over to |
| 88 |
+# java-pkg_rm_files during the src_prepare phase. |
| 89 |
# |
| 90 |
# See java-utils-2_src_prepare. |
| 91 |
# |
| 92 |
# @CODE |
| 93 |
+# java-pkg_rm_files File1.java File2.java |
| 94 |
+# @CODE |
| 95 |
# |
| 96 |
# @param $* - list of files to remove. |
| 97 |
-# JAVA_RM_FILES - array containing files to remove. |
| 98 |
-# if defined, automatically handed over to java-pkg_rm_files in java-utils-2_src_prepare. |
| 99 |
-# |
| 100 |
-# @CODE |
| 101 |
java-pkg_rm_files() { |
| 102 |
debug-print-function ${FUNCNAME} $* |
| 103 |
- OIFS="$IFS" |
| 104 |
- IFS="\n" |
| 105 |
+ local IFS="\n" |
| 106 |
for filename in "$@"; do |
| 107 |
[[ ! -f "${filename}" ]] && die "${filename} is not a regular file. Aborting." |
| 108 |
einfo "Removing unneeded file ${filename}" |
| 109 |
rm -f "${S}/${filename}" || die "cannot remove ${filename}" |
| 110 |
eend $? |
| 111 |
done |
| 112 |
- IFS="$OIFS" |
| 113 |
} |
| 114 |
|
| 115 |
# @FUNCTION: java-pkg_dojar |
Archives