Version bump to 2.0.0 and allign -9999 ebuild with 2.0.0 (style changes). New use flag to disable extended xen support if desired.

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

6 files changed, 80 insertions, 12 deletions

diff --git a/sys-apps/kexec-tools/ChangeLog b/sys-apps/kexec-tools/ChangeLog
index 19dfedfc8fa9..36e679302c16 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.24 2009/01/22 13:59:21 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kexec-tools/ChangeLog,v 1.25 2009/01/23 04:43:47 darkside Exp $
+
+*kexec-tools-2.0.0 (23 Jan 2009)
+
+  23 Jan 2009; Jeremy Olexa <darkside@gentoo.org>
+  +files/kexec-tools-2.0.0-asneeded.patch, metadata.xml,
+  +kexec-tools-2.0.0.ebuild, kexec-tools-9999.ebuild:
+  Version bump to 2.0.0 and allign -9999 ebuild with 2.0.0 (style changes).
+  New use flag to disable extended xen support if desired.
 
 *kexec-tools-1.101-r7 (22 Jan 2009)
 
diff --git a/sys-apps/kexec-tools/Manifest b/sys-apps/kexec-tools/Manifest
index 406866df360b..e7912f2cfd6f 100644
--- a/sys-apps/kexec-tools/Manifest
+++ b/sys-apps/kexec-tools/Manifest
@@ -2,12 +2,15 @@ AUX kexec-linux-headers.patch 410 RMD160 52dad63608d804132e81886e4822e6efbc8cf1a
 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
 AUX kexec-tools-1.101-respect-LDFLAGS.patch 544 RMD160 a20e704e12e4eebc416e6ed4f8b51d6f1f5bfa3d SHA1 8e5c7e32c5983348f6a98c7673818aabd41d7e44 SHA256 26f36df57500a8e1569a129199b8a22d914a15ca09e977a2341ede659a67ccba
+AUX kexec-tools-2.0.0-asneeded.patch 649 RMD160 e4686dbdd2acb6713499553b1a8141857f517876 SHA1 75ea096fab33f3173d17207f23e1471c12c7b776 SHA256 734774df849124ebd3202b57a47a025f9b6e9d94585f0257b282a2d5e214db06
 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
+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-9999.ebuild 953 RMD160 851b9c51570659efc9de62a36941d3d7a4be5e7c SHA1 966bb2d98e76939c60e42c3ebf05084c720a12de SHA256 7762137c50dde955667d703084d2967784eacb42f2563aab6efaef7d8175147c
-MISC ChangeLog 5269 RMD160 9923b70584a2beff6139915c8f67eaad942d4c1f SHA1 457e0bb89d5044b1be4128417c0a413842857358 SHA256 c0c8e84ac3f7d6bfe378db915d2be71c5a1f57a9cc2abb74b46c54816d49c2e3
-MISC metadata.xml 236 RMD160 90bc28a96b66cace5ee4740e930c387d088e8f77 SHA1 0805185dd37cdb670bd5ddf5d35ab86271009574 SHA256 26e8247c181c7cf65e7f549b14d2d97fc846db0cbb1fdc8f7e1f13a4fd723694
+EBUILD kexec-tools-2.0.0.ebuild 938 RMD160 d5dc2f988b4b9e6fa62ac0e62036d1d67d9578ec SHA1 9298fb37a24875c1a470ca7b18b850f756a04e6b SHA256 9f684a177430ec0e859c1b79ed86204b09e489d3da5dc48fd781bc26b097aa78
+EBUILD kexec-tools-9999.ebuild 965 RMD160 d8352bef2a700ff169d82b1a7f3081cbd8b32814 SHA1 7c0f4c1ca0a2fde7b6b932040252616d618edb45 SHA256 1482ab267103c9a27a9d45b3525adccc6e54397a0859947ab3c0ad8aaa0b135c
+MISC ChangeLog 5600 RMD160 0569e4ecbcf2b55d85d15c6bf7ef2841f77bccdd SHA1 71085c747c3bf8a8068041d22a52bbdbac6ac7df SHA256 f8e90c577ab212d49f3d96c9e805f552163bd9dc15b0ae733fc467f991eab11c
+MISC metadata.xml 308 RMD160 ebcbfa349cc9f60484d74d64dae06be917cbbca0 SHA1 160fb93fc9e88f6e1f6d61c08cc307a87b3515e0 SHA256 785b4a06ad58f26e4e142c40b74a2e5955912f822fa810b6428835b49871d0f1
diff --git a/sys-apps/kexec-tools/files/kexec-tools-2.0.0-asneeded.patch b/sys-apps/kexec-tools/files/kexec-tools-2.0.0-asneeded.patch
new file mode 100644
index 000000000000..71c6303694fd
--- /dev/null
+++ b/sys-apps/kexec-tools/files/kexec-tools-2.0.0-asneeded.patch
@@ -0,0 +1,17 @@
+Upstream already:
+http://git.kernel.org/?p=linux/kernel/git/horms/kexec-tools.git;a=blobdiff;f=kexec/Makefile;h=99949c44f94e5c727d6e379e86bb373730e74237;hp=61479040891440a76d95771b8f9d318526cb83fa;hb=6abf3ba5dc63ef670010927d5572d38c3ce2a587;hpb=8108aeeef14a2ab40756e90c980ac09687eff007
+
+--- kexec/Makefile.orig	2009-01-22 22:09:36.502007555 -0600
++++ kexec/Makefile	2009-01-22 22:10:21.644256852 -0600
+@@ -67,10 +67,9 @@
+ 
+ -include $(KEXEC_DEPS)
+ 
+-$(KEXEC): LDFLAGS+=$(LIBS)
+ $(KEXEC): $(KEXEC_OBJS) $(UTIL_LIB)
+ 	@$(MKDIR) -p $(@D)
+-	$(LINK.o) -o $@ $^
++	$(LINK.o) -o $@ $^ $(LIBS)
+ 
+ $(KEXEC): CPPFLAGS+=-I$(srcdir)/kexec/arch/$(ARCH)/include
+ 
diff --git a/sys-apps/kexec-tools/kexec-tools-2.0.0.ebuild b/sys-apps/kexec-tools/kexec-tools-2.0.0.ebuild
new file mode 100644
index 000000000000..bfe1fcfaec3c
--- /dev/null
+++ b/sys-apps/kexec-tools/kexec-tools-2.0.0.ebuild
@@ -0,0 +1,36 @@
+# 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.ebuild,v 1.1 2009/01/23 04:43:47 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://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"
+}
+
+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
+}
diff --git a/sys-apps/kexec-tools/kexec-tools-9999.ebuild b/sys-apps/kexec-tools/kexec-tools-9999.ebuild
index 5b96c58c2541..ecce918790ab 100644
--- a/sys-apps/kexec-tools/kexec-tools-9999.ebuild
+++ b/sys-apps/kexec-tools/kexec-tools-9999.ebuild
@@ -1,6 +1,8 @@
 # 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-9999.ebuild,v 1.3 2009/01/22 13:40:38 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kexec-tools/kexec-tools-9999.ebuild,v 1.4 2009/01/23 04:43:47 darkside Exp $
+
+EAPI=2
 
 EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/horms/kexec-tools.git"
 inherit git autotools
@@ -12,9 +14,9 @@ SRC_URI=""
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="zlib"
-
+IUSE="xen zlib"
 DEPEND="zlib? ( sys-libs/zlib )"
+RDEPEND="${DEPEND}"
 
 src_unpack() {
 	git_src_unpack
@@ -22,9 +24,8 @@ src_unpack() {
 	eautoreconf
 }
 
-src_compile() {
-	econf $(use_with zlib) || die "econf failed"
-	emake || die "emake failed"
+src_configure() {
+	econf $(use_with zlib) $(use_with xen)
 }
 
 src_install() {
@@ -33,6 +34,6 @@ src_install() {
 	doman kexec/kexec.8
 	dodoc News AUTHORS TODO doc/*.txt
 
-	newinitd "${FILESDIR}"/kexec.init kexec
-	newconfd "${FILESDIR}"/kexec.conf kexec
+	newinitd "${FILESDIR}"/kexec.init kexec || die
+	newconfd "${FILESDIR}"/kexec.conf kexec || die
 }
diff --git a/sys-apps/kexec-tools/metadata.xml b/sys-apps/kexec-tools/metadata.xml
index 8fb90c7b5baf..272063138b04 100644
--- a/sys-apps/kexec-tools/metadata.xml
+++ b/sys-apps/kexec-tools/metadata.xml
@@ -5,4 +5,7 @@
   <maintainer>
     <email>darkside@gentoo.org</email>
   </maintainer>
+  <use>
+	  <flag name='xen'>Enable extended xen support</flag>
+  </use>
 </pkgmetadata>