New version for GNOME 2.26. Clean up old revisions.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

5 files changed, 37 insertions, 41 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/Manifest b/gnome-extra/gcalctool/Manifest
index ea5df6cf9989..7e1b1580790a 100644
--- a/gnome-extra/gcalctool/Manifest
+++ b/gnome-extra/gcalctool/Manifest
@@ -1,10 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST gcalctool-5.20.2.tar.bz2 1343757 RMD160 e8dfca5d3751858420c8a03a1600afc3a020c4f4 SHA1 c33733a5885f33e21d64628393feaaf93b4db345 SHA256 b871c8b7fa2c4afa78b6a1708cffe04ae389ee20ff34e5fb2ddb4b78071edacd
-DIST gcalctool-5.22.3.tar.bz2 1495748 RMD160 c32ecb6f79cb0e9b208d937714b4cd0ca9d2fa10 SHA1 39519e851fd58d614aef72b7661ff25b052ef4f2 SHA256 ef61430800f5e286d448d232d3ddd6205c18de4800bd5c4c2231d6bfd963b6fe
 DIST gcalctool-5.24.3.1.tar.bz2 1795492 RMD160 1ffa493b82ce78caa72e051fe3f92bbf6fd61224 SHA1 e84bfbddb937f0afe6025a6a8eebe8c825ac3c53 SHA256 a3860c3c7e4c3bcc12ca2ab09f15aa19e4f803de6d16fb92cd600215ed52e39e
-DIST gcalctool-5.24.3.tar.bz2 1806208 RMD160 4278245aca11f9ccf8b7111939a6fb6a22ae9065 SHA1 b29b43cc01af99b9f60aedcc13e6ca47c77104b0 SHA256 cad50dcd9a31f8cb75bf3b45c3d9a91d5673eb365af0960ec372103afd56f587
-EBUILD gcalctool-5.20.2.ebuild 972 RMD160 3e6ec57a53b954af627b1b988955d4f03a150945 SHA1 0ba0b1b6f455d150fe160f3c5e86edadf6bc18d0 SHA256 9c5fda5ec9739bb06f8f7770ee55af57bfe549557f2caee72b29a33fb029b14d
-EBUILD gcalctool-5.22.3.ebuild 801 RMD160 20f0478436f93f4d92383921c12d072f5c5341f5 SHA1 b60bb57e4bfc3e39257b76b5af9a96e4c0144dad SHA256 1b4896db05b61624f5332656ff711716eb1295a825ebfd38489cd3065ee33624
+DIST gcalctool-5.26.1.tar.bz2 2039217 RMD160 8b6a94db38d9b2456b72e903fd835f4fed6290cf SHA1 b928d34ba7d2227432c187dd5d3f4a76eb14bb59 SHA256 05a97bbfcd9e8c4040e44edc8d77ef3eac9415e3b90daa679938cea8a2d4a49b
+EBUILD gcalctool-5.20.2.ebuild 917 RMD160 e68b68df59b9815a48548c9608ccfad572d2e75f SHA1 d8de4a2117d0ce54895953cebee436c9f09bb236 SHA256 311e967ab2faf880acd4fddb6d6ed1a0e987d34031c925d430b0dba375b15d0c
 EBUILD gcalctool-5.24.3.1.ebuild 800 RMD160 be8be4b02d377b024d349220fdf1dd6eac7ad666 SHA1 f58438a80d83786d13defd18a17f268f31715076 SHA256 867104872a91cebb429d9bbbf854e9dc3606322db8bc28d35a8ea9023def0851
-EBUILD gcalctool-5.24.3.ebuild 807 RMD160 c257e73c2d52c41c818377d29b7fdd3b83e8fe77 SHA1 bcab716f539cd9215a4e7943ee9ecda2cb440f07 SHA256 d521e1769fb3d439f400ef50ab62f1ab0b07d23c9338dc50750615ff4e53910d
-MISC ChangeLog 21832 RMD160 ef04886ffb79bb76585195ec88445b9e3036934a SHA1 5c9a6d046089fadc52a69e448270a89920642982 SHA256 074d227b7ea352884c5e4e45700995691b75c14fdac76ca8dd278a3456c884d9
+EBUILD gcalctool-5.26.1.ebuild 991 RMD160 d11a29645d01eb95013900d40385e6eac4878472 SHA1 c95697531bb496f644bfa3122c793f556e9e5f10 SHA256 91c2c79834ab8ca8649e4938c29ccec7e093d4b2fd6b7ab343caa269c9e1d7b7
+MISC ChangeLog 22081 RMD160 981874bb9a0822089cb67de27b034c03df6f5a2d SHA1 e8f0b65813ea54bb0933a87cb8ccee2cb851726d SHA256 46bdaa3438ecbdc91e422bebf883bf459520d07631c1d1ad6681838d8fc9c69a
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkoIoP0ACgkQ1fmVwcYIWAb73gCfUtIzzJA35E8IILa7DXpKJ86Y
+gusAoI2+oirDzXkcPIuEV5saCSQ8bmwH
+=aM5i
+-----END PGP SIGNATURE-----
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"    
+}