From 6f1eb5a6096997c71b82296f509d564c2e42c48f Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Tue, 31 Jul 2012 12:08:56 +0200 Subject: sci-chemistry/nmrpipe: Version Bump, bring x11-libs/xview back into the game (Portage version: 2.2.0_alpha120/git/Linux x86_64, RepoMan options: --force, unsigned Manifest commit) --- sci-chemistry/nmrpipe/ChangeLog | 16 ++ sci-chemistry/nmrpipe/Manifest | 4 +- .../nmrpipe/files/7.3.2012.114.11.33-lib.patch | 36 ---- .../nmrpipe/files/7.5.2012.204.11.07-lib.patch | 36 ++++ .../nmrpipe/nmrpipe-7.3.2012.114.11.33.ebuild | 187 -------------------- .../nmrpipe/nmrpipe-7.5.2012.204.11.07.ebuild | 188 +++++++++++++++++++++ 6 files changed, 242 insertions(+), 225 deletions(-) delete mode 100644 sci-chemistry/nmrpipe/files/7.3.2012.114.11.33-lib.patch create mode 100644 sci-chemistry/nmrpipe/files/7.5.2012.204.11.07-lib.patch delete mode 100644 sci-chemistry/nmrpipe/nmrpipe-7.3.2012.114.11.33.ebuild create mode 100644 sci-chemistry/nmrpipe/nmrpipe-7.5.2012.204.11.07.ebuild diff --git a/sci-chemistry/nmrpipe/ChangeLog b/sci-chemistry/nmrpipe/ChangeLog index 5e2b18b08..87651f341 100644 --- a/sci-chemistry/nmrpipe/ChangeLog +++ b/sci-chemistry/nmrpipe/ChangeLog @@ -2,6 +2,22 @@ # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 31 Jul 2012; Justin Lecher + +files/7.5.2012.204.11.07-lib.patch, -files/7.3.2012.114.11.33-lib.patch, + -nmrpipe-7.3.2012.114.11.33.ebuild, +nmrpipe-7.5.2012.204.11.07.ebuild: + Version Bump, bring x11-libs/xview back into the game + + 31 Jul 2012; Justin Lecher + +files/7.5.2012.204.11.07-lib.patch, -files/7.3.2012.114.11.33-lib.patch, + -nmrpipe-7.3.2012.114.11.33.ebuild, +nmrpipe-7.5.2012.204.11.07.ebuild: + Version Bump, bring x11-libs/xview back into the game + +*nmrpipe-7.5.2012.204.11.07 (31 Jul 2012) + + 31 Jul 2012; Justin Lecher + -nmrpipe-7.3.2012.114.11.33.ebuild, +nmrpipe-7.5.2012.204.11.07.ebuild: + Version Bump, bring x11-libs/xview back into the game + 02 May 2012; Justin Lecher +files/7.3.2012.114.11.33-lib.patch, -files/7.1.2012.029.12.03-lib.patch, -nmrpipe-7.1.2012.029.12.03.ebuild, +nmrpipe-7.3.2012.114.11.33.ebuild: diff --git a/sci-chemistry/nmrpipe/Manifest b/sci-chemistry/nmrpipe/Manifest index edd3ee817..d096fcb4c 100644 --- a/sci-chemistry/nmrpipe/Manifest +++ b/sci-chemistry/nmrpipe/Manifest @@ -1,5 +1,5 @@ -DIST NMRPipeX.tZ 121186289 SHA256 b83c1a50867ebc3672cba74803f66c7bf1caccdded8c449ac6d246073113ce69 SHA512 7dd91256967a3e803e3c44ea53bae5818716c870330a94f2d4070edf472c322630e7e2f8f2062f9e3b0b6608b3735e1ea979f5872a0a59d105edb412f1f8e478 WHIRLPOOL 6799adb28d91c1e5666e68dcd36bc5d579726ababdf731fe8cf2265f828f984032a6610d00993e59c2d9126d6051e06092236183cdcc786b799daf507b9869f8 +DIST NMRPipeX.tZ 121070804 SHA256 988866c2d96ede3a33800836d8d610f4ad5c81b13707c6c5d46e65e8b1533617 SHA512 fa8b87cb7b509e3459eb93abae9408327676ed1a73924aa8a5ae3fe6ea1a0deb07b413b0ea79ec2cec2c32a8691fc4aebb1fcfd731448aba0a4d3c320b53ba45 WHIRLPOOL 2085e4ee8999e3f329acbb7db033d737d0511f9e2af7b7b938dc9a3162f40ef7129f38497839d2629c52a1fce9d6202eecf4ecade588bdd56ed16a03fe85796f DIST binval.com 3865 SHA256 5742154bed54087130fa6093ff62bdc991d12960d7c1ef7e74436aa97e730975 SHA512 6bce8a2bfdb10b4e0997d54043c5447025f6d7e24501fc63591b9184a22523c152a76aebec56a9b8ae9ab01674986d998fde7a77b63477468aa099cdf1791a57 WHIRLPOOL 10e257fefe9905dacd0ee159e80ac488c8781cb6464c01599b0a227023de83bfe9075b34f422f2ab14e4964a75886d53ea43cb0f5cbac3470e6ea96b45355ca0 DIST dyn.tZ 144122013 SHA256 23e81f523a80b33ed8a01b954807c06b15354f02ba8fd01cf4d11ae4094c57d9 SHA512 eca3a89a0c3fe58a58751cde2c4505a4d249ed7d6c0c44a9e276465b813bf12d070614f081e17396bd29dd13586d671d5aa1587fad05eaad653d92fea5390e2c WHIRLPOOL 7b629a34870d2c2c0558bb1bfec3b376345d80b0c6a98992e3abc361b92dc8ad91e080b91a998080e48043dc6105d139b52d3ec73c7ba4a8e4fbf95b85913871 -DIST install.com 42705 SHA256 dda96dc52ec47b9d24f2d8afdc650b6e6dbfb19afc28dfda258744ebda924441 SHA512 7637321c8aa52fa53523384ddf53f6dfc618fd405829f50940236d838d38205e423f81bd9b0096fac5c5f44d4a4fa1ca103c04d1009140f0794ff5ea75ee2ae1 WHIRLPOOL cf7150197ef086055231f8551321f14131aa1635dac1024e13a79de9c73c34d8877fb4ac76fe48b9c4be2f62771d6a98ca6b5a58391870214ebf85bc49853ca9 +DIST install.com 42691 SHA256 75bae839de4e5dc94506030b5670f6db7e376362f6a45d32e5104634b9a421f7 SHA512 f95e6bd93400e0bda2f350e46ffe266bcbced8f1fb97769f711ec5c0bfe0a55871663dabde2526d6bbb631eb1f3cb355bfa2e7142418b7a4a8806ee5c8c7cb0f WHIRLPOOL 95c3992dbb780bc4ad9923a41e23811a496d2d6ae845341a009a9f9af08aa1be71a5179efc9f988ce0d2387df1c255f4a552b1afc0eefb4f979e95f56c68a8fb DIST talos.tZ 56676241 SHA256 a0444844210ed582944a4a956969e151d31b2e3ed426945aee8c4d0d7cdbc6fa SHA512 686974732aa03c1bb906c46ade38d4dd3b1cfaa5da5b42f968789da57c3bd4c56facda9185eb38df71c43117e0b136874f8db7abb923a64052262c0b60b59832 WHIRLPOOL ce140f404ba16a34bef7c00878a00087a923df4b5ef858f5e49f6772e01c1fbcd7b4789c95c17751c95c9fe9dd805980b5df557dda478142a5a1640fb12b4c8c diff --git a/sci-chemistry/nmrpipe/files/7.3.2012.114.11.33-lib.patch b/sci-chemistry/nmrpipe/files/7.3.2012.114.11.33-lib.patch deleted file mode 100644 index 91abd611d..000000000 --- a/sci-chemistry/nmrpipe/files/7.3.2012.114.11.33-lib.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- nmrbin.linux9/nmrDraw 2009-10-07 23:33:21.000000000 +0200 -+++ nmrbin.linux9/nmrDraw.new 2009-10-24 16:29:03.000000000 +0200 -@@ -2,6 +2,17 @@ - - setenv EXTRASMENU $NMRTXT/dot.text_extras_menu - -+setenv NMRBIN ${NMRBASE}/bin/ -+setenv NMRLIB ${NMRBIN}/lib -+setenv AUXLIB ${NMRBIN}/openwin/lib -+ -+if (!($?LD_LIBRARY_PATH)) then -+ setenv LD_LIBRARY_PATH ${NMRLIB}:${AUXLIB} -+else -+ setenv LD_LIBRARY_PATH ${NMRLIB}:${LD_LIBRARY_PATH}:${AUXLIB} -+endif -+ -+ - if ($DISPLAY == "") then - echo Warning: DISPLAY environment variable is not set. - exit 1 ---- nmrbin.linux9/xNotify 2009-10-07 23:33:21.000000000 +0200 -+++ nmrbin.linux9/xNotify.new 2009-10-24 16:29:42.000000000 +0200 -@@ -1,2 +1,13 @@ - #!/bin/csh -f -+ -+setenv NMRBIN ${NMRBASE}/bin -+setenv NMRLIB ${NMRBIN}/lib -+setenv AUXLIB ${NMRBIN}/openwin/lib -+ -+if (!($?LD_LIBRARY_PATH)) then -+ setenv LD_LIBRARY_PATH ${NMRLIB}:${AUXLIB} -+else -+ setenv LD_LIBRARY_PATH ${NMRLIB}:${LD_LIBRARY_PATH}:${AUXLIB} -+endif -+ - xnotify.exe -Wfsdb $* diff --git a/sci-chemistry/nmrpipe/files/7.5.2012.204.11.07-lib.patch b/sci-chemistry/nmrpipe/files/7.5.2012.204.11.07-lib.patch new file mode 100644 index 000000000..91abd611d --- /dev/null +++ b/sci-chemistry/nmrpipe/files/7.5.2012.204.11.07-lib.patch @@ -0,0 +1,36 @@ +--- nmrbin.linux9/nmrDraw 2009-10-07 23:33:21.000000000 +0200 ++++ nmrbin.linux9/nmrDraw.new 2009-10-24 16:29:03.000000000 +0200 +@@ -2,6 +2,17 @@ + + setenv EXTRASMENU $NMRTXT/dot.text_extras_menu + ++setenv NMRBIN ${NMRBASE}/bin/ ++setenv NMRLIB ${NMRBIN}/lib ++setenv AUXLIB ${NMRBIN}/openwin/lib ++ ++if (!($?LD_LIBRARY_PATH)) then ++ setenv LD_LIBRARY_PATH ${NMRLIB}:${AUXLIB} ++else ++ setenv LD_LIBRARY_PATH ${NMRLIB}:${LD_LIBRARY_PATH}:${AUXLIB} ++endif ++ ++ + if ($DISPLAY == "") then + echo Warning: DISPLAY environment variable is not set. + exit 1 +--- nmrbin.linux9/xNotify 2009-10-07 23:33:21.000000000 +0200 ++++ nmrbin.linux9/xNotify.new 2009-10-24 16:29:42.000000000 +0200 +@@ -1,2 +1,13 @@ + #!/bin/csh -f ++ ++setenv NMRBIN ${NMRBASE}/bin ++setenv NMRLIB ${NMRBIN}/lib ++setenv AUXLIB ${NMRBIN}/openwin/lib ++ ++if (!($?LD_LIBRARY_PATH)) then ++ setenv LD_LIBRARY_PATH ${NMRLIB}:${AUXLIB} ++else ++ setenv LD_LIBRARY_PATH ${NMRLIB}:${LD_LIBRARY_PATH}:${AUXLIB} ++endif ++ + xnotify.exe -Wfsdb $* diff --git a/sci-chemistry/nmrpipe/nmrpipe-7.3.2012.114.11.33.ebuild b/sci-chemistry/nmrpipe/nmrpipe-7.3.2012.114.11.33.ebuild deleted file mode 100644 index 16a99887a..000000000 --- a/sci-chemistry/nmrpipe/nmrpipe-7.3.2012.114.11.33.ebuild +++ /dev/null @@ -1,187 +0,0 @@ -# Copyright 1999-2012 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 virtualx - -DESCRIPTION="Spectral visualisation, analysis and Fourier processing" -HOMEPAGE="http://spin.niddk.nih.gov/bax/software/NMRPipe/" -SRC_URI=" - NMRPipeX.tZ - talos.tZ - dyn.tZ - 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 - media-fonts/font-sun-misc - !sci-chemistry/sparta+ - !sci-chemistry/talos+ - sys-libs/ncurses - x11-apps/xset - 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}" - -QA_PREBUILT=" - opt/nmrpipe/nmrbin.linux9/lib/.* - opt/nmrpipe/nmrbin.linux9/.* - opt/nmrpipe/talos/bin/.* - opt/nmrpipe/talosplus/bin/.* - opt/nmrpipe/promega/.* - opt/nmrpipe/spartaplus/.* - " - -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 NMRPipeX.tZ talos.tZ dyn.tZ; do - ln -sf "${DISTDIR}"/${i} || die - done - # ... copy the installation scripts ... - cp -L "${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 - VIRTUALX_COMMAND="csh ./install.com +type linux9 +dest ${S}/NMR +nopost" virtualmake -} - -src_prepare() { - epatch "${FILESDIR}"/${PV}-lib.patch - - mv nmrbin.linux9/nmr{W,w}ish || die -} - -src_install() { - cat >> "${T}"/nmrWish <<- EOF - #!${EPREFIX}/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} ; do - rm -f ${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 -rf 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 -f com/nmrInit.linux9.com || die "Failed to remove broken init script." - # Remove installation log files. - rm -f README_NMRPIPE_USERS *.log || die "Failed to remove installation log." - # Remove unused binaries - rm -f {talos*,spartaplus,promega}/bin/*{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 talosplus/com -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 || die - newenvd env-${PN}-new 40${PN} || die "Failed to install env file." - - # PREFIX stuff - sed \ - -e "s: sh : ${EPREFIX}/bin/sh :g" \ - -e "s: csh : ${EPREFIX}/bin/csh :g" \ - -e "s: bash : ${EPREFIX}/bin/bash :g" \ - -e "s:appTerm -e:appTerm -e ${EPREFIX}/bin/csh:g" \ - -i com/* || die - - # Some scripts are on the wrong place - cp -f nmrtxt/*.com com/ - rm -f {acme,com}/{nmrproc,fid}.com || die - - sed \ - -e "s:!/bin:!${EPREFIX}/bin:g" \ - -e "s:!/usr/bin:!${EPREFIX}/usr/bin:g" \ - -e "s:!/usr/local/bin:!${EPREFIX}/usr/bin:g" \ - -e "s: /bin: ${EPREFIX}/bin:g" \ - -e "s: /usr/bin: ${EPREFIX}/usr/bin:g" \ - -e "s: /usr/local/bin: ${EPREFIX}/usr/bin:g" \ - -i $(find "${S}" \( -name *.tcl -o -name *.com -o -name *.ksh \) ) \ - -i {com/,nmrtxt/*.com,nmrtxt/nt/*.com,dynamo/tcl/,talos*/com/,dynamo/tcl/}* \ - nmrbin.linux9/{nmrDraw,xNotify} || die - - 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/,sparta*/bin/,nmrbin.linux9/,com/,dynamo/tcl/,nmrtxt/*.com,talos*/com/,promega/bin/}* || die - - exeinto ${NMRBASE}/nmrbin.linux9 - doexe "${T}"/nmrWish || die -} diff --git a/sci-chemistry/nmrpipe/nmrpipe-7.5.2012.204.11.07.ebuild b/sci-chemistry/nmrpipe/nmrpipe-7.5.2012.204.11.07.ebuild new file mode 100644 index 000000000..7d84f8a4b --- /dev/null +++ b/sci-chemistry/nmrpipe/nmrpipe-7.5.2012.204.11.07.ebuild @@ -0,0 +1,188 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +# Versioning is output of nmrPipe -help + +EAPI=4 + +inherit eutils prefix virtualx + +DESCRIPTION="Spectral visualisation, analysis and Fourier processing" +HOMEPAGE="http://spin.niddk.nih.gov/bax/software/NMRPipe/" +SRC_URI=" + NMRPipeX.tZ + talos.tZ + dyn.tZ + 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 + media-fonts/font-sun-misc + !sci-chemistry/sparta+ + !sci-chemistry/talos+ + sys-libs/ncurses + x11-apps/xset + x11-libs/libX11 + x11-libs/xview + amd64? ( + app-emulation/emul-linux-x86-baselibs + app-emulation/emul-linux-x86-xlibs + )" + +S="${WORKDIR}" + +NMRBASE="/opt/${PN}" +ENMRBASE="${EPREFIX}/${NMRBASE}" + +QA_PREBUILT=" + opt/nmrpipe/nmrbin.linux9/lib/.* + opt/nmrpipe/nmrbin.linux9/.* + opt/nmrpipe/talos/bin/.* + opt/nmrpipe/talosplus/bin/.* + opt/nmrpipe/promega/.* + opt/nmrpipe/spartaplus/.* + " + +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 NMRPipeX.tZ talos.tZ dyn.tZ; do + ln -sf "${DISTDIR}"/${i} || die + done + # ... copy the installation scripts ... + cp -L "${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 + VIRTUALX_COMMAND="csh ./install.com +type linux9 +dest ${S}/NMR +nopost" virtualmake +} + +src_prepare() { + epatch "${FILESDIR}"/${PV}-lib.patch + + mv nmrbin.linux9/nmr{W,w}ish || die +} + +src_install() { + cat >> "${T}"/nmrWish <<- EOF + #!${EPREFIX}/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} ; do + rm -f ${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 -rf 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 + rm nmrbin.linux9/lib/{libxview.so*,libolgx.so*} || die + # Remove the initialisation script generated during the installation. + # It contains incorrect hardcoded paths; only the "nmrInit.com" script + # should be used. + rm -f com/nmrInit.linux9.com || die "Failed to remove broken init script." + # Remove installation log files. + rm -f README_NMRPIPE_USERS *.log || die "Failed to remove installation log." + # Remove unused binaries + rm -f {talos*,spartaplus,promega}/bin/*{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 talosplus/com -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 || die + newenvd env-${PN}-new 40${PN} || die "Failed to install env file." + + # PREFIX stuff + sed \ + -e "s: sh : ${EPREFIX}/bin/sh :g" \ + -e "s: csh : ${EPREFIX}/bin/csh :g" \ + -e "s: bash : ${EPREFIX}/bin/bash :g" \ + -e "s:appTerm -e:appTerm -e ${EPREFIX}/bin/csh:g" \ + -i com/* || die + + # Some scripts are on the wrong place + cp -f nmrtxt/*.com com/ + rm -f {acme,com}/{nmrproc,fid}.com || die + + sed \ + -e "s:!/bin:!${EPREFIX}/bin:g" \ + -e "s:!/usr/bin:!${EPREFIX}/usr/bin:g" \ + -e "s:!/usr/local/bin:!${EPREFIX}/usr/bin:g" \ + -e "s: /bin: ${EPREFIX}/bin:g" \ + -e "s: /usr/bin: ${EPREFIX}/usr/bin:g" \ + -e "s: /usr/local/bin: ${EPREFIX}/usr/bin:g" \ + -i $(find "${S}" \( -name *.tcl -o -name *.com -o -name *.ksh \) ) \ + -i {com/,nmrtxt/*.com,nmrtxt/nt/*.com,dynamo/tcl/,talos*/com/,dynamo/tcl/}* \ + nmrbin.linux9/{nmrDraw,xNotify} || die + + 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/,sparta*/bin/,nmrbin.linux9/,com/,dynamo/tcl/,nmrtxt/*.com,talos*/com/,promega/bin/}* || die + + exeinto ${NMRBASE}/nmrbin.linux9 + doexe "${T}"/nmrWish || die +} -- cgit v1.2.3-65-gdbad From 62d00614d5e2db29124d91b30c4545e906d807f7 Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Tue, 31 Jul 2012 12:10:29 +0200 Subject: x11-libs/xview: Use everything from debian; build only 32bit libs everywhere; be carefully this is very hacky approach (Portage version: 2.2.0_alpha120/git/Linux x86_64, unsigned Manifest commit) --- x11-libs/xview/ChangeLog | 9 ++- x11-libs/xview/Manifest | 6 +- x11-libs/xview/files/xview-3.2-impl-dec.patch | 30 +++++++ x11-libs/xview/metadata.xml | 10 +-- x11-libs/xview/xview-3.2-r7.ebuild | 108 ++++++++++++++++++++++++++ 5 files changed, 155 insertions(+), 8 deletions(-) create mode 100644 x11-libs/xview/files/xview-3.2-impl-dec.patch create mode 100644 x11-libs/xview/xview-3.2-r7.ebuild diff --git a/x11-libs/xview/ChangeLog b/x11-libs/xview/ChangeLog index c281a436f..59416a1d6 100644 --- a/x11-libs/xview/ChangeLog +++ b/x11-libs/xview/ChangeLog @@ -1,7 +1,14 @@ # ChangeLog for x11-libs/xview -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*xview-3.2-r7 (31 Jul 2012) + + 31 Jul 2012; Justin Lecher +xview-3.2-r7.ebuild, + +files/xview-3.2-impl-dec.patch, metadata.xml: + Use everything from debian; build only 32bit libs everywhere; be carefully + this is very hacky approach + 25 Jun 2011; Justin Lecher metadata.xml: Fixed herd entry in metadata.xml diff --git a/x11-libs/xview/Manifest b/x11-libs/xview/Manifest index 238314363..b024f62b2 100644 --- a/x11-libs/xview/Manifest +++ b/x11-libs/xview/Manifest @@ -1,2 +1,4 @@ -DIST xview-3.2-gcc-4.1-v0.1.patch.bz2 8018 RMD160 0387c073d7f4c8303467f3065ba2a573fdb6710e SHA1 f06eb2412e4d61dffaee7db436527d7933a50931 SHA256 2b26f10122535eff43a4f87fc97ffb54eac88c312a3688b05bce806ce9a273ba -DIST xview-3.2p1.4-19c.tar.gz 3350088 RMD160 6e0e90a737df7de8d30dbbd647527d599f13e8dd SHA1 1a2023945edef33ea4251fcb3b9e69bcf35a531c SHA256 ce05762918ccaa0bd86819e1347b57b6d0e5d515b148f9f740d3ffd1fa9eea83 +DIST xview-3.2-gcc-4.1-v0.1.patch.bz2 8018 SHA256 2b26f10122535eff43a4f87fc97ffb54eac88c312a3688b05bce806ce9a273ba SHA512 d4c80bccc2b8d57ff6906002b1b3e12f0cb480c7873ef118423d7bd566a6b655f422c61782893f796889052b1ab19f1328fcf670a1e0ef93e6b2e28aec2eb80b WHIRLPOOL f42e871a21c06bb213e9726edd88e58b9024320e95798b4acf32222dd3b0efd6b5183dcdfe64c3b257429fee1524d010e3f8e75f5428642d87fd81ef99244deb +DIST xview-3.2p1.4-19c.tar.gz 3350088 SHA256 ce05762918ccaa0bd86819e1347b57b6d0e5d515b148f9f740d3ffd1fa9eea83 SHA512 d0e29de2d540d0cc8ec2739e61e0ccdf36cf97f4e87fcffe469733e1649ee837d3ed115b944f92843612752fdb823227df7ffd55ec62c093aea1b04d9f2f3af9 WHIRLPOOL 78b87f49c2605b418e4c6294a7323ed4a85f4fa741ab80f3013b934877bae07c969c1a7fde5b422f6a7eb88217bf7c48d43c01f2633e5886aa21925dd669ab3a +DIST xview_3.2p1.4-28.debian.tar.gz 95902 SHA256 38458016e3cabb2264a0aa0f8fd0e8ddb00dda5659755eb6dc35d2af58243ec0 SHA512 80beaf7a3fad6aa8d410913ab218426b3bd2dda0b9ad3242989973cf3f2cdd9a43238f939f9a6d72ca8859dfa867365513b5ab5f226ba4c4a75a8a3579d90f28 WHIRLPOOL 31b065a9b22d116a5b3e648583d4b6237781ecace7d31d5d701fefe5f180f90f7e549fed3cbe7d72e8794ab5a3278eb5e15cdc01d1e0c9c0374f3eed0e52eae6 +DIST xview_3.2p1.4.orig.tar.gz 3227552 SHA256 fcc88f884a6cb05789ed800edea24d9c4cf1f60cb7d61f3ce7f10de677ef9e8d SHA512 5dd55529aee68d5ca7f2ff4e899b790b59cefb1bcd95706eef9b9e2c5545dc4ca6c866a55ed06ca91914ebde5d6ca4dcd038ce9e2ae97bfe240595b045a69315 WHIRLPOOL 4c1ef22107350659ec4b91beb48c52060f94a82e6ab30641b47afbd42d99d1f46e806b007b90c36fb3079869ba57ef9d41c59ffce0d648cb8ef2088608474a59 diff --git a/x11-libs/xview/files/xview-3.2-impl-dec.patch b/x11-libs/xview/files/xview-3.2-impl-dec.patch new file mode 100644 index 000000000..0296a9aeb --- /dev/null +++ b/x11-libs/xview/files/xview-3.2-impl-dec.patch @@ -0,0 +1,30 @@ + lib/libxview/misc/hashfn.c | 1 + + lib/libxview/win/win_env.c | 3 +++ + 2 files changed, 4 insertions(+), 0 deletions(-) + +diff --git a/lib/libxview/misc/hashfn.c b/lib/libxview/misc/hashfn.c +index f127e2b..a7b27b9 100644 +--- a/lib/libxview/misc/hashfn.c ++++ b/lib/libxview/misc/hashfn.c +@@ -17,6 +17,7 @@ static char sccsid[] = "@(#)hashfn.c 20.12 93/06/28"; + #define hashfn_c + + #include ++#include + + /* + * hashfn_new_table(size, hash_fn, cmp_fn) -- create a new hash table object +diff --git a/lib/libxview/win/win_env.c b/lib/libxview/win/win_env.c +index d8e7fcc..72f1def 100644 +--- a/lib/libxview/win/win_env.c ++++ b/lib/libxview/win/win_env.c +@@ -18,6 +18,9 @@ static char sccsid[] = "@(#)win_env.c 20.16 93/06/28"; + #include + #include + #include ++#include ++#include ++#include + + /* + * Public routines diff --git a/x11-libs/xview/metadata.xml b/x11-libs/xview/metadata.xml index 59d99c304..04b998aab 100644 --- a/x11-libs/xview/metadata.xml +++ b/x11-libs/xview/metadata.xml @@ -1,9 +1,9 @@ - sci - - jlec@gentoo.org - Justin Lecher - + sci + + jlec@gentoo.org + Justin Lecher + diff --git a/x11-libs/xview/xview-3.2-r7.ebuild b/x11-libs/xview/xview-3.2-r7.ebuild new file mode 100644 index 000000000..6ca59a3a7 --- /dev/null +++ b/x11-libs/xview/xview-3.2-r7.ebuild @@ -0,0 +1,108 @@ +## Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/www/viewcvs.gentoo.org/raw_cvs/gentoo-x86/x11-libs/xview/Attic/xview-3.2-r6.ebuild,v 1.6 2008/12/21 09:03:33 ssuominen dead $ + +EAPI=4 + +inherit eutils toolchain-funcs flag-o-matic + +MY_PN="${P}p1.4" + +DESCRIPTION="The X Window-System-based Visual/Integrated Environment for Workstations" +HOMEPAGE="http://physionet.caregroup.harvard.edu/physiotools/xview/" +# We usr the debian tarball so that the debian patches apply +SRC_URI=" + mirror://debian/pool/main/x/xview/xview_3.2p1.4.orig.tar.gz + mirror://debian/pool/main/x/xview/xview_3.2p1.4-28.debian.tar.gz" + +LICENSE="XVIEW" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux -*" +IUSE="static-libs" + +RDEPEND=" + media-fonts/font-bh-75dpi + media-fonts/font-sun-misc + x11-libs/libXpm + x11-misc/xbitmaps + x11-proto/xextproto" + +DEPEND="${RDEPEND} + app-text/rman + x11-misc/gccmakedep + x11-misc/imake" + +S=${WORKDIR}/${MY_PN} + +src_prepare() { + append-flags -m32 + append-ldflags -m32 + + EPATCH_OPTS="-p1" + + epatch \ + "${FILESDIR}"/${P}-impl-dec.patch \ + "${WORKDIR}"/debian/patches/{debian-changes-3.2p1.4-26,display_setting} + + # Do not build xgettext and msgfmt since they are provided by the gettext + # package. Using the programs provided by xview breaks many packages + # including vim, grep and binutils. + sed \ + -e 's/MSG_UTIL = xgettext msgfmt/#MSG_UTIL = xgettext msgfmt/' \ + -i util/Imakefile || die "gettext sed failed" + + # (#120910) Look for imake in the right place + sed -i -e 's:\/X11::' imake || die "imake sed failed" + + sed -i -e 's:/usr/X11R6:/usr:' config/XView.cf Build-LinuxXView.bash || die + + # Nasty hacks to force CC and CFLAGS + sed \ + -e "s:^\(IMAKEINCLUDE=.*\)\"$:\1 -DCcCmd=$(tc-getCC)\":" \ + -e "s:usr/lib/X11/config:usr/$(get_libdir)/X11/config:" -i Build-LinuxXView.bash || die + sed -e "s:\(.*STD_DEFINES =.*\)$:\1 -D_GNU_SOURCE ${CFLAGS}:" -i config/XView.obj || die + sed -e "s:\(.*define LibXViewDefines .*\)$:\1 -D_GNU_SOURCE ${CFLAGS}:" -i config/XView.cf || die + sed -e "s:^\(MORECCFLAGS.*\)$:\1 -D_GNU_SOURCE ${CFLAGS}:" -i clients/olvwm-4.1/Imakefile + sed -e "s:\(-Wl,-soname\):${LDFLAGS} \1:g" -i config/XView.rules || die +} + +src_compile() { + export OPENWINHOME="/usr" + export X11DIR="/usr" + export MANDIR="/usr/share/man" + + # This is crazy and I know it, but wait till you read the code in + # Build-LinuxXView.bash. + bash Build-LinuxXView.bash libs \ + || die "building libs failed" +# bash Build-LinuxXView.bash clients \ +# || die "building clients failed" +# bash Build-LinuxXView.bash contrib \ +# || die "building contrib failed" +# bash Build-LinuxXView.bash olvwm \ +# || die "building olvwm failed" +} + +src_install() { + export OPENWINHOME="/usr" + export X11DIR="/usr" + export MANDIR="/usr/share/man" + export DESTDIR="${ED}" + + bash Build-LinuxXView.bash instlibs \ + || die "installing libs failed" +# bash Build-LinuxXView.bash instclients \ +# || die "installing clients failed" +# bash Build-LinuxXView.bash instcontrib \ +# || die "installing contrib failed" +# bash Build-LinuxXView.bash instolvwm \ +# || die "installing olvwm failed" +# cd "${ED}"/usr + + use static-libs || \ + find "${ED}" -type f -name "*.a" -delete + + cd "${S}"/doc + dodoc README xview-info olgx_api.txt olgx_api.ps sel_api.txt dnd_api.txt whats_new.ps + rm -rf "${ED}"/usr/X11R6/share/doc/xview "${ED}"/usr/X11R6/share/doc "${ED}"/usr/bin || die +} -- cgit v1.2.3-65-gdbad From ffe59cae3e15c9c317768007f2010dad17de348d Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Tue, 31 Jul 2012 12:11:38 +0200 Subject: x11-libs/xview: Add missing inherit of multilib (Portage version: 2.2.0_alpha120/git/Linux x86_64, unsigned Manifest commit) --- x11-libs/xview/ChangeLog | 4 ++++ x11-libs/xview/xview-3.2-r6.ebuild | 4 ++-- x11-libs/xview/xview-3.2-r7.ebuild | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/x11-libs/xview/ChangeLog b/x11-libs/xview/ChangeLog index 59416a1d6..5716bc176 100644 --- a/x11-libs/xview/ChangeLog +++ b/x11-libs/xview/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 31 Jul 2012; Justin Lecher xview-3.2-r6.ebuild, + xview-3.2-r7.ebuild: + Add missing inherit of multilib + *xview-3.2-r7 (31 Jul 2012) 31 Jul 2012; Justin Lecher +xview-3.2-r7.ebuild, diff --git a/x11-libs/xview/xview-3.2-r6.ebuild b/x11-libs/xview/xview-3.2-r6.ebuild index 0d3849589..5da5aad1d 100644 --- a/x11-libs/xview/xview-3.2-r6.ebuild +++ b/x11-libs/xview/xview-3.2-r6.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/www/viewcvs.gentoo.org/raw_cvs/gentoo-x86/x11-libs/xview/Attic/xview-3.2-r6.ebuild,v 1.6 2008/12/21 09:03:33 ssuominen dead $ -inherit eutils toolchain-funcs +inherit eutils toolchain-funcs multilib MY_PN="${P}p1.4-19c" GCC_PATCHVER="0.1" diff --git a/x11-libs/xview/xview-3.2-r7.ebuild b/x11-libs/xview/xview-3.2-r7.ebuild index 6ca59a3a7..a69274f9c 100644 --- a/x11-libs/xview/xview-3.2-r7.ebuild +++ b/x11-libs/xview/xview-3.2-r7.ebuild @@ -4,7 +4,7 @@ EAPI=4 -inherit eutils toolchain-funcs flag-o-matic +inherit eutils toolchain-funcs flag-o-matic multilib MY_PN="${P}p1.4" -- cgit v1.2.3-65-gdbad