diff options
| author |   Honza Macháček <Hloupy.Honza@centrum.cz> | 2013-06-18 15:55:47 +0200 |
|---|---|---|
| committer | Honza Macháček <Hloupy.Honza@centrum.cz> | 2013-06-18 15:55:47 +0200 |
| commit | 43ae215b3409c36d8f51402580ead76fc6624763 (patch) | |
| tree | a6ba9560293bd68d9f6a926676af9cff0c78a816 | |
| parent | The dependency of several packages on sci-libs/libxc modified to reflect corr... (diff) | |
| parent | sci-chemistry/talosn: drop upstream path in favour of our (diff) | |
| download | sci-43ae215b3409c36d8f51402580ead76fc6624763.tar.gz sci-43ae215b3409c36d8f51402580ead76fc6624763.tar.bz2 sci-43ae215b3409c36d8f51402580ead76fc6624763.zip | |
Merge branch 'master' of git+ssh://git.overlays.gentoo.org/proj/sci
Looks like I have broken something. Conflicts are reported in sci-libs/libxc.
Trying desperately to recover.
| -rw-r--r-- | sci-chemistry/talosn/ChangeLog | 6 | ||||
| -rw-r--r-- | sci-chemistry/talosn/talosn-4.01.2013.148.15.55-r2.ebuild (renamed from sci-chemistry/talosn/talosn-4.01.2013.148.15.55.ebuild) | 13 |
2 files changed, 17 insertions, 2 deletions
diff --git a/sci-chemistry/talosn/ChangeLog b/sci-chemistry/talosn/ChangeLog index dea3c84e4..9d358bff2 100644 --- a/sci-chemistry/talosn/ChangeLog +++ b/sci-chemistry/talosn/ChangeLog @@ -2,6 +2,12 @@ # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*talosn-4.01.2013.148.15.55-r2 (18 Jun 2013) + + 18 Jun 2013; Justin Lecher <jlec@gentoo.org> + -talosn-4.01.2013.148.15.55.ebuild, +talosn-4.01.2013.148.15.55-r2.ebuild: + drop upstream path in favour of our + *talosn-4.01.2013.148.15.55 (18 Jun 2013) 18 Jun 2013; Justin Lecher <jlec@gentoo.org> diff --git a/sci-chemistry/talosn/talosn-4.01.2013.148.15.55.ebuild b/sci-chemistry/talosn/talosn-4.01.2013.148.15.55-r2.ebuild index ac569c3a8..648c3420d 100644 --- a/sci-chemistry/talosn/talosn-4.01.2013.148.15.55.ebuild +++ b/sci-chemistry/talosn/talosn-4.01.2013.148.15.55-r2.ebuild @@ -15,8 +15,10 @@ LICENSE="all-rights-reserved" KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" IUSE="examples" -RDEPEND=">=virtual/jre-1.5" -DEPEND="${RDEPEND}" +DEPEND=">=virtual/jre-1.5" +RDEPEND="${DEPEND} + app-shells/tcsh + sci-biology/ncbi-tools" S="${WORKDIR}" @@ -26,6 +28,12 @@ src_prepare() { local s64 use amd64 || s64="_x64" rm -f bin/TALOSN.{linux,mac,static.*,winxp,linux9${s64}} || die + + sed \ + -e '/setenv TALOSN_DIR/d' \ + -e "/set BLAST/s:=.*:= \"${EPREFIX}/usr/bin/blastpgp\":g" \ + -e '/set NR_DBNAME/s:=.*:= ${BLASTDB}:g' \ + -i talosn_ss || die } src_install() { @@ -54,6 +62,7 @@ src_install() { cat >> "${T}"/40talosn <<- EOF TALOSN_DIR="${EPREFIX}/${TALOSN}" + #BLASTDB= EOF doenvd "${T}"/40talosn } |