5 files changed, 15 insertions, 125 deletions
diff --git a/games-util/xboxdrv/ChangeLog b/games-util/xboxdrv/ChangeLog
index f657174e7357..4222fbea2285 100644
--- a/games-util/xboxdrv/ChangeLog
+++ b/games-util/xboxdrv/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-util/xboxdrv
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-util/xboxdrv/ChangeLog,v 1.20 2011/12/11 09:29:49 phajdan.jr Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-util/xboxdrv/ChangeLog,v 1.21 2012/01/26 18:26:59 mr_bones_ Exp $
+
+*xboxdrv-0.8.4 (26 Jan 2012)
+
+  26 Jan 2012; Michael Sterrett <mr_bones_@gentoo.org> -xboxdrv-0.7.1.ebuild,
+  -xboxdrv-0.7.3.ebuild, -xboxdrv-0.8.0.ebuild,
+  -files/xboxdrv-0.8.0-scons-blows.patch, +xboxdrv-0.8.4.ebuild:
+  version bump
 
   11 Dec 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org> xboxdrv-0.8.2.ebuild:
   x86 stable wrt bug #393213
diff --git a/games-util/xboxdrv/files/xboxdrv-0.8.0-scons-blows.patch b/games-util/xboxdrv/files/xboxdrv-0.8.0-scons-blows.patch
deleted file mode 100644
index 460413af12cf..000000000000
--- a/games-util/xboxdrv/files/xboxdrv-0.8.0-scons-blows.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- SConstruct.orig	2011-05-27 17:12:23.710420793 -0400
-+++ SConstruct	2011-05-27 17:12:41.975696140 -0400
-@@ -153,7 +153,7 @@
-                                Glob('src/axisevent/*.cpp') +
-                                Glob('src/buttonevent/*.cpp') +
-                                Glob('src/modifier/*.cpp'))
--env.Append(LIBS = libxboxdrv)
-+env.Prepend(LIBS = libxboxdrv)
- 
- env.Program('xboxdrv', Glob('src/main/main.cpp'))
- 
diff --git a/games-util/xboxdrv/xboxdrv-0.7.1.ebuild b/games-util/xboxdrv/xboxdrv-0.7.1.ebuild
deleted file mode 100644
index 80ad247c68f6..000000000000
--- a/games-util/xboxdrv/xboxdrv-0.7.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-util/xboxdrv/xboxdrv-0.7.1.ebuild,v 1.3 2011/04/11 14:19:09 phajdan.jr Exp $
-
-EAPI=2
-inherit scons-utils toolchain-funcs linux-info
-
-MY_P=${PN}-linux-${PV}
-DESCRIPTION="Userspace Xbox 360 Controller driver"
-HOMEPAGE="http://pingus.seul.org/~grumbel/xboxdrv/"
-SRC_URI="http://pingus.seul.org/~grumbel/xboxdrv/${MY_P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-libs/boost
-	sys-fs/udev
-	virtual/libusb:1
-	x11-libs/libX11"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-CONFIG_CHECK="~INPUT_EVDEV ~INPUT_JOYDEV ~INPUT_UINPUT ~!JOYSTICK_XPAD"
-
-src_compile() {
-	escons \
-		BUILD=custom \
-		CXX="$(tc-getCXX)" \
-		CXXFLAGS="-Wall ${CXXFLAGS}" \
-		LINKFLAGS="${LDFLAGS}" \
-		|| die "scons failed"
-}
-
-src_install() {
-	dobin xboxdrv || die "dobin failed"
-
-	insinto /etc/hal/fdi/policy
-	newins hal/xboxdrv_policy.fdi 99-xboxdrv.fdi || die "newins failed"
-	insinto /etc/hal/fdi/preprobe
-	newins hal/xboxdrv_preprobe.fdi 99-xboxdrv.fdi || die "newins failed"
-
-	doman doc/xboxdrv.1
-	dodoc AUTHORS NEWS PROTOCOL README TODO
-}
diff --git a/games-util/xboxdrv/xboxdrv-0.8.0.ebuild b/games-util/xboxdrv/xboxdrv-0.8.0.ebuild
deleted file mode 100644
index 3c41ee7101d0..000000000000
--- a/games-util/xboxdrv/xboxdrv-0.8.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-util/xboxdrv/xboxdrv-0.8.0.ebuild,v 1.3 2011/07/21 10:36:10 maekke Exp $
-
-EAPI=2
-inherit eutils scons-utils toolchain-funcs linux-info
-
-MY_P=${PN}-linux-${PV}
-DESCRIPTION="Userspace Xbox 360 Controller driver"
-HOMEPAGE="http://pingus.seul.org/~grumbel/xboxdrv/"
-SRC_URI="http://pingus.seul.org/~grumbel/xboxdrv/${MY_P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-libs/boost
-	sys-fs/udev
-	sys-apps/dbus
-	dev-libs/glib:2
-	virtual/libusb:1
-	x11-libs/libX11"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-CONFIG_CHECK="~INPUT_EVDEV ~INPUT_JOYDEV ~INPUT_UINPUT ~!JOYSTICK_XPAD"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-scons-blows.patch
-}
-
-src_compile() {
-	escons \
-		BUILD=custom \
-		CXX="$(tc-getCXX)" \
-		CXXFLAGS="-Wall ${CXXFLAGS}" \
-		LINKFLAGS="${LDFLAGS}" \
-		|| die "scons failed"
-}
-
-src_install() {
-	dobin xboxdrv || die "dobin failed"
-
-	insinto /etc/hal/fdi/policy
-	newins hal/xboxdrv_policy.fdi 99-xboxdrv.fdi || die "newins failed"
-	insinto /etc/hal/fdi/preprobe
-	newins hal/xboxdrv_preprobe.fdi 99-xboxdrv.fdi || die "newins failed"
-
-	doman doc/xboxdrv.1
-	dodoc AUTHORS NEWS PROTOCOL README TODO
-}
diff --git a/games-util/xboxdrv/xboxdrv-0.7.3.ebuild b/games-util/xboxdrv/xboxdrv-0.8.4.ebuild
index d1a6d04cbca3..fb8a70861a4e 100644
--- a/games-util/xboxdrv/xboxdrv-0.7.3.ebuild
+++ b/games-util/xboxdrv/xboxdrv-0.8.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-util/xboxdrv/xboxdrv-0.7.3.ebuild,v 1.1 2011/05/07 22:06:04 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-util/xboxdrv/xboxdrv-0.8.4.ebuild,v 1.1 2012/01/26 18:26:59 mr_bones_ Exp $
 
 EAPI=2
 inherit scons-utils toolchain-funcs linux-info
@@ -17,6 +17,8 @@ IUSE=""
 
 RDEPEND="dev-libs/boost
 	sys-fs/udev
+	sys-apps/dbus
+	dev-libs/glib:2
 	virtual/libusb:1
 	x11-libs/libX11"
 DEPEND="${RDEPEND}
@@ -32,17 +34,11 @@ src_compile() {
 		CXX="$(tc-getCXX)" \
 		CXXFLAGS="-Wall ${CXXFLAGS}" \
 		LINKFLAGS="${LDFLAGS}" \
-		|| die "scons failed"
+		|| die
 }
 
 src_install() {
-	dobin xboxdrv || die "dobin failed"
-
-	insinto /etc/hal/fdi/policy
-	newins hal/xboxdrv_policy.fdi 99-xboxdrv.fdi || die "newins failed"
-	insinto /etc/hal/fdi/preprobe
-	newins hal/xboxdrv_preprobe.fdi 99-xboxdrv.fdi || die "newins failed"
-
+	dobin xboxdrv || die
 	doman doc/xboxdrv.1
 	dodoc AUTHORS NEWS PROTOCOL README TODO
 }