Version bump. Removed old

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

5 files changed, 116 insertions, 17 deletions

diff --git a/x11-drivers/xf86-video-virtualbox/ChangeLog b/x11-drivers/xf86-video-virtualbox/ChangeLog
index 271543653a24..836795afeb16 100644
--- a/x11-drivers/xf86-video-virtualbox/ChangeLog
+++ b/x11-drivers/xf86-video-virtualbox/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for x11-drivers/xf86-video-virtualbox
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-virtualbox/ChangeLog,v 1.154 2015/06/14 11:48:00 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-virtualbox/ChangeLog,v 1.155 2015/07/14 14:32:42 polynomial-c Exp $
+
+*xf86-video-virtualbox-5.0.0 (14 Jul 2015)
+*xf86-video-virtualbox-4.3.30 (14 Jul 2015)
+
+  14 Jul 2015; Lars Wendler <polynomial-c@gentoo.org>
+  -xf86-video-virtualbox-4.3.18.ebuild, -xf86-video-virtualbox-4.3.26.ebuild,
+  +xf86-video-virtualbox-4.3.30.ebuild, +xf86-video-virtualbox-5.0.0.ebuild,
+  +files/xf86-video-virtualbox-5.0.0_beta3-configure_checks.patch,
+  +files/xf86-video-virtualbox-5-localconfig:
+  Version bump. Removed old.
 
   14 Jun 2015; Mikle Kolyada <zlogene@gentoo.org>
   xf86-video-virtualbox-4.3.28.ebuild:
diff --git a/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-5-localconfig b/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-5-localconfig
new file mode 100644
index 000000000000..aee5ec1ea83a
--- /dev/null
+++ b/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-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
+
+TEMPLATE_VBOXGUESTR3XF86MOD_LDFLAGS.release =
+TEMPLATE_VBOXGUESTR3XORGMOD_LDFLAGS = $(TEMPLATE_VBOXGUESTR3DLL_LDFLAGS)
diff --git a/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-5.0.0_beta3-configure_checks.patch b/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-5.0.0_beta3-configure_checks.patch
new file mode 100644
index 000000000000..92f8a182e34d
--- /dev/null
+++ b/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-5.0.0_beta3-configure_checks.patch
@@ -0,0 +1,52 @@
+--- VirtualBox-5.0.0_BETA3/configure
++++ VirtualBox-5.0.0_BETA3/configure
+@@ -1258,10 +1258,7 @@
+   XCloseDisplay(dpy);
+ }
+ EOF
+-  [ -n "$INCX11" ] && I_INCX11=`prefix_I "$INCX11"`
+-  if test_compile "$LIBX11 $I_INCX11" Xlibs Xlibs; then
+-    log_success "found"
+-  fi
++  test_compile "$LIBX11 $I_INCX11" Xlibs Xlibs
+ }
+ 
+ 
+@@ -1415,21 +1412,6 @@
+ #include <GL/glu.h>
+ extern "C" int main(void)
+ {
+-  Display *dpy;
+-  int major, minor;
+-
+-  dpy = XOpenDisplay(NULL);
+-  if (dpy)
+-  {
+-    Bool glx_version = glXQueryVersion(dpy, &major, &minor);
+-    XCloseDisplay(dpy);
+-    if (glx_version)
+-    {
+-      printf("found version %u.%u, OK.\n", major, minor);
+-      return 0;
+-    }
+-  }
+-  printf("found (inactive), OK.\n");
+   return 0;
+ }
+ EOF
+@@ -2706,7 +2688,6 @@
+   # don't check for yasm for the time beeing as 0.40 and 0.50 both have known bugs
+   # [ "$OS" != "darwin" ] && check_yasm
+   [ "$OS" != "darwin"  ] && check_xsltproc
+-  [ "$OS" != "darwin"  ] && check_mkisofs
+ fi
+ 
+ # the libraries
+@@ -2774,7 +2755,6 @@
+   check_compiler_h
+   [ $ONLY_ADDITIONS -eq 0 -a "$BUILD_MACHINE" = "amd64" -a $WITH_VMMRAW -eq 1 ] && check_32bit
+   # tools/common/makeself*
+-  [ $OSE -ge 1 ] && check_makeself
+ fi
+ 
+ [ -n "$SETUP_WINE" ] && setup_wine
diff --git a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.3.26.ebuild b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.3.30.ebuild
index a28cce939847..d92bad5b5996 100644
--- a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.3.26.ebuild
+++ b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-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/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.3.26.ebuild,v 1.5 2015/04/01 19:03:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.3.30.ebuild,v 1.1 2015/07/14 14:32:42 polynomial-c Exp $
 
 EAPI=5
 
diff --git a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.3.18.ebuild b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.0.0.ebuild
index 2a1a5a39ccd4..195e71525743 100644
--- a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.3.18.ebuild
+++ b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.0.0.ebuild
@@ -1,6 +1,6 @@
-# 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/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.3.18.ebuild,v 1.2 2014/12/22 13:12:45 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.0.0.ebuild,v 1.1 2015/07/14 14:32:42 polynomial-c Exp $
 
 EAPI=5
 
@@ -16,7 +16,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="dri"
 
 RDEPEND=">=x11-base/xorg-server-1.7:=[-minimal]
@@ -54,7 +54,7 @@ QA_TEXTRELS_x86="usr/lib/VBoxOGL.so"
 
 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}"
 
 	python-single-r1_pkg_setup
 }
@@ -77,15 +77,13 @@ src_prepare() {
 	rm -rf kBuild/bin tools
 
 	# Disable things unused or splitted into separate ebuilds
-	cp "${FILESDIR}/${PN}-3-localconfig" LocalConfig.kmk || die
+	cp "${FILESDIR}/${PN}-5-localconfig" LocalConfig.kmk || die
 
 	# Ugly hack to build the opengl part of the video driver
 	epatch "${FILESDIR}/${PN}-2.2.0-enable-opengl.patch"
 
 	# unset useless/problematic checks in configure
-	epatch "${FILESDIR}/${PN}-3.2.8-mesa-check.patch" \
-		"${FILESDIR}/${PN}-4-makeself-check.patch" \
-		"${FILESDIR}/${PN}-4-mkisofs-check.patch"
+	epatch "${FILESDIR}/${PN}-5.0.0_beta3-configure_checks.patch"
 
 	# Patch to link with lazy on hardened #394757
 	if gcc-specs-now ; then
@@ -95,14 +93,23 @@ 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() {