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.

Package-Manager: portage-2.2.15/cvs/Linux x86_64

4 files changed, 123 insertions, 3 deletions

diff --git a/games-engines/scummvm/ChangeLog b/games-engines/scummvm/ChangeLog
index 9305250ee10f..32197ee5bf98 100644
--- a/games-engines/scummvm/ChangeLog
+++ b/games-engines/scummvm/ChangeLog
@@ -1,6 +1,14 @@
 # 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.138 2014/10/29 20:35:26 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-engines/scummvm/ChangeLog,v 1.139 2014/12/30 19:13:15 calchan Exp $
+
+*scummvm-1.7.0-r1 (30 Dec 2014)
+
+  30 Dec 2014; Denis Dupeyron <calchan@gentoo.org> -scummvm-1.7.0.ebuild,
+  +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.
 
   29 Oct 2014; Michael Sterrett <mr_bones_@gentoo.org>
   -files/scummvm-1.5.0-EE.patch, -scummvm-1.5.0.ebuild:
diff --git a/games-engines/scummvm/Manifest b/games-engines/scummvm/Manifest
index ebd0724a25d7..972ecd583bd2 100644
--- a/games-engines/scummvm/Manifest
+++ b/games-engines/scummvm/Manifest
@@ -1,4 +1,5 @@
 DIST scummvm-1.7.0.tar.bz2 20018016 SHA256 d9ff0e8cf911afa466d5456d28fef692a17d47ddecfd428bf2fef591237c2e66 SHA512 0133feb2df58461fb0e42b1e84cfb309bd964dad239f7ca0c7529edd4f4716895a45491e31597ec6f6d17361b0ce8f73c317399db07a1249b2ab570e4829000e WHIRLPOOL 077eb74cf46dfb15eaa2d473b627d953bc8e13bd0ae87a4fdc16282e468cf237bd9173b761cc9f89b9d6a13ce76db40aa67d5092e2e77eba2a0c6dab097b0fb4
+EBUILD scummvm-1.7.0-r1.ebuild 2850 SHA256 2106bfb0670d569990f8de1dae70c315cb7a63f5caa04b9ca57f9403d661eb57 SHA512 8c258759f500a32315e3ecda23baed39bf86d97bdbf87c1f2aa03a786c963d4e2e6a0fd53ec303aaaaea73e6a5d89452f35d237506dfb65ef27eb210818b02ad WHIRLPOOL 654bb0672e5eed1692d094b5b2aa6a78369a520f60110bd89f56e66ea58316fc139a3319eb9bb7734cc40727a07083e4b0c5c6e14ea4aefaa54cc5d9172b1587
 EBUILD scummvm-1.7.0.ebuild 2737 SHA256 cd9772ef4848f68d9cf134826553e2d3e12ae1cc9faca4df360520c60454f163 SHA512 0abadc1b7d20ea0ee8e775c0347eaf1cb432d183ea1e29f376b46f8d7dd622f07a84ad1197492474cb35b57b287d56929fb2876165ea97a90df2aaafda4a01ac WHIRLPOOL 15c5977b979a15ced04968504f3ac8a6525e95478fcd643e1cb2059be57f4390366d6899de22ecbcd43886f27ec45a57164d104989f2e29446b389927c846ebd
-MISC ChangeLog 19350 SHA256 70c74866a1c72249d6eaf094e4646f1a8a269143c8a82efe006894d659dd728b SHA512 9793437269b2b63f20beb7a155c723526136955c37c3a6388c2f60d28b084e94d5440f49aedb0347efc42ac56faae2e5542dde2b8755501924f1e700d232e593 WHIRLPOOL 8e4f28020a044499b763cd8265693c49b3039ee24795073453366d1eaa06f802e498dd61bb84cf84e4433d16a8672626919725d8f828002bd91ae2f59e0a0f14
-MISC metadata.xml 311 SHA256 ba7555854c859720c5582c00c3b4b58059e839d2abfcd32c2d1a25015b39be47 SHA512 b208bb3e4fc8a84dac59a9878b01757c6f5e7eeaa22a517f07f99b3fa85f10985443fa30d206f2b7a00093d99330a91a3db3f6386df1b4dd8e537b807dafa12b WHIRLPOOL 947cd7ac8057e1524c5aa41429d19edebf6e3b30a31e6326b52aa5237fc79bffe7c620480866940e1a734485d7bee8570e4a4ec5f7b147fc8ceb8b7e9720e496
+MISC ChangeLog 19669 SHA256 2144a0b151b0074efd5b35e4cc794794f070185fb0b56cf43f037aeb2b977cbf SHA512 a7296a6c5c8fce71adb67432881e2e1585f319049e3e6cccfe5133029975a3460dfddbd2b678d1ebd8428d60a2d9c50a36504c750fcaf377f7fe5009c1ebea44 WHIRLPOOL ebf1a7cf4e2f7b795c91fab5e4e0f380e0d960f9a0332e6cb9a8ff513c9ae77de210bd841afeed122ff94482dfeb167e04deea0f9b31b83eb88bf1d83e64a7e6
+MISC metadata.xml 414 SHA256 fbb2b6c152f1b177d3771c3a726b4cda69eafd65fd70098195d13c0922dfc0f5 SHA512 2b386de8531363e9c5fc8671d475dc919447052d12fe6c0cce6d7935c223581f0b8834d4cf1992570c5228895077ace409740d54a47c9b59bc6d4c2b7e5be399 WHIRLPOOL 396b3685d379477bdc9d42f80bc18c2e20cc993480a07f05a9ff69d5403166c1281ccaea052777dcb17752b5b8f2c00de596e5876644b827ab3c49b223767125
diff --git a/games-engines/scummvm/metadata.xml b/games-engines/scummvm/metadata.xml
index 5bedc3d00a15..58a03608c07a 100644
--- a/games-engines/scummvm/metadata.xml
+++ b/games-engines/scummvm/metadata.xml
@@ -5,5 +5,6 @@
   <use>
     <flag name="fluidsynth">compile with support for fluidsynth</flag>
     <flag name="mpeg2">enable mpeg2 codec for cutscenes</flag>
+    <flag name="unsupported">enable unsupported and/or broken game engines (you're on your own)</flag>
   </use>
 </pkgmetadata>
diff --git a/games-engines/scummvm/scummvm-1.7.0-r1.ebuild b/games-engines/scummvm/scummvm-1.7.0-r1.ebuild
new file mode 100644
index 000000000000..c10847c2a8cc
--- /dev/null
+++ b/games-engines/scummvm/scummvm-1.7.0-r1.ebuild
@@ -0,0 +1,110 @@
+# 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-r1.ebuild,v 1.1 2014/12/30 19:13:15 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_enable unsupported 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
+}