diff options
| author |   Michael Sterrett <mr_bones_@gentoo.org> | 2009-12-07 21:20:56 +0000 |
|---|---|---|
| committer | Michael Sterrett <mr_bones_@gentoo.org> | 2009-12-07 21:20:56 +0000 |
| commit | 09fe15f8886a8b98d2cd8005ba0a4f0881c743ee (patch) | |
| tree | 891ec6db8fc82eae6fd083b805982a4c4673cf3e /games-fps | |
| parent | Automated update of use.local.desc (diff) | |
| download | historical-09fe15f8886a8b98d2cd8005ba0a4f0881c743ee.tar.gz historical-09fe15f8886a8b98d2cd8005ba0a4f0881c743ee.tar.bz2 historical-09fe15f8886a8b98d2cd8005ba0a4f0881c743ee.zip | |
punt alsa since it's incomplete (bug #110374)
Package-Manager: portage-2.1.6.13/cvs/Linux i686
Diffstat (limited to 'games-fps')
| -rw-r--r-- | games-fps/quake2-icculus/ChangeLog | 6 | ||||
| -rw-r--r-- | games-fps/quake2-icculus/Manifest | 4 | ||||
| -rw-r--r-- | games-fps/quake2-icculus/quake2-icculus-0.16.1-r1.ebuild | 25 |
3 files changed, 17 insertions, 18 deletions
diff --git a/games-fps/quake2-icculus/ChangeLog b/games-fps/quake2-icculus/ChangeLog index 73d08d1aae91..6879ad5e97db 100644 --- a/games-fps/quake2-icculus/ChangeLog +++ b/games-fps/quake2-icculus/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-fps/quake2-icculus # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-fps/quake2-icculus/ChangeLog,v 1.38 2009/11/19 18:39:09 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-fps/quake2-icculus/ChangeLog,v 1.39 2009/12/07 21:20:56 mr_bones_ Exp $ + + 07 Dec 2009; Michael Sterrett <mr_bones_@gentoo.org> + quake2-icculus-0.16.1-r1.ebuild: + punt alsa since it's incomplete (bug #110374) 19 Nov 2009; Raúl Porcel <armin76@gentoo.org> quake2-icculus-0.16.1-r1.ebuild: diff --git a/games-fps/quake2-icculus/Manifest b/games-fps/quake2-icculus/Manifest index 5a00483623e9..62c490909203 100644 --- a/games-fps/quake2-icculus/Manifest +++ b/games-fps/quake2-icculus/Manifest @@ -10,6 +10,6 @@ DIST maxpak.pak 3282742 RMD160 6b5223fee63dbb2c886e3c1e39d9e157d65f589f SHA1 eca DIST quake2-r0.16.1.tar.gz 1525384 RMD160 dbbf9cad08ab381e0c2cd037e317104085455c23 SHA1 9226acadc896ddc9924c6b7f9b71857078af5dba SHA256 49f4d3d53772b6ffd7733506f5d121c7893bfd8884133bfc36a28039c0744642 DIST roguesrc320.shar.Z 626769 RMD160 767c5b1a7a1123370e9c924282656dfdcc6cebba SHA1 7c5cadde75f5353622552cd28501ce60ac83dca2 SHA256 ceefb2fd748961cb0bc3244220f3eb09d8f7b8ca2eb32cdf9b284727a2fdc919 DIST xatrixsrc320.shar.Z 455917 RMD160 357182dcd760a95b27942cdf807ba1242bcb1160 SHA1 ec67b6d2be623dd344c100869fc48bcbadea927a SHA256 94bf596cd85d38ea294b99ccb0ebb5e4b9776cca335001b3803e2d8407395589 -EBUILD quake2-icculus-0.16.1-r1.ebuild 5528 RMD160 ab6cb3826227afac68685e42b13c76f7d762825f SHA1 4efc493405e55626e3a8869e35248b31b175d016 SHA256 abaaf917450f0cf7da868600ba9ab9e641d790b9cbb75db952d047766ea3aaf1 -MISC ChangeLog 6871 RMD160 e5ee5d28a8dca6fd1b0b791570642ea07550f088 SHA1 d1ac93f7ca2a204e253a526b34920bc461f7afae SHA256 f89209a5b7e791935df5af6d01ebe70648a0b886f90845619496893ef76c7f67 +EBUILD quake2-icculus-0.16.1-r1.ebuild 5367 RMD160 f81f16da89a918b352e445dbfa4aabba704c5341 SHA1 5568eecec4033d4e99c0db8d92f2ba623b69f9d5 SHA256 98aecf628a8c7370e64b529c750317f567fc655207104917efa4309afe083c2a +MISC ChangeLog 7012 RMD160 5e333efb9d63c06f6c3a3d7768667874e5245d27 SHA1 fa71d6991f7faba710a3a8c31a7756978dfb16ed SHA256 e79fc321be489439559ce9a1f6e50ec7d5f01a5c50800d3ed4bb4eae6ed8f3e2 MISC metadata.xml 513 RMD160 1dc52f937a6d3f1e62131171345cd429c4f080cf SHA1 01cfd49cdfd38befba81acae82c76c52edc38b31 SHA256 0608a118c068c5cb15473fc3ee2c6338b6a6330ee2063d1d2b6864c57a761e2c diff --git a/games-fps/quake2-icculus/quake2-icculus-0.16.1-r1.ebuild b/games-fps/quake2-icculus/quake2-icculus-0.16.1-r1.ebuild index 96fa08161eac..32d1f2231142 100644 --- a/games-fps/quake2-icculus/quake2-icculus-0.16.1-r1.ebuild +++ b/games-fps/quake2-icculus/quake2-icculus-0.16.1-r1.ebuild @@ -1,7 +1,8 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-fps/quake2-icculus/quake2-icculus-0.16.1-r1.ebuild,v 1.18 2009/11/19 18:39:09 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-fps/quake2-icculus/quake2-icculus-0.16.1-r1.ebuild,v 1.19 2009/12/07 21:20:56 mr_bones_ Exp $ +EAPI=2 inherit eutils toolchain-funcs games MY_P="quake2-r${PV}" @@ -15,13 +16,12 @@ SRC_URI="http://icculus.org/quake2/files/${MY_P}.tar.gz LICENSE="GPL-2" SLOT="0" KEYWORDS="ppc sparc x86 ~x86-fbsd" -IUSE="aalib alsa cdinstall dedicated demo ipv6 joystick opengl qmax rogue sdl svga X xatrix" +IUSE="aalib cdinstall dedicated demo ipv6 joystick opengl qmax rogue sdl svga X xatrix" UIDEPEND="aalib? ( media-libs/aalib ) - alsa? ( media-libs/alsa-lib ) opengl? ( virtual/opengl ) svga? ( media-libs/svgalib ) - sdl? ( media-libs/libsdl ) + sdl? ( media-libs/libsdl[audio,joystick?,video] ) X? ( x11-libs/libXxf86dga x11-libs/libXxf86vm @@ -47,13 +47,6 @@ pkg_setup() { alert_user=y fi - if ! use sdl ; then - ewarn "The ALSA sound driver for this game is broken." - ewarn "The 'sdl' USE flag is recommended instead." - echo - alert_user=y - fi - if [[ -n "${alert_user}" ]] ; then ebeep epause @@ -64,9 +57,11 @@ src_unpack() { unpack ${MY_P}.tar.gz cd "${S}" sed -i -e 's:BUILD_SOFTX:BUILD_X11:' Makefile || die - epatch "${FILESDIR}"/${P}-amd64.patch # make sure this is still needed in future versions - epatch "${FILESDIR}"/${P}-gentoo-paths.patch - epatch "${FILESDIR}"/${P}-no-asm-io.patch #193107 + # -amd64.patch # make sure this is still needed in future versions + epatch \ + "${FILESDIR}"/${P}-amd64.patch \ + "${FILESDIR}"/${P}-gentoo-paths.patch \ + "${FILESDIR}"/${P}-no-asm-io.patch #193107 # Now we deal with the silly rogue / xatrix addons ... this is ugly :/ ln -s $(type -P echo) "${T}"/more @@ -131,7 +126,7 @@ src_compile() { BUILD_QMAX=${BUILD_QMAX} \ HAVE_IPV6=$(yesno ipv6) \ BUILD_ARTS=NO \ - BUILD_ALSA=$(yesno alsa) \ + BUILD_ALSA=NO \ SDLDIR=/usr/lib \ DEFAULT_BASEDIR="${GAMES_DATADIR}/quake2" \ DEFAULT_LIBDIR="$(games_get_libdir)/${PN}${libsuffix}" \ |