[gentoo-commits] proj/gnome:master commit in: gnome-extra/gcalctool/

["Gilles Dartiguelongue" <eva@gentoo.org>]

commit:     5c6bef0bda5a56647a207c63ae4c39f3ba1810de
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 24 17:24:06 2012 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Mon Dec 24 17:24:32 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=5c6bef0b

gnome-extra/gcalctool: moved to gx86

    * Sync live ebuild with gx86 changes.

---
 gnome-extra/gcalctool/gcalctool-6.6.2.ebuild |   46 --------------------------
 gnome-extra/gcalctool/gcalctool-9999.ebuild  |   13 ++++---
 2 files changed, 7 insertions(+), 52 deletions(-)

diff --git a/gnome-extra/gcalctool/gcalctool-6.6.2.ebuild b/gnome-extra/gcalctool/gcalctool-6.6.2.ebuild
deleted file mode 100644
index e989072..0000000
--- a/gnome-extra/gcalctool/gcalctool-6.6.2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-GCONF_DEBUG="no"
-
-inherit gnome2
-if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
-fi
-
-DESCRIPTION="A calculator application for GNOME"
-HOMEPAGE="http://live.gnome.org/Gcalctool http://calctool.sourceforge.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-if [[ ${PV} = 9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
-fi
-
-COMMON_DEPEND=">=x11-libs/gtk+-3:3
-	>=dev-libs/glib-2.31:2
-	dev-libs/libxml2:2"
-RDEPEND="${COMMON_DEPEND}
-	!<gnome-extra/gnome-utils-2.3"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.35
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-if [[ ${PV} = 9999 ]]; then
-	DEPEND="${DEPEND}
-		app-text/yelp-tools"
-fi
-
-src_configure() {
-	DOCS="AUTHORS ChangeLog* NEWS README"
-	G2CONF="${G2CONF}
-		--disable-schemas-compile"
-	[[ ${PV} != 9999 ]] && G2CONF="${G2CONF} ITSTOOL=$(type -P true)"
-	gnome2_src_configure
-}

diff --git a/gnome-extra/gcalctool/gcalctool-9999.ebuild b/gnome-extra/gcalctool/gcalctool-9999.ebuild
index e989072..46ae85d 100644
--- a/gnome-extra/gcalctool/gcalctool-9999.ebuild
+++ b/gnome-extra/gcalctool/gcalctool-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI="5"
 GCONF_DEBUG="no"
 
 inherit gnome2
@@ -22,15 +22,18 @@ else
 	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
 fi
 
-COMMON_DEPEND=">=x11-libs/gtk+-3:3
+COMMON_DEPEND="
+	>=x11-libs/gtk+-3:3
 	>=dev-libs/glib-2.31:2
-	dev-libs/libxml2:2"
+	dev-libs/libxml2:2
+"
 RDEPEND="${COMMON_DEPEND}
 	!<gnome-extra/gnome-utils-2.3"
 DEPEND="${COMMON_DEPEND}
 	>=dev-util/intltool-0.35
 	sys-devel/gettext
-	virtual/pkgconfig"
+	virtual/pkgconfig
+"
 
 if [[ ${PV} = 9999 ]]; then
 	DEPEND="${DEPEND}
@@ -39,8 +42,6 @@ fi
 
 src_configure() {
 	DOCS="AUTHORS ChangeLog* NEWS README"
-	G2CONF="${G2CONF}
-		--disable-schemas-compile"
 	[[ ${PV} != 9999 ]] && G2CONF="${G2CONF} ITSTOOL=$(type -P true)"
 	gnome2_src_configure
 }