Version Bump; fix has_version invalid atom bug #255744

svn path=/trunk/; revision=584

6 files changed, 121 insertions, 8 deletions

diff --git a/x11-drivers/xf86-input-virtualbox/ChangeLog b/x11-drivers/xf86-input-virtualbox/ChangeLog
index bdb879a..387c21f 100644
--- a/x11-drivers/xf86-input-virtualbox/ChangeLog
+++ b/x11-drivers/xf86-input-virtualbox/ChangeLog
@@ -1,7 +1,12 @@
 # ChangeLog for x11-drivers/xf86-input-virtualbox
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-virtualbox/ChangeLog,v 1.8 2008/12/18 12:09:06 flameeyes Exp $
 
+  23 Jan 2009; Alessio Cassibba (X-Drum) <swapon@gmail.com>
+  xf86-input-virtualbox-2.0.4-r1.ebuild, xf86-input-virtualbox-2.0.6.ebuild,
+  xf86-input-virtualbox-2.1.0.ebuild, +xf86-input-virtualbox-2.1.2.ebuild:
+  Version Bump; fix has_version invalid atom bug #255744
+
   19 Dec 2008; Alessio Cassibba (X-Drum) <swapon@gmail.com>
   +files/xf86-input-virtualbox-2.1.0-allow-gcc43.patch,
   +xf86-input-virtualbox-2.1.0.ebuild:
diff --git a/x11-drivers/xf86-input-virtualbox/Manifest b/x11-drivers/xf86-input-virtualbox/Manifest
index ccc1c89..33f307a 100644
--- a/x11-drivers/xf86-input-virtualbox/Manifest
+++ b/x11-drivers/xf86-input-virtualbox/Manifest
@@ -4,9 +4,11 @@ DIST VirtualBox-1.6.6-OSE.tar.bz2 35483853 RMD160 4b17428371089806cf6f5e52d19059
 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
+DIST VirtualBox-2.1.2-OSE.tar.bz2 47889575 RMD160 7deb3f77fa546872abdd16ca3eee39085e8509cf SHA1 1035a4a33a8106c7492b79ef58a7d7c2cf35ad29 SHA256 d3c1ae8ed7594094aaf8496204c5415479e1943e5b5179c5baae8a66885362de
 EBUILD xf86-input-virtualbox-1.6.6.ebuild 1767 RMD160 3b864392d6a0fe6ee85db592699a6147665e6b5f SHA1 c08b562e9dee3d172b32c29c79d41c4cb4ead284 SHA256 fab67e47ee53819a79ead31b28218f5e00eb8a95eeeb152fc994744b0ed83492
-EBUILD xf86-input-virtualbox-2.0.4-r1.ebuild 2267 RMD160 0b27826026ba44f7ef753481f0e07f42682a05e2 SHA1 56e11380ca953dee2104935db5ff4311244b30bf SHA256 e6322db22738e04d6d20c5745ffd21f831069ad11d4587d8a7d08e1c8574970d
-EBUILD xf86-input-virtualbox-2.0.6.ebuild 2264 RMD160 d654ffb6e6c8df1ec4aeb9f84447785581041586 SHA1 ae3b29d01732a79512fbaa4ccc48229c1296b580 SHA256 a15246a1c7b1502e2d3ff1c3faced9447639a4db4f2f40a5a0315e5fd2b15561
-EBUILD xf86-input-virtualbox-2.1.0.ebuild 2776 RMD160 e58c0f411d3174482b6b7a418cb18f657c5a81e3 SHA1 87ef0f5b511e33dfe0ef5a9dd2a3e4311993ac9c SHA256 2bb823dc8ca8c1c9e3b5830f3d3948810fd16fe4fe44f1d610af9ef6bab420d0
-MISC ChangeLog 4757 RMD160 83980d2d806c7f35330668361e77274d20ea135d SHA1 ec4510783b04f4715c036d98ae220a3f2c7b21ce SHA256 cde78859cee1e962a54a61174b87ab257f4812686b046f32d434f40afc2b4e0c
+EBUILD xf86-input-virtualbox-2.0.4-r1.ebuild 2285 RMD160 126e109e6fd770408b2ad94d38d6f85dd07d6b93 SHA1 ceffd199e4ca13032d129fd5e1f8775a9080c139 SHA256 1ff7c9e4cb7502191eaba4b1e95d0e36881b41f777f002f343ea4e9452485614
+EBUILD xf86-input-virtualbox-2.0.6.ebuild 2282 RMD160 8d659f6baa7687579c674ee045a6c05068de51b0 SHA1 89131714bc47afaa07c32e1a7bbb511b9452dc90 SHA256 0d950bc4adfea75ba0bb347f2bf0bcd06351549a692ff3bbc0d468d5f158300f
+EBUILD xf86-input-virtualbox-2.1.0.ebuild 2794 RMD160 eafeda40167a3a92ca20a7c12601e7418f62373a SHA1 6b9e4b6145a59957b938936de7c887cfa9515140 SHA256 ff4ac97b54aa3f3c037be292f08912e2e7b3a8f4012a9d317a19de2559141c4d
+EBUILD xf86-input-virtualbox-2.1.2.ebuild 2798 RMD160 77eabf6e3532ee09de71b4a99273b6a5b4661841 SHA1 8c4a96e9c93666c8cf5d4f54817599840c90cc2f SHA256 1c899b9384994b96fd6805c379c34eaacc87e706c91c66524b031eb877dddbe3
+MISC ChangeLog 5027 RMD160 978e2d8ab5afaf5c82d74a3e6440b627c43a2cb6 SHA1 94818311782576aa4e000563676e551f5cafb6b5 SHA256 f8d51a2e6615315b2a5794e31b5a5c324c6d81caf6df46875a874c8f36f8aac4
 MISC metadata.xml 344 RMD160 12935d5b21be85bc4222fd06371c93dcbf6f534e SHA1 68b99919921f246738cce4350b77d895e7c78106 SHA256 fff5aeb6f453d2e137765ca5016e81344cb0cd0cecd51d81bbb889cb1d7a5ba9
diff --git a/x11-drivers/xf86-input-virtualbox/xf86-input-virtualbox-2.0.4-r1.ebuild b/x11-drivers/xf86-input-virtualbox/xf86-input-virtualbox-2.0.4-r1.ebuild
index e9f8d21..745bc67 100644
--- a/x11-drivers/xf86-input-virtualbox/xf86-input-virtualbox-2.0.4-r1.ebuild
+++ b/x11-drivers/xf86-input-virtualbox/xf86-input-virtualbox-2.0.4-r1.ebuild
@@ -63,7 +63,8 @@ src_install() {
 
 		if has_version ">=x11-base/xorg-server-1.5" ; then
 				newins vboxmouse_drv_15.so vboxmouse_drv.so
-		elif has_version ">=x11-base/xorg-server-1.4 &&	<x11-base/xorg-server-1.5" ; then
+		elif has_version ">=x11-base/xorg-server-1.4" \
+		&& has_version "<x11-base/xorg-server-1.5" ; then
 				newins vboxmouse_drv_14.so vboxmouse_drv.so
 		else
 				newins vboxmouse_drv_71.so vboxmouse_drv.so
diff --git a/x11-drivers/xf86-input-virtualbox/xf86-input-virtualbox-2.0.6.ebuild b/x11-drivers/xf86-input-virtualbox/xf86-input-virtualbox-2.0.6.ebuild
index 9174ffc..20ca1ec 100644
--- a/x11-drivers/xf86-input-virtualbox/xf86-input-virtualbox-2.0.6.ebuild
+++ b/x11-drivers/xf86-input-virtualbox/xf86-input-virtualbox-2.0.6.ebuild
@@ -63,7 +63,8 @@ src_install() {
 
 		if has_version ">=x11-base/xorg-server-1.5" ; then
 				newins vboxmouse_drv_15.so vboxmouse_drv.so
-		elif has_version ">=x11-base/xorg-server-1.4 &&	<x11-base/xorg-server-1.5" ; then
+		elif has_version ">=x11-base/xorg-server-1.4" \
+		&& has_version "<x11-base/xorg-server-1.5" ; then
 				newins vboxmouse_drv_14.so vboxmouse_drv.so
 		else
 				newins vboxmouse_drv_71.so vboxmouse_drv.so
diff --git a/x11-drivers/xf86-input-virtualbox/xf86-input-virtualbox-2.1.0.ebuild b/x11-drivers/xf86-input-virtualbox/xf86-input-virtualbox-2.1.0.ebuild
index 7c36c1e..53646f5 100644
--- a/x11-drivers/xf86-input-virtualbox/xf86-input-virtualbox-2.1.0.ebuild
+++ b/x11-drivers/xf86-input-virtualbox/xf86-input-virtualbox-2.1.0.ebuild
@@ -79,7 +79,8 @@ src_install() {
 
 		if has_version ">=x11-base/xorg-server-1.5" ; then
 				newins vboxmouse_drv_15.so vboxmouse_drv.so
-		elif has_version ">=x11-base/xorg-server-1.4 &&	<x11-base/xorg-server-1.5" ; then
+		elif has_version ">=x11-base/xorg-server-1.4" \
+		&& has_version "<x11-base/xorg-server-1.5" ; then
 				newins vboxmouse_drv_14.so vboxmouse_drv.so
 		else
 				newins vboxmouse_drv_71.so vboxmouse_drv.so
diff --git a/x11-drivers/xf86-input-virtualbox/xf86-input-virtualbox-2.1.2.ebuild b/x11-drivers/xf86-input-virtualbox/xf86-input-virtualbox-2.1.2.ebuild
new file mode 100644
index 0000000..09b6f8f
--- /dev/null
+++ b/x11-drivers/xf86-input-virtualbox/xf86-input-virtualbox-2.1.2.ebuild
@@ -0,0 +1,103 @@
+# 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.0.4.ebuild,v 1.1 2008/10/27 18:20:25 jokey Exp $
+
+inherit x-modular eutils
+
+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.4
+		>=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}
+
+pkg_setup() {
+	# gcc 4.3 is *not supported* by upstream,
+	# please do not report bugs upstream at this time.
+	if [[ "$(gcc-major-version)$(gcc-minor-version)" == "43" ]]; then
+			elog ""
+			elog "Warning:"
+			elog "gcc-$(gcc-major-version).$(gcc-minor-version) was detected"
+			elog "this gcc release is *not supported* by upstream, please"
+			elog "*don't* file bug reports upstream reporting gcc failures."
+			elog ""
+	fi
+}
+
+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
+
+		# Disable gcc 4.3.x checks in configure
+		epatch "${FILESDIR}/${P}-allow-gcc43.patch"
+}
+
+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/xmouse ; 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/input
+
+		if has_version ">=x11-base/xorg-server-1.5" ; then
+				newins vboxmouse_drv_15.so vboxmouse_drv.so
+		elif has_version ">=x11-base/xorg-server-1.4" \
+		&& has_version "<x11-base/xorg-server-1.5" ; then
+				newins vboxmouse_drv_14.so vboxmouse_drv.so
+		else
+				newins vboxmouse_drv_71.so vboxmouse_drv.so
+		fi
+
+		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 ""
+}