commit improved ebuild thanks to mr_bones_ and abcd

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

3 files changed, 32 insertions, 13 deletions

diff --git a/games-emulation/lxdream/ChangeLog b/games-emulation/lxdream/ChangeLog
index 979b77bc990f..cbbcf19e2860 100644
--- a/games-emulation/lxdream/ChangeLog
+++ b/games-emulation/lxdream/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-emulation/lxdream
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/lxdream/ChangeLog,v 1.1 2010/02/13 23:33:02 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/lxdream/ChangeLog,v 1.2 2010/02/14 01:42:44 chithanh Exp $
+
+*lxdream-0.9.1-r1 (14 Feb 2010)
+
+  14 Feb 2010; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  -lxdream-0.9.1.ebuild, +lxdream-0.9.1-r1.ebuild:
+  commit improved version thanks to mr_bones_ and abcd
 
 *lxdream-0.9.1 (13 Feb 2010)
 
diff --git a/games-emulation/lxdream/Manifest b/games-emulation/lxdream/Manifest
index f14ee40130d4..e9275c3e2971 100644
--- a/games-emulation/lxdream/Manifest
+++ b/games-emulation/lxdream/Manifest
@@ -1,4 +1,4 @@
 DIST lxdream-0.9.1.tar.gz 2556802 RMD160 e6869156acdab2b7a746bafda54aaecaa050e629 SHA1 ea64402b145d7247166eddf251f655d2c8c84af0 SHA256 6ab26f1b5149233301d890f4677e1225aceb148fe2f813449c5568055f10ad70
-EBUILD lxdream-0.9.1.ebuild 1205 RMD160 f26a333066e9eda41a7a504e522a22dd4eb30b4e SHA1 319c285a4acccabbe99cd8281cadfe95e7b6b6dc SHA256 78e468428d6e891b1d7d473fa2797821b96568df7b3f6efd2bf9dd475d32e444
-MISC ChangeLog 394 RMD160 0f28023c35f9ec8765c554a96fe764006d2b93e1 SHA1 3d8dd1f420a47d3895ec0de00df3259d7fc8a882 SHA256 f1faea2af5d1157ed978967736c06c120136bc464cb77bf321d9910a69494218
+EBUILD lxdream-0.9.1-r1.ebuild 1513 RMD160 b5705e1f1cfda75ef5f16b8af907e48a94978e9d SHA1 1bddb722ac9c71863b06233c2694c00b4dbb3f25 SHA256 02fb1059ee7265bd2b0c991ab3128c506fcd4c4436cf4f36f83f013de7d3ff39
+MISC ChangeLog 603 RMD160 19171f581f26399381f647c304598a5c36f418be SHA1 dc0ce69c896fe42f3ffbc7eb99cad81369616608 SHA256 527780cf579151ebe0215c117be52873bc8b081708e8560f4d98dae5fb1d32d4
 MISC metadata.xml 273 RMD160 b23a6e0c2aca78ba15c546a7f10a7ce1fa873608 SHA1 0383306a66a0b2746f5152db074dbc945c4d3d08 SHA256 4036c7e7515432cb12816916bf89cae3b5c84215243ece069bfec391a36a3193
diff --git a/games-emulation/lxdream/lxdream-0.9.1.ebuild b/games-emulation/lxdream/lxdream-0.9.1-r1.ebuild
index 1382baae8e8f..5ae5b0481583 100644
--- a/games-emulation/lxdream/lxdream-0.9.1.ebuild
+++ b/games-emulation/lxdream/lxdream-0.9.1-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/lxdream/lxdream-0.9.1.ebuild,v 1.1 2010/02/13 23:33:02 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/lxdream/lxdream-0.9.1-r1.ebuild,v 1.1 2010/02/14 01:42:44 chithanh Exp $
 
-EAPI="2"
+EAPI=2
 
 inherit eutils games
 
@@ -13,13 +13,12 @@ SRC_URI="http://www.lxdream.org/count.php?file=${P}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="debug esd profile pulseaudio sdl"
+IUSE="debug profile pulseaudio sdl"
 
 RDEPEND="media-libs/alsa-lib
 	media-libs/libpng
-	esd? ( media-sound/esound )
 	pulseaudio? ( media-sound/pulseaudio )
-	sdl? ( media-libs/libsdl )
+	sdl? ( media-libs/libsdl[audio] )
 	virtual/opengl
 	x11-libs/gtk+:2"
 
@@ -28,20 +27,34 @@ DEPEND="${RDEPEND}
 	sys-devel/gettext
 	virtual/os-headers"
 
+src_prepare() {
+	# Make .desktop file pass desktop-file-validate
+	sed -i \
+		-e '/Encoding/d' \
+		-e '/FilePattern/d' \
+		-e '/Categories/s|$|;|' \
+		${PN}.desktop || die "sed failed"
+	# Do not override user-specified CFLAGS
+	sed -i \
+		-e s/'CFLAGS=\"-g -fexceptions\"'/'CFLAGS=\"${CFLAGS} -g -fexceptions\"'/ \
+		-e '/CCOPT/d' \
+		-e '/OBJCOPT/d' \
+		configure || die "sed failed"
+}
+
 src_configure() {
-	econf \
+	egamesconf \
+		--datadir="${GAMES_DATADIR_BASE}" \
 		$(use_enable debug trace) \
 		$(use_enable debug watch) \
 		$(use_enable profile profiled) \
-		$(use_with esd) \
 		$(use_with pulseaudio pulse) \
-		$(use_with sdl)
+		$(use_with sdl) \
+		--without-esd
 }
 
 src_install() {
 	emake DESTDIR="${D}" install || die "install failed"
 	dodoc ChangeLog NEWS README || die "dodoc failed"
-	doicon pixmaps/${PN}.png || die "doicon failed"
-	domenu ${PN}.desktop || die "domenu failed"
 	prepgamesdirs
 }