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

(Portage version: 2.1.10.54/cvs/Linux x86_64)

4 files changed, 7 insertions, 266 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/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 '{}' +
-}