Fix bug #143738.

Package-Manager: portage-2.1.2_pre2

3 files changed, 18 insertions, 21 deletions

diff --git a/sci-mathematics/axiom/ChangeLog b/sci-mathematics/axiom/ChangeLog
index 4ef6a464da6a..922f6a438adf 100644
--- a/sci-mathematics/axiom/ChangeLog
+++ b/sci-mathematics/axiom/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sci-mathematics/axiom
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/axiom/ChangeLog,v 1.11 2006/08/25 11:12:08 metalgod Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/axiom/ChangeLog,v 1.12 2006/10/01 13:00:20 plasmaroo Exp $
+
+  01 Oct 2006; Tim Yamin <plasmaroo@gentoo.org> axiom-3.9-r1.ebuild:
+  Fix bug #143738; patch by Johannes Weiner.
 
   25 Aug 2006; Luis Medinas <metalgod@gentoo.org> axiom-3.9-r1.ebuild:
   Added ~amd64 keyword.
diff --git a/sci-mathematics/axiom/Manifest b/sci-mathematics/axiom/Manifest
index b3731bd4ec22..6181e7475bd8 100644
--- a/sci-mathematics/axiom/Manifest
+++ b/sci-mathematics/axiom/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX gcl-2.6.7.fix-configure.in-gentoo.Makefile.patch 1073 RMD160 960a81bb50ef0b62dbc49e08ada7b08e900934c3 SHA1 c04618a8fbc5b02a34c83878ea7275ae114436f0 SHA256 0324fdeb5dc9172e4c022bc7e99c9bc64ef991c617efacfa9d2cbff7b6c48d47
 MD5 d258cd9bae8894176e8b19f6062392f4 files/gcl-2.6.7.fix-configure.in-gentoo.Makefile.patch 1073
 RMD160 960a81bb50ef0b62dbc49e08ada7b08e900934c3 files/gcl-2.6.7.fix-configure.in-gentoo.Makefile.patch 1073
@@ -25,15 +22,15 @@ AUX noweb-2.9-insecure-tmp-file.patch.input 4819 RMD160 2afe80731bd3fcfa23e0ee79
 MD5 ff71bb7ac45cae40335ecbfa0b89412c files/noweb-2.9-insecure-tmp-file.patch.input 4819
 RMD160 2afe80731bd3fcfa23e0ee799649886ce3fdd0af files/noweb-2.9-insecure-tmp-file.patch.input 4819
 SHA256 68bf232fd91b94fc9d08373d079afcb890a6af6991373da81089560ce21889a9 files/noweb-2.9-insecure-tmp-file.patch.input 4819
-DIST axiom-Sept2005-src.tgz 41447064 RMD160 ae0a63e4dc7d772183001e688d5a5561d689f7d4 SHA256 750da2f7960686c7f50fa4c6c859f51300909e4b488fe6395d75fe4405a1d1f3
-EBUILD axiom-3.9-r1.ebuild 2966 RMD160 6c89b03c39db2f0b8a008b08bd06eeb3120f1f22 SHA1 ba43920b4218a80a52f8af33f183cdae68f1c496 SHA256 62454f637faf95835784d518ab7a6066ac98f181d4866b27c73e28d240c1ae07
-MD5 0af37d1c665e8bbee23d54723017154c axiom-3.9-r1.ebuild 2966
-RMD160 6c89b03c39db2f0b8a008b08bd06eeb3120f1f22 axiom-3.9-r1.ebuild 2966
-SHA256 62454f637faf95835784d518ab7a6066ac98f181d4866b27c73e28d240c1ae07 axiom-3.9-r1.ebuild 2966
-MISC ChangeLog 1773 RMD160 aaf806f87703f87500e576dcfce161a8291ed58a SHA1 8c3859a4ed4e06a08a377abbb2c674f0620aaf55 SHA256 70aefd989410c75905c6d30f9b537d8880ea2b62993811039c60acabd6c095e4
-MD5 23b862516be1ba67f595c59f78ffa615 ChangeLog 1773
-RMD160 aaf806f87703f87500e576dcfce161a8291ed58a ChangeLog 1773
-SHA256 70aefd989410c75905c6d30f9b537d8880ea2b62993811039c60acabd6c095e4 ChangeLog 1773
+DIST axiom-Sept2005-src.tgz 41447064 RMD160 ae0a63e4dc7d772183001e688d5a5561d689f7d4 SHA1 ba30056ab5af30a579a285480ca5058b11bf8fa6 SHA256 750da2f7960686c7f50fa4c6c859f51300909e4b488fe6395d75fe4405a1d1f3
+EBUILD axiom-3.9-r1.ebuild 3117 RMD160 aa2280411a6710cc0355f5af5020edf904e4f2ae SHA1 5ded959729e0e90d1800c043f93d17d38974421d SHA256 02a1acc15a9f96ddd2b0235c67ba77bce904f4d7e11275140074de3026006b59
+MD5 133169b1a94e16e28945990303ae32ee axiom-3.9-r1.ebuild 3117
+RMD160 aa2280411a6710cc0355f5af5020edf904e4f2ae axiom-3.9-r1.ebuild 3117
+SHA256 02a1acc15a9f96ddd2b0235c67ba77bce904f4d7e11275140074de3026006b59 axiom-3.9-r1.ebuild 3117
+MISC ChangeLog 1889 RMD160 21d581e8074b11277cb2b04d37c2ce945f02eb07 SHA1 35e77d2c763909c416bea3dc1bc8fec39f60bd6b SHA256 40370dde89b89cad951735284351a7ec827b3921bbdcc2370e05568d516a676b
+MD5 ad614c48bb1124e03c2b786b9a36dcd5 ChangeLog 1889
+RMD160 21d581e8074b11277cb2b04d37c2ce945f02eb07 ChangeLog 1889
+SHA256 40370dde89b89cad951735284351a7ec827b3921bbdcc2370e05568d516a676b ChangeLog 1889
 MISC metadata.xml 232 RMD160 cd6cf62c8dc09807056f44bf051e0049dc0c7597 SHA1 feb472989e0bfe41a1cdae69b094c3472834fbd1 SHA256 c9a5f2181f1e640694da1262af19dab7f6b3c73eec8b005153a8f013a5609c7a
 MD5 f7ab9347963404916c19d25a8f7ea64e metadata.xml 232
 RMD160 cd6cf62c8dc09807056f44bf051e0049dc0c7597 metadata.xml 232
@@ -41,10 +38,3 @@ SHA256 c9a5f2181f1e640694da1262af19dab7f6b3c73eec8b005153a8f013a5609c7a metadata
 MD5 f5325403baf7987627d722d86541cf13 files/digest-axiom-3.9-r1 253
 RMD160 7163e15cb0087c7bd6221d1f760fb6e8b9970035 files/digest-axiom-3.9-r1 253
 SHA256 10e35fdd3f04a38fbba5651b96ec5a78d461eafbb720f1f2f5253ee9fd99a7c8 files/digest-axiom-3.9-r1 253
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-iD8DBQFE7tsfwUpWvClEHQoRAiWqAKCBJV0UXsAYLvadkFAZKMndhdbcGACdEYaA
-SfOETDsFdaa8mWYhCgn+zs0=
-=S+YF
------END PGP SIGNATURE-----
diff --git a/sci-mathematics/axiom/axiom-3.9-r1.ebuild b/sci-mathematics/axiom/axiom-3.9-r1.ebuild
index 1d77832c32a7..98e665810477 100644
--- a/sci-mathematics/axiom/axiom-3.9-r1.ebuild
+++ b/sci-mathematics/axiom/axiom-3.9-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/axiom/axiom-3.9-r1.ebuild,v 1.3 2006/08/25 11:12:08 metalgod Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/axiom/axiom-3.9-r1.ebuild,v 1.4 2006/10/01 13:00:20 plasmaroo Exp $
 
 inherit eutils
 
@@ -57,6 +57,10 @@ src_compile() {
 	sed -e 's/struct termio ptermio;/struct termios ptermio;/' -i src/clef/edible.c.pamphlet
 	mkdir src/graph/viewports
 
+	# Fix include paths for libXpm
+	# (Bug #143738)
+	sed -i -e '/^XLIB=/s:/X11R6::g' Makefile.pamphlet || die "Failed to fix XLIB in Makefile.pamphlet"
+
 	# Let the fun begin...
 	./configure
 	make || die # -jX breaks