Set custom lib dir, bug 306595
authorAndrey Kislyuk <weaver@gentoo.org>
Fri, 26 Feb 2010 16:07:02 +0000 (16:07 +0000)
committerAndrey Kislyuk <weaver@gentoo.org>
Fri, 26 Feb 2010 16:07:02 +0000 (16:07 +0000)
Package-Manager: portage-2.2_rc30/cvs/Linux x86_64

sci-biology/ncbi-tools++/ChangeLog
sci-biology/ncbi-tools++/Manifest
sci-biology/ncbi-tools++/ncbi-tools++-2009.05.15-r2.ebuild [moved from sci-biology/ncbi-tools++/ncbi-tools++-2009.05.15-r1.ebuild with 86% similarity]

index 17ee97585d64cc972c23577c5888bc09bac4cf23..493d4040a9801140ee6b2215a0651c7a86788bf1 100644 (file)
@@ -1,6 +1,12 @@
 # ChangeLog for sci-biology/ncbi-tools++
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/ncbi-tools++/ChangeLog,v 1.9 2010/01/12 14:46:33 weaver Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/ncbi-tools++/ChangeLog,v 1.10 2010/02/26 16:07:02 weaver Exp $
+
+*ncbi-tools++-2009.05.15-r2 (26 Feb 2010)
+
+  26 Feb 2010; Andrey Kislyuk <weaver@gentoo.org>
+  -ncbi-tools++-2009.05.15-r1.ebuild, +ncbi-tools++-2009.05.15-r2.ebuild:
+  Set custom lib dir, bug 306595
 
   12 Jan 2010; Andrey Kislyuk <weaver@gentoo.org>
   ncbi-tools++-2009.05.15-r1.ebuild:
index 972db5dae8fa5ec59a2fdc9e3f95bb81225912d3..682663b0ca54ec159eb247546a6fa51e69019fe3 100644 (file)
@@ -1,5 +1,5 @@
 AUX ncbi-tools++-2009.05.15-gcc44.patch 554 RMD160 57a23cbaad59b6011124f684db55f4ac2e4a43ab SHA1 7ed63addba554bf87a347d25ea2d4ea6b6552a1a SHA256 ddc2379ff636851e1bb4fb601930ee926c396819e06812b1ba76da001255d5c6
 DIST ncbi_cxx--May_15_2009.tar.gz 13986626 RMD160 131a04d43056fd4d4fd1781d38a5c1b9e3089a13 SHA1 0cecad93774ce40b3455149b2c3538dfce032b85 SHA256 ccb86f2e33251580e23c94b8d2a4aa4832c278171ded29513f0c9859b303f1d8
-EBUILD ncbi-tools++-2009.05.15-r1.ebuild 2459 RMD160 a9db3f0d68b753519489f6c2f8fb3a2de3600031 SHA1 18ff717adacf361e8fb9c728887ff1c2d924dce0 SHA256 c76a46e277014f58d909ca0871397e3929638ec6e2ed9554994bf5fb8f33aaa2
-MISC ChangeLog 1768 RMD160 55f2c605943cc04e10249f75cd1bb7cf3b5a305f SHA1 7202963cdb8a6a28a976a6fec6762efc1261ef9b SHA256 82a52c532e82d34800fdafae3f4e78986eff7575ba9dcebe27f11351f42c4ebb
+EBUILD ncbi-tools++-2009.05.15-r2.ebuild 2538 RMD160 20c19e891bd8cb95f31397b824c634dba69b3000 SHA1 49e4bf2474be89bb69a6b8d853fabeffe6955235 SHA256 68af78953d8db1bb3f1e0959d0465b1b6ec3632adea7bc736673a2d5eedfeeb2
+MISC ChangeLog 1970 RMD160 740c9a6ac86b7e72b88fe4dbe74bccd4ff617661 SHA1 f13bb19d94ba70cdf98f6fb365877786e5ab82a1 SHA256 eb64875fe205ff0471cf77b91fad32bcf9295e5088dac89742dec664dcf86d04
 MISC metadata.xml 259 RMD160 d9d81b67d635fabd81aef8ae0edf971211ae9072 SHA1 8e32f751c67ff891fa35405a2cf6fb33752d6eb1 SHA256 541c3fbcf299d9a8ccf4132ee61f9e53a5d737cefdaa6fdc77764d8d4c7f3110
similarity index 86%
rename from sci-biology/ncbi-tools++/ncbi-tools++-2009.05.15-r1.ebuild
rename to sci-biology/ncbi-tools++/ncbi-tools++-2009.05.15-r2.ebuild
index 7cd06bde8a65afcca49d0f88604386f34ee5b99e..b8ae87fe88f477879102d5152d6225e6a6c780c1 100644 (file)
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/ncbi-tools++/ncbi-tools++-2009.05.15-r1.ebuild,v 1.5 2010/01/12 14:46:33 weaver Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/ncbi-tools++/ncbi-tools++-2009.05.15-r2.ebuild,v 1.1 2010/02/26 16:07:02 weaver Exp $
 
 EAPI="2"
 
@@ -61,13 +61,15 @@ src_configure() {
                --with-dll \
                --without-ftds \
                --prefix="${D}"/usr \
-               --libdir="${D}"/usr/$(get_libdir) \
+               --libdir="${D}"/usr/$(get_libdir)/${PN} \
                --with-z="/usr" \
                --with-bz2="/usr" \
                --with-pcre="/usr" \
                --with-openssl="/usr" \
                || die
 
+#              --with-mt \ # fails with gcc-4.4 but not 4.3
+
 # apparently gbench-only configs
 #              --with-boost="/usr" \
 #              --with-sablot="/usr" \
@@ -88,7 +90,11 @@ src_install() {
        emake install || die
        # File collisions with sci-biology/ncbi-tools
        rm -f "${D}"/usr/bin/{asn2asn,rpsblast,test_regexp}
-       rm -f "${D}"/usr/$(get_libdir)/libblast.*
-       # File collision with openrc. NCBI probably needs a subdirectory in /usr/lib
-       rm -f "${D}"/usr/$(get_libdir)/libeinfo.*
+
+       echo "LD_LIBRARY_PATH=/usr/lib/${PN}" > ${S}/99${PN}
+       doenvd "${S}/99${PN}"
+}
+
+pkg_postinst() {
+       einfo 'Please run "source /etc/profile" before using this package in the current shell.'
 }