summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /app-text/pdfshuffler/files
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'app-text/pdfshuffler/files')
-rw-r--r--app-text/pdfshuffler/files/pdfshuffler-PyPDF2.patch18
1 files changed, 18 insertions, 0 deletions
diff --git a/app-text/pdfshuffler/files/pdfshuffler-PyPDF2.patch b/app-text/pdfshuffler/files/pdfshuffler-PyPDF2.patch
new file mode 100644
index 000000000000..8228c1765143
--- /dev/null
+++ b/app-text/pdfshuffler/files/pdfshuffler-PyPDF2.patch
@@ -0,0 +1,18 @@
+diff -r -U2 pdfshuffler-0.6.0.orig/pdfshuffler/pdfshuffler.py pdfshuffler-0.6.0/pdfshuffler/pdfshuffler.py
+--- pdfshuffler-0.6.0.orig/pdfshuffler/pdfshuffler.py 2012-04-28 21:15:17.000000000 +0700
++++ pdfshuffler-0.6.0/pdfshuffler/pdfshuffler.py 2015-01-11 02:10:02.952809411 +0600
+@@ -72,5 +72,13 @@
+
+ import poppler #for the rendering of pdf pages
+-from pyPdf import PdfFileWriter, PdfFileReader
++
++try:
++ from PyPDF2 import PdfFileWriter, PdfFileReader
++except ImportError:
++ try:
++ from pyPdf import PdfFileWriter, PdfFileReader
++ except ImportError:
++ print('Neither PyPDF2 nor pyPdf found')
++ sys.exit(1)
+
+ from pdfshuffler_iconview import CellRendererImage