Add modular X dependencies.

(Portage version: 2.1_pre6-r3)

4 files changed, 29 insertions, 11 deletions

diff --git a/app-editors/qemacs/ChangeLog b/app-editors/qemacs/ChangeLog
index b9f09c2e248a..55c4ec481595 100644
--- a/app-editors/qemacs/ChangeLog
+++ b/app-editors/qemacs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-editors/qemacs
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/qemacs/ChangeLog,v 1.16 2005/04/23 07:50:20 usata Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/qemacs/ChangeLog,v 1.17 2006/03/18 23:41:53 joshuabaergen Exp $
+
+  18 Mar 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  qemacs-0.3.1.ebuild, qemacs-0.3.1-r1.ebuild, qemacs-0.3.1-r2.ebuild:
+  Add modular X dependencies.
 
 *qemacs-0.3.1-r2 (23 Apr 2005)
 
diff --git a/app-editors/qemacs/qemacs-0.3.1-r1.ebuild b/app-editors/qemacs/qemacs-0.3.1-r1.ebuild
index 4cf38995791f..2e7b19964334 100644
--- a/app-editors/qemacs/qemacs-0.3.1-r1.ebuild
+++ b/app-editors/qemacs/qemacs-0.3.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-editors/qemacs/qemacs-0.3.1-r1.ebuild,v 1.3 2005/03/17 13:46:43 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/qemacs/qemacs-0.3.1-r1.ebuild,v 1.4 2006/03/18 23:41:53 joshuabaergen Exp $
 
 inherit eutils
 
@@ -13,8 +13,12 @@ SLOT="0"
 KEYWORDS="~x86 ~amd64 ~ppc"
 IUSE="X png unicode"
 
-DEPEND="X? ( virtual/x11 )
+RDEPEND="X? ( || ( x11-libs/libXv virtual/x11 ) )
 	png? ( =media-libs/libpng-1.2* )"
+DEPEND="${RDEPEND}
+	X? ( || ( ( x11-libs/libXft
+				x11-proto/xextproto )
+			virtual/x11 ) )"
 
 src_unpack() {
 	unpack ${A}
diff --git a/app-editors/qemacs/qemacs-0.3.1-r2.ebuild b/app-editors/qemacs/qemacs-0.3.1-r2.ebuild
index 2051c7047682..2aa85c380d63 100644
--- a/app-editors/qemacs/qemacs-0.3.1-r2.ebuild
+++ b/app-editors/qemacs/qemacs-0.3.1-r2.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-editors/qemacs/qemacs-0.3.1-r2.ebuild,v 1.1 2005/04/23 07:50:20 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/qemacs/qemacs-0.3.1-r2.ebuild,v 1.2 2006/03/18 23:41:53 joshuabaergen Exp $
 
 inherit eutils
 
@@ -13,8 +13,14 @@ SLOT="0"
 KEYWORDS="~x86 ~amd64 ~ppc"
 IUSE="X png unicode xv"
 
-DEPEND="X? ( virtual/x11 )
+# For those so inclined, the libXv dep can probably
+# be made conditional on the xv USE flag somehow.
+RDEPEND="X? ( || ( x11-libs/libXv virtual/x11 ) )
 	png? ( =media-libs/libpng-1.2* )"
+DEPEND="${RDEPEND}
+	X? ( || ( ( x11-libs/libXft
+				x11-proto/xextproto )
+			virtual/x11 ) )"
 
 src_unpack() {
 	unpack ${A}
diff --git a/app-editors/qemacs/qemacs-0.3.1.ebuild b/app-editors/qemacs/qemacs-0.3.1.ebuild
index 81b2a2f9cb92..b9ac0df6845a 100644
--- a/app-editors/qemacs/qemacs-0.3.1.ebuild
+++ b/app-editors/qemacs/qemacs-0.3.1.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-editors/qemacs/qemacs-0.3.1.ebuild,v 1.17 2005/04/21 18:27:01 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/qemacs/qemacs-0.3.1.ebuild,v 1.18 2006/03/18 23:41:53 joshuabaergen Exp $
 
 inherit eutils
 
@@ -13,8 +13,12 @@ SLOT="0"
 KEYWORDS="x86 amd64 ppc"
 IUSE="X png unicode"
 
-DEPEND="X? ( virtual/x11 )
+RDEPEND="X? ( || ( x11-libs/libXv virtual/x11 ) )
 	png? ( =media-libs/libpng-1.2* )"
+DEPEND="${RDEPEND}
+	X? ( || ( ( x11-libs/libXft
+				x11-proto/xextproto )
+			virtual/x11 ) )"
 
 src_unpack() {
 	unpack ${A}