gcc34 fix? (bug #72734); tidy

diff --git a/games-kids/stickers/ChangeLog b/games-kids/stickers/ChangeLog
index 2e7bee245ccfb9ec2037e2ddac7f4ae3d2474c5e..54f3d9a12a36a2b34aeb6bde6df98ddba0ea92eb 100644 (file)
--- a/games-kids/stickers/ChangeLog
+++ b/games-kids/stickers/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-kids/stickers
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-kids/stickers/ChangeLog,v 1.4 2004/06/24 22:52:17 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-kids/stickers/ChangeLog,v 1.5 2004/12/03 08:19:07 mr_bones_ Exp $
+
+  03 Dec 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  stickers-0.1.3-r1.ebuild:
+  gcc34 fix? (bug #72734); tidy
 
   24 Jan 2004; Michael Sterrett <mr_bones_@gentoo.org>
   stickers-0.1.3-r1.ebuild:

diff --git a/games-kids/stickers/Manifest b/games-kids/stickers/Manifest
index 5138a14115b48f8c22cfd56019373fcea17b2e52..dead87675ced24200e0074dce64bf4747f500c7b 100644 (file)
--- a/games-kids/stickers/Manifest
+++ b/games-kids/stickers/Manifest
@@ -1,4 +1,4 @@
-MD5 baccfc54157bcd4ec9a2841944fb8922 stickers-0.1.3-r1.ebuild 905
-MD5 c622f976af0e59019d9051964e54c59a ChangeLog 1142
+MD5 953f5b2061f6e7c108916b8232b258ff ChangeLog 1259
+MD5 cee2eb2c09ba0d35b4d4ae3e9da6870a stickers-0.1.3-r1.ebuild 1062
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 MD5 50ce6ad2f6d2cfc96a7ba1851fdaad03 files/digest-stickers-0.1.3-r1 67

diff --git a/games-kids/stickers/stickers-0.1.3-r1.ebuild b/games-kids/stickers/stickers-0.1.3-r1.ebuild
index 6536bfc263c668c56e8f86402dabd53f73763670..7a923d3864b4fb79ec6c37810f0c2e0d352f7d5f 100644 (file)
--- a/games-kids/stickers/stickers-0.1.3-r1.ebuild
+++ b/games-kids/stickers/stickers-0.1.3-r1.ebuild
@@ -1,22 +1,29 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-kids/stickers/stickers-0.1.3-r1.ebuild,v 1.4 2004/06/24 22:52:17 agriffis Exp $
-
+# $Header: /var/cvsroot/gentoo-x86/games-kids/stickers/stickers-0.1.3-r1.ebuild,v 1.5 2004/12/03 08:19:07 mr_bones_ Exp $
 
 DESCRIPTION="Stickers Book for small children"
 HOMEPAGE="http://users.powernet.co.uk/kienzle/stickers/"
 SRC_URI="http://users.powernet.co.uk/kienzle/stickers/${P}.tar.gz"
 
-KEYWORDS="x86 amd64"
 LICENSE="GPL-2"
 SLOT="0"
+KEYWORDS="x86 amd64"
 IUSE="nls"
 
 DEPEND="virtual/x11
        media-libs/imlib
-       x11-libs/gtk+
+       =x11-libs/gtk+-1.2*
        nls? ( sys-devel/gettext )"
 
+src_unpack() {
+       unpack ${A}
+       # gcc34 fix? (bug #72734)
+       sed -i \
+               -e '/ONTRACE/d' "${S}/rc.c" \
+               || die "sed failed"
+}
+
 src_compile() {
        local myconf
        use nls || myconf="${myconf} --disable-nls"
@@ -25,13 +32,14 @@ src_compile() {
                --prefix=/usr \
                --infodir=/usr/share/info \
                --mandir=/usr/share/man \
-               ${myconf} || die
+               ${myconf} || die "configure failed"
        emake || die "emake failed"
 }
 
 src_install () {
        make \
-               prefix=${D}/usr \
-               infodir=${D}/usr/share/info \
-               mandir=${D}/usr/share/man install || die "make install failed"
+               prefix="${D}/usr" \
+               infodir="${D}/usr/share/info" \
+               mandir="${D}/usr/share/man" install \
+               || die "make install failed"
 }