summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZhang Zongyu <zzy2529420793@gmail.com>2020-08-31 00:44:53 +0800
committerMiroslav Šulc <fordfrog@gentoo.org>2020-08-30 18:53:53 +0200
commite93b8d82f35c737ac42a255de4fe8e52528d4d18 (patch)
tree657327103763b584815b2cb1281c5d09ec719ec7
parentwww-client/qutebrowser: arm64 keyworded (bug #734830) (diff)
downloadgentoo-e93b8d82f35c737ac42a255de4fe8e52528d4d18.tar.gz
gentoo-e93b8d82f35c737ac42a255de4fe8e52528d4d18.tar.bz2
gentoo-e93b8d82f35c737ac42a255de4fe8e52528d4d18.zip
app-portage/java-ebuilder: update ebuild for ${PV}==9999
Signed-off-by: Zhang Zongyu <zzy2529420793@gmail.com> Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
-rw-r--r--app-portage/java-ebuilder/java-ebuilder-9999.ebuild31
1 files changed, 9 insertions, 22 deletions
diff --git a/app-portage/java-ebuilder/java-ebuilder-9999.ebuild b/app-portage/java-ebuilder/java-ebuilder-9999.ebuild
index 7a78207628c..32f44a7de32 100644
--- a/app-portage/java-ebuilder/java-ebuilder-9999.ebuild
+++ b/app-portage/java-ebuilder/java-ebuilder-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2016-2019 Gentoo Authors
+# Copyright 2016-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -27,32 +27,18 @@ RDEPEND=">=virtual/jre-1.8
S="${WORKDIR}/${P}"
JAVA_SRC_DIR="src/main/java"
-JAVA_ADDRES_DIRS="src/main/resources"
+JAVA_RESOURCE_DIRS="src/main/resources"
-MAIN_CLASS="org.gentoo.java.ebuilder.Main"
+JAVA_LAUNCHER_FILENAME=${PN}
+JAVA_MAIN_CLASS="org.gentoo.java.ebuilder.Main"
src_prepare() {
default
-
- local base_dir="target/classes/"
-
- [[ ! -d "${base_dir}" ]] &&mkdir -p "${base_dir}META-INF"
- echo "Manifest-Version: 1.0
-Main-Class: ${MAIN_CLASS}" \
- >> "${base_dir}META-INF/MANIFEST.MF"
-
- hprefixify scripts/{{tree,meta}.sh,movl} java-ebuilder.conf
-}
-
-src_compile() {
- java-pkg-simple_src_compile
-
- jar uf ${JAVA_JAR_FILENAME} -C ${JAVA_ADDRES_DIRS} usage.txt || die "Failed to add resources"
+ hprefixify scripts/{bin/*,resources/Makefiles/*,movl} java-ebuilder.conf
}
src_install() {
java-pkg-simple_src_install
- java-pkg_dolauncher ${PN} --main ${MAIN_CLASS}
insinto /var/lib/${PN}
doins -r maven
@@ -61,9 +47,10 @@ src_install() {
dodoc README maven.conf
- exeinto /usr/lib/${PN}
- doexe scripts/{tree,meta}.sh
-
+ exeinto /usr/lib/${PN}/bin
+ doexe scripts/bin/*
+ insinto /usr/lib/${PN}
+ doins -r scripts/resources/*
dobin scripts/movl
insinto /etc