Use new poppler patch, and drop the post-3.5.1 one as it's no more relevant as we're using poppler.

(Portage version: 2.1_pre4-r1)

4 files changed, 101 insertions, 10 deletions

diff --git a/kde-base/kpdf/ChangeLog b/kde-base/kpdf/ChangeLog
index e25bf9331453..3b1ebf165eec 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.76 2006/02/04 15:07:49 yoswink Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kpdf/ChangeLog,v 1.77 2006/02/05 12:29:24 flameeyes Exp $
+
+  05 Feb 2006; Diego Pettenò <flameeyes@gentoo.org> kpdf-3.5.1-r2.ebuild:
+  Use new poppler patch, and drop the post-3.5.1 one as it's no more relevant
+  as we're using poppler.
 
   04 Feb 2006; Jose Luis Rivero <yoswink@gentoo.org> kpdf-3.4.3-r4.ebuild:
   Stable on alpha wrt security bug #121375
diff --git a/kde-base/kpdf/Manifest b/kde-base/kpdf/Manifest
index fef62e96cc3f..36ce391f5f59 100644
--- a/kde-base/kpdf/Manifest
+++ b/kde-base/kpdf/Manifest
@@ -1,44 +1,132 @@
 MD5 dbd2ecef154a91d59813acb29ff6de55 ChangeLog 10251
+RMD160 8e83f463f4c87e491e905a0b08aa75e009b32a46 ChangeLog 10251
+SHA256 8aa426c0ef2786ca76c31607dbce9766293d06939ac4a7f7acc2fd15d8d17388 ChangeLog 10251
 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 ad9f9a5920cdd067ae76d39d768fce5f files/digest-kpdf-3.4.3-r4 71
+RMD160 ffd5641d032574a27bee5145d077046b4b16b929 files/digest-kpdf-3.4.3-r4 71
+SHA256 855a1a4a8a0ad7e737acc281482598e137f230dfb23b434b6d773a00a165a2ad files/digest-kpdf-3.4.3-r4 71
 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
-MD5 6060dd5a9d260ea840ae673a3ddacc4d files/digest-kpdf-3.5.1-r2 518
+RMD160 56996a7e7e46b1511adf94f0de9f5a6c5c8c2b2a files/digest-kpdf-3.5.1-r1 71
+SHA256 a09f9dc50f9ce50cd9793223c6e7bde8efbd3ccb79e11470c484a91746347df3 files/digest-kpdf-3.5.1-r1 71
+MD5 d821d1fcc03c6b77d538d64c96c8838b files/digest-kpdf-3.5.1-r2 524
+RMD160 c9a3226eafd3373096b88a359ef7ef926b5a3562 files/digest-kpdf-3.5.1-r2 524
+SHA256 97baa752bbf18c532a93e1f167956b8c9218831559d8bc9faf9223de1446c530 files/digest-kpdf-3.5.1-r2 524
 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
+RMD160 6d0d9487eefb8482d5a7da96b2dbbed7dfe8203d kpdf-3.4.3-r2.ebuild 645
+SHA256 67ab865c50ecee0f5f129e76936ce61cb30b15653913bee068f0dbff17570166 kpdf-3.4.3-r2.ebuild 645
 MD5 e8ae49a7983a5ae9280c354de61d226f kpdf-3.4.3-r3.ebuild 1078
+RMD160 e5d2b3ccb696f1c1c023837d0c4fab28bc9674d0 kpdf-3.4.3-r3.ebuild 1078
+SHA256 45c7030a8d7aff58b04e8819e39134fc60f061d749f1ea4ffdde65da7bfd7ec1 kpdf-3.4.3-r3.ebuild 1078
 MD5 fdf608b3145616b96baefa545d8af6c5 kpdf-3.4.3-r4.ebuild 1138
+RMD160 373edfca78df8de3df18a805e9b0646fcf5a06a9 kpdf-3.4.3-r4.ebuild 1138
+SHA256 ae2ae7f697081f69acf9c2652a41d17f4636e723e2e25f701fc38533663e049e kpdf-3.4.3-r4.ebuild 1138
 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 531c4b155103eed24f2f88d83d3b6461 kpdf-3.5.0-r2.ebuild 953
+RMD160 818252087f292245d9c7f10f22509164ca6236a6 kpdf-3.5.0-r2.ebuild 953
+SHA256 415ef3322cf4cb4f21ca8b9c6c4e1dd2b27cd408579095c2bf5b9bd3b8da177d kpdf-3.5.0-r2.ebuild 953
 MD5 319d936787de54e4423c1a9fdf499c5e kpdf-3.5.0-r3.ebuild 1101
+RMD160 909766a5ea9a6e313685ffdd1f3c823713d1bf04 kpdf-3.5.0-r3.ebuild 1101
+SHA256 96132687027f3047b29b3d0c97969db23cafc6dd3396052a7f322075eff5d3ce kpdf-3.5.0-r3.ebuild 1101
 MD5 83802275c8156d6e4aff171ef643d683 kpdf-3.5.0.ebuild 841
+RMD160 cccaeb45e85c79fcee47b63ab9b51df84f7d5693 kpdf-3.5.0.ebuild 841
+SHA256 83539b5af5227e980cfabddb4d0f748dbf192bf5fa6726ba9054b6972fa62f94 kpdf-3.5.0.ebuild 841
 MD5 d6fe1d2b278b94465006ad9054206a18 kpdf-3.5.1-r1.ebuild 1047
-MD5 a033bbdcf3ae02b41502a6d2639db371 kpdf-3.5.1-r2.ebuild 1173
+RMD160 d6565fd9a838fe5c277895a4789322653f166bc8 kpdf-3.5.1-r1.ebuild 1047
+SHA256 f5d0355e54f06b3826846040d49da1083c0ac2656a4dfef9788c732d9c7ab30e kpdf-3.5.1-r1.ebuild 1047
+MD5 a8d0d04476d4bff433d79fa7d9230aaf kpdf-3.5.1-r2.ebuild 1122
+RMD160 772ad7ad0e2994ed7693735214221cc9b4f7fb31 kpdf-3.5.1-r2.ebuild 1122
+SHA256 74f3ae6640f90c64926fbc206b3233eef363d22812753e8f0b232ce1047d0294 kpdf-3.5.1-r2.ebuild 1122
 MD5 b71520405927b5861fa74ecca94abc04 kpdf-3.5.1.ebuild 993
+RMD160 9e25987ff1d37e5698d3481c2e1d0df7aeac7987 kpdf-3.5.1.ebuild 993
+SHA256 95f38c1f1202e356473e9cddf642462ca7e57ab99bf41e88a5473d6d6f5e28ac kpdf-3.5.1.ebuild 993
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
+SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a metadata.xml 156
diff --git a/kde-base/kpdf/files/digest-kpdf-3.5.1-r2 b/kde-base/kpdf/files/digest-kpdf-3.5.1-r2
index f49c15c4546f..f1974bb28694 100644
--- a/kde-base/kpdf/files/digest-kpdf-3.5.1-r2
+++ b/kde-base/kpdf/files/digest-kpdf-3.5.1-r2
@@ -1,6 +1,6 @@
 MD5 2cd1c5348b7df46cf7f9d91e1dbfebd2 kdegraphics-3.5.1.tar.bz2 7315482
 RMD160 a8b2b94c0378c689c9be808a1f57e93ecef54418 kdegraphics-3.5.1.tar.bz2 7315482
 SHA256 d0f1fed464c1d410b66c115a60245e1c639de828eebde181f26cc8185a0c9ad6 kdegraphics-3.5.1.tar.bz2 7315482
-MD5 cfa9a4abdce59cc3ae1ce578d81663e3 kpdf-3.5.1-poppler.patch.bz2 5831
-RMD160 b085a06aae0c63a571b155cc2add384cdf989822 kpdf-3.5.1-poppler.patch.bz2 5831
-SHA256 9ac96a2bc813f6c985cf65e636406ed68c4c595600deb448561dac14ff79e311 kpdf-3.5.1-poppler.patch.bz2 5831
+MD5 357d6f2afde33c2dcb3e07d7ce74b216 kpdf-3.5.1-poppler-2.patch.bz2 5847
+RMD160 2351c506ccd34dade7cd7fdfdabaa4561fa7226e kpdf-3.5.1-poppler-2.patch.bz2 5847
+SHA256 3daf7caec19b6060eeb454dd668986fda28f1ad2faea9d91cdc89bf8e4e3a58e kpdf-3.5.1-poppler-2.patch.bz2 5847
diff --git a/kde-base/kpdf/kpdf-3.5.1-r2.ebuild b/kde-base/kpdf/kpdf-3.5.1-r2.ebuild
index 86f8cb965c03..7178ea5f810b 100644
--- a/kde-base/kpdf/kpdf-3.5.1-r2.ebuild
+++ b/kde-base/kpdf/kpdf-3.5.1-r2.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.5.1-r2.ebuild,v 1.2 2006/02/03 16:32:15 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kpdf/kpdf-3.5.1-r2.ebuild,v 1.3 2006/02/05 12:29:24 flameeyes Exp $
 
 KMNAME=kdegraphics
 MAXKDEVER=$PV
@@ -18,11 +18,10 @@ DEPEND=">=media-libs/freetype-2.0.5
 	>=app-text/poppler-bindings-0.5.0"
 
 SRC_URI="${SRC_URI}
-	mirror://gentoo/${P}-poppler.patch.bz2"
+	mirror://gentoo/${P}-poppler-2.patch.bz2"
 
 PATCHES="${FILESDIR}/${P}-saveas.patch
-	${FILESDIR}/post-3.5.1-kdegraphics-CVE-2006-0301.diff
-	${DISTDIR}/${P}-poppler.patch.bz2"
+	${DISTDIR}/${P}-poppler-2.patch.bz2"
 
 pkg_setup() {
 	if ! built_with_use app-text/poppler-bindings qt; then