Remove p.masked snapshot that tries to support wxWebKit. When this is re-introduced eventually, it will have to be a proper separate package

Package-Manager: portage-2.2_rc22/cvs/Linux 2.6.31-gentoo x86_64

6 files changed, 10 insertions, 147 deletions

diff --git a/net-libs/webkit-gtk/ChangeLog b/net-libs/webkit-gtk/ChangeLog
index 59a1cc2c65fc..7a56b1d211a5 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-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.46 2009/09/12 22:42:02 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.47 2009/09/27 18:31:52 leio Exp $
+
+  27 Sep 2009; Mart Raudsepp <leio@gentoo.org>
+  -files/webkit-gtk-0_p46126-cxxmissing.patch,
+  -files/webkit-gtk-0_p46126-wx-parallel-make.patch,
+  -files/webkit-gtk-0_p46126-wxslot-gentoo.patch,
+  -webkit-gtk-0_p46193.ebuild:
+  Remove p.masked snapshot that tries to support wxWebKit. When this is
+  re-introduced eventually, it will have to be a proper separate package
 
   12 Sep 2009; Gilles Dartiguelongue <eva@gentoo.org>
   webkit-gtk-0_p40220-r1.ebuild, webkit-gtk-0_p46193.ebuild,
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index a5722e174144..8f514ca26f95 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,27 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX webkit-gtk-0_p40220-gcc44-aliasing.patch 31876 RMD160 19f850df93fd81d1a736dbcc5441d0193929ef35 SHA1 293465980ececa6f2dbdd55787edf2676f628edf SHA256 6aee86b94b443a088502a35d25ffc7f17fa36f6e89dd082dcca11042a7af110f
-AUX webkit-gtk-0_p46126-cxxmissing.patch 245 RMD160 82965bb2cbadfc4bafd80a2df04f65d8a324d0f0 SHA1 15459648122c7dfc218c1577d6ef195556660ab4 SHA256 199fe035ced332cfe9abd2a8a14f69be8ea49d5796d34082dc5612691fcfe9d1
-AUX webkit-gtk-0_p46126-wx-parallel-make.patch 636 RMD160 c050983cc3993cf50fbf71e5f6421d5c773b8b18 SHA1 2b26d200d3f1ccde7e49a81a49595c03238b33e0 SHA256 7df659acbe7d2316bf7e6bfd40c2002691e4734f5333d10602327311ed7f2a8c
-AUX webkit-gtk-0_p46126-wxslot-gentoo.patch 473 RMD160 5d3f75c4129dbfcdfedfcdd1f38acc255289300b SHA1 0be9ad004c94f16b2ca0b6488685fca58ffef694 SHA256 c76d788a22632bf7f6a589351ddd3b12129b0eead020719ac5b0076ea7da2785
 AUX webkit-gtk-CVE-2009-0945.patch 671 RMD160 a51f2326f44e05146eaeea5b3f0fcc973efdaeca SHA1 2a281b7ee69158daf7d088add2f21f99903506dd SHA256 65ccad453b147067725dac0f9ba8f07cd0d04970ab0f8d85f086ef07a6d0b3c3
 DIST WebKit-r40220.tar.bz2 10307835 RMD160 5700977d5a9a23680e58b1e3952ecb2fe1430e9a SHA1 2aa2bd3a9c60f53a1a1ef0bf810ea2c59b0a80e2 SHA256 223154d0e247336cd3cf808b030cfb00739103b7a258050e71703903df922020
-DIST WebKit-r46193.tar.bz2 11728345 RMD160 8cddda98e88ccd5e603ea8c919668b5c707a2344 SHA1 5490986303560917b2151f394069b2b9b30fa10f SHA256 1dc4b8ec0501dfc2150bcac879c80906813bf729ba5300a9b2dc882f9bcb4ef5
 DIST webkit-1.1.10.tar.gz 6343872 RMD160 c3d5a7b9793318d0fc9f4d170b7aeac7a6f30735 SHA1 8f0637c936b4f62fb21c8d0c35298e5c0317fd0a SHA256 4eb4fc4a3f47edbc18c9dc09d54fd2189954ebaa0e521b0ab97e21087d8c9855
 DIST webkit-1.1.7.tar.gz 6205024 RMD160 63dea479e23b62ae6d0abb0e5559c35eed34466d SHA1 77d27ab8f0d74ddda349ea9e4416d27d9adb8b61 SHA256 1aaae2bc36ba7ffb27690647e1631f336c0aee56bad2fd91ee6ea906ff17945f
 DIST webkit-1.1.8.tar.gz 6232745 RMD160 6c0cda8cbcf88c7d7104e0bcc6b910eada9213c0 SHA1 3b858495e293c0998a2652993a93ccbedff71839 SHA256 984929e42c6904893f5cd73f6506f858a3859d2ee1a56d69b4f7e9f62a0d2ffa
 EBUILD webkit-gtk-0_p40220-r1.ebuild 2017 RMD160 e0c5faca4ae98256b4b964fde174e932aad08d6e SHA1 6de0cd2a6d02773f13d00232ac66aa2073df17db SHA256 1220f0c9faff1820bcb8ddebaf3a3a0e0b133456fd6497f40311463efbffad69
-EBUILD webkit-gtk-0_p46193.ebuild 2485 RMD160 499ba2a215f36722529809a6d9226abc7cac993d SHA1 b4e6ac4215cffdd2d117f8f76c43f6261b3e913b SHA256 4a1f5b8a2014ff91f54c2989ea1e8c6b25f95115c18ad63f43563d79d557d5fe
 EBUILD webkit-gtk-1.1.10.ebuild 2511 RMD160 e029198e79fce4177becec6333d5a4e795688f9e SHA1 8c998ecb5b4372b58c2b9c9dba0d821d8f9a03c6 SHA256 f04688997e19b3ccfeddbfee0cf47211de559f3e8a55ed2238e12761176f44ff
 EBUILD webkit-gtk-1.1.7.ebuild 2149 RMD160 ca61c85d21c4a605452531b5873b2e5646553bb4 SHA1 dbdbc1a21bb9f7310386c077045c1e1fc0c0d779 SHA256 c5689e71175b2e04d69254ed73719bee650266caa98d2111c1a0ec0be4e85468
 EBUILD webkit-gtk-1.1.8.ebuild 2492 RMD160 43d965e5396eca18bc4530c3ac152d95716a3433 SHA1 928d6d1508b0b874121c558f72757935dae90100 SHA256 441d4d8f3d95ae1471f58f710f154b5afd7d8c9f396af96780b498fd7ccd00f3
-MISC ChangeLog 10542 RMD160 0620b4b1070d1987e8bd2b7f7546849274aa7050 SHA1 018eb018de1db20acccf249f0d68bb4827d6ba7e SHA256 da4f1cb94344ae3d9bf55afbadaf47a8b0e581a161faeac597fa7a6fef1d5d6d
+MISC ChangeLog 10917 RMD160 88b1eaecbb2d1757eadcbfae0a4321a888f62fb9 SHA1 a330311bb1f637183478737efd7ed9a02943f8e0 SHA256 c55e745f62cc3e06b903b3ad7db7bb1bef71d16b1b397b82474b3d0bda6625d3
 MISC metadata.xml 432 RMD160 672c7e534ff86cfef074939053d64efc29e53b1e SHA1 40167924c241c19efa021b71fb15096739687952 SHA256 c4d89a5f0ca8b3da0d4432530d41e75a184a07cd560599219d268d3f1ff2418b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkqsI8IACgkQ1fmVwcYIWAbh5ACfW8IKumFsF7Rsg7FSY5/fWNt3
-qjgAoM2IuKkzGdtXeWhx9jz4PdfRYaGK
-=+Fv2
------END PGP SIGNATURE-----
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-0_p46126-cxxmissing.patch b/net-libs/webkit-gtk/files/webkit-gtk-0_p46126-cxxmissing.patch
deleted file mode 100644
index 0f9afdf3baef..000000000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-0_p46126-cxxmissing.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./configure.ac.orig	2009-07-18 01:39:33.000000000 +0200
-+++ ./configure.ac	2009-07-21 21:10:37.286329878 +0200
-@@ -79,6 +79,7 @@
- AC_DISABLE_STATIC
- AC_LIBTOOL_WIN32_DLL
- AC_PROG_LIBTOOL
-+AC_PROG_CXX
- # use dolt to speedup the build
- DOLT
- 
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-0_p46126-wx-parallel-make.patch b/net-libs/webkit-gtk/files/webkit-gtk-0_p46126-wx-parallel-make.patch
deleted file mode 100644
index 6a1f3cd28086..000000000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-0_p46126-wx-parallel-make.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN ./WebKitTools.orig/wx/build-wxwebkit ./WebKitTools/wx/build-wxwebkit
---- ./WebKitTools.orig/wx/build-wxwebkit	2009-06-30 21:27:58.000000000 +0200
-+++ ./WebKitTools/wx/build-wxwebkit	2009-07-21 23:16:29.542350407 +0200
-@@ -179,7 +179,7 @@
-         cd $olddir
-     else
-         if [ -f $dir/GNUmakefile ]; then
--            make -C $dir -f GNUmakefile $MAKE_ARGS CXXFLAGS="$cxxflags -fvisibility=hidden -fvisibility-inlines-hidden" $@
-+            make -C $dir -f GNUmakefile $MAKEOPTS $MAKE_ARGS CXXFLAGS="${CXXFLAGS} $cxxflags -fvisibility=hidden -fvisibility-inlines-hidden" $@
-         fi
-     fi
-     if [ $? != 0 ]; then
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-0_p46126-wxslot-gentoo.patch b/net-libs/webkit-gtk/files/webkit-gtk-0_p46126-wxslot-gentoo.patch
deleted file mode 100644
index 171be72a51ad..000000000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-0_p46126-wxslot-gentoo.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN ./WebKit.orig/wx/wxwk-settings.bkl ./WebKit/wx/wxwk-settings.bkl
---- ./WebKit.orig/wx/wxwk-settings.bkl	2009-07-13 01:13:26.000000000 +0200
-+++ ./WebKit/wx/wxwk-settings.bkl	2009-07-21 22:07:34.182387455 +0200
-@@ -33,7 +33,7 @@
-     <set var="WX_UNICODE">1</set>
-     <set var="WX_SHARED">1</set>
- 
--    <include file="presets/wx.bkl"/>
-+    <include file="presets/wx28.bkl"/>
-     <include file="presets/wxwebkit.bkl"/>
-     <include file="dependencies.bkl"/>
- 
diff --git a/net-libs/webkit-gtk/webkit-gtk-0_p46193.ebuild b/net-libs/webkit-gtk/webkit-gtk-0_p46193.ebuild
deleted file mode 100644
index d2d3b6123920..000000000000
--- a/net-libs/webkit-gtk/webkit-gtk-0_p46193.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-0_p46193.ebuild,v 1.3 2009/09/12 22:42:02 eva Exp $
-
-EAPI="2"
-
-AT_M4DIR=./autotools
-WX_GTK_VER="2.8"
-inherit autotools flag-o-matic eutils wxwidgets
-
-MY_P="WebKit-r${PV/0\_p}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="http://www.webkit.org/"
-SRC_URI="http://nightly.webkit.org/files/trunk/src/${MY_P}.tar.bz2"
-
-LICENSE="LGPL-2 LGPL-2.1 BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 -ia64 ~ppc -sparc ~x86 ~x86-fbsd"
-IUSE="coverage debug gstreamer pango soup sqlite svg wxwidgets xslt"
-
-RDEPEND=">=x11-libs/gtk+-2.8
-	>=dev-libs/icu-3.8.1-r1
-	>=net-misc/curl-7.15
-	media-libs/jpeg
-	media-libs/libpng
-	dev-libs/libxml2
-	sqlite? ( >=dev-db/sqlite-3 )
-	gstreamer? (
-		>=media-libs/gst-plugins-base-0.10
-		)
-	soup? ( >=net-libs/libsoup-2.27.4 )
-	xslt? ( dev-libs/libxslt )
-	pango? ( x11-libs/pango )
-	wxwidgets? ( x11-libs/wxGTK )"
-
-DEPEND="${RDEPEND}
-	dev-util/gperf
-	dev-util/pkgconfig
-	virtual/perl-Text-Balanced"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-0_p46126-cxxmissing.patch"
-	epatch "${FILESDIR}/${PN}-0_p46126-wxslot-gentoo.patch"
-	epatch "${FILESDIR}/${PN}-0_p46126-wx-parallel-make.patch"
-	epatch "${FILESDIR}/${PN}-0_p46193-bake.patch"
-	gtkdocize
-	eautoreconf
-}
-
-src_configure() {
-	# It doesn't compile on alpha without this LDFLAGS
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	local myconf
-	use pango && myconf="${myconf} --with-font-backend=pango"
-	use soup && myconf="${myconf} --with-http-backend=soup"
-
-	econf \
-		$(use_enable sqlite database) \
-		$(use_enable sqlite icon-database) \
-		$(use_enable sqlite dom-storage) \
-		$(use_enable sqlite offline-web-applications) \
-		$(use_enable gstreamer video) \
-		$(use_enable svg) \
-		$(use_enable debug) \
-		$(use_enable xslt) \
-		$(use_enable coverage) \
-		${myconf}
-}
-
-src_compile() {
-	emake || die "emake failed"
-
-	if use wxwidgets ; then
-		# Upstream without further comment
-		cd "${S}"
-		cp DerivedSources/JSDataGridC*.{cpp,h} WebCore/bindings/js || die "copy failed"
-
-		cd "${S}"/WebKitTools/wx
-		./build-wxwebkit || die "wxwebkit build failed"
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Install failed"
-}
-
-pkg_postinst() {
-	if use gstreamer; then
-	    ewarn
-	    ewarn "If ${PN} doesn't play some video format, please check your"
-	    ewarn "USE flags on media-plugins/gst-plugins-meta"
-	fi
-}