From: Leonardo Boshell <leonardop@gentoo.org>
Date: Mon, 31 Oct 2005 10:33:45 +0000 (+0000)
Subject: Misc. clean-ups in ebuild.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b79795d7d42bb93327e3bdfa6112d7125abcd1c5;p=gentoo.git

Misc. clean-ups in ebuild.
Package-Manager: portage-2.0.53_rc7
---

diff --git a/x11-libs/goffice/ChangeLog b/x11-libs/goffice/ChangeLog
index df2a4533b268..2754a79f3292 100644
--- a/x11-libs/goffice/ChangeLog
+++ b/x11-libs/goffice/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/goffice
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/goffice/ChangeLog,v 1.3 2005/10/31 01:07:11 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/goffice/ChangeLog,v 1.4 2005/10/31 10:33:45 leonardop Exp $
+
+  31 Oct 2005; Leonardo Boshell <leonardop@gentoo.org> goffice-0.1.0.ebuild:
+  Don't install COPYING and INSTALL documents. Moved G2CONF declaration to
+  pkg_setup(). Misc. clean-ups.
 
   31 Oct 2005; Jason Wever <weeve@gentoo.org> goffice-0.1.0.ebuild:
   Added ~sparc keyword wrt bug #110858.
diff --git a/x11-libs/goffice/Manifest b/x11-libs/goffice/Manifest
index b400801445ed..c177625b377e 100644
--- a/x11-libs/goffice/Manifest
+++ b/x11-libs/goffice/Manifest
@@ -1,4 +1,4 @@
-MD5 f4784b419c44b5e909238e2c8cfd3476 ChangeLog 664
+MD5 aa365dc4bf1875566e44305675738204 ChangeLog 853
 MD5 0d5535797dbf42513d9f390cdb6d31f0 files/digest-goffice-0.1.0 67
-MD5 dcc9c4a17906f4b1c1df62bc3b38b071 goffice-0.1.0.ebuild 1358
+MD5 46f3c51316357a8b958c6575bdc22e4d goffice-0.1.0.ebuild 1335
 MD5 9223ce07181892826a7663eb673f91f3 metadata.xml 436
diff --git a/x11-libs/goffice/goffice-0.1.0.ebuild b/x11-libs/goffice/goffice-0.1.0.ebuild
index fa0dc3b870c9..6c26463e079f 100644
--- a/x11-libs/goffice/goffice-0.1.0.ebuild
+++ b/x11-libs/goffice/goffice-0.1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/goffice/goffice-0.1.0.ebuild,v 1.3 2005/10/31 01:07:11 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/goffice/goffice-0.1.0.ebuild,v 1.4 2005/10/31 10:33:45 leonardop Exp $
 
 inherit eutils gnome2
 
@@ -15,21 +15,28 @@ IUSE="gnome"
 #cairo support broken and -gtk broken
 
 RDEPEND=">=dev-libs/glib-2.6.3
-		>=gnome-extra/libgsf-1.13.1
-		>=dev-libs/libxml2-2.4.12
-		>=x11-libs/pango-1.8.2
-		>=x11-libs/gtk+-2.6
-		>=gnome-base/libglade-2.3.6
-		>=gnome-base/libgnomeprint-2.8.2
-		>=media-libs/libart_lgpl-2.3.11
-		gnome? ( >=gnome-base/gconf-2
-					>=gnome-base/libgnomeui-2 )"
+	>=gnome-extra/libgsf-1.13.1
+	>=dev-libs/libxml2-2.4.12
+	>=x11-libs/pango-1.8.1
+	>=x11-libs/gtk+-2.6
+	>=gnome-base/libglade-2.3.6
+	>=gnome-base/libgnomeprint-2.8.2
+	>=media-libs/libart_lgpl-2.3.11
+	gnome? (
+		>=gnome-base/gconf-2
+		>=gnome-base/libgnomeui-2 )"
 
 DEPEND="${RDEPEND}
-		dev-util/pkgconfig
-		>=dev-util/intltool-0.29"
+		>=dev-util/pkgconfig-0.9
+		>=dev-util/intltool-0.28"
+
+DOCS="AUTHORS BUGS ChangeLog MAINTAINERS NEWS README"
+USE_DESTDIR="1"
+
 
 pkg_setup() {
+	G2CONF="$(use_with gnome)"
+
 	if use gnome && ! built_with_use gnome-extra/libgsf gnome; then
 		eerror "Please rebuild gnome-extra/libgsf with gnome support enabled"
 		eerror "USE=\"gnome\" emerge gnome-extra/libgsf"
@@ -37,8 +44,3 @@ pkg_setup() {
 		die "No Gnome support found in libgsf"
 	fi
 }
-
-G2CONF="${G2CONF} $(use_with gnome)"
-USE_DESTDIR="1"
-
-DOCS="AUTHORS BUGS COPYING ChangeLog INSTALL MAINTAINERS NEWS README"