Added patches from bug #25007

7 files changed, 112 insertions, 9 deletions

diff --git a/app-sci/lard/ChangeLog b/app-sci/lard/ChangeLog
index 21a64f1a8a9d..994e1e5d20a1 100644
--- a/app-sci/lard/ChangeLog
+++ b/app-sci/lard/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-sci/lard
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-sci/lard/ChangeLog,v 1.8 2004/04/19 10:32:35 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-sci/lard/ChangeLog,v 1.9 2004/04/19 15:53:27 phosphan Exp $
+
+*lard-2.0.15-r1 (19 Apr 2004)
+
+  19 Apr 2004; Patrick Kursawe <phosphan@gentoo.org> lard-2.0.15-r1.ebuild,
+  lard-2.0.15.ebuild, files/2.0.15-gcc-multi-string-literal.patch:
+  Added patches from bug #25007
 
   19 Apr 2004; Patrick Kursawe <phosphan@gentoo.org> lard-20030204.ebuild:
   Using epatch instead of patch.
diff --git a/app-sci/lard/Manifest b/app-sci/lard/Manifest
index c77fca69ae92..7d289dc21ecd 100644
--- a/app-sci/lard/Manifest
+++ b/app-sci/lard/Manifest
@@ -1,10 +1,13 @@
 MD5 ed94e2c0e1b16570adbd7805eb8ae9ae lard-20030204.ebuild 1417
-MD5 dbdfed06735bb62fcfadf944ffe97865 lard-2.0.14.ebuild 1402
-MD5 d88370dee1f4dde21a8217adc2433f98 ChangeLog 1588
+MD5 07fce2ea09a87e9dd0e69332cbe2d0b9 lard-2.0.15-r1.ebuild 1502
+MD5 ead6f21670953660e824745468e5bc45 lard-2.0.14.ebuild 1402
+MD5 19e8186853999c1ace36ffb2ff1e6eb1 ChangeLog 1795
 MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
-MD5 0f916dcef5e2a294bcc5d2ea5e77925a lard-2.0.15.ebuild 1402
+MD5 6c40f835b123304230711480910220f7 lard-2.0.15.ebuild 1406
 MD5 017b3b8d56d2ab50af986a012c264e94 files/digest-lard-2.0.14 199
 MD5 7cb79984b40e57160f56c678ebcbcb6e files/digest-lard-2.0.15 199
+MD5 b15a173334689177c50733e628dbcdb2 files/2.0.15-gcc-multi-string-literal.patch 901
 MD5 35210aeeee5612c8757e9fa082e4ae46 files/lard-2.0.14-configure.patch 779
 MD5 1d798df4d5d56c5ec7ed16b7b7a61aef files/digest-lard-20030204 201
 MD5 f8edcceea4f0b88bdec4b7834fa43b35 files/lard-2.0.15-configure.patch 2274
+MD5 7cb79984b40e57160f56c678ebcbcb6e files/digest-lard-2.0.15-r1 199
diff --git a/app-sci/lard/files/2.0.15-gcc-multi-string-literal.patch b/app-sci/lard/files/2.0.15-gcc-multi-string-literal.patch
new file mode 100644
index 000000000000..7eb21fd25de8
--- /dev/null
+++ b/app-sci/lard/files/2.0.15-gcc-multi-string-literal.patch
@@ -0,0 +1,35 @@
+diff -cr --new-file interpreter.orig/Makefile.in interpreter/Makefile.in
+*** interpreter.orig/Makefile.in	Tue Nov 25 18:49:30 2003
+--- interpreter/Makefile.in	Tue Nov 25 18:49:44 2003
+***************
+*** 462,467 ****
+--- 462,468 ----
+  
+  init.tcl: init.tcl.pl
+  	./init.tcl.pl $(libdir)/tcl $(lardlibdir) > init.tcl
++ 	./con.py
+  
+  main.c: init.tcl
+  # Tell versions [3.59,3.63) of GNU make to not export all variables.
+diff -cr --new-file interpreter.orig/con.py interpreter/con.py
+*** interpreter.orig/con.py	Thu Jan  1 01:00:00 1970
+--- interpreter/con.py	Tue Nov 25 18:49:59 2003
+***************
+*** 0 ****
+--- 1,16 ----
++ #!/usr/bin/python
++ 
++ f=open('init.tcl')
++ s=f.read()
++ f.close()
++ s=s[s.find('"'):s.rfind('"')+1]
++ newstr=''
++ for c in s:
++     if c=='\n':
++         newstr=newstr+'\\n'
++     else:
++         newstr=newstr+c
++ 
++ f=open('init.tcl','w+')
++ f.write(newstr)
++ f.close()
diff --git a/app-sci/lard/files/digest-lard-2.0.15-r1 b/app-sci/lard/files/digest-lard-2.0.15-r1
new file mode 100644
index 000000000000..447f61f1b482
--- /dev/null
+++ b/app-sci/lard/files/digest-lard-2.0.15-r1
@@ -0,0 +1,3 @@
+MD5 ab9e509f03a2701777605df49f9d376d lard-2.0.15.tar.gz 394967
+MD5 99adde34967f1c75a89f3983ce79b0b8 lard-demos-2.0.12.tar.gz 119124
+MD5 c76c77fe5643893abc03911bf3cf0607 lard-doc-2.0.14.tar.gz 355267
diff --git a/app-sci/lard/lard-2.0.14.ebuild b/app-sci/lard/lard-2.0.14.ebuild
index 3085635d6abb..becaf95d76d9 100644
--- a/app-sci/lard/lard-2.0.14.ebuild
+++ b/app-sci/lard/lard-2.0.14.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-sci/lard/lard-2.0.14.ebuild,v 1.8 2004/02/22 19:52:53 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-sci/lard/lard-2.0.14.ebuild,v 1.9 2004/04/19 15:53:27 phosphan Exp $
 
 IUSE=""
 
diff --git a/app-sci/lard/lard-2.0.15-r1.ebuild b/app-sci/lard/lard-2.0.15-r1.ebuild
new file mode 100644
index 000000000000..1938fc4565e6
--- /dev/null
+++ b/app-sci/lard/lard-2.0.15-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-sci/lard/lard-2.0.15-r1.ebuild,v 1.1 2004/04/19 15:53:27 phosphan Exp $
+
+inherit eutils
+
+IUSE=""
+
+DESCRIPTION="Language for Asynchronous Research and Development. Used to describe and simulate asynchronous circuits"
+HOMEPAGE="http://www.cs.man.ac.uk/apt/projects/tools/lard/index.html"
+SRC_URI="ftp://ftp.cs.man.ac.uk/pub/amulet/lard/${P}.tar.gz
+	ftp://ftp.cs.man.ac.uk/pub/amulet/lard/lard-demos-2.0.12.tar.gz
+	ftp://ftp.cs.man.ac.uk/pub/amulet/lard/lard-doc-2.0.14.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc"
+
+DEPEND="sys-devel/flex
+	dev-lang/tcl
+	dev-lang/tk
+	sys-devel/bison
+	sys-devel/binutils
+	dev-tcltk/tclx
+	dev-libs/gmp
+	dev-lang/perl
+	dev-tcltk/bwidget"
+
+src_unpack() {
+	unpack ${A} ; cd ${S}
+	epatch ${FILESDIR}/${P}-configure.patch
+	epatch ${FILESDIR}/${PV}-gcc-multi-string-literal.patch
+	chmod +x interpreter/con.py
+}
+
+src_compile() {
+	econf --libdir=/usr/lib/lard
+	emake || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR=${D} install || die "install failed"
+
+	dodoc AUTHORS COPYING NEWS README
+
+	dodir /usr/share/doc/${PF}/demos
+	cp -R ${WORKDIR}/lard-demos-2.0.12/* ${D}/usr/share/doc/${PF}/demos
+	cd ${WORKDIR}/lard-doc
+	find . -name "*.doc *.cgi" -exec rm {} \;
+	dodir /usr/share/doc/${PF}/html
+	cp -R * ${D}/usr/share/doc/${PF}/html
+	cd ${WORKDIR}
+	dosed "s:\$exec_prefix:#\$exec_prefix:g" /usr/bin/lcd
+}
diff --git a/app-sci/lard/lard-2.0.15.ebuild b/app-sci/lard/lard-2.0.15.ebuild
index 4699f38bfcd5..d456bdc8bbe2 100644
--- a/app-sci/lard/lard-2.0.15.ebuild
+++ b/app-sci/lard/lard-2.0.15.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-sci/lard/lard-2.0.15.ebuild,v 1.2 2003/11/04 10:49:13 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-sci/lard/lard-2.0.15.ebuild,v 1.3 2004/04/19 15:53:27 phosphan Exp $
+
+inherit eutils
 
 IUSE=""
 
@@ -26,7 +28,7 @@ DEPEND="sys-devel/flex
 
 src_unpack() {
 	unpack ${A} ; cd ${S}
-	patch -p1 < ${FILESDIR}/${P}-configure.patch || die
+	epatch ${FILESDIR}/${P}-configure.patch
 }
 
 src_compile() {