Drop old

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

11 files changed, 19 insertions, 652 deletions

diff --git a/sci-mathematics/Macaulay2/ChangeLog b/sci-mathematics/Macaulay2/ChangeLog
index 1c808a5e9fa5..77a7060dc4c3 100644
--- a/sci-mathematics/Macaulay2/ChangeLog
+++ b/sci-mathematics/Macaulay2/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-mathematics/Macaulay2
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/Macaulay2/ChangeLog,v 1.36 2015/04/21 17:40:45 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/Macaulay2/ChangeLog,v 1.37 2015/04/22 07:23:32 jlec Exp $
+
+  22 Apr 2015; Justin Lecher <jlec@gentoo.org> -Macaulay2-1.4-r1.ebuild,
+  -Macaulay2-1.4.ebuild, -Macaulay2-1.6.ebuild,
+  -files/1.4-comint-use-fields.patch, -files/1.4-fix-emacs-syntax-table.patch,
+  -files/1.4-pari-2.5-compat.patch, -files/1.4-paths-of-external-programs.patch,
+  -files/1.6-prune-NumAlgGeo-examples.patch, metadata.xml:
+  Drop old
 
   21 Apr 2015; Pacho Ramos <pacho@gentoo.org> Macaulay2-1.7_pre.ebuild:
   x86 stable wrt bug #542572
diff --git a/sci-mathematics/Macaulay2/Macaulay2-1.4-r1.ebuild b/sci-mathematics/Macaulay2/Macaulay2-1.4-r1.ebuild
deleted file mode 100644
index a65b2ee14e37..000000000000
--- a/sci-mathematics/Macaulay2/Macaulay2-1.4-r1.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/Macaulay2/Macaulay2-1.4-r1.ebuild,v 1.5 2015/03/26 10:17:49 tomka Exp $
-
-EAPI="2"
-
-inherit autotools elisp-common eutils flag-o-matic
-
-IUSE="emacs optimization"
-MY_REV="12617"
-
-FACTORYVER="3-1-1"
-
-DESCRIPTION="research tool for commutative algebra and algebraic geometry"
-SRC_BASE="http://www.math.uiuc.edu/${PN}/Downloads/"
-SRC_URI="${SRC_BASE}/OtherSourceCode/1.4/factory-${FACTORYVER}.tar.gz
-		 ${SRC_BASE}/OtherSourceCode/1.4/libfac-${FACTORYVER}.tar.gz
-		 http://www.math.uiuc.edu/${PN}/Extra/gc-7.2alpha5-2010-09-03.tar.gz
-		 ${SRC_BASE}/SourceCode/${P}-r${MY_REV}-src.tar.bz2"
-
-HOMEPAGE="http://www.math.uiuc.edu/Macaulay2/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-# Tests are broken and building the package runs thousands of tests anyway
-RESTRICT="test"
-
-DEPEND="sys-libs/gdbm
-	>=dev-libs/ntl-5.5.2
-	<dev-libs/ntl-7
-	>=sci-mathematics/pari-2.3.4[gmp]
-	>=sys-libs/readline-6.1
-	dev-libs/libxml2:2
-	sci-mathematics/frobby
-	sci-mathematics/4ti2
-	sci-mathematics/nauty
-	>=sci-mathematics/normaliz-2.5
-	<sci-mathematics/normaliz-2.7
-	sci-mathematics/gfan
-	>=dev-libs/mpfr-3.0.0
-	>=sci-libs/mpir-2.1.1[cxx]
-	sci-libs/cddlib
-	sci-libs/cdd+
-	sci-libs/lrslib[gmp]
-	virtual/blas
-	virtual/lapack
-	dev-util/ctags
-	sys-libs/ncurses
-	sys-process/time
-	emacs? ( virtual/emacs )"
-RDEPEND="${DEPEND}"
-
-SITEFILE=70Macaulay2-gentoo.el
-
-S="${WORKDIR}/${P}-r${MY_REV}"
-
-pkg_setup () {
-		tc-export CC CPP CXX
-		append-cppflags "-I/usr/include/frobby"
-}
-
-src_prepare() {
-	# Patching .m2 files to look for external programs in
-	# /usr/bin
-	epatch "${FILESDIR}"/${PV}-paths-of-external-programs.patch
-
-	# The following three are all upstream and need to be removed on bump.
-	# Fix an incompatibility with pari-2.5
-	epatch "${FILESDIR}"/${PV}-pari-2.5-compat.patch
-	# Two M2.el improvements
-	epatch "${FILESDIR}"/${PV}-comint-use-fields.patch
-	epatch "${FILESDIR}"/${PV}-fix-emacs-syntax-table.patch
-
-	# Fixing make warnings about unavailable jobserver:
-	sed -i "s/\$(MAKE)/+ \$(MAKE)/g" "${S}"/distributions/Makefile.in
-
-	# Factory, and libfac are statically linked libraries which (in this flavor) are not used by any
-	# other program. We build them internally and don't install them
-	mkdir "${S}/BUILD/tarfiles" || die "Creation of directory failed"
-	cp "${DISTDIR}/factory-3-1-1.tar.gz" "${S}/BUILD/tarfiles/" \
-		|| die "copy failed"
-	cp "${DISTDIR}/libfac-3-1-1.tar.gz" "${S}/BUILD/tarfiles/" \
-		|| die "copy failed"
-	# Macaulay 2 in this version insists on a snapshot of boehm-gc that is not available elsewhere
-	# We will let it build its internal version until >=boehm-gc-7.2_alpha5 is in in tree.  Note:
-	# The resulting QA warning is known.
-	cp "${DISTDIR}/gc-7.2alpha5-2010-09-03.tar.gz" "${S}/BUILD/tarfiles/" \
-		|| die "copy failed"
-
-	eautoreconf
-}
-
-src_configure (){
-	# Recommended in bug #268064 Possibly unecessary
-	# but should not hurt anybody.
-	if ! use emacs; then
-		tags="ctags"
-	fi
-
-	# configure instead of econf to enable install with --prefix
-	./configure --prefix="${D}/usr" \
-		--disable-encap \
-		--disable-strip \
-		$(use_enable optimization optimize) \
-		--enable-build-libraries="factory gc libfac" \
-		--with-unbuilt-programs="4ti2 gfan normaliz nauty cddplus lrslib" \
-		|| die "failed to configure Macaulay"
-}
-
-src_compile() {
-	# Parallel build not supported yet
-	emake -j1 || die "failed to build Macaulay"
-
-	if use emacs; then
-		cd "${S}/Macaulay2/emacs"
-		elisp-compile *.el || die "elisp-compile failed"
-	fi
-}
-
-src_test() {
-	emake check || die "tests failed"
-}
-
-src_install () {
-	# Parallel install not supported yet
-	emake -j1 install || die "install failed"
-
-	# Remove emacs files and install them in the
-	# correct place if use emacs
-	rm -rf "${D}"/usr/share/emacs/site-lisp
-	if use emacs; then
-		cd "${S}/Macaulay2/emacs"
-		elisp-install ${PN} *.elc *.el || die "elisp-install failed"
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-}
-
-pkg_postinst() {
-	if use emacs; then
-		elisp-site-regen
-		elog "If you want to set a hot key for Macaulay2 in Emacs add a line similar to"
-		elog "(global-set-key [ f12 ] 'M2)"
-		elog "in order to set it to F12 (or choose a different one)."
-	fi
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/sci-mathematics/Macaulay2/Macaulay2-1.4.ebuild b/sci-mathematics/Macaulay2/Macaulay2-1.4.ebuild
deleted file mode 100644
index 09b71af9cf8f..000000000000
--- a/sci-mathematics/Macaulay2/Macaulay2-1.4.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/Macaulay2/Macaulay2-1.4.ebuild,v 1.6 2015/03/26 10:17:49 tomka Exp $
-
-EAPI="2"
-
-inherit autotools elisp-common eutils flag-o-matic
-
-IUSE="emacs optimization"
-MY_REV="12617"
-
-FACTORYVER="3-1-1"
-
-DESCRIPTION="research tool for commutative algebra and algebraic geometry"
-SRC_BASE="http://www.math.uiuc.edu/${PN}/Downloads/"
-SRC_URI="${SRC_BASE}/OtherSourceCode/1.4/factory-${FACTORYVER}.tar.gz
-		 ${SRC_BASE}/OtherSourceCode/1.4/libfac-${FACTORYVER}.tar.gz
-		 http://www.math.uiuc.edu/${PN}/Extra/gc-7.2alpha5-2010-09-03.tar.gz
-		 ${SRC_BASE}/SourceCode/${P}-r${MY_REV}-src.tar.bz2"
-
-HOMEPAGE="http://www.math.uiuc.edu/Macaulay2/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-
-DEPEND="sys-libs/gdbm
-	>=dev-libs/ntl-5.5.2
-	<dev-libs/ntl-7
-	>=sci-mathematics/pari-2.3.4[gmp]
-	>=sys-libs/readline-6.1
-	dev-libs/libxml2:2
-	sci-mathematics/frobby
-	sci-mathematics/4ti2
-	sci-mathematics/nauty
-	>=sci-mathematics/normaliz-2.5
-	sci-mathematics/gfan
-	>=dev-libs/mpfr-3.0.0
-	>=sci-libs/mpir-2.1.1[cxx]
-	sci-libs/cddlib
-	sci-libs/cdd+
-	sci-libs/lrslib[gmp]
-	virtual/blas
-	virtual/lapack
-	dev-util/ctags
-	sys-libs/ncurses
-	sys-process/time
-	emacs? ( virtual/emacs )"
-RDEPEND="${DEPEND}"
-
-SITEFILE=70Macaulay2-gentoo.el
-
-S="${WORKDIR}/${P}-r${MY_REV}"
-
-pkg_setup () {
-		tc-export CC CPP CXX
-		append-cppflags "-I/usr/include/frobby"
-}
-
-src_prepare() {
-	# Patching .m2 files to look for external programs in
-	# /usr/bin
-	epatch "${FILESDIR}"/${PV}-paths-of-external-programs.patch
-
-	# Fixing make warnings about unavailable jobserver:
-	sed -i "s/\$(MAKE)/+ \$(MAKE)/g" "${S}"/distributions/Makefile.in
-
-	# Factory, and libfac are statically linked libraries which (in this flavor) are not used by any
-	# other program. We build them internally and don't install them
-	mkdir "${S}/BUILD/tarfiles" || die "Creation of directory failed"
-	cp "${DISTDIR}/factory-3-1-1.tar.gz" "${S}/BUILD/tarfiles/" \
-		|| die "copy failed"
-	cp "${DISTDIR}/libfac-3-1-1.tar.gz" "${S}/BUILD/tarfiles/" \
-		|| die "copy failed"
-	# Macaulay 2 in this version insists on a snapshot of boehm-gc that is not available elsewhere
-	# We will let it build its internal version until >=boehm-gc-7.2_alpha5 is in in tree.  Note:
-	# The resulting QA warning is known.
-	cp "${DISTDIR}/gc-7.2alpha5-2010-09-03.tar.gz" "${S}/BUILD/tarfiles/" \
-		|| die "copy failed"
-
-	eautoreconf
-}
-
-src_configure (){
-	# Recommended in bug #268064 Possibly unecessary
-	# but should not hurt anybody.
-	if ! use emacs; then
-		tags="ctags"
-	fi
-
-	# configure instead of econf to enable install with --prefix
-	./configure --prefix="${D}/usr" \
-		--disable-encap \
-		--disable-strip \
-		$(use_enable optimization optimize) \
-		--enable-build-libraries="factory gc libfac" \
-		--with-unbuilt-programs="4ti2 gfan normaliz nauty cddplus lrslib" \
-		|| die "failed to configure Macaulay"
-}
-
-src_compile() {
-	# Parallel build not supported yet
-	emake -j1 || die "failed to build Macaulay"
-
-	if use emacs; then
-		cd "${S}/Macaulay2/emacs"
-		elisp-compile *.el || die "elisp-compile failed"
-	fi
-}
-
-src_test() {
-	emake check || die "tests failed"
-}
-
-src_install () {
-	# Parallel install not supported yet
-	emake -j1 install || die "install failed"
-
-	# Remove emacs files and install them in the
-	# correct place if use emacs
-	rm -rf "${D}"/usr/share/emacs/site-lisp
-	if use emacs; then
-		cd "${S}/Macaulay2/emacs"
-		elisp-install ${PN} *.elc *.el || die "elisp-install failed"
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-}
-
-pkg_postinst() {
-	if use emacs; then
-		elisp-site-regen
-		elog "If you want to set a hot key for Macaulay2 in Emacs add a line similar to"
-		elog "(global-set-key [ f12 ] 'M2)"
-		elog "in order to set it to F12 (or choose a different one)."
-	fi
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/sci-mathematics/Macaulay2/Macaulay2-1.6.ebuild b/sci-mathematics/Macaulay2/Macaulay2-1.6.ebuild
deleted file mode 100644
index 041881e6d17e..000000000000
--- a/sci-mathematics/Macaulay2/Macaulay2-1.6.ebuild
+++ /dev/null
@@ -1,175 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/Macaulay2/Macaulay2-1.6.ebuild,v 1.5 2015/03/26 10:17:49 tomka Exp $
-
-EAPI=5
-
-inherit autotools elisp-common eutils flag-o-matic python-utils-r1 toolchain-funcs
-
-IUSE="debug emacs optimization"
-
-# Those packages will be built internally.
-FACTORY="factory-3-1-6"
-LIBFAC="libfac-3-1-6"
-GITHUBTAG="release-1.6-stable-20130514"
-
-DESCRIPTION="Research tool for commutative algebra and algebraic geometry"
-HOMEPAGE="http://www.math.uiuc.edu/Macaulay2/"
-SRC_URI="https://github.com/Macaulay2/M2/archive/${GITHUBTAG}.tar.gz -> ${P}.tar.gz
-	ftp://www.mathematik.uni-kl.de/pub/Math/Singular/Libfac/${LIBFAC}.tar.gz
-	ftp://www.mathematik.uni-kl.de/pub/Math/Singular/Factory/factory-gftables.tar.gz
-	http://www.math.uiuc.edu/Macaulay2/Downloads/OtherSourceCode/trunk/${FACTORY}.tar.gz
-	http://www.math.uiuc.edu/Macaulay2/Extra/gtest-1.6.0.tar.gz
-	http://www.mathematik.uni-osnabrueck.de/normaliz/Normaliz2.10.1/Normaliz2.10.1.zip"
-# Need normaliz for an up to date normaliz.m2
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="
-	sys-process/time
-	virtual/pkgconfig
-	app-arch/unzip
-	app-text/dos2unix
-	dev-lang/python:2.7"
-# Unzip and dos2unix just for normaliz
-# python2.7 necessary for gtest building
-
-RDEPEND="
-	sys-libs/gdbm
-	<dev-libs/ntl-7
-	sci-mathematics/pari[gmp]
-	>=sys-libs/readline-6.1
-	dev-libs/libxml2:2
-	sci-mathematics/frobby
-	sci-mathematics/4ti2
-	sci-mathematics/nauty
-	>=sci-mathematics/normaliz-2.10
-	sci-mathematics/gfan
-	sci-libs/mpir[cxx]
-	dev-libs/mpfr
-	sci-libs/cdd+
-	sci-libs/cddlib
-	sci-libs/lrslib[gmp]
-	virtual/blas
-	virtual/lapack
-	dev-util/ctags
-	sys-libs/ncurses
-	>=dev-libs/boehm-gc-7.2_alpha6[threads]
-	>=dev-libs/libatomic_ops-7.2_alpha6
-	emacs? ( virtual/emacs )"
-
-SITEFILE=70Macaulay2-gentoo.el
-
-S="${WORKDIR}/M2-${GITHUBTAG}/M2"
-
-pkg_setup () {
-		tc-export CC CPP CXX
-		append-cppflags "-I/usr/include/frobby"
-		# gtest needs python:2. Setting it with python_export preserves
-		# the exported variables in other phases too.
-		python_export python2_7 PYTHON EPYTHON
-}
-
-src_prepare() {
-	tc-export PKG_CONFIG
-	# Put updated Normaliz.m2 in place
-	cp "${WORKDIR}/Normaliz2.10/Macaulay2/Normaliz.m2" \
-		"${S}/Macaulay2/packages" || die
-	dos2unix "${S}/Macaulay2/packages/Normaliz.m2" || die
-
-	# Patching .m2 files to look for external programs in
-	# /usr/bin
-	epatch "${FILESDIR}"/${PV}-paths-of-external-programs.patch
-
-	# Shortcircuit lapack tests
-	epatch "${FILESDIR}"/${PV}-lapack.patch
-
-	# NumericalAlgebraicGeometry has some non-working examples (they are
-	# non-reduced although that is a precondition for the used
-	# algorithms.)  We just cut them.
-	pushd Macaulay2/packages/NumericalAlgebraicGeometry
-	epatch "${FILESDIR}"/${PV}-prune-NumAlgGeo-examples.patch
-	popd
-
-	# Factory, and libfac are statically linked libraries which (in this
-	# flavor) are not used by any other program. We build them
-	# internally and don't install them
-	mkdir "${S}/BUILD/tarfiles" || die "Creation of directory failed"
-	cp "${DISTDIR}/${FACTORY}.tar.gz" "${S}/BUILD/tarfiles/" \
-		|| die "copy failed"
-	cp "${DISTDIR}/factory-gftables.tar.gz" "${S}/BUILD/tarfiles/" \
-		|| die "copy failed"
-	cp "${DISTDIR}/${LIBFAC}.tar.gz" "${S}/BUILD/tarfiles/" \
-		|| die "copy failed"
-	# Macaulay2 developers want that gtest is built internally because
-	# the documentation says it may fail if build with options not the
-	# same as the tested program.
-	cp "${DISTDIR}/gtest-1.6.0.tar.gz" "${S}/BUILD/tarfiles/" \
-		|| die "copy failed"
-
-	eautoreconf
-}
-
-src_configure (){
-	# Recommended in bug #268064 Possibly unecessary
-	# but should not hurt anybody.
-	if ! use emacs; then
-		tags="ctags"
-	fi
-
-	# configure instead of econf to enable install with --prefix
-	./configure LIBS="$($(tc-getPKG_CONFIG) --libs lapack)" \
-		--prefix="${D}/usr" \
-		--disable-encap \
-		--disable-strip \
-		$(use_enable optimization optimize) \
-		$(use_enable debug) \
-		--enable-build-libraries="factory libfac" \
-		--with-unbuilt-programs="4ti2 gfan normaliz nauty cddplus lrslib" \
-		|| die "failed to configure Macaulay"
-}
-
-src_compile() {
-	# Parallel build not supported yet
-	emake -j1
-
-	if use emacs; then
-		cd "${S}/Macaulay2/emacs"
-		elisp-compile *.el
-	fi
-}
-
-src_test() {
-	# No parallel tests yet & Need to increase the time
-	# limit for long running tests in Schubert2 to pass
-	emake TLIMIT=650 -j1 check
-}
-
-src_install () {
-	# Parallel install not supported yet
-	emake -j1 install
-
-	# Remove emacs files and install them in the
-	# correct place if use emacs
-	rm -rf "${D}"/usr/share/emacs/site-lisp
-	if use emacs; then
-		cd "${S}/Macaulay2/emacs"
-		elisp-install ${PN} *.elc *.el
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-}
-
-pkg_postinst() {
-	if use emacs; then
-		elisp-site-regen
-		elog "If you want to set a hot key for Macaulay2 in Emacs add a line similar to"
-		elog "(global-set-key [ f12 ] 'M2)"
-		elog "in order to set it to F12 (or choose a different one)."
-	fi
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/sci-mathematics/Macaulay2/Manifest b/sci-mathematics/Macaulay2/Manifest
index 346c22e27c3c..101cdbec451e 100644
--- a/sci-mathematics/Macaulay2/Manifest
+++ b/sci-mathematics/Macaulay2/Manifest
@@ -1,38 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-AUX 1.4-comint-use-fields.patch 964 SHA256 6d5434a158b3973c91cfaaba56738c61de0a033a4aee0e03e9b74f7b5c9d9e20 SHA512 88e837aaf86a800407ea3c7713c06ff1f0a8fe3c2ff6e5dc24c9583ef37ceaefc487c99dc706efb79c29529c7e909164ceb46cf2a2ca6bd725f12ae71347e63c WHIRLPOOL da2de65b484c7434a8fb9efdbd973f0dad442b774b56166588ab9edabf23162cefddc461ca7ddc6279584a73a97f448120a635c96f0e5b346afce56f3a1325fd
-AUX 1.4-fix-emacs-syntax-table.patch 495 SHA256 710b0b1d50b6788553220ddde6553070e335642485a32713cf3f6d3e845a45b7 SHA512 b3d443de927cdad636b274aee7c4b2907f727e59c0c5018d4d50cf323b7f64b485cb5d53ce66eb1d86591cdf4e36b910c254d2cb760debf6678617bf21b3ec90 WHIRLPOOL fe0e424535c2b330084a9a013d5e748ea25999ab31c56962d2dc4c5f29b0e8dc401291ffbb099ae8bcde0f9c478b40b903b04206c7104fd7ae5c1e10934ebe93
-AUX 1.4-pari-2.5-compat.patch 702 SHA256 d4bebc010a3eace30cf740887cb7ceda661969700397d4ffae78dc8eff97639f SHA512 425bdf8b3cbedd60060008d9c7682666da7bbfa3c53cebe6378699701479ce0aa55a272e20156732f3ed44d892de00268e4baa452a449a37791bddb38c4cde92 WHIRLPOOL 97a0913393f548d31cf316a493fe7d0ed0affdb13fbb2f042def8fbfb19534dedd0140071244213e3777bca626e02c33e713dd6052436a96444dcb1c22be87a6
-AUX 1.4-paths-of-external-programs.patch 3175 SHA256 162823069e075d7b7712db841d8c7bb8e1f03f2c33d4ade18e0b7a20543f5230 SHA512 5a5536db88048cc543a92178597544309dd1b214e1fcdc05a64a9f0de1252c6aad0c9951f897a5b4ff9eae2aba2a23c3318e89dc9a3e403a30c9efdba62122ae WHIRLPOOL 943ebb26a2afd0dec0006f7f097d938468dd3fc13dda7b6a0489c786841861f6c99611569cf438e46ae8d567c9427bf5d25ec5bb220efdf312d84db53fadcc62
 AUX 1.6-lapack.patch 1849 SHA256 d9f49f6b97d12fe09aa7655c24682e16c0da27f3376f82bd62dbac1d907988ae SHA512 89221bf3495f84b0f8f12046dcc3f85f3062c8637d2b42a37817ccef84762ffe31457d2b607457a6a3c23a50f196789d7ca6421e1078191f72bd7e08f46bd36d WHIRLPOOL 0df82df521ea3088a8ea6ec29cb5429ce771d2c40c5662dc0c8a61525893d75809b534c85cc026e2b01cc5d7869afc86ff1101439144c5507e97f3e672c29ba8
 AUX 1.6-paths-of-external-programs.patch 3767 SHA256 af95d1332b04c6746af8c14477830cadb8807da097b14b07d30559df79f9a0bd SHA512 556944da47742a3c4539e084bb6dab7c2375733eb4cbe4d14e1dea852bba3ac61e5f6ad5f805958a52d371a918c8672f7f0308c7c0454a502ca61bb59fea6bf5 WHIRLPOOL c0b0a5638d9a59ea5d5e5c7fe625fb811ece69a3619959aae7d1de1bd525862359163547096c7c5312a66b71e638942c854f96afa9f79b51e0f3395c47d2e240
-AUX 1.6-prune-NumAlgGeo-examples.patch 1399 SHA256 6873c4967dbf1196fcdee42302ec9e091047bc194bac805a934de9522d1f3a26 SHA512 3304797e0c9726f507dc722452c0d8ae9a20f1175ebed157d8f368923ceb602a1d91b69e64e66e0fb1a477a459941a8eeada0821121109e2c696a0469a47d820 WHIRLPOOL 4a2062e09a6d26a72212cf71cabefa5e41e95f583bc0fa44a590f092d3a03265673b11a40f92035bc5e80c14ef8a9795338e3e1cca1b7f6fd6af5df93d9d8b0d
 AUX 70Macaulay2-gentoo.el 597 SHA256 e5583d11e6ab662261abb32e90fcf31ccf6bd56f2b23b691b9255d1b8d8acb2f SHA512 2d6b6d3c85ca93bf4d4100f2172013074dec83f8ce067af219b026ca2b495ff1aa7fb3da027b64ef8e55ad431ce5d42bffdad1ab474bb3e95240ac4235f2f986 WHIRLPOOL fda758e3dc0972a846c452fc61187577902262e5861401ace4cd1d594fd15b513e08083c0c932cc383e05b6cc4e40b5adb417a1e79567f72e172d5fab43e360d
-DIST Macaulay2-1.4-r12617-src.tar.bz2 4003881 SHA256 9ddaf6f7288629647150067f46ca634a9b3c88fedfe3a9e21231531867ad9d91 SHA512 654462aa96d0dcd0809681514d807cfa9abad686f7ed4f4b48a3d69fe3bbfd50bb6caaa6ec73909d0260bd003b324d95f6c2449acd1cdacfff60f3ac78f0a8c0 WHIRLPOOL 449cfb146dc80d1cfb12b5c771049b6b8b05b796ba4da04543f15ab9321b33f1a96abf1facaecbc62ef47d64ec960b2c61bf42af7a115c66e3b0bcb483fbf33e
-DIST Macaulay2-1.6.tar.gz 5966755 SHA256 7130dd5b58158aac0dc99de92a3c27376c644c801e38f4bb69e82c91db529404 SHA512 c5873f55c870e0a9bb0f9584b41e66e30e729f13214a58b1b61dea5b995d09b9fdab357eccbebd1d9c1a9096bae1c5ea95a4777a46bf5a0de3be8d7faca2f3e0 WHIRLPOOL 5e5a6142da9e7e1b34dd0cb510b7d368176cb7e458af4f9f06967190455d0fc983b0b178e5c18930af5a977f5da02c4b7ad20e28bc3f74ade45c4dd962e17dbe
 DIST Macaulay2-1.7_pre.tar.bz2 4639477 SHA256 b14918187724f8911bc50edf87c9692209ff0c2191feb257084adc87609eb1cd SHA512 e70376d1e54b6e239ebb3bf676507a2115fdf5c4fbe05f320553029a84114b74d78f54e4d1bdc7643131f3c45c301e83c21ff99e4d4b675372e971368398d6f5 WHIRLPOOL 396311aadb8a7845deaee5aeca49c431430abc46201e935ef72c4579c9cbe6cd4da85f3e09ff0fe647031f8050fb7c62f63ecce251bf34648c1848cd00eef68e
-DIST Normaliz2.10.1.zip 6225465 SHA256 94524d4592334ea1b083f795f39ae008aa3bd565e316f55387759074b27793af SHA512 77d0656291d156091c004f1dbfed98ffe5836bbd5c715877e38d6727a1f24289f4adf6875012a0986d01da2180878af55c4e58959c7aac36386f69a8c7f89695 WHIRLPOOL d2288b85a78cc7c573b8a497acdf06c43933215672084dde009534dc904dab1ef63e0e726251805b3baafec906a1d3e2b573647ef90109eea2338703cf631b08
-DIST factory-3-1-1.tar.gz 540431 SHA256 1f86833248ef2bb5fd7820201d08df864bda2d8be58bc69255ecdca6fdf12c1b SHA512 e57a558e80f2f1bfa472ff65b52ad2872419e588e48d343708d07b15daa9c57a7d0264fceb9b67cf0ef754fd98c70e859d1bc98c2f0b06610fc7f33d43f59e94 WHIRLPOOL 8ed90df61fe59f588408580d1d5aea2e76c155ed65a4ef798c08d0cd6d9f41bad0b9aa2fa63a06738a47a3a9d29bf2949bd777bbc0d79979365c667ee332330a
-DIST factory-3-1-6.tar.gz 596355 SHA256 862e3b108ad4aeb5f5d8dfbe5f9122b8c473877b39e7c2746920c607f3f87022 SHA512 5c76a9fa7824590a3fc40eed3fccac097b5491a46292d9b49d6c99cb919a4bd3f1a6a5e18e24364c1094b7e1028f61510fc20b86e17fae23f39e1a5390c57477 WHIRLPOOL d0109317744b598571457752218d8f86ca1dfc008a5767e4b1c6e2c6c7242446b37e18976cb0682a14646f3bcc72e545c0674ec764658f4f2bd5cf92e2351c00
 DIST factory-4.0.0+m4.tar.gz 4711126 SHA256 9b2498cc7fc6765f1c586e8061ebe236cdce4b32a44721a235ad2644ec3124fb SHA512 1dacb9aae52e655bccbbc960397b02351050791594dd9c39771f0da7f8c6e8130a8827c2a675c3fbaaa214606e123ac9776e1c73d143649353cefc50cadeea3e WHIRLPOOL 47c4d6261fc6cc9c172035d8774f0cde9fa669fa164fc4a0f47e84ba789d69d14f5a16d042451564412fdedddec71335714ad751508495c22cea25b69f10b925
-DIST factory-gftables.tar.gz 2961892 SHA256 4cd6b3de2fd5eea694a5d843328ab8f6dba1da05ae93efcd2ca0fa5d7658a6fb SHA512 49dfb52e030f04c0b940ce124eb633bb34dacb7ab2faf7f5fee82b3e1ce5331af600b9b684a53eb766c643e38a45f361028940cfd26b8a699c919cfb63d12535 WHIRLPOOL f5d15ac5dcb8e126ecffb42cde5bf5472dbb81e7cb7b2abc1306ee36ef8d85067d0c13b7fa58b65eb09b69da1409a81ea02c0f7ca0e3d1ac71f5c21d8e8b5f81
 DIST factory.4.0.1-gftables.tar.gz 2974152 SHA256 9cd158ceb1c2b1c47bdca2c0b004bba92cb0e0aaa0ea6a43ca784ebdce10eebd SHA512 060c58fe6e4565dd5e7649bfa070f14dec3c383a55ebab52a9f02b58a6405e2183e0c7e08964cddb87b81e872c0d8a52d7bd4575d07269547be544cf6a725a76 WHIRLPOOL a721a6824681118578c7289cea77a3f47e5c7654f30dc454eaac76b19cc89e416ae54b8d21a69f897d7087d4b67990634fc960f81df2ea53f428868d608dc9c2
-DIST gc-7.2alpha5-2010-09-03.tar.gz 1257818 SHA256 adba7f6663d911d4031a1a6a87de6f75d5d8f7870ad362e16f5395449911c1fa SHA512 07b214c040c2b00fa40e57721e71617eaecdbae79d2d08bdb287502e7a111b5da752891f0574fe30699a26efd8c656bb5e9e8ab1c0488a353ef86cd0ba209dda WHIRLPOOL c36830a83682bb8d180384f47985106d64562c9a2b399d44c60b2169f43b143c33f1feffc43959e71e6d9c8cfd07d5a77c59026799b506cb117515cf70d2b29d
-DIST gtest-1.6.0.tar.gz 956966 SHA256 d2346ad6f3b56763b3e18ffde7e69fd2fac11a434f5b12a70f16fabb133554d9 SHA512 b4926751cc3212eb3d3d567a35fd85ed5c8c8393f5781a302f712c56451bf79e596929e56aae0ddedd26d1de2e7ec706c33dd4ee2cfc77a12eb385f36b1da62c WHIRLPOOL 4209b769117486ad5e156625b051364e768338eb3f750e2dfa9149d6e1debebbb81cf3b8b96805dc4222352852a8f70eea3a9f3345ef3986bfacf2fada98581b
 DIST gtest-1.7.0.tar.gz 1001582 SHA256 c0f860eee47c86e0aeb462fd0bdfd70e3975297e0b8b178e0e03a95e1f6c9bc4 SHA512 a9f5c047b39efb2d11b55ee9913662ca402ac6837b3ad2d278ecfbd1caf32ed4546f169e3e92503d57bf3b62ccf89cd062da1c7ea3638aae98e868d2766363c3 WHIRLPOOL 36edbdf8be7c3793a89918a3c43d74e75a6281a37c394f7d2f20506130a76aab04a3beddba01bf7f0e9b6901c7e834ca014c31c913c0ea846d3f6be9c93599d2
-DIST libfac-3-1-1.tar.gz 90104 SHA256 4c463af2d22375aa62be4fb1f9a32cada6723ca5e3ddbd8a4f5cab72b675e33a SHA512 d920bd40c9fb3938d2c08ff0d750bd26df0c7627af388f2ee0592947e4bc78c9841b9bae95775af53642daeee7b8d42761af4bf564e7f899f2ac03ba7ac83a67 WHIRLPOOL 03b550ee8f9ddb57cbd1e690a9e9a660ab083da74b58936c8a3275ba106023d64d59b8bad0ced8b08db2a8e912b01737d2a9814824b154bb95216f556aa77701
-DIST libfac-3-1-6.tar.gz 83557 SHA256 b511559d1c49ca799d46dad6b8e89b9f0183f1c2f53046b1727f9c1d3ff54104 SHA512 fa23180d4139cd87009ff1194a749d7e2997e50c55db9787c2bdabdd6dc6989cda565a54d5138b92315fa51706c58e412b0c21665a04baeeaf756947daf9f38b WHIRLPOOL ff569ced414c779c50ce0aa8b09a06e31930f6be40dd204e2cb7b53e4589f86cff434afae220adfa19290bd188a7c27b711d2f0d3b41cf0b8e9b8a9c69268469
-EBUILD Macaulay2-1.4-r1.ebuild 4332 SHA256 ee166f0023d2a41f68d01103c32b57adb13a99df6d8fd2ec0eb470ce0082a04f SHA512 4e73586bda7d56a38206cb960e84f7697717155539dfdb150a16ded5cc3925ad8f48763d68c4e85927a20674faf7ef4dc62045b4b04d952f0d4602b13ceb1cf4 WHIRLPOOL c0a377bffc089b3a6176f6cdc323cf692721387e3e883fc224b3ec279482b919ac794c1ef81be516dbf0feb0e1261573b93c3e544a2b9dca1cd4fffaeb1265d4
-EBUILD Macaulay2-1.4.ebuild 3909 SHA256 4f4e171e14eef6895a5f33d9586d07994ed4eb8812b6bf3d6b9729f9c8a77467 SHA512 76f34282eb73aaea3a81baed5ce6a410579b665c4fe26cb8037b60778f3adc1024bb3e85523e5af2bc94c6c44559f03793fb9c63a2f70135db771d5a6a17056c WHIRLPOOL 4ef152c4342a67fdf3aa27a42f1f513213042aa0f2b6e555955af8289a19efb73fd042b39e1bf66c2137563da1ef78379a53512970c5b52edb250acd44ef6f95
-EBUILD Macaulay2-1.6.ebuild 5086 SHA256 33abba1628ae0280da2ebd09a10e6503ec538ec19cd5b77308a24e97e9692b69 SHA512 a0efd0301a46fc953f704f9c108b409ca8a0ead956e6f9216ca6f6ed89f508dd02fcda7a6fba3a807d249fe9ea190f2f2671a615936672da5725b4b4bbb66682 WHIRLPOOL 4ed06acc7ed8e8d798a237fcc6c90c4773b382063ef96c3e749d3869e0b8f3821d390065663fabb0f725afdd8f79ba98addebf17ae84c980f4b5cdcb048edc32
 EBUILD Macaulay2-1.7_pre.ebuild 4042 SHA256 5a3fe038596589c97f323c9b2efbac0f41acd5676938e8f21c9aecdfb6cbccc8 SHA512 61610289bfdba37db4b3ac26064c5f272dfe9cea8d19a38a496130451732ce5d930fa95d9e79bc14adfc231e8bacfda56104008310dc5f95a89bee720e31fa00 WHIRLPOOL 395823cd3ebbaa7e5472f0db533d56f2254dde2dd0e52f87055a87f315db9a765cc85fcfe187d858afff61d34355c33b54b9ccf4ee868185cb1c08781d7e61dc
-MISC ChangeLog 2774 SHA256 0cbfa8a420c319c2296855452385b509940f641d39cddc0c6c179e2213c11e47 SHA512 3c77c3ed270d01ae9e452f78aefd17e64255833e444c461178b160e19088ff2c4635420c7cf2ff9bf38203b95ea21f52066c07089e8e69fcac4ba4db7b469069 WHIRLPOOL 34c9d77c82cb6d6b6b0ff00be3972e997c078f188e978277f3c8ea48096b16604fe4aa3faab9257d1a4fbc0a341a7fcaa5990d0285055da426342f2bb5745aab
-MISC metadata.xml 501 SHA256 0f1bd9e307bc0b7f1e5f116c5993f8c36cd796a11bf7f5deca930d43d1d3574b SHA512 19b638437b7591c262ac41401f4154742325aa8afa7a3b087c85b3dee2e4ce98166cc67136bc31d1df25b5bb90eaf6482e05de1ee25023f3f03ad017789b0ccd WHIRLPOOL edfa93878dbaf97c227c18f43805ca48c83978d94d8f4ddf000cd8a2b34bd13dd2454c9086497e00b8cce1cec1d38763b3f8e0a55f0b39f4fc3172d4a858d4ce
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iEYEAREIAAYFAlU2i54ACgkQCaWpQKGI+9Q9zgCfTW7yCkR6ZyWwkUQWC3whOEfr
-vicAn2QNDRo07RkMmAGlBBfsybt5kdJo
-=ceuH
------END PGP SIGNATURE-----
+MISC ChangeLog 3125 SHA256 6c09e6c967f44675d6596baf5fc9bda14cd880c434ff3bfa697c136d5a8d55ee SHA512 af194798a10316494c0274acaff98b1c59e3f66e494b88e1f06ec6b255984da543a4112cadd74379357088ac9ef3d4ba19599d8015f1a42a683f6fbe3a13aff5 WHIRLPOOL fe9810cbbf5f3e0b1d3d0cbcb4ad197a5da30c9d83760bf6939294e4f4f75b70a273fbdbd576d692eb2285a77d1c725c44aa35288c401c956d66dd2e6f1e28df
+MISC metadata.xml 519 SHA256 d292da81b1c9613d347c8e56eee399180bd249b962c259b942b6a76fdba3da53 SHA512 2676f7ef0d7b5ab6ca842e99315db83633ba60dbf405efe6802742e5feadfc3ac7cd3b6b1aa49d81668c607b949d1fa8b362e77e139d7831ec774fb45e524818 WHIRLPOOL 42ffcb097509f02da8d70cebfe89e482d948afe94ab4d3c2a58bebb827047d4959a433af068751d742a4914db311f2d7e9030b91af4229932efb65190cc70523
diff --git a/sci-mathematics/Macaulay2/files/1.4-comint-use-fields.patch b/sci-mathematics/Macaulay2/files/1.4-comint-use-fields.patch
deleted file mode 100644
index 5895f3ef2145..000000000000
--- a/sci-mathematics/Macaulay2/files/1.4-comint-use-fields.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: Macaulay2/emacs/M2.el
-===================================================================
---- Macaulay2/emacs/M2.el	(revision 13949)
-+++ Macaulay2/emacs/M2.el	(revision 13951)
-@@ -38,7 +38,6 @@
- \\{M2-comint-mode-map}"
-   (M2-common)
-   (setq comint-prompt-regexp M2-comint-prompt-regexp)
--  (setq comint-use-prompt-regexp-instead-of-fields t)
-   (set (make-local-variable 'comint-dynamic-complete-functions) '( M2-dynamic-complete-symbol comint-dynamic-complete-filename))
-   ;; give up trying to fix this:
-   ;; (set (make-local-variable 'ansi-color-for-comint-mode-on) nil)
-@@ -46,7 +45,6 @@
- 
- (defun M2-common()
-   "Set up features common to both Macaulay 2 major modes."
--  (set (make-local-variable 'comint-use-prompt-regexp-instead-of-fields) nil) ; we might want to start using "input fields", too!
-   (set (make-local-variable 'comment-start) "-- ")
-   (set (make-local-variable 'comment-end) "")
-   (set (make-local-variable 'comment-column) 60)
diff --git a/sci-mathematics/Macaulay2/files/1.4-fix-emacs-syntax-table.patch b/sci-mathematics/Macaulay2/files/1.4-fix-emacs-syntax-table.patch
deleted file mode 100644
index 32fc43bc14a2..000000000000
--- a/sci-mathematics/Macaulay2/files/1.4-fix-emacs-syntax-table.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: Macaulay2/emacs/M2.el
-===================================================================
---- Macaulay2/emacs/M2.el	(revision 13991)
-+++ Macaulay2/emacs/M2.el	(revision 14000)
-@@ -102,7 +102,7 @@
- (mapcar
-  (function
-   (lambda (syntax-table)
--    (modify-syntax-entry ?\\ "\\" syntax-table)
-+    (modify-syntax-entry ?\\ "." syntax-table)
-     (modify-syntax-entry ?-  ". 12" syntax-table)
-     (modify-syntax-entry ?\n ">" syntax-table)
-     (modify-syntax-entry ?\^m ">" syntax-table)
diff --git a/sci-mathematics/Macaulay2/files/1.4-pari-2.5-compat.patch b/sci-mathematics/Macaulay2/files/1.4-pari-2.5-compat.patch
deleted file mode 100644
index 5b254a8eb447..000000000000
--- a/sci-mathematics/Macaulay2/files/1.4-pari-2.5-compat.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: Macaulay2/d/pari-c.c
-===================================================================
---- Macaulay2/d/pari-c.c	(revision 13515)
-+++ Macaulay2/d/pari-c.c	(revision 13519)
-@@ -154,9 +154,11 @@
- */
- 
- #define pari_examine(x) do { fputs(" " #x ": ", stdout); voir(x,-1); } while (0)
--#define pari_display(x) do { fputs(" " #x ": ", stdout); outbeaut(x); } while (0)
-+#define pari_display(x) do { fputs(" " #x ": ", stdout); output(x); } while (0)
- #define abs(x) ((x)<0?-(x):(x))
- 
-+#define max(a,b) ((a)>(b)?(a):(b))
-+
- static void gmp_examine0(mpz_t z) {
-   int i, n = max(z->_mp_alloc,abs(z->_mp_size));
-   printf("alloc %d size %d %s {",z->_mp_alloc,z->_mp_size,z->_mp_size < 0 ? "-" : "+");
diff --git a/sci-mathematics/Macaulay2/files/1.4-paths-of-external-programs.patch b/sci-mathematics/Macaulay2/files/1.4-paths-of-external-programs.patch
deleted file mode 100644
index 9b16e5a51669..000000000000
--- a/sci-mathematics/Macaulay2/files/1.4-paths-of-external-programs.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-diff -U 3 -dHrN M2source.orig/Macaulay2/packages/FourTiTwo.m2 M2source.patches/Macaulay2/packages/FourTiTwo.m2
---- M2source.orig/Macaulay2/packages/FourTiTwo.m2	2010-09-19 02:32:45.000000000 +0200
-+++ M2source.patches/Macaulay2/packages/FourTiTwo.m2	2010-09-19 02:37:25.000000000 +0200
-@@ -47,7 +47,7 @@
- 
- path'4ti2 = (options FourTiTwo).Configuration#"path"
- -- NOTE: the absolute path should be put into the .init file for 4ti2 inside the .Macaulay2 directory.
--if path'4ti2 == "" then path'4ti2 = prefixDirectory | currentLayout#"programs"
-+if path'4ti2 == "" then path'4ti2 = "/usr/bin/"
- 
- getFilename = () -> (
-      filename := temporaryFileName();
-diff -U 3 -dHrN M2source.orig/Macaulay2/packages/gfanInterface.m2 M2source.patches/Macaulay2/packages/gfanInterface.m2
---- M2source.orig/Macaulay2/packages/gfanInterface.m2	2010-09-19 02:32:45.000000000 +0200
-+++ M2source.patches/Macaulay2/packages/gfanInterface.m2	2010-09-19 02:38:08.000000000 +0200
-@@ -26,7 +26,7 @@
-      }
- 
- gfan'path = gfanInterface#Options#Configuration#"path"
--if gfan'path == "" then gfan'path = prefixDirectory | currentLayout#"programs"
-+if gfan'path == "" then gfan'path = "/usr/bin/"
- if instance(gfan'path, String) then gfan'path = {gfan'path}
- if not instance(gfan'path,List) then error "expected configuration option gfan'path to be a list of strings or a string"
- gfan'path = join(
-diff -U 3 -dHrN M2source.orig/Macaulay2/packages/Nauty.m2 M2source.patches/Macaulay2/packages/Nauty.m2
---- M2source.orig/Macaulay2/packages/Nauty.m2	2010-09-19 02:33:04.000000000 +0200
-+++ M2source.patches/Macaulay2/packages/Nauty.m2	2010-09-19 02:40:46.000000000 +0200
-@@ -27,7 +27,8 @@
- -- Check the ~/.Macaulay2/init-Nauty.m2 file for the absolute path.
- -- If it's not there, then use the M2-Programs directory.
- nauty'path = (options Nauty).Configuration#"path";
--if nauty'path == "" then nauty'path = prefixDirectory | currentLayout#"programs";
-+if nauty'path == "" then nauty'path = "/usr/bin/";
-+
- 
- -------------------
- -- Exports
-diff -U 3 -dHrN M2source.orig/Macaulay2/packages/Normaliz.m2 M2source.patches/Macaulay2/packages/Normaliz.m2
---- M2source.orig/Macaulay2/packages/Normaliz.m2	2010-09-19 02:33:04.000000000 +0200
-+++ M2source.patches/Macaulay2/packages/Normaliz.m2	2010-09-19 02:39:12.000000000 +0200
-@@ -156,7 +156,7 @@
-         nmzExec="norm64";
-     );
- --    return nmzExec;
--    return prefixDirectory | currentLayout#"programs" | nmzExec;
-+    return "/usr/bin/" | nmzExec;
- );
- 
- 
-diff -U 3 -dHrN M2source.orig/Macaulay2/packages/StatePolytope.m2 M2source.patches/Macaulay2/packages/StatePolytope.m2
---- M2source.orig/Macaulay2/packages/StatePolytope.m2	2010-09-19 02:32:46.000000000 +0200
-+++ M2source.patches/Macaulay2/packages/StatePolytope.m2	2010-09-19 02:38:39.000000000 +0200
-@@ -31,7 +31,7 @@
- 
- 
- gfanCommand = (options StatePolytope)#Configuration#"gfan command"
--if gfanCommand === "gfan" then gfanCommand = prefixDirectory | currentLayout#"programs" | gfanCommand
-+if gfanCommand === "gfan" then gfanCommand = "/usr/bin/" | gfanCommand
- gfanCommand = "!" | gfanCommand
- 
- --The next two functions print out the ring and the ideal in the format required by gfan
diff --git a/sci-mathematics/Macaulay2/files/1.6-prune-NumAlgGeo-examples.patch b/sci-mathematics/Macaulay2/files/1.6-prune-NumAlgGeo-examples.patch
deleted file mode 100644
index c59d5ec0ab7a..000000000000
--- a/sci-mathematics/Macaulay2/files/1.6-prune-NumAlgGeo-examples.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- doc.m2	2013-05-13 15:30:04.000000000 +0200
-+++ doc-fixed.m2	2013-05-15 09:10:27.573473985 +0200
-@@ -549,11 +549,9 @@
- setRandomSeed 7
- R = CC[x,y]
- F = {x^2+y^2-1, x*y};
--regeneration F 
- R = CC[x,y,z]
- sph = (x^2+y^2+z^2-1); 
- I = ideal {sph*(x-0.5)*(y-x^2), sph*(y-0.5)*(z-x^3), sph*(z-0.5)*(z-x^3)*(y-x^3)};
--cs = regeneration I_*
-      	///,
- 	Caveat => {"This function is under development. It may not work well if the input represents a nonreduced scheme.",
- 	     "The (temporary) option ", TO Output, " can take two values: ", TO Regular, " (default) and ", TO Singular, ". 
-@@ -571,12 +569,9 @@
- setRandomSeed 7
- R = CC[x,y]
- F = {x^2+y^2-1, x*y};
--W = first regeneration F 
--decompose W
- R = CC[x,y,z]
- sph = (x^2+y^2+z^2-1); 
- I = ideal {sph*(x-0.5)*(y-x^2), sph*(y-0.5)*(z-x^3), sph*(z-0.5)*(z-x^3)*(y-x^3)};
--regeneration I_* / decompose
-      	///,
- 	Caveat => {"This function is under development. It can not decompose nonreduced components at the moment. 
- 	     If monodromy breakup algorithm fails to classify some points, the unnclassified points appear 
-@@ -597,8 +592,6 @@
- sph = (x^2+y^2+z^2-1); 
- I = ideal {sph*(x-1)*(y-x^2), sph*(y-1)*(z-x^3)};
- setRandomSeed 7
--V = numericalVariety I 
--peek V
-     	///,
- 	Caveat => {"This function is under development. It may not work well if the input represents a nonreduced scheme." },
-         SeeAlso=>{(decompose, WitnessSet)}
diff --git a/sci-mathematics/Macaulay2/metadata.xml b/sci-mathematics/Macaulay2/metadata.xml
index 09dd6f4ff10a..3513de74db1a 100644
--- a/sci-mathematics/Macaulay2/metadata.xml
+++ b/sci-mathematics/Macaulay2/metadata.xml
@@ -1,15 +1,15 @@
 <?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="optimization">Accept upstream's choices for -O option, i.e. -O3 almost everywhere.</flag>
-</use>
-<longdescription lang="en">
+  <maintainer>
+    <email>tomka@gentoo.org</email>
+    <name>Thomas Kahle</name>
+  </maintainer>
+  <herd>sci-mathematics</herd>
+  <use>
+    <flag name="optimization">Accept upstream's choices for -O option, i.e. -O3 almost everywhere.</flag>
+  </use>
+  <longdescription lang="en">
   Macaulay2 is a research tool for algraic geometry and commutative
   algebra. 
 </longdescription>