Version bump. Added check that CONFIG_COMPAT_BRK is set for kernels >=2.6.26 since gcl compilation will fail otherwise.

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.25-SENTINEL-4 i686

3 files changed, 92 insertions, 2 deletions

diff --git a/sci-mathematics/axiom/ChangeLog b/sci-mathematics/axiom/ChangeLog
index b15afcf28fbc..1d78e28c6bad 100644
--- a/sci-mathematics/axiom/ChangeLog
+++ b/sci-mathematics/axiom/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-mathematics/axiom
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/axiom/ChangeLog,v 1.17 2008/03/31 12:58:24 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/axiom/ChangeLog,v 1.18 2008/07/12 14:37:32 markusle Exp $
+
+*axiom-200805 (12 Jul 2008)
+
+  12 Jul 2008; Markus Dittrich <markusle@gentoo.org> +axiom-200805.ebuild:
+  Version bump. Added check that CONFIG_COMPAT_BRK is set for kernels
+  >=2.6.26 since gcl compilation will fail otherwise.
 
 *axiom-200803 (30 Mar 2008)
 
diff --git a/sci-mathematics/axiom/Manifest b/sci-mathematics/axiom/Manifest
index e5f70992859e..7cff792c3495 100644
--- a/sci-mathematics/axiom/Manifest
+++ b/sci-mathematics/axiom/Manifest
@@ -2,8 +2,10 @@ AUX axiom-200711-gcl-configure.patch 445 RMD160 c62109a2198b19d0770de49c08107cd8
 AUX noweb-2.9-insecure-tmp-file.Makefile.patch 439 RMD160 16cdc72fab65bab45c7728d374da60f7b4cccc65 SHA1 428d4380a17535939a59b5efd12556ab4cafde06 SHA256 3c4b5bea61620cb545e576d2e82dd8daa0478fc6c40ae0a93dbdac432aa9531d
 AUX noweb-2.9-insecure-tmp-file.patch.input 4819 RMD160 2afe80731bd3fcfa23e0ee799649886ce3fdd0af SHA1 23aff1cf0862618c7450704d0d47fcec2497de0b SHA256 68bf232fd91b94fc9d08373d079afcb890a6af6991373da81089560ce21889a9
 DIST axiom-mar2008-src.tgz 206421514 RMD160 b3f55e1e4a4ead181743f14c812bc5ec9229847e SHA1 8ea4dbfffb316e204b72da3afcdb80b002ce3ce7 SHA256 fa51b08fb13ce8984b559a0bea6ec0bd9b4bde2b4a97f56011bf92a5e1164a78
+DIST axiom-may2008-src.tgz 207172456 RMD160 496c91f00d3b8623c13ea82ee5a95698899a5406 SHA1 51949340f754104c0fa72e269737538829cd9062 SHA256 c91cc50a9a6b9d66b398f8b96236249db72b6ce280d51c188db1805a4534380e
 DIST silver-nov2007-src.tgz 89646725 RMD160 b12d325030e3d9c047f763a46be713a00fd7ac18 SHA1 6a7b609a6b93781872bb239f93aef326185d97c0 SHA256 15389e631ceb1275aafdbceca47052352b6ae9c883fb232caf886c3c0bac90c8
 EBUILD axiom-200711.ebuild 2053 RMD160 0d3eb53d04751183d554cffdedd1bbc6d70922ac SHA1 e1c5c69596ef28284f652f6b82d7f4eacb3764dc SHA256 db80b1b123a5eee3a6ae20b3450dfb61d1011fed4f1389a6f22e1affdc02e1e1
 EBUILD axiom-200803.ebuild 2059 RMD160 631931d50db907e883ff324cf3c8a8c0b16e4a4d SHA1 6408ec297b8b73397f0b0c65e463e6e310212653 SHA256 878b697b986803c9220143ba52aa50f1761f8d0d996985fec3e0f8624dfcce8e
-MISC ChangeLog 2939 RMD160 d2689c10f98adf2a8e7befd4c8c6f3fe002f79dc SHA1 1708c18696ccbf5fce4ae86067a86dabd68ef384 SHA256 fffe4396aedb0dae5a6c8478eb44091e27a344d06a5df487e24e1c2c32fab3d5
+EBUILD axiom-200805.ebuild 2357 RMD160 c19eb8b9d7d69a9c93115180a77fff098350cfac SHA1 73553e75c76eaa4b9a767ed22a3b16684b5f8692 SHA256 ef9cfb4bc05c7913eb198e44094a3a3c2a662ba7efc4b152398b6a37753c6491
+MISC ChangeLog 3168 RMD160 14c22f59c4b6309472d96c85b450138719efe353 SHA1 8471c4b2eddaff4bde6452765ceee71f1ab10cb9 SHA256 fe1d00e9819592e9c7690b453f183f910cb292f5a9b5fa8359a6ace5457a2109
 MISC metadata.xml 168 RMD160 d98790cf055dc0f820c63d65f485b9dcfa8950f4 SHA1 95c9e4f7368f82053d631bbcd469612c92ca13cb SHA256 c0cc8d6ab9385750af753ddc504299ed90a70b5c4c655f6c77d865917a8829c9
diff --git a/sci-mathematics/axiom/axiom-200805.ebuild b/sci-mathematics/axiom/axiom-200805.ebuild
new file mode 100644
index 000000000000..d02ff51f1d52
--- /dev/null
+++ b/sci-mathematics/axiom/axiom-200805.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/axiom/axiom-200805.ebuild,v 1.1 2008/07/12 14:37:32 markusle Exp $
+
+inherit eutils multilib flag-o-matic linux-info
+
+DESCRIPTION="Axiom is a general purpose Computer Algebra system"
+HOMEPAGE="http://axiom.axiom-developer.org/"
+SRC_URI="http://www.axiom-developer.org/axiom-website/downloads/${PN}-may2008-src.tgz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# NOTE: Do not strip since this seems to remove some crucial
+# runtime paths as well, thereby, breaking axiom
+RESTRICT="strip"
+
+DEPEND="virtual/latex-base
+	x11-libs/libXaw"
+
+S="${WORKDIR}"/${PN}
+
+pkg_setup() {
+	# for 2.6.25 kernels and higher we need to have CONFIG_COMPAT_BRK
+	# enabled, otherwise gcl fails to compile (see bug #186926).
+	get_running_version
+	if [[ "${KV_MINOR}" == "6" && "${KV_PATCH}" > "24" ]]; then
+		local CONFIG_CHECK="COMPAT_BRK"
+		check_extra_config
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	cp "${FILESDIR}"/noweb-2.9-insecure-tmp-file.patch.input \
+		"${S}"/zips/noweb-2.9-insecure-tmp-file.patch \
+		|| die "Failed to fix noweb"
+	cp "${FILESDIR}"/${PN}-200711-gcl-configure.patch \
+		"${S}"/zips/gcl-2.6.7.configure.in.patch \
+		|| die "Failed to fix gcl-2.6.7 configure"
+	epatch "${FILESDIR}"/noweb-2.9-insecure-tmp-file.Makefile.patch \
+		|| die "Failed to patch noweb security issue!"
+}
+
+src_compile() {
+	# lots of strict-aliasing badness
+	append-flags -fno-strict-aliasing
+
+	./configure || die "Failed to configure"
+	# use gcl 2.6.7
+	sed -e "s:GCLVERSION=gcl-2.6.8pre$:GCLVERSION=gcl-2.6.7:" \
+		-i Makefile.pamphlet Makefile \
+		|| die "Failed to select proper gcl"
+
+	# fix libXpm.a location
+	sed -e "s:X11R6/lib:$(get_libdir):g" -i Makefile.pamphlet \
+		|| die "Failed to fix libXpm lib paths"
+
+	# Let the fun begin...
+	AXIOM="${S}"/mnt/linux emake -j1 || die
+}
+
+src_install() {
+	make DESTDIR="${D}"/opt/axiom COMMAND="${D}"/opt/axiom/mnt/linux/bin/axiom install \
+		|| die 'Failed to install Axiom!'
+
+	mv "${D}"/opt/axiom/mnt/linux/* "${D}"/opt/axiom
+	rm -fr "${D}"/opt/axiom/mnt
+
+	dodir /usr/bin
+	dosym /opt/axiom/bin/axiom /usr/bin/axiom
+
+	sed -e "2d;3i AXIOM=/opt/axiom" \
+		-i "${D}"/opt/axiom/bin/axiom \
+		|| die "Failed to patch axiom runscript!"
+
+	dodoc changelog readme faq
+}