Fix DEPEND/RDEPEND for modular-X.

(Portage version: 2.0.54)

4 files changed, 77 insertions, 14 deletions

diff --git a/media-fonts/cronyx-fonts/ChangeLog b/media-fonts/cronyx-fonts/ChangeLog
index d750ce1d2544..62d83b91b061 100644
--- a/media-fonts/cronyx-fonts/ChangeLog
+++ b/media-fonts/cronyx-fonts/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-fonts/cronyx-fonts
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/cronyx-fonts/ChangeLog,v 1.8 2005/09/23 15:32:30 gustavoz Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/cronyx-fonts/ChangeLog,v 1.9 2006/01/11 21:28:27 robbat2 Exp $
+
+*cronyx-fonts-2.3.1-r2 (11 Jan 2006)
+
+  11 Jan 2006; Robin H. Johnson <robbat2@gentoo.org>
+  +cronyx-fonts-2.3.1-r2.ebuild:
+  Fix DEPEND/RDEPEND for modular-X.
 
   23 Sep 2005; Gustavo Zacarias <gustavoz@gentoo.org>
   cronyx-fonts-2.3.1-r1.ebuild:
diff --git a/media-fonts/cronyx-fonts/Manifest b/media-fonts/cronyx-fonts/Manifest
index e2696496124f..9dc01a9ba7ca 100644
--- a/media-fonts/cronyx-fonts/Manifest
+++ b/media-fonts/cronyx-fonts/Manifest
@@ -1,14 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 408d174601de60ec6723a4355c2a8338 ChangeLog 1476
 MD5 cce67b6311cc302a0e388b5038f4df50 cronyx-fonts-2.3.1-r1.ebuild 1800
-MD5 c0bac14640d614b0eca02031e346962b ChangeLog 1315
-MD5 295674d4bed87f5a7c2796e032ed561e metadata.xml 158
+MD5 94269bcc2f509f997426b5565e9c8988 cronyx-fonts-2.3.1-r2.ebuild 1846
 MD5 b4e9ecfe13c53dedb9a770132b8bc035 files/digest-cronyx-fonts-2.3.1-r1 64
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFDNCA3KRy60XGEcJIRAgCCAJ9Su7H7uGY5FPFPU2M/Zn1YAOsEAQCfXVsl
-rnrRVnj/2fU8tslJ4+FLueM=
-=4PCg
------END PGP SIGNATURE-----
+MD5 b4e9ecfe13c53dedb9a770132b8bc035 files/digest-cronyx-fonts-2.3.1-r2 64
+MD5 295674d4bed87f5a7c2796e032ed561e metadata.xml 158
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
new file mode 100644
index 000000000000..3157993d4ca6
--- /dev/null
+++ b/media-fonts/cronyx-fonts/cronyx-fonts-2.3.1-r2.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2006 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.1 2006/01/11 21:28:27 robbat2 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 ) )"
+RDEPEND=""
+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
+		einfo "In order to make X see the fonts, you need to add the"
+		einfo "following lines to the files section of your "
+		einfo "/etc/X11/XF86Config (or the XOrg equivalent):"
+		einfo "  FontPath \"${FONT_ROOT}/100dpi/:unscaled\""
+		einfo "  FontPath \"${FONT_ROOT}/misc/:unscaled\""
+		einfo "  FontPath \"${FONT_ROOT}/75dpi/:unscaled\""
+		einfo ""
+		einfo "In order to make them accessible to your current X"
+		einfo "session, run:"
+		einfo "  xset fp+ ${FONT_ROOT}/100dpi/:unscaled,\\"
+		einfo "${FONT_ROOT}/misc/:unscaled,\\"
+		einfo "${FONT_ROOT}/75dpi/:unscaled"
+		einfo "  xset fp rehash"
+	fi
+}
+
+pkg_postrm() {
+	if use X > /dev/null ; then
+		rebuild_fontfiles
+	fi
+}
diff --git a/media-fonts/cronyx-fonts/files/digest-cronyx-fonts-2.3.1-r2 b/media-fonts/cronyx-fonts/files/digest-cronyx-fonts-2.3.1-r2
new file mode 100644
index 000000000000..0defe51dc8b7
--- /dev/null
+++ b/media-fonts/cronyx-fonts/files/digest-cronyx-fonts-2.3.1-r2
@@ -0,0 +1 @@
+MD5 736fc53c897ec5d69d3c783a282ce611 x6rus-2.3.1-bin.tgz 602902