calchan     14/12/31 20:59:53

  Modified:             ChangeLog
  Added:                scummvm-1.7.0-r2.ebuild
  Removed:              scummvm-1.7.0-r1.ebuild
  Log:
  Fix bug with addition of 'unsupported' USE flag. Thanks to David Turner.
  
  (Portage version: 2.2.15/cvs/Linux x86_64, unsigned Manifest commit)

Revision  Changes    Path
1.140                games-engines/scummvm/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-engines/scummvm/ChangeLog?rev=1.140&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-engines/scummvm/ChangeLog?rev=1.140&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-engines/scummvm/ChangeLog?r1=1.139&r2=1.140

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/games-engines/scummvm/ChangeLog,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -r1.139 -r1.140
--- ChangeLog   30 Dec 2014 19:13:15 -0000      1.139
+++ ChangeLog   31 Dec 2014 20:59:53 -0000      1.140
@@ -1,11 +1,17 @@
 # ChangeLog for games-engines/scummvm
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-engines/scummvm/ChangeLog,v 1.139 
2014/12/30 19:13:15 calchan Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-engines/scummvm/ChangeLog,v 1.140 
2014/12/31 20:59:53 calchan Exp $
+
+*scummvm-1.7.0-r2 (31 Dec 2014)
+
+  31 Dec 2014; Denis Dupeyron <[email protected]> -scummvm-1.7.0-r1.ebuild,
+  +scummvm-1.7.0-r2.ebuild:
+  Fix bug with addition of 'unsupported' USE flag. Thanks to David Turner.
 
 *scummvm-1.7.0-r1 (30 Dec 2014)
 
-  30 Dec 2014; Denis Dupeyron <[email protected]> -scummvm-1.7.0.ebuild,
-  +scummvm-1.7.0-r1.ebuild, metadata.xml:
+  30 Dec 2014; Denis Dupeyron <[email protected]> +scummvm-1.7.0-r1.ebuild,
+  metadata.xml:
   Remove redundant jpeg flag in IUSE. Add unsupported USE flag to build
   unsupported and/or broken game engines, with warning in metadata. Add support
   for EXTRA_ECONF.



1.1                  games-engines/scummvm/scummvm-1.7.0-r2.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-engines/scummvm/scummvm-1.7.0-r2.ebuild?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-engines/scummvm/scummvm-1.7.0-r2.ebuild?rev=1.1&content-type=text/plain

Index: scummvm-1.7.0-r2.ebuild
===================================================================
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: 
/var/cvsroot/gentoo-x86/games-engines/scummvm/scummvm-1.7.0-r2.ebuild,v 1.1 
2014/12/31 20:59:53 calchan Exp $

EAPI=5
inherit eutils flag-o-matic gnome2-utils toolchain-funcs games

DESCRIPTION="Reimplementation of the SCUMM game engine used in Lucasarts 
adventures"
HOMEPAGE="http://scummvm.sourceforge.net/";
SRC_URI="mirror://sourceforge/scummvm/${P/_/}.tar.bz2"

LICENSE="GPL-2 LGPL-2.1 BSD GPL-3-with-font-exception"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
IUSE="aac alsa debug flac fluidsynth jpeg mpeg2 mp3 opengl png theora truetype 
unsupported vorbis zlib"
RESTRICT="test"  # it only looks like there's a test there #77507

RDEPEND=">=media-libs/libsdl-1.2.2[sound,joystick,video]
        zlib? ( sys-libs/zlib )
        jpeg? ( virtual/jpeg:0 )
        png? ( media-libs/libpng:0 )
        vorbis? ( media-libs/libogg media-libs/libvorbis )
        theora? ( media-libs/libtheora )
        aac? ( media-libs/faad2 )
        alsa? ( media-libs/alsa-lib )
        mp3? ( media-libs/libmad )
        mpeg2? ( media-libs/libmpeg2 )
        flac? ( media-libs/flac )
        opengl? ( virtual/opengl )
        truetype? ( media-libs/freetype:2 )
        fluidsynth? ( media-sound/fluidsynth )"
DEPEND="${RDEPEND}
        x86? ( dev-lang/nasm )"

S=${WORKDIR}/${P/_/}

src_prepare() {
        # -g isn't needed for nasm here
        sed -i \
                -e '/NASMFLAGS/ s/-g//' \
                configure || die
        sed -i \
                -e '/INSTALL.*doc/d' \
                -e '/INSTALL.*\/pixmaps/d' \
                -e 's/-s //' \
                ports.mk || die
}

src_configure() {
        local myconf

        # bug #137547
        use fluidsynth || myconf="${myconf} --disable-fluidsynth"

        use x86 && append-ldflags -Wl,-z,noexecstack

        # NOT AN AUTOCONF SCRIPT SO DONT CALL ECONF
        ./configure \
                --backend=sdl \
                --host=$CHOST \
                --enable-verbose-build \
                --prefix=/usr \
                --bindir="${GAMES_BINDIR}" \
                --datadir="${GAMES_DATADIR}"/${PN} \
                --libdir="${GAMES_LIBDIR}" \
                --enable-zlib \
                $(use_enable debug) \
                $(use_enable !debug release-mode) \
                $(use_enable zlib) \
                $(use_enable aac faad) \
                $(use_enable alsa) \
                $(use_enable jpeg) \
                $(use_enable png) \
                $(use_enable mp3 mad) \
                $(use_enable mpeg2) \
                $(use_enable flac) \
                $(use_enable opengl) \
                $(use_enable vorbis) \
                $(use_enable theora theoradec) \
                $(use_enable truetype freetype2) \
                $(use_enable x86 nasm) \
                $(use unsupported && echo --enable-all-engines) \
                ${myconf} ${EXTRA_ECONF} || die
}

src_compile() {
        emake AR="$(tc-getAR) cru" RANLIB=$(tc-getRANLIB)
}

src_install() {
        emake DESTDIR="${D}" install
        dodoc AUTHORS NEWS README TODO
        doicon -s scalable icons/scummvm.svg
        make_desktop_entry scummvm ScummVM scummvm "Game;AdventureGame"
        prepgamesdirs
}

pkg_preinst() {
        games_pkg_preinst
        gnome2_icon_savelist
}

pkg_postinst() {
        games_pkg_postinst
        gnome2_icon_cache_update
}

pkg_postrm() {
        gnome2_icon_cache_update
}




Reply via email to