New version for GNOME 2.26. Clean up old revisions.

(Portage version: 2.2_rc33/cvs/Linux x86_64)

4 files changed, 23 insertions, 35 deletions

diff --git a/gnome-extra/gcalctool/ChangeLog b/gnome-extra/gcalctool/ChangeLog
index 0959ee326af8..69584418c86d 100644
--- a/gnome-extra/gcalctool/ChangeLog
+++ b/gnome-extra/gcalctool/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-extra/gcalctool
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gcalctool/ChangeLog,v 1.176 2009/04/27 14:02:39 jer Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gcalctool/ChangeLog,v 1.177 2009/05/11 22:04:39 eva Exp $
+
+*gcalctool-5.26.1 (11 May 2009)
+
+  11 May 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  gcalctool-5.20.2.ebuild, -gcalctool-5.22.3.ebuild,
+  -gcalctool-5.24.3.ebuild, +gcalctool-5.26.1.ebuild:
+  New version for GNOME 2.26. Clean up old revisions.
 
   27 Apr 2009; Jeroen Roovers <jer@gentoo.org> gcalctool-5.24.3.1:
   Stable for HPPA (bug #260063).
diff --git a/gnome-extra/gcalctool/gcalctool-5.20.2.ebuild b/gnome-extra/gcalctool/gcalctool-5.20.2.ebuild
index c1f453e7fa6d..1efe2257533e 100644
--- a/gnome-extra/gcalctool/gcalctool-5.20.2.ebuild
+++ b/gnome-extra/gcalctool/gcalctool-5.20.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gcalctool/gcalctool-5.20.2.ebuild,v 1.8 2008/04/20 02:10:12 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gcalctool/gcalctool-5.20.2.ebuild,v 1.9 2009/05/11 22:04:39 eva Exp $
 
 inherit gnome2 eutils
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://calctool.sourceforge.net/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
+KEYWORDS="arm sh"
 IUSE=""
 
 RDEPEND=">=x11-libs/gtk+-2.11.6
diff --git a/gnome-extra/gcalctool/gcalctool-5.22.3.ebuild b/gnome-extra/gcalctool/gcalctool-5.22.3.ebuild
deleted file mode 100644
index 2cad0cff4d5a..000000000000
--- a/gnome-extra/gcalctool/gcalctool-5.22.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gcalctool/gcalctool-5.22.3.ebuild,v 1.8 2008/11/13 19:20:20 ranger Exp $
-
-inherit gnome2 eutils
-
-DESCRIPTION="A calculator application for GNOME"
-HOMEPAGE="http://calctool.sourceforge.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=x11-libs/gtk+-2.11.6
-	>=dev-libs/glib-2
-	>=dev-libs/atk-1.5
-	>=gnome-base/gconf-2
-	gnome-base/libglade
-	!<gnome-extra/gnome-utils-2.3"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	app-text/scrollkeeper
-	>=dev-util/intltool-0.35
-	>=dev-util/pkgconfig-0.9
-	>=app-text/gnome-doc-utils-0.3.2"
-
-DOCS="AUTHORS ChangeLog* MAINTAINERS NEWS README TODO"
diff --git a/gnome-extra/gcalctool/gcalctool-5.24.3.ebuild b/gnome-extra/gcalctool/gcalctool-5.26.1.ebuild
index daf4eb7995b0..901d1f845f5b 100644
--- a/gnome-extra/gcalctool/gcalctool-5.24.3.ebuild
+++ b/gnome-extra/gcalctool/gcalctool-5.26.1.ebuild
@@ -1,8 +1,10 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gcalctool/gcalctool-5.24.3.ebuild,v 1.1 2009/01/18 23:40:24 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gcalctool/gcalctool-5.26.1.ebuild,v 1.1 2009/05/11 22:04:39 eva Exp $
 
-inherit gnome2 eutils
+EAPI="2"
+
+inherit gnome2
 
 DESCRIPTION="A calculator application for GNOME"
 HOMEPAGE="http://calctool.sourceforge.net/"
@@ -26,3 +28,10 @@ DEPEND="${RDEPEND}
 	>=app-text/gnome-doc-utils-0.3.2"
 
 DOCS="AUTHORS ChangeLog* MAINTAINERS NEWS README TODO"
+
+src_prepare() {
+	gnome2_src_prepare
+	
+	# Fix intltoolize broken file, see upstream #577133
+	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in || die "sed failed"    
+}