Ebuild cleanup.

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

3 files changed, 22 insertions, 16 deletions

diff --git a/sci-mathematics/axiom/ChangeLog b/sci-mathematics/axiom/ChangeLog
index eac339026e3c..f31ca6624bfb 100644
--- a/sci-mathematics/axiom/ChangeLog
+++ b/sci-mathematics/axiom/ChangeLog
@@ -1,6 +1,10 @@
 # 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.20 2008/07/13 10:52:18 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/axiom/ChangeLog,v 1.21 2008/07/15 02:39:54 markusle Exp $
+
+  15 Jul 2008; Markus Dittrich <markusle@gentoo.org> axiom-200805.ebuild:
+  Ebuild cleanup. Thanks much to <dberkholz@gentoo.org> for pointing 
+  out improvements.
 
   13 Jul 2008; Markus Dittrich <markusle@gentoo.org> axiom-200805.ebuild:
   Switched linux-info based brk randomization check to a run-time 
diff --git a/sci-mathematics/axiom/Manifest b/sci-mathematics/axiom/Manifest
index b004f02439cd..f1b35b4f0c3d 100644
--- a/sci-mathematics/axiom/Manifest
+++ b/sci-mathematics/axiom/Manifest
@@ -6,6 +6,6 @@ DIST axiom-may2008-src.tgz 207172456 RMD160 496c91f00d3b8623c13ea82ee5a95698899a
 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
-EBUILD axiom-200805.ebuild 2983 RMD160 ad8841952dea6ca0ca6b0c6c3305fe34aef18827 SHA1 a800b8f4c2529aed156a58a107fea1ece185e115 SHA256 124584a3450c1b08364adb1723a916abc4318960b745e1de6869df2905278662
-MISC ChangeLog 3435 RMD160 01e227b22612ce75af4888572f3c6872c9d54e40 SHA1 4002a98475d030ac0ff8104678d4a7650cc4ab08 SHA256 913f380efc5017c1a771c441419006b07bd65789e37ff0e1aa236409abbfc760
+EBUILD axiom-200805.ebuild 3105 RMD160 36e78b28ba4528b31d26f437d8a8da69fdaf5b33 SHA1 6df3715755b4294722507f85e9ee039c3f3c3097 SHA256 dbea1b6cab593f8688b9f94cd3efef844f54ae08751795f12bfb603667b480a6
+MISC ChangeLog 3600 RMD160 60340757530fbcee88a8ef0e361f4f99e0e2e9dc SHA1 249f599162355da1d707c22b6dda39d1ec9b0c75 SHA256 6fdc2033d61b45c809811002333edc577660844e78047ff7f449ca00f6e4c75d
 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
index 8f078816887b..bb0882bae254 100644
--- a/sci-mathematics/axiom/axiom-200805.ebuild
+++ b/sci-mathematics/axiom/axiom-200805.ebuild
@@ -1,6 +1,6 @@
 # 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.3 2008/07/13 13:44:03 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/axiom/axiom-200805.ebuild,v 1.4 2008/07/15 02:39:54 markusle Exp $
 
 inherit eutils multilib flag-o-matic
 
@@ -24,25 +24,25 @@ DEPEND="virtual/latex-base
 S="${WORKDIR}"/${PN}
 
 pkg_setup() {
-	# for 2.6.25 kernels and higher we need to have
+	# for 2.6.25 kernels and higher we need to have 
 	# /proc/sys/kernel/randomize_va_space set to somthing other
 	# than 2, otherwise gcl fails to compile (see bug #186926).
 	local current_setting=$(/sbin/sysctl kernel.randomize_va_space 2>/dev/null | cut -d' ' -f3)
 	if [[ ${current_setting} == 2 ]]; then
 		echo
-		eerror "You kernel has brk randomization enabled. This will"
-		eerror "cause compilation to fail (see bug #186926). You can"
-		eerror "issue:"
+		eerror "Your kernel has brk randomization enabled. This will"
+		eerror "cause axiom to fail to compile *and* run (see bug #186926)."
+		eerror "You can issue:"
 		eerror
 		eerror "   /sbin/sysctl -w kernel.randomize_va_space=1"
 		eerror
 		eerror "as root to turn brk randomization off temporarily."
-		eerror "Please remember to turn it back on via"
+		eerror "However, when not using axiom you may want to turn"
+		eerror "brk randomization back on via"
 		eerror
 		eerror "   /sbin/sysctl -w kernel.randomize_va_space=2"
 		eerror
-		eerror "once axiom is done compiling since turning brk"
-		eerror "randomization off results in a less secure kernel."
+		eerror "since it results in a less secure kernel."
 		die "Kernel brk randomization detected"
 	fi
 }
@@ -65,7 +65,7 @@ src_compile() {
 	# lots of strict-aliasing badness
 	append-flags -fno-strict-aliasing
 
-	./configure || die "Failed to configure"
+	econf || 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 \
@@ -76,15 +76,17 @@ src_compile() {
 		|| die "Failed to fix libXpm lib paths"
 
 	# Let the fun begin...
-	AXIOM="${S}"/mnt/linux emake -j1 || die
+	AXIOM="${S}"/mnt/linux emake -j1 || die "emake failed"
 }
 
 src_install() {
-	make DESTDIR="${D}"/opt/axiom COMMAND="${D}"/opt/axiom/mnt/linux/bin/axiom install \
+	emake 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
+	mv "${D}"/opt/axiom/mnt/linux/* "${D}"/opt/axiom \
+		|| die "Failed to mv axiom into its final destination path."
+	rm -fr "${D}"/opt/axiom/mnt \
+		|| die "Failed to remove old directory."
 
 	dodir /usr/bin
 	dosym /opt/axiom/bin/axiom /usr/bin/axiom