Remove virtual/x11.

Package-Manager: portage-2.1.3_rc8

6 files changed, 17 insertions, 75 deletions

diff --git a/media-fonts/cronyx-fonts/ChangeLog b/media-fonts/cronyx-fonts/ChangeLog
index 15324632952b..13bd6b154a7f 100644
--- a/media-fonts/cronyx-fonts/ChangeLog
+++ b/media-fonts/cronyx-fonts/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-fonts/cronyx-fonts
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/cronyx-fonts/ChangeLog,v 1.18 2007/03/19 14:43:42 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/cronyx-fonts/ChangeLog,v 1.19 2007/07/22 07:52:58 dirtyepic Exp $
+
+  22 Jul 2007; Ryan Hill <dirtyepic@gentoo.org>
+  -cronyx-fonts-2.3.1-r1.ebuild, cronyx-fonts-2.3.1-r2.ebuild:
+  Remove virtual/x11.
 
   19 Mar 2007; Marius Mauch <genone@gentoo.org>
   cronyx-fonts-2.3.1-r1.ebuild, cronyx-fonts-2.3.1-r2.ebuild:
diff --git a/media-fonts/cronyx-fonts/cronyx-fonts-2.3.1-r1.ebuild b/media-fonts/cronyx-fonts/cronyx-fonts-2.3.1-r1.ebuild
deleted file mode 100644
index 84c284348f47..000000000000
--- a/media-fonts/cronyx-fonts/cronyx-fonts-2.3.1-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/cronyx-fonts/cronyx-fonts-2.3.1-r1.ebuild,v 1.9 2007/07/15 05:13:09 mr_bones_ Exp $
-
-DESCRIPTION="Cronyx Cyrillic bitmap fonts for X"
-HOMEPAGE="http://koi8.pp.ru/frame.html?xwin.html#xwin_fonts"
-S=${WORKDIR}/cyrillic
-SRC_URI="http://koi8.pp.ru/dist/x6rus-${PV}-bin.tgz"
-KEYWORDS="alpha amd64 ppc sparc x86"
-SLOT="0"
-LICENSE="freedist"
-DEPEND="X? ( || ( x11-apps/mkfontdir virtual/x11 ) )"
-IUSE="X"
-
-FONT_ROOT=/usr/share/fonts/cronyx
-FONT_TARGETS="75dpi 100dpi misc"
-
-src_install() {
-	for dir in $FONT_TARGETS; do
-		insinto ${FONT_ROOT}/$dir
-		doins ${dir}/*.pcf.gz
-	done
-	# our install dir is still ${FONT_ROOT}/misc, so
-	doins misc/fonts.alias
-	dodoc xrus.info
-}
-
-rebuild_fontfiles() {
-	einfo "Refreshing fonts.scale and fonts.dir..."
-	cd ${FONT_ROOT}
-	mkfontdir -- ${FONT_TARGETS}
-	if [ "${ROOT}" = "/" ] &&  [ -x /usr/bin/fc-cache ]
-	then
-		einfo "Updating font cache..."
-		HOME="/root" /usr/bin/fc-cache -f ${FONT_TARGETS}
-	fi
-}
-
-pkg_postinst() {
-	if use X > /dev/null ; then
-		rebuild_fontfiles
-		elog "In order to make X see the fonts, you need to add the"
-		elog "following lines to the files section of your "
-		elog "/etc/X11/XF86Config (or the XOrg equivalent):"
-		elog "  FontPath \"${FONT_ROOT}/100dpi/:unscaled\""
-		elog "  FontPath \"${FONT_ROOT}/misc/:unscaled\""
-		elog "  FontPath \"${FONT_ROOT}/75dpi/:unscaled\""
-		elog ""
-		elog "In order to make them accessible to your current X"
-		elog "session, run:"
-		elog "  xset fp+ ${FONT_ROOT}/100dpi/:unscaled,\\"
-		elog "${FONT_ROOT}/misc/:unscaled,\\"
-		elog "${FONT_ROOT}/75dpi/:unscaled"
-		elog "  xset fp rehash"
-	fi
-}
-
-pkg_postrm() {
-	if use X > /dev/null ; then
-		rebuild_fontfiles
-	fi
-}
diff --git a/media-fonts/cronyx-fonts/cronyx-fonts-2.3.1-r2.ebuild b/media-fonts/cronyx-fonts/cronyx-fonts-2.3.1-r2.ebuild
index 7b07d0e2afea..2c6662d6e0ad 100644
--- a/media-fonts/cronyx-fonts/cronyx-fonts-2.3.1-r2.ebuild
+++ b/media-fonts/cronyx-fonts/cronyx-fonts-2.3.1-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/cronyx-fonts/cronyx-fonts-2.3.1-r2.ebuild,v 1.11 2007/07/15 05:13:09 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/cronyx-fonts/cronyx-fonts-2.3.1-r2.ebuild,v 1.12 2007/07/22 07:52:58 dirtyepic Exp $
 
 DESCRIPTION="Cronyx Cyrillic bitmap fonts for X"
 HOMEPAGE="http://koi8.pp.ru/frame.html?xwin.html#xwin_fonts"
@@ -9,9 +9,9 @@ SRC_URI="http://koi8.pp.ru/dist/x6rus-${PV}-bin.tgz"
 KEYWORDS="alpha amd64 arm ia64 ppc s390 sh sparc x86 ~x86-fbsd"
 SLOT="0"
 LICENSE="freedist"
-DEPEND="X? ( || ( x11-apps/mkfontdir virtual/x11 ) )"
+DEPEND="x11-apps/mkfontdir"
 RDEPEND=""
-IUSE="X"
+IUSE=""
 
 FONT_ROOT=/usr/share/fonts/cronyx
 FONT_TARGETS="75dpi 100dpi misc"
diff --git a/media-fonts/cronyx-fonts/files/digest-cronyx-fonts-2.3.1-r1 b/media-fonts/cronyx-fonts/files/digest-cronyx-fonts-2.3.1-r1
deleted file mode 100644
index d8c9297e25f0..000000000000
--- a/media-fonts/cronyx-fonts/files/digest-cronyx-fonts-2.3.1-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 736fc53c897ec5d69d3c783a282ce611 x6rus-2.3.1-bin.tgz 602902
-RMD160 b519669aeeea1b4e519730227d6b176847a17b9a x6rus-2.3.1-bin.tgz 602902
-SHA256 779cc5fa4e90260266390b3e4fdcd6bf52a20c743ed3bbe4d038e509c9c7f2e8 x6rus-2.3.1-bin.tgz 602902
diff --git a/media-fonts/x11fonts-jmk/ChangeLog b/media-fonts/x11fonts-jmk/ChangeLog
index 7a01bb9720e3..a3005ac82fc7 100644
--- a/media-fonts/x11fonts-jmk/ChangeLog
+++ b/media-fonts/x11fonts-jmk/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-fonts/x11fonts-jmk
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/x11fonts-jmk/ChangeLog,v 1.13 2006/11/27 00:02:05 flameeyes Exp $
+# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/x11fonts-jmk/ChangeLog,v 1.14 2007/07/22 07:54:20 dirtyepic Exp $
+
+  22 Jul 2007; Ryan Hill <dirtyepic@gentoo.org> x11fonts-jmk-3.0-r1.ebuild:
+  Remove virtual/x11.
 
   27 Nov 2006; Diego Pettenò <flameeyes@gentoo.org>
   x11fonts-jmk-3.0-r1.ebuild:
diff --git a/media-fonts/x11fonts-jmk/x11fonts-jmk-3.0-r1.ebuild b/media-fonts/x11fonts-jmk/x11fonts-jmk-3.0-r1.ebuild
index 7898f0375947..98f1b4b3eafc 100644
--- a/media-fonts/x11fonts-jmk/x11fonts-jmk-3.0-r1.ebuild
+++ b/media-fonts/x11fonts-jmk/x11fonts-jmk-3.0-r1.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/x11fonts-jmk/x11fonts-jmk-3.0-r1.ebuild,v 1.15 2006/11/27 00:02:05 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/x11fonts-jmk/x11fonts-jmk-3.0-r1.ebuild,v 1.16 2007/07/22 07:54:20 dirtyepic Exp $
 
 inherit eutils
 
@@ -14,8 +14,8 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm ia64 ppc s390 sh sparc x86 ~x86-fbsd"
 IUSE=""
 
-DEPEND="|| ( ( x11-misc/imake x11-apps/bdftopcf )
-			virtual/x11 )"
+DEPEND="x11-misc/imake
+		x11-apps/bdftopcf"
 RDEPEND=""
 
 FONTPATH="/usr/share/fonts/jmk"