Fixed DEPEND for modular X.

Package-Manager: portage-2.1_pre3-r1

5 files changed, 16 insertions, 44 deletions

diff --git a/x11-misc/accessx/ChangeLog b/x11-misc/accessx/ChangeLog
index 5120d9bce656..55333a336df8 100644
--- a/x11-misc/accessx/ChangeLog
+++ b/x11-misc/accessx/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/accessx
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/accessx/ChangeLog,v 1.18 2005/11/02 19:03:12 nelchael Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/accessx/ChangeLog,v 1.19 2006/01/15 15:59:25 nelchael Exp $
+
+  15 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org>
+  -accessx-0950-r1.ebuild, accessx-0951.ebuild:
+  Fixed DEPEND for modular X.
 
   02 Nov 2005; Krzysiek Pawlik <nelchael@gentoo.org> -accessx-0950.ebuild,
   accessx-0951.ebuild:
diff --git a/x11-misc/accessx/Manifest b/x11-misc/accessx/Manifest
index 99f3a1db67e9..f9ad11ea47a7 100644
--- a/x11-misc/accessx/Manifest
+++ b/x11-misc/accessx/Manifest
@@ -1,7 +1,5 @@
-MD5 346c697704452c22830f1f0825a93a85 ChangeLog 1698
-MD5 0c5b126dff1d336b3f22a3e84a13312a accessx-0950-r1.ebuild 741
-MD5 c134ceacfd1464d2950628d9969fa431 accessx-0951.ebuild 630
+MD5 216dbb03dce102830ca11caeef9a5ae8 ChangeLog 1830
+MD5 714be4c264b67e428ba8afda4053060f accessx-0951.ebuild 701
 MD5 fb7ad94abfb681ca6ba8d09e740339b2 files/access-gcc3-gentoo.patch 355
-MD5 07c27dbfdef1d506b42ec5a0cc0bc40c files/digest-accessx-0950-r1 62
 MD5 fc200d62091d4d1c4bcee5a5805b8b26 files/digest-accessx-0951 62
 MD5 cdb11033a3fa6525334cecf938961c07 metadata.xml 166
diff --git a/x11-misc/accessx/accessx-0950-r1.ebuild b/x11-misc/accessx/accessx-0950-r1.ebuild
deleted file mode 100644
index 1fe2836afed3..000000000000
--- a/x11-misc/accessx/accessx-0950-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/accessx/accessx-0950-r1.ebuild,v 1.12 2004/09/29 09:20:27 pyrania Exp $
-
-inherit eutils
-
-S=${WORKDIR}/${PN}
-DESCRIPTION="Interface to the XKEYBOARD extension in X11"
-SRC_URI="http://cmos-eng.rehab.uiuc.edu/accessx/software/${PN}${PV}.tar.gz"
-HOMEPAGE="http://cmos-eng.rehab.uiuc.edu/accessx/"
-IUSE=""
-
-DEPEND="virtual/x11
-	dev-lang/tk"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 sparc ppc"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/access-gcc3-gentoo.patch
-}
-
-src_compile() {
-	make || die
-}
-
-src_install () {
-	into /usr
-	dobin accessx ax || die
-	dodoc README INSTALL CHANGES
-}
diff --git a/x11-misc/accessx/accessx-0951.ebuild b/x11-misc/accessx/accessx-0951.ebuild
index 88577c5331f7..4ba1f576f926 100644
--- a/x11-misc/accessx/accessx-0951.ebuild
+++ b/x11-misc/accessx/accessx-0951.ebuild
@@ -1,13 +1,18 @@
-# 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/x11-misc/accessx/accessx-0951.ebuild,v 1.7 2005/11/02 19:03:12 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/accessx/accessx-0951.ebuild,v 1.8 2006/01/15 15:59:25 nelchael Exp $
 
 S=${WORKDIR}/${PN}
 DESCRIPTION="Interface to the XKEYBOARD extension in X11"
 SRC_URI="http://cmos-eng.rehab.uiuc.edu/accessx/software/${PN}${PV}.tar.gz"
 HOMEPAGE="http://cmos-eng.rehab.uiuc.edu/accessx/"
 
-DEPEND="virtual/x11
+RDEPEND="|| ( (
+		x11-libs/libX11
+		x11-libs/libXext )
+	virtual/x11 )"
+
+DEPEND="${RDEPEND}
 		dev-lang/tk"
 
 LICENSE="GPL-2"
diff --git a/x11-misc/accessx/files/digest-accessx-0950-r1 b/x11-misc/accessx/files/digest-accessx-0950-r1
deleted file mode 100644
index c3dd35473984..000000000000
--- a/x11-misc/accessx/files/digest-accessx-0950-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c61cf27887c76a8cca32f878389bba57 accessx0950.tar.gz 10280