dev-java/jcalendar: Stable for amd64+x86 + Clean up old.

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

3 files changed, 12 insertions, 60 deletions

diff --git a/dev-java/jcalendar/Manifest b/dev-java/jcalendar/Manifest
index 3e24b3469260..663676146d38 100644
--- a/dev-java/jcalendar/Manifest
+++ b/dev-java/jcalendar/Manifest
@@ -1,2 +1 @@
-DIST jcalendar-1.3.3.zip 669499 SHA256 1dbbf9037026b32adfd123d3946c3ca272075f8b4ddf205436cddeffae320ac9 SHA512 966cb1f063b15bb941e9e263bd0dcf8a6121a6fa37ed2def69be6031856a1459a198f1b10202d697aafff8c71ad6f4e191449014bb692385c066f2c93b9c73fd WHIRLPOOL 39ef9f370b9ddc7c04717c45b34614919e65e54d52b6c2c0b0898b38d917d470e2442bfde08f2b94d567c8806749651aa00362363d38b4a13ba6fae3171a1b58
 DIST jcalendar-1.4.zip 982517 SHA256 21fb9332aad57d9542e9833376686a4bc7612e979c638e97334421bd15447c4f SHA512 aeab6f98451f4fa8718e127de6c0af345410bebbd1de4fa1ca4b9e7f5a22908f9e455ba96da34ef9e8691b4d462e8a01dbd7881b6565a0f3a65d18fe58b68d9c WHIRLPOOL 8c25a8918ef7d83cce59c347701a7af8e3a1bd307398f80d9e2d9d076afae05daaa56e1430eba167139aaae6193ed84a6c860d68ecd286992be71bec9e0dd388
diff --git a/dev-java/jcalendar/jcalendar-1.3.3.ebuild b/dev-java/jcalendar/jcalendar-1.3.3.ebuild
deleted file mode 100644
index 7f1bd6777556..000000000000
--- a/dev-java/jcalendar/jcalendar-1.3.3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source"
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Java date chooser bean for graphically picking a date"
-SRC_URI="http://www.toedter.com/download/${P}.zip"
-HOMEPAGE="http://www.toedter.com/en/jcalendar/"
-
-LICENSE="LGPL-2.1"
-SLOT="1.2"
-KEYWORDS="amd64 x86 ~x86-fbsd"
-
-COMMON_DEPEND="dev-java/jgoodies-looks:2.0"
-
-RDEPEND=">=virtual/jdk-1.4
-	${COMMON_DEPEND}"
-
-DEPEND=">=virtual/jdk-1.4
-	>=app-arch/unzip-5.50-r1
-	${COMMON_DEPEND}"
-
-S="${WORKDIR}"
-
-# NOTE: build.xml contains no tests
-
-java_prepare() {
-	cd lib || die
-	rm -v *.jar || die
-
-	java-pkg_jar-from jgoodies-looks-2.0
-}
-
-EANT_BUILD_XML="src/build.xml"
-EANT_DOC_TARGET="dist"
-
-src_install() {
-	java-pkg_newjar lib/${P}.jar
-
-	dodoc readme.txt
-
-	use doc && java-pkg_dohtml -r doc/*
-	use source && java-pkg_dosrc src/com
-}
diff --git a/dev-java/jcalendar/jcalendar-1.4.ebuild b/dev-java/jcalendar/jcalendar-1.4.ebuild
index fa558a8ee1a5..a5e1c65f3a66 100644
--- a/dev-java/jcalendar/jcalendar-1.4.ebuild
+++ b/dev-java/jcalendar/jcalendar-1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -9,21 +9,23 @@ JAVA_PKG_IUSE="doc source"
 inherit java-pkg-2 java-ant-2
 
 DESCRIPTION="Java date chooser bean for graphically picking a date"
-SRC_URI="http://www.toedter.com/download/${P}.zip"
 HOMEPAGE="http://www.toedter.com/en/jcalendar/"
+SRC_URI="http://www.toedter.com/download/${P}.zip"
 
 LICENSE="LGPL-2.1"
 SLOT="1.2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
-COMMON_DEPEND="dev-java/jgoodies-looks:2.6"
+CDEPEND="dev-java/jgoodies-looks:2.6"
 
-RDEPEND=">=virtual/jdk-1.4
-	${COMMON_DEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
 
-DEPEND=">=virtual/jdk-1.4
-	>=app-arch/unzip-5.50-r1
-	${COMMON_DEPEND}"
+DEPEND="
+	${CDEPEND}
+	app-arch/unzip
+	>=virtual/jdk-1.6"
 
 S="${WORKDIR}"
 
@@ -36,7 +38,7 @@ EANT_BUILD_TARGET="jar"
 EANT_DOC_TARGET=""
 
 java_prepare() {
-	rm lib/*.jar || die
+	java-pkg_clean
 }
 
 src_install() {