diff options
author | Thomas Kahle <tomka@gentoo.org> | 2012-03-24 21:28:09 +0000 |
---|---|---|
committer | Thomas Kahle <tomka@gentoo.org> | 2012-03-24 21:28:09 +0000 |
commit | 9b213dae0196b56a73c4f1b8f79999c2bd57767d (patch) | |
tree | 7e3ea337e8c258b7a866d18eda1ae57f5f57c98a /sci-mathematics/singular | |
parent | Make opengl dependency soft in kde-workspace (except kwin) (diff) | |
download | historical-9b213dae0196b56a73c4f1b8f79999c2bd57767d.tar.gz historical-9b213dae0196b56a73c4f1b8f79999c2bd57767d.tar.bz2 historical-9b213dae0196b56a73c4f1b8f79999c2bd57767d.zip |
add 3.1.4 with python support. Kudos to all contributors from lmona.de and sage-on-gentoo
Package-Manager: portage-2.1.10.50/cvs/Linux x86_64
Diffstat (limited to 'sci-mathematics/singular')
-rw-r--r-- | sci-mathematics/singular/ChangeLog | 11 | ||||
-rw-r--r-- | sci-mathematics/singular/Manifest | 12 | ||||
-rw-r--r-- | sci-mathematics/singular/files/singular-3.1.3.2-python.patch | 45 | ||||
-rw-r--r-- | sci-mathematics/singular/singular-3.1.4.ebuild | 179 |
4 files changed, 241 insertions, 6 deletions
diff --git a/sci-mathematics/singular/ChangeLog b/sci-mathematics/singular/ChangeLog index 0b114dbd6142..e74868034785 100644 --- a/sci-mathematics/singular/ChangeLog +++ b/sci-mathematics/singular/ChangeLog @@ -1,6 +1,13 @@ # 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.48 2011/12/23 12:49:25 tomka Exp $ +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/singular/ChangeLog,v 1.49 2012/03/24 21:28:09 tomka Exp $ + +*singular-3.1.4 (24 Mar 2012) + + 24 Mar 2012; Thomas Kahle <tomka@gentoo.org> + +files/singular-3.1.3.2-python.patch, +singular-3.1.4.ebuild: + add 3.1.4 with python support. Kudos to all contributors from lmona.de and + sage-on-gentoo *singular-3.1.3.3 (23 Dec 2011) diff --git a/sci-mathematics/singular/Manifest b/sci-mathematics/singular/Manifest index 8b9ea981fde3..bb4228dadfd1 100644 --- a/sci-mathematics/singular/Manifest +++ b/sci-mathematics/singular/Manifest @@ -5,6 +5,7 @@ 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.2-python.patch 1136 RMD160 7a2a8b51267affb02816426ccf0feb2137aeb91c SHA1 0c4b568458a8de5284c1801f049805c2a0e606ea SHA256 3fc61301eed3d51ffaf12265e1c302be23ee10cb4d3e9a86769d79bf817c43d3 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 @@ -14,15 +15,18 @@ DIST Singular-3-1-3-1-share.tar.gz 9413521 RMD160 f5f9ccfa22552c95745313475b6131 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 +DIST Singular-3-1-4-share.tar.gz 9544863 RMD160 1d40573e111f26b2b5200be441b57740b68683e5 SHA1 75e968a3e4ca607d150f1a0597d79c7b38028a50 SHA256 8e4f36163b258cfaf7a4e8379e1e031721092326693264a0c4154381d15c871a +DIST Singular-3-1-4.tar.gz 20662954 RMD160 850daae35b3897ff8fd84fe25d92de672b568bb2 SHA1 f016de5c19a68826b7f7a8fdbb5f8ba612484ab3 SHA256 e15ec070b277981a7b6448e0ae3127a6b8539f4312a1e755c1003054e4ef6e84 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 EBUILD singular-3.1.3.3.ebuild 4956 RMD160 60b37151f3b83fc3a6c75ff262a54b2623df95af SHA1 e5c1fe737d3a1009693686100d4d01b781120577 SHA256 8c41de9bb23dafa5314c595ab989f67b4236be8fb42f223c1bec8f4bfdc4437a -MISC ChangeLog 11413 RMD160 7d947d05bd5b695a9144b4b99b2685486f622871 SHA1 95f4b13a1285d7dc18f773f572fdae21aec73c0a SHA256 5117716ff0be06c2f566e8f78702d1837a1754a562560bf14f5129d534113daf +EBUILD singular-3.1.4.ebuild 4829 RMD160 d6e03ae7e42ca1666afa7d2a67b0f59908a0766f SHA1 968847199c3283beeeb03c2a4b5483045568d855 SHA256 1df5d0586016870eeca68ed58dd4f5857449eca4e2716b1eb55a3b8560891cca +MISC ChangeLog 11650 RMD160 e9753b7855709137b469e52dc000afedcc5889a1 SHA1 e74c280aa2093de0a501fc8a03bd59fe5eb6651a SHA256 b3c91d8e191d6e06e828e9dd8cb80befb8c592840a0f49332bdad3906e44ae1c MISC metadata.xml 369 RMD160 a0e979ca13cc60ced54af5d3c02cfb8b76bd6af1 SHA1 dcc261552e4483b66399c450482fc112e6a27994 SHA256 cff5f6b561efdc5121015bb0afc25656aa698d41b6c3c62019e13b5fa0980e20 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iF4EAREIAAYFAk70eN8ACgkQodBTJSDyo64WrQD/cigZ4vY1g04so9mNk4bdFy3f -ac3cEUiFJW5mxNgxCyUA/3G5WhHcEnOrIK2VHFS5IVJTgG8l6lDXM1QnO19RzutH -=bli7 +iF4EAREIAAYFAk9uPHUACgkQodBTJSDyo66rNQD9Ggo/o850PNNBoBMu/EP1KOdd +qHqP6Cipuc5SsYor3TcA/1re7pZgUJited4uunOVJny+qxuRDuQA+iC09cpqw6Yh +=Q34T -----END PGP SIGNATURE----- diff --git a/sci-mathematics/singular/files/singular-3.1.3.2-python.patch b/sci-mathematics/singular/files/singular-3.1.3.2-python.patch new file mode 100644 index 000000000000..2cc29c9a553b --- /dev/null +++ b/sci-mathematics/singular/files/singular-3.1.3.2-python.patch @@ -0,0 +1,45 @@ +--- Singular/pyobject.cc.orig 2011-01-31 15:03:16.000000000 +0100 ++++ Singular/pyobject.cc 2011-08-24 17:22:57.000000000 +0200 +@@ -14,7 +14,7 @@ + + + +- ++#include <Python.h> + + #include <Singular/mod2.h> + +@@ -27,7 +27,7 @@ + + #include <Singular/lists.h> + +-#include <Python.h> ++ + #include <iterator> // std::distance + #include <stdio.h> + +@@ -592,11 +592,12 @@ + long len = newElts.size(); + for (long idx = 0; idx < len; ++idx) + { +- char* name = newElts[idx][0].str(); ++ PythonObject current (newElts[idx]); ++ char* name = current.operator[](0).str(); + if (name && (*name != '\0') && (*name != '_')) + { + Py_XDECREF(get_current_definition(name)); +- newElts[idx][1].import_as(name); ++ newElts[idx].operator[](1).import_as(name); + } + + } +--- Singular/pyobject_setup.cc.orig 2011-02-10 19:15:30.000000000 +0100 ++++ Singular/pyobject_setup.cc 2011-08-24 17:23:55.000000000 +0200 +@@ -12,6 +12,7 @@ + **/ + //***************************************************************************** + ++#include <Python.h> + #include <Singular/mod2.h> + #include <kernel/febase.h> + #include "static.h" diff --git a/sci-mathematics/singular/singular-3.1.4.ebuild b/sci-mathematics/singular/singular-3.1.4.ebuild new file mode 100644 index 000000000000..8e873334db19 --- /dev/null +++ b/sci-mathematics/singular/singular-3.1.4.ebuild @@ -0,0 +1,179 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/singular/singular-3.1.4.ebuild,v 1.1 2012/03/24 21:28:09 tomka Exp $ + +EAPI="3" +WANT_AUTOCONF="2.1" # Upstream ticket 240 -> wontfix + +PYTHON_DEPEND="python? 2" + +# Upstream does not care about tests. +RESTRICT="test" + +inherit autotools eutils elisp-common flag-o-matic multilib prefix python 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-4" +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 python +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 )" + +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 + + if use python; then + python_set_active_version 2 + python_pkg_setup + 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 + 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 + + 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 \ + --with-malloc=system \ + $(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 "${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} + 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 +} |