From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 749801384B4 for ; Thu, 26 Nov 2015 11:57:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CC46421C11B; Thu, 26 Nov 2015 11:57:36 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id DC9A021C110 for ; Thu, 26 Nov 2015 11:57:35 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 66379340656 for ; Thu, 26 Nov 2015 11:57:34 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 24092A94 for ; Thu, 26 Nov 2015 11:57:32 +0000 (UTC) From: "Justin Lecher" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" Message-ID: <1448539042.4c364af359ca5494e932dd10c0ee694df64ee049.jlec@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-chemistry/nmrpipe/, sci-chemistry/nmrpipe/files/ X-VCS-Repository: proj/sci X-VCS-Files: sci-chemistry/nmrpipe/files/env-nmrpipe sci-chemistry/nmrpipe/files/env-nmrpipe-new sci-chemistry/nmrpipe/files/nmrpipe-8.6.2015.271.07.19-lib.patch sci-chemistry/nmrpipe/files/nmrpipe-8.7.2015.320.15.26-lib.patch sci-chemistry/nmrpipe/nmrpipe-8.6.2015.271.07.19-r1.ebuild sci-chemistry/nmrpipe/nmrpipe-8.7.2015.320.15.26.ebuild X-VCS-Directories: sci-chemistry/nmrpipe/files/ sci-chemistry/nmrpipe/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: 4c364af359ca5494e932dd10c0ee694df64ee049 X-VCS-Branch: master Date: Thu, 26 Nov 2015 11:57:32 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 740a1a52-acb5-4054-905c-8cda3cb7a450 X-Archives-Hash: 88ba45895051b5812eab13c4b2993584 commit: 4c364af359ca5494e932dd10c0ee694df64ee049 Author: Justin Lecher gentoo org> AuthorDate: Thu Nov 26 11:57:22 2015 +0000 Commit: Justin Lecher gentoo org> CommitDate: Thu Nov 26 11:57:22 2015 +0000 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=4c364af3 sci-chemistry/nmrpipe: Version Bump and cleanup Package-Manager: portage-2.2.25 Signed-off-by: Justin Lecher gentoo.org> .../nmrpipe/files/{env-nmrpipe-new => env-nmrpipe} | 8 ++- ....patch => nmrpipe-8.7.2015.320.15.26-lib.patch} | 0 ...r1.ebuild => nmrpipe-8.7.2015.320.15.26.ebuild} | 74 +++++++++------------- 3 files changed, 36 insertions(+), 46 deletions(-) diff --git a/sci-chemistry/nmrpipe/files/env-nmrpipe-new b/sci-chemistry/nmrpipe/files/env-nmrpipe similarity index 81% rename from sci-chemistry/nmrpipe/files/env-nmrpipe-new rename to sci-chemistry/nmrpipe/files/env-nmrpipe index 87697f7..e155adc 100644 --- a/sci-chemistry/nmrpipe/files/env-nmrpipe-new +++ b/sci-chemistry/nmrpipe/files/env-nmrpipe @@ -1,8 +1,8 @@ # Platform NMRCHECK="ALL" -BINTYPE="linux9" -NMRBINTYPE="linux9" +BINTYPE="@BINTYPE@" +NMRBINTYPE="@BINTYPE@" PATH="/opt/nmrpipe/com:/opt/nmrpipe/bin:/opt/nmrpipe/dynamo/tcl:/opt/nmrpipe/talosplus/com:/opt/nmrpipe/dynamo/com" # NMRPipe @@ -40,3 +40,7 @@ PDBH_TAB="/opt/nmrpipe/pdb/resolution.tab" TCLPATH="/opt/nmrpipe/com" PROMEGA_DIR="/opt/nmrpipe/promega" + +NMR_PLUGIN_FN="/opt/nmrpipe/smile/NMR_PLUGIN_FN" +NMR_PLUGIN_EXE="/opt/nmrpipe/smile/NMR_PLUGIN_EXE" +NMR_PLUGIN_INFO="/opt/nmrpipe/smile/NMR_PLUGIN_INFO" diff --git a/sci-chemistry/nmrpipe/files/nmrpipe-8.6.2015.271.07.19-lib.patch b/sci-chemistry/nmrpipe/files/nmrpipe-8.7.2015.320.15.26-lib.patch similarity index 100% rename from sci-chemistry/nmrpipe/files/nmrpipe-8.6.2015.271.07.19-lib.patch rename to sci-chemistry/nmrpipe/files/nmrpipe-8.7.2015.320.15.26-lib.patch diff --git a/sci-chemistry/nmrpipe/nmrpipe-8.6.2015.271.07.19-r1.ebuild b/sci-chemistry/nmrpipe/nmrpipe-8.7.2015.320.15.26.ebuild similarity index 74% rename from sci-chemistry/nmrpipe/nmrpipe-8.6.2015.271.07.19-r1.ebuild rename to sci-chemistry/nmrpipe/nmrpipe-8.7.2015.320.15.26.ebuild index 725c01d..2e80308 100644 --- a/sci-chemistry/nmrpipe/nmrpipe-8.6.2015.271.07.19-r1.ebuild +++ b/sci-chemistry/nmrpipe/nmrpipe-8.7.2015.320.15.26.ebuild @@ -20,6 +20,7 @@ SRC_URI=" http://spin.niddk.nih.gov/NMRPipe/install/download/install.com -> install-${PV}.com http://spin.niddk.nih.gov/NMRPipe/install/download/binval.com -> binval-${PV}.com http://spin.niddk.nih.gov/NMRPipe/install/download/NMRPipeX.tZ -> NMRPipeX-${PV}.tZ + http://spin.niddk.nih.gov/NMRPipe/install/download/plugin.smile.tZ -> plugin.smile-${PV}.tZ http://spin.niddk.nih.gov/NMRPipe/install/download/talos.tZ -> talos-${PV}.tZ http://spin.niddk.nih.gov/NMRPipe/install/download/dyn.tZ -> dyn-${PV}.tZ " @@ -33,7 +34,6 @@ LICENSE="nmrpipe" KEYWORDS="" IUSE="" -#RESTRICT="fetch strip" RESTRICT="strip" DEPEND="app-shells/tcsh" @@ -53,76 +53,61 @@ RDEPEND="${DEPEND} !prefix? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)] ) prefix? ( dev-util/patchelf )" -S="${WORKDIR}" +S="${WORKDIR}/NMR" NMRBASE="/opt/${PN}" ENMRBASE="${EPREFIX}/${NMRBASE}" -QA_PREBUILT=" - opt/.* - " - -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}" -} +QA_PREBUILT="opt/.*" src_unpack() { # The installation script will unpack the package. We just provide symlinks # to the archive files, ... - for i in NMRPipeX-${PV}.tZ talos-${PV}.tZ dyn-${PV}.tZ; do + for i in NMRPipeX-${PV}.tZ plugin.smile-${PV}.tZ talos-${PV}.tZ dyn-${PV}.tZ; do ln -sf "${DISTDIR}"/${i} ${i/-${PV}/} || die done + mkdir "${S}" && cd "${S}" || die # ... copy the installation scripts ... cp -L "${DISTDIR}"/install-${PV}.com install.com || die cp -L "${DISTDIR}"/binval-${PV}.com binval.com || die # ... and make the installation scripts executable. chmod +x *.com || die - # 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 + VIRTUALX_COMMAND="csh" + virtualmake \ + ./install.com \ + +type $(usex x86 linux9 linux212_64) \ + +src "${WORKDIR}" \ + +dest "${S}" \ + +nopost +nocshrc } src_prepare() { - local bin + local bin i epatch "${FILESDIR}"/${P}-lib.patch - mv nmrbin.linux9/nmr{W,w}ish || die + mv nmrbin.$(usex x86 linux9 linux212_64)/nmr{W,w}ish || die ebegin "Cleaning installation" - for i in ${A} ; do - rm -f ${i/-${PV}/} || 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 \ + rm -rf nmrbin.linux*/{lib/*.timestamp,*timestamp,xv,gnuplot*,rasmol*,nc,nedit} \ + nmrbin.{linux,mac} nmruser format \ + $(usex x86 nmrbin.linux212_64 nmrbin.linux9) \ || 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 + rm nmrbin.linux*/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." + rm -f com/nmrInit.linux*.com || die "Failed to remove broken init script." # Remove installation log files. - rm -f README_NMRPIPE_USERS *.log || die "Failed to remove installation log." + rm -f README_NMRPIPE_USERS *.log install.com binval.com || die "Failed to remove installation log." # Remove unused binaries rm -f {talos*,spartaplus,promega}/bin/*{linux,mac,sgi6x,winxp} pdb/misc/addSeg || die # Some scripts are on the wrong place cp -f nmrtxt/*.com com/ - rm -f {acme,com}/{nmrproc,fid}.com || die - + rm -f {acme,com}/{nmrproc,fid,install}.com || die eend ebegin "Fixing paths in scripts" @@ -143,7 +128,7 @@ src_prepare() { -e "s: /usr/local/bin: ${EPREFIX}/usr/bin:g" \ -i $(find "${S}" \( -name "*.tcl" -o -name "*.com" -o -name "*.ksh" \)) \ {com/,nmrtxt/*.com,nmrtxt/nt/*.com,dynamo/tcl/,talos*/com/,dynamo/tcl/}* \ - nmrbin.linux9/{nmrDraw,xNotify} || die + nmrbin.linux*/{nmrDraw,xNotify} || die eend if use prefix; then @@ -155,7 +140,7 @@ src_prepare() { -i com/* || die ebegin "Setting RPATH in binaries" - for bin in $(find nmrbin.linux9/ -type f -maxdepth 1); do + for bin in $(find nmrbin.linux*/ -type f -maxdepth 1); do patchelf --set-rpath "${EPREFIX}/usr/lib/" ${bin} done eend $? @@ -187,20 +172,21 @@ src_install() { sed \ -e "s:/opt/nmrpipe:${EPREFIX}/opt/nmrpipe:g" \ - "${FILESDIR}"/env-${PN}-new \ - > env-${PN}-new || die - newenvd env-${PN}-new 40${PN} + -e "s:@BINTYPE@:$(usex x86 linux9 linux212_64):g" \ + "${FILESDIR}"/env-${PN} \ + > "${T}"/env-${PN} || die + newenvd "${T}"/env-${PN} 40${PN} insinto ${NMRBASE} doins -r * - dosym nmrbin.linux9 ${NMRBASE}/bin + dosym nmrbin.linux* ${NMRBASE}/bin ebegin "Fixing permissions" - chmod 775 "${ED}"/${NMRBASE}/{talos*/bin/,sparta*/bin/,nmrbin.linux9/,com/,dynamo/tcl/,nmrtxt/*.com,talos*/com/,promega/bin/}* || die + chmod 775 "${ED}"/${NMRBASE}/{talos*/bin/,sparta*/bin/,nmrbin.linux*/,com/,dynamo/tcl/,nmrtxt/*.com,talos*/com/,promega/bin/}* || die eend - exeinto ${NMRBASE}/nmrbin.linux9 + exeinto ${NMRBASE}/nmrbin.$(usex x86 linux9 linux212_64) doexe "${T}"/nmrWish insinto ${NMRBASE}/nmrtxt