opengl isn't optional (bug #206398)

Package-Manager: portage-2.1.3.19

3 files changed, 20 insertions, 35 deletions

diff --git a/games-puzzle/krystaldrop/ChangeLog b/games-puzzle/krystaldrop/ChangeLog
index 3c9201785607..8a3e67f6d9b1 100644
--- a/games-puzzle/krystaldrop/ChangeLog
+++ b/games-puzzle/krystaldrop/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-puzzle/krystaldrop
-# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/krystaldrop/ChangeLog,v 1.6 2006/12/06 17:25:47 wolf31o2 Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/krystaldrop/ChangeLog,v 1.7 2008/01/28 21:17:42 mr_bones_ Exp $
+
+  28 Jan 2008; Michael Sterrett <mr_bones_@gentoo.org>
+  krystaldrop-0.7.2.ebuild:
+  opengl isn't optional (bug #206398)
 
   06 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   krystaldrop-0.7.2.ebuild:
diff --git a/games-puzzle/krystaldrop/Manifest b/games-puzzle/krystaldrop/Manifest
index 5526dfb25764..7c82457f221e 100644
--- a/games-puzzle/krystaldrop/Manifest
+++ b/games-puzzle/krystaldrop/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX krystaldrop-0.7.2-deps.patch 1152 RMD160 48eac8807d977daddbc40a57eeec407950d10d13 SHA1 72d0ce25b1c1bfdca0ba7170f7a274a2162334cd SHA256 bc8121c186af89aa1116d0eed5b5743c91a691434965f4128b2e9ac4ade2ea84
 MD5 2f8888ebfa635ef9dd07d6e5c0ccd3ea files/krystaldrop-0.7.2-deps.patch 1152
 RMD160 48eac8807d977daddbc40a57eeec407950d10d13 files/krystaldrop-0.7.2-deps.patch 1152
@@ -15,14 +12,14 @@ RMD160 3d1b1461baad3c9c0597fe967791a9e170d3e618 files/krystaldrop-assert.patch 4
 SHA256 ac4a526be3335f7aab6fd00f0af5a79556aedc66704277704a9bb41030983df2 files/krystaldrop-assert.patch 417
 DIST art_0.7.2.tgz 17079147 RMD160 3a01c1375946f6d0b764ed3482ebb346ffe6480c SHA1 80d6ba755bb98f914fbc85ebdaa59b482e332e44 SHA256 7cd9dbd1ad12eb7e26e57e2a52b59e7137e20979d4fc8cb21a48faff983f6e27
 DIST src_0.7.2.tgz 162856 RMD160 d53bcfb904bf32948ccf47838df011f67435e45b SHA1 c87ba2773f2ef5fe97fa4bc2eb89d2324a27e2c6 SHA256 d0e42cf05f241e409649de6a48045c026c42417cdabd233c8fef8783096946e5
-EBUILD krystaldrop-0.7.2.ebuild 1842 RMD160 6458ef31f579f78f2e50aaa243c206f9dd5bd4e0 SHA1 9fd5548501ae87a4540f85591700f93759bda5a1 SHA256 00f3b69347dd2a03f7d53febd922e436ab7e56a7e3f58c361901098b1b98a366
-MD5 f647dcdff9a2aff407b126913d737538 krystaldrop-0.7.2.ebuild 1842
-RMD160 6458ef31f579f78f2e50aaa243c206f9dd5bd4e0 krystaldrop-0.7.2.ebuild 1842
-SHA256 00f3b69347dd2a03f7d53febd922e436ab7e56a7e3f58c361901098b1b98a366 krystaldrop-0.7.2.ebuild 1842
-MISC ChangeLog 1017 RMD160 15e325fc274eae4146ef484a313db20eaadea4db SHA1 3265e6a0cc52747e80525315a272ae3176b16b36 SHA256 d2e144b8c84c40bdd7ad98af29eaa1b9bf3627be88f945a82333b5fe5fb34e54
-MD5 c01418a3a8ea7bc2d16685bd0cf56e60 ChangeLog 1017
-RMD160 15e325fc274eae4146ef484a313db20eaadea4db ChangeLog 1017
-SHA256 d2e144b8c84c40bdd7ad98af29eaa1b9bf3627be88f945a82333b5fe5fb34e54 ChangeLog 1017
+EBUILD krystaldrop-0.7.2.ebuild 1597 RMD160 4c371c6c9c5b50481d7d17731478de900f4f4401 SHA1 b4d9516471e128322a4a11736bfb5edf79811838 SHA256 9cbd9ef7e5b540cf79c624e8c45203a07b6699c09136ce19add9f94441033b26
+MD5 5b9b625aee2e2b0736a1ae8105db4bbc krystaldrop-0.7.2.ebuild 1597
+RMD160 4c371c6c9c5b50481d7d17731478de900f4f4401 krystaldrop-0.7.2.ebuild 1597
+SHA256 9cbd9ef7e5b540cf79c624e8c45203a07b6699c09136ce19add9f94441033b26 krystaldrop-0.7.2.ebuild 1597
+MISC ChangeLog 1140 RMD160 a4800ba6e7e40d3c65e167d625c3752dd730b4a8 SHA1 f493a8a4a5b8977e4f2cda82ff1a7c912df1049f SHA256 b1769fea90cce0e39d6442e50b2c6456d99257392040be35ced32f149f3c7be6
+MD5 6a26917a4c0b3d5ee09f7bded3176364 ChangeLog 1140
+RMD160 a4800ba6e7e40d3c65e167d625c3752dd730b4a8 ChangeLog 1140
+SHA256 b1769fea90cce0e39d6442e50b2c6456d99257392040be35ced32f149f3c7be6 ChangeLog 1140
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
@@ -30,10 +27,3 @@ SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata
 MD5 89937c91bbdb4dec6d8f2d5985fb42f0 files/digest-krystaldrop-0.7.2 446
 RMD160 648f3aa39cdb260c1a1f48a4882b307bd8ae69bc files/digest-krystaldrop-0.7.2 446
 SHA256 0f0d5016ef0f02ffd06b5d4651b29709f94e31842ac8cb5d56964407172cf92d files/digest-krystaldrop-0.7.2 446
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
-
-iD8DBQFF9zHOdz7hIScOURERApF7AKC2mv6crUuaMTcFaOnX+anLbHuhGACfSReg
-knVwFxTfXWqHNAwfk7MJJp8=
-=O6lH
------END PGP SIGNATURE-----
diff --git a/games-puzzle/krystaldrop/krystaldrop-0.7.2.ebuild b/games-puzzle/krystaldrop/krystaldrop-0.7.2.ebuild
index 5f576c6f7477..2bc109fee088 100644
--- a/games-puzzle/krystaldrop/krystaldrop-0.7.2.ebuild
+++ b/games-puzzle/krystaldrop/krystaldrop-0.7.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/krystaldrop/krystaldrop-0.7.2.ebuild,v 1.7 2007/03/13 23:20:41 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/krystaldrop/krystaldrop-0.7.2.ebuild,v 1.8 2008/01/28 21:17:42 mr_bones_ Exp $
 
 inherit eutils games
 
@@ -12,9 +12,9 @@ SRC_URI="mirror://sourceforge/krystaldrop/art_${PV}.tgz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="opengl"
+IUSE=""
 
-DEPEND="opengl? ( virtual/opengl )
+DEPEND="virtual/opengl
 	media-libs/libsdl
 	media-libs/sdl-image
 	media-libs/sdl-mixer
@@ -42,19 +42,10 @@ src_unpack() {
 		-e "s:BINDIR:\"${GAMES_STATEDIR}/${PN}\":" \
 			Sources/KrystalDrop/Controller/HighScoresController.cpp \
 				|| die "sed HighScoresController.cpp failed"
-
-	if ! use opengl ; then
-		sed -i \
-			-e "/<opengl>.*<\/opengl>/ s|yes|no|" kdrop.xml \
-				|| die "sed kdrop.xml failed"
-		sed -i \
-			-e '/^USE_OPENGL/ s/yes/no/' Sources/Makefile \
-				|| die "sed Sources/Makefile failed"
-	fi
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
+	emake DESTDIR="${D}" install || die "emake install failed"
 	dodir "${GAMES_STATEDIR}/${PN}"
 	mv "${D}${GAMES_DATADIR}/${PN}/art/survival.sco" \
 		"${D}${GAMES_STATEDIR}/${PN}/" || die "mv failed"
@@ -62,7 +53,7 @@ src_install() {
 	dodoc CHANGES README
 	doman doc/kdrop.6
 	newicon art/drop.png ${PN}.png
-	make_desktop_entry kdrop "KrystalDrop" ${PN}.png
+	make_desktop_entry kdrop "KrystalDrop" ${PN}
 
 	prepgamesdirs
 }