fix sandbox issues by adding --disable-scrollkeeper, bug #213512

(Portage version: 2.1.4.4)

4 files changed, 10 insertions, 72 deletions

diff --git a/app-editors/gedit/ChangeLog b/app-editors/gedit/ChangeLog
index cf311b3e0d09..1386494849c3 100644
--- a/app-editors/gedit/ChangeLog
+++ b/app-editors/gedit/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-editors/gedit
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/ChangeLog,v 1.237 2008/03/23 10:52:51 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/ChangeLog,v 1.238 2008/03/29 14:34:45 eva Exp $
+
+  29 Mar 2008; Gilles Dartiguelongue <eva@gentoo.org> -gedit-2.20.4.ebuild,
+  gedit-2.20.4-r1.ebuild, gedit-2.22.0.ebuild:
+  fix sandbox issues by adding --disable-scrollkeeper, bug #213512
 
 *gedit-2.22.0 (23 Mar 2008)
 
diff --git a/app-editors/gedit/gedit-2.20.4-r1.ebuild b/app-editors/gedit/gedit-2.20.4-r1.ebuild
index 219bf806b109..3377f72d0f70 100644
--- a/app-editors/gedit/gedit-2.20.4-r1.ebuild
+++ b/app-editors/gedit/gedit-2.20.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/gedit-2.20.4-r1.ebuild,v 1.8 2008/03/22 03:55:54 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/gedit-2.20.4-r1.ebuild,v 1.9 2008/03/29 14:34:45 eva Exp $
 
 inherit gnome2 python eutils autotools
 
@@ -48,7 +48,8 @@ if [[ "${ARCH}" == "PPC" ]] ; then
 fi
 
 pkg_setup() {
-	G2CONF="${G2CONF} $(use_enable python) $(use_enable spell) $(use_enable xattr attr)"
+	G2CONF="${G2CONF} $(use_enable python) $(use_enable spell)
+		$(use_enable xattr attr) --disable-scrollkeeper"
 }
 
 src_unpack() {
diff --git a/app-editors/gedit/gedit-2.20.4.ebuild b/app-editors/gedit/gedit-2.20.4.ebuild
deleted file mode 100644
index c4168a877ac2..000000000000
--- a/app-editors/gedit/gedit-2.20.4.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/gedit-2.20.4.ebuild,v 1.7 2008/02/04 04:00:50 jer Exp $
-
-inherit gnome2 eutils autotools
-
-DESCRIPTION="A text editor for the GNOME desktop"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd"
-IUSE="doc python spell xattr"
-
-RDEPEND=">=gnome-base/gconf-2
-	xattr? ( sys-apps/attr )
-	>=dev-libs/glib-2.13.5
-	>=x11-libs/gtk+-2.11.6
-	=x11-libs/gtksourceview-2*
-	>=gnome-base/libgnomeui-2.16
-	>=gnome-base/libglade-2.5.1
-	>=gnome-base/libgnomeprintui-2.12.1
-	>=gnome-base/gnome-vfs-2.16
-	spell? (
-		>=app-text/enchant-1.2
-		app-text/iso-codes
-	)
-	python? (
-		>=dev-python/pygobject-2.11.5
-		>=dev-python/pygtk-2.9.7
-		>=dev-python/pygtksourceview-2
-	)"
-
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=dev-util/pkgconfig-0.9
-	>=app-text/scrollkeeper-0.3.11
-	>=dev-util/intltool-0.35
-	>=app-text/gnome-doc-utils-0.3.2"
-
-DOCS="AUTHORS BUGS ChangeLog MAINTAINERS NEWS README"
-
-if [[ "${ARCH}" == "PPC" ]] ; then
-	# HACK HACK HACK: someone fix this garbage
-	MAKEOPTS="${MAKEOPTS} -j1"
-fi
-
-pkg_setup() {
-	G2CONF="${G2CONF} $(use_enable python) $(use_enable spell) $(use_enable xattr attr)"
-}
-
-src_unpack() {
-	gnome2_src_unpack
-
-	# Remove symbols that are not meant to be part of the docs, and
-	# break compilation if USE="doc -python" (bug #158638).
-	if use !python && use doc; then
-		epatch "${FILESDIR}"/${PN}-2.16.2-no_python_module_docs.patch
-	fi
-
-	# chown on fbsd doesn't have --reference.  Bug #183691
-	epatch "${FILESDIR}"/${PN}-2.18.1-fbsd.patch
-
-	# Make libattr optional; bug #191989
-	epatch "${FILESDIR}"/${PN}-2.20.3-libattr.patch
-
-	AT_M4DIR="m4" eautoreconf
-}
diff --git a/app-editors/gedit/gedit-2.22.0.ebuild b/app-editors/gedit/gedit-2.22.0.ebuild
index 0769897958d8..91736ec3c762 100644
--- a/app-editors/gedit/gedit-2.22.0.ebuild
+++ b/app-editors/gedit/gedit-2.22.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/gedit-2.22.0.ebuild,v 1.1 2008/03/23 10:52:51 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/gedit-2.22.0.ebuild,v 1.2 2008/03/29 14:34:45 eva Exp $
 
 inherit gnome2 python eutils autotools
 
@@ -48,6 +48,7 @@ fi
 
 pkg_setup() {
 	G2CONF="${G2CONF}
+		--disable-scrollkeeper
 		$(use_enable python)
 		$(use_enable spell)
 		$(use_enable xattr attr)"