bump to 4.0.2

(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 565C32BC)

3 files changed, 162 insertions, 2 deletions

diff --git a/sci-mathematics/singular/ChangeLog b/sci-mathematics/singular/ChangeLog
index c316bd90afa1..4edcf0b08a1a 100644
--- a/sci-mathematics/singular/ChangeLog
+++ b/sci-mathematics/singular/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-mathematics/singular
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/singular/ChangeLog,v 1.60 2014/12/05 10:34:11 jlec Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/singular/ChangeLog,v 1.61 2015/03/09 13:49:39 tomka Exp $
+
+*singular-4.0.2 (09 Mar 2015)
+
+  09 Mar 2015; Thomas Kahle <tomka@gentoo.org>
+  +files/singular-4.0.0-fix-omalloc-ar-detection.patch, +singular-4.0.2.ebuild:
+  bump to 4.0.2
 
   05 Dec 2014; Justin Lecher <jlec@gentoo.org> -singular-3.1.2-r2.ebuild,
   -singular-3.1.3.1.ebuild, -singular-3.1.3.3.ebuild, -singular-3.1.4.ebuild,
diff --git a/sci-mathematics/singular/files/singular-4.0.0-fix-omalloc-ar-detection.patch b/sci-mathematics/singular/files/singular-4.0.0-fix-omalloc-ar-detection.patch
new file mode 100644
index 000000000000..87b44234af5f
--- /dev/null
+++ b/sci-mathematics/singular/files/singular-4.0.0-fix-omalloc-ar-detection.patch
@@ -0,0 +1,12 @@
+diff -U 3 -dHrN singular-4.0.0.orig/omalloc/configure.ac singular-4.0.0/omalloc/configure.ac
+--- singular-4.0.0.orig/omalloc/configure.ac	2014-03-06 18:07:49.000000000 +0100
++++ singular-4.0.0/omalloc/configure.ac	2014-05-09 15:41:19.755097185 +0200
+@@ -117,7 +117,7 @@
+ dnl check for programs
+ dnl
+ AC_CHECK_PROG(AR, ar, ar, :)
+-if test "$ac_cv_prog_AR" != ar; then
++if test "$ac_cv_prog_AR" = no; then
+   AC_MSG_ERROR(*** ar program not found)
+ fi
+ AC_CHECK_PROGS(PERL, perl, "no")
diff --git a/sci-mathematics/singular/singular-4.0.2.ebuild b/sci-mathematics/singular/singular-4.0.2.ebuild
new file mode 100644
index 000000000000..e55836950aad
--- /dev/null
+++ b/sci-mathematics/singular/singular-4.0.2.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/singular/singular-4.0.2.ebuild,v 1.1 2015/03/09 13:49:39 tomka Exp $
+
+EAPI=5
+
+inherit autotools eutils elisp-common flag-o-matic multilib prefix versionator
+
+MY_PN=Singular
+MY_PV=$(replace_all_version_separators '.')
+# Consistency is different...
+MY_DIR2=$(get_version_component_range 1-3 ${PV})
+MY_DIR=$(replace_all_version_separators '-' ${MY_DIR2})
+# This is where the share tarball unpacks to
+MY_SHARE_DIR="${WORKDIR}"/share/
+
+DESCRIPTION="Computer algebra system for polynomial computations"
+HOMEPAGE="http://www.singular.uni-kl.de/"
+SRC_URI="http://www.mathematik.uni-kl.de/ftp/pub/Math/${MY_PN}/SOURCES/${MY_DIR}/${PN}-${MY_PV}.tar.gz
+		 http://www.mathematik.uni-kl.de/ftp/pub/Math/${MY_PN}/SOURCES/${MY_DIR}/${PN}-${MY_PV}-share.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-linux ~x86-macos"
+IUSE="boost doc emacs examples python +readline"
+
+RDEPEND="dev-libs/gmp
+	>=dev-libs/ntl-5.5.1
+	emacs? ( >=virtual/emacs-22 )
+	sci-mathematics/flint
+	sci-mathematics/4ti2"
+
+DEPEND="${RDEPEND}
+	dev-lang/perl
+	boost? ( dev-libs/boost )
+	readline? ( sys-libs/readline )"
+
+SITEFILE=60${PN}-gentoo.el
+
+S="${WORKDIR}/${PN}-${MY_DIR2}"
+
+pkg_setup() {
+	append-flags "-fPIC"
+	append-ldflags "-fPIC"
+	tc-export AR CC CPP CXX
+
+	# Ensure that >=emacs-22 is selected
+	if use emacs; then
+		elisp-need-emacs 22 || die "Emacs version too low"
+	fi
+}
+
+src_prepare () {
+	# Need to do something about resources later...
+	# epatch "${FILESDIR}"/${PN}-4.0.0-gentoo.patch
+
+	# omalloc's old configure will fail if ar is not exactly 'ar'.
+	epatch "${FILESDIR}"/${PN}-4.0.0-fix-omalloc-ar-detection.patch
+
+	cd "${S}"/omalloc || die "failed to cd into omalloc directory"
+	eautoreconf
+}
+
+src_configure() {
+	econf --with-gmp \
+		  --with-ntl \
+		  --with-flint \
+		  --enable-gfanlib \
+		  --disable-debug \
+		  --disable-doc \
+		  --enable-factory \
+		  --enable-libfac \
+		  --enable-IntegerProgramming \
+		  $(use_with python python embed) \
+		  $(use_with boost Boost) \
+		  $(use_enable emacs) \
+		  $(use_with readline) || die "configure failed"
+}
+
+src_compile() {
+	emake || die "emake failed"
+
+	if use emacs; then
+		cd "${MY_SHARE_DIR}"singular/emacs/
+		elisp-compile *.el || die "elisp-compile failed"
+	fi
+}
+
+# src_install () {
+# 	dodoc README
+# 	# execs and libraries
+# 	cd "${S}"/build/bin
+# 	dobin ${MY_PN}* gen_test change_cost solve_IP toric_ideal LLL \
+# 		|| die "failed to install binaries"
+# 	insinto /usr/$(get_libdir)/${PN}
+# 	doins *.so || die "failed to install libraries"
+#
+# 	dosym ${MY_PN}-${MY_DIR} /usr/bin/${MY_PN} \
+# 		|| die "failed to create symbolic link"
+#
+# 	# stuff from the share tar ball
+# 	cd "${WORKDIR}"/${MY_PN}/${MY_SHARE_DIR}
+# 	insinto /usr/share/${PN}
+# 	doins -r LIB  || die "failed to install lib files"
+# 	if use examples; then
+# 		insinto /usr/share/doc/${PF}
+# 		doins -r examples || die "failed to install examples"
+# 	fi
+# 	if use doc; then
+# 		dohtml -r html/* || die "failed to install html docs"
+# 		insinto /usr/share/${PN}
+# 		doins doc/singular.idx || die "failed to install idx file"
+# 		cp info/${PN}.hlp info/${PN}.info &&
+# 		doinfo info/${PN}.info \
+# 			|| die "failed to install info files"
+# 	fi
+# 	if use emacs; then
+# 		elisp-install ${PN} emacs/*.el emacs/*.elc emacs/.emacs* \
+# 			|| die "elisp-install failed"
+# 		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+# 	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
+}