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

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

commit:     b5f505ba8d5419f104f2b950a4a8b75aec323fff
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 28 16:04:38 2012 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Oct 28 16:41:35 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=b5f505ba

gnome-extra/gcalctool: 6.5.92 → 6.6.1

---
 ...lctool-6.5.92.ebuild => gcalctool-6.6.1.ebuild} |    6 +++---
 gnome-extra/gcalctool/gcalctool-9999.ebuild        |    6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/gnome-extra/gcalctool/gcalctool-6.5.92.ebuild b/gnome-extra/gcalctool/gcalctool-6.6.1.ebuild
similarity index 96%
rename from gnome-extra/gcalctool/gcalctool-6.5.92.ebuild
rename to gnome-extra/gcalctool/gcalctool-6.6.1.ebuild
index 1e06c80..e989072 100644
--- a/gnome-extra/gcalctool/gcalctool-6.5.92.ebuild
+++ b/gnome-extra/gcalctool/gcalctool-6.6.1.ebuild
@@ -28,7 +28,6 @@ COMMON_DEPEND=">=x11-libs/gtk+-3:3
 RDEPEND="${COMMON_DEPEND}
 	!<gnome-extra/gnome-utils-2.3"
 DEPEND="${COMMON_DEPEND}
-	app-text/scrollkeeper
 	>=dev-util/intltool-0.35
 	sys-devel/gettext
 	virtual/pkgconfig"
@@ -38,9 +37,10 @@ if [[ ${PV} = 9999 ]]; then
 		app-text/yelp-tools"
 fi
 
-pkg_setup() {
+src_configure() {
+	DOCS="AUTHORS ChangeLog* NEWS README"
 	G2CONF="${G2CONF}
 		--disable-schemas-compile"
 	[[ ${PV} != 9999 ]] && G2CONF="${G2CONF} ITSTOOL=$(type -P true)"
-	DOCS="AUTHORS ChangeLog* NEWS README"
+	gnome2_src_configure
 }

diff --git a/gnome-extra/gcalctool/gcalctool-9999.ebuild b/gnome-extra/gcalctool/gcalctool-9999.ebuild
index 1e06c80..e989072 100644
--- a/gnome-extra/gcalctool/gcalctool-9999.ebuild
+++ b/gnome-extra/gcalctool/gcalctool-9999.ebuild
@@ -28,7 +28,6 @@ COMMON_DEPEND=">=x11-libs/gtk+-3:3
 RDEPEND="${COMMON_DEPEND}
 	!<gnome-extra/gnome-utils-2.3"
 DEPEND="${COMMON_DEPEND}
-	app-text/scrollkeeper
 	>=dev-util/intltool-0.35
 	sys-devel/gettext
 	virtual/pkgconfig"
@@ -38,9 +37,10 @@ if [[ ${PV} = 9999 ]]; then
 		app-text/yelp-tools"
 fi
 
-pkg_setup() {
+src_configure() {
+	DOCS="AUTHORS ChangeLog* NEWS README"
 	G2CONF="${G2CONF}
 		--disable-schemas-compile"
 	[[ ${PV} != 9999 ]] && G2CONF="${G2CONF} ITSTOOL=$(type -P true)"
-	DOCS="AUTHORS ChangeLog* NEWS README"
+	gnome2_src_configure
 }