Fix bug 414709. Thanks Jean-Francis Roy for the solution.

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

3 files changed, 198 insertions, 5 deletions

diff --git a/sci-mathematics/singular/ChangeLog b/sci-mathematics/singular/ChangeLog
index e74868034785..159095b8a219 100644
--- a/sci-mathematics/singular/ChangeLog
+++ b/sci-mathematics/singular/ChangeLog
@@ -1,6 +1,11 @@
 # 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.49 2012/03/24 21:28:09 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/singular/ChangeLog,v 1.50 2012/05/13 06:42:27 tomka Exp $
+
+*singular-3.1.4-r1 (13 May 2012)
+
+  13 May 2012; Thomas Kahle <tomka@gentoo.org> +singular-3.1.4-r1.ebuild:
+  Fix bug 414709. Thanks Jean-Francis Roy for the solution.
 
 *singular-3.1.4 (24 Mar 2012)
 
diff --git a/sci-mathematics/singular/Manifest b/sci-mathematics/singular/Manifest
index bb4228dadfd1..eec0a3d030bb 100644
--- a/sci-mathematics/singular/Manifest
+++ b/sci-mathematics/singular/Manifest
@@ -20,13 +20,14 @@ DIST Singular-3-1-4.tar.gz 20662954 RMD160 850daae35b3897ff8fd84fe25d92de672b568
 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
+EBUILD singular-3.1.4-r1.ebuild 5233 RMD160 bf757cb6d7d8fd320a14ce2f8a165bff6c16613e SHA1 088605737680b8eb4e61315383c0005b6a0c9217 SHA256 ae0fc54c95a9bffe1f38f661784f34c0ba4f9447aadd5970acd2d86bee9341e6
 EBUILD singular-3.1.4.ebuild 4829 RMD160 d6e03ae7e42ca1666afa7d2a67b0f59908a0766f SHA1 968847199c3283beeeb03c2a4b5483045568d855 SHA256 1df5d0586016870eeca68ed58dd4f5857449eca4e2716b1eb55a3b8560891cca
-MISC ChangeLog 11650 RMD160 e9753b7855709137b469e52dc000afedcc5889a1 SHA1 e74c280aa2093de0a501fc8a03bd59fe5eb6651a SHA256 b3c91d8e191d6e06e828e9dd8cb80befb8c592840a0f49332bdad3906e44ae1c
+MISC ChangeLog 11819 RMD160 4414317499785944514e70f421030f4e1cc50a44 SHA1 eb3f24cf3888e30cd1f4db33544262df5a3a6947 SHA256 214067f3d0201ba44c8f4a100795174b6ede3417addcb6c602ee0a2ad6ecb3f0
 MISC metadata.xml 369 RMD160 a0e979ca13cc60ced54af5d3c02cfb8b76bd6af1 SHA1 dcc261552e4483b66399c450482fc112e6a27994 SHA256 cff5f6b561efdc5121015bb0afc25656aa698d41b6c3c62019e13b5fa0980e20
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk9uPHUACgkQodBTJSDyo66rNQD9Ggo/o850PNNBoBMu/EP1KOdd
-qHqP6Cipuc5SsYor3TcA/1re7pZgUJited4uunOVJny+qxuRDuQA+iC09cpqw6Yh
-=Q34T
+iF4EAREIAAYFAk+vV/QACgkQid6yGVZcMrzYxwEAjizHhUZAMohEzUYdqt2xHChZ
+yXuUq8qqxH6GpuLTsWAA/3TFCFXqVeovoBLfpPEStADTOOMYAtn4fLDwMT0K3Au6
+=moll
 -----END PGP SIGNATURE-----
diff --git a/sci-mathematics/singular/singular-3.1.4-r1.ebuild b/sci-mathematics/singular/singular-3.1.4-r1.ebuild
new file mode 100644
index 000000000000..b41632d00905
--- /dev/null
+++ b/sci-mathematics/singular/singular-3.1.4-r1.ebuild
@@ -0,0 +1,187 @@
+# 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-r1.ebuild,v 1.1 2012/05/13 06:42:27 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
+
+	# 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
+
+	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
+}