Fix guile build problems

3 files changed, 47 insertions, 9 deletions

diff --git a/gnome-base/libgtop/ChangeLog b/gnome-base/libgtop/ChangeLog
index c110b3999f7e..cbd7395ca299 100644
--- a/gnome-base/libgtop/ChangeLog
+++ b/gnome-base/libgtop/ChangeLog
@@ -1,8 +1,11 @@
 # ChangeLog for gnome-base/libgtop
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgtop/ChangeLog,v 1.6 2002/12/09 04:22:38 manson Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgtop/ChangeLog,v 1.7 2002/12/11 18:50:57 foser Exp $
 
-\* Autoupdate keywords (12-6-02)
+  10 Dec 2002; foser <foser@gentoo.org> libgtop-1.0.13-r2.ebuild :
+  Added patch by Stanislev brabec <sbrabec@suse.cz> to fix build break with latest guile (bug #11957)
+
+* Autoupdate keywords (12-6-02)
   06 Dec 2002; Rodney Rees <manson@gentoo.org> changed sparc ~sparc keywords
  
 *libgtop-2.0.0-r1 ( 26 Jun 2002)
diff --git a/gnome-base/libgtop/files/libgtop-1.0.13-guile-compile.patch b/gnome-base/libgtop/files/libgtop-1.0.13-guile-compile.patch
new file mode 100644
index 000000000000..e6b698a95d1e
--- /dev/null
+++ b/gnome-base/libgtop/files/libgtop-1.0.13-guile-compile.patch
@@ -0,0 +1,32 @@
+Index: sysdeps/guile/Makefile.am
+===================================================================
+RCS file: /cvs/gnome/libgtop/sysdeps/guile/Attic/Makefile.am,v
+retrieving revision 1.15
+diff -u -r1.15 Makefile.am
+--- sysdeps/guile/Makefile.am	18 Feb 1999 09:54:13 -0000	1.15
++++ sysdeps/guile/Makefile.am	11 Dec 2002 13:05:53 -0000
+@@ -19,7 +19,7 @@
+ 	mv gnc-t guile.c
+ 
+ guile.x: guile.c
+-	guile-snarf $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $< > $@
++	guile-snarf $< $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) > $@
+ 
+ EXTRA_DIST			= guile.pl
+ 
+Index: sysdeps/guile/names/Makefile.am
+===================================================================
+RCS file: /cvs/gnome/libgtop/sysdeps/guile/names/Attic/Makefile.am,v
+retrieving revision 1.13
+diff -u -r1.13 Makefile.am
+--- sysdeps/guile/names/Makefile.am	18 Feb 1999 09:54:16 -0000	1.13
++++ sysdeps/guile/names/Makefile.am	11 Dec 2002 13:05:53 -0000
+@@ -17,7 +17,7 @@
+ 	mv gnc-t guile-names.c
+ 
+ guile-names.x: guile-names.c
+-	guile-snarf $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $< > $@
++	guile-snarf $< $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) > $@
+ 
+ EXTRA_DIST			= guile-names.pl
+ 
diff --git a/gnome-base/libgtop/libgtop-1.0.13-r2.ebuild b/gnome-base/libgtop/libgtop-1.0.13-r2.ebuild
index d651440f64d3..1687beef452e 100644
--- a/gnome-base/libgtop/libgtop-1.0.13-r2.ebuild
+++ b/gnome-base/libgtop/libgtop-1.0.13-r2.ebuild
@@ -1,34 +1,37 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgtop/libgtop-1.0.13-r2.ebuild,v 1.9 2002/12/09 04:22:38 manson Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgtop/libgtop-1.0.13-r2.ebuild,v 1.10 2002/12/11 18:50:57 foser Exp $
 
-IUSE="nls"
+inherit eutils
 
+IUSE="nls"
 S=${WORKDIR}/${P}
 DESCRIPTION="libgtop"
 SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/${PN}/${P}.tar.gz"
-
 HOMEPAGE="http://www.gnome.org/"
 SLOT="1"
 LICENSE="LGPL-2.1"
-KEYWORDS="x86 ppc sparc "
+KEYWORDS="x86 ppc sparc"
 
 RDEPEND=">=sys-devel/bc-1.06
 	 >=sys-libs/readline-4.1
          >=gnome-base/gnome-libs-1.4.1.2-r1"
 
 DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext ) 
+	nls? ( sys-devel/gettext )
+	>=dev-util/guile-1.4 
 	sys-devel/perl"
 
 
 src_unpack() {
-
 	unpack ${A}
 
 	# Fix a remote buffer overflow vuln.
 	cd ${S}
-	patch -p1 <${FILESDIR}/${PV}-remote_buffer_overflow.diff || die
+	epatch ${FILESDIR}/${PV}-remote_buffer_overflow.diff
+	# guile compile fix
+	epatch ${FILESDIR}/${PN}-${PV}-guile-compile.patch
+	automake-1.4
 }
 
 src_compile() {