summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authormschubert2016-12-20 17:36:42 +0100
committermschubert2016-12-20 17:36:42 +0100
commit057234bda17ef6608e45419f706f7013062f9491 (patch)
tree36084d46fe74d4e112a038924d515a04ac8c8eee
parent3bc4fbb63ff0881506ce0fd0dd0ecc665abca158 (diff)
downloadaur-057234bda17ef6608e45419f706f7013062f9491.tar.gz
git sources; bump 1:r860
-rw-r--r--.SRCINFO11
-rw-r--r--PKGBUILD30
-rw-r--r--setup.patch49
3 files changed, 71 insertions, 19 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 9967e9d535c..08bdc622c33 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,23 @@
+# Generated by mksrcinfo v8
+# Tue Dec 20 16:36:22 UTC 2016
pkgbase = python2-sloppycell
pkgdesc = Software environment for simulation and analysis of biomolecular networks
- pkgver = 20110614
+ pkgver = r860.14366d3
pkgrel = 1
+ epoch = 1
url = http://sloppycell.sourceforge.net/
arch = i686
arch = x86_64
license = BSD
- makedepends = cvs
+ makedepends = git
makedepends = gcc-fortran
depends = python2-scipy
depends = python2-numpy
depends = lapack
+ source = git+http://git.code.sf.net/p/sloppycell/git
+ source = setup.patch
+ md5sums = SKIP
+ md5sums = 3b7af95a88305880a8fc1340c7a0790f
pkgname = python2-sloppycell
diff --git a/PKGBUILD b/PKGBUILD
index 996ee17f38b..b2a293076b5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,34 +1,30 @@
# Maintainer: Michael Schubert <mschu.dev at gmail>
-
pkgname=python2-sloppycell
-pkgver=20110614
+pkgver=r860.14366d3
pkgrel=1
+epoch=1
pkgdesc="Software environment for simulation and analysis of biomolecular networks"
arch=('i686' 'x86_64')
url="http://sloppycell.sourceforge.net/"
license=('BSD')
depends=('python2-scipy' 'python2-numpy' 'lapack')
-makedepends=('cvs' 'gcc-fortran')
+makedepends=('git' 'gcc-fortran')
+source=("git+http://git.code.sf.net/p/sloppycell/git"
+ "setup.patch")
+md5sums=('SKIP'
+ '3b7af95a88305880a8fc1340c7a0790f')
-_cvsroot=":pserver:anonymous@sloppycell.cvs.sourceforge.net:/cvsroot"
-_cvsmod="sloppycell"
-_cvsMod="SloppyCell"
+pkgver() {
+ cd "$srcdir"/git
+ printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+}
build() {
- cd "$srcdir"
- if [ -d ${_cvsMod}/CVS ]; then
- cd ${_cvsMod}
- cvs -q update -dA
- else
- cvs -q -z3 -d${_cvsroot}/${_cvsmod} co ${_cvsMod}
- cd ${_cvsMod}
- sed -i "/daskr =/s|$| extra_link_args='-Wl,--defsym,main=main',|" setup.py
- fi
+ cd "$srcdir"/git
python2 setup.py build
}
package() {
- cd "$srcdir/$_cvsMod"
+ cd "$srcdir"/git
python2 setup.py install --root="$pkgdir/" --skip-build --optimize=1
}
-
diff --git a/setup.patch b/setup.patch
new file mode 100644
index 00000000000..1c91ef7e7fd
--- /dev/null
+++ b/setup.patch
@@ -0,0 +1,49 @@
+--- setup.py.orig 2016-12-20 17:34:58.140428476 +0100
++++ setup.py 2016-12-20 17:35:23.547463313 +0100
+@@ -1,8 +1,8 @@
+-# This gets f2py_signatures installed in the correct place. See
++# This gets f2py_signatures installed in the correct place. See
+ # http://groups.google.com/group/comp.lang.python/browse_thread/thread/35ec7b2fed36eaec/2105ee4d9e8042cb
+ from distutils.command.install import INSTALL_SCHEMES
+ for scheme in INSTALL_SCHEMES.values():
+- scheme['data'] = scheme['purelib']
++ scheme['data'] = scheme['purelib']
+
+ # Importing these adds a 'bdist_mpkg' option that allows building binary packages on OS X.
+ try:
+@@ -16,7 +16,7 @@ import scipy
+ if hasattr(scipy, 'Numeric'):
+ # Using old scipy
+ import scipy_distutils.core as core
+- data_files = [('SloppyCell/ReactionNetworks',
++ data_files = [('SloppyCell/ReactionNetworks',
+ ['ReactionNetworks/f2py_signatures.pyf',
+ 'ReactionNetworks/f2py_signatures_no_derivs.pyf',
+ 'ReactionNetworks/mtrand.h',
+@@ -55,19 +55,21 @@ if hasattr(os, 'link'):
+ # on CCMR, it seems (very slightly), faster to use the included ones rather
+ # than linking against LAPACK.
+ daskr = core.Extension(name = 'SloppyCell._daskr',
+- sources = ['daskr.pyf', 'ddaskr/ddaskr.f',
+- 'ddaskr/daux.f', 'ddaskr/dlinpk.f'])
++ sources = ['daskr.pyf', 'ddaskr/ddaskr.f',
++ 'ddaskr/daux.f', 'ddaskr/dlinpk.f'],
++ extra_link_args = ['-shared'])
+
+ misc_c = core.Extension(name = 'SloppyCell.misc_c',
+- sources = ['misc_c.c', 'misc_c.pyf'])
++ sources = ['misc_c.c', 'misc_c.pyf'],
++ extra_link_args = ['-shared'])
+
+ core.setup(name='SloppyCell',
+ version='CVS',
+ author='Ryan Gutenkunst',
+ author_email='rng7@cornell.edu',
+ url='http://sloppycell.sourceforge.net',
+- packages=['SloppyCell',
+- 'SloppyCell.ReactionNetworks',
++ packages=['SloppyCell',
++ 'SloppyCell.ReactionNetworks',
+ 'SloppyCell.Testing',
+ 'SloppyCell.ExprManip',
+ 'SloppyCell.Vandermonde',