old

Package-Manager: portage-2.2.0_alpha63/cvs/Linux x86_64

4 files changed, 14 insertions, 185 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/Manifest b/dev-tex/pdftex/Manifest
index f7d4187972b0..3dfa7bad1e8e 100644
--- a/dev-tex/pdftex/Manifest
+++ b/dev-tex/pdftex/Manifest
@@ -1,18 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX pdftex-1.40.10-poppler.patch 2130 RMD160 34bf1d2ef9d60edf475c0db12c3016419acb4502 SHA1 81c6b1a2340ccc9f5b095d3d6192c4a665099f45 SHA256 4e0282c7adab34cb71806a73d61b3342b784ee69bf9e9187fe9b2c5a1b58945f
 AUX pdftex-1.40.11-libpng15.patch 8384 RMD160 4c23200710f948263072d5a0ea2970851f9246f1 SHA1 ac96cb79abad7e3a2b4533c4f4223f4c08d4e8be SHA256 3f054bb6e987cf54e852234496bb2e22bb7e6b26962ffff56bcec3c6174b695c
-DIST pdftex-1.40.10.tar.bz2 4990395 RMD160 34b55cd40081def07b987195eebd7c4adfdd1f0a SHA1 5bd5637fccb0ee67afa39d36ef9fea2f221610da SHA256 40f95b4374c92da4c72c014cee91306e4a5202c246ea66df526c10bb705c90bd
 DIST pdftex-1.40.11.tar.bz2 6108613 RMD160 730b25d1fb7b33ee2b35217c197aa88ea33de030 SHA1 300d7bdbfc3f2442803319c36956ce2a6fbf0953 SHA256 17bd8ac40f73cfb60328591c8353d82e8709f2472a251d170db695af9999036f
-EBUILD pdftex-1.40.10.ebuild 3172 RMD160 05f5cd91ac6b9bc2c0b2c1dbe5dde44972a2dd4c SHA1 53f7eaa952476c9bfbd3c54dbaf69391bb535e52 SHA256 d18000853991416553e836919e11a6813dd7388ea668b3f7a5ba83312a921833
 EBUILD pdftex-1.40.11.ebuild 2006 RMD160 1a5db1e1dd1b4799a41041a08c5b2a085a1e3ab9 SHA1 4d6bf001b4be63923332fa991e2178d7d3cd0e3d SHA256 f2f247b01f23045ba88860ceda589fce73cf0a47a3cc7ea5b6eeb7979d7014e6
-MISC ChangeLog 4604 RMD160 8ea8508924e7bb337db793c2b70e719233da621a SHA1 e42e9bd91b71e59e9d6ed150adb02fb2cd43a5fd SHA256 e47dcc7b1d3f076d463244225cc49c4d7b58740a213d9a001782f372fd439fa2
+MISC ChangeLog 4729 RMD160 9527db2497419af38683c8b74712424b733a8504 SHA1 233f2823fd279238929e0dfb6102658d17e08d4e SHA256 5e44226da1b69cf818b6853361f29e329b541fc31c5e625f6645a986a1f78263
 MISC metadata.xml 638 RMD160 59e3769086396359f1a50ee60b6702555770e33e SHA1 f9a566b850466987e74d5c16c345c54506ae4a0d SHA256 b28290517ed75fbaaa0282cdca3692f11635d173ee5dc5cb342f6071dbb3d3ea
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk4bScAACgkQvFcC4BYPU0qVYgCgsob529koIFxhhvpOROc5pZAx
-Qr4An11kW5Edu7wGx7UHJqw/mFYb+TbS
-=bJJn
+iQEcBAEBAgAGBQJOkWRXAAoJEEdUh39IaPFNB1sH/0aMiftplzpOsYDZmYz0dWLE
+5MjuZ2gZ0k5NeEaTwPkWUWFGv1wuxxvpjmMDPxi8ni5DkM7FxzNELwSXEkYXwPJ5
+vgzFUJ/YW8yb+pSBYYCHopstmjsmBEJdeNLpq7QMMRoroZfZqCR5y3mQmJNBa7e/
+ChtvDu+Ln+lO/J8BI/WvXfGbxiy1RdaoUX5D7ADYs+/NSQQmoCg55s28NDWhN0vG
+nW3u7WjNZPahrcOOheypHOnfeYLEHSDK4CmCzZHdOtk3VCZVspqm6ddPM5uY1Oqt
+fx2ZrnIq/0Hw664XRrfIZcnvyNcYHW0UJN6YJDqUKwm1n4NGiq1zdP4s642Jszk=
+=pb4s
 -----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
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
-}