[patch] jfreechart-1.0.14-r1.ebuild.diff

jfreechart-1.0.14-r1.ebuild.diff (text/plain), 1.65 KB, created by Andreas Sturmlechner on 2013-05-22 23:23:47 UTC

--- dev-java/jfreechart/jfreechart-1.0.14.ebuild	2013-05-22 15:10:16.000000000 +0200
+++ dev-java/jfreechart/jfreechart-1.0.14-r1.ebuild	2013-05-23 01:14:32.232248324 +0200
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jfreechart/jfreechart-1.0.14.ebuild,v 1.1 2013/05/22 13:10:16 tomwij Exp $
+# $Header: $
 
 EAPI="5"
 
@@ -16,11 +16,9 @@
 SLOT="1.0"
 KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 
-IUSE="+servlet test"
+IUSE="examples +servlet test"
 
-COMMON_DEPEND="
-	>=dev-java/itext-2.1.5:0
-	>=dev-java/jcommon-1.0.17:1.0
+COMMON_DEPEND=">=dev-java/jcommon-1.0.17:1.0
 	servlet? ( java-virtuals/servlet-api:2.3 )"
 
 DEPEND=">=virtual/jdk-1.4
@@ -28,6 +26,7 @@
 	test? ( dev-java/ant-junit:0 )"
 
 RDEPEND=">=virtual/jdk-1.4
+	examples? ( >=dev-java/itext-2.1.5:0 )
 	${COMMON_DEPEND}"
 
 JAVA_PKG_FILTER_COMPILER="jikes"
@@ -39,7 +38,11 @@
 	# http://sourceforge.net/p/jfreechart/bugs/1100/
 	epatch "${FILESDIR}/${P}-fix-TimeSeriesCollectionTests.patch"
 
-	rm -v *.jar lib/*.jar || die
+	rm -v lib/*.jar || die
+
+	if ! use examples; then
+		rm -v "${P}-demo.jar" || die
+	fi
 
 	if ! use servlet; then
 		rm -rf source/org/jfree/chart/servlet || die
@@ -66,12 +69,14 @@
 	dodoc README.txt ChangeLog NEWS
 
 	use doc && java-pkg_dojavadoc javadoc
+
+	use examples && java-pkg_newjar ${P}-demo.jar ${PN}-demo.jar
+
 	use source && java-pkg_dosrc source/org
 }
 
 get_jars() {
 	local antflags="
-		-Ditext.jar=$(java-pkg_getjar itext iText.jar) \
 		-Djcommon.jar=$(java-pkg_getjar jcommon-1.0 jcommon.jar)"
 
 	use servlet && antflags="${antflags} \