Gentoo Archives: gentoo-commits

From: "Miroslav Šulc" <fordfrog@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-portage/java-ebuilder/
Date: Sun, 30 Aug 2020 16:54:01
Message-Id: 1598806433.e93b8d82f35c737ac42a255de4fe8e52528d4d18.fordfrog@gentoo
1 commit: e93b8d82f35c737ac42a255de4fe8e52528d4d18
2 Author: Zhang Zongyu <zzy2529420793 <AT> gmail <DOT> com>
3 AuthorDate: Sun Aug 30 16:44:53 2020 +0000
4 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
5 CommitDate: Sun Aug 30 16:53:53 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e93b8d82
7
8 app-portage/java-ebuilder: update ebuild for ${PV}==9999
9
10 Signed-off-by: Zhang Zongyu <zzy2529420793 <AT> gmail.com>
11 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
12
13 .../java-ebuilder/java-ebuilder-9999.ebuild | 31 +++++++---------------
14 1 file changed, 9 insertions(+), 22 deletions(-)
15
16 diff --git a/app-portage/java-ebuilder/java-ebuilder-9999.ebuild b/app-portage/java-ebuilder/java-ebuilder-9999.ebuild
17 index 7a78207628c..32f44a7de32 100644
18 --- a/app-portage/java-ebuilder/java-ebuilder-9999.ebuild
19 +++ b/app-portage/java-ebuilder/java-ebuilder-9999.ebuild
20 @@ -1,4 +1,4 @@
21 -# Copyright 2016-2019 Gentoo Authors
22 +# Copyright 2016-2020 Gentoo Authors
23 # Distributed under the terms of the GNU General Public License v2
24
25 EAPI=7
26 @@ -27,32 +27,18 @@ RDEPEND=">=virtual/jre-1.8
27 S="${WORKDIR}/${P}"
28
29 JAVA_SRC_DIR="src/main/java"
30 -JAVA_ADDRES_DIRS="src/main/resources"
31 +JAVA_RESOURCE_DIRS="src/main/resources"
32
33 -MAIN_CLASS="org.gentoo.java.ebuilder.Main"
34 +JAVA_LAUNCHER_FILENAME=${PN}
35 +JAVA_MAIN_CLASS="org.gentoo.java.ebuilder.Main"
36
37 src_prepare() {
38 default
39 -
40 - local base_dir="target/classes/"
41 -
42 - [[ ! -d "${base_dir}" ]] &&mkdir -p "${base_dir}META-INF"
43 - echo "Manifest-Version: 1.0
44 -Main-Class: ${MAIN_CLASS}" \
45 - >> "${base_dir}META-INF/MANIFEST.MF"
46 -
47 - hprefixify scripts/{{tree,meta}.sh,movl} java-ebuilder.conf
48 -}
49 -
50 -src_compile() {
51 - java-pkg-simple_src_compile
52 -
53 - jar uf ${JAVA_JAR_FILENAME} -C ${JAVA_ADDRES_DIRS} usage.txt || die "Failed to add resources"
54 + hprefixify scripts/{bin/*,resources/Makefiles/*,movl} java-ebuilder.conf
55 }
56
57 src_install() {
58 java-pkg-simple_src_install
59 - java-pkg_dolauncher ${PN} --main ${MAIN_CLASS}
60
61 insinto /var/lib/${PN}
62 doins -r maven
63 @@ -61,9 +47,10 @@ src_install() {
64
65 dodoc README maven.conf
66
67 - exeinto /usr/lib/${PN}
68 - doexe scripts/{tree,meta}.sh
69 -
70 + exeinto /usr/lib/${PN}/bin
71 + doexe scripts/bin/*
72 + insinto /usr/lib/${PN}
73 + doins -r scripts/resources/*
74 dobin scripts/movl
75
76 insinto /etc