Add patch for GCC 4.3 for bug #250600 and fixed various QA issues.

(Portage version: 2.2_rc20/cvs/Linux 2.6.28-gentoo x86_64)

4 files changed, 53 insertions, 27 deletions

diff --git a/app-admin/jinit/ChangeLog b/app-admin/jinit/ChangeLog
index 8fe9cbd3a4da..24a6eb48b5e1 100644
--- a/app-admin/jinit/ChangeLog
+++ b/app-admin/jinit/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-admin/jinit
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/jinit/ChangeLog,v 1.14 2006/11/22 19:23:14 masterdriverz Exp $
+# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/jinit/ChangeLog,v 1.15 2009/01/08 00:09:54 dirtyepic Exp $
+
+*jinit-0.1.12-r1 (08 Jan 2009)
+
+  08 Jan 2009; Ryan Hill <dirtyepic@gentoo.org>
+  +files/jinit-0.1.12-gcc43.patch, -jinit-0.1.12.ebuild,
+  +jinit-0.1.12-r1.ebuild:
+  Add patch for GCC 4.3 for bug #250600 and fixed various QA issues.
 
   22 Nov 2006; Charlie Shepherd <masterdriverz@gentoo.org> ChangeLog:
   Remove old ebuild, fix up ebuild (including homepage - bug 91389), see cvs
diff --git a/app-admin/jinit/files/jinit-0.1.12-gcc43.patch b/app-admin/jinit/files/jinit-0.1.12-gcc43.patch
new file mode 100644
index 000000000000..c9f6d92fcb03
--- /dev/null
+++ b/app-admin/jinit/files/jinit-0.1.12-gcc43.patch
@@ -0,0 +1,10 @@
+--- org/jinit-0.1.12/init_ipc/User.hh	2003-04-29 23:35:53.000000000 +0200
++++ jinit-0.1.12/init_ipc/User.hh	2009-01-04 11:19:16.000000000 +0100
+@@ -13,6 +13,7 @@
+ #include <errno.h>
+ #include <time.h>
+ #include <err.h>
++#include <cstdlib>
+ 
+ #include "init_ipc/sysvq.hh"
+ #include "need/error.hh"
diff --git a/app-admin/jinit/jinit-0.1.12-r1.ebuild b/app-admin/jinit/jinit-0.1.12-r1.ebuild
new file mode 100644
index 000000000000..cf82e4022350
--- /dev/null
+++ b/app-admin/jinit/jinit-0.1.12-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/jinit/jinit-0.1.12-r1.ebuild,v 1.1 2009/01/08 00:09:54 dirtyepic Exp $
+
+inherit eutils
+
+DESCRIPTION="An alternative to sysvinit which supports the need(8) concept"
+HOMEPAGE="http://john.fremlin.de/programs/linux/jinit/"
+SRC_URI="http://john.fremlin.de/programs/linux/jinit/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${P}-gcc43.patch
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "failed emake install"
+	emake prefix="${D}"/usr/share/doc/${P}/example-setup install-initscripts \
+		|| die "failed installing example setup"
+	mv "${D}"/usr/sbin "${D}"/ || die
+	mv "${D}"/sbin/init "${D}"/sbin/jinit || die
+	mv "${D}"/sbin/shutdown "${D}"/sbin/jinit-shutdown || die
+	dodoc AUTHORS ChangeLog NEWS README TODO || die
+}
diff --git a/app-admin/jinit/jinit-0.1.12.ebuild b/app-admin/jinit/jinit-0.1.12.ebuild
deleted file mode 100644
index e384d1165ea9..000000000000
--- a/app-admin/jinit/jinit-0.1.12.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-200666666 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/jinit/jinit-0.1.12.ebuild,v 1.3 2006/11/22 19:23:14 masterdriverz Exp $
-
-DESCRIPTION="An alternative to sysvinit which supports the need(8) concept"
-HOMEPAGE="http://john.fremlin.de/programs/linux/jinit/"
-SRC_URI="http://john.fremlin.de/programs/linux/jinit/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-src_install() {
-	emake DESTDIR=${D} install || die
-	mv ${D}/usr/sbin ${D}/
-	mv ${D}/sbin/init ${D}/sbin/jinit
-	dodoc AUTHORS ChangeLog NEWS README TODO
-	cp -R example-setup ${D}/usr/share/doc/${PF}/
-
-	#find ${D}/usr/share/doc/${PF}/example-setup -name "Makefile*"
-}