Fix DEPEND/RDEPEND for modular-X.

(Portage version: 2.0.54)

8 files changed, 110 insertions, 18 deletions

diff --git a/media-fonts/artwiz-fonts/ChangeLog b/media-fonts/artwiz-fonts/ChangeLog
index 09686f28db01..102090aeaa21 100644
--- a/media-fonts/artwiz-fonts/ChangeLog
+++ b/media-fonts/artwiz-fonts/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-fonts/artwiz-fonts
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/artwiz-fonts/ChangeLog,v 1.11 2005/12/14 17:46:42 joshuabaergen Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/artwiz-fonts/ChangeLog,v 1.12 2006/01/11 21:01:43 robbat2 Exp $
+
+*artwiz-fonts-2.4-r2 (11 Jan 2006)
+
+  11 Jan 2006; Robin H. Johnson <robbat2@gentoo.org>
+  +artwiz-fonts-2.4-r2.ebuild:
+  Fix DEPEND/RDEPEND for modular-X.
 
   14 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
   artwiz-fonts-2.4.ebuild, artwiz-fonts-2.4-r1.ebuild:
diff --git a/media-fonts/artwiz-fonts/Manifest b/media-fonts/artwiz-fonts/Manifest
index 28b1dd1b2098..8698cac58ab0 100644
--- a/media-fonts/artwiz-fonts/Manifest
+++ b/media-fonts/artwiz-fonts/Manifest
@@ -1,5 +1,7 @@
-MD5 05b5b77556cd57f301c04a1bbdc9b9c1 ChangeLog 1858
+MD5 5dff1e37777b31d60df4a54820d8b00e ChangeLog 2015
 MD5 dd391aa944ad99dab49403955383ea5a artwiz-fonts-2.4-r1.ebuild 1467
+MD5 9bb85934bba61f63c7f41173058c031d artwiz-fonts-2.4-r2.ebuild 1509
 MD5 6bcd7b2b59fa9fc515b68a781941239a artwiz-fonts-2.4.ebuild 1317
 MD5 a7f07fa24970169b9a931592e6840eee files/digest-artwiz-fonts-2.4 68
 MD5 a7f07fa24970169b9a931592e6840eee files/digest-artwiz-fonts-2.4-r1 68
+MD5 a7f07fa24970169b9a931592e6840eee files/digest-artwiz-fonts-2.4-r2 68
diff --git a/media-fonts/artwiz-fonts/artwiz-fonts-2.4-r2.ebuild b/media-fonts/artwiz-fonts/artwiz-fonts-2.4-r2.ebuild
new file mode 100644
index 000000000000..eb56d659454e
--- /dev/null
+++ b/media-fonts/artwiz-fonts/artwiz-fonts-2.4-r2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/artwiz-fonts/artwiz-fonts-2.4-r2.ebuild,v 1.1 2006/01/11 21:01:43 robbat2 Exp $
+
+S="${WORKDIR}/xfonts-artwiz-2.3"
+DESCRIPTION="Artwiz Fonts"
+SRC_URI="http://ftp.debian.org/debian/pool/main/x/xfonts-artwiz/xfonts-artwiz_${PV}.tar.gz"
+HOMEPAGE="http://fluxbox.sourceforge.net/docs/artwiz-fonts.php"
+
+SLOT=0
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+DEPEND="|| ( x11-apps/bdftopcf virtual/x11 )
+		x11-apps/ttmkfdir"
+RDEPEND=""
+
+src_compile() {
+	cd ${S}/upstream
+	for font in *.bdf; do
+		/usr/X11R6/bin/bdftopcf ${font} > `basename $font .bdf`.pcf
+	done
+	gzip *.pcf
+}
+
+src_install() {
+	cd ${S}/upstream
+	rm cursor.pcf.gz
+
+	insopts -m0644
+	insinto /usr/share/fonts/artwiz/
+	doins *.pcf.gz
+
+	cd ${S}/debian
+	insopts -m0644
+	insinto /usr/share/fonts/artwiz/
+	doins fonts.alias
+
+#	These don't get downloaded because there is no simple way to
+#	fetch them.. ie if I included the README in SRC_URI above, it would
+#	get saved as /usr/portage/distfiles/README which doesn't seem like
+#	a really good idea.
+	dodoc ../COPYING
+
+	if [ -z "$(grep artwiz /etc/X11/fs/config)" ]
+	then
+		sed 's#^catalog.*$#&\n\t/usr/share/fonts/artwiz:unscaled,#g' \
+			/etc/X11/fs/config > ${S}/config
+		insinto /etc/X11/fs
+		doins config
+	fi
+
+}
+
+pkg_postinst() {
+	einfo ">>> Making font dirs..."
+	cd /usr/share/fonts/artwiz
+	mkfontdir
+}
diff --git a/media-fonts/artwiz-fonts/files/digest-artwiz-fonts-2.4-r2 b/media-fonts/artwiz-fonts/files/digest-artwiz-fonts-2.4-r2
new file mode 100644
index 000000000000..d8bcb89e46a4
--- /dev/null
+++ b/media-fonts/artwiz-fonts/files/digest-artwiz-fonts-2.4-r2
@@ -0,0 +1 @@
+MD5 1113078c54818ac82025934ca5cb61d0 xfonts-artwiz_2.4.tar.gz 36521
diff --git a/media-fonts/vc-fonts/ChangeLog b/media-fonts/vc-fonts/ChangeLog
index 2034dfb74cbb..c0d2ac39ae0e 100644
--- a/media-fonts/vc-fonts/ChangeLog
+++ b/media-fonts/vc-fonts/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-fonts/vc-fonts
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/vc-fonts/ChangeLog,v 1.7 2005/09/23 15:51:27 gustavoz Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/vc-fonts/ChangeLog,v 1.8 2006/01/11 21:04:52 robbat2 Exp $
+
+*vc-fonts-20020207-r1 (11 Jan 2006)
+
+  11 Jan 2006; Robin H. Johnson <robbat2@gentoo.org>
+  +vc-fonts-20020207-r1.ebuild:
+  Fix DEPEND/RDEPEND for modular-X.
 
   23 Sep 2005; Gustavo Zacarias <gustavoz@gentoo.org>
   vc-fonts-20020207.ebuild:
diff --git a/media-fonts/vc-fonts/Manifest b/media-fonts/vc-fonts/Manifest
index fd6630409940..7c04a147baa5 100644
--- a/media-fonts/vc-fonts/Manifest
+++ b/media-fonts/vc-fonts/Manifest
@@ -1,14 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 ca326f152ef840c27004eacb150b2da9 ChangeLog 1039
-MD5 89e726912990017f6524cc24b724c12f vc-fonts-20020207.ebuild 628
-MD5 295674d4bed87f5a7c2796e032ed561e metadata.xml 158
+MD5 8040f5f72c2e05b6ad23e32548ee50f5 ChangeLog 1198
 MD5 b51f5ad4a2253780a6a386d3d6f2b7c0 files/digest-vc-fonts-20020207 69
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFDNCSpKRy60XGEcJIRAnRLAKCZ0CyQlw5NSa8a+QNAlmc+H+U35QCff+F9
-dDBnFpbY5tMK0FPUB1NlH3g=
-=qt7G
------END PGP SIGNATURE-----
+MD5 b51f5ad4a2253780a6a386d3d6f2b7c0 files/digest-vc-fonts-20020207-r1 69
+MD5 295674d4bed87f5a7c2796e032ed561e metadata.xml 158
+MD5 f958171c09803de8abf8f10368d53c2d vc-fonts-20020207-r1.ebuild 641
+MD5 89e726912990017f6524cc24b724c12f vc-fonts-20020207.ebuild 628
diff --git a/media-fonts/vc-fonts/files/digest-vc-fonts-20020207-r1 b/media-fonts/vc-fonts/files/digest-vc-fonts-20020207-r1
new file mode 100644
index 000000000000..78fdf82b3c2b
--- /dev/null
+++ b/media-fonts/vc-fonts/files/digest-vc-fonts-20020207-r1
@@ -0,0 +1 @@
+MD5 0795afdb3f20fc7d098cffde47cb83cc vc-fonts-20020207.tar.bz2 18154
diff --git a/media-fonts/vc-fonts/vc-fonts-20020207-r1.ebuild b/media-fonts/vc-fonts/vc-fonts-20020207-r1.ebuild
new file mode 100644
index 000000000000..b82a2afb4d22
--- /dev/null
+++ b/media-fonts/vc-fonts/vc-fonts-20020207-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2006 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.1 2006/01/11 21:04:52 robbat2 Exp $
+
+S=${WORKDIR}/vc
+DESCRIPTION="Vico bitmap Fonts"
+SRC_URI="http://vico.kleinplanet.de/files/${P}.tar.bz2"
+HOMEPAGE="http://vico.kleinplanet.de/"
+
+SLOT=0
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+DEPEND="|| ( x11-apps/mkfontdir virtual/x11 )"
+RDEPEND=""
+IUSE=""
+
+src_install() {
+
+	insopts -m0644
+	insinto /usr/share/fonts/vc
+	doins *.pcf.gz fonts.alias
+	mkfontdir ${D}/usr/share/fonts/vc
+}