[gentoo-commits] repo/gentoo:master commit in: app-portage/java-ebuilder/

[Miroslav Šulc]

commit:     5b365713e2bc9751eb00c88e363d6265a3743205
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 30 20:02:55 2019 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Wed Oct 30 20:03:07 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b365713

app-portage/java-ebuilder: bump and fixes

Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 app-portage/java-ebuilder/Manifest                 |  3 +-
 app-portage/java-ebuilder/java-ebuilder-0.2.ebuild | 65 ----------------------
 ...ilder-0.1.ebuild => java-ebuilder-0.3.0.ebuild} | 26 +++++----
 .../java-ebuilder/java-ebuilder-9999.ebuild        | 24 +++++---
 4 files changed, 32 insertions(+), 86 deletions(-)

diff --git a/app-portage/java-ebuilder/Manifest b/app-portage/java-ebuilder/Manifest
index 5c6b9f0e520..5cf9428f053 100644
--- a/app-portage/java-ebuilder/Manifest
+++ b/app-portage/java-ebuilder/Manifest
@@ -1,2 +1 @@
-DIST java-ebuilder-0.1.tar.gz 22291 BLAKE2B c958ec8c02d33dba4f70877aefe9c8e11a9a8b9acadad614c4c792f736f9a25306ac45fe6730dcebcbf33bb5135d9086a7915f01c58f6273d1a3e54c0c52766c SHA512 bc058b03da53bab03d7a48b2971f34da812bfd03aff7cc64ee4a3209245f4855bf8095d12c5c506f49b896db69fba09f06814f4c35e13a25c4e8f381d6416637
-DIST java-ebuilder-0.2.tar.gz 22998 BLAKE2B 3ba143a765f2f9b6a99bce1733724aa90ea5d0472d4d3d679217d3854ad61eefb32fd760cb117ef6ecd3a9a57b477895353f471b59a3d79748b383e6bf1fec05 SHA512 c76b15d4a81413e05359202c7b73b84baa3b277faddb7aa5f904290e5e47ed2bc6d80638c7b5417acc4224d067e4f48f1687972b7e36c363da8e9a89ea7f2766
+DIST java-ebuilder-0.3.0.tar.gz 23127 BLAKE2B 2893d8afffe128bff769f2e2bbeaa393182c8d6671cdc3da0755a3cabb07552f6f22d9120e77232f7db83dbde5baae8ce9b40becbad85fabaf5238f6ee96bbeb SHA512 0f6ce22d144e888c05d4cbe488434454f9f5ff8598ebb6e6f9734bab90cead14283b6b82b5bfc52aa43f39ad786085453d6171d81537af2983717363645b6c63

diff --git a/app-portage/java-ebuilder/java-ebuilder-0.2.ebuild b/app-portage/java-ebuilder/java-ebuilder-0.2.ebuild
deleted file mode 100644
index f294a30ebbc..00000000000
--- a/app-portage/java-ebuilder/java-ebuilder-0.2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 2016-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-if [[ ${PV} == 9999 ]]; then
-	ECLASS="git-r3"
-	EGIT_REPO_URI="https://github.com/heroxbd/${PN}.git"
-else
-	SRC_URI="https://github.com/gentoo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-inherit java-pkg-2 java-pkg-simple prefix ${ECLASS}
-
-DESCRIPTION="Java team tool for semi-automatic creation of ebuilds from pom.xml"
-HOMEPAGE="https://github.com/gentoo/java-ebuilder"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-DEPEND=">=virtual/jdk-1.8"
-RDEPEND=">=virtual/jre-1.8
-	sys-process/parallel
-	>=dev-java/maven-bin-3"
-
-S="${WORKDIR}/${P}"
-
-JAVA_SRC_DIR="src/main/java"
-JAVA_ADDRES_DIRS="src/main/resources"
-
-MAIN_CLASS="org.gentoo.java.ebuilder.Main"
-
-java_prepare() {
-	eapply_user
-	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"
-}
-
-src_prepare() {
-	eapply_user
-	hprefixify scripts/{{tree,meta}.sh,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
-	dodir /var/lib/${PN}/{poms,cache}
-
-	dodoc README maven.conf
-
-	exeinto /usr/lib/${PN}
-	doexe scripts/{tree,meta}.sh
-
-	dobin scripts/movl
-
-	insinto /etc
-	doins java-ebuilder.conf
-}

diff --git a/app-portage/java-ebuilder/java-ebuilder-0.1.ebuild b/app-portage/java-ebuilder/java-ebuilder-0.3.0.ebuild
similarity index 72%
rename from app-portage/java-ebuilder/java-ebuilder-0.1.ebuild
rename to app-portage/java-ebuilder/java-ebuilder-0.3.0.ebuild
index 1c42c4d5eee..ecd724819f2 100644
--- a/app-portage/java-ebuilder/java-ebuilder-0.1.ebuild
+++ b/app-portage/java-ebuilder/java-ebuilder-0.3.0.ebuild
@@ -1,13 +1,13 @@
-# Copyright 2016 Gentoo Foundation
+# Copyright 2016-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 
 if [[ ${PV} == 9999 ]]; then
 	ECLASS="git-r3"
-	EGIT_REPO_URI="https://github.com/heroxbd/${PN}.git"
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${PN}.git"
 else
-	SRC_URI="https://github.com/gentoo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.gz"
 	KEYWORDS="~amd64"
 fi
 
@@ -31,18 +31,23 @@ JAVA_ADDRES_DIRS="src/main/resources"
 
 MAIN_CLASS="org.gentoo.java.ebuilder.Main"
 
-java_prepare() {
-	eapply_user
+src_prepare() {
+	default
+
 	local base_dir="target/classes/"
-	[[ ! -d "${base_dir}" ]] &&mkdir -p "${base_dir}META-INF"
+
+	[[ ! -d "${base_dir}" ]] && mkdir -p "${base_dir}META-INF"
 	echo "Manifest-Version: 1.0
 Main-Class: ${MAIN_CLASS}" \
 		>> "${base_dir}META-INF/MANIFEST.MF"
-}
 
-src_prepare() {
 	hprefixify scripts/{{tree,meta}.sh,movl} java-ebuilder.conf
-	eapply_user
+}
+
+src_compile() {
+	java-pkg-simple_src_compile
+
+	jar uf ${JAVA_JAR_FILENAME} -C ${JAVA_ADDRES_DIRS} usage.txt || die "Failed to add resources"
 }
 
 src_install() {
@@ -52,6 +57,7 @@ src_install() {
 	insinto /var/lib/${PN}
 	doins -r maven
 	dodir /var/lib/${PN}/{poms,cache}
+	keepdir /var/lib/${PN}/{poms,cache}
 
 	dodoc README maven.conf
 

diff --git a/app-portage/java-ebuilder/java-ebuilder-9999.ebuild b/app-portage/java-ebuilder/java-ebuilder-9999.ebuild
index 367d6061c92..7a78207628c 100644
--- a/app-portage/java-ebuilder/java-ebuilder-9999.ebuild
+++ b/app-portage/java-ebuilder/java-ebuilder-9999.ebuild
@@ -1,13 +1,13 @@
-# Copyright 2016-2017 Gentoo Foundation
+# Copyright 2016-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 
 if [[ ${PV} == 9999 ]]; then
 	ECLASS="git-r3"
-	EGIT_REPO_URI="https://github.com/gentoo/${PN}.git"
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${PN}.git"
 else
-	SRC_URI="https://github.com/gentoo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://gitweb.gentoo.org/proj/java-ebuilder.git/snapshot/${P}.tar.gz"
 	KEYWORDS="~amd64"
 fi
 
@@ -31,20 +31,25 @@ JAVA_ADDRES_DIRS="src/main/resources"
 
 MAIN_CLASS="org.gentoo.java.ebuilder.Main"
 
-java_prepare() {
-	eapply_user
+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"
-}
 
-src_prepare() {
-	eapply_user
 	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"
+}
+
 src_install() {
 	java-pkg-simple_src_install
 	java-pkg_dolauncher ${PN} --main ${MAIN_CLASS}
@@ -52,6 +57,7 @@ src_install() {
 	insinto /var/lib/${PN}
 	doins -r maven
 	dodir /var/lib/${PN}/{poms,cache}
+	keepdir /var/lib/${PN}/{poms,cache}
 
 	dodoc README maven.conf