From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1PtE04-000419-Cm for garchives@archives.gentoo.org; Sat, 26 Feb 2011 06:51:32 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BD6FA1C01F; Sat, 26 Feb 2011 06:51:23 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 6CF461C01F for ; Sat, 26 Feb 2011 06:51:23 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AD6D01B40DF for ; Sat, 26 Feb 2011 06:51:22 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id DFD698006A for ; Sat, 26 Feb 2011 06:51:21 +0000 (UTC) From: "Thomas Kahle" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Kahle" Message-ID: Subject: [gentoo-commits] proj/sci:master commit in: sci-mathematics/Macaulay2/ X-VCS-Repository: proj/sci X-VCS-Files: sci-mathematics/Macaulay2/ChangeLog sci-mathematics/Macaulay2/Macaulay2-9999.ebuild X-VCS-Directories: sci-mathematics/Macaulay2/ X-VCS-Committer: tom111 X-VCS-Committer-Name: Thomas Kahle X-VCS-Revision: f25808fc0d5097d0181544289eb38af6d00447a3 Date: Sat, 26 Feb 2011 06:51:21 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 5b6ac3356fa6446eaaa8f894b516cc9b commit: f25808fc0d5097d0181544289eb38af6d00447a3 Author: Thomas Kahle gentoo org> AuthorDate: Sat Feb 26 06:52:13 2011 +0000 Commit: Thomas Kahle gmx de> CommitDate: Sat Feb 26 06:52:34 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/sci.git;a=3Dc= ommit;h=3Df25808fc Live ebuild updated (Portage version: 2.1.9.41/git/Linux i686, signed Manifest commit with ke= y 0x914769A1) --- sci-mathematics/Macaulay2/ChangeLog | 5 ++- sci-mathematics/Macaulay2/Macaulay2-9999.ebuild | 36 +++++++----------= ----- 2 files changed, 16 insertions(+), 25 deletions(-) diff --git a/sci-mathematics/Macaulay2/ChangeLog b/sci-mathematics/Macaul= ay2/ChangeLog index 107a4ca..1e0b146 100644 --- a/sci-mathematics/Macaulay2/ChangeLog +++ b/sci-mathematics/Macaulay2/ChangeLog @@ -1,7 +1,10 @@ # ChangeLog for sci-mathematics/Macaulay2 -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ =20 + 26 Feb 2011; Thomas Kahle Macaulay2-9999.ebuild: + Live ebuild updated + 12 Nov 2010; Thomas Kahle -files/1.4_pre-paths-of-external-programs.patch, -Macaulay2-1.3.1-r3.ebuild, -Macaulay2-1.4_pre.ebuild, diff --git a/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild b/sci-mathem= atics/Macaulay2/Macaulay2-9999.ebuild index 80ce6b0..3798d86 100644 --- a/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild +++ b/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ =20 EAPI=3D"2" =20 -inherit autotools elisp-common eutils subversion +inherit autotools elisp-common eutils flag-o-matic subversion =20 IUSE=3D"emacs optimization" =20 @@ -53,6 +53,7 @@ RESTRICT=3D"mirror" =20 pkg_setup () { tc-export CC CPP CXX + append-cppflags "-I/usr/include/frobby" } =20 src_prepare() { @@ -60,31 +61,19 @@ src_prepare() { # /usr/bin epatch "${FILESDIR}"/${PV}-paths-of-external-programs.patch =20 - # This is now a configure option: -# if ! use optimization ; then -# epatch "${FILESDIR}"/respect-CFLAGS.patch -# fi - -## fixed in trunk as of 09/28/10 -# # The Posets-Package refers to a non-existent Graphs package. -# # We dump it for now. -# rm "${S}"/Macaulay2/packages/Posets.m2 -# sed -i "/ Posets/d" "${S}"/configure.ac -# sed -i "/Posets/d" "${S}"/Macaulay2/packages/Macaulay2Doc/changes.m2 - # Fixing make warnings about unavailable jobserver: sed -i "s/\$(MAKE)/+ \$(MAKE)/g" "${S}"/distributions/Makefile.in =20 - # Factory, and libfac are statically linked libraries which (in this fl= avor) - # are not used by any other program. We build them internally and don't= install them - # Permission was granted to tomka by bicatali on IRC. - # 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 for now. + # Factory, and libfac are statically linked libraries which (in this fl= avor) 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 >=3Dboehm-gc-7.2_alph= a5 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" =20 @@ -92,19 +81,18 @@ src_prepare() { } =20 src_configure (){ - # Recommended in bug #268064 Possibly unecessary # but should not hurt anybody. if ! use emacs; then tags=3D"ctags" fi =20 - CPPFLAGS=3D"-I/usr/include/frobby" \ - ./configure --prefix=3D"${D}/usr" \ + # configure instead of econf to enable install with --prefix + ./configure --prefix=3D"${D}/usr" \ --disable-encap \ --disable-strip \ $(use_enable optimization optimize) \ - --enable-build-libraries=3D"factory libfac" \ + --enable-build-libraries=3D"factory gc libfac" \ --with-unbuilt-programs=3D"4ti2 gfan normaliz nauty cddplus lrslib" \ || die "failed to configure Macaulay" } @@ -129,7 +117,6 @@ src_install () { =20 # 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" @@ -146,6 +133,7 @@ pkg_postinst() { elog "in order to set it to F12 (or choose a different one)." fi } + pkg_postrm() { use emacs && elisp-site-regen }