Port over to modular X.

Package-Manager: portage-2.1_pre4-r1

5 files changed, 43 insertions, 12 deletions

diff --git a/sci-mathematics/axiom/ChangeLog b/sci-mathematics/axiom/ChangeLog
index 71483e1ef9fe..068bd9869279 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.6 2006/01/22 14:19:41 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/axiom/ChangeLog,v 1.7 2006/02/14 18:30:54 plasmaroo Exp $
+
+  14 Feb 2006; <plasmaroo@gentoo.org> axiom-3.9.ebuild, axiom-9999.ebuild:
+  Port over to modular X.
 
   22 Jan 2006; <plasmaroo@gentoo.org> axiom-3.9.ebuild,
   +files/gcl-2.6.7.fix-configure.in-gentoo.Makefile.patch,
diff --git a/sci-mathematics/axiom/Manifest b/sci-mathematics/axiom/Manifest
index 22f24638b6e7..d84ed19029c4 100644
--- a/sci-mathematics/axiom/Manifest
+++ b/sci-mathematics/axiom/Manifest
@@ -1,10 +1,30 @@
-MD5 0990821e9368d730c7a2459ccc0fadcb ChangeLog 1120
-MD5 a72d894015e2b517edeb865404d27dfb axiom-3.9.ebuild 2631
-MD5 89a525a7281abca48480fd4289bcfb85 axiom-9999.ebuild 2630
-MD5 5e0239b67a06d3ea02047349b2e48e0d files/digest-axiom-3.9 69
+MD5 2feeab4b49d0661089154be2f58ea977 ChangeLog 1222
+RMD160 8e1456e085678903d41fc89c4041d51033aa11d0 ChangeLog 1222
+SHA256 dd67094fe2c3a1e920dc1a24b54d609cfb95457833dd8adee0043e768648d9b8 ChangeLog 1222
+MD5 89ff28d40f3c6a5fcb25f89ef3fd01b8 axiom-3.9.ebuild 2659
+RMD160 6825b2749e852e5e7a66cd8ff61d5a157ca3ae7a axiom-3.9.ebuild 2659
+SHA256 52aa4c03e71ed657b3866d1e925d0ffcc959048996ae79e47b84a9202d71d7c4 axiom-3.9.ebuild 2659
+MD5 89cca4dd61bbe92511fe1b73665920f8 axiom-9999.ebuild 2658
+RMD160 c5fc76a47bf0b9e66766e72b9fbd986b703c1b56 axiom-9999.ebuild 2658
+SHA256 3651d0a801ec9aaadf1ef9185a82ecd66714892f41e29f0dcaab3cfe64fa6cf5 axiom-9999.ebuild 2658
+MD5 f5325403baf7987627d722d86541cf13 files/digest-axiom-3.9 253
+RMD160 7163e15cb0087c7bd6221d1f760fb6e8b9970035 files/digest-axiom-3.9 253
+SHA256 10e35fdd3f04a38fbba5651b96ec5a78d461eafbb720f1f2f5253ee9fd99a7c8 files/digest-axiom-3.9 253
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-axiom-9999 0
+RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-axiom-9999 0
+SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-axiom-9999 0
 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
+SHA256 0324fdeb5dc9172e4c022bc7e99c9bc64ef991c617efacfa9d2cbff7b6c48d47 files/gcl-2.6.7.fix-configure.in-gentoo.Makefile.patch 1073
 MD5 e309d0438c4dbaf7883c48c5f12275b4 files/gcl-2.6.7.fix-configure.in-gentoo.patch.input 1227
+RMD160 0ec6e8b0a207378b8c10a804d87e79009aa60b5e files/gcl-2.6.7.fix-configure.in-gentoo.patch.input 1227
+SHA256 dadc568b55a805168043ca78b1c1974d74698c2e92e32e1c9dfdcee234984c3d files/gcl-2.6.7.fix-configure.in-gentoo.patch.input 1227
 MD5 84829d019c500de4d62b6f0e79fa9e0f files/gcl-2.6.7.fix-out-of-build-root-compile.Makefile.patch 1422
+RMD160 ea2e4f25456bab6c69e75d573362689b60de90e1 files/gcl-2.6.7.fix-out-of-build-root-compile.Makefile.patch 1422
+SHA256 5a9388f09d6d380546f950ad17f9bc4b3977a192cd86a97e6416e6ad36f59a14 files/gcl-2.6.7.fix-out-of-build-root-compile.Makefile.patch 1422
 MD5 43fa5bf93354597104a9752dea29743f files/gcl-2.6.7.fix-out-of-build-root-compile.patch.input 843
+RMD160 489ec75966dae4d7d2921fc93ab8a2655fee6e1e files/gcl-2.6.7.fix-out-of-build-root-compile.patch.input 843
+SHA256 dfaae7ea24fb8fcb761ed9b540dc66eeb5b22b65e626e1e475c911eadeb8338e files/gcl-2.6.7.fix-out-of-build-root-compile.patch.input 843
 MD5 e49bb02132d2cd74ad4e6ee291e102d9 metadata.xml 220
+RMD160 97dc1fa1de002625a0e04371d72e5d457e63045e metadata.xml 220
+SHA256 2f6b6030e20679df7ccb7dab65f5ca6890144aa443f815d11e494a035ffef399 metadata.xml 220
diff --git a/sci-mathematics/axiom/axiom-3.9.ebuild b/sci-mathematics/axiom/axiom-3.9.ebuild
index 125a983498ab..9c3a7ee6dc09 100644
--- a/sci-mathematics/axiom/axiom-3.9.ebuild
+++ b/sci-mathematics/axiom/axiom-3.9.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.ebuild,v 1.3 2006/01/22 14:19:41 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/axiom/axiom-3.9.ebuild,v 1.4 2006/02/14 18:30:54 plasmaroo Exp $
 
 inherit eutils
 
@@ -13,8 +13,11 @@ SLOT="0"
 KEYWORDS="~x86"
 IUSE=""
 
-DEPEND="virtual/x11
-	virtual/tetex"
+DEPEND="virtual/tetex
+	|| (
+		x11-libs/libXaw
+		virtual/x11
+	)"
 
 S="${WORKDIR}/axiom"
 
diff --git a/sci-mathematics/axiom/axiom-9999.ebuild b/sci-mathematics/axiom/axiom-9999.ebuild
index 56db0e41b0ab..7ec422870946 100644
--- a/sci-mathematics/axiom/axiom-9999.ebuild
+++ b/sci-mathematics/axiom/axiom-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# 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-9999.ebuild,v 1.5 2005/12/30 18:43:55 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/axiom/axiom-9999.ebuild,v 1.6 2006/02/14 18:30:54 plasmaroo Exp $
 
 ECVS_SERVER="cvs.savannah.nongnu.org:/sources/axiom"
 ECVS_MODULE="axiom"
@@ -18,8 +18,11 @@ SLOT="0"
 KEYWORDS="~x86"
 IUSE=""
 
-DEPEND="virtual/x11
-	virtual/tetex"
+DEPEND="virtual/tetex
+	|| (
+		x11-libs/libXaw
+		virtual/x11
+	)"
 
 S=${WORKDIR}/${ECVS_MODULE}
 
diff --git a/sci-mathematics/axiom/files/digest-axiom-3.9 b/sci-mathematics/axiom/files/digest-axiom-3.9
index 72d51f09c1a5..26f751be5612 100644
--- a/sci-mathematics/axiom/files/digest-axiom-3.9
+++ b/sci-mathematics/axiom/files/digest-axiom-3.9
@@ -1 +1,3 @@
 MD5 6b107a03b03595703d5e3e6bdd12f8c1 axiom-Sept2005-src.tgz 41447064
+RMD160 ae0a63e4dc7d772183001e688d5a5561d689f7d4 axiom-Sept2005-src.tgz 41447064
+SHA256 750da2f7960686c7f50fa4c6c859f51300909e4b488fe6395d75fe4405a1d1f3 axiom-Sept2005-src.tgz 41447064