summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Sterrett <mr_bones_@gentoo.org>2015-06-01 22:05:46 +0000
committerMichael Sterrett <mr_bones_@gentoo.org>2015-06-01 22:05:46 +0000
commit0cd5f644f29087125d2bcfec805d16e4156b5909 (patch)
tree6ff1d2601ab52cb3f407afc8f013b34ea67d3b31 /games-action/cs2d
parentclean up app-emulation/emul-linux which has been removed (diff)
downloadgentoo-2-0cd5f644f29087125d2bcfec805d16e4156b5909.tar.gz
gentoo-2-0cd5f644f29087125d2bcfec805d16e4156b5909.tar.bz2
gentoo-2-0cd5f644f29087125d2bcfec805d16e4156b5909.zip
clean up app-emulation/emul-linux which has been removed
(Portage version: 2.2.18/cvs/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'games-action/cs2d')
-rw-r--r--games-action/cs2d/ChangeLog5
-rw-r--r--games-action/cs2d/cs2d-0123.ebuild31
2 files changed, 15 insertions, 21 deletions
diff --git a/games-action/cs2d/ChangeLog b/games-action/cs2d/ChangeLog
index ea3d450e7362..5b6d17af866d 100644
--- a/games-action/cs2d/ChangeLog
+++ b/games-action/cs2d/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for games-action/cs2d
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/cs2d/ChangeLog,v 1.12 2015/03/14 18:05:51 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/cs2d/ChangeLog,v 1.13 2015/06/01 22:05:45 mr_bones_ Exp $
+
+ 01 Jun 2015; Michael Sterrett <mr_bones_@gentoo.org> cs2d-0123.ebuild:
+ clean up app-emulation/emul-linux which has been removed
14 Mar 2015; Michał Górny <mgorny@gentoo.org> -cs2d-0122.ebuild:
Drop old versions that require emul-linux-x86 packages.
diff --git a/games-action/cs2d/cs2d-0123.ebuild b/games-action/cs2d/cs2d-0123.ebuild
index 231799ad19b8..8addc302806d 100644
--- a/games-action/cs2d/cs2d-0123.ebuild
+++ b/games-action/cs2d/cs2d-0123.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/cs2d/cs2d-0123.ebuild,v 1.4 2014/08/10 21:21:50 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/cs2d/cs2d-0123.ebuild,v 1.5 2015/06/01 22:05:45 mr_bones_ Exp $
EAPI=5
@@ -27,22 +27,11 @@ RDEPEND="
virtual/opengl
)
amd64? (
- || (
- app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)]
- >=media-libs/openal-1.15.1[abi_x86_32(-)]
- )
- || (
- app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)]
- >=virtual/opengl-7.0-r1[abi_x86_32(-)]
- )
- || (
- app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
- (
- >=media-libs/freetype-2.5.0.1:2[abi_x86_32(-)]
- >=x11-libs/libX11-1.6.2[abi_x86_32(-)]
- >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)]
- )
- )
+ >=media-libs/openal-1.15.1[abi_x86_32(-)]
+ >=virtual/opengl-7.0-r1[abi_x86_32(-)]
+ >=media-libs/freetype-2.5.0.1:2[abi_x86_32(-)]
+ >=x11-libs/libX11-1.6.2[abi_x86_32(-)]
+ >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)]
)"
QA_PRESTRIPPED="opt/cs2d/CounterStrike2D"
@@ -52,10 +41,12 @@ S=${WORKDIR}
src_prepare() {
# removing windows files
- rm -f *.exe *.bat
+ rm -f *.exe *.bat || die
# OpenAL is default sound driver
- sed -i -e 's:^sounddriver.*$:sounddriver OpenAL Default:' sys/config.cfg || die
+ sed -i \
+ -e 's:^sounddriver.*$:sounddriver OpenAL Default:' \
+ sys/config.cfg || die
}
src_install() {