Version bump. Removed old

(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 981CA6FC)

4 files changed, 66 insertions, 17 deletions

diff --git a/app-emulation/virtualbox-guest-additions/ChangeLog b/app-emulation/virtualbox-guest-additions/ChangeLog
index a32ae056be29..09db5a4f5310 100644
--- a/app-emulation/virtualbox-guest-additions/ChangeLog
+++ b/app-emulation/virtualbox-guest-additions/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for app-emulation/virtualbox-guest-additions
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/ChangeLog,v 1.163 2015/06/14 11:53:19 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/ChangeLog,v 1.164 2015/07/14 14:33:13 polynomial-c Exp $
+
+*virtualbox-guest-additions-5.0.0 (14 Jul 2015)
+*virtualbox-guest-additions-4.3.30 (14 Jul 2015)
+
+  14 Jul 2015; Lars Wendler <polynomial-c@gentoo.org>
+  -virtualbox-guest-additions-4.3.18.ebuild,
+  -virtualbox-guest-additions-4.3.26.ebuild,
+  +virtualbox-guest-additions-4.3.30.ebuild,
+  +virtualbox-guest-additions-5.0.0.ebuild,
+  +files/virtualbox-guest-additions-5-localconfig:
+  Version bump. Removed old.
 
   14 Jun 2015; Mikle Kolyada <zlogene@gentoo.org>
   virtualbox-guest-additions-4.3.28.ebuild:
diff --git a/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-5-localconfig b/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-5-localconfig
new file mode 100644
index 000000000000..f04dab4ddfb0
--- /dev/null
+++ b/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-5-localconfig
@@ -0,0 +1,30 @@
+# -*- Makefile -*-
+#
+# Overwrite some default kBuild settings
+#
+
+#
+# Copyright (C) 2006-2008 Sun Microsystems, Inc.
+#
+# This file is part of VirtualBox Open Source Edition (OSE), as
+# available from http://www.virtualbox.org. This file is free software;
+# you can redistribute it and/or modify it under the terms of the GNU
+# General Public License as published by the Free Software Foundation,
+# in version 2 as it comes in the "COPYING" file of the VirtualBox OSE
+# distribution. VirtualBox OSE is distributed in the hope that it will
+# be useful, but WITHOUT ANY WARRANTY of any kind.
+#
+
+# don't build testcases to save time, they are not needed for the package
+VBOX_WITH_TESTCASES     :=
+VBOX_WITH_VALIDATIONKIT :=
+
+KBUILD_MSG_STYLE        := brief
+
+## paths, origin, hardening
+VBOX_WITH_HARDENING        := 2
+VBOX_WITH_ORIGIN           :=
+VBOX_ONLY_ADDITIONS        := 1
+
+## don't build with -Werror
+VBOX_WITH_WARNINGS_AS_ERRORS :=
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.3.26.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.3.30.ebuild
index 31295fc83170..d98a0cce3b6a 100644
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.3.26.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.3.30.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 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.26.ebuild,v 1.5 2015/04/01 19:02:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.3.30.ebuild,v 1.1 2015/07/14 14:33:13 polynomial-c Exp $
 
 EAPI=5
 
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.3.18.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.0.0.ebuild
index 3aba9b224b98..01c13efe1134 100644
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.3.18.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.0.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 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.18.ebuild,v 1.2 2014/12/22 13:13:47 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.0.0.ebuild,v 1.1 2015/07/14 14:33:13 polynomial-c Exp $
 
 EAPI=5
 
-inherit eutils linux-mod systemd user
+inherit eutils linux-mod systemd user toolchain-funcs
 
 MY_PV="${PV/beta/BETA}"
 MY_PV="${MY_PV/rc/RC}"
@@ -15,7 +15,7 @@ SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="X"
 
 RDEPEND="X? ( ~x11-drivers/xf86-video-virtualbox-${PV}
@@ -50,7 +50,7 @@ S="${WORKDIR}/${MY_P}"
 
 pkg_setup() {
 	linux-mod_pkg_setup
-	BUILD_PARAMS="KERN_DIR=${KV_DIR} KERNOUT=${KV_OUT_DIR}"
+	BUILD_PARAMS="KERN_DIR=${KV_OUT_DIR} KERNOUT=${KV_OUT_DIR}"
 	enewgroup vboxguest
 	enewuser vboxguest -1 /bin/sh /dev/null vboxguest
 	# automount Error: VBoxServiceAutoMountWorker: Group "vboxsf" does not exist
@@ -77,7 +77,7 @@ src_prepare() {
 	popd &>/dev/null || die
 
 	# Disable things unused or splitted into separate ebuilds
-	cp "${FILESDIR}/${PN}-3-localconfig" LocalConfig.kmk || die
+	cp "${FILESDIR}/${PN}-5-localconfig" LocalConfig.kmk || die
 
 	# stupid new header references...
 	for vboxheader in {product,revision}-generated.h ; do
@@ -90,23 +90,31 @@ src_prepare() {
 
 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"
+	local cmd=(
+		./configure
+		--nofatal
+		--disable-xpcom
+		--disable-sdl-ttf
+		--disable-pulse
+		--disable-alsa
+		--with-gcc="$(tc-getCC)"
+		--with-g++="$(tc-getCXX)"
+		--target-arch=${ARCH}
+		--with-linux="${KV_OUT_DIR}"
+		--build-headless
+	)
+	echo "${cmd[@]}"
+	"${cmd[@]}" || die "configure failed"
+	source ./env.sh
+	export VBOX_GCC_OPT="${CFLAGS} ${CPPFLAGS}"
 }
 
 src_compile() {
-	source ./env.sh
-
 	for each in /src/VBox/{Runtime,Additions/common} \
 		/src/VBox/Additions/linux/sharedfolders ; do
 			cd "${S}"${each} || die
 			MAKE="kmk" \
 			emake TOOL_YASM_AS=yasm \
-			KBUILD_PATH="${S}/kBuild" \
 			KBUILD_VERBOSE=2
 	done