Fix nodrm patch, bug 121492

Package-Manager: portage-2.1_pre4-r1

4 files changed, 127 insertions, 5 deletions

diff --git a/app-text/xpdf/ChangeLog b/app-text/xpdf/ChangeLog
index 96296d6e4fc4..05e30c8327a2 100644
--- a/app-text/xpdf/ChangeLog
+++ b/app-text/xpdf/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/xpdf
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xpdf/ChangeLog,v 1.127 2006/02/04 16:17:47 killerfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xpdf/ChangeLog,v 1.128 2006/02/04 19:06:24 genstef Exp $
+
+  04 Feb 2006; Stefan Schweizer <genstef@gentoo.org>
+  +files/xpdf-3.01-poppler-nodrm.patch, xpdf-3.01-r7.ebuild:
+  Fix nodrm patch, bug 121492
 
   04 Feb 2006; Rene Nussbaumer <killerfox@gentoo.org> xpdf-3.01-r7.ebuild:
   Stable on hppa. See bug #120985.
diff --git a/app-text/xpdf/Manifest b/app-text/xpdf/Manifest
index bd25ed4e6820..1553d8d140aa 100644
--- a/app-text/xpdf/Manifest
+++ b/app-text/xpdf/Manifest
@@ -1,31 +1,96 @@
-MD5 564cb111299d1266e4e8135bef944b5a ChangeLog 16079
+MD5 b126dfa31532b7377a8afedda3748db5 ChangeLog 16222
+RMD160 a4a25c95918c17c96aa858191e9fd30847f6238a ChangeLog 16222
+SHA256 9d05c863bb7f62625637085eb6cab510d6630f4c7079b92727af9d4cddcab0d0 ChangeLog 16222
 MD5 ec978d9450f061ea49ee697b39d545bf files/digest-xpdf-3.00-r10 767
+RMD160 0572eee1ae52b062cda92bcd24b43c0855bc8441 files/digest-xpdf-3.00-r10 767
+SHA256 1f01e450400847cbfafac573df0b6e49ab94f94c3400c3b703fb0fd6e413c2b3 files/digest-xpdf-3.00-r10 767
 MD5 fb31167789c80b1a01d773fc5108c356 files/digest-xpdf-3.01-r5 767
+RMD160 ac986fa56f43e58c4319fe406848140d6e8673e4 files/digest-xpdf-3.01-r5 767
+SHA256 117f22b3dfae00f3658f74ecbc016120c7a1a036910f7c6757cc5ee1e273cc03 files/digest-xpdf-3.01-r5 767
 MD5 ddc9f57937bb7077b0b7e5661cf8d1f3 files/digest-xpdf-3.01-r7 253
+RMD160 8770f26914bc17bb1f8dd6e9f74c6e99f315faf6 files/digest-xpdf-3.01-r7 253
+SHA256 ebbaec613cff6d4535e7290505e4f597fdf4d0f26560f2f3889c482fefbe317c files/digest-xpdf-3.01-r7 253
 MD5 24d9ec970f2b8178c64f7150be0d7ace files/xpdf-3.00-64bit.patch 1304
+RMD160 cb79b3df1eb715637d1c27cd9d4b09ae07fb28e3 files/xpdf-3.00-64bit.patch 1304
+SHA256 2a90a1c2ed45cddedf042b90066be792c22ab94b9f4d451ba3904c693a7f0660 files/xpdf-3.00-64bit.patch 1304
 MD5 a80ebb2f6574bbcbe5826028edfe8f28 files/xpdf-3.00-PathScanner.patch 3225
+RMD160 538ec6dea2aa77afc68e1a10275f94ad01b7eabe files/xpdf-3.00-PathScanner.patch 3225
+SHA256 91b72c92c0c80b82e72c043d6252941ed40fbc468b260792ca52b6e134a08aea files/xpdf-3.00-PathScanner.patch 3225
 MD5 8524f477885c0a9e6b397d83da4ab661 files/xpdf-3.00-core.patch 317
+RMD160 5894cc08a6ad6a082e82d56b014da3c09f63b9e9 files/xpdf-3.00-core.patch 317
+SHA256 e85aa847028fb92a344fb1c8009b5f303f952acf7653451f8f59ac5479e77858 files/xpdf-3.00-core.patch 317
 MD5 8221707abac9c48b486b8c2b9bc7a7a0 files/xpdf-3.00-empty-bookmark.patch 373
+RMD160 6eeb9f5ac29ae13483f8673c1b92388fdb7f45d5 files/xpdf-3.00-empty-bookmark.patch 373
+SHA256 2e299c37fb869c4f98f9fe3901092c613a514c779e54d017360f6c424c54503e files/xpdf-3.00-empty-bookmark.patch 373
 MD5 a0e8c344d40384d23af93a7b7a2adba7 files/xpdf-3.00-fonts.patch 399
+RMD160 aebe14ba23dc474e9435787666fd4c7a78d2e5c3 files/xpdf-3.00-fonts.patch 399
+SHA256 897d4d7417df072c47b7ba175fefac2db95226f1ed7e519bee210823fa9f45ed files/xpdf-3.00-fonts.patch 399
 MD5 1ca86139c360680d756c771b7c6c8647 files/xpdf-3.00-freetype-2.1.7.patch 2743
+RMD160 f0aab1d503b706446759284b08984c087db216ac files/xpdf-3.00-freetype-2.1.7.patch 2743
+SHA256 4d8aa14e350c455211509238d21479051d426b9c9c0d67ea7a5ce06dca6b2bdf files/xpdf-3.00-freetype-2.1.7.patch 2743
 MD5 e07939dc8546a450c5d8aca6263ad8ee files/xpdf-3.00-gcc41.patch 890
+RMD160 da9b4f2d1e0b9ccb63e9d14daa87ece82e91264b files/xpdf-3.00-gcc41.patch 890
+SHA256 3d1b386abf7ef3467e4a61b81337463c7468bc53883bcf58b8864d0ea3fea69e files/xpdf-3.00-gcc41.patch 890
 MD5 f200f24c7cfa6061337dc6c0e03f36b9 files/xpdf-3.00-nodrm.diff 1049
+RMD160 a886aa3e37929efdc425212701eedabb0511d423 files/xpdf-3.00-nodrm.diff 1049
+SHA256 bebc7345bc909f2e39670f6653b3d2eb50640e951cbe26cfd06e1f3783f4a03e files/xpdf-3.00-nodrm.diff 1049
 MD5 5e63c86e19a1c1387cab38b7e2902c9e files/xpdf-3.00-overflow.patch 8115
+RMD160 a270009390886efb7f3f69a844c3ad5fb1f75ce1 files/xpdf-3.00-overflow.patch 8115
+SHA256 172d3a4e45854760a99b618e32d68f0633acdc3887d332e238ba5394768ca833 files/xpdf-3.00-overflow.patch 8115
 MD5 dd4a7f876f8002dc835dab94f7fcefc1 files/xpdf-3.00-pl2.patch 1665
+RMD160 7ed03bdbf06d3e3ca74a4a8e8ef76db39c1cbe81 files/xpdf-3.00-pl2.patch 1665
+SHA256 05c507f0c83d48471dc7f4442fdf2385b66d8a75faf32a0213812fc2352e7f95 files/xpdf-3.00-pl2.patch 1665
 MD5 ae2950dd45961a041a23aae7f740815b files/xpdf-3.00-pl3.patch 356
+RMD160 717357b08b9fdc719bf72f0af9342a2c5f6da95e files/xpdf-3.00-pl3.patch 356
+SHA256 7b63ef4c0f2011fea053be77b522e655b69fed8c06c430ff2de5a0f839adcec0 files/xpdf-3.00-pl3.patch 356
 MD5 47a6dbee52353a95ac7974c6f44594f0 files/xpdf-3.00-scroll-opts.patch 6347
+RMD160 87d751e41456d8a1e61e75521b58c4f458775595 files/xpdf-3.00-scroll-opts.patch 6347
+SHA256 a42794e377d4535ee2c8a7a2bc7da98cb6092c1272cc64a408c1382e59431dd5 files/xpdf-3.00-scroll-opts.patch 6347
 MD5 8aec20a56895c25a8c2c35c16211d731 files/xpdf-3.00-security-can-2005-2097.patch 1612
+RMD160 879705ab60cba92ea9710694707d3ffdcc34164b files/xpdf-3.00-security-can-2005-2097.patch 1612
+SHA256 4f59f33b9e83ef7d0c9a9c236df8f154a6da98a964dc640de847e5d840aafecb files/xpdf-3.00-security-can-2005-2097.patch 1612
 MD5 5710ee134d1bb9566a577e33e206b980 files/xpdf-3.00-truetype-new.diff 3153
+RMD160 31b446d6cdcefcfa907b522d0cfdd037e7b67dbb files/xpdf-3.00-truetype-new.diff 3153
+SHA256 b8561054e4c9c865d1391222444463f2e1940857a8fefc560cd2755144aeafa6 files/xpdf-3.00-truetype-new.diff 3153
 MD5 8bcdee9af356073f2e0dd88071379148 files/xpdf-3.01-crash.patch 1057
+RMD160 806756fb9cb44da5c3329a20a87fc0f0e301e8d8 files/xpdf-3.01-crash.patch 1057
+SHA256 b5bcbaf6587c684b1e70e0578f9ec1b993d5b63a5c7c56438abd456a3359699c files/xpdf-3.01-crash.patch 1057
 MD5 ecab3568f87fdb4d4cd4fe2168949035 files/xpdf-3.01-nodrm.patch 3183
+RMD160 289e906f1d783aeb2193b5f825244ceed960b323 files/xpdf-3.01-nodrm.patch 3183
+SHA256 0fff6b9eb716c9e0983057e672b7262461b9c2bcc8b81761c2e05835ca188b4c files/xpdf-3.01-nodrm.patch 3183
 MD5 34c377b9f408fcfccb9b5513c98a6b1f files/xpdf-3.01-onlyx.patch 3099
+RMD160 d10fecaf3a8fe6a3ba93081d49addc9779020ff9 files/xpdf-3.01-onlyx.patch 3099
+SHA256 0d54737c58e8ad061528e00aa8d96512603f55ba16cc0a86ffb4c41c0ae880a9 files/xpdf-3.01-onlyx.patch 3099
 MD5 145b821ca07a9e6a110dfe0088a39dc0 files/xpdf-3.01-pdftoppm.patch 1911
+RMD160 058669546724c6f1ce6fc4acf462368c2c3d23db files/xpdf-3.01-pdftoppm.patch 1911
+SHA256 0c4abf48bb89b811cdef434222e66456354de85a9bf2efdaa0462ce6cec253d2 files/xpdf-3.01-pdftoppm.patch 1911
+MD5 82bf7fedf2b17d230c7b9bc8c0b14da5 files/xpdf-3.01-poppler-nodrm.patch 1712
+RMD160 9be0eb12d1c2501e9a8eae7c7844832a030e2a11 files/xpdf-3.01-poppler-nodrm.patch 1712
+SHA256 50ee43c573fc046bdb74bc368ed4a589b062bc1b9454e68be49a9397540ea4ee files/xpdf-3.01-poppler-nodrm.patch 1712
 MD5 934ccc815f9aecaa94152266f8fb29d8 files/xpdf-3.01-resize.patch 1232
+RMD160 1be3dc73d8ef01f610bbf1d378b9b008e4ac16a2 files/xpdf-3.01-resize.patch 1232
+SHA256 be233c879d8524032d1781fba984e25dfe582c73af5587c893ff12bd10af38dc files/xpdf-3.01-resize.patch 1232
 MD5 362d1ebc96229b3ce0bf07fd0f2132d8 files/xpdf-3.01-sec-rollup.patch 7717
+RMD160 3633680b736a84819cfe43d4663b3ccba061e4a8 files/xpdf-3.01-sec-rollup.patch 7717
+SHA256 02eb69ffc01d95f4a01e475842c529e8c25815bdf89066a6024be76475b46ec7 files/xpdf-3.01-sec-rollup.patch 7717
 MD5 4184783da2885ecde3c2256de5144555 files/xpdf-3.01pl1.patch 4936
+RMD160 123403a98df5d8191ac1f7b3780fb6c6e0bf344f files/xpdf-3.01pl1.patch 4936
+SHA256 10a9dd1ff8dc6885d0168ba9cfece8f9bc9a0b305f3afc0739d940103ed19124 files/xpdf-3.01pl1.patch 4936
 MD5 2fce5bedd61300fad1566a41f991a782 files/xpdf-goo-sizet.patch 1424
+RMD160 c52769d3ac95b372593e22d46ad4742dc44e47d3 files/xpdf-goo-sizet.patch 1424
+SHA256 d1a75bcb1764383ee1f5bd1c2d678cdadc69cd123069657f1dced0825964cbb0 files/xpdf-goo-sizet.patch 1424
 MD5 a21a0caeb7356fb3e68e5db195a505e9 files/xpdfrc.1 1587
+RMD160 8fc69b3973376edcfe44e2feb787788f6f810ffe files/xpdfrc.1 1587
+SHA256 dc9f7028c78891789eb138a0e85fb93c5fe12bfeae6cc703e0509a52afe165d6 files/xpdfrc.1 1587
 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
+RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 metadata.xml 161
+SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76 metadata.xml 161
 MD5 325dd311659f0619a29b5e7daeb001f2 xpdf-3.00-r10.ebuild 3879
+RMD160 2a1673daecf018c00235aba80697018731a40b78 xpdf-3.00-r10.ebuild 3879
+SHA256 baaf9927c61dc9c175ad498913a69531e2fb303c96cf0f0bedb94ec2089017c6 xpdf-3.00-r10.ebuild 3879
 MD5 5851c6a89bce6b96ca5d0a059ae9882a xpdf-3.01-r5.ebuild 3681
-MD5 8a650a698aac3913ecae07d7652dc44a xpdf-3.01-r7.ebuild 880
+RMD160 22c45aa250bffb5df9d98352f075d312659a7d67 xpdf-3.01-r5.ebuild 3681
+SHA256 099ad7d8dbe6e20a87272fc4a4e28aa2962330e06bbbe015c3d970f4cceb8a5d xpdf-3.01-r5.ebuild 3681
+MD5 dac1e8ae71e461910b0df55e6a6406d6 xpdf-3.01-r7.ebuild 886
+RMD160 8d860245a392a68a034a062f52efeed5d9da018b xpdf-3.01-r7.ebuild 886
+SHA256 80a1a0838d5e68812092ce042c1bd9ecf8a9dbbc9bc08cae98e09d715b94e7ab xpdf-3.01-r7.ebuild 886
diff --git a/app-text/xpdf/files/xpdf-3.01-poppler-nodrm.patch b/app-text/xpdf/files/xpdf-3.01-poppler-nodrm.patch
new file mode 100644
index 000000000000..8a752ac391ca
--- /dev/null
+++ b/app-text/xpdf/files/xpdf-3.01-poppler-nodrm.patch
@@ -0,0 +1,53 @@
+diff -ur xpdf-3.01-poppler.orig/PDFCore.cc xpdf-3.01-poppler/PDFCore.cc
+--- xpdf-3.01-poppler.orig/PDFCore.cc	2006-02-04 19:59:02.000000000 +0100
++++ xpdf-3.01-poppler/PDFCore.cc	2006-02-04 19:59:55.000000000 +0100
+@@ -1271,9 +1271,6 @@
+   int x0, y0, x1, y1, t;
+   GooString *s;
+ 
+-  if (!doc->okToCopy()) {
+-    return NULL;
+-  }
+   if ((page = findPage(pg))) {
+     cvtUserToDev(pg, xMin, yMin, &x0, &y0);
+     cvtUserToDev(pg, xMax, yMax, &x1, &y1);
+diff -ur xpdf-3.01-poppler.orig/XPDFCore.cc xpdf-3.01-poppler/XPDFCore.cc
+--- xpdf-3.01-poppler.orig/XPDFCore.cc	2006-02-04 19:59:02.000000000 +0100
++++ xpdf-3.01-poppler/XPDFCore.cc	2006-02-04 19:59:55.000000000 +0100
+@@ -376,9 +376,6 @@
+   int pg;
+   double ulx, uly, lrx, lry;
+ 
+-  if (!doc->okToCopy()) {
+-    return;
+-  }
+   if (getSelection(&pg, &ulx, &uly, &lrx, &lry)) {
+     //~ for multithreading: need a mutex here
+     if (currentSelection) {
+@@ -1115,11 +1112,7 @@
+ #ifndef NO_TEXT_SELECT
+ 	  if (core->selectULX != core->selectLRX &&
+ 	      core->selectULY != core->selectLRY) {
+-	    if (core->doc->okToCopy()) {
+-	      core->copySelection();
+-	    } else {
+-	      error(-1, "Copying of text from this document is not allowed.");
+-	    }
++	    core->copySelection();
+ 	  }
+ #endif
+ 	}
+diff -ur xpdf-3.01-poppler.orig/XPDFViewer.cc xpdf-3.01-poppler/XPDFViewer.cc
+--- xpdf-3.01-poppler.orig/XPDFViewer.cc	2006-02-04 19:59:02.000000000 +0100
++++ xpdf-3.01-poppler/XPDFViewer.cc	2006-02-04 19:59:55.000000000 +0100
+@@ -2390,10 +2390,6 @@
+   PSOutputDev *psOut;
+ 
+   doc = viewer->core->getDoc();
+-  if (!doc->okToPrint()) {
+-    error(-1, "Printing this document is not allowed.");
+-    return;
+-  }
+ 
+   viewer->core->setBusyCursor(gTrue);
+ 
diff --git a/app-text/xpdf/xpdf-3.01-r7.ebuild b/app-text/xpdf/xpdf-3.01-r7.ebuild
index 3afe98961324..e7a54c04ec79 100644
--- a/app-text/xpdf/xpdf-3.01-r7.ebuild
+++ b/app-text/xpdf/xpdf-3.01-r7.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/xpdf/xpdf-3.01-r7.ebuild,v 1.2 2006/02/04 16:17:47 killerfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xpdf/xpdf-3.01-r7.ebuild,v 1.3 2006/02/04 19:06:24 genstef Exp $
 
 inherit eutils
 
@@ -27,7 +27,7 @@ S=${WORKDIR}/${P}-poppler
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	use nodrm && epatch ${FILESDIR}/${P}-nodrm.patch
+	use nodrm && epatch ${FILESDIR}/${P}-poppler-nodrm.patch
 }
 
 src_install() {