Version bump; drop support for pre-1.5 X servers wrt #259150; qa: avoid pre-stripped files thanks to Maciej Mrozowski wrt bug #274323

svn path=/trunk/; revision=721

4 files changed, 119 insertions, 17 deletions

diff --git a/x11-drivers/xf86-input-virtualbox/ChangeLog b/x11-drivers/xf86-input-virtualbox/ChangeLog
index 1b4b4e3..7e311e4 100644
--- a/x11-drivers/xf86-input-virtualbox/ChangeLog
+++ b/x11-drivers/xf86-input-virtualbox/ChangeLog
@@ -1,24 +1,24 @@
 # ChangeLog for x11-drivers/xf86-input-virtualbox
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-virtualbox/ChangeLog,v 1.13 2009/06/01 00:26:21 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-virtualbox/ChangeLog,v 1.15 2009/08/17 14:32:07 patrick Exp $
 
-  05 Aug 2009; Alessio Cassibba (X-Drum) <swapon@gmail.com>
-  -xf86-input-virtualbox-2.2.4.ebuild,
-  +xf86-input-virtualbox-3.0.4.ebuild:
-  Version bump; prune old ebuilds in overlay
+  10 Sep 2009; Alessio Cassibba (X-Drum) <swapon@gmail.com>
+  +xf86-input-virtualbox-3.0.6.ebuild:
+  Version bump; drop support for pre-1.5 X servers wrt #259150;
+  qa: avoid pre-stripped files thanks to Maciej Mrozowski wrt bug #274323
+
+*xf86-input-virtualbox-3.0.4 (17 Aug 2009)
 
-  20 Jul 2009; Alessio Cassibba (X-Drum) <swapon@gmail.com>
-  -xf86-input-virtualbox-3.0.2.ebuild,
-  +xf86-input-virtualbox-3.0.2-r1.ebuild:
-  Respect multilib dirs wrt #278213
+  17 Aug 2009; Patrick Lauer <patrick@gentoo.org>
+  +xf86-input-virtualbox-3.0.4.ebuild:
+  Bump to 3.0.4, fixes #280157. Thanks to Alessio Cassibba
 
-  10 Jul 2009; Alessio Cassibba (X-Drum) <swapon@gmail.com>
-  -xf86-input-virtualbox-3.0.0.ebuild, +xf86-input-virtualbox-3.0.2.ebuild:
-  Version bump; drop release 3.0.0
+*xf86-input-virtualbox-3.0.2 (16 Jul 2009)
 
-  02 Jul 2009; Alessio Cassibba (X-Drum) <swapon@gmail.com>
-  +xf86-input-virtualbox-3.0.0.ebuild:
-  Version bump
+  16 Jul 2009; Patrick Lauer <patrick@gentoo.org>
+  +xf86-input-virtualbox-3.0.2.ebuild:
+  Bump to 3.0.2. Fixes #275963. Thanks to Alessio Cassiba and all the
+  testers
 
 *xf86-input-virtualbox-2.2.4 (01 Jun 2009)
 
diff --git a/x11-drivers/xf86-input-virtualbox/Manifest b/x11-drivers/xf86-input-virtualbox/Manifest
index ac8d066..b1eafa3 100644
--- a/x11-drivers/xf86-input-virtualbox/Manifest
+++ b/x11-drivers/xf86-input-virtualbox/Manifest
@@ -1,7 +1,9 @@
-AUX xf86-input-virtualbox-2-localconfig 876 RMD160 db4b06bd8646f237260e8d61c5651a1fb4c22787 SHA1 9ab92582b1e0cc8a6a36cbd2fb52974bc90a5e8d SHA256 a11765d7e2623a081857ede04a650151742ef827bc7675323b4f7b14d06a3d64
+AUX xf86-input-virtualbox-2-localconfig 996 RMD160 4e986699d9484a3b7d9b11eb1bb30ca9d3a33fb3 SHA1 52d13e385d75d55aac64697eb715421df856c728 SHA256 ff777086ae7d0337e59066b4f7d6538823ca1804b57906e07cd562c8a48e054f
 DIST VirtualBox-3.0.2-OSE.tar.bz2 51322139 RMD160 9d33f82cf0ef2ca001fd61b9b26583ca2ad32a5a SHA1 442206e7dfcf6719b7ee452f9f042563acd6f0eb SHA256 41ee0fc47103aeeae8301f7b75d358662ff0f05e5874b9775641d6a9b9e39fe8
 DIST VirtualBox-3.0.4-OSE.tar.bz2 51381059 RMD160 7addc9d840ef751d95356a342c6a51f2c87a855b SHA1 454f4fbd46a3c7bfa0f6e48eaa37bb578446aca5 SHA256 006a25df51a209262ee93b8cf3f155e1883fa872b4b8c5d77f042675a0f302e1
+DIST VirtualBox-3.0.6-OSE.tar.bz2 51994159 RMD160 480e7997bd9ed44b41209bfa82627217b37c49a3 SHA1 403d23fcb8c0f209e6ea8ab9233f8607b923afdf SHA256 5f52961c2b318076f5ec5f3dccecb09233a8f31d821ae2cea9481c5453cd31ef
 EBUILD xf86-input-virtualbox-3.0.2-r1.ebuild 3011 RMD160 361a66aaae4b8776aafbc4ccd715f7b5b1b7b701 SHA1 992d891e1174d541dd4b416366fe5541763fabcf SHA256 f9f8315b8362091c106dacf3ca3544d517448490161034dd8d9e0cb8e349c470
 EBUILD xf86-input-virtualbox-3.0.4.ebuild 3011 RMD160 361a66aaae4b8776aafbc4ccd715f7b5b1b7b701 SHA1 992d891e1174d541dd4b416366fe5541763fabcf SHA256 f9f8315b8362091c106dacf3ca3544d517448490161034dd8d9e0cb8e349c470
-MISC ChangeLog 6220 RMD160 7e7c9b9d50ea98fd6bc5e537a6ac08aa54b09007 SHA1 dc2a9325d75b8bbc00c72fcf06d971cd4d44f725 SHA256 f119bba2359ce91bdb43d353d1f490f145df13a7c65197e8b3cba8338d57c85b
+EBUILD xf86-input-virtualbox-3.0.6.ebuild 2627 RMD160 f55d0894759088751ff025cd75c04e7acc159e7b SHA1 5722445825b2c4006282f03b277eebf09a5b5210 SHA256 d9392771c9ee2a5365aaec07d30f134dfd3c6a89b7718a1449f480e571d86999
+MISC ChangeLog 6216 RMD160 ff20ea0c5003743752529700082ba2001ff37ba0 SHA1 6cb191a82088535ae524d635b6722f04ddb1aea9 SHA256 baa6d9845bc7790d451f4876313f44d3a47205721f22a3a90a8020d874321a9a
 MISC metadata.xml 344 RMD160 12935d5b21be85bc4222fd06371c93dcbf6f534e SHA1 68b99919921f246738cce4350b77d895e7c78106 SHA256 fff5aeb6f453d2e137765ca5016e81344cb0cd0cecd51d81bbb889cb1d7a5ba9
diff --git a/x11-drivers/xf86-input-virtualbox/files/xf86-input-virtualbox-2-localconfig b/x11-drivers/xf86-input-virtualbox/files/xf86-input-virtualbox-2-localconfig
index 313b6bd..535c3f9 100644
--- a/x11-drivers/xf86-input-virtualbox/files/xf86-input-virtualbox-2-localconfig
+++ b/x11-drivers/xf86-input-virtualbox/files/xf86-input-virtualbox-2-localconfig
@@ -25,3 +25,6 @@ KBUILD_MSG_STYLE        := brief
 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-input-virtualbox/xf86-input-virtualbox-3.0.6.ebuild b/x11-drivers/xf86-input-virtualbox/xf86-input-virtualbox-3.0.6.ebuild
new file mode 100644
index 0000000..09572c7
--- /dev/null
+++ b/x11-drivers/xf86-input-virtualbox/xf86-input-virtualbox-3.0.6.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-virtualbox/xf86-input-virtualbox-2.2.4.ebuild,v 1.2 2009/06/01 13:31:15 mr_bones_ Exp $
+
+EAPI=2
+
+inherit x-modular eutils multilib
+
+MY_P=VirtualBox-${PV}-OSE
+DESCRIPTION="VirtualBox input 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="hal"
+
+RDEPEND="x11-base/xorg-server
+		hal? ( sys-apps/hal )"
+DEPEND="${RDEPEND}
+		>=dev-util/kbuild-0.1.5-r1
+		>=dev-lang/yasm-0.6.2
+		sys-devel/dev86
+		sys-power/iasl
+		x11-proto/inputproto
+		x11-proto/randrproto
+		x11-proto/xproto"
+
+S=${WORKDIR}/${MY_P/-OSE/_OSE}
+
+src_prepare() {
+		# 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_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"
+		source ./env.sh
+}
+
+src_compile() {
+		for each in /src/VBox/{Runtime,Additions/common/VBoxGuestLib} \
+		/src/VBox/Additions/x11/vboxmouse ; 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/$(get_libdir)/xorg/modules/input
+
+		# xorg-server-1.6.x
+		if has_version ">=x11-base/xorg-server-1.6" ; then
+				newins vboxmouse_drv_16.so vboxmouse_drv.so
+		# xorg-server-1.5.x
+		else
+				newins vboxmouse_drv_15.so vboxmouse_drv.so
+		fi
+
+		# install hal information file about the mouse driver
+		if use hal; then
+			cd "${S}/src/VBox/Additions/linux/installer"
+			insinto /usr/share/hal/fdi/information/20thirdparty
+			doins 90-vboxguest.fdi
+		fi
+}
+
+pkg_postinst() {
+		elog "You need to edit the file /etc/X11/xorg.conf and set:"
+		elog ""
+		elog "	Driver  \"vboxmouse\""
+		elog ""
+		elog "in the Core Pointer's InputDevice section (Section \"InputDevice\")"
+		elog ""
+		if has_version ">=x11-base/xorg-server-1.5" ; then
+			elog "Starting with 1.5 version, X.Org Server can do mouse auto-detection"
+			elog "you may install the hal information file about the mouse driver:"
+			elog ""
+			elog "/usr/share/hal/fdi/information/20thirdparty/90-vboxguest.fdi"
+			elog ""
+			elog "dropping it into: /etc/hal/fdi/policy/"
+			elog ""
+		fi
+}