version bump

Package-Manager: portage-2.2_rc58/cvs/Linux x86_64

4 files changed, 181 insertions, 6 deletions

diff --git a/dev-tex/pdftex/ChangeLog b/dev-tex/pdftex/ChangeLog
index ac791d7690df..d1d20c611030 100644
--- a/dev-tex/pdftex/ChangeLog
+++ b/dev-tex/pdftex/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-tex/pdftex
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tex/pdftex/ChangeLog,v 1.18 2009/08/27 08:12:35 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tex/pdftex/ChangeLog,v 1.19 2009/12/12 12:21:12 aballier Exp $
+
+*pdftex-1.40.10 (12 Dec 2009)
+
+  12 Dec 2009; Alexis Ballier <aballier@gentoo.org> +pdftex-1.40.10.ebuild,
+  +files/pdftex-1.40.10-poppler.patch:
+  version bump
 
   27 Aug 2009; Alexis Ballier <aballier@gentoo.org> pdftex-1.40.9.ebuild,
   +files/pdftex-1.40.9-poppler-0.11.3.patch:
diff --git a/dev-tex/pdftex/Manifest b/dev-tex/pdftex/Manifest
index 9070bebfd619..6fada198c1e3 100644
--- a/dev-tex/pdftex/Manifest
+++ b/dev-tex/pdftex/Manifest
@@ -1,19 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX pdftex-1.40.10-poppler.patch 2130 RMD160 34bf1d2ef9d60edf475c0db12c3016419acb4502 SHA1 81c6b1a2340ccc9f5b095d3d6192c4a665099f45 SHA256 4e0282c7adab34cb71806a73d61b3342b784ee69bf9e9187fe9b2c5a1b58945f
 AUX pdftex-1.40.9-getline.patch 483 RMD160 ad59f68ec3214f1dc5c8e0fa928d75e24f8363ad SHA1 9ee9ecd0d44d38ce25b42f9882a6e8db1575ece8 SHA256 feb214f1614b1d62e027efaad7348b6a359a675b5b320fad76c5aacbfe1ea50f
 AUX pdftex-1.40.9-poppler-0.11.3.patch 1926 RMD160 3f0a2ec242f2247a193aea6573f0f705d56ba010 SHA1 98e53c467764065ce632d4e17c5d0392f4c6ab2f SHA256 0d9441dbeee2729c2ef69b0393b3ac6baf95f272a33d9f2ede9f75b687efa428
 AUX pdftex-1.40.9-poppler-0.11.patch 596 RMD160 51737e4d9d10b2a883c4b304d28c908b36871371 SHA1 71927b2e8877cea1277576f5cad0b7c5484a2669 SHA256 0bc05b34bb76092e7f27dd35f236a3b45321a7b79a3e9dbb424bdc0ed25455ac
 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.10.tar.bz2 4990395 RMD160 34b55cd40081def07b987195eebd7c4adfdd1f0a SHA1 5bd5637fccb0ee67afa39d36ef9fea2f221610da SHA256 40f95b4374c92da4c72c014cee91306e4a5202c246ea66df526c10bb705c90bd
 DIST pdftex-1.40.9.tar.bz2 3899364 RMD160 09df8924b478a26a4816a55ae97822127bb1c476 SHA1 8302ef0c9651ff293916505b122ad59db955e318 SHA256 78e17e070c27b6645db291fa1d7b390d19bf090bca4326806ed292c9809dc27c
+EBUILD pdftex-1.40.10.ebuild 2837 RMD160 9803bafa2620c4e9dc6fe163b731a65db5b92123 SHA1 e05be58c22e311b204b22376e2467da9726bde64 SHA256 594fc97c7b24f81006ac6c83195fa3b1dedb2efadd6710dad9d494c2e31777db
 EBUILD pdftex-1.40.9.ebuild 2757 RMD160 ca94dac822deb23892f009c7646d49bee09f055d SHA1 ccf684177cb86a9c71c900e4099393f454cc9804 SHA256 f87ec5298af67208fef0da6ef84a49824cdc505fd3960530093dc8e6c7df0541
-MISC ChangeLog 2553 RMD160 3724e0eaa1123b1d208fbbad6ec0ca6a649446de SHA1 203ede3ae185d4bf6fcc3f1c4d78aed2c2502064 SHA256 423c35dbf7bb6969af50e48163adef7ba0054a16dc546083c05831deb06e1389
+MISC ChangeLog 2715 RMD160 9547e43888f1026bb25d16d369b7b6f905cd40f7 SHA1 99989a4c3a4b4b55827ff94c36dac89d74ea9ed3 SHA256 2b162eed84e5015386fade48ea96b7c338679bba90f31d498b5520f0eb42775d
 MISC metadata.xml 638 RMD160 59e3769086396359f1a50ee60b6702555770e33e SHA1 f9a566b850466987e74d5c16c345c54506ae4a0d SHA256 b28290517ed75fbaaa0282cdca3692f11635d173ee5dc5cb342f6071dbb3d3ea
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2.0.13 (GNU/Linux)
 
-iEYEARECAAYFAkqWP/kACgkQvFcC4BYPU0rYLACgkigQRBCjxDs2D1Gsu+zf7YZY
-hK0AmwRP3MfUfVV9HXrmZLD0uPEpTGuO
-=M4yQ
+iEYEARECAAYFAksjir0ACgkQvFcC4BYPU0qYuwCfe6LfK/6BOgfkqjXc/63YWHy6
+MdIAoKZVqRRmVcbdASGVNp7svnTAp9hM
+=uB42
 -----END PGP SIGNATURE-----
diff --git a/dev-tex/pdftex/files/pdftex-1.40.10-poppler.patch b/dev-tex/pdftex/files/pdftex-1.40.10-poppler.patch
new file mode 100644
index 000000000000..dd32807f93f3
--- /dev/null
+++ b/dev-tex/pdftex/files/pdftex-1.40.10-poppler.patch
@@ -0,0 +1,44 @@
+Index: src/texk/web2c/pdftexdir/pdftoepdf.cc
+===================================================================
+--- src.orig/texk/web2c/pdftexdir/pdftoepdf.cc
++++ src/texk/web2c/pdftexdir/pdftoepdf.cc
+@@ -650,7 +650,7 @@ static void writeEncodings()
+     }
+     for (r = encodingList; r != 0; r = n) {
+         n = r->next;
+-        delete r->font;
++        r->font->decRefCnt();
+         delete r;
+     }
+ }
+@@ -690,7 +690,7 @@ read_pdf_info(char *image_name, char *pa
+     Page *page;
+     int rotate;
+     PDFRectangle *pagebox;
+-    float pdf_version_found, pdf_version_wanted;
++    int minor_pdf_version_found, major_pdf_version_found;
+     // initialize
+     if (!isInit) {
+         globalParams = new GlobalParams();
+@@ -705,15 +705,15 @@ read_pdf_info(char *image_name, char *pa
+     // this works only for PDF 1.x -- but since any versions of PDF newer
+     // than 1.x will not be backwards compatible to PDF 1.x, pdfTeX will
+     // then have to changed drastically anyway.
+-    pdf_version_found = pdf_doc->doc->getPDFVersion();
+-    pdf_version_wanted = 1 + (minor_pdf_version_wanted * 0.1);
+-    if (pdf_version_found > pdf_version_wanted) {
++    minor_pdf_version_found = pdf_doc->doc->getPDFMinorVersion();
++    major_pdf_version_found = pdf_doc->doc->getPDFMajorVersion();
++    if (major_pdf_version_found > 1 || ((major_pdf_version_found == 1) && (minor_pdf_version_found > minor_pdf_version_wanted))) {
+         char msg[] =
+-            "PDF inclusion: found PDF version <%.1f>, but at most version <%.1f> allowed";
++            "PDF inclusion: found PDF version <%d.%d>, but at most version <1.%d> allowed";
+         if (pdf_inclusion_errorlevel > 0) {
+-            pdftex_fail(msg, pdf_version_found, pdf_version_wanted);
++            pdftex_fail(msg, major_pdf_version_found, minor_pdf_version_found, minor_pdf_version_wanted);
+         } else {
+-            pdftex_warn(msg, pdf_version_found, pdf_version_wanted);
++            pdftex_warn(msg, major_pdf_version_found, minor_pdf_version_found, minor_pdf_version_wanted);
+         }
+     }
+     epdf_num_pages = pdf_doc->doc->getCatalog()->getNumPages();
diff --git a/dev-tex/pdftex/pdftex-1.40.10.ebuild b/dev-tex/pdftex/pdftex-1.40.10.ebuild
new file mode 100644
index 000000000000..ca6a0f23d129
--- /dev/null
+++ b/dev-tex/pdftex/pdftex-1.40.10.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-tex/pdftex/pdftex-1.40.10.ebuild,v 1.1 2009/12/12 12:21:12 aballier Exp $
+
+inherit libtool toolchain-funcs eutils multilib
+
+DESCRIPTION="Standalone (patched to use poppler) version of pdftex"
+HOMEPAGE="http://www.pdftex.org/"
+SLOT="0"
+LICENSE="GPL-2"
+
+SRC_URI="http://sarovar.org/frs/download.php/1292/${P}.tar.bz2"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=virtual/poppler-0.11.3
+	media-libs/libpng
+	sys-libs/zlib
+	app-admin/eselect-pdftex"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+S="${WORKDIR}/${P}/src"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-poppler.patch"
+	elibtoolize
+}
+
+src_compile() {
+	#tc-export CC CXX AR RANLIB
+
+	econf \
+		--disable-cxx-runtime-hack	\
+		--disable-afm2pl			\
+		--disable-aleph				\
+		--disable-bibtex			\
+		--disable-bibtex8			\
+		--disable-cfftot1			\
+		--disable-cjkutils			\
+		--disable-devnag			\
+		--disable-detex				\
+		--disable-dialog			\
+		--disable-dtl				\
+		--disable-dvi2tty			\
+		--disable-dvidvi			\
+		--disable-dviljk			\
+		--disable-dvipdfm			\
+		--disable-dvipdfmx			\
+		--disable-dvipng			\
+		--disable-dvipos			\
+		--disable-dvipsk			\
+		--disable-gsftopk			\
+		--disable-lacheck			\
+		--disable-lcdf-typetools	\
+		--disable-luatex			\
+		--disable-makeindexk		\
+		--disable-mf				\
+		--disable-mmafm				\
+		--disable-mmpfb				\
+		--disable-mp				\
+		--disable-musixflx			\
+		--disable-one				\
+		--disable-otfinfo			\
+		--disable-otftotfm			\
+		--disable-pdfopen			\
+		--disable-ps2eps			\
+		--disable-ps2pkm			\
+		--disable-psutils			\
+		--disable-seetexk			\
+		--disable-t1dotlessj		\
+		--disable-t1lint			\
+		--disable-t1rawafm			\
+		--disable-t1reencode		\
+		--disable-t1testpage		\
+		--disable-t1utils			\
+		--disable-tex				\
+		--disable-tex4htk			\
+		--disable-tpic2pdftex		\
+		--disable-ttf2pk			\
+		--disable-ttfdump			\
+		--disable-ttftotype42		\
+		--disable-vlna				\
+		--disable-web-progs			\
+		--disable-xetex				\
+		--disable-xdv2pdf			\
+		--disable-xdvik				\
+		--disable-xdvipdfmx			\
+		--disable-native-texlive-build \
+		--disable-tetex				\
+		--disable-texlive			\
+		--without-mf-x-toolkit		\
+		--without-x					\
+		--disable-shared			\
+		--disable-largefile			\
+		--with-system-xpdf			\
+		--with-system-zlib			\
+		--with-system-pnglib		\
+		--disable-multiplatform
+
+	emake SHELL=/bin/sh || die
+}
+
+src_install() {
+	cd "${S}/texk/web2c"
+	emake DESTDIR="${D}" \
+		SUBDIRS="" \
+		bin_PROGRAMS="pdftex" \
+		nodist_man_MANS="" \
+		dist_man_MANS="" \
+		install || die
+	# Rename it
+	mv "${D}/usr/bin/pdftex" "${D}/usr/bin/pdftex-${P}" || die "renaming failed"
+}
+
+pkg_postinst(){
+	einfo "Calling eselect pdftex update"
+	eselect pdftex update
+}