[gentoo-commits] proj/sci:master commit in: sci-chemistry/nmrpipe/, sci-chemistry/nmrpipe/files/

["Andrew Ammerlaan" <andrewammerlaan@riseup.net>]

commit:     c5c54229938315a8130e778033004f58a35cc347
Author:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Tue Jan  5 20:20:45 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Tue Jan  5 20:20:45 2021 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=c5c54229

sci-chemistry/nmrpipe: vers bump, fix fetch, fix homepage, add keywords

EAPI bump, update ncurses dep

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net>

 .../files/nmrpipe-8.7.2015.320.15.26-lib.patch     | 36 ----------------------
 ...20.15.26.ebuild => nmrpipe-8.7.20200827.ebuild} | 35 ++++++++++-----------
 2 files changed, 17 insertions(+), 54 deletions(-)

diff --git a/sci-chemistry/nmrpipe/files/nmrpipe-8.7.2015.320.15.26-lib.patch b/sci-chemistry/nmrpipe/files/nmrpipe-8.7.2015.320.15.26-lib.patch
deleted file mode 100644
index 91abd611d..000000000
--- a/sci-chemistry/nmrpipe/files/nmrpipe-8.7.2015.320.15.26-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/nmrpipe-8.7.2015.320.15.26.ebuild b/sci-chemistry/nmrpipe/nmrpipe-8.7.20200827.ebuild
similarity index 86%
rename from sci-chemistry/nmrpipe/nmrpipe-8.7.2015.320.15.26.ebuild
rename to sci-chemistry/nmrpipe/nmrpipe-8.7.20200827.ebuild
index d0bc331c2..e56ce8fd9 100644
--- a/sci-chemistry/nmrpipe/nmrpipe-8.7.2015.320.15.26.ebuild
+++ b/sci-chemistry/nmrpipe/nmrpipe-8.7.20200827.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Versioning is output of nmrPipe -help
 
-EAPI=6
+EAPI=7
 
-inherit eutils virtualx
+inherit virtualx
 
 DESCRIPTION="Spectral visualisation, analysis and Fourier processing"
-HOMEPAGE="http://spin.niddk.nih.gov/bax/software/NMRPipe/"
+HOMEPAGE="https://www.ibbr.umd.edu/nmrpipe"
 #SRC_URI="
 #	NMRPipeX.tZ
 #	talos.tZ
@@ -16,12 +16,12 @@ HOMEPAGE="http://spin.niddk.nih.gov/bax/software/NMRPipe/"
 #	binval.com
 #	install.com"
 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
+	https://www.ibbr.umd.edu/nmrpipe/install.com -> install-${PV}.com
+	https://www.ibbr.umd.edu/nmrpipe/binval.com -> binval-${PV}.com
+	https://www.ibbr.umd.edu/nmrpipe/NMRPipeX.tZ -> NMRPipeX-${PV}.tZ
+	https://www.ibbr.umd.edu/nmrpipe/plugin.smile.tZ -> plugin.smile-${PV}.tZ
+	https://www.ibbr.umd.edu/nmrpipe/talos.tZ -> talos-${PV}.tZ
+	https://www.ibbr.umd.edu/nmrpipe/dyn.tZ -> dyn-${PV}.tZ
 	"
 
 SLOT="0"
@@ -30,10 +30,9 @@ LICENSE="nmrpipe"
 # 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=""
-IUSE=""
+KEYWORDS="~amd64 ~x86"
 
-RESTRICT="strip"
+RESTRICT="strip bindist mirror"
 
 DEPEND="app-shells/tcsh"
 RDEPEND="${DEPEND}
@@ -43,10 +42,10 @@ RDEPEND="${DEPEND}
 	media-fonts/font-sun-misc
 	!sci-chemistry/sparta+
 	!sci-chemistry/talos+
-	sys-libs/ncurses:5/5
+	sys-libs/ncurses-compat:5/5
 	x11-apps/xset
-	|| ( x11-libs/xview x11-libs/xview-bin )
-	!prefix? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)] )
+	x11-libs/xview-bin
+	!prefix? ( >=x11-libs/libX11-1.6.2 )
 	prefix? ( dev-util/patchelf )"
 
 S="${WORKDIR}/NMR"
@@ -69,7 +68,7 @@ src_unpack() {
 	# ... and make the installation scripts executable.
 	chmod +x *.com || die
 	VIRTUALX_COMMAND="csh"
-	virtualmake \
+	virtx \
 		./install.com \
 		+type $(usex x86 linux9 linux212_64) \
 		+src "${WORKDIR}" \
@@ -78,8 +77,8 @@ src_unpack() {
 }
 
 src_prepare() {
+	default
 	local bin i
-	epatch "${FILESDIR}"/${P}-lib.patch
 
 	mv nmrbin.$(usex x86 linux9 linux212_64)/nmr{W,w}ish || die