Version bump adapted from sage-on-gentoo

(Portage version: 2.2.8-prefix/cvs/Linux x86_64, signed Manifest commit with key 0x13CB1360)

5 files changed, 255 insertions, 4 deletions

diff --git a/sci-mathematics/singular/ChangeLog b/sci-mathematics/singular/ChangeLog
index 552b33a4d3b3..95592b0b74fe 100644
--- a/sci-mathematics/singular/ChangeLog
+++ b/sci-mathematics/singular/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-mathematics/singular
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/singular/ChangeLog,v 1.54 2012/08/15 09:59:46 tomka Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/singular/ChangeLog,v 1.55 2014/03/11 19:07:22 bicatali Exp $
+
+*singular-3.1.6 (11 Mar 2014)
+
+  11 Mar 2014; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/singular-3.1.6-factory_template_instantiation.patch,
+  +files/singular-3.1.6-ntl6compat.patch, +singular-3.1.6.ebuild, metadata.xml:
+  Version bump adapted from sage-on-gentoo
 
   15 Aug 2012; Thomas Kahle <tomka@gentoo.org>
   +files/singular-3.1.3.3-install_name.patch:
diff --git a/sci-mathematics/singular/files/singular-3.1.6-factory_template_instantiation.patch b/sci-mathematics/singular/files/singular-3.1.6-factory_template_instantiation.patch
new file mode 100644
index 000000000000..edf764a758eb
--- /dev/null
+++ b/sci-mathematics/singular/files/singular-3.1.6-factory_template_instantiation.patch
@@ -0,0 +1,26 @@
+diff --git a/libfac/factor/tmpl_inst.cc b/libfac/factor/tmpl_inst.cc
+index bda287a..2f5ba49 100644
+Index: libfac/factor/tmpl_inst.cc
+===================================================================
+--- a/libfac/factor/tmpl_inst.cc
++++ b/libfac/factor/tmpl_inst.cc
+@@ -3,7 +3,7 @@
+ ////////////////////////////////////////////////////////////
+ 
+ 
+-//#include <templates/ftmpl_array.cc>
++#include <factory/templates/ftmpl_array.cc>
+ //#include <templates/ftmpl_factor.cc>
+ #include <templates/ftmpl_list.h>
+ #include <factory/templates/ftmpl_list.cc>
+@@ -75,8 +75,8 @@ template OSTREAM & operator << ( OSTREAM &, const List<Variable> & );
+ template OSTREAM & operator << ( OSTREAM &, const Array<int> & );
+ #endif
+ 
+-template class Array<int>;
+-template class Array<Variable>;
++//template class Array<int>;
++//template class Array<Variable>;
+ //template class Array<REvaluation>;
+ 
+ // for database
diff --git a/sci-mathematics/singular/files/singular-3.1.6-ntl6compat.patch b/sci-mathematics/singular/files/singular-3.1.6-ntl6compat.patch
new file mode 100644
index 000000000000..2fcbcba33e02
--- /dev/null
+++ b/sci-mathematics/singular/files/singular-3.1.6-ntl6compat.patch
@@ -0,0 +1,43 @@
+diff --git a/Singular/claptmpl.cc b/Singular/claptmpl.cc
+index 0fa6109..553afa5 100644
+Index: Singular/claptmpl.cc
+===================================================================
+--- a/Singular/claptmpl.cc
++++ b/Singular/claptmpl.cc
+@@ -123,3 +123,36 @@ template class std::list<PolyMinorValue>;
+ template class Cache<MinorKey, IntMinorValue>;
+ template class Cache<MinorKey, PolyMinorValue>;
+ 
++#ifdef HAVE_NTL
++#include<NTL/version.h>
++#if NTL_MAJOR_VERSION == 6
++
++#include<NTL/tools.h>
++#include<NTL/lzz_pE.h>
++#include<NTL/lzz_pEX.h>
++#include<NTL/lzz_p.h>
++#include<NTL/vector.h>
++#include<NTL/pair.h>
++#include<NTL/GF2X.h>
++#include<NTL/GF2EX.h>
++#include<NTL/ZZ.h>
++#include<NTL/ZZX.h>
++#include<NTL/ZZ_pX.h>
++#ifdef NTL_CLIENT               // in <NTL/tools.h>: using of name space NTL
++NTL_CLIENT
++#endif
++template class Vec<zz_p>;
++template class Vec<zz_pE>;
++template class Mat<zz_p>;
++template class Mat<zz_pE>;
++template class Mat<ZZ>;
++template class Vec<Pair<zz_pEX, long> >;
++template class Vec<Pair<GF2EX, long> >;
++template class Vec<Pair<ZZX, long> >;
++template class Vec<Pair<ZZ_pX, long> >;
++template class Vec<Pair<GF2X, long> >;
++template void swap<zz_pE>(Vec<zz_pE>&, Vec<zz_pE>&);
++template long operator==<zz_p>(Vec<zz_p> const&, Vec<zz_p> const&);
++#endif
++
++#endif
diff --git a/sci-mathematics/singular/metadata.xml b/sci-mathematics/singular/metadata.xml
index ec150ef78eb2..936baecd730d 100644
--- a/sci-mathematics/singular/metadata.xml
+++ b/sci-mathematics/singular/metadata.xml
@@ -7,7 +7,6 @@
 </maintainer>
 <herd>sci-mathematics</herd>
 <use>
-  <flag name='boost'>Compile against external boost headers
-    (<pkg>dev-libs/boost</pkg>)</flag>
+  <flag name='boost'>Compile against external boost headers (<pkg>dev-libs/boost</pkg>)</flag>
 </use>
 </pkgmetadata>
diff --git a/sci-mathematics/singular/singular-3.1.6.ebuild b/sci-mathematics/singular/singular-3.1.6.ebuild
new file mode 100644
index 000000000000..ba1372a4f72e
--- /dev/null
+++ b/sci-mathematics/singular/singular-3.1.6.ebuild
@@ -0,0 +1,176 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/singular/singular-3.1.6.ebuild,v 1.1 2014/03/11 19:07:22 bicatali Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit autotools eutils elisp-common flag-o-matic multilib prefix python-single-r1 versionator
+
+MY_PN=Singular
+MY_PV=$(replace_all_version_separators -)
+MY_DIR=$(get_version_component_range 1-3 ${MY_PV})
+# Note: Upstream's share tarball may not get updated on every release
+MY_SHARE_DIR="3-1-6"
+MY_PV_SHARE="${MY_PV}"
+
+DESCRIPTION="Computer algebra system for polynomial computations"
+HOMEPAGE="http://www.singular.uni-kl.de/"
+
+SRC_COM="http://www.mathematik.uni-kl.de/ftp/pub/Math/${MY_PN}/SOURCES/"
+SRC_URI="${SRC_COM}${MY_DIR}/${MY_PN}-${MY_PV}.tar.gz
+		 ${SRC_COM}${MY_SHARE_DIR}/${MY_PN}-${MY_PV_SHARE}-share.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-linux"
+IUSE="boost doc emacs examples python readline test"
+
+RDEPEND="
+	dev-libs/gmp:0=
+	dev-libs/ntl:0=
+	emacs? ( >=virtual/emacs-22 )
+	readline? ( sys-libs/readline:0= )"
+DEPEND="${RDEPEND}
+	dev-lang/perl
+	boost? ( dev-libs/boost:0= )"
+
+# Upstream does not care about tests
+RESTRICT="test"
+
+S="${WORKDIR}/${MY_PN}-${MY_DIR}"
+
+pkg_setup() {
+	append-flags -fPIC
+	append-ldflags -fPIC
+	tc-export CC CPP CXX
+	use emacs && elisp-need-emacs 22
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare () {
+	epatch \
+		"${FILESDIR}"/${PN}-3.1.0-gentoo.patch \
+		"${FILESDIR}"/${PN}-3.1.0-emacs-22.patch \
+		"${FILESDIR}"/${PN}-3.0.4.4-nostrip.patch \
+		"${FILESDIR}"/${PN}-3.1.3.3-Minor.h.patch \
+		"${FILESDIR}"/${PN}-3.1.6-ntl6compat.patch \
+		"${FILESDIR}"/${PN}-3.1.6-factory_template_instantiation.patch
+	use python && epatch "${FILESDIR}"/${PN}-3.1.3.2-python.patch
+
+	if  [[ ${CHOST} == *-darwin* ]] ; then
+		epatch "${FILESDIR}"/${PN}-3.1.3.3-install_name.patch
+		eprefixify kernel/Makefile.in
+		eprefixify Singular/Makefile.in
+	fi
+
+	eprefixify kernel/feResource.cc
+
+	# The SLDFLAGS mangling prevents passing raw LDLAGS to gcc (see e.g. bug 414709)
+	sed -i \
+		-e "/CXXFLAGS/ s/--no-exceptions//g" \
+		-e "s/SLDFLAGS=-shared/SLDFLAGS=\"$(raw-ldflags) -shared\"\n\t  \tSLDFLAGS2=\"${LDFLAGS} -shared\"/" \
+		-e "s/  SLDFLAGS=/  SLDFLAGS=\n  SLDFLAGS2=/" \
+		-e "s/AC_SUBST(SLDFLAGS)/AC_SUBST(SLDFLAGS)\nAC_SUBST(SLDFLAGS2)/" \
+		"${S}"/Singular/configure.in || die
+
+	sed -i \
+		-e "s/@SLDFLAGS@/@SLDFLAGS@\nSLDFLAGS2\t= @SLDFLAGS2@/" \
+		-e "/\$(CXX).*SLDFLAGS/s/SLDFLAGS/SLDFLAGS2/" \
+		"${S}"/Singular/Makefile.in || die
+
+	# remove ntl sources for safety.
+	rm -r ntl || die
+
+	cd "${S}"/Singular || die "failed to cd into Singular/"
+
+	eautoconf
+}
+
+src_configure() {
+	econf \
+		--prefix="${S}"/build \
+		--exec-prefix="${S}"/build \
+		--bindir="${S}"/build/bin \
+		--libdir="${S}"/build/lib \
+		--libexecdir="${S}"/build/lib \
+		--includedir="${S}"/build/include \
+		--with-apint=gmp \
+		--with-NTL \
+		--disable-doc \
+		--without-MP \
+		--without-flint \
+		--enable-factory \
+		--enable-libfac \
+		--enable-IntegerProgramming \
+		--enable-Singular \
+		--with-malloc=system \
+		$(use_with python python embed) \
+		$(use_with boost Boost) \
+		$(use_enable emacs) \
+		$(use_with readline)
+}
+
+src_compile() {
+	emake
+	if use emacs; then
+		cd "${WORKDIR}"/${MY_PN}/${MY_SHARE_DIR}/emacs/
+		elisp-compile *.el
+	fi
+}
+
+src_test() {
+	# Tests fail to link -lsingular, upstream ticket #243
+	emake test
+}
+
+src_install () {
+	dodoc README
+	# execs and libraries
+	cd "${S}"/build/bin
+	dobin ${MY_PN}* gen_test change_cost solve_IP toric_ideal LLL
+	insinto /usr/$(get_libdir)/${PN}
+	doins *.so
+
+	dosym ${MY_PN}-${MY_DIR} /usr/bin/${MY_PN}
+	dosym ${MY_PN}-${MY_DIR} /usr/bin/${PN}
+
+	# stuff from the share tar ball
+	cd "${WORKDIR}"/${MY_PN}/${MY_SHARE_DIR}
+	insinto /usr/share/${PN}
+	doins -r LIB
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+	fi
+	if use doc; then
+		dohtml -r html/*
+		insinto /usr/share/${PN}
+		doins doc/singular.idx
+		cp info/${PN}.hlp info/${PN}.info &&
+		doinfo info/${PN}.info
+	fi
+	if use emacs; then
+		elisp-install ${PN} emacs/*.el emacs/*.elc emacs/.emacs*
+		elisp-site-file-install "${FILESDIR}"/60${PN}-gentoo.el
+	fi
+}
+
+pkg_postinst() {
+	einfo "The authors ask you to register as a SINGULAR user."
+	einfo "Please check the license file for details."
+	if use emacs; then
+		echo
+		ewarn "Please note that the ESingular emacs wrapper has been"
+		ewarn "removed in favor of full fledged singular support within"
+		ewarn "Gentoo's emacs infrastructure; i.e. just fire up emacs"
+		ewarn "and you should be good to go! See bug #193411 for more info."
+		echo
+	fi
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}