[gentoo-commits] repo/gentoo:master commit in: dev-java/scram/

["Miroslav Šulc" <fordfrog@gentoo.org>]

commit:     55c64cf5baa028cc91202d93efec400cc8dbce17
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Mon Feb  5 16:07:45 2024 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue Feb  6 09:33:55 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55c64cf5

dev-java/scram: code cleanup

Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 dev-java/scram/Manifest         |  2 +-
 dev-java/scram/scram-2.1.ebuild | 57 +++++++++++++----------------------------
 2 files changed, 19 insertions(+), 40 deletions(-)

diff --git a/dev-java/scram/Manifest b/dev-java/scram/Manifest
index 42494f4d9f77..5ba3c94824d5 100644
--- a/dev-java/scram/Manifest
+++ b/dev-java/scram/Manifest
@@ -1 +1 @@
-DIST scram-2.1.tar.gz 64263 BLAKE2B 59b71ee0faa32d2478e38e4275b7c83efb3f7a3ede0c068a8c0a6fe970248d22b539c50b97127b1b757839758d119b395fedd85d85425bd019e0972c2df20ef4 SHA512 e0757b306db03c56f03fa0907e46693337854c152a321cae1b109a1c16b0cb5be2482a92d64a420432a3ea31371990cbac444f965abde89c04083005b30012ef
+DIST scram-2.1.tar.bz2 52442 BLAKE2B e9ec2367251770c4adb3d4bf62702c8ca13264fd12270dfb4f138c740536eb508a383486a81e1ab2bb0f8d4792642d033180c0e43ac287917543249fd16c8a76 SHA512 e2807d2c4b7984b5d9f53cb5ea6f9b2c2d5b48b5e695f25fb775cb3f22672851a9299cfe95912f109205c74817cf9f2fd706f8d49e473257e2571f409ec34044

diff --git a/dev-java/scram/scram-2.1.ebuild b/dev-java/scram/scram-2.1.ebuild
index b533f76dcbb3..6e7eeccf9430 100644
--- a/dev-java/scram/scram-2.1.ebuild
+++ b/dev-java/scram/scram-2.1.ebuild
@@ -1,9 +1,6 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom common/pom.xml --download-uri https://gitlab.com/ongresinc/scram/-/archive/2.1/scram-2.1.tar.gz --slot 0 --keywords "~amd64 ~ppc64 ~x86" --ebuild scram-2.1.ebuild
-
 EAPI=8
 
 JAVA_PKG_IUSE="doc source test"
@@ -14,43 +11,36 @@ inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="Java Implementation of the Salted Challenge Response Authentication Mechanism"
 HOMEPAGE="https://gitlab.com/ongresinc/scram"
-SRC_URI="https://gitlab.com/ongresinc/${PN}/-/archive/${PV}/${P}.tar.gz"
+SRC_URI="https://gitlab.com/ongresinc/${PN}/-/archive/${PV}/${P}.tar.bz2"
+S="${WORKDIR}/${P}"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 ppc64 x86"
 
-# Common dependencies
-# POM: common/pom.xml
-# com.ongres.stringprep:saslprep:1.1 -> >=dev-java/stringprep-2.0:0
-
-CP_DEPEND="
-	dev-java/saslprep:0
-"
+CP_DEPEND="dev-java/saslprep:0"
 
-# Compile dependencies
-# POM: common/pom.xml
-# com.google.code.findbugs:annotations:3.0.1 -> !!!artifactId-not-found!!!
-# com.google.code.findbugs:jsr305:3.0.1 -> >=dev-java/jsr305-3.0.2:0
-# POM: common/pom.xml
-# test? junit:junit:4.12 -> >=dev-java/junit-4.13.2:4
-
-DEPEND="
-	>=virtual/jdk-1.8:*
-	${CP_DEPEND}
+DEPEND="${CP_DEPEND}
 	dev-java/findbugs-annotations:0
 	dev-java/jsr305:0
+	>=virtual/jdk-1.8:*
 	test? ( dev-java/stringprep:0 )
 "
 
-RDEPEND="
+RDEPEND="${CP_DEPEND}
 	>=virtual/jre-1.8:*
-	${CP_DEPEND}"
+"
 
 DOCS=( CHANGELOG NOTICE README.md )
 
-S="${WORKDIR}/${P}"
-
+JAVADOC_CLASSPATH="
+	findbugs-annotations
+	saslprep
+"
+JAVADOC_SRC_DIRS=(
+	"common/src/main/java"
+	"client/src/main/java"
+)
 JAVA_CLASSPATH_EXTRA="findbugs-annotations,jsr305"
 JAVA_TEST_GENTOO_CLASSPATH="junit-4,stringprep"
 
@@ -69,15 +59,7 @@ src_compile() {
 	JAVA_GENTOO_CLASSPATH_EXTRA+=":client.jar"
 	rm -r target || die
 
-	if use doc; then
-		einfo "Compiling javadocs"
-		JAVA_SRC_DIR=(
-			"common/src/main/java"
-			"client/src/main/java"
-		)
-		JAVA_JAR_FILENAME="ignoreme.jar"
-		java-pkg-simple_src_compile
-	fi
+	use doc && ejavadoc
 }
 
 src_test() {
@@ -89,12 +71,9 @@ src_test() {
 }
 
 src_install() {
-	default
+	JAVA_JAR_FILENAME="client.jar"
+	java-pkg-simple_src_install
 	java-pkg_dojar "common.jar"
-	java-pkg_dojar "client.jar"
-	if use doc; then
-		java-pkg_dojavadoc target/api
-	fi
 	if use source; then
 		java-pkg_dosrc "common/src/main/java/*"
 		java-pkg_dosrc "client/src/main/java/*"