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

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

Package-Manager: portage-2.1.10.62/cvs/Linux x86_64

3 files changed, 82 insertions, 3 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/Manifest b/dev-java/jcharts/Manifest
index 6fe0c7128d15..7546937478a0 100644
--- a/dev-java/jcharts/Manifest
+++ b/dev-java/jcharts/Manifest
@@ -1,4 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST jCharts-0.7.5.zip 2499046 RMD160 8acf331baac631c246805b49bb8c4f462ea27015 SHA1 dfa73472439de40a0009fcc6257873159111342f SHA256 add40a61a022f353421bfc578537871b7d716750896d689ada8ac294334956d6
 EBUILD jcharts-0.7.5-r1.ebuild 1352 RMD160 0e837d440d6628d8e655c73606fc0e24de1ba9e5 SHA1 88d1edcd7067cfa71693b6c3fd7b64262b24459b SHA256 9964e3990fa8e5f9c690b89093e26d4326e493907680f10ae64a336d0c10943c
-MISC ChangeLog 1130 RMD160 f3b9776c0e669862849029fddecf19969ce7f119 SHA1 f9b36211021f7ab58a247295fc83d51f5d61d595 SHA256 d16b72b38c00f13d50c8c04e2a8eea4915a50a64cf873106b861ba4743704a3c
+EBUILD jcharts-0.7.5-r2.ebuild 1405 RMD160 758898ba7349eccbde18383bc64fe3ef4719aefb SHA1 0578ee3acb1110c9b76ce5c6ca13dcb34b8870c4 SHA256 c376753b6824bf1a7a5f57566e9e45552afe49bf2e0808b42966cd15bf0f3f07
+MISC ChangeLog 1354 RMD160 80eb07a02d1fe72ccf3e18ad7e5a856d2885cfe9 SHA1 2dc44afde4e1bd5f2034f537715916bdf5417304 SHA256 2e65512ac7db634c2a69d0e050d0596b54929e448880c98cb0fa5c32298dc818
 MISC metadata.xml 455 RMD160 66e8f2f0a033e851409cc828b60e2ee58cc6f0d3 SHA1 e7310a1d607d8ff1325ae2f8bc38e5dce2a96d45 SHA256 148ca08bf90898d798fd8c6f047115ecd696909c3950f965d1d76f2b3c5a435b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQEcBAEBAgAGBQJPwop7AAoJEIUJ+svaV163AJEIAI8RHf/Awj2qOlD1Le/U8PQ3
+nl9Ze8rjo7jbSys6nBoplCI+SAKgUM259zZ0yKPuJ4FL/3O2WqQAvwQVy8JHIZ2o
+74YrNLspyn6uO4/ZPVDzwPqZn/gR4JB+dIco12nM4U/jAGVIpadOANl/Bn4q8vd1
+qXyBTqHnRInAONwLD0i7hA1KNJQPJaaOTPPFXTPOYmYi89BEnrxtMpuPJcI32Ve3
+zeM0FOk2L+O6qOafMo542YRHi2zw6c39cT5YtGNV3paF15N9ITXxW/xKutrpeCod
+QZFgncYRK0fG2OcVti4e1kZztzfLibC0oDYGLHnD2c7vZgAJpGcZGB2VPhe7zxc=
+=4ADu
+-----END PGP SIGNATURE-----
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
+}