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

11 files changed, 83 insertions, 54 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index a0e6b3895a3e..65234dec33ae 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/apache-rat/Manifest b/dev-java/apache-rat/Manifest
index 47c3dc4a7566..69bd30cb90a7 100644
--- a/dev-java/apache-rat/Manifest
+++ b/dev-java/apache-rat/Manifest
@@ -1,6 +1,6 @@
 AUX apache-rat-0.15-fix-tests.patch 1751 BLAKE2B b4c55855c289db6c9f43dc5e5d28fc565abf448c38f21bf8169560580a4c6b3c6cc05d48bc93990d1b6b42d9f121f6951beb0650806189f4a9b2783f4c9631c7 SHA512 0791827f7e1aa738c9ce3239cf04cc826eddf9cf413d2c046df4eab29b8f3c7b538867ae25e4ef232d1ef762ac515a6ff12e69d2d0f3c066605dbd58ea0832a6
 DIST apache-rat-0.15-src.tar.bz2 203040 BLAKE2B 0727fb932cfbab7080eba5115bee69e5c46155a231509109a5c7aecf40ed539d4357f2d9b31342717306221891e4a411e01077ae55a0988abe4926e40f1fafc4 SHA512 7f9fb219a5ce0b95909f006140b20e7621d9f5ce583c42a57e2783ec40fd842e75b546843ab033a99bf5108d0d8369a0ab1aac80e33af9685f651fed3dd603ee
 DIST apache-rat-0.15-src.tar.bz2.asc 833 BLAKE2B b87e059a5a83d3d728c28c25926129743fdfb6a5c7cf2e258892d86711e7f5890d140ca1cfa5fc1012d56b6321ec2c93903ec30854bd3536216c8f1fd269f504 SHA512 f5abcb3df5d23834deab8c3c1a476100324452cba88e9185fb398dd6118c3c8ff8dc00c4c9f8166245833d6e602c51bc8cdf20361813bbe1e720022766412b8d
-EBUILD apache-rat-0.15-r1.ebuild 2940 BLAKE2B 9bbabf48b8c39c23e6c56de5159ce440673d05fe99542d7eeb92f623e3b7aed8aa1e8ce9360d297a52ff938528b691998d272d0f3095b9f6c1dc0ca549d90f07 SHA512 b766e7135d9f7621517380c371cd37496ea1211a2a0a68daf6ee68aeead1994dafc4d2455a74891cf4f0bc9219ac6de7000bcc1ed5577d0f540f403efa71fe03
+EBUILD apache-rat-0.15-r1.ebuild 2943 BLAKE2B cc77e6ba60787f43d3fa7e858d52bdf4618b16920b714db1d8dd2bcfeb6a9bd46e8598f3b0f700eef2752d690ba4a09d0f20bfc8716a792765b67bb0a406b61a SHA512 3baba7dcf23fcead9d2fcad1213eaa9c56e657325e83b65fa3dd7431d07b7f238a0a05161d3924d903b88b9a44b5f3cd42772cd4e6554533dfd51bacdb637fa0
 EBUILD apache-rat-0.15.ebuild 3348 BLAKE2B ac1deecf106f5fac049b5abf7ea17aee0a472ccbb45e6e39f3bbc8d9ff69d4bd8a6c52515c1653cfc3f6a02751d7b8bf98d8d5aa20e34266f61a053794d969ed SHA512 e881328a8061367fce6fda69b3894513d26cc302283dc8350d8f316962059820c11d2afbaa3ed6fe67f99d54395be9520f2f11d0467325ca6512d0e2c1ef80c5
 MISC metadata.xml 320 BLAKE2B 9451f2f8ba85ed8d1fba22da8fa3c905d4079c068d5e6e16af4296b5789b6ea2e2cdcf1d63ec5e275ede7b34ff49ff3bd41680a0bdda238ceb0d56103ef8f5fd SHA512 190d5b038f8962873e882f89d25f7532ad7c6144e6d8ea1337d7daaf1243d140fa98b6cde1604e138637b0eb50ae613097a23e6048291f275e0e6ec894360a50
diff --git a/dev-java/apache-rat/apache-rat-0.15-r1.ebuild b/dev-java/apache-rat/apache-rat-0.15-r1.ebuild
index 4551262f6e9c..83f694bf7399 100644
--- a/dev-java/apache-rat/apache-rat-0.15-r1.ebuild
+++ b/dev-java/apache-rat/apache-rat-0.15-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -100,7 +100,7 @@ src_install() {
 	java-pkg_dojar "${PN}-tasks.jar"
 	java-pkg_dolauncher "${PN}" --main org.apache.rat.Report
 
-	use doc && java-pkg_dojavadoc javadoc
+	use doc && java-pkg_dojavadoc target/api
 
 	if use source; then
 		java-pkg_dosrc "${PN}-core/src/main/java/*"
diff --git a/dev-java/commons-imaging/Manifest b/dev-java/commons-imaging/Manifest
index c73c769cb441..d86e75f1deda 100644
--- a/dev-java/commons-imaging/Manifest
+++ b/dev-java/commons-imaging/Manifest
@@ -1,5 +1,7 @@
 AUX commons-imaging-1.0_alpha3-PngChunk.javadoc.patch 734 BLAKE2B 8ea3c987688bef6537ca329514b638dfd0fc1322a2e4e3700537412fbbdc74d72e1e95dee4a7131587035e8e79485a08b6d7ba6ee79c95b27b3a40f5ba614632 SHA512 604cb85bac45a3b3882f283f1172c4d48578826e4f99e7d6e11bb2311c997248ca37003bfd9730c9e982ea8940ada0ed3ad1fd767984210fd18a7c72dffa1dd9
+DIST apache-sanselan-incubating-0.97-src.tar.gz 33317875 BLAKE2B c9db6c30accc308d2c5d5977b84da118ab50b010b3728665a75dab13f9fecb70075e2d2208a62fabc57af7396f7c39b1ec498e0840e5a2c9c8de9b95d2dd597a SHA512 b7e8af01f4b4ca812313bbf573758d9c0e1355266bfb83898336b14c4b492a8979f2a593f00d53c076e83cf807a049df624491a26623cfbceb00560b748f05f2
 DIST commons-imaging-1.0-alpha3-src.tar.gz 39966281 BLAKE2B f0fbb6d7ae0c12be19fe13d3ff4e1cced5acfe7ea72326528c67b57fade73c0acee3eb8eaa62b3d40c473c0c2faf7f60ec190bc0954c5159405358bfac4efd42 SHA512 16300adb5873fef464bedfdce7e1368f52add8d33087f059667840880b8666024feeecdb278a53d5c3d8e76d01ab921ea146d41ca688757f0cf0c2f2b32b0d53
 DIST commons-imaging-1.0-alpha3-src.tar.gz.asc 833 BLAKE2B b28631badf344fa476a99db78e26a9453d033d21dba8484b2621a4cb0295ea262f58d2df4f8afd6d8090ecd0ea98ec2dca0168e2b401d662c335ad1ef9518b98 SHA512 b7e6691d5eac6f81657dc42aa69184da7fd1bf364da391ac4e1a27991d9a8bbba23296d58b874b4c69a20d39c3c1e821ca19c312f3e71b3acd8903156a2a0a1d
-EBUILD commons-imaging-1.0_alpha3-r1.ebuild 1148 BLAKE2B 87c54db705c40c7a102485922d1ca305088cc108457cf03ddf34428bb212d1929fc874dfc92a8c9e2051a965379c3b20b152ec0b3efde95c99030d4985b94b00 SHA512 590b7ef85f1ffb20303ca30476788489f7bb8ae0e93c766f19b086a4a0989c0dcab25218bd1cfc24b225d075cea83ac9f2527bc3a216683306f343aaea2bfeca
+EBUILD commons-imaging-0.97.ebuild 1268 BLAKE2B 98eaeedb90c2d97801d70c2f691b5ca5fb56f93c642484d9dbf87f8caa440c9306113a28fe04b9b7806ba83c3c8086585cb589d05057b9cedd63a641746a2826 SHA512 a570235727e09958ce776c3b39b6b18f63742263f6123b2b8b68b4c6a5fe98072091c0b9349b61352882af86fe09f67f91b9aef402c0908e3c6ffdea79c1573f
+EBUILD commons-imaging-1.0_alpha3-r2.ebuild 1148 BLAKE2B 1cb2c19470dc0adb09508d98610de629161324e23821bb93f6975b7cdaa0bc062ea2cd6e0281aaa4bd244cd7c82e23634ebc5458b4bef61a955cc62ed3c9cf4a SHA512 fb2cc2a29daf3466e032e77b43742872c140c62bce9c391ba5e8e73e592aebef6e1687c0401e006344c16913068f9a97e22a22cc2ae64b407dfd875ca5e616d4
 MISC metadata.xml 1078 BLAKE2B e2b1574082b656f2025228403463c5111b3d8174d72f9f4d9e31de9c9f72682b6cdd534d4aee455c30f222ae29fddf516395484a7b7fd5811cbd1f82382f4865 SHA512 812966e93eaea83f94ad0957d2421e73bafceff6c354b822d6936cbea9cd058e7dd0400d8d21e88eaa37a1cf1db625f2d5300317ea9817fc705558092c579cf3
diff --git a/dev-java/commons-imaging/commons-imaging-0.97.ebuild b/dev-java/commons-imaging/commons-imaging-0.97.ebuild
new file mode 100644
index 000000000000..6017ef9c71e8
--- /dev/null
+++ b/dev-java/commons-imaging/commons-imaging-0.97.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A minimalistic realtime charting library for Java"
+HOMEPAGE="https://commons.apache.org/proper/commons-imaging/"
+SRC_URI="https://archive.apache.org/dist/commons/sanselan/source/apache-sanselan-incubating-${PV}-src.tar.gz"
+S="${WORKDIR}/sanselan-${PV}-incubator"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="test" # 5/48 failures, dunno why :(
+
+DEPEND=">=virtual/jdk-1.8:*
+	test? ( dev-java/junit:4 )"
+RDEPEND=">=virtual/jre-1.8:*"
+
+JAVA_ENCODING="ISO-8859-1"
+JAVA_SRC_DIR="src/main/java"
+
+src_prepare() {
+	java-pkg-2_src_prepare
+	# Tsk, Windows developers…
+	find src/test/java -name "*.java" -exec sed -i 's:\\:/:g' {} + || die
+}
+
+src_test() {
+	local DIR="src/test/java"
+	local CP="${DIR}:${PN}.jar:$(java-pkg_getjars junit-4)"
+
+	local TESTS=$(find "${DIR}" -name "*Test.java" \
+		! -name "*BaseTest.java" ! -name SanselanTest.java ! -name ByteSourceTest.java)
+	TESTS="${TESTS//src\/test\/java\/}"
+	TESTS="${TESTS//.java}"
+	TESTS="${TESTS//\//.}"
+
+	ejavac -cp "${CP}" -d "${DIR}" $(find "${DIR}" -name "*.java")
+	ejunit4 -classpath "${CP}" ${TESTS}
+}
diff --git a/dev-java/commons-imaging/commons-imaging-1.0_alpha3-r1.ebuild b/dev-java/commons-imaging/commons-imaging-1.0_alpha3-r2.ebuild
index dc75db349433..73382ff1998c 100644
--- a/dev-java/commons-imaging/commons-imaging-1.0_alpha3-r1.ebuild
+++ b/dev-java/commons-imaging/commons-imaging-1.0_alpha3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/commons/imaging/source/${P/_/-}-src.tar.gz
 S="${WORKDIR}/${P/_/-}-src"
 
 LICENSE="Apache-2.0"
-SLOT="0"
+SLOT="1"
 KEYWORDS="~amd64 ~x86"
 
 VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/commons.apache.org.asc"
diff --git a/dev-java/fop/Manifest b/dev-java/fop/Manifest
index 5202227ac4a6..8f49a6d89f62 100644
--- a/dev-java/fop/Manifest
+++ b/dev-java/fop/Manifest
@@ -10,5 +10,5 @@ DIST fop-2.9-src.tar.gz 20642865 BLAKE2B 6ab265ddfb1c07b9266687930af21ac46534388
 DIST fop-2.9-src.tar.gz.asc 833 BLAKE2B 284f04d450bcfb6583d353ae21bbadad8da14b59d946e094453b564e700c8cfdcb448ed206a5a246b725b453a1b3feea69f96ff3b2a683320bce6743cc5a167f SHA512 404d5df54cf84ddb11c7f5ebc6772d61cd04fc434dea421429a9a270e1d0ca17f61df8a33600db5a41c6d45f828a67fc26becfa9b4ac18342e9dfb4781dd0bdc
 DIST fop-hyph-2.0.jar 6655933 BLAKE2B bfbefcc2ebd9a9a467c23a70d7cef256f83cf2335f6e17db6bbefceaf8a3cee78de0302f269d096eb3238b3f4883429e09cc640bed11a42da4ef67ab9f0cb164 SHA512 3d5f27623008c7beba5332387bd42c501b7ae1dddfc98014b3fb35273394ca5f0a4ce69e7726090ec468c9b4f7983fb8b1a5759f49e81ea342c81c61311d87b3
 EBUILD fop-2.8-r1.ebuild 5398 BLAKE2B a6e17013c677550fb748477329400eb4e273cec936a6f019935f211128fb8339da9bdb301ae929fdf80dcb8678105c48ad9d019b896f92ec21e627e46b6cfc8d SHA512 49ebabe7c5c7481655c340c285b9d1efb66c4234183124abce93ff8928c695b5f98593fe9c2cdf1a499b257489213e2ce80e1047cc33d9c78ae755acc0e400c1
-EBUILD fop-2.9.ebuild 6006 BLAKE2B 5729a03bd0d8985a268a531098f87a5efe5c61d66d69b378b6c841f03a8cec88ea9c3d9456f9e7c440c87f3539abf05e2fe71d7d139251a44d2ed40bf7610327 SHA512 c29173adc43721a11fafc7c6ffb3fa211e2b07e7436a42e2934b93c7bbc0f2b502be0d473086ecc4b017bfd5f53f0f7751e67f119ce698a24b3f8058352c6274
+EBUILD fop-2.9.ebuild 6087 BLAKE2B eb8762570c765c07037563c803a88eabc5bb27d605849af76f27e6a3cb7069d5374b8c6acb3872f81e06c1f4e2ce07a9afbb906aa233ec232b5243ac54bf6c6f SHA512 bbf6c2d6b1de655bea0ba0e329fe7b1e95d0f65155725c1e68b78d6b0fd7169c49ce93efae8bab2bacf861371970962704051c785917b6910d3ec2ba2ff7e7b3
 MISC metadata.xml 449 BLAKE2B 91dd2fd3b50581a408755aade7aa37406c527e9298bd0156cb18d363fef88cf60eb85f259ba443022fbd6c5377be0e0fc990cb2826d418347dc92bf7b6ff5ca9 SHA512 cf49f03d1ed992a7df7deebb7c00721895be45ff144da8c4b1777aecba5e17d86a7353a83ad8df8b356f70afda5fadcdc53350b2c5732a0f0469b18f501959d4
diff --git a/dev-java/fop/fop-2.9.ebuild b/dev-java/fop/fop-2.9.ebuild
index 63bf4d2080f1..f001831b1cff 100644
--- a/dev-java/fop/fop-2.9.ebuild
+++ b/dev-java/fop/fop-2.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -151,6 +151,8 @@ src_test() {
 	# This jar file was created manually from the output of "mvn test".
 	# Upstream does this with maven-antrun-plugin
 	jar -xf "${WORKDIR}/fop-2.7-test-event-model.jar" || die
+	mkdir generated-test || die
+	mv {target/test-classes,generated-test}/org || die
 	java-pkg-simple_src_test
 
 	einfo "Testing fop-core"
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/*"