Add patch to compile against latest itext releases. Fixes bug #239586. Thanks to Arttu Valo <arttuv69@gmail.com>.

Package-Manager: portage-2.2_rc14/cvs/Linux 2.6.27-gentoo i686

4 files changed, 155 insertions, 2 deletions

diff --git a/dev-java/flyingsaucer/ChangeLog b/dev-java/flyingsaucer/ChangeLog
index a75bab3c9ab0..66af98732b0d 100644
--- a/dev-java/flyingsaucer/ChangeLog
+++ b/dev-java/flyingsaucer/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/flyingsaucer
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/flyingsaucer/ChangeLog,v 1.2 2008/01/29 08:19:05 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/flyingsaucer/ChangeLog,v 1.3 2008/11/21 12:23:46 betelgeuse Exp $
+
+*flyingsaucer-7-r1 (21 Nov 2008)
+
+  21 Nov 2008; Petteri Räty <betelgeuse@gentoo.org>
+  +files/7-itext-2.0.8.patch, +flyingsaucer-7-r1.ebuild:
+  Add patch to compile against latest itext releases. Fixes bug #239586.
+  Thanks to Arttu Valo <arttuv69@gmail.com>.
 
   29 Jan 2008; Miroslav Šulc <fordfrog@gentoo.org> flyingsaucer-7.ebuild:
   ~amd64 keyword added
diff --git a/dev-java/flyingsaucer/Manifest b/dev-java/flyingsaucer/Manifest
index 25100642aeee..ec23849a64c2 100644
--- a/dev-java/flyingsaucer/Manifest
+++ b/dev-java/flyingsaucer/Manifest
@@ -1,4 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX 7-itext-2.0.8.patch 3109 RMD160 fb55c34482eaed77fe5f1a3d7a61825b3779c690 SHA1 ec2ed09132aa73da7ec549a7615eab1439d321e7 SHA256 424465642ee38f6042457432f94529144cb5106403f670c8eba1c059d1898550
 DIST flyingsaucer-R7final-src.zip 7058444 RMD160 0c8e83d4d220a780ec2d8ad84b590827fbcf9ff2 SHA1 55945177bde5a2230d871aced975c067a3709f7b SHA256 d4539358ae08b5278334ec66beea78a821c9e6fba1db6159317e4c94fb2bf135
+EBUILD flyingsaucer-7-r1.ebuild 1764 RMD160 fbee337ae98e01df933f5fe0dd569ee4001f9460 SHA1 2b459dde55e0186a54cc7e53207d0d2b1d66bd3f SHA256 493f8540bb209bad9e281ada48287245e91fde1fb4f4515a76761cc5b961ee58
 EBUILD flyingsaucer-7.ebuild 1707 RMD160 0004aa1386671328f407d373c0a0219308b797d5 SHA1 2f9a4463797cf8fb68fa6e2b469e5fc284381360 SHA256 94a4fe2d6349e3c6c25e6e54eccfba41678eaf31e5522d3d78109c00067b2881
-MISC ChangeLog 503 RMD160 5f73cbbd41c8fb2f41de9c74efa92036b4d6e41f SHA1 695b669afdc9cb10378c390aa81852ac8737adef SHA256 77d923ecfe05351b7032a819a0919aa91dfefc4c70269b934683f62878f05726
+MISC ChangeLog 768 RMD160 ade1e4ca834a677b5658dc29707c59035c13d12f SHA1 376ed5c25342028635ad28269c5a9591e11c0057 SHA256 9d0671af7a49e2389db8b71f078e54484b635cc2a0f1c9611bb674594df5ef93
 MISC metadata.xml 358 RMD160 50ba955fa6d7095189d8869cb38a77341be28e2c SHA1 a62263957ef4a508de617bc1ab12f935058fdcd1 SHA256 f11840254a0f20cf6079b12acf98ecb829fcdf6a19e99e7cfda6a54f732a1131
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkkmqFwACgkQcxLzpIGCsLS4RACcCYY0+wvxlaC2CDwW6sTiYHU+
+SqwAn1TOBLpGSplM5iR/f4eDLuUdRx1Y
+=MbqC
+-----END PGP SIGNATURE-----
diff --git a/dev-java/flyingsaucer/files/7-itext-2.0.8.patch b/dev-java/flyingsaucer/files/7-itext-2.0.8.patch
new file mode 100644
index 000000000000..33b4ea37b994
--- /dev/null
+++ b/dev-java/flyingsaucer/files/7-itext-2.0.8.patch
@@ -0,0 +1,61 @@
+diff -u -r src.old/java/org/xhtmlrenderer/pdf/ITextFSImage.java src/java/org/xhtmlrenderer/pdf/ITextFSImage.java
+--- src.old/java/org/xhtmlrenderer/pdf/ITextFSImage.java	2008-10-23 19:46:53.000000000 +0300
++++ src/java/org/xhtmlrenderer/pdf/ITextFSImage.java	2008-10-23 19:48:05.000000000 +0300
+@@ -31,11 +31,11 @@
+     }
+ 
+     public int getWidth() {
+-        return (int)_image.plainWidth();
++        return (int)_image.getPlainWidth();
+     }
+ 
+     public int getHeight() {
+-        return (int)_image.plainHeight();
++        return (int)_image.getPlainHeight();
+     }
+ 
+     public void scale(int width, int height) {
+diff -u -r src.old/java/org/xhtmlrenderer/pdf/ITextRenderer.java src/java/org/xhtmlrenderer/pdf/ITextRenderer.java
+--- src.old/java/org/xhtmlrenderer/pdf/ITextRenderer.java	2008-10-23 19:46:53.000000000 +0300
++++ src/java/org/xhtmlrenderer/pdf/ITextRenderer.java	2008-10-23 19:48:56.000000000 +0300
+@@ -234,7 +234,7 @@
+         
+         _outputDevice.start(_doc);
+         _outputDevice.setWriter(writer);
+-        _outputDevice.initializePage(writer.getDirectContent(), firstPageSize.height());
++        _outputDevice.initializePage(writer.getDirectContent(), firstPageSize.getHeight());
+         
+         _root.getLayer().assignPagePaintingPositions(c, Layer.PAGED_MODE_PRINT);
+         
+@@ -254,7 +254,7 @@
+                 doc.setPageSize(nextPageSize);
+                 doc.newPage();
+                 _outputDevice.initializePage(
+-                        writer.getDirectContent(), nextPageSize.height());
++                        writer.getDirectContent(), nextPageSize.getHeight());
+             }
+         }
+         
+diff -u -r src.old/java/org/xhtmlrenderer/pdf/ITextUserAgent.java src/java/org/xhtmlrenderer/pdf/ITextUserAgent.java
+--- src.old/java/org/xhtmlrenderer/pdf/ITextUserAgent.java	2008-10-23 19:46:53.000000000 +0300
++++ src/java/org/xhtmlrenderer/pdf/ITextUserAgent.java	2008-10-23 19:50:00.000000000 +0300
+@@ -60,8 +60,8 @@
+                         PdfReader reader = _outputDevice.getReader(url);
+                         PDFAsImage image = new PDFAsImage(url);
+                         Rectangle rect = reader.getPageSizeWithRotation(1);
+-                        image.setInitialWidth(rect.width()*_outputDevice.getDotsPerPoint());
+-                        image.setInitialHeight(rect.height()*_outputDevice.getDotsPerPoint());
++                        image.setInitialWidth(rect.getWidth()*_outputDevice.getDotsPerPoint());
++                        image.setInitialHeight(rect.getHeight()*_outputDevice.getDotsPerPoint());
+                         resource = new ImageResource(image);
+                     } else {
+ 	                    Image image = Image.getInstance(url);
+@@ -84,7 +84,7 @@
+     
+     private void scaleToOutputResolution(Image image) {
+         float factor = _sharedContext.getDotsPerPixel();
+-        image.scaleAbsolute(image.plainWidth() * factor, image.plainHeight() * factor);
++        image.scaleAbsolute(image.getPlainWidth() * factor, image.getPlainHeight() * factor);
+     }
+ 
+     public SharedContext getSharedContext() {
diff --git a/dev-java/flyingsaucer/flyingsaucer-7-r1.ebuild b/dev-java/flyingsaucer/flyingsaucer-7-r1.ebuild
new file mode 100644
index 000000000000..f91a961896f8
--- /dev/null
+++ b/dev-java/flyingsaucer/flyingsaucer-7-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/flyingsaucer/flyingsaucer-7-r1.ebuild,v 1.1 2008/11/21 12:23:46 betelgeuse Exp $
+
+EAPI=1
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="100% Java XHTML+CSS renderer"
+HOMEPAGE="https://xhtmlrenderer.dev.java.net/"
+SRC_URI="http://www.pdoubleya.com/projects/${PN}/downloads/r${PV}/${PN}-R${PV}final-src.zip"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="minimal svg"
+
+COMMON_DEP="
+	>=dev-java/itext-2.0.8:0
+	svg? ( dev-java/svgsalamander:0 )"
+
+# 1.5 because svgsalamander is 1.5
+RDEPEND="
+	svg? ( >=virtual/jre-1.5 )
+	!svg? ( >=virtual/jre-1.4 )
+	${COMMON_DEP}"
+DEPEND="
+	svg? ( >=virtual/jdk-1.5 )
+	!svg? ( >=virtual/jdk-1.4 )
+	app-arch/unzip
+	${COMMON_DEP}"
+
+S=${WORKDIR}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/7-itext-2.0.8.patch"
+
+	# Save lib/minium.jar because it's not publicly available although it's in
+	# public domain, will separate if something else needs it
+	rm -v lib/itext*.jar lib/dev/*.jar lib/dev/*/*.jar || die
+	cd lib
+	java-pkg_jar-from itext
+	if use svg; then
+		java-pkg_jar-from svgsalamander
+		EANT_BUILD_TARGET+=" jar.svg"
+	fi
+
+	use minimal || EANT_BUILD_TARGET=" jar.docbook jar.about jar.browser"
+
+}
+
+# Investigate building demos/photogallery demos/filebrowser
+# seems the files are missing for jar.photogaller jar.filebrowser
+EANT_BUILD_TARGET="jar.core"
+EANT_DOC_TARGET="docs"
+
+RESTRICT="test"
+
+# Needs X11
+src_test() {
+	eant test -Djava.awt.headless=true
+}
+
+src_install() {
+	dodoc README || die
+	java-pkg_dojar build/*.jar lib/minium.jar
+	use doc && java-pkg_dojavadoc doc/user/api
+	use source && java-pkg_dosrc src/java/org
+}