Version bump. Removed old. Added x11-proto/glproto to RDEPEND (bug #494592)

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)

6 files changed, 26 insertions, 210 deletions

diff --git a/app-emulation/virtualbox-guest-additions/ChangeLog b/app-emulation/virtualbox-guest-additions/ChangeLog
index dfa907ce98fb..9d28e944dba2 100644
--- a/app-emulation/virtualbox-guest-additions/ChangeLog
+++ b/app-emulation/virtualbox-guest-additions/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for app-emulation/virtualbox-guest-additions
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/ChangeLog,v 1.136 2013/12/07 14:31:41 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/ChangeLog,v 1.137 2013/12/18 20:55:37 polynomial-c Exp $
+
+*virtualbox-guest-additions-4.3.6 (18 Dec 2013)
+
+  18 Dec 2013; Lars Wendler <polynomial-c@gentoo.org>
+  -virtualbox-guest-additions-4.1.26.ebuild,
+  virtualbox-guest-additions-4.2.18.ebuild,
+  virtualbox-guest-additions-4.2.20.ebuild,
+  -virtualbox-guest-additions-4.3.2.ebuild,
+  virtualbox-guest-additions-4.3.4.ebuild,
+  +virtualbox-guest-additions-4.3.6.ebuild:
+  Version bump. Removed old. Added x11-proto/glproto to RDEPEND. Thanks to Yi
+  Yang for reporting this in bug #494592.
 
   07 Dec 2013; Pacho Ramos <pacho@gentoo.org>
   virtualbox-guest-additions-4.2.18.ebuild:
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.1.26.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.1.26.ebuild
deleted file mode 100644
index 7bfe056e9e80..000000000000
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.1.26.ebuild
+++ /dev/null
@@ -1,200 +0,0 @@
-# Copyright 1999-2013 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.1.26.ebuild,v 1.5 2013/10/15 14:19:58 polynomial-c Exp $
-
-EAPI=2
-
-inherit eutils linux-mod user
-
-MY_P=VirtualBox-${PV}
-DESCRIPTION="VirtualBox kernel modules and user-space tools for Gentoo 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-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 )
-	!!x11-drivers/xf86-input-virtualbox"
-DEPEND="${RDEPEND}
-		>=dev-util/kbuild-0.1.999
-		>=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}"
-
-pkg_setup() {
-		linux-mod_pkg_setup
-		BUILD_PARAMS="KERN_DIR=${KV_DIR} KERNOUT=${KV_OUT_DIR}"
-		enewgroup vboxguest
-		enewuser vboxguest -1 /bin/sh /dev/null 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
-
-	# Remove shipped binaries (kBuild,yasm), see bug #232775
-	cd "${S}"
-	rm -rf kBuild/bin tools
-}
-
-src_prepare() {
-	# PaX fixes (see bug #298988)
-	pushd "${WORKDIR}" &>/dev/null || die
-	epatch "${FILESDIR}"/vboxguest-4.1.0-log-use-c99.patch
-	popd &>/dev/null || die
-
-	# 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_configure() {
-		# build the user-space tools, warnings are harmless
-		./configure --nofatal \
-		--disable-xpcom \
-		--disable-sdl-ttf \
-		--disable-pulse \
-		--disable-alsa \
-		--build-headless || die "configure failed"
-}
-
-src_compile() {
-		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" \
-				KBUILD_VERBOSE=2 \
-				|| 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 /lib/udev/rules.d
-		echo 'KERNEL=="vboxguest", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
-		>> "${D}/lib/udev/rules.d/60-virtualbox-guest-additions.rules" \
-			|| die
-		echo 'KERNEL=="vboxuser", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
-		>> "${D}/lib/udev/rules.d/60-virtualbox-guest-additions.rules" \
-			|| die
-
-		# 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 ! use X ; then
-			elog "use flag X is off, enable it to install the"
-			elog "X Window System video driver."
-		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 driver, use the following"
-		elog "file as your /etc/X11/xorg.conf:"
-		elog "    /usr/share/doc/${PF}/xorg.conf.vbox"
-		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 ""
-}
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.2.18.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.2.18.ebuild
index 5dd8063f2e5b..a20d2666e3fb 100644
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.2.18.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.2.18.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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.2.18.ebuild,v 1.5 2013/12/07 14:31:41 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.2.18.ebuild,v 1.6 2013/12/18 20:55:37 polynomial-c Exp $
 
 EAPI=5
 
@@ -28,7 +28,8 @@ RDEPEND="X? ( ~x11-drivers/xf86-video-virtualbox-${PV}
 			 x11-libs/libXau
 			 x11-libs/libXdmcp
 			 x11-libs/libSM
-			 x11-libs/libICE )
+			 x11-libs/libICE
+			 x11-proto/glproto )
 	sys-apps/dbus
 	!!x11-drivers/xf86-input-virtualbox"
 DEPEND="${RDEPEND}
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.2.20.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.2.20.ebuild
index 2a58b9e9053c..0ef926edf928 100644
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.2.20.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.2.20.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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.2.20.ebuild,v 1.1 2013/11/29 08:16:24 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.2.20.ebuild,v 1.2 2013/12/18 20:55:37 polynomial-c Exp $
 
 EAPI=5
 
@@ -28,7 +28,8 @@ RDEPEND="X? ( ~x11-drivers/xf86-video-virtualbox-${PV}
 			 x11-libs/libXau
 			 x11-libs/libXdmcp
 			 x11-libs/libSM
-			 x11-libs/libICE )
+			 x11-libs/libICE
+			 x11-proto/glproto )
 	sys-apps/dbus
 	!!x11-drivers/xf86-input-virtualbox"
 DEPEND="${RDEPEND}
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.3.4.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.3.4.ebuild
index 1bb8f6dbf4ee..be74e5bbf163 100644
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.3.4.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.3.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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.3.4.ebuild,v 1.1 2013/11/30 18:22:50 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.3.4.ebuild,v 1.2 2013/12/18 20:55:37 polynomial-c Exp $
 
 EAPI=5
 
@@ -28,7 +28,8 @@ RDEPEND="X? ( ~x11-drivers/xf86-video-virtualbox-${PV}
 			 x11-libs/libXau
 			 x11-libs/libXdmcp
 			 x11-libs/libSM
-			 x11-libs/libICE )
+			 x11-libs/libICE
+			 x11-proto/glproto )
 	sys-apps/dbus
 	!!x11-drivers/xf86-input-virtualbox"
 DEPEND="${RDEPEND}
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.3.2.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.3.6.ebuild
index eb63b06abaaf..65259ea9bc9b 100644
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.3.2.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.3.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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.3.2.ebuild,v 1.2 2013/11/14 11:27:23 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.3.6.ebuild,v 1.1 2013/12/18 20:55:37 polynomial-c Exp $
 
 EAPI=5
 
@@ -28,11 +28,12 @@ RDEPEND="X? ( ~x11-drivers/xf86-video-virtualbox-${PV}
 			 x11-libs/libXau
 			 x11-libs/libXdmcp
 			 x11-libs/libSM
-			 x11-libs/libICE )
+			 x11-libs/libICE
+			 x11-proto/glproto )
 	sys-apps/dbus
 	!!x11-drivers/xf86-input-virtualbox"
 DEPEND="${RDEPEND}
-		>=dev-util/kbuild-0.1.9998_pre20120806
+		>=dev-util/kbuild-0.1.9998_pre20131130
 		>=dev-lang/yasm-0.6.2
 		sys-devel/bin86
 		sys-libs/pam