my my the end is nigh

(Portage version: 2.0.51.19)

9 files changed, 8 insertions, 117 deletions

diff --git a/gnome-extra/gcalctool/ChangeLog b/gnome-extra/gcalctool/ChangeLog
index 7e8d8d7808d0..ac4e453714e9 100644
--- a/gnome-extra/gcalctool/ChangeLog
+++ b/gnome-extra/gcalctool/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for gnome-extra/gcalctool
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gcalctool/ChangeLog,v 1.59 2005/05/18 01:55:21 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gcalctool/ChangeLog,v 1.60 2005/06/06 13:52:46 foser Exp $
+
+  06 Jun 2005; Marinus Schraal <foser@gentoo.org> gcalctool-4.5.4{1,2}.ebuild :
+  Add workaround for #92920
 
   18 May 2005; Jason Wever <weeve@gentoo.org> gcalctool-4.4.22.ebuild:
   Stable on SPARC.
diff --git a/gnome-extra/gcalctool/files/digest-gcalctool-4.3.51 b/gnome-extra/gcalctool/files/digest-gcalctool-4.3.51
deleted file mode 100644
index 2306ef5dee19..000000000000
--- a/gnome-extra/gcalctool/files/digest-gcalctool-4.3.51
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1b06749fafc19a195fa069501c2b23a5 gcalctool-4.3.51.tar.bz2 842356
diff --git a/gnome-extra/gcalctool/files/digest-gcalctool-4.4.16 b/gnome-extra/gcalctool/files/digest-gcalctool-4.4.16
deleted file mode 100644
index 731291c98463..000000000000
--- a/gnome-extra/gcalctool/files/digest-gcalctool-4.4.16
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4a99b4fc3be0a84d4874f4bef8ca15d8 gcalctool-4.4.16.tar.bz2 882103
diff --git a/gnome-extra/gcalctool/files/digest-gcalctool-4.4.19 b/gnome-extra/gcalctool/files/digest-gcalctool-4.4.19
deleted file mode 100644
index 61abbfdc2755..000000000000
--- a/gnome-extra/gcalctool/files/digest-gcalctool-4.4.19
+++ /dev/null
@@ -1 +0,0 @@
-MD5 cfa223952c586e83d214829dd8505057 gcalctool-4.4.19.tar.bz2 913169
diff --git a/gnome-extra/gcalctool/gcalctool-4.3.51.ebuild b/gnome-extra/gcalctool/gcalctool-4.3.51.ebuild
deleted file mode 100644
index 504cbb7499e8..000000000000
--- a/gnome-extra/gcalctool/gcalctool-4.3.51.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gcalctool/gcalctool-4.3.51.ebuild,v 1.10 2005/01/08 23:23:49 slarti Exp $
-
-inherit gnome2
-
-DESCRIPTION="A scientific calculator for Gnome2"
-HOMEPAGE="http://calctool.sourceforge.net/"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="x86 ppc sparc hppa alpha ~ia64 amd64 mips"
-IUSE=""
-
-RDEPEND=">=x11-libs/gtk+-2
-	>=gnome-base/libgnome-2
-	>=gnome-base/libgnomeui-2
-	>=gnome-base/gconf-1.2"
-
-DEPEND="${RDEPEND}
-	app-text/scrollkeeper
-	dev-util/pkgconfig"
-
-DOCS="AUTHORS COPYING ChangeLog NEWS README TODO MAINTAINERS"
-
-src_install() {
-
-	gnome2_src_install
-
-	# remove symlink that conflicts with <2.3 gnome-utils
-	rm -f ${D}/usr/bin/gnome-calculator
-
-}
diff --git a/gnome-extra/gcalctool/gcalctool-4.4.16.ebuild b/gnome-extra/gcalctool/gcalctool-4.4.16.ebuild
deleted file mode 100644
index ea8618917fe7..000000000000
--- a/gnome-extra/gcalctool/gcalctool-4.4.16.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gcalctool/gcalctool-4.4.16.ebuild,v 1.6 2005/01/08 23:23:49 slarti Exp $
-
-inherit gnome2
-
-DESCRIPTION="A scientific calculator for Gnome2"
-HOMEPAGE="http://calctool.sourceforge.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~ppc sparc hppa ~alpha arm ia64 ~amd64 ~mips"
-IUSE=""
-
-RDEPEND=">=x11-libs/gtk+-2
-	>=gnome-base/libgnome-2
-	>=gnome-base/libgnomeui-2
-	>=gnome-base/gconf-1.2"
-
-DEPEND="${RDEPEND}
-	app-text/scrollkeeper
-	dev-util/pkgconfig"
-
-DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README TODO MAINTAINERS"
-
-src_install() {
-
-	gnome2_src_install
-
-	# remove symlink that conflicts with <2.3 gnome-utils
-	rm -f ${D}/usr/bin/gnome-calculator
-
-}
diff --git a/gnome-extra/gcalctool/gcalctool-4.4.19.ebuild b/gnome-extra/gcalctool/gcalctool-4.4.19.ebuild
deleted file mode 100644
index bbee67fdbd04..000000000000
--- a/gnome-extra/gcalctool/gcalctool-4.4.19.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gcalctool/gcalctool-4.4.19.ebuild,v 1.9 2005/01/08 23:23:49 slarti Exp $
-
-inherit gnome2 eutils
-
-DESCRIPTION="A scientific calculator for Gnome2"
-HOMEPAGE="http://calctool.sourceforge.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc sparc ~hppa alpha ~ia64 ~amd64 ~mips ~arm"
-IUSE=""
-
-RDEPEND=">=x11-libs/gtk+-2
-	>=gnome-base/libgnome-2
-	>=gnome-base/libgnomeui-2
-	>=gnome-base/gconf-1.2"
-
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.29
-	app-text/scrollkeeper
-	dev-util/pkgconfig"
-
-DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README TODO MAINTAINERS"
-
-src_unpack() {
-
-	unpack ${A}
-
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-4.4.20-remove_disable_deprecated.patch
-
-}
-
-src_install() {
-
-	gnome2_src_install
-
-	# remove symlink that conflicts with <2.3 gnome-utils
-	rm -f ${D}/usr/bin/gnome-calculator
-
-}
diff --git a/gnome-extra/gcalctool/gcalctool-5.5.41.ebuild b/gnome-extra/gcalctool/gcalctool-5.5.41.ebuild
index 4774d39c9667..1af9e65f0796 100644
--- a/gnome-extra/gcalctool/gcalctool-5.5.41.ebuild
+++ b/gnome-extra/gcalctool/gcalctool-5.5.41.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/gnome-extra/gcalctool/gcalctool-5.5.41.ebuild,v 1.3 2005/06/05 18:57:46 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gcalctool/gcalctool-5.5.41.ebuild,v 1.4 2005/06/06 13:52:46 foser Exp $
 
 inherit gnome2 eutils
 
@@ -27,7 +27,7 @@ DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README TODO MAINTAINERS"
 
 src_install() {
 
-	gnome2_src_install
+	gnome2_src_install scrollkeeper_localstate_dir=${D}/var/lib/scrollkeeper/
 
 	# remove symlink that conflicts with <2.3 gnome-utils
 	rm -f ${D}/usr/bin/gnome-calculator
diff --git a/gnome-extra/gcalctool/gcalctool-5.5.42.ebuild b/gnome-extra/gcalctool/gcalctool-5.5.42.ebuild
index 02c4ddb2572b..83a87b692334 100644
--- a/gnome-extra/gcalctool/gcalctool-5.5.42.ebuild
+++ b/gnome-extra/gcalctool/gcalctool-5.5.42.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/gnome-extra/gcalctool/gcalctool-5.5.42.ebuild,v 1.2 2005/05/06 11:52:40 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gcalctool/gcalctool-5.5.42.ebuild,v 1.3 2005/06/06 13:52:46 foser Exp $
 
 inherit gnome2 eutils
 
@@ -27,7 +27,7 @@ DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README TODO MAINTAINERS"
 
 src_install() {
 
-	gnome2_src_install
+	gnome2_src_install scrollkeeper_localstate_dir=${D}/var/lib/scrollkeeper/
 
 	# remove symlink that conflicts with <2.3 gnome-utils
 	rm -f ${D}/usr/bin/gnome-calculator