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

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

4 files changed, 13 insertions, 145 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/Manifest b/sci-mathematics/singular/Manifest
index bc95ef4373c1..b169d6dfd8cc 100644
--- a/sci-mathematics/singular/Manifest
+++ b/sci-mathematics/singular/Manifest
@@ -12,13 +12,11 @@ AUX singular-3.1.0-glibc-2.10.patch 1407 RMD160 5cc0db1754b16397b7af3c044489bdb1
 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-0-4-2-share.tar.gz 8291673 RMD160 ad10c76f84edbfb466a68c0bef0a7595405cd4c4 SHA1 e6186c22b792c823f86c885510f5a7eeacba41a7 SHA256 1e37ece3931a401728f75f9cc308412db90599994dc37f1561076e89183f2300
-DIST Singular-3-0-4-2.tar.gz 15379506 RMD160 090733d6e48838070a8af63dd00c633852e57878 SHA1 f8586a9d9c72785a65be461220640605b969ae70 SHA256 1c88a78ae9e1056496a992432370666af33375fef94b194861b3c7c08f70a536
 DIST Singular-3-0-4-4.tar.gz 15388216 RMD160 2a1b8a78411c1fb4f884389143dff2fb52e6b92d SHA1 29fccaabc269e8e2816a397c22bd61c48cbcf651 SHA256 c579489f57a7f0838d475c2b6e63d3459089ddedd93d783168439cfaaf2c4cec
 DIST Singular-3-1-0-4-share.tar.gz 7640466 RMD160 d8a482dfebce6b9a5230dff8de76551e00e45d53 SHA1 a23e004a2a7aabda08b59c0f60c55c4fcb7ef91e SHA256 7fc069eb9125cd451f42a7dc76475e70793edfb1ea741b65a4f61b5d078d60b1
 DIST Singular-3-1-0-7.tar.gz 18637001 RMD160 6fc4ce0314cb224d23e654cf1273c1e7ea361e37 SHA1 8ffff0a83fd1efb1b4a2416aaa1698e2ec148914 SHA256 381e0ff888ffa849748a618be2070a84255a52785e0739d62bc43bd7c661b02d
 EBUILD singular-3.0.1.2.ebuild 3130 RMD160 4671045a9d23f1e14419d6e075b44ddb4ceb11a5 SHA1 77cd6c69b3da929d6c55516d50574fe4bf09cba5 SHA256 e88cf1f5a012518d6f5c6c4bde1215b8f7928a192c053b8c2965f03b4697c5ce
-EBUILD singular-3.0.4.2.ebuild 3827 RMD160 e8ffe96a6de0f85a18dadc85ef9e79f07c08bebe SHA1 edb2429e84b5048d5f6dc361b5c89dfe62efd031 SHA256 c1cef308acd2e6dd44287115f0f4f1b273c5e21406e487ed0759d95fdab103d1
-EBUILD singular-3.0.4.4.ebuild 4550 RMD160 5b9749c4d519bf3b79863a48df6c14df0adb5ccb SHA1 91b720d14f948ebbbe38e5fce6ff983c54882f42 SHA256 663f324531daaddd369f75eaa0f337f1658d4eec806f58091af89d81cc5a0fc4
+EBUILD singular-3.0.4.4.ebuild 4571 RMD160 bed564d4be8d0cf7f39bf8696cc88efa004f9641 SHA1 648563447d53647922b06b9084d12e84c63fb93e SHA256 0b072eb24837fb4628fdee76e31c00be563e08245fec5688a5294c98cce21133
 EBUILD singular-3.1.0.7.ebuild 4033 RMD160 7bf44372855ed0e02e1a53df28b4ff1bb514255b SHA1 b1766b89815467d9bedb846e57a77afd696c2fe5 SHA256 eaf63e8d1fbe00ec989240d37c113fd4b48c0a04d70f3c6b1889661c8b45541b
-MISC ChangeLog 8200 RMD160 2bf3fc1d44fbfd085c6164acae24438aa8f6e52b SHA1 5127044cc28e9c0ef970b0ac91d810365e78521a SHA256 af9174e49cc73d829731a8183f5f2156bec05eff0176d5a6b2374b268bcea931
+MISC ChangeLog 8375 RMD160 442ef7b1cd45283ad22e30e4292fe800de265f91 SHA1 0a8f72eaad560bbaa884a12171753bd1de52c6ae SHA256 1170941c98074a69f0f10a05f7150e60de04e02e6521d89d0931c20049be4b9d
 MISC metadata.xml 280 RMD160 2d367099d0325ec0cc6c6bc330d90c0c9ca8aca6 SHA1 d97bcf8e217b23d35fad5c7d4d3fa6c3b6c3d5e7 SHA256 56cb53caa58cda2146b3292101a68724ee15efa78563b33fff3e7b0c1ba47718
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}