Disable consolefont on hppa by default for bug #228889, thanks to Jeroen

Roovers.

Package-Manager: portage-2.2.0_alpha29/cvs/Linux i686

3 files changed, 31 insertions, 16 deletions

diff --git a/sys-apps/openrc/ChangeLog b/sys-apps/openrc/ChangeLog
index 828bf77ff942..4ebbcf217398 100644
--- a/sys-apps/openrc/ChangeLog
+++ b/sys-apps/openrc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/openrc
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.138 2011/04/13 17:16:14 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.139 2011/04/15 03:27:29 williamh Exp $
+
+  15 Apr 2011; William Hubbs <williamh@gentoo.org> openrc-9999.ebuild:
+  Disable consolefont on hppa by default for bug #222889, thanks to
+  Jeroen Roovers .
 
   12 Apr 2011; William Hubbs <williamh@gentoo.org> -openrc-0.6.3.ebuild,
   -openrc-0.6.5.ebuild, -openrc-0.6.6.ebuild, -openrc-0.6.7.ebuild,
@@ -158,7 +162,7 @@
   21 Dec 2009; Mike Frysinger <vapier@gentoo.org> openrc-0.5.3.ebuild,
   openrc-9999.ebuild, +files/openrc-9999-pause.patch:
   Restore "pause" functionality to teach people to convert #218859 by Martin
-  Mokrejš.
+  Mokrejš.
 
   21 Dec 2009; Mike Frysinger <vapier@gentoo.org>
   files/openrc-9999-msg-style.patch:
@@ -167,7 +171,7 @@
   07 Dec 2009; Mike Frysinger <vapier@gentoo.org> openrc-0.5.3.ebuild,
   openrc-9999.ebuild:
   Migrate hostname by default to avoid default thrashing on conf.d/hostname
-  #295406 by Martin Mokrejš. Also delay automatic dep tree update till
+  #295406 by Martin Mokrejš. Also delay automatic dep tree update till
   after we are done screwing with /etc.
 
   06 Dec 2009; William Hubbs <williamh@gentoo.org> -openrc-0.5.2-r2.ebuild,
@@ -281,7 +285,7 @@
 
   15 Oct 2009; Mike Frysinger <vapier@gentoo.org> openrc-0.5.1-r1.ebuild,
   openrc-9999.ebuild:
-  Relocate docs to normal Gentoo location #241342 by Diego E. Pettenò.
+  Relocate docs to normal Gentoo location #241342 by Diego E. Pettenò.
 
 *openrc-0.5.1-r1 (15 Oct 2009)
 
@@ -347,14 +351,14 @@
   files/9999/0003-KV.patch:
   Update patches against latest svn #267540 by Vivien Moreau.
 
-  18 Apr 2009; Benedikt Böhm <hollow@gentoo.org>
+  18 Apr 2009; Benedikt Böhm <hollow@gentoo.org>
   files/0.4.3/0002-support-custom-status.patch:
   backport r1523 and r1524 to fix compile on FreeBSD and still provide the
   system status function in custom hooks
 
 *openrc-0.4.3-r2 (18 Apr 2009)
 
-  18 Apr 2009; Benedikt Böhm <hollow@gentoo.org>
+  18 Apr 2009; Benedikt Böhm <hollow@gentoo.org>
   +files/0.4.3/0002-support-custom-status.patch,
   -files/openrc-0.4.3-fix-is_older_than.patch,
   +files/0.4.3/0001-fix-is_older_than.patch, openrc-0.4.3-r1.ebuild,
@@ -410,7 +414,7 @@
   03 Jan 2009; Jeroen Roovers <jer@gentoo.org> metadata.xml:
   Change comment into useable tags.
 
-  01 Jan 2009; Benedikt Böhm <hollow@gentoo.org>
+  01 Jan 2009; Benedikt Böhm <hollow@gentoo.org>
   +files/0.4.0/0005-init-script-novserver.patch:
   fix dmesg and sysfs init script inside vservers, bug #253105
 
@@ -604,7 +608,7 @@
   +openrc-0.2.1-r1.ebuild:
   fix bug #216091. crash when stringlist was non-existant
 
-  03 Apr 2008; Raúl Porcel <armin76@gentoo.org> openrc-0.2.1.ebuild:
+  03 Apr 2008; Raúl Porcel <armin76@gentoo.org> openrc-0.2.1.ebuild:
   Add ~sparc wrt #214957
 
   02 Apr 2008; Doug Goldstein <cardoe@gentoo.org> openrc-0.2.1.ebuild,
@@ -665,7 +669,7 @@
   28 Mar 2008; Alexis Ballier <aballier@gentoo.org> openrc-0.2-r1.ebuild:
   keyword ~x86-fbsd
 
-  28 Mar 2008; Raúl Porcel <armin76@gentoo.org> openrc-0.2-r1.ebuild:
+  28 Mar 2008; Raúl Porcel <armin76@gentoo.org> openrc-0.2-r1.ebuild:
   Add ~ia64 wrt #214957
 
   27 Mar 2008; Doug Goldstein <cardoe@gentoo.org> openrc-0.2-r1.ebuild:
diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest
index 350ffe09d8ac..8ee69442e1cf 100644
--- a/sys-apps/openrc/Manifest
+++ b/sys-apps/openrc/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX openrc-9999-msg-style.patch 2775 RMD160 af958b2a8ed5ad29f25b53bad9a426cf7e173405 SHA1 251b8d0a52bb6e98d80a5213afc4d067583441fc SHA256 637fc2d13e0940b55b7d4613ebf8ebabdee87a802a2690191c01fd5ee7cb3581
 AUX openrc-9999-pause.patch 825 RMD160 737615919d779894e990072a0ff026aeb4fc0a95 SHA1 c9c469d0bfb685a83d8a736467434b22eaf702cd SHA256 ffa34418921d30c589ad762a5d6d7640c37e7279ca19af469912cb9f118cc75d
@@ -10,13 +10,13 @@ DIST openrc-0.8.1.tar.bz2 161637 RMD160 2bd5881dca952c8bdd421fb3e973d8ce1b38d1ac
 EBUILD openrc-0.6.8.ebuild 14186 RMD160 7eee5fa69add6020e41a1e21145d25eba307b94c SHA1 1768693f6a4413aa329f04002b9cddfcd453a095 SHA256 3b68e325cf9d1d79f453c822a9cc0ed7c726866b0a9f7714ef06a6d397f61475
 EBUILD openrc-0.7.0.ebuild 14237 RMD160 542e5cd3ae6d064c04f82930fe1f39e34064f8fe SHA1 4212faba9a7741a69a96881d4eef40e4b782112a SHA256 28f69ab8df400048363b27e49c667ee12d6dea80164ea523eba889d28ad64540
 EBUILD openrc-0.8.1.ebuild 13777 RMD160 a719de350e0ddde0d70454c339f506e74e927f3e SHA1 2a8e027ed0b9b61e07ea22e238e92a5fdb06d2b1 SHA256 b00dd24458a656b40e42de9580f7d43abc401c682ca3d75171366308d130c2b9
-EBUILD openrc-9999.ebuild 13777 RMD160 8c1b1afaa2d6d3d8dad19513655daf40052d868e SHA1 190e017ea1d7f3d92bfa0cca656436e0d752c1f2 SHA256 e010d1199d0961a00ba9030e9c8784eb106eb389d45f316af176bb22d932bf6f
-MISC ChangeLog 26720 RMD160 43b659a24dcdd2559ae096616249f01961e68b65 SHA1 9213ca50fdc7bdd8a07f5243f5bbc8abe48cae72 SHA256 2b4c681321bc3e31b700da506f18f1fec280b572b7e736fe35aeb9e3203cdbef
+EBUILD openrc-9999.ebuild 14101 RMD160 5da5ba0126a3c54f11964fdb17191baa4b638d01 SHA1 b7e33523f6c96dc48fd598b5ac9c736b7831e6fe SHA256 ab504186c7b31a8c08b4e04723f3d7577ca4ea2ec82b0e5efb89aac2ca700570
+MISC ChangeLog 26899 RMD160 fe0593b6e8e21b421deedadac730cee342a10614 SHA1 6d87c23eb4ca14e842c6c3b8e27adab9e562758a SHA256 2a434f0a94bc40d571f3b0b40a7d816d40808119e9bc623c742bcca612ecbf80
 MISC metadata.xml 159 RMD160 b92bb52b0f2ee2c0ee08ac8b32f98c3521f9d480 SHA1 aac3cb897981c4918f5f2244d192b5bcc6727d36 SHA256 ca2e1a5ac106397eca5111140a1b07830e4d5dfacbeadba359fe17896c33a6c8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREIAAYFAk2l2mMACgkQV3J2n04Eauwc8QCgzKLYgiJjJpvYbxNtDWvR/mbn
-RGgAninQ8PsP16TzqQ/a9oHFJNEA7EQE
-=uE29
+iEYEARECAAYFAk2nuzUACgkQblQW9DDEZThgIACeL1MI1KXSR7E4uDjHrA7JGnWx
+KAkAn0LhqOqnSO8kILf85lJdozmy9EdB
+=WDsA
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/openrc/openrc-9999.ebuild b/sys-apps/openrc/openrc-9999.ebuild
index a5e13152bdfa..77599d6bf1a3 100644
--- a/sys-apps/openrc/openrc-9999.ebuild
+++ b/sys-apps/openrc/openrc-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.79 2011/03/24 18:49:34 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.80 2011/04/15 03:27:29 williamh Exp $
 
 EAPI="1"
 
@@ -133,6 +133,11 @@ src_install() {
 	# Cater to the norm
 	set_config_yes_no /etc/conf.d/keymaps windowkeys '(' use x86 '||' use amd64 ')'
 
+	# On HPPA, do not run consolefont by default (bug #222889)
+	if use hppa; then
+		rm -f "${D}"/usr/share/openrc/runlevels/boot/consolefont
+	fi
+
 	# Support for logfile rotation
 	insinto /etc/logrotate.d
 	newins "${FILESDIR}"/openrc.logrotate openrc
@@ -408,6 +413,12 @@ pkg_postinst() {
 		ewarn "your files to /etc/conf.d/modules and delete the directory."
 	fi
 
+	if use hppa; then
+		elog "Setting the console font does not work on all HPPA consoles."
+		elog "You can still enable it by running:"
+		elog "# rc-update add consolefont boot"
+	fi
+
 	# update the dependency tree after touching all files #224171
 	[[ "${ROOT}" = "/" ]] && "${ROOT}/${LIBDIR}"/rc/bin/rc-depend -u