From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 3A48458973 for ; Wed, 3 Feb 2016 15:13:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 42725E07D9; Wed, 3 Feb 2016 15:13:15 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B1F70E07BA for ; Wed, 3 Feb 2016 15:13:14 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5E93434092E for ; Wed, 3 Feb 2016 15:13:13 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E0E158E6 for ; Wed, 3 Feb 2016 15:13:11 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1454512388.4f5d287a02f221da9ffc9ee48917157de6165921.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/sysvinit/files/, sys-apps/sysvinit/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/sysvinit/files/inittab-2.88 sys-apps/sysvinit/sysvinit-2.88-r8.ebuild sys-apps/sysvinit/sysvinit-2.88-r9.ebuild X-VCS-Directories: sys-apps/sysvinit/files/ sys-apps/sysvinit/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 4f5d287a02f221da9ffc9ee48917157de6165921 X-VCS-Branch: master Date: Wed, 3 Feb 2016 15:13:11 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 0f8b98cd-be65-46e5-967b-c9a2876bd579 X-Archives-Hash: ba512a3c167d63c9cea1945540aa1d93 commit: 4f5d287a02f221da9ffc9ee48917157de6165921 Author: Lars Wendler gentoo org> AuthorDate: Wed Feb 3 15:10:31 2016 +0000 Commit: Lars Wendler gentoo 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 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, # Modified by: Mike Frysinger, # Modified by: Robin H. Johnson, +# Modified by: William Hubbs, # # $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() {