Drop old

(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)

10 files changed, 17 insertions, 622 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/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>