Import 3.1.3.3 from sage-on-gentoo. Thanks François Bissey

Package-Manager: portage-2.1.10.41/cvs/Linux x86_64

6 files changed, 265 insertions, 5 deletions

diff --git a/sci-mathematics/singular/ChangeLog b/sci-mathematics/singular/ChangeLog
index 6be20dcc4a99..0b114dbd6142 100644
--- a/sci-mathematics/singular/ChangeLog
+++ b/sci-mathematics/singular/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sci-mathematics/singular
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/singular/ChangeLog,v 1.47 2011/05/03 14:51:47 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/singular/ChangeLog,v 1.48 2011/12/23 12:49:25 tomka Exp $
+
+*singular-3.1.3.3 (23 Dec 2011)
+
+  23 Dec 2011; Thomas Kahle <tomka@gentoo.org> +singular-3.1.3.3.ebuild,
+  +files/singular-3.1.3.3-Minor.h.patch,
+  +files/singular-3.1.3.3-os_x_ppc.patch,
+  +files/singular-3.1.3.3.make_parallel.2.patch:
+  Import 3.1.3.3 from sage-on-gentoo. Thanks François Bissey
 
 *singular-3.1.3.1 (03 May 2011)
 
diff --git a/sci-mathematics/singular/Manifest b/sci-mathematics/singular/Manifest
index f61511aaef26..8b9ea981fde3 100644
--- a/sci-mathematics/singular/Manifest
+++ b/sci-mathematics/singular/Manifest
@@ -5,18 +5,24 @@ AUX 60singular-gentoo.el 298 RMD160 6bd931435ad813a3a63c02ea68d90e768a685d88 SHA
 AUX singular-3.0.4.4-nostrip.patch 453 RMD160 396d1c318ee76767b9dff9de7db516f988950962 SHA1 c1e154ecadd31286a1c2c6dc4d51170b7ecc62e9 SHA256 70d6972d7bddd1d8d601f715465a46c92eba1edf2c5608bbd01ae65c6fd64553
 AUX singular-3.1.0-emacs-22.patch 637 RMD160 ad6648dd733a064aa8f801056ed8f9c3f84fad90 SHA1 a0f3bc3a866618798f30fdfb97ca8e30bffc4e7f SHA256 2ae842d9636bd132271a23aa03c6810e6bdfaf0bf31b4376d8488402a41dd5a3
 AUX singular-3.1.0-gentoo.patch 4563 RMD160 1bba02ab548c81a1b92e57accd977333b2a873d3 SHA1 9e7dfcef890f506c508d72dbcb54e30978308f8b SHA256 31cf4c45ad9319431efda173a8bc24a9eac609b9fd2afadbe66156bec43f9146
+AUX singular-3.1.3.3-Minor.h.patch 234 RMD160 3178bb44bd0d791a967a71263baff977ca777ff9 SHA1 a41c8fe5d18f477e6cee60c5544c1bf169d4dbba SHA256 87419ec7ec7c51672c77dee048e1ca4dfaa325a37762e282a257cfb3d02da92a
+AUX singular-3.1.3.3-os_x_ppc.patch 368 RMD160 4ffe7632047c8786166f0c3b921d18ec4dcf4007 SHA1 b181ddae8c4b64b7da4efc47fb7a2f3e25a3f66b SHA256 33dbb7ab84a24c9c4e08e49acd955d8a4cb97884780c74a3b3d1123f3ed5cd08
+AUX singular-3.1.3.3.make_parallel.2.patch 1498 RMD160 2ae6e6118306381e67d62649792851f02f33da20 SHA1 4ae0fabd544d8304ada69d1ef510f279334bee5b SHA256 4d16186fc3e218d86a99f45d414e84b0d91d2ca0c10a1431fc73d9275acd0686
 DIST Singular-3-1-2-share.tar.gz 9341118 RMD160 585f8d77ec3624eea298b85bdd4f8d6383d63fd2 SHA1 eb98e7c63c2f73ecdee83ce45274127b8246008f SHA256 03ca31608684a02f645c3ab75fe06402fc076f05e1ed7154427855affbfab45e
 DIST Singular-3-1-2.tar.gz 19564373 RMD160 53f407f62af36a8570b027c30b73c54dc106b290 SHA1 19ede02ed4cd513efd20f5a54568bc096e1d2c35 SHA256 4fbe46cca2aef42fdf73ef8556350278f9f3b3d5d0d1b8e21c1a182e59f2b88a
 DIST Singular-3-1-3-1-share.tar.gz 9413521 RMD160 f5f9ccfa22552c95745313475b61314b8f266306 SHA1 e6a4de27ae212d426ce0017992c02fa37ed72269 SHA256 d02d7fc41e0b0b5699f818271a01ae10cff576b320eb9044e814c95e52659d11
 DIST Singular-3-1-3-1.tar.gz 19780477 RMD160 557d9413c0c7a7c93dcd735c0edb0dedd3b90014 SHA1 09cfb15bb7aa4c6f1379699bb36f04c01f18d0e7 SHA256 f097e49eb88044f501ef516d7c3e4e6d81b4df009ceeb3f846928067e3c1f3e0
+DIST Singular-3-1-3-3-share.tar.gz 9451406 RMD160 f1ffdd77a2394253c3f8f952b7bf7b3acac85483 SHA1 9a8c1315ca2778ee99b916fb5b7e1dfd2fa65ff7 SHA256 a9fe1bf80a95352a6d502d47c47eb5ecbff0066cdc3797ffe28fabcc0c4de816
+DIST Singular-3-1-3-3.tar.gz 20050926 RMD160 76a5ae09d0035d854c6a47de390595eaf1bc8959 SHA1 36fd44868c37f8ef228d05111450bcfb83d88d09 SHA256 1228c05fcd3a70244bc7fd676c46a65d64c57a223511ae2ac2fb1f6b5699ce39
 EBUILD singular-3.1.2-r2.ebuild 4829 RMD160 99a33be0d2ea04161d2dd07d9f6b3ae9733760ce SHA1 df303d34f2da89dfd9773c62b4bfd3250a164c48 SHA256 5d13a92d0b9d48b44b2ee10f7b9abf989d861f6ec9ec7a78a794e61cef529048
 EBUILD singular-3.1.3.1.ebuild 4655 RMD160 2af3c2fb9deee0bd9f15196f8b40ef13181c67c4 SHA1 2d8f8f2359a0221e02e5b28fca6150dcf076ff5e SHA256 e3f7b6d0a80560a4571e1426c4b7fcd6bae7cd8b1622a4392e78809f73d5f3d0
-MISC ChangeLog 11112 RMD160 99c6762aaaace5471a16dac85fa6e2da8d68e068 SHA1 d377ad09675c4d34d0354e2552753956a45cc779 SHA256 2c2e1d8afcdd668bd67431aa3054986e8b21c75f380b1d97d5fb43dceb27fb40
+EBUILD singular-3.1.3.3.ebuild 4956 RMD160 60b37151f3b83fc3a6c75ff262a54b2623df95af SHA1 e5c1fe737d3a1009693686100d4d01b781120577 SHA256 8c41de9bb23dafa5314c595ab989f67b4236be8fb42f223c1bec8f4bfdc4437a
+MISC ChangeLog 11413 RMD160 7d947d05bd5b695a9144b4b99b2685486f622871 SHA1 95f4b13a1285d7dc18f773f572fdae21aec73c0a SHA256 5117716ff0be06c2f566e8f78702d1837a1754a562560bf14f5129d534113daf
 MISC metadata.xml 369 RMD160 a0e979ca13cc60ced54af5d3c02cfb8b76bd6af1 SHA1 dcc261552e4483b66399c450482fc112e6a27994 SHA256 cff5f6b561efdc5121015bb0afc25656aa698d41b6c3c62019e13b5fa0980e20
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk3AFygACgkQodBTJSDyo642wQD7BqE6bpseYHghz7q0kYz1YtG0
-2G2gbBcSY+MB6Gy66hsA/A5u3aB4KsKqyAV0zFVxw0yAcV9g0vawuh5Wqv0UhZY+
-=Qn1W
+iF4EAREIAAYFAk70eN8ACgkQodBTJSDyo64WrQD/cigZ4vY1g04so9mNk4bdFy3f
+ac3cEUiFJW5mxNgxCyUA/3G5WhHcEnOrIK2VHFS5IVJTgG8l6lDXM1QnO19RzutH
+=bli7
 -----END PGP SIGNATURE-----
diff --git a/sci-mathematics/singular/files/singular-3.1.3.3-Minor.h.patch b/sci-mathematics/singular/files/singular-3.1.3.3-Minor.h.patch
new file mode 100644
index 000000000000..1d03e61ae308
--- /dev/null
+++ b/sci-mathematics/singular/files/singular-3.1.3.3-Minor.h.patch
@@ -0,0 +1,10 @@
+--- src/Singular/Minor.h	2010-02-02 08:22:24.000000000 -0500
++++ patches/Minor.h	2011-06-28 13:26:01.000000000 -0400
+@@ -2,6 +2,7 @@
+ #define MINOR_H
+ 
+ #include <assert.h>
++#include <time.h>
+ #include <iostream>
+ #include <string>
+ 
diff --git a/sci-mathematics/singular/files/singular-3.1.3.3-os_x_ppc.patch b/sci-mathematics/singular/files/singular-3.1.3.3-os_x_ppc.patch
new file mode 100644
index 000000000000..e0c54f465548
--- /dev/null
+++ b/sci-mathematics/singular/files/singular-3.1.3.3-os_x_ppc.patch
@@ -0,0 +1,14 @@
+diff -r -u src/kernel/mod_raw.cc src.osx/kernel/mod_raw.cc
+--- src/kernel/mod_raw.cc	2011-04-25 08:25:05.000000000 +0200
++++ src.osx/kernel/mod_raw.cc	2011-10-10 10:47:17.000000000 +0200
+@@ -172,6 +172,10 @@
+ #define HAVE_ELF_SYSTEM
+ #endif
+ 
++#if defined(ppcMac_darwin)
++#define HAVE_ELF_SYSTEM
++#endif
++
+ #if defined(ix86Mac_darwin)
+ #define HAVE_ELF_SYSTEM
+ #endif
diff --git a/sci-mathematics/singular/files/singular-3.1.3.3.make_parallel.2.patch b/sci-mathematics/singular/files/singular-3.1.3.3.make_parallel.2.patch
new file mode 100644
index 000000000000..8eeaed88d9fb
--- /dev/null
+++ b/sci-mathematics/singular/files/singular-3.1.3.3.make_parallel.2.patch
@@ -0,0 +1,45 @@
+diff -ru src/Makefile.in src.parallel/Makefile.in
+--- src/Makefile.in	2011-08-10 19:47:17.000000000 +0200
++++ src.parallel/Makefile.in	2011-12-10 13:40:18.000000000 +0100
+@@ -146,14 +146,14 @@
+ 	rm -rf configure
+ 
+ clean mostlyclean: local-clean
+-	$(recurse)
++	+$(recurse)
+ 
+ distclean: local-distclean
+-	$(recurse)
++	+$(recurse)
+ 	rm -rf build
+ 
+ maintainer-clean: uninstall local-maintainer-clean
+-	$(recurse)
++	+$(recurse)
+ 
+ ##############################################################
+ # some extra targets for the specific packages
+diff -ru src/Singular/Makefile.in src.parallel/Singular/Makefile.in
+--- src/Singular/Makefile.in	2011-09-30 12:10:15.000000000 +0200
++++ src.parallel/Singular/Makefile.in	2011-12-10 13:39:41.000000000 +0100
+@@ -413,7 +413,7 @@
+ 
+ cntrlc.o cntrlc.og : feOptES.inc feOptTS.inc feOpt.inc version.h
+ 
+-misc_ip.o emacs.o tesths.o: version.h
++misc_ip.o emacs.o tesths.o: feOpt.inc version.h
+ 
+ claptmpl.o: claptmpl.cc mod2.h
+ 	${CXX} ${CXXFLAGS}  ${CPPFLAGS} ${DEFS} -c $<
+diff -ru src/kernel/Makefile.in src.parallel/kernel/Makefile.in
+--- src/kernel/Makefile.in	2011-05-18 09:37:59.000000000 +0200
++++ src.parallel/kernel/Makefile.in	2011-12-10 13:39:41.000000000 +0100
+@@ -243,7 +243,7 @@
+ 
+ # Hmm compiling with -fomit-frame-pointer resulted in access violation
+ # under cygwin
+-prCopy.o: prCopy.inc
++prCopy.o prCopy.og prCopy.op: prCopy.inc
+ 
+ prCopy.inc : prCopyMacros.h prCopyTemplate.cc prCopy.pl
+ 	$(PERL) prCopy.pl > prCopy.xx && mv prCopy.xx prCopy.inc
diff --git a/sci-mathematics/singular/singular-3.1.3.3.ebuild b/sci-mathematics/singular/singular-3.1.3.3.ebuild
new file mode 100644
index 000000000000..ca0860495cfa
--- /dev/null
+++ b/sci-mathematics/singular/singular-3.1.3.3.ebuild
@@ -0,0 +1,177 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/singular/singular-3.1.3.3.ebuild,v 1.1 2011/12/23 12:49:25 tomka Exp $
+
+EAPI="3"
+WANT_AUTOCONF="2.1" # Upstream ticket 240 -> wontfix
+
+# Upstream does not care about tests.
+RESTRICT="test"
+
+inherit autotools eutils elisp-common flag-o-matic multilib prefix versionator
+
+MY_PN=Singular
+MY_PV=$(replace_all_version_separators -)
+MY_DIR=$(get_version_component_range 1-3 ${MY_PV})
+# There 'share' tarball does not get updated on every release
+MY_SHARE_DIR="3-1-3"
+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/"
+# Share stuff did not see a new version:
+SRC_URI="${SRC_COM}${MY_DIR}/${MY_PN}-${MY_PV}.tar.gz
+		 ${SRC_COM}${MY_SHARE_DIR}/Singular-${MY_PV_SHARE}-share.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-linux ~x86-macos"
+IUSE="boost doc emacs examples +readline test"
+
+RDEPEND="dev-libs/gmp
+	>=dev-libs/ntl-5.5.1
+	emacs? ( >=virtual/emacs-22 )"
+
+DEPEND="${RDEPEND}
+	dev-lang/perl
+	boost? ( dev-libs/boost )
+	readline? ( sys-libs/readline )
+	test? ( dev-util/cmake
+			dev-util/cppunit )"
+
+S="${WORKDIR}"/${MY_PN}-${MY_DIR}
+SITEFILE=60${PN}-gentoo.el
+
+pkg_setup() {
+	append-flags "-fPIC"
+	append-ldflags "-fPIC"
+	tc-export 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 () {
+	epatch "${FILESDIR}"/${PN}-3.1.0-gentoo.patch
+	epatch "${FILESDIR}"/${PN}-3.1.0-emacs-22.patch
+	epatch "${FILESDIR}"/${PN}-3.0.4.4-nostrip.patch
+	epatch "${FILESDIR}"/${PN}-3.1.3.3-Minor.h.patch
+	# fix parallel make issue reported upstream http://www.singular.uni-kl.de:8002/trac/ticket/395
+	epatch "${FILESDIR}"/${PN}-3.1.3.3.make_parallel.2.patch
+
+	if  [[ ${CHOST} == *-darwin* ]] ; then
+		epatch "${FILESDIR}"/${PN}-3.1.3.3-os_x_ppc.patch
+	fi
+
+	eprefixify kernel/feResource.cc
+
+	sed -i \
+		-e "/CXXFLAGS/ s/--no-exceptions//g" \
+		-e "s/SLDFLAGS=-shared/SLDFLAGS=\"$(raw-ldflags) -shared\"/" \
+		"${S}"/Singular/configure.in || 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-gmp="${EPREFIX}"/usr \
+		--disable-NTL \
+		--disable-debug \
+		--disable-doc \
+		--without-MP \
+		--enable-factory \
+		--enable-libfac \
+		--enable-IntegerProgramming \
+		--enable-Singular \
+		$(use_with boost Boost) \
+		$(use_enable emacs) \
+		$(use_with readline) || die "configure failed"
+}
+
+src_compile() {
+	emake || die "emake failed"
+
+	if use emacs; then
+		cd "${WORKDIR}"/${MY_PN}/${MY_SHARE_DIR}/emacs/
+		elisp-compile *.el || die "elisp-compile failed"
+	fi
+}
+
+src_test() {
+	# Tests fail to link -lsingular, upstream ticket #243
+	emake test || die "tests failed"
+}
+
+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}
+	# fix install_name on macos, the build system is buggy enough not to add extra for OS X.
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		for d in *.so ; do
+			install_name_tool -id "${EPREFIX}/usr/$(get_libdir)/${PN}/${d}" "${d}"
+		done
+	fi
+	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
+}