Stop using xpdfVersion, it's gone from latest poppler and we don't really need it.

Package-Manager: portage-2.2_rc11/cvs/Linux 2.6.26.5 x86_64

4 files changed, 37 insertions, 4 deletions

diff --git a/dev-tex/pdftex/ChangeLog b/dev-tex/pdftex/ChangeLog
index be1a30b6f4ed..f2872539b7a3 100644
--- a/dev-tex/pdftex/ChangeLog
+++ b/dev-tex/pdftex/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-tex/pdftex
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tex/pdftex/ChangeLog,v 1.4 2008/09/24 18:36:20 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tex/pdftex/ChangeLog,v 1.5 2008/09/30 17:15:40 aballier Exp $
+
+  30 Sep 2008; Alexis Ballier <aballier@gentoo.org>
+  +files/pdftex-1.40.9-xpdfversion.patch, pdftex-1.40.9.ebuild:
+  Stop using xpdfVersion, it's gone from latest poppler and we don't really
+  need it.
 
   24 Sep 2008; Raúl Porcel <armin76@gentoo.org> pdftex-1.40.9.ebuild:
   Add ~alpha/~ia64 wrt #237202
diff --git a/dev-tex/pdftex/Manifest b/dev-tex/pdftex/Manifest
index 23bf4fb88fee..78b11bf8c357 100644
--- a/dev-tex/pdftex/Manifest
+++ b/dev-tex/pdftex/Manifest
@@ -1,5 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX pdftex-1.40.9-poppler.patch 2855 RMD160 ae883ff7dbafd9452aa3d52233df3af2e5f2e30f SHA1 cb76325eb46aca46c16828907a7f62a830d13703 SHA256 e701f2627e81c5723e0a99487e3275008cba3448207ebd35a55bb4ed829da12d
+AUX pdftex-1.40.9-xpdfversion.patch 737 RMD160 b736d3fa14b5efda42505a78e2d2fd315132260c SHA1 aebf5ccfe9ac1c6a92e4d96a4a2dd59e32ee3c10 SHA256 dfefc2eab684832ba8bc140ad8fb1c52d1009d3d7c0c622f10a68cdd60bfca7d
 DIST pdftex-1.40.9.tar.bz2 3899364 RMD160 09df8924b478a26a4816a55ae97822127bb1c476 SHA1 8302ef0c9651ff293916505b122ad59db955e318 SHA256 78e17e070c27b6645db291fa1d7b390d19bf090bca4326806ed292c9809dc27c
-EBUILD pdftex-1.40.9.ebuild 2509 RMD160 fb254eed140c473b784faa2ffedf492759b53116 SHA1 f0dabb1c12bfcb8be8e385b44abc382c9f756d59 SHA256 5673eee23a5d459ef7fe2b1548da3939e5dc52978029fc4fa9d18b2cecaaa4c6
-MISC ChangeLog 735 RMD160 e0d82b6b1a2430bed113f206c5efc51afbae9131 SHA1 e1149edae8454d6102f95e1485cb62882fb75a6f SHA256 c2bce9cc20b93445c83184fabf11d1a3d4a96c43481f0fb01eeacf2150e2f1a3
+EBUILD pdftex-1.40.9.ebuild 2555 RMD160 2776eb3afbfbf03c69459c1914dca6f424452d5e SHA1 8c7b681960120f74e00a9f91797daa2c06b5ed25 SHA256 c75b107df5d36c787738996b89ac91f0bb93e914f047c77f1d7361a7ad789796
+MISC ChangeLog 940 RMD160 100a5a6d79f0925bd77c072dc197dd4e7365919e SHA1 7ba2d794549d514ad6deeced2b702ec4b736fa8a SHA256 aa89a6dde9fb3a75ed087c7793d90c0762453eef145bd2ba1351182a5597b553
 MISC metadata.xml 638 RMD160 59e3769086396359f1a50ee60b6702555770e33e SHA1 f9a566b850466987e74d5c16c345c54506ae4a0d SHA256 b28290517ed75fbaaa0282cdca3692f11635d173ee5dc5cb342f6071dbb3d3ea
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkjiXsQACgkQvFcC4BYPU0pUagCgn40YzTEtAGvwMVjIMkP77JNo
+w4QAn11lzz3Htceaz0h12K9b8oY21IqH
+=lXah
+-----END PGP SIGNATURE-----
diff --git a/dev-tex/pdftex/files/pdftex-1.40.9-xpdfversion.patch b/dev-tex/pdftex/files/pdftex-1.40.9-xpdfversion.patch
new file mode 100644
index 000000000000..c6f0c79f6985
--- /dev/null
+++ b/dev-tex/pdftex/files/pdftex-1.40.9-xpdfversion.patch
@@ -0,0 +1,16 @@
+Index: pdftex-1.40.9/src/texk/web2c/pdftexdir/utils.c
+===================================================================
+--- pdftex-1.40.9.orig/src/texk/web2c/pdftexdir/utils.c
++++ pdftex-1.40.9/src/texk/web2c/pdftexdir/utils.c
+@@ -1267,9 +1267,9 @@ void initversionstring(char **versions)
+     (void) asprintf(versions,
+                     "Compiled with libpng %s; using libpng %s\n"
+                     "Compiled with zlib %s; using zlib %s\n"
+-                    "Compiled with poppler version %s\n",
++                    "Compiled with poppler\n",
+                     PNG_LIBPNG_VER_STRING, png_libpng_ver,
+-                    ZLIB_VERSION, zlib_version, xpdfVersion);
++                    ZLIB_VERSION, zlib_version);
+ }
+ 
+ 
diff --git a/dev-tex/pdftex/pdftex-1.40.9.ebuild b/dev-tex/pdftex/pdftex-1.40.9.ebuild
index 9834bac01ec3..2221bc16ac31 100644
--- a/dev-tex/pdftex/pdftex-1.40.9.ebuild
+++ b/dev-tex/pdftex/pdftex-1.40.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tex/pdftex/pdftex-1.40.9.ebuild,v 1.4 2008/09/24 18:36:20 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tex/pdftex/pdftex-1.40.9.ebuild,v 1.5 2008/09/30 17:15:40 aballier Exp $
 
 inherit libtool toolchain-funcs eutils multilib
 
@@ -26,6 +26,7 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}/${P}-poppler.patch"
+	epatch "${FILESDIR}/${P}-xpdfversion.patch"
 	elibtoolize
 }