old

(Portage version: 2.2.0_alpha63/cvs/Linux x86_64)

3 files changed, 5 insertions, 177 deletions

diff --git a/dev-tex/pdftex/ChangeLog b/dev-tex/pdftex/ChangeLog
index bfc08aad7c90..39a63e025f06 100644
--- a/dev-tex/pdftex/ChangeLog
+++ b/dev-tex/pdftex/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-tex/pdftex
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tex/pdftex/ChangeLog,v 1.33 2011/07/11 19:06:34 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tex/pdftex/ChangeLog,v 1.34 2011/10/09 09:07:09 ssuominen Exp $
+
+  09 Oct 2011; Samuli Suominen <ssuominen@gentoo.org> -pdftex-1.40.10.ebuild,
+  -files/pdftex-1.40.10-poppler.patch:
+  old
 
   11 Jul 2011; Alexis Ballier <aballier@gentoo.org> pdftex-1.40.11.ebuild:
   keyword ~x86-fbsd, bug #347461
diff --git a/dev-tex/pdftex/files/pdftex-1.40.10-poppler.patch b/dev-tex/pdftex/files/pdftex-1.40.10-poppler.patch
deleted file mode 100644
index dd32807f93f3..000000000000
--- a/dev-tex/pdftex/files/pdftex-1.40.10-poppler.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-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
deleted file mode 100644
index c04ce10a23c1..000000000000
--- a/dev-tex/pdftex/pdftex-1.40.10.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2010 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.10 2010/05/21 17:47:37 pva Exp $
-
-EAPI=2
-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=">=app-text/poppler-0.12.3-r3[xpdf-headers]
-	media-libs/libpng
-	sys-libs/zlib
-	virtual/tex-base
-	app-admin/eselect-pdftex"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-S=${WORKDIR}/${P}/src
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-poppler.patch"
-	elibtoolize
-}
-
-src_configure() {
-	# Too many regexps use A-Z a-z constructs, what causes problems with locales
-	# that don't have the same alphabetical order than ascii. Bug #293199
-	# So we set LC_ALL to C in order to avoid problems.
-	export LC_ALL=C
-
-	local myconf
-	myconf=""
-	has_version '>=app-text/texlive-core-2009' && myconf="--with-system-kpathsea"
-
-	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		\
-		${myconf}
-}
-
-src_compile() {
-	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
-}