dev-java/rome: Fix up jdom dependency.

Package-Manager: portage-2.2.20.1
Signed-off-by: Patrice Clement <monsieurp@gentoo.org>

2 files changed, 17 insertions, 63 deletions

diff --git a/dev-java/rome/rome-0.9-r1.ebuild b/dev-java/rome/rome-0.9-r2.ebuild
index 30702d286ee8..e021ef27e09a 100644
--- a/dev-java/rome/rome-0.9-r1.ebuild
+++ b/dev-java/rome/rome-0.9-r2.ebuild
@@ -3,7 +3,6 @@
 # $Id$
 
 EAPI=5
-
 JAVA_PKG_IUSE="doc source test"
 
 inherit java-pkg-2 java-ant-2
@@ -11,22 +10,26 @@ inherit java-pkg-2 java-ant-2
 DESCRIPTION="Open source Atom/RSS Java utilities that make it easy to work in Java with most syndication formats"
 HOMEPAGE="https://java.net/projects/rome"
 SRC_URI="https://rome.dev.java.net/source/browse/*checkout*/rome/www/dist/${P}-src.zip"
-
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-COMMON_DEPEND="dev-java/jdom:0"
-DEPEND=">=virtual/jdk-1.4
+EANT_JAVA_ENCODING="ISO-8859-1"
+CDEPEND="dev-java/jdom:1.0"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.6
 	app-arch/unzip
-	test? ( dev-java/ant-junit:0 )
-	${COMMON_DEPEND}"
-RDEPEND=">=virtual/jre-1.4
-	${COMMON_DEPEND}"
+	test? ( dev-java/ant-junit:0 )"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
 
 JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="jdom"
+EANT_GENTOO_CLASSPATH="jdom-1.0"
 
 java_prepare() {
 	# Patch build.xml so the tests pass
@@ -36,13 +39,13 @@ java_prepare() {
 	mkdir -p target/lib || die
 }
 
+src_test() {
+	java-pkg-2_src_test
+}
+
 src_install() {
 	java-pkg_newjar target/${P}.jar
-
 	use doc && java-pkg_dojavadoc dist/docs/api
 	use source && java-pkg_dosrc src/java/*
 }
 
-src_test() {
-	java-pkg-2_src_test
-}
diff --git a/dev-java/rome/rome-0.9.ebuild b/dev-java/rome/rome-0.9.ebuild
deleted file mode 100644
index 20a33a6296b7..000000000000
--- a/dev-java/rome/rome-0.9.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Open source Atom/RSS Java utilities that make it easy to work in Java with most syndication formats"
-HOMEPAGE="https://java.net/projects/rome"
-SRC_URI="https://rome.dev.java.net/source/browse/*checkout*/rome/www/dist/${P}-src.zip"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86 ~x86-fbsd"
-IUSE=""
-
-COMMON_DEPEND=">=dev-java/jdom-1.0"
-DEPEND=">=virtual/jdk-1.4
-	app-arch/unzip
-	test? ( dev-java/ant-junit )
-	${COMMON_DEPEND}"
-RDEPEND=">=virtual/jre-1.4
-	${COMMON_DEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Patch build.xml so the tests pass
-	epatch "${FILESDIR}/${P}-build.xml-test-upstream.patch"
-
-	# Symlink jars
-	mkdir -p target/lib
-	cd target/lib
-	java-pkg_jar-from jdom-1.0
-}
-
-src_install() {
-	java-pkg_newjar target/${P}.jar
-
-	use doc && java-pkg_dojavadoc dist/docs/api
-	use source && java-pkg_dosrc src/java/*
-}
-
-src_test() {
-	java-pkg_jar-from --into target/lib junit
-	ANT_TASKS="ant-junit" eant test
-}