Version bump of dev-java/itext (bug #475552). Dropped old, broken :5 version. Removed...

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x77C501ED

diff --git a/dev-java/itext/ChangeLog b/dev-java/itext/ChangeLog
index 8ebe9e82bb81f847c1cb972b62de7a8afd9a7c6b..aa21d081476376612250fc59de37010cd3b97ce8 100644 (file)
--- a/dev-java/itext/ChangeLog
+++ b/dev-java/itext/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/itext
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/itext/ChangeLog,v 1.102 2014/08/10 20:15:26 slyfox Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/itext/ChangeLog,v 1.103 2015/01/11 16:11:57 ercpe Exp $
+
+*itext-5.5.4 (11 Jan 2015)
+
+  11 Jan 2015; Johann Schmitz <ercpe@gentoo.org> +itext-5.5.4.ebuild,
+  -files/2.0.8-site_xml.patch, -itext-5.2.0.ebuild:
+  Version bump of dev-java/itext (bug #475552). Dropped old, broken :5 version.
+  Removed unused patch file.
 
   10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org> itext-2.1.5-r2.ebuild,
   itext-5.2.0.ebuild:

diff --git a/dev-java/itext/Manifest b/dev-java/itext/Manifest
index 5815e1c7097282949204cde3434d74b508db5b03..20d01eed35d6c0396b54d97ecfa3ca10bc0dc703 100644 (file)
--- a/dev-java/itext/Manifest
+++ b/dev-java/itext/Manifest
@@ -1,19 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX 2.0.8-site_xml.patch 726 SHA256 b6738416f0587706908d4eb30626e49766428922ecc3995d825b0c42515a7fe2 SHA512 da50239e9afabb25685380e6af59cdd613734416cb46416ff00a6acf54ee1746dd36a25d7dfff7dfff905ffdff35a06c89164b05fb5ba3947f1558d427459bad WHIRLPOOL 829a6d605230205364c39847b4c9829e77dab4381399d5009db137120a4fb4ddbfdfdea475de3f7f560b080c52499076f117b02a2cfd96803e0cbef2a14dfe30
 DIST iText-src-2.1.5.tar.gz 1301652 SHA256 213599606c9b77c064486c3f5335ede99718eb4bc8c00c29a21758ddb67653e4 SHA512 ca6bc9807379923b25e45cf06976c7ddea7ebce5bd418204ca4a6f668cb55fb06ddda2b55d34e78aebd2ae307fc8040bcd702369b5c9da849286dab7f8d474ea WHIRLPOOL ce3067c7c747b2e8f07f63a0e0693bea1025b8cbad09d66912bf2c039e0f4aa9a2a284bcdf7590f604c4afe14ab21815a880b3c3f9ad13cd5584f537da3af4af
 DIST iTextAsian.jar 329741 SHA256 19c8c57b430958ee93d7a7aab61448e1627b9acd2b0735aa0ca33d78404587bc SHA512 fad669829efb9b6d3e5de8b8b6b175058e4aedaf310c1f6991487f3ebea15f2979e401b7969e6388bfc8ba456382d452986505abfc431fca714f471faa70933e WHIRLPOOL b861a2e78e71e2df07e45a2be44ccf21328f4b16b6d4cf17535b205b2592ff5135ba54133e1360547ced983356a60b1fd25e6264ec06d63bf8048439dffa6e48
 DIST iTextAsianCmaps.jar 1696864 SHA256 f7fdbd3c93f7b552d935d8300b6644685beb57e056f1934ed001b50d0b60de6f SHA512 bc5d9b06f405488075d2027fadee72127fdd81f1f362ec1f59ebbd70da61ea62a8a9f1122eec4a3f030fdc72f0f440bed049ca4c3f91206321ca5cfec79a4a85 WHIRLPOOL f68c9bf551f924d1ee531d730b147fa1dcf26ac8effa2c4caacad8b7c8b1b9ac82ac0ce78a3b3a9acf5abfd1cc71c087a2d0506a5e0a75426985b2002b9c71fe
-DIST itext-5.2.0.zip 7051627 SHA256 43c59c6c473d570d73a297d6c6c7b3eb82028eb8713cb8e3458116a97b54b9da SHA512 395c4f0d45ef693067d83f7c9d39540b46006dd4ea8f958d32f579147f664bdb848b4f36f94e920bfb1b29c6d4e7f489cf0b9111acbf85daa48fbc8a8a38c938 WHIRLPOOL 2f7b0a5f108f1038f63da1cb202904324606576e97b9c57a69181222f8cebad380c174cdcd7fe6c74554ec523fbd1ff2b58639b8635c1b48ff186e0ff9044399
+DIST itext-5.5.4.zip 9765296 SHA256 d4ddf4e5825f2c240641aaf3d7340cc7e6e2318576dc2f523b9da170df005c4f SHA512 bfcbc1de97a94451ac5b486bd02a764ed60d28455aeeecab4e93c6004accd015e61cce2019dc4979e46ef220547e7dfdbbc5d3aaad182f88280cc0053b4681d2 WHIRLPOOL bf7e88c16393df90e0de0ebf17d19088e2120db78bd219fefee251457b2c6dba72a084a10ac547cfc73cd1c074b312193de7c02241681c152a7746ba83d62d64
 EBUILD itext-2.1.5-r2.ebuild 2007 SHA256 142e969489ce59e16e9e288bfb82d2abfdcc84ca8a03013671c1918ded2dd224 SHA512 2bf5c7f88ad68327127f4896c88feedcddc17ac9c3b881e340013f987e2cbe6847df500707052258ad49cd771c41e90fd608c4178a169d03f94a7019657e9a0f WHIRLPOOL 820cd5da2a557d68dc4e0478ddeca14663d2de5d4fd830b92a2dec501c27b9c91b9fa80806ab1c85338bb3ae30280e2d59951e299afec28e0dd593083396e73c
-EBUILD itext-5.2.0.ebuild 1287 SHA256 45d559f3bfdce3b6f1cf2e0092a594bef7a11d4aeadd91eb2ce44daa3a7ee018 SHA512 0debf72ececa4369856927297f8c17541337697f6f76f301b9e5f4676917859c0cafb2b596fc2571ece9a4baa38e32035c65bafbee0fb4d145182e8e9b933830 WHIRLPOOL 76ad78bfd304782ccbde82ba8c237fc4d8b0411ec028d986051fe7b62567dcf58b1bcd2c0c1435fa9fb821624c14cb35d060c588efc96a33440bbee56fa08302
-MISC ChangeLog 15645 SHA256 06eae5d5f606bcabd2c83773bb2e4a6750ea1ccb2fc564093380344189998d2f SHA512 b3e7fc15e8ba46dee5eecc6afc8547345895fe547a7e5e057c7dfd361bb9a9928a998bca060a67588446c6d65c180ae7e7b2caf7cbb1158fb90125b576379545 WHIRLPOOL 01e524e18da2f453963f58b3595d84b4f357ea623ec378806d9d021ee534e549ae64b634aa3bed6c79285b4d4bf744c4c9a428d120d5fd45df89b90f245f5c24
+EBUILD itext-5.5.4.ebuild 915 SHA256 3136599ee7ea549f5ef21f230276d14bf378a8e8251bbefbd2333369b50ea04e SHA512 93f431d60e3681d615f7abac6fc058865928cc1a48f414eb4da4699f3466521e7bf75f0d92f1775e2fdfe56b176446bec989fc127312a9dc1001ea1eabf7a933 WHIRLPOOL 2d79e0f08a5341b4ac3be04644050f3b98e2be8bbc7bbe4252dbe483dae1d2458e8661b897258f3d0196210aeb78eaa280cfb071417409dee2afa2a41e71f1fc
+MISC ChangeLog 15904 SHA256 3a74bbadefbf3901b8c4beea1c10f8ef6950e872648c3876fb987938c61fe554 SHA512 ce2aa499889c1af907a8699b2d711ba02fa4aa1508cb8a7f6bbcd7503a7d3c9da3dcca7ae148850446b58961f9d61c537fab5ff040859794ee2b7a2f17083590 WHIRLPOOL e0706dbe43c94219935464f8a6b389164fcb8c3b839471e4b753f90314b8b0115f57d7bad219d47b997b59815c05cfaa848b5bf20bb56e9a314fd6a78199f3d9
 MISC metadata.xml 829 SHA256 287f2988d97cdfcef44dbbbf665da2637890d63f4461f833c206008417e794b6 SHA512 c579dc640b8eadf55d8b968080889404d11b9feedac6d1c7cc7b495c164d3eda39c8ca8e9c10671384bbd71dc84a1ebd165d99cd7607aeace76c27459c45eefa WHIRLPOOL 507b07a99261e51370f23764a9fa53c3b5698f3a7f49f072f8fed3b4705a81477b505b1c0ee9ecc3e1bf9423510c20ae6b666ae7be664038d3167ce9ebb53f6e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlPn0t8ACgkQcaHudmEf86rhfACeMaEHVJSjS/6NgmQBlJkm00z2
-ya8AnjqVEJ1uVkXGXd3Jpt4hC9LpVQyq
-=R0YR
+iQEcBAEBCAAGBQJUsqDSAAoJEKCEBkJ3xQHt/l4H/A20Qe1k0zOn6kS0K+j8yjWZ
+xGhe01Mx1dd5lSIMQRWxgYPQfceq3Z8ETEdWZDJHjs20riXQ4sv2qU1zRVnk3LrL
+PbCZoFo7dVW0H+0ZNQFuv6QeTkDDJAVHY/IG9tFyBB81ku4DgVj44SOYPZAriEug
+DGyntBe/J3nFID9FX15Y+8802DzsEAC8gXAyNsvnGCxUqWiKG4kdtLYhDuqkf/3A
+stroJ1MXipceWxUBSB3DvqOJAn1SHBOB5rjtnOZja47m+J3Thn3YOEj6Vpt6tqub
+QYCz5GdV/QRywgLjue94eWrkZpa0fngz/o5ybtwUkQ/EwRNd6scLgFhMk2FooRU=
+=qgMo
 -----END PGP SIGNATURE-----

diff --git a/dev-java/itext/files/2.0.8-site_xml.patch b/dev-java/itext/files/2.0.8-site_xml.patch
deleted file mode 100644 (file)
index 6ea2af9..0000000
--- a/dev-java/itext/files/2.0.8-site_xml.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur itext-2.0.8_orig/work/src/ant/site.xml itext-2.0.8/work/src/ant/site.xml
---- itext-2.0.8_orig/work/src/ant/site.xml     2008-01-26 13:26:26.000000000 -0500
-+++ itext-2.0.8/work/src/ant/site.xml  2008-01-26 13:26:46.000000000 -0500
-@@ -67,8 +67,6 @@
-                               <include name="com/lowagie/**" />\r
-                   </packageset>\r
-               <classpath refid="itext.classpath"/>\r
--            <link href="http://java.sun.com/j2se/1.4/docs/api/" />\r
--              <link href="http://www.bouncycastle.org/docs/docs1.4/" />\r
-               <header>&lt;a href="http://itext.ugent.be/itext-in-action/" target="_blank"&gt;&lt;img src="http://itext.ugent.be/img/lowagie_3d.jpg" border="0" /&gt;&lt;/a&gt;</header>\r
-         </javadoc>\r
-     </target>\r

diff --git a/dev-java/itext/itext-5.2.0.ebuild b/dev-java/itext/itext-5.2.0.ebuild
deleted file mode 100644 (file)
index e3de1f8..0000000
--- a/dev-java/itext/itext-5.2.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/itext/itext-5.2.0.ebuild,v 1.3 2014/08/10 20:15:26 slyfox Exp $
-
-EAPI="4"
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Java library that generate documents in the Portable Document Format (PDF) and/or HTML"
-HOMEPAGE="http://itextpdf.com"
-SRC_URI="mirror://sourceforge/${PN}/${P}.zip"
-
-LICENSE="AGPL-3"
-SLOT="5"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-COMMON_DEP="
-       dev-java/bcmail:0
-       dev-java/bcprov:0
-       dev-java/bctsp:0"
-RDEPEND="${COMMON_DEP}
-       >=virtual/jre-1.5"
-DEPEND="${COMMON_DEP}
-       >=virtual/jdk-1.5
-       app-arch/unzip"
-
-src_unpack() {
-       default
-       unpack ./${PN}{pdf,-xtra}-${PV}-sources.jar
-}
-
-java_prepare() {
-       # Extract resources from precompiled jar
-       mkdir target/classes -p || die
-       pushd target/classes > /dev/null || die
-               declare -a resources
-               resources=( $(jar -tf "${WORKDIR}"/${PN}pdf-${PV}.jar \
-                       | sed -e '/class$/d' -e '/\/$/d' -e '/META-INF/d') )
-               assert
-               jar -xf "${WORKDIR}"/${PN}pdf-${PV}.jar "${resources[@]}" || die
-       popd > /dev/null
-
-       find "${WORKDIR}" -name '*.jar' -exec rm -v {} + || die
-}
-
-JAVA_GENTOO_CLASSPATH="bcmail,bcprov,bctsp"
-
-src_install() {
-       java-pkg-simple_src_install
-}

diff --git a/dev-java/itext/itext-5.5.4.ebuild b/dev-java/itext/itext-5.5.4.ebuild
new file mode 100644 (file)
index 0000000..8d97b2e
--- /dev/null
+++ b/dev-java/itext/itext-5.5.4.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/itext/itext-5.5.4.ebuild,v 1.1 2015/01/11 16:11:57 ercpe Exp $
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Java library that generate documents in the Portable Document Format (PDF) and/or HTML."
+HOMEPAGE="http://itextpdf.com"
+SRC_URI="mirror://sourceforge/${PN}/${P}.zip"
+
+LICENSE="AGPL-3"
+SLOT="5"
+KEYWORDS="~amd64 ~x86"
+
+COMMON_DEP="
+       dev-java/bcmail:0
+       >=dev-java/bcprov-1.49:0
+       dev-java/bcpkix:0
+       dev-java/xml-security:0
+"
+
+RDEPEND="${COMMON_DEP}
+       >=virtual/jre-1.5"
+
+DEPEND="${COMMON_DEP}
+       >=virtual/jdk-1.5
+       app-arch/unzip"
+
+JAVA_GENTOO_CLASSPATH="bcmail,bcprov,bcpkix,xml-security"
+
+java_prepare() {
+       mkdir source || die
+
+       for x in *-sources.jar; do
+               unzip -n ${x} -d source || die
+       done
+
+       rm -v *.jar || die
+}