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

Package-Manager: portage-2.1.4.4

5 files changed, 17 insertions, 80 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/Manifest b/app-editors/gedit/Manifest
index 81f6a1019513..5ebe2fdb6a61 100644
--- a/app-editors/gedit/Manifest
+++ b/app-editors/gedit/Manifest
@@ -9,15 +9,14 @@ DIST gedit-2.20.3.tar.bz2 3812377 RMD160 e3747bbafca099ae5567005b5bd6af3ba2704c3
 DIST gedit-2.20.4.tar.bz2 3809006 RMD160 8f87871f2ab5c9f5747dd990aaa5eaad2f30215a SHA1 82bf5fe2e119018936fca0b89196c9e86c69ee3f SHA256 695b70582734b3ba04e0d76970bf1dd722a22ef027f8a749ec3fb05e40e83121
 DIST gedit-2.22.0.tar.bz2 3883104 RMD160 57ee94075d0b88eba2b933313e81e26eb05115b8 SHA1 a960a32a5b43a25ad3bfd577835b2cf05a7391fc SHA256 ffad28c732e1a9b250d6d3c5b92a252b6ac87741e4d1fd9daba9940fde399e2e
 EBUILD gedit-2.20.3.ebuild 1778 RMD160 31e114c3a8913f53a31d1189fc97d3b8837608aa SHA1 d378bcc2fd5316073c447745e21ba4147ecf2b32 SHA256 f370eec52c41281f312d96e07d1c3cce402dc7384c02e8a4a13e4009fc5c528c
-EBUILD gedit-2.20.4-r1.ebuild 2227 RMD160 f6b396263b59588c7afaad56193d0f58221ab8c0 SHA1 a8bf915725534c142009c53a1398c5733bee8787 SHA256 d13b8d185fca76cb795d17c233e9604f7fda116ec3072bff3316bbbc45106862
-EBUILD gedit-2.20.4.ebuild 1792 RMD160 6f179ce545f86d01f56c91c3b4ebbc24e9325baa SHA1 9f22d3c32a2361a4e3c4d9cbed8126ce166da0ad SHA256 79319e3585d03293a92e6dc0f9df05dcaf56e6eab93529b348a7fb5fa044f9bf
-EBUILD gedit-2.22.0.ebuild 2133 RMD160 84a97d271dd0508890ced94f85e0efa2d0f980b1 SHA1 f609d118bc6f139c8171edf4f653b0aa74c653e2 SHA256 05b1c1651276944324d2c7588dceb06ead5e9350f7b55646f60596f0be233a42
-MISC ChangeLog 28456 RMD160 e425da2dae5e6b75af97e82156d9ac25f8b10363 SHA1 2c570acfa16a8e2e028e0a07244f7bf72b297244 SHA256 3999bb2b6fd27e4ca7da4675dc9ec2064b782b0d9ad36d572135dd0d1b7d7237
+EBUILD gedit-2.20.4-r1.ebuild 2251 RMD160 6e013bc8e029fe02dd897412e13bc6e75a9137ff SHA1 a08efb32e77f28f0603d9fd5b7309be119ea68f8 SHA256 edeb80dbe814cdd08401968702ee59d1ba99680433819bb1b9343bcba5eda94b
+EBUILD gedit-2.22.0.ebuild 2157 RMD160 91b8a0fb82f4425a3bdbda0355cdddba817c5383 SHA1 14b80964c746d089d1dd1b981b815c828880581a SHA256 44ceb7cf8393217198866bfbcdbc90e05485c79f9628ea28a7ca036d4dd56406
+MISC ChangeLog 28646 RMD160 c3b3e7b39d80a487d841763a3db73545ed5ec15c SHA1 9ecbeb3dfa5200ab495274bd88c53ec4db0fc932 SHA256 8bd6f8a18bf30f0661fce1eb7447868cf96f3107df88518d8d534f7748943a8c
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.8 (GNU/Linux)
+Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkfmNoYACgkQkeYb6olFHJcpugCgu6Fe+OOFhfeDPPDXWrJ3swcV
-mOUAoNyUGgs4PmGv+3YXI6tY9rKTzTAo
-=oDtx
+iEYEARECAAYFAkfuRX4ACgkQ1fmVwcYIWAYF2ACfYwyrK+nehN8DgRxmCIDjPyaA
+oGUAnjjPbU4yQIOQRSi31WR3ejR25Kj0
+=bjtN
 -----END PGP SIGNATURE-----
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)"