cleanup for sci-math/singular

(Portage version: 2.1.8.3/git/Linux i686)
 (Signed Manifest commit)

4 files changed, 18 insertions, 376 deletions

diff --git a/sci-mathematics/singular/ChangeLog b/sci-mathematics/singular/ChangeLog
index 7b1ccc902..90538b3d5 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: $
 
+  08 Nov 2010; Thomas Kahle <tomka@gentoo.org> -singular-3.1.1.4-r1.ebuild,
+  -singular-3.1.2-r1.ebuild:
+  Moved latest to main tree, removed old. 3.1.2-r0 stays for migration to
+  libsingular
+
   05 Nov 2010; François Bissey <f.r.bissey@massey.ac.nz>
   singular-3.1.2.ebuild:
   I think I got the headers sorted now.
diff --git a/sci-mathematics/singular/Manifest b/sci-mathematics/singular/Manifest
index 5832e8354..519db5462 100644
--- a/sci-mathematics/singular/Manifest
+++ b/sci-mathematics/singular/Manifest
@@ -1,15 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX 60singular-gentoo.el 298 RMD160 6bd931435ad813a3a63c02ea68d90e768a685d88 SHA1 ffd1cb26719d6745f2e9463952f125769b8ca5a1 SHA256 b05a83af5a80fc1240e77d1cd036f4c9ca00907d11fb90d7f0ffb0c92ff7d235
 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.1.3-soname.patch 651 RMD160 76c4d10f7fa0f55ffdb55232c8e4c670343ea3e7 SHA1 d7909ac36431742ecb43104d7c55b48fdc4439f6 SHA256 ad025b5a19c29ab8f25782fe3ee36a0139f1db64defa2298afb8b84d37ccdef1
 AUX singular-3.1.1.4-parrallelmake.patch 2817 RMD160 0ee9b10e85160faa5b11c7c0394fbdc9bee99398 SHA1 2b9cf560b426afee9932bb8be5f4a3553b77eed1 SHA256 6a916c2a766ca2e91266a00af1c3f4a81257c1bdf9453f01b1a7f8859feed413
-DIST Singular-3-1-1-4-share.tar.gz 8283752 RMD160 4201afe285e1e3c6a65e3af34dee512d3752ea86 SHA1 e4e555d142b548b1165c022b6a025f66cb10de19 SHA256 ebf598d056b76cc5c5c5108d368a47fcdace92087eb2bbda61afb091f7e27b46
-DIST Singular-3-1-1-4.tar.gz 19422406 RMD160 ef65429b8b75c9996e14f8848559d59b129c7f21 SHA1 cd330df7f83b439635d0a3a1db5314c45435eead SHA256 ea8328708ce5f9aaa5f73eee010c138b948b171228db737014d317038eff72d9
 DIST Singular-3-1-1-4a-share.tar.gz 8313448 RMD160 9abdd10ee46655147500b84f6a5d0dddc0c0206c SHA1 f8940c1bcb5b39f47a4fce30d758bdf02f2dda9c SHA256 d3705064205d17ea5ccf72acd26e5060be8ad84378969cf02bce49969c54b540
 DIST Singular-3-1-2.tar.gz 19564373 RMD160 53f407f62af36a8570b027c30b73c54dc106b290 SHA1 19ede02ed4cd513efd20f5a54568bc096e1d2c35 SHA256 4fbe46cca2aef42fdf73ef8556350278f9f3b3d5d0d1b8e21c1a182e59f2b88a
-EBUILD singular-3.1.1.4-r1.ebuild 6130 RMD160 03f44ba75b6b736c774d1c1ad42b1d3394e2e863 SHA1 e8827b70a0f2d8db3b5c2c20b6db20e73f423ddb SHA256 1ff61e21add3a0d5ec5ecaccb1b7b389ac873ce48e90e93537f4e2002e946452
-EBUILD singular-3.1.2-r1.ebuild 4446 RMD160 9215d0e606c4b464848f61878e59cdc55cd3efc6 SHA1 d39a70fd28774116eb26b7a5b3691d36b7dbcd21 SHA256 b4f8cd6944f7ea2eb96f748d2d9cf112c04f623c00ff009965ea8b47fbc0c516
 EBUILD singular-3.1.2.ebuild 6559 RMD160 694d6a18adc957458ed6ef6ea6fd5f93a92e5eb6 SHA1 a7e8d2faf71802a45b16cdf4a963124f602bd8da SHA256 b0087dccdef0c4919b3e18af4a1e6a07ccea9924f4a219636741bd02738be00e
-MISC ChangeLog 3739 RMD160 4e85810467b96fcaf8beeeaae7c76e660263e715 SHA1 1f867f1f6a37cc73804ad48b27e83c1a4ea032a3 SHA256 d61058bf56d7e7add3eb8b9ba8b074b7c501398b279b3ad5b54e2c7f8e56b6a0
+MISC ChangeLog 3933 RMD160 6d4f0f169168ec878739b267c328fffe0554d996 SHA1 92524bc30a9f5e5a9bcdac926fbed5e069966f4b SHA256 d2a87cd3c07e829ba4194548a800638d4b8631ba82334a292721f4dce04bd401
 MISC metadata.xml 471 RMD160 f505db20910413450175a8a9dc6dc27cc41ffa41 SHA1 4f0d34a55b6d10392e819cf08877d5877adc9729 SHA256 d1b8811843425ea5cf1d1ce1e90eeb4fae2198f1f93de190aeab4c10400b9805
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iJwEAQEIAAYFAkzYiTkACgkQQYXt1pFHaaETxAQAn5uHs2aU5flnI8zY4hPYrSz8
+N7rsan6vlWtfxjCuDbMFOiLde9yOxca8YULM83Y4Bv73ZeNTGgWMBV46Fp6ugNFM
+XIed54pzVE8m5vCumjaJn/wE9T1amvTdf1lXaqiqebctoWlMK+veHkhCBjNWnpPb
+9PY4aG1cA29/Eg8395M=
+=LiMG
+-----END PGP SIGNATURE-----
diff --git a/sci-mathematics/singular/singular-3.1.1.4-r1.ebuild b/sci-mathematics/singular/singular-3.1.1.4-r1.ebuild
deleted file mode 100644
index 0fb91f0cd..000000000
--- a/sci-mathematics/singular/singular-3.1.1.4-r1.ebuild
+++ /dev/null
@@ -1,205 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-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_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"
-
-RESTRICT="mirror"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-linux"
-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() {
-	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
-	# 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
-	epatch "${FILESDIR}"/${PN}-3.1.1.3-soname.patch
-	epatch "${FILESDIR}"/${P}-parrallelmake.patch
-
-	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 \
-		--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 boost Boost) \
-		$(use_enable emacs) \
-		$(use_with readline) || die "configure failed"
-}
-
-src_compile() {
-	emake || die "emake failed"
-
-	if (use libsingular || use test ) ; then
-		emake 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 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"
-
-	if use libsingular; then
-		cd "${S}"
-		emake install-libsingular || die "failed to put libsingular in the right location"
-		cd "${S}"/build/lib
-		dolib.so libsingular.so."${SOSUFFIX}"
-		dosym libsingular.so."${SOSUFFIX}" /usr/$(get_libdir)/libsingular.so \
-			|| die "failed to create symlink"
-		dosym libsingular.so."${SOSUFFIX}" \
-			/usr/$(get_libdir)/libsingular.so."$(get_major_version)" \
-			|| die "failed to create symbolic link"
-		insinto /usr/include
-		cd "${S}"/build/include
-		# Move factory.h and cf_gmp.h in the singular folder so we don't either
-		# collide with factory or need it to use libsingular.
-		sed -e "s:factory.h:singular/factory.h:" \
-			-i singular/clapconv.h singular/fglm.h singular/mod2.h || die
-		sed -e "s:cf_gmp.h:singular/cf_gmp.h:" \
-			-i singular/si_gmp.h factory.h || die
-		sed -e "s:factoryconf.h:singular/factoryconf.h:" \
-			-e "s:templates:singular/templates:g" \
-			-i factory.h || die
-		doins libsingular.h mylimits.h
-		insinto /usr/include/singular
-		doins singular/*
-		doins factory.h factoryconf.h cf_gmp.h
-		insinto /usr/include/singular/templates
-		doins templates/*
-	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
-
-	if use libsingular ; then
-		einfo "libsingular include the functionality included by libfactory (factory ebuild)"
-		einfo "To avoid file collisions with factory and the need of factory to use libsingular"
-		einfo "We have moved the factory headers shipped by singular in /usr/include/singular."
-		einfo "If you want to use the factory functionality offered by libsingular rather than"
-		einfo "the one offered by the factory ebuild you should include sngular/factory.h rather"
-		einfo "than just factory.h."
-	fi
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/sci-mathematics/singular/singular-3.1.2-r1.ebuild b/sci-mathematics/singular/singular-3.1.2-r1.ebuild
deleted file mode 100644
index 01777c90f..000000000
--- a/sci-mathematics/singular/singular-3.1.2-r1.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-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"
-
-RESTRICT="mirror"
-
-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
-}