gentoo auto-resync : 09:12:2024 - 02:07:41

3 files changed, 106 insertions, 1 deletions

diff --git a/dev-java/scram/Manifest b/dev-java/scram/Manifest
index c6e8a00c7c50..2d607ef4ffba 100644
--- a/dev-java/scram/Manifest
+++ b/dev-java/scram/Manifest
@@ -1,3 +1,5 @@
 DIST scram-2.1.tar.bz2 52442 BLAKE2B e9ec2367251770c4adb3d4bf62702c8ca13264fd12270dfb4f138c740536eb508a383486a81e1ab2bb0f8d4792642d033180c0e43ac287917543249fd16c8a76 SHA512 e2807d2c4b7984b5d9f53cb5ea6f9b2c2d5b48b5e695f25fb775cb3f22672851a9299cfe95912f109205c74817cf9f2fd706f8d49e473257e2571f409ec34044
+DIST scram-3.1.tar.gz 70163 BLAKE2B f91c8eeb81e5518f2b238e363db94a17af6ff19aa43e693483d46cff57ca52b73490ddb78782a06e72fa417ebee6b3977ed9e42c25bfc844cb455ce0a5c112ee SHA512 9602c25c4e5c6efb04c334b8c89abaa2e50986c0f91f958792d55184f0d6242e6aeec495b408a55df4bc97eaab838bfdc6bb5f70b62665e6953a87bb5dc63ac6
 EBUILD scram-2.1.ebuild 1823 BLAKE2B 8cd7d8bbeb53ecb8457476723d3d0c87f3b772f1952e9881c4d4d434aae3cd8a4cc436347267197ac0532ed7eb67a727c9206bed5239062f84542edac635b494 SHA512 7c2d86d3994371ac4da7d32bf14c15d32a6e967eef33cc6a4eb070f4c5fcb5125749c576ebd7f6c31a292c4ce58e19e063dafd9789a23c8223d323cfdece77c4
-MISC metadata.xml 297 BLAKE2B f03fc754a928c11fd5dfc5cf8a4d180484eb4b83ea6ad6532b3317b68866e2b0e84b4a709866efef7bdd6ab3917aeca2d5095af7e1a1075f925c38cc3f414313 SHA512 a6a4d886cb27996296b2cb0a510f5b82b29b3ae667f18c8e0779cfb07f4552cf64ceed46841b434c36c0e22f30fed14e11d129826279e00ee511a073eb9a55a7
+EBUILD scram-3.1.ebuild 2015 BLAKE2B 7ada595de609bb465433b86b9c2c294ae1406c2ae7e6d62e90cce31f0a315f646d37fd57b459b57e22d6de64cd8741f09d67f3a97d07376a7f8f93a6fa3a37c9 SHA512 450c862dd21fd9b017e8a77b97b6b56e3802496c5f1568727c615c7c5fd82e58471b1a11078ddcbf4d17a48f102479e354ac4875b20f6e5750b47f835fa47c45
+MISC metadata.xml 349 BLAKE2B e8538574177740ee2eebd053bcc3ef9476f3c2de5cff9327a26ef2adc07d7708bed6e408498f8651b984ca86ddb344dba44f82318b84a5f04103b0eb4482b8d9 SHA512 d8069a0d64882c077a77310e4af630de82a74848abe0c70060fb54f3d7aa85ec1acce90357abcf8c5253551a1f100c5efd83918621989e0f3db4256df357fad2
diff --git a/dev-java/scram/metadata.xml b/dev-java/scram/metadata.xml
index 0feb6155dbc1..33fd2cf43d98 100644
--- a/dev-java/scram/metadata.xml
+++ b/dev-java/scram/metadata.xml
@@ -6,5 +6,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="gitlab">ongresinc/scram</remote-id>
+		<remote-id type="github">ongres/scram</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-java/scram/scram-3.1.ebuild b/dev-java/scram/scram-3.1.ebuild
new file mode 100644
index 000000000000..5d9dc470f1fa
--- /dev/null
+++ b/dev-java/scram/scram-3.1.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="com.ongres.scram:client:3.1"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="SCRAM (RFC 5802) Java implementation"
+HOMEPAGE="https://github.com/ongres/scram"
+SRC_URI="https://github.com/ongres/scram/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${P}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+RESTRICT="test" #839681
+
+CP_DEPEND="
+	dev-java/jetbrains-annotations:0
+	>=dev-java/stringprep-2.2:0
+"
+
+DEPEND="
+	${CP_DEPEND}
+	dev-java/findbugs-annotations:0
+	dev-java/jsr305:0
+	>=virtual/jdk-1.8:*
+	test? ( dev-java/junit:5 )
+"
+
+RDEPEND="
+	${CP_DEPEND}
+	>=virtual/jre-1.8:*
+"
+
+DOCS=( CHANGELOG.md README.md )
+
+JAVADOC_CLASSPATH="
+	findbugs-annotations
+	jetbrains-annotations
+	stringprep
+"
+
+JAVADOC_SRC_DIRS=(
+	"scram-common/src/main/java"
+	"scram-client/src/main/java"
+)
+
+JAVA_CLASSPATH_EXTRA="
+	findbugs-annotations
+	jetbrains-annotations
+	jsr305
+	stringprep
+"
+
+JAVA_TEST_GENTOO_CLASSPATH="
+	junit-4
+	junit-5
+	stringprep
+"
+
+src_compile() {
+	einfo "Compiling module common"
+	JAVA_SRC_DIR="scram-common/src/main/java"
+	JAVA_JAR_FILENAME="common.jar"
+	java-pkg-simple_src_compile
+	JAVA_GENTOO_CLASSPATH_EXTRA+=":common.jar"
+	rm -r target || die
+
+	einfo "Compiling module client"
+	JAVA_SRC_DIR="scram-client/src/main/java"
+	JAVA_JAR_FILENAME="client.jar"
+	java-pkg-simple_src_compile
+	JAVA_GENTOO_CLASSPATH_EXTRA+=":client.jar"
+	rm -r target || die
+
+	use doc && ejavadoc
+}
+
+src_test() {
+	einfo "Testing scram-common"
+	JAVA_TEST_SRC_DIR="scram-common/src/test/java"
+	java-pkg-simple_src_test
+
+	einfo "Testing scram-client"
+	JAVA_TEST_SRC_DIR="scram-client/src/test/java"
+	java-pkg-simple_src_test
+}
+
+src_install() {
+	JAVA_JAR_FILENAME="client.jar"
+	java-pkg-simple_src_install
+	java-pkg_dojar "common.jar"
+	if use source; then
+		java-pkg_dosrc "scram-common/src/main/java/*"
+		java-pkg_dosrc "scram-client/src/main/java/*"
+	fi
+}