Default to us keymap for sparc (2.6)

Package-Manager: portage-2.1.2-r9

diff --git a/sys-apps/baselayout/ChangeLog b/sys-apps/baselayout/ChangeLog
index ea8d69399c5d813ea9d608fb4661ec2a0131c89a..9de8ed0b598f960d827249c51ce38aa65c0a767a 100644 (file)
--- a/sys-apps/baselayout/ChangeLog
+++ b/sys-apps/baselayout/ChangeLog
@@ -1,10 +1,14 @@
 # ChangeLog for sys-apps/baselayout
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.405 2007/02/14 03:38:53 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.406 2007/02/15 18:53:29 gustavoz Exp $
 
 # See the rc-scripts ChangeLog in subversion for release info:
 # http://sources.gentoo.org/viewcvs.py/*checkout*/baselayout/trunk/ChangeLog
 
+  15 Feb 2007; Gustavo Zacarias <gustavoz@gentoo.org>
+  baselayout-1.12.9.ebuild, baselayout-1.13.0_alpha12.ebuild:
+  Default to us keymap for sparc (2.6)
+
   14 Feb 2007; Jeroen Roovers <jer@gentoo.org> baselayout-1.12.9.ebuild:
   Stable for HPPA (bug #158637).
 

diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest
index c06c8cefc992cf995f0b68dd4c50ef9b9d9976f0..cd662f6cca3f5e4d43f052c9d14c1fc5119013a6 100644 (file)
--- a/sys-apps/baselayout/Manifest
+++ b/sys-apps/baselayout/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX baselayout-1.11.14-man.patch 768 RMD160 b1743f52d71b6ff2bd0d8cb8106112d8fad9d5b7 SHA1 f61b8f985a27dc9f2dd834001602b008030e79ce SHA256 7c12d6ee90b14b3152c2256df5983d3e6d102ca53b5da3ca6505b8925a86a80a
 MD5 dff93a6f0914f6969d21482d2f36e75e files/baselayout-1.11.14-man.patch 768
 RMD160 b1743f52d71b6ff2bd0d8cb8106112d8fad9d5b7 files/baselayout-1.11.14-man.patch 768
@@ -119,10 +122,10 @@ EBUILD baselayout-1.12.8-r5.ebuild 18806 RMD160 f92c6b723d8cedd8206e5a4f2492ab7f
 MD5 4c097460b439c778e7b411d1de5ccbe5 baselayout-1.12.8-r5.ebuild 18806
 RMD160 f92c6b723d8cedd8206e5a4f2492ab7f6f74f215 baselayout-1.12.8-r5.ebuild 18806
 SHA256 e8ac81fd781d6ad9ee338c70735cb05fbfe7d0ed5804d74d4d42a3100f4ce427 baselayout-1.12.8-r5.ebuild 18806
-EBUILD baselayout-1.12.9.ebuild 18620 RMD160 9d05039df427837e26b0e95463959d3998a34113 SHA1 35185ffcb0b8a05dc9fd4189ea235182a503deaf SHA256 334a84c5f2eecd770c2ff4a4dcc66767e44e0d6cfda6c98aa9f616797329f790
-MD5 a527617e06555c4b379c5d41a2a1a34d baselayout-1.12.9.ebuild 18620
-RMD160 9d05039df427837e26b0e95463959d3998a34113 baselayout-1.12.9.ebuild 18620
-SHA256 334a84c5f2eecd770c2ff4a4dcc66767e44e0d6cfda6c98aa9f616797329f790 baselayout-1.12.9.ebuild 18620
+EBUILD baselayout-1.12.9.ebuild 18559 RMD160 e109c013b6c4985c84606c7345a72e7a24b7b203 SHA1 0aea85f0c83d62980e343b40bfb591c8bc9f3f54 SHA256 5cbc83fc143a0d37f0d0215c9535084f58094485f1cc434db497b5b01fe752b4
+MD5 a102d313b1159ea202b091d12288cbed baselayout-1.12.9.ebuild 18559
+RMD160 e109c013b6c4985c84606c7345a72e7a24b7b203 baselayout-1.12.9.ebuild 18559
+SHA256 5cbc83fc143a0d37f0d0215c9535084f58094485f1cc434db497b5b01fe752b4 baselayout-1.12.9.ebuild 18559
 EBUILD baselayout-1.13.0_alpha10-r2.ebuild 10934 RMD160 4f71d822f993e21a4250ed99a85af4b6091fe1bb SHA1 0837a883620447a06a936d2f1d84e1905f765bb4 SHA256 1391cbac4f1baa7ba44c027ba935596b7f7c5e7b7abbf3d3f592764e71dcd659
 MD5 8306835dd009aa74a41042636a701caf baselayout-1.13.0_alpha10-r2.ebuild 10934
 RMD160 4f71d822f993e21a4250ed99a85af4b6091fe1bb baselayout-1.13.0_alpha10-r2.ebuild 10934
@@ -135,14 +138,14 @@ EBUILD baselayout-1.13.0_alpha11-r2.ebuild 10610 RMD160 868bc408d08fe51a4f5c13ff
 MD5 414a9899713dbe2714b70d77eeb571d3 baselayout-1.13.0_alpha11-r2.ebuild 10610
 RMD160 868bc408d08fe51a4f5c13ffea2b48171ef035c5 baselayout-1.13.0_alpha11-r2.ebuild 10610
 SHA256 30d6bb6a0bb89a7f08f249390b88c7179c73fc08a9935895f3bd4dcc38c4188f baselayout-1.13.0_alpha11-r2.ebuild 10610
-EBUILD baselayout-1.13.0_alpha12.ebuild 9952 RMD160 43d92d6959b78e3abae68c2ceb35a9bfb9b754cc SHA1 ebbd61d5c619a1e707d42336aa90b6f443d85232 SHA256 e01c1c7c63b5b70614055df93fb259f272f1750cb6478f27657ef10c279a1d9a
-MD5 3f21ea2af66b3483803f51df3cc48df8 baselayout-1.13.0_alpha12.ebuild 9952
-RMD160 43d92d6959b78e3abae68c2ceb35a9bfb9b754cc baselayout-1.13.0_alpha12.ebuild 9952
-SHA256 e01c1c7c63b5b70614055df93fb259f272f1750cb6478f27657ef10c279a1d9a baselayout-1.13.0_alpha12.ebuild 9952
-MISC ChangeLog 90700 RMD160 1920f6cd63c064da6571420acc9b6099714ee85e SHA1 b377bcced0a0a060f60ca21d76233e20132badc6 SHA256 b9d7f2ed5ad58b23f9437258a07ed3800d515900fa92470c032b34c0043c32f7
-MD5 a734c13ab6074ec8ad6f1c1e1fac4aac ChangeLog 90700
-RMD160 1920f6cd63c064da6571420acc9b6099714ee85e ChangeLog 90700
-SHA256 b9d7f2ed5ad58b23f9437258a07ed3800d515900fa92470c032b34c0043c32f7 ChangeLog 90700
+EBUILD baselayout-1.13.0_alpha12.ebuild 9887 RMD160 a653175fac3fd824644f84745a6de783425efb6f SHA1 ffcf262e70d6ec63ed2b1219fa62aa40772961f5 SHA256 04e5537b204ead309d118a96b25c857333074212a50d7be3a5b18e1d708b5e78
+MD5 1263156afae51d52e5ebe8b64319cb9b baselayout-1.13.0_alpha12.ebuild 9887
+RMD160 a653175fac3fd824644f84745a6de783425efb6f baselayout-1.13.0_alpha12.ebuild 9887
+SHA256 04e5537b204ead309d118a96b25c857333074212a50d7be3a5b18e1d708b5e78 baselayout-1.13.0_alpha12.ebuild 9887
+MISC ChangeLog 90861 RMD160 2d95703e61fee5ab10aaf1ebc312814e5efdb814 SHA1 adc30624ba77330b0cee379ee4d6a55b982fdab5 SHA256 4f73804df8d84faf352f42c6bcfde03b88557f8cbc031cbf91419c7d40fd767d
+MD5 ed5f52d4f7dfda516f757274dfbc24a5 ChangeLog 90861
+RMD160 2d95703e61fee5ab10aaf1ebc312814e5efdb814 ChangeLog 90861
+SHA256 4f73804df8d84faf352f42c6bcfde03b88557f8cbc031cbf91419c7d40fd767d ChangeLog 90861
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -183,3 +186,10 @@ SHA256 43fd9d1cfeacfd464916cb9011db751d238122f899172a0cc69a56bc8ccabca8 files/di
 MD5 73d1269ba801eb1a113e55b5679be37f files/digest-baselayout-1.13.0_alpha12 280
 RMD160 82ba1b5b86ef5f414bf202d8cfd1275e7e21bf97 files/digest-baselayout-1.13.0_alpha12 280
 SHA256 4e5b7e0884373590a6b434976433e8d06a3fb4d52282f416d5a25dc2d265bd8a files/digest-baselayout-1.13.0_alpha12 280
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.6-ecc01.6 (GNU/Linux)
+
+iD8DBQFF1Kw0KRy60XGEcJIRAqaBAJwIJ7mg4cMs7G41jF2MQNkPBGUosQCgpz+h
+tW5Sbc0FUsZtFOMnbYPqHK4=
+=3CkH
+-----END PGP SIGNATURE-----

diff --git a/sys-apps/baselayout/baselayout-1.12.9.ebuild b/sys-apps/baselayout/baselayout-1.12.9.ebuild
index 281d914582ee82e5dcccd93e4c134f8534ec3630..7ce64d1cab9547d9552492a2fea3a71c7db59c49 100644 (file)
--- a/sys-apps/baselayout/baselayout-1.12.9.ebuild
+++ b/sys-apps/baselayout/baselayout-1.12.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.12.9.ebuild,v 1.10 2007/02/14 03:38:53 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.12.9.ebuild,v 1.11 2007/02/15 18:53:29 gustavoz Exp $
 
 inherit flag-o-matic eutils toolchain-funcs multilib
 
@@ -47,7 +47,6 @@ src_unpack() {
 
        case $(tc-arch) in
        sparc)
-               sed -i -e '/^KEYMAP=/s:us:sunkeymap:' etc/conf.d/keymaps || die
                # Disable interactive boot on sparc due to stty calls, #104067
                sed -i -e '/^RC_INTERACTIVE=/s:yes:no:' etc/conf.d/rc || die
                ;;

diff --git a/sys-apps/baselayout/baselayout-1.13.0_alpha12.ebuild b/sys-apps/baselayout/baselayout-1.13.0_alpha12.ebuild
index 9c23d67eaae6a986b598c5b476480f7d13e682c3..aa10fd7665b0ae757853651a6d30e4352fe3be9e 100644 (file)
--- a/sys-apps/baselayout/baselayout-1.13.0_alpha12.ebuild
+++ b/sys-apps/baselayout/baselayout-1.13.0_alpha12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.13.0_alpha12.ebuild,v 1.2 2007/01/20 15:16:15 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.13.0_alpha12.ebuild,v 1.3 2007/02/15 18:53:29 gustavoz Exp $
 
 inherit flag-o-matic eutils toolchain-funcs multilib
 
@@ -50,7 +50,6 @@ src_unpack() {
        # SPARC does not like stty, so we disable RC_INTERACTIVE which requires it
        # see Gentoo bug #104067.
        if use sparc ; then \
-               sed -i -e  '/^KEYMAP=/s:us:sunkeymap:' etc/conf.d/keymaps || die
                sed -i -e '/^RC_INTERACTIVE=/s:yes:no:' etc/conf.d/rc || die
        fi
 }