Fix font install path, patch by David Wildasin (bug #252095)

Package-Manager: portage-2.1.4.5

4 files changed, 44 insertions, 8 deletions

diff --git a/app-misc/cmatrix/ChangeLog b/app-misc/cmatrix/ChangeLog
index f74f3c2607a1..9d9da435ad1c 100644
--- a/app-misc/cmatrix/ChangeLog
+++ b/app-misc/cmatrix/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-misc/cmatrix
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/cmatrix/ChangeLog,v 1.25 2008/03/14 09:22:12 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/cmatrix/ChangeLog,v 1.26 2008/12/27 07:36:32 wormo Exp $
+
+  27 Dec 2008; Stephanie Lockwood-Childs <wormo@gentoo.org>
+  +files/cmatrix-1.2a-fontdir.patch, cmatrix-1.2a-r1.ebuild:
+  Fix font install path, patch by David Wildasin (bug #252095)
 
   14 Mar 2008; Christian Heim <phreak@gentoo.org> metadata.xml:
   Removing Charlie Shepherd (masterdriverz, #153940) from metadata.xml.
diff --git a/app-misc/cmatrix/Manifest b/app-misc/cmatrix/Manifest
index fd3690888084..07f4e4bb9b19 100644
--- a/app-misc/cmatrix/Manifest
+++ b/app-misc/cmatrix/Manifest
@@ -1,5 +1,6 @@
+AUX cmatrix-1.2a-fontdir.patch 1794 RMD160 afb4e12a0305849fbd818007c513ceedb24e8fc9 SHA1 a5e498165b0a58c66eb3d4ae55072c9399edaf1b SHA256 54b5722ee9d235221675732d039959029fe1bc007797323d387c9f976f754379
 AUX cmatrix-1.2a-gentoo.patch 3034 RMD160 59ba4db1eeb9f8242d070e29b3154212ed47cc2d SHA1 b4ac5206b56f2df3af04775d648cba65690fb5ef SHA256 a3c9646fe96da2a8509460c9afdb6ad85d1b704d01393d41825a1897fb49ff80
 DIST cmatrix-1.2a.tar.gz 74376 RMD160 8a401753ca0e88c0d24b6a8c3f23b725368c13bb SHA1 ca078c10322a47e327f07a44c9a42b52eab5ad93 SHA256 1fa6e6caea254b6fe70a492efddc1b40ad7ccb950a5adfd80df75b640577064c
-EBUILD cmatrix-1.2a-r1.ebuild 1229 RMD160 b874183c9acbb66b7c341972139fdc26a8428535 SHA1 32a25c1f3b79748ff9499cb9c75582b336786e12 SHA256 e162eceaf47a6683ed6d4ff52cb40b8311c3037a92d3f15e83d4cb8bc48a3fab
-MISC ChangeLog 2766 RMD160 fc36d96f4ec09a683a34336bff1331642ed7204d SHA1 7eab7fa0248d3a05bb24ea35de1aa234f3460c75 SHA256 b3e04f05904637f3361f59a89c39b5976f8912044be8fc0b95013b6897865a57
+EBUILD cmatrix-1.2a-r1.ebuild 1286 RMD160 abdab55ec75925e573d24a576081ffbeed9dac59 SHA1 87ee4530f206a948ab2d75049f4262ff83cf4ff6 SHA256 36899d2aa2d73fef61a9977ee02d9552dc0632457c8c3bf26a9d96967ab139b6
+MISC ChangeLog 2950 RMD160 0c3e6fbd56c001e7e387f542b4e03d3488723834 SHA1 3f06ca4a58f2a11e4399fdc8a15128f797106d00 SHA256 b1af4820ef86519531bebbc7bd74d9a782aa9551ed71f9c0a2ebabc650bfd4ee
 MISC metadata.xml 236 RMD160 92f49f8275e75caf57b88a3172d5204eaa4e33ae SHA1 dd1a8550a514e55ab0ed6190ab4794bb090994f8 SHA256 56075995f83836ae824c7cb01931b98d6745f6d5a7764299c8262e801486b829
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
 }
diff --git a/app-misc/cmatrix/files/cmatrix-1.2a-fontdir.patch b/app-misc/cmatrix/files/cmatrix-1.2a-fontdir.patch
new file mode 100644
index 000000000000..6e69841b5e01
--- /dev/null
+++ b/app-misc/cmatrix/files/cmatrix-1.2a-fontdir.patch
@@ -0,0 +1,28 @@
+diff -Naru cmatrix-1.2a.orig/Makefile.am cmatrix-1.2a/Makefile.am
+--- cmatrix-1.2a.orig/Makefile.am	2008-12-24 02:37:43.000000000 +0000
++++ cmatrix-1.2a/Makefile.am	2008-12-24 02:50:08.000000000 +0000
+@@ -18,20 +18,9 @@
+ 	    $(INSTALL_DATA) $(srcdir)/matrix.fnt $(DESTDIR)/usr/lib/kbd/consolefonts; \
+ 	    $(INSTALL_DATA) $(srcdir)/matrix.psf.gz $(DESTDIR)/usr/lib/kbd/consolefonts; \
+ 	fi
+-	@if test -d /usr/lib/X11/fonts/misc; then \
+-	    echo " Installing X window matrix fonts in $(DESTDIR)/usr/lib/X11/fonts/misc..."; \
+-	    $(INSTALL_DATA) $(srcdir)/mtx.pcf $(DESTDIR)/usr/lib/X11/fonts/misc; \
+-	    $(INSTALL_DATA) $(srcdir)/mtx.pcf $(DESTDIR)/usr/lib/X11/fonts/misc; \
+-	    echo " Running mkfontdir $(DESTDIR)/usr/lib/X11/fonts/misc..."; \
+-	    echo " Done.  If this is the first time you have installed CMatrix you will"; \
++	@if test -d /usr/share/fonts/misc; then \
++	    echo " Installing X window matrix fonts in $(DESTDIR)/usr/share/fonts/misc..."; \
++	    $(INSTALL_DATA) $(srcdir)/mtx.pcf $(DESTDIR)/usr/share/fonts/misc; \
++	    echo " If this is the first time you have installed CMatrix you will"; \
+ 	    echo " probably have to restart X window in order to use the mtx.pcf font."; \
+-	else \
+-	if test -d /usr/X11R6/lib/X11/fonts/misc; then \
+-	    echo " Installing X window matrix fonts in $(DESTDIR)/usr/X11R6/lib/X11/fonts/misc..."; \
+-	    $(INSTALL_DATA) $(srcdir)/mtx.pcf $(DESTDIR)/usr/X11R6/lib/X11/fonts/misc; \
+-	    $(INSTALL_DATA) $(srcdir)/mtx.pcf $(DESTDIR)/usr/X11R6/lib/X11/fonts/misc; \
+-	    echo " Running mkfontdir $(DESTDIR)/usr/X11R6/lib/X11/fonts/misc..."; \
+-	    echo " Done.  If this is the first time you have installed CMatrix you will"; \
+-	    echo " probably have to restart X window in order to use the mtx.pcf font."; \
+-	fi \
+ 	fi