Changed dom4j dep to be conditional on rups USE flag

Package-Manager: portage-2.1.5.2

3 files changed, 89 insertions, 2 deletions

diff --git a/dev-java/itext/ChangeLog b/dev-java/itext/ChangeLog
index 2be7ccfbb73e..710d2bfdaa2d 100644
--- a/dev-java/itext/ChangeLog
+++ b/dev-java/itext/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/itext
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/itext/ChangeLog,v 1.76 2008/05/20 02:47:58 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/itext/ChangeLog,v 1.77 2008/06/03 00:47:23 wltjr Exp $
+
+*itext-2.1.2-r1 (03 Jun 2008)
+
+  03 Jun 2008; William L. Thomson Jr. <wltjr@gentoo.org>
+  +itext-2.1.2-r1.ebuild:
+  Changed dom4j dep to be conditional on rups USE flag
 
 *itext-2.1.2 (19 May 2008)
 
diff --git a/dev-java/itext/Manifest b/dev-java/itext/Manifest
index 05708f0d1113..26d496a2e17f 100644
--- a/dev-java/itext/Manifest
+++ b/dev-java/itext/Manifest
@@ -12,6 +12,7 @@ EBUILD itext-2.0.7.ebuild 1803 RMD160 d38bb7887c764f8a452fd9dd96d3b05b8bbf380b S
 EBUILD itext-2.0.8.ebuild 1822 RMD160 3cae29c2b1c6c50ae821d6d23b2d22e59564003d SHA1 1e98eb6bd12ee45f2f60937ddae1e986c23b3fe7 SHA256 f4edc9532c72d20d2a9ac5e919f44005b0774bf71a9b00f7410a2f9d51602b05
 EBUILD itext-2.1.0.ebuild 2308 RMD160 53c175590f40fdc8746b3ebea9ef648f44f59328 SHA1 b64df5a2991f560be9acbf82db35d469027dc7ae SHA256 f85cad109debd05adc7bb250baeb0475c8a498baf067bb62fc78f6654c7f7a85
 EBUILD itext-2.1.1.ebuild 2308 RMD160 25a9e316d97af0b17c33a75ebcccdd060b041d60 SHA1 8476c61770f05512cfd3368e07bc534f31a296e6 SHA256 acc3ec6bfb56a722e4b637085855d8399e23d9710874811b37aa838eaf225f8a
+EBUILD itext-2.1.2-r1.ebuild 2402 RMD160 83cb2760ec3ca044a5e7bf3b54aaa51988d70d21 SHA1 e23976b7f0ab0d2ca6022971fc4fb0d28b4099c2 SHA256 5c7fbabc50c4514417e634c3a6f348fe8bfeae6c50a2bfd42468cc0f378ed2cd
 EBUILD itext-2.1.2.ebuild 2389 RMD160 0caaf482ea9672b8a9e176b0ab0ffaaf06cfe9e3 SHA1 dfdce21a0a2220137a8a4349e4acd8a4e024fe45 SHA256 055a05b0d6c2bffd60c3e38dd755d56aed88602722a1f2b35911ae2c3659a77e
-MISC ChangeLog 12075 RMD160 079cd0e073f4d0fa70334ba9284a71d52b021d28 SHA1 8a0840d7a47bf00a26b6569d821188a5b0b9bc58 SHA256 e5d9c7562c9839150eef0310b24ecbbf8fb7dc96f6b6bf26c04f87557e08b5e8
+MISC ChangeLog 12245 RMD160 d4db34e78aaa22342833b256bc0e4873f3bd707b SHA1 ee5a1e3cfd2787649720fe2fa4b2a70966d82237 SHA256 81b442c30ba30e97500c1dd4f02a9f28761c333b82299c4176825d5ef2fce366
 MISC metadata.xml 755 RMD160 6d5a2821fe21dec8e0ee7b4ca1f4b664430cc799 SHA1 fcfe8df62909268540923da86a2af452126d5359 SHA256 9e0fc30b42f3ed3e82f53abbaede5a2bca9ea2db5f6115cf0a3b0d3cf57cf605
diff --git a/dev-java/itext/itext-2.1.2-r1.ebuild b/dev-java/itext/itext-2.1.2-r1.ebuild
new file mode 100644
index 000000000000..e1c169ae8ddb
--- /dev/null
+++ b/dev-java/itext/itext-2.1.2-r1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/itext/itext-2.1.2-r1.ebuild,v 1.1 2008/06/03 00:47:23 wltjr Exp $
+
+EAPI=1
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="A Java library that generate documents in the Portable Document Format (PDF) and/or HTML."
+HOMEPAGE="http://www.lowagie.com/iText/"
+DISTFILE="${PN/it/iT}-src-${PV}.tar.gz"
+ASIANJAR="iTextAsian.jar"
+ASIANCMAPSJAR="iTextAsianCmaps.jar"
+SRC_URI="mirror://sourceforge/itext/${DISTFILE}
+	cjk? ( mirror://sourceforge/itext/${ASIANJAR}
+		mirror://sourceforge/itext/${ASIANCMAPSJAR} )"
+
+LICENSE="MPL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="cjk rtf rups"
+
+BCV="1.38"
+
+COMMON_DEPEND=">=dev-java/bcmail-${BCV}
+	>=dev-java/bcprov-${BCV}
+	rups? ( dev-java/dom4j:1 )"
+DEPEND="|| ( =virtual/jdk-1.6* =virtual/jdk-1.5* !doc? ( !rups? ( =virtual/jdk-1.4* ) ) )
+	 ${COMMON_DEPEND}"
+RDEPEND="!doc? ( !rups? ( >=virtual/jre-1.4 ) )
+	doc? ( !rups? ( >=virtual/jre-1.5 ) )
+	!doc? ( rups? ( >=virtual/jre-1.5 ) )
+	doc? ( rups? ( >=virtual/jre-1.5 ) )
+	${COMMON_DEPEND}"
+
+S="${WORKDIR}/src"
+
+src_unpack() {
+	cd "${WORKDIR}"
+	unpack ${DISTFILE}
+	cd "${S}"
+
+	if use cjk; then
+		cp "${DISTDIR}/${ASIANJAR}" "${DISTDIR}/${ASIANCMAPSJAR}" "${WORKDIR}" \
+			|| die "Could not copy asian fonts"
+	fi
+
+	sed -i -e 's|<link href="http://java.sun.com/j2se/1.4/docs/api/" />||' \
+		-e 's|<link href="http://www.bouncycastle.org/docs/docs1.4/" />||' \
+		"${S}/ant/site.xml"
+
+	java-ant_bsfix_files ant/*.xml || die "failed to rewrite build xml files"
+
+	mkdir -p "${WORKDIR}/lib" || die "Failed to create ${WORKDIR}/lib"
+	cd "${WORKDIR}/lib" || die "Could not cd ${WORKDIR}/lib"
+	java-pkg_jar-from bcmail bcmail.jar "bcmail-jdk14-${BCV/./}.jar"
+	java-pkg_jar-from bcprov bcprov.jar "bcprov-jdk14-${BCV/./}.jar"
+	java-pkg_jar-from dom4j-1 dom4j.jar "dom4j-1.6.1.jar"
+}
+
+src_compile() {
+	eant jar $(use_doc javadoc) \
+		$(use rtf && echo "jar.rtf") \
+		$(use rups && echo "jar.rups")
+}
+
+src_install() {
+	cd "${WORKDIR}"
+	java-pkg_dojar lib/iText.jar
+	use rtf && java-pkg_dojar lib/iText-rtf.jar
+	use rups && java-pkg_dojar lib/iText-rups.jar
+	if use cjk; then
+		java-pkg_dojar "${ASIANJAR}"
+		java-pkg_dojar "${ASIANCMAPSJAR}"
+	fi
+
+	use source && java-pkg_dosrc src/core/com src/rups/com
+	use doc && java-pkg_dojavadoc build/docs
+}