Bumped to latest release

(Portage version: 2.1.4_rc3)

5 files changed, 24 insertions, 62 deletions

diff --git a/dev-java/itext/ChangeLog b/dev-java/itext/ChangeLog
index 26d50b9d40c6..33a3dc3dc903 100644
--- a/dev-java/itext/ChangeLog
+++ b/dev-java/itext/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/itext
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/itext/ChangeLog,v 1.59 2007/10/14 15:46:06 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/itext/ChangeLog,v 1.60 2007/11/29 19:43:51 wltjr Exp $
+
+*itext-2.0.7 (29 Nov 2007)
+
+  29 Nov 2007; William L. Thomson Jr. <wltjr@gentoo.org>
+  -itext-1.4.8.ebuild, -itext-2.0.4.ebuild, +itext-2.0.7.ebuild:
+  Bumped to latest release
 
   14 Oct 2007; Markus Rothe <corsair@gentoo.org> itext-2.0.5.ebuild:
   Stable on ppc64; bug #194836
diff --git a/dev-java/itext/files/digest-itext-1.4.8 b/dev-java/itext/files/digest-itext-1.4.8
deleted file mode 100644
index 14a177497645..000000000000
--- a/dev-java/itext/files/digest-itext-1.4.8
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 51a799be0141d08afc793318a6dee111 itext-src-1.4.8.tar.gz 1165951
-RMD160 ecd9b80d7323319382fa16b8895332df25ecd6e2 itext-src-1.4.8.tar.gz 1165951
-SHA256 b283ac094389516e9914b31622e08842dd9220a026dcc4ce9138084b685e77a2 itext-src-1.4.8.tar.gz 1165951
diff --git a/dev-java/itext/files/digest-itext-2.0.4 b/dev-java/itext/files/digest-itext-2.0.7
index 569cd0523d70..f805c3a4ad14 100644
--- a/dev-java/itext/files/digest-itext-2.0.4
+++ b/dev-java/itext/files/digest-itext-2.0.7
@@ -1,9 +1,9 @@
+MD5 bf26546279f55e11a9aeb17e78180580 iText-src-2.0.7.tar.gz 1118588
+RMD160 725ba37ccc92560b2c57c0ae1524f3a64764c9c5 iText-src-2.0.7.tar.gz 1118588
+SHA256 6c1a70cce16480a1678c02cfd931b889dff4abf7d4cf1923bed005c50cfced68 iText-src-2.0.7.tar.gz 1118588
 MD5 e27491cdbb11d39d674fb5dad1247d54 iTextAsian.jar 329741
 RMD160 eff3f2abec72982132a1aecc43493bb5f8294fbb iTextAsian.jar 329741
 SHA256 19c8c57b430958ee93d7a7aab61448e1627b9acd2b0735aa0ca33d78404587bc iTextAsian.jar 329741
 MD5 d2b66db873422c5852eb9d2689486794 iTextAsianCmaps.jar 1696864
 RMD160 9099b41a1fed08e278cc698b7f4eabd39ecb3217 iTextAsianCmaps.jar 1696864
 SHA256 f7fdbd3c93f7b552d935d8300b6644685beb57e056f1934ed001b50d0b60de6f iTextAsianCmaps.jar 1696864
-MD5 2ad0df42a3f9b0160de0ed8d2adc9d2f itext-src-2.0.4.tar.gz 1080630
-RMD160 03ffcdf21590ba2f83acaa9d159acc9979aa6ff5 itext-src-2.0.4.tar.gz 1080630
-SHA256 607668efbf081d4e22549e86e523b6a6b6add7eccd23e995f36c73ae3becea16 itext-src-2.0.4.tar.gz 1080630
diff --git a/dev-java/itext/itext-1.4.8.ebuild b/dev-java/itext/itext-1.4.8.ebuild
deleted file mode 100644
index 51f0d575fa9a..000000000000
--- a/dev-java/itext/itext-1.4.8.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/itext/itext-1.4.8.ebuild,v 1.8 2007/10/12 21:43:48 wltjr Exp $
-
-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/"
-SRC_URI="mirror://sourceforge/itext/${PN}-src-${PV}.tar.gz"
-
-IUSE="doc source"
-
-LICENSE="MPL-1.1"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-
-DEPEND=">=virtual/jdk-1.4
-	dev-java/ant-core
-	source? ( app-arch/zip )"
-RDEPEND=">=virtual/jre-1.4"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	mkdir "${WORKDIR}"/src && cd "${WORKDIR}"/src
-	unpack ${PN}-src-${PV}.tar.gz
-}
-
-src_compile() {
-	cd "${WORKDIR}"/src
-	eant jar $(use_doc)
-}
-
-src_install() {
-	java-pkg_dojar build/bin/*.jar
-
-	use source && java-pkg_dosrc src/com
-	use doc && java-pkg_dojavadoc build/docs
-}
diff --git a/dev-java/itext/itext-2.0.4.ebuild b/dev-java/itext/itext-2.0.7.ebuild
index 1635e53cb85a..5595c6b5b9cc 100644
--- a/dev-java/itext/itext-2.0.4.ebuild
+++ b/dev-java/itext/itext-2.0.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/itext/itext-2.0.4.ebuild,v 1.9 2007/10/12 21:43:48 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/itext/itext-2.0.7.ebuild,v 1.1 2007/11/29 19:43:51 wltjr Exp $
 
 JAVA_PKG_IUSE="doc source"
 
@@ -8,22 +8,22 @@ 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}-src-${PV}.tar.gz"
+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}
-	)"
+	cjk? ( mirror://sourceforge/itext/${ASIANJAR}
+		mirror://sourceforge/itext/${ASIANCMAPSJAR} )"
 
 LICENSE="MPL-1.1"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="cjk"
 
-COMMON_DEPEND=">=dev-java/bcmail-1.36
-	>=dev-java/bcprov-1.36"
+BCV="1.38"
+
+COMMON_DEPEND=">=dev-java/bcmail-${BCV}
+	>=dev-java/bcprov-${BCV}"
 DEPEND="|| ( =virtual/jdk-1.6* =virtual/jdk-1.5* =virtual/jdk-1.4* )
 	${COMMON_DEPEND}"
 RDEPEND=">=virtual/jre-1.4
@@ -36,18 +36,16 @@ src_unpack() {
 	unpack ${DISTFILE}
 
 	if use cjk; then
-		cp "${DISTDIR}/${ASIANJAR}" "${DISTDIR}/${ASIANCMAPSJAR}" "${S}" || die
+		cp "${DISTDIR}/${ASIANJAR}" "${DISTDIR}/${ASIANCMAPSJAR}" "${S}" || die "Could not copy asian fonts"
 	fi
 
-#	epatch ${FILESDIR}/2.0.2-compile_xml.patch
 	epatch "${FILESDIR}"/2.0.2-site_xml.patch
-	epatch "${FILESDIR}"/2.0-ImageIO.patch
 	java-ant_bsfix_files ant/*.xml || die "failed to rewrite build xml files"
 
-	mkdir -p "${WORKDIR}/lib" || die
-	cd "${WORKDIR}/lib" || die
-	java-pkg_jar-from bcmail bcmail.jar bcmail-jdk14-135.jar
-	java-pkg_jar-from bcprov bcprov.jar bcprov-jdk14-135.jar
+	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"
 }
 
 EANT_BUILD_XML="src/build.xml"