bump, #129191

Package-Manager: portage-2.1_pre7-r5

8 files changed, 249 insertions, 28 deletions

diff --git a/app-emulation/xen-tools/ChangeLog b/app-emulation/xen-tools/ChangeLog
index f8a18476c604..a3aaa149c18c 100644
--- a/app-emulation/xen-tools/ChangeLog
+++ b/app-emulation/xen-tools/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-emulation/xen-tools
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.2 2006/04/01 02:06:55 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.3 2006/04/09 21:26:48 chrb Exp $
+
+*xen-tools-3.0.2 (09 Apr 2006)
+
+  09 Apr 2006; <chrb@gentoo.org> +xen-tools-3.0.2.ebuild:
+  bump, #129191
 
   01 Apr 2006; Aron Griffis <agriffis@gentoo.org> xen-tools-3.0.1.ebuild,
   xen-tools-3.0.1_p9029.ebuild:
diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest
index 026665341a1c..6bc6e425feef 100644
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@@ -1,15 +1,15 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 c2abb924dab166d72787f1dd9ba918e4 ChangeLog 1004
-RMD160 131bb89e355bbfb51f9b8ac908cde95e6a698b2f ChangeLog 1004
-SHA256 12e4054b3f9cedbf478c05adc97330c5d784abd00abd351a97c16a41031a0eb5 ChangeLog 1004
+MD5 ab641546c7cfcf22226fe0b63331a013 ChangeLog 1111
+RMD160 efb25d59216018b8eeb5f82738e13ed244425361 ChangeLog 1111
+SHA256 6f0b66e5ede6183e5120528044120b300c5e99be956d04ecc26d7de8c4300e47 ChangeLog 1111
 MD5 f286994bc4b6be508d4a9e943b44794b files/digest-xen-tools-3.0.1 235
 RMD160 77a42023b130ceef29f79a0c28742a7e8731eadf files/digest-xen-tools-3.0.1 235
 SHA256 2bdbb205f6f9f9ed4a9a06093a63768214a9d14df48cf32e0f10c2cbfbfb8098 files/digest-xen-tools-3.0.1 235
 MD5 2ddf0133ffa840ddb0ff85770d2a8770 files/digest-xen-tools-3.0.1_p9029 259
 RMD160 79c9eaf49563f42eea950aea8597fa1cc309786e files/digest-xen-tools-3.0.1_p9029 259
 SHA256 a035a6a1cd2752da07db13617674322479f049833240b801f7ad828ddab38557 files/digest-xen-tools-3.0.1_p9029 259
+MD5 6923762444fb7024862461773f66c0e6 files/digest-xen-tools-3.0.2 235
+RMD160 81bcec08f6decd6b204f370926fb43afc1b5248d files/digest-xen-tools-3.0.2 235
+SHA256 a1c65be37f1287699413ecebc10f13f7447db890995c5c2fc9cefc0e3845f86e files/digest-xen-tools-3.0.2 235
 MD5 0664978b7f05728a0f4ffdbacec90f01 files/xend-conf 357
 RMD160 e2b04f3d7cfb4fa8407adf2a4470e461901f9681 files/xend-conf 357
 SHA256 7edcef347bfd373144140883ff9f38c9ff76614b71d912759fa635fb840911bc files/xend-conf 357
@@ -31,10 +31,6 @@ SHA256 c2a5eeabbd6fa369faa3a23b98b96b525c728bc11480dc5a4b9425f3cd9c8c88 xen-tool
 MD5 7bdb691d507e782cc8789d35661e1690 xen-tools-3.0.1_p9029.ebuild 3362
 RMD160 8607db57f8b0192edb03c609a08a6b3d0d94d5db xen-tools-3.0.1_p9029.ebuild 3362
 SHA256 e0537312563f6fa1a610ed2bb8e696bbf6deaaf95d34ec347a1904af5086e66c xen-tools-3.0.1_p9029.ebuild 3362
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.1 (GNU/Linux)
-
-iD8DBQFELeBKJrHF4yAQTrARAj5jAJ9Yi2e6AoPc6mOoeNiNJjQmNTKkBwCfROvM
-lFmKp47kFVNpllOwWm3aYvw=
-=gJl1
------END PGP SIGNATURE-----
+MD5 c2c6247a847c33cf95d185bd854db22d xen-tools-3.0.2.ebuild 3363
+RMD160 c050efc21a14208f04119f739f395dfe571ae583 xen-tools-3.0.2.ebuild 3363
+SHA256 c2a5eeabbd6fa369faa3a23b98b96b525c728bc11480dc5a4b9425f3cd9c8c88 xen-tools-3.0.2.ebuild 3363
diff --git a/app-emulation/xen-tools/files/digest-xen-tools-3.0.2 b/app-emulation/xen-tools/files/digest-xen-tools-3.0.2
new file mode 100644
index 000000000000..d0716148e4b2
--- /dev/null
+++ b/app-emulation/xen-tools/files/digest-xen-tools-3.0.2
@@ -0,0 +1,3 @@
+MD5 0a09976ccad6c627ef62a53e17780998 xen-3.0.2-src.tgz 4932396
+RMD160 8622621e7c42e2fa61ca15b463977a3dda3138a0 xen-3.0.2-src.tgz 4932396
+SHA256 3aed5343183d49250d5ea8ace7e2536a4860faebe28958beb8e9d864e76d1202 xen-3.0.2-src.tgz 4932396
diff --git a/app-emulation/xen-tools/xen-tools-3.0.2.ebuild b/app-emulation/xen-tools/xen-tools-3.0.2.ebuild
new file mode 100644
index 000000000000..62d3a827f773
--- /dev/null
+++ b/app-emulation/xen-tools/xen-tools-3.0.2.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-3.0.2.ebuild,v 1.1 2006/04/09 21:26:48 chrb Exp $
+
+inherit mount-boot flag-o-matic eutils
+
+DESCRIPTION="Xend daemon and tools"
+HOMEPAGE="http://xen.sourceforge.net"
+if [[ ${PV} == *_p* ]]; then
+	XEN_UNSTABLE="xen-unstable-${PV#*_p}"
+	SRC_URI="mirror://gentoo/${XEN_UNSTABLE}.tar.bz2"
+	S=${WORKDIR}/${XEN_UNSTABLE}
+else
+	SRC_URI="http://www.cl.cam.ac.uk/Research/SRG/netos/xen/downloads/xen-${PV}-src.tgz"
+	S=${WORKDIR}/xen-${PV}
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~x86"
+IUSE="doc debug screen custom-cflags"
+
+DEPEND="sys-devel/gcc
+	dev-lang/python"
+
+RDEPEND="!<app-emulation/xen-3.0.1-r5
+	dev-lang/python
+	sys-apps/iproute2
+	net-misc/bridge-utils
+	sys-libs/zlib
+	doc? (
+		dev-tex/latex2html
+		media-gfx/transfig
+	)
+	screen? (
+		app-misc/screen
+		app-admin/logrotate
+	)
+	|| ( sys-fs/udev sys-apps/hotplug )"
+
+src_unpack() {
+	unpack ${A}
+	# if the user *really* wants to use their own custom-cflags, let them
+	if use custom-cflags; then
+		einfo "User wants their own CFLAGS - removing defaults"
+		# try and remove all the default custom-cflags
+		find ${S} -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \
+			-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
+			-i {} \;
+		# odd fixes
+		sed -e "s/int mode/int mode=-1/" -i ${S}/tools/misc/xc_shadow.c
+	fi
+}
+
+src_compile() {
+	local myopt
+	use debug && myopt="${myopt} debug=y"
+
+	if use custom-cflags; then
+		filter-flags -fPIE -fstack-protector
+	else
+		unset CFLAGS
+	fi
+
+	emake -C tools ${myopt} || die "compile failed"
+
+	if use doc; then
+		sh ./docs/check_pkgs || die "package check failed"
+		make -C docs ${myopt} || die "compiling docs failed"
+	fi
+}
+
+src_install() {
+	local myopt="XEN_PYTHON_NATIVE_INSTALL=1"
+
+	make DESTDIR=${D} ${myopt} install-tools \
+		|| die "install failed"
+
+	if use doc; then
+		make DESTDIR=${D} -C docs install || die "install docs failed"
+		# Rename doc/xen to the Gentoo-style doc/xen-x.y
+		mv ${D}/usr/share/doc/{${PN},${PF}}
+	fi
+
+	newinitd ${FILESDIR}/xend-init xend
+	newconfd ${FILESDIR}/xend-conf xend
+	newconfd ${FILESDIR}/xendomains-conf xendomains
+	newinitd ${FILESDIR}/xendomains-init xendomains
+
+	if use screen; then
+		sed -i -e 's/SCREEN="no"/SCREEN="yes"/' ${D}/etc/init.d/xendomains
+	fi
+
+	# xend expects these to exist
+	keepdir /var/run/xenstored /var/lib/xenstored /var/xen/dump
+
+	# for upstream change tracking
+	if [[ -n ${XEN_UNSTABLE} ]]; then
+		dodoc ${S}/XEN-VERSION
+	fi
+}
+
+pkg_postinst() {
+	einfo "Please visit the Xen and Gentoo wiki:"
+	einfo "http://gentoo-wiki.com/HOWTO_Xen_and_Gentoo"
+
+	if ! built_with_use dev-lang/python ncurses; then
+		echo
+		ewarn "NB: Your dev-lang/python is built without USE=ncurses."
+		ewarn "Please rebuild python with USE=ncurses to make use of xenmon.py."
+	fi
+
+	if [[ -n ${XEN_UNSTABLE} ]]; then
+		echo
+		einfo "This is a snapshot of the xen-unstable tree."
+		einfo "Please report bugs in xen itself (and not the packaging) to"
+		einfo "bugzilla.xensource.com"
+	fi
+}
diff --git a/app-emulation/xen/ChangeLog b/app-emulation/xen/ChangeLog
index b030bb373122..9688bb55a352 100644
--- a/app-emulation/xen/ChangeLog
+++ b/app-emulation/xen/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-emulation/xen
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/ChangeLog,v 1.31 2006/04/01 14:30:49 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/ChangeLog,v 1.32 2006/04/09 21:24:11 chrb Exp $
+
+*xen-3.0.2 (09 Apr 2006)
+
+  09 Apr 2006; <chrb@gentoo.org> +xen-3.0.2.ebuild:
+  bump, #129191
 
 *xen-3.0.1_p9029 (24 Mar 2006)
 *xen-3.0.1-r5 (24 Mar 2006)
diff --git a/app-emulation/xen/Manifest b/app-emulation/xen/Manifest
index 3fc7866565bc..5013cf97a1fe 100644
--- a/app-emulation/xen/Manifest
+++ b/app-emulation/xen/Manifest
@@ -1,9 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 24527d23e7e44437236ced780d538f60 ChangeLog 5657
-RMD160 141a9b2d72defe0009ee3068e8455fbfe8053d3e ChangeLog 5657
-SHA256 515c3c99d33b9f8cf2ede2b0c00cdd5e6a0fb453379121680e2546f3b10c0004 ChangeLog 5657
+MD5 80b4f6aadbb4511955acdc4a33a3071c ChangeLog 5752
+RMD160 035ef8b9f6991f0ba266a4dd3283ddba7c65becf ChangeLog 5752
+SHA256 aa0d50dbb1537fcaf09dac0d650c248d6a4016beacfcae1f9f7c6c9d08894959 ChangeLog 5752
 MD5 7934c87d6994825fb9e8ff09a531d0ae files/digest-xen-3.0.1-r4 63
 RMD160 897e07562d499a7ac4f74f324031738527ae38e2 files/digest-xen-3.0.1-r4 63
 SHA256 b503a88ad3b4457384161967969c3d341ab7f3b09bf0925e925270650fb8d378 files/digest-xen-3.0.1-r4 63
@@ -13,6 +10,9 @@ SHA256 2bdbb205f6f9f9ed4a9a06093a63768214a9d14df48cf32e0f10c2cbfbfb8098 files/di
 MD5 2ddf0133ffa840ddb0ff85770d2a8770 files/digest-xen-3.0.1_p9029 259
 RMD160 79c9eaf49563f42eea950aea8597fa1cc309786e files/digest-xen-3.0.1_p9029 259
 SHA256 a035a6a1cd2752da07db13617674322479f049833240b801f7ad828ddab38557 files/digest-xen-3.0.1_p9029 259
+MD5 6923762444fb7024862461773f66c0e6 files/digest-xen-3.0.2 235
+RMD160 81bcec08f6decd6b204f370926fb43afc1b5248d files/digest-xen-3.0.2 235
+SHA256 a1c65be37f1287699413ecebc10f13f7447db890995c5c2fc9cefc0e3845f86e files/digest-xen-3.0.2 235
 MD5 cbd69f44ee0f0649253e7ab4af11d909 files/gentoo-makefile-targets 118
 RMD160 0ffa087d15a57377b5a32356bdb4f264e4f04f01 files/gentoo-makefile-targets 118
 SHA256 21f04a03aeeba9862740669f77b846f1c4745e6d1e070e582fb9312b364f2df9 files/gentoo-makefile-targets 118
@@ -40,10 +40,6 @@ SHA256 e1f71b0d9e846579baa33980e05bbe2ebe84c0d8d3ca19a7f155c67a12d0077b xen-3.0.
 MD5 27f160e7574f05519ba83c939c613f20 xen-3.0.1_p9029.ebuild 2517
 RMD160 f26b29f05521daabfcaa884fb2f98534dca21531 xen-3.0.1_p9029.ebuild 2517
 SHA256 8a9a73aa307faa4a0c7d7833af43575a39377558a5be74eb8ca910a3e70d78c3 xen-3.0.1_p9029.ebuild 2517
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.1 (GNU/Linux)
-
-iD8DBQFELo6kJrHF4yAQTrARAmDuAKCdQyQoytEnLjXdgvZUqLaVA3xvwwCgix80
-scvVBB6hxvZs8Db9dHV/LBA=
-=+Q8E
------END PGP SIGNATURE-----
+MD5 e2bbac44200cdfcd90bf22eafd18f8c5 xen-3.0.2.ebuild 2514
+RMD160 94acb0f6be5c4b5bd0b9bffc95a2f72928e4433b xen-3.0.2.ebuild 2514
+SHA256 e1f71b0d9e846579baa33980e05bbe2ebe84c0d8d3ca19a7f155c67a12d0077b xen-3.0.2.ebuild 2514
diff --git a/app-emulation/xen/files/digest-xen-3.0.2 b/app-emulation/xen/files/digest-xen-3.0.2
new file mode 100644
index 000000000000..d0716148e4b2
--- /dev/null
+++ b/app-emulation/xen/files/digest-xen-3.0.2
@@ -0,0 +1,3 @@
+MD5 0a09976ccad6c627ef62a53e17780998 xen-3.0.2-src.tgz 4932396
+RMD160 8622621e7c42e2fa61ca15b463977a3dda3138a0 xen-3.0.2-src.tgz 4932396
+SHA256 3aed5343183d49250d5ea8ace7e2536a4860faebe28958beb8e9d864e76d1202 xen-3.0.2-src.tgz 4932396
diff --git a/app-emulation/xen/xen-3.0.2.ebuild b/app-emulation/xen/xen-3.0.2.ebuild
new file mode 100644
index 000000000000..57e5bab703ed
--- /dev/null
+++ b/app-emulation/xen/xen-3.0.2.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-3.0.2.ebuild,v 1.1 2006/04/09 21:24:11 chrb Exp $
+
+inherit mount-boot flag-o-matic
+
+DESCRIPTION="The Xen virtual machine monitor"
+HOMEPAGE="http://xen.sourceforge.net"
+if [[ ${PV} == *_p* ]]; then
+	XEN_UNSTABLE="xen-unstable-${PV#*_p}"
+	SRC_URI="mirror://gentoo/${XEN_UNSTABLE}.tar.bz2"
+	S=${WORKDIR}/${XEN_UNSTABLE}
+else
+	SRC_URI="http://www.cl.cam.ac.uk/Research/SRG/netos/xen/downloads/${P}-src.tgz"
+	S=${WORKDIR}/xen-${PV}
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug custom-cflags pae"
+
+DEPEND="sys-devel/dev86"
+RDEPEND=""
+
+src_unpack() {
+	unpack ${A}
+	# if the user *really* wants to use their own custom-cflags, let them
+	if use custom-cflags; then
+		einfo "User wants their own CFLAGS - removing defaults"
+		# try and remove all the default custom-cflags
+		find ${S} -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \
+			-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
+			-i {} \;
+		# odd fixes
+		sed -e "s/int mode/int mode=-1/" -i ${S}/tools/misc/xc_shadow.c
+	fi
+}
+
+src_compile() {
+	local myopt
+	use debug && myopt="${myopt} debug=y"
+	use pae && myopt="${myopt} XEN_TARGET_X86_PAE=y"
+
+	if use custom-cflags; then
+		filter-flags -fPIE -fstack-protector
+	else
+		unset CFLAGS
+	fi
+
+	emake -C xen ${myopt} || die "compile failed"
+}
+
+src_install() {
+	local myopt
+	use pae && myopt="${myopt} XEN_TARGET_X86_PAE=y"
+
+	make DESTDIR=${D} ${myopt} install-xen \
+		|| die "install failed"
+
+	# for upstream change tracking
+	if [[ -n ${XEN_UNSTABLE} ]]; then
+		dodoc ${S}/XEN-VERSION
+	fi
+}
+
+pkg_postinst() {
+	einfo "Please visit the Xen and Gentoo wiki:"
+	einfo "http://gentoo-wiki.com/HOWTO_Xen_and_Gentoo"
+
+	echo
+	einfo "Note: xen tools have been moved to app-emulation/xen-tools;"
+	einfo "you need to install that package to manage your domains."
+
+	if [[ -n ${XEN_UNSTABLE} ]]; then
+		echo
+		einfo "This is a snapshot of the xen-unstable tree."
+		einfo "Please report bugs in xen itself (and not the packaging) to"
+		einfo "bugzilla.xensource.com"
+	fi
+
+	if use pae; then
+		echo
+		einfo "This is a PAE build of Xen. It will *only* boot PAE kernels!"
+	fi
+}