Cleanup build a bit and install mountpoint #198700.

(Portage version: 2.1.3.19)

4 files changed, 131 insertions, 1 deletions

diff --git a/sys-apps/sysvinit/ChangeLog b/sys-apps/sysvinit/ChangeLog
index 0c207ab1c379..57d0cc8a98ef 100644
--- 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.53 2007/08/10 08:52:55 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sysvinit/ChangeLog,v 1.54 2007/11/11 19:19:07 vapier Exp $
+
+*sysvinit-2.86-r10 (11 Nov 2007)
+
+  11 Nov 2007; Mike Frysinger <vapier@gentoo.org>
+  +files/sysvinit-2.86-build.patch, +sysvinit-2.86-r10.ebuild:
+  Cleanup build a bit and install mountpoint #198700.
 
 *sysvinit-2.86-r9 (10 Aug 2007)
 
diff --git a/sys-apps/sysvinit/files/digest-sysvinit-2.86-r10 b/sys-apps/sysvinit/files/digest-sysvinit-2.86-r10
new file mode 100644
index 000000000000..7fc9a567296b
--- /dev/null
+++ b/sys-apps/sysvinit/files/digest-sysvinit-2.86-r10
@@ -0,0 +1,6 @@
+MD5 650af823f937d386e81520b1741d4d45 sysvinit-2.86-kexec.patch 4139
+RMD160 5f8e9ccd3a39701cf47a1a541c78a4be971d46fc sysvinit-2.86-kexec.patch 4139
+SHA256 936245ef3060939bec3099efc006009336b3672422c1de41983b277ab5ddac47 sysvinit-2.86-kexec.patch 4139
+MD5 7d5d61c026122ab791ac04c8a84db967 sysvinit-2.86.tar.gz 99009
+RMD160 46587ab51390b5c8cd3179a3690f86efdbe9b4b9 sysvinit-2.86.tar.gz 99009
+SHA256 035f98fae17d9cff002993c564ccc83dc4ed136127172caeff872b6abdb679d8 sysvinit-2.86.tar.gz 99009
diff --git a/sys-apps/sysvinit/files/sysvinit-2.86-build.patch b/sys-apps/sysvinit/files/sysvinit-2.86-build.patch
new file mode 100644
index 000000000000..0f3e1f0b5e45
--- /dev/null
+++ b/sys-apps/sysvinit/files/sysvinit-2.86-build.patch
@@ -0,0 +1,25 @@
+--- sysvinit/src/Makefile
++++ sysvinit/src/Makefile
+@@ -10,5 +10,3 @@
+ 
+-CC	= gcc
+-CFLAGS	= -Wall -O2 -fomit-frame-pointer -D_GNU_SOURCE
+-LDFLAGS	= -s
++CFLAGS	+= -Wall -D_GNU_SOURCE
+ STATIC	=
+@@ -48,9 +48,7 @@
+ MANDIR		= /usr/share/man
+ 
+ # Additional libs for GNU libc.
+-ifneq ($(wildcard /usr/lib/libcrypt.a),)
+ LCRYPT		= -lcrypt
+-endif
+ 
+ all:		$(BIN) $(SBIN) $(USRBIN)
+ 
+@@ -112,2 +117,5 @@
+ install:
++		$(INSTALL) -d $(ROOT)/bin $(ROOT)/sbin $(ROOT)/usr/bin \
++			$(ROOT)/usr/include $(ROOT)/$(MANDIR)/man1 $(ROOT)/$(MANDIR)/man5 \
++			$(ROOT)/$(MANDIR)/man8
+ 		for i in $(BIN); do \
diff --git a/sys-apps/sysvinit/sysvinit-2.86-r10.ebuild b/sys-apps/sysvinit/sysvinit-2.86-r10.ebuild
new file mode 100644
index 000000000000..2447251e0a18
--- /dev/null
+++ b/sys-apps/sysvinit/sysvinit-2.86-r10.ebuild
@@ -0,0 +1,93 @@
+# 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-r10.ebuild,v 1.1 2007/11/11 19:19:07 vapier Exp $
+
+inherit eutils toolchain-funcs flag-o-matic
+
+DESCRIPTION="/sbin/init - parent of all processes"
+HOMEPAGE="http://freshmeat.net/projects/sysvinit/"
+SRC_URI="ftp://ftp.cistron.nl/pub/people/miquels/software/${P}.tar.gz
+	ftp://sunsite.unc.edu/pub/Linux/system/daemons/init/${P}.tar.gz
+	http://www.gc-linux.org/down/isobel/kexec/sysvinit/sysvinit-2.86-kexec.patch"
+
+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 )"
+DEPEND="${RDEPEND}
+	virtual/os-headers"
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	cd "${S}"
+	cp "${FILESDIR}"/change_console.{c,8} src/ || die
+	epatch "${FILESDIR}"/${P}-docs.patch
+	epatch "${FILESDIR}"/${P}-shutdown-usage.patch
+	epatch "${FILESDIR}"/${P}-off-by-one.patch
+	epatch "${DISTDIR}"/${P}-kexec.patch
+	epatch "${FILESDIR}"/${P}-execl.patch
+	epatch "${FILESDIR}"/${P}-utmp-64bit.patch
+	epatch "${FILESDIR}"/${P}-shutdown-single.patch
+	epatch "${FILESDIR}"/${P}-utmp-smp.patch
+	epatch "${FILESDIR}"/${P}-build.patch
+	use selinux && epatch "${FILESDIR}"/${PV}-selinux-1.patch
+
+	# Mung inittab for specific architectures
+	cd "${WORKDIR}"
+	cp "${FILESDIR}"/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() {
+	use static && append-ldflags -static
+	emake -C src \
+		CC="$(tc-getCC)" \
+		all change_console \
+		|| die
+}
+
+src_install() {
+	emake -C src \
+		install \
+		ROOT="${D}" \
+		|| die "make install"
+	dodoc README doc/*
+
+	into /
+	dosbin src/change_console || die
+	doman src/change_console.8
+
+	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
+}