bump to 3.1.2, adding myself as a maintainer

Package-Manager: portage-2.1.9.24/cvs/Linux i686

4 files changed, 183 insertions, 8 deletions

diff --git a/sci-mathematics/singular/ChangeLog b/sci-mathematics/singular/ChangeLog
index e84ab821008f..dec54e0bb71d 100644
--- a/sci-mathematics/singular/ChangeLog
+++ b/sci-mathematics/singular/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-mathematics/singular
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/singular/ChangeLog,v 1.34 2010/10/17 08:20:13 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/singular/ChangeLog,v 1.35 2010/11/08 23:33:11 tomka Exp $
+
+*singular-3.1.2-r1 (08 Nov 2010)
+
+  08 Nov 2010; Thomas Kahle <tomka@gentoo.org> +singular-3.1.2-r1.ebuild,
+  metadata.xml:
+  bump to 3.1.2, adding myself as a maintainer
 
 *singular-3.1.1-r1 (17 Oct 2010)
 
diff --git a/sci-mathematics/singular/Manifest b/sci-mathematics/singular/Manifest
index 4062c4a57171..fed22989adda 100644
--- a/sci-mathematics/singular/Manifest
+++ b/sci-mathematics/singular/Manifest
@@ -10,18 +10,19 @@ 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-0-1-2.tar.gz 10741252 RMD160 bcfb83fe7a57658865aa69fc526e01413fb3da81 SHA1 a95aa909bfa20145df0eb1a345ae1476116af5fd SHA256 3d50427b17cef0a2ac36d302bf7421a4cb06df24139d5386c64d14a07e7cd399
 DIST Singular-3-0-1-share.tar.gz 3909236 RMD160 f1a1792cbb0688e1353285f898a2e40bc88fd4f6 SHA1 d7c07192707dbc6f916b3c5d704bae216f0834ff SHA256 5b8647886e15ca0a296a7d08a4161ecdc6fe5ef558cd9b36acda95a21a0883a2
+DIST Singular-3-1-1-4a-share.tar.gz 8313448 RMD160 9abdd10ee46655147500b84f6a5d0dddc0c0206c SHA1 f8940c1bcb5b39f47a4fce30d758bdf02f2dda9c SHA256 d3705064205d17ea5ccf72acd26e5060be8ad84378969cf02bce49969c54b540
 DIST Singular-3-1-1-share.tar.gz 8131651 RMD160 711c790a35c3a6aee11dd3fa5681c63423c58b57 SHA1 1c050e5bfe2d454f1bfa22acb238780afa210680 SHA256 0803152d4e95f6f5464c8b1a344473f2c70ae8dc63bbd71810e256060ba64fea
 DIST Singular-3-1-1.tar.gz 19254919 RMD160 4fe827201e229a7cce2253a80d922bf54a2944c4 SHA1 cfd03b7d4443367d85c6d9f873525ae247b4552f SHA256 70c908beafb4ed67b03a4ec69d12f8892da71022908e7c3322550fb53b223ca8
+DIST Singular-3-1-2.tar.gz 19564373 RMD160 53f407f62af36a8570b027c30b73c54dc106b290 SHA1 19ede02ed4cd513efd20f5a54568bc096e1d2c35 SHA256 4fbe46cca2aef42fdf73ef8556350278f9f3b3d5d0d1b8e21c1a182e59f2b88a
 EBUILD singular-3.0.1.2.ebuild 3130 RMD160 4671045a9d23f1e14419d6e075b44ddb4ceb11a5 SHA1 77cd6c69b3da929d6c55516d50574fe4bf09cba5 SHA256 e88cf1f5a012518d6f5c6c4bde1215b8f7928a192c053b8c2965f03b4697c5ce
 EBUILD singular-3.1.1-r1.ebuild 3163 RMD160 83d4445bd94aec5999a58d0f12c9aa857bd47f2f SHA1 15a1407c45439ad9633b48e506531441fb9023b6 SHA256 461d6f110b0cd54cb40f81b82f5eb0162c4a0e4e6d8126ce799ce757bd4a9886
-MISC ChangeLog 9254 RMD160 02f578087eedde988a141295707408d793987ab6 SHA1 bb41ca46fada35455bf6c6ca5ace6d9a28f9574d SHA256 4859a126f840113924c49107932bda02ce0694ffaa8217392a16c61000d4a030
-MISC metadata.xml 280 RMD160 2d367099d0325ec0cc6c6bc330d90c0c9ca8aca6 SHA1 d97bcf8e217b23d35fad5c7d4d3fa6c3b6c3d5e7 SHA256 56cb53caa58cda2146b3292101a68724ee15efa78563b33fff3e7b0c1ba47718
+EBUILD singular-3.1.2-r1.ebuild 4537 RMD160 1f64d85be12e0e18b0e2f00f548b9f618b21e88e SHA1 f3af5e7f02849ec7ad8dc29722ea435e3eaafd38 SHA256 405b35f80095d89e05b3ef472fccd56172bc22652aa1374fcbd245aacf0cc3ae
+MISC ChangeLog 9421 RMD160 5a79d8a38f7beedd289f81babbbc8e079b1ad334 SHA1 d3c365524ac04f148f2d7b656aa824944d375094 SHA256 f40defab7fe9e92fea223b574d3dc74915b22bcfcf9fc9c5d5f725b81f625a0d
+MISC metadata.xml 369 RMD160 a0e979ca13cc60ced54af5d3c02cfb8b76bd6af1 SHA1 dcc261552e4483b66399c450482fc112e6a27994 SHA256 cff5f6b561efdc5121015bb0afc25656aa698d41b6c3c62019e13b5fa0980e20
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iJwEAQECAAYFAky6scgACgkQIiMqcbOVdxRnJwP/Z5Iu2wGO2T9XC9cTixDGjDEy
-RpzbWqhBhy42psOzMOFqp9LWGn5f96Q3xh7PgXhPblJ21G337j1BT++lhc8vSmue
-Qw9Bk9AYnrgVtMJCuUPZoG32uI4OLBIQAsA+a8BKw9IDPFBBn3Y0rzt6QqamZAeB
-WTDkT+jsHdhCM+O83n0=
-=/X5H
+iEYEARECAAYFAkzYiL0ACgkQnZsgo/h8kNZUDQCgkSNS3U6PAok0FmwRsm38/we1
+qcQAnjIjx48jsjdDexvvPinNz0DxOkZE
+=hBL2
 -----END PGP SIGNATURE-----
diff --git a/sci-mathematics/singular/metadata.xml b/sci-mathematics/singular/metadata.xml
index eee5b016e1f2..ec150ef78eb2 100644
--- a/sci-mathematics/singular/metadata.xml
+++ b/sci-mathematics/singular/metadata.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+<maintainer>
+  <email>tomka@gentoo.org</email>
+  <name>Thomas Kahle</name>
+</maintainer>
 <herd>sci-mathematics</herd>
 <use>
   <flag name='boost'>Compile against external boost headers
diff --git a/sci-mathematics/singular/singular-3.1.2-r1.ebuild b/sci-mathematics/singular/singular-3.1.2-r1.ebuild
new file mode 100644
index 000000000000..661c0db683ff
--- /dev/null
+++ b/sci-mathematics/singular/singular-3.1.2-r1.ebuild
@@ -0,0 +1,164 @@
+# 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.2-r1.ebuild,v 1.1 2010/11/08 23:33:11 tomka Exp $
+
+EAPI="3"
+WANT_AUTOCONF="2.1" # Upstream ticket 240 -> wontfix
+
+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})
+MY_SHARE_DIR="3-1-1"
+MY_PV_SHARE="${MY_SHARE_DIR}-4a"  # What an awesome filenaming scheme...
+
+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"
+IUSE="boost doc emacs examples +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() {
+	append-flags "-fPIC"
+	append-ldflags "-fPIC"
+	tc-export CC CPP CXX
+}
+
+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
+
+	# This file has a trailing whitespace breaking stuff
+	# It's fixed in upstream cvs, remove with next version!
+	sed -i 's/[ \t]*$//' "${S}"/omalloc/Makefile.in || die
+
+	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
+
+	SOSUFFIX=$(get_version_component_range 1-3)
+	sed -i \
+		-e "s:SO_SUFFIX = so:SO_SUFFIX = so.${SOSUFFIX}:" \
+		"${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 \
+		$(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
+}