summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Sterrett <mr_bones_@gentoo.org>2010-08-12 16:56:49 +0000
committerMichael Sterrett <mr_bones_@gentoo.org>2010-08-12 16:56:49 +0000
commit06b1e7cd14b393da9600f3473202f8fe181fc250 (patch)
tree245da372e904586c9368aa153e980ae35bf6b9ab /games-util/joystick
parentRemoved old unused flag (diff)
downloadhistorical-06b1e7cd14b393da9600f3473202f8fe181fc250.tar.gz
historical-06b1e7cd14b393da9600f3473202f8fe181fc250.tar.bz2
historical-06b1e7cd14b393da9600f3473202f8fe181fc250.zip
Add libsdl use dep; respect LDFLAGS (bug #332459)
Package-Manager: portage-2.1.8.3/cvs/Linux i686
Diffstat (limited to 'games-util/joystick')
-rw-r--r--games-util/joystick/ChangeLog8
-rw-r--r--games-util/joystick/Manifest6
-rw-r--r--games-util/joystick/files/joystick-20060731-asneeded.patch4
-rw-r--r--games-util/joystick/joystick-20060731.ebuild6
4 files changed, 14 insertions, 10 deletions
diff --git a/games-util/joystick/ChangeLog b/games-util/joystick/ChangeLog
index b7169527e9ef..8d10f1f28d45 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.8 2009/12/21 15:47:29 ssuominen Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-util/joystick/ChangeLog,v 1.9 2010/08/12 16:56:49 mr_bones_ Exp $
+
+ 12 Aug 2010; Michael Sterrett <mr_bones_@gentoo.org>
+ joystick-20060731.ebuild, files/joystick-20060731-asneeded.patch:
+ Add libsdl use dep; respect LDFLAGS (bug #332459)
21 Dec 2009; Samuli Suominen <ssuominen@gentoo.org>
joystick-20060731.ebuild, +files/joystick-20060731-asneeded.patch:
diff --git a/games-util/joystick/Manifest b/games-util/joystick/Manifest
index 10842b2116b6..470cba65fb2e 100644
--- a/games-util/joystick/Manifest
+++ b/games-util/joystick/Manifest
@@ -1,7 +1,7 @@
-AUX joystick-20060731-asneeded.patch 810 RMD160 cc8d75c977ce713e0324169d2a76b9726a09ef89 SHA1 47e10ebfca585c446e2118f882128501e596adfc SHA256 d0e4282d85c1f8f614ac139d05691805ee965839cae9cec6ded5b7129860faab
+AUX joystick-20060731-asneeded.patch 832 RMD160 edd93052a8c0a3eb711be04b633c88f2bab82c3d SHA1 0d65fa234594aa263ffda713803cc5a1dc62e2f1 SHA256 6f714e005697fe5f2965727529c2b2dc56534f5d49f301dbef69e26479399887
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 1005 RMD160 bae95786f6143393616a12519f4787ebaaa99158 SHA1 280d1d75a37687006354ac8e3936e055fc0d9000 SHA256 89ba724955c0742dbe754e8b3d3a4d5e98a3547a4062e4e2d66893d0c58a128f
-MISC ChangeLog 1411 RMD160 d65d6d552bcab78ad2c1425cb6f94937e967953b SHA1 5c3842d7486fa2b6fb974c4e6afada2164a2fb71 SHA256 5ec4b4a6aad26cdb3e3e9b4145e65df5ee285291f1d26b0992da1010ae441998
+EBUILD joystick-20060731.ebuild 1012 RMD160 d747ae325ed4df2a70123fbe99a230be582e9b63 SHA1 2eddcf8e0692f1ca6b4754199b75c6dc98e58028 SHA256 8dd457e6e76ba7e7d7fc05b43b6ec15b6ffbbdfbe82b952cc7dc26999e91ef25
+MISC ChangeLog 1587 RMD160 00e9b4bc58e8058dc2fead13c7f3a9943697364e SHA1 40cb181edf1b530f914eb5c7c6dc609b216a5a48 SHA256 c2271cf7f7a2a1b4bc943af2d20cee168066edb6bec38d276fd63b64b5ac158e
MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
diff --git a/games-util/joystick/files/joystick-20060731-asneeded.patch b/games-util/joystick/files/joystick-20060731-asneeded.patch
index 3bfe30f01ea2..d9bbc07240ae 100644
--- a/games-util/joystick/files/joystick-20060731-asneeded.patch
+++ b/games-util/joystick/files/joystick-20060731-asneeded.patch
@@ -5,7 +5,7 @@
ffcfstress: ffcfstress.c
$(CC) $(CFLAGS) -funsigned-char \
- -lm ffcfstress.c -o ffcfstress
-+ ffcfstress.c -o ffcfstress -lm
++ ffcfstress.c -o ffcfstress $(LDFLAGS) -lm
ffmvforce.o: ffmvforce.c
$(CC) -c $(CFLAGS) $(CPPFLAGS) $^ -o $@ `sdl-config --cflags`
@@ -14,7 +14,7 @@
jscal: jscal.o
- $(CC) $(CFLAGS) $(CPPFLAGS) -lm $^ -o $@
-+ $(CC) $(CFLAGS) $(CPPFLAGS) $^ -o $@ -lm
++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $^ -o $@ -lm
gencodes: gencodes.c scancodes.h
$(CC) $(CFLAGS) $(CPPFLAGS) gencodes.c -o gencodes
diff --git a/games-util/joystick/joystick-20060731.ebuild b/games-util/joystick/joystick-20060731.ebuild
index 1649235b761d..b0b5c41a1abc 100644
--- a/games-util/joystick/joystick-20060731.ebuild
+++ b/games-util/joystick/joystick-20060731.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 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.6 2009/12/21 15:47:29 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-util/joystick/joystick-20060731.ebuild,v 1.7 2010/08/12 16:56:49 mr_bones_ Exp $
EAPI=2
inherit eutils toolchain-funcs
@@ -14,7 +14,7 @@ SLOT="0"
KEYWORDS="~amd64 ~ppc x86"
IUSE="sdl"
-DEPEND="sdl? ( media-libs/libsdl )
+DEPEND="sdl? ( media-libs/libsdl[video] )
!x11-libs/tslib"
S=${WORKDIR}/utils