Revision bump (and amd64 stable) to stop installing /usr/X11R6 directory wrt #204773.

Package-Manager: portage-2.1.4
RepoMan-Options: --force

4 files changed, 63 insertions, 5 deletions

diff --git a/app-misc/cmatrix/ChangeLog b/app-misc/cmatrix/ChangeLog
index ea3ff64cbad8..6147f62b6d1c 100644
--- a/app-misc/cmatrix/ChangeLog
+++ b/app-misc/cmatrix/ChangeLog
@@ -1,6 +1,12 @@
 # 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.18 2008/01/07 17:07:25 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/cmatrix/ChangeLog,v 1.19 2008/01/25 08:24:58 drac Exp $
+
+*cmatrix-1.2a-r1 (25 Jan 2008)
+
+  25 Jan 2008; Samuli Suominen <drac@gentoo.org> +cmatrix-1.2a-r1.ebuild:
+  Revision bump (and amd64 stable) to stop installing /usr/X11R6 directory wrt
+  #204773.
 
   07 Jan 2008; Jeroen Roovers <jer@gentoo.org> cmatrix-1.2a.ebuild:
   Marked ~hppa (LuckyLuke in #gentoo-hppa).
diff --git a/app-misc/cmatrix/Manifest b/app-misc/cmatrix/Manifest
index ca883a357597..4d20285f562c 100644
--- a/app-misc/cmatrix/Manifest
+++ b/app-misc/cmatrix/Manifest
@@ -3,14 +3,18 @@ MD5 9bfecf967586ff4ee812fbff868b34b1 files/cmatrix-1.2a-gentoo.patch 3034
 RMD160 59ba4db1eeb9f8242d070e29b3154212ed47cc2d files/cmatrix-1.2a-gentoo.patch 3034
 SHA256 a3c9646fe96da2a8509460c9afdb6ad85d1b704d01393d41825a1897fb49ff80 files/cmatrix-1.2a-gentoo.patch 3034
 DIST cmatrix-1.2a.tar.gz 74376 RMD160 8a401753ca0e88c0d24b6a8c3f23b725368c13bb SHA1 ca078c10322a47e327f07a44c9a42b52eab5ad93 SHA256 1fa6e6caea254b6fe70a492efddc1b40ad7ccb950a5adfd80df75b640577064c
+EBUILD cmatrix-1.2a-r1.ebuild 1221 RMD160 2c9583d617b2b410bf7c3b1ba3d51c8fcbcb372d SHA1 d3325f6cbb551ebc0284f1a4c1e602cf50f47c5b SHA256 292422bd825e9a54156688425dce78011b28fa324ee015ad5c611f93510df99e
+MD5 a11b6c03effafb7413e27c5d826d3ca5 cmatrix-1.2a-r1.ebuild 1221
+RMD160 2c9583d617b2b410bf7c3b1ba3d51c8fcbcb372d cmatrix-1.2a-r1.ebuild 1221
+SHA256 292422bd825e9a54156688425dce78011b28fa324ee015ad5c611f93510df99e cmatrix-1.2a-r1.ebuild 1221
 EBUILD cmatrix-1.2a.ebuild 1555 RMD160 914b88c2b8927844ef64bbf1149290dd6454f851 SHA1 4a535efb29efcdc92e9790aebdb51339cccf4bfa SHA256 c093e214793970d9a0bef106fa7d44a64dad08f2271ae5296063bf04d92a724e
 MD5 ecebd2eeca67b7ae7ee0963a3213b396 cmatrix-1.2a.ebuild 1555
 RMD160 914b88c2b8927844ef64bbf1149290dd6454f851 cmatrix-1.2a.ebuild 1555
 SHA256 c093e214793970d9a0bef106fa7d44a64dad08f2271ae5296063bf04d92a724e cmatrix-1.2a.ebuild 1555
-MISC ChangeLog 1855 RMD160 601731cadc92fffa2fb8dc386d57778e791dfc95 SHA1 eed0468aa7b451ad59c2c8c5140e6502c022ef9a SHA256 6c4dc159c8c400bae525e9381ee3f9eee09a8fa0f5e74699ee27b281afa1762a
-MD5 2be2eca5da6c34d759c14cbd9d2716b6 ChangeLog 1855
-RMD160 601731cadc92fffa2fb8dc386d57778e791dfc95 ChangeLog 1855
-SHA256 6c4dc159c8c400bae525e9381ee3f9eee09a8fa0f5e74699ee27b281afa1762a ChangeLog 1855
+MISC ChangeLog 2053 RMD160 536f138a3f61fa799632cfca0c804e932bf3022d SHA1 95082d46224ec1637a0e3c4d616352a10db70c91 SHA256 4d90685e304b181b99d0a5a458eabe5a4026526b7bb54ca1e5442f13afff674a
+MD5 dadd7fcb91f71c5869995c161f6cfb12 ChangeLog 2053
+RMD160 536f138a3f61fa799632cfca0c804e932bf3022d ChangeLog 2053
+SHA256 4d90685e304b181b99d0a5a458eabe5a4026526b7bb54ca1e5442f13afff674a ChangeLog 2053
 MISC metadata.xml 259 RMD160 fef2d90923eca53380db43d32c61bf2ddbb746dd SHA1 e12bd9c4c1126e7a59ff94d9bd9b2a91ae1bdbc6 SHA256 ac17b4389ba9663c039d266e0b37ac6bde7799f169310ee8b4761fd492ab4c5a
 MD5 ede773d05e48fe5c26e14888c8e46414 metadata.xml 259
 RMD160 fef2d90923eca53380db43d32c61bf2ddbb746dd metadata.xml 259
@@ -18,3 +22,6 @@ SHA256 ac17b4389ba9663c039d266e0b37ac6bde7799f169310ee8b4761fd492ab4c5a metadata
 MD5 7ca8b8659bd0b3b222005056550fdf82 files/digest-cmatrix-1.2a 235
 RMD160 ebf2a3d01e71fc3b9f53f47651c607e19eb80ae1 files/digest-cmatrix-1.2a 235
 SHA256 16990c1fe9fc39190c56b85f35e738e716252385ae62f3fc8f0cfd39205af518 files/digest-cmatrix-1.2a 235
+MD5 7ca8b8659bd0b3b222005056550fdf82 files/digest-cmatrix-1.2a-r1 235
+RMD160 ebf2a3d01e71fc3b9f53f47651c607e19eb80ae1 files/digest-cmatrix-1.2a-r1 235
+SHA256 16990c1fe9fc39190c56b85f35e738e716252385ae62f3fc8f0cfd39205af518 files/digest-cmatrix-1.2a-r1 235
diff --git a/app-misc/cmatrix/cmatrix-1.2a-r1.ebuild b/app-misc/cmatrix/cmatrix-1.2a-r1.ebuild
new file mode 100644
index 000000000000..4480718e846f
--- /dev/null
+++ b/app-misc/cmatrix/cmatrix-1.2a-r1.ebuild
@@ -0,0 +1,42 @@
+# 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.1 2008/01/25 08:24:58 drac Exp $
+
+inherit autotools eutils
+
+DESCRIPTION="An ncurses based app to show a scrolling screen from the Matrix"
+HOMEPAGE="http://www.asty.org/cmatrix.html"
+SRC_URI="http://www.asty.org/${PN}/dist/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~hppa ~ppc ~sparc x86"
+IUSE="X"
+
+DEPEND="X? ( x11-apps/mkfontdir )
+	sys-libs/ncurses"
+
+src_unpack() {
+	unpack ${A}
+	# patch Makefile.am to make sure the fonts installations don't violate the
+	# sandbox.
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+	eautoreconf
+}
+
+src_install() {
+	dodir /usr/share/consolefonts || die 'dodir failed'
+	dodir /usr/lib/kbd/consolefonts || die 'dodir failed'
+	use X && dodir /usr/lib/X11/fonts/misc || die 'dodir failed'
+	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'
+		fi
+	fi
+}
diff --git a/app-misc/cmatrix/files/digest-cmatrix-1.2a-r1 b/app-misc/cmatrix/files/digest-cmatrix-1.2a-r1
new file mode 100644
index 000000000000..27f22c926bf2
--- /dev/null
+++ b/app-misc/cmatrix/files/digest-cmatrix-1.2a-r1
@@ -0,0 +1,3 @@
+MD5 ebfb5733104a258173a9ccf2669968a1 cmatrix-1.2a.tar.gz 74376
+RMD160 8a401753ca0e88c0d24b6a8c3f23b725368c13bb cmatrix-1.2a.tar.gz 74376
+SHA256 1fa6e6caea254b6fe70a492efddc1b40ad7ccb950a5adfd80df75b640577064c cmatrix-1.2a.tar.gz 74376