Add patch to make pdftoppm install in non-X builds. Bug #102077

Package-Manager: portage-2.0.52-r1

4 files changed, 46 insertions, 7 deletions

diff --git a/app-text/xpdf/ChangeLog b/app-text/xpdf/ChangeLog
index 431beda10d26..41da9722b78b 100644
--- a/app-text/xpdf/ChangeLog
+++ b/app-text/xpdf/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/xpdf
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xpdf/ChangeLog,v 1.91 2005/09/05 12:08:57 dsd Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xpdf/ChangeLog,v 1.92 2005/09/13 01:16:04 dang Exp $
+
+  13 Sep 2005; <dang@gentoo.org> +files/xpdf-3.01-pdftoppm.patch,
+  xpdf-3.01.ebuild:
+  Add patch to make pdftoppm install in non-X builds. Bug #102077
 
   05 Sep 2005; Daniel Drake <dsd@gentoo.org> ChangeLog:
   Fix Manifest
diff --git a/app-text/xpdf/Manifest b/app-text/xpdf/Manifest
index 32c607006a33..ed7a83a91043 100644
--- a/app-text/xpdf/Manifest
+++ b/app-text/xpdf/Manifest
@@ -1,16 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 b4f3da45bbeaba31ec7b311488a4b3f3 xpdf-3.01.ebuild 3487
+MD5 763deff18a7e6e7125aca1f3d6be3229 xpdf-3.01.ebuild 3529
 MD5 0e303cf49620828eff323b0251d0141c xpdf-3.00-r8.ebuild 3622
 MD5 4baf6cdd9480cd938afaede8334c7a72 xpdf-3.00-r10.ebuild 3909
 MD5 4dfde9229c0dfade67d4d1669cf11210 xpdf-3.00-r9.ebuild 3860
-MD5 1016e17571b3b81274bda0711f1636c9 ChangeLog 11066
+MD5 5d44a004d67074484bdece3088d8b596 ChangeLog 11220
 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
 MD5 8aec20a56895c25a8c2c35c16211d731 files/xpdf-3.00-security-can-2005-2097.patch 1612
 MD5 8221707abac9c48b486b8c2b9bc7a7a0 files/xpdf-3.00-empty-bookmark.patch 373
 MD5 a21a0caeb7356fb3e68e5db195a505e9 files/xpdfrc.1 1587
 MD5 f200f24c7cfa6061337dc6c0e03f36b9 files/xpdf-3.00-nodrm.diff 1049
+MD5 145b821ca07a9e6a110dfe0088a39dc0 files/xpdf-3.01-pdftoppm.patch 1911
 MD5 fb31167789c80b1a01d773fc5108c356 files/digest-xpdf-3.01 767
 MD5 dd4a7f876f8002dc835dab94f7fcefc1 files/xpdf-3.00-pl2.patch 1665
 MD5 37f0b42aad269cb5896773b47b1d83ac files/xpdf-3.00-truetype-new.diff.gz 1271
@@ -31,7 +32,7 @@ MD5 ec978d9450f061ea49ee697b39d545bf files/digest-xpdf-3.00-r9 767
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDHDWBTOXg++0VvJQRAoadAJ9zOliOB4bKSm6gL53zuTsjHiS/XgCggawn
-6U3pbnh3TiSDB++p4Wy65y8=
-=ENxC
+iD8DBQFDJijcomPajV0RnrERAg3wAJ9KdWSQ3lKKBVp/KCXwGOXRJod8rQCfYPeh
+RWDrUDyfJZx4rTh8e3KVWCY=
+=s8ar
 -----END PGP SIGNATURE-----
diff --git a/app-text/xpdf/files/xpdf-3.01-pdftoppm.patch b/app-text/xpdf/files/xpdf-3.01-pdftoppm.patch
new file mode 100644
index 000000000000..7e0dc988309c
--- /dev/null
+++ b/app-text/xpdf/files/xpdf-3.01-pdftoppm.patch
@@ -0,0 +1,33 @@
+diff -urN xpdf-3.01/Makefile.in xpdf-3.01-pdftoppm-no_X-patch/Makefile.in
+--- xpdf-3.01/Makefile.in	2005-08-17 07:34:30.000000000 +0200
++++ xpdf-3.01-pdftoppm-no_X-patch/Makefile.in	2005-09-12 23:12:25.272986000 +0200
+@@ -82,7 +82,7 @@
+ 	$(INSTALL_PROGRAM) xpdf/pdftotext$(EXE) $(DESTDIR)@bindir@/pdftotext$(EXE)
+ 	$(INSTALL_PROGRAM) xpdf/pdfinfo$(EXE) $(DESTDIR)@bindir@/pdfinfo$(EXE)
+ 	$(INSTALL_PROGRAM) xpdf/pdffonts$(EXE) $(DESTDIR)@bindir@/pdffonts$(EXE)
+-@X@	$(INSTALL_PROGRAM) xpdf/pdftoppm$(EXE) $(DESTDIR)@bindir@/pdftoppm$(EXE)
++	$(INSTALL_PROGRAM) xpdf/pdftoppm$(EXE) $(DESTDIR)@bindir@/pdftoppm$(EXE)
+ 	$(INSTALL_PROGRAM) xpdf/pdfimages$(EXE) $(DESTDIR)@bindir@/pdfimages$(EXE)
+ 	-mkdir -p $(DESTDIR)@mandir@/man1
+ @X@	$(INSTALL_DATA) $(srcdir)/doc/xpdf.1 $(DESTDIR)@mandir@/man1/xpdf.1
+@@ -90,7 +90,7 @@
+ 	$(INSTALL_DATA) $(srcdir)/doc/pdftotext.1 $(DESTDIR)@mandir@/man1/pdftotext.1
+ 	$(INSTALL_DATA) $(srcdir)/doc/pdfinfo.1 $(DESTDIR)@mandir@/man1/pdfinfo.1
+ 	$(INSTALL_DATA) $(srcdir)/doc/pdffonts.1 $(DESTDIR)@mandir@/man1/pdffonts.1
+-@X@	$(INSTALL_DATA) $(srcdir)/doc/pdftoppm.1 $(DESTDIR)@mandir@/man1/pdftoppm.1
++	$(INSTALL_DATA) $(srcdir)/doc/pdftoppm.1 $(DESTDIR)@mandir@/man1/pdftoppm.1
+ 	$(INSTALL_DATA) $(srcdir)/doc/pdfimages.1 $(DESTDIR)@mandir@/man1/pdfimages.1
+ 	-mkdir -p $(DESTDIR)@mandir@/man5
+ 	$(INSTALL_DATA) $(srcdir)/doc/xpdfrc.5 $(DESTDIR)@mandir@/man5/xpdfrc.5
+diff -urN xpdf-3.01/xpdf/Makefile.in xpdf-3.01-pdftoppm-no_X-patch/xpdf/Makefile.in
+--- xpdf-3.01/xpdf/Makefile.in	2005-08-17 07:34:31.000000000 +0200
++++ xpdf-3.01-pdftoppm-no_X-patch/xpdf/Makefile.in	2005-09-12 23:27:53.903705325 +0200
+@@ -109,7 +109,7 @@
+ 	pdffonts$(EXE) pdftoppm$(EXE) pdfimages$(EXE)
+ 
+ all-no-x: pdftops$(EXE) pdftotext$(EXE) pdfinfo$(EXE) pdffonts$(EXE) \
+-	pdfimages$(EXE)
++	pdftoppm$(EXE) pdfimages$(EXE)
+ 
+ #------------------------------------------------------------------------
+ 
diff --git a/app-text/xpdf/xpdf-3.01.ebuild b/app-text/xpdf/xpdf-3.01.ebuild
index 8a8c435cb35c..247a6f23dacf 100644
--- a/app-text/xpdf/xpdf-3.01.ebuild
+++ b/app-text/xpdf/xpdf-3.01.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xpdf/xpdf-3.01.ebuild,v 1.1 2005/09/05 04:32:20 metalgod Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xpdf/xpdf-3.01.ebuild,v 1.2 2005/09/13 01:16:04 dang Exp $
 
 inherit eutils
 
@@ -54,6 +54,7 @@ src_unpack() {
 	epatch ${FILESDIR}/${PN}-3.00-gcc41.patch
 	epatch ${FILESDIR}/${PN}-3.00-64bit.patch
 	epatch ${FILESDIR}/${PN}-3.01-crash.patch
+	epatch ${FILESDIR}/${PN}-3.01-pdftoppm.patch
 	autoconf
 }