Let REQUIRED_USE in libmikmod's ebuild force audio backend and remove the forced USE="oss" from here. Pull in correct SLOTs of libmikmod and libpng to ensure headers are installed.

Package-Manager: portage-2.2.0_alpha142/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

3 files changed, 37 insertions, 18 deletions

diff --git a/games-puzzle/ensemblist/ChangeLog b/games-puzzle/ensemblist/ChangeLog
index d7093321475a..1f6cdd0f1847 100644
--- a/games-puzzle/ensemblist/ChangeLog
+++ b/games-puzzle/ensemblist/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-puzzle/ensemblist
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/ensemblist/ChangeLog,v 1.10 2010/10/04 10:38:52 tupone Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/ensemblist/ChangeLog,v 1.11 2012/11/18 05:57:10 ssuominen Exp $
+
+  18 Nov 2012; Samuli Suominen <ssuominen@gentoo.org> ensemblist-040126.ebuild:
+  Let REQUIRED_USE in libmikmod's ebuild force audio backend and remove the
+  forced USE="oss" from here. Pull in correct SLOTs of libmikmod and libpng to
+  ensure headers are installed.
 
   04 Oct 2010; Tupone Alfredo <tupone@gentoo.org> ensemblist-040126.ebuild:
   Respect LDFLAGS. Bug #337272 by flameeyes@gentoo.org
diff --git a/games-puzzle/ensemblist/Manifest b/games-puzzle/ensemblist/Manifest
index 06a7eeeb781a..36af6cb22767 100644
--- a/games-puzzle/ensemblist/Manifest
+++ b/games-puzzle/ensemblist/Manifest
@@ -1,5 +1,19 @@
-AUX ensemblist-040126-build.patch 1610 RMD160 af2e2c93a685536b84ce434f163fe57a42aad764 SHA1 3a3b007275a4e8ffd8f84122429a538e75a5e898 SHA256 47f29cc749d3240fdee845391bba58e4fecb6025499594cd1da08999cd3758ac
-DIST ensemblist-040126.tar.gz 1312095 RMD160 7c132f4e82d819e358b46c45a4dba8a0a2a0c741 SHA1 843a1a84fd956fa0deb89f6ebf525b24e54e9016 SHA256 6cfd48b3f62a0853a08609a85841bea400a9fe0eb9d3b8bdf0f62dd5a8aa36be
-EBUILD ensemblist-040126.ebuild 1032 RMD160 4310ef86a3e29c6294dfbbd6d75dbbdd8f16897a SHA1 90bab77040b66017e525b880a5178192140156a4 SHA256 3ecb4e2f64ecb794e383b06ce56f927f6c65825e7fc96ddc67089fb255508c7c
-MISC ChangeLog 1563 RMD160 9a22298c59fc1df51b5c680ba5a537b60563aea8 SHA1 7ef744e80f8a88e4ecc6ea15cbf815bb297d2680 SHA256 922b4ad824cd2faeb25dbbd8da3b90dabe964ea2f401f7bfd642001f49f87b74
-MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX ensemblist-040126-build.patch 1610 SHA256 47f29cc749d3240fdee845391bba58e4fecb6025499594cd1da08999cd3758ac SHA512 19e9e9625786d43053a72ba633aaa08d18b7a91fe5995cb583b6830605f0ec2b37b8c002d7853db520fc7ccfc4bbe8699184d2ac69f62be51d4801b438ea6ce5 WHIRLPOOL cc690f57cf4ca7ce69743867a46f0a732094d0db5aba6d573806e7210a354ff5641ab2955377cc8113be714d4d1b9cc778cedeefd58fc90aa7e9c3c17ae9cb31
+DIST ensemblist-040126.tar.gz 1312095 SHA256 6cfd48b3f62a0853a08609a85841bea400a9fe0eb9d3b8bdf0f62dd5a8aa36be
+EBUILD ensemblist-040126.ebuild 981 SHA256 9166f17c3de48d6071e72f69d103a8d9049ac6fa4519e06c33e72372dc34bfa7 SHA512 2b6216e9e79cc35a33d937eadd4e5a2bea3b0f1fbc684e1d8c02969433ad6198dcfa2b22c74594b69e2d9aaa5658a486eb5ad6a1e956b54045bddd4086e19749 WHIRLPOOL fb67a7bd70f8b5151c4005457c1b73eb1341b0c20e6846e00336e2865a342447600a65a6c89053d6eb415905d8ac37a8aeed9d4920569cc1ebba054bdcd6851b
+MISC ChangeLog 1834 SHA256 f3d91d14e76881d6eda7d4b67461de50f899222464b263379d06097a0e2e3e17 SHA512 c673a5fce2b327b7c34c5792d79d34425ebaf7eeb4f1323f2e6b85e308d66f785f689ddf04a0ad9051de4bd32c9b5adf811d4d29b5bebcf701358dfb272a7b50 WHIRLPOOL 431ca66e2111fb4d244de39f1c17dcdbab2431e6a1f0c7abc81d0b5038828707f4d8c57447c21c3c90fcaca521df267a1c09142f347a0efceaaead298dce8395
+MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJQqHi0AAoJEEdUh39IaPFNpWkH/icVvxVBnLP4oK39ejypUsZD
+IP6s76EZBMpWSBoSEFxlch4rQEO7F5KZHhuTJhaBJ0xX6iIlEvRU7e+JhDm0dWue
+GE0OkhjHfh6h2IenA/NAatZ56VRzqLpQBgLrDENLCZtcAn/UCOmvWoYSJ4arwyeS
+Bh5yEmg5bUpk0OZ9AgXXfkTfDp0EMmUXXFAjen4YalTV+M4Xp55uq4guShM/hZXy
+lwgkDEORO9BCj9v2iMHG+3AYwUHgEQJYEdrXC2PZA8+HdByZXzIy8+twyCkfe0Wi
+pIBI8wZOegvF6jlsoA0vV7zwY+USxrjPk8WqCeTCiHjaD9aSZhsDJdbaJ2glhb8=
+=ySdA
+-----END PGP SIGNATURE-----
diff --git a/games-puzzle/ensemblist/ensemblist-040126.ebuild b/games-puzzle/ensemblist/ensemblist-040126.ebuild
index 7113d26b4584..86f0e6605c53 100644
--- a/games-puzzle/ensemblist/ensemblist-040126.ebuild
+++ b/games-puzzle/ensemblist/ensemblist-040126.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/ensemblist/ensemblist-040126.ebuild,v 1.10 2010/10/18 16:39:30 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/ensemblist/ensemblist-040126.ebuild,v 1.11 2012/11/18 05:57:10 ssuominen Exp $
 
 EAPI=2
 inherit eutils games
@@ -14,26 +14,26 @@ SLOT="0"
 KEYWORDS="ppc x86"
 IUSE=""
 
-DEPEND="x11-libs/libXmu
-	virtual/opengl
-	media-libs/freeglut
+DEPEND="media-libs/freeglut
+	media-libs/libmikmod:0
+	media-libs/libpng:0
 	virtual/glu
-	media-libs/libpng
-	media-libs/libmikmod[oss]"
+	virtual/opengl
+	x11-libs/libXmu"
 
 PATCHES=( "${FILESDIR}"/${P}-build.patch )
 
 src_compile() {
 	emake DATADIR="\"${GAMES_DATADIR}\"/${PN}/datas" \
 		CFLAGSLD="${LDFLAGS}" \
-		|| die "emake failed"
+		|| die
 }
 
 src_install() {
-	dogamesbin ensemblist || die "dogamesbin failed"
+	dogamesbin ensemblist || die
 	insinto "${GAMES_DATADIR}/${PN}"
-	doins -r datas || die "doins failed"
-	dodoc README Changelog
+	doins -r datas || die
+	dodoc Changelog README
 	make_desktop_entry ${PN} Ensemblist
 	prepgamesdirs
 }