mr_bones_ 15/05/12 19:20:46 Modified: bastion-20120620-r1.ebuild metadata.xml ChangeLog Log: punt bundled-libs use flag (bug #513602) (Portage version: 2.2.18/cvs/Linux x86_64, unsigned Manifest commit)
Revision Changes Path 1.7 games-rpg/bastion/bastion-20120620-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-rpg/bastion/bastion-20120620-r1.ebuild?rev=1.7&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-rpg/bastion/bastion-20120620-r1.ebuild?rev=1.7&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-rpg/bastion/bastion-20120620-r1.ebuild?r1=1.6&r2=1.7 Index: bastion-20120620-r1.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/games-rpg/bastion/bastion-20120620-r1.ebuild,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- bastion-20120620-r1.ebuild 15 May 2014 16:57:29 -0000 1.6 +++ bastion-20120620-r1.ebuild 12 May 2015 19:20:46 -0000 1.7 @@ -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 @@ 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 @@ # 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 @@ 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 * 1.3 games-rpg/bastion/metadata.xml file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-rpg/bastion/metadata.xml?rev=1.3&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-rpg/bastion/metadata.xml?rev=1.3&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-rpg/bastion/metadata.xml?r1=1.2&r2=1.3 Index: metadata.xml =================================================================== RCS file: /var/cvsroot/gentoo-x86/games-rpg/bastion/metadata.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- metadata.xml 25 Nov 2014 23:17:01 -0000 1.2 +++ metadata.xml 12 May 2015 19:20:46 -0000 1.3 @@ -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> 1.9 games-rpg/bastion/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-rpg/bastion/ChangeLog?rev=1.9&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-rpg/bastion/ChangeLog?rev=1.9&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-rpg/bastion/ChangeLog?r1=1.8&r2=1.9 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/games-rpg/bastion/ChangeLog,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- ChangeLog 25 Nov 2014 23:17:01 -0000 1.8 +++ ChangeLog 12 May 2015 19:20:46 -0000 1.9 @@ -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_bon...@gentoo.org> + bastion-20120620-r1.ebuild, metadata.xml: + punt bundled-libs use flag (bug #513602) 25 Nov 2014; Julian Ospald <hasuf...@gentoo.org> metadata.xml: drop maintainership
