Modular X porting.

Package-Manager: portage-2.1_pre4-r1

4 files changed, 43 insertions, 12 deletions

diff --git a/app-accessibility/brltty/ChangeLog b/app-accessibility/brltty/ChangeLog
index 231d7e20a4d4..b30862be1504 100644
--- a/app-accessibility/brltty/ChangeLog
+++ b/app-accessibility/brltty/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-accessibility/brltty
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/brltty/ChangeLog,v 1.40 2006/01/26 05:05:38 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/brltty/ChangeLog,v 1.41 2006/02/02 02:08:14 williamh Exp $
+
+  02 Feb 2006; William Hubbs <williamh@gentoo.org> brltty-3.6.ebuild,
+  brltty-3.6.1-r1.ebuild:
+  Ported to modular X.
+
+  02 Feb 2006; William Hubbs <williamh@gentoo.org> brltty-3.6.1-r1.ebuild:
+  Ported to modular X.
 
 *brltty-3.7.2 (26 Jan 2006)
 
diff --git a/app-accessibility/brltty/Manifest b/app-accessibility/brltty/Manifest
index 84cae8b2789c..7c016d07ee68 100644
--- a/app-accessibility/brltty/Manifest
+++ b/app-accessibility/brltty/Manifest
@@ -1,10 +1,30 @@
-MD5 9431891efc86e71d7770fc88e9111c5c ChangeLog 4716
+MD5 b25210b3a0a1c30234ed7eed332835ec ChangeLog 4935
+RMD160 18299c5882e57f9d33af32cdbbc05516e7f557ab ChangeLog 4935
+SHA256 35b6832b1aab6d00af1777fb75f7d2adb277b67b73caee439add7a8eb5deb298 ChangeLog 4935
 MD5 b69eb608789e94959869c6fa6a409407 brltty-3.5.ebuild 669
-MD5 3b2d66a8f3995b74d281f4ca80a30b74 brltty-3.6.1-r1.ebuild 835
-MD5 dd7dcc1f1c76ae3d9a882452e1938747 brltty-3.6.ebuild 792
+RMD160 8be9ebe4cee784a6c4eefb08802e32b8bdfc29f0 brltty-3.5.ebuild 669
+SHA256 04a9b8bb74e90d5c140c0713f289ed4ac2f575f7d9ae48ab94557d1e9180d049 brltty-3.5.ebuild 669
+MD5 5bf4ee6fcb7993e2d0bbb9dbaa1c48a6 brltty-3.6.1-r1.ebuild 926
+RMD160 12ebc5a31a9de6ba58de477053612c564db1158b brltty-3.6.1-r1.ebuild 926
+SHA256 01f493bc0cac98424cdff9be29044300bdbb6485941729932aaed73254257220 brltty-3.6.1-r1.ebuild 926
+MD5 5ce1e793de71daf22e755f423a8213d0 brltty-3.6.ebuild 883
+RMD160 4ed8107ddd8b3014cfe017de13ac77a9ca3eb043 brltty-3.6.ebuild 883
+SHA256 90f7ca54b3961f8e1053f20a526eba59191f917e4d17f6471f705119a997f064 brltty-3.6.ebuild 883
 MD5 0ed0793b0c172052cf51feb3536fa540 brltty-3.7.2.ebuild 1098
+RMD160 e06f8cdf92d7a5f8744023985caf2b34e9762b77 brltty-3.7.2.ebuild 1098
+SHA256 6f5b56f6fdc7ee74fa10f613f1322266a426d61cf80844eac41eee63b53a2af2 brltty-3.7.2.ebuild 1098
 MD5 7d93e814d84d01d5a05daab69875e2f9 files/digest-brltty-3.5 62
+RMD160 35649a1318428d861d25c5a175bcf69515a1dee2 files/digest-brltty-3.5 62
+SHA256 f0d9e07ccb23455f821bd649624fdce4c9208f33e8e15803eb21b32670ca2f69 files/digest-brltty-3.5 62
 MD5 b1706df140ca8876753283a3a222a3d5 files/digest-brltty-3.6 63
+RMD160 d195e847fd320d74a4fe2d48f444c60aac7aa0b2 files/digest-brltty-3.6 63
+SHA256 aaf9f3c9bd8bc3e80a6458ebe0c68b5d25d2cf11b48152910104958fbede1b35 files/digest-brltty-3.6 63
 MD5 af551ceff5cb2d450b638b0116e2898d files/digest-brltty-3.6.1-r1 65
+RMD160 ff9a80a841a2e71eeecd8a288be06b7acce64171 files/digest-brltty-3.6.1-r1 65
+SHA256 efaa0975fd6026f7726a9f4398d88b67eee73e51bb83cc76283342b767457a12 files/digest-brltty-3.6.1-r1 65
 MD5 3f696c04f5a04d1ee32aeeb99853f2bf files/digest-brltty-3.7.2 65
+RMD160 b77e9a92a94104a8f2b2d1f332e3c9d1a518d3d6 files/digest-brltty-3.7.2 65
+SHA256 9ada2237cde64c59146edbd0060838ebf6212248de4c1dda100cf9a3088ecb78 files/digest-brltty-3.7.2 65
 MD5 e385ac1a0787152b5b9dfb9c2fa24681 metadata.xml 1369
+RMD160 b84aea78cca99f745caeea7cc3a96bca3d594fc8 metadata.xml 1369
+SHA256 263e4d610a1ed22f4f7176a3759194490e4a1b9d02f339c149c4a462524a63be metadata.xml 1369
diff --git a/app-accessibility/brltty/brltty-3.6.1-r1.ebuild b/app-accessibility/brltty/brltty-3.6.1-r1.ebuild
index eb2065f6fb17..cc1d78a459e5 100644
--- a/app-accessibility/brltty/brltty-3.6.1-r1.ebuild
+++ b/app-accessibility/brltty/brltty-3.6.1-r1.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/app-accessibility/brltty/brltty-3.6.1-r1.ebuild,v 1.3 2005/08/23 02:06:31 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/brltty/brltty-3.6.1-r1.ebuild,v 1.4 2006/02/02 02:08:14 williamh Exp $
 
 MY_P=${P/_/}
 S=${WORKDIR}/${MY_P}
@@ -14,9 +14,11 @@ SLOT="0"
 KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
 IUSE="gpm X usb"
 
-DEPEND="virtual/libc
+RDEPEND="virtual/libc
 	gpm? ( >=sys-libs/gpm-1.20 )
-	X? ( virtual/x11 )"
+	X? ( || ( x11-libs/libXaw virtual/x11 ) )"
+DEPEND="${RDEPEND}
+	X? ( || ( x11-proto/xextproto virtual/x11 ) )"
 
 src_compile() {
 	econf `use_enable gpm` \
diff --git a/app-accessibility/brltty/brltty-3.6.ebuild b/app-accessibility/brltty/brltty-3.6.ebuild
index f57a98234dc4..57f91eca56f2 100644
--- a/app-accessibility/brltty/brltty-3.6.ebuild
+++ b/app-accessibility/brltty/brltty-3.6.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/app-accessibility/brltty/brltty-3.6.ebuild,v 1.6 2005/09/07 20:36:44 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/brltty/brltty-3.6.ebuild,v 1.7 2006/02/02 02:08:14 williamh Exp $
 
 MY_P=${P/_/}
 S=${WORKDIR}/${MY_P}
@@ -14,9 +14,11 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 sparc ~x86"
 IUSE="gpm X usb"
 
-DEPEND="virtual/libc
+RDEPEND="virtual/libc
 	gpm? ( >=sys-libs/gpm-1.20 )
-	X? ( virtual/x11 )"
+	X? ( || ( x11-libs/libXaw virtual/x11 ) )"
+DEPEND="${RDEPEND}
+	X? ( || ( x11-proto/xextproto virtual/x11 ) )"
 
 src_compile() {
 	econf `use_enable gpm` \