games-emulation/desmume: Version bump, port to EAPI 5, remove some old versions.

Package-Manager: portage-2.1.12.2/cvs/Linux x86_64
Manifest-Sign-Key: 0xA5880072BBB51E42

9 files changed, 35 insertions, 170 deletions

diff --git a/games-emulation/desmume/ChangeLog b/games-emulation/desmume/ChangeLog
index 3a01b921d75e..80182458c9df 100644
--- a/games-emulation/desmume/ChangeLog
+++ b/games-emulation/desmume/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for games-emulation/desmume
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/desmume/ChangeLog,v 1.19 2012/06/23 21:58:43 hanno Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/desmume/ChangeLog,v 1.20 2013/05/28 10:34:08 hanno Exp $
+
+*desmume-0.9.9 (28 May 2013)
+
+  28 May 2013; Hanno Boeck <hanno@gentoo.org> -desmume-0.9.4.ebuild,
+  -desmume-0.9.5.ebuild, -desmume-0.9.7.ebuild, +desmume-0.9.9.ebuild,
+  -files/desmume-0.9.4-gcc44.patch, -files/desmume-0.9.5-sse2-fix.diff,
+  -files/desmume-add-missing-potfiles.diff,
+  -files/desmume-fix-gcc-warning.diff:
+  Version bump, port to EAPI 5, remove some old versions.
 
 *desmume-0.9.8 (23 Jun 2012)
 
diff --git a/games-emulation/desmume/Manifest b/games-emulation/desmume/Manifest
index 958fbc5bab29..daaeb79172bc 100644
--- a/games-emulation/desmume/Manifest
+++ b/games-emulation/desmume/Manifest
@@ -1,34 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX desmume-0.9.4-gcc44.patch 339 RMD160 7f1ab5b12dc709eea63cb86754d25a00d6013367 SHA1 33cd11a8c55272f6e4dba795dcb763a9c06558f0 SHA256 820f6a07336ae6fbead0a873de0bb7f04900fb683e8146586f9d3f039730afda
-AUX desmume-0.9.5-sse2-fix.diff 290 RMD160 f800b3e07ce8747511dc14af2153cd42c88d0d47 SHA1 06c9b76de45e4c32409b9e92c746a707c9c7804c SHA256 b779250e91032a4f6f856d409edacd9a129c364a8d8bf04081deb05b564b118c
-AUX desmume-add-missing-potfiles.diff 263 RMD160 e108af244c4f3b8c47b9db9762aaf6a63b53449f SHA1 5d162b5b57b68ce0814ed74ff80daf33d78229a1 SHA256 ef5ba05ce2650fae733004990e95358620cac37e8cbcfe891eddd9dbd1ffa2e1
-AUX desmume-fix-gcc-warning.diff 1060 RMD160 fb8bd79028de8e5641dc02d1ae063c4f301864c1 SHA1 8d204c17dd41b7c5cc62f30896e16c00be37bbeb SHA256 2f09290a42667f535df78c5a7941c927dfa35aa80c5c6ed239a1dd42fa5d2b6f
-DIST desmume-0.9.4.tar.gz 1035843 RMD160 c86eab6727331a45403325facc0add968275de6d SHA1 06eb3cb9c57547d3c43e272648d176a252143e43 SHA256 5fc50e746e6c42ae64602338605b5a6890098b2819df90399908ac30ff6d9533
-DIST desmume-0.9.5.tar.gz 935073 RMD160 9eb537cde87cdba78b39480c6196f60702fcf208 SHA1 27174becda0551ec231ff18c5e95266a95825524 SHA256 a709127d52d76bf5a9411bcf0b115d74f10907fb142104b7ef01c9f8cc2e3101
-DIST desmume-0.9.7.tar.gz 1142550 RMD160 8770addf1ae5aab9b15a70de7c4b0511b245220d SHA1 18e00f675d3e6217474a6bbf3c554aade9aceee5 SHA256 0a0f7ef3cc76ff0bbc6f3df47c3689653617074ea7ffc354e9fa1240c5336523
-DIST desmume-0.9.8.tar.gz 3677290 RMD160 68ee9cf026df5a3d301f12630cceaebd7fd2caed SHA1 de72f0a634d5904eced1491d2aeed96705168f65 SHA256 78363468a2d5efba95de57739a9c81a3757ecd76c2a183ec68336e30d47a5e01
-EBUILD desmume-0.9.4.ebuild 881 RMD160 969256c7dc413c622734748b3caa4a8f1be03e5d SHA1 640267963a9dc98e61202c6c0122375c922a59c2 SHA256 56e74ff5c9a84e0f8ff9b6f294aad9643ff2128886e25c2a94522876ded9aa07
-EBUILD desmume-0.9.5.ebuild 897 RMD160 dfaca43eaa1ebb21b6efeb263aab4f1f53fcf421 SHA1 270362f4d54d471a7123793e4e862ad8bb02b5c2 SHA256 3655e592b9a3e825fb2c5ac67dd1061f7a1efb275f85835effafb9b617e5011b
-EBUILD desmume-0.9.7.ebuild 1135 RMD160 e5ddfd9617c65728cbc1953394d12cf8a297fa77 SHA1 cf35f06d8db1870e63f665f9a8cfe37f3e26d3e0 SHA256 4d656550489088c0a44694ef83c56976ff01636686cba5c3e3d6d6db271ef53a
-EBUILD desmume-0.9.8.ebuild 826 RMD160 3f0e36acabee9e23f431cf2a437fe070771843a9 SHA1 324d26603c5d27dc42dfeed4b18f53a6a20344d7 SHA256 21a29f272d7b2fcce57e8510d28d60fc51d243e31697a77d64c73faf4511945e
-MISC ChangeLog 2878 RMD160 b7229c2ba87dc324e63cb87c4f49891d419f0ba8 SHA1 88a0f9456b11bba8b592cf3a9f8976accdc612fb SHA256 4425d96e0b89700cb7e8825f9efceecdf091926d0ab0f2283d83d63460395da3
-MISC metadata.xml 217 RMD160 2cee600c10e18cdf9affa5625ffb8a09a6afbd3a SHA1 c45c975e3ce6414fb9924aeb6a59801ba41371cd SHA256 7bf8a4fe5f89e7603117203f6124665523e00cec1c4ec668f265416d7e64ce00
+DIST desmume-0.9.8.tar.gz 3677290 SHA256 78363468a2d5efba95de57739a9c81a3757ecd76c2a183ec68336e30d47a5e01
+DIST desmume-0.9.9.tar.gz 4107513 SHA256 cd2ad70cdde1236eba5a4ff8cea838f42b7dc470e32ac938263f49f12a55d754 SHA512 ba5a965102559f048cd57718b4c50e6b2bd39eca4a5990e4cdf068bfa752fccb52d71911ea48da769c5ec18bb740f6b09e6c856ccc78b1e1adf23fd701d1fe31 WHIRLPOOL 055594100216e4ffd046119716e9acc018e7631f96f2be4e830495f88462382180c3955841bfcc3ec494227a606bc820820342907e2b1b2b61a8a65f9b1949b4
+EBUILD desmume-0.9.8.ebuild 826 SHA256 21a29f272d7b2fcce57e8510d28d60fc51d243e31697a77d64c73faf4511945e SHA512 672f1b94c0fd70adf8c880b542cb308bf609c6a433f476b71dd1bd6a8fc90fa9e98a2aef65f1bff62fe112f652275be0cd1be4ef739106599a78ae8d0a06012e WHIRLPOOL 2bcfabf3ed1e54ff4a0bbd84a8426f32dd23e4c933b583f333c3d257a67ec474723104805fb5585f038c713f349740cf6ad42f7c83d21c1479e89c8f4b551abd
+EBUILD desmume-0.9.9.ebuild 826 SHA256 4004b2be65b633267dc0d6358c78f4a3ab80992009fed8242ed4e611502fbadd SHA512 87b556747d2d9c2aaf0302c329b7fb5f21eaadb7c9e2872dab2d5661ff272fa64c51b1f396a2586c4fc877217dd5e0b2721c1909d92c525af4bd0f9a52b403b9 WHIRLPOOL 662bb75bc258e775c22178acb8bd8f9ed41a432fb68aa30f07a0bf4a21e260f5a99c63371b67f2e3b0bc7f933d40cc341de926a17fa11dfe728cfbc7ff4781d4
+MISC ChangeLog 3262 SHA256 436eb82fa595f5ef2b8454f47cd9dcdea342155be39390320b935808c8a84d38 SHA512 8be94fe11bd5985f49af0ed456c7d8ff266ef7175f4ef7dd9cdc80ce373550caaf82326abde5ea686eed24c332dc82a40cca3c046a3c09cfe5aee524e65a39f1 WHIRLPOOL 386b6b230cf66dae5dad8e1208c69fd1f2f5f48d39b77f1138e20048924d842d3de22296bc3c053a79c00d9320178ce9e63b47193821f526ef4e32a6c6ba24ef
+MISC metadata.xml 217 SHA256 7bf8a4fe5f89e7603117203f6124665523e00cec1c4ec668f265416d7e64ce00 SHA512 eed8cc56a201284a6a73b182bfc9b130b3cfbf6a4de59361679617ca8c8919a8973fc74a7b47f8303e3df31eef1293a49ad68f4f191b1726e79f672ddf1daee7 WHIRLPOOL a05ae17432b5cc070e4d89053a7ef2a41938c6d2ff7514b5131fa48ad6628e17e9e5199d22ae8d8fcc159a820a0aa1bb4d846cd9da12cd8bfaff1a743ae92bf7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCAAGBQJP5jwMAAoJEKWIAHK7tR5CSJkP/194Hu24JFdzgRFYG/TAyS+W
-bqA+qanrIFSrunWwXiGEoVySdZb+Pmc8Ea9ZcBoXTeFmlk7LIfWx/Ounp9fwRRot
-f/A4iD9jZesRVqKEcCeHAR96NTPlC8fd8GouNAcgYEdsYXA1ZrRSz2uMq6Ah6A1d
-WaGTnQJiKCcjKZQLkhrAOWX82tOlS60SUJzeYW2rURYJNTPI6NxwgXuiAc8PgMP1
-b0iFMoyROGmKSvzVg4MQwbilMTFQ05V0FsP12NSXZOot4LKNByv4MAb6azRHn6w2
-kgVWFll5TttCTqrxc4lMu1tcIIW6/c3ULD0PQYMLF8/11rPXrPz1m+SHQ+Qieb7s
-R5CBPC3paZZ4OrjyAdyc8NhuWLnz3MZFZQz7HU2NKWdZmy3l3bPTitcUU0od9kEQ
-HGQBboGvCCSKhSIbDB1UeFn8boH4k0TkTIFBhGlWOmnuE+bdyIT3+ddLCySfIlG4
-t+5x6vpk7zcvElwZRDu69+F7olKhsE6qxsujDlzemhzYBifJiaa0ALcvEfbdWNII
-RAbWTXBRvFeDeQiWU7FmbrmhTOjGVOYGEh6rES2jdceqDHdOeCgSdjc5U2dZddrj
-HQCv0GmM8zm9/KdF6qHGRE6Pj3xETYFMvulzNh6lQ4SZHQYg79mL7MDbQISkqUxu
-cLgNRKd70pI11IDRuxRX
-=ts5J
+iQIcBAEBCAAGBQJRpIgvAAoJEKWIAHK7tR5COoIP/ivZyZrR+zr2Jlabhb8XYVHk
+8pMMYDX8Ppw9EpFlgcQFm2Ggsu6uEFfyT+0QTn46eYpfTB8PutEJbNCHsZ3sdl1W
+2Dsg3WKiUjEtaAQF4uC88kRUmpLApVoaFA8C4FPUgZ8UZnAFB7FEQoB8qpMSXiV2
+iOOf9YeJOUNYlgJgYtpWHWkWE3ejD7VGL9TyM2twjni/juyc6+JnfWMif1Tu+mb5
+2Fm2EFKWOaBhtoMvDGBVw3mjd5IKOygUgCIPQdr7dP1Zf+jRucKxE6gjNmsxu8Rl
+VqC6Y6iagjZIm+/XVpjYcPR1aV1zFQxJk3ecfuCzhyKae61z1C5cAdx8qJHE4wpo
+GdopNTfT5EDCSubalwPqQ5DLk2ZxFRIFFBqyKi0p7IDfsn5qdzi1StZp+c6Y8Gqn
+VsqgF8Y9pXfP1sC1nkQoizCh1Mxz/dXkDr3bSy3a9zYFT6UqIWHhVzrBQEPZ1NAa
+zQMS7DJRCVs5wi/mp/FauY6O4nUT5YzeTeMHSNOnWI+dfcYZxy71JhtNXcVyaS5C
+qhqPN61mTt5UvzrmBozJ6ip0+wkcwzMq6sW2lWCiwRKYXVn2bCZLvpyTzeevx8Jh
+bSG3jqCV0ylUBDhEgSL+UGGs2LlbiA78WLKbF483hm2rO9qbd6mduDBElTd2fJcL
+9maHXRMBkyeIoi1d3bpI
+=Wdze
 -----END PGP SIGNATURE-----
diff --git a/games-emulation/desmume/desmume-0.9.4.ebuild b/games-emulation/desmume/desmume-0.9.4.ebuild
deleted file mode 100644
index b4d799d36c61..000000000000
--- a/games-emulation/desmume/desmume-0.9.4.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/desmume/desmume-0.9.4.ebuild,v 1.4 2011/03/01 07:31:40 mr_bones_ Exp $
-
-EAPI="2"
-
-inherit eutils games
-
-DESCRIPTION="Nintendo DS emulator"
-HOMEPAGE="http://desmume.org/"
-SRC_URI="mirror://sourceforge/desmume/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND=">=x11-libs/gtk+-2.8.0:2
-	gnome-base/libglade
-	x11-libs/gtkglext
-	virtual/opengl
-	sys-libs/zlib
-	dev-libs/zziplib
-	media-libs/libsdl[joystick]"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-gcc44.patch"
-}
-
-src_configure() {
-	egamesconf --datadir=/usr/share || die "egamesconf failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake failed"
-	dodoc AUTHORS ChangeLog README README.LIN
-	prepgamesdirs
-}
diff --git a/games-emulation/desmume/desmume-0.9.7.ebuild b/games-emulation/desmume/desmume-0.9.7.ebuild
deleted file mode 100644
index 4c65d14541a4..000000000000
--- a/games-emulation/desmume/desmume-0.9.7.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/desmume/desmume-0.9.7.ebuild,v 1.1 2011/11/12 21:01:35 hanno Exp $
-
-EAPI="2"
-
-inherit eutils games
-
-DESCRIPTION="Nintendo DS emulator"
-HOMEPAGE="http://desmume.org/"
-SRC_URI="mirror://sourceforge/desmume/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND=">=x11-libs/gtk+-2.8.0:2
-	gnome-base/libglade
-	x11-libs/gtkglext
-	virtual/opengl
-	sys-libs/zlib
-	dev-libs/zziplib
-	media-libs/libsdl[joystick]
-	x11-libs/agg"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	# https://sourceforge.net/tracker/?func=detail&aid=3436660&group_id=164579&atid=832291
-	epatch "${FILESDIR}/desmume-add-missing-potfiles.diff"
-	# https://sourceforge.net/tracker/?func=detail&aid=3436995&group_id=164579&atid=832291
-	epatch "${FILESDIR}/desmume-fix-gcc-warning.diff"
-}
-
-src_configure() {
-	egamesconf --datadir=/usr/share || die "egamesconf failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake failed"
-	dodoc AUTHORS ChangeLog README README.LIN
-	prepgamesdirs
-}
diff --git a/games-emulation/desmume/desmume-0.9.5.ebuild b/games-emulation/desmume/desmume-0.9.9.ebuild
index 69a30bc3ca17..133a224e8076 100644
--- a/games-emulation/desmume/desmume-0.9.5.ebuild
+++ b/games-emulation/desmume/desmume-0.9.9.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/desmume/desmume-0.9.5.ebuild,v 1.4 2011/03/01 07:31:40 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/desmume/desmume-0.9.9.ebuild,v 1.1 2013/05/28 10:34:08 hanno Exp $
 
-EAPI="2"
+EAPI="5"
 
-inherit eutils games
+inherit games
 
 DESCRIPTION="Nintendo DS emulator"
 HOMEPAGE="http://desmume.org/"
@@ -25,10 +25,6 @@ DEPEND=">=x11-libs/gtk+-2.8.0:2
 	x11-libs/agg"
 RDEPEND="${DEPEND}"
 
-src_prepare() {
-	epatch "${FILESDIR}/${P}-sse2-fix.diff"
-}
-
 src_configure() {
 	egamesconf --datadir=/usr/share || die "egamesconf failed"
 }
diff --git a/games-emulation/desmume/files/desmume-0.9.4-gcc44.patch b/games-emulation/desmume/files/desmume-0.9.4-gcc44.patch
deleted file mode 100644
index d95a16c8aae1..000000000000
--- a/games-emulation/desmume/files/desmume-0.9.4-gcc44.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- desmume-0.9.4/src/texcache.h	2009-07-08 11:11:01.000000000 +0300
-+++ desmume-0.9.4-gcc44/src/texcache.h	2009-07-24 20:21:16.000000000 +0300
-@@ -43,7 +43,7 @@
- 
- void TexCache_Reset();
- 
--template<TexCache_TexFormat format>
-+template<TexCache_TexFormat>
- void TexCache_SetTexture(u32 format, u32 texpal);
- 
- void TexCache_Invalidate();
diff --git a/games-emulation/desmume/files/desmume-0.9.5-sse2-fix.diff b/games-emulation/desmume/files/desmume-0.9.5-sse2-fix.diff
deleted file mode 100644
index 1f9d48ad857d..000000000000
--- a/games-emulation/desmume/files/desmume-0.9.5-sse2-fix.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- trunk/desmume/src/matrix.h	2009/12/12 10:34:06	3145
-+++ trunk/desmume/src/matrix.h	2009/12/12 16:30:55	3146
-@@ -115,7 +115,7 @@
- 
- //switched SSE2 functions
- //-------------
--#ifdef ENABLE_SSE
-+#ifdef ENABLE_SSE2
- 
- template<int NUM>
- FORCEINLINE void memset_u16_le(void* dst, u16 val)
diff --git a/games-emulation/desmume/files/desmume-add-missing-potfiles.diff b/games-emulation/desmume/files/desmume-add-missing-potfiles.diff
deleted file mode 100644
index 7ce2f8758086..000000000000
--- a/games-emulation/desmume/files/desmume-add-missing-potfiles.diff
+++ /dev/null
@@ -1,6 +0,0 @@
---- desmume-0.9.7/po/POTFILES.skip	2011-01-27 11:27:00.000000000 +0100
-+++ desmume-0.9.7-1/po/POTFILES.skip	2011-11-11 21:10:30.550725740 +0100
-@@ -1,2 +1,3 @@
- src/wx/PadSimple/GUI/ConfigDlg.cpp
- src/wxdlg/wxdlg3dViewer.cpp
-+src/wxdlg/wxcontrolsconfigdialog.cpp
diff --git a/games-emulation/desmume/files/desmume-fix-gcc-warning.diff b/games-emulation/desmume/files/desmume-fix-gcc-warning.diff
deleted file mode 100644
index 409640264c7a..000000000000
--- a/games-emulation/desmume/files/desmume-fix-gcc-warning.diff
+++ /dev/null
@@ -1,22 +0,0 @@
---- desmume-0.9.7/src/GPU.cpp	2011-01-27 11:27:00.000000000 +0100
-+++ desmume-0.9.7-fix-warning/src/GPU.cpp	2011-11-11 21:17:10.826721602 +0100
-@@ -1184,16 +1184,16 @@
- 	case BGType_AffineExt_256x1:
- 		// 256 colors 
- 		pal = MMU.ARM9_VMEM + gpu->core * 0x400;
--		apply_rot_fun<rot_256_map<MOSAIC> >(gpu,X,Y,PA,PB,PC,PD,LG, gpu->BG_bmp_ram[num], NULL, pal);
-+		apply_rot_fun<rot_256_map<MOSAIC> >(gpu,X,Y,PA,PB,PC,PD,LG, gpu->BG_bmp_ram[num], 0, pal);
- 		return;
- 	case BGType_AffineExt_Direct:
- 		// direct colors / BMP
--		apply_rot_fun<rot_BMP_map<MOSAIC> >(gpu,X,Y,PA,PB,PC,PD,LG, gpu->BG_bmp_ram[num], NULL, NULL);
-+		apply_rot_fun<rot_BMP_map<MOSAIC> >(gpu,X,Y,PA,PB,PC,PD,LG, gpu->BG_bmp_ram[num], 0, NULL);
- 		return;
- 	case BGType_Large8bpp:
- 		// large screen 256 colors
- 		pal = MMU.ARM9_VMEM + gpu->core * 0x400;
--		apply_rot_fun<rot_256_map<MOSAIC> >(gpu,X,Y,PA,PB,PC,PD,LG, gpu->BG_bmp_large_ram[num], NULL, pal);
-+		apply_rot_fun<rot_256_map<MOSAIC> >(gpu,X,Y,PA,PB,PC,PD,LG, gpu->BG_bmp_large_ram[num], 0, pal);
- 		return;
- 	default: break;
- 	}