Version bump; prune old ebuilds in overlay

svn path=/trunk/; revision=715

5 files changed, 20 insertions, 328 deletions

diff --git a/app-emulation/virtualbox-guest-additions/ChangeLog b/app-emulation/virtualbox-guest-additions/ChangeLog
index a5558ba..3af3d88 100644
--- a/app-emulation/virtualbox-guest-additions/ChangeLog
+++ b/app-emulation/virtualbox-guest-additions/ChangeLog
@@ -1,17 +1,21 @@
 # ChangeLog for app-emulation/virtualbox-guest-additions
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/ChangeLog,v 1.13 2009/06/01 00:24:41 patrick Exp $
-
-  10 Jul 2009; Alessio Cassibba (X-Drum) <swapon@gmail.com>
-  -virtualbox-guest-additions-3.0.0.ebuild,
-  +virtualbox-guest-additions-3.0.2.ebuild:
-  Version bump; drop release 3.0.0
-
-  02 Jul 2009; Alessio Cassibba (X-Drum) <swapon@gmail.com>
-  +files/virtualbox-guest-additions-3.initd,
-  +virtualbox-guest-additions-3.0.0.ebuild:
-  Version bump; drop vboxadd-timesync; add new vboxadd-service binary;
-  add new virtualbox-guest-additions initd
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/ChangeLog,v 1.14 2009/07/16 21:42:07 patrick Exp $
+
+  05 Aug 2009; Alessio Cassibba (X-Drum) <swapon@gmail.com>
+  -virtualbox-guest-additions-2.2.2.ebuild,
+  -virtualbox-guest-additions-2.2.4.ebuild,
+  -virtualbox-guest-additions-3.0.2.ebuild,
+  +virtualbox-guest-additions-3.0.4.ebuild:
+  Version bump; prune old ebuilds in overlay
+
+*virtualbox-guest-additions-3.0.2 (16 Jul 2009)
+
+  16 Jul 2009; Patrick Lauer <patrick@gentoo.org>
+  +virtualbox-guest-additions-3.0.2.ebuild,
+  +files/virtualbox-guest-additions-3.initd:
+  Bump to 3.0.2. Fixes #275963. Thanks to Alessio Cassiba and all the
+  testers
 
 *virtualbox-guest-additions-2.2.4 (01 Jun 2009)
 
diff --git a/app-emulation/virtualbox-guest-additions/Manifest b/app-emulation/virtualbox-guest-additions/Manifest
index 4f7127d..9832ae0 100644
--- a/app-emulation/virtualbox-guest-additions/Manifest
+++ b/app-emulation/virtualbox-guest-additions/Manifest
@@ -1,11 +1,7 @@
 AUX virtualbox-guest-additions-2-localconfig 877 RMD160 7a09c0e50c1294c289cfd0665dc29986e55f2f7c SHA1 186a04d197c4f1a22376f767b4804cb05a8c811a SHA256 0115ff252376fa9c1244f79f183041a8e1b078f64d8bea2126d344e8b21a7b84
 AUX virtualbox-guest-additions-3.initd 1434 RMD160 b03f21d0d143abc686d514eda1ffa74d6be502c1 SHA1 7345f0aa3b06483ed184fa7f78264468a4843e49 SHA256 0ac8a47686ba2d428a935d263fc13146ce3078a78df32795dc3e97580c93da72
 AUX virtualbox-guest-additions.initd 1463 RMD160 4daceefa3e10659381f4b714512548944c7f54fd SHA1 f5290150bbf99feac5c6d81c4f82f9191e5f1786 SHA256 933dbdc5e5363dfbdc2d51deed0726ab91f1ea89e330298266b9ffb03c38989a
-DIST VirtualBox-2.2.2-OSE.tar.bz2 50937824 RMD160 b29f67dff7c9432d373bf62447e708bbdff92693 SHA1 31d928b786d9c1ca4cc30fd8c6d9089aceb05cad SHA256 868ccdfaa9f2d364ba1cf407234d59713a464837e4012104e5a2a5b2ad4c2d5d
-DIST VirtualBox-2.2.4-OSE.tar.bz2 50948689 RMD160 12577f01568e362d6285aa19eeb8eeb9ca6eadb7 SHA1 ebc5566c4b8115c649a82bde743e94ea62ed1a26 SHA256 b5d52a67b94510275eb3dc8649eb7d3063446da4f3ac038f821d598c62b5d6c5
-DIST VirtualBox-3.0.2-OSE.tar.bz2 51322139 RMD160 9d33f82cf0ef2ca001fd61b9b26583ca2ad32a5a SHA1 442206e7dfcf6719b7ee452f9f042563acd6f0eb SHA256 41ee0fc47103aeeae8301f7b75d358662ff0f05e5874b9775641d6a9b9e39fe8
-EBUILD virtualbox-guest-additions-2.2.2.ebuild 4250 RMD160 101e4bcef6dcb657bb811f7c7bf730a3a41da6ff SHA1 9be3d0d8dfaa7b0c3f2a469a542cfff5765fdfd3 SHA256 3323b1aa0e6014fdb5970ab1df380d6da5bb14309f7171bc24c554ea3d7cb939
-EBUILD virtualbox-guest-additions-2.2.4.ebuild 4107 RMD160 5b136a773f37cc1899e5ec35c74fe1dee731bf67 SHA1 db8005ab68c240d0c2604777db773bd406432d26 SHA256 613fa0d803200243c008453ab181789332ce4245c9502a59080e03df334e7ac7
-EBUILD virtualbox-guest-additions-3.0.2.ebuild 4205 RMD160 50cc9f09ed9be5f678c454bf5be1c0fc47394cc6 SHA1 f67dc4e4677e21c9d2052a63fe879d93ff7674f6 SHA256 6f962d931d4b338bb016d2db22952661690aa6f10ab6a1dbc2c9cea41478fdca
-MISC ChangeLog 9436 RMD160 f69dc0a80adac7b649f8aa07544b38f05355ec11 SHA1 94ddc2034a1d6080a90e63da1753cc4a9f720603 SHA256 53537099662178cf5755afd3dd320614de03d246324b6a423ad952006f128f9a
+DIST VirtualBox-3.0.4-OSE.tar.bz2 51381059 RMD160 7addc9d840ef751d95356a342c6a51f2c87a855b SHA1 454f4fbd46a3c7bfa0f6e48eaa37bb578446aca5 SHA256 006a25df51a209262ee93b8cf3f155e1883fa872b4b8c5d77f042675a0f302e1
+EBUILD virtualbox-guest-additions-3.0.4.ebuild 4205 RMD160 57e0b3ddc3b64b6ed2eca13e1e54bf4e6038e6a6 SHA1 dda080ffa32b4f44977169c717b57b05fbb7bdb4 SHA256 d9c4ff2a8d7c2b83426ff07dd6e0f416190d1e5dbca8143a24d083b8383059e8
+MISC ChangeLog 9539 RMD160 4a5cb74fa5143c1cbfb505ba6928f11f8892fca7 SHA1 337c5d7f7f0daf35c6af3ae62d62e254d91e464f SHA256 b6f7a38b8873005d6c2c9f8b02cb26d9684dbf140907f160679737bd7256a497
 MISC metadata.xml 344 RMD160 12935d5b21be85bc4222fd06371c93dcbf6f534e SHA1 68b99919921f246738cce4350b77d895e7c78106 SHA256 fff5aeb6f453d2e137765ca5016e81344cb0cd0cecd51d81bbb889cb1d7a5ba9
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-2.2.2.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-2.2.2.ebuild
deleted file mode 100644
index 6402529..0000000
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-2.2.2.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-2.2.2.ebuild,v 1.1 2009/04/30 16:24:56 patrick Exp $
-
-inherit eutils linux-mod
-
-MY_P=VirtualBox-${PV}-OSE
-DESCRIPTION="VirtualBox kernel modules and user-space tools for Linux guests"
-HOMEPAGE="http://www.virtualbox.org/"
-SRC_URI="http://download.virtualbox.org/virtualbox/${PV}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="X"
-
-RDEPEND="X? ( ~x11-drivers/xf86-video-virtualbox-${PV}
-			 ~x11-drivers/xf86-input-virtualbox-${PV}
-			 x11-apps/xrandr
-			 x11-apps/xrefresh
-			 x11-libs/libXmu
-			 x11-libs/libX11
-			 x11-libs/libXt
-			 x11-libs/libXext
-			 x11-libs/libXau
-			 x11-libs/libXdmcp
-			 x11-libs/libSM
-			 x11-libs/libICE
-			 amd64? ( app-emulation/emul-linux-x86-xlibs ) )"
-DEPEND="${RDEPEND}
-		>=dev-util/kbuild-0.1.5-r1
-		>=dev-lang/yasm-0.6.2
-		sys-devel/bin86
-		sys-devel/dev86
-		sys-power/iasl
-		X? ( x11-proto/renderproto )"
-
-BUILD_TARGETS="all"
-BUILD_TARGET_ARCH="${ARCH}"
-MODULE_NAMES="vboxadd(misc:${WORKDIR}/vboxadd:${WORKDIR}/vboxadd)
-			vboxvfs(misc:${WORKDIR}/vboxvfs:${WORKDIR}/vboxvfs)"
-
-S=${WORKDIR}/${MY_P/-OSE/_OSE}
-
-pkg_setup() {
-		linux-mod_pkg_setup
-		BUILD_PARAMS="KERN_DIR=${KV_DIR} KERNOUT=${KV_OUT_DIR}"
-		enewgroup vboxadd
-		enewuser vboxadd -1 /bin/sh /var/run/vboxadd vboxadd
-}
-
-src_unpack() {
-		unpack ${A}
-
-		# Create and unpack a tarball with the sources of the Linux guest
-		# kernel modules, to include all the needed files
-		"${MY_P/-OSE/_OSE}"/src/VBox/Additions/linux/export_modules "${WORKDIR}/vbox-kmod.tar.gz"
-		unpack ./vbox-kmod.tar.gz
-
-		# Remove shipped binaries (kBuild,yasm), see bug #232775
-		cd "${S}"
-		rm -rf kBuild/bin tools
-
-		# Disable things unused or splitted into separate ebuilds
-		cp "${FILESDIR}/${PN}-2-localconfig" LocalConfig.kmk
-}
-
-src_compile() {
-		linux-mod_src_compile
-
-		# build the user-space tools, warnings are harmless
-		./configure --nofatal \
-		--disable-xpcom \
-		--disable-sdl-ttf \
-		--disable-pulse \
-		--disable-alsa \
-		--build-headless || die "configure failed"
-		source ./env.sh
-
-		for each in	/src/VBox/{Runtime,Additions/common} \
-		/src/VBox/Additions/linux/{sharedfolders,daemon} ; do
-				cd "${S}"${each}
-				MAKE="kmk" emake TOOL_YASM_AS=yasm \
-				KBUILD_PATH="${S}/kBuild" \
-				|| die "kmk VBoxControl failed"
-		done
-
-		if use X; then
-				cd "${S}"/src/VBox/Additions/x11/VBoxClient
-				MAKE="kmk" emake TOOL_YASM_AS=yasm \
-				KBUILD_PATH="${S}/kBuild" \
-				|| die "kmk VBoxClient failed"
-		fi
-}
-
-src_install() {
-		linux-mod_src_install
-
-		cd "${S}"/out/linux.${ARCH}/release/bin/additions
-
-		# shared folders
-		insinto /sbin
-		newins mountvboxsf mount.vboxsf
-		fperms 4755 /sbin/mount.vboxsf
-
-		# time synchronisation system service
-		insinto /usr/sbin
-		doins vboxadd-timesync
-		fperms 0755 /usr/sbin/vboxadd-timesync
-
-		newinitd "${FILESDIR}"/${PN}.initd ${PN}
-
-		insinto /usr/bin
-		doins VBoxControl
-		fperms 0755 /usr/bin/VBoxControl
-
-		# VBoxClient user service and xrandr wrapper
-		if use X; then
-			doins VBoxClient
-			fperms 0755 /usr/bin/VBoxClient
-
-			cd "${S}"/src/VBox/Additions/x11/Installer
-			newins VBoxRandR.sh VBoxRandR
-			fperms 0755 /usr/bin/VBoxRandR
-
-			newins 98vboxadd-xclient VBoxClient-all
-			fperms 0755 /usr/bin/VBoxClient-all
-		fi
-
-		# udev rule for vboxdrv
-		dodir /etc/udev/rules.d
-		echo 'KERNEL=="vboxadd", NAME="vboxadd", OWNER="vboxadd", MODE="0660"' \
-		>> "${D}/etc/udev/rules.d/60-virtualbox-guest-additions.rules"
-		echo 'KERNEL=="vboxuser", NAME="vboxuser", OWNER="vboxadd", MODE="0660"' \
-		>> "${D}/etc/udev/rules.d/60-virtualbox-guest-additions.rules"
-}
-
-pkg_postinst() {
-		linux-mod_pkg_postinst
-		if ! useq X ; then
-			elog "use flag X is off, enable it to install the"
-			elog "X Window System input and video drivers"
-		fi
-		elog "Please add:"
-		elog "/etc/init.d/${PN}"
-		elog "to the default runlevel in order to load all"
-		elog "needed modules and services."
-		elog ""
-		elog "Warning:"
-		elog "this ebuild is only needed if you are running gentoo"
-		elog "inside a VirtualBox Virtual Machine, you don't need"
-		elog "it to run VirtualBox itself."
-		elog ""
-}
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-2.2.4.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-2.2.4.ebuild
deleted file mode 100644
index 634b55d..0000000
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-2.2.4.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit eutils linux-mod
-
-MY_P=VirtualBox-${PV}-OSE
-DESCRIPTION="VirtualBox kernel modules and user-space tools for Linux guests"
-HOMEPAGE="http://www.virtualbox.org/"
-SRC_URI="http://download.virtualbox.org/virtualbox/${PV}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="X"
-
-RDEPEND="X? ( ~x11-drivers/xf86-video-virtualbox-${PV}
-			 ~x11-drivers/xf86-input-virtualbox-${PV}
-			 x11-apps/xrandr
-			 x11-apps/xrefresh
-			 x11-libs/libXmu
-			 x11-libs/libX11
-			 x11-libs/libXt
-			 x11-libs/libXext
-			 x11-libs/libXau
-			 x11-libs/libXdmcp
-			 x11-libs/libSM
-			 x11-libs/libICE
-			 amd64? ( app-emulation/emul-linux-x86-xlibs ) )"
-DEPEND="${RDEPEND}
-		>=dev-util/kbuild-0.1.5-r1
-		>=dev-lang/yasm-0.6.2
-		sys-devel/bin86
-		sys-devel/dev86
-		sys-power/iasl
-		X? ( x11-proto/renderproto )"
-
-BUILD_TARGETS="all"
-BUILD_TARGET_ARCH="${ARCH}"
-MODULE_NAMES="vboxadd(misc:${WORKDIR}/vboxadd:${WORKDIR}/vboxadd)
-			vboxvfs(misc:${WORKDIR}/vboxvfs:${WORKDIR}/vboxvfs)"
-
-S=${WORKDIR}/${MY_P/-OSE/_OSE}
-
-pkg_setup() {
-		linux-mod_pkg_setup
-		BUILD_PARAMS="KERN_DIR=${KV_DIR} KERNOUT=${KV_OUT_DIR}"
-		enewgroup vboxadd
-		enewuser vboxadd -1 /bin/sh /var/run/vboxadd vboxadd
-}
-
-src_unpack() {
-		unpack ${A}
-
-		# Create and unpack a tarball with the sources of the Linux guest
-		# kernel modules, to include all the needed files
-		"${MY_P/-OSE/_OSE}"/src/VBox/Additions/linux/export_modules "${WORKDIR}/vbox-kmod.tar.gz"
-		unpack ./vbox-kmod.tar.gz
-
-		# Remove shipped binaries (kBuild,yasm), see bug #232775
-		cd "${S}"
-		rm -rf kBuild/bin tools
-
-		# Disable things unused or splitted into separate ebuilds
-		cp "${FILESDIR}/${PN}-2-localconfig" LocalConfig.kmk
-}
-
-src_compile() {
-		linux-mod_src_compile
-
-		# build the user-space tools, warnings are harmless
-		./configure --nofatal \
-		--disable-xpcom \
-		--disable-sdl-ttf \
-		--disable-pulse \
-		--disable-alsa \
-		--build-headless || die "configure failed"
-		source ./env.sh
-
-		for each in	/src/VBox/{Runtime,Additions/common} \
-		/src/VBox/Additions/linux/{sharedfolders,daemon} ; do
-				cd "${S}"${each}
-				MAKE="kmk" emake TOOL_YASM_AS=yasm \
-				KBUILD_PATH="${S}/kBuild" \
-				|| die "kmk VBoxControl failed"
-		done
-
-		if use X; then
-				cd "${S}"/src/VBox/Additions/x11/VBoxClient
-				MAKE="kmk" emake TOOL_YASM_AS=yasm \
-				KBUILD_PATH="${S}/kBuild" \
-				|| die "kmk VBoxClient failed"
-		fi
-}
-
-src_install() {
-		linux-mod_src_install
-
-		cd "${S}"/out/linux.${ARCH}/release/bin/additions
-
-		# shared folders
-		insinto /sbin
-		newins mountvboxsf mount.vboxsf
-		fperms 4755 /sbin/mount.vboxsf
-
-		# time synchronisation system service
-		insinto /usr/sbin
-		doins vboxadd-timesync
-		fperms 0755 /usr/sbin/vboxadd-timesync
-
-		newinitd "${FILESDIR}"/${PN}.initd ${PN}
-
-		insinto /usr/bin
-		doins VBoxControl
-		fperms 0755 /usr/bin/VBoxControl
-
-		# VBoxClient user service and xrandr wrapper
-		if use X; then
-			doins VBoxClient
-			fperms 0755 /usr/bin/VBoxClient
-
-			cd "${S}"/src/VBox/Additions/x11/Installer
-			newins VBoxRandR.sh VBoxRandR
-			fperms 0755 /usr/bin/VBoxRandR
-
-			newins 98vboxadd-xclient VBoxClient-all
-			fperms 0755 /usr/bin/VBoxClient-all
-		fi
-
-		# udev rule for vboxdrv
-		dodir /etc/udev/rules.d
-		echo 'KERNEL=="vboxadd", NAME="vboxadd", OWNER="vboxadd", MODE="0660"' \
-		>> "${D}/etc/udev/rules.d/60-virtualbox-guest-additions.rules"
-		echo 'KERNEL=="vboxuser", NAME="vboxuser", OWNER="vboxadd", MODE="0660"' \
-		>> "${D}/etc/udev/rules.d/60-virtualbox-guest-additions.rules"
-}
-
-pkg_postinst() {
-		linux-mod_pkg_postinst
-		if ! useq X ; then
-			elog "use flag X is off, enable it to install the"
-			elog "X Window System input and video drivers"
-		fi
-		elog "Please add:"
-		elog "/etc/init.d/${PN}"
-		elog "to the default runlevel in order to load all"
-		elog "needed modules and services."
-		elog ""
-		elog "Warning:"
-		elog "this ebuild is only needed if you are running gentoo"
-		elog "inside a VirtualBox Virtual Machine, you don't need"
-		elog "it to run VirtualBox itself."
-		elog ""
-}
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.0.2.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.0.4.ebuild
index c786ab7..43593c6 100644
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.0.2.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.0.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-2.2.4.ebuild,v 1.1 2009/06/01 00:24:41 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.0.2.ebuild,v 1.1 2009/07/16 21:42:07 patrick Exp $
 
 inherit eutils linux-mod