stable on amd64

(Portage version: 2.0.51.22-r3)

3 files changed, 20 insertions, 80 deletions

diff --git a/gnome-extra/guppi/ChangeLog b/gnome-extra/guppi/ChangeLog
index d2da1de47114..ebf8b73e21ad 100644
--- a/gnome-extra/guppi/ChangeLog
+++ b/gnome-extra/guppi/ChangeLog
@@ -1,72 +1,8 @@
 # ChangeLog for gnome-extra/guppi
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/guppi/ChangeLog,v 1.20 2005/11/20 01:22:33 allanonjl Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/guppi/ChangeLog,v 1.21 2005/11/26 11:46:41 blubb Exp $
 
-*guppi-0.40.3-r3 (20 Nov 2005)
+  26 Nov 2005; Simon Stelling <blubb@gentoo.org> guppi-0.40.3-r2.ebuild,
+  guppi-0.40.3-r3.ebuild:
+  fix trivial multilib-strict issues; mark -r2 stable on amd64
 
-  20 Nov 2005; John N. Laliberte <allanonjl@gentoo.org>
-  +files/guppi-0.40.3-gcc4.patch, -guppi-0.40.3-r1.ebuild,
-  +guppi-0.40.3-r3.ebuild:
-  remove -r1 (old version). add gcc4 patch (Thanks to Halcy0n)
-
-  17 Oct 2005; Aron Griffis <agriffis@gentoo.org> guppi-0.40.3-r2.ebuild:
-  Mark 0.40.3-r2 stable on ia64
-
-  26 Aug 2005; Aron Griffis <agriffis@gentoo.org> guppi-0.40.3-r2.ebuild:
-  add ~ia64
-
-  16 May 2005; John N. Laliberte <allanonjl@gentoo.org>
-  guppi-0.40.3-r2.ebuild:
-  gcc -> toolchain-funcs
-
-  18 Sep 2004; Daniel Goller <morfic@gentoo.org>
-  +files/guppi-0.40.3-gcc34.patch, guppi-0.40.3-r2.ebuild:
-  fixing bug 55228, thanks to Matthew Baker for patch
-
-  03 Jun 2004; Aron Griffis <agriffis@gentoo.org> guppi-0.40.3-r1.ebuild,
-  guppi-0.40.3-r2.ebuild:
-  Fix use invocation
-
-  02 Mar 2004; <augustus@gentoo.org> guppi-0.40.3-r2.ebuild:
-  Added ~amd64 keyword.
-
-  09 Jan 2004; Aron Griffis <agriffis@gentoo.org> guppi-0.40.3-r2.ebuild:
-  stable on alpha
-
-  17 Oct 2003; Alastair Tse <liquidx@gentoo.org> guppi-0.40.3-r1.ebuild,
-  guppi-0.40.3-r2.ebuild:
-  added gal dep (#31051)
-
-  24 Jul 2003; Tavis Ormandy <taviso@gentoo.org> guppi-0.40.3-r2.ebuild:
-  ~alpha
-
-  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
- 
-*guppi-0.40.3-r2 (4 Nov 2002)
-
-  4 Nov 2002; Martin Schlemmer <azarah@gentoo.org> :
-  Add the --enable-gnumeric option back again, thanks to
-  Eric Andresen <ndiin1@cox.net> for noticing that it got
-  missing.
-
-*guppi-0.40.3-r1 (16 Mar 2002)
-
-  1 Sep 2002; Martin Schlemmer <azarah@gentoo.org> :
-  Fix libglade DEPEND to pull in a gnome1 version of libglade.
-
-  25 Jul 2002; Spider <spider@gentoo.org> :
-  make it work with repoman
-  
-  16 Mar 2002; M.Schlemmer <azarah@gentoo.org> :
-
-  Drop guile depend to version 1.4 to fix gnucash support.
-
-*guppi-0.40.3 (1 Feb 2002)
-
-  1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
-  
-  Added initial ChangeLog which should be updated whenever the package is
-  updated in any way. This changelog is targetted to users. This means that the
-  comments should well explained and written in clean English. The details about
-  writing correct changelogs are explained in the skel.ChangeLog file which you
-  can find in the root directory of the portage repository.
diff --git a/gnome-extra/guppi/guppi-0.40.3-r2.ebuild b/gnome-extra/guppi/guppi-0.40.3-r2.ebuild
index 409c95b1df4a..b31eb663f9eb 100644
--- a/gnome-extra/guppi/guppi-0.40.3-r2.ebuild
+++ b/gnome-extra/guppi/guppi-0.40.3-r2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/guppi/guppi-0.40.3-r2.ebuild,v 1.14 2005/10/17 12:59:17 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/guppi/guppi-0.40.3-r2.ebuild,v 1.15 2005/11/26 11:46:41 blubb Exp $
 
-inherit toolchain-funcs eutils
+inherit toolchain-funcs eutils multilib
 
 IUSE="python nls readline"
 
@@ -15,7 +15,7 @@ SRC_URI="ftp://ftp.yggdrasil.com/mirrors/site/ftp.gnome.org/pub/GNOME/stable/sou
 HOMEPAGE="http://www.gnome.org/guppi/"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="alpha ~amd64 ia64 ppc sparc x86"
+KEYWORDS="alpha amd64 ia64 ppc sparc x86"
 
 
 RDEPEND="=x11-libs/gtk+-1.2*
@@ -73,13 +73,14 @@ src_compile() {
 			--sysconfdir=/etc \
 			--localstatedir=/var/lib \
 			--with-bonobo \
+			--libdir=/usr/$(get_libdir) \
 			${myconf} || die
 
 	# The python 'generate' module opens some files in rw mode for some
 	# unknown reason.
-	addwrite "/usr/lib/python2.0/"
-	addwrite "/usr/lib/python2.1/"
-	addwrite "/usr/lib/python2.2/"
+	addwrite "/usr/$(get_libdir)/python2.0/"
+	addwrite "/usr/$(get_libdir)/python2.1/"
+	addwrite "/usr/$(get_libdir)/python2.2/"
 
 	emake || die
 }
@@ -90,6 +91,7 @@ src_install() {
 		infodir=${D}/usr/share/info \
 		sysconfdir=${D}/etc \
 		localstatedir=${D}/var/lib \
+		libdir=${D}/usr/$(get_libdir) \
 		install || die
 
 	dodoc AUTHORS COPYING ChangeLog NEWS README TODO
diff --git a/gnome-extra/guppi/guppi-0.40.3-r3.ebuild b/gnome-extra/guppi/guppi-0.40.3-r3.ebuild
index b49975839d37..6b07e553c329 100644
--- a/gnome-extra/guppi/guppi-0.40.3-r3.ebuild
+++ b/gnome-extra/guppi/guppi-0.40.3-r3.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/guppi/guppi-0.40.3-r3.ebuild,v 1.1 2005/11/20 01:22:33 allanonjl Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/guppi/guppi-0.40.3-r3.ebuild,v 1.2 2005/11/26 11:46:41 blubb Exp $
 
-inherit toolchain-funcs eutils
+inherit toolchain-funcs eutils multilib
 
 IUSE="python nls readline"
 
@@ -76,13 +76,14 @@ src_compile() {
 			--sysconfdir=/etc \
 			--localstatedir=/var/lib \
 			--with-bonobo \
+			--libdir=/usr/$(get_libdir) \
 			${myconf} || die
 
 	# The python 'generate' module opens some files in rw mode for some
 	# unknown reason.
-	addwrite "/usr/lib/python2.0/"
-	addwrite "/usr/lib/python2.1/"
-	addwrite "/usr/lib/python2.2/"
+	addwrite "/usr/$(get_libdir)/python2.0/"
+	addwrite "/usr/$(get_libdir)/python2.1/"
+	addwrite "/usr/$(get_libdir)/python2.2/"
 
 	emake || die
 }
@@ -93,6 +94,7 @@ src_install() {
 		infodir=${D}/usr/share/info \
 		sysconfdir=${D}/etc \
 		localstatedir=${D}/var/lib \
+		libdir=${D}/usr/$(get_libdir) \
 		install || die
 
 	dodoc AUTHORS COPYING ChangeLog NEWS README TODO