gentoo auto-resync : 18:06:2024 - 00:10:02

12 files changed, 223 insertions, 45 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index d29dd0c51e34..4c6ed5b5fbc7 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/cpptasks/Manifest b/dev-java/cpptasks/Manifest
index 3bb228ca0da3..b76520d51564 100644
--- a/dev-java/cpptasks/Manifest
+++ b/dev-java/cpptasks/Manifest
@@ -1,4 +1,4 @@
-AUX cpptasks-1.0_beta5-test-classpath.patch 1070 BLAKE2B eacc916610026d4eb25fe7a217ce23e6ca485400e9f90c8ac37a4fb614fd0ac59d622161f79854b664db0e1cc48d047655479d817fcade448952d4c231d33860 SHA512 4ce1d06f6cb1a32ff8807f9e9ad8deddef26d4ea6ed6b2826d80e3ca16c491ecefb0c850ad9a958fdae3cdbd764852ab3a5f0ad66464b928f4c12061e3cb3e73
 DIST cpptasks-1.0b5.tar.gz 902930 BLAKE2B 02cc20ea8e4316f7d0572cd147868219f1cfa326fd87d2edbea8a9b81c88f83173a373a88149bc2da55099bb9a0ac4d1f8927a6c708e6a5640b56220dbdba006 SHA512 620d16e60cdd4d8a09efe6c5889ec1beb20d38df3a7ebf337de546cd60881b4c22a08f24374e7dac02dbbb3b23defbb740a70f1d0ff59212496e631251f0e32c
 EBUILD cpptasks-1.0_beta5-r2.ebuild 1332 BLAKE2B 944ccd54edfe0de536f0f5462601da381ba52450008802fc4b9c09cd07d5b041bb045507ebc039bbccc3f5d2bb491c8dfb04edfe783cb3890a45df9f736d3919 SHA512 6c960a332ea92b88ce6b58c642ea3e328ae8732011e92fbc7a8cd0dfa1b7e9ee11ee05b556835ad580e1e910dfd186aae821ab1839db726105d9651cb464c5eb
+EBUILD cpptasks-1.0_beta5-r3.ebuild 1161 BLAKE2B f820bfb90e52a8f1b8807f29ce00340e5c04f962b76f188f7433613bec3e2f3fd0bd249ea7d71aced712b634738b5931eb23ca2bace176dc569e29f6f860ef71 SHA512 971faaca92bf8cb4a8a47424bb0ecfc968e5f8189bc9f43ed58773e0ba20eafbce0beb9dbf48e663e643529b23e0ac22811c754e433719fe1ad18216e50093d7
 MISC metadata.xml 318 BLAKE2B 53f5719585c7a4f0479017c4410975aefadcedd17db45949c351329e28761f05ebd89ef0557505a9a3ae03967b9baefe3e2c5b1edf0116a10434755a8d76fbe3 SHA512 b89f13a465ae0f1cad3352319206dc922badf513f63af878b118577e1f6da322b824dd14ca9220cf10aa5c5463c30399f001395a36c45c3b69228a375be379ee
diff --git a/dev-java/cpptasks/cpptasks-1.0_beta5-r3.ebuild b/dev-java/cpptasks/cpptasks-1.0_beta5-r3.ebuild
new file mode 100644
index 000000000000..c588ecf5dcc6
--- /dev/null
+++ b/dev-java/cpptasks/cpptasks-1.0_beta5-r3.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc examples source test"
+JAVA_TESTING_FRAMEWORKS="junit"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Ant-tasks to compile various source languages and produce executables"
+HOMEPAGE="https://ant-contrib.sourceforge.net"
+SRC_URI="https://downloads.sourceforge.net/ant-contrib/ant-contrib/${P/_/-}/${P/_beta/b}.tar.gz"
+S="${WORKDIR}/${P/_beta/b}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+CP_DEPEND="
+	>=dev-java/ant-1.10.14:0
+	dev-java/xerces:2
+"
+
+DEPEND="${CP_DEPEND}
+	>=virtual/jdk-1.8:*
+	test? (
+		>=dev-java/ant-1.10.14:0[junit]
+		dev-java/junit:0
+	)
+"
+
+RDEPEND="${CP_DEPEND}
+	>=virtual/jre-1.8:*
+"
+
+DOCS=( NOTICE )
+
+JAVA_RESOURCE_DIRS="src/main/resources"
+JAVA_SRC_DIR="src/main/java"
+JAVA_TEST_GENTOO_CLASSPATH="junit"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+JAVA_TEST_RUN_ONLY=( net.sf.antcontrib.cpptasks.TestAllClasses )
+JAVA_TEST_SRC_DIR="src/test/java"
+
+src_install() {
+	java-pkg-simple_src_install
+	java-pkg_register-ant-task
+	use examples && java-pkg_doexamples src/samples/*
+}
diff --git a/dev-java/cpptasks/files/cpptasks-1.0_beta5-test-classpath.patch b/dev-java/cpptasks/files/cpptasks-1.0_beta5-test-classpath.patch
deleted file mode 100644
index 02754ce7f1ed..000000000000
--- a/dev-java/cpptasks/files/cpptasks-1.0_beta5-test-classpath.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 732e296e780633e3dce1bace28a4abae04f506c7 Mon Sep 17 00:00:00 2001
-From: Yuan Liao <liaoyuan@gmail.com>
-Date: Sat, 15 Jan 2022 10:58:28 -0800
-Subject: [PATCH] Prevent test classpath from being overwritten by
- java-ant-2.eclass
-
-Signed-off-by: Yuan Liao <liaoyuan@gmail.com>
----
- build.xml | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/build.xml b/build.xml
-index ed3a0f7..24a3114 100644
---- a/build.xml
-+++ b/build.xml
-@@ -176,8 +176,12 @@
-            deprecation="false"
-            target="${javac.target}"
-            source="${javac.source}"
--           optimize="false"
--           classpath="${build.lib}/${name}.jar;${java.class.path}"/>
-+           optimize="false">
-+        <classpath>
-+            <pathelement location="${build.lib}/${name}.jar" />
-+            <pathelement location="${java.class.path}" />
-+        </classpath>
-+    </javac>
-     <jar jarfile="${tests.build.lib}/${name}_test.jar">
-             <fileset dir="." includes="NOTICE LICENSE"/>
-             <fileset dir="${tests.build.classes}"/>
--- 
-2.34.1
-
diff --git a/dev-java/jbitcollider-core/Manifest b/dev-java/jbitcollider-core/Manifest
index 1bd48acf7bc1..122f18d1ea15 100644
--- a/dev-java/jbitcollider-core/Manifest
+++ b/dev-java/jbitcollider-core/Manifest
@@ -1,3 +1,3 @@
 DIST jBitcollider-0.8.zip 1192489 BLAKE2B cf30002394c83b6748d1a24f92148da46fdb1e84dc14f3b673ed8d3bd6ff2719b5530c890f21cc9e7af9a4553cfbb9cb606799606ea88b40e5b96e768b1c11cc SHA512 272e9e0e6e66d3ac9d17e17d8fcbed82b508e512c5cdada7f18c2920597f31ae5968509c9814c5530ee7c5bea9f3d1b049b922d55056637642bcb515b890a9f7
-EBUILD jbitcollider-core-0.8-r1.ebuild 949 BLAKE2B a06eecdfbbcb0a1a0c8ec8e258c42767a313d96db56278a2c57bdec73d0b3c5f13cd2e2577b1c99111b83a4c9f18afd4b284af78df2e501195492afd428d5e48 SHA512 43dae0aea9b8aea0b5b4ad281a7b54e6f87f59488f1d41ce8c36039758f0fb8404f431cb8a2574166e9864fdd3d65b521c030cffce166b5528fd0fe1b5ddba5b
+EBUILD jbitcollider-core-0.8-r2.ebuild 736 BLAKE2B e4f9f0f289580e3cfb724d15174af9b55f000fd1f97315ef28150f61b618386cb5eaa6639ec49ec5afd4d7367bdf68bcc4f814dfcddd1005bb52ebd897e623bf SHA512 786e5809b2ca40304e07fcb5101eee7de4951a1aaecf43c62bdef37ed281fecbae2edfa5c1f5d825c6eac24d334cbbc219d9f829b6a6798ec956b9e20de007c0
 MISC metadata.xml 249 BLAKE2B 505f3f09f157b6a610aa6fc92d3b3fa9ce775ae1190f7a445dd0a0c77ba7d1f098f948cd0a4f3a5a9746a1775a7d43273b95783f3c4d50faf755310aefb0b4da SHA512 b82796a4bebd08ba383b1b2c73ea5c562c7902156774a7fa0930b5995a9fc207eb2d1251f9bf4a07ec26fe28b57b0784b4fae6469bf82b6a4202bfed49ca4e9b
diff --git a/dev-java/jbitcollider-core/jbitcollider-core-0.8-r1.ebuild b/dev-java/jbitcollider-core/jbitcollider-core-0.8-r2.ebuild
index 0c66fbeb2e50..a72404f111ad 100644
--- a/dev-java/jbitcollider-core/jbitcollider-core-0.8-r1.ebuild
+++ b/dev-java/jbitcollider-core/jbitcollider-core-0.8-r2.ebuild
@@ -1,19 +1,19 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 JAVA_PKG_IUSE="doc source"
 
 MY_PN="jBitcollider"
 MY_P="${MY_PN}-${PV}"
-JAVA_SRC_DIR="plugins/org.bitpedia.collider.core/src"
 
 inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="Core classes of jBitcollider: org.bitpedia.collider.core"
-HOMEPAGE="http://bitcollider.sourceforge.net/"
+HOMEPAGE="https://bitcollider.sourceforge.net"
 SRC_URI="https://downloads.sourceforge.net/project/bitcollider/jBitcollider%20%28Java%29/${PV}/${MY_P}.zip"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="public-domain"
 SLOT="0"
@@ -23,14 +23,9 @@ DEPEND=">=virtual/jdk-1.8:*"
 RDEPEND=">=virtual/jre-1.8:*"
 BDEPEND="app-arch/unzip"
 
-S="${WORKDIR}/${MY_P}"
+JAVA_SRC_DIR="plugins/org.bitpedia.collider.core/src"
 
 src_prepare() {
-	default
-
-	rm -v lib/*.jar || die
-	rm -v plugins/*/lib/*.jar || die
-	rm -v plugins/org.bitpedia.collider.*/bin/org/bitpedia/collider/*/*.class || die
-	rm -v plugins/org.bitpedia.collider.core/bin/org/bitpedia/util/*.class || die
 	java-pkg-2_src_prepare
+	java-pkg_clean
 }
diff --git a/dev-java/jcalendar/Manifest b/dev-java/jcalendar/Manifest
index e7e6134fff77..b6c69ddbd3d6 100644
--- a/dev-java/jcalendar/Manifest
+++ b/dev-java/jcalendar/Manifest
@@ -1,3 +1,4 @@
 DIST jcalendar-1.4.zip 982517 BLAKE2B f82ba64d26aefe44a197d78998427af2173c41d1843e080f12c35984c18be58235ca115bc1f53d17a035e4c1ab7bd590b4993b0509e7408a4af50f4ec4b4697e SHA512 aeab6f98451f4fa8718e127de6c0af345410bebbd1de4fa1ca4b9e7f5a22908f9e455ba96da34ef9e8691b4d462e8a01dbd7881b6565a0f3a65d18fe58b68d9c
 EBUILD jcalendar-1.4-r1.ebuild 920 BLAKE2B 539afb6e0a5e5403a2ade349bdacaf143d577f15381e8a7ff353f7adbf356013042546582f04f84740da807fffbe7e5583e982d75914804f1ed88f3f6063a02e SHA512 8bbff1c750dbb220e39942d315c3748e81a5346a1d065b2e53c4b6dd076be9a35c781e2a47eca5d4c55e0da64ec2c03b8eed16d124330be15238416488f00a5e
+EBUILD jcalendar-1.4-r2.ebuild 938 BLAKE2B b61c1634bcd556b21f815c0aaf83f789ad2e456965aefb346a0713879a962d977d2a43773cd4b67234a7d3c45907a1a7dc5159268c4e534419e46c9c308242bc SHA512 410c18d7d74069162d6469a434279e62becc494219a5e26d45f28505143cb4ec36f8d1c369427e400eef4f703a444314aabe77926c27915f9f5997a92e8da7c3
 MISC metadata.xml 643 BLAKE2B 8912f34c6db67cfc93128de60b468ff57f33fad59d320c3bde5e724480e3f029772c6709be554ede57151b9295ffeccdf5d2d31b0a6ca0d46249143ae966ca4b SHA512 0fa2211e2fcea4cd103bf43a1903ffaf0bd9432328b9032d30de51c1be238e8aa2b2c5ff40cb6439a864aee10992dffe77d86af846252a728df10e637f7f2e13
diff --git a/dev-java/jcalendar/jcalendar-1.4-r2.ebuild b/dev-java/jcalendar/jcalendar-1.4-r2.ebuild
new file mode 100644
index 000000000000..cc3c29b2f91c
--- /dev/null
+++ b/dev-java/jcalendar/jcalendar-1.4-r2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Java date chooser bean for graphically picking a date"
+HOMEPAGE="https://toedter.com/jcalendar/"
+SRC_URI="https://www.toedter.com/download/${P}.zip"
+
+LICENSE="LGPL-2.1"
+SLOT="1.2"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="app-arch/unzip"
+
+CP_DEPEND="dev-java/jgoodies-looks:2.6"
+
+DEPEND="
+	${CP_DEPEND}
+	>=virtual/jdk-1.8:*"
+
+RDEPEND="
+	${CP_DEPEND}
+	>=virtual/jre-1.8:*"
+
+JAVA_MAIN_CLASS="com.toedter.calendar.demo.JCalendarDemo"
+JAVA_RESOURCE_DIRS="res"
+JAVA_SRC_DIR="src"
+
+src_prepare() {
+	java-pkg-2_src_prepare
+	java-pkg_clean
+	mkdir -p res/META-INF || die
+	mv src/jcalendar.manifest res/META-INF/MANIFEST.MF || die
+	pushd src > /dev/null || die
+		find com -type f ! -name '*.java' \
+			| xargs cp --parents -t ../res || die
+	popd > /dev/null || die
+}
diff --git a/dev-java/jdom/Manifest b/dev-java/jdom/Manifest
index e62797c7c33a..2da633791ce3 100644
--- a/dev-java/jdom/Manifest
+++ b/dev-java/jdom/Manifest
@@ -2,5 +2,6 @@ AUX jdom-2.0.6.1-skip-failing-tests.patch 8392 BLAKE2B b906e2854f51a534af29fa1d8
 DIST JDOM-2.0.6.1.tar.gz 8368301 BLAKE2B b9d5d8e611b9a0505c9576f2c4a2243eddd8a171bbe44d83440edf44154cae80138ddca8a0bceb3124a6825111d30641a28d645507a1bacad6a8cb9ad1dbccdd SHA512 c09b422b0635a478cb70e57e4c35bc7f505f6a2730be813d6e63c053814581e4dc3fdf431b945394c30ab37a8fb83fd103767f8de84d28bef79e95e2c37518e1
 DIST jdom-1.1.3.tar.gz 4233403 BLAKE2B 9e4afacc6f10d2be1d793bd3b9f438f79e8e27f50bcae83eac5054df806c01c211ac493465bcda58ac204e796663ffb8aedf43a177f23c23a69af399243461a0 SHA512 a693fcc0d5c8ab3cf086a7904c7fb711e7deedca542089b84c6d011584e0d889495a58843033bff25272fdf130b1347419e31b9a4650c85ce9dfa19022dc0278
 EBUILD jdom-1.1.3-r1.ebuild 1252 BLAKE2B 1f13d6f90843dd28a886d5b8158d33602239d6fe7540655166a7bf8aa6f3201cb9a3700a7a1ea669c04a7aa8a94432ed6b8e6c1df5a3b1ed36243ec1bb3d0f1d SHA512 bf245f0d9e759c1c0ebe8937d980e391480687eb53ba0234e5f7b02f124b4a55b61bf6001d391da7fbb58de4a82d7ec90b9bd63a101d869e1d96c14d43a792a6
+EBUILD jdom-1.1.3-r2.ebuild 827 BLAKE2B 880f75219e9e475b63921ffda7bcf8ce1f519291c12743186f1d88ceec0603d43741c0063a4d61e39a83cad8d0a970ca255f1d533131e8cd22046e8503d79cb5 SHA512 94157be7a910cb2ec5a3064c64ca8b2741a6e04fa1d238e0f43557d5eb2ed175e91b67a3bb17d09ef5463f9dd34c28c3d46cd200233067c53ff59d3525c1882d
 EBUILD jdom-2.0.6.1.ebuild 2748 BLAKE2B 3e0e6123893a15827ed6202b16387e4403748a33c70132ac0c1edafe6b505046d6fa1896d4cec93dc01d0adb551f1b548e5c2af1c8998c541ff8ac7ef4aa292f SHA512 66ced362fd81ddd13989cac07f6093628ce6166fdfe8f7c6b41fe94376fff4ee5911f7637cf5a43375731674d6410efe0ecfe740e838a45558930293bedf4d46
 MISC metadata.xml 870 BLAKE2B 4f720a44e7f3d2c808e81aeebcdb11963cbdc590d61d9edd4ea5794913096b84ad463726071f66848a26d7a6209c466db4a00253793c08d7fc848fc780da1763 SHA512 516809ec60e2c6763949ddac1cd2cce46a52973c3be148a6153b0941787d4a798699206367ba26e707f1e671a5f851b00281b84b18592b3ece442bc4129aafaf
diff --git a/dev-java/jdom/jdom-1.1.3-r2.ebuild b/dev-java/jdom/jdom-1.1.3-r2.ebuild
new file mode 100644
index 000000000000..e321b981d167
--- /dev/null
+++ b/dev-java/jdom/jdom-1.1.3-r2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc examples source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Java API to manipulate XML data"
+HOMEPAGE="http://jdom.org"
+SRC_URI="http://jdom.org/dist/binary/archive/${P}.tar.gz"
+S="${WORKDIR}/${PN}"
+
+LICENSE="JDOM"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+DOCS=( {CHANGES,COMMITTERS,README,TODO}.txt )
+
+JAVA_SRC_DIR="src"
+
+src_prepare() {
+	java-pkg-2_src_prepare
+	java-pkg_clean
+
+	# circular dependency with jaxen-1.2[jdom]
+	rm -v src/java/org/jdom/xpath/JaxenXPath.java \
+		|| die "Unable to remove Jaxen Binding class."
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	use examples && java-pkg_doexamples samples
+}
diff --git a/dev-java/xpp2/Manifest b/dev-java/xpp2/Manifest
index 460c9ac86032..40312a5ce931 100644
--- a/dev-java/xpp2/Manifest
+++ b/dev-java/xpp2/Manifest
@@ -1,4 +1,5 @@
 AUX xpp2-2.1.10-fix-java5+.patch 872 BLAKE2B a8fa53326a2fefa40f726a4cd3e5e2828b3d2e50907736be1b2639489692ff2a0ff683d1538123163d5fe52d2935d97832d643d7365829ca1eaa7c7936623e75 SHA512 495dfb83a773d11fb1f9f423f1bfa532770710b4b16c1f6e64e517e8148958a5160ddbbc43dd4cdc7ecc51126fba1062a10277bc9234b58e46a044e81180b3a5
 DIST PullParser2.1.10.tgz 2310288 BLAKE2B 0c1f3aedf88aae18e7cab40b04055fa7a20f6bfe05973e6cbe3b459b408dfa193834d22a6d77b3d1ba3802e115d89f73e3f423efc7571efc8f09bb73625950d6 SHA512 87a091e415a31cde27ca1193735743b60f516feb336a9a3577792636e54ab8d671a22e74eb8aa41268f6251c688c68fe92a28f735ec78b96b919909f80c59590
 EBUILD xpp2-2.1.10-r3.ebuild 1854 BLAKE2B 886333476332b887bfb6e02a235a6d7f50fbca065b5533a774881077d622bd7c12de73632d2cdae2fa9983781fe7ef88f10f51bccf3249b4e936247c93bbf3ae SHA512 4e011582986248939e206b8a2652e2d2a5d902615e29e3f15e87f92121093b73977fc7a36f6c0a354dde4c2562026e73c665a66187b40ba6384902d87ebeb198
+EBUILD xpp2-2.1.10-r4.ebuild 2400 BLAKE2B 9c7e4e9660d9e7b809c7503dad6224e78fe6ef49557888ac66b99ffd44263d50d82eea0be1f16eb7a06dcb05008b7b16702c1e5560608c2b78a0f77160476964 SHA512 d15b1c37d618aa308aa7459fb7628ba9a3f1ad832d77e4e24e6d02373fa75da6a5093be688ba771670d3d4f610d2c2adc2872a62eef3beb0cbd66473e2263a23
 MISC metadata.xml 459 BLAKE2B 6b230c468ed9a62380563114c50b9b3cbd58237df4327ddc6194dba9524c6a0872c04354927d800544b1095db4a7f3c3ee0b0d37f16d23578da1b84f79628218 SHA512 f41891c17a7ab0a61bff751bdef3cb45f9385de1c10219aa19a8cc194b780b0db7d46ee89ed5403b193f473178828e79e88fa80833b5bdd56f8c9d3a532fff9d
diff --git a/dev-java/xpp2/xpp2-2.1.10-r4.ebuild b/dev-java/xpp2/xpp2-2.1.10-r4.ebuild
new file mode 100644
index 000000000000..0e785ac7de74
--- /dev/null
+++ b/dev-java/xpp2/xpp2-2.1.10-r4.ebuild
@@ -0,0 +1,82 @@
+# 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="pull-parser:pull-parser:2"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_PN="PullParser"
+MY_P="${MY_PN}${PV}"
+
+DESCRIPTION="A streaming pull XML parser used to quickly process input elements"
+HOMEPAGE="https://web.archive.org/web/20130904163229/http://www.extreme.indiana.edu/xgws/xsoap/xpp/xpp2/"
+SRC_URI="https://web.archive.org/web/20130904173708/http://www.extreme.indiana.edu/xgws/xsoap/xpp/download/PullParser2/${MY_P}.tgz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="Apache-1.1 IBM"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+
+# Some failures, partly because we haven't patched Xerces but probably
+# also because this software is ancient. :(
+RESTRICT="test"
+
+CP_DEPEND="dev-java/xerces:2"
+DEPEND="${CP_DEPEND}
+	>=virtual/jdk-1.8:*
+	test? ( dev-java/junit:4 )"
+RDEPEND="${CP_DEPEND}
+	>=virtual/jre-1.8:*"
+
+PATCHES=( "${FILESDIR}/${P}-fix-java5+.patch" )
+
+JAVADOC_ARGS="-source 8"
+JAVA_RESOURCE_DIRS="res"
+JAVA_SRC_DIR="src/java"
+
+src_prepare() {
+	default #780585
+	java-pkg-2_src_prepare
+	java-pkg_clean
+	mkdir res || die
+	cp -r src/java/impl/factory/META-INF res || die
+	touch "res/PullParser${PV}_VERSION" || die
+
+	mv src/{java/,}tests || die
+	mv src/{java/,}samples || die
+}
+
+src_compile() {
+	java-pkg-simple_src_compile
+	rm xpp2.jar || die
+	JAVA_JAR_FILENAME="PullParser.jar"
+
+	cp -r target/classes parser || die
+	rm -r parser/org/gjt/xpp/x2impl || die
+	rm parser/org/gjt/xpp/impl/PullParserFactorySmallImpl.class || die
+	jar cvf PullParser.jar -C parser . || die
+
+	cp -r target/classes standard || die
+	rm -r standard/{javax,org/xml} || die
+	rm -r standard/org/gjt/xpp/{jaxp11,sax2,x2impl} || die
+	rm standard/org/gjt/xpp/impl/PullParserFactorySmallImpl.class || die
+	jar cvf PullParser-standard.jar -C standard . || die
+
+	cp -r target/classes intf || die
+	rm -r intf/{javax,org/xml,org/gjt/xpp/{impl,jaxp11,sax2,x2impl}} || die
+	rm -r intf/META-INF || die
+	jar cvf PullParser-intf.jar -C intf . || die
+
+	cp -r target/classes x2 || die
+	rm -r x2/org/gjt/xpp/impl/{pullparser,tokenizer} || die
+	rm x2/org/gjt/xpp/impl/PullParserFactory* || die
+	jar cvf PullParser-x2.jar -C x2 . || die
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	java-pkg_dojar PullParser-{standard,intf,x2}.jar
+}