gentoo resync : 20.03.2022

3 files changed, 57 insertions, 40 deletions

diff --git a/dev-java/jchart2d/Manifest b/dev-java/jchart2d/Manifest
index f9b282147711..35ed03954dc9 100644
--- a/dev-java/jchart2d/Manifest
+++ b/dev-java/jchart2d/Manifest
@@ -1,3 +1,3 @@
 DIST jchart2d-eclipse-project-3.2.2.zip 3203952 BLAKE2B 99f3058184e02b682e288675edd68c7f53f2961a1888d096c7834d011ce279b9cfc8228f801e8fc4d3b20250875c5db59cc945ab46ae62c28b85545082e684ca SHA512 aa369b78aced9f7884d51f5298a6772d00cd4003d970e0bb401b717b4bdd2fdd543cf9a382edf7c9a6d1837cedb483a04aa89aac1e66d6e365655e99c76ee812
-EBUILD jchart2d-3.2.2.ebuild 912 BLAKE2B 1d03ce8959dd57b2d714e8afec81d740054a8b113c1564e80ec37e720c5d1907a9acdb21f9f1cc168a173f42f2e83c813d1485f0ff4aea3838d29f85f606f95e SHA512 abf365afbd13a3f2ccc937ff68926ad9abf0e53deb8c96b24b3dbf0a8c361813e51d4e9b0cc95a0fa145062c36a51b412c0d037b75fcc8442df4250002e1ab49
+EBUILD jchart2d-3.2.2-r1.ebuild 1277 BLAKE2B 8e7935c0ae45ce1c550389f414a42c46220e6f429179d134da37a3ada3c6bb8f48ec68274bdae7591ef034921f94963824e443cca51ff2c19cc1cf38740906ae SHA512 7517ca26379c108b84fde30d29e16ed48854c6b74f08390873056bddd5967d28d56c9cd5efc63503558cdad3101e5e09cb96796106ff4fd51539869609915b8d
 MISC metadata.xml 888 BLAKE2B a0930cd934de146950dba51ca961f8b1679e37062f24fe4ad2c2a375809da6a2489855afd638552652a3aeefd9fd20dca50250ba0022e32372491a191e09e51b SHA512 b88619b0447efbd55015786afa2d2ab02a23f29cb16b6d2b78123bfcb1ca4f500d0124061856d88ce4ffd5773c104e0ae043e1f6826e65e1b8242e9bb3fedaaf
diff --git a/dev-java/jchart2d/jchart2d-3.2.2-r1.ebuild b/dev-java/jchart2d/jchart2d-3.2.2-r1.ebuild
new file mode 100644
index 000000000000..fe2e13524222
--- /dev/null
+++ b/dev-java/jchart2d/jchart2d-3.2.2-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="net.sf.jchart2d:jchart2d:3.2.2"
+# JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A minimalistic realtime charting library for Java"
+HOMEPAGE="http://jchart2d.sourceforge.net"
+SRC_URI="mirror://sourceforge/project/jchart2d/jchart2d/sources/jchart2d-eclipse-project-${PV}.zip"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+CP_DEPEND="dev-java/jide-oss:0
+	dev-java/xmlgraphics-commons:2"
+
+DEPEND=">=virtual/jdk-1.8:*
+	${CP_DEPEND}"
+
+RDEPEND=">=virtual/jre-1.8:*
+	${CP_DEPEND}"
+
+BDEPEND="
+	app-arch/unzip"
+
+S="${WORKDIR}/${PN}"
+
+DOCS=( ../NOTICE-apache-xmlgraphics-commons )
+
+JAVA_SRC_DIR="src"
+
+# FAILURES!!!
+# Tests run: 212,  Failures: 119
+# JAVA_TEST_SRC_DIR="test"
+# JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+
+src_prepare() {
+	default
+	java-pkg_clean
+
+	# src/Bug3553696.java:3: error: package info.monitorenter.gui.chart.tracepoints does not exist
+	# import info.monitorenter.gui.chart.tracepoints.TracePoint2D;
+	#                                               ^
+	rm src/Bug3553696.java || die
+}
+
+src_install() {
+	default # https://bugs.gentoo.org/789582
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/jchart2d/jchart2d-3.2.2.ebuild b/dev-java/jchart2d/jchart2d-3.2.2.ebuild
deleted file mode 100644
index 4e3f1e632d16..000000000000
--- a/dev-java/jchart2d/jchart2d-3.2.2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="A minimalistic realtime charting library for Java"
-HOMEPAGE="http://jchart2d.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${PN}/sources/${PN}-eclipse-project-${PV}.zip"
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-RESTRICT="test" # Even the headless tests need a display!?
-
-CDEPEND="dev-java/jide-oss:0
-	dev-java/xmlgraphics-commons:2"
-
-RDEPEND=">=virtual/jre-1.6
-	${CDEPEND}"
-
-DEPEND=">=virtual/jdk-1.6
-	${CDEPEND}
-	app-arch/unzip"
-
-JAVA_GENTOO_CLASSPATH="jide-oss,xmlgraphics-commons-2"
-JAVA_SRC_DIR="src"
-
-S="${WORKDIR}/${PN}"
-
-java_prepare() {
-	rm -rv ext/* || die
-
-	# Ant tries and fails to build these outdated bug
-	# demonstrations. Did Ant's globbing behaviour change?
-	rm -v src/*.java || die
-}