Version bump with multiple security fixes.

Package-Manager: portage-2.1.9.36/cvs/Linux x86_64

3 files changed, 136 insertions, 2 deletions

diff --git a/net-libs/webkit-gtk/ChangeLog b/net-libs/webkit-gtk/ChangeLog
index 1c91e9daf9d4..2946d2ce5600 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-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.100 2011/01/23 14:42:06 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.101 2011/02/09 18:33:31 pacho Exp $
+
+*webkit-gtk-1.2.7 (09 Feb 2011)
+
+  09 Feb 2011; Pacho Ramos <pacho@gentoo.org> +webkit-gtk-1.2.7.ebuild:
+  Version bump with multiple security fixes.
 
   23 Jan 2011; Raúl Porcel <armin76@gentoo.org> webkit-gtk-1.2.6.ebuild:
   alpha/ia64/sparc stable wrt #350598
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index ad7c50e03c59..a5e61e050130 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,10 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX webkit-gtk-1.2.3-fix-pool-sparc.patch 2518 RMD160 48ec89fb42403fae1b1533b54917a3311553cc78 SHA1 8c4e6c5e7c0c957ee1743a0d347b50f992460c17 SHA256 aee1f0d846c1e47c225e421a774fe93c49b71b7d31234fc5515d33922f130434
 AUX webkit-gtk-1.2.5-darwin-quartz.patch 1984 RMD160 5995be8598b62aff487726de02ac12b1a79357b4 SHA1 c7f0c5ac74f8a92f93ab36cfa1e1356f6112eac8 SHA256 8f37d606dec60186c10cca8795adc1dd3c8ec4ded86c94bad3036ed955573b78
 AUX webkit-gtk-1.2.5-darwin8.patch 1152 RMD160 a546515b8a088f8f11e532662833c3e41ad6df83 SHA1 e1e841cae9d5a70940630a918b40ac4b27497c58 SHA256 51e3fb832793cb0be13ceff63d1b4c4ef82efaa7b3151ab53d04ae966d65efa6
 AUX webkit-gtk-1.2.5-tests-build.patch 526 RMD160 c336c7309899169a2691bf3b984fa4df480b2ad4 SHA1 c25129b41dcca46424d58c3796f7207119e4a790 SHA256 aa2875954048318f2a9c5035b670774a1c5ce1b641b067f936fa076f38659383
 DIST webkit-1.2.5.tar.gz 6727977 RMD160 7510af4c5d15c06adf984a090a9e9550f5ea7147 SHA1 2cd50e62a0c94bba8cc8a8466ea16fac1f9fc1ce SHA256 b08a69a9ccbd84b2e23a94caf7eb5cfc390bb6cef49a4921b5eb11860b329d41
 DIST webkit-1.2.6.tar.gz 6613589 RMD160 84d7101c84f2735744f08b5e8ed684ccf05a59dd SHA1 0dcfbf7cedda400567f2e081b12987b9d82b33eb SHA256 88a1488ffba8de14f5531ca2e7bf535561170265594a33ff53fb875a9e5d38cf
+DIST webkit-1.2.7.tar.gz 6615990 RMD160 f36b3ae05693e0eeb4d1936ceee52b6fe1517e57 SHA1 e9afc573d2459794c3749ba404f2187f9dcc9ed3 SHA256 228a80b3f0132db1342708e8ef7738996f05e30393e0187acf4cab987283718b
 EBUILD webkit-gtk-1.2.5.ebuild 3152 RMD160 25f9a75720761b6aaaf30b4b4bfe95dc0e9deb65 SHA1 079b12e389819f0af96429edfc0fcbf00d133d6f SHA256 474ec46f5d3d9d039704c9a47e6d485b56699b661eb7c9ae8cf8a2c7739d415e
 EBUILD webkit-gtk-1.2.6.ebuild 3363 RMD160 0ee60bebdaf83b11ab1101cdc09bf3541f0f9418 SHA1 0777d67c811a3a54602f7c1682ca990c363ad929 SHA256 3c41414142d24c30dc17d6e1076e23b4343c7e38e82af631f2556695734775a4
-MISC ChangeLog 20138 RMD160 b3382febf58f1c98e6d548b9f89e2d8bb5c5ed15 SHA1 7cf2024b20122d175f4187fe7b9f42b8f751069c SHA256 0f3d5db2639aecf67ec4aa3eba42d8951b5baaec64870c03841f214bb6bdf540
+EBUILD webkit-gtk-1.2.7.ebuild 3368 RMD160 f16ef108d70ffaa860f2a76e272873ed39f3e347 SHA1 5b51c7af0f49039e6bf870a1bfd722d16ae651b8 SHA256 8d2d35ac2cfb7716f52cb5bf775061bb1c21455e255d3526a05c594045a8acca
+MISC ChangeLog 20287 RMD160 4c3adc6e7f4136803bd8d57dec31141da9f90a2b SHA1 edcd5880cc4d69775a699b85fc54d0390dcee284 SHA256 3458469b4451e83df068b4ffe80b7b331c18f0cfc57f0c991e33b837432b8ee0
 MISC metadata.xml 439 RMD160 ed901542890ff2bf45ff3302f79b48cc0ba9e5f8 SHA1 746abe4ff5e3911f962a40f23fe1c521d32adca8 SHA256 57260da7cdd67c9be679d44a3deba705ff381fde47433b5d22ccd1402ecabdf3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAk1S3gEACgkQCaWpQKGI+9TkSgCeJZzEOI4FmJzjjB9uDjnklQwi
+oWcAnRyMy34LxnhFehBp7m45c7jv2l/Q
+=b/No
+-----END PGP SIGNATURE-----
diff --git a/net-libs/webkit-gtk/webkit-gtk-1.2.7.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.2.7.ebuild
new file mode 100644
index 000000000000..7adc6fe998dd
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-1.2.7.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2011 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.7.ebuild,v 1.1 2011/02/09 18:33:31 pacho Exp $
+
+EAPI="3"
+
+inherit autotools flag-o-matic eutils virtualx
+
+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="2"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
+# geoclue is missing
+IUSE="aqua coverage debug doc +gstreamer introspection +jit test"
+
+# use sqlite, svg by default
+# dependency on >=x11-libs/gtk+-2.13 for gail
+# XXX: Quartz patch does not apply
+RDEPEND="
+	dev-libs/libxml2
+	dev-libs/libxslt
+	virtual/jpeg
+	>=media-libs/libpng-1.4
+	x11-libs/cairo
+	>=x11-libs/gtk+-2.13:2[aqua=]
+	>=dev-libs/glib-2.21.3:2
+	>=dev-libs/icu-3.8.1-r1
+	>=net-libs/libsoup-2.29.90:2.4
+	>=dev-db/sqlite-3
+	>=app-text/enchant-0.22
+	>=x11-libs/pango-1.12
+
+	gstreamer? (
+		media-libs/gstreamer:0.10
+		>=media-libs/gst-plugins-base-0.10.25:0.10 )
+	introspection? ( >=dev-libs/gobject-introspection-0.6.2 )"
+
+DEPEND="${RDEPEND}
+	>=sys-devel/flex-2.5.33
+	sys-devel/gettext
+	dev-util/gperf
+	dev-util/pkgconfig
+	dev-util/gtk-doc-am
+	doc? ( >=dev-util/gtk-doc-1.10 )
+	test? ( x11-themes/hicolor-icon-theme )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	# FIXME: Fix unaligned accesses on ARM, IA64 and SPARC
+	# https://bugs.webkit.org/show_bug.cgi?id=19775
+	use sparc && epatch "${FILESDIR}"/${PN}-1.2.3-fix-pool-sparc.patch
+
+	# intermediate MacPorts hack while upstream bug is not fixed properly
+	# https://bugs.webkit.org/show_bug.cgi?id=28727
+	use aqua && epatch "${FILESDIR}"/${PN}-1.2.5-darwin-quartz.patch
+
+	# Fix build on Darwin8 (10.4 Tiger)
+	epatch "${FILESDIR}"/${PN}-1.2.5-darwin8.patch
+
+	# Don't force -O2
+	sed -i 's/-O2//g' "${S}"/configure.ac || die "sed failed"
+
+	# Don't build tests if not needed, part of bug #343249
+	epatch "${FILESDIR}/${PN}-1.2.5-tests-build.patch"
+
+	# Prevent maintainer mode from being triggered during make
+	AT_M4DIR=autotools eautoreconf
+}
+
+src_configure() {
+	# It doesn't compile on alpha without this in LDFLAGS
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# Sigbuses on SPARC with mcpu and co.
+	use sparc && filter-flags "-mcpu=*" "-mvis" "-mtune=*"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	local myconf
+
+	myconf="
+		--disable-introspection
+		--disable-web_sockets
+		$(use_enable coverage)
+		$(use_enable debug)
+		$(use_enable gstreamer video)
+		$(use_enable introspection)
+		$(use_enable jit)
+		$(use aqua && echo "--with-font-backend=pango --with-target=quartz")"
+		# Disable web-sockets per bug #326547
+
+	econf ${myconf}
+}
+
+src_compile() {
+	# Fix sandbox error with USE="introspection"
+	# https://bugs.webkit.org/show_bug.cgi?id=35471
+	emake XDG_DATA_HOME="${T}/.local" || die "Compile failed"
+}
+
+src_test() {
+	unset DISPLAY
+	# Tests need virtualx, bug #294691, bug #310695
+	# Set XDG_DATA_HOME for introspection tools, bug #323669
+	Xemake check XDG_DATA_HOME="${T}/.local" || die "Test phase failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "Install failed"
+	dodoc WebKit/gtk/{NEWS,ChangeLog} || die "dodoc failed"
+}