Modular X deps (bug #117970)

(Portage version: 2.1_pre3-r1)

6 files changed, 16 insertions, 135 deletions

diff --git a/app-accessibility/dasher/ChangeLog b/app-accessibility/dasher/ChangeLog
index decf6f312a41..2cb420ce8f0b 100644
--- a/app-accessibility/dasher/ChangeLog
+++ b/app-accessibility/dasher/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-accessibility/dasher
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/dasher/ChangeLog,v 1.54 2006/01/22 19:53:27 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/dasher/ChangeLog,v 1.55 2006/01/24 22:18:53 leonardop Exp $
+
+  24 Jan 2006; Leonardo Boshell <leonardop@gentoo.org>
+  dasher-3.2.18.ebuild:
+  Added modular X dependencies. Thanks to Tobias Minich for his contribution
+  on bug #117970.
 
   22 Jan 2006; <dang@gentoo.org> dasher-3.2.18.ebuild:
   Marked stable on amd64 per bug #119634
diff --git a/app-accessibility/dasher/dasher-3.2.16.ebuild b/app-accessibility/dasher/dasher-3.2.16.ebuild
deleted file mode 100644
index 84323a0c984f..000000000000
--- a/app-accessibility/dasher/dasher-3.2.16.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/dasher/dasher-3.2.16.ebuild,v 1.1 2005/08/24 10:54:05 leonardop Exp $
-
-inherit eutils gnome2
-
-DESCRIPTION="A text entry interface, driven by continuous pointing gestures"
-HOMEPAGE="http://www.inference.phy.cam.ac.uk/dasher/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-IUSE="accessibility gnome"
-
-# The package claims to support 'qte', but it hasn't been tested.
-# Any patches from someone who can test it are welcome.
-# <leonardop@gentoo.org>
-RDEPEND=">=x11-libs/gtk+-2
-	>=gnome-base/gconf-2
-	>=gnome-base/libglade-2
-	>=x11-libs/libwnck-1
-	dev-libs/expat
-	>=dev-libs/glib-2
-	virtual/x11
-	gnome? (
-		>=gnome-base/libgnome-2
-		>=gnome-base/libgnomeui-2
-		>=gnome-base/gnome-vfs-2 )
-	accessibility? (
-		app-accessibility/gnome-speech
-		>=gnome-base/libbonobo-2
-		>=gnome-base/orbit-2
-		>=gnome-base/libgnomeui-2
-		>=gnome-extra/at-spi-1 )"
-
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.28
-	>=dev-util/pkgconfig-0.9
-	app-text/scrollkeeper"
-
-USE_DESTDIR="1"
-DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README"
-
-
-pkg_setup() {
-	G2CONF="$(use_with gnome) $(use_with accessibility a11y) \
-		$(use_with accessibility speech) --without-cairo"
-	# cairo switch disabled until gtk+ 2.7 or better is available and
-	# not hard-masked
-}
-
-src_unpack() {
-	unpack "${A}"
-	cd "${S}"
-
-	# Poor pointer management causes segfault at startup
-	epatch ${FILESDIR}/${PN}-3.2.15-buildwindowtree.patch
-
-	local makefiles="Data/Help/Gnome/omf.make"
-	for f in $(find Data/Help/Gnome -name Makefile.in); do
-		makefiles="${makefiles} $f"
-	done
-	gnome2_omf_fix $makefiles
-}
diff --git a/app-accessibility/dasher/dasher-3.2.17.ebuild b/app-accessibility/dasher/dasher-3.2.17.ebuild
deleted file mode 100644
index 0ddbacbaa97b..000000000000
--- a/app-accessibility/dasher/dasher-3.2.17.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/dasher/dasher-3.2.17.ebuild,v 1.1 2005/08/29 04:13:19 leonardop Exp $
-
-inherit eutils gnome2
-
-DESCRIPTION="A text entry interface, driven by continuous pointing gestures"
-HOMEPAGE="http://www.inference.phy.cam.ac.uk/dasher/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-IUSE="accessibility gnome"
-
-# The package claims to support 'qte', but it hasn't been tested.
-# Any patches from someone who can test it are welcome.
-# <leonardop@gentoo.org>
-RDEPEND="dev-libs/expat
-	>=x11-libs/gtk+-2
-	>=gnome-base/gconf-2
-	>=gnome-base/libglade-2
-	>=x11-libs/libwnck-1
-	>=dev-libs/glib-2
-	virtual/x11
-	gnome? (
-		>=gnome-base/libgnome-2
-		>=gnome-base/libgnomeui-2
-		>=gnome-base/gnome-vfs-2 )
-	accessibility? (
-		app-accessibility/gnome-speech
-		>=gnome-base/libbonobo-2
-		>=gnome-base/orbit-2
-		>=gnome-base/libgnomeui-2
-		>=gnome-extra/at-spi-1 )"
-
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.28
-	>=dev-util/pkgconfig-0.9
-	app-text/scrollkeeper"
-
-USE_DESTDIR="1"
-DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README"
-
-
-pkg_setup() {
-	G2CONF="$(use_with gnome) $(use_with accessibility a11y) \
-		$(use_with accessibility speech) --without-cairo"
-	# cairo switch disabled until gtk+ 2.7 or better is available and
-	# not hard-masked
-}
-
-src_unpack() {
-	unpack "${A}"
-	cd "${S}"
-
-	# Poor pointer management causes segfault at startup
-	epatch ${FILESDIR}/${PN}-3.2.15-buildwindowtree.patch
-
-	local makefiles="Data/Help/Gnome/omf.make"
-	for f in $(find Data/Help/Gnome -name Makefile.in); do
-		makefiles="${makefiles} $f"
-	done
-	gnome2_omf_fix $makefiles
-}
diff --git a/app-accessibility/dasher/dasher-3.2.18.ebuild b/app-accessibility/dasher/dasher-3.2.18.ebuild
index 24a692554ece..0285b409c645 100644
--- a/app-accessibility/dasher/dasher-3.2.18.ebuild
+++ b/app-accessibility/dasher/dasher-3.2.18.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/app-accessibility/dasher/dasher-3.2.18.ebuild,v 1.6 2006/01/22 19:53:27 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/dasher/dasher-3.2.18.ebuild,v 1.7 2006/01/24 22:18:53 leonardop Exp $
 
 inherit eutils gnome2
 
@@ -22,7 +22,9 @@ RDEPEND="dev-libs/expat
 	>=gnome-base/libglade-2
 	>=dev-libs/glib-2
 	>=x11-libs/libwnck-1
-	virtual/x11
+	|| ( (
+			x11-libs/libX11 )
+		virtual/x11 )
 	gnome? (
 		>=gnome-base/libgnome-2
 		>=gnome-base/libgnomeui-2
@@ -35,6 +37,12 @@ RDEPEND="dev-libs/expat
 		>=gnome-extra/at-spi-1 )"
 
 DEPEND="${RDEPEND}
+	|| ( (
+			x11-proto/xextproto
+			x11-proto/xproto
+			x11-libs/libXt )
+		virtual/x11 )
+
 	>=dev-util/intltool-0.28
 	>=dev-util/pkgconfig-0.9
 	app-text/scrollkeeper"
diff --git a/app-accessibility/dasher/files/digest-dasher-3.2.16 b/app-accessibility/dasher/files/digest-dasher-3.2.16
deleted file mode 100644
index adfe93ed14f4..000000000000
--- a/app-accessibility/dasher/files/digest-dasher-3.2.16
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8e0a06db2a4452ec43c696f85bb9e1dc dasher-3.2.16.tar.bz2 4595501
diff --git a/app-accessibility/dasher/files/digest-dasher-3.2.17 b/app-accessibility/dasher/files/digest-dasher-3.2.17
deleted file mode 100644
index daddcd3be906..000000000000
--- a/app-accessibility/dasher/files/digest-dasher-3.2.17
+++ /dev/null
@@ -1 +0,0 @@
-MD5 583dbd217ca9352e1a1a2f11fdfd55b2 dasher-3.2.17.tar.bz2 4596772