gentoo auto-resync : 06:02:2024 - 11:42:15

3 files changed, 26 insertions, 46 deletions

diff --git a/dev-java/scram/Manifest b/dev-java/scram/Manifest
index d259fb09e031..0ea581262fd8 100644
--- a/dev-java/scram/Manifest
+++ b/dev-java/scram/Manifest
@@ -1,3 +1,3 @@
-DIST scram-2.1.tar.gz 64263 BLAKE2B 59b71ee0faa32d2478e38e4275b7c83efb3f7a3ede0c068a8c0a6fe970248d22b539c50b97127b1b757839758d119b395fedd85d85425bd019e0972c2df20ef4 SHA512 e0757b306db03c56f03fa0907e46693337854c152a321cae1b109a1c16b0cb5be2482a92d64a420432a3ea31371990cbac444f965abde89c04083005b30012ef
-EBUILD scram-2.1.ebuild 2579 BLAKE2B 1e20abc1f4108341d040de51470a5a1644ac88b50fda154c2f438dcace3d40a0fc6de8cfb84d072f20f81ca111408b6d27b9a5451c3cc557d2479328dee0167a SHA512 dc54b0b0b64a0404657e50d6090102b01f042d2b9c8e4722555ba3173d4b7949e724f22a6ccbefee53eaf2472535940e9e601b991ee5190478818775834b4d2d
-MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
+DIST scram-2.1.tar.bz2 52442 BLAKE2B e9ec2367251770c4adb3d4bf62702c8ca13264fd12270dfb4f138c740536eb508a383486a81e1ab2bb0f8d4792642d033180c0e43ac287917543249fd16c8a76 SHA512 e2807d2c4b7984b5d9f53cb5ea6f9b2c2d5b48b5e695f25fb775cb3f22672851a9299cfe95912f109205c74817cf9f2fd706f8d49e473257e2571f409ec34044
+EBUILD scram-2.1.ebuild 1827 BLAKE2B 34cdbef391fbfc00361bb7bdbd97bf2496526e030de0aaaf07e0efdb6ec9cd36c8677c425639904c23bd6b038ba77b9cdbc6045104ab9e8a8908a10ba122a31a SHA512 c8ebe2806c9e1533813cd372932998938af5f141cf48c7c5c292a57854639ae5b7c7b93040f2a526ff2fea94f71d36e3f0d6bef427e3c81fd3c4c9c15aea1e4d
+MISC metadata.xml 297 BLAKE2B f03fc754a928c11fd5dfc5cf8a4d180484eb4b83ea6ad6532b3317b68866e2b0e84b4a709866efef7bdd6ab3917aeca2d5095af7e1a1075f925c38cc3f414313 SHA512 a6a4d886cb27996296b2cb0a510f5b82b29b3ae667f18c8e0779cfb07f4552cf64ceed46841b434c36c0e22f30fed14e11d129826279e00ee511a073eb9a55a7
diff --git a/dev-java/scram/metadata.xml b/dev-java/scram/metadata.xml
index 75321cfb5598..0feb6155dbc1 100644
--- a/dev-java/scram/metadata.xml
+++ b/dev-java/scram/metadata.xml
@@ -4,4 +4,7 @@
 	<maintainer type="project">
 		<email>java@gentoo.org</email>
 	</maintainer>
+	<upstream>
+		<remote-id type="gitlab">ongresinc/scram</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/scram/scram-2.1.ebuild b/dev-java/scram/scram-2.1.ebuild
index c29fd451b086..6e7eeccf9430 100644
--- a/dev-java/scram/scram-2.1.ebuild
+++ b/dev-java/scram/scram-2.1.ebuild
@@ -1,9 +1,6 @@
-# Copyright 1999-2022 Gentoo Authors
+# 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
-"
-
-# 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
+CP_DEPEND="dev-java/saslprep:0"
 
-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,21 +59,11 @@ 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() {
-	einfo "Testing module common"
-	JAVA_TEST_SRC_DIR="common/src/test/java"
-	java-pkg-simple_src_test
+	cp -r {common,client}/src/test/java || die
 
 	einfo "Testing module cwclientcommon"
 	JAVA_TEST_SRC_DIR="client/src/test/java"
@@ -91,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/*"