Remove virtual/x11.

Package-Manager: portage-2.1.3_rc8

11 files changed, 37 insertions, 67 deletions

diff --git a/media-fonts/monafont/ChangeLog b/media-fonts/monafont/ChangeLog
index 5a0c5d9cda45..43899ebe7f04 100644
--- a/media-fonts/monafont/ChangeLog
+++ b/media-fonts/monafont/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-fonts/monafont
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/monafont/ChangeLog,v 1.32 2007/01/05 17:08:16 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/monafont/ChangeLog,v 1.33 2007/07/22 07:08:31 dirtyepic Exp $
+
+  22 Jul 2007; Ryan Hill <dirtyepic@gentoo.org> monafont-2.90-r1.ebuild,
+  monafont-2.90-r2.ebuild:
+  Remove virtual/x11.
 
   05 Jan 2007; Diego Pettenò <flameeyes@gentoo.org>
   monafont-2.90-r1.ebuild:
diff --git a/media-fonts/monafont/monafont-2.90-r1.ebuild b/media-fonts/monafont/monafont-2.90-r1.ebuild
index 818e1d7b28f1..80f60a8006ae 100644
--- a/media-fonts/monafont/monafont-2.90-r1.ebuild
+++ b/media-fonts/monafont/monafont-2.90-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/monafont/monafont-2.90-r1.ebuild,v 1.12 2007/01/05 17:08:16 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/monafont/monafont-2.90-r1.ebuild,v 1.13 2007/07/22 07:08:31 dirtyepic Exp $
 
 inherit font
 
@@ -18,7 +18,7 @@ IUSE="X truetype"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
-	|| ( x11-apps/bdftopcf virtual/x11 )
+	x11-apps/bdftopcf
 	dev-lang/perl
 	>=sys-apps/sed-4
 	app-arch/unzip"
diff --git a/media-fonts/monafont/monafont-2.90-r2.ebuild b/media-fonts/monafont/monafont-2.90-r2.ebuild
index 8ca17f50d804..2bcfadc7d596 100644
--- a/media-fonts/monafont/monafont-2.90-r2.ebuild
+++ b/media-fonts/monafont/monafont-2.90-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/monafont/monafont-2.90-r2.ebuild,v 1.12 2006/11/26 22:13:41 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/monafont/monafont-2.90-r2.ebuild,v 1.13 2007/07/22 07:08:31 dirtyepic Exp $
 
 inherit font
 
@@ -16,7 +16,8 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 IUSE="truetype"
 
-DEPEND="|| ( ( x11-apps/bdftopcf x11-apps/mkfontdir ) <virtual/x11-7 )
+DEPEND="x11-apps/bdftopcf
+		x11-apps/mkfontdir
 		dev-lang/perl
 		>=sys-apps/sed-4
 		app-arch/unzip"
diff --git a/media-fonts/shinonome/Manifest b/media-fonts/shinonome/Manifest
index a71004e4657b..0fec95ca76bb 100644
--- a/media-fonts/shinonome/Manifest
+++ b/media-fonts/shinonome/Manifest
@@ -1,24 +1,16 @@
-DIST shinonome-0.9.10.tar.bz2 4820015 RMD160 f97ca309dfc68b6811f0fc9ed4b3e440307e9945 SHA1 a5d51d43a3b3b1a70b8090c76baf3341ce009e2c SHA256 eb08a2cee0d1bc6717eb8fee36ba1971f9f3a23a039428e1c3f238661ad0dd97
 DIST shinonome-0.9.11.tar.bz2 4943752 RMD160 a2343195a78f61510391832262897839d286bf94 SHA1 19da90b929f7a72ce8ff2de325eaba2f9a73f051 SHA256 40c0f54659042c33541510c894bcc769b104867f186285e7cf32971ca6add63b
-EBUILD shinonome-0.9.10.ebuild 1312 RMD160 2946c6082d20d73e5b9a2dcfe63d71e42d205a75 SHA1 dc0b4129b2dd0eeaa466bc43f5d00935e561af2b SHA256 f48fc10e0af1e78411ecf55a20c8c134a4021e39dbfbb6556ad024ffe163217b
-MD5 cec0236c46e5b99edb263471813a4800 shinonome-0.9.10.ebuild 1312
-RMD160 2946c6082d20d73e5b9a2dcfe63d71e42d205a75 shinonome-0.9.10.ebuild 1312
-SHA256 f48fc10e0af1e78411ecf55a20c8c134a4021e39dbfbb6556ad024ffe163217b shinonome-0.9.10.ebuild 1312
-EBUILD shinonome-0.9.11.ebuild 878 RMD160 eed59c45f0a7634c3ac8279b4a6b77a2f2af01d4 SHA1 7873be065a82b3e0f2155313ee0d9ac239cadea2 SHA256 c17574077d32d35cc5e743ec92db3f66c7174cdfb4562192852b0fd6c4b99d48
-MD5 8fb142907949945ce000080fc54a16d0 shinonome-0.9.11.ebuild 878
-RMD160 eed59c45f0a7634c3ac8279b4a6b77a2f2af01d4 shinonome-0.9.11.ebuild 878
-SHA256 c17574077d32d35cc5e743ec92db3f66c7174cdfb4562192852b0fd6c4b99d48 shinonome-0.9.11.ebuild 878
-MISC ChangeLog 2935 RMD160 6a571149168fbb2eb2485c187e34bfa423d758f8 SHA1 662bfed7b724a000736e9b2b837d6b6bb2bbb716 SHA256 8df5920426dcc05972642a95cac6d9007ddef93954467f46d0c222d218812e21
-MD5 9e87021b4d0dd246f3266839bb095ad3 ChangeLog 2935
-RMD160 6a571149168fbb2eb2485c187e34bfa423d758f8 ChangeLog 2935
-SHA256 8df5920426dcc05972642a95cac6d9007ddef93954467f46d0c222d218812e21 ChangeLog 2935
+EBUILD shinonome-0.9.11.ebuild 816 RMD160 7922dd3113127c4510138023dc923d9efeda9bb8 SHA1 2555ebd63040dcb4341ecc241ed6ddd4ac750647 SHA256 247f8bd0e761193f4093c9da7e447a76e1649da3de489fd566a13bc5c0aa53e7
+MD5 3604a4131542374429322ecfff30e851 shinonome-0.9.11.ebuild 816
+RMD160 7922dd3113127c4510138023dc923d9efeda9bb8 shinonome-0.9.11.ebuild 816
+SHA256 247f8bd0e761193f4093c9da7e447a76e1649da3de489fd566a13bc5c0aa53e7 shinonome-0.9.11.ebuild 816
+MISC ChangeLog 3121 RMD160 5fbbdbb45fb35ae9b8c7d8481b9eeb6f7cc788d8 SHA1 bcf2ecd032bc2cb1e49eed4cd92101947db31b1b SHA256 d3ac2b1f227bf49dece2e0846db969b5b6306411277d1f0aab6174f847484b61
+MD5 c731cb13cf81acf2ecbed980c93fa887 ChangeLog 3121
+RMD160 5fbbdbb45fb35ae9b8c7d8481b9eeb6f7cc788d8 ChangeLog 3121
+SHA256 d3ac2b1f227bf49dece2e0846db969b5b6306411277d1f0aab6174f847484b61 ChangeLog 3121
 MISC metadata.xml 175 RMD160 e22fbca96af27631c4910bc93f69d81280ddd96e SHA1 5f1d4ea1a9ccb9b3dbd74ddaed58f0df64f2ad63 SHA256 0dc53674ee3ca2348bedd390f639dac96f537cce8cd0c550c13917de7b61f2e8
 MD5 9088d4a413fe0b465560c753492acf1f metadata.xml 175
 RMD160 e22fbca96af27631c4910bc93f69d81280ddd96e metadata.xml 175
 SHA256 0dc53674ee3ca2348bedd390f639dac96f537cce8cd0c550c13917de7b61f2e8 metadata.xml 175
-MD5 a002e1888b71d20420674c2ff58bc328 files/digest-shinonome-0.9.10 256
-RMD160 53d671a4d709842cbf85d778b6296ba450eb235a files/digest-shinonome-0.9.10 256
-SHA256 774498ac0355a9d4b0753ad88d78e4f65486ec9d17a9a806c0b50c7685c636e6 files/digest-shinonome-0.9.10 256
 MD5 958cdca6d897737d2e328458908ed5e1 files/digest-shinonome-0.9.11 256
 RMD160 42864392f8e5231ec4ff792522e84a8baedd2257 files/digest-shinonome-0.9.11 256
 SHA256 1aa06b018b4d667dc0817d918c6d63866eaf44b2f24e4b0ccaa15f9ce398e51e files/digest-shinonome-0.9.11 256
diff --git a/media-fonts/vc-fonts/ChangeLog b/media-fonts/vc-fonts/ChangeLog
index b83cbb785cd2..5cf854fbcf31 100644
--- a/media-fonts/vc-fonts/ChangeLog
+++ b/media-fonts/vc-fonts/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-fonts/vc-fonts
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/vc-fonts/ChangeLog,v 1.17 2007/03/18 12:08:15 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/vc-fonts/ChangeLog,v 1.18 2007/07/22 07:05:30 dirtyepic Exp $
+
+  22 Jul 2007; Ryan Hill <dirtyepic@gentoo.org> vc-fonts-20020207.ebuild,
+  vc-fonts-20020207-r1.ebuild:
+  Remove virtual/x11.
 
   18 Mar 2007; Simon Stelling <blubb@gentoo.org>
   vc-fonts-20020207-r1.ebuild:
diff --git a/media-fonts/vc-fonts/vc-fonts-20020207-r1.ebuild b/media-fonts/vc-fonts/vc-fonts-20020207-r1.ebuild
index 9bb5b8179b45..13da3899e854 100644
--- a/media-fonts/vc-fonts/vc-fonts-20020207-r1.ebuild
+++ b/media-fonts/vc-fonts/vc-fonts-20020207-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/vc-fonts/vc-fonts-20020207-r1.ebuild,v 1.10 2007/03/18 12:08:15 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/vc-fonts/vc-fonts-20020207-r1.ebuild,v 1.11 2007/07/22 07:05:30 dirtyepic Exp $
 
 S=${WORKDIR}/vc
 DESCRIPTION="Vico bitmap Fonts"
@@ -11,7 +11,7 @@ SLOT=0
 LICENSE="GPL-2"
 KEYWORDS="alpha amd64 arm ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 
-DEPEND="|| ( x11-apps/mkfontdir virtual/x11 )"
+DEPEND="x11-apps/mkfontdir"
 RDEPEND=""
 IUSE=""
 
diff --git a/media-fonts/vc-fonts/vc-fonts-20020207.ebuild b/media-fonts/vc-fonts/vc-fonts-20020207.ebuild
index b7b226cfdf81..94a10ca5419c 100644
--- a/media-fonts/vc-fonts/vc-fonts-20020207.ebuild
+++ b/media-fonts/vc-fonts/vc-fonts-20020207.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/vc-fonts/vc-fonts-20020207.ebuild,v 1.8 2006/03/23 21:15:30 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/vc-fonts/vc-fonts-20020207.ebuild,v 1.9 2007/07/22 07:05:30 dirtyepic Exp $
 
 S=${WORKDIR}/vc
 DESCRIPTION="Vico bitmap Fonts"
@@ -13,7 +13,7 @@ KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
-	|| ( x11-apps/mkfontdir virtual/x11 )"
+		x11-apps/mkfontdir"
 IUSE=""
 
 src_install() {
diff --git a/media-fonts/zh-kcfonts/ChangeLog b/media-fonts/zh-kcfonts/ChangeLog
index e610e643d5ab..866704ca88c5 100644
--- a/media-fonts/zh-kcfonts/ChangeLog
+++ b/media-fonts/zh-kcfonts/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-fonts/zh-kcfonts
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/zh-kcfonts/ChangeLog,v 1.20 2007/06/13 16:56:32 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/zh-kcfonts/ChangeLog,v 1.21 2007/07/22 07:11:28 dirtyepic Exp $
+
+  22 Jul 2007; Ryan Hill <dirtyepic@gentoo.org> -zh-kcfonts-1.05-r1.ebuild,
+  zh-kcfonts-1.05-r2.ebuild:
+  Remove virtual/x11.
 
   13 Jun 2007; Raúl Porcel <armin76@gentoo.org> zh-kcfonts-1.05-r2.ebuild:
   alpha stable wrt #171063
diff --git a/media-fonts/zh-kcfonts/files/digest-zh-kcfonts-1.05-r1 b/media-fonts/zh-kcfonts/files/digest-zh-kcfonts-1.05-r1
deleted file mode 100644
index 93d1f728fdf8..000000000000
--- a/media-fonts/zh-kcfonts/files/digest-zh-kcfonts-1.05-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 aab839f8c4c8afbd1f02ce6ed3a6373a zh-kcfonts-1.05.tgz 1175700
-RMD160 a4f7a15460da0a188c4a779ce590a22b6a4ac11a zh-kcfonts-1.05.tgz 1175700
-SHA256 2a4027e277b4f35215ae9c07b3ea320a1f740445317a77c88c8fd9e48368a2e6 zh-kcfonts-1.05.tgz 1175700
diff --git a/media-fonts/zh-kcfonts/zh-kcfonts-1.05-r1.ebuild b/media-fonts/zh-kcfonts/zh-kcfonts-1.05-r1.ebuild
deleted file mode 100644
index 3ad367b883c1..000000000000
--- a/media-fonts/zh-kcfonts/zh-kcfonts-1.05-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/zh-kcfonts/zh-kcfonts-1.05-r1.ebuild,v 1.10 2006/03/23 21:18:51 spyderous Exp $
-
-KCFONTS="${P}.tgz"
-
-DESCRIPTION="Kuo Chauo Chinese Fonts collection in BIG5 encoding"
-SRC_URI="ftp://ftp.freebsd.org.tw/pub/releases/i386/4.9-RELEASE/packages/x11-fonts/${P}.tgz"
-HOMEPAGE="http://freebsd.sinica.edu.tw/"
-# no real homepage exists, but this was written by Taiwanese FreeBSD devs
-
-LICENSE="freedist"
-SLOT="0"
-KEYWORDS="alpha amd64 ppc sparc x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	|| ( ( x11-apps/bdftopcf
-			x11-apps/mkfontdir
-		)
-		virtual/x11
-	)"
-S=${WORKDIR}
-FONTPATH=/usr/share/fonts/${PN}
-
-src_install() {
-	insinto ${FONTPATH}
-	doins lib/X11/fonts/local/*gz || die
-	sort lib/X11/fonts/local/kc_fonts.alias | uniq > ${T}/fonts.alias
-	doins ${T}/fonts.alias || die
-	mkfontdir ${D}/${FONTPATH}
-}
diff --git a/media-fonts/zh-kcfonts/zh-kcfonts-1.05-r2.ebuild b/media-fonts/zh-kcfonts/zh-kcfonts-1.05-r2.ebuild
index 05c50689bafa..385eb9b9e7ef 100644
--- a/media-fonts/zh-kcfonts/zh-kcfonts-1.05-r2.ebuild
+++ b/media-fonts/zh-kcfonts/zh-kcfonts-1.05-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/zh-kcfonts/zh-kcfonts-1.05-r2.ebuild,v 1.9 2007/06/13 16:56:32 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/zh-kcfonts/zh-kcfonts-1.05-r2.ebuild,v 1.10 2007/07/22 07:11:28 dirtyepic Exp $
 
 inherit toolchain-funcs eutils
 
@@ -20,7 +20,8 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm ia64 ppc s390 sh sparc x86 ~x86-fbsd"
 IUSE=""
 
-DEPEND="|| ( ( x11-apps/mkfontdir x11-apps/bdftopcf ) virtual/x11 )"
+DEPEND="x11-apps/mkfontdir
+		x11-apps/bdftopcf"
 RDEPEND=""
 S="${WORKDIR}"
 FONTPATH="/usr/share/fonts/${PN}"