New version for GNOME 2.28. Clean up old revisions.

(Portage version: 2.2_rc46/cvs/Linux x86_64)

4 files changed, 23 insertions, 104 deletions

diff --git a/net-libs/webkit-gtk/ChangeLog b/net-libs/webkit-gtk/ChangeLog
index 8599d555b916..7c7f15981c72 100644
--- a/net-libs/webkit-gtk/ChangeLog
+++ b/net-libs/webkit-gtk/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-libs/webkit-gtk
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.52 2009/10/02 15:57:48 volkmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.53 2009/10/29 21:35:36 eva Exp $
+
+*webkit-gtk-1.1.15.2 (29 Oct 2009)
+
+  29 Oct 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  -webkit-gtk-1.1.7.ebuild, -webkit-gtk-1.1.8.ebuild,
+  +webkit-gtk-1.1.15.2.ebuild, metadata.xml:
+  New version for GNOME 2.28. Clean up old revisions.
 
   02 Oct 2009; Mounir Lamouri <volkmar@gentoo.org> webkit-gtk-1.1.10.ebuild:
   Stable for ppc, bug 271865
diff --git a/net-libs/webkit-gtk/metadata.xml b/net-libs/webkit-gtk/metadata.xml
index 96518fea1fdd..b67845148bb1 100644
--- a/net-libs/webkit-gtk/metadata.xml
+++ b/net-libs/webkit-gtk/metadata.xml
@@ -6,6 +6,7 @@
     <flag name="coverage">enable code coverage support</flag>
     <flag name="pango">Use pango as fontbackend instead of freetype</flag>
     <flag name="soup">Use SOUP as backend instead of curl</flag>
+	<flag name="websockets">enable full duplex single socket communication</flag>
     <flag name="xslt">enable support for XSLT</flag>
   </use>
 </pkgmetadata>
diff --git a/net-libs/webkit-gtk/webkit-gtk-1.1.8.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.1.15.2.ebuild
index 42d819440e85..ec132216fd52 100644
--- a/net-libs/webkit-gtk/webkit-gtk-1.1.8.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-1.1.15.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 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.8.ebuild,v 1.5 2009/09/12 22:42:02 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.1.15.2.ebuild,v 1.1 2009/10/29 21:35:36 eva Exp $
 
 EAPI="2"
 
@@ -15,7 +15,7 @@ LICENSE="LGPL-2 LGPL-2.1 BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd"
 # geoclue
-IUSE="coverage debug doc gnome-keyring +gstreamer pango"
+IUSE="coverage debug doc +gstreamer pango ruby +websockets"
 
 # use sqlite, svg by default
 RDEPEND="
@@ -26,21 +26,22 @@ RDEPEND="
 	x11-libs/cairo
 
 	>=x11-libs/gtk+-2.10
+	>=gnome-base/gail-1.8
 	>=dev-libs/icu-3.8.1-r1
-	>=net-libs/libsoup-2.25.90
+	>=net-libs/libsoup-2.27.91
 	>=dev-db/sqlite-3
 	>=app-text/enchant-0.22
 
-	gnome-keyring? ( >=gnome-base/gnome-keyring-2.26.0 )
 	gstreamer? (
 		media-libs/gstreamer:0.10
 		media-libs/gst-plugins-base:0.10 )
-	pango? ( x11-libs/pango )
+	pango? ( >=x11-libs/pango-1.12 )
 	!pango? (
 		media-libs/freetype:2
 		media-libs/fontconfig )
 "
 DEPEND="${RDEPEND}
+	>=sys-devel/flex-2.5.33
 	sys-devel/gettext
 	dev-util/gperf
 	dev-util/pkgconfig
@@ -51,7 +52,8 @@ S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
 	# Make it libtool-1 compatible
-	rm -v autotools/lt* autotools/libtool.m4 || die "removing libtool macros failed"
+	rm -v autotools/lt* autotools/libtool.m4 \
+		|| die "removing libtool macros failed"
 	# Don't force -O2
 	sed -i 's/-O2//g' "${S}"/configure.ac || die "sed failed"
 	# Prevent maintainer mode from being triggered during make
@@ -64,11 +66,13 @@ src_configure() {
 
 	local myconf
 
-	myconf="--enable-svg-filters
-		$(use_enable gnome-keyring gnomekeyring)
-		$(use_enable gstreamer video)
+	myconf="
+		$(use_enable coverage)
 		$(use_enable debug)
-		$(use_enable coverage)"
+		$(use_enable gstreamer video)
+		$(use_enable ruby)
+		$(use_enable websockets web_sockets)
+		--enable-filters"
 
 	# USE-flag controlled font backend because upstream default is freetype
 	# Remove USE-flag once font-backend becomes pango upstream
@@ -87,11 +91,3 @@ src_install() {
 	emake DESTDIR="${D}" install || die "Install failed"
 	dodoc WebKit/gtk/{NEWS,ChangeLog} || die "dodoc failed"
 }
-
-pkg_postinst() {
-	if use gstreamer; then
-	    ewarn
-	    ewarn "If ${PN} doesn't play some video format, please check your"
-	    ewarn "USE flags on media-plugins/gst-plugins-meta"
-	fi
-}
diff --git a/net-libs/webkit-gtk/webkit-gtk-1.1.7.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.1.7.ebuild
deleted file mode 100644
index 130cc0affee5..000000000000
--- a/net-libs/webkit-gtk/webkit-gtk-1.1.7.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2009 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.7.ebuild,v 1.4 2009/09/12 22:42:02 eva Exp $
-
-EAPI="2"
-
-MY_P="webkit-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="http://www.webkitgtk.org/"
-SRC_URI="http://www.webkitgtk.org/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2 LGPL-2.1 BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd"
-# geoclue
-IUSE="coverage debug doc gnome-keyring +gstreamer pango"
-
-# use sqlite, svg by default
-RDEPEND="
-	dev-libs/libxml2
-	dev-libs/libxslt
-	media-libs/jpeg
-	media-libs/libpng
-	x11-libs/cairo
-
-	>=x11-libs/gtk+-2.10
-	>=dev-libs/icu-3.8.1-r1
-	>=net-libs/libsoup-2.25.90
-	>=dev-db/sqlite-3
-	>=app-text/enchant-0.22
-
-	gnome-keyring? ( >=gnome-base/gnome-keyring-2.26.0 )
-	gstreamer? (
-		media-libs/gstreamer:0.10
-		media-libs/gst-plugins-base:0.10 )
-	pango? ( x11-libs/pango )
-	!pango? (
-		media-libs/freetype:2
-		media-libs/fontconfig )
-"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	dev-util/gperf
-	dev-util/pkgconfig
-	doc? ( >=dev-util/gtk-doc-1.10 )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	# It doesn't compile on alpha without this in LDFLAGS
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	local myconf
-
-	myconf="--enable-svg-filters
-		$(use_enable gnome-keyring gnomekeyring)
-		$(use_enable gstreamer video)
-		$(use_enable debug)
-		$(use_enable coverage)"
-
-	# USE-flag controlled font backend because upstream default is freetype
-	# Remove USE-flag once font-backend becomes pango upstream
-	if use pango; then
-		ewarn "You have enabled the incomplete pango backend"
-		ewarn "Please file any and all bugs *upstream*"
-		myconf="${myconf} --with-font-backend=pango"
-	else
-		myconf="${myconf} --with-font-backend=freetype"
-	fi
-
-	econf ${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Install failed"
-	dodoc WebKit/gtk/{NEWS,ChangeLog} || die "dodoc failed"
-}
-
-pkg_postinst() {
-	if use gstreamer; then
-	    ewarn
-	    ewarn "If ${PN} doesn't play some video format, please check your"
-	    ewarn "USE flags on media-plugins/gst-plugins-meta"
-	fi
-}