Fix poppler depend.

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

8 files changed, 32 insertions, 27 deletions

diff --git a/www-apps/swish-e/ChangeLog b/www-apps/swish-e/ChangeLog
index 4f1405c895ca..35744cb0f223 100644
--- a/www-apps/swish-e/ChangeLog
+++ b/www-apps/swish-e/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-apps/swish-e
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/swish-e/ChangeLog,v 1.16 2009/10/23 16:17:33 vostorga Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/swish-e/ChangeLog,v 1.17 2010/02/10 22:58:12 ssuominen Exp $
+
+  10 Feb 2010; Samuli Suominen <ssuominen@gentoo.org> swish-e-2.4.3.ebuild,
+  swish-e-2.4.3-r1.ebuild, swish-e-2.4.3-r2.ebuild, swish-e-2.4.4.ebuild,
+  swish-e-2.4.5.ebuild, swish-e-2.4.7.ebuild:
+  Fix poppler depend.
 
   23 Oct 2009; Víctor Ostorga <vostorga@gentoo.org> swish-e-2.4.3.ebuild,
   swish-e-2.4.3-r1.ebuild:
diff --git a/www-apps/swish-e/Manifest b/www-apps/swish-e/Manifest
index 19593e375e10..62380e30dedb 100644
--- a/www-apps/swish-e/Manifest
+++ b/www-apps/swish-e/Manifest
@@ -7,11 +7,11 @@ DIST swish-e-2.4.5.tar.gz 1474881 RMD160 b89d8cc8d8f850d2ddf0b52b583a1cb1c0f3c1b
 DIST swish-e-2.4.7.tar.gz 1523786 RMD160 ad436ecb69549cf92531bb681918442309b63b89 SHA1 0970c5f8dcb2f12130b38a9fc7dd99c2f2d7ebcb SHA256 5ddd541ff8ecb3c78ad6ca76c79e620f457fac9f7d0721ad87e9fa22fe997962
 EBUILD swish-e-2.2.2-r1.ebuild 898 RMD160 af4e1775181a6c836ad28a4b45e1c91ebe4f071f SHA1 8cadbd41f9e8f18b13e2cad1b71fbab85e8d78b5 SHA256 090e5883df8f042446aeee7d72d07bb999bdcdc072212eddb4468e7fe1f6457f
 EBUILD swish-e-2.2.2-r2.ebuild 1043 RMD160 4b2e98fb4cdf1a12e29adbb3b18bdd049a92c8dd SHA1 1f97e7543b9a36e6c360d11f545d5298b44cb10f SHA256 56007379b3b9a8b6cddb6bd796f7e1805391785aea294fa83471a6b1c1dd40ad
-EBUILD swish-e-2.4.3-r1.ebuild 1800 RMD160 3854a7200d0a1add9fed9c60926501f56feb91d0 SHA1 b7407ea0c2e8502756fabe0f5422e3fc4c662c10 SHA256 8d1785467d62be926e4b4c6c21591c779b4912c307802b4a989af7da5ec07470
-EBUILD swish-e-2.4.3-r2.ebuild 1797 RMD160 e3efc17798cacad483d4a76db4c4a9eff30f9059 SHA1 66698b55abb3ca322fbc51f5b626cdddfe024baf SHA256 806341f063c813c512b54a91ad03dd461b0616e48f266a126f8245a91c247041
-EBUILD swish-e-2.4.3.ebuild 1605 RMD160 5b95db3de11f46b43af68d5b901eef19b2819b5c SHA1 0594f2160cce849c3e07c030a6d354d46cc257c3 SHA256 a5903d956eae2d4549c801b60cbd1a46c828c6bba67b5789da3325fb82a1920e
-EBUILD swish-e-2.4.4.ebuild 1794 RMD160 b819f1a05f8812f7b741b987be84b259c5018a49 SHA1 3ac7a6a2cb8f01979430b1e0f49f90c16866fc43 SHA256 6cc1d74d3a79a99e88ad4319c0b39062e042a09fba8b811e59fcd8e6f24a6055
-EBUILD swish-e-2.4.5.ebuild 1794 RMD160 c42947b70a189fdc34dafc97e165baaaa8c74f27 SHA1 5e660e39a25bcb0ff96fcc49b876e9e0e24028c9 SHA256 f74fb0922f5d0956126883aab635f331a928b524e0bbc5cfaa7f14916f3ece55
-EBUILD swish-e-2.4.7.ebuild 1876 RMD160 5dfbfc060e6a0b6c5dd268482038c2c1cfc8dbaa SHA1 cb7d14a3cfaf69db893ad9e858bfe7f1769d8a13 SHA256 e794aa2fc9980861c20548921916c400777d66971863331670c7d1b53cbcdbac
-MISC ChangeLog 3238 RMD160 3bb2390b714271f7c6f8ae8e8973551a06cf9188 SHA1 3eae64ce579d42338f80b7f8b2b51438e689e10f SHA256 0727fcca43f9e81a6b79a36e0fdaeecfa8f7a5989fbdd35bbe74a096761cf94d
+EBUILD swish-e-2.4.3-r1.ebuild 1796 RMD160 9de68a1bb81cc05864ea819ac3e5c39133fd3497 SHA1 ce10d1e369b14bf971a598bb03fac03af03c27ce SHA256 101a04d4b30033c39749b097d8d7e2ff538a37bd4348229f3fd7322c64ae8baf
+EBUILD swish-e-2.4.3-r2.ebuild 1793 RMD160 d9329df9362356681025f1511b659b546fd0a382 SHA1 35c90cec559c65bf0b5affef385d8d085f83228f SHA256 7a09304a107c01f81c3d912f091437ea7d28b32f827b04fd68278e3cec591a25
+EBUILD swish-e-2.4.3.ebuild 1601 RMD160 d2d6fdf16b13a8c08dbb3d10abc8eb7c97056787 SHA1 77b99476b241e5390b0d9c8a207dc25bb4b046cb SHA256 6980a942421e74fae1237b3b027cd133052eb90f3ddde57739f9516ddab051ef
+EBUILD swish-e-2.4.4.ebuild 1790 RMD160 35797751f8db31c53d259755f90ff2f7ec72864a SHA1 d9b2749a2a621da3b9ba1a524850029b860fc76b SHA256 0d66eeaa4055444751b9bb3fc3a26e69799ef1a26adc67a2a498ffb696106f43
+EBUILD swish-e-2.4.5.ebuild 1790 RMD160 98f95c53ece33f7a2fdcfbda8fe7610aa10ba3c1 SHA1 6d4e8843ef51972d01c0650befe7330e1561f4d8 SHA256 9c6edc702a14f093e7139fd8085637d78f2e2394e133a57ef695aa8a08771f12
+EBUILD swish-e-2.4.7.ebuild 1895 RMD160 19186f802035b2f7f0d2aa711117991e54ba4e2a SHA1 6cd74b6af2c8271f51cd88bd632dc4c0036674c4 SHA256 74af5d130b8aabb01eab9c0a74b9f01066aa7b4fddbee8356318d94a3824d898
+MISC ChangeLog 3458 RMD160 7bc89c554ca79bc8a2d05313bbcdac652485d894 SHA1 6a23c4a857800d71360561b1facf8cea7f884042 SHA256 5c2dffb3fa07f1f8d4eca74a3ecf012b47c10efa08210b31ee83c7dd9489e37c
 MISC metadata.xml 233 RMD160 7ea8a2aa48bbdd650d37b04e480a614837466354 SHA1 3b75abb51e59be83481f71773b9eb39da97e98c5 SHA256 82d92f11b8f3b4b377b30608752f96290f16ee6d6b3415ff146885bd1e5033c5
diff --git a/www-apps/swish-e/swish-e-2.4.3-r1.ebuild b/www-apps/swish-e/swish-e-2.4.3-r1.ebuild
index b8134092f420..e26998ff8e34 100644
--- a/www-apps/swish-e/swish-e-2.4.3-r1.ebuild
+++ b/www-apps/swish-e/swish-e-2.4.3-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/www-apps/swish-e/swish-e-2.4.3-r1.ebuild,v 1.6 2009/10/23 16:17:33 vostorga Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/swish-e/swish-e-2.4.3-r1.ebuild,v 1.7 2010/02/10 22:58:12 ssuominen Exp $
 
 inherit perl-module eutils
 
@@ -15,7 +15,7 @@ IUSE="doc perl pdf mp3"
 
 DEPEND=">=sys-libs/zlib-1.1.3
 	dev-libs/libxml2
-	pdf?  ( virtual/poppler-utils )
+	pdf?  ( app-text/poppler )
 	perl? (	dev-perl/libwww-perl
 			dev-perl/HTML-Parser
 			dev-perl/HTML-Tagset
diff --git a/www-apps/swish-e/swish-e-2.4.3-r2.ebuild b/www-apps/swish-e/swish-e-2.4.3-r2.ebuild
index d4f6008e41c4..b8af17e8c15d 100644
--- a/www-apps/swish-e/swish-e-2.4.3-r2.ebuild
+++ b/www-apps/swish-e/swish-e-2.4.3-r2.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/www-apps/swish-e/swish-e-2.4.3-r2.ebuild,v 1.6 2009/03/30 16:21:43 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/swish-e/swish-e-2.4.3-r2.ebuild,v 1.7 2010/02/10 22:58:12 ssuominen Exp $
 
 inherit perl-module eutils
 
@@ -15,7 +15,7 @@ IUSE="doc perl pdf mp3"
 
 DEPEND=">=sys-libs/zlib-1.1.3
 	dev-libs/libxml2
-	pdf?  ( virtual/poppler-utils )
+	pdf?  ( app-text/poppler )
 	perl? (	dev-perl/libwww-perl
 			dev-perl/HTML-Parser
 			dev-perl/HTML-Tagset
diff --git a/www-apps/swish-e/swish-e-2.4.3.ebuild b/www-apps/swish-e/swish-e-2.4.3.ebuild
index 38a038257c37..cdb079a3e946 100644
--- a/www-apps/swish-e/swish-e-2.4.3.ebuild
+++ b/www-apps/swish-e/swish-e-2.4.3.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/www-apps/swish-e/swish-e-2.4.3.ebuild,v 1.5 2009/10/23 16:17:33 vostorga Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/swish-e/swish-e-2.4.3.ebuild,v 1.6 2010/02/10 22:58:12 ssuominen Exp $
 
 inherit perl-module
 
@@ -15,7 +15,7 @@ IUSE="perl pdf mp3"
 
 DEPEND=">=sys-libs/zlib-1.1.3
 	dev-libs/libxml2
-	pdf?  ( virtual/poppler-utils )
+	pdf?  ( app-text/poppler )
 	perl? (	dev-perl/libwww-perl
 			dev-perl/HTML-Parser
 			dev-perl/HTML-Tagset
diff --git a/www-apps/swish-e/swish-e-2.4.4.ebuild b/www-apps/swish-e/swish-e-2.4.4.ebuild
index d459d49ce931..3e5225c943f2 100644
--- a/www-apps/swish-e/swish-e-2.4.4.ebuild
+++ b/www-apps/swish-e/swish-e-2.4.4.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/www-apps/swish-e/swish-e-2.4.4.ebuild,v 1.3 2009/03/30 16:21:43 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/swish-e/swish-e-2.4.4.ebuild,v 1.4 2010/02/10 22:58:12 ssuominen Exp $
 
 inherit perl-module eutils
 
@@ -15,7 +15,7 @@ IUSE="doc perl pdf mp3"
 
 DEPEND=">=sys-libs/zlib-1.1.3
 	dev-libs/libxml2
-	pdf?  ( virtual/poppler-utils )
+	pdf?  ( app-text/poppler )
 	perl? (	dev-perl/libwww-perl
 			dev-perl/HTML-Parser
 			dev-perl/HTML-Tagset
diff --git a/www-apps/swish-e/swish-e-2.4.5.ebuild b/www-apps/swish-e/swish-e-2.4.5.ebuild
index 48d6b63357d5..47a786e60158 100644
--- a/www-apps/swish-e/swish-e-2.4.5.ebuild
+++ b/www-apps/swish-e/swish-e-2.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/www-apps/swish-e/swish-e-2.4.5.ebuild,v 1.2 2009/03/30 16:21:43 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/swish-e/swish-e-2.4.5.ebuild,v 1.3 2010/02/10 22:58:12 ssuominen Exp $
 
 inherit perl-module eutils
 
@@ -15,7 +15,7 @@ IUSE="doc perl pdf mp3"
 
 DEPEND=">=sys-libs/zlib-1.1.3
 	dev-libs/libxml2
-	pdf?  ( virtual/poppler-utils )
+	pdf?  ( app-text/poppler )
 	perl? (	dev-perl/libwww-perl
 			dev-perl/HTML-Parser
 			dev-perl/HTML-Tagset
diff --git a/www-apps/swish-e/swish-e-2.4.7.ebuild b/www-apps/swish-e/swish-e-2.4.7.ebuild
index 1dbe2b74939c..10cb50dec592 100644
--- a/www-apps/swish-e/swish-e-2.4.7.ebuild
+++ b/www-apps/swish-e/swish-e-2.4.7.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/www-apps/swish-e/swish-e-2.4.7.ebuild,v 1.1 2009/06/03 08:32:40 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/swish-e/swish-e-2.4.7.ebuild,v 1.2 2010/02/10 22:58:12 ssuominen Exp $
 
 EAPI=2
 
@@ -17,7 +17,7 @@ IUSE="doc perl pdf mp3"
 
 DEPEND=">=sys-libs/zlib-1.1.3
 	dev-libs/libxml2
-	pdf?  ( virtual/poppler-utils )
+	pdf?  ( >=app-text/poppler-0.12.3-r3[utils] )
 	perl? (	dev-perl/libwww-perl
 			dev-perl/HTML-Parser
 			dev-perl/HTML-Tagset