diff options
| author |   Julian Ospald <hasufell@gentoo.org> | 2013-08-18 00:48:51 +0000 |
|---|---|---|
| committer | Julian Ospald <hasufell@gentoo.org> | 2013-08-18 00:48:51 +0000 |
| commit | 2bf492d9e94c5bb24621ddd200a8b653f9fccac2 (patch) | |
| tree | 63d45b709fb4f6b69a4dcf0d833a33c0157056a9 /games-action | |
| parent | stable amd64, x86 wrt #480814 (diff) | |
| download | gentoo-2-2bf492d9e94c5bb24621ddd200a8b653f9fccac2.tar.gz gentoo-2-2bf492d9e94c5bb24621ddd200a8b653f9fccac2.tar.bz2 gentoo-2-2bf492d9e94c5bb24621ddd200a8b653f9fccac2.zip | |
fix deps, revert allegro unbundle to fix x86 build, stable for amd64, x86 wrt #480812
(Portage version: 2.2.0/cvs/Linux x86_64, signed Manifest commit with key E73C35B3)
Diffstat (limited to 'games-action')
| -rw-r--r-- | games-action/beathazardultra/ChangeLog | 7 | ||||
| -rw-r--r-- | games-action/beathazardultra/beathazardultra-20130308.ebuild | 10 |
2 files changed, 10 insertions, 7 deletions
diff --git a/games-action/beathazardultra/ChangeLog b/games-action/beathazardultra/ChangeLog index 749fd59f242d..227dc7721250 100644 --- a/games-action/beathazardultra/ChangeLog +++ b/games-action/beathazardultra/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for games-action/beathazardultra # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-action/beathazardultra/ChangeLog,v 1.3 2013/05/09 14:11:01 hasufell Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-action/beathazardultra/ChangeLog,v 1.4 2013/08/18 00:48:51 hasufell Exp $ + + 18 Aug 2013; Julian Ospald <hasufell@gentoo.org> + beathazardultra-20130308.ebuild: + fix deps, revert allegro unbundle to fix x86 build, stable for amd64, x86 wrt + #480812 09 May 2013; Julian Ospald <hasufell@gentoo.org> beathazardultra-20130308.ebuild: diff --git a/games-action/beathazardultra/beathazardultra-20130308.ebuild b/games-action/beathazardultra/beathazardultra-20130308.ebuild index fa5eb3e0ca0d..59ef00308e69 100644 --- a/games-action/beathazardultra/beathazardultra-20130308.ebuild +++ b/games-action/beathazardultra/beathazardultra-20130308.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-action/beathazardultra/beathazardultra-20130308.ebuild,v 1.4 2013/05/09 14:11:01 hasufell Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-action/beathazardultra/beathazardultra-20130308.ebuild,v 1.5 2013/08/18 00:48:51 hasufell Exp $ -# TODO: unbundle allegro on amd64 when multilib support +# TODO: unbundle allegro[gtk...] (no multilib on amd64 and 5.0.9 soname) EAPI=5 @@ -14,7 +14,7 @@ SRC_URI="beathazard-installer_03-08-13" LICENSE="all-rights-reserved" SLOT="0" -KEYWORDS="-* ~amd64 ~x86" +KEYWORDS="-* amd64 x86" IUSE="bundled-libs" RESTRICT="bindist fetch splitdebug" @@ -31,15 +31,14 @@ RDEPEND=" app-emulation/emul-linux-x86-xlibs ) x86? ( + x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXcursor x11-libs/libXinerama x11-libs/libXrandr !bundled-libs? ( - media-libs/allegro:5 media-libs/libpng:1.2 virtual/jpeg - x11-libs/gtk+:2 ) )" @@ -59,7 +58,6 @@ src_unpack() { src_prepare() { if ! use bundled-libs ; then einfo "Removing bundled libs..." - use x86 && { rm -v all/hge_lib/liballegro* || die ; } rm -v all/hge_lib/libjpeg.so* all/hge_lib/libpng12.so* fi } |