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

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

4 files changed, 17 insertions, 81 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/Manifest b/www-client/epiphany/Manifest
index d054e13b1b55..abe7051ccfd5 100644
--- a/www-client/epiphany/Manifest
+++ b/www-client/epiphany/Manifest
@@ -24,14 +24,13 @@ DIST epiphany-2.30.2.tar.bz2 5881032 RMD160 c0bb5e1a14ccbe72531cbf3f0f416c517243
 EBUILD epiphany-2.26.3-r2.ebuild 2624 RMD160 1aeeece7b923434d629a4fd430f7828370939b0d SHA1 9c4e4f9714e1697e6d05ff6d92c2faa70fd12ce6 SHA256 385f22f83986bc8aa0d9d12ea86f5175a9a67bef688ec6a031b0cf70965ce545
 EBUILD epiphany-2.26.3-r4.ebuild 3353 RMD160 cd930b046c95e71a756d7d80297bc0fa9dafa623 SHA1 67146df1e01872d8e5a22e7555bfbec18eff6707 SHA256 1bb7ef17a3e8bbd1bea6db47bf4b7b091726b5f8a70428b0064ff138601d75ef
 EBUILD epiphany-2.28.2.ebuild 1650 RMD160 1c691198559a17efb21315817a345b938d80378b SHA1 84e0d17efbe480e8ab20a989faddc0dfa94ffff4 SHA256 ce7ecb0187abcfe0ae97580446d07043464cc844bb85de110571e21139c16bb3
-EBUILD epiphany-2.30.2-r1.ebuild 2404 RMD160 653776c5bca3b4d6054ec25adf9800693dd0f618 SHA1 6795c0ea252612450f80abe469ccf279702318e5 SHA256 c7e0d34a354913f423c6b4348ab6026afb0ae42b6e7fee8641992463aa494c9e
-EBUILD epiphany-2.30.2.ebuild 1831 RMD160 afdaa70e0b949b578334c359b07c7338cb368174 SHA1 38f23029756d8dcbb69fccb9027c5ece89163719 SHA256 665132bfd440d9b620e919921a6854b7c143734565298e3af53204321dd3216c
-MISC ChangeLog 48505 RMD160 c6edb39895e04917d692b1564e6752f6dab9b741 SHA1 5b9a41fa92938bc8bcdee8f623e50d3999b258ee SHA256 c163c8bce3e0eb06b0db8638eb6a1d7e1967bcdab69891b01c989fd3abaa2019
+EBUILD epiphany-2.30.2-r1.ebuild 2410 RMD160 c751af6c563ab8718a3936ca563a919f96829041 SHA1 4c9005af35d5fac586c216705c84f0b45e519fd8 SHA256 67b7067dff1ccbadbc94f7697889058e9b3b9f37e2a6dc1f105a5b7052280430
+MISC ChangeLog 48687 RMD160 2b2af2afc11d742ada8b39a73d6a99293971fdf9 SHA1 f9ef683bd4c9f993d5934b4ba4bfff1f52118e12 SHA256 22e6fa4f2323b4d95cb3a0012c2768d51a629cc95881490be4997111f2a08361
 MISC metadata.xml 276 RMD160 459f04368f1f1341a41c24a487a475b22e878228 SHA1 c296c95eafc63e398d5d203f4eaa26a3826b2b6c SHA256 9e2cf9fb8bee83947d19caa6b4610e82b916daa9f744661f19e4f8138e80490a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkwyUe0ACgkQCaWpQKGI+9SjKACfcS2dz1jJkJBnEhD/NIswTC5f
-SKoAn3Xh90pD35wdllGQXRk9S1+i/5OQ
-=ee7Q
+iEYEARECAAYFAkw11tUACgkQCaWpQKGI+9QRTwCfXawsvfaLsiOvfANjbSjpP//q
+KKUAn1Olt0fPEnTnwE5tZUMLX/5Sasng
+=YEk7
 -----END PGP SIGNATURE-----
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"
-#}