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
commit82cfd465f7bea84e4225020a8406c159d62a2b29 (patch)
tree543077c29c9f09933e042a1916e6bb6c9665489f /games-util
parentVersion bump (diff)
downloadhistorical-82cfd465f7bea84e4225020a8406c159d62a2b29.tar.gz
historical-82cfd465f7bea84e4225020a8406c159d62a2b29.tar.bz2
historical-82cfd465f7bea84e4225020a8406c159d62a2b29.zip
block x11-libs/tslib due to inputattach collision (bug #281456)
Package-Manager: portage-2.1.6.13/cvs/Linux i686
Diffstat (limited to 'games-util')
-rw-r--r--games-util/joystick/ChangeLog6
-rw-r--r--games-util/joystick/Manifest4
-rw-r--r--games-util/joystick/joystick-20060731.ebuild5
3 files changed, 10 insertions, 5 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/Manifest b/games-util/joystick/Manifest
index 612b9d1d10d3..6b5db9be09bf 100644
--- a/games-util/joystick/Manifest
+++ b/games-util/joystick/Manifest
@@ -1,6 +1,6 @@
AUX joystick-MCS-defines.patch 575 RMD160 1c3ee34bc75645dff552e0b22a8515e4b3bb3dbe SHA1 81d0fa629cc7c11e7336fc3b610c296418fbd777 SHA256 fc58bba55c2b158aa5615599c6433989df2d09204d1d2717728f50489fac0b61
AUX joystick-jstest-segv.patch 1561 RMD160 16585232d1edf36e492dea560a916e8a63e2567b SHA1 f59b280ad68880a336e6f86cedda6962a0a3c4ee SHA256 d0caec60e34eb2b60ae621ddaf3d5aeb6f0ca7efbcd10d0727c39a79153c873a
DIST joystick-20060731.tar.bz2 27411 RMD160 fea5a38160bb578c7d0ab380b7d5f7ceba490ca4 SHA1 9846e9750058728b75f5db9b4496af4c72dfb016 SHA256 17aa3ca45f6bbd2004d0cede4a0f1c32b4cabb946628a85602d89c45d874006b
-EBUILD joystick-20060731.ebuild 950 RMD160 b2ef67d482a5af2e037086bf190cf061cbe18469 SHA1 748f037fc95f78e1bf4623e09081287f383bb277 SHA256 1b18e1387c8f01fd2c844d6ddf1dfe200e7c93d56a1a014f4c8a2113bb6dfea7
-MISC ChangeLog 1070 RMD160 174b4a839989faeb72f6c7b855d068073ac8c538 SHA1 0b7dc57a736c0d1700db259407d4812e9d2e8f8c SHA256 044b7e726d008a7fccbc812297cf1f5a92d05821e1a1c81c60719ade64899d4f
+EBUILD joystick-20060731.ebuild 967 RMD160 c3f42b7a102a2cf7704ccbf1aa09bbeba5c47a0e SHA1 b4b49841532deaa6fd73bdcc61faf25296e2a4bc SHA256 3663119192dc50096cf3cc3c9859bb9dc347c7869445adaa01a2aa5850cccc96
+MISC ChangeLog 1220 RMD160 59835087a2934f5c7c180bbb1fa12fa87566d23f SHA1 5441c57b1f1275ada08f529ca8f821f4ba20aa92 SHA256 a9b32b18ef5b00b393f02c918759a8e9d8633f154c5415c6dd717c5894ba1cfa
MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
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