summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2010-11-07 21:13:34 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2010-11-07 21:13:34 +0000
commit8f42c052805b64580dadfff956e4ddf1d348b779 (patch)
tree67c6cde47659e6b17e7fe96ab1ba03e3b2d06d11 /net-libs
parentDepend on virtual/jpeg wrt bug 327487. Remove intermediate version. (diff)
downloadgentoo-2-8f42c052805b64580dadfff956e4ddf1d348b779.tar.gz
gentoo-2-8f42c052805b64580dadfff956e4ddf1d348b779.tar.bz2
gentoo-2-8f42c052805b64580dadfff956e4ddf1d348b779.zip
Use virtual/jpeg wrt #327487.
(Portage version: 2.2.0_alpha4/cvs/Linux x86_64)
Diffstat (limited to 'net-libs')
-rw-r--r--net-libs/webkit-gtk/ChangeLog7
-rw-r--r--net-libs/webkit-gtk/webkit-gtk-1.1.15.4.ebuild6
-rw-r--r--net-libs/webkit-gtk/webkit-gtk-1.2.3.ebuild6
-rw-r--r--net-libs/webkit-gtk/webkit-gtk-1.2.5.ebuild6
4 files changed, 15 insertions, 10 deletions
diff --git a/net-libs/webkit-gtk/ChangeLog b/net-libs/webkit-gtk/ChangeLog
index eabbf4ca524b..92e2b8cf8c1b 100644
--- a/net-libs/webkit-gtk/ChangeLog
+++ b/net-libs/webkit-gtk/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for net-libs/webkit-gtk
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.82 2010/10/17 15:00:12 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.83 2010/11/07 21:13:34 ssuominen Exp $
+
+ 07 Nov 2010; Samuli Suominen <ssuominen@gentoo.org>
+ webkit-gtk-1.1.15.4.ebuild, webkit-gtk-1.2.3.ebuild,
+ webkit-gtk-1.2.5.ebuild:
+ Use virtual/jpeg wrt #327487.
17 Oct 2010; Raúl Porcel <armin76@gentoo.org> webkit-gtk-1.2.3.ebuild:
alpha/ia64/sparc stable wrt #324077
diff --git a/net-libs/webkit-gtk/webkit-gtk-1.1.15.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.1.15.4.ebuild
index 7e792f5e911c..7349b931547a 100644
--- a/net-libs/webkit-gtk/webkit-gtk-1.1.15.4.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-1.1.15.4.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/net-libs/webkit-gtk/webkit-gtk-1.1.15.4.ebuild,v 1.13 2010/03/29 22:28:28 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.1.15.4.ebuild,v 1.14 2010/11/07 21:13:34 ssuominen Exp $
EAPI="2"
@@ -22,8 +22,8 @@ IUSE="aqua coverage debug doc +gstreamer +websockets"
RDEPEND="
dev-libs/libxml2
dev-libs/libxslt
- media-libs/jpeg:0
- media-libs/libpng
+ virtual/jpeg
+ >=media-libs/libpng-1.4
x11-libs/cairo
>=x11-libs/gtk+-2.13[aqua=]
diff --git a/net-libs/webkit-gtk/webkit-gtk-1.2.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.2.3.ebuild
index 2014d3c92390..490b8d014658 100644
--- a/net-libs/webkit-gtk/webkit-gtk-1.2.3.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-1.2.3.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/net-libs/webkit-gtk/webkit-gtk-1.2.3.ebuild,v 1.7 2010/10/17 15:00:12 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.2.3.ebuild,v 1.8 2010/11/07 21:13:34 ssuominen Exp $
EAPI="2"
@@ -25,8 +25,8 @@ IUSE="coverage debug doc +gstreamer" # aqua
RDEPEND="
dev-libs/libxml2
dev-libs/libxslt
- media-libs/jpeg:0
- media-libs/libpng
+ virtual/jpeg
+ >=media-libs/libpng-1.4
x11-libs/cairo
>=x11-libs/gtk+-2.13
>=dev-libs/glib-2.21.3
diff --git a/net-libs/webkit-gtk/webkit-gtk-1.2.5.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.2.5.ebuild
index 2f9ff27a72ce..f8f046b5456c 100644
--- a/net-libs/webkit-gtk/webkit-gtk-1.2.5.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-1.2.5.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/net-libs/webkit-gtk/webkit-gtk-1.2.5.ebuild,v 1.1 2010/10/11 13:47:37 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.2.5.ebuild,v 1.2 2010/11/07 21:13:34 ssuominen Exp $
EAPI="3"
@@ -24,8 +24,8 @@ IUSE="coverage debug doc +gstreamer introspection" # aqua
RDEPEND="
dev-libs/libxml2
dev-libs/libxslt
- media-libs/jpeg:0
- media-libs/libpng
+ virtual/jpeg
+ >=media-libs/libpng-1.4
x11-libs/cairo
>=x11-libs/gtk+-2.13
>=dev-libs/glib-2.21.3