remove old

(Portage version: 2.2_rc67/cvs/Linux x86_64)

7 files changed, 8 insertions, 257 deletions

diff --git a/dev-tex/pdftex/ChangeLog b/dev-tex/pdftex/ChangeLog
index c673002e7bab..28798f0c1e9d 100644
--- a/dev-tex/pdftex/ChangeLog
+++ b/dev-tex/pdftex/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-tex/pdftex
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tex/pdftex/ChangeLog,v 1.27 2010/05/21 17:47:37 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tex/pdftex/ChangeLog,v 1.28 2010/06/09 10:07:00 aballier Exp $
+
+  09 Jun 2010; Alexis Ballier <aballier@gentoo.org> -pdftex-1.40.9.ebuild,
+  -files/pdftex-1.40.9-getline.patch, -files/pdftex-1.40.9-poppler.patch,
+  -files/pdftex-1.40.9-poppler-0.11.3.patch,
+  -files/pdftex-1.40.9-poppler-0.11.patch,
+  -files/pdftex-1.40.9-xpdfversion.patch:
+  remove old
 
   21 May 2010; Peter Volkov <pva@gentoo.org> pdftex-1.40.10.ebuild:
   amd64 stable, bug 302203
diff --git a/dev-tex/pdftex/files/pdftex-1.40.9-getline.patch b/dev-tex/pdftex/files/pdftex-1.40.9-getline.patch
deleted file mode 100644
index 8b40619acc10..000000000000
--- a/dev-tex/pdftex/files/pdftex-1.40.9-getline.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=270779
-Ported from the texlive-core patch.
-
-Index: src/texk/web2c/cpascal.h
-===================================================================
---- src.orig/texk/web2c/cpascal.h
-+++ src/texk/web2c/cpascal.h
-@@ -14,6 +14,7 @@
- 
- /* We must include this first, to resolve many C issues.  */
- #include "config.h"
-+#define getline pdftex_getline
- 
- /* We only use getopt in the applications, not in web2c itself.  */
- #include <kpathsea/getopt.h>
diff --git a/dev-tex/pdftex/files/pdftex-1.40.9-poppler-0.11.3.patch b/dev-tex/pdftex/files/pdftex-1.40.9-poppler-0.11.3.patch
deleted file mode 100644
index 973ec53772ee..000000000000
--- a/dev-tex/pdftex/files/pdftex-1.40.9-poppler-0.11.3.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Index: pdftex-1.40.9/src/texk/web2c/pdftexdir/pdftoepdf.cc
-===================================================================
---- pdftex-1.40.9.orig/src/texk/web2c/pdftexdir/pdftoepdf.cc
-+++ pdftex-1.40.9/src/texk/web2c/pdftexdir/pdftoepdf.cc
-@@ -685,7 +685,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();
-@@ -700,15 +700,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 || 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/files/pdftex-1.40.9-poppler-0.11.patch b/dev-tex/pdftex/files/pdftex-1.40.9-poppler-0.11.patch
deleted file mode 100644
index 17d04f274802..000000000000
--- a/dev-tex/pdftex/files/pdftex-1.40.9-poppler-0.11.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-http://cgit.freedesktop.org/poppler/poppler/commit/?id=80f415176952635a485356cf36048eee53396c25
-https://bugs.gentoo.org/show_bug.cgi?id=269545
-
-Index: pdftex-1.40.9/src/texk/web2c/pdftexdir/pdftoepdf.cc
-===================================================================
---- pdftex-1.40.9.orig/src/texk/web2c/pdftexdir/pdftoepdf.cc
-+++ pdftex-1.40.9/src/texk/web2c/pdftexdir/pdftoepdf.cc
-@@ -645,7 +645,7 @@ static void writeEncodings()
-     }
-     for (r = encodingList; r != 0; r = n) {
-         n = r->next;
--        delete r->font;
-+        r->font->decRefCnt();
-         delete r;
-     }
- }
diff --git a/dev-tex/pdftex/files/pdftex-1.40.9-poppler.patch b/dev-tex/pdftex/files/pdftex-1.40.9-poppler.patch
deleted file mode 100644
index eb8aa50bf94b..000000000000
--- a/dev-tex/pdftex/files/pdftex-1.40.9-poppler.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-Index: pdftex-1.40.9/src/texk/web2c/pdftexdir/pdftoepdf.cc
-===================================================================
---- pdftex-1.40.9.orig/src/texk/web2c/pdftexdir/pdftoepdf.cc
-+++ pdftex-1.40.9/src/texk/web2c/pdftexdir/pdftoepdf.cc
-@@ -24,8 +24,9 @@ Franklin Street, Fifth Floor, Boston, MA
- #include <stdio.h>
- #include <string.h>
- #include <ctype.h>
--#include <aconf.h>
--#include <GString.h>
-+#include <dirent.h>
-+#include <poppler-config.h>
-+#include <GooString.h>
- #include <gmem.h>
- #include <gfile.h>
- #include <config.h>
-@@ -159,7 +160,7 @@ static PdfDocument *find_add_document(ch
-     fprintf(stderr, "\npdfTeX Debug: Creating %s (%d)\n", p->file_name,
-             p->occurences);
- #endif
--    GString *docName = new GString(p->file_name);
-+    GooString *docName = new GooString(p->file_name);
-     p->doc = new PDFDoc(docName);       // takes ownership of docName
-     if (!p->doc->isOk() || !p->doc->okToPrint()) {
-         pdftex_fail("xpdf: reading PDF image failed");
-@@ -520,7 +521,7 @@ static void copyObject(Object * obj)
-     int i, l, c;
-     Ref ref;
-     char *p;
--    GString *s;
-+    GooString *s;
-     if (obj->isBool()) {
-         pdf_printf("%s", obj->getBool()? "true" : "false");
-     } else if (obj->isInt()) {
-@@ -713,7 +714,7 @@ read_pdf_info(char *image_name, char *pa
-     epdf_num_pages = pdf_doc->doc->getCatalog()->getNumPages();
-     if (page_name) {
-         // get page by name
--        GString name(page_name);
-+        GooString name(page_name);
-         LinkDest *link = pdf_doc->doc->findDest(&name);
-         if (link == 0 || !link->isOk())
-             pdftex_fail("PDF inclusion: invalid destination <%s>", page_name);
-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
-@@ -35,7 +35,7 @@ Franklin Street, Fifth Floor, Boston, MA
- #include "zlib.h"
- #include "ptexlib.h"
- #include "png.h"
--#include "xpdf/config.h"        /* just to get the xpdf version */
-+#include <poppler/poppler-config.h>        /* just to get the poppler version */
- 
- static const char _svn_version[] =
-     "$Id: pdftex-1.40.9-poppler.patch,v 1.1 2008/09/03 18:48:18 aballier Exp $ $URL: svn://192.168.0.1/svnroot/pdftex/branches/stable/source/src/texk/web2c/pdftexdir/utils.c $";
-@@ -1267,7 +1267,7 @@ 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 xpdf version %s\n",
-+                    "Compiled with poppler version %s\n",
-                     PNG_LIBPNG_VER_STRING, png_libpng_ver,
-                     ZLIB_VERSION, zlib_version, xpdfVersion);
- }
diff --git a/dev-tex/pdftex/files/pdftex-1.40.9-xpdfversion.patch b/dev-tex/pdftex/files/pdftex-1.40.9-xpdfversion.patch
deleted file mode 100644
index c6f0c79f6985..000000000000
--- a/dev-tex/pdftex/files/pdftex-1.40.9-xpdfversion.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-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
deleted file mode 100644
index 65503fe26bb4..000000000000
--- a/dev-tex/pdftex/pdftex-1.40.9.ebuild
+++ /dev/null
@@ -1,109 +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.9.ebuild,v 1.20 2010/02/10 22:06:54 ssuominen 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/download.php/1240/${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
-	media-libs/libpng
-	sys-libs/zlib"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-S="${WORKDIR}/${P}/src"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-poppler.patch"
-	epatch "${FILESDIR}/${P}-xpdfversion.patch"
-	epatch "${FILESDIR}/${P}-poppler-0.11.patch"
-	epatch "${FILESDIR}/${P}-getline.patch"
-	epatch "${FILESDIR}/${P}-poppler-0.11.3.patch"
-	elibtoolize
-}
-
-src_compile() {
-	# 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
-
-	tc-export CC CXX AR RANLIB
-
-	econf \
-		--without-cxx-runtime-hack	\
-		--without-aleph				\
-		--without-bibtex8			\
-		--without-cjkutils			\
-		--without-detex				\
-		--without-dialog			\
-		--without-dtl				\
-		--without-dvi2tty			\
-		--without-dvidvi			\
-		--without-dviljk			\
-		--without-dvipdfm			\
-		--without-dvipdfmx			\
-		--without-dvipng			\
-		--without-dvipos			\
-		--without-dvipsk			\
-		--without-etex				\
-		--without-gsftopk			\
-		--without-lacheck			\
-		--without-lcdf-typetools	\
-		--without-makeindexk		\
-		--without-mkocp-default		\
-		--without-mkofm-default		\
-		--without-musixflx			\
-		--without-omega				\
-		--without-pdfopen			\
-		--without-ps2eps			\
-		--without-ps2pkm			\
-		--without-psutils			\
-		--without-sam2p				\
-		--without-seetexk			\
-		--without-t1utils			\
-		--without-tetex				\
-		--without-tex4htk			\
-		--without-texi2html			\
-		--without-texinfo			\
-		--without-texlive			\
-		--without-ttf2pk			\
-		--without-tth				\
-		--without-xdv2pdf			\
-		--without-xdvik				\
-		--without-xdvipdfmx			\
-		--without-xetex				\
-		--disable-largefile			\
-		--with-system-zlib			\
-		--with-system-pnglib		\
-		--disable-multiplatform
-
-	cd "${S}/texk/web2c"
-	emake \
-		LIBXPDFDEP="" LDLIBXPDF="$(pkg-config --libs poppler)" \
-		LIBXPDFSRCDIR="/usr/include/poppler" LIBXPDFDIR="/usr/include/poppler" \
-		ZLIBSRCDIR="." \
-		pdftex || die "emake pdftex failed"
-}
-
-src_install() {
-	cd "${S}/texk/web2c"
-	emake bindir="${D}/usr/bin" \
-		LIBXPDFDEP="" LDLIBXPDF="$(pkg-config --libs poppler)" \
-		LIBXPDFSRCDIR="/usr/include/poppler" LIBXPDFDIR="/usr/include/poppler" \
-		ZLIBSRCDIR="." \
-		install-pdftex || die "install pdftex failed"
-	# Rename it
-	mv "${D}/usr/bin/pdftex" "${D}/usr/bin/pdftex-${P}" || die "renaming failed"
-}