Bumped to latest release

Package-Manager: portage-2.1.4_rc3

6 files changed, 36 insertions, 82 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/Manifest b/dev-java/itext/Manifest
index 1d78b64a5af5..3552160779d0 100644
--- a/dev-java/itext/Manifest
+++ b/dev-java/itext/Manifest
@@ -6,20 +6,11 @@ AUX 2.0.2-site_xml.patch 605 RMD160 85b03eecf4ba0786c697f9e41803db2f7bab5ab3 SHA
 MD5 a768d72871266f58d42ce070829a3a54 files/2.0.2-site_xml.patch 605
 RMD160 85b03eecf4ba0786c697f9e41803db2f7bab5ab3 files/2.0.2-site_xml.patch 605
 SHA256 7eae0aee289c82b9823a9f98ae69db878f1813c93e98feba177bf411f48258b2 files/2.0.2-site_xml.patch 605
+DIST iText-src-2.0.7.tar.gz 1118588 RMD160 725ba37ccc92560b2c57c0ae1524f3a64764c9c5 SHA1 56a3b59eba27476e3c37a2249b1c3724a1e5a4a0 SHA256 6c1a70cce16480a1678c02cfd931b889dff4abf7d4cf1923bed005c50cfced68
 DIST iTextAsian.jar 329741 RMD160 eff3f2abec72982132a1aecc43493bb5f8294fbb SHA1 c227697b8af6f77ac8ebea3205cef07258e855c7 SHA256 19c8c57b430958ee93d7a7aab61448e1627b9acd2b0735aa0ca33d78404587bc
 DIST iTextAsianCmaps.jar 1696864 RMD160 9099b41a1fed08e278cc698b7f4eabd39ecb3217 SHA1 2901f5995849d5c1338f29a6de0d5415add8d4e0 SHA256 f7fdbd3c93f7b552d935d8300b6644685beb57e056f1934ed001b50d0b60de6f
-DIST itext-src-1.4.8.tar.gz 1165951 RMD160 ecd9b80d7323319382fa16b8895332df25ecd6e2 SHA1 0ec375106add3bd622624991786d18eb8a9b4c2e SHA256 b283ac094389516e9914b31622e08842dd9220a026dcc4ce9138084b685e77a2
-DIST itext-src-2.0.4.tar.gz 1080630 RMD160 03ffcdf21590ba2f83acaa9d159acc9979aa6ff5 SHA1 761c2a884f46d5b7dcacac4445d9c195fd80b6fd SHA256 607668efbf081d4e22549e86e523b6a6b6add7eccd23e995f36c73ae3becea16
 DIST itext-src-2.0.5.tar.gz 1097323 RMD160 d900ae5be59ff42ae3ffdf835c08fa3050888308 SHA1 e65a2987a064ce3433cc0d67fcf87e6036852292 SHA256 de67a00dd3c256c3fe09da280732acafc3f782c9ae1ed80844481f1f24ced11d
 DIST itext-src-2.0.6.tar.gz 1114156 RMD160 c08290521c3e43a34ba8a11c2883a516681c9ffb SHA1 1a4c603c887439bcae44b50f3246142c2acb78f1 SHA256 2fa06a5c591f25f0716427641e17e29952205be8ecb6619c2ac62966ea52e1e4
-EBUILD itext-1.4.8.ebuild 935 RMD160 b6a0b5ae464a16f3c4d80dd2977ab5e7c16defb1 SHA1 c9306a8fb0b8955f7a8a68daf0a1537cdcd96ab3 SHA256 ff88dbbfd18223b557b9fcad518d3b504f383e83604edabaf5ba3fecaf57d2be
-MD5 2085c223186a173033e481b46c89fc7e itext-1.4.8.ebuild 935
-RMD160 b6a0b5ae464a16f3c4d80dd2977ab5e7c16defb1 itext-1.4.8.ebuild 935
-SHA256 ff88dbbfd18223b557b9fcad518d3b504f383e83604edabaf5ba3fecaf57d2be itext-1.4.8.ebuild 935
-EBUILD itext-2.0.4.ebuild 1760 RMD160 f6c339df83221d32c77ea119ab7d523a0690ce5a SHA1 68c225989df3f273c398f2fb0fc3a38b8c774728 SHA256 b62ff96e04ad9f74b01f4779a0a14c2a719d8960d14b645e5973e4f4d6058560
-MD5 f6391ddde75b3afd6cf093810fac2bea itext-2.0.4.ebuild 1760
-RMD160 f6c339df83221d32c77ea119ab7d523a0690ce5a itext-2.0.4.ebuild 1760
-SHA256 b62ff96e04ad9f74b01f4779a0a14c2a719d8960d14b645e5973e4f4d6058560 itext-2.0.4.ebuild 1760
 EBUILD itext-2.0.5.ebuild 1799 RMD160 38fe811270946b3ce5a357a0c42ae95a973c8f84 SHA1 d9ece6a59d9a56bac9ea729ac5ca69c6fe26ffc4 SHA256 206870ecc542811a262d90236c9d63d675d2978e9c4e208ad21434ce32b5f185
 MD5 0e33d3cb4203782f6a712dcc0e058b75 itext-2.0.5.ebuild 1799
 RMD160 38fe811270946b3ce5a357a0c42ae95a973c8f84 itext-2.0.5.ebuild 1799
@@ -28,23 +19,24 @@ EBUILD itext-2.0.6.ebuild 1801 RMD160 9b60ecc7a9e302d12077af7fccee4ecdcc5cb29b S
 MD5 c4dc9d3297641cc9386afd9f8a526198 itext-2.0.6.ebuild 1801
 RMD160 9b60ecc7a9e302d12077af7fccee4ecdcc5cb29b itext-2.0.6.ebuild 1801
 SHA256 8a91fb754b785d24476123121a16dc7629df959ce2ef8ca6477d8610d1886d4f itext-2.0.6.ebuild 1801
-MISC ChangeLog 9807 RMD160 f3b3762d5c3b6a390d23676737685ce8eff56070 SHA1 3aabe978edbb7d6786520b24867847dc0d7b3c2c SHA256 43772400b4363d89bf67cfaad782adbca823990851a15d5691fc7b2b9091690b
-MD5 e2e8750b8f1aba2e8132c10223818d70 ChangeLog 9807
-RMD160 f3b3762d5c3b6a390d23676737685ce8eff56070 ChangeLog 9807
-SHA256 43772400b4363d89bf67cfaad782adbca823990851a15d5691fc7b2b9091690b ChangeLog 9807
+EBUILD itext-2.0.7.ebuild 1807 RMD160 8a3aba3cbc851af39c1a8eacced381534784975f SHA1 593622a588ea10e5580416b236051636cdd9d31c SHA256 9a9202e57dcaa4122ef349d02da323dba8d7efc1b35ebbc0b137d3304b3ee19b
+MD5 8c8c8213e457ab8e7d315f4c0d722140 itext-2.0.7.ebuild 1807
+RMD160 8a3aba3cbc851af39c1a8eacced381534784975f itext-2.0.7.ebuild 1807
+SHA256 9a9202e57dcaa4122ef349d02da323dba8d7efc1b35ebbc0b137d3304b3ee19b itext-2.0.7.ebuild 1807
+MISC ChangeLog 9983 RMD160 d2e3dff4292b7d9d94403cb1391e44a43ba7621c SHA1 4628e39c3b5ecf492beb1f58629aa292201183fe SHA256 1e6c366a8bf9a70360cea6a9e5d403c34736ee55a962dad9ba0c40f96ed24ad6
+MD5 494c13c18482c5c70d170889d93d298a ChangeLog 9983
+RMD160 d2e3dff4292b7d9d94403cb1391e44a43ba7621c ChangeLog 9983
+SHA256 1e6c366a8bf9a70360cea6a9e5d403c34736ee55a962dad9ba0c40f96ed24ad6 ChangeLog 9983
 MISC metadata.xml 755 RMD160 6d5a2821fe21dec8e0ee7b4ca1f4b664430cc799 SHA1 fcfe8df62909268540923da86a2af452126d5359 SHA256 9e0fc30b42f3ed3e82f53abbaede5a2bca9ea2db5f6115cf0a3b0d3cf57cf605
 MD5 220b53e6cd3c1cc6d9f735e4d06d4d4f metadata.xml 755
 RMD160 6d5a2821fe21dec8e0ee7b4ca1f4b664430cc799 metadata.xml 755
 SHA256 9e0fc30b42f3ed3e82f53abbaede5a2bca9ea2db5f6115cf0a3b0d3cf57cf605 metadata.xml 755
-MD5 581aef64e40ae5b7a0eecbda29306226 files/digest-itext-1.4.8 250
-RMD160 a65feb676756314d01cab2a81fb5161c065208ea files/digest-itext-1.4.8 250
-SHA256 3130669fad66b2d606b1086605e65ee66ad52fd83187378400f79c02e6e3a172 files/digest-itext-1.4.8 250
-MD5 d06bf106ba690deb2bb7b963eb7baf32 files/digest-itext-2.0.4 714
-RMD160 63f1c8e8e1c4acf12c3cf0f72192239486f4c616 files/digest-itext-2.0.4 714
-SHA256 729b96c9ba4a7815f7ce35feff872bfb7107900a53925f2df3c7b5d2c0e0df7d files/digest-itext-2.0.4 714
 MD5 1571e06ce85ac1c605935f30a7c9f9bc files/digest-itext-2.0.5 714
 RMD160 9259929f13942ee911ccda75ebdfd4a3b6d65242 files/digest-itext-2.0.5 714
 SHA256 235122026b26739ffc8e27c0748d561fad7f2c09bbc4d9ad4a514ec95c59fe41 files/digest-itext-2.0.5 714
 MD5 b6fee48b712dd9d5dba14ab688be9713 files/digest-itext-2.0.6 714
 RMD160 74c84d006b66d14f07f3776c4bd098789d18e6f3 files/digest-itext-2.0.6 714
 SHA256 71e6a7165c6eb0870046ef5bd20ca4a0f2a2ccc4dfa1215ff1084664ce4de8ab files/digest-itext-2.0.6 714
+MD5 97a24daa058ab991b403637bb5f3790e files/digest-itext-2.0.7 714
+RMD160 ea35408ae6c2142b69541e42ab23a919ed70ab8e files/digest-itext-2.0.7 714
+SHA256 8fd1e44e5deff479e70f8f1f67190956fd5875f5cee9a3ff618ca408cd94090e files/digest-itext-2.0.7 714
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"