revision bump to force installation of a new init script that is compatible with openrc-0.4.3. Stable users need not upgrade but can without issues

Package-Manager: portage-2.1.6.11/cvs/Linux x86_64

6 files changed, 51 insertions, 102 deletions

diff --git a/sys-apps/kexec-tools/ChangeLog b/sys-apps/kexec-tools/ChangeLog
index 11eae5611022..3e03fdeafdb4 100644
--- a/sys-apps/kexec-tools/ChangeLog
+++ b/sys-apps/kexec-tools/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-apps/kexec-tools
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kexec-tools/ChangeLog,v 1.28 2009/03/22 16:26:25 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kexec-tools/ChangeLog,v 1.29 2009/04/12 04:45:19 darkside Exp $
+
+*kexec-tools-2.0.0-r2 (12 Apr 2009)
+
+  12 Apr 2009; Jeremy Olexa <darkside@gentoo.org> files/kexec.init,
+  -kexec-tools-1.101-r4.ebuild, -kexec-tools-1.101-r7.ebuild,
+  +kexec-tools-2.0.0-r2.ebuild:
+  revision bump to force installation of a new init script that is compatible
+  with openrc-0.4.3. Stable users need not upgrade but can without issues
 
   22 Mar 2009; Markus Meier <maekke@gentoo.org> kexec-tools-2.0.0-r1.ebuild:
   amd64/x86 stable, bug #260092
diff --git a/sys-apps/kexec-tools/Manifest b/sys-apps/kexec-tools/Manifest
index d6923f600529..878680282ceb 100644
--- a/sys-apps/kexec-tools/Manifest
+++ b/sys-apps/kexec-tools/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX kexec-linux-headers.patch 410 RMD160 52dad63608d804132e81886e4822e6efbc8cf1ae SHA1 2ccbc57980819f02c18bcedc5526ce7fdea0c50b SHA256 f89714cdeaf16d14eb275a111b0ee0163ba1a5c76ec492be170750682851567b
 AUX kexec-tools-1.101-LDFLAGS.patch 361 RMD160 ef5b21154a127e962ff5bb208972982738e457dd SHA1 b39c522620c3b7e5dcafb5e91a80503444a41695 SHA256 a5ec5ae9c369583f3b86668b2e05034d7f42ef25ec1fb93204c61aeee83c0089
 AUX kexec-tools-1.101-ppc64.patch 269 RMD160 651b1e36900fc5b4795f24f0d3531309445dd7bc SHA1 f5138d8eaa35f8baab3bb04ed0238c01781a9963 SHA256 01fb1e1f7c27866eefed97f32a56206810d1b697e444e2b9392f2b1eb887504b
@@ -8,20 +5,10 @@ AUX kexec-tools-1.101-respect-LDFLAGS.patch 544 RMD160 a20e704e12e4eebc416e6ed4f
 AUX kexec-tools-2.0.0-asneeded.patch 649 RMD160 e4686dbdd2acb6713499553b1a8141857f517876 SHA1 75ea096fab33f3173d17207f23e1471c12c7b776 SHA256 734774df849124ebd3202b57a47a025f9b6e9d94585f0257b282a2d5e214db06
 AUX kexec-tools-2.0.0-respect-LDFLAGS.patch 290 RMD160 d49f079dc270d602f7f7802ec56ee2fe867da359 SHA1 8d65add25fee582433b08e5cd09018e2efbe55e8 SHA256 c815c53eebcfddd687cefcaa835b604b489f14410bbd4c524e845cf31c69fa15
 AUX kexec.conf 397 RMD160 a366158ef7a24764c7e42bd0a246e035587d0c42 SHA1 46760b27c210c7514a86f9d2f2b35b3ffc5f9d90 SHA256 59bd15f8a0be3a41a457e61cfbb3520252773ed6422b9b223b347dfeb54f152a
-AUX kexec.init 2143 RMD160 3cac226ae1e05c2c8167e1b41a5e5e69309656df SHA1 4e39921327c04c1fd40fda2faf8e34105f5b020c SHA256 ebdb277a609fb8e82077b2cc83a0af6ec0ef1da0fe4ddb74b860307230b4b54e
-DIST kexec-tools-1.101-kdump10.patch 246975 RMD160 67a94b54c848a2c85bfd0801766f02d76c44bba7 SHA1 f995ba47838dd99d23f3368560257ea5800136f0 SHA256 6ca5dd055d1714bb6c2e7aad44c84171673573d95ca832f06f37eaa39d926863
-DIST kexec-tools-1.101.tar.gz 206785 RMD160 2c6cb949f1f9ac2871a5616d890edbe0bc43768a SHA1 65234ec68ca19c5d444375b923fecbb9ce28b255 SHA256 280b34fefa12c3d7a3e432c3730fe5d0d56e8d169c28b695cce9ba6d8dbe6e38
+AUX kexec.init 2115 RMD160 ecd6acfb42923fdc0bfb8f094e5a212a5926b59d SHA1 da5c950250700bc50c35d77a64b689059f72f07a SHA256 6dae3ca906749857d372359431d5ceccc4047dbacb975b988dbcd81cacf1f919
 DIST kexec-tools-2.0.0.tar.bz2 262331 RMD160 88b8e0cf6fc7772f5f5d63536996f6afe67c2232 SHA1 5e822216553258c788480984cd214f7d13b212ca SHA256 41439d49957d0400c7bd9e26b7573049025133cb5edac18c1eb08993953e2044
-EBUILD kexec-tools-1.101-r4.ebuild 1205 RMD160 a5924c4301e5a036b1c22d98891edbef1fd1a31c SHA1 e1734aa7724d5ad06c700fe7c7191807a5caaf3e SHA256 1231f5a0bd9c3dd0949f8d3c391cdfb87d0d829cd5eaa74d14631bdd04475ad1
-EBUILD kexec-tools-1.101-r7.ebuild 1260 RMD160 207cc05a1eb358767db5f445b9472871eb3de500 SHA1 64ba6296c9c322ffc104e816091d039a4a159147 SHA256 1229a20ae5ec65c27834bdaed41fcde14e752f0703e6f719380a40166f72126a
 EBUILD kexec-tools-2.0.0-r1.ebuild 993 RMD160 2d68c08d6af398d21ba130d678a8af839b31c915 SHA1 fc674c6db01f294593c511defed7349e5ef56199 SHA256 6d6dcbd1cb48e50b7a72b5629606189d4043dd907c3eea4fb2be4e5ff9196c9b
+EBUILD kexec-tools-2.0.0-r2.ebuild 997 RMD160 eaccc5168b44daef797c30b0e3095057e93cfbf3 SHA1 011d49c1fe27c348ca164f934826f0f8f1a9a933 SHA256 3d8c5ea277b69b4a16d83f36426b5c37534873fb8504d219b80cde97018bf0c8
 EBUILD kexec-tools-9999.ebuild 965 RMD160 d8352bef2a700ff169d82b1a7f3081cbd8b32814 SHA1 7c0f4c1ca0a2fde7b6b932040252616d618edb45 SHA256 1482ab267103c9a27a9d45b3525adccc6e54397a0859947ab3c0ad8aaa0b135c
-MISC ChangeLog 6122 RMD160 be6d67563c16062c58c84ccf020a13e931864a87 SHA1 37df6152bda4646e2c439084b5de6d88a2dfc66a SHA256 eb56db7825a480059664ad70226df5c551a6b07572695c27e5757ebbab468ccd
+MISC ChangeLog 6476 RMD160 951314ac15820623d8297af804b63cae1ffc77d6 SHA1 4e4c1493e690b7761eaf9ca8455fff15300b00e9 SHA256 25b331156d4bc2aa7be04ce087944de4fb7f00414c59eec0ca7ccb3d54c626f7
 MISC metadata.xml 308 RMD160 ebcbfa349cc9f60484d74d64dae06be917cbbca0 SHA1 160fb93fc9e88f6e1f6d61c08cc307a87b3515e0 SHA256 785b4a06ad58f26e4e142c40b74a2e5955912f822fa810b6428835b49871d0f1
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAknGZr8ACgkQkKaRLQcq0GIpmwCgryVn/Pl91PTWRhITZABgn3ae
-DiAAni5dCANxOCsK+XLlU0+EfstZLyMV
-=3kf2
------END PGP SIGNATURE-----
diff --git a/sys-apps/kexec-tools/files/kexec.init b/sys-apps/kexec-tools/files/kexec.init
index 21b045cedc97..63aeaf92cf41 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.13 2008/12/18 01:06:32 dsd Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kexec-tools/files/kexec.init,v 1.14 2009/04/12 04:45:19 darkside Exp $
 
 depend() {
 	need localmount 
@@ -83,7 +83,7 @@ stop() {
 	[ "${LOAD_DURING_SHUTDOWN:-yes}" != "yes" ] && return 0
 
 	ebegin "Configuring kexec"
-	if [ "${RC_SOFTLEVEL:-${SOFTLEVEL:-${RC_RUNLEVEL:-${RUNLEVEL}}}}" != "reboot" ]; then
+	if [ "`/sbin/runlevel|/bin/cut -c 3`" != "6" ]; then
 		einfo "Not rebooting, so disabling"
 		kexec -u
 		return 0
diff --git a/sys-apps/kexec-tools/kexec-tools-1.101-r4.ebuild b/sys-apps/kexec-tools/kexec-tools-1.101-r4.ebuild
deleted file mode 100644
index 2692336faf3c..000000000000
--- a/sys-apps/kexec-tools/kexec-tools-1.101-r4.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# 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-1.101-r4.ebuild,v 1.2 2008/03/11 21:29:02 genstef Exp $
-
-inherit eutils
-
-DESCRIPTION="Load another kernel from the currently executing Linux kernel"
-HOMEPAGE="http://www.xmission.com/~ebiederm/files/kexec/"
-SRC_URI="http://www.xmission.com/~ebiederm/files/kexec/${P}.tar.gz
-	http://lse.sourceforge.net/kdump/patches/1.101-kdump10/kexec-tools-1.101-kdump10.patch"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="zlib"
-DEPEND="zlib? ( sys-libs/zlib )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${DISTDIR}"/kexec-tools-1.101-kdump10.patch
-	epatch "${FILESDIR}"/${P}-LDFLAGS.patch
-	epatch "${FILESDIR}"/${P}-ppc64.patch
-	epatch "${FILESDIR}"/kexec-linux-headers.patch
-	epatch "${FILESDIR}"/${P}-respect-LDFLAGS.patch
-}
-
-src_compile() {
-	econf $(use_with zlib) || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	doman kexec/kexec.8
-	dodoc News AUTHORS TODO
-
-	newinitd "${FILESDIR}"/kexec.init kexec
-	newconfd "${FILESDIR}"/kexec.conf kexec
-}
diff --git a/sys-apps/kexec-tools/kexec-tools-1.101-r7.ebuild b/sys-apps/kexec-tools/kexec-tools-1.101-r7.ebuild
deleted file mode 100644
index 62a0ee748e29..000000000000
--- a/sys-apps/kexec-tools/kexec-tools-1.101-r7.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kexec-tools/kexec-tools-1.101-r7.ebuild,v 1.1 2009/01/22 13:59:21 darkside Exp $
-
-inherit eutils
-
-DESCRIPTION="Load another kernel from the currently executing Linux kernel"
-HOMEPAGE="http://www.xmission.com/~ebiederm/files/kexec/"
-SRC_URI="http://www.xmission.com/~ebiederm/files/kexec/${P}.tar.gz
-	http://lse.sourceforge.net/kdump/patches/1.101-kdump10/kexec-tools-1.101-kdump10.patch"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="zlib"
-DEPEND="zlib? ( sys-libs/zlib )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${DISTDIR}"/kexec-tools-1.101-kdump10.patch
-	epatch "${FILESDIR}"/${P}-LDFLAGS.patch
-	epatch "${FILESDIR}"/${P}-ppc64.patch
-	epatch "${FILESDIR}"/kexec-linux-headers.patch
-	epatch "${FILESDIR}"/${P}-respect-LDFLAGS.patch
-}
-
-src_compile() {
-	econf $(use_with zlib) || die "econf failed"
-	sed -i -e 's/=-Wall/+=-Wall/' Makefile.conf || die
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	doman kexec/kexec.8
-	dodoc News AUTHORS TODO
-
-	newinitd "${FILESDIR}"/kexec.init kexec
-	newconfd "${FILESDIR}"/kexec.conf kexec
-}
diff --git a/sys-apps/kexec-tools/kexec-tools-2.0.0-r2.ebuild b/sys-apps/kexec-tools/kexec-tools-2.0.0-r2.ebuild
new file mode 100644
index 000000000000..73015d4cb713
--- /dev/null
+++ b/sys-apps/kexec-tools/kexec-tools-2.0.0-r2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kexec-tools/kexec-tools-2.0.0-r2.ebuild,v 1.1 2009/04/12 04:45:19 darkside Exp $
+
+EAPI=2
+
+inherit eutils
+
+DESCRIPTION="Load another kernel from the currently executing Linux kernel"
+HOMEPAGE="http://www.kernel.org/pub/linux/kernel/people/horms/kexec-tools"
+SRC_URI="mirror://kernel/linux/kernel/people/horms/kexec-tools/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="xen zlib"
+DEPEND="zlib? ( sys-libs/zlib )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-asneeded.patch"
+	epatch "${FILESDIR}/${P}-respect-LDFLAGS.patch"
+}
+
+src_configure() {
+	econf $(use_with zlib) $(use_with xen)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	doman kexec/kexec.8
+	dodoc News AUTHORS TODO
+
+	newinitd "${FILESDIR}"/kexec.init kexec || die
+	newconfd "${FILESDIR}"/kexec.conf kexec || die
+}