sci-mathematics/singular-3.1.1.3 revbump and QA

3 files changed, 163 insertions, 1 deletions

diff --git a/sci-mathematics/singular/ChangeLog b/sci-mathematics/singular/ChangeLog
index acd02042b..63aaea994 100644
--- a/sci-mathematics/singular/ChangeLog
+++ b/sci-mathematics/singular/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*singular-3.1.1.3 (13 Jul 2010)
+
+  13 Jul 2010; Thomas Kahle <tom111@gmx.de> +singular-3.1.1.3.ebuild:
+  revbump to 3.1.1.3 and minor QA
+
   13 Jul 2010; Thomas Kahle <tom111@gmx.de> singular-3.1.1.2.ebuild,
   metadata.xml:
   support for libsingular
diff --git a/sci-mathematics/singular/Manifest b/sci-mathematics/singular/Manifest
index c80e9c18b..3a3be5abc 100644
--- a/sci-mathematics/singular/Manifest
+++ b/sci-mathematics/singular/Manifest
@@ -5,6 +5,9 @@ AUX singular-3.1.0-gentoo.patch 4765 RMD160 9ba5f369c473c58ed28019b85a95c27eb58f
 AUX singular-3.1.0-glibc-2.10.patch 1407 RMD160 5cc0db1754b16397b7af3c044489bdb1efacaf6c SHA1 fc696943e0a10217f0839ef2b14128a709fb6bb3 SHA256 57461bf8bba6a44ef6f1c3bcf8a1121fb7ea95ce286118219c22f2bf366905f7
 DIST Singular-3-1-1-2-share.tar.gz 8172459 RMD160 7899cdfd54d131cc7ee6fb95dabe4cfbec696a78 SHA1 57287a74c6bcae5214055ce7d057f29e35f93e37 SHA256 e73db1557fd96d9b88d959ccbf78229771831954614fb7301d275493493e07ee
 DIST Singular-3-1-1-2.tar.gz 19397418 RMD160 205671f1ea2e2f22c025defc3d85c762362c7e3f SHA1 217af7a4e9b36b769a145bf81fb27c49d64333f6 SHA256 4e5929b324f952c69de1dedddbeca1c51a3733a0f63e026d3e7b61a7e469d5a7
+DIST Singular-3-1-1-3-share.tar.gz 8282887 RMD160 341ecf1fd2964f9a796b79d4af28e02ef2d16c4d SHA1 17aae4d08ed2c4aa404b19e2157ea4e09869819b SHA256 c94e7f94749b11a79003691ce28235b543681f717584f577f0e145804e9e3d2a
+DIST Singular-3-1-1-3.tar.gz 19433518 RMD160 732d56b5e7dfdb1c96d6b35242ba001eb0c330f4 SHA1 d0ae1374454ba353522773d9cbd9442d35ca2c85 SHA256 12534fe4c6202b8953163df10e6b6f2629243d3900222694f8dc6bcad3c2112b
 EBUILD singular-3.1.1.2.ebuild 4045 RMD160 a43f98bc944e637e5ee25f5d19b7cc808cf027d0 SHA1 a1b69b8887dc9bc2d269aa2f6482e57c8effaadc SHA256 0d91245a6cbc629ee5a22acf5e9638a3e82f65d7a7826b7b64a325974870cc35
-MISC ChangeLog 833 RMD160 36f84f72604b9372bd0dbd005fc5141cc4994815 SHA1 5c9610f5a1a4d0df43280331d0875546ac19a12e SHA256 68b7cdf7026cfb20500ab0239bc133454067276aabd68301206e24c498ff0bd2
+EBUILD singular-3.1.1.3.ebuild 4119 RMD160 18ff50589db22cf4c8a1150fa0bac5b91f43b1fc SHA1 7e151b413cde06cff6c5f64bf8033a3aab8b6b0a SHA256 3aa5b9e9e0ec81d7ef41766b02f98805bbd096811c7181bd0c0fb11b124f45b9
+MISC ChangeLog 971 RMD160 b23cd6d4ca6339ef8699b4807e3c7b12292aa3d4 SHA1 9f5daae1c2b8bedf046f139049b764b26b2b014a SHA256 c049c0dcd8274798b1661c5611b4fa4e196643384291b5de2f23d6e231e439e0
 MISC metadata.xml 471 RMD160 f505db20910413450175a8a9dc6dc27cc41ffa41 SHA1 4f0d34a55b6d10392e819cf08877d5877adc9729 SHA256 d1b8811843425ea5cf1d1ce1e90eeb4fae2198f1f93de190aeab4c10400b9805
diff --git a/sci-mathematics/singular/singular-3.1.1.3.ebuild b/sci-mathematics/singular/singular-3.1.1.3.ebuild
new file mode 100644
index 000000000..ab9bda84f
--- /dev/null
+++ b/sci-mathematics/singular/singular-3.1.1.3.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/singular/singular-3.1.1.ebuild,v 1.2 2010/04/28 14:55:16 bicatali Exp $
+
+EAPI="2"
+WANT_AUTOCONF="2.1" # Upstream ticket 240 -> wontfix
+
+inherit eutils elisp-common autotools multilib versionator
+
+MY_PN=Singular
+MY_PV=$(replace_all_version_separators -)
+MY_DIR=$(get_version_component_range 1-3 ${MY_PV})
+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/${MY_DIR}/${MY_PN}"
+SRC_URI="${SRC_COM}-${MY_PV}.tar.gz ${SRC_COM}-${MY_PV_SHARE}-share.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="boost doc emacs examples libsingular +readline"
+
+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() {
+	tc-export CC CPP CXX
+}
+
+src_prepare () {
+	epatch "${FILESDIR}"/${PN}-3.1.0-gentoo.patch
+	epatch "${FILESDIR}"/${PN}-3.1.0-emacs-22.patch
+	# I don't see a need for the following patch, looks like cruft from
+	# older versions to me. The shipped code is fine !
+#	epatch "${FILESDIR}"/${PN}-3.1.0-glibc-2.10.patch
+	epatch "${FILESDIR}"/${PN}-3.0.4.4-nostrip.patch
+
+	sed -i \
+		-e '/CXXFLAGS/ s/--no-exceptions//g' \
+		"${S}"/Singular/configure.in || die
+
+	cd "${S}"/Singular || die "failed to cd into Singular/"
+	eautoconf
+}
+
+src_configure() {
+
+	econf \
+		--prefix="${S}" \
+		--disable-debug \
+		--disable-doc \
+		--disable-NTL \
+		--disable-gmp \
+		--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 -j1 || die "emake failed"
+
+	if (use libsingular || use test ) ; then
+		emake -j1 libsingular || die "emake libsingular failed"
+	fi
+
+	if use emacs; then
+		cd "${WORKDIR}"/${MY_PN}/${MY_DIR}/emacs/
+		elisp-compile *.el || die "elisp-compile failed"
+	fi
+}
+
+src_test() {
+	# Tests fail to link -lsingular, upstream ticket #243
+	emake -j1 test || die "tests failed"
+}
+
+src_install () {
+	dodoc README
+	# execs and libraries
+	cd "${S}"/*-Linux
+	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"
+
+	if use libsingular; then
+		insinto /usr/include
+		doins "${S}"/Singular/libsingular.h
+		dolib.so "${S}"/Singular/libsingular.so
+	fi
+
+	# stuff from the share tar ball
+	cd "${WORKDIR}"/${MY_PN}/${MY_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
+}