Removed old version and fixed RDEPEND on boost (see bug #293084).

(Portage version: 2.1.7.4/cvs/Linux x86_64)

3 files changed, 11 insertions, 141 deletions

diff --git a/sci-mathematics/singular/ChangeLog b/sci-mathematics/singular/ChangeLog
index 567f442548d2..3d80fc55dc3c 100644
--- a/sci-mathematics/singular/ChangeLog
+++ b/sci-mathematics/singular/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-mathematics/singular
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/singular/ChangeLog,v 1.29 2009/11/24 03:38:03 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/singular/ChangeLog,v 1.30 2009/11/24 03:47:20 markusle Exp $
+
+  24 Nov 2009; Markus Dittrich <markusle@gentoo.org>
+  -singular-3.0.4.2.ebuild, singular-3.0.4.4.ebuild:
+  Removed old version and fixed RDEPEND on boost (see bug #293084).
 
 *singular-3.1.0.7 (24 Nov 2009)
 
diff --git a/sci-mathematics/singular/singular-3.0.4.2.ebuild b/sci-mathematics/singular/singular-3.0.4.2.ebuild
deleted file mode 100644
index 60a34fbdc91b..000000000000
--- a/sci-mathematics/singular/singular-3.0.4.2.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/singular/singular-3.0.4.2.ebuild,v 1.2 2008/05/17 09:42:07 markusle Exp $
-
-inherit eutils elisp-common flag-o-matic autotools multilib
-
-PV_MAJOR=${PV%.*}
-MY_PV=${PV//./-}
-MY_PN=${PN/s/S}
-MY_PV_MAJOR=${MY_PV%-*}
-
-DESCRIPTION="Computer algebra system for polynomial computations"
-HOMEPAGE="http://www.singular.uni-kl.de/"
-SRC_URI="http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/SOURCES/3-0-4/${MY_PN}-${MY_PV}.tar.gz
-	http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/UNIX/${MY_PN}-${MY_PV}-share.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc emacs boost"
-
-DEPEND=">=dev-lang/perl-5.6
-		>=dev-libs/gmp-4.1-r1
-		emacs? ( virtual/emacs )
-		boost? ( dev-libs/boost )"
-
-S="${WORKDIR}"/${MY_PN}-${MY_PV_MAJOR}
-SITEFILE=60${PN}-gentoo.el
-
-src_unpack () {
-	unpack ${A}
-	epatch "${FILESDIR}"/${P}-gentoo.diff
-
-	cd "${S}"/kernel
-	sed -e "s/PFSUBST/${PF}/" -i feResource.cc || \
-		die "sed failed on feResource.cc"
-
-	cd "${S}"/Singular
-	if ! use boost; then
-		sed -e "s/AC_CHECK_HEADERS(boost/#AC_CHECK_HEADERS(boost/" \
-			-i configure.in || \
-			die "failed to fix detection of boost headers"
-	else
-		# -no-exceptions and boost don't play well
-		sed -e "/CXXFLAGS/ s/--no-exceptions//g" \
-			-i configure.in || \
-			die "sed failed on configure"
-	fi
-	eautoconf
-}
-
-src_compile() {
-	local myconf="${myconf} --disable-doc --without-MP --with-factory --with-libfac --with-gmp --prefix=${S}"
-	econf $(use_enable emacs) \
-		${myconf} || die "econf failed"
-	emake -j1 || die "make failed"
-
-	if use emacs; then
-		cd "${WORKDIR}"/${MY_PN}/${MY_PV_MAJOR}/emacs/
-		elisp-compile *.el || die "elisp-compile failed"
-	fi
-}
-
-src_install () {
-	# install basic docs
-	cd "${S}" && dodoc BUGS ChangeLog || \
-		die "failed to install docs"
-
-	# install data files
-	insinto /usr/share/${PN}/LIB
-	cd "${S}"/${MY_PN}/LIB && doins *.lib COPYING help.cnf || \
-		die "failed to install lib files"
-	insinto /usr/share/${PN}/LIB/gftables
-	cd gftables && doins * \
-		|| die "failed to install files int LIB/gftables"
-
-	cd "${S}"/*-Linux
-
-	# install binaries
-	rm ${MY_PN} || die "failed to remove ${MY_PN}"
-	dobin ${MY_PN}* gen_test change_cost solve_IP \
-		toric_ideal LLL || die "failed to install binaries"
-
-	# install libraries
-	insinto /usr/$(get_libdir)/${PN}
-	doins *.so || die "failed to install libraries"
-
-	# create symbolic link
-	dosym /usr/bin/${MY_PN}-${MY_PV_MAJOR} /usr/bin/${MY_PN} || \
-		die "failed to create symbolic link"
-
-	# install examples
-	cd "${WORKDIR}"/${MY_PN}/${MY_PV_MAJOR}
-	insinto /usr/share/${PN}/examples
-	doins examples/* || die "failed to install examples"
-
-	# install extended docs
-	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
-
-	# install emacs specific stuff here, as we did a directory change
-	# some lines above!
-	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
-}
diff --git a/sci-mathematics/singular/singular-3.0.4.4.ebuild b/sci-mathematics/singular/singular-3.0.4.4.ebuild
index cfae78c8e636..9f34c01d6b08 100644
--- a/sci-mathematics/singular/singular-3.0.4.4.ebuild
+++ b/sci-mathematics/singular/singular-3.0.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/singular/singular-3.0.4.4.ebuild,v 1.4 2009/08/09 16:09:21 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/singular/singular-3.0.4.4.ebuild,v 1.5 2009/11/24 03:47:20 markusle Exp $
 
 inherit eutils elisp-common flag-o-matic autotools multilib versionator
 
@@ -19,9 +19,11 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="doc emacs boost"
 
-DEPEND=">=dev-lang/perl-5.6
-		>=dev-libs/gmp-4.1-r1
-		emacs? ( >=virtual/emacs-22 )
+RDEPEND=">=dev-libs/gmp-4.1-r1
+		emacs? ( >=virtual/emacs-22 )"
+
+DEPEND="${RDEPEND}
+		>=dev-lang/perl-5.6
 		boost? ( dev-libs/boost )"
 
 S="${WORKDIR}"/${MY_PN}-${MY_PV_MAJOR}