Install desktop entry, bug #157527

Package-Manager: portage-2.1.2_rc3-r1

3 files changed, 48 insertions, 22 deletions

diff --git a/games-emulation/visualboyadvance/ChangeLog b/games-emulation/visualboyadvance/ChangeLog
index 19b860613884..35ef4493aae4 100644
--- a/games-emulation/visualboyadvance/ChangeLog
+++ b/games-emulation/visualboyadvance/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-emulation/visualboyadvance
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/visualboyadvance/ChangeLog,v 1.29 2006/10/13 17:12:32 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/visualboyadvance/ChangeLog,v 1.30 2006/12/11 22:27:52 nyhm Exp $
+
+  11 Dec 2006; Tristan Heaven <nyhm@gentoo.org>
+  visualboyadvance-1.7.2-r1.ebuild:
+  Install desktop entry, bug #157527
 
   13 Oct 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   +files/1.7.2-gcc41.patch:
diff --git a/games-emulation/visualboyadvance/Manifest b/games-emulation/visualboyadvance/Manifest
index b4a10a2928f7..f68842771827 100644
--- a/games-emulation/visualboyadvance/Manifest
+++ b/games-emulation/visualboyadvance/Manifest
@@ -18,14 +18,14 @@ MD5 a0c26da0983eebc48c3ca83825dde876 files/visualboyadvance 631
 RMD160 c2cb3806fdfe83cb3e87de9a4c6ec6201b6bad5a files/visualboyadvance 631
 SHA256 1742ef8d37e5f46ee40611d3dee4e26fbdb5aa130c2456fd7108bfadcb25ca22 files/visualboyadvance 631
 DIST VisualBoyAdvance-src-1.7.2.tar.gz 1410762 RMD160 44f94a4f270f2cda25879681c52892f6978caf99 SHA1 04d82406079563fd17cda07f72488185e9152f51 SHA256 f4114f921a4fd4bf2ccfc68a46b9c5aa9c71cd94519fbe9ec0be992462e129b7
-EBUILD visualboyadvance-1.7.2-r1.ebuild 1329 RMD160 1853a5fefd68fb874591f606c49461ebe71c757a SHA1 5e1eb10a5f18eac834a3c668cd1811bec6ae3e16 SHA256 b9c2b8c41540085aba67f2de58f1b5402cb94a3e3601d22a1e71202f969e9df5
-MD5 a5a094ba500801f27ea4952118d5e0da visualboyadvance-1.7.2-r1.ebuild 1329
-RMD160 1853a5fefd68fb874591f606c49461ebe71c757a visualboyadvance-1.7.2-r1.ebuild 1329
-SHA256 b9c2b8c41540085aba67f2de58f1b5402cb94a3e3601d22a1e71202f969e9df5 visualboyadvance-1.7.2-r1.ebuild 1329
-MISC ChangeLog 4680 RMD160 e57124d4116f58d5d328363b54b350bb3f835caf SHA1 7bd6680861634a382ab45bedd1e7d7cfc418903b SHA256 769fa65739e54f92cfd402763519d157702e36d9e32da15583c466ce70c6ec64
-MD5 10039dd88440bf081ec27c7c4b62559e ChangeLog 4680
-RMD160 e57124d4116f58d5d328363b54b350bb3f835caf ChangeLog 4680
-SHA256 769fa65739e54f92cfd402763519d157702e36d9e32da15583c466ce70c6ec64 ChangeLog 4680
+EBUILD visualboyadvance-1.7.2-r1.ebuild 1859 RMD160 c5a2e5362c4e84278587561fc5ca57f21bb0d15c SHA1 e8c86fb6448998c1233b82b89ac1649ae6b015a0 SHA256 0498f3c2dcd4bd99a13755a49117840d61c2902c1577e00c0839c71d23b2d911
+MD5 4623bdd1dd925df9e47efe322e9ce1fb visualboyadvance-1.7.2-r1.ebuild 1859
+RMD160 c5a2e5362c4e84278587561fc5ca57f21bb0d15c visualboyadvance-1.7.2-r1.ebuild 1859
+SHA256 0498f3c2dcd4bd99a13755a49117840d61c2902c1577e00c0839c71d23b2d911 visualboyadvance-1.7.2-r1.ebuild 1859
+MISC ChangeLog 4798 RMD160 f3d0a38512f573d1118dacca414fd3bb66ffaa8c SHA1 60bb7540ca057c5bd4d13b56e72ceace95d18ef6 SHA256 b6655d4d3048c29e6d6d2dcc74ca21cffcf8295466f084b3477895787c66f6ec
+MD5 c9503aa1e5c968094a5c5130983beac1 ChangeLog 4798
+RMD160 f3d0a38512f573d1118dacca414fd3bb66ffaa8c ChangeLog 4798
+SHA256 b6655d4d3048c29e6d6d2dcc74ca21cffcf8295466f084b3477895787c66f6ec ChangeLog 4798
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
@@ -34,9 +34,9 @@ MD5 b964aaf93d522f3ee903d5a8d4da2ac5 files/digest-visualboyadvance-1.7.2-r1 283
 RMD160 09c852b5f54c540714618644527326d5f29f628c files/digest-visualboyadvance-1.7.2-r1 283
 SHA256 17c8c0a1c947b5f0ed452c3fa5ed0b1892f9c35ae1ec41d4bb0897d827e6b8b0 files/digest-visualboyadvance-1.7.2-r1 283
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
+Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFFNraXdz7hIScOURERAlwFAJ9BxMPBwV+VRXubnGhHGuuIwYWqNwCg7SrU
-z2JGbKj3awk6IWJAsOxoBzI=
-=n28Q
+iD8DBQFFfdtydz7hIScOURERAhzGAKCfhRfBq4MEjneYUkVBib0BFVUlhQCg0URp
+iueo+mlvqOc8/hNMc1C6lXo=
+=xMw8
 -----END PGP SIGNATURE-----
diff --git a/games-emulation/visualboyadvance/visualboyadvance-1.7.2-r1.ebuild b/games-emulation/visualboyadvance/visualboyadvance-1.7.2-r1.ebuild
index ceea2055fee8..359bb9274009 100644
--- a/games-emulation/visualboyadvance/visualboyadvance-1.7.2-r1.ebuild
+++ b/games-emulation/visualboyadvance/visualboyadvance-1.7.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/visualboyadvance/visualboyadvance-1.7.2-r1.ebuild,v 1.10 2006/10/18 23:19:44 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/visualboyadvance/visualboyadvance-1.7.2-r1.ebuild,v 1.11 2006/12/11 22:27:52 nyhm Exp $
 
 inherit eutils flag-o-matic games
 
@@ -11,27 +11,43 @@ SRC_URI="mirror://sourceforge/vba/VisualBoyAdvance-src-${PV}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
-IUSE="mmx gtk"
+IUSE="gtk mmx nls"
 
 RDEPEND="media-libs/libpng
-	sys-libs/zlib
 	media-libs/libsdl
 	gtk? (
 		>=x11-libs/gtk+-2.4
 		>=dev-cpp/gtkmm-2.4
 		>=dev-cpp/libglademm-2.4
-	)"
+	)
+	nls? ( virtual/libintl )"
 DEPEND="${RDEPEND}
-	mmx? ( dev-lang/nasm )"
+	dev-util/pkgconfig
+	mmx? ( dev-lang/nasm )
+	nls? ( sys-devel/gettext )"
 
 S=${WORKDIR}/VisualBoyAdvance-${PV}
 
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}/${PV}-homedir.patch"
-	epatch "${FILESDIR}/${PV}-gcc34.patch"
-	epatch "${FILESDIR}/${PV}-gcc41.patch"
+
+	sed -i \
+		-e 's:$(localedir):/usr/share/locale:' \
+		-e 's:$(datadir)/locale:/usr/share/locale:' \
+		$(find . -name 'Makefile.in*') \
+		|| die "sed failed"
+
+	cat >> src/i386/2xSaImmx.asm <<-EOF
+		%ifidn __OUTPUT_FORMAT__,elf
+		section .note.GNU-stack noalloc noexec nowrite progbits
+		%endif
+	EOF
+
+	epatch \
+		"${FILESDIR}"/${PV}-homedir.patch \
+		"${FILESDIR}"/${PV}-gcc34.patch \
+		"${FILESDIR}"/${PV}-gcc41.patch
 }
 
 src_compile() {
@@ -40,14 +56,20 @@ src_compile() {
 
 	# Removed --enable-c-core as it *should* determine this based on arch
 	egamesconf \
+		--disable-dependency-tracking \
 		$(use_with mmx) \
 		$(use_enable gtk gtk 2.4) \
+		$(use_enable nls) \
 		|| die
 	emake || die "emake failed"
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
+	emake DESTDIR="${D}" install || die "emake install failed"
 	dodoc AUTHORS ChangeLog NEWS README README-win.txt
+	if use gtk ; then
+		newicon src/gtk/images/vba-64.png ${PN}.png
+		make_desktop_entry gvba VisualBoyAdvance
+	fi
 	prepgamesdirs
 }