4 files changed, 98 insertions, 11 deletions
diff --git a/sys-process/minit/ChangeLog b/sys-process/minit/ChangeLog
index 234189102aa8..66447465f8cb 100644
--- a/sys-process/minit/ChangeLog
+++ b/sys-process/minit/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-process/minit
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/minit/ChangeLog,v 1.7 2007/01/05 02:30:44 vapier Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-process/minit/ChangeLog,v 1.8 2009/08/30 17:39:54 vostorga Exp $
+
+  30 Aug 2009; Víctor Ostorga <vostorga@gentoo.org> minit-0.10.ebuild,
+  +files/minit-0.10-fixes.diff, metadata.xml:
+  Adding Andreas Wiese <aw@instandbesetzt.net> and myself as maintainers
+  Fixing build , bugs #248443 and #270144 , patch thanks to Andreas Wiese
 
 *minit-0.10 (05 Jan 2007)
 
diff --git a/sys-process/minit/files/minit-0.10-fixes.diff b/sys-process/minit/files/minit-0.10-fixes.diff
new file mode 100644
index 000000000000..5c80091f84f3
--- /dev/null
+++ b/sys-process/minit/files/minit-0.10-fixes.diff
@@ -0,0 +1,62 @@
+diff -ru minit-0.10.orig/Makefile minit-0.10/Makefile
+--- minit-0.10.orig/Makefile	2005-04-08 19:24:04.000000000 +0200
++++ minit-0.10/Makefile	2008-11-27 23:05:57.000000000 +0100
+@@ -7,7 +7,7 @@
+ CROSS=
+ #CROSS=arm-linux-
+ LDFLAGS=-s
+-MANDIR=/usr/man
++MANDIR=/usr/share/man
+ 
+ path = $(subst :, ,$(PATH))
+ diet_path = $(foreach dir,$(path),$(wildcard $(dir)/diet))
+@@ -44,9 +44,11 @@
+ msvc: msvc.o
+ minit-update: minit-update.o split.o openreadclose.o
+ serdo: serdo.o
+-
+ shutdown: shutdown.o split.o openreadclose.o opendevconsole.o
+-	$(DIET) $(CROSS)$(CC) $(LDFLAGS) -o shutdown $^
++pidfilehack: pidfilehack.o
++hard-reboot: hard-reboot.o
++write_proc: write_proc.o
++killall5: killall5.o
+ 
+ %.o: %.c
+ 	$(DIET) $(CROSS)$(CC) $(CFLAGS) -c $<
+@@ -61,22 +63,11 @@
+ test: test.c
+ 	gcc -nostdlib -o $@ $^ -I../dietlibc/include ../dietlibc/start.o ../dietlibc/dietlibc.a
+ 
+-pidfilehack: pidfilehack.c
+-	$(DIET) $(CROSS)$(CC) $(CFLAGS) -o $@ $^
+-
+-hard-reboot: hard-reboot.c
+-	$(DIET) $(CROSS)$(CC) $(CFLAGS) -o $@ $^
+-
+-write_proc: write_proc.c
+-	$(DIET) $(CROSS)$(CC) $(CFLAGS) -o $@ $^
+-
+-killall5: killall5.c
+-	$(DIET) $(CROSS)$(CC) $(CFLAGS) -o $@ $^
+-
+ install-files:
+ 	install -d $(DESTDIR)/etc/minit $(DESTDIR)/sbin $(DESTDIR)/bin $(DESTDIR)$(MANDIR)/man8
+-	install minit pidfilehack $(DESTDIR)/sbin
++	install minit killall5 pidfilehack $(DESTDIR)/sbin
+ 	install write_proc hard-reboot minit-update $(DESTDIR)/sbin
++	install listpids $(DESTDIR)/sbin/minit-list
+ 	install msvc serdo $(DESTDIR)/bin
+ 	install -m 4750 shutdown $(DESTDIR)/sbin
+ 	test -f $(DESTDIR)/sbin/init || ln $(DESTDIR)/sbin/minit $(DESTDIR)/sbin/init
+diff -ru minit-0.10.orig/serdo.c minit-0.10/serdo.c
+--- minit-0.10.orig/serdo.c	2005-02-26 18:00:22.000000000 +0100
++++ minit-0.10/serdo.c	2008-11-27 23:02:57.000000000 +0100
+@@ -10,6 +10,7 @@
+ #define MAXENV 256
+ char* envp[MAXENV+2];
+ int envc;
++extern char **environ;
+ 
+ int continueonerror;
+ 
diff --git a/sys-process/minit/metadata.xml b/sys-process/minit/metadata.xml
index b7b975bd9be1..9f8ea27e80ce 100644
--- a/sys-process/minit/metadata.xml
+++ b/sys-process/minit/metadata.xml
@@ -1,10 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>no-herd</herd>
-<maintainer>
-  <email>maintainer-needed@gentoo.org</email>
-</maintainer>
+		<herd>no-herd</herd>
+		<maintainer>
+			<email>vostorga@gentoo.org</email>
+			<name>Víctor Ostorga</name>
+		</maintainer>
+		<maintainer>
+			<email>aw-gentoo@instandbesetzt.net</email>
+			<name>Andreas Wiese</name>
+		</maintainer>
 <longdescription>
 minit - a small yet feature-complete init
 
diff --git a/sys-process/minit/minit-0.10.ebuild b/sys-process/minit/minit-0.10.ebuild
index eede83401652..ef8ffd61c8fe 100644
--- a/sys-process/minit/minit-0.10.ebuild
+++ b/sys-process/minit/minit-0.10.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/minit/minit-0.10.ebuild,v 1.1 2007/01/05 02:30:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/minit/minit-0.10.ebuild,v 1.2 2009/08/30 17:39:54 vostorga Exp $
 
 inherit eutils
 
@@ -14,15 +14,30 @@ KEYWORDS="~x86"
 IUSE=""
 
 DEPEND="dev-libs/libowfat
-	dev-libs/dietlibc"
+		dev-libs/dietlibc"
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+	unpack ${A}
+
+	epatch "${FILESDIR}"/minit-0.10-fixes.diff
+}
 
 src_compile() {
-	emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" DIET="" || die
+	use sparc && DIET='' || DIET=diet
+	emake CFLAGS="${CFLAGS} -I/usr/include/libowfat" \
+		LDFLAGS="${LDFLAGS}" DIET="${DIET}" || die
 }
 
 src_install() {
-	emake install DESTDIR="${D}" || die
+	emake install-files DESTDIR="${D}" || die
 	mv "${D}"/sbin/shutdown "${D}"/sbin/minit-shutdown || die
+	mv "${D}"/sbin/killall5 "${D}"/sbin/minit-killall5 || die
 	rm "${D}"/sbin/init || die
 	dodoc CHANGES README TODO
 }
+
+pkg_postinst() {
+	[ -e /etc/minit/in ] || mkfifo "${ROOT}"/etc/minit/in
+	[ -e /etc/minit/out ] || mkfifo "${ROOT}"/etc/minit/out
+}