Restrict to <=jdk:1.6, depends on removed api. #180437

dev-java/servletapi -> java-virtuals/servlet-api #398689

(Portage version: 2.1.10.62/cvs/Linux x86_64)

2 files changed, 66 insertions, 2 deletions

diff --git a/dev-java/jcharts/ChangeLog b/dev-java/jcharts/ChangeLog
index c262fac319b6..108efdb762a6 100644
--- a/dev-java/jcharts/ChangeLog
+++ b/dev-java/jcharts/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/jcharts
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jcharts/ChangeLog,v 1.8 2009/10/03 20:30:14 caster Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jcharts/ChangeLog,v 1.9 2012/05/27 20:11:25 sera Exp $
+
+*jcharts-0.7.5-r2 (27 May 2012)
+
+  27 May 2012; Ralph Sennhauser <sera@gentoo.org> +jcharts-0.7.5-r2.ebuild:
+  Restrict to <=jdk:1.6, depends on removed api. #180437
+  dev-java/servletapi -> java-virtuals/servlet-api #398689
 
   03 Oct 2009; Vlastimil Babka <caster@gentoo.org> -jcharts-0.7.5.ebuild:
   Remove old.
diff --git a/dev-java/jcharts/jcharts-0.7.5-r2.ebuild b/dev-java/jcharts/jcharts-0.7.5-r2.ebuild
new file mode 100644
index 000000000000..beefda530774
--- /dev/null
+++ b/dev-java/jcharts/jcharts-0.7.5-r2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jcharts/jcharts-0.7.5-r2.ebuild,v 1.1 2012/05/27 20:11:25 sera Exp $
+
+EAPI="4"
+
+JAVA_PKG_IUSE="doc examples source"
+
+inherit java-pkg-2 java-ant-2
+
+MY_P="jCharts-${PV}"
+DESCRIPTION="jCharts is a 100% Java based charting utility that outputs a variety of charts"
+HOMEPAGE="http://jcharts.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# tests need X11
+RESTRICT=test
+
+# depends on com.sun.image.codec.jpeg which was removed in java 1.7 #180437
+COMMON_DEP="
+	dev-java/batik:1.7
+	java-virtuals/servlet-api:3.0"
+RDEPEND="${COMMON_DEP}
+	|| ( virtual/jre:1.6 virtual/jre:1.5 virtual/jre:1.4 )"
+DEPEND="${COMMON_DEP}
+	|| ( virtual/jdk:1.6 virtual/jdk:1.5 virtual/jdk:1.4 )
+	app-arch/unzip"
+
+S="${WORKDIR}/${MY_P}"
+
+java_prepare() {
+	rm -v *.{jar,war} lib/*.jar || die
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+JAVA_ANT_CLASSPATH_TAGS+=" javadoc"
+
+EANT_BUILD_XML="build/build.xml"
+EANT_GENTOO_CLASSPATH="batik-1.7,servlet-api-3.0"
+EANT_DOC_TARGET="javadocs"
+
+#src_test() {
+#	java-pkg-2_src_test
+#}
+
+src_install() {
+	java-pkg_newjar build/*.jar
+	dohtml docs/*.html
+
+	use doc && java-pkg_dojavadoc build/javadocs
+	use source && java-pkg_dosrc src/org
+	use examples && java-pkg_doexamples demo
+}