sandbox fix u

(Portage version: 2.0.51.19)

8 files changed, 11 insertions, 162 deletions

diff --git a/dev-util/glade/ChangeLog b/dev-util/glade/ChangeLog
index 874e5df42e0e..0212deb9de98 100644
--- a/dev-util/glade/ChangeLog
+++ b/dev-util/glade/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-util/glade
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/glade/ChangeLog,v 1.38 2005/05/13 23:02:11 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/glade/ChangeLog,v 1.39 2005/06/06 16:13:05 foser Exp $
+
+  06 Jun 2005; Marinus Schraal <foser@gentoo.org> glade-2.6.8.ebuild :
+  Add workaround for #92920
 
   13 May 2005; Bryan Østergaard <kloeri@gentoo.org> glade-2.6.8.ebuild:
   ~ia64 keyword.
diff --git a/dev-util/glade/files/digest-glade-2.0.0-r1 b/dev-util/glade/files/digest-glade-2.0.0-r1
deleted file mode 100644
index b70f5107867c..000000000000
--- a/dev-util/glade/files/digest-glade-2.0.0-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 16b685dca1064a950d9f506b669cf859 glade-2.0.0.tar.bz2 1723210
diff --git a/dev-util/glade/files/digest-glade-2.6.0 b/dev-util/glade/files/digest-glade-2.6.0
deleted file mode 100644
index 2610b7389c1f..000000000000
--- a/dev-util/glade/files/digest-glade-2.6.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 49ff3e8123f55937e53a3a3bb3ec90fa glade-2.6.0.tar.bz2 2145674
diff --git a/dev-util/glade/files/digest-glade-2.6.7 b/dev-util/glade/files/digest-glade-2.6.7
deleted file mode 100644
index 96adeef40562..000000000000
--- a/dev-util/glade/files/digest-glade-2.6.7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 779cc32e29ac516b832d47fe6f2bf92e glade-2.6.7.tar.bz2 2446366
diff --git a/dev-util/glade/glade-2.0.0-r1.ebuild b/dev-util/glade/glade-2.0.0-r1.ebuild
deleted file mode 100644
index 06023970801d..000000000000
--- a/dev-util/glade/glade-2.0.0-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/glade/glade-2.0.0-r1.ebuild,v 1.9 2005/01/21 04:39:27 joem Exp $
-
-inherit gnome.org eutils
-
-DESCRIPTION="a GUI Builder.  This release is for GTK+ 2 and GNOME 2."
-HOMEPAGE="http://glade.gnome.org/"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="x86 ~ppc sparc"
-IUSE="gnome gnomedb"
-
-RDEPEND="=x11-libs/gtk+-2*
-	>=dev-libs/libxml2-2.4.1
-	>=app-text/scrollkeeper-0.2
-	gnome? ( >=gnome-base/libgnomeui-2.0.0
-		>=gnome-base/libgnomecanvas-2.0.0
-		>=gnome-base/libbonoboui-2.0.0 )
-	gnomedb? ( >=gnome-extra/libgnomedb-0.11 )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	sys-devel/gettext
-	>=dev-util/intltool-0.11"
-
-
-src_unpack() {
-	unpack ${A}
-	# this patch fixes potential potential issues
-	# with scrollkeeper. speeds up unnecessary scroll generation
-	epatch ${FILESDIR}/${P}-scrollkeeper.patch
-}
-
-src_compile() {
-	# note: ./configure --help and configure.in lists
-	# --disable-gnomedb, whereas the code looks for --disable-gnome-db
-
-	econf \
-		`use_enable gnome` \
-		`use_enable gnomedb gnome-db` \
-		|| die
-
-	emake || die "Compilation failed"
-}
-
-src_install() {
-	dodir /var/lib/scrollkeeper
-	einstall "scrollkeeper_localstate_dir=${D}/var/lib/scrollkeeper"
-
-	# regenerate these at pkg_postinst
-	rm -rf ${D}/var/lib/scrollkeeper
-
-	dodoc AUTHORS COPYING* FAQ NEWS README* TODO
-}
-
-pkg_postinst() {
-	echo ">>> Updating Scrollkeeper"
-	scrollkeeper-update -q -p ${ROOT}/var/lib/scrollkeeper
-}
diff --git a/dev-util/glade/glade-2.6.0.ebuild b/dev-util/glade/glade-2.6.0.ebuild
deleted file mode 100644
index e82bb7110ccd..000000000000
--- a/dev-util/glade/glade-2.6.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/glade/glade-2.6.0.ebuild,v 1.7 2005/01/21 04:39:27 joem Exp $
-
-inherit gnome.org eutils
-
-DESCRIPTION="a GUI Builder.  This release is for GTK+ 2 and GNOME 2."
-HOMEPAGE="http://glade.gnome.org/"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="~x86 ~sparc ~amd64 ~ppc"
-IUSE="gnome gnomedb"
-
-RDEPEND=">=x11-libs/gtk+-2.4
-	>=dev-libs/libxml2-2.4.1
-	>=app-text/scrollkeeper-0.3.10
-	gnome? ( >=gnome-base/libgnomeui-2.6.0
-		>=gnome-base/libgnomecanvas-2.0.0
-		>=gnome-base/libbonoboui-2.0.0 )
-	gnomedb? ( >=gnome-extra/libgnomedb-0.90.3
-			>=gnome-extra/libgda-0.90.0 )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	sys-devel/gettext
-	>=dev-util/intltool-0.30"
-
-src_unpack() {
-	unpack ${A}
-	# this patch fixes potential potential issues
-	# with scrollkeeper. speeds up unnecessary scroll generation
-	EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/${PN}-2.0.0-scrollkeeper.patch
-}
-
-src_compile() {
-	# note: ./configure --help and configure.in lists
-	# --disable-gnomedb, whereas the code looks for --disable-gnome-db
-
-	econf \
-		`use_enable gnome` \
-		`use_enable gnomedb gnome-db` \
-		|| die
-
-	emake || die "Compilation failed"
-}
-
-src_install() {
-	dodir /var/lib/scrollkeeper
-	einstall "scrollkeeper_localstate_dir=${D}/var/lib/scrollkeeper"
-
-	# regenerate these at pkg_postinst
-	rm -rf ${D}/var/lib/scrollkeeper
-
-	dodoc AUTHORS COPYING* FAQ NEWS README* TODO
-}
-
-pkg_postinst() {
-	echo ">>> Updating Scrollkeeper"
-	scrollkeeper-update -q -p ${ROOT}/var/lib/scrollkeeper
-}
diff --git a/dev-util/glade/glade-2.6.7.ebuild b/dev-util/glade/glade-2.6.7.ebuild
deleted file mode 100644
index 1497665d9f6b..000000000000
--- a/dev-util/glade/glade-2.6.7.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/glade/glade-2.6.7.ebuild,v 1.2 2005/01/21 04:39:27 joem Exp $
-
-inherit eutils gnome2
-
-DESCRIPTION="a GUI Builder.  This release is for GTK+ 2 and GNOME 2."
-HOMEPAGE="http://glade.gnome.org/"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="~x86 ~sparc ~amd64 ~ppc"
-IUSE="gnome gnomedb"
-
-RDEPEND=">=x11-libs/gtk+-2.4
-	>=dev-libs/libxml2-2.4.1
-	gnome? ( >=gnome-base/libgnomeui-2.6.0
-		>=gnome-base/libgnomecanvas-2.0.0
-		>=gnome-base/libbonoboui-2.0.0 )
-	gnomedb? ( >=gnome-extra/libgnomedb-0.90.3
-			>=gnome-extra/libgda-0.90.0 )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	sys-devel/gettext
-	>=app-text/scrollkeeper-0.3.10
-	>=dev-util/intltool-0.30"
-
-src_unpack() {
-	unpack ${A}
-	# this patch fixes potential potential issues
-	# with scrollkeeper. speeds up unnecessary scroll generation
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-2.0.0-scrollkeeper.patch
-}
-
-G2CONF="${G2CONF} `use_enable gnome` `use_enable gnomedb gnome-db`"
-USE_DESTDIR="1"
diff --git a/dev-util/glade/glade-2.6.8.ebuild b/dev-util/glade/glade-2.6.8.ebuild
index 7a49e814edd1..a8118d40c34f 100644
--- a/dev-util/glade/glade-2.6.8.ebuild
+++ b/dev-util/glade/glade-2.6.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/glade/glade-2.6.8.ebuild,v 1.8 2005/05/13 23:02:11 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/glade/glade-2.6.8.ebuild,v 1.9 2005/06/06 16:13:05 foser Exp $
 
 inherit eutils gnome2
 
@@ -37,3 +37,9 @@ G2CONF="${G2CONF} `use_enable gnome` `use_enable gnomedb gnome-db`"
 
 DOCS="AUTHORS FAQ INSTALL NEWS README TODO"
 USE_DESTDIR="1"
+
+src_install() {
+
+	gnome2_src_install scrollkeeper_localstate_dir=${D}/var/lib/scrollkeeper/
+
+}