xpdf -> poppler depend, bug 121708

Package-Manager: portage-2.1_pre7-r2

4 files changed, 104 insertions, 10 deletions

diff --git a/kde-base/kpdf/ChangeLog b/kde-base/kpdf/ChangeLog
index a10eddb91dbf..f4f28e7fcd72 100644
--- a/kde-base/kpdf/ChangeLog
+++ b/kde-base/kpdf/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kpdf
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kpdf/ChangeLog,v 1.90 2006/03/31 19:56:02 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kpdf/ChangeLog,v 1.91 2006/04/04 12:20:05 genstef Exp $
+
+  04 Apr 2006; Stefan Schweizer <genstef@gentoo.org> kpdf-3.4.3-r3.ebuild,
+  kpdf-3.4.3-r4.ebuild:
+  xpdf -> poppler depend, bug 121708
 
   31 Mar 2006; Carsten Lohrke <carlo@gentoo.org> kpdf-3.5.2.ebuild:
   Use deprange-dual() instead deprange(), bug #128226.
diff --git a/kde-base/kpdf/Manifest b/kde-base/kpdf/Manifest
index 70140dccc2e9..e64c446a8deb 100644
--- a/kde-base/kpdf/Manifest
+++ b/kde-base/kpdf/Manifest
@@ -1,46 +1,138 @@
-MD5 8cca468601416a00232a153ca623c2f1 ChangeLog 12195
+MD5 8744a27eb3b2ba7a909aa0d2fd3601b8 ChangeLog 12334
+RMD160 2342b0b34e74e50c7c8ecf6a5266c0ccc66341d6 ChangeLog 12334
+SHA256 7daef51c011510e17c9126654f2a6feccf124968cbdf6a7cc985e95bec67cfec ChangeLog 12334
 MD5 1334abaee53983ad0a0810adeafef453 files/digest-kpdf-3.4.1 221
+RMD160 ce80baa4c1806e9aacce02a4860a401e0ed7408f files/digest-kpdf-3.4.1 221
+SHA256 a5c43c1dc911a886d673620d40b300bcc9d5847fd0c55deaa7fa4fbc3b435c71 files/digest-kpdf-3.4.1 221
 MD5 1334abaee53983ad0a0810adeafef453 files/digest-kpdf-3.4.1-r1 221
+RMD160 ce80baa4c1806e9aacce02a4860a401e0ed7408f files/digest-kpdf-3.4.1-r1 221
+SHA256 a5c43c1dc911a886d673620d40b300bcc9d5847fd0c55deaa7fa4fbc3b435c71 files/digest-kpdf-3.4.1-r1 221
 MD5 912bf2607fc0c67f023f6084731eba21 files/digest-kpdf-3.4.1-r3 221
+RMD160 5b8f0e22ce5f36d62553064ca6fc0bcc49c4ba13 files/digest-kpdf-3.4.1-r3 221
+SHA256 fd244b06ada8b2d523cb89d79d6e20b0f3106c5f5c06ec8ed9705e29e973498e files/digest-kpdf-3.4.1-r3 221
 MD5 cb94e5a98246b8c80e29c3d668e4be9d files/digest-kpdf-3.4.2 300
+RMD160 fb98c79539826f284ce816ad665d2d59517f0eda files/digest-kpdf-3.4.2 300
+SHA256 5650b82e45604f03199e3747fc1916c11be6561cc2bca4a212d344280ef18ad3 files/digest-kpdf-3.4.2 300
 MD5 cb94e5a98246b8c80e29c3d668e4be9d files/digest-kpdf-3.4.2-r1 300
+RMD160 fb98c79539826f284ce816ad665d2d59517f0eda files/digest-kpdf-3.4.2-r1 300
+SHA256 5650b82e45604f03199e3747fc1916c11be6561cc2bca4a212d344280ef18ad3 files/digest-kpdf-3.4.2-r1 300
 MD5 cb94e5a98246b8c80e29c3d668e4be9d files/digest-kpdf-3.4.2-r2 300
+RMD160 fb98c79539826f284ce816ad665d2d59517f0eda files/digest-kpdf-3.4.2-r2 300
+SHA256 5650b82e45604f03199e3747fc1916c11be6561cc2bca4a212d344280ef18ad3 files/digest-kpdf-3.4.2-r2 300
 MD5 ad9f9a5920cdd067ae76d39d768fce5f files/digest-kpdf-3.4.3 71
+RMD160 ffd5641d032574a27bee5145d077046b4b16b929 files/digest-kpdf-3.4.3 71
+SHA256 855a1a4a8a0ad7e737acc281482598e137f230dfb23b434b6d773a00a165a2ad files/digest-kpdf-3.4.3 71
 MD5 ad9f9a5920cdd067ae76d39d768fce5f files/digest-kpdf-3.4.3-r2 71
+RMD160 ffd5641d032574a27bee5145d077046b4b16b929 files/digest-kpdf-3.4.3-r2 71
+SHA256 855a1a4a8a0ad7e737acc281482598e137f230dfb23b434b6d773a00a165a2ad files/digest-kpdf-3.4.3-r2 71
 MD5 ad9f9a5920cdd067ae76d39d768fce5f files/digest-kpdf-3.4.3-r3 71
+RMD160 ffd5641d032574a27bee5145d077046b4b16b929 files/digest-kpdf-3.4.3-r3 71
+SHA256 855a1a4a8a0ad7e737acc281482598e137f230dfb23b434b6d773a00a165a2ad files/digest-kpdf-3.4.3-r3 71
 MD5 0b480b54a66891d4c4586b2f85a929d6 files/digest-kpdf-3.4.3-r4 259
+RMD160 ccf17dd77898c2cfe182670e78545399ef8d2775 files/digest-kpdf-3.4.3-r4 259
+SHA256 f18bf29f96dfe957dd43e07c873d7a93cf045b87745ae307cc755a570a6ef291 files/digest-kpdf-3.4.3-r4 259
 MD5 0459ac16349d79da6246392e2454796b files/digest-kpdf-3.5.0 71
+RMD160 e1fce0a4770ec5c23d4bea00d20f51386a378782 files/digest-kpdf-3.5.0 71
+SHA256 556dde324334f05490e579205a17fcea38c0cc898dacb99bf0cb7cc8e0cc3041 files/digest-kpdf-3.5.0 71
 MD5 0459ac16349d79da6246392e2454796b files/digest-kpdf-3.5.0-r2 71
+RMD160 e1fce0a4770ec5c23d4bea00d20f51386a378782 files/digest-kpdf-3.5.0-r2 71
+SHA256 556dde324334f05490e579205a17fcea38c0cc898dacb99bf0cb7cc8e0cc3041 files/digest-kpdf-3.5.0-r2 71
 MD5 0459ac16349d79da6246392e2454796b files/digest-kpdf-3.5.0-r3 71
+RMD160 e1fce0a4770ec5c23d4bea00d20f51386a378782 files/digest-kpdf-3.5.0-r3 71
+SHA256 556dde324334f05490e579205a17fcea38c0cc898dacb99bf0cb7cc8e0cc3041 files/digest-kpdf-3.5.0-r3 71
 MD5 caced8d9ad43d51ee9d60fa05a53ed52 files/digest-kpdf-3.5.1 71
+RMD160 56996a7e7e46b1511adf94f0de9f5a6c5c8c2b2a files/digest-kpdf-3.5.1 71
+SHA256 a09f9dc50f9ce50cd9793223c6e7bde8efbd3ccb79e11470c484a91746347df3 files/digest-kpdf-3.5.1 71
 MD5 caced8d9ad43d51ee9d60fa05a53ed52 files/digest-kpdf-3.5.1-r1 71
+RMD160 56996a7e7e46b1511adf94f0de9f5a6c5c8c2b2a files/digest-kpdf-3.5.1-r1 71
+SHA256 a09f9dc50f9ce50cd9793223c6e7bde8efbd3ccb79e11470c484a91746347df3 files/digest-kpdf-3.5.1-r1 71
 MD5 e0d0c50cee8e40212fc24a50a13a7f17 files/digest-kpdf-3.5.1-r2 813
+RMD160 1e1ec4123d21ed4bbb6bb91574024da513771269 files/digest-kpdf-3.5.1-r2 813
+SHA256 2bca43de8c2173c91a2b8505ce03bd64df1eea8815b9535d4690bf02d0377e53 files/digest-kpdf-3.5.1-r2 813
 MD5 4cd21cf1dda4d6e4a1d233b8f74d8240 files/digest-kpdf-3.5.2 518
+RMD160 d169f1b95af3ba919f5d5c20d6cd668ca77c8186 files/digest-kpdf-3.5.2 518
+SHA256 ced659c452eeeeb3057e56d16de64c5896102f6d87c8d18d30bfdcee0316e734 files/digest-kpdf-3.5.2 518
 MD5 653bd55a1e87c51731d0b0512051774e files/kdegraphics-3.4.2-kpdf-contentcrash.patch 749
+RMD160 0a28706eebe96636d063ecfc2960dfe01666ec43 files/kdegraphics-3.4.2-kpdf-contentcrash.patch 749
+SHA256 97c82623aca3131364e2d66b02b95a7ca2c5b6eacd17c4d15ea5a9890049b536 files/kdegraphics-3.4.2-kpdf-contentcrash.patch 749
 MD5 4caddebea4d845abb2de6dbbfe1b979a files/kdegraphics-3.4.2-kpdf-fix.patch 1024
+RMD160 b0183d302c385978bd725751601add55be6f234f files/kdegraphics-3.4.2-kpdf-fix.patch 1024
+SHA256 71d22256cfee7db6884087b67f34fa56319c321591980855955bad08b4d4e641 files/kdegraphics-3.4.2-kpdf-fix.patch 1024
 MD5 cba50683fe0c9704ddfcd91fde5129c8 files/kpdf-3.5.0-cropbox-fix.patch 631
+RMD160 8c93e06c047f04c4f746a8cf665f60996aa9c097 files/kpdf-3.5.0-cropbox-fix.patch 631
+SHA256 b4282561b0b6e3f1e9b0ce847e9522522cf154c8e21baabf1d778103cce6db14 files/kpdf-3.5.0-cropbox-fix.patch 631
 MD5 d18efc8eb0bf3e3b54a33cf04cdba3fd files/kpdf-3.5.0-splitter-io.patch 1415
+RMD160 730d7fa0c3a77aead29c7b69655747a91a871027 files/kpdf-3.5.0-splitter-io.patch 1415
+SHA256 61b5ca8b672b25a276eabc872e9941c7ca9416a4fd84cc4eeeac257ca83bd6c2 files/kpdf-3.5.0-splitter-io.patch 1415
 MD5 191a45e1b9346c3bbeb4bfda29f3d48a files/kpdf-3.5.1-saveas.patch 926
+RMD160 b52c0efcfeb3fe1e138eacec2ab3f92dce47ef87 files/kpdf-3.5.1-saveas.patch 926
+SHA256 ccdf0c3046d3f1ad2a6b97055147b3e3931bc17822ec6df7ac5022873e75960f files/kpdf-3.5.1-saveas.patch 926
 MD5 ec3b95efe9139f4259d6de213fe4b87b files/post-3.4.1-kdegraphics-4.diff 1827
+RMD160 5bc2b23779549afda028fa820b3dd67938ba88a0 files/post-3.4.1-kdegraphics-4.diff 1827
+SHA256 d239c548d97cd1aa33d5987470bbb76aca996d284cce1cee8e7fb2d74597bd00 files/post-3.4.1-kdegraphics-4.diff 1827
 MD5 e8dde74416769d4589dcca25072aea3e files/post-3.4.3-kdegraphics-CAN-2005-3193.diff 9685
+RMD160 77e176e272746f9fb99506b3a3dc32e7b17401e3 files/post-3.4.3-kdegraphics-CAN-2005-3193.diff 9685
+SHA256 62da36cf89ea7a9a03a32dc6d96b27e1ee66d24798eb302902ffe6f80e8adfc0 files/post-3.4.3-kdegraphics-CAN-2005-3193.diff 9685
 MD5 ebbce0a49537b694932b3c0efcf18261 files/post-3.4.3-kdegraphics-CVE-2006-0301.diff 1775
+RMD160 8245dc7b6ae38c8f320ced7b12c978bf266ffce5 files/post-3.4.3-kdegraphics-CVE-2006-0301.diff 1775
+SHA256 6c72956c3c2a8d6ee3c1722184428309ec277172ecd422b25169aaa58b109915 files/post-3.4.3-kdegraphics-CVE-2006-0301.diff 1775
 MD5 17ea076e986be5e26a4feea3cd264f7e files/post-3.5.0-kdegraphics-CAN-2005-3193.diff 8611
+RMD160 71460faa87ab74fd3688d16559340702faccfc30 files/post-3.5.0-kdegraphics-CAN-2005-3193.diff 8611
+SHA256 739fa28e62431d26eb06f99c5cc316062c8f1a20956c56f7c6de9439e92fb378 files/post-3.5.0-kdegraphics-CAN-2005-3193.diff 8611
 MD5 bc7dc2a5235f95a41fc1d7ab885899da files/post-3.5.1-kdegraphics-CVE-2006-0301.diff 1684
+RMD160 8f3cae16be3b68fb6b120aa133d41608579d4f38 files/post-3.5.1-kdegraphics-CVE-2006-0301.diff 1684
+SHA256 55879b0a865d520bc8bcffd4052dd9e677308050f6562c05ce31847aa00591a3 files/post-3.5.1-kdegraphics-CVE-2006-0301.diff 1684
 MD5 493fdf9a2dc94e56301161f38122b422 kpdf-3.4.1-r1.ebuild 627
+RMD160 29257e15e89a793c348bb697ec28a711c39131dd kpdf-3.4.1-r1.ebuild 627
+SHA256 c4770b9401ff0edc60d0d1538af5ab959a220478e92989875389ab9e6d2a8783 kpdf-3.4.1-r1.ebuild 627
 MD5 8d30155d231e3dec857b28b81b157f36 kpdf-3.4.1-r3.ebuild 684
+RMD160 e63d369113cf68caa1e796aa654f405c84e699ed kpdf-3.4.1-r3.ebuild 684
+SHA256 7d58cd1161b6182a939ef3b27960e47cb19e22940c73a91060e2f664032bd0bb kpdf-3.4.1-r3.ebuild 684
 MD5 710200655b097652c4ea66ea6e5931db kpdf-3.4.1.ebuild 569
+RMD160 3516be2e5360b2544387873e2cf2ba86eaa74504 kpdf-3.4.1.ebuild 569
+SHA256 a63267fa921ad4597a091773e02af5e40585ecb49f1ec15e747c5913529be054 kpdf-3.4.1.ebuild 569
 MD5 da8c7b95896e393c3af5901801f76253 kpdf-3.4.2-r1.ebuild 698
+RMD160 efa342f688ae89df5a5698fd42e2efed7c90a63c kpdf-3.4.2-r1.ebuild 698
+SHA256 26236067a33bd5f147bcb21383b1a158aed68711de96a429e10bcd21bd8d28b8 kpdf-3.4.2-r1.ebuild 698
 MD5 26ec262357d5acdd4fbe2e83d488e692 kpdf-3.4.2-r2.ebuild 816
+RMD160 1b99d067159d9055d77acafe47a6d50cadd6ff12 kpdf-3.4.2-r2.ebuild 816
+SHA256 3216598c23d233e4987b224d1199ca3b7de428c97e288ec339e38b6375b91434 kpdf-3.4.2-r2.ebuild 816
 MD5 9d42c07d0672b69a347a437c76b5e024 kpdf-3.4.2.ebuild 578
+RMD160 1ee479e05921d310fdf16a41b0486891b35c65e0 kpdf-3.4.2.ebuild 578
+SHA256 1e489ddc9fb93bfcd8db9a5a2f9bb74ffbbc2cf1b5be8cc868a97ec73ef53bc4 kpdf-3.4.2.ebuild 578
 MD5 fb75128e908283c51dbc40125468bb21 kpdf-3.4.3-r2.ebuild 645
-MD5 e8ae49a7983a5ae9280c354de61d226f kpdf-3.4.3-r3.ebuild 1078
-MD5 0e36cceea958060bea059363f1885d19 kpdf-3.4.3-r4.ebuild 1141
+RMD160 6d0d9487eefb8482d5a7da96b2dbbed7dfe8203d kpdf-3.4.3-r2.ebuild 645
+SHA256 67ab865c50ecee0f5f129e76936ce61cb30b15653913bee068f0dbff17570166 kpdf-3.4.3-r2.ebuild 645
+MD5 fac28164a1b4e5710ac963e352d0c4e6 kpdf-3.4.3-r3.ebuild 1025
+RMD160 d2c6bd236d2be756472f7640a84a685d6b1e0ed1 kpdf-3.4.3-r3.ebuild 1025
+SHA256 d5e0f29e8c00e540315f9dec541b0469fb4efd359e7261c8de3a49040bfcf2e8 kpdf-3.4.3-r3.ebuild 1025
+MD5 50bd31a25846bcb28baf4374783b9a34 kpdf-3.4.3-r4.ebuild 1084
+RMD160 b7d76abc1ab45c6163480cebeed5c87abb0d569c kpdf-3.4.3-r4.ebuild 1084
+SHA256 a323d1df6e44138c1bee5315e16e90f4c93af91350079fd339cadf5eebff472e kpdf-3.4.3-r4.ebuild 1084
 MD5 71273e2bb8b2c3a5e1407a5a32a4b68a kpdf-3.4.3.ebuild 576
+RMD160 4d29eba9e1fd45eeaa90d9aefe8dccf40ac04f22 kpdf-3.4.3.ebuild 576
+SHA256 96246cafaee8509e6c6b0019b1e4cd75bcdd254c7570a3119b0b06e7fe0e00f1 kpdf-3.4.3.ebuild 576
 MD5 b2257fe84d7b73e540845f894d92caf2 kpdf-3.5.0-r2.ebuild 960
+RMD160 94c1f17213b50dee72bb094579817dea8e294c9f kpdf-3.5.0-r2.ebuild 960
+SHA256 a39b799366cda5c2719a41c00587a143fd5fc64222376c9a9f7d4dd07b4d98ea kpdf-3.5.0-r2.ebuild 960
 MD5 b789176772906a81b90da88f852f18a1 kpdf-3.5.0-r3.ebuild 1109
+RMD160 402db33b3df2ebf9297112ef7ec92b253f2fcfaa kpdf-3.5.0-r3.ebuild 1109
+SHA256 12bf8a7ea5b325fc3469ffe6f8681fe8b075c5a7f4492106b5ef5b1d530e4949 kpdf-3.5.0-r3.ebuild 1109
 MD5 6c817c925ff8f1e8e57bf9adb2c01005 kpdf-3.5.0.ebuild 849
+RMD160 f77422c07618cfd51ee566dce1ead8530484136d kpdf-3.5.0.ebuild 849
+SHA256 8a975e7df159ab6f30b01e58b8283c73454fdf7b0e8c4099407442f619baf6a2 kpdf-3.5.0.ebuild 849
 MD5 292c91b7f2f06e6875f6690adde62b17 kpdf-3.5.1-r1.ebuild 1056
+RMD160 6ac4c83d88753d9875c94814e36b79504ec8ff1e kpdf-3.5.1-r1.ebuild 1056
+SHA256 10f54160deb70b6dce3e55c129aec0b53b6a626cb908d41da00689400e27dbdf kpdf-3.5.1-r1.ebuild 1056
 MD5 668506d4eb27c8387152c2f7f2e1fe84 kpdf-3.5.1-r2.ebuild 1389
+RMD160 6b8eadea188456513475c96811815ec769a2582e kpdf-3.5.1-r2.ebuild 1389
+SHA256 526e84a7938530e1c46e58f321700828f8a6ac00823c054412782357c343c2b5 kpdf-3.5.1-r2.ebuild 1389
 MD5 54031c9bb8d16a59825892c82490f439 kpdf-3.5.1.ebuild 998
+RMD160 a33250074e561f76901203e8fce73d347836a90c kpdf-3.5.1.ebuild 998
+SHA256 cb1c6ea2f8aa62e8c52840fde909783c2bb041de585eddb8152787bd28fd8929 kpdf-3.5.1.ebuild 998
 MD5 c9f1b20a705040008a2504591c852f84 kpdf-3.5.2.ebuild 1158
+RMD160 a77eb9c4afbc48eabfd744d71c5304295373ca0d kpdf-3.5.2.ebuild 1158
+SHA256 dc17ae167b9e92c69c0d717c679d8ab008bd6bedacae789e3ee6a76049c04862 kpdf-3.5.2.ebuild 1158
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
+SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a metadata.xml 156
diff --git a/kde-base/kpdf/kpdf-3.4.3-r3.ebuild b/kde-base/kpdf/kpdf-3.4.3-r3.ebuild
index 27d734f5b7c9..11441ecf6a76 100644
--- a/kde-base/kpdf/kpdf-3.4.3-r3.ebuild
+++ b/kde-base/kpdf/kpdf-3.4.3-r3.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/kde-base/kpdf/kpdf-3.4.3-r3.ebuild,v 1.9 2006/02/01 11:56:08 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kpdf/kpdf-3.4.3-r3.ebuild,v 1.10 2006/04/04 12:20:05 genstef Exp $
 
 KMNAME=kdegraphics
 MAXKDEVER=$PV
@@ -15,8 +15,7 @@ KMEXTRA="kfile-plugins/pdf"
 DEPEND=">=media-libs/freetype-2.0.5
 	media-libs/t1lib"
 RDEPEND="${DEPEND}
-	|| ( >=app-text/poppler-bindings-0.4.3-r1
-	     <app-text/xpdf-3.01-r4 )" # kfile-plugins/pdf depends on "pdfinfo"
+	app-text/poppler" # kfile-plugins/pdf depends on "pdfinfo"
 
 PATCHES="${FILESDIR}/post-3.4.3-kdegraphics-CAN-2005-3193.diff"
 
diff --git a/kde-base/kpdf/kpdf-3.4.3-r4.ebuild b/kde-base/kpdf/kpdf-3.4.3-r4.ebuild
index e76d449a4d76..3718e08e0e74 100644
--- a/kde-base/kpdf/kpdf-3.4.3-r4.ebuild
+++ b/kde-base/kpdf/kpdf-3.4.3-r4.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/kde-base/kpdf/kpdf-3.4.3-r4.ebuild,v 1.8 2006/03/24 12:31:25 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kpdf/kpdf-3.4.3-r4.ebuild,v 1.9 2006/04/04 12:20:05 genstef Exp $
 
 KMNAME=kdegraphics
 MAXKDEVER=$PV
@@ -15,8 +15,7 @@ KMEXTRA="kfile-plugins/pdf"
 DEPEND=">=media-libs/freetype-2.0.5
 	media-libs/t1lib"
 RDEPEND="${DEPEND}
-	|| ( >=app-text/poppler-bindings-0.4.3-r1
-	     <app-text/xpdf-3.01-r4 )" # kfile-plugins/pdf depends on "pdfinfo"
+	app-text/poppler" # kfile-plugins/pdf depends on "pdfinfo"
 
 PATCHES="${FILESDIR}/post-3.4.3-kdegraphics-CAN-2005-3193.diff
 	${FILESDIR}/post-3.4.3-kdegraphics-CVE-2006-0301.diff"