[gentoo-commits] gentoo-x86 commit in sci-mathematics/Macaulay2: Macaulay2-0.9.95-r2.ebuild ChangeLog Macaulay2-0.9.95-r1.ebuild Macaulay2-1.0.ebuild Macaulay2-0.9.95.ebuild Macaulay2-0.9.2.ebuild

[Markus Dittrich (markusle)]

markusle    08/01/06 15:51:18

  Modified:             Macaulay2-0.9.95-r2.ebuild ChangeLog
                        Macaulay2-0.9.95-r1.ebuild
  Added:                Macaulay2-1.0.ebuild
  Removed:              Macaulay2-0.9.95.ebuild Macaulay2-0.9.2.ebuild
  Log:
  Version bump and removed old versions.
  (Portage version: 2.1.4_rc14)

Revision  Changes    Path
1.3                  sci-mathematics/Macaulay2/Macaulay2-0.9.95-r2.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-mathematics/Macaulay2/Macaulay2-0.9.95-r2.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-mathematics/Macaulay2/Macaulay2-0.9.95-r2.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-mathematics/Macaulay2/Macaulay2-0.9.95-r2.ebuild?r1=1.2&r2=1.3

Index: Macaulay2-0.9.95-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-mathematics/Macaulay2/Macaulay2-0.9.95-r2.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Macaulay2-0.9.95-r2.ebuild	1 Jun 2007 01:02:30 -0000	1.2
+++ Macaulay2-0.9.95-r2.ebuild	6 Jan 2008 15:51:17 -0000	1.3
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/Macaulay2/Macaulay2-0.9.95-r2.ebuild,v 1.2 2007/06/01 01:02:30 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/Macaulay2/Macaulay2-0.9.95-r2.ebuild,v 1.3 2008/01/06 15:51:17 markusle Exp $
 
 inherit elisp-common eutils flag-o-matic toolchain-funcs autotools
 
@@ -65,12 +65,10 @@
 }
 
 src_test() {
-	cd "${S}"
 	make check || die "tests failed"
 }
 
 src_install () {
-	cd "${S}"
 	make install || die "install failed"
 
 	# nothing in here, get rid of it



1.16                 sci-mathematics/Macaulay2/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-mathematics/Macaulay2/ChangeLog?rev=1.16&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-mathematics/Macaulay2/ChangeLog?rev=1.16&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-mathematics/Macaulay2/ChangeLog?r1=1.15&r2=1.16

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-mathematics/Macaulay2/ChangeLog,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ChangeLog	1 Jun 2007 01:02:30 -0000	1.15
+++ ChangeLog	6 Jan 2008 15:51:17 -0000	1.16
@@ -1,6 +1,18 @@
 # ChangeLog for sci-mathematics/Macaulay2
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/Macaulay2/ChangeLog,v 1.15 2007/06/01 01:02:30 markusle Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/Macaulay2/ChangeLog,v 1.16 2008/01/06 15:51:17 markusle Exp $
+
+*Macaulay2-1.0 (06 Jan 2008)
+
+  06 Jan 2008; Markus Dittrich <markusle@g.o>
+  -files/gentoo-libfac-0.3.2.include.diff,
+  +files/Macaulay2-1.0-example-fix.patch, 
+  -files/gentoo-factory-1.3b.diff,
+  -Macaulay2-0.9.2.ebuild, -Macaulay2-0.9.95.ebuild, 
+  +Macaulay2-1.0.ebuild:
+  Version bump and removed old versions. The tarball for
+  Macaulay2-1.0 was extracted from upstream's svn release
+  branch since no sources were posted.
 
   31 May 2007; Markus Dittrich <markusle@g.o>
   Macaulay2-0.9.95-r2.ebuild:



1.7                  sci-mathematics/Macaulay2/Macaulay2-0.9.95-r1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-mathematics/Macaulay2/Macaulay2-0.9.95-r1.ebuild?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-mathematics/Macaulay2/Macaulay2-0.9.95-r1.ebuild?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-mathematics/Macaulay2/Macaulay2-0.9.95-r1.ebuild?r1=1.6&r2=1.7

Index: Macaulay2-0.9.95-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-mathematics/Macaulay2/Macaulay2-0.9.95-r1.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Macaulay2-0.9.95-r1.ebuild	25 May 2007 17:33:43 -0000	1.6
+++ Macaulay2-0.9.95-r1.ebuild	6 Jan 2008 15:51:17 -0000	1.7
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/Macaulay2/Macaulay2-0.9.95-r1.ebuild,v 1.6 2007/05/25 17:33:43 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/Macaulay2/Macaulay2-0.9.95-r1.ebuild,v 1.7 2008/01/06 15:51:17 markusle Exp $
 
 inherit elisp-common eutils flag-o-matic toolchain-funcs autotools
 
@@ -65,12 +65,10 @@
 }
 
 src_test() {
-	cd "${S}"
 	make check || die "tests failed"
 }
 
 src_install () {
-	cd "${S}"
 	make install || die "install failed"
 
 	# nothing in here, get rid of it



1.1                  sci-mathematics/Macaulay2/Macaulay2-1.0.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-mathematics/Macaulay2/Macaulay2-1.0.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-mathematics/Macaulay2/Macaulay2-1.0.ebuild?rev=1.1&content-type=text/plain

Index: Macaulay2-1.0.ebuild
===================================================================
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/Macaulay2/Macaulay2-1.0.ebuild,v 1.1 2008/01/06 15:51:17 markusle Exp $

inherit elisp-common eutils flag-o-matic toolchain-funcs autotools

IUSE="emacs"

DESCRIPTION="research tool for commutative algebra and algebraic geometry"
SRC_URI="mirror://gentoo/${P}-src.tar.bz2
	ftp://www.mathematik.uni-kl.de/pub/Math/Singular/Factory/factory-3-0-3.tar.gz \
	ftp://www.mathematik.uni-kl.de/pub/Math/Singular/Libfac/libfac-3-0-3.tar.gz"

HOMEPAGE="http://www.math.uiuc.edu/Macaulay2/"

SLOT="0"
LICENSE="GPL-2"
KEYWORDS="~x86 ~amd64"

DEPEND="sys-libs/gdbm
	dev-libs/gmp
	dev-libs/ntl
	dev-libs/boehm-gc
	virtual/blas
	virtual/lapack
	dev-util/ctags
	sys-libs/ncurses
	emacs? ( virtual/emacs )"

SITEFILE=70Macaulay2-gentoo.el

pkg_setup() {

	# boehm-gc currently is broken with USE='threads'
	# (see bug #195335) causing Macaulay2 to fail
	if built_with_use =dev-libs/boehm-gc-7* threads; then
		echo
		eerror "dev-libs/boehm-gc-7* with USE=\"threads\" is"
		eerror "currently broken (see bug #195335) causing"
		eerror "Macaulay to fail building. Please re-emerge"
		eerror "dev-libs/boehm-gc-7* with USE=\"-threads\"!"
		die "boehm-gc setup error"
		echo
	fi
}

src_unpack() {
	unpack ${A}
	cd "${S}"
	epatch "${FILESDIR}"/${P}-example-fix.patch

	sed -e "s:\$docdirtail/${PN}:\$docdirtail/${P}:" \
		-i configure.ac \
		|| die "Failed to fix doc install directory."
}

src_compile() {
	cd "${WORKDIR}/factory-3.0.3"
	econf --enable-NTL --prefix="${WORKDIR}" || \
		die "failed to configure factory"
	emake || die "failed to build factory"
	make install || die "failed to install factory"

	cd "${WORKDIR}/libfac"
	CPPFLAGS="-I${WORKDIR}/include" econf --with-NOSTREAMIO \
		--prefix="${WORKDIR}" || die "failed to configure libfac"
	emake || die "failed to build libfac"
	make install || die "failed to install libfac"

	cd "${S}"
	sed -e "/^docm2RelDir/s:Macaulay2:${P}:" \
		-i include/config.Makefile.in \
		|| die "failed to fix makefile"

	CXXFLAGS="${CXXFLAGS} -Wno-deprecated"
	append-ldflags "-L${WORKDIR}/$(get_libdir)"
	emake -j1 && CPPFLAGS="-I/usr/include/gc -I${WORKDIR}/include" \
		./configure --prefix="${D}/usr" --disable-encap \
		--with-lapacklibs="$(pkg-config lapack --libs)" \
		|| die "failed to configure Macaulay"

	emake -j1 || die "failed to build Macaulay"
}

# checks are currently very broken
#src_test() {
#	cd "${S}"
#	make check || die "tests failed"
#}

src_install () {
	make install || die "install failed"

	# nothing useful in here, get rid of it
	# NOTE: Macaulay installs into lib even on amd64 hence don't 
	# replace lib with $(get_libdir) below!
	rm -fr "${D}"/usr/lib \
		|| die "failed to remove empty /usr/lib"

	use emacs && elisp-site-file-install "${FILESDIR}/${SITEFILE}"
}

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
}



-- 
gentoo-commits@l.g.o mailing list