From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9C9A213835A for ; Sun, 30 Aug 2020 16:54:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D21AFE0972; Sun, 30 Aug 2020 16:54:00 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 996DEE0972 for ; Sun, 30 Aug 2020 16:54:00 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1921733C84E for ; Sun, 30 Aug 2020 16:53:59 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 979662FD for ; Sun, 30 Aug 2020 16:53:57 +0000 (UTC) From: "Miroslav Šulc" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Miroslav Šulc" Message-ID: <1598806433.e93b8d82f35c737ac42a255de4fe8e52528d4d18.fordfrog@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-portage/java-ebuilder/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-portage/java-ebuilder/java-ebuilder-9999.ebuild X-VCS-Directories: app-portage/java-ebuilder/ X-VCS-Committer: fordfrog X-VCS-Committer-Name: Miroslav Šulc X-VCS-Revision: e93b8d82f35c737ac42a255de4fe8e52528d4d18 X-VCS-Branch: master Date: Sun, 30 Aug 2020 16:53:57 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 6736e827-8157-4724-86d2-e6255ecff5c9 X-Archives-Hash: 5b4acc095fcfde11e32f61b1dc358799 commit: e93b8d82f35c737ac42a255de4fe8e52528d4d18 Author: Zhang Zongyu gmail com> AuthorDate: Sun Aug 30 16:44:53 2020 +0000 Commit: Miroslav Šulc gentoo org> CommitDate: Sun Aug 30 16:53:53 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e93b8d82 app-portage/java-ebuilder: update ebuild for ${PV}==9999 Signed-off-by: Zhang Zongyu gmail.com> Signed-off-by: Miroslav Šulc gentoo.org> .../java-ebuilder/java-ebuilder-9999.ebuild | 31 +++++++--------------- 1 file 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