diff options
| author |   Michael Sterrett <mr_bones_@gentoo.org> | 2015-05-12 19:20:46 +0000 |
|---|---|---|
| committer | Michael Sterrett <mr_bones_@gentoo.org> | 2015-05-12 19:20:46 +0000 |
| commit | e50c63c2b71047d0796d21b79d5489647d764485 (patch) | |
| tree | f4eb09aa725735bedace1fab5e69c580914c668c /games-rpg | |
| parent | Removed vulnerable version (diff) | |
| download | gentoo-2-e50c63c2b71047d0796d21b79d5489647d764485.tar.gz gentoo-2-e50c63c2b71047d0796d21b79d5489647d764485.tar.bz2 gentoo-2-e50c63c2b71047d0796d21b79d5489647d764485.zip | |
punt bundled-libs use flag (bug #513602)
(Portage version: 2.2.18/cvs/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'games-rpg')
| -rw-r--r-- | games-rpg/bastion/ChangeLog | 8 | ||||
| -rw-r--r-- | games-rpg/bastion/bastion-20120620-r1.ebuild | 41 | ||||
| -rw-r--r-- | games-rpg/bastion/metadata.xml | 5 |
3 files changed, 19 insertions, 35 deletions
diff --git a/games-rpg/bastion/ChangeLog b/games-rpg/bastion/ChangeLog index f6787ebe67b2..2e9ea36e47f1 100644 --- a/games-rpg/bastion/ChangeLog +++ b/games-rpg/bastion/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-rpg/bastion -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-rpg/bastion/ChangeLog,v 1.8 2014/11/25 23:17:01 hasufell Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/games-rpg/bastion/ChangeLog,v 1.9 2015/05/12 19:20:46 mr_bones_ Exp $ + + 12 May 2015; Michael Sterrett <mr_bones_@gentoo.org> + bastion-20120620-r1.ebuild, metadata.xml: + punt bundled-libs use flag (bug #513602) 25 Nov 2014; Julian Ospald <hasufell@gentoo.org> metadata.xml: drop maintainership diff --git a/games-rpg/bastion/bastion-20120620-r1.ebuild b/games-rpg/bastion/bastion-20120620-r1.ebuild index 5b5176c9b0b2..d2c3c1dd8130 100644 --- a/games-rpg/bastion/bastion-20120620-r1.ebuild +++ b/games-rpg/bastion/bastion-20120620-r1.ebuild @@ -1,9 +1,8 @@ -# 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-rpg/bastion/bastion-20120620-r1.ebuild,v 1.6 2014/05/15 16:57:29 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-rpg/bastion/bastion-20120620-r1.ebuild,v 1.7 2015/05/12 19:20:46 mr_bones_ Exp $ EAPI=5 - inherit eutils gnome2-utils check-reqs unpacker games TIMESTAMP=${PV:0:4}-${PV:4:2}-${PV:6:2} @@ -14,7 +13,7 @@ SRC_URI="Bastion-HIB-${TIMESTAMP}.sh" LICENSE="all-rights-reserved" SLOT="0" KEYWORDS="-* amd64 x86" -IUSE="bundled-libs" +IUSE="" RESTRICT="bindist fetch splitdebug" MYGAMEDIR=${GAMES_PREFIX_OPT}/${PN} @@ -25,21 +24,16 @@ QA_PREBUILT="${MYGAMEDIR#/}/Bastion.bin* # mono shit: vague dependencies RDEPEND=" virtual/opengl - media-libs/freealut - media-libs/openal - media-libs/sdl-gfx - media-libs/sdl-image - media-libs/sdl-mixer - media-libs/sdl-net - media-libs/sdl-ttf - media-libs/smpeg - x11-libs/libX11 - x11-libs/libXft - !bundled-libs? ( - dev-lang/mono - media-libs/fmod:1 - media-libs/libsdl[X,sound,video,opengl,joystick] - )" + media-libs/freealut + media-libs/openal + media-libs/sdl-gfx + media-libs/sdl-image + media-libs/sdl-mixer + media-libs/sdl-net + media-libs/sdl-ttf + media-libs/smpeg + x11-libs/libX11 + x11-libs/libXft" CHECKREQS_DISK_BUILD="2400M" @@ -63,15 +57,6 @@ src_unpack() { unpack ./../instarchive_{all,linux_${myarch}}.tar.lzma } -src_prepare() { - if ! use bundled-libs ; then - einfo "Removing bundles libs..." - rm -v $(get_libdir)/libmono-2.0.so* \ - $(get_libdir)/libfmodex.so* \ - $(get_libdir)/libSDL-1.2.so*|| die - fi -} - src_install() { insinto "${MYGAMEDIR}" doins -r * diff --git a/games-rpg/bastion/metadata.xml b/games-rpg/bastion/metadata.xml index d13413d31d91..01a746edb196 100644 --- a/games-rpg/bastion/metadata.xml +++ b/games-rpg/bastion/metadata.xml @@ -2,10 +2,5 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <herd>games</herd> - <use> - <flag name='bundled-libs'> - Use the upstream provided bundled libraries. - </flag> - </use> </pkgmetadata> |