bump to prerelease version as latest release fails

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x565C32BC

3 files changed, 170 insertions, 6 deletions

diff --git a/sci-mathematics/Macaulay2/ChangeLog b/sci-mathematics/Macaulay2/ChangeLog
index cd6c0ae3cda7..13c2747a3f1b 100644
--- a/sci-mathematics/Macaulay2/ChangeLog
+++ b/sci-mathematics/Macaulay2/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-mathematics/Macaulay2
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/Macaulay2/ChangeLog,v 1.31 2014/05/03 15:44:12 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/Macaulay2/ChangeLog,v 1.32 2014/07/04 11:08:51 tomka Exp $
+
+*Macaulay2-1.7_pre (04 Jul 2014)
+
+  04 Jul 2014; Thomas Kahle <tomka@gentoo.org> +Macaulay2-1.7_pre.ebuild:
+  bump to prerelease version as latest release fails
 
   03 May 2014; Thomas Kahle <tomka@gentoo.org> Macaulay2-1.6.ebuild:
   Use python-2 for gtest (bug 509462)
diff --git a/sci-mathematics/Macaulay2/Macaulay2-1.7_pre.ebuild b/sci-mathematics/Macaulay2/Macaulay2-1.7_pre.ebuild
new file mode 100644
index 000000000000..285226392de5
--- /dev/null
+++ b/sci-mathematics/Macaulay2/Macaulay2-1.7_pre.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/Macaulay2/Macaulay2-1.7_pre.ebuild,v 1.1 2014/07/04 11:08:51 tomka Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit autotools elisp-common eutils flag-o-matic python-single-r1 toolchain-funcs
+
+FACTORY="factory-4.0.0+m4"
+FACTORY_GFTABLES="factory.4.0.1-gftables"
+
+DESCRIPTION="Research tool for commutative algebra and algebraic geometry"
+HOMEPAGE="http://www.math.uiuc.edu/Macaulay2/"
+BASE_URI="http://www.math.uiuc.edu/Macaulay2/Downloads/OtherSourceCode/trunk"
+SRC_URI="
+	http://dev.gentoo.org/~tomka/files/${P}.tar.bz2
+	${BASE_URI}/${FACTORY}.tar.gz
+	${BASE_URI}/${FACTORY_GFTABLES}.tar.gz
+	${BASE_URI}/gtest-1.7.0.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS=" ~amd64 ~x86"
+IUSE="debug emacs +optimization"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+	sys-process/time
+	virtual/pkgconfig"
+
+RDEPEND="${PYTHON_DEPS}
+	sys-libs/gdbm
+	dev-libs/ntl
+	sci-mathematics/pari[gmp]
+	>=sys-libs/readline-6.1
+	dev-libs/libxml2:2
+	sci-mathematics/flint[gc]
+	sci-mathematics/frobby
+	sci-mathematics/4ti2
+	sci-mathematics/nauty
+	>=sci-mathematics/normaliz-2.8
+	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.4[threads]
+	dev-libs/libatomic_ops
+	emacs? ( virtual/emacs )"
+
+SITEFILE=70Macaulay2-gentoo.el
+
+S="${WORKDIR}/M2/"
+
+pkg_setup () {
+	tc-export CC CPP CXX PKG_CONFIG
+	append-cppflags "-I/usr/include/frobby"
+	# gtest needs python:2
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# Patching .m2 files to look for external programs in
+	# /usr/bin
+	epatch "${FILESDIR}"/1.6-paths-of-external-programs.patch
+
+	# Shortcircuit lapack tests
+	epatch "${FILESDIR}"/1.6-lapack.patch
+
+	# Factory is a statically linked library which (in this flavor) are not used by any
+	# other program. We build it internally and don't install it.
+	cp "${DISTDIR}/${FACTORY}.tar.gz" "${S}/BUILD/tarfiles/" \
+		|| die "copy failed"
+	cp "${DISTDIR}/${FACTORY_GFTABLES}.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.7.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 \
+		--with-issue=Gentoo \
+		$(use_enable optimization optimize) \
+		$(use_enable debug) \
+		--enable-build-libraries="factory" \
+		--with-unbuilt-programs="4ti2 gfan normaliz nauty cddplus lrslib" \
+		|| die "failed to configure Macaulay"
+}
+
+src_compile() {
+	# Parallel build not supported yet
+	emake IgnoreExampleErrors=true -j1
+
+	if use emacs; then
+		cd "${S}/Macaulay2/emacs" || die
+		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=550 -j1 check
+}
+
+src_install () {
+	# Parallel install not supported yet
+	emake IgnoreExampleErrors=true -j1 install
+
+	# Remove emacs files and install them in the
+	# correct place if use emacs
+	rm -rf "${ED}"/usr/share/emacs/site-lisp || die
+	if use emacs; then
+		cd "${S}/Macaulay2/emacs" || die
+		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 c9dd1339fcf1..e680ba1dab87 100644
--- a/sci-mathematics/Macaulay2/Manifest
+++ b/sci-mathematics/Macaulay2/Manifest
@@ -11,23 +11,28 @@ AUX 1.6-prune-NumAlgGeo-examples.patch 1399 SHA256 6873c4967dbf1196fcdee42302ec9
 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 4320 SHA256 1cd029f99254ac4596afe1711bc45a1e8d0e7d8f027b7564d23e92aa066ace84 SHA512 54bcafcd1d9719d888fbd20301235905b409f1a0aaee9a526e18a5ba9eff96f0380a3c737b54f440ed561eb84b24176b0e7c6c7c9b2b8722961e96b831250921 WHIRLPOOL 6d4ab258db25ceb8c2d82253069a9dfc0638d9dd68d3f2087059e5420918232e63a3487e5e49286968d6a93b79fcc6c989649319e727be1d1e08f6e4564ddb43
 EBUILD Macaulay2-1.4.ebuild 3892 SHA256 d5d9631515263d355e548827512e44fd526ffd41b5db981ac9acae35fbfca39c SHA512 1d95b5c593655a40851a371ce5f8dc3eb9d4dfc0656d66068c557d56d7394e5022d1b690c424a5a73649a7399b1f2e2837e3803ea262fffd4c97e087b9bc9e1c WHIRLPOOL a7a342f10f7c4efc8025e50db2b3542a7dea802abaa6695faefe345cd0733654a510a12da66648da688bda9cd55cd3bef6d65b757f7681861fa565a7ba61155b
 EBUILD Macaulay2-1.6.ebuild 5083 SHA256 26b232700c4a4b44381bdc3e3ce09e7bcd2d504cd42656c2859572090ea40980 SHA512 d8ac6f360d8290f25246f927dd28882c1f134b5ca4eaea0be4a116039a3a5eb23db984522e899db4bffa69d08db2f80e889c54443bbce17e4f6565e7cdf835c7 WHIRLPOOL df63c19e9b648097753ffa227489a51cf3eed3eff4eb6a42f6989565c224117d5bd8c1bf68f20b11594072a8fbe188432a5fe582ff87a5860ec4fdeba37012be
-MISC ChangeLog 2123 SHA256 0cdad6b96f4e85dbaad86462e46ba66afb7fa64573eba885d98dd63796437f64 SHA512 ff2ab2b581fa2c8d1a48d4d671448fdbccbc0a04f98f4dc8b1c8cd6a7b7612a36b9d8ff8ca408f529fe8441cc7e88efba439e8d2bfafeb2c9204c425b0b8a772 WHIRLPOOL 390e21875f324318756cf6cde9ab42b6bba3fb15a1077fdb7144dbbff33e9a0492e81ab2506b4af67a6b7d32acb80080efa263d66b0558e6779cbed6b08b11fd
+EBUILD Macaulay2-1.7_pre.ebuild 4048 SHA256 72ef97cbac4b66097a272278cbf663f660883ef9b50c576d44d77844a9d6b2f9 SHA512 d05ae7e1a56bd9ebae2295e4be890a7dd48296bd8c604dc55126a7a56ca46a4e79fe28a832d8a59b40353b2826eb8de63086b215e1590a09f03ba663d8e08f13 WHIRLPOOL 565489388c13c82093efb17282cb9787a4a59872930506c393cb7cf5d3aa82306b8ad1775074617bbf016c569496ca432467927aac7e52202328c1b8b94637a7
+MISC ChangeLog 2285 SHA256 956c1431df2e8a7854e11a69ff1205c32fdd5b4d2144ba79682ec091692816ed SHA512 380a5e5cd480436fe1719e07853c013bb5e98797e3922c8479a2db86410cb21987726c371a73d5e2652bc7486dce2a4d686d9c47a168ac9f49f1346589d40261 WHIRLPOOL a1c1f154a21954de3e4a3914d3bb6e22290ffac7d5b921f54ae75d0e7edf9e1f967b24e43814763dbbff6fd5bba1cfab41dcd4e3b5993e9e3abdbf33bcbf8a99
 MISC metadata.xml 501 SHA256 0f1bd9e307bc0b7f1e5f116c5993f8c36cd796a11bf7f5deca930d43d1d3574b SHA512 19b638437b7591c262ac41401f4154742325aa8afa7a3b087c85b3dee2e4ce98166cc67136bc31d1df25b5bb90eaf6482e05de1ee25023f3f03ad017789b0ccd WHIRLPOOL edfa93878dbaf97c227c18f43805ca48c83978d94d8f4ddf000cd8a2b34bd13dd2454c9086497e00b8cce1cec1d38763b3f8e0a55f0b39f4fc3172d4a858d4ce
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iF4EAREIAAYFAlNlDuIACgkQid6yGVZcMrw/FwD/RgLaQAvTLHBGykgVSW3erDC8
-HCmOuFpsPxCXXZYLBm4BAJap+0pqE57vKYgyB0RR/uzClKmiteX/FoXNBHgXTdDT
-=fQ3H
+iF4EAREIAAYFAlO2i1wACgkQid6yGVZcMrxsGQEAtQTg7sZkWiOrD7LYjAABvbik
+p87N05coyjSb+xzZnpsBAK5a4MPICm92pKCpUdouNa8E9set0Pteeysz7DEFwZYv
+=DHd3
 -----END PGP SIGNATURE-----