Fixed the "emboss_create_files" program.

5 files changed, 37 insertions, 7 deletions

diff --git a/app-sci/staden/ChangeLog b/app-sci/staden/ChangeLog
index 83ab9ba64a62..26da0f2df0e5 100644
--- a/app-sci/staden/ChangeLog
+++ b/app-sci/staden/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-sci/staden
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-sci/staden/ChangeLog,v 1.4 2004/09/16 19:16:54 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-sci/staden/ChangeLog,v 1.5 2004/09/16 23:13:26 ribosome Exp $
+
+*staden-1.4.1-r4 (16 Sep 2004)
+
+  16 Sep 2004; Olivier Fisette <ribosome@gentoo.org>
+  +files/staden-1.4.1-emboss.patch, -staden-1.4.1-r3.ebuild,
+  +staden-1.4.1-r4.ebuild:
+  Patched the "create_emboss_files" program to allow more flexibility.
 
 *staden-1.4.1-r3 (16 Sep 2004)
 
diff --git a/app-sci/staden/Manifest b/app-sci/staden/Manifest
index c90e7ae42f5e..b4368b352252 100644
--- a/app-sci/staden/Manifest
+++ b/app-sci/staden/Manifest
@@ -1,5 +1,5 @@
-MD5 768996f35bde0f29ec317d23b45af8bf staden-1.4.1-r3.ebuild 6939
-MD5 3358893417ee50bf49a9242144f2c19d ChangeLog 1319
+MD5 c08291ee018b34f7bff671d66f78c974 staden-1.4.1-r4.ebuild 6873
+MD5 02efc86cc59dfc8e0c9d2f584b186598 ChangeLog 1564
 MD5 f189a3c4ff5ae55bcee4f8ed0ace5d20 metadata.xml 254
 MD5 e908bf4692dd3494ec22f07db2e7a9f5 files/staden-1.4.1-env 225
 MD5 3699a9d368068d835cbd8568d50d23e5 files/staden-1.4.1-gap4.patch 463
@@ -9,6 +9,7 @@ MD5 bd82265e893628c1b46329d77e1f11d8 files/staden-1.4.1-iwidgetsrc.new 445
 MD5 8650f58c55b83838846447c89543255d files/staden-1.4.1-getopt.patch 375
 MD5 7717f77ecd800d0b3049974db3fcd0a9 files/staden-1.4.1-prefinish.patch 362
 MD5 a8ceefd2b3b2c1c0053a504561635379 files/staden-1.4.1-mutscan.patch 328
-MD5 4250ea5eac7e7f2092a797bb78e27e41 files/digest-staden-1.4.1-r3 217
+MD5 4250ea5eac7e7f2092a797bb78e27e41 files/digest-staden-1.4.1-r4 217
 MD5 708ea4c4b4cbc7e2b6b88b5a09e1b564 files/staden-1.4.1-top.patch 230
 MD5 ea4a62a1cd5070014d2c9352eeecf06a files/staden-1.4.1-tk_utils.patch 368
+MD5 12ca92a6e8763128e89ea667b4224b71 files/staden-1.4.1-emboss.patch 799
diff --git a/app-sci/staden/files/digest-staden-1.4.1-r3 b/app-sci/staden/files/digest-staden-1.4.1-r4
index eb3556875249..eb3556875249 100644
--- a/app-sci/staden/files/digest-staden-1.4.1-r3
+++ b/app-sci/staden/files/digest-staden-1.4.1-r4
diff --git a/app-sci/staden/files/staden-1.4.1-emboss.patch b/app-sci/staden/files/staden-1.4.1-emboss.patch
new file mode 100644
index 000000000000..7e619f0d2f5f
--- /dev/null
+++ b/app-sci/staden/files/staden-1.4.1-emboss.patch
@@ -0,0 +1,22 @@
+--- lib/spin2_emboss/create_emboss_files.tcl.old	2004-09-16 18:52:45.566400400 -0400
++++ lib/spin2_emboss/create_emboss_files.tcl	2004-09-16 18:43:32.912416576 -0400
+@@ -2,15 +2,15 @@
+ # dialogue for each program along with the necessary menu definitions.
+ #
+ # These will be written to
+-#     $STADENROOT/lib/spin2_emboss/acdtcl/*
+-#     $STADENROOT/tables/emboss_menu
++#     $OUTDIR
++#     $OUTDIR/emboss_menu
+ #
+ # To run it, simply run this script. NOTE that it requires DISPLAY to be set
+ # correctly, even though no graphics are obvious. This is because certain
+ # widgets are temporarily created in order to query their pathnames.
+ 
+-set acdtcl_dir acdtcl
+-set menu_file  ../../tables/emboss_menu
++set acdtcl_dir $env(OUTDIR)
++set menu_file  $env(OUTDIR)/emboss_menu
+ 
+ tkinit
+ wm withdraw .
diff --git a/app-sci/staden/staden-1.4.1-r3.ebuild b/app-sci/staden/staden-1.4.1-r4.ebuild
index 011adde20199..e1f70c6181b6 100644
--- a/app-sci/staden/staden-1.4.1-r3.ebuild
+++ b/app-sci/staden/staden-1.4.1-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-sci/staden/staden-1.4.1-r3.ebuild,v 1.1 2004/09/16 19:16:54 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-sci/staden/staden-1.4.1-r4.ebuild,v 1.1 2004/09/16 23:13:26 ribosome Exp $
 
 inherit eutils
 
@@ -135,13 +135,13 @@ src_compile() {
 	mkdir ${S}/lib/linux-binaries
 	mv ${S}/src/lib/linux-binaries/* ${S}/lib/linux-binaries
 
-	# Link "itcl" and "itk" libraries to the Staden libraries directories.
 	ln -s /usr/lib/libitcl3.2.so ${S}/lib/itcl3.3/libitcl3.3.so
 	ln -s /usr/lib/libitk3.2.so ${S}/lib/itk3.3/libitk3.3.so
 
-	# Patched version of iwidgetsrc
 	cp ${FILESDIR}/${P}-iwidgetsrc.new ${S}/tables/iwidgetsrc
 
+	epatch ${FILESDIR}/${P}-emboss.patch
+
 	# Netscape is not a good default browser (security masked in Portage).
 	# Use documentation.html rather than staden_home.html as the top-level
 	# hypertext documentation file.