Update double-conversion.patch to also include ALPHA, bug #410191 by mach1. Remove old.

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

5 files changed, 12 insertions, 274 deletions

diff --git a/net-libs/webkit-gtk/ChangeLog b/net-libs/webkit-gtk/ChangeLog
index 9ef19e488349..d5393b9031b7 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-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.148 2012/03/25 16:14:38 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.149 2012/04/02 21:58:55 pacho Exp $
+
+  02 Apr 2012; Pacho Ramos <pacho@gentoo.org> -webkit-gtk-1.4.3-r200.ebuild,
+  -webkit-gtk-1.4.3-r300.ebuild, files/webkit-gtk-1.6.1-double-conversion.patch:
+  Update double-conversion.patch to also include ALPHA, bug #410191 by mach1.
+  Remove old.
 
   25 Mar 2012; Raúl Porcel <armin76@gentoo.org> webkit-gtk-1.6.1-r201.ebuild,
   webkit-gtk-1.6.1-r301.ebuild:
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 774e4bbfea1b..e9451da8a048 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -9,25 +9,22 @@ AUX webkit-gtk-1.2.5-tests-build.patch 526 RMD160 c336c7309899169a2691bf3b984fa4
 AUX webkit-gtk-1.2.7-libpng15.patch 1657 RMD160 19cec5b29437313372b9b25d43029105197a4abf SHA1 2748a46b1a4c9d547094ae2795ad2c812fbf59aa SHA256 0aef21a127b9427cb98684102c91902f38585c7d7642525760c7a7d9f0d39dc7
 AUX webkit-gtk-1.4.1-libpng15.patch 2571 RMD160 427d9746f365f27c66be0c73a41c7034754e2522 SHA1 0481a4039c79414449262392758a63e97157ff93 SHA256 c014d8380270a73d96069f5eac343fab40d1a1112b03c32e5e6365da89ab7705
 AUX webkit-gtk-1.6.1-darwin-quartz.patch 1516 RMD160 6c73b491645c0d4626d5a60043159c045bee013f SHA1 e032315b4155a92f18ea43b29a4581655eb34d89 SHA256 34ad751c33e868d85b41e06ecbd085b61a81c42bd52063bada52bc59b9e05a23
-AUX webkit-gtk-1.6.1-double-conversion.patch 1585 RMD160 2eb508cf95ce16f5a49e7375c46271d85d5280c6 SHA1 70b81cd3bb600fa698487b6fb59459ca24e31b6f SHA256 2b1baadaf694e96d546ae50ce2a4154e4d1f7efbe7566868297cee27e9c08f08
+AUX webkit-gtk-1.6.1-double-conversion.patch 1599 RMD160 a9546a7eedabad03fdf68a95626a81a5297befbe SHA1 1f4d87c4dc1264c3e95e2e04192a253ee2eb06a2 SHA256 7699e501785518bce36ebdd4faf2d3ace521fc27e748dfadedd65420de5d1e41
 AUX webkit-gtk-1.6.1-pkgconfig-fix.patch 1297 RMD160 8a83465d74bf34d6fe7cbb6a2767f62c77e33aa2 SHA1 40090e84c3ee7814c14363d8bb790c7ec38d2dbb SHA256 f4a41c4dd1c40347e846b377bd94b2d3ad10b1f110711b5f341f8fd8a5a13014
 AUX webkit-gtk-1.6.1-sparc-needs-alignment.patch 430 RMD160 5220e63f6c6abf4f9d2d0c4857637cb9fd07120f SHA1 7b29e3dfb79f4b2566d300bef37efa88594fd7eb SHA256 870f314ed330b8cb1d7ffc498e2019c001eded83f14dfb4976804f85af403f80
 AUX webkit-gtk-1.6.3-paxctl-introspection.patch 929 RMD160 fe2eb5fb4d6830c377a723480db6519e7a08cc32 SHA1 53b27522fe37fedb2485079055ce755833fe8048 SHA256 96efa5fcd823eca76f24c4d975dda0f7d9cfc439c71807941e895a70d0aea377
-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-r201.ebuild 4959 RMD160 efc7fe947fe751336e0038c866e842ff9b898180 SHA1 862ae335a359e32c933266b5c19dd6ea5cb1958c SHA256 c6869c581b6d7fc829c525f450c93dac9e89336b08f9394c8426892d99852896
 EBUILD webkit-gtk-1.6.1-r301.ebuild 4895 RMD160 071c892951df0ea7a1e49edbffbc03bebb645496 SHA1 c07d104bb89fbc44ac86cdc76a89746169435875 SHA256 72cb6d8910e902f4222ab70967cf87a6ecac981c7e6d3d0a305d4a59cfee3f8d
 EBUILD webkit-gtk-1.6.3-r200.ebuild 5305 RMD160 2fc401fc23c9bc7e15538850675adf7c8f0249d2 SHA1 1675235ea4f12be876e325cdc21e25c1848e6dd9 SHA256 b12b080d0a044c9cd98cdb8617e8ff4fba7a12836e92ca16058a24aec3ec6dbd
 EBUILD webkit-gtk-1.6.3-r300.ebuild 5133 RMD160 6cb6b17685ac942cc3003bc3b173755cdb0753cb SHA1 bb62ef1de44178bc7cbbc940c594eabffbc4557e SHA256 2d032d3208fa73a7b7cfdcc562e6a1b4e476b0912a3658e2fef5bc5332214eb8
-MISC ChangeLog 29697 RMD160 782ab62aad61ff77ea02f04736de4b17a1b216d1 SHA1 c9eb9b95d766d3aef3e3de5991ece9da8b5c9684 SHA256 9fcecfeaa92a528a455213acb880f91883e6a57ae40f219222ee801539e5f8c0
+MISC ChangeLog 29946 RMD160 055dfe2a1e868cb1d3ecf1c82c22a829cf99d21a SHA1 7a683877d61d185cbbbf81439202d1c115b303c3 SHA256 9b86728276773c9ee0ce9aa7d7b5cc31f480829fe6b9d99586014c530ddccce5
 MISC metadata.xml 539 RMD160 422a84bfd5fd0ca7d32825e204b0a435a980ecd5 SHA1 33fe25bdc890c5e034d5dc02a82b028283e0cc03 SHA256 eb78ad3163ace16c943a2620ef1659d33913985b8a9584a2d734f021a82f7887
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk9vRHUACgkQuQc30/atMkD7/ACgkq/jEOhVAV+wgCmdwGhDmpAN
-LfUAnRkyyr+tJMTCTtt43hUu5Keg7od4
-=kKRb
+iEYEARECAAYFAk96ISUACgkQCaWpQKGI+9Rk/wCeMNde59R5BLFgxIaa+6AbmjS2
+Mc0AnAq6oQZTeWUQMhjhlQKM8xLKnUOq
+=C7w+
 -----END PGP SIGNATURE-----
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.6.1-double-conversion.patch b/net-libs/webkit-gtk/files/webkit-gtk-1.6.1-double-conversion.patch
index 415fdfc3b2a5..0c07a5133123 100644
--- a/net-libs/webkit-gtk/files/webkit-gtk-1.6.1-double-conversion.patch
+++ b/net-libs/webkit-gtk/files/webkit-gtk-1.6.1-double-conversion.patch
@@ -30,7 +30,7 @@ Index: webkit-1.6.1/Source/JavaScriptCore/wtf/dtoa/utils.h
  defined(_MIPS_ARCH_MIPS32R2)
  #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
 -#elif CPU(MIPS) || CPU(PPC) || CPU(PPC64) || OS(WINCE) || CPU(SH4)
-+#elif CPU(MIPS) || CPU(PPC) || CPU(PPC64) || OS(WINCE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(SPARC)
++#elif CPU(MIPS) || CPU(PPC) || CPU(PPC64) || OS(WINCE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(SPARC) || CPU(ALPHA)
  #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
  #elif defined(_M_IX86) || defined(__i386__)
  #if defined(_WIN32)
diff --git a/net-libs/webkit-gtk/webkit-gtk-1.4.3-r200.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.4.3-r200.ebuild
deleted file mode 100644
index 6d620b57f47c..000000000000
--- a/net-libs/webkit-gtk/webkit-gtk-1.4.3-r200.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# 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.4.3-r200.ebuild,v 1.7 2011/11/05 13:21:15 pacho Exp $
-
-EAPI="4"
-
-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
-IUSE="aqua coverage debug doc spell +gstreamer +introspection +jit"
-# bug 372493
-REQUIRED_USE="introspection? ( gstreamer )"
-
-# use sqlite, svg by default
-# dependency on >=x11-libs/gtk+-2.13:2 for gail
-RDEPEND="
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	virtual/jpeg
-	>=media-libs/libpng-1.4:0
-	x11-libs/cairo
-	>=dev-libs/glib-2.27.90:2
-	>=x11-libs/gtk+-2.13:2[aqua=,introspection?]
-	>=dev-libs/icu-3.8.1-r1
-	>=net-libs/libsoup-2.33.6:2.4[introspection?]
-	dev-db/sqlite:3
-	>=x11-libs/pango-1.12
-	x11-libs/libXrender
-
-	gstreamer? (
-		media-libs/gstreamer:0.10
-		>=media-libs/gst-plugins-base-0.10.25:0.10 )
-
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
-
-	spell? ( >=app-text/enchant-0.22 )
-"
-DEPEND="${RDEPEND}
-	>=sys-devel/flex-2.5.33
-	sys-devel/gettext
-	virtual/yacc
-	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() {
-	DOCS="Source/WebKit/gtk/NEWS Source/WebKit/gtk/ChangeLog"
-
-	# 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.3-fix-pool-sparc.patch
-
-	# Fix build on Darwin8 (10.4 Tiger)
-	# XXX: Fails to apply
-	#epatch "${FILESDIR}"/${PN}-1.2.5-darwin8.patch
-
-	# Don't force -O2
-	sed -i 's/-O2//g' "${S}"/configure.ac
-
-	# Don't build tests if not needed, part of bug #343249
-	# XXX: Fails to apply
-	#epatch "${FILESDIR}/${PN}-1.2.5-tests-build.patch"
-
-	# Prevent maintainer mode from being triggered during make
-	AT_M4DIR=Source/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
-
-	# XXX: Check Web Audio support
-	# XXX: webgl fails compilation
-	# XXX: WebKit2 is the new out-of-process model, doesn't work yet
-	myconf="
-		$(use_enable coverage)
-		$(use_enable debug)
-		$(use_enable spell spellcheck)
-		$(use_enable introspection)
-		$(use_enable gstreamer video)
-		$(use_enable jit)
-		--disable-webgl
-		--with-gtk=2.0
-		--disable-webkit2
-		--disable-web-sockets
-		$(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"
-}
-
-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"
-}
-
-src_install() {
-	default
-
-	# Remove .la files
-	find "${D}" -name '*.la' -exec rm -f '{}' +
-}
diff --git a/net-libs/webkit-gtk/webkit-gtk-1.4.3-r300.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.4.3-r300.ebuild
deleted file mode 100644
index a391ae4bad7c..000000000000
--- a/net-libs/webkit-gtk/webkit-gtk-1.4.3-r300.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# 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.4.3-r300.ebuild,v 1.8 2011/11/05 13:21:15 pacho Exp $
-
-EAPI="4"
-
-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="3"
-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"
-# bug 372493
-REQUIRED_USE="introspection? ( gstreamer )"
-
-# use sqlite, svg by default
-# dependency on >=x11-libs/gtk+-2.13:2 for gail
-# Aqua support in gtk3 is untested
-RDEPEND="
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	virtual/jpeg
-	>=media-libs/libpng-1.4:0
-	x11-libs/cairo
-	>=dev-libs/glib-2.27.90:2
-	>=x11-libs/gtk+-3.0:3[aqua=,introspection?]
-	>=dev-libs/icu-3.8.1-r1
-	>=net-libs/libsoup-2.33.6:2.4[introspection?]
-	dev-db/sqlite:3
-	>=x11-libs/pango-1.12
-	x11-libs/libXrender
-
-	gstreamer? (
-		media-libs/gstreamer:0.10
-		>=media-libs/gst-plugins-base-0.10.25:0.10 )
-
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
-
-	spell? ( >=app-text/enchant-0.22 )
-"
-DEPEND="${RDEPEND}
-	>=sys-devel/flex-2.5.33
-	sys-devel/gettext
-	virtual/yacc
-	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() {
-	DOCS="Source/WebKit/gtk/NEWS Source/WebKit/gtk/ChangeLog"
-
-	# 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)
-	# XXX: Fails to apply
-	#epatch "${FILESDIR}"/${PN}-1.2.5-darwin8.patch
-
-	# Don't force -O2
-	sed -i 's/-O2//g' "${S}"/configure.ac
-
-	# Don't build tests if not needed, part of bug #343249
-	# XXX: Fails to apply
-	#epatch "${FILESDIR}/${PN}-1.2.5-tests-build.patch"
-
-	# Prevent maintainer mode from being triggered during make
-	AT_M4DIR=Source/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
-
-	# XXX: Check Web Audio support
-	# XXX: webgl fails compilation
-	# XXX: WebKit2 is the new out-of-process model, doesn't work yet
-	myconf="
-		$(use_enable coverage)
-		$(use_enable debug)
-		$(use_enable spell spellcheck)
-		$(use_enable introspection)
-		$(use_enable gstreamer video)
-		$(use_enable jit)
-		--disable-webgl
-		--with-gtk=3.0
-		--disable-webkit2
-		--disable-web-sockets
-		$(use aqua && echo "--with-font-backend=pango --with-target=quartz")"
-		# Aqua support in gtk3 is untested
-		# 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"
-}
-
-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"
-}
-
-src_install() {
-	default
-
-	# Remove .la files
-	find "${D}" -name '*.la' -exec rm -f '{}' +
-}