commit: 2635a5185a661a73e3d53f55d6622f0c0f1e171e
Author: zongyu <zzy2529420793 <AT> gmail <DOT> com>
AuthorDate: Tue Aug 18 03:20:15 2020 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue Aug 18 08:05:21 2020 +0000
URL: https://gitweb.gentoo.org/proj/java-ebuilder.git/commit/?id=2635a518
update java-pkg-maven, add two licenses
Signed-off-by: zongyu <zzy2529420793 <AT> gmail.com>
maven/eclass/java-pkg-maven.eclass | 19 +++++++--
maven/licenses/Indiana-University-Extreme-Lab | 58 +++++++++++++++++++++++++++
maven/licenses/UPL-1.0 | 35 ++++++++++++++++
3 files changed, 108 insertions(+), 4 deletions(-)
diff --git a/maven/eclass/java-pkg-maven.eclass
b/maven/eclass/java-pkg-maven.eclass
index 68f6712..089523c 100644
--- a/maven/eclass/java-pkg-maven.eclass
+++ b/maven/eclass/java-pkg-maven.eclass
@@ -37,26 +37,35 @@ EXPORT_FUNCTIONS src_unpack
# the application. Give it a default value to handle src_unpack.
: ${JAVA_TEST_SRC_DIR:=src/test/java}
+# @ECLASS-VARIABLE: JAVA_BINJAR_FILENAME
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# The name of the binary jar file that java-pkg-maven will not unpack
+
# @FUNCTION: java-pkg-binjar_src_unpack
# @DESCRIPTION:
# Copy the binary jar into the expected place of java-pkg-simple. Do
# not extract files from archive.
java-pkg-maven_src_unpack() {
+ # mkdir
+ mkdir -p "${S}"/${JAVA_TEST_SRC_DIR}\
+ || die "Could not create ${JAVA_TEST_SRC_DIR}"
+ mkdir -p "${S}"/${JAVA_SRC_DIR}\
+ || die "Could not create ${JAVA_SRC_DIR}"
+
+ # unpack files
for file in ${A}; do
case ${file} in
*-test-sources.jar)
- mkdir -p "${S}"/${JAVA_TEST_SRC_DIR}\
- || die "Could not create
${JAVA_TEST_SRC_DIR}"
unzip -q -o "${DISTDIR}"/${file} -d
"${S}"/${JAVA_TEST_SRC_DIR}\
|| die "Could not unzip source code for
testing" ;;
*-sources.jar)
- mkdir -p "${S}"/${JAVA_SRC_DIR}\
- || die "Could not create
${JAVA_SRC_DIR}"
unzip -q -o "${DISTDIR}"/${file} -d
"${S}"/${JAVA_SRC_DIR}\
|| die "Could not unzip source code"
if [[ -d "${S}"/${JAVA_SRC_DIR}/META-INF ]] ;
then
rm "${S}"/${JAVA_SRC_DIR}/META-INF -r
|| die
fi ;;
+ ${JAVA_BINJAR_FILENAME}) ;;
*)
unpack ${file};;
esac
@@ -67,5 +76,7 @@ java-pkg-maven_src_unpack() {
cp "${S}"/${JAVA_SRC_DIR} "${S}"/${JAVA_RESOURCE_DIRS} -r || die
find "${S}"/${JAVA_RESOURCE_DIRS} -type f ! -name \*.properties \
-exec rm {} \; || die
+ find "${S}"/${JAVA_RESOURCE_DIRS} -type d -empty -delete || die
+ mkdir -p "${S}"/${JAVA_RESOURCE_DIRS}
}
diff --git a/maven/licenses/Indiana-University-Extreme-Lab
b/maven/licenses/Indiana-University-Extreme-Lab
new file mode 100644
index 0000000..104f189
--- /dev/null
+++ b/maven/licenses/Indiana-University-Extreme-Lab
@@ -0,0 +1,58 @@
+LICENSE FOR THE Extreme! Lab PullParser
+------------------------------------------------------------------------
+
+Copyright � 2002 The Trustees of Indiana University.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+1) All redistributions of source code must retain the above
+ copyright notice, the list of authors in the original source
+ code, this list of conditions and the disclaimer listed in this
+ license;
+
+2) All redistributions in binary form must reproduce the above
+ copyright notice, this list of conditions and the disclaimer
+ listed in this license in the documentation and/or other
+ materials provided with the distribution;
+
+3) Any documentation included with all redistributions must include
+ the following acknowledgement:
+
+ "This product includes software developed by the Indiana
+ University Extreme! Lab. For further information please visit
+ http://www.extreme.indiana.edu/";
+
+ Alternatively, this acknowledgment may appear in the software
+ itself, and wherever such third-party acknowledgments normally
+ appear.
+
+4) The name "Indiana Univeristy" and "Indiana Univeristy
+ Extreme! Lab" shall not be used to endorse or promote
+ products derived from this software without prior written
+ permission from Indiana University. For written permission,
+ please contact http://www.extreme.indiana.edu/.
+
+5) Products derived from this software may not use "Indiana
+ Univeristy" name nor may "Indiana Univeristy" appear in their name,
+ without prior written permission of the Indiana University.
+
+Indiana University provides no reassurances that the source code
+provided does not infringe the patent or any other intellectual
+property rights of any other entity. Indiana University disclaims any
+liability to any recipient for claims brought by any other entity
+based on infringement of intellectual property rights or otherwise.
+
+LICENSEE UNDERSTANDS THAT SOFTWARE IS PROVIDED "AS IS" FOR WHICH
+NO�WARRANTIES AS TO CAPABILITIES OR ACCURACY ARE MADE. INDIANA
+UNIVERSITY GIVES NO WARRANTIES AND MAKES NO REPRESENTATION THAT
+SOFTWARE IS FREE OF INFRINGEMENT OF THIRD PARTY PATENT, COPYRIGHT, OR
+OTHER PROPRIETARY RIGHTS.� INDIANA UNIVERSITY MAKES NO WARRANTIES THAT
+SOFTWARE IS FREE FROM "BUGS", "VIRUSES", "TROJAN HORSES", "TRAP
+DOORS", "WORMS", OR OTHER HARMFUL CODE. LICENSEE ASSUMES THE ENTIRE
+RISK AS TO THE PERFORMANCE OF SOFTWARE AND/OR ASSOCIATED MATERIALS,
+AND TO THE PERFORMANCE AND VALIDITY OF INFORMATION GENERATED USING
+SOFTWARE.
+
diff --git a/maven/licenses/UPL-1.0 b/maven/licenses/UPL-1.0
new file mode 100644
index 0000000..e2f6bd3
--- /dev/null
+++ b/maven/licenses/UPL-1.0
@@ -0,0 +1,35 @@
+Copyright (c) [year] [copyright holders]
+
+The Universal Permissive License (UPL), Version 1.0
+
+Subject to the condition set forth below, permission is hereby granted to any
+person obtaining a copy of this software, associated documentation and/or data
+(collectively the "Software"), free of charge and under any and all copyright
+rights in the Software, and any and all patent rights owned or freely
+licensable by each licensor hereunder covering either (i) the unmodified
+Software as contributed to or provided by such licensor, or (ii) the Larger
+Works (as defined below), to deal in both
+
+(a) the Software, and
+(b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
+one is included with the Software (each a "Larger Work" to which the Software
+is contributed by such licensors),
+
+without restriction, including without limitation the rights to copy, create
+derivative works of, display, perform, and distribute the Software and make,
+use, sell, offer for sale, import, export, have made, and have sold the
+Software and the Larger Work(s), and to sublicense the foregoing rights on
+either these or other terms.
+
+This license is subject to the following condition:
+The above copyright notice and either this complete permission notice or at
+a minimum a reference to the UPL must be included in all copies or
+substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
