EAPI=2; add use-based deps (bug #209009); add alternate graphics support

Package-Manager: portage-2.1.6.4/cvs/Linux 2.6.27.8 i686

4 files changed, 35 insertions, 25 deletions

diff --git a/games-puzzle/xlogical/ChangeLog b/games-puzzle/xlogical/ChangeLog
index bb59021958d4..d4620340fd85 100644
--- a/games-puzzle/xlogical/ChangeLog
+++ b/games-puzzle/xlogical/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-puzzle/xlogical
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/xlogical/ChangeLog,v 1.4 2008/05/04 21:08:55 nyhm Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/xlogical/ChangeLog,v 1.5 2009/01/13 02:02:32 mr_bones_ Exp $
+
+  13 Jan 2009; Michael Sterrett <mr_bones_@gentoo.org> metadata.xml,
+  xlogical-1.0.7.ebuild:
+  EAPI=2; add use-based deps (bug #209009); add alternate graphics support
 
   04 May 2008; Tristan Heaven <nyhm@gentoo.org>
   +files/xlogical-1.0.7-gcc43.patch, xlogical-1.0.7.ebuild:
diff --git a/games-puzzle/xlogical/Manifest b/games-puzzle/xlogical/Manifest
index 4e45520f2bd4..954c6cb12ea8 100644
--- a/games-puzzle/xlogical/Manifest
+++ b/games-puzzle/xlogical/Manifest
@@ -1,16 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX xlogical-1.0.7-gcc41.patch 1121 RMD160 1922b92b0ac2513760d76031d7236134bf083664 SHA1 e2f164d792b5ab02b5711eeb8048e2131c70b712 SHA256 d70f35be5bbf65e7511d239d2449e332c71f93a5af632169c95a3262448fcc4a
 AUX xlogical-1.0.7-gcc43.patch 915 RMD160 79aafb8d623bbdf75cc8aefca0014a56be3af665 SHA1 7e9546501df00c6e0ba11155753940876303705d SHA256 fd8394829ba2a3726b25f0bb5d651e3920e5c945f023fca57d2044227e4e8ec7
 DIST xlogical-1.0-7.tar.bz2 1853575 RMD160 f290e0e41c607a2a3e567f093ddb59d015f12a77 SHA1 197ea5bcdd25babc6af427b11de9f4a67ae4d570 SHA256 166d227770dcb7d94138f844a8a81380eff3fac7f564274bb2c66ae974e8e7ca
-EBUILD xlogical-1.0.7.ebuild 1285 RMD160 f5cc0fb8103dbab8b846e8618735bf9fe25dbf36 SHA1 59a51f09961b0ab03b657bc739552034baae8223 SHA256 fd2588abb13d1e5f9f00adbdb4f5516e061d7436d0d8352b677cb4a845d57e44
-MISC ChangeLog 735 RMD160 fdf260c71f331ead6e85f4664b5f53a592db4974 SHA1 cad0f5ea7abef07a7450885a60eacacb53bf88ce SHA256 2e89f163b43b89cb56e1adc3757b335aa0b4db78c1abf151b4a8209db52d664f
-MISC metadata.xml 336 RMD160 fef2462eb3b75537c7d0e11de691c31612bf7efb SHA1 c8367ee566bf5b39f52a104575e603eb5087c543 SHA256 2ca74dcd27b11352491f9d35689976309ba158b80d8ec457c14561536104b1bb
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkgeJe0ACgkQdz7hIScOURG2pACfRvUY29yQ8W97vgAFKewCaahg
-ltIAn0ahbqpGTx7JNVq54krAjpbRXEBk
-=vg+v
------END PGP SIGNATURE-----
+DIST xlogical_gfx.zip 347801 RMD160 216aaad3d33b0ad08308a3025a89291e819ee20f SHA1 d3828a661896d31cd54d00b45965773b91f9437b SHA256 1d6f97ad3cbcb7b78d3e3594643195d6457ab7ca613ccabd6256a5fe13a98f49
+EBUILD xlogical-1.0.7.ebuild 1667 RMD160 b2757270560b0bd6cfce67671858bbfda7344950 SHA1 db5d1e7d6973bf432d9ab5b001b1baa83445a287 SHA256 aeb696af6c83c641cce3d9e94232e3ff2c57d6830214f84fa6cf8f098ef40617
+MISC ChangeLog 910 RMD160 19e697f9417d5284f4f26d6a8ddc352fb96e6a65 SHA1 3d7a44a9e0c44f62fc8d481e76402340b9b70d77 SHA256 bf3659d7342e6998184766c90a7de25bcab650820d64fef06ec2bcfacb34aba7
+MISC metadata.xml 455 RMD160 68bacad750ec879539a9e11fa2bd7e4bb96c36de SHA1 c32cd5d24c82cd6331a4f58acca0bab9b459d1e3 SHA256 511e828cc57c9cc0524b7e6de21df1d61a0e2155f8db247d317d5e388b5aeb50
diff --git a/games-puzzle/xlogical/metadata.xml b/games-puzzle/xlogical/metadata.xml
index 8be643a7ce06..36ec4edcdc0d 100644
--- a/games-puzzle/xlogical/metadata.xml
+++ b/games-puzzle/xlogical/metadata.xml
@@ -6,4 +6,7 @@
 XLogical is a puzzle game based on the Logical! game that was originally
 released by Rainbow Arts on the Commodore Amiga computer.
 </longdescription>
+  <use>
+    <flag name="alt_gfx">Use alternate graphics which are closer to the original Amiga version</flag>
+  </use>
 </pkgmetadata>
diff --git a/games-puzzle/xlogical/xlogical-1.0.7.ebuild b/games-puzzle/xlogical/xlogical-1.0.7.ebuild
index 872f8c1fa509..dd89dfc02c72 100644
--- a/games-puzzle/xlogical/xlogical-1.0.7.ebuild
+++ b/games-puzzle/xlogical/xlogical-1.0.7.ebuild
@@ -1,29 +1,39 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/xlogical/xlogical-1.0.7.ebuild,v 1.6 2008/05/04 21:08:55 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/xlogical/xlogical-1.0.7.ebuild,v 1.7 2009/01/13 02:02:32 mr_bones_ Exp $
 
+EAPI=2
 inherit autotools versionator eutils games
 
 MY_PV=$(replace_version_separator 2 '-' )
 MY_P=${PN}-${MY_PV}
 DESCRIPTION="SDL logical clone"
 HOMEPAGE="http://changeling.ixionstudios.com/xlogical/"
-SRC_URI="http://changeling.ixionstudios.com/xlogical/downloads/${MY_P}.tar.bz2"
+SRC_URI="http://changeling.ixionstudios.com/xlogical/downloads/${MY_P}.tar.bz2
+	alt_gfx? ( http://changeling.ixionstudios.com/xlogical/downloads/xlogical_gfx.zip )"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 x86"
-IUSE=""
+IUSE="alt_gfx"
 
-DEPEND="media-libs/libsdl
-	media-libs/sdl-image
-	media-libs/sdl-mixer"
+RDEPEND="media-libs/libsdl
+	media-libs/sdl-image[jpeg]
+	media-libs/sdl-mixer[mikmod]"
+DEPEND="${RDEPEND}
+	alt_gfx? ( app-arch/unzip )"
 
 S=${WORKDIR}/${PN}-$(get_version_component_range 1-2)
 
 src_unpack() {
-	unpack ${A}
-	cd "${S}"
+	unpack ${MY_P}.tar.bz2
+	if use alt_gfx ; then
+		cd "${S}/images"
+		unpack xlogical_gfx.zip
+	fi
+}
+
+src_prepare() {
 	sed -i '/^CXXFLAGS/d' Makefile.am || die "sed failed"
 	edos2unix properties.h anim.h exception.h
 	epatch \
@@ -38,11 +48,13 @@ src_install() {
 	insinto "${GAMES_DATADIR}"/${PN}
 	doins -r ${PN}.{properties,levels} music sound images \
 		 || die "installing game data failed"
+	find "${D}" -name "Makefile*" -exec rm -f '{}' +
 
 	insinto "${GAMES_STATEDIR}"/${PN}
-	insopts -m0660
 	doins ${PN}.scores || die "installing hi-score failed"
+	fperms 0660 "${GAMES_STATEDIR}"/${PN}/${PN}.scores
 
 	dodoc AUTHORS ChangeLog NEWS README TODO
+	make_desktop_entry ${PN} "Xlogical"
 	prepgamesdirs
 }