modular X deps for all ebuilds

Package-Manager: portage-2.0.54

6 files changed, 31 insertions, 26 deletions

diff --git a/media-fonts/terminus-font/ChangeLog b/media-fonts/terminus-font/ChangeLog
index 0ac7e560ec10..b1b703b229f2 100644
--- a/media-fonts/terminus-font/ChangeLog
+++ b/media-fonts/terminus-font/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-fonts/terminus-font
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/terminus-font/ChangeLog,v 1.35 2006/01/11 20:46:09 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/terminus-font/ChangeLog,v 1.36 2006/02/01 07:16:11 mr_bones_ Exp $
+
+  01 Feb 2006; Michael Sterrett <mr_bones_@gentoo.org>
+  terminus-font-4.07.ebuild, terminus-font-4.11.ebuild,
+  terminus-font-4.12.ebuild, terminus-font-4.14.ebuild:
+  modular X deps for all ebuilds
 
 *terminus-font-4.14-r1 (11 Jan 2006)
 
diff --git a/media-fonts/terminus-font/Manifest b/media-fonts/terminus-font/Manifest
index 4af060051110..c0fe9baafa34 100644
--- a/media-fonts/terminus-font/Manifest
+++ b/media-fonts/terminus-font/Manifest
@@ -1,12 +1,12 @@
-MD5 a17c1cbbd383979a1123f8fb506745c3 ChangeLog 4476
+MD5 65d067202903ff0582514a50ec8f112c ChangeLog 4679
 MD5 92f73aafe5535cf0996be1b810ab7c9b files/digest-terminus-font-4.07 70
 MD5 675b78bea73e2d292d68944a6c455e73 files/digest-terminus-font-4.11 70
 MD5 604792fcc99234081b4cce8320970e91 files/digest-terminus-font-4.12 70
 MD5 bc7d84257a5dc86feed158e475c255f7 files/digest-terminus-font-4.14 70
 MD5 bc7d84257a5dc86feed158e475c255f7 files/digest-terminus-font-4.14-r1 70
 MD5 295674d4bed87f5a7c2796e032ed561e metadata.xml 158
-MD5 60676cf60fca62bfc640fe1c60912b0d terminus-font-4.07.ebuild 1096
-MD5 820a0838cc9bf4525973ece5eb18a5a2 terminus-font-4.11.ebuild 1091
-MD5 2d312416abb4ddf6113be554503e0b16 terminus-font-4.12.ebuild 1100
+MD5 4f6089d8fbe33a45a4362987278239b6 terminus-font-4.07.ebuild 1108
+MD5 e21899a03a90811d9d0b67e3fb52cadf terminus-font-4.11.ebuild 1104
+MD5 aca9a9337d75444ff0336781f061a03d terminus-font-4.12.ebuild 1111
 MD5 4c0d6f214240637d310c1d9efbd41da9 terminus-font-4.14-r1.ebuild 1120
-MD5 83ca82ed7600cac6ae459f6baa8146e1 terminus-font-4.14.ebuild 1099
+MD5 72b22462b40575e3da96d8d2452532be terminus-font-4.14.ebuild 1110
diff --git a/media-fonts/terminus-font/terminus-font-4.07.ebuild b/media-fonts/terminus-font/terminus-font-4.07.ebuild
index 0ef312323a90..d7f70154e3dd 100644
--- a/media-fonts/terminus-font/terminus-font-4.07.ebuild
+++ b/media-fonts/terminus-font/terminus-font-4.07.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/media-fonts/terminus-font/terminus-font-4.07.ebuild,v 1.5 2005/01/06 14:54:59 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/terminus-font/terminus-font-4.07.ebuild,v 1.6 2006/02/01 07:16:11 mr_bones_ Exp $
 
 DESCRIPTION="A clean fixed font for the console and X11"
 HOMEPAGE="http://www.is-vn.bg/hamster/jimmy-en.html"
@@ -11,9 +11,9 @@ KEYWORDS="x86 ppc sparc alpha mips hppa ia64 amd64"
 IUSE="X"
 
 DEPEND="sys-apps/gawk
-	dev-lang/perl
-	X? ( virtual/x11 )"
-RDEPEND="X? ( virtual/x11 )"
+		dev-lang/perl
+		X? ( || ( x11-apps/bdftopcf virtual/x11 ) )"
+RDEPEND=""
 
 src_compile() {
 	./configure \
diff --git a/media-fonts/terminus-font/terminus-font-4.11.ebuild b/media-fonts/terminus-font/terminus-font-4.11.ebuild
index eda870c5bc65..0f46eff17168 100644
--- a/media-fonts/terminus-font/terminus-font-4.11.ebuild
+++ b/media-fonts/terminus-font/terminus-font-4.11.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/media-fonts/terminus-font/terminus-font-4.11.ebuild,v 1.7 2005/04/05 23:03:48 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/terminus-font/terminus-font-4.11.ebuild,v 1.8 2006/02/01 07:16:11 mr_bones_ Exp $
 
 DESCRIPTION="A clean fixed font for the console and X11"
 HOMEPAGE="http://www.is-vn.bg/hamster/jimmy-en.html"
@@ -11,9 +11,9 @@ KEYWORDS="x86 ppc sparc ~alpha ~mips hppa ia64 amd64 ppc64"
 IUSE="X"
 
 DEPEND="sys-apps/gawk
-	dev-lang/perl
-	X? ( virtual/x11 )"
-RDEPEND="X? ( virtual/x11 )"
+		dev-lang/perl
+		X? ( || ( x11-apps/bdftopcf virtual/x11 ) )"
+RDEPEND=""
 
 src_compile() {
 	./configure \
diff --git a/media-fonts/terminus-font/terminus-font-4.12.ebuild b/media-fonts/terminus-font/terminus-font-4.12.ebuild
index 5b0549a624a6..0f110c3a58dd 100644
--- a/media-fonts/terminus-font/terminus-font-4.12.ebuild
+++ b/media-fonts/terminus-font/terminus-font-4.12.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/media-fonts/terminus-font/terminus-font-4.12.ebuild,v 1.7 2005/06/06 09:46:55 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/terminus-font/terminus-font-4.12.ebuild,v 1.8 2006/02/01 07:16:11 mr_bones_ Exp $
 
 DESCRIPTION="A clean fixed font for the console and X11"
 HOMEPAGE="http://www.is-vn.bg/hamster/jimmy-en.html"
@@ -11,9 +11,9 @@ KEYWORDS="~alpha amd64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="X"
 
 DEPEND="sys-apps/gawk
-	dev-lang/perl
-	X? ( virtual/x11 )"
-RDEPEND="X? ( virtual/x11 )"
+		dev-lang/perl
+		X? ( || ( x11-apps/bdftopcf virtual/x11 ) )"
+RDEPEND=""
 
 src_compile() {
 	./configure \
diff --git a/media-fonts/terminus-font/terminus-font-4.14.ebuild b/media-fonts/terminus-font/terminus-font-4.14.ebuild
index ebf9ed25dc61..0d2e67110a94 100644
--- a/media-fonts/terminus-font/terminus-font-4.14.ebuild
+++ b/media-fonts/terminus-font/terminus-font-4.14.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/media-fonts/terminus-font/terminus-font-4.14.ebuild,v 1.5 2005/09/03 20:32:25 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/terminus-font/terminus-font-4.14.ebuild,v 1.6 2006/02/01 07:16:11 mr_bones_ Exp $
 
 DESCRIPTION="A clean fixed font for the console and X11"
 HOMEPAGE="http://www.is-vn.bg/hamster/jimmy-en.html"
@@ -11,9 +11,9 @@ KEYWORDS="alpha amd64 ~hppa ia64 ~mips ppc ppc64 sparc x86"
 IUSE="X"
 
 DEPEND="sys-apps/gawk
-	dev-lang/perl
-	X? ( virtual/x11 )"
-RDEPEND="X? ( virtual/x11 )"
+		dev-lang/perl
+		X? ( || ( x11-apps/bdftopcf virtual/x11 ) )"
+RDEPEND=""
 
 src_compile() {
 	./configure \