Version bump

svn path=/trunk/; revision=556

3 files changed, 102 insertions, 16 deletions

diff --git a/x11-drivers/xf86-video-virtualbox/ChangeLog b/x11-drivers/xf86-video-virtualbox/ChangeLog
index bc8c4a9..5a607d2 100644
--- a/x11-drivers/xf86-video-virtualbox/ChangeLog
+++ b/x11-drivers/xf86-video-virtualbox/ChangeLog
@@ -1,20 +1,22 @@
 # 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.5 2008/10/27 18:21:13 jokey Exp $
-
-  26 Nov 2008; Alessio Cassibba (X-Drum) <swapon@gmail.com>
-  xf86-video-virtualbox-2.0.4-r1.ebuild, 
-  +xf86-video-virtualbox-2.0.6.ebuild,
-  files/xf86-video-virtualbox-2-localconfig:
-  Version Bump; improve build speed (don't build unneeded stuff); drop version
-  2.0.2
-
-  31 Oct 2008; Alessio Cassibba (X-Drum) <swapon@gmail.com>
-  -xf86-video-virtualbox-2.0.2.ebuild,
-  +xf86-video-virtualbox-2.0.2-r1.ebuild,
-  -xf86-video-virtualbox-2.0.4.ebuild,
-  +xf86-video-virtualbox-2.0.4-r1.ebuild:
-  fix xorg-server 1.5.x version check thanks to Walter Meinl, wrt bug #244920
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-virtualbox/ChangeLog,v 1.7 2008/12/18 12:12:00 flameeyes Exp $
+
+  19 Dec 2008; <x-drum@gentoo.org> +xf86-video-virtualbox-2.1.0.ebuild:
+  Version bump
+
+*xf86-video-virtualbox-2.0.6 (18 Dec 2008)
+*xf86-video-virtualbox-2.0.4-r1 (18 Dec 2008)
+
+  18 Dec 2008; Diego E. Pettenò <flameeyes@gentoo.org>
+  files/xf86-video-virtualbox-2-localconfig,
+  +xf86-video-virtualbox-2.0.4-r1.ebuild,
+  +xf86-video-virtualbox-2.0.6.ebuild:
+  Proxy commit Alessio's ebuilds.
+
+  28 Oct 2008; Markus Ullmann <jokey@gentoo.org>
+  xf86-video-virtualbox-1.6.6.ebuild:
+  Reinstate stable keyword for bug #244718
 
 *xf86-video-virtualbox-2.0.4 (27 Oct 2008)
 
diff --git a/x11-drivers/xf86-video-virtualbox/Manifest b/x11-drivers/xf86-video-virtualbox/Manifest
index 7336580..066cb0d 100644
--- a/x11-drivers/xf86-video-virtualbox/Manifest
+++ b/x11-drivers/xf86-video-virtualbox/Manifest
@@ -2,8 +2,10 @@ AUX xf86-video-virtualbox-2-localconfig 876 RMD160 db4b06bd8646f237260e8d61c5651
 DIST VirtualBox-1.6.6-OSE.tar.bz2 35483853 RMD160 4b17428371089806cf6f5e52d1905936f7beb01d SHA1 7c323b35d77277c650cbce2821ab6778d1e3270e SHA256 acb3c20ef751ed408489d7b5c2d5d441226055a6e83bfeb9258ce2d55baba4da
 DIST VirtualBox-2.0.4-OSE.tar.bz2 37841781 RMD160 390a2b4d97a3ed6fdc885b89354884a07b3fc464 SHA1 f8e7c109546c033927bd41e78f259adb81cb1504 SHA256 5618fb09efafac3fc9c183a44aa3c1d8c44d1d7fa58bfb5a73c221f1dd8740fd
 DIST VirtualBox-2.0.6-OSE.tar.bz2 37834467 RMD160 d75b9fbfe1311a5d83388d470d665ba8da0ab73b SHA1 e0f43d59b3309b37fe1703fb19b234f590598733 SHA256 75aea6e429beb953c8d0427cc38e4d25ccd849505ed57fdee0be22cada5497c5
+DIST VirtualBox-2.1.0-OSE.tar.bz2 39382682 RMD160 8c35b83889fcba3bc263d54a0523690cc1bda8b3 SHA1 a6ad07118c4a1161c4afa44ccb95db25ef07b7e0 SHA256 80d9dbab379de5ef097019f3b94a8a7e7a6535c37aa0168286c8b2bf4a960c7a
 EBUILD xf86-video-virtualbox-1.6.6.ebuild 1831 RMD160 39bc9acce013faace38374da5d247a9afa8e3c50 SHA1 d48f1d7b41f572a2e8b4dd3f0d36da30f56c26ee SHA256 66d2ded0f1cde76dccb1cc98cd0a28b5713a08bc5b23ee849b2af98e015392de
 EBUILD xf86-video-virtualbox-2.0.4-r1.ebuild 2141 RMD160 158d78d0ed2d46b4c33bf9ffcd191ffec4d36281 SHA1 73773be5f61a9961b4c741635699c517c3d7cff0 SHA256 4c0da78041e2a50a6ddf608931bf05748e8839a20b10311b57c44b184c107035
 EBUILD xf86-video-virtualbox-2.0.6.ebuild 2141 RMD160 158d78d0ed2d46b4c33bf9ffcd191ffec4d36281 SHA1 73773be5f61a9961b4c741635699c517c3d7cff0 SHA256 4c0da78041e2a50a6ddf608931bf05748e8839a20b10311b57c44b184c107035
-MISC ChangeLog 4563 RMD160 431dd16553390d243ce4f646efdcb468b2e69c19 SHA1 e31a66aeea3d4a7fe47635d1d96f4de4fc5b44b7 SHA256 f3de9d351f5b5c386595631aa8d7e5c744838efabba8ecbab77ea7b6fede862f
+EBUILD xf86-video-virtualbox-2.1.0.ebuild 2141 RMD160 158d78d0ed2d46b4c33bf9ffcd191ffec4d36281 SHA1 73773be5f61a9961b4c741635699c517c3d7cff0 SHA256 4c0da78041e2a50a6ddf608931bf05748e8839a20b10311b57c44b184c107035
+MISC ChangeLog 4518 RMD160 45ba98b8079c154eab3724d82b2b3a6f9a28f6a9 SHA1 b45a8401945599f0f1bfe6c10896df677cf581b0 SHA256 16919e5a26d6cf06b046e04458800fb3cfc6283c5513ebcdfd1d36511d96fe76
 MISC metadata.xml 344 RMD160 12935d5b21be85bc4222fd06371c93dcbf6f534e SHA1 68b99919921f246738cce4350b77d895e7c78106 SHA256 fff5aeb6f453d2e137765ca5016e81344cb0cd0cecd51d81bbb889cb1d7a5ba9
diff --git a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-2.1.0.ebuild b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-2.1.0.ebuild
new file mode 100644
index 0000000..e825edb
--- /dev/null
+++ b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-2.1.0.ebuild
@@ -0,0 +1,82 @@
+# 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.4.ebuild,v 1.1 2008/10/27 18:21:13 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}/${PN}-2-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
+			cd "${S}"${each}
+			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 &&	<x11-base/xorg-server-1.5" ; 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 ""
+}