New version for GNOME 2.28. Clean up old revisions.

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

3 files changed, 13 insertions, 43 deletions

diff --git a/gnome-extra/gcalctool/ChangeLog b/gnome-extra/gcalctool/ChangeLog
index 3b6848590701..e6954a578668 100644
--- a/gnome-extra/gcalctool/ChangeLog
+++ b/gnome-extra/gcalctool/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-extra/gcalctool
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gcalctool/ChangeLog,v 1.182 2009/10/24 16:35:51 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gcalctool/ChangeLog,v 1.183 2009/10/29 22:08:35 eva Exp $
+
+*gcalctool-5.28.1 (29 Oct 2009)
+
+  29 Oct 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  -gcalctool-5.26.1.ebuild, -gcalctool-5.26.2.ebuild,
+  +gcalctool-5.28.1.ebuild:
+  New version for GNOME 2.28. Clean up old revisions.
 
   24 Oct 2009; nixnut <nixnut@gentoo.org> gcalctool-5.26.3.ebuild:
   ppc stable #281427
diff --git a/gnome-extra/gcalctool/gcalctool-5.26.1.ebuild b/gnome-extra/gcalctool/gcalctool-5.26.1.ebuild
deleted file mode 100644
index f585ead247c3..000000000000
--- a/gnome-extra/gcalctool/gcalctool-5.26.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# 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.26.1.ebuild,v 1.2 2009/05/12 05:56:45 mr_bones_ Exp $
-
-EAPI="2"
-
-inherit gnome2
-
-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.14.0
-	>=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"
-
-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"
-}
diff --git a/gnome-extra/gcalctool/gcalctool-5.26.2.ebuild b/gnome-extra/gcalctool/gcalctool-5.28.1.ebuild
index 839f859c5b40..039061b35667 100644
--- a/gnome-extra/gcalctool/gcalctool-5.26.2.ebuild
+++ b/gnome-extra/gcalctool/gcalctool-5.28.1.ebuild
@@ -1,8 +1,9 @@
 # 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.26.2.ebuild,v 1.1 2009/05/18 21:06:33 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gcalctool/gcalctool-5.28.1.ebuild,v 1.1 2009/10/29 22:08:35 eva Exp $
 
 EAPI="2"
+GCONF_DEBUG="no"
 
 inherit gnome2
 
@@ -18,7 +19,6 @@ RDEPEND=">=x11-libs/gtk+-2.14.0
 	>=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
@@ -27,11 +27,11 @@ DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.9
 	>=app-text/gnome-doc-utils-0.3.2"
 
-DOCS="AUTHORS ChangeLog* MAINTAINERS NEWS README TODO"
+DOCS="AUTHORS ChangeLog* MAINTAINERS NEWS README"
 
 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"
+	# Fix bashisms
+	sed 's/\[\[\(.*\)\]\]/[\1]/g' -i configure.in configure || die "sed failed"
 }