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

(Portage version: 2.2_rc22/cvs/Linux 2.6.31-gentoo x86_64)

5 files changed, 9 insertions, 131 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/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
-}