Merge branch 'u/arojas/upgrade_lrcalc_to_2_0' of git://trac.sagemath.…

…org/sage into u/arojas/upgrade_lrcalc_to_2_0

build/pkgs/lrcalc/checksums.ini

@@ -1,4 +1,5 @@
-tarball=lrcalc-VERSION.tar.gz
-sha1=89c288875bc3e3e2919876cb645bdfd7316b5965
-md5=6bba16c0cca9debccd0af847bd3d4a23
-cksum=3738483656
+tarball=liblrcalc-VERSION.tar.gz
+sha1=2a98661eb39c7ef526c932f7886fc3142fd639ab
+md5=7cfa8f67287f2b70a15a833b94bc24b6
+cksum=2250996027
+upstream_url=https://sites.math.rutgers.edu/~asbuch/lrcalc/lrcalc-VERSION.tar.gz

build/pkgs/lrcalc/package-version.txt

@@ -1 +1 @@
-1.2.p1
+2.1

build/pkgs/lrcalc/spkg-configure.m4

@@ -1,9 +1,10 @@
 SAGE_SPKG_CONFIGURE([lrcalc], [
-    AC_CHECK_HEADERS([lrcalc/schublib.h], [
+    AC_LANG_PUSH([C])
+    AC_CHECK_HEADERS([lrcalc/schublib.h] [lrcalc/lrcoef.h], [
           AC_SEARCH_LIBS([mult_poly_schubert], [lrcalc], [], [sage_spkg_install_lrcalc=yes])
     ], [sage_spkg_install_lrcalc=yes],
-    [[#ifndef _HASHTAB_H
-      #include <lrcalc/hashtab.h>
-      #include <lrcalc/vector.h>
+    [[#ifndef _IVECTOR_H
+      #include <lrcalc/ivector.h>
       #endif]])
+    AC_LANG_POP
 ])

build/pkgs/lrcalc/spkg-install.in

@@ -1,9 +1,5 @@
 cd src
 
-# Use newer version of config.guess and config.sub (see Trac #19725)
-cp "$SAGE_ROOT"/config/config.guess .
-cp "$SAGE_ROOT"/config/config.sub .
-
 sdh_configure
 sdh_make
 sdh_make_install

build/pkgs/lrcalc_python/SPKG.rst

@@ -0,0 +1,22 @@
+lrcalc_python: Littlewood-Richardson calculator
+===============================================
+
+Description
+-----------
+
+Python bindings for the Littlewood-Richardson Calculator
+
+http://sites.math.rutgers.edu/~asbuch/lrcalc/
+
+License
+-------
+
+GNU General Public License V3
+
+
+Upstream Contact
+----------------
+
+Anders S. Buch (asbuch@math.rutgers.edu)
+
+https://bitbucket.org/asbuch/lrcalc

build/pkgs/lrcalc_python/checksums.ini

@@ -0,0 +1,5 @@
+tarball=lrcalc-VERSION.tar.gz
+sha1=3e9366d9e8b8beccec70b07d174b8f6683c01574
+md5=4ae444d12ed8e0dd770594ea3ef4a208
+cksum=2741305196
+upstream_url=https://pypi.io/packages/source/l/lrcalc/lrcalc-VERSION.tar.gz

build/pkgs/lrcalc_python/dependencies

@@ -0,0 +1,5 @@
+$(PYTHON) lrcalc | $(PYTHON_TOOLCHAIN) cython
+
+----------
+All lines of this file are ignored except the first.
+It is copied by SAGE_ROOT/build/make/install into SAGE_ROOT/build/make/Makefile.

build/pkgs/lrcalc_python/install-requires.txt

@@ -0,0 +1 @@
+lrcalc ~=2.1

build/pkgs/lrcalc_python/package-version.txt

@@ -0,0 +1 @@
+2.1

build/pkgs/lrcalc_python/spkg-install.in

@@ -0,0 +1 @@
+cd src && sdh_pip_install .

build/pkgs/lrcalc_python/type

@@ -0,0 +1 @@
+standard

build/pkgs/sagelib/dependencies

@@ -1,4 +1,4 @@
-FORCE $(SCRIPTS) arb boost_cropped $(BLAS) brial cliquer cypari cysignals cython ecl eclib ecm flint libgd gap giac givaro glpk gmpy2 gsl iml jinja2 jupyter_core lcalc lrcalc libbraiding libhomfly libpng linbox m4ri m4rie memory_allocator mpc mpfi mpfr $(MP_LIBRARY) ntl numpy pari pip pkgconfig planarity ppl pplpy primesieve primecount primecountpy pycygwin $(PYTHON) ratpoints requests rw sage_conf singular symmetrica zn_poly $(PCFILES) | $(PYTHON_TOOLCHAIN) sage_setup
+FORCE $(SCRIPTS) arb boost_cropped $(BLAS) brial cliquer cypari cysignals cython ecl eclib ecm flint libgd gap giac givaro glpk gmpy2 gsl iml jinja2 jupyter_core lcalc lrcalc_python libbraiding libhomfly libpng linbox m4ri m4rie memory_allocator mpc mpfi mpfr $(MP_LIBRARY) ntl numpy pari pip pkgconfig planarity ppl pplpy primesieve primecount primecountpy pycygwin $(PYTHON) ratpoints requests rw sage_conf singular symmetrica zn_poly $(PCFILES) | $(PYTHON_TOOLCHAIN) sage_setup
 
 ----------
 All lines of this file are ignored except the first.