Version bump

Package-Manager: portage-2.2.0_alpha13/cvs/Linux x86_64

3 files changed, 199 insertions, 13 deletions

diff --git a/app-emulation/virtualbox-guest-additions/ChangeLog b/app-emulation/virtualbox-guest-additions/ChangeLog
index bed4bceb9d7d..9dad2d4c03c5 100644
--- a/app-emulation/virtualbox-guest-additions/ChangeLog
+++ b/app-emulation/virtualbox-guest-additions/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/virtualbox-guest-additions
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/ChangeLog,v 1.57 2010/12/31 14:44:53 hwoarang Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/ChangeLog,v 1.58 2011/01/06 22:57:31 polynomial-c Exp $
+
+*virtualbox-guest-additions-4.0.0 (06 Jan 2011)
+
+  06 Jan 2011; Lars Wendler <polynomial-c@gentoo.org>
+  +virtualbox-guest-additions-4.0.0.ebuild:
+  Version bump.
 
   31 Dec 2010; Markos Chandras <hwoarang@gentoo.org>
   virtualbox-guest-additions-3.2.12.ebuild:
diff --git a/app-emulation/virtualbox-guest-additions/Manifest b/app-emulation/virtualbox-guest-additions/Manifest
index eac340aad218..ef8a4824a6b0 100644
--- a/app-emulation/virtualbox-guest-additions/Manifest
+++ b/app-emulation/virtualbox-guest-additions/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX vboxclient.desktop 145 RMD160 2a337f588cd85da4edb74c2e2333d1be1018ca9d SHA1 8e634ef77d287cdbc116f14fa6e147d83559f263 SHA256 0e310fbb8defee6842f5fc9d2cf124a4ca7a0d1121074cf1aa2e1bea5900f905
 AUX vboxguest-log-use-c99.patch 562 RMD160 7973598545c9f801120ff87691fb6d068466942a SHA1 7a6e096cf1c1bfb5a878f31171948efebc41e0a9 SHA256 76e830ce0aae1b9afe84516907e5668c6012aea25377bda4c2de1967857b1c82
 AUX virtualbox-guest-additions-3-localconfig 937 RMD160 018d9cab7ddc9dc4cb300d2a518ce0ef827a45e8 SHA1 8680e37b364c99bac1375a1b8b7034ade87b70ee SHA256 477e3d4556a2b12c3c6125c4fecc63092b1f7879756941e53832d04a7c1eb682
@@ -9,15 +6,10 @@ AUX xorg.conf.vbox 407 RMD160 53dcfdd2b0ff8930d23f30b7f5cf4d525806eef6 SHA1 7302
 DIST VirtualBox-3.1.8-OSE.tar.bz2 56291753 RMD160 45aa637d1e008248bd9061e9824b9c2631e8b570 SHA1 e29f3070d337d9c475241a68948dba43c363b079 SHA256 b77c8ae7b43401c908a231f8e3b7355f96b351237fd86f1f7416ed99a6081e85
 DIST VirtualBox-3.2.10-OSE.tar.bz2 58175083 RMD160 53b3b77b80e71df145286c387e388df9c34ab327 SHA1 3b9a671b76da2661bb99c4e6f289f9c7b22d4160 SHA256 4db25b96427daab4849d9ce303bac8e1e1c27d878daa18c407cb404dd19e4b19
 DIST VirtualBox-3.2.12-OSE.tar.bz2 58239733 RMD160 9bcb80327655d77cede13b1f76b1fa6c763b1a25 SHA1 73ddd9365588ea56a54ff81117719ac818e842f9 SHA256 064eb382e5b752a3f9189c930734393765125e70b5f99679a63ff4eb6186e261
+DIST VirtualBox-4.0.0.tar.bz2 70279717 RMD160 8cfce949fc8fc3fccdcb46781fd1d861f385b83c SHA1 2d0a763d148622569f2a23254b35bce5e112f7e8 SHA256 c60b42385b4956780babd133d2b694dade4838e18ef723a78f899fc3bd8543a0
 EBUILD virtualbox-guest-additions-3.1.8-r2.ebuild 5117 RMD160 4198a341013b88b72624166ed4d7a66932d9ada0 SHA1 55d742d2ecc9067861fe659ced53fcad2a249a73 SHA256 0ac300ffda4def0fb790a92da577b90aac455b62e3db68cbca76d2fcddbfe6a4
 EBUILD virtualbox-guest-additions-3.2.10.ebuild 5482 RMD160 e755c36f9720c2802fa6f1080f1c0a33c567feed SHA1 6b14d6935d626d7ab74fc0f765db0a683a985ba4 SHA256 cb6574b8c6eb615dfcd39125c170e5c8947f34c6887a2b98266092f3342be250
 EBUILD virtualbox-guest-additions-3.2.12.ebuild 5477 RMD160 f48582ad6fb2af1a34839da11b626b8376fd751a SHA1 179eab277872f746f0e6f38908d9d323f5bf6bdf SHA256 b112a1594bdb1b8afe1aa340cb68988df5b0769d0ea9677971f2e20a7e0723aa
-MISC ChangeLog 18185 RMD160 4372a7946144ddbfe6c9b3029c75771b79fe40a7 SHA1 2cecd1803408132f72470cd988513e24c45abfe1 SHA256 4883d10cf9dca0ad1a22506fc18710c7ea431df3faa2a19f58a6cfd9868b9a10
+EBUILD virtualbox-guest-additions-4.0.0.ebuild 5460 RMD160 01ba6776628e8b411eccbce60190993b98944339 SHA1 2fc23f9e052b491190fc31c113053a7aedea8442 SHA256 876cfbb99c721d1d87a3e8ebb05ce82bf627b0e715736353657f488f3f4386eb
+MISC ChangeLog 18353 RMD160 c3d1768ea514bffe0f417a287aed3afb5a924175 SHA1 49635ab060ec44357377e95d761aa33910bf146a SHA256 365c569cbf6267415b963c5759c128252377a60500c7ac72a6b82853def87545
 MISC metadata.xml 457 RMD160 12d3d923e95f66b27bd9456b76319b9a6d8ae815 SHA1 54139c285252e9229298cf32d0716062cde5f0de SHA256 1fbd88d74325c1c6c63512eb9b7185797d6b9992b8c4f809d51897252729eccf
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iEYEARECAAYFAk0d7CIACgkQ9/cejkQaxBBdagCeLUEdlHQGzqsPq+SSU3MmYuqH
-UsoAn0jh6R8gaOtXJPrTmLS3JJ35Wq67
-=cZJ4
------END PGP SIGNATURE-----
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.0.0.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.0.0.ebuild
new file mode 100644
index 000000000000..e27dfd9e6acf
--- /dev/null
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.0.0.ebuild
@@ -0,0 +1,188 @@
+# Copyright 1999-2011 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-4.0.0.ebuild,v 1.1 2011/01/06 22:57:31 polynomial-c Exp $
+
+inherit eutils linux-mod
+
+MY_P=VirtualBox-${PV}
+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 )"
+DEPEND="${RDEPEND}
+		>=dev-util/kbuild-0.1.5-r1
+		>=dev-lang/yasm-0.6.2
+		sys-devel/bin86
+		sys-devel/dev86
+		sys-libs/pam
+		sys-power/iasl
+		X? ( x11-proto/renderproto )
+		!X? ( x11-proto/xproto )"
+
+BUILD_TARGETS="all"
+BUILD_TARGET_ARCH="${ARCH}"
+MODULE_NAMES="vboxguest(misc:${WORKDIR}/vboxguest:${WORKDIR}/vboxguest)
+			vboxsf(misc:${WORKDIR}/vboxsf:${WORKDIR}/vboxsf)"
+
+S="${WORKDIR}/${MY_P}_OSE"
+
+pkg_setup() {
+		linux-mod_pkg_setup
+		BUILD_PARAMS="KERN_DIR=${KV_DIR} KERNOUT=${KV_OUT_DIR}"
+		enewgroup vboxguest
+		enewuser vboxguest -1 /bin/sh /var/run/vboxguest vboxguest
+}
+
+src_unpack() {
+		unpack ${A}
+
+		# Create and unpack a tarball with the sources of the Linux guest
+		# kernel modules, to include all the needed files
+		"${S}"/src/VBox/Additions/linux/export_modules "${WORKDIR}/vbox-kmod.tar.gz"
+		unpack ./vbox-kmod.tar.gz
+
+		# PaX fixes (see bug #298988)
+		epatch "${FILESDIR}"/vboxguest-log-use-c99.patch
+
+		# 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}-3-localconfig" LocalConfig.kmk
+
+		# stupid new header references...
+		for vboxheader in {product,revision}-generated.h ; do
+			for mdir in vbox{guest,sf} ; do
+				ln -sf "${S}"/out/linux.${ARCH}/release/${vboxheader} \
+					"${WORKDIR}/${mdir}/${vboxheader}"
+			done
+		done
+}
+
+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
+
+		# Now creating the kernel modules. We must do this _after_
+		# we compiled the user-space tools as we need two of the
+		# automatically generated header files. (>=3.2.0)
+		linux-mod_src_compile
+}
+
+src_install() {
+		linux-mod_src_install
+
+		cd "${S}"/out/linux.${ARCH}/release/bin/additions
+
+		insinto /sbin
+		newins mount.vboxsf mount.vboxsf
+		fperms 4755 /sbin/mount.vboxsf
+
+		newinitd "${FILESDIR}"/${PN}-7.initd ${PN}
+
+		insinto /usr/sbin/
+		newins VBoxService vboxguest-service
+		fperms 0755 /usr/sbin/vboxguest-service
+
+		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 98vboxadd-xclient VBoxClient-all
+			fperms 0755 /usr/bin/VBoxClient-all
+		fi
+
+		# udev rule for vboxdrv
+		dodir /etc/udev/rules.d
+		echo 'KERNEL=="vboxguest", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
+		>> "${D}/etc/udev/rules.d/60-virtualbox-guest-additions.rules"
+		echo 'KERNEL=="vboxuser", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
+		>> "${D}/etc/udev/rules.d/60-virtualbox-guest-additions.rules"
+
+		# VBoxClient autostart file
+		insinto /etc/xdg/autostart
+		doins "${FILESDIR}"/vboxclient.desktop
+
+		# sample xorg.conf
+		insinto /usr/share/doc/${PF}
+		doins "${FILESDIR}"/xorg.conf.vbox
+}
+
+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 ""
+		elog "Please add users to the \"vboxguest\" group so they can"
+		elog "benefit from seamless mode, auto-resize and clipboard."
+		elog ""
+		elog "Please add:"
+		elog "/etc/init.d/${PN}"
+		elog "to the default runlevel in order to start"
+		elog "needed services."
+		elog "To use the VirtualBox X drivers, use the following"
+		elog "file as your /etc/X11/xorg.conf:"
+		elog "    /usr/share/doc/${PF}/xorg.conf.xorg"
+		elog ""
+		elog "Also make sure you use the Mesa library for OpenGL:"
+		elog "    eselect opengl set xorg-x11"
+		elog ""
+		elog "An autostart .desktop file has been installed to start"
+		elog "VBoxClient in desktop sessions."
+		elog ""
+		elog "You can mount shared folders with:"
+		elog "    mount -t vboxsf <shared_folder_name> <mount_point>"
+		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 ""
+}