New version for GNOME 2.28. Clean up old revisions.

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

5 files changed, 37 insertions, 110 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/Manifest b/net-libs/webkit-gtk/Manifest
index 354ed8546bac..b6e11aeed54c 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,13 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX webkit-gtk-0_p40220-gcc44-aliasing.patch 31876 RMD160 19f850df93fd81d1a736dbcc5441d0193929ef35 SHA1 293465980ececa6f2dbdd55787edf2676f628edf SHA256 6aee86b94b443a088502a35d25ffc7f17fa36f6e89dd082dcca11042a7af110f
 AUX webkit-gtk-1.1.10-reduce-gnome-keyring-req.patch 363 RMD160 89f5fb0c5ac6925ba01b2b1eeb67c28784cacbe3 SHA1 ddb49156ffc156930494026195cbfd3d428ae958 SHA256 4824005e4178b78a50b3f0d2bd31f06c8ccc35197f631a60839b613bdc36a491
 AUX webkit-gtk-CVE-2009-0945.patch 671 RMD160 a51f2326f44e05146eaeea5b3f0fcc973efdaeca SHA1 2a281b7ee69158daf7d088add2f21f99903506dd SHA256 65ccad453b147067725dac0f9ba8f07cd0d04970ab0f8d85f086ef07a6d0b3c3
 DIST WebKit-r40220.tar.bz2 10307835 RMD160 5700977d5a9a23680e58b1e3952ecb2fe1430e9a SHA1 2aa2bd3a9c60f53a1a1ef0bf810ea2c59b0a80e2 SHA256 223154d0e247336cd3cf808b030cfb00739103b7a258050e71703903df922020
 DIST webkit-1.1.10.tar.gz 6343872 RMD160 c3d5a7b9793318d0fc9f4d170b7aeac7a6f30735 SHA1 8f0637c936b4f62fb21c8d0c35298e5c0317fd0a SHA256 4eb4fc4a3f47edbc18c9dc09d54fd2189954ebaa0e521b0ab97e21087d8c9855
-DIST webkit-1.1.7.tar.gz 6205024 RMD160 63dea479e23b62ae6d0abb0e5559c35eed34466d SHA1 77d27ab8f0d74ddda349ea9e4416d27d9adb8b61 SHA256 1aaae2bc36ba7ffb27690647e1631f336c0aee56bad2fd91ee6ea906ff17945f
-DIST webkit-1.1.8.tar.gz 6232745 RMD160 6c0cda8cbcf88c7d7104e0bcc6b910eada9213c0 SHA1 3b858495e293c0998a2652993a93ccbedff71839 SHA256 984929e42c6904893f5cd73f6506f858a3859d2ee1a56d69b4f7e9f62a0d2ffa
+DIST webkit-1.1.15.2.tar.gz 6081293 RMD160 21298d312214ad0655703571286e81d553098fbb SHA1 ebf0fd805dd8397ae11701341806cd78002baa18 SHA256 ae76bf52bd7b57fd4b4ee5894f72d0fdb6ad550051efb6424f6a4466796798ac
 EBUILD webkit-gtk-0_p40220-r1.ebuild 2017 RMD160 e0c5faca4ae98256b4b964fde174e932aad08d6e SHA1 6de0cd2a6d02773f13d00232ac66aa2073df17db SHA256 1220f0c9faff1820bcb8ddebaf3a3a0e0b133456fd6497f40311463efbffad69
 EBUILD webkit-gtk-1.1.10.ebuild 2975 RMD160 1d8082ba31b16f4b05bf620ca7a91e7d1f2f52b4 SHA1 09267ef604a469b65111a3242799d5298fb5b39e SHA256 7337a61c51a5956fc61389f3db49784c70c7f1727bad5d524eca4055b5628c85
-EBUILD webkit-gtk-1.1.7.ebuild 2149 RMD160 ca61c85d21c4a605452531b5873b2e5646553bb4 SHA1 dbdbc1a21bb9f7310386c077045c1e1fc0c0d779 SHA256 c5689e71175b2e04d69254ed73719bee650266caa98d2111c1a0ec0be4e85468
-EBUILD webkit-gtk-1.1.8.ebuild 2492 RMD160 43d965e5396eca18bc4530c3ac152d95716a3433 SHA1 928d6d1508b0b874121c558f72757935dae90100 SHA256 441d4d8f3d95ae1471f58f710f154b5afd7d8c9f396af96780b498fd7ccd00f3
-MISC ChangeLog 11683 RMD160 cbd1c637f247a401f042abc5ca5cf068a195b002 SHA1 73d999e1238389786270de67c2b518c79bbd8722 SHA256 48596c64eb99d21b3018e9575383f6f370bd0192b1bdaf4a1c59583c39be42fd
-MISC metadata.xml 432 RMD160 672c7e534ff86cfef074939053d64efc29e53b1e SHA1 40167924c241c19efa021b71fb15096739687952 SHA256 c4d89a5f0ca8b3da0d4432530d41e75a184a07cd560599219d268d3f1ff2418b
+EBUILD webkit-gtk-1.1.15.2.ebuild 2331 RMD160 3ac0e7a73c87bec3d826d3b9814a63178f5c7843 SHA1 1c92a9b230e09956c51d676b6fddd08ecf066d59 SHA256 d8244b1f678782fbe2c73ca29850e39905525223c43241ec9316c5ab65d80253
+MISC ChangeLog 11923 RMD160 bd4effe76b73a54e422862d758e6b13ecfb248e0 SHA1 01ebbf294b7a26d383b7238eefbc10d6552f803b SHA256 1c48a86f4cbbff14f532aeba18ab3e0855a25cd9dda412dd4f2351628385fa19
+MISC metadata.xml 511 RMD160 f92b89efcf0adad44e3f19adf0e0c30baacaed10 SHA1 373bd2cc8e0e724723da36f7fdc742cd44ccb35d SHA256 1d1d12891a988ba9e30946956a5f95caa30512bcf47479403367334fa38b9907
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkrqCq4ACgkQ1fmVwcYIWAbGrQCffeGdZukmBAZ5csPsu7RVOmWr
+EqcAn1MFT65V8ce6K3nttCaCTz7BoSuh
+=jaDk
+-----END PGP SIGNATURE-----
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
-}