Stop installing mountpoint since newer util-linux does now.

Package-Manager: portage-2.2.0_alpha51/cvs/Linux x86_64

diff --git a/sys-apps/sysvinit/ChangeLog b/sys-apps/sysvinit/ChangeLog
index 15691430a96d64f028b989abf8a80d68605d24dc..b2aaf5a4b1273afeefba0b656f38af75359351b6 100644 (file)
--- a/sys-apps/sysvinit/ChangeLog
+++ b/sys-apps/sysvinit/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/sysvinit
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sysvinit/ChangeLog,v 1.92 2011/05/31 13:11:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sysvinit/ChangeLog,v 1.93 2011/08/29 21:21:44 vapier Exp $
+
+*sysvinit-2.88-r3 (29 Aug 2011)
+
+  29 Aug 2011; Mike Frysinger <vapier@gentoo.org> +sysvinit-2.88-r3.ebuild:
+  Stop installing mountpoint since newer util-linux does now.
 
 *sysvinit-2.88-r2 (31 May 2011)
 

diff --git a/sys-apps/sysvinit/Manifest b/sys-apps/sysvinit/Manifest
index 6d76854b845769067d15c00717e8ddc514b7d917..9a964ecca077bc8105bc8a48154fae9e7f2ebae9 100644 (file)
--- a/sys-apps/sysvinit/Manifest
+++ b/sys-apps/sysvinit/Manifest
@@ -14,13 +14,14 @@ DIST sysvinit_2.87dsf.orig.tar.gz 106102 RMD160 69d4bc75ee55a23f650f7bfc7beb5b04
 EBUILD sysvinit-2.87-r3.ebuild 2729 RMD160 0a496b1915f2dd4d6bb952e2fc9f8727b1034945 SHA1 fe0eac47289dd45385fba3c5df60cef9167bebd7 SHA256 0d24f5177bc5bc4add0dd817070258e3c0af0f46312a3d7156718c3eca3c00eb
 EBUILD sysvinit-2.88-r1.ebuild 2510 RMD160 92c599dd2a6ad592b16fb670afe4b9f7f863ec26 SHA1 a5200cbd953a447333b94c8fc4f57cbbcefc1624 SHA256 62d5487c1d007cb52cd226894098f349edbc4c98cda5ca02ab85eda63cd100ce
 EBUILD sysvinit-2.88-r2.ebuild 2577 RMD160 42ab43e9ef358ef28fddf8831b47109ee1eb09bf SHA1 4d2b60f4d662e1655207c483887eb91da0e3bb73 SHA256 1772dab4449093255426542cf71b3b90d1ce923455980090370a1973a749693e
+EBUILD sysvinit-2.88-r3.ebuild 2748 RMD160 6cc23582ec5aaf6fe42a699cc13061d5bedcc6f6 SHA1 62c2174c2cff65e326570a23f0e5c373351e7384 SHA256 8184c3f33dba82a2a2db62c8c9996198099b083d256a39079e6cf4f1e1b4b270
 EBUILD sysvinit-2.88.ebuild 2468 RMD160 78bbdc2143aeb6797469e4c15e9318f24bb38e85 SHA1 5793263eb935d4e57ee10764fb4a284b6cc7498b SHA256 dd4fefeedecd8719ea04e32a79f9cf6668ad3acf6959813fe7d221cdcd99da9a
-MISC ChangeLog 13798 RMD160 a4a12f8fc314ca56ab81bbc704ffcddf5beccb5f SHA1 83f2e51240f02681325d678d535fa0a153c6e260 SHA256 1e48ab5aa8b5e73f18c9343f15ecec9971dfcc3c82847db2b9a111086bd08292
+MISC ChangeLog 13970 RMD160 9fbef158cf3b7df0e144aa339b87bbab584470a0 SHA1 f97a342473e485e4bb8e0f136f0544f0ca60d007 SHA256 553ad63216612f26ff7f32ebd64f96d37854b663455c10ec1c8abc0f4f1c7399
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk3k6RkACgkQaC/OocHi7Jak9QD9FCIVhQTWbvJNK8K/90PN9TgP
-IKaFaJE7gpbaVICRgIYA/R2hVTUt+7jVM8vCjgOn75gGMk7DqJp6gaX81IwED7xM
-=n09q
+iF4EAREIAAYFAk5cAuQACgkQaC/OocHi7JbZhwD9HdRNkLZILeaoDNeNSgMebX90
+K9i/Jgj/8uKtVpZZwfgA/2gRX03VrssnsJ6Kin+Zuc2U0ajrWOThlnl8+nuMvJDE
+=r6mo
 -----END PGP SIGNATURE-----

diff --git a/sys-apps/sysvinit/sysvinit-2.88-r3.ebuild b/sys-apps/sysvinit/sysvinit-2.88-r3.ebuild
new file mode 100644 (file)
index 0000000..7e4a233
--- /dev/null
+++ b/sys-apps/sysvinit/sysvinit-2.88-r3.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sysvinit/sysvinit-2.88-r3.ebuild,v 1.1 2011/08/29 21:21:44 vapier Exp $
+
+inherit eutils toolchain-funcs flag-o-matic
+
+DESCRIPTION="/sbin/init - parent of all processes"
+HOMEPAGE="http://savannah.nongnu.org/projects/sysvinit"
+SRC_URI="mirror://nongnu/${PN}/${P}dsf.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="selinux ibm static kernel_FreeBSD"
+
+RDEPEND="selinux? ( >=sys-libs/libselinux-1.28 )
+       !<sys-apps/util-linux-2.20"
+DEPEND="${RDEPEND}
+       virtual/os-headers"
+
+S=${WORKDIR}/${P}dsf
+
+src_unpack() {
+       unpack ${A}
+       cd "${S}"
+       epatch "${FILESDIR}"/${PN}-2.86-kexec.patch #80220
+       epatch "${FILESDIR}"/${PN}-2.86-shutdown-single.patch #158615
+       epatch "${FILESDIR}"/${P}-makefile.patch #319197
+       epatch "${FILESDIR}"/${P}-selinux.patch #326697
+       sed -i '/^CPPFLAGS =$/d' src/Makefile || die
+
+       # mountpoint has moved to util-linux
+       sed -i \
+               -e '/^BIN/s:mountpoint::' \
+               -e '/^MAN1/s:mountpoint[.]1::' \
+               src/Makefile || die
+
+       # Mung inittab for specific architectures
+       cd "${WORKDIR}"
+       cp "${FILESDIR}"/inittab-2.87 inittab || die "cp inittab"
+       local insert=""
+       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 s390 && insert='s0:12345:respawn:/sbin/agetty 38400 console'
+       if use ibm ; then
+               insert="${insert}#hvc0:2345:respawn:/sbin/agetty -L 9600 hvc0"$'\n'
+               insert="${insert}#hvsi:2345:respawn:/sbin/agetty -L 19200 hvsi0"
+       fi
+       (use arm || use mips || use sh || use sparc) && sed -i '/ttyS0/s:#::' inittab
+       if use kernel_FreeBSD ; then
+               sed -i \
+                       -e 's/linux/cons25/g' \
+                       -e 's/ttyS0/cuaa0/g' \
+                       -e 's/ttyS1/cuaa1/g' \
+                       inittab #121786
+       fi
+       [[ -n ${insert} ]] && echo "# Architecture specific features"$'\n'"${insert}" >> inittab
+}
+
+src_compile() {
+       local myconf
+
+       tc-export CC
+       append-lfs-flags
+       use static && append-ldflags -static
+       use selinux && myconf=WITH_SELINUX=yes
+       emake -C src ${myconf} || die
+}
+
+src_install() {
+       emake -C src install ROOT="${D}" || die
+       dodoc README doc/*
+
+       insinto /etc
+       doins "${WORKDIR}"/inittab || die "inittab"
+
+       doinitd "${FILESDIR}"/{reboot,shutdown}.sh || die
+}
+
+pkg_postinst() {
+       # Reload init to fix unmounting problems of / on next reboot.
+       # This is really needed, as without the new version of init cause init
+       # not to quit properly on reboot, and causes a fsck of / on next reboot.
+       if [[ ${ROOT} == / ]] ; then
+               # Do not return an error if this fails
+               /sbin/telinit U &>/dev/null
+       fi
+}

diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index b444c85c6b8ff028eedadee23ee99e6689416741..7f7180c94ff7cc2355f960f1cce599cb4e41adaf 100644 (file)
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX crypto-loop.confd 412 RMD160 5e65febe9641a8362078fdae39b4ac955fb2e63b SHA1 2f881a24ff67115e74de7a11c66a34a745060864 SHA256 188c945e5e6c54cb14874057c625ff30b72fb33d3d5648e53de2f231a3375600
 AUX crypto-loop.initd 1729 RMD160 fa53920677d793cf98cad994e4dabd53e53d8d04 SHA1 19d3b7c4aa95cdadde2f6fb81a391081eae04f42 SHA256 b8329250c865e79a1e761d713c2270c99d5fe96e0d5a7ca646946fab65c4b810
@@ -13,6 +13,7 @@ AUX util-linux-2.19.1-umount-l-nfs.patch 2721 RMD160 60e0ccf77633bec6b7a1576810a
 DIST util-linux-2.19.1-20110510.diff.bz2 47865 RMD160 0983ac7a48031e4b3e0ddce213887526cfa17bc0 SHA1 e73c7bca691b5d83c1b2725d53a5b669fb268495 SHA256 e04f541ca48951284331e71cbf142d777750dbc9baa051ed9e9913c7dab32b7f
 DIST util-linux-2.19.1.tar.bz2 4396543 RMD160 e4763d21a3a32029ccc525a0222e271f0946a4fd SHA1 96af5d4a37c42296dae5365ba533316216a6b347 SHA256 d3eac4afcc687b3ae1ffedcab2dc12df84c7ba7045cce31386d2b7040a011c7d
 DIST util-linux-2.19.tar.bz2 4376791 RMD160 a1b6bf38106c95f68929de49941c577d77cbd337 SHA1 7e08c8b5d8011b1144ff32019638fa743daf8700 SHA256 d8189ba6dfb508d5c36f50103a7b84943d893e51e6d7a314155a82f68efb33b6
+DIST util-linux-2.20.tar.bz2 4615091 RMD160 c293bee7d9b6b03c0f3981c2020de1471d37b560 SHA1 e8cd2c8e968cdbdc097d82cceaf15d536e0254c1 SHA256 c1cffbf5a1a7a32965f2e8e9ce76336310031e10b87c418d0679075724271d4c
 DIST util-linux-ng-2.17.1-20100308.diff.bz2 57867 RMD160 26584b886ac8db1ec723690a685a442615366f2c SHA1 f76a2deb4b4012e98d82517d84dfb09725533a51 SHA256 c7478553e03ba7cbe28ddb066361966567d97b0746a13396bff12a83183014a0
 DIST util-linux-ng-2.17.2.tar.bz2 3815657 RMD160 398aa54c6001acc16bc2d049ccbdb62824776ba3 SHA1 69275de84f7dabb7a5d90d0046c3a6b861c16a1d SHA256 c9ae801b6a5ab20b7749a278a8bf6830ef53adc5e8b7eb0ac1a9f410c774118f
 DIST util-linux-ng-2.18-20100706.diff.bz2 58805 RMD160 5b1d645ecf33af652c7be704f213558d5c70202e SHA1 c36d29f27a2ce3f2ec746ae48712ae8ea74af856 SHA256 cde75f181eb998316a7d695da3c93b1894de3cc2b45df2f2c3f21e8b0280b4a4
@@ -22,13 +23,14 @@ EBUILD util-linux-2.18-r1.ebuild 3271 RMD160 998c66452f87b053114d10625cc4f2e39ae
 EBUILD util-linux-2.19.1-r1.ebuild 3300 RMD160 e19ae8a60f195e1cce005c9213316da171fd3032 SHA1 d701278e753d20b9920c514a99419c10631ccadb SHA256 9422b08fb168c59452e36fea90af2d5975c517ee2db3b2a8e36cde2981a17fff
 EBUILD util-linux-2.19.1.ebuild 3162 RMD160 dd57955b2e9ebbc7717d2b8ce12cbdceb64e2e8d SHA1 567fcdf55eb499143aef82e34aa8cf620e5abe77 SHA256 70630679959a63448654b9152d67a2ed5a05c251f5bd08bf3a1ac77bfc6ebcad
 EBUILD util-linux-2.19.ebuild 3059 RMD160 29645f9660d0caf38bd2eb3d7a97d1d0ba544e94 SHA1 e3df015f117c4867f04abc3b8b1e1be82d8cbea5 SHA256 224395e264f11496a12b8f150022bf408428fbac16b893106dbddca5d77e1724
-EBUILD util-linux-9999.ebuild 3043 RMD160 d62fbfc05d79dd1c2d2235b43354cbf231bfbb7a SHA1 f7d40a26abfe2dc7c1f5091c6f1a36e0259684f4 SHA256 e7ed54ee79b7f856f17684d43b6bb581e32f34aec92751aa082b4e47e4ad1eb0
-MISC ChangeLog 52352 RMD160 149131ffd53b32c769c5521ffb979337a9bf7222 SHA1 ac6a7b3522ea1e2348c245c4f7ba141cf0d88ef4 SHA256 1e3e8a4aa6829f94092694ad15e6027875233e58edce2930fa0b0ec6d79b4286
+EBUILD util-linux-2.20.ebuild 3266 RMD160 3c03a6674c46575ad66ce88dd9495fcbd52991db SHA1 01273429e2f7dba86ba410d26a7665f3b1254112 SHA256 90317d69793895036bef41653e7d84e1b0007684b84a514d1c4b09e435be2d0e
+EBUILD util-linux-9999.ebuild 3267 RMD160 3e97788791c3125b7ffe7518ebadf005a3b59c9b SHA1 afdec8c52ebdf382bbd104f217bbd44c02d33c45 SHA256 69f0854eac2385ac4cb79b12214de66532557821f2c8a8ead2459cf3ba700159
+MISC ChangeLog 52734 RMD160 a8880141de0d1edc32f47274367a8f75a8f69639 SHA1 b2187d7094969ef107d1f55ecb5916970f6e7b89 SHA256 f758e991a8adcd05caf1f51c728ca941baa88d89acc16831c92f9367e8eddb8f
 MISC metadata.xml 516 RMD160 cd7ff3c0fbcf9c078d67e1cf164493c4d42f8c8b SHA1 8fb4ca9b1cf683a6b0da4bdc0b0551a1a057ea6b SHA256 70df7021a278c482dce7e20ae97550d7dbbf05e1bf612ac7780a28108bbfe702
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk4yZF8ACgkQ/ejvha5XGaP5dACfdmdZ4e0tw0qejwkOJG7bAVnc
-FNIAoOjvMZSH9czPA/2a5ZXXP0FpaoCx
-=7XMn
+iF4EAREIAAYFAk5cA7YACgkQaC/OocHi7JZ/4wD/TTSmD2ILKBCXkh6Vch9vmgP0
+9tYPm3YsOUtnyyOZX98A/iDadpWxe4+tyJR8b9vx7MUC8SSjKdihxG22PUu9y6a4
+=VY+s
 -----END PGP SIGNATURE-----