Fails to build without opengl (bug #378191)

Package-Manager: portage-2.1.10.11/cvs/Linux i686

diff --git a/games-rpg/tmw/ChangeLog b/games-rpg/tmw/ChangeLog
index 1b575b924e078886e9b47b0a99914879eec406d4..df97c7fb1e9b56647da086399b7535216d04c0a9 100644 (file)
--- a/games-rpg/tmw/ChangeLog
+++ b/games-rpg/tmw/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-rpg/tmw
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/tmw/ChangeLog,v 1.39 2011/08/02 11:56:25 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/tmw/ChangeLog,v 1.40 2011/09/05 18:02:37 mr_bones_ Exp $
+
+  05 Sep 2011; Michael Sterrett <mr_bones_@gentoo.org> tmw-0.5.2.ebuild:
+  Fails to build without opengl (bug #378191)
 
 *tmw-0.5.2 (02 Aug 2011)
 

diff --git a/games-rpg/tmw/Manifest b/games-rpg/tmw/Manifest
index feed1e9be729da9b0f1853649f5ce4a279deeb19..b50f246e055d32211ae177b39c5d69536b7a67c7 100644 (file)
--- a/games-rpg/tmw/Manifest
+++ b/games-rpg/tmw/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX tmw-0.0.29.1-desktop.patch 1524 RMD160 2d837ec55f6b9725ea59ba9ee1fee85a642e9cff SHA1 c98c84104edc792a2ebece4d9dd9d83a5830c81e SHA256 64d50fd25940f83e3afa524e1a9e5ff41c5aa70b5a1e0956e1156f308b29c165
 AUX tmw-0.0.29.1-gcc45.patch 625 RMD160 21fe9ffaf0ba2df2caa028e230e29cdbe5028cca SHA1 0b127dfc67796042187f38385bf4d82de0e8bd23 SHA256 9657f37dd2560fdadcd3cdd2b05e5a26d757b0575fc770e0ba7fa2a4c19f600c
 AUX tmw-0.5.2-gentoo.patch 1006 RMD160 c244c31d3edab0fd52cf98be851ad6a7cd588370 SHA1 c160e1dab2588ed3e76e1dc834eb34886983acdd SHA256 acc8b2cc8f0d3134edf89aba4c9e8695cd13ce803aea0f9c9eaf06827fbca014
@@ -9,13 +6,6 @@ DIST tmw-0.5.2.tar.bz2 2968428 RMD160 2748952fb75a7437e92d1f57943517032bbd36f2 S
 DIST tmwmusic-0.0.20.tar.gz 9259802 RMD160 a7212f90b40f864d0670905fe037564eba48ab30 SHA1 c1e3126ff7f53f6e12caaf885a493cd5c4aed6e3 SHA256 964bb27235cdc3199c392f6ddf25ce293c6f32e013abe85592b96221a5896939
 DIST tmwmusic-0.3.tar.gz 25125282 RMD160 f121922ec22e4a4d72b883d7ffaeb24422c18aac SHA1 a712a920708271e97cc684d695c9202e1822c187 SHA256 9c942b0f9a9a3692f2a0c80b0a7433d7b0adaa35e6c85eab26723299b6c9c4bb
 EBUILD tmw-0.0.29.1.ebuild 1749 RMD160 e352c90bc2e9cc226e32c4ee9984d6a66a913b50 SHA1 29b5a31215570f9f855f092d5a2c966afad6ede1 SHA256 44403d95da0b9bdff76aff7131f67541e62028351d7229fb54b9f86c4c5a5711
-EBUILD tmw-0.5.2.ebuild 1808 RMD160 9da3a4da979fe8c61accdb499db8d80553f31439 SHA1 c9633003f7506eacc338b5641790846e2018908d SHA256 a133b9b076687e3a074f90330a012645d6e25ab3a3bc272d22ae3a78646c9366
-MISC ChangeLog 5764 RMD160 01a23b0eaee8957c417193e80ac0d9c2a3456ec8 SHA1 29b63df16831dabc5862f5c7f96b405eb90b3b9d SHA256 3b0cd72ca186d6d6a7dddb49dd81a7f55c84a3047e3db6fc25495ce2452cd744
+EBUILD tmw-0.5.2.ebuild 1792 RMD160 aef6d6b883d42bd36f9e92b3af95aca7fbdab91b SHA1 62fa7f9fea40ef40eb2fa78ed172f0df5ed3ee0f SHA256 e96b098f734ba3b5d0731eb9ddfa12c9fd8ff0308e629196729d3f0974867bb9
+MISC ChangeLog 5887 RMD160 4efb2889f5d98aea7bffeb4afe8d03a4ece36999 SHA1 4f49bb9e38176d5315f56d864f6122cc6faa1788 SHA256 6d29f45c2362748d8da6340266e52981ae52221c75a15ea734b35dfc60fae8eb
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAk435fkACgkQIY77eQFFFC3EaQCgq5UvaneZ3jXkoZZP1ndu8YfA
-/rsAni3QLp06jvUY6GWYHa9pwbobAGBZ
-=zoTo
------END PGP SIGNATURE-----

diff --git a/games-rpg/tmw/tmw-0.5.2.ebuild b/games-rpg/tmw/tmw-0.5.2.ebuild
index f6f3baf085828e99162fbefd29e8896683044c61..92dc39961fa914f1afee9edf8567cdac54441c4e 100644 (file)
--- a/games-rpg/tmw/tmw-0.5.2.ebuild
+++ b/games-rpg/tmw/tmw-0.5.2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/tmw/tmw-0.5.2.ebuild,v 1.1 2011/08/02 11:56:25 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/tmw/tmw-0.5.2.ebuild,v 1.2 2011/09/05 18:02:37 mr_bones_ Exp $
 
 EAPI=2
-inherit eutils games cmake-utils
+inherit eutils cmake-utils games
 
 MUSIC=tmwmusic-0.3
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/themanaworld/${P}.tar.bz2
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="nls opengl"
+IUSE="nls"
 
 RDEPEND=">=dev-games/physfs-1.0.0
        dev-libs/libxml2
@@ -28,11 +28,11 @@ RDEPEND=">=dev-games/physfs-1.0.0
        media-libs/libpng
        media-fonts/dejavu
        >=dev-games/guichan-0.8.1[sdl]
-       media-libs/libsdl
+       media-libs/libsdl[opengl,video]
        media-libs/sdl-gfx
        x11-libs/libX11
        nls? ( virtual/libintl )
-       opengl? ( virtual/opengl )"
+       virtual/opengl"
 DEPEND="${RDEPEND}
        dev-util/pkgconfig
        nls? ( sys-devel/gettext )"
@@ -57,7 +57,7 @@ src_prepare() {
 
 src_configure() {
        mycmakeargs=(
-               $(cmake-utils_use_with opengl)
+               -DWITH_OPENGL=ON
                $(cmake-utils_use_enable nls)
        )
        cmake-utils_src_configure