commit: 4f5d287a02f221da9ffc9ee48917157de6165921 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> AuthorDate: Wed Feb 3 15:10:31 2016 +0000 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> CommitDate: Wed Feb 3 15:13:08 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f5d287a
sys-apps/sysvinit: Revbump to fix bug #573668 Bumped to EAPI-5. Minor ebuild improvements. Package-Manager: portage-2.2.27 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> sys-apps/sysvinit/files/inittab-2.88 | 3 ++- ...svinit-2.88-r8.ebuild => sysvinit-2.88-r9.ebuild} | 20 ++++++++++++-------- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/sys-apps/sysvinit/files/inittab-2.88 b/sys-apps/sysvinit/files/inittab-2.88 index 5328d30..ffb1ce3 100644 --- a/sys-apps/sysvinit/files/inittab-2.88 +++ b/sys-apps/sysvinit/files/inittab-2.88 @@ -8,6 +8,7 @@ # Modified by: Martin Schlemmer, <[email protected]> # Modified by: Mike Frysinger, <[email protected]> # Modified by: Robin H. Johnson, <[email protected]> +# Modified by: William Hubbs, <[email protected]> # # $Id$ @@ -36,7 +37,7 @@ su0:S:wait:/sbin/openrc single su1:S:wait:/sbin/sulogin # TERMINALS -x1:12345:respawn:/sbin/agetty 38400 console linux +#x1:12345:respawn:/sbin/agetty 38400 console linux c1:12345:respawn:/sbin/agetty 38400 tty1 linux c2:2345:respawn:/sbin/agetty 38400 tty2 linux c3:2345:respawn:/sbin/agetty 38400 tty3 linux diff --git a/sys-apps/sysvinit/sysvinit-2.88-r8.ebuild b/sys-apps/sysvinit/sysvinit-2.88-r9.ebuild similarity index 89% rename from sys-apps/sysvinit/sysvinit-2.88-r8.ebuild rename to sys-apps/sysvinit/sysvinit-2.88-r9.ebuild index acc8a8d..a6b30a3 100644 --- a/sys-apps/sysvinit/sysvinit-2.88-r8.ebuild +++ b/sys-apps/sysvinit/sysvinit-2.88-r9.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI="4" +EAPI=5 inherit eutils toolchain-funcs flag-o-matic @@ -27,12 +27,16 @@ RDEPEND="${CDEPEND} S=${WORKDIR}/${P}dsf +PATCHES=( + "${FILESDIR}/${PN}-2.86-kexec.patch" #80220 + "${FILESDIR}/${PN}-2.86-shutdown-single.patch" #158615 + "${FILESDIR}/${P}-makefile.patch" #319197 + "${FILESDIR}/${P}-selinux.patch" #326697 + "${FILESDIR}/${P}-shutdown-h.patch" #449354 +) + src_prepare() { - 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 - epatch "${FILESDIR}"/${P}-shutdown-h.patch #449354 + epatch "${PATCHES[@]}" sed -i '/^CPPFLAGS =$/d' src/Makefile || die # last/lastb/mesg/mountpoint/sulogin/utmpdump/wall have moved to util-linux @@ -99,7 +103,7 @@ src_install() { doins "${WORKDIR}"/inittab # dead symlink - rm -f "${D}"/usr/bin/lastb + rm "${D}"/usr/bin/lastb || die } pkg_postinst() {
