Fix poppler depend.

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

4 files changed, 19 insertions, 14 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/Manifest b/dev-tex/pdftex/Manifest
index 3789194fb2e2..ea7a4f7f141b 100644
--- a/dev-tex/pdftex/Manifest
+++ b/dev-tex/pdftex/Manifest
@@ -6,7 +6,7 @@ AUX pdftex-1.40.9-poppler.patch 2855 RMD160 ae883ff7dbafd9452aa3d52233df3af2e5f2
 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 3157 RMD160 380eea30dd28f356fd46e1d31e3a0588ce9cf529 SHA1 ee97462bc3f557f4f963c18817e0fc565d4ec1a9 SHA256 0e8cec9cf2289bc4e049e92686d59ce801d0e1b494b30888bf724bfeccfe9704
-EBUILD pdftex-1.40.9.ebuild 2977 RMD160 b9e29012f4ff72803a633dff88750f3a1774f0ab SHA1 42e3d22c0c55a85ee756e73a9908083394fddf58 SHA256 911638250d9640e61dc8cc10125fd65afa1109c3942870755fda1191bc27b76c
-MISC ChangeLog 3334 RMD160 f07aab7e26eb6b8e7bb7d70a53b893c66972abb0 SHA1 c43850ee362f575bab24ca1d75b3515205326013 SHA256 aa1b4c8908014e4cb4b8559b3a2ef721e84ad521f5736b11a0f1b7165d2365b9
+EBUILD pdftex-1.40.10.ebuild 3178 RMD160 e0dae9bc69fae3ce00219624f89ca902f1a75cc9 SHA1 6be574dec7a82c7dc1674e70d132b9f8737dc933 SHA256 74e86c66749d60dc385f97dd7ad59c87fdd65b7aaf9fc2a7dc970d48f80eee84
+EBUILD pdftex-1.40.9.ebuild 2942 RMD160 e2cb2d95b7daa1ffd3caf3594d069aac210c2bf3 SHA1 8b2db6c732be3a273552349e937eeefc7083d182 SHA256 e6c8014c8c057e022dfdc44152c35e2e9a04a718bbaab02879386b0ccd55d358
+MISC ChangeLog 3460 RMD160 5e368c810d7f4f4d04cd614fad9b50653a224f03 SHA1 f2464a373fa087bc028ecec0b5ead6fd25f31713 SHA256 64025c6c3b35c7b09408ec5c0bcf1737e01dbd7225e769cd74418e577d88e92e
 MISC metadata.xml 638 RMD160 59e3769086396359f1a50ee60b6702555770e33e SHA1 f9a566b850466987e74d5c16c345c54506ae4a0d SHA256 b28290517ed75fbaaa0282cdca3692f11635d173ee5dc5cb342f6071dbb3d3ea
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
 }