(Proxy-Commit) Port from dev overlay

(Portage version: 2.2_rc8/cvs/Linux 2.6.26-gentoo-r1 i686)

6 files changed, 128 insertions, 5 deletions

diff --git a/x11-drivers/xf86-video-virtualbox/ChangeLog b/x11-drivers/xf86-video-virtualbox/ChangeLog
index f1c4544a4251..2cc95d181e68 100644
--- a/x11-drivers/xf86-video-virtualbox/ChangeLog
+++ b/x11-drivers/xf86-video-virtualbox/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for x11-drivers/xf86-video-virtualbox
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-virtualbox/ChangeLog,v 1.3 2008/09/06 19:29:03 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-virtualbox/ChangeLog,v 1.4 2008/09/15 19:47:16 jokey Exp $
+
+*xf86-video-virtualbox-2.0.2 (15 Sep 2008)
+
+  15 Sep 2008; Markus Ullmann <jokey@gentoo.org>
+  files/xf86-video-virtualbox-1.6.4-fix-missing-makefiles.patch,
+  +files/xf86-video-virtualbox-2.0.2-localconfig,
+  xf86-video-virtualbox-1.6.4-r1.ebuild, xf86-video-virtualbox-1.6.6.ebuild,
+  +xf86-video-virtualbox-2.0.2.ebuild:
+  (Proxy-Commit) Port from dev overlay
+
+  13 Sep 2008; Alessio Cassibba (X-Drum) <swapon@gmail.com>
+  +xf86-video-virtualbox-2.0.2.ebuild,
+  +files/xf86-video-virtualbox-2.0.2-localconfig:
+  Version bump: add support for x11-base/xorg-server-1.5.0, force 2.0.2 to
+  build with dev-util/kbuild-0.1.4
 
 *xf86-video-virtualbox-1.6.6 (06 Sep 2008)
 *xf86-video-virtualbox-1.6.4-r1 (06 Sep 2008)
diff --git a/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-1.6.4-fix-missing-makefiles.patch b/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-1.6.4-fix-missing-makefiles.patch
index 266df2074052..27fffb6a9130 100644
--- a/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-1.6.4-fix-missing-makefiles.patch
+++ b/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-1.6.4-fix-missing-makefiles.patch
@@ -1,7 +1,7 @@
 --- src/apps/Makefile.kmk	1970-01-01 01:00:00.000000000 +0100
 +++ src/apps/Makefile.kmk	2008-08-02 16:06:11.358197514 +0200
 @@ -0,0 +1,28 @@
-+# $Id: xf86-video-virtualbox-1.6.4-fix-missing-makefiles.patch,v 1.2 2008/09/06 19:29:04 jokey Exp $
++# $Id: xf86-video-virtualbox-1.6.4-fix-missing-makefiles.patch,v 1.3 2008/09/15 19:47:19 jokey Exp $
 +## @file
 +# Sub-Makefile for the external apps.
 +#
@@ -32,7 +32,7 @@
 --- src/apps/tunctl/Makefile.kmk	1970-01-01 01:00:00.000000000 +0100
 +++ src/apps/tunctl/Makefile.kmk	2008-08-02 16:06:37.447936207 +0200
 @@ -0,0 +1,32 @@
-+# $Id: xf86-video-virtualbox-1.6.4-fix-missing-makefiles.patch,v 1.2 2008/09/06 19:29:04 jokey Exp $
++# $Id: xf86-video-virtualbox-1.6.4-fix-missing-makefiles.patch,v 1.3 2008/09/15 19:47:19 jokey Exp $
 +## @file
 +# Sub-Makefile for VBoxTunctl
 +#
diff --git a/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-2.0.2-localconfig b/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-2.0.2-localconfig
new file mode 100644
index 000000000000..3e1f7d8cbb32
--- /dev/null
+++ b/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-2.0.2-localconfig
@@ -0,0 +1,27 @@
+# -*- 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_TESTSUITE     :=
+
+KBUILD_MSG_STYLE        := brief
+
+## paths, origin, hardening
+VBOX_WITH_HARDENING        := 2
+VBOX_WITH_ORIGIN           :=
+
diff --git a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-1.6.4-r1.ebuild b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-1.6.4-r1.ebuild
index 017af879d369..5f5f50179bec 100644
--- a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-1.6.4-r1.ebuild
+++ b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-1.6.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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-1.6.4-r1.ebuild,v 1.1 2008/09/06 19:29:03 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-1.6.4-r1.ebuild,v 1.2 2008/09/15 19:47:16 jokey Exp $
 
 inherit x-modular eutils
 
diff --git a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-1.6.6.ebuild b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-1.6.6.ebuild
index fce392eabca4..86d90e09beb1 100644
--- a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-1.6.6.ebuild
+++ b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-1.6.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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-1.6.6.ebuild,v 1.1 2008/09/06 19:29:03 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-1.6.6.ebuild,v 1.2 2008/09/15 19:47:16 jokey Exp $
 
 inherit x-modular eutils
 
diff --git a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-2.0.2.ebuild b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-2.0.2.ebuild
new file mode 100644
index 000000000000..2036527e8138
--- /dev/null
+++ b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-2.0.2.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2008 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-2.0.2.ebuild,v 1.1 2008/09/15 19:47:16 jokey Exp $
+
+inherit x-modular eutils
+
+MY_P=VirtualBox-${PV}-OSE
+DESCRIPTION="VirtualBox video driver"
+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=""
+
+RDEPEND="x11-base/xorg-server"
+DEPEND="${RDEPEND}
+		>=dev-util/kbuild-0.1.4
+		>=dev-lang/yasm-0.6.2
+		sys-devel/dev86
+		sys-power/iasl
+		x11-proto/fontsproto
+		x11-proto/randrproto
+		x11-proto/renderproto
+		x11-proto/xextproto
+		x11-proto/xineramaproto
+		x11-proto/xproto"
+
+S=${WORKDIR}/${MY_P/-OSE/}
+
+src_unpack() {
+		unpack ${A}
+		cd "${S}"
+
+		# Remove shipped binaries (kBuild,yasm), see bug #232775
+		rm -rf kBuild/bin tools
+
+		# Disable things unused or splitted into separate ebuilds
+		cp "${FILESDIR}/${P}-localconfig" LocalConfig.kmk
+}
+
+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/VBoxGuestLib} \
+		src/VBox/Additions/x11/xgraphics ; do
+			MAKE="kmk" emake TOOL_YASM_AS=yasm \
+			KBUILD_PATH="${S}/kBuild" \
+			|| die "kmk failed"
+		done
+}
+
+src_install() {
+		cd "${S}/out/linux.${ARCH}/release/bin/additions"
+		insinto /usr/lib/xorg/modules/drivers
+
+		if has_version "=x11-base/xorg-server-1.5" ; then
+				newins vboxvideo_drv_15.so vboxvideo_drv.so
+		elif has_version "=x11-base/xorg-server-1.4" ; then
+				newins vboxvideo_drv_14.so vboxvideo_drv.so
+		else
+				newins vboxvideo_drv_13.so vboxvideo_drv.so
+		fi
+}
+
+pkg_postinst() {
+		elog "You need to edit the file /etc/X11/xorg.conf and set:"
+		elog ""
+		elog "  Driver  \"vboxvideo\""
+		elog ""
+		elog "in the Graphics device section (Section \"Device\")"
+		elog ""
+}