Fix poppler depend.

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

5 files changed, 15 insertions, 21 deletions

diff --git a/app-text/calibre/ChangeLog b/app-text/calibre/ChangeLog
index 733982e63ba5..d981a6a3a03e 100644
--- a/app-text/calibre/ChangeLog
+++ b/app-text/calibre/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/calibre
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.75 2010/02/06 18:56:51 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.76 2010/02/10 21:04:19 ssuominen Exp $
+
+  10 Feb 2010; Samuli Suominen <ssuominen@gentoo.org> calibre-0.6.33.ebuild,
+  calibre-0.6.36.ebuild, calibre-0.6.37.ebuild:
+  Fix poppler depend.
 
   06 Feb 2010; Zac Medico <zmedico@gentoo.org> calibre-0.6.37.ebuild:
   Set PYTHON_USE_WITH=sqlite to generate the python[sqlite] dep.
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index b13222862269..cc7e0b556fd9 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST calibre-0.4.77.tar.bz2 4054837 RMD160 24c64276b2413ac8e0974f8f0caa535e8635df3c SHA1 30e39484987a606fb875c6b4afa8785fed0aa4b3 SHA256 4075d8d20713d2e5e299bc3ff51fd541474dff8576c9a6d12f4159c094d73dab
 DIST calibre-0.5.14.tar.gz 7693491 RMD160 175e473e74e036ad245db35a08e700e92d8c718d SHA1 f3241ce95fb590873427d9a9c0881f336b995aef SHA256 71caa8e0540879b851afc5b10a588279b559ee24f2f7375c10737eafd0b2f24e
 DIST calibre-0.6.11.tar.gz 8771885 RMD160 6cc9155560915a3d74314294514a6a97b077cdb9 SHA1 1068e8935318201fc0de7e52a72317c825e7817f SHA256 de71128ea76f468e56201d9940e550b61fe2691d96f1943f1905870d32907b8a
@@ -10,15 +7,8 @@ DIST calibre-0.6.37.tar.gz 11423275 RMD160 70354735d94295787b9b5bcaaf92f6c178cd9
 EBUILD calibre-0.4.77.ebuild 2282 RMD160 3d0daa0c5740299d302be542de93b42aba01a7b5 SHA1 609941ba89bf2274b2ad776c316140563d0c7366 SHA256 76479992561158d6d7eaa7ebe117b430b8836bbe774f84ab58a7ce037b4604e3
 EBUILD calibre-0.5.14-r1.ebuild 4260 RMD160 dc4d9465d99914e4336ba4b35cd8257435769f18 SHA1 438b4b4cc28a06a7f5bdbccc70862d6810c95904 SHA256 fcc6677b0a7047ce5f377d0cef1c8927e6c70dc87205542ab942f310f6bf8b4b
 EBUILD calibre-0.6.11.ebuild 4074 RMD160 c9951c75216bddc46887edddab6c93b444c8b06c SHA1 0fa086e34ec29fe3847838ff41d1674153af96ae SHA256 f65bb03f0a5ffa3d6b896083e69f9805c3d290c0a04b8c5ff46a38b17c1ecc6b
-EBUILD calibre-0.6.33.ebuild 4365 RMD160 df606b35eceed94b4076f0d4be19d7e73f521a01 SHA1 b880dcd54060ed32cdebf6cf1042d851272e4156 SHA256 011930b1c20414781c7b14c8dbfeb6a7992359e540f53cebff6f3d87272e14ea
-EBUILD calibre-0.6.36.ebuild 4365 RMD160 2be458381c87b9c3df8485c9d10887630184c70f SHA1 ecef7db0a034f617f057e28854c4cbd951875d87 SHA256 852339b299b84442eec95fb458526e63c49a87f77484841656e34e628175f6b3
-EBUILD calibre-0.6.37.ebuild 4443 RMD160 5e06e8dcea59855d4cf955fb4b030010b63ff125 SHA1 542fd2289023d0cc3b8b93212e9ba3b16dc3d1bd SHA256 f7b5d895aaa1dc285b007de1dcd1ac15951db56e356ca2b96249d6ccb0820104
-MISC ChangeLog 12017 RMD160 b345811a33b37fc7833d7e06eac53fcde082f3f2 SHA1 47cd1a2eeec3c97e49ff0723159d7ba2ebbbd5ef SHA256 b0aad6fc5763e37de5af8d8b8f799d68cc8c2fb1db5139419be67121d01bdeba
+EBUILD calibre-0.6.33.ebuild 4389 RMD160 673bdbf8c4dce6c75cecac685f7b8201700219bd SHA1 8431152c509ddb289c76db168401b5212b2619ab SHA256 525a0979c142fa93ae6556fce16510407cf6bd2b7650287cda4a4f9c8e12d44d
+EBUILD calibre-0.6.36.ebuild 4389 RMD160 a7ee187dba8fa3cb9ca6697e344c1fff0a0e9dd9 SHA1 2a57c65c11e04eee2f2e98e8047d2969d877a22e SHA256 c127706855249ce421332c9fcfcd0eafa28a1b60965e2acd1f0475f79f34d004
+EBUILD calibre-0.6.37.ebuild 4467 RMD160 05ed28375fbb54daa9ee96849ead59ac069b6efb SHA1 fa6b3ee7300d81a7c428c41299fe2801b691bd81 SHA256 f3431d09f13c9dd86a0daf964fb9fa9b80c46675db70f7cad4068d7ac31f11ce
+MISC ChangeLog 12167 RMD160 6140a58a7c15cdc8c8b50512134d128d1ed6f0ed SHA1 de28adb4cdddeb35d7ad068c9f96bc457b2cb56b SHA256 0d9730e19d410b07c63c944a7645a792bc276ac799935c931aad1759aca9688c
 MISC metadata.xml 231 RMD160 d960211907e25a59573b7be5bb36be9b47bd4c3c SHA1 197ba481e4ddb1dd2776f589fe7339d5f0f9868f SHA256 c97fff2a7f866fcaaa116ae2b946a9422dca2d6b04c702097b02e175d0a07572
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAkttu7EACgkQ/ejvha5XGaPvngCfWzpvwBtdyTO7VBTbL6pv1Ouv
-qKoAoLylRmEYoE9pdm1U0fSZuEFGodXn
-=Zuiz
------END PGP SIGNATURE-----
diff --git a/app-text/calibre/calibre-0.6.33.ebuild b/app-text/calibre/calibre-0.6.33.ebuild
index 7d831fd0f217..622621bb22fc 100644
--- a/app-text/calibre/calibre-0.6.33.ebuild
+++ b/app-text/calibre/calibre-0.6.33.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.6.33.ebuild,v 1.1 2010/01/13 01:39:10 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.6.33.ebuild,v 1.2 2010/02/10 21:04:19 ssuominen Exp $
 
 EAPI=2
 NEED_PYTHON=2.6
@@ -33,7 +33,7 @@ SHARED_DEPEND=">=dev-lang/python-2.6[sqlite]
 	>=dev-python/python-dateutil-1.4.1
 	>=dev-python/beautifulsoup-3.0.5
 	>=dev-python/dnspython-1.6.0
-	>=virtual/poppler-0.12.0
+	>=app-text/poppler-0.12.3-r3[qt4,xpdf-headers]
 	>=sys-apps/help2man-1.36.4
 	app-text/podofo"
 
diff --git a/app-text/calibre/calibre-0.6.36.ebuild b/app-text/calibre/calibre-0.6.36.ebuild
index d24a8bcbcc40..29573081517c 100644
--- a/app-text/calibre/calibre-0.6.36.ebuild
+++ b/app-text/calibre/calibre-0.6.36.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.6.36.ebuild,v 1.1 2010/01/30 11:02:03 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.6.36.ebuild,v 1.2 2010/02/10 21:04:19 ssuominen Exp $
 
 EAPI=2
 NEED_PYTHON=2.6
@@ -33,7 +33,7 @@ SHARED_DEPEND=">=dev-lang/python-2.6[sqlite]
 	>=dev-python/python-dateutil-1.4.1
 	>=dev-python/beautifulsoup-3.0.5
 	>=dev-python/dnspython-1.6.0
-	>=virtual/poppler-0.12.0
+	>=app-text/poppler-0.12.3-r3[qt4,xpdf-headers]
 	>=sys-apps/help2man-1.36.4
 	app-text/podofo"
 
diff --git a/app-text/calibre/calibre-0.6.37.ebuild b/app-text/calibre/calibre-0.6.37.ebuild
index 917ed53914da..cb55d5d6e3b7 100644
--- a/app-text/calibre/calibre-0.6.37.ebuild
+++ b/app-text/calibre/calibre-0.6.37.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.6.37.ebuild,v 1.4 2010/02/06 18:56:51 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.6.37.ebuild,v 1.5 2010/02/10 21:04:19 ssuominen Exp $
 
 EAPI=2
 PYTHON_DEPEND=2:2.6
@@ -33,7 +33,7 @@ SHARED_DEPEND=">=dev-python/setuptools-0.6_rc5
 	>=dev-python/python-dateutil-1.4.1
 	>=dev-python/beautifulsoup-3.0.5
 	>=dev-python/dnspython-1.6.0
-	>=virtual/poppler-0.12.0
+	>=app-text/poppler-0.12.3-r3[qt4,xpdf-headers]
 	>=sys-apps/help2man-1.36.4
 	app-text/podofo"