Fix poppler depend.

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

3 files changed, 16 insertions, 11 deletions

diff --git a/dev-tex/pdftex/ChangeLog b/dev-tex/pdftex/ChangeLog
index d718485e5e57..0af0c9e9c328 100644
--- a/dev-tex/pdftex/ChangeLog
+++ b/dev-tex/pdftex/ChangeLog
@@ -1,6 +1,10 @@
 # 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.24 2010/02/07 18:17:01 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tex/pdftex/ChangeLog,v 1.25 2010/02/10 22:06:54 ssuominen Exp $
+
+  10 Feb 2010; Samuli Suominen <ssuominen@gentoo.org> pdftex-1.40.9.ebuild,
+  pdftex-1.40.10.ebuild:
+  Fix poppler depend.
 
   07 Feb 2010; Raúl Porcel <armin76@gentoo.org> pdftex-1.40.10.ebuild:
   alpha/arm/ia64/s390/sh/sparc stable wrt #302203
diff --git a/dev-tex/pdftex/pdftex-1.40.10.ebuild b/dev-tex/pdftex/pdftex-1.40.10.ebuild
index 5e4eafb584a8..185c42cff9eb 100644
--- a/dev-tex/pdftex/pdftex-1.40.10.ebuild
+++ b/dev-tex/pdftex/pdftex-1.40.10.ebuild
@@ -1,7 +1,8 @@
 # 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.6 2010/02/07 18:17:01 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tex/pdftex/pdftex-1.40.10.ebuild,v 1.7 2010/02/10 22:06:54 ssuominen Exp $
 
+EAPI=2
 inherit libtool toolchain-funcs eutils multilib
 
 DESCRIPTION="Standalone (patched to use poppler) version of pdftex"
@@ -14,7 +15,7 @@ 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
+RDEPEND=">=app-text/poppler-0.12.3-r3[xpdf-headers]
 	media-libs/libpng
 	sys-libs/zlib
 	virtual/tex-base
@@ -22,16 +23,14 @@ RDEPEND=">=virtual/poppler-0.11.3
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
-S="${WORKDIR}/${P}/src"
+S=${WORKDIR}/${P}/src
 
 src_unpack() {
-	unpack ${A}
-	cd "${S}"
 	epatch "${FILESDIR}/${P}-poppler.patch"
 	elibtoolize
 }
 
-src_compile() {
+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.
@@ -109,7 +108,9 @@ src_compile() {
 		--with-system-pnglib		\
 		--disable-multiplatform		\
 		${myconf}
+}
 
+src_compile() {
 	emake SHELL=/bin/sh || die
 }
 
diff --git a/dev-tex/pdftex/pdftex-1.40.9.ebuild b/dev-tex/pdftex/pdftex-1.40.9.ebuild
index 125aeb9573e4..65503fe26bb4 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-2009 Gentoo Foundation
+# 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.19 2009/12/12 12:27:23 aballier Exp $
+# $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
 
@@ -14,7 +14,7 @@ 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=">=virtual/poppler-0.8
+RDEPEND=">=app-text/poppler-0.12.3-r3
 	media-libs/libpng
 	sys-libs/zlib"
 DEPEND="${RDEPEND}
@@ -29,7 +29,7 @@ src_unpack() {
 	epatch "${FILESDIR}/${P}-xpdfversion.patch"
 	epatch "${FILESDIR}/${P}-poppler-0.11.patch"
 	epatch "${FILESDIR}/${P}-getline.patch"
-	has_version '>=dev-libs/poppler-0.11.3' && epatch "${FILESDIR}/${P}-poppler-0.11.3.patch"
+	epatch "${FILESDIR}/${P}-poppler-0.11.3.patch"
 	elibtoolize
 }