summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gnome-extra/gcalctool/ChangeLog8
-rw-r--r--gnome-extra/gcalctool/gcalctool-6.2.0.ebuild36
-rw-r--r--gnome-extra/gcalctool/gcalctool-6.6.2.ebuild (renamed from gnome-extra/gcalctool/gcalctool-6.4.1.1.ebuild)24
3 files changed, 18 insertions, 50 deletions
diff --git a/gnome-extra/gcalctool/ChangeLog b/gnome-extra/gcalctool/ChangeLog
index 54e49741964d..2681b8c72089 100644
--- a/gnome-extra/gcalctool/ChangeLog
+++ b/gnome-extra/gcalctool/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for gnome-extra/gcalctool
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gcalctool/ChangeLog,v 1.223 2012/05/24 09:22:18 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gcalctool/ChangeLog,v 1.224 2012/12/24 17:25:25 eva Exp $
+
+*gcalctool-6.6.2 (24 Dec 2012)
+
+ 24 Dec 2012; Gilles Dartiguelongue <eva@gentoo.org> -gcalctool-6.2.0.ebuild,
+ -gcalctool-6.4.1.1.ebuild, +gcalctool-6.6.2.ebuild:
+ Version bump for Gnome 3.6.
*gcalctool-6.4.2.1 (24 May 2012)
diff --git a/gnome-extra/gcalctool/gcalctool-6.2.0.ebuild b/gnome-extra/gcalctool/gcalctool-6.2.0.ebuild
deleted file mode 100644
index 6c619c2d0389..000000000000
--- a/gnome-extra/gcalctool/gcalctool-6.2.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gcalctool/gcalctool-6.2.0.ebuild,v 1.2 2012/05/05 06:25:17 jdhore Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-
-inherit gnome2
-
-DESCRIPTION="A calculator application for GNOME"
-HOMEPAGE="http://live.gnome.org/Gcalctool http://calctool.sourceforge.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
-
-COMMON_DEPEND=">=x11-libs/gtk+-2.90.7:3
- >=dev-libs/glib-2.25.10:2
- dev-libs/libxml2"
-DEPEND="${COMMON_DEPEND}
- >=app-text/gnome-doc-utils-0.3.2
- app-text/scrollkeeper
- >=dev-util/intltool-0.35
- virtual/pkgconfig
- sys-devel/bison
- sys-devel/flex
- sys-devel/gettext"
-RDEPEND="${COMMON_DEPEND}
- !<gnome-extra/gnome-utils-2.3"
-
-pkg_setup() {
- G2CONF="${G2CONF}
- --disable-schemas-compile"
- DOCS="AUTHORS ChangeLog* NEWS README"
-}
diff --git a/gnome-extra/gcalctool/gcalctool-6.4.1.1.ebuild b/gnome-extra/gcalctool/gcalctool-6.6.2.ebuild
index dfaa8663fc56..3d227662edbd 100644
--- a/gnome-extra/gcalctool/gcalctool-6.4.1.1.ebuild
+++ b/gnome-extra/gcalctool/gcalctool-6.6.2.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gcalctool/gcalctool-6.4.1.1.ebuild,v 1.2 2012/05/05 06:25:17 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gcalctool/gcalctool-6.6.2.ebuild,v 1.1 2012/12/24 17:25:25 eva Exp $
-EAPI="4"
+EAPI="5"
GCONF_DEBUG="no"
inherit gnome2
@@ -15,23 +15,21 @@ SLOT="0"
IUSE=""
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
-COMMON_DEPEND=">=x11-libs/gtk+-3:3
+COMMON_DEPEND="
+ >=x11-libs/gtk+-3:3
>=dev-libs/glib-2.31:2
- dev-libs/libxml2"
+ dev-libs/libxml2:2
+"
RDEPEND="${COMMON_DEPEND}
!<gnome-extra/gnome-utils-2.3"
DEPEND="${COMMON_DEPEND}
- >=app-text/gnome-doc-utils-0.3.2
- app-text/scrollkeeper
>=dev-util/intltool-0.35
+ sys-devel/gettext
virtual/pkgconfig
- sys-devel/bison
- sys-devel/flex
- sys-devel/gettext"
+"
-pkg_setup() {
- G2CONF="${G2CONF}
- --disable-schemas-compile
- ITSTOOL=$(type -P true)"
+src_configure() {
DOCS="AUTHORS ChangeLog* NEWS README"
+ G2CONF="${G2CONF} ITSTOOL=$(type -P true)"
+ gnome2_src_configure
}