remove failing patch thanks to pioto in bug 213426 and fix init script for openrc, bug 214018

(Portage version: 2.1.4.4)

4 files changed, 11 insertions, 20 deletions

diff --git a/sys-apps/kexec-tools/ChangeLog b/sys-apps/kexec-tools/ChangeLog
index ef6a88e295ce..45ba1c15edfc 100644
--- a/sys-apps/kexec-tools/ChangeLog
+++ b/sys-apps/kexec-tools/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/kexec-tools
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kexec-tools/ChangeLog,v 1.18 2008/03/11 21:29:02 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kexec-tools/ChangeLog,v 1.19 2008/03/21 09:43:54 genstef Exp $
+
+  21 Mar 2008; Stefan Schweizer <genstef@gentoo.org>
+  -files/kexec-tools-9999-LDFLAGS.patch, files/kexec.init,
+  kexec-tools-9999.ebuild:
+  remove failing patch thanks to pioto in bug 213426 and fix init script for
+  openrc, bug 214018
 
   11 Mar 2008; Stefan Schweizer <genstef@gentoo.org>
   +files/kexec-tools-1.101-respect-LDFLAGS.patch,
diff --git a/sys-apps/kexec-tools/files/kexec-tools-9999-LDFLAGS.patch b/sys-apps/kexec-tools/files/kexec-tools-9999-LDFLAGS.patch
deleted file mode 100644
index c982a3579509..000000000000
--- a/sys-apps/kexec-tools/files/kexec-tools-9999-LDFLAGS.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-this should really be rewritten to invoke the compiler driver (gcc) rather than
-the linker (ld) ...
-
---- purgatory/Makefile
-+++ purgatory/Makefile
-@@ -59,7 +59,7 @@
- 
- $(PURGATORY): $(PURGATORY_OBJS) $(UTIL_LIB)
- 	$(MKDIR) -p $(@D)
--	$(LD) $(LDFLAGS) $(EXTRA_LDFLAGS) --no-undefined -e purgatory_start -r -o $@ $(PURGATORY_OBJS) $(UTIL_LIB)
-+	$(LD) $(EXTRA_LDFLAGS) --no-undefined -e purgatory_start -r -o $@ $(PURGATORY_OBJS) $(UTIL_LIB)
- 
- echo::
- 	@echo "PURGATORY_C_SRCS $(PURGATORY_C_SRCS)"
diff --git a/sys-apps/kexec-tools/files/kexec.init b/sys-apps/kexec-tools/files/kexec.init
index 10cf6e58a63a..7fb12935c2f3 100755
--- a/sys-apps/kexec-tools/files/kexec.init
+++ b/sys-apps/kexec-tools/files/kexec.init
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kexec-tools/files/kexec.init,v 1.10 2008/01/21 08:51:10 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kexec-tools/files/kexec.init,v 1.11 2008/03/21 09:43:55 genstef Exp $
 
 depend() {
 	need localmount 
@@ -83,7 +83,7 @@ stop() {
 	[ "${LOAD_DURING_SHUTDOWN:-yes}" != "yes" ] && return 0
 
 	ebegin "Configuring kexec"
-	if [ "${RC_SOFTLEVEL:-${SOFTLEVEL}}" != "reboot" ] || ! is_runlevel_stop ; then
+	if [ "${RC_SOFTLEVEL:-${SOFTLEVEL}}" != "reboot" ]; then
 		einfo "Not rebooting, so disabling"
 		kexec -u
 		return 0
diff --git a/sys-apps/kexec-tools/kexec-tools-9999.ebuild b/sys-apps/kexec-tools/kexec-tools-9999.ebuild
index ebb2f4f39126..4c2bf2fd0498 100644
--- a/sys-apps/kexec-tools/kexec-tools-9999.ebuild
+++ b/sys-apps/kexec-tools/kexec-tools-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kexec-tools/kexec-tools-9999.ebuild,v 1.1 2007/03/06 18:13:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kexec-tools/kexec-tools-9999.ebuild,v 1.2 2008/03/21 09:43:54 genstef Exp $
 
 EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/horms/kexec-tools-testing.git"
 inherit git autotools
@@ -19,7 +19,6 @@ DEPEND="zlib? ( sys-libs/zlib )"
 src_unpack() {
 	git_src_unpack
 	cd "${S}"
-	epatch "${FILESDIR}"/${P}-LDFLAGS.patch
 	eautoreconf
 }