dev-java/jgraphx: EAPI bump, version bump

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Andrew Ammerlaan <andrewammerlaan@riseup.net>
Signed-off-by: Horea Christian <chr@chymera.eu>

4 files changed, 11 insertions, 104 deletions

diff --git a/dev-java/jgraphx/Manifest b/dev-java/jgraphx/Manifest
index 940eb6906..421fe6919 100644
--- a/dev-java/jgraphx/Manifest
+++ b/dev-java/jgraphx/Manifest
@@ -1,3 +1 @@
-DIST jgraphx-1.4.1.0.zip 4052749 BLAKE2B 12817a161391df4b63f1260af10b76f91cd4f2123f03ebb5e1826f927ced23724ea1210b455320552578a69d6c299fc577f443426a7eecc508ba99d69a9144a7 SHA512 c9d5482abb4876632a794a0c0ea4c7ec1a963ebdc72e7efc9be1ce0ed44edb589879caf3017cc626fbe51e0f8c46ff94c62966c5c242099b1f76c0f63bec58b3
-DIST jgraphx-1.8.0.6.zip 4216848 BLAKE2B beef4e75b001f15de0a77690f7c200f39fc05d1ced11fddf35656372e473d0a69a502bc05a52da62846a2ae2043200d66c15bc019690963191e543be991a735f SHA512 07985168625f094a8de9ab0e5c6050dd1a5d537b21eb6c73e468ad21db2758ac78a272dfedf22b94585eff4f77288ad99f8f1b70b18462754f0f3048ad06e40f
-DIST jgraphx-2.5.0.3.zip 4462094 BLAKE2B 59d0c4461ef836026338a16a07e8b44977b93a6bd67b3664187c7afd681638c63c09673825f5ad6afbd2825632d614d491a4c546fd7c8d9e21683d035c557e66 SHA512 2cdc86c61409f4bba0c25c02dafb26fc6d76a127b584f92d380baa610715ad5e2034c43c1d912f3d7eca4c03464fedcf01573a3dad4fa184c365ff4fc0b2b7ea
+DIST jgraphx-4.2.2.tar.gz 3525225 BLAKE2B a716df6d843fdc3b0ef32ba9549701d658f1daa104fd90df00137753d837756a2008129cb449771ec8dac3731b3033b429a7758f7f2e3ca58f27b93c88732b5c SHA512 767c0972100c8ed41561304367cba4574d1ba1bcd5c5d57fa869dd0a1bc1b2d6d70253577a4d2a2f03641afec5bd0d4e81e52a13529681737de7918c0c24cee7
diff --git a/dev-java/jgraphx/jgraphx-1.8.0.6.ebuild b/dev-java/jgraphx/jgraphx-1.8.0.6.ebuild
deleted file mode 100644
index ae457bf45..000000000
--- a/dev-java/jgraphx/jgraphx-1.8.0.6.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2014 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-ant-2 versionator
-
-MY_PV=$(replace_all_version_separators '_')
-
-DESCRIPTION="Open-source graph component for Java"
-HOMEPAGE="http://www.jgraph.com"
-SRC_URI="http://www.jgraph.com/downloads/jgraphx/archive/${PN}-${MY_PV}.zip -> ${P}.zip"
-
-SLOT="1.8"
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples source"
-
-DEPEND="
-	>=virtual/jdk-1.5
-	app-arch/unzip"
-RDEPEND=">=virtual/jre-1.5"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	# don't do javadoc always
-	sed -i \
-		-e 's/depends="doc"/depends="compile"/' \
-		build.xml || die "sed failed"
-	rm -rf doc/api lib/jgraphx.jar || die
-}
-
-EANT_BUILD_TARGET="build"
-EANT_DOC_TARGET="doc"
-
-src_install() {
-	java-pkg_dojar lib/${PN}.jar
-
-	use doc && java-pkg_dojavadoc docs/api
-	use source && java-pkg_dosrc src/org
-	use examples && java-pkg_doexamples examples
-}
diff --git a/dev-java/jgraphx/jgraphx-2.5.0.3.ebuild b/dev-java/jgraphx/jgraphx-2.5.0.3.ebuild
deleted file mode 100644
index 926d260f7..000000000
--- a/dev-java/jgraphx/jgraphx-2.5.0.3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2014 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-ant-2 versionator
-
-MY_PV=$(replace_all_version_separators '_')
-
-DESCRIPTION="Open-source graph component for Java"
-SRC_URI="http://www.jgraph.com/downloads/jgraphx/archive/${PN}-${MY_PV}.zip\
-		-> ${P}.zip"
-HOMEPAGE="http://www.jgraph.com"
-IUSE="doc examples source"
-DEPEND=">=virtual/jdk-1.5
-	app-arch/unzip"
-RDEPEND=">=virtual/jre-1.5"
-LICENSE="BSD"
-SLOT="2.5"
-KEYWORDS="~amd64 ~x86"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	# don't do javadoc always
-	sed -i \
-		-e 's/depends="doc"/depends="compile"/' \
-		build.xml || die "sed failed"
-	rm -rf doc/api lib/jgraphx.jar || die
-}
-
-EANT_BUILD_TARGET="build"
-EANT_DOC_TARGET="doc"
-
-src_install() {
-	java-pkg_dojar lib/${PN}.jar
-
-	use doc && java-pkg_dojavadoc docs/api
-	use source && java-pkg_dosrc src/org
-	use examples && java-pkg_doexamples examples
-}
diff --git a/dev-java/jgraphx/jgraphx-1.4.1.0.ebuild b/dev-java/jgraphx/jgraphx-4.2.2.ebuild
index 488bafcef..de4e6ab36 100644
--- a/dev-java/jgraphx/jgraphx-1.4.1.0.ebuild
+++ b/dev-java/jgraphx/jgraphx-4.2.2.ebuild
@@ -1,31 +1,26 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2 versionator
-
-MY_PV=$(replace_all_version_separators '_')
+inherit java-pkg-2 java-ant-2
 
 DESCRIPTION="Open-source graph component for Java"
-HOMEPAGE="http://www.jgraph.com"
-SRC_URI="http://www.jgraph.com/downloads/jgraphx/archive/${PN}-${MY_PV}.zip -> ${P}.zip"
+HOMEPAGE="https://github.com/jgraph"
+SRC_URI="https://github.com/jgraph/jgraphx/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
-SLOT="0"
 LICENSE="BSD"
+SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="doc examples source"
 
-DEPEND="
-	>=virtual/jdk-1.5
-	app-arch/unzip"
-RDEPEND=">=virtual/jre-1.5"
+IUSE="doc examples source"
 
-S="${WORKDIR}/${PN}"
+DEPEND=">=virtual/jdk-1.7"
+RDEPEND=">=virtual/jre-1.7"
 
 src_prepare() {
+	default
 	# don't do javadoc always
 	sed -i \
 		-e 's/depends="doc"/depends="compile"/' \