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

Package-Manager: portage-2.2_rc20/cvs/Linux 2.6.28-gentoo x86_64

5 files changed, 66 insertions, 29 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/Manifest b/app-admin/jinit/Manifest
index 2c7fe48d188c..8fbd3dfb6fcf 100644
--- a/app-admin/jinit/Manifest
+++ b/app-admin/jinit/Manifest
@@ -1,4 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX jinit-0.1.12-gcc43.patch 297 RMD160 601ed4b4d5a64e1f1e439ee0e5aa21b4300e0118 SHA1 d4303ea9b829dbe0144d836b7780eca58aa3cca9 SHA256 190549bbb897909027f0f0d923778be6e539e48ed7002f72c144b4152f49b1d6
 DIST jinit-0.1.12.tar.gz 110745 RMD160 2a6b71f139762a0f3fa7dc0a76612485f1ef3c28 SHA1 7ab86f5a0f346279813356c2ea14171d3c70e8f5 SHA256 8db7e4cc34fd5f12b1803e910f1a01cffd0d945705467f2190472a8ec78c86b9
-EBUILD jinit-0.1.12.ebuild 788 RMD160 3eaa7fd279b53bf30b2bd3b06e56822096eeb563 SHA1 998a1c538c620e5095962484345c89bb97fb04c8 SHA256 79db260c7265b103c6cdf1a3817d1b576172f4f19df192e46406ceee86f031b0
-MISC ChangeLog 1858 RMD160 8e7b6977a377d64cec9ca06dbb267cbee5867857 SHA1 c85af1d7fbf8633e4cb4dfa38e35d0e3d7f976c5 SHA256 448183f88fe03a82b75248c27d54fd83d081cb05e47b06e6dc6f56673abe67b7
+EBUILD jinit-0.1.12-r1.ebuild 1007 RMD160 1b1a74090eb896d0395269253b3aaac2656efa9b SHA1 f74190adb696ef0018b03f2371eede97f401f6a8 SHA256 824d104c06dc546774111b2a9404f5a9dd0db863ca5fbc7252a2a0ccf4eebc04
+MISC ChangeLog 2088 RMD160 2c7108f39b0ed57afd6f41f77fc4f78fdde3a0d0 SHA1 3e8f0f59e3791fedd5fcd20e0e1f42e7f61b7a4b SHA256 77410102245ca04183e5475f8a88151a72d0450e27cea70594ccf757ffb5a2d8
 MISC metadata.xml 233 RMD160 d81ec1a0582856aeac5ef3bfec5c80d9850216f6 SHA1 9b94f113e7f382076b1749c2a856e409c96cade3 SHA256 dce03f6cdd96135caf3c971a5ca4a8c916f44532fe8cfb6df88b7bdade407e8b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkllRJQACgkQiqiDRvmkBmKEOQCePe6Rg/4KvfdzNtcZ+fhQ4fr9
+mRwAn1USOlExL4g8IFGt1zWYDsBjbO46
+=rFeq
+-----END PGP SIGNATURE-----
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*"
-}