Fix poppler depend.

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

5 files changed, 20 insertions, 15 deletions

diff --git a/gnustep-libs/popplerkit/ChangeLog b/gnustep-libs/popplerkit/ChangeLog
index 77d74955d474..131f0579adcc 100644
--- a/gnustep-libs/popplerkit/ChangeLog
+++ b/gnustep-libs/popplerkit/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnustep-libs/popplerkit
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-libs/popplerkit/ChangeLog,v 1.22 2009/07/19 15:27:49 nixnut Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnustep-libs/popplerkit/ChangeLog,v 1.23 2010/02/10 20:04:33 ssuominen Exp $
+
+  10 Feb 2010; Samuli Suominen <ssuominen@gentoo.org> popplerkit-0.2.ebuild,
+  popplerkit-0.4.0-r1.ebuild, popplerkit-0.4.1.ebuild:
+  Fix poppler depend.
 
   19 Jul 2009; nixnut <nixnut@gentoo.org> popplerkit-0.4.1.ebuild:
   ppc stable #273704
diff --git a/gnustep-libs/popplerkit/Manifest b/gnustep-libs/popplerkit/Manifest
index faf57026a168..52e04c08c57e 100644
--- a/gnustep-libs/popplerkit/Manifest
+++ b/gnustep-libs/popplerkit/Manifest
@@ -3,8 +3,8 @@ AUX popplerkit-0.4.0-config-as-needed.patch 1636 RMD160 a9b2c2a0222e549f7aa15462
 DIST etoile-0.2.tar.gz 21373391 RMD160 99aa05909469fc7ffae9118829a5f155050271c5 SHA1 9ecf33b0130687c1946da3eb7568605b5e9dfcbf SHA256 293cb9e5c50b27a8e38f16374c17595f20c5950ba44d00ffac3fb17ddd852d2c
 DIST etoile-0.4.0.tar.gz 8892225 RMD160 cf5396cdd2e4e8477f4ac1c493f814b862999a75 SHA1 3848ededa6f5f7981e208cea0c1833416b425e4c SHA256 785774e4697e7f1387d0c92c04886e6705d44272aeeb08ebd648871be5f5b59f
 DIST etoile-0.4.1.tar.bz2 8281449 RMD160 f7965102a42e8616007baf89f4d11019aa12ef99 SHA1 b87af57c4a39aa939bee9ae883092bc86d942014 SHA256 2c9f189a0eae9dbc85589660a55faac498d05a056bf8148fa91f25455728cf25
-EBUILD popplerkit-0.2.ebuild 738 RMD160 dfc61a9924cbee427c67eebf7e907444342614bf SHA1 fe6f32e957303cb533869f13de0680a129cc33f5 SHA256 e84326ba87814d1be89d848e9c29a8243923f7184c510f04c2202356fbd52fa7
-EBUILD popplerkit-0.4.0-r1.ebuild 979 RMD160 8ee0016a5e7071e38fadd9564d9a8610db5f0de4 SHA1 8972a72d134e5edae9d4b2df729d9375b48d5723 SHA256 c28ea98721c694bcd29682ba4a4cb62e6393b3a158663e697abb0818c7e1f5d4
-EBUILD popplerkit-0.4.1.ebuild 963 RMD160 c11f2169346a157170b14c7486ce2ca92e460712 SHA1 17dfa4077b461e2a7efd8c0c43e8e53d31274949 SHA256 4416a605401a6168bbc778d071ca88ead4a8cfa31ba309da0f0354a47f614487
-MISC ChangeLog 3054 RMD160 1eac6e24d8367a48586f95915a03d667d406e15e SHA1 c07de6d5ed230bf5feb3bbb124a23d2c7e486049 SHA256 57fd3f7cf176e5527c66a6fb5347599770bbcdcb3b58e68ab3802d7c60219a5f
+EBUILD popplerkit-0.2.ebuild 735 RMD160 1d80cf16fa56f4893d1d5e36e2d285627f0da70f SHA1 aca2fc99a30a2fd549de2ca4f59c0bf710626d2b SHA256 8f28c2c11f4f15143fb9f4efeb91c26f58edaca2f1b2aa9df34bea06b30ead6d
+EBUILD popplerkit-0.4.0-r1.ebuild 975 RMD160 4a071b2266bcbb63f23c1d41e83421edc79d8edc SHA1 31eff3fedd40ecb46131f3a6a5622b22a39b433e SHA256 bc12e6df8c95520a1ee86d5eb7a9ec11f575eea2aa2847d76c779b5a309f3347
+EBUILD popplerkit-0.4.1.ebuild 1025 RMD160 bed3f287dd0eee8a66166caf9adf8f4e3f28d315 SHA1 11dfc9f783a088e3f2cfaa281086a9e7cf229d19 SHA256 b70fe3dfe2a65d0e6d93524a723de36331101492b9ce352e82a16afe082d1c96
+MISC ChangeLog 3212 RMD160 5c112909b7ab7d88fd17639aa7b240a7f0b1deda SHA1 fe2ad61f153e76859f435a682af2f1f125f5e140 SHA256 becb10b5ec52820dc0597400616e20f24c8b100f79212cb8d722b10972be1c6a
 MISC metadata.xml 249 RMD160 ba5b4e225358e1ecbc6edcd8b8a5c314d7897b18 SHA1 4c78f83a26931b22608dbddf72ed75de1e2b5589 SHA256 78beb5173d3c75a10c26540981e01218b86d92441d0a09c84b0af106d2e8b24a
diff --git a/gnustep-libs/popplerkit/popplerkit-0.2.ebuild b/gnustep-libs/popplerkit/popplerkit-0.2.ebuild
index a01e606eb6a7..a4e4320c672a 100644
--- a/gnustep-libs/popplerkit/popplerkit-0.2.ebuild
+++ b/gnustep-libs/popplerkit/popplerkit-0.2.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/gnustep-libs/popplerkit/popplerkit-0.2.ebuild,v 1.9 2009/03/30 13:53:43 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-libs/popplerkit/popplerkit-0.2.ebuild,v 1.10 2010/02/10 20:04:33 ssuominen Exp $
 
 inherit gnustep-2
 
@@ -13,7 +13,7 @@ LICENSE="GPL-2"
 KEYWORDS="amd64 ppc x86"
 SLOT="0"
 
-RDEPEND=">=virtual/poppler-0.4
+RDEPEND="app-text/poppler
 	>=media-libs/freetype-2"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
diff --git a/gnustep-libs/popplerkit/popplerkit-0.4.0-r1.ebuild b/gnustep-libs/popplerkit/popplerkit-0.4.0-r1.ebuild
index 7d55f5ee721d..0e0b0d99eb99 100644
--- a/gnustep-libs/popplerkit/popplerkit-0.4.0-r1.ebuild
+++ b/gnustep-libs/popplerkit/popplerkit-0.4.0-r1.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/gnustep-libs/popplerkit/popplerkit-0.4.0-r1.ebuild,v 1.3 2009/03/30 13:53:43 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-libs/popplerkit/popplerkit-0.4.0-r1.ebuild,v 1.4 2010/02/10 20:04:33 ssuominen Exp $
 
 inherit gnustep-2
 
@@ -14,7 +14,7 @@ KEYWORDS="~amd64 ~ppc ~x86"
 SLOT="0"
 IUSE=""
 
-RDEPEND=">=virtual/poppler-0.6
+RDEPEND="app-text/poppler
 	>=media-libs/freetype-2"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
diff --git a/gnustep-libs/popplerkit/popplerkit-0.4.1.ebuild b/gnustep-libs/popplerkit/popplerkit-0.4.1.ebuild
index 70275641b379..d6cf62a0d952 100644
--- a/gnustep-libs/popplerkit/popplerkit-0.4.1.ebuild
+++ b/gnustep-libs/popplerkit/popplerkit-0.4.1.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/gnustep-libs/popplerkit/popplerkit-0.4.1.ebuild,v 1.5 2009/07/19 15:27:49 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-libs/popplerkit/popplerkit-0.4.1.ebuild,v 1.6 2010/02/10 20:04:33 ssuominen Exp $
 
 EAPI=2
 
@@ -16,7 +16,8 @@ KEYWORDS="amd64 ppc x86"
 SLOT="0"
 IUSE=""
 
-RDEPEND=">=virtual/poppler-0.6
+# Check me. Is xpdf-headers required?
+RDEPEND=">=app-text/poppler-0.12.3-r3[xpdf-headers]
 	>=media-libs/freetype-2"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"