summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Sterrett <mr_bones_@gentoo.org>2009-08-14 17:01:26 +0000
committerMichael Sterrett <mr_bones_@gentoo.org>2009-08-14 17:01:26 +0000
commit29965db8625cbbd7d2f8589b3372d18b4390d68b (patch)
tree0d3017ff7623ca8a61700f4a2a1273ceddaa8221 /games-util/joystick
parentVersion bump (diff)
downloadgentoo-2-29965db8625cbbd7d2f8589b3372d18b4390d68b.tar.gz
gentoo-2-29965db8625cbbd7d2f8589b3372d18b4390d68b.tar.bz2
gentoo-2-29965db8625cbbd7d2f8589b3372d18b4390d68b.zip
block x11-libs/tslib due to inputattach collision (bug #281456)
(Portage version: 2.1.6.13/cvs/Linux i686)
Diffstat (limited to 'games-util/joystick')
-rw-r--r--games-util/joystick/ChangeLog6
-rw-r--r--games-util/joystick/joystick-20060731.ebuild5
2 files changed, 8 insertions, 3 deletions
diff --git a/games-util/joystick/ChangeLog b/games-util/joystick/ChangeLog
index 8cc6c5caa6b7..1ebbd2f39ea2 100644
--- a/games-util/joystick/ChangeLog
+++ b/games-util/joystick/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for games-util/joystick
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-util/joystick/ChangeLog,v 1.6 2009/01/29 08:24:46 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-util/joystick/ChangeLog,v 1.7 2009/08/14 17:01:26 mr_bones_ Exp $
+
+ 14 Aug 2009; Michael Sterrett <mr_bones_@gentoo.org>
+ joystick-20060731.ebuild:
+ block x11-libs/tslib due to inputattach collision (bug #281456)
29 Jan 2009; Michael Sterrett <mr_bones_@gentoo.org>
joystick-20060731.ebuild:
diff --git a/games-util/joystick/joystick-20060731.ebuild b/games-util/joystick/joystick-20060731.ebuild
index 140b4d30bb17..2771a27b7134 100644
--- a/games-util/joystick/joystick-20060731.ebuild
+++ b/games-util/joystick/joystick-20060731.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-util/joystick/joystick-20060731.ebuild,v 1.4 2009/01/29 08:24:46 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-util/joystick/joystick-20060731.ebuild,v 1.5 2009/08/14 17:01:26 mr_bones_ Exp $
EAPI=2
inherit eutils toolchain-funcs
@@ -14,7 +14,8 @@ SLOT="0"
KEYWORDS="~amd64 ~ppc x86"
IUSE="sdl"
-DEPEND="sdl? ( media-libs/libsdl )"
+DEPEND="sdl? ( media-libs/libsdl )
+ !x11-libs/tslib"
S=${WORKDIR}/utils