Remove external links from javadoc call so it doesn't work online, closes bug #171900...

Package-Manager: portage-2.1.2.3

diff --git a/dev-java/itext/ChangeLog b/dev-java/itext/ChangeLog
index 097a0371a5d8d8004a302c7ded61de98973c0bc0..22f1710a4e7e2e5d7f76a0be8f24c6b8cc761d85 100644 (file)
--- a/dev-java/itext/ChangeLog
+++ b/dev-java/itext/ChangeLog
@@ -1,6 +1,11 @@
 # 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.39 2007/03/27 15:13:05 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/itext/ChangeLog,v 1.40 2007/04/03 10:26:39 caster Exp $
+
+  03 Apr 2007; Vlastimil Babka <caster@gentoo.org>
+  +files/2.0.1-site_xml.patch, itext-2.0.1.ebuild:
+  Remove external links from javadoc call so it doesn't work online, closes
+  bug #171900. Add missing bcprov dep. Don't call dojar on deps' jars.
 
   27 Mar 2007; William L. Thomson Jr. <wltjr@gentoo.org>
   +files/2.0.1-compile_xml.patch, -files/compile_xml.patch,

diff --git a/dev-java/itext/Manifest b/dev-java/itext/Manifest
index 68d14227eb0f565ce0c5ff1f33b8e6c007148a89..ee1098cdce25737c6e9287e4d3332db97d7ce148 100644 (file)
--- a/dev-java/itext/Manifest
+++ b/dev-java/itext/Manifest
@@ -2,20 +2,24 @@ AUX 2.0.1-compile_xml.patch 1528 RMD160 2981018d521814e3c866a70438be09b45bb75c90
 MD5 372e907da45af9a4e09b2c5af62c2f66 files/2.0.1-compile_xml.patch 1528
 RMD160 2981018d521814e3c866a70438be09b45bb75c90 files/2.0.1-compile_xml.patch 1528
 SHA256 770756a625ffe507cd9fc17bb8210dbc9efc97a67f7976fe46f9a72f8bbf95cb files/2.0.1-compile_xml.patch 1528
+AUX 2.0.1-site_xml.patch 605 RMD160 85b03eecf4ba0786c697f9e41803db2f7bab5ab3 SHA1 61d2ca24185dbf3231ad1d95b786e24cb54e626a SHA256 7eae0aee289c82b9823a9f98ae69db878f1813c93e98feba177bf411f48258b2
+MD5 a768d72871266f58d42ce070829a3a54 files/2.0.1-site_xml.patch 605
+RMD160 85b03eecf4ba0786c697f9e41803db2f7bab5ab3 files/2.0.1-site_xml.patch 605
+SHA256 7eae0aee289c82b9823a9f98ae69db878f1813c93e98feba177bf411f48258b2 files/2.0.1-site_xml.patch 605
 DIST itext-src-1.4.8.tar.gz 1165951 RMD160 ecd9b80d7323319382fa16b8895332df25ecd6e2 SHA1 0ec375106add3bd622624991786d18eb8a9b4c2e SHA256 b283ac094389516e9914b31622e08842dd9220a026dcc4ce9138084b685e77a2
 DIST itext-src-2.0.1.tar.gz 1137551 RMD160 5d0c9c6af927295913bcb254806c33b5b14db946 SHA1 db971d9979a6f714a26320912cfa0abaa83f2ff2 SHA256 2df9eb0bb170a39e3116474aa1e76d6505b398bb41a3958b894e35889e2167f4
 EBUILD itext-1.4.8.ebuild 928 RMD160 0d25c72a105297ae9d072acdcca253ec4f405cf2 SHA1 2046691d9b118c4fc1a4a77ca1e64f973b071037 SHA256 dfaaf7582f83a015f2099cb1bab5475318772c1fd1164ee8b5ba425de677abeb
 MD5 cf6f281b2cf47a9c7dc877ce95234de3 itext-1.4.8.ebuild 928
 RMD160 0d25c72a105297ae9d072acdcca253ec4f405cf2 itext-1.4.8.ebuild 928
 SHA256 dfaaf7582f83a015f2099cb1bab5475318772c1fd1164ee8b5ba425de677abeb itext-1.4.8.ebuild 928
-EBUILD itext-2.0.1.ebuild 1153 RMD160 4a40a3c53f3bb33ab9c720282ba0e136bdd6d409 SHA1 3939cb75529edf501961011fc4d0ad81a7727bd7 SHA256 3a4caf401b401b52908be46df6014ee2f9fb0840169c1df114fc197de642ccb8
-MD5 1b02c66f7f7f3b11bc40d729a30615b6 itext-2.0.1.ebuild 1153
-RMD160 4a40a3c53f3bb33ab9c720282ba0e136bdd6d409 itext-2.0.1.ebuild 1153
-SHA256 3a4caf401b401b52908be46df6014ee2f9fb0840169c1df114fc197de642ccb8 itext-2.0.1.ebuild 1153
-MISC ChangeLog 6887 RMD160 c5dc32f776943853ee938dc0ead04a1f46c8bb6b SHA1 77789d2cba03e446f6b722886f00db7911da1ebe SHA256 0635a3c43746f495afce2001742f7ff3f9aad29e06ff63d91906ee1dc32978f9
-MD5 65d907296821b9f71067b9b8754a75d4 ChangeLog 6887
-RMD160 c5dc32f776943853ee938dc0ead04a1f46c8bb6b ChangeLog 6887
-SHA256 0635a3c43746f495afce2001742f7ff3f9aad29e06ff63d91906ee1dc32978f9 ChangeLog 6887
+EBUILD itext-2.0.1.ebuild 1298 RMD160 3533359451065f744b752522f215867cb091d134 SHA1 b66bd02af07143070189ce6f9f17f93d526484bb SHA256 5c4b9653278f41167893ffb66ee93b528789f03775f8eb1c19a27153c40cbdf1
+MD5 831201c0fd2341627c4408f13d1c2bf5 itext-2.0.1.ebuild 1298
+RMD160 3533359451065f744b752522f215867cb091d134 itext-2.0.1.ebuild 1298
+SHA256 5c4b9653278f41167893ffb66ee93b528789f03775f8eb1c19a27153c40cbdf1 itext-2.0.1.ebuild 1298
+MISC ChangeLog 7138 RMD160 4fd731f11958995ab2e82a99bde51db78f74e204 SHA1 49685ce42b6365ada79fcdd3a66d667d9b07fd19 SHA256 db6313840b7e31768e8082004df79b69f282e7d4c375d9f93a1e987f904714a2
+MD5 31f0bc2d7e10b439ef69e98e895bd84b ChangeLog 7138
+RMD160 4fd731f11958995ab2e82a99bde51db78f74e204 ChangeLog 7138
+SHA256 db6313840b7e31768e8082004df79b69f282e7d4c375d9f93a1e987f904714a2 ChangeLog 7138
 MISC metadata.xml 755 RMD160 6d5a2821fe21dec8e0ee7b4ca1f4b664430cc799 SHA1 fcfe8df62909268540923da86a2af452126d5359 SHA256 9e0fc30b42f3ed3e82f53abbaede5a2bca9ea2db5f6115cf0a3b0d3cf57cf605
 MD5 220b53e6cd3c1cc6d9f735e4d06d4d4f metadata.xml 755
 RMD160 6d5a2821fe21dec8e0ee7b4ca1f4b664430cc799 metadata.xml 755

diff --git a/dev-java/itext/files/2.0.1-site_xml.patch b/dev-java/itext/files/2.0.1-site_xml.patch
new file mode 100644 (file)
index 0000000..4a749e3
--- /dev/null
+++ b/dev-java/itext/files/2.0.1-site_xml.patch
@@ -0,0 +1,11 @@
+--- src/ant/site.xml   2007-03-06 16:15:50.000000000 +0100
++++ src/ant/site.xml   2007-04-03 12:07:50.000000000 +0200
+@@ -126,8 +126,6 @@
+                               <include name="com/lowagie/**" />\r
+                   </packageset>\r
+               <classpath refid="itext.classpath"/>\r
+-            <link href="http://java.sun.com/j2se/1.3/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-2.0.1.ebuild b/dev-java/itext/itext-2.0.1.ebuild
index be0d4688b7c5581a47ac864e9cb64dc0caef02ae..11b920f58d3830ab88e049237349c49479a1c28e 100644 (file)
--- a/dev-java/itext/itext-2.0.1.ebuild
+++ b/dev-java/itext/itext-2.0.1.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.1.ebuild,v 1.2 2007/03/27 15:13:05 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/itext/itext-2.0.1.ebuild,v 1.3 2007/04/03 10:26:39 caster Exp $
 
 JAVA_PKG_IUSE="doc source"
 
@@ -14,7 +14,8 @@ LICENSE="MPL-1.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-COMMON_DEPEND=">=dev-java/bcmail-1.35"
+COMMON_DEPEND=">=dev-java/bcmail-1.36
+       >=dev-java/bcprov-1.36"
 DEPEND=">=virtual/jdk-1.4
        ${COMMON_DEPEND}"
 RDEPEND=">=virtual/jre-1.4
@@ -27,6 +28,8 @@ src_unpack() {
        unpack ${A}
 
        epatch ${FILESDIR}/${PV}-compile_xml.patch
+       epatch ${FILESDIR}/${PV}-site_xml.patch
+       java-ant_bsfix_files ant/*.xml || die "failed to rewrite build xml files"
 
        mkdir -p "${WORKDIR}/build/bin" || die
        cd "${WORKDIR}/build/bin" || die
@@ -37,7 +40,7 @@ src_unpack() {
 EANT_BUILD_XML="src/build.xml"
 
 src_install() {
-       java-pkg_dojar build/bin/*.jar
+       java-pkg_dojar build/bin/iText.jar
 
        use source && java-pkg_dosrc src/com
        use doc && java-pkg_dojavadoc build/docs