Fix qt4 build and only install libpoppler-cairo.la with USE=cairo

Package-Manager: portage-2.1_rc1-r2

4 files changed, 256 insertions, 29 deletions

diff --git a/app-text/poppler-bindings/ChangeLog b/app-text/poppler-bindings/ChangeLog
index 1c7f2dfb7621..ec313587ce09 100644
--- a/app-text/poppler-bindings/ChangeLog
+++ b/app-text/poppler-bindings/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/poppler-bindings
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/poppler-bindings/ChangeLog,v 1.28 2006/05/23 00:12:25 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler-bindings/ChangeLog,v 1.29 2006/05/23 13:25:35 genstef Exp $
+
+  23 May 2006; Stefan Schweizer <genstef@gentoo.org>
+  +files/poppler-0.5.2-qt4-annotation-helper.patch,
+  poppler-bindings-0.5.2.ebuild:
+  Fix qt4 build and only install libpoppler-cairo.la with USE=cairo
 
 *poppler-bindings-0.5.2 (23 May 2006)
 
diff --git a/app-text/poppler-bindings/Manifest b/app-text/poppler-bindings/Manifest
index 42bdbd3b9c32..74e0387cf42a 100644
--- a/app-text/poppler-bindings/Manifest
+++ b/app-text/poppler-bindings/Manifest
@@ -1,55 +1,59 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX poppler-0.5.0-bindings.patch 2928 RMD160 e3bede718e8a4161aa931e46ceb35498d5fe8e2a SHA1 d7a1f4358e539a11d743c9355f25e8fdc771b94b SHA256 3e06b35deb4a1b2fa4b25c9c0dbfd99005ed62b8dc842d5f219a998f42e88795
+AUX poppler-0.5.0-bindings.patch 2928 RMD160 e3bede718e8a4161aa931e46ceb35498d5fe8e2a SHA1 d7a1f4358e539a11d743c9355f25e8fdc771b94b SHA256 3e06b35deb4a1b2fa4b25c9c0dbfd99005ed62b8dc842d5f219a998f42e88795 size 2928
 MD5 293623f77988fe5a042ce6fa81099ae5 files/poppler-0.5.0-bindings.patch 2928
 RMD160 e3bede718e8a4161aa931e46ceb35498d5fe8e2a files/poppler-0.5.0-bindings.patch 2928
 SHA256 3e06b35deb4a1b2fa4b25c9c0dbfd99005ed62b8dc842d5f219a998f42e88795 files/poppler-0.5.0-bindings.patch 2928
-AUX poppler-0.5.1-arthur.patch 1420 RMD160 24628ffec2d19f251c9901ce4fd102a6260febd3 SHA1 cadd6f58a15ca63d71ac94cd25a5d084363c0eb2 SHA256 f25d0dda38ec392923c6de2835635b9a5dc9599cad5aad35e0e7fea2704cbd98
+AUX poppler-0.5.1-arthur.patch 1420 RMD160 24628ffec2d19f251c9901ce4fd102a6260febd3 SHA1 cadd6f58a15ca63d71ac94cd25a5d084363c0eb2 SHA256 f25d0dda38ec392923c6de2835635b9a5dc9599cad5aad35e0e7fea2704cbd98 size 1420
 MD5 96d36c0ffd0b851de5501a7a6f754ba6 files/poppler-0.5.1-arthur.patch 1420
 RMD160 24628ffec2d19f251c9901ce4fd102a6260febd3 files/poppler-0.5.1-arthur.patch 1420
 SHA256 f25d0dda38ec392923c6de2835635b9a5dc9599cad5aad35e0e7fea2704cbd98 files/poppler-0.5.1-arthur.patch 1420
-AUX poppler-0.5.1-bindings.patch 3014 RMD160 deab225ad3c9a0f719784f38e6f734e2825ec875 SHA1 3847cf4111ceb493ebdd49f7f5c07ede0f282715 SHA256 18a89c526341019d44ca0054b0b6f54a8c903b05d0bec69a94d2a72a2897d68f
+AUX poppler-0.5.1-bindings.patch 3014 RMD160 deab225ad3c9a0f719784f38e6f734e2825ec875 SHA1 3847cf4111ceb493ebdd49f7f5c07ede0f282715 SHA256 18a89c526341019d44ca0054b0b6f54a8c903b05d0bec69a94d2a72a2897d68f size 3014
 MD5 446d870c27304d4bdef6fca86e9bb624 files/poppler-0.5.1-bindings.patch 3014
 RMD160 deab225ad3c9a0f719784f38e6f734e2825ec875 files/poppler-0.5.1-bindings.patch 3014
 SHA256 18a89c526341019d44ca0054b0b6f54a8c903b05d0bec69a94d2a72a2897d68f files/poppler-0.5.1-bindings.patch 3014
-AUX poppler-0.5.1-qt-pthread.patch 1247 RMD160 f5c2b8b25ba217f8f6596140a89446cd6a37c52f SHA1 c493a7bc9e9b94f159e133670c0f1328e34d52d7 SHA256 99296e73696786df70809700d7019c5b0135ad2ec806e16658b77335b183daa7
+AUX poppler-0.5.1-qt-pthread.patch 1247 RMD160 f5c2b8b25ba217f8f6596140a89446cd6a37c52f SHA1 c493a7bc9e9b94f159e133670c0f1328e34d52d7 SHA256 99296e73696786df70809700d7019c5b0135ad2ec806e16658b77335b183daa7 size 1247
 MD5 e83dc2fe447e9b661c680dc176ce1c01 files/poppler-0.5.1-qt-pthread.patch 1247
 RMD160 f5c2b8b25ba217f8f6596140a89446cd6a37c52f files/poppler-0.5.1-qt-pthread.patch 1247
 SHA256 99296e73696786df70809700d7019c5b0135ad2ec806e16658b77335b183daa7 files/poppler-0.5.1-qt-pthread.patch 1247
-AUX poppler-0.5.1-r1-bindings.patch 2982 RMD160 07ee852dd5988822886be6bebf1431f9e69b66e2 SHA1 9d6ce016f3ed7a43545608d42092806bd1dfad67 SHA256 32dfeb415c242b67f67c4934b7d725f18296d56af90a84f4a3d6b3862298c175
+AUX poppler-0.5.1-r1-bindings.patch 2982 RMD160 07ee852dd5988822886be6bebf1431f9e69b66e2 SHA1 9d6ce016f3ed7a43545608d42092806bd1dfad67 SHA256 32dfeb415c242b67f67c4934b7d725f18296d56af90a84f4a3d6b3862298c175 size 2982
 MD5 dd9bbe42d7cb066d25d0bc67a019581f files/poppler-0.5.1-r1-bindings.patch 2982
 RMD160 07ee852dd5988822886be6bebf1431f9e69b66e2 files/poppler-0.5.1-r1-bindings.patch 2982
 SHA256 32dfeb415c242b67f67c4934b7d725f18296d56af90a84f4a3d6b3862298c175 files/poppler-0.5.1-r1-bindings.patch 2982
-AUX poppler-0.5.2-bindings.patch 2981 RMD160 3cd602de04e21b16ad2d72e43ac497f2096e9407 SHA1 5fada87381a777eed18bf2db8c2f74c66769f2db SHA256 fddf8730871743ca6bb3cf210f9444b7b5de4704d68b383ddc982ef9e2ff9ffc
+AUX poppler-0.5.2-bindings.patch 2981 RMD160 3cd602de04e21b16ad2d72e43ac497f2096e9407 SHA1 5fada87381a777eed18bf2db8c2f74c66769f2db SHA256 fddf8730871743ca6bb3cf210f9444b7b5de4704d68b383ddc982ef9e2ff9ffc size 2981
 MD5 fd7f0254cdc14aa17e517b17c4500d15 files/poppler-0.5.2-bindings.patch 2981
 RMD160 3cd602de04e21b16ad2d72e43ac497f2096e9407 files/poppler-0.5.2-bindings.patch 2981
 SHA256 fddf8730871743ca6bb3cf210f9444b7b5de4704d68b383ddc982ef9e2ff9ffc files/poppler-0.5.2-bindings.patch 2981
-DIST poppler-0.5.0.tar.gz 935312 RMD160 a5bad2dd16a7b99b931c15757ff33591f2c4307a SHA256 554fad3767c23c96ad886fe0220073133016d64f416273c26aea43ea80d4563b
-DIST poppler-0.5.1-cvs20060401.patch.bz2 41297 RMD160 35659844e017eeacf16da6172377b8e144201b61 SHA256 56e1c52451a14c2d6eba7f55eece60102e2ee5dd2fb24aeb18e584d0109cf027
-DIST poppler-0.5.1.tar.gz 954930 RMD160 ffd39323da0e0c487a6e7de48d8a607385189ddd SHA256 2ee3f06d64dd703a2411428169fe21c17f6358950bb797d52ca8eebd1dcf1abe
-DIST poppler-0.5.2.tar.gz 1046998 RMD160 132730e1d5371a684f1a9a221a647a21c2d73617 SHA256 b3f2b753b6070e42f391c74a0edd06bb6cb0a3d33e5dc1a08ff204777508ee99
-EBUILD poppler-bindings-0.5.0.ebuild 1921 RMD160 0f99c11a5501a30a7a0bf98ac36bbb6ade1b8ae6 SHA1 2d48335286fa286965e51d01417ac7391701f885 SHA256 2c6bba081a07c6b7fac777a9767f6dec22d59b8b04ddc8e027b4800c5813081e
+AUX poppler-0.5.2-qt4-annotation-helper.patch 7243 RMD160 56ed9e125d63af0fdf1ae8331226ca10473ade60 SHA1 e456437b22ac8bf69fe0708925ff5f47cc31b9b6 SHA256 6e724b2758f53ca6dbf20f72c18fb100da7c44db77557662bc30f5ecad584a6f size 7243
+MD5 04097dff631fe96ee0d6ec4c6e2cbf87 files/poppler-0.5.2-qt4-annotation-helper.patch 7243
+RMD160 56ed9e125d63af0fdf1ae8331226ca10473ade60 files/poppler-0.5.2-qt4-annotation-helper.patch 7243
+SHA256 6e724b2758f53ca6dbf20f72c18fb100da7c44db77557662bc30f5ecad584a6f files/poppler-0.5.2-qt4-annotation-helper.patch 7243
+DIST poppler-0.5.0.tar.gz 935312 RMD160 a5bad2dd16a7b99b931c15757ff33591f2c4307a SHA256 554fad3767c23c96ad886fe0220073133016d64f416273c26aea43ea80d4563b size 935312
+DIST poppler-0.5.1-cvs20060401.patch.bz2 41297 RMD160 35659844e017eeacf16da6172377b8e144201b61 SHA256 56e1c52451a14c2d6eba7f55eece60102e2ee5dd2fb24aeb18e584d0109cf027 size 41297
+DIST poppler-0.5.1.tar.gz 954930 RMD160 ffd39323da0e0c487a6e7de48d8a607385189ddd SHA256 2ee3f06d64dd703a2411428169fe21c17f6358950bb797d52ca8eebd1dcf1abe size 954930
+DIST poppler-0.5.2.tar.gz 1046998 RMD160 132730e1d5371a684f1a9a221a647a21c2d73617 SHA256 b3f2b753b6070e42f391c74a0edd06bb6cb0a3d33e5dc1a08ff204777508ee99 size 1046998
+EBUILD poppler-bindings-0.5.0.ebuild 1921 RMD160 0f99c11a5501a30a7a0bf98ac36bbb6ade1b8ae6 SHA1 2d48335286fa286965e51d01417ac7391701f885 SHA256 2c6bba081a07c6b7fac777a9767f6dec22d59b8b04ddc8e027b4800c5813081e size 1921
 MD5 5fdd43aee2bb2adf5709f25dd97a5af7 poppler-bindings-0.5.0.ebuild 1921
 RMD160 0f99c11a5501a30a7a0bf98ac36bbb6ade1b8ae6 poppler-bindings-0.5.0.ebuild 1921
 SHA256 2c6bba081a07c6b7fac777a9767f6dec22d59b8b04ddc8e027b4800c5813081e poppler-bindings-0.5.0.ebuild 1921
-EBUILD poppler-bindings-0.5.1-r1.ebuild 1952 RMD160 aa305c0afa46b55a95b3d4bf44c5689c8f1388cd SHA1 bd0facd5d47a1eca3118c42b6c0272388b6f865a SHA256 153c2e8dca534a9de4c81f850f9268b9a70bd5a4f7ee02a11e3edea06c299d19
+EBUILD poppler-bindings-0.5.1-r1.ebuild 1952 RMD160 aa305c0afa46b55a95b3d4bf44c5689c8f1388cd SHA1 bd0facd5d47a1eca3118c42b6c0272388b6f865a SHA256 153c2e8dca534a9de4c81f850f9268b9a70bd5a4f7ee02a11e3edea06c299d19 size 1952
 MD5 efe621903215cb8914ae2c4943a984cf poppler-bindings-0.5.1-r1.ebuild 1952
 RMD160 aa305c0afa46b55a95b3d4bf44c5689c8f1388cd poppler-bindings-0.5.1-r1.ebuild 1952
 SHA256 153c2e8dca534a9de4c81f850f9268b9a70bd5a4f7ee02a11e3edea06c299d19 poppler-bindings-0.5.1-r1.ebuild 1952
-EBUILD poppler-bindings-0.5.1.ebuild 1627 RMD160 80f2cf2dd888c6da4b99e806c18c0f46435b2cec SHA1 0c0080b2d5a5e3d44e7b84e84707614500577961 SHA256 59ffecc50fc855006d0d0ff6b0629b5f5a2734dd9b259d7378b040cd6eca526d
+EBUILD poppler-bindings-0.5.1.ebuild 1627 RMD160 80f2cf2dd888c6da4b99e806c18c0f46435b2cec SHA1 0c0080b2d5a5e3d44e7b84e84707614500577961 SHA256 59ffecc50fc855006d0d0ff6b0629b5f5a2734dd9b259d7378b040cd6eca526d size 1627
 MD5 16258bb5c47b7b5f264cb949bce2c18c poppler-bindings-0.5.1.ebuild 1627
 RMD160 80f2cf2dd888c6da4b99e806c18c0f46435b2cec poppler-bindings-0.5.1.ebuild 1627
 SHA256 59ffecc50fc855006d0d0ff6b0629b5f5a2734dd9b259d7378b040cd6eca526d poppler-bindings-0.5.1.ebuild 1627
-EBUILD poppler-bindings-0.5.2.ebuild 1735 RMD160 f326ea7e6ae5852556bf459e635820b18e5ca09d SHA1 756d22b16203d801f3ba32c5f9dc24fc8bf50e7e SHA256 e7177878b8295d325c3f7f3b7e005ba2d66a0a7957f07eae1294cea9532eb18f
-MD5 f69c18a95509fcc2dd7080fe82454595 poppler-bindings-0.5.2.ebuild 1735
-RMD160 f326ea7e6ae5852556bf459e635820b18e5ca09d poppler-bindings-0.5.2.ebuild 1735
-SHA256 e7177878b8295d325c3f7f3b7e005ba2d66a0a7957f07eae1294cea9532eb18f poppler-bindings-0.5.2.ebuild 1735
-MISC ChangeLog 4507 RMD160 c869d41737ea02a7b100466c64b89aa437411bd6 SHA1 fdef9a94e3dcd497539588d983c85aefcd703cab SHA256 1374a7ba92fc5244b8d0c3742a8cbf6498f9ec5d1f7305549ab3ef4eb61c7013
-MD5 451005773631c07039515701ed52a3a8 ChangeLog 4507
-RMD160 c869d41737ea02a7b100466c64b89aa437411bd6 ChangeLog 4507
-SHA256 1374a7ba92fc5244b8d0c3742a8cbf6498f9ec5d1f7305549ab3ef4eb61c7013 ChangeLog 4507
-MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76
+EBUILD poppler-bindings-0.5.2.ebuild 1807 RMD160 fac86442bbd04babfd2a01e258a4dd278705bf98 SHA1 043508bca06cdf771fc5191e4adc0c7aff7189b9 SHA256 7968b6a16d22a75a5b8d4a1c49869fe8998fe0ae21689816b693c92e520fe237 size 1807
+MD5 250f44c9898f9d2873a4e9e7f874dc0b poppler-bindings-0.5.2.ebuild 1807
+RMD160 fac86442bbd04babfd2a01e258a4dd278705bf98 poppler-bindings-0.5.2.ebuild 1807
+SHA256 7968b6a16d22a75a5b8d4a1c49869fe8998fe0ae21689816b693c92e520fe237 poppler-bindings-0.5.2.ebuild 1807
+MISC ChangeLog 4717 RMD160 2cfa1325855c73e4f731cfa268b8b61edf9c8583 SHA1 738fc9121a2169fb27537cdd05763ffc5ffcac19 SHA256 724dfebb6dc8ce522e176e28a6d53b2ca1c5b6e205c9c10a84892a55d8ef661b size 4717
+MD5 0bdc98811b3d321e68cb7dd5e188c202 ChangeLog 4717
+RMD160 2cfa1325855c73e4f731cfa268b8b61edf9c8583 ChangeLog 4717
+SHA256 724dfebb6dc8ce522e176e28a6d53b2ca1c5b6e205c9c10a84892a55d8ef661b ChangeLog 4717
+MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76 size 161
 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 metadata.xml 161
 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76 metadata.xml 161
@@ -66,9 +70,9 @@ MD5 6aae685863ec86edd7f860278449115d files/digest-poppler-bindings-0.5.2 244
 RMD160 890fbf88211bc637259d07fe180489d41c7cfc30 files/digest-poppler-bindings-0.5.2 244
 SHA256 d3f1104a858823571288102ce8299d3ade759fbdcf50b5cfae7fc4f573c86dee files/digest-poppler-bindings-0.5.2 244
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3-ecc0.1.6 (GNU/Linux)
+Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEclNromPajV0RnrERArxoAJ9vEvGgnDgptGpa3H/R80c1/SpMsgCfXpZJ
-n3Cu0JVJeWWWZfNZWUcZcz4=
-=MwJp
+iD8DBQFEcw1RNJowsmZ/PzARAuj1AJ9cKa1avnPe7e4Jekw2xR2SerFpJgCgov9I
+nTzj1aP9rZ/kPa5ihvUUn4k=
+=PjeO
 -----END PGP SIGNATURE-----
diff --git a/app-text/poppler-bindings/files/poppler-0.5.2-qt4-annotation-helper.patch b/app-text/poppler-bindings/files/poppler-0.5.2-qt4-annotation-helper.patch
new file mode 100644
index 000000000000..21823f1aad72
--- /dev/null
+++ b/app-text/poppler-bindings/files/poppler-0.5.2-qt4-annotation-helper.patch
@@ -0,0 +1,217 @@
+diff -Nur poppler-0.5.2/qt4/src.orig/poppler-annotation-helper.h poppler-0.5.2/qt4/src/poppler-annotation-helper.h
+--- poppler-0.5.2/qt4/src.orig/poppler-annotation-helper.h	1970-01-01 01:00:00.000000000 +0100
++++ poppler-0.5.2/qt4/src/poppler-annotation-helper.h	2006-05-23 14:56:20.000000000 +0200
+@@ -0,0 +1,213 @@
++/* poppler-annotation-helper.h: qt interface to poppler
++ * Copyright (C) 2006, Albert Astals Cid <aacid@kde.org>
++ * Adapting code from
++ *   Copyright (C) 2004 by Enrico Ros <eros.kde@email.it>
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2, or (at your option)
++ * any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ */
++
++#include <QtCore/QDebug>
++
++namespace Poppler {
++
++class XPDFReader
++{
++    public:
++        // find named symbol and parse it
++        static void lookupName( Dict *, const char *, QString & dest );
++        static void lookupString( Dict *, const char *, QString & dest );
++        static void lookupBool( Dict *, const char *, bool & dest );
++        static void lookupInt( Dict *, const char *, int & dest );
++        static void lookupNum( Dict *, const char *, double & dest );
++        static int lookupNumArray( Dict *, const char *, double * dest, int len );
++        static void lookupColor( Dict *, const char *, QColor & color );
++        static void lookupIntRef( Dict *, const char *, int & dest );
++        static void lookupDate( Dict *, const char *, QDateTime & dest );
++        // transform from user coords to normalized ones using the matrix M
++        static inline void transform( double * M, double x, double y, QPointF &res );
++};
++
++void XPDFReader::lookupName( Dict * dict, const char * type, QString & dest )
++{
++    Object nameObj;
++    dict->lookup( type, &nameObj );
++    if ( nameObj.isNull() )
++        return;
++    if ( nameObj.isName() )
++        dest = nameObj.getName();
++    else
++        qDebug() << type << " is not Name." << endl;
++    nameObj.free();
++}
++
++void XPDFReader::lookupString( Dict * dict, const char * type, QString & dest )
++{
++    Object stringObj;
++    dict->lookup( type, &stringObj );
++    if ( stringObj.isNull() )
++        return;
++    if ( stringObj.isString() )
++        dest = stringObj.getString()->getCString();
++    else
++        qDebug() << type << " is not String." << endl;
++    stringObj.free();
++}
++
++void XPDFReader::lookupBool( Dict * dict, const char * type, bool & dest )
++{
++    Object boolObj;
++    dict->lookup( type, &boolObj );
++    if ( boolObj.isNull() )
++        return;
++    if ( boolObj.isBool() )
++        dest = boolObj.getBool() == gTrue;
++    else
++        qDebug() << type << " is not Bool." << endl;
++    boolObj.free();
++}
++
++void XPDFReader::lookupInt( Dict * dict, const char * type, int & dest )
++{
++    Object intObj;
++    dict->lookup( type, &intObj );
++    if ( intObj.isNull() )
++        return;
++    if ( intObj.isInt() )
++        dest = intObj.getInt();
++    else
++        qDebug() << type << " is not Int." << endl;
++    intObj.free();
++}
++
++void XPDFReader::lookupNum( Dict * dict, const char * type, double & dest )
++{
++    Object numObj;
++    dict->lookup( type, &numObj );
++    if ( numObj.isNull() )
++        return;
++    if ( numObj.isNum() )
++        dest = numObj.getNum();
++    else
++        qDebug() << type << " is not Num." << endl;
++    numObj.free();
++}
++
++int XPDFReader::lookupNumArray( Dict * dict, const char * type, double * dest, int len )
++{
++    Object arrObj;
++    dict->lookup( type, &arrObj );
++    if ( arrObj.isNull() )
++        return 0;
++    Object numObj;
++    if ( arrObj.isArray() )
++    {
++        len = qMin( len, arrObj.arrayGetLength() );
++        for ( int i = 0; i < len; i++ )
++        {
++            dest[i] = arrObj.arrayGet( i, &numObj )->getNum();
++            numObj.free();
++        }
++    }
++    else
++    {
++        len = 0;
++        qDebug() << type << "is not Array." << endl;
++    }
++    arrObj.free();
++    return len;
++}
++
++void XPDFReader::lookupColor( Dict * dict, const char * type, QColor & dest )
++{
++    double c[3];
++    if ( XPDFReader::lookupNumArray( dict, type, c, 3 ) == 3 )
++        dest = QColor( (int)(c[0]*255.0), (int)(c[1]*255.0), (int)(c[2]*255.0));
++}
++
++void XPDFReader::lookupIntRef( Dict * dict, const char * type, int & dest )
++{
++    Object refObj;
++    dict->lookupNF( type, &refObj );
++    if ( refObj.isNull() )
++        return;
++    if ( refObj.isRef() )
++        dest = refObj.getRefNum();
++    else
++        qDebug() << type << " is not Ref." << endl;
++    refObj.free();
++}
++
++void XPDFReader::lookupDate( Dict * dict, const char * type, QDateTime & dest )
++{
++    Object dateObj;
++    dict->lookup( type, &dateObj );
++    if ( dateObj.isNull() )
++        return;
++    if ( dateObj.isString() )
++    {
++        const char * s = dateObj.getString()->getCString();
++        if ( s[0] == 'D' && s[1] == ':' )
++            s += 2;
++        int year, mon, day, hour, min, sec;
++        if ( sscanf( s, "%4d%2d%2d%2d%2d%2d", &year, &mon, &day, &hour, &min, &sec ) == 6 )
++        {
++            QDate d( year, mon, day );
++            QTime t( hour, min, sec );
++            if ( d.isValid() && t.isValid() )
++                dest = QDateTime(d, t);
++        }
++        else
++            qDebug() << "Wrong Date format '" << s << "' for '" << type << "'." << endl;
++    }
++    else
++        qDebug() << type << " is not Date" << endl;
++    dateObj.free();
++}
++
++void XPDFReader::transform( double * M, double x, double y, QPointF &res )
++{
++    res.setX( M[0] * x + M[2] * y + M[4] );
++    res.setY( M[1] * x + M[3] * y + M[5] );
++}
++
++/** @short Helper classes for CROSSDEPS resolving and DS conversion. */
++struct ResolveRevision
++{
++    int           prevAnnotationID; // ID of the annotation to be reparended
++    int           nextAnnotationID; // (only needed for speeding up resolving)
++    Annotation *  nextAnnotation;   // annotation that will act as parent
++    Annotation::RevScope nextScope; // scope of revision (Reply)
++    Annotation::RevType  nextType;  // type of revision (None)
++};
++
++struct ResolveWindow
++{
++    int           popupWindowID;    // ID of the (maybe shared) window
++    Annotation *  annotation;       // annotation having the popup window
++};
++
++struct PostProcessText              // this handles a special pdf case conversion
++{
++    Annotation *  textAnnotation;   // a popup text annotation (not FreeText)
++    bool          opened;           // pdf property to convert to window flags
++};
++
++struct PopupWindow
++{
++    Annotation *  dummyAnnotation;  // window properties (in pdf as Annotation)
++    bool          shown;            // converted to Annotation::Hidden flag
++};
++
++}
diff --git a/app-text/poppler-bindings/poppler-bindings-0.5.2.ebuild b/app-text/poppler-bindings/poppler-bindings-0.5.2.ebuild
index 241909fbea67..ecd23038ae53 100644
--- a/app-text/poppler-bindings/poppler-bindings-0.5.2.ebuild
+++ b/app-text/poppler-bindings/poppler-bindings-0.5.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/poppler-bindings/poppler-bindings-0.5.2.ebuild,v 1.1 2006/05/23 00:12:25 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler-bindings/poppler-bindings-0.5.2.ebuild,v 1.2 2006/05/23 13:25:35 genstef Exp $
 
 inherit autotools eutils multilib
 
@@ -31,6 +31,7 @@ S="${WORKDIR}/${MY_P}"
 
 src_unpack(){
 	unpack ${A}
+	epatch ${FILESDIR}/${MY_P}-qt4-annotation-helper.patch
 	cd ${S}
 
 	epatch ${FILESDIR}/${MY_P}-bindings.patch
@@ -61,7 +62,7 @@ src_compile() {
 }
 
 src_install() {
-	dolib.a poppler/libpoppler-cairo.la
+	use cairo && dolib.a poppler/libpoppler-cairo.la
 	make DESTDIR=${D} install || die "make install failed"
 }