Fixing the serial console for EFIKA on older revisions, and moved IBM checks to after...

Package-Manager: portage-2.1.2.2

diff --git a/sys-apps/sysvinit/ChangeLog b/sys-apps/sysvinit/ChangeLog
index c5d11f44d98dae4e4ab6779452fc5f1f72a3016a..524f7e59a977c154fab930042865e53154686f60 100644 (file)
--- a/sys-apps/sysvinit/ChangeLog
+++ b/sys-apps/sysvinit/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/sysvinit
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sysvinit/ChangeLog,v 1.48 2007/03/27 23:11:16 spb Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sysvinit/ChangeLog,v 1.49 2007/04/05 14:16:55 wolf31o2 Exp $
+
+  05 Apr 2007; Chris Gianelloni <wolf31o2@gentoo.org>
+  sysvinit-2.86-r5.ebuild, sysvinit-2.86-r6.ebuild, sysvinit-2.86-r7.ebuild,
+  sysvinit-2.86-r8.ebuild:
+  Fixing the serial console for EFIKA on older revisions, and moved IBM checks
+  to after PPC checks so they are not overridden for ppc64 32ul.
 
   27 Mar 2007; Stephen Bennett <spb@gentoo.org> sysvinit-2.86-r7.ebuild:
   mips stable

diff --git a/sys-apps/sysvinit/Manifest b/sys-apps/sysvinit/Manifest
index 6ee7f06921323d80f562a27c9b7b12b2d76fd136..dfafb7be349843fcd76986f2829da20565d5f26a 100644 (file)
--- a/sys-apps/sysvinit/Manifest
+++ b/sys-apps/sysvinit/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 2.86-gentoo.patch 641 RMD160 9e3f9ace9e58c3352f536649491a8a5b3f89e512 SHA1 d5bd112a171285768f5618e530cab5d22f7b6f55 SHA256 6edd083b1b09b75f76b75fc299e2ddab7344a0df8f212e3cd86f27c44caa8c01
 MD5 5f94105e0b503a39fda5fb65d885e16c files/2.86-gentoo.patch 641
 RMD160 9e3f9ace9e58c3352f536649491a8a5b3f89e512 files/2.86-gentoo.patch 641
@@ -60,26 +63,26 @@ RMD160 9ba2959e6375bee10e00ba9be9cd22d5e0103007 files/sysvinit-2.86-utmp-64bit.p
 SHA256 2126f4c0e1512b133da8d629691b5dc52c730e188b5790cb4e3c681e3912e03e files/sysvinit-2.86-utmp-64bit.patch 1112
 DIST sysvinit-2.86-kexec.patch 4139 RMD160 5f8e9ccd3a39701cf47a1a541c78a4be971d46fc SHA1 5dc952d6b1585c926a67f11eeee835e56aeea5b0 SHA256 936245ef3060939bec3099efc006009336b3672422c1de41983b277ab5ddac47
 DIST sysvinit-2.86.tar.gz 99009 RMD160 46587ab51390b5c8cd3179a3690f86efdbe9b4b9 SHA1 3e78df609a2ff0fea6304cb662a7f10298d03667 SHA256 035f98fae17d9cff002993c564ccc83dc4ed136127172caeff872b6abdb679d8
-EBUILD sysvinit-2.86-r5.ebuild 3208 RMD160 71a5b2320ae50ee6333971e18c430142e31cdc3b SHA1 2a996856244e274eead8708808e7e7ffd42b9164 SHA256 7c68deb26d678164efe1096a5b2f63313a24640269b788d511f28e57acbb024d
-MD5 c1ca2e8b412e8697d3783d7debbe75d5 sysvinit-2.86-r5.ebuild 3208
-RMD160 71a5b2320ae50ee6333971e18c430142e31cdc3b sysvinit-2.86-r5.ebuild 3208
-SHA256 7c68deb26d678164efe1096a5b2f63313a24640269b788d511f28e57acbb024d sysvinit-2.86-r5.ebuild 3208
-EBUILD sysvinit-2.86-r6.ebuild 3270 RMD160 edf368a7146c7210f1b00bca97c966d9fb4eb059 SHA1 1838b5748befbe51401162255e78c2dc459c6879 SHA256 5594fb850aa68fa52d8072073b108b5d44a50cf51550ed037332ae79eddb234a
-MD5 c6a15f7c7a59f4c16978d8aa7f812785 sysvinit-2.86-r6.ebuild 3270
-RMD160 edf368a7146c7210f1b00bca97c966d9fb4eb059 sysvinit-2.86-r6.ebuild 3270
-SHA256 5594fb850aa68fa52d8072073b108b5d44a50cf51550ed037332ae79eddb234a sysvinit-2.86-r6.ebuild 3270
-EBUILD sysvinit-2.86-r7.ebuild 3309 RMD160 b08b6b6ed8d6b3d116a7e2587f0e12881dab359d SHA1 cecb5df420874f985947366fdaa029494b57ac2e SHA256 e9d924300949614a65326e7b325f556356e3cced4acd04000583a431de30ca8f
-MD5 cd541838fdce30da25057022458fe639 sysvinit-2.86-r7.ebuild 3309
-RMD160 b08b6b6ed8d6b3d116a7e2587f0e12881dab359d sysvinit-2.86-r7.ebuild 3309
-SHA256 e9d924300949614a65326e7b325f556356e3cced4acd04000583a431de30ca8f sysvinit-2.86-r7.ebuild 3309
-EBUILD sysvinit-2.86-r8.ebuild 3314 RMD160 d7dbbdf555df86f8b785e9ac154585f937792046 SHA1 6f1635a9c88b58f4de174a06c90a16a304edd9c5 SHA256 32cc60af3d75cc29b43732604ddaed6b5daf65785e676194ea14f258d88b8f65
-MD5 6204da976f1716bbdbd9cc75788b6beb sysvinit-2.86-r8.ebuild 3314
-RMD160 d7dbbdf555df86f8b785e9ac154585f937792046 sysvinit-2.86-r8.ebuild 3314
-SHA256 32cc60af3d75cc29b43732604ddaed6b5daf65785e676194ea14f258d88b8f65 sysvinit-2.86-r8.ebuild 3314
-MISC ChangeLog 6999 RMD160 c1d7181449e32549cd9cd04f3581dc993a1f6ec1 SHA1 ef98afd4c88c93c00cf99cc155e1313557f86681 SHA256 e0a490de70bc1d9af938d729455def847a7d0ded8108c599a56cff0cab60ef34
-MD5 e0ce5bdad2eff1cb1e0d4e0834ef8053 ChangeLog 6999
-RMD160 c1d7181449e32549cd9cd04f3581dc993a1f6ec1 ChangeLog 6999
-SHA256 e0a490de70bc1d9af938d729455def847a7d0ded8108c599a56cff0cab60ef34 ChangeLog 6999
+EBUILD sysvinit-2.86-r5.ebuild 3220 RMD160 c9796fcdce8a48fcfdd2d3940f6a0a3f146a8dc7 SHA1 67d9938b4550ca37c1279ebe7a7b7e9339fcb41e SHA256 fbbee1f68bf83849c64957ca47074dc2867ca91914e3afe62e0eef4ae0b7d90f
+MD5 ba4af4acc13ac37e250f1ccfac094692 sysvinit-2.86-r5.ebuild 3220
+RMD160 c9796fcdce8a48fcfdd2d3940f6a0a3f146a8dc7 sysvinit-2.86-r5.ebuild 3220
+SHA256 fbbee1f68bf83849c64957ca47074dc2867ca91914e3afe62e0eef4ae0b7d90f sysvinit-2.86-r5.ebuild 3220
+EBUILD sysvinit-2.86-r6.ebuild 3282 RMD160 ce428dde41e2de1669fb29b7b2b9bb4e622c6d83 SHA1 d5aed63ec8d231f21ae0af71156635ce667d1227 SHA256 84f3a2c95745f25aede804c8c679ef53893e45a40427a89bf7df32cc3b8b5ed0
+MD5 b400edeb65adebb9fa214f6d6e999674 sysvinit-2.86-r6.ebuild 3282
+RMD160 ce428dde41e2de1669fb29b7b2b9bb4e622c6d83 sysvinit-2.86-r6.ebuild 3282
+SHA256 84f3a2c95745f25aede804c8c679ef53893e45a40427a89bf7df32cc3b8b5ed0 sysvinit-2.86-r6.ebuild 3282
+EBUILD sysvinit-2.86-r7.ebuild 3325 RMD160 4c5ae23559fea3de964f793385204507bb06d6ad SHA1 6031eb67267a835129e9ac2750948ac6442d7264 SHA256 7875bbe606e798c68317ba66265ed3ccc837774bb12f52ccaa918920743e03bb
+MD5 05192dc36824bcbe3cc029f3b849b990 sysvinit-2.86-r7.ebuild 3325
+RMD160 4c5ae23559fea3de964f793385204507bb06d6ad sysvinit-2.86-r7.ebuild 3325
+SHA256 7875bbe606e798c68317ba66265ed3ccc837774bb12f52ccaa918920743e03bb sysvinit-2.86-r7.ebuild 3325
+EBUILD sysvinit-2.86-r8.ebuild 3325 RMD160 35bd2fd3060603193a08251574d4f9c72f70365b SHA1 bd7b17db40032e9932086b89eccad895dbc30df3 SHA256 64b3bbac25a358b1638094ab37111b009c5db7fa22a16d99e583cb6544275cfb
+MD5 e68187e16a24838ae56cf6f4c6578495 sysvinit-2.86-r8.ebuild 3325
+RMD160 35bd2fd3060603193a08251574d4f9c72f70365b sysvinit-2.86-r8.ebuild 3325
+SHA256 64b3bbac25a358b1638094ab37111b009c5db7fa22a16d99e583cb6544275cfb sysvinit-2.86-r8.ebuild 3325
+MISC ChangeLog 7307 RMD160 f7c215e9c2e86a9006fdd75a28f24c2b06fe21d0 SHA1 ec01d86ac4cb71615fe45cc43ace68f88334cc6a SHA256 9e9ed2e3e2645c89aae14bd74f5b85a87d7581ee975386708a0f2f5c3ec37fa5
+MD5 c0c71b4686d0d0671cea197c70e008af ChangeLog 7307
+RMD160 f7c215e9c2e86a9006fdd75a28f24c2b06fe21d0 ChangeLog 7307
+SHA256 9e9ed2e3e2645c89aae14bd74f5b85a87d7581ee975386708a0f2f5c3ec37fa5 ChangeLog 7307
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -96,3 +99,10 @@ SHA256 b2bb79f2cb614dae61f284fc74c63b65f0434e0f8e66212ccb698577d671f62d files/di
 MD5 a0a89857120e374f52bb610074e602f7 files/digest-sysvinit-2.86-r8 488
 RMD160 586ea36bc8586bf1f30e9a51715e6ab520a798ac files/digest-sysvinit-2.86-r8 488
 SHA256 b2bb79f2cb614dae61f284fc74c63b65f0434e0f8e66212ccb698577d671f62d files/digest-sysvinit-2.86-r8 488
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.3 (GNU/Linux)
+
+iD8DBQFGFQTekT4lNIS36YERAurAAJ4+JNYt/+SzQX2lq3xu5x/eAp6c5gCeP8gf
+UMHYB67bdz1brdZwkavoqyw=
+=JD5m
+-----END PGP SIGNATURE-----

diff --git a/sys-apps/sysvinit/sysvinit-2.86-r5.ebuild b/sys-apps/sysvinit/sysvinit-2.86-r5.ebuild
index 2930ab524199fbb679540808f1c6c9e528dc8899..b1beeb5e865c67b1951f9648ff4d3a07f90f1275 100644 (file)
--- a/sys-apps/sysvinit/sysvinit-2.86-r5.ebuild
+++ b/sys-apps/sysvinit/sysvinit-2.86-r5.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/sysvinit/sysvinit-2.86-r5.ebuild,v 1.11 2007/02/26 04:34:36 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sysvinit/sysvinit-2.86-r5.ebuild,v 1.12 2007/04/05 14:16:55 wolf31o2 Exp $
 
 inherit eutils toolchain-funcs flag-o-matic
 
@@ -38,13 +38,13 @@ src_unpack() {
        cd "${WORKDIR}"
        cp "${FILESDIR}"/inittab . || die "cp inittab"
        local insert=""
+       use ppc && insert="#psc0:12345:respawn:/sbin/agetty 115200 ttyPSC0 linux\n"
+       use arm && insert='#f0:12345:respawn:/sbin/agetty 9600 ttyFB0 vt100'
+       use hppa && insert='b0:12345:respawn:/sbin/agetty 9600 ttyB0 vt100'
        if use ibm ; then
-               insert="#hvc0:2345:respawn:/sbin/agetty -L 9600 hvc0"$'\n'
+               insert="${insert}#hvc0:2345:respawn:/sbin/agetty -L 9600 hvc0"$'\n'
                insert="${insert}#hvsi:2345:respawn:/sbin/agetty -L 19200 hvsi0"
        fi
-       use ppc && insert="psc0:12345:respawn:/sbin/agetty 115200 ttyPSC0 linux"
-       use arm && insert='#f0:12345:respawn:/sbin/agetty 9600 ttyFB0 vt100'
-       use hppa && insert='b0:12345:respawn:/sbin/agetty 9600 ttyB0 vt100'
        (use arm || use mips || use sh || use sparc) && sed -i '/ttyS0/s:#::' inittab
        [[ -n ${insert} ]] && echo "# Architecture specific features"$'\n'"${insert}" >> inittab
 }

diff --git a/sys-apps/sysvinit/sysvinit-2.86-r6.ebuild b/sys-apps/sysvinit/sysvinit-2.86-r6.ebuild
index 071fedba96eb9a6ed53615c304aaf42c180f59cb..5a2a8132291b65eeb18e23214ef1021305f862ca 100644 (file)
--- a/sys-apps/sysvinit/sysvinit-2.86-r6.ebuild
+++ b/sys-apps/sysvinit/sysvinit-2.86-r6.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/sysvinit/sysvinit-2.86-r6.ebuild,v 1.6 2007/02/26 04:34:36 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sysvinit/sysvinit-2.86-r6.ebuild,v 1.7 2007/04/05 14:16:55 wolf31o2 Exp $
 
 inherit eutils toolchain-funcs flag-o-matic
 
@@ -38,13 +38,13 @@ src_unpack() {
        cd "${WORKDIR}"
        cp "${FILESDIR}"/inittab . || die "cp inittab"
        local insert=""
+       use ppc && insert="#psc0:12345:respawn:/sbin/agetty 115200 ttyPSC0 linux\n"
+       use arm && insert='#f0:12345:respawn:/sbin/agetty 9600 ttyFB0 vt100'
+       use hppa && insert='b0:12345:respawn:/sbin/agetty 9600 ttyB0 vt100'
        if use ibm ; then
-               insert="#hvc0:2345:respawn:/sbin/agetty -L 9600 hvc0"$'\n'
+               insert="${insert}#hvc0:2345:respawn:/sbin/agetty -L 9600 hvc0"$'\n'
                insert="${insert}#hvsi:2345:respawn:/sbin/agetty -L 19200 hvsi0"
        fi
-       use ppc && insert="psc0:12345:respawn:/sbin/agetty 115200 ttyPSC0 linux"
-       use arm && insert='#f0:12345:respawn:/sbin/agetty 9600 ttyFB0 vt100'
-       use hppa && insert='b0:12345:respawn:/sbin/agetty 9600 ttyB0 vt100'
        (use arm || use mips || use sh || use sparc) && sed -i '/ttyS0/s:#::' inittab
        [[ -n ${insert} ]] && echo "# Architecture specific features"$'\n'"${insert}" >> inittab
 }

diff --git a/sys-apps/sysvinit/sysvinit-2.86-r7.ebuild b/sys-apps/sysvinit/sysvinit-2.86-r7.ebuild
index 3b6eee9b7822ad922f889a452148a90aa75bd54d..777543fdfabc5932ccded1d10ae69d67533f4ac0 100644 (file)
--- a/sys-apps/sysvinit/sysvinit-2.86-r7.ebuild
+++ b/sys-apps/sysvinit/sysvinit-2.86-r7.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/sysvinit/sysvinit-2.86-r7.ebuild,v 1.10 2007/03/27 23:11:16 spb Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sysvinit/sysvinit-2.86-r7.ebuild,v 1.11 2007/04/05 14:16:55 wolf31o2 Exp $
 
 inherit eutils toolchain-funcs flag-o-matic
 
@@ -39,13 +39,13 @@ src_unpack() {
        cd "${WORKDIR}"
        cp "${FILESDIR}"/inittab . || die "cp inittab"
        local insert=""
+       use ppc && insert="#psc0:12345:respawn:/sbin/agetty 115200 ttyPSC0 linux\n"
+       use arm && insert='#f0:12345:respawn:/sbin/agetty 9600 ttyFB0 vt100'
+       use hppa && insert='b0:12345:respawn:/sbin/agetty 9600 ttyB0 vt100'
        if use ibm ; then
-               insert="#hvc0:2345:respawn:/sbin/agetty -L 9600 hvc0"$'\n'
+               insert="${insert}#hvc0:2345:respawn:/sbin/agetty -L 9600 hvc0"$'\n'
                insert="${insert}#hvsi:2345:respawn:/sbin/agetty -L 19200 hvsi0"
        fi
-       use ppc && insert="#psc0:12345:respawn:/sbin/agetty 115200 ttyPSC0 linux"
-       use arm && insert='#f0:12345:respawn:/sbin/agetty 9600 ttyFB0 vt100'
-       use hppa && insert='b0:12345:respawn:/sbin/agetty 9600 ttyB0 vt100'
        (use arm || use mips || use sh || use sparc) && sed -i '/ttyS0/s:#::' inittab
        [[ -n ${insert} ]] && echo "# Architecture specific features"$'\n'"${insert}" >> inittab
 }

diff --git a/sys-apps/sysvinit/sysvinit-2.86-r8.ebuild b/sys-apps/sysvinit/sysvinit-2.86-r8.ebuild
index 8d9e2e1c7c472aab6f29c895a7c9622235543896..63e0b5bb36566854825ef757bbe0bf8d07a3fe3a 100644 (file)
--- a/sys-apps/sysvinit/sysvinit-2.86-r8.ebuild
+++ b/sys-apps/sysvinit/sysvinit-2.86-r8.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/sysvinit/sysvinit-2.86-r8.ebuild,v 1.1 2007/03/13 21:19:39 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sysvinit/sysvinit-2.86-r8.ebuild,v 1.2 2007/04/05 14:16:55 wolf31o2 Exp $
 
 inherit eutils toolchain-funcs flag-o-matic
 
@@ -39,13 +39,13 @@ src_unpack() {
        cd "${WORKDIR}"
        cp "${FILESDIR}"/inittab . || die "cp inittab"
        local insert=""
+       use ppc && insert="#psc0:12345:respawn:/sbin/agetty 115200 ttyPSC0 linux\n"
+       use arm && insert='#f0:12345:respawn:/sbin/agetty 9600 ttyFB0 vt100'
+       use hppa && insert='b0:12345:respawn:/sbin/agetty 9600 ttyB0 vt100'
        if use ibm ; then
-               insert="#hvc0:2345:respawn:/sbin/agetty -L 9600 hvc0"$'\n'
+               insert="${insert}#hvc0:2345:respawn:/sbin/agetty -L 9600 hvc0"$'\n'
                insert="${insert}#hvsi:2345:respawn:/sbin/agetty -L 19200 hvsi0"
        fi
-       use ppc && insert="#psc0:12345:respawn:/sbin/agetty 115200 ttyPSC0 linux"
-       use arm && insert='#f0:12345:respawn:/sbin/agetty 9600 ttyFB0 vt100'
-       use hppa && insert='b0:12345:respawn:/sbin/agetty 9600 ttyB0 vt100'
        (use arm || use mips || use sh || use sparc) && sed -i '/ttyS0/s:#::' inittab
        [[ -n ${insert} ]] && echo "# Architecture specific features"$'\n'"${insert}" >> inittab
 }