bump to 4.0.2

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x565C32BC

4 files changed, 172 insertions, 20 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/Manifest b/sci-mathematics/singular/Manifest
index 9a8b4ddd3a0a..8a4dc148060d 100644
--- a/sci-mathematics/singular/Manifest
+++ b/sci-mathematics/singular/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX 60singular-gentoo.el 298 SHA256 b05a83af5a80fc1240e77d1cd036f4c9ca00907d11fb90d7f0ffb0c92ff7d235 SHA512 4c17a25d91c085e12f26441fcde858e61bf191bd7d9dcf63ff5b5a1dce1d63e3f7c4f78ce8afa4f2359ad4ba6eb51f3e224ae6c502b18f5f7a76738534337431 WHIRLPOOL 371c5fe968afea07fa8ca4bd51392859a18565b6f34e43d698ef433e28db0587eaa64f2b83cc71979104d1ef121c690f8113ed6efa424a00397e0256b58d55d7
 AUX singular-3.0.4.4-nostrip.patch 453 SHA256 70d6972d7bddd1d8d601f715465a46c92eba1edf2c5608bbd01ae65c6fd64553 SHA512 2fd31198c7c4e752976539a7ddc3b03bb4030efc52e66e5a2d34ce438af558d9d8b45aa088da6cf4eb1edf7f7239994f6eea040d0a8eb0c2c854b6275e7dde5f WHIRLPOOL 4cc614b3c1e62e3ad68725e8f0cf85522ee1190fa4d8f8af1344eaead28d9837c60ac468f5b3206ba03dc9db2656257108d029e73f0ab9666f220568f049825d
@@ -12,27 +12,19 @@ AUX singular-3.1.3.3-os_x_ppc.patch 368 SHA256 33dbb7ab84a24c9c4e08e49acd955d8a4
 AUX singular-3.1.3.3.make_parallel.2.patch 1498 SHA256 4d16186fc3e218d86a99f45d414e84b0d91d2ca0c10a1431fc73d9275acd0686 SHA512 368690aa1063bf78b211f3291ec5a00a6369a83978f371d2dc6557b8924fff4ced8a438b1ca5464d3886ae94c155b67db5a00470644c8a03b7aeadb4aa74d2e7 WHIRLPOOL d5bf887e95ee5b321bcd3dd7ddd406e540a9cd00406009d381f191bccce572d95493d273114a5e9c055c6dcd4c12fd391d4eef098d97815500abb114ab961313
 AUX singular-3.1.6-factory_template_instantiation.patch 900 SHA256 03c64c0f4946a4de9b57f4ae644bb364283763b56075e712c617972de4636c37 SHA512 0a0d7a271fddf543de6d8d987322e4062997a6283ccbb90f55c8d70ed39a2e58a0d68e881c0d260ad9f4ceaf60352bcd78a48b6f707a7719369c0b4cbe47542f WHIRLPOOL 8b0a5903c6d13cb94e68791fa1ab7e6846909059ebf4d9d5eda5a04693fc09eed93c1c95ad03af018068c044846b9da6d98cc11da03a8277d29ce4860671946c
 AUX singular-3.1.6-ntl6compat.patch 1401 SHA256 4fbc4bd0817e585345a7dd3fa8df8c19e8ed241fb78d911c2e7161b1e12e9c1c SHA512 5d6c4ec73b81cebcd8d24dc75efedb2f3da656fc5103701f25f7bba40355e995f116acddb7bb711b8832a89ec55a1b7fbbc7dd9215822f786e7a6012905b66be WHIRLPOOL c0ee7ee9486eda07f00df2ab4604b88813d19dd47662d25e16eb9c83ede3f85589f7c1d6d675791d0198c53ceff9a2fe47c4fdcc185e08d172fa4798bcd6bf76
+AUX singular-4.0.0-fix-omalloc-ar-detection.patch 484 SHA256 510bcac07d297b39579e99caf101cd9132a607453ff2566f8e7024a2cb23ccf6 SHA512 4f74b1d436c17efa3872a6b24e56c691220813a3cc2debeb19caa5dd6bf0e3c39af32e43e3d7afb5af40f985ec56377128185b9138dfcf77a04618ba444ea619 WHIRLPOOL 9485b6c7adce21c208da12acc62babeadeba20bd9fee15c3f10833246f2ed225887cdf8d9e8d35b29ca5753acf7e8dca8a7a802d67a99d6ce066dc027ebbb512
 DIST Singular-3-1-6-share.tar.gz 10620177 SHA256 c74a97b7eb8ed53417682637fe11c2480aeb1a6cbf4a8db27a1b16a162e83c4d SHA512 54bff29c5d64609583ec8b1c43005a1ff453c8f2cedfe9a26ac840888e9d306e3104e14aea5a3cc923fac916215c4285ecfe5ae7e1242aee0308b5e4c6e2d48d WHIRLPOOL a1edc8fa9cad189af413870b0e63316e135e8456075f13b3d8036afafd6c25f4bcc854432cdcb8c2ec690c63b43f616367aa9f1027c096e95f22aa0508943f67
 DIST Singular-3-1-6.tar.gz 25535111 SHA256 7956a17a0b5d428fea25bc0bc6c19c753748fb98bb2926c49b9fbcbec94172ff SHA512 103a10dd474d93cceb678bcef1a4aae5ec693cb9e68c9d63a7536929b738a0127501ee145a79cc3b9ddfa4bd1ca0f05e640eeb3b0fbdb60de4f56aa5beacc213 WHIRLPOOL 71ef6d505f7c8b2eeacd46666640d7b3c79f75d6c2c858b135553b1fb3a9dd7d88df74924009468c32aa4aa748b88ccb7762010ab4d36eec420a07fd36e8dd22
+DIST singular-4.0.2-share.tar.gz 8789162 SHA256 fe81cb100f3b73b159eb4a8122a29bc0f7705ef6f62ad55b68b5582c1ec0642d SHA512 068827df04a5d1b4407dbaab1296d0120071dc109b749037b02263d51906852a5c2c1ef321733953a181c2d3d0fe799c197ef0af3b9341810ecf31a5324e0a25 WHIRLPOOL 615487e95e32d9f07552e92ebcd46e3071d110dd31e7d980b01340d22a5205ba2d771532fad1bf44863a38820428157284a171e0b901861fda6e51482d546adc
+DIST singular-4.0.2.tar.gz 8635172 SHA256 c105a2c8ace0b3c9189b782ed63660ce235407d0160907c2cafc2128d36d8cb7 SHA512 4543a45839ce8adc45e3b2edd84a6e398b7ba157da1eda050dbce2a8b20333eb0c63433e3e7eaf59d76bf6bcb65c1b1611bfc08c25fd493c88e2f06624898e3d WHIRLPOOL fe30bc87c6b403b2e30bd1c016aeeb015c2a64a63d87b81536dc53a2555ac068f3e0c6d8763775d8be5e5e1a935aadab1c86b603cbb698234a19cc9cfffac282
 EBUILD singular-3.1.6.ebuild 4770 SHA256 76405ee23daaff5d73b42e96c18e93a56277c6d3ecb1f32b7fa6df9b22a76d8d SHA512 0308de0e31ec6f8e5801a3375f43f52970d0e173ae48484ddfa074021535d82962ba494a4bc200b4e41c0e3a59702499003b2330ce03806081bf1bdac9b7ec12 WHIRLPOOL 752fa5fdff5f4e719af2ca8edc4ebc90ce8744ede046f7f5b8a7d0f9d142dbc7b8dbbb1d77abc39867337adbe44250af40b286cb59598c24334533fbbd4517a5
-MISC ChangeLog 13278 SHA256 6f8e8c6202fbbe77b786f59ce69fad0bc0b3ab311d955e5b0b7e8fe1534c699b SHA512 0ebdd40e3ae596f1cde9f142d30145dbd0741f320c4a2c87c2d5d7e5f85f95eec6100097377971752faefe31a77c99f045fc29612ba387248f76dac26fee1a38 WHIRLPOOL 756c05f03ee99124428bd26bf451354b1def99315e5f51540ea44e90a276d0faf96ffb904821e97748d876d293d0595879952dc047fa18b60e97e21080520b1f
+EBUILD singular-4.0.2.ebuild 4011 SHA256 9d7255cebe5ecce24a6bfab2ad859e2f49c081b66f2304f3ef2a47cd2081048a SHA512 36592bc11624ef50cf4fed13d865ba000a93dcf6826b3799fb2f967524ca01797c72e97cf44162795943559ffd007b312b89d54c34d52cd8ffa96883a848fd8b WHIRLPOOL 51caf21ac5ca048b0ae8f634931b8b4d2f0300ffbfbd004e1e4139adf8d387addeb2e851cf39eb9102da6ad3ecba1557b2aa5d9eefc4a1d0395afae338d64b50
+MISC ChangeLog 13454 SHA256 b0973e4131d02f35d1beab6cd5486c8d70c11da2ca814c9a99a7b693c76612ba SHA512 a2d45a85bd49972759f3036df8bcb702b58e14cb572b662086fcdd28e90ad2d9428f1fb2c425719c23538372d37d65281ceb4243003ff592eb48c85db9ebbc5d WHIRLPOOL 0f19f4f3b2b6561ba161b9a149b880d9f3dae0f9367c92a92ccdd1b2195c1c801e65aa9df603189d583fc772d4b85baec5267bbe62ca783a2cb356c242f22245
 MISC metadata.xml 381 SHA256 784d034201d00e1cf426a61486184b5178702a00dbaa4be3740a462c45cc1312 SHA512 5896b2b956ca1405616871bdb55981b94a22cb4b4f6483096429ec8b010d522d32d9e4eb0a87bc040aab6d3ff8007f1b0f3172d7994f74a408dd9628e89dc08d WHIRLPOOL d5b8312b3aed717bcf191dccad086994456e413a0444d11c216e96a416b4cf1d3c4903ba187cdee3e61a9dddaa1858958766e0782b28ab8ff6c6d5fa86b7eaac
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCgBmBQJUgYokXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirwAwP/jVUqWfq9r7i3YZhnwlU5C+L
-dq4HIyk/Lf4+QMju/Kqi5BXgnjRCc3dtVQ3BbWt7sdMwuKk+87mcux4pPFWWXb20
-5nZ9E/ARIUh+e7lEfZ5mU+oqfi9feGqMN7hrDGODLOh9QnK0n8cU5mc5uSoag9dh
-KIPj4dsN4t/kNRuNDlPqP/pnm9Jr1XM/6O5+el1dj99gs1TtAlvAqX/QuL5v3pII
-kGz+l1+bT4uZoeXsOWribqA18yVbjCTHKz+TF4lyohBPwfM5Yaj9PX4Dz0q/N0mU
-tIODEkMYZT7rBm3ai4ao+x34lb2D74nQeHjYUDRD4YbWbkLDueVKI8R8HiZF5tku
-MYd+zQXipCzjh+UNngWWUu2WT+k5PLlqCvp83tOWjEw4fCgOVO09llP/6TfTxZQ1
-ZV18HzZ/Dd1dFe0FPhiy4gBBVzEW2vmtKulQ+WZzefQZ3M0Bqlxmc3lApx1SNvI/
-O5WQYWc/qOvMWoXiKmrv+prePNWTbu9ZEaNiWBiblW9VDNNFaz5lZ2iElfIlVyKO
-uyNLzHFDpUsQMqu8Jm+jp0C8urFt81gr9gbaUSDAo6jO58B/RiuXQ2rs0p+CPxDv
-RoCp9Jo2vkOSu0Vljpj8on7lhDplEeO6g78MjbBq2J3HaCAAPgo9V7ipHDkTL1mU
-rR7SLZPLaIQbLgcTzYLw
-=417N
+iF4EAREIAAYFAlT9pVYACgkQid6yGVZcMrxIvgD+NOCYG1gCLOyp5rBkDKR4nsz7
+m32ihprs2xzTE+1jlN0A/jrqv+N9K6Fpj5i67zfPiBykms+MT18UX2yyTF9LOpJF
+=PKYy
 -----END PGP SIGNATURE-----
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
+}