summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephanie J. Lockwood-Childs <wormo@gentoo.org>2008-12-27 07:36:32 +0000
committerStephanie J. Lockwood-Childs <wormo@gentoo.org>2008-12-27 07:36:32 +0000
commitc5bb929c77759bd77c64d3e75a8313479ea0a5ea (patch)
tree86eb083c2d27a28b978db7f0a988885f3a6a79d3 /app-misc/cmatrix/cmatrix-1.2a-r1.ebuild
parentsh love (diff)
downloadgentoo-2-c5bb929c77759bd77c64d3e75a8313479ea0a5ea.tar.gz
gentoo-2-c5bb929c77759bd77c64d3e75a8313479ea0a5ea.tar.bz2
gentoo-2-c5bb929c77759bd77c64d3e75a8313479ea0a5ea.zip
Fix font install path, patch by David Wildasin (bug #252095)
(Portage version: 2.1.4.5)
Diffstat (limited to 'app-misc/cmatrix/cmatrix-1.2a-r1.ebuild')
-rw-r--r--app-misc/cmatrix/cmatrix-1.2a-r1.ebuild13
1 files changed, 8 insertions, 5 deletions
diff --git a/app-misc/cmatrix/cmatrix-1.2a-r1.ebuild b/app-misc/cmatrix/cmatrix-1.2a-r1.ebuild
index a5a1f7429ab3..f2cc037aec53 100644
--- a/app-misc/cmatrix/cmatrix-1.2a-r1.ebuild
+++ b/app-misc/cmatrix/cmatrix-1.2a-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/cmatrix/cmatrix-1.2a-r1.ebuild,v 1.7 2008/02/27 22:37:00 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/cmatrix/cmatrix-1.2a-r1.ebuild,v 1.8 2008/12/27 07:36:32 wormo Exp $
inherit autotools eutils
@@ -22,6 +22,9 @@ src_unpack() {
# sandbox.
cd "${S}"
epatch "${FILESDIR}"/${P}-gentoo.patch
+ if use X ; then
+ epatch "${FILESDIR}"/${P}-fontdir.patch
+ fi
eautoreconf
}
@@ -29,16 +32,16 @@ src_install() {
dodir /usr/share/consolefonts || die 'dodir failed'
dodir /usr/lib/kbd/consolefonts || die 'dodir failed'
if use X;then
- dodir /usr/lib/X11/fonts/misc || die 'dodir failed'
+ dodir /usr/share/fonts/misc || die 'dodir failed'
fi
emake DESTDIR="${D}" install || die 'emake install failed'
}
pkg_postinst() {
if use X; then
- if [ -d "${ROOT}"usr/lib/X11/fonts/misc ] ; then
- einfo ">>> Running mkfontdir on ${ROOT}usr/lib/X11/fonts/misc"
- mkfontdir "${ROOT}"usr/lib/X11/fonts/misc || die 'mkfontdir failed'
+ if [ -d "${ROOT}"usr/share/fonts/misc ] ; then
+ einfo ">>> Running mkfontdir on ${ROOT}usr/share/fonts/misc"
+ mkfontdir "${ROOT}"usr/share/fonts/misc || die 'mkfontdir failed'
fi
fi
}