From f088be5f7c686f903d6012b45980db133e8fb729 Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Mon, 7 Jun 2010 14:55:32 +0200 Subject: Version Bump (Portage version: 2.2_rc67/git/Linux x86_64) (Signed Manifest commit) --- sci-chemistry/nmrpipe/ChangeLog | 6 + sci-chemistry/nmrpipe/Manifest | 20 +-- .../nmrpipe/nmrpipe-5.0.2010.108.19.28.ebuild | 166 --------------------- .../nmrpipe/nmrpipe-5.0.2010.155.15.05.ebuild | 154 +++++++++++++++++++ 4 files changed, 170 insertions(+), 176 deletions(-) delete mode 100644 sci-chemistry/nmrpipe/nmrpipe-5.0.2010.108.19.28.ebuild create mode 100644 sci-chemistry/nmrpipe/nmrpipe-5.0.2010.155.15.05.ebuild diff --git a/sci-chemistry/nmrpipe/ChangeLog b/sci-chemistry/nmrpipe/ChangeLog index d0018b0ed..08c20e955 100644 --- a/sci-chemistry/nmrpipe/ChangeLog +++ b/sci-chemistry/nmrpipe/ChangeLog @@ -2,6 +2,12 @@ # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*nmrpipe-5.0.2010.155.15.05 (07 Jun 2010) + + 07 Jun 2010; Justin Lecher + -nmrpipe-5.0.2010.108.19.28.ebuild, +nmrpipe-5.0.2010.155.15.05.ebuild: + Version Bump + *nmrpipe-5.0.2010.108.19.28 (21 Apr 2010) 21 Apr 2010; Justin Lecher diff --git a/sci-chemistry/nmrpipe/Manifest b/sci-chemistry/nmrpipe/Manifest index 2180f3357..a5bb2dd69 100644 --- a/sci-chemistry/nmrpipe/Manifest +++ b/sci-chemistry/nmrpipe/Manifest @@ -4,20 +4,20 @@ Hash: SHA1 AUX 5.0.2010.108.19.28-lib.patch 997 RMD160 09e9dbed8e1e2e4964bdf381a15b556d0ea9f3bb SHA1 881a3554f21fb23973e0b8a31b59cff495f5edbb SHA256 011aea3e38ef3eb650be7b5d6274913bbb4f5367838f4bb86f97556ad247b57f AUX env-nmrpipe 499 RMD160 11ab9f42b03700caedfe344186c47fd4a6409758 SHA1 8431685d268b14d88dd31cb494f0d333fff225b9 SHA256 f16820dd88ae38c8db6ffed19a97aade62f0de4c3de692b7a2c3b89897d894e2 AUX env-nmrpipe-new 537 RMD160 0b8b6e53ad49c4bd280f22590e92fdf336e7b66f SHA1 3491378d2d49c867dd0f5bd661d79409b714ea53 SHA256 fbe6cec954a377bb9d957a0c1921060d2543d2b378a6beb801e6fb34796bff15 -DIST NMRPipeX.tZ 123447147 RMD160 f76b8f066915e75838a4901064798b583e083129 SHA1 3f860c6d77727c4c9b36a7d15307c2da1cf691ea SHA256 2bedfc6f04a3d81dd96b740d139af54e5005ca7dd49603b4d9ee7ae55e73ac0a +DIST NMRPipeX.tZ 150521041 RMD160 d2a9c70aac1fa81011f57821a09ac377783b80cb SHA1 064b040e758265e4cfde10fbd22738ed214fd4f5 SHA256 908aed7336312d0fe80cc87b173263a8f58da51c9ca9c9da13de531412664baf DIST acme.tar.Z 11681951 RMD160 fdcf35fab1b63ddda55288b1b2ed0f82c8299bef SHA1 5093f92a4d7e4173bc056b6b1922a6da8e6bbf0c SHA256 5713452a1461e636f0de48e5ce3476fc0ae60b3f78a0288744f45e455f3445d9 DIST binval.com 3654 RMD160 60f7b8e13ef48dc22822beb2fd107beac25db300 SHA1 fdd8d2a2b9b6f57ad9d2ebac84b15e428478d261 SHA256 0ab49d267a3b947f31024e3eae281101b7002a64a801b36f1671bd79e8ef5a9d -DIST dyn.tZ 136730777 RMD160 f67b38b268ea9d26356d5881aba4818682cfdc73 SHA1 4c25b09ecd1d1eb13484d38f0f90dcf1b5015b60 SHA256 527a87cf1d1a6cd807225ee1c7702c61056cacb74a206456b510b8840a16e42b -DIST install.com 36431 RMD160 df7439189fba3f4c8d108e260450ad9250aead02 SHA1 b54c6089d0c094c07668e59fd89fce587ac931da SHA256 0d1e6cec3b18e5ebb43a941b34aa4b8652f52e1b85e17fb9b7a3307f561edc84 -DIST talos.tZ 25240809 RMD160 8073faca1a417d056ea967e5ea1ad8bb05181f0c SHA1 5fb510d80c390a5d669bd70374d0ea00b7dc395f SHA256 a796e1f59a801cd273de18a83e42142c77cf6076b4f35c86a1f292229ca214d1 +DIST dyn.tZ 139928217 RMD160 1b6324b0c7eb2deccd3228a635aa4052df095ad5 SHA1 8abcccd5c3c9836055cfda39bb8710cd87cf0c80 SHA256 69b4b8a00eb848f12891484521c8a5918a5ff9a6a17fef94e3df7e78a78f4ec8 +DIST install.com 36561 RMD160 680403d59dfb65046694a64d5e43b378f1bf3a71 SHA1 8d8e9b36d20206083cfe691358e8a346b5e59832 SHA256 86bbb20e9a2b5007450758d1ad44df497f54d6d34199e5d888c1ab92dee11626 +DIST talos.tZ 32728853 RMD160 d05b93ee937024d8ad0a12d394649ed08ba659fe SHA1 a2ec99fdcb326dcf64ec9ffdcd53cbfdb0fa5e93 SHA256 9e3608cd7c1c84710360722c4fdf8579450c50d8ad811736d19b20ca03371b1c DIST valpha_all.tar 699166720 RMD160 75ebf0a84524212cd25d62ba33f6a5edca05dd20 SHA1 a8be07ac97a826e44ed240946217a50fd3e8ba1e SHA256 3f2ff243e1d0e2508f20ec1ab6108eb986bcc1bc4c9ec79b4ff8ce6584805b0a -EBUILD nmrpipe-5.0.2010.108.19.28.ebuild 5241 RMD160 4777f227d18f670fc4c9b01d4ce7872c5b8622cd SHA1 873c5957891c142e64fe5503bb15afd1442eb6a7 SHA256 ec8ed115833ee9b102411ef1fb3dbc580ce2527162ce48d2558659f53eb98a63 -MISC ChangeLog 5746 RMD160 e846053c1981271f3c3bf7e0041a51a0d9c9b73a SHA1 ceadc0a6d68ebd549f35eb2e56321a33751c0def SHA256 9901e9c4338dca866b4eee56e7561d8ca264232c0d2d2475416d53f912f309fa +EBUILD nmrpipe-5.0.2010.155.15.05.ebuild 4703 RMD160 385bdf7f68cf927064994da958c4afe7fdb58c45 SHA1 0fd3582eb2ba195c0a56b07fc50d6d61adcf0fab SHA256 b3fdb78dca25c30f48a8bf835fe410be85d252211cc1524b324def5cdfe3f7af +MISC ChangeLog 5926 RMD160 a8d06421b6b8510c7d644d59acbc65d21e02ec6d SHA1 45f63940485116e59f294786aa2809ccd022eb9c SHA256 206e185e38a7b3d531912fcb15a8d86151e67599e06a5d29e8a36607d6cc0e33 MISC metadata.xml 273 RMD160 77dd0acbd8530bfceee840dfeccd1f4228e0460b SHA1 7c6794b74e4f357c0cd501266226eda09417d6ee SHA256 ed6f9e4b8aa59f68498bb75bf3be63a6de60feda167e4ceb12c7cb81bf8aac09 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.14 (GNU/Linux) +Version: GnuPG v2.0.15 (GNU/Linux) -iEYEARECAAYFAkvhQq0ACgkQgAnW8HDreRaGDgCePBARWo8EohqofijanFvbuYrl -V8MAn2+l2iLRKc64fqMzjQeeSTLgblvF -=5DSH +iEYEARECAAYFAkwM7EQACgkQgAnW8HDreRZhEwCfSIq/U/7TDoWqpn80pA0xffCg +o0EAoKpznW4ACarZQSsUNzG8ab8bA5rZ +=KgDD -----END PGP SIGNATURE----- diff --git a/sci-chemistry/nmrpipe/nmrpipe-5.0.2010.108.19.28.ebuild b/sci-chemistry/nmrpipe/nmrpipe-5.0.2010.108.19.28.ebuild deleted file mode 100644 index c3f80c9f9..000000000 --- a/sci-chemistry/nmrpipe/nmrpipe-5.0.2010.108.19.28.ebuild +++ /dev/null @@ -1,166 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -# Versioning is output of nmrPipe -help - -EAPI="3" - -inherit eutils prefix - -DESCRIPTION="Spectral visualisation, analysis and Fourier processing" -HOMEPAGE="http://spin.niddk.nih.gov/bax/software/NMRPipe/" -SRC_URI=" - NMRPipeX.tZ - valpha_all.tar - talos.tZ - dyn.tZ - acme.tar.Z - binval.com - install.com" - -SLOT="0" -LICENSE="as-is" -# Right now, precompiled executables are only available for Linux on the -# x86 architecture. The maintainer chose to keep the sources closed, but -# says he will gladly provide precompiled executables for other platforms -# if there are such requests. -KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="" - -RESTRICT="fetch" - -DEPEND="app-shells/tcsh" -RDEPEND="${DEPEND} - app-editors/nedit - dev-lang/tk - dev-tcltk/blt - sys-libs/ncurses - x11-libs/libX11 - amd64? ( - app-emulation/emul-linux-x86-baselibs - app-emulation/emul-linux-x86-xlibs - ) - x86? ( x11-libs/xview )" - -S="${WORKDIR}" -NMRBASE="/opt/${PN}" -ENMRBASE="${EPREFIX}/${NMRBASE}" - -pkg_nofetch() { - einfo "Please visit:" - einfo "\t${HOMEPAGE}" - einfo - einfo "Contact the author, then download the following files:" - for i in ${A}; do - einfo "\t${i}" - done - einfo - einfo "Place the downloaded files in your distfiles directory:" - einfo "\t${DISTDIR}" -} - -src_unpack() { - # The installation script will unpack the package. We just provide symlinks - # to the archive files, ... - for i in valpha_all.tar talos.tZ NMRPipeX.tZ dyn.tZ acme.tar.Z; do - ln -s "${DISTDIR}"/${i} ${i} - done - # ... copy the installation scripts ... - cp "${DISTDIR}"/{binval.com,install.com} . - # ... and make the installation scripts executable. - chmod +x binval.com install.com - - # Unset DISPLAY to avoid the interactive graphical test. - # This just unpacks the stuff - env DISPLAY="" csh ./install.com +type linux9 +dest "${S}"/NMR || die -} - -src_prepare() { - epatch "${FILESDIR}"/${PV}-lib.patch - - mv -v nmrbin.linux9/nmr{W,w}ish || die -} - -src_install() { - cat >> "${T}"/nmrWish <<- EOF - #!/bin/csh -f - setenv NMRBIN \${NMRBASE}/bin/ - setenv NMRLIB \${NMRBIN}/lib - setenv AUXLIB \${NMRBIN}/openwin/lib - setenv TCLPATH \${NMRBASE}/com - setenv TCL_LIBRARY \${NMRBASE}/nmrtcl/tcl8.4 - setenv TK_LIBRARY \${NMRBASE}/nmrtcl/tk8.4 - setenv BLT_LIBRARY \${NMRBASE}/nmrtcl/blt2.4 - setenv NMRPIPE_TCL_LIB \${NMRBASE}/nmrtcl/tcl8.4 - setenv NMRPIPE_TK_LIB \${NMRBASE}/nmrtcl/tk8.4 - setenv NMRPIPE_BLT_LIB \${NMRBASE}/nmrtcl/blt2.4 - - if (!(\$?LD_LIBRARY_PATH)) then - setenv LD_LIBRARY_PATH \${NMRLIB}:\${AUXLIB} - else - setenv LD_LIBRARY_PATH \${NMRLIB}:\${LD_LIBRARY_PATH}:\${AUXLIB} - endif - - nmrwish \$* - EOF - - # Remove the symlinks for the archives and the installation scripts. - for i in ${A} valpha_hn.tar valpha_time.tar; do - rm ${i} || die "Failed to remove archive symlinks." - done - # Remove some of the bundled applications and libraries; they are provided by Gentoo instead. -# rm -r nmrbin.linux9/{lib/{libBLT24.so,libolgx.so*,libxview.so*,*.timestamp},*timestamp,xv,gnuplot*,rasmol*,nc,nedit} \ - rm -r nmrbin.linux9/{lib/*.timestamp,*timestamp,xv,gnuplot*,rasmol*,nc,nedit} \ - nmrbin.{linux,mac,sgi6x,sol,winxp} nmruser format \ - || die "Failed to remove unnecessary libraries." - # As long as xview is not fixed for amd64 we do this - use amd64 || rm nmrbin.linux9/lib/{libxview.so*,libolgx.so*} - # Remove the initialisation script generated during the installation. - # It contains incorrect hardcoded paths; only the "nmrInit.com" script - # should be used. - rm com/nmrInit.linux9.com || die "Failed to remove broken init script." - # Remove installation log files. - rm README_NMRPIPE_USERS *.log || die "Failed to remove installation log." - # Remove unused binaries - rm talos/bin/TALOS.{linux,mac,sgi6x,winxp} pdb/misc/addSeg || die - - # Set the correct path to NMRPipe in the auxiliary scripts. - for i in $(find com/ dynamo/surface/misc/ nmrtxt/ talos/misc -type f); do - sed -e "s%/u/delaglio%${ENMRBASE}%" -i ${i} || die \ - "Failed patching scripts." - done - sed -i "s:${WORKDIR}:${ENMRBASE}:g" com/font.com || die - - sed \ - -e "s:/opt/nmrpipe:${EPREFIX}/opt/nmrpipe:g" \ - "${FILESDIR}"/env-${PN}-new \ - > env-${PN}-new - newenvd env-${PN}-new 40${PN} || die "Failed to install env file." - - insinto ${NMRBASE} - doins -r * || die "Failed to install application." - - dosym nmrbin.linux9 ${NMRBASE}/bin || die \ - "Failed to symlink binaries." - - # fperms does not chmod nmrwish -# fperms -v 775 ${NMRBASE}/{talos/bin,nmrbin.linux9,com,dynamo/tcl}/* || die - chmod -c 775 "${ED}"/${NMRBASE}/{talos/bin,nmrbin.linux9,com,dynamo/tcl}/* || die - - exeinto ${NMRBASE}/nmrbin.linux9 - doexe "${T}"/nmrWish || die -} - -#pkg_postinst() { -# ewarn "Before using NMRPipe applications, users must source the following" -# ewarn "csh script, which will set the necessary environment variables:" -# ewarn "\t${NMRBASE}/com/nmrInit.com" -# ewarn -# ewarn "Be aware that this script redefines the locations of the Tcl" -# ewarn "libraries. This could break other non-NMRPipe Tcl applications" -# ewarn "run in the same session." -# ewarn -# ewarn "Using Dynamo does not require running an additional initialisation" -# ewarn "script. The necessary environment variables should already be set." -#} diff --git a/sci-chemistry/nmrpipe/nmrpipe-5.0.2010.155.15.05.ebuild b/sci-chemistry/nmrpipe/nmrpipe-5.0.2010.155.15.05.ebuild new file mode 100644 index 000000000..8b19ce889 --- /dev/null +++ b/sci-chemistry/nmrpipe/nmrpipe-5.0.2010.155.15.05.ebuild @@ -0,0 +1,154 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +# Versioning is output of nmrPipe -help + +EAPI="3" + +inherit eutils prefix + +DESCRIPTION="Spectral visualisation, analysis and Fourier processing" +HOMEPAGE="http://spin.niddk.nih.gov/bax/software/NMRPipe/" +SRC_URI=" + NMRPipeX.tZ + valpha_all.tar + talos.tZ + dyn.tZ + acme.tar.Z + binval.com + install.com" + +SLOT="0" +LICENSE="as-is" +# Right now, precompiled executables are only available for Linux on the +# x86 architecture. The maintainer chose to keep the sources closed, but +# says he will gladly provide precompiled executables for other platforms +# if there are such requests. +KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="" + +RESTRICT="fetch" + +DEPEND="app-shells/tcsh" +RDEPEND="${DEPEND} + app-editors/nedit + dev-lang/tk + dev-tcltk/blt + !sci-chemistry/talos+ + sys-libs/ncurses + x11-libs/libX11 + amd64? ( + app-emulation/emul-linux-x86-baselibs + app-emulation/emul-linux-x86-xlibs + ) + x86? ( x11-libs/xview )" + +S="${WORKDIR}" +NMRBASE="/opt/${PN}" +ENMRBASE="${EPREFIX}/${NMRBASE}" + +pkg_nofetch() { + einfo "Please visit:" + einfo "\t${HOMEPAGE}" + einfo + einfo "Contact the author, then download the following files:" + for i in ${A}; do + einfo "\t${i}" + done + einfo + einfo "Place the downloaded files in your distfiles directory:" + einfo "\t${DISTDIR}" +} + +src_unpack() { + # The installation script will unpack the package. We just provide symlinks + # to the archive files, ... + for i in valpha_all.tar talos.tZ NMRPipeX.tZ dyn.tZ acme.tar.Z; do + ln -s "${DISTDIR}"/${i} ${i} + done + # ... copy the installation scripts ... + cp "${DISTDIR}"/{binval.com,install.com} . + # ... and make the installation scripts executable. + chmod +x binval.com install.com + + # Unset DISPLAY to avoid the interactive graphical test. + # This just unpacks the stuff + env DISPLAY="" csh ./install.com +type linux9 +dest "${S}"/NMR || die +} + +src_prepare() { + epatch "${FILESDIR}"/${PV}-lib.patch + + mv -v nmrbin.linux9/nmr{W,w}ish || die +} + +src_install() { + cat >> "${T}"/nmrWish <<- EOF + #!/bin/csh -f + setenv NMRBIN \${NMRBASE}/bin/ + setenv NMRLIB \${NMRBIN}/lib + setenv AUXLIB \${NMRBIN}/openwin/lib + setenv TCLPATH \${NMRBASE}/com + setenv TCL_LIBRARY \${NMRBASE}/nmrtcl/tcl8.4 + setenv TK_LIBRARY \${NMRBASE}/nmrtcl/tk8.4 + setenv BLT_LIBRARY \${NMRBASE}/nmrtcl/blt2.4 + setenv NMRPIPE_TCL_LIB \${NMRBASE}/nmrtcl/tcl8.4 + setenv NMRPIPE_TK_LIB \${NMRBASE}/nmrtcl/tk8.4 + setenv NMRPIPE_BLT_LIB \${NMRBASE}/nmrtcl/blt2.4 + + if (!(\$?LD_LIBRARY_PATH)) then + setenv LD_LIBRARY_PATH \${NMRLIB}:\${AUXLIB} + else + setenv LD_LIBRARY_PATH \${NMRLIB}:\${LD_LIBRARY_PATH}:\${AUXLIB} + endif + + nmrwish \$* + EOF + + # Remove the symlinks for the archives and the installation scripts. + for i in ${A} valpha_hn.tar valpha_time.tar; do + rm ${i} || die "Failed to remove archive symlinks." + done + # Remove some of the bundled applications and libraries; they are provided by Gentoo instead. +# rm -r nmrbin.linux9/{lib/{libBLT24.so,libolgx.so*,libxview.so*,*.timestamp},*timestamp,xv,gnuplot*,rasmol*,nc,nedit} \ + rm -r nmrbin.linux9/{lib/*.timestamp,*timestamp,xv,gnuplot*,rasmol*,nc,nedit} \ + nmrbin.{linux,mac,sgi6x,sol,winxp} nmruser format \ + || die "Failed to remove unnecessary libraries." + # As long as xview is not fixed for amd64 we do this + use amd64 || rm nmrbin.linux9/lib/{libxview.so*,libolgx.so*} + # Remove the initialisation script generated during the installation. + # It contains incorrect hardcoded paths; only the "nmrInit.com" script + # should be used. + rm com/nmrInit.linux9.com || die "Failed to remove broken init script." + # Remove installation log files. + rm README_NMRPIPE_USERS *.log || die "Failed to remove installation log." + # Remove unused binaries + rm talos/bin/TALOS.{linux,mac,sgi6x,winxp} pdb/misc/addSeg || die + + # Set the correct path to NMRPipe in the auxiliary scripts. + for i in $(find com/ dynamo/surface/misc/ nmrtxt/ talos/misc -type f); do + sed -e "s%/u/delaglio%${ENMRBASE}%" -i ${i} || die \ + "Failed patching scripts." + done + sed -i "s:${WORKDIR}:${ENMRBASE}:g" com/font.com || die + + sed \ + -e "s:/opt/nmrpipe:${EPREFIX}/opt/nmrpipe:g" \ + "${FILESDIR}"/env-${PN}-new \ + > env-${PN}-new + newenvd env-${PN}-new 40${PN} || die "Failed to install env file." + + insinto ${NMRBASE} + doins -r * || die "Failed to install application." + + dosym nmrbin.linux9 ${NMRBASE}/bin || die \ + "Failed to symlink binaries." + + # fperms does not chmod nmrwish +# fperms -v 775 ${NMRBASE}/{talos/bin,nmrbin.linux9,com,dynamo/tcl}/* || die + chmod -c 775 "${ED}"/${NMRBASE}/{talos/bin,nmrbin.linux9,com,dynamo/tcl}/* || die + + exeinto ${NMRBASE}/nmrbin.linux9 + doexe "${T}"/nmrWish || die +} -- cgit v1.2.3-65-gdbad