Bump to 3.1.2, clean out old versions

(Portage version: 2.1.3.9)

8 files changed, 12 insertions, 199 deletions

diff --git a/app-emulation/xen/ChangeLog b/app-emulation/xen/ChangeLog
index 1c6b59937471..87fc16f86d37 100644
--- a/app-emulation/xen/ChangeLog
+++ b/app-emulation/xen/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/xen
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/ChangeLog,v 1.49 2007/10/15 18:33:40 marineam Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/ChangeLog,v 1.50 2007/11/17 00:13:55 marineam Exp $
+
+*xen-3.1.2 (17 Nov 2007)
+
+  17 Nov 2007; Michael Marineau <marineam@gentoo.org> -xen-3.0.4_p1.ebuild,
+  -xen-3.1.0.ebuild, -xen-3.1.1.ebuild, +xen-3.1.2.ebuild:
+  Bump to 3.1.2, fixes CVE-2007-5906, Bug #198995. Clean out old versions.
 
 *xen-3.1.1 (15 Oct 2007)
 
diff --git a/app-emulation/xen/files/digest-xen-3.0.4_p1 b/app-emulation/xen/files/digest-xen-3.0.4_p1
deleted file mode 100644
index 7aadef066796..000000000000
--- a/app-emulation/xen/files/digest-xen-3.0.4_p1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 e85e16ad3dc354338e3ac4a8951f9649 xen-3.0.4_1-src.tgz 6473636
-RMD160 f869eec35f6afe0bc9824ce2eb4a600f789d423b xen-3.0.4_1-src.tgz 6473636
-SHA256 6b3842393e69a9c8fcdbc2789d05830aba6f1d108a6f97f1448de4a86f92a5cb xen-3.0.4_1-src.tgz 6473636
diff --git a/app-emulation/xen/files/digest-xen-3.1.0 b/app-emulation/xen/files/digest-xen-3.1.0
deleted file mode 100644
index e436de9ac59e..000000000000
--- a/app-emulation/xen/files/digest-xen-3.1.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 b7ae1f652b071862ae4c90b72d549627 xen-3.1.0-src.tgz 6831094
-RMD160 2fd65a3b81e522d0ed2d62fd11e5977167f1ceb3 xen-3.1.0-src.tgz 6831094
-SHA256 b5d7cea6deeee1439e8883fed4b3f1a8e4f675b4af8148178721f99bd76676b7 xen-3.1.0-src.tgz 6831094
diff --git a/app-emulation/xen/files/digest-xen-3.1.1 b/app-emulation/xen/files/digest-xen-3.1.1
deleted file mode 100644
index e739866b2661..000000000000
--- a/app-emulation/xen/files/digest-xen-3.1.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 d5bafac9c819206d6a85c11352cc90fd xen-3.1.1.tgz 6868014
-RMD160 23f522a76815a64ba18eaf9eec19f38ea01e8c32 xen-3.1.1.tgz 6868014
-SHA256 c6c986177e75e41e7412920d453b5b759568a90266b09e2fea6043f8890f75e2 xen-3.1.1.tgz 6868014
diff --git a/app-emulation/xen/files/digest-xen-3.1.2 b/app-emulation/xen/files/digest-xen-3.1.2
new file mode 100644
index 000000000000..9d0a411de636
--- /dev/null
+++ b/app-emulation/xen/files/digest-xen-3.1.2
@@ -0,0 +1,3 @@
+MD5 4bb2aec65694c880b5ff90a472dacca9 xen-3.1.2.tar.gz 6881935
+RMD160 c0644576a3f5d8552c7359f53a29296458804d3b xen-3.1.2.tar.gz 6881935
+SHA256 711e97d8a4e711cd0d9e368999d83366ee93296d26034e773be15964e4f6422d xen-3.1.2.tar.gz 6881935
diff --git a/app-emulation/xen/xen-3.0.4_p1.ebuild b/app-emulation/xen/xen-3.0.4_p1.ebuild
deleted file mode 100644
index 7874fc418765..000000000000
--- a/app-emulation/xen/xen-3.0.4_p1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-3.0.4_p1.ebuild,v 1.5 2007/08/27 17:19:12 marineam Exp $
-
-inherit mount-boot flag-o-matic
-
-DESCRIPTION="The Xen virtual machine monitor"
-HOMEPAGE="http://www.xensource.com/xen/xen/"
-MY_PV=${PV/_p/_}
-SRC_URI="http://bits.xensource.com/oss-xen/release/${MY_PV/_/-}/src.tgz/xen-${MY_PV}-src.tgz"
-S="${WORKDIR}/xen-${MY_PV}-src"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug custom-cflags pae"
-
-RDEPEND="|| ( sys-boot/grub
-		sys-boot/grub-static )
-		>=sys-kernel/xen-sources-2.6.16.33"
-PDEPEND="~app-emulation/xen-tools-${PV}"
-
-RESTRICT="test"
-
-# Approved by QA team in bug #144032
-QA_WX_LOAD="boot/xen-syms-${MY_PV/_/-}"
-
-pkg_setup() {
-	if [[ -z ${XEN_TARGET_ARCH} ]]; then
-		if use x86 && use amd64; then
-			die "Confusion! Both x86 and amd64 are set in your use flags!"
-		elif use x86; then
-			export XEN_TARGET_ARCH="x86_32"
-		elif use amd64; then
-			export XEN_TARGET_ARCH="x86_64"
-		else
-			die "Unsupported architecture!"
-		fi
-	fi
-}
-
-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 {} \;
-	fi
-}
-
-src_compile() {
-	local myopt
-	use debug && myopt="${myopt} debug=y"
-	use pae && myopt="${myopt} pae=y"
-
-	if use custom-cflags; then
-		filter-flags -fPIE -fstack-protector
-	else
-		unset CFLAGS
-	fi
-
-	# Send raw LDFLAGS so that --as-needed works
-	emake LDFLAGS="$(raw-ldflags)" -C xen ${myopt} || die "compile failed"
-}
-
-src_install() {
-	local myopt
-	use debug && myopt="${myopt} debug=y"
-	use pae && myopt="${myopt} pae=y"
-
-	emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" ${myopt} install-xen || die "install failed"
-}
-
-pkg_postinst() {
-	elog "Please visit the Xen and Gentoo wiki:"
-	elog "http://gentoo-wiki.com/HOWTO_Xen_and_Gentoo"
-
-	echo
-	elog "Note: xen tools have been moved to app-emulation/xen-tools"
-
-	if use pae; then
-		echo
-		ewarn "This is a PAE build of Xen. It will *only* boot PAE kernels!"
-	fi
-}
diff --git a/app-emulation/xen/xen-3.1.0.ebuild b/app-emulation/xen/xen-3.1.0.ebuild
deleted file mode 100644
index dcc4d72fbaac..000000000000
--- a/app-emulation/xen/xen-3.1.0.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-3.1.0.ebuild,v 1.2 2007/08/27 17:19:12 marineam Exp $
-
-inherit mount-boot flag-o-matic
-
-DESCRIPTION="The Xen virtual machine monitor"
-HOMEPAGE="http://www.xensource.com/xen/xen/"
-SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/src.tgz/xen-${PV}-src.tgz"
-S="${WORKDIR}/xen-${PV}-src"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug custom-cflags pae"
-
-RDEPEND="|| ( sys-boot/grub
-		sys-boot/grub-static )
-		>=sys-kernel/xen-sources-2.6.18"
-PDEPEND="~app-emulation/xen-tools-${PV}"
-
-RESTRICT="test"
-
-# Approved by QA team in bug #144032
-QA_WX_LOAD="boot/xen-syms-${PV}"
-
-pkg_setup() {
-	if [[ -z ${XEN_TARGET_ARCH} ]]; then
-		if use x86 && use amd64; then
-			die "Confusion! Both x86 and amd64 are set in your use flags!"
-		elif use x86; then
-			export XEN_TARGET_ARCH="x86_32"
-		elif use amd64; then
-			export XEN_TARGET_ARCH="x86_64"
-		else
-			die "Unsupported architecture!"
-		fi
-	fi
-}
-
-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 {} \;
-	fi
-}
-
-src_compile() {
-	local myopt
-	use debug && myopt="${myopt} debug=y"
-	use pae && myopt="${myopt} pae=y"
-
-	if use custom-cflags; then
-		filter-flags -fPIE -fstack-protector
-	else
-		unset CFLAGS
-	fi
-
-	# Send raw LDFLAGS so that --as-needed works
-	emake LDFLAGS="$(raw-ldflags)" -C xen ${myopt} || die "compile failed"
-}
-
-src_install() {
-	local myopt
-	use debug && myopt="${myopt} debug=y"
-	use pae && myopt="${myopt} pae=y"
-
-	emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install || die "install failed"
-}
-
-pkg_postinst() {
-	elog "Please visit the Xen and Gentoo wiki:"
-	elog "http://gentoo-wiki.com/HOWTO_Xen_and_Gentoo"
-
-	echo
-	elog "Note: xen tools have been moved to app-emulation/xen-tools"
-
-	if use pae; then
-		echo
-		ewarn "This is a PAE build of Xen. It will *only* boot PAE kernels!"
-	fi
-}
diff --git a/app-emulation/xen/xen-3.1.1.ebuild b/app-emulation/xen/xen-3.1.2.ebuild
index ee4ae38a5603..8fa1e718e331 100644
--- a/app-emulation/xen/xen-3.1.1.ebuild
+++ b/app-emulation/xen/xen-3.1.2.ebuild
@@ -1,16 +1,12 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-3.1.1.ebuild,v 1.1 2007/10/15 18:33:40 marineam Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-3.1.2.ebuild,v 1.1 2007/11/17 00:13:55 marineam Exp $
 
 inherit mount-boot flag-o-matic
 
 DESCRIPTION="The Xen virtual machine monitor"
 HOMEPAGE="http://www.xensource.com/xen/xen/"
-#SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/src.tgz/xen-${PV}-src.tgz"
-#S="${WORKDIR}/xen-${PV}-src"
-
-# Temporary while we wait on the upstream tarball
-SRC_URI="http://dev.gentoo.org/~marineam/files/xen/xen-${PV}.tgz"
+SRC_URI="mirror://gentoo/xen-${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"