dev-java/jgraphx: Drop old; bump EAPI; fix license; QA -> layout

Package-Manager: portage-2.2.0_alpha179

8 files changed, 30 insertions, 154 deletions

diff --git a/dev-java/jgraphx/ChangeLog b/dev-java/jgraphx/ChangeLog
index 1e6b6660e..93b782e99 100644
--- a/dev-java/jgraphx/ChangeLog
+++ b/dev-java/jgraphx/ChangeLog
@@ -1,7 +1,12 @@
 # ChangeLog for dev-java/jgraphx
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  12 Jun 2013; Justin Lecher <jlec@gentoo.org> -jgraphx-1.2.0.7.ebuild,
+  -jgraphx-1.3.0.2.ebuild, jgraphx-1.4.1.0.ebuild, -jgraphx-1.4.1.2.ebuild,
+  jgraphx-1.8.0.6.ebuild, metadata.xml:
+  Drop old; bump EAPI; fix license; QA -> layout
+
 *jgraphx-1.8.0.6 (28 Jul 2012)
 
   28 Jul 2012; Guillaume Horel <guillaume.horel@gmail.com>
diff --git a/dev-java/jgraphx/Manifest b/dev-java/jgraphx/Manifest
index 126a5a322..9e3a58174 100644
--- a/dev-java/jgraphx/Manifest
+++ b/dev-java/jgraphx/Manifest
@@ -1,5 +1,2 @@
-DIST jgraphx-1.2.0.7.zip 3034071 SHA256 9dfc39de448d9ba28ab6b27fe3c8e920033779feb38dbe45cf96145c6d506b08
-DIST jgraphx-1.3.0.2.zip 3055762 SHA256 c58aa9e3b1f334f54633017f1f9b35204e19d18524c41df3a5e68c2aa50d2c2d
 DIST jgraphx-1.4.1.0.zip 4052749 SHA256 086cd3de7d2b381a61f5a7d5eea19e80d3f1f1aaff9642d2b9e582d86a312f59
-DIST jgraphx-1.4.1.2.zip 4148011 SHA256 cb0216df6fe3e9351afae7f02585e6f5c50e28e764d9504dd8aa558a87d3fe95
 DIST jgraphx-1.8.0.6.zip 4216848 SHA256 237035982616769f0c15b805b4ce12616915498a5995fbdae814b97f434c860d SHA512 07985168625f094a8de9ab0e5c6050dd1a5d537b21eb6c73e468ad21db2758ac78a272dfedf22b94585eff4f77288ad99f8f1b70b18462754f0f3048ad06e40f WHIRLPOOL 403b784bdf934fc4a6aae643badb4380279bd15ea87520d6df0ed3d3ed58b020d3f0f979e9d2a2de338256bbdb5793e1e9d50634c60e83d104ceb88b96fcefba
diff --git a/dev-java/jgraphx/jgraphx-1.2.0.7.ebuild b/dev-java/jgraphx/jgraphx-1.2.0.7.ebuild
deleted file mode 100644
index e10480ed7..000000000
--- a/dev-java/jgraphx/jgraphx-1.2.0.7.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=2
-
-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="as-is"
-SLOT="0"
-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 || die
-	rm 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.3.0.2.ebuild b/dev-java/jgraphx/jgraphx-1.3.0.2.ebuild
deleted file mode 100644
index a04453dd0..000000000
--- a/dev-java/jgraphx/jgraphx-1.3.0.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jgraph/jgraph-5.12.0.4.ebuild,v 1.5 2008/05/13 21:09:16 ken69267 Exp $
-
-EAPI=2
-
-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="as-is"
-SLOT="0"
-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-1.4.1.0.ebuild
index a0f83e766..1940bda80 100644
--- a/dev-java/jgraphx/jgraphx-1.4.1.0.ebuild
+++ b/dev-java/jgraphx/jgraphx-1.4.1.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=2
+EAPI=5
 
 JAVA_PKG_IUSE="doc source"
 
@@ -11,16 +11,18 @@ 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"
+SRC_URI="http://www.jgraph.com/downloads/jgraphx/archive/${PN}-${MY_PV}.zip -> ${P}.zip"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc examples source"
-DEPEND=">=virtual/jdk-1.5
+
+DEPEND="
+	>=virtual/jdk-1.5
 	app-arch/unzip"
 RDEPEND=">=virtual/jre-1.5"
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
 
 S="${WORKDIR}/${PN}"
 
diff --git a/dev-java/jgraphx/jgraphx-1.4.1.2.ebuild b/dev-java/jgraphx/jgraphx-1.4.1.2.ebuild
deleted file mode 100644
index a0f83e766..000000000
--- a/dev-java/jgraphx/jgraphx-1.4.1.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=2
-
-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="as-is"
-SLOT="0"
-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.8.0.6.ebuild b/dev-java/jgraphx/jgraphx-1.8.0.6.ebuild
index 895650d27..b6d4e2724 100644
--- a/dev-java/jgraphx/jgraphx-1.8.0.6.ebuild
+++ b/dev-java/jgraphx/jgraphx-1.8.0.6.ebuild
@@ -1,24 +1,28 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+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"
+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
+
+DEPEND="
+	>=virtual/jdk-1.5
 	app-arch/unzip"
 RDEPEND=">=virtual/jre-1.5"
-LICENSE="as-is"
-SLOT="1.8"
-KEYWORDS="~amd64 ~x86"
 
 S="${WORKDIR}/${PN}"
 
diff --git a/dev-java/jgraphx/metadata.xml b/dev-java/jgraphx/metadata.xml
index 8cdee3b70..57850f4e3 100644
--- a/dev-java/jgraphx/metadata.xml
+++ b/dev-java/jgraphx/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
-<longdescription lang="en">
+  <herd>sci</herd>
+  <longdescription lang="en">
   JGraph X is based on the mxGraph architecture, a re-designed core
   based on JGraph experience.
   Overall, JGraph X provides more features that JGraph, with a far