new version + some fixes

8 files changed, 361 insertions, 2 deletions

diff --git a/app-sci/tbass/ChangeLog b/app-sci/tbass/ChangeLog
index cb96978822b6..57c3a35731a2 100644
--- a/app-sci/tbass/ChangeLog
+++ b/app-sci/tbass/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-sci/tbass
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-sci/tbass/ChangeLog,v 1.9 2003/07/02 12:33:39 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-sci/tbass/ChangeLog,v 1.10 2003/07/31 04:24:21 george Exp $
+
+*tbass-20030725.3.3 (30 Jul 2003)
+
+  30 Jul 2003; George Shapovalov <george@gentoo.org> tbass-20030725.ebuild, files/tbass-20030725.3.3-{balsa-lard-configure.patch,tech-example-configure.patch,tech-verilog-configure.patch,tech-xilinx-configure.patch} :
+  new version (#25008),
+  some updates + fixes #24494, lard has been split off this package
+  Thanks to Chris Bainbridge <chrb@dcs.ed.ac.uk> for submission and updates
 
 *tbass-20030318 (12 May 2003)
 
diff --git a/app-sci/tbass/Manifest b/app-sci/tbass/Manifest
index 4d8fddb4406d..feb3a4612e61 100644
--- a/app-sci/tbass/Manifest
+++ b/app-sci/tbass/Manifest
@@ -1,12 +1,18 @@
+MD5 a038b01607c298db100f8c758cddf650 tbass-20030725.3.3.ebuild 4820
 MD5 1493520ff902cc2eea6d4970fe9979a5 tbass-20030204.ebuild 3156
 MD5 d6fe4966aed5c3c2cf5062ae9429670b tbass-20030108.ebuild 2161
 MD5 8a3db906862cb8da3ecc0b64ae7f89cd tbass-20030318.ebuild 3233
 MD5 4d07198aa67b3671c01ab942a1f9321b tbass-20020729.ebuild 2170
-MD5 0c700dc2354cdcbf42f699cf3f866fd0 ChangeLog 1619
+MD5 6a782271a9a6fc4c96bdaf76f1abf5ec ChangeLog 2044
 MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
+MD5 1a6bd8a5a7ec961bbe736875a26b525e files/digest-tbass-20030725.3.3 476
 MD5 615126ca2b7e11dba062f9c622e8ff53 files/tbass-20030204-tech-verilog-configure.patch 1054
+MD5 06b5b9d22251b4c131088e5e35ff5ecd files/tbass-20030725.3.3-balsa-lard-configure.patch 1376
+MD5 615126ca2b7e11dba062f9c622e8ff53 files/tbass-20030725.3.3-tech-verilog-configure.patch 1054
+MD5 5b08db63956e99c35e4b7d70012e33a5 files/tbass-20030725.3.3-tech-xilinx-configure.patch 2438
 MD5 5b08db63956e99c35e4b7d70012e33a5 files/tbass-20030204-tech-xilinx-configure.patch 2438
 MD5 50238387a321b8a333d97955093be1a5 files/digest-tbass-20020729 398
 MD5 436732842affb4eed72237dfb1b1f44f files/digest-tbass-20030108 398
 MD5 7f71232858d93d8ef166dac62bc1f3f2 files/digest-tbass-20030204 411
 MD5 4eb9869acd357739092fb7cc087e747c files/digest-tbass-20030318 411
+MD5 a85522222885bf0fe3c93aecd2feba6e files/tbass-20030725.3.3-tech-example-configure.patch 1392
diff --git a/app-sci/tbass/files/digest-tbass-20030725.3.3 b/app-sci/tbass/files/digest-tbass-20030725.3.3
new file mode 100644
index 000000000000..db51bbf943a1
--- /dev/null
+++ b/app-sci/tbass/files/digest-tbass-20030725.3.3
@@ -0,0 +1,7 @@
+MD5 0f42d86e91c76dec98432239d3de60ae balsa-3.3.tar.gz 1021926
+MD5 7caed3f4401b8438798ce52d572c1d28 balsa-manual-3.3.pdf 4395057
+MD5 f68bf32c69916d30d62ddf1bf6960a6a balsa-tech-example-3.3.tar.gz 61560
+MD5 af8abda78884e905470e992f57e64534 dma-example.tar.gz 7194
+MD5 6bf0aa7eb37a33728f58221502cc7f6a examples.tar.gz 7017
+MD5 02c765d09fd8c1fe0b3a2f8e0ac5b3ec balsa-tech-verilog-20030204.tar.gz 50373
+MD5 71d301394337e13a0bef01fa6ee3984b balsa-tech-xilinx-20021029.tar.gz 141410
diff --git a/app-sci/tbass/files/tbass-20030725.3.3-balsa-lard-configure.patch b/app-sci/tbass/files/tbass-20030725.3.3-balsa-lard-configure.patch
new file mode 100644
index 000000000000..0d4bac0da6ca
--- /dev/null
+++ b/app-sci/tbass/files/tbass-20030725.3.3-balsa-lard-configure.patch
@@ -0,0 +1,37 @@
+*** balsa-lard-3.3/configure.old	Mon Jul 21 21:59:27 2003
+--- balsa-lard-3.3/configure	Mon Jul 21 22:00:11 2003
+***************
+*** 1652,1667 ****
+  fi
+  
+  
+! if test ${BALSA_CONFIG}; then :
+! else
+! 	{ { echo "$as_me:$LINENO: error: cannot find required balsa-config, install Balsa and add it to your path" >&5
+! echo "$as_me: error: cannot find required balsa-config, install Balsa and add it to your path" >&2;}
+!    { (exit 1); exit 1; }; }
+! fi
+  
+  echo "$as_me:$LINENO: checking installed Balsa directory" >&5
+  echo $ECHO_N "checking installed Balsa directory... $ECHO_C" >&6
+! ac_default_prefix=`${BALSA_CONFIG} -d`
+  prefix=${ac_default_prefix}
+  echo "$as_me:$LINENO: result: ${ac_default_prefix}" >&5
+  echo "${ECHO_T}${ac_default_prefix}" >&6
+--- 1652,1667 ----
+  fi
+  
+  
+! #if test ${BALSA_CONFIG}; then :
+! #else
+! #	{ { echo "$as_me:$LINENO: error: cannot find required balsa-config, install Balsa and add it to your path" >&5
+! #echo "$as_me: error: cannot find required balsa-config, install Balsa and add it to your path" >&2;}
+! #   { (exit 1); exit 1; }; }
+! #fi
+  
+  echo "$as_me:$LINENO: checking installed Balsa directory" >&5
+  echo $ECHO_N "checking installed Balsa directory... $ECHO_C" >&6
+! ac_default_prefix=/usr
+  prefix=${ac_default_prefix}
+  echo "$as_me:$LINENO: result: ${ac_default_prefix}" >&5
+  echo "${ECHO_T}${ac_default_prefix}" >&6
diff --git a/app-sci/tbass/files/tbass-20030725.3.3-tech-example-configure.patch b/app-sci/tbass/files/tbass-20030725.3.3-tech-example-configure.patch
new file mode 100644
index 000000000000..2de545317954
--- /dev/null
+++ b/app-sci/tbass/files/tbass-20030725.3.3-tech-example-configure.patch
@@ -0,0 +1,37 @@
+*** balsa-tech-example-3.3/configure.old	Mon Jul 21 21:51:29 2003
+--- balsa-tech-example-3.3/configure	Mon Jul 21 21:53:44 2003
+***************
+*** 1610,1625 ****
+  fi
+  
+  
+! if test ${BALSA_CONFIG}; then :
+! else
+! 	{ { echo "$as_me:$LINENO: error: cannot find required balsa-config, install Balsa and add it to your path" >&5
+! echo "$as_me: error: cannot find required balsa-config, install Balsa and add it to your path" >&2;}
+!    { (exit 1); exit 1; }; }
+! fi
+  
+  echo "$as_me:$LINENO: checking installed Balsa directory" >&5
+  echo $ECHO_N "checking installed Balsa directory... $ECHO_C" >&6
+! ac_default_prefix=`${BALSA_CONFIG} -d`
+  prefix=${ac_default_prefix}
+  echo "$as_me:$LINENO: result: ${ac_default_prefix}" >&5
+  echo "${ECHO_T}${ac_default_prefix}" >&6
+--- 1610,1625 ----
+  fi
+  
+  
+! #if test ${BALSA_CONFIG}; then :
+! #else
+! #	{ { echo "$as_me:$LINENO: error: cannot find required balsa-config, install Balsa and add it to your path" >&5
+! #echo "$as_me: error: cannot find required balsa-config, install Balsa and add it to your path" >&2;}
+! #   { (exit 1); exit 1; }; }
+! #fi
+  
+  echo "$as_me:$LINENO: checking installed Balsa directory" >&5
+  echo $ECHO_N "checking installed Balsa directory... $ECHO_C" >&6
+! ac_default_prefix=/usr
+  prefix=${ac_default_prefix}
+  echo "$as_me:$LINENO: result: ${ac_default_prefix}" >&5
+  echo "${ECHO_T}${ac_default_prefix}" >&6
diff --git a/app-sci/tbass/files/tbass-20030725.3.3-tech-verilog-configure.patch b/app-sci/tbass/files/tbass-20030725.3.3-tech-verilog-configure.patch
new file mode 100644
index 000000000000..16c7d6e6189b
--- /dev/null
+++ b/app-sci/tbass/files/tbass-20030725.3.3-tech-verilog-configure.patch
@@ -0,0 +1,33 @@
+*** balsa-tech-verilog-20030204/configure.old	Thu Mar 13 16:51:29 2003
+--- balsa-tech-verilog-20030204/configure	Thu Mar 13 16:51:32 2003
+***************
+*** 1610,1623 ****
+  fi
+  
+  
+! if test ${BALSA_CONFIG}; then :
+! else
+! 	{ { echo "$as_me:$LINENO: error: cannot find required balsa-config, install Balsa and add it to your path" >&5
+! echo "$as_me: error: cannot find required balsa-config, install Balsa and add it to your path" >&2;}
+!    { (exit 1); exit 1; }; }
+! fi
+  
+! ac_default_prefix=`${BALSA_CONFIG} -d`
+  prefix=${ac_default_prefix}
+  echo installed Balsa prefix is: ${ac_default_prefix}
+  
+--- 1610,1623 ----
+  fi
+  
+  
+! #if test ${BALSA_CONFIG}; then :
+! #else
+! #	{ { echo "$as_me:$LINENO: error: cannot find required balsa-config, install Balsa and add it to your path" >&5
+! #echo "$as_me: error: cannot find required balsa-config, install Balsa and add it to your path" >&2;}
+! #   { (exit 1); exit 1; }; }
+! #fi
+  
+! ac_default_prefix=/usr
+  prefix=${ac_default_prefix}
+  echo installed Balsa prefix is: ${ac_default_prefix}
+  
diff --git a/app-sci/tbass/files/tbass-20030725.3.3-tech-xilinx-configure.patch b/app-sci/tbass/files/tbass-20030725.3.3-tech-xilinx-configure.patch
new file mode 100644
index 000000000000..d6a4e6e480e7
--- /dev/null
+++ b/app-sci/tbass/files/tbass-20030725.3.3-tech-xilinx-configure.patch
@@ -0,0 +1,83 @@
+*** balsa-tech-xilinx-20021029/configure.old	Thu Mar 13 17:17:48 2003
+--- balsa-tech-xilinx-20021029/configure	Thu Mar 13 17:26:04 2003
+***************
+*** 275,281 ****
+  program_transform_name=s,x,x,
+  silent=
+  site=
+! srcdir=
+  verbose=
+  x_includes=NONE
+  x_libraries=NONE
+--- 275,281 ----
+  program_transform_name=s,x,x,
+  silent=
+  site=
+! srcdir=.
+  verbose=
+  x_includes=NONE
+  x_libraries=NONE
+***************
+*** 673,687 ****
+  else
+    ac_srcdir_defaulted=no
+  fi
+! if test ! -r $srcdir/$ac_unique_file; then
+!   if test "$ac_srcdir_defaulted" = yes; then
+!     { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
+!    { (exit 1); exit 1; }; }
+!   else
+!     { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
+!    { (exit 1); exit 1; }; }
+!   fi
+! fi
+  srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
+  ac_env_build_alias_set=${build_alias+set}
+  ac_env_build_alias_value=$build_alias
+--- 673,687 ----
+  else
+    ac_srcdir_defaulted=no
+  fi
+! #if test ! -r $srcdir/$ac_unique_file; then
+! #  if test "$ac_srcdir_defaulted" = yes; then
+! #    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
+! #   { (exit 1); exit 1; }; }
+! #  else
+! #    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
+! #   { (exit 1); exit 1; }; }
+! #  fi
+! #fi
+  srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
+  ac_env_build_alias_set=${build_alias+set}
+  ac_env_build_alias_value=$build_alias
+***************
+*** 1533,1546 ****
+  fi
+  
+  
+! if test ${BALSA_CONFIG}; then :
+! else
+! 	{ { echo "$as_me:$LINENO: error: cannot find required balsa-config, install Balsa and add it to your path" >&5
+! echo "$as_me: error: cannot find required balsa-config, install Balsa and add it to your path" >&2;}
+!    { (exit 1); exit 1; }; }
+! fi
+  
+! ac_default_prefix=`${BALSA_CONFIG} -d`
+  prefix=${ac_default_prefix}
+  echo installed Balsa prefix is: ${ac_default_prefix}
+  
+--- 1533,1546 ----
+  fi
+  
+  
+! #if test ${BALSA_CONFIG}; then :
+! #else
+! #	{ { echo "$as_me:$LINENO: error: cannot find required balsa-config, install Balsa and add it to your path" >&5
+! #echo "$as_me: error: cannot find required balsa-config, install Balsa and add it to your path" >&2;}
+! #   { (exit 1); exit 1; }; }
+! #fi
+  
+! ac_default_prefix=/usr
+  prefix=${ac_default_prefix}
+  echo installed Balsa prefix is: ${ac_default_prefix}
+  
diff --git a/app-sci/tbass/tbass-20030725.3.3.ebuild b/app-sci/tbass/tbass-20030725.3.3.ebuild
new file mode 100644
index 000000000000..3deb35cf2a81
--- /dev/null
+++ b/app-sci/tbass/tbass-20030725.3.3.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-sci/tbass/tbass-20030725.3.3.ebuild,v 1.1 2003/07/31 04:24:21 george Exp $
+
+IUSE=""
+
+Name="balsa"
+My_PV="3.3"
+#quite custom anyway, this one has version number at the end 
+#to indicate it is a release
+
+DESCRIPTION="Balsa is both a framework for synthesising asynchronous hardware systems and the language for describing such systems"
+HOMEPAGE="http://www.cs.man.ac.uk/amulet/projects/balsa/"
+SRC_URI="ftp://ftp.cs.man.ac.uk/pub/amulet/balsa/${My_PV}/${Name}-${My_PV}.tar.gz
+	ftp://ftp.cs.man.ac.uk/pub/amulet/balsa/${My_PV}/balsa-manual-${My_PV}.pdf
+	ftp://ftp.cs.man.ac.uk/pub/amulet/balsa/${My_PV}/${Name}-tech-example-${My_PV}.tar.gz
+	ftp://ftp.cs.man.ac.uk/pub/amulet/balsa/examples/dma-example.tar.gz
+	ftp://ftp.cs.man.ac.uk/pub/amulet/balsa/examples/examples.tar.gz
+	ftp://ftp.cs.man.ac.uk/pub/amulet/balsa/snapshots/${Name}-tech-verilog-20030204.tar.gz
+	ftp://ftp.cs.man.ac.uk/pub/amulet/balsa/snapshots/${Name}-tech-xilinx-20021029.tar.gz"
+ 	#ftp://ftp.cs.man.ac.uk/pub/amulet/balsa/${My_PV}/${Name}-lard-${My_PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc "
+
+DEPEND="virtual/glibc
+	sys-devel/binutils
+	dev-libs/gmp
+	dev-lang/perl
+	x11-libs/gtk+"
+ 	#>=app-sci/lard-2.0.15"
+
+RDEPEND="${DEPEND}
+	dev-util/guile
+	media-gfx/graphviz
+	app-sci/gtkwave
+	app-sci/espresso-ab"
+
+S=${WORKDIR}/${Name}-${My_PV}
+
+if [ -f ${DISTDIR}/balsa-tech-ams-20030506.tar.gz ]; then
+TECH_AMS=1
+fi
+
+src_unpack() {
+	unpack ${A}
+	if [ $TECH_AMS ]; then unpack balsa-tech-ams-20030506.tar.gz; fi
+	cd ${WORKDIR}
+	patch -p0 < ${FILESDIR}/${P}-tech-verilog-configure.patch || die
+	patch -p0 < ${FILESDIR}/${P}-tech-xilinx-configure.patch || die
+	patch -p0 < ${FILESDIR}/${P}-tech-example-configure.patch || die
+	#patch -p0 < ${FILESDIR}/${P}-balsa-lard-configure.patch || die
+	#echo "patching file balsa-lard-${PV}/bin/Makefile.in"
+	#sed -i -e "s: \$(bindir): \$(DESTDIR)\$(bindir):g" ${WORKDIR}/balsa-lard-${PV}/bin/Makefile.in
+}
+
+src_compile() {
+	# compile balsa
+	econf
+	sed -i -e "s: \$(bindir): \$(DESTDIR)\$(bindir):g" bin/Makefile
+	emake BALSAHOME=${S} || die
+
+	# configure tech paths
+	if [ $TECH_AMS ]; then
+	cd ${WORKDIR}/balsa-tech-ams-20030506
+	econf
+	fi
+
+	# config generic verilog backend
+	cd ${WORKDIR}/balsa-tech-verilog-20030204
+	econf
+
+	# config Xilinx FPGA backend
+	cd ${WORKDIR}/balsa-tech-xilinx-20021029
+	econf
+
+	# config example tech
+	cd ${WORKDIR}/balsa-tech-example-${My_PV}
+	econf
+
+	# config balsa-lard (deprecated, but may find some use for it)
+	#cd ${WORKDIR}/balsa-lard-${PV}
+	#econf
+}
+
+src_install() {
+	# install balsa
+	einstall || die "make install failed"
+
+	# move the docs to the right directory
+	dodoc ${D}/usr/doc/*
+	rm -rf ${D}/usr/doc
+
+	# install manual and examples
+	dodir /usr/share/doc/${P}/examples/dma-example
+	cp -R ${WORKDIR}/dma-example ${D}/usr/share/doc/${P}/examples
+	cp -R ${WORKDIR}/examples/* ${D}/usr/share/doc/${P}/examples
+	dodoc ${DISTDIR}/balsa-manual-${My_PV}.pdf
+
+	# install tech
+	if [ $TECH_AMS ]; then
+	cd ${WORKDIR}/balsa-tech-ams-20030506
+	make DESTDIR=${D} install || die "make install failed"
+	fi
+
+	cd ${WORKDIR}/balsa-tech-verilog-20030204
+	make DESTDIR=${D} install || die "make install failed"
+
+	cd ${WORKDIR}/balsa-tech-xilinx-20021029
+	make DESTDIR=${D} install || die "make install failed"
+
+	cd ${WORKDIR}/balsa-tech-example-${My_PV}
+	make DESTDIR=${D} install || die "make install failed"
+
+	cd ${S}
+	dodoc AUTHORS COPYING NEWS README TODO
+
+	# balsa-lard has been split from balsa .. requires working balsa
+	# install for compile. Paths need fixing to compile in sandbox.
+	# Even with paths fixed I get errors like:
+	# find-filename: cannot open block with dotted path `[balsa.types.synthesis]'
+	#
+	# Lets just ignore the problem and hope it goes away.
+	#
+        #cd ${WORKDIR}/balsa-lard-${PV}
+	# hack - imports come from hard coded path, we set this
+	# for install,
+	#echo "patching ${WORKDIR}/balsa-lard-${PV}/share/scheme/base-local.scm"
+	#sed -i -e "s:/usr/share/scheme/:${D}/usr/share/scheme/:g" share/scheme/base-local.scm
+        #make DESTDIR=${D} install || die "make install failed"
+}
+
+pkg_postinst() {
+	if [ ! $TECH_AMS ]; then
+	einfo "The AMS035 tech library was *not* installed."
+	einfo "It is no longer publically distributed."
+	einfo "If you have the appropriate license from AMS request"
+	einfo "the ${Name}-tech-ams-20030506.tar.gz file"
+	einfo "directly from the Balsa developers and add it to "
+	einfo "/usr/portage/distfiles before emerging."
+	else
+	einfo "The AMS035 tech library was found and installed."
+	fi
+	einfo ""
+	einfo "The Balsa-Lard interface has been deprecated and is no longer installed."
+	einfo "If you need it you must manually download and install it."
+	einfo ""
+}