Fix poppler depend.

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

5 files changed, 21 insertions, 17 deletions

diff --git a/app-text/xournal/ChangeLog b/app-text/xournal/ChangeLog
index a16bf0b9fe36..67529849562a 100644
--- a/app-text/xournal/ChangeLog
+++ b/app-text/xournal/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/xournal
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xournal/ChangeLog,v 1.12 2009/12/26 19:22:31 pva Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/xournal/ChangeLog,v 1.13 2010/02/10 14:26:42 ssuominen Exp $
+
+  10 Feb 2010; Samuli Suominen <ssuominen@gentoo.org>
+  xournal-0.4.2.1-r1.ebuild, xournal-0.4.5.ebuild, xournal-0.4.5-r1.ebuild:
+  Fix poppler depend.
 
   26 Dec 2009; Peter Volkov <pva@gentoo.org> xournal-0.4.2.1-r1.ebuild,
   xournal-0.4.5.ebuild, xournal-0.4.5-r1.ebuild:
diff --git a/app-text/xournal/Manifest b/app-text/xournal/Manifest
index 8712e85a4c32..98587b3f9d02 100644
--- a/app-text/xournal/Manifest
+++ b/app-text/xournal/Manifest
@@ -2,8 +2,8 @@ AUX xournal-0.4.2.1-pdf-annotation.patch 997 RMD160 e03546e87d39d18af2e93c8d2f62
 AUX xournal-0.4.5-xoprint-len.patch 4299 RMD160 e1fe28debea0d010494aa79f3a6eaf47853dd0b2 SHA1 2b642dc6d01a8c89095e150323ca755276000636 SHA256 0b2bb739e2719658186df82379f083daf71f0a6883aeb7f93f97312cf4cdb96e
 DIST xournal-0.4.2.1.tar.gz 516147 RMD160 8daf2deac1f4e07284ba8818eec2968bdbd9baea SHA1 e401675154afd207f7b345c2191714f351837251 SHA256 2eea4c3d455b54020af738467ac026c632bb509ebc9d7f0d4b019ea66163b8ff
 DIST xournal-0.4.5.tar.gz 425062 RMD160 a4228e6874482bd381c59cd8e3db1100361c1d40 SHA1 390cb275774469ed1b04b7268dd625bd456c895e SHA256 a7d7c2cb544451939779276e6e5ee5acc756bd0efb5253de15dc00bfe07755d1
-EBUILD xournal-0.4.2.1-r1.ebuild 1085 RMD160 3a4d506bbd342b23265ad7f0b9a6c87e152b6b88 SHA1 1622adbd0cfebbc8917694dc8466d9019515b168 SHA256 539f20a17d531a9cebf8ad3c1e07f0243c8f5dbfed90754f411e3439670adda7
-EBUILD xournal-0.4.5-r1.ebuild 1116 RMD160 352c24c8423bdcfa5ed1c5175c2eac1c3a25940f SHA1 29a82ea4ca892dfc6a21dd0e929507e45161c7ed SHA256 330f31bff8c5cee246dea01dbc6f9b2c41ed6ebdf951d21f3c25de1c74bf5a15
-EBUILD xournal-0.4.5.ebuild 1030 RMD160 dd8fa50720c49c3c8539af7f1b69f61fad139865 SHA1 e2c59aad5c8662a94887572528e2190164cf7854 SHA256 f1cfd752b4bd2aa991d1eb4032eccf16a37bab409af13a19152cc98d1cc7cbba
-MISC ChangeLog 2251 RMD160 2f4088c2b8907f31be04044873560a1fa1b7a8a6 SHA1 ffa31aff2bef7f1103a7447e53113c68bdf8fc1d SHA256 5431c5a9dd0a9cde776f6363cd1348c85add96fe0d94aaa90268abb23e373059
+EBUILD xournal-0.4.2.1-r1.ebuild 1105 RMD160 1a597ebf0cb901a0c6065c31c798b780d36278ad SHA1 62f205ddb813d1f12d3928f003aa58d5a0b03e85 SHA256 e14515d137e4649e5341f24a078d76f59fd95bbd8821ee7f87d9a597a08559dd
+EBUILD xournal-0.4.5-r1.ebuild 1143 RMD160 10ce3908abf34b59c53519c60db395e579c5da8c SHA1 895a7cacbfbe3d803f6bf5fc337e47fafe8f5ab8 SHA256 e123c962e39447ba8d9db615e210c9a5127d753df14d79cb36bdb5fbbe35f457
+EBUILD xournal-0.4.5.ebuild 1057 RMD160 24ca9b646e64d2cdf0814a02f128d9a85087b40c SHA1 93f8a8ac9dfcdbea56e8d647c5bbe5dc5dcd1afd SHA256 b091d5d3582b405103a3c4488d64f62eb8e89affef7b0b203ebb2ce403f28e64
+MISC ChangeLog 2410 RMD160 b8ccb53671cd7abe69cae9977f31abc072402321 SHA1 b9d1e49b2bbafe2c83cedc59e8a5de50c14adfcb SHA256 561b3c30d276888f530e20d8486748cdcef9678d975b590de600ff8c1b2ef9bb
 MISC metadata.xml 608 RMD160 3a4dfac1c981219f56ff49aae0e1f0a18ca5a439 SHA1 a06f91dfa4bfd4d99e8175378c2b72f5912c6833 SHA256 f6691d5ca74e6fed04ae9cf84888def47bd29b3df5626d6d33b412bd9bde04aa
diff --git a/app-text/xournal/xournal-0.4.2.1-r1.ebuild b/app-text/xournal/xournal-0.4.2.1-r1.ebuild
index 8cf8146f7731..072f652224bb 100644
--- a/app-text/xournal/xournal-0.4.2.1-r1.ebuild
+++ b/app-text/xournal/xournal-0.4.2.1-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/app-text/xournal/xournal-0.4.2.1-r1.ebuild,v 1.5 2009/12/26 19:22:31 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xournal/xournal-0.4.2.1-r1.ebuild,v 1.6 2010/02/10 14:26:42 ssuominen Exp $
 
 EAPI=2
 inherit gnome2 autotools
@@ -20,7 +20,7 @@ DEPEND="${DEPEND}
 	>=gnome-base/libgnomeprint-2.2
 	>=gnome-base/libgnomeprintui-2.2"
 RDEPEND="${DEPEND}
-	pdf? ( virtual/poppler-utils app-text/ghostscript-gpl )"
+	pdf? ( >=app-text/poppler-0.12.3-r3[utils] app-text/ghostscript-gpl )"
 DEPEND="${DEPEND}
 	dev-util/pkgconfig"
 
diff --git a/app-text/xournal/xournal-0.4.5-r1.ebuild b/app-text/xournal/xournal-0.4.5-r1.ebuild
index cc2df00fb2fd..883b937a6c10 100644
--- a/app-text/xournal/xournal-0.4.5-r1.ebuild
+++ b/app-text/xournal/xournal-0.4.5-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/app-text/xournal/xournal-0.4.5-r1.ebuild,v 1.2 2009/12/26 19:22:31 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xournal/xournal-0.4.5-r1.ebuild,v 1.3 2010/02/10 14:26:42 ssuominen Exp $
 
 EAPI=2
 inherit gnome2 eutils
@@ -19,9 +19,9 @@ DEPEND=">=x11-libs/gtk+-2.10
 	>=gnome-base/libgnomecanvas-2.4
 	>=gnome-base/libgnomeprint-2.2
 	>=gnome-base/libgnomeprintui-2.2
-	>=virtual/poppler-glib-0.5.4"
+	>=app-text/poppler-0.12.3-r3[cairo]"
 RDEPEND="${DEPEND}
-	pdf? ( virtual/poppler-utils app-text/ghostscript-gpl )"
+	pdf? ( >=app-text/poppler-0.12.3-r3[utils] app-text/ghostscript-gpl )"
 DEPEND="${DEPEND}
 	dev-util/pkgconfig"
 
diff --git a/app-text/xournal/xournal-0.4.5.ebuild b/app-text/xournal/xournal-0.4.5.ebuild
index acf16706753e..67b9c7a6f8c5 100644
--- a/app-text/xournal/xournal-0.4.5.ebuild
+++ b/app-text/xournal/xournal-0.4.5.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/app-text/xournal/xournal-0.4.5.ebuild,v 1.3 2009/12/26 19:22:31 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xournal/xournal-0.4.5.ebuild,v 1.4 2010/02/10 14:26:42 ssuominen Exp $
 
 EAPI=2
 inherit gnome2
@@ -19,9 +19,9 @@ DEPEND=">=x11-libs/gtk+-2.10
 	>=gnome-base/libgnomecanvas-2.4
 	>=gnome-base/libgnomeprint-2.2
 	>=gnome-base/libgnomeprintui-2.2
-	>=virtual/poppler-glib-0.5.4"
+	>=app-text/poppler-0.12.3-r3[cairo]"
 RDEPEND="${DEPEND}
-	pdf? ( virtual/poppler-utils app-text/ghostscript-gpl )"
+	pdf? ( >=app-text/poppler-0.12.3-r3[utils] app-text/ghostscript-gpl )"
 DEPEND="${DEPEND}
 	dev-util/pkgconfig"