Filter -mvis on sparc due bug #351561, thanks to Alex Buell. Remove old.

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

4 files changed, 13 insertions, 127 deletions

diff --git a/net-libs/webkit-gtk/ChangeLog b/net-libs/webkit-gtk/ChangeLog
index 0ed85493a5f3..62bd02b028c7 100644
--- a/net-libs/webkit-gtk/ChangeLog
+++ b/net-libs/webkit-gtk/ChangeLog
@@ -1,6 +1,10 @@
 # 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.98 2011/01/15 12:10:57 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.99 2011/01/15 13:56:25 pacho Exp $
+
+  15 Jan 2011; Pacho Ramos <pacho@gentoo.org> -webkit-gtk-1.2.3.ebuild,
+  webkit-gtk-1.2.6.ebuild:
+  Filter -mvis on sparc due bug #351561, thanks to Alex Buell. Remove old.
 
   15 Jan 2011; Markus Meier <maekke@gentoo.org> webkit-gtk-1.2.6.ebuild:
   arm stable, bug #350598
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index a49a6c55b278..9c2b761f655c 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -5,18 +5,16 @@ AUX webkit-gtk-1.2.3-fix-pool-sparc.patch 2518 RMD160 48ec89fb42403fae1b1533b549
 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.3.tar.gz 6740030 RMD160 41fa194de2865867dbf7d1156d0962a7580f2275 SHA1 88c38ebeba187a062272b2aa8ca2bbd0bbb86306 SHA256 ff70b25ea8dedc0031f29f2ea8d9aa226bfa65ebd2f12772390f4e2845306fe1
 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
-EBUILD webkit-gtk-1.2.3.ebuild 3224 RMD160 e571e1c7c5fef504bd0f63a93fe9229930a73328 SHA1 99e5ae68ae325f014d2af49f26664f9294bf471b SHA256 e1cab519d5cc0200c8fc842bbe0707855df32f00aa9d563c6e5161dab5d8b728
 EBUILD webkit-gtk-1.2.5.ebuild 3152 RMD160 25f9a75720761b6aaaf30b4b4bfe95dc0e9deb65 SHA1 079b12e389819f0af96429edfc0fcbf00d133d6f SHA256 474ec46f5d3d9d039704c9a47e6d485b56699b661eb7c9ae8cf8a2c7739d415e
-EBUILD webkit-gtk-1.2.6.ebuild 3349 RMD160 f6a89b82d8197fcf5c0831de7250a2528c675a35 SHA1 689db6e623c6d31d505fd3d6a8b3ccff0f34f61a SHA256 639a9a97d74a23a37eeb1c6e24e7bf0c96b4213baa13ace4442bd2a5382547b8
-MISC ChangeLog 19848 RMD160 a976ca283de044d7d2a6aba5abca7d2236f3c923 SHA1 4750583aeb54a822a5196f46aabd722be47db639 SHA256 539eecc09b45d91da242c886d4a0ece873748e1bbca5a06e888d143f78eea0d5
+EBUILD webkit-gtk-1.2.6.ebuild 3364 RMD160 d8c0d97939d8f88ce484c61b58b6ed0c59d54ed6 SHA1 bef2cee706f4f78e42c947ac83f59a3908994043 SHA256 fe064c8f40c14f3f183efa27d5c27f40f37cb9205cf74fab400957b1becf4ed8
+MISC ChangeLog 20022 RMD160 bc1a53748b0d4d27e758ab216ccedf80c1aaa4c7 SHA1 9aa597b03e73ec406b1a9b6d72c170ef211a697b SHA256 385aed3f88a3647187950a568b745eb44c97077726ba42f9c55ef89981dca82c
 MISC metadata.xml 439 RMD160 ed901542890ff2bf45ff3302f79b48cc0ba9e5f8 SHA1 746abe4ff5e3911f962a40f23fe1c521d32adca8 SHA256 57260da7cdd67c9be679d44a3deba705ff381fde47433b5d22ccd1402ecabdf3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAk0xjwEACgkQkKaRLQcq0GIKEQCgl4AqbNOce8LOO+DarIkmjKW5
-pU8AnjTIzgJXje9b1CSE9uolzjeuUGQT
-=M5Hk
+iEYEARECAAYFAk0xp48ACgkQCaWpQKGI+9R9bQCfckKhuq8461r7uLkThCQNlrhA
+L60AnR+GzQvHPqqhDHBaomvoC+rjgShs
+=L9NX
 -----END PGP SIGNATURE-----
diff --git a/net-libs/webkit-gtk/webkit-gtk-1.2.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.2.3.ebuild
deleted file mode 100644
index b3c24cca57ac..000000000000
--- a/net-libs/webkit-gtk/webkit-gtk-1.2.3.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2010 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.3.ebuild,v 1.9 2010/12/29 22:41:40 nirbheek Exp $
-
-EAPI="2"
-
-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 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
-# geoclue
-# FIXME: we are still not ready for introspection
-IUSE="coverage debug doc +gstreamer" # aqua
-
-# use sqlite, svg by default
-# dependency on >=x11-libs/gtk+-2.13 for gail
-# XXX: Quartz patch does not apply
-# >=x11-libs/gtk+-2.13[aqua=]
-RDEPEND="
-	dev-libs/libxml2
-	dev-libs/libxslt
-	virtual/jpeg
-	>=media-libs/libpng-1.4
-	x11-libs/cairo
-	>=x11-libs/gtk+-2.13
-	>=dev-libs/glib-2.21.3
-	>=dev-libs/icu-3.8.1-r1
-	>=net-libs/libsoup-2.29.90
-	>=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
-#		!!dev-libs/gir-repository[webkit]
-#		dev-libs/gir-repository[libsoup] )
-
-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 )"
-
-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
-
-	# Darwin/Aqua build is broken, needs autoreconf
-	# XXX: BROKEN. Patch does not apply anymore.
-	# https://bugs.webkit.org/show_bug.cgi?id=28727
-	#epatch "${FILESDIR}"/${PN}-1.1.15.4-darwin-quartz.patch
-
-	# Make it libtool-1 compatible
-	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
-	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
-	use sparc && filter-flags "-mcpu=*" "-mtune=*"
-
-	local myconf
-
-	myconf="
-		--disable-introspection
-		--disable-web_sockets
-		$(use_enable coverage)
-		$(use_enable debug)
-		$(use_enable gstreamer video)"
-		# Disable web-sockets per bug #326547
-		# quartz patch above does not apply anymore
-		#$(use aqua && echo "--with-target=quartz")"
-
-	econf ${myconf}
-}
-
-src_test() {
-	unset DISPLAY
-	# Tests can fail without it, bug 323669
-	export XDG_DATA_HOME="${T}"
-	# Tests will fail without it, bug 294691, bug 310695
-	Xemake check || die "Test phase failed"
-}
-
-#src_compile() {
-	# Fix sandbox error with USE="introspection"
-	# https://bugs.webkit.org/show_bug.cgi?id=35471
-#	addpredict "$(unset HOME; echo ~)/.local"
-#	emake || die "Compile failed"
-#}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Install failed"
-	dodoc WebKit/gtk/{NEWS,ChangeLog} || die "dodoc failed"
-}
diff --git a/net-libs/webkit-gtk/webkit-gtk-1.2.6.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.2.6.ebuild
index 82ef330ec58c..e34f4135f740 100644
--- a/net-libs/webkit-gtk/webkit-gtk-1.2.6.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-1.2.6.ebuild
@@ -1,6 +1,6 @@
 # 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.6.ebuild,v 1.7 2011/01/15 12:10:57 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.2.6.ebuild,v 1.8 2011/01/15 13:56:26 pacho Exp $
 
 EAPI="3"
 
@@ -76,8 +76,8 @@ src_configure() {
 	# It doesn't compile on alpha without this in LDFLAGS
 	use alpha && append-ldflags "-Wl,--no-relax"
 
-	# Sigbuses on SPARC with mcpu
-	use sparc && filter-flags "-mcpu=*" "-mtune=*"
+	# 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"