addpredict is needed to prevent sandbox violation (bug #323977). Remove old.

(Portage version: 2.1.8.3/cvs/Linux x86_64)

3 files changed, 12 insertions, 75 deletions

diff --git a/www-client/epiphany/ChangeLog b/www-client/epiphany/ChangeLog
index 24471d04854d..a2e6b3c0ea0f 100644
--- a/www-client/epiphany/ChangeLog
+++ b/www-client/epiphany/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-client/epiphany
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/ChangeLog,v 1.245 2010/07/05 21:43:04 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/ChangeLog,v 1.246 2010/07/08 13:46:56 pacho Exp $
+
+  08 Jul 2010; Pacho Ramos <pacho@gentoo.org> -epiphany-2.30.2.ebuild,
+  epiphany-2.30.2-r1.ebuild:
+  addpredict is needed to prevent sandbox violation (bug #323977). Remove
+  old.
 
 *epiphany-2.30.2-r1 (05 Jul 2010)
 
diff --git a/www-client/epiphany/epiphany-2.30.2-r1.ebuild b/www-client/epiphany/epiphany-2.30.2-r1.ebuild
index 95bf788e4d98..1d287187a13a 100644
--- a/www-client/epiphany/epiphany-2.30.2-r1.ebuild
+++ b/www-client/epiphany/epiphany-2.30.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-2.30.2-r1.ebuild,v 1.1 2010/07/05 21:43:04 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-2.30.2-r1.ebuild,v 1.2 2010/07/08 13:46:56 pacho Exp $
 
 EAPI="2"
 
@@ -79,9 +79,9 @@ src_prepare() {
 	epatch "${FILESDIR}/${P}-uri-crash.patch"
 }
 
-#src_compile() {
-	# Fix sandbox error with USE="introspection"
+src_compile() {
+	# Fix sandbox error with USE="introspection" and "doc"
 	# https://bugs.webkit.org/show_bug.cgi?id=35471
-#	addpredict "$(unset HOME; echo ~)/.local"
-#	emake || die "Compile failed"
-#}
+	addpredict "$(unset HOME; echo ~)/.local"
+	emake || die "Compile failed"
+}
diff --git a/www-client/epiphany/epiphany-2.30.2.ebuild b/www-client/epiphany/epiphany-2.30.2.ebuild
deleted file mode 100644
index 3a312d990c68..000000000000
--- a/www-client/epiphany/epiphany-2.30.2.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-2.30.2.ebuild,v 1.1 2010/06/13 21:09:33 pacho Exp $
-
-EAPI="2"
-
-inherit eutils gnome2
-
-DESCRIPTION="GNOME webbrowser based on Webkit"
-HOMEPAGE="http://www.gnome.org/projects/epiphany/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~sparc ~x86"
-
-# We are not ready for introspection yet
-IUSE="avahi doc networkmanager +nss test"
-
-# TODO: add seed support
-RDEPEND=">=dev-libs/glib-2.19.7
-	>=x11-libs/gtk+-2.19.5
-	>=dev-libs/libxml2-2.6.12
-	>=dev-libs/libxslt-1.1.7
-	>=x11-libs/startup-notification-0.5
-	>=x11-libs/libnotify-0.4
-	>=dev-libs/dbus-glib-0.71
-	>=gnome-base/gconf-2
-	>=app-text/iso-codes-0.35
-	>=net-libs/webkit-gtk-1.1.22
-	>=net-libs/libsoup-2.29.91[gnome]
-	>=gnome-base/gnome-keyring-2.26.0
-
-	x11-libs/libICE
-	x11-libs/libSM
-
-	avahi? ( >=net-dns/avahi-0.6.22 )
-	networkmanager? ( net-misc/networkmanager )
-	nss? ( dev-libs/nss )
-	x11-themes/gnome-icon-theme"
-#       introspection? ( >=dev-libs/gobject-introspection-0.6.7 )
-DEPEND="${RDEPEND}
-	app-text/scrollkeeper
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.40
-	>=app-text/gnome-doc-utils-0.3.2
-	gnome-base/gnome-common
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README TODO"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-introspection
-		--disable-scrollkeeper
-		--disable-maintainer-mode
-		--with-distributor-name=Gentoo
-		$(use_enable avahi zeroconf)
-		$(use_enable networkmanager network-manager)
-		$(use_enable nss)
-		$(use_enable test tests)"
-}
-
-#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"
-#}