Version bump, remove old.

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

4 files changed, 79 insertions, 52 deletions

diff --git a/net-libs/webkit-gtk/ChangeLog b/net-libs/webkit-gtk/ChangeLog
index fdfc777df2a5..c430487e2ee7 100644
--- a/net-libs/webkit-gtk/ChangeLog
+++ b/net-libs/webkit-gtk/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-libs/webkit-gtk
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.138 2012/01/18 21:06:58 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.139 2012/02/04 10:04:42 pacho Exp $
+
+*webkit-gtk-1.6.3-r200 (04 Feb 2012)
+*webkit-gtk-1.6.3-r300 (04 Feb 2012)
+
+  04 Feb 2012; Pacho Ramos <pacho@gentoo.org> +webkit-gtk-1.6.3-r200.ebuild,
+  +webkit-gtk-1.6.3-r300.ebuild, -webkit-gtk-1.6.1-r200.ebuild,
+  -webkit-gtk-1.6.1-r300.ebuild:
+  Version bump, remove old.
 
   18 Jan 2012; Markus Meier <maekke@gentoo.org> webkit-gtk-1.6.1-r301.ebuild:
   arm stable, bug #393007
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 866d92ff7dec..320d9596812b 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -11,19 +11,20 @@ AUX webkit-gtk-1.6.1-darwin-quartz.patch 1516 RMD160 6c73b491645c0d4626d5a600431
 AUX webkit-gtk-1.6.1-double-conversion.patch 1585 RMD160 2eb508cf95ce16f5a49e7375c46271d85d5280c6 SHA1 70b81cd3bb600fa698487b6fb59459ca24e31b6f SHA256 2b1baadaf694e96d546ae50ce2a4154e4d1f7efbe7566868297cee27e9c08f08
 AUX webkit-gtk-1.6.1-pkgconfig-fix.patch 1297 RMD160 8a83465d74bf34d6fe7cbb6a2767f62c77e33aa2 SHA1 40090e84c3ee7814c14363d8bb790c7ec38d2dbb SHA256 f4a41c4dd1c40347e846b377bd94b2d3ad10b1f110711b5f341f8fd8a5a13014
 DIST webkit-1.4.3.tar.gz 8512387 RMD160 43d1fd1cfd0cbf9fc83b107f05442e2d531c03aa SHA1 a24adee9583d66ebc93ac61ce9881947a54c569d SHA256 b808ace6b3edad76aba57cc746a430051abfedf301c969628b989a1128dd37e4
+DIST webkit-1.6.3.tar.xz 6794004 RMD160 cc319ffe4c2810663ae05b90e69d9495f5c3f0aa SHA1 7df69608ef2ce9dd7328353b4ee34f69271cd43b SHA256 12d0dbce6a895c7a8491a028e34a1dc55ae13ab76ac6202b2e489da9468077c3
 DIST webkit-gtk-1.6.1.tar.xz 6416248 RMD160 ab63ea133ed2bd471c5faf012d4d284c324d6ff3 SHA1 13b976e736f09950ceeb6f1b0af00c52e9d8d475 SHA256 ca29992afb70d97301b8cf991ce58bf53523a71b5eb91134d998a458824a0339
 EBUILD webkit-gtk-1.4.3-r200.ebuild 3489 RMD160 60dcca3f8ea8db6398c2e01e96119a44d28a6b80 SHA1 7d25b89803d208c7f0a7799659513ee8ff995966 SHA256 6380b001bf9077c2135453e3e45e947db2cbe9171fc2dcf9364bab1d25c13ac4
 EBUILD webkit-gtk-1.4.3-r300.ebuild 3559 RMD160 a508e11554ad3666d4180e94bfbef671cdfc59be SHA1 0cfa0a81eff8bded59f064fa787fdd716575b63f SHA256 7c94293468e42977281cdf3b7aa78e9c423ec35467256040473eadac17bd2760
-EBUILD webkit-gtk-1.6.1-r200.ebuild 4178 RMD160 5fe6f89c0ee09e69a43a81b9343b007643cd66e1 SHA1 463e74ebcadb4ccef80ec28a24e7f762510c3083 SHA256 ed401ed3a61f95e01e9970562eec6e5cf8784f97fc64baa68abfcce9a202a4fe
 EBUILD webkit-gtk-1.6.1-r201.ebuild 4906 RMD160 7d6e6cda401c26a335dbf697cc438e2dc844d279 SHA1 6c4c38abb181d1f58a5bb9293a06b1cc92e0b274 SHA256 e023d17baf382e0f8295fe86658945560de3622ac3ee43ad0fefb81e67952d9f
-EBUILD webkit-gtk-1.6.1-r300.ebuild 4309 RMD160 696a1e6861188b138ce3b6e96ffca21c12fb58bb SHA1 5657c69a1309f5708da2686e0a303d71d903e6fb SHA256 1ecfe44612708f55cc3a941fc38f68f5334350e2237d918938837f2c1c64ee7c
 EBUILD webkit-gtk-1.6.1-r301.ebuild 4842 RMD160 993c15ff4b3ba94fb74bae68f2eec9a32455fa47 SHA1 981856cdfae646aabe974f2ce6a06b2463365bf0 SHA256 1d78c2d6175660fe05bde35f55e86bdb3cebb13486758ac475cf6c9d2e7718a7
-MISC ChangeLog 26930 RMD160 f309ccb5c079b3c6881f4712713b5ca4af3e6254 SHA1 e91d8c171ceef4be8f1c445a032433874bebaff5 SHA256 00ffe58636e039de8852911126f7353e063eda77c5b23e6ca6d5b707c67c77ce
+EBUILD webkit-gtk-1.6.3-r200.ebuild 4672 RMD160 0fb8a14cde8aceca4d8364359a04d1f19617b75d SHA1 1333545bb7529f8fa5cbff6154c1443a4744d64d SHA256 c28294cd67fa5efe980137e3d57070f3d9c71e524a4444d7334ca13d5dab7ab8
+EBUILD webkit-gtk-1.6.3-r300.ebuild 4608 RMD160 1b06849d2fe5946efabd81c4b7fd29fe6fe87ed8 SHA1 605ec8462ef009025fb656b80003bd7c9287badd SHA256 3165f3658f98c6f1dfc58b6ce9111956d6a2d01e06a6275eb32d35cf436cae41
+MISC ChangeLog 27207 RMD160 90745f2d02ad1b538da21a42609501386e476dce SHA1 9f23a7a691700eb4a53b69fd7da1660af2aea7bc SHA256 9b05881899814fd79c7de6ca0db6704d5431691ecd56e20b248c6b5e1d0c1863
 MISC metadata.xml 539 RMD160 422a84bfd5fd0ca7d32825e204b0a435a980ecd5 SHA1 33fe25bdc890c5e034d5dc02a82b028283e0cc03 SHA256 eb78ad3163ace16c943a2620ef1659d33913985b8a9584a2d734f021a82f7887
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk8XNPYACgkQkKaRLQcq0GJw9wCgkoeE5c2wA+sXaKvFdI+8dCTQ
-AccAoKdJrejC84vcfbvVBiCUstf7EZpj
-=s+NG
+iEYEARECAAYFAk8tAsIACgkQCaWpQKGI+9SpDwCfYPhQj3iImyJbEzqawkT85YCa
+uukAnA0eKn+yK+FWzhaLM5lMocqw2qQu
+=o856
 -----END PGP SIGNATURE-----
diff --git a/net-libs/webkit-gtk/webkit-gtk-1.6.1-r200.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.6.3-r200.ebuild
index 46ec4732f9cb..ba7b54d5bc43 100644
--- a/net-libs/webkit-gtk/webkit-gtk-1.6.1-r200.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-1.6.3-r200.ebuild
@@ -1,24 +1,23 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 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.6.1-r200.ebuild,v 1.1 2011/09/30 13:52:33 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.6.3-r200.ebuild,v 1.1 2012/02/04 10:04:42 pacho Exp $
 
 EAPI="4"
 
-inherit autotools eutils flag-o-matic eutils virtualx
+inherit autotools eutils flag-o-matic eutils virtualx gnome2-utils toolchain-funcs
 
 MY_P="webkit-${PV}"
 DESCRIPTION="Open source web browser engine"
 HOMEPAGE="http://www.webkitgtk.org/"
-# Upstream is still shipping silly gzip files
-#SRC_URI="http://www.webkitgtk.org/${MY_P}.tar.gz"
-SRC_URI="mirror://gentoo/${P}.tar.xz"
+SRC_URI="http://www.webkitgtk.org/${MY_P}.tar.xz"
 
 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"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
 # geoclue
+
 IUSE="aqua coverage debug +gstreamer +introspection +jit spell webgl"
+
 # bug 372493
 REQUIRED_USE="introspection? ( gstreamer )"
 
@@ -63,28 +62,44 @@ S="${WORKDIR}/${MY_P}"
 src_prepare() {
 	DOCS="ChangeLog NEWS" # other ChangeLog files handled by src_install
 
+	# Fix arches that use 64-bit double type
+	# https://bugs.webkit.org/show_bug.cgi?id=69940
+	epatch "${FILESDIR}/${PN}-1.6.1-double-conversion.patch"
+
 	# 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
+	# TODO: FAILS TO APPLY!
+	#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
+	use aqua && epatch "${FILESDIR}"/${PN}-1.6.1-darwin-quartz.patch
 
-	# Fix build on Darwin8 (10.4 Tiger)
-	# XXX: Fails to apply
-	#epatch "${FILESDIR}"/${PN}-1.2.5-darwin8.patch
+	# Skip tests phase: here we will place tests we need to skip, any
+	# skipped test needs to have an upstream report and needs to be
+	# rechecked on every major bump.
+	#
+	# adjustments test is flacky, https://bugs.webkit.org/show_bug.cgi?id=68647
+	sed -i -e '/\/webkit\/webview\/adjustments/d' Source/WebKit/gtk/tests/testwebview.c || die
+	# the same for icon-uri one, https://bugs.webkit.org/show_bug.cgi?id=69228
+	sed -i -e '/\/webkit\/webview\/icon-uri/d' Source/WebKit/gtk/tests/testwebview.c || die
 
-	# Don't force -O2
-	sed -i 's/-O2//g' "${S}"/configure.ac
+	# Drop DEPRECATED flags
+	sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED:$(NULL):g' GNUmakefile.am || die
 
-	# Don't build tests if not needed, part of bug #343249
-	# XXX: Fails to apply
-	#epatch "${FILESDIR}/${PN}-1.2.5-tests-build.patch"
+	# Don't force -O2
+	sed -i 's/-O2//g' "${S}"/configure.ac || die
 
 	# Required for webgl; https://bugs.webkit.org/show_bug.cgi?id=69085
 	mkdir -p DerivedSources/ANGLE
 
+	# We need to reset some variables to prevent permissions problems and failures
+	# like https://bugs.webkit.org/show_bug.cgi?id=35471 and bug #323669
+	gnome2_environment_reset
+
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
 	# Prevent maintainer mode from being triggered during make
 	AT_M4DIR=Source/autotools eautoreconf
 }
@@ -122,18 +137,11 @@ src_configure() {
 	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"
-}
-
 src_test() {
 	unset DISPLAY
 	# Tests need virtualx, bug #294691, bug #310695
-	# Set XDG_DATA_HOME for introspection tools, bug #323669
 	# Parallel tests sometimes fail
-	Xemake -j1 check XDG_DATA_HOME="${T}/.local"
+	Xemake -j1 check
 }
 
 src_install() {
diff --git a/net-libs/webkit-gtk/webkit-gtk-1.6.1-r300.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.6.3-r300.ebuild
index f035fa593137..bbba7ad67836 100644
--- a/net-libs/webkit-gtk/webkit-gtk-1.6.1-r300.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-1.6.3-r300.ebuild
@@ -1,24 +1,22 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 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.6.1-r300.ebuild,v 1.2 2011/11/29 19:01:02 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.6.3-r300.ebuild,v 1.1 2012/02/04 10:04:42 pacho Exp $
 
 EAPI="4"
 
-inherit autotools eutils flag-o-matic eutils virtualx
+inherit autotools eutils flag-o-matic eutils virtualx gnome2-utils
 
 MY_P="webkit-${PV}"
 DESCRIPTION="Open source web browser engine"
 HOMEPAGE="http://www.webkitgtk.org/"
-# Upstream is still shipping silly gzip files
-#SRC_URI="http://www.webkitgtk.org/${MY_P}.tar.gz"
-SRC_URI="mirror://gentoo/${P}.tar.xz"
+SRC_URI="http://www.webkitgtk.org/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2 LGPL-2.1 BSD"
 SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
-~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
 # geoclue
 IUSE="aqua coverage debug doc +gstreamer +introspection +jit spell webgl"
+
 # bug 372493
 REQUIRED_USE="introspection? ( gstreamer )"
 
@@ -66,20 +64,35 @@ S="${WORKDIR}/${MY_P}"
 src_prepare() {
 	DOCS="ChangeLog NEWS" # other ChangeLog files handled by src_install
 
+	# Fix arches that use 64-bit double type
+	# https://bugs.webkit.org/show_bug.cgi?id=69940
+	epatch "${FILESDIR}/${PN}-1.6.1-double-conversion.patch"
+
 	# 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
+	# TODO: FAILS TO APPLY!
+	#use sparc && epatch "${FILESDIR}"/${PN}-1.2.3-fix-pool-sparc.patch
 
-	# Don't force -O2
-	sed -i 's/-O2//g' "${S}"/configure.ac
+	# 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.6.1-darwin-quartz.patch
+
+	# Drop DEPRECATED flags
+	sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED:$(NULL):g' GNUmakefile.am || die
 
-	# Don't build tests if not needed, part of bug #343249
-	# XXX: Fails to apply
-	#epatch "${FILESDIR}/${PN}-1.2.5-tests-build.patch"
+	# Don't force -O2
+	sed -i 's/-O2//g' "${S}"/configure.ac || die
 
 	# Required for webgl; https://bugs.webkit.org/show_bug.cgi?id=69085
 	mkdir -p DerivedSources/ANGLE
 
+	# We need to reset some variables to prevent permissions problems and failures
+	# like https://bugs.webkit.org/show_bug.cgi?id=35471 and bug #323669
+	gnome2_environment_reset
+
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
 	# Prevent maintainer mode from being triggered during make
 	AT_M4DIR=Source/autotools eautoreconf
 }
@@ -119,9 +132,7 @@ src_configure() {
 }
 
 src_compile() {
-	# Fix sandbox error with USE="introspection"
-	# https://bugs.webkit.org/show_bug.cgi?id=35471
-	emake XDG_DATA_HOME="${T}/.local"
+	default
 
 	# ${PN} neither ships, nor builds documentation on its own
 	if use doc; then
@@ -132,9 +143,8 @@ src_compile() {
 src_test() {
 	unset DISPLAY
 	# Tests need virtualx, bug #294691, bug #310695
-	# Set XDG_DATA_HOME for introspection tools, bug #323669
 	# Parallel tests sometimes fail
-	Xemake -j1 check XDG_DATA_HOME="${T}/.local"
+	Xemake -j1 check
 }
 
 src_install() {