Require SLOT="0" of media-libs/jpeg for headers.

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

5 files changed, 17 insertions, 13 deletions

diff --git a/www-client/dillo/ChangeLog b/www-client/dillo/ChangeLog
index fb294191e918..3417e5f3f56f 100644
--- a/www-client/dillo/ChangeLog
+++ b/www-client/dillo/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-client/dillo
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/dillo/ChangeLog,v 1.83 2010/02/12 13:23:29 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/dillo/ChangeLog,v 1.84 2010/02/12 13:47:28 ssuominen Exp $
+
+  12 Feb 2010; Samuli Suominen <ssuominen@gentoo.org> dillo-2.1.1.ebuild,
+  dillo-2.2.ebuild, dillo-9999.ebuild:
+  Require SLOT="0" of media-libs/jpeg for headers.
 
 *dillo-2.2 (12 Feb 2010)
 
diff --git a/www-client/dillo/Manifest b/www-client/dillo/Manifest
index d06b31c049a9..b1d840e26e55 100644
--- a/www-client/dillo/Manifest
+++ b/www-client/dillo/Manifest
@@ -7,8 +7,8 @@ AUX dillo.png 6135 RMD160 e15bf21c6f86256967ca49d1222429660e3aeeb6 SHA1 6933b0f6
 AUX dillo2-inbuf.patch 393 RMD160 e1b976f0ceb0693d2e39c0ee1f8a68db3af4f7bb SHA1 f3033ddf7eadfd9d2cb24403f0acb2022304bf17 SHA256 29e44f3be9e37298264068662638b4e1c5c7d2c7226691dae691e9ea5234b330
 DIST dillo-2.1.1.tar.bz2 612711 RMD160 4b8fe423e3a0fd0e461cc8e1795bac39ad47d3b6 SHA1 eb252663b9480e53e0376d75b81130404ccf40ce SHA256 8eec025872030fc1419fb93ee41dbdf380a6d1f75f4d51aec5eee9a9a4aa4477
 DIST dillo-2.2.tar.bz2 630259 RMD160 050f5bcd46042764c9bba536e6e5fd97453e1d6f SHA1 06b325a246a639d936dabfc73d005f951d23c151 SHA256 f4352970bda70404faa66d1fc90e1dcd1e3417266bf4e29759674d48804ac2ba
-EBUILD dillo-2.1.1.ebuild 1494 RMD160 67f52a6af1fc5913ca04c7573d18c51b765db59d SHA1 0383a226016b25f4d6d5db3ce083bebb75b38eb9 SHA256 4146ceedf7a8c23adfccd436fe10451731027943c121cb1ed4ccbc7ea3b731db
-EBUILD dillo-2.2.ebuild 1499 RMD160 0ab19b67368f9a04ffcb1099032800cb83781ab2 SHA1 8b59a17d49132787678cdbec5c7d10e89aee0f4f SHA256 fe606abff6a18b9ae007012eb032b05f50937df983a5c5d57c520dddc294bdae
-EBUILD dillo-9999.ebuild 1486 RMD160 747982bb508257d0c3fbc98ba92e547406bfca3f SHA1 147697ad832b869fc9a7a9c432bde05f6445efe9 SHA256 e7834bc4327e9af9eb0bb7ddfbc6523cadea30a88084f86cf5e4a66839d5b76d
-MISC ChangeLog 18660 RMD160 9d95865604837d2b4800c68f400af8b84744589c SHA1 5ec4c0520582d974b411ae8e484d08d697a59fc1 SHA256 95a18a4b49cd35534db80107bc0b4b5ce9c3a92623d3dc14cdccbae7d686eaf9
+EBUILD dillo-2.1.1.ebuild 1499 RMD160 943ad68b04c512d565cb8ad96d0054564b919051 SHA1 8cdc4c6995681c70da17da90602732631214c722 SHA256 6ae0f703df92bffd73ea3bb9b9ba4f5602488b3884b879f8d4d974a49e577a9d
+EBUILD dillo-2.2.ebuild 1504 RMD160 6c5128f2c6cbe2e82f01ab11244c54155480052d SHA1 13794f720a6cdd687e75824c4884a20d2cd818d5 SHA256 fcaeb35949acf4d2cd1e508983e0e4f27337ca140591f8bd5c7182f7f172edb2
+EBUILD dillo-9999.ebuild 1491 RMD160 5d16a0219bacc531187eedbf2ea8a77f3e73a910 SHA1 13ed9233c22f94541b02221ff35eddf72ef2087c SHA256 68e991537c60074c2e3a68148a86eb67aa9ddf7663100b27c124ea9f85b98ea6
+MISC ChangeLog 18828 RMD160 91a414af5205ac946b7726fba4216cf6a921d811 SHA1 c89cf43edb641620a29af04ea676998e8979859c SHA256 682e8fa55622fa3f7beae398deab27a80b7cf75d9d188ac178ecf0385f05c6c5
 MISC metadata.xml 265 RMD160 d03285bfab732286bde355fe0ec756e0cb88a6dd SHA1 93226e7e58879e1dd0200d6df5f8ad8d0143def1 SHA256 0aa5b2b231654873313aba9afebdb90a273b222741c4787d9386973af3c1d575
diff --git a/www-client/dillo/dillo-2.1.1.ebuild b/www-client/dillo/dillo-2.1.1.ebuild
index 0696b6a5ee0e..a01c967aad2e 100644
--- a/www-client/dillo/dillo-2.1.1.ebuild
+++ b/www-client/dillo/dillo-2.1.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/www-client/dillo/dillo-2.1.1.ebuild,v 1.10 2009/09/06 16:25:17 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/dillo/dillo-2.1.1.ebuild,v 1.11 2010/02/12 13:47:28 ssuominen Exp $
 
 EAPI="2"
 inherit eutils flag-o-matic multilib
@@ -16,7 +16,7 @@ IUSE="doc +gif ipv6 +jpeg +png ssl"
 
 RDEPEND="x11-libs/fltk:2[-cairo,jpeg=,png=]
 	sys-libs/zlib
-	jpeg? ( media-libs/jpeg )
+	jpeg? ( media-libs/jpeg:0 )
 	png? ( media-libs/libpng )
 	ssl? ( dev-libs/openssl )"
 DEPEND="${RDEPEND}
diff --git a/www-client/dillo/dillo-2.2.ebuild b/www-client/dillo/dillo-2.2.ebuild
index 30b8037096da..698b54b73f03 100644
--- a/www-client/dillo/dillo-2.2.ebuild
+++ b/www-client/dillo/dillo-2.2.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/www-client/dillo/dillo-2.2.ebuild,v 1.1 2010/02/12 13:23:29 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/dillo/dillo-2.2.ebuild,v 1.2 2010/02/12 13:47:28 ssuominen Exp $
 
 EAPI="2"
 inherit eutils flag-o-matic multilib
@@ -16,7 +16,7 @@ IUSE="doc +gif ipv6 +jpeg +png ssl"
 
 RDEPEND="x11-libs/fltk:2[-cairo,jpeg=,png=]
 	sys-libs/zlib
-	jpeg? ( media-libs/jpeg )
+	jpeg? ( media-libs/jpeg:0 )
 	png? ( media-libs/libpng )
 	ssl? ( dev-libs/openssl )"
 DEPEND="${RDEPEND}
diff --git a/www-client/dillo/dillo-9999.ebuild b/www-client/dillo/dillo-9999.ebuild
index bf04c9131063..a5fd2ec41d25 100644
--- a/www-client/dillo/dillo-9999.ebuild
+++ b/www-client/dillo/dillo-9999.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-client/dillo/dillo-9999.ebuild,v 1.2 2009/04/17 15:11:02 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/dillo/dillo-9999.ebuild,v 1.3 2010/02/12 13:47:28 ssuominen Exp $
 
 EAPI="2"
 inherit eutils flag-o-matic multilib mercurial
@@ -16,7 +16,7 @@ IUSE="doc +gif ipv6 +jpeg +png ssl"
 
 RDEPEND="x11-libs/fltk:2[-cairo,jpeg=,png=]
 	sys-libs/zlib
-	jpeg? ( media-libs/jpeg )
+	jpeg? ( media-libs/jpeg:0 )
 	png? ( media-libs/libpng )
 	ssl? ( dev-libs/openssl )"
 DEPEND="${RDEPEND}