Added a new patch to support compile fixes for gcc 3 and gcc4. Fixes for gcc4 were made by Miguel Marte <miguelmarte@gmail.com> on bug #136358.

Package-Manager: portage-2.1

7 files changed, 617 insertions, 10 deletions

diff --git a/media-plugins/xmms-nsf/ChangeLog b/media-plugins/xmms-nsf/ChangeLog
index 73ba4fb5748f..62cd07f50786 100644
--- a/media-plugins/xmms-nsf/ChangeLog
+++ b/media-plugins/xmms-nsf/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-plugins/xmms-nsf
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-nsf/ChangeLog,v 1.14 2005/11/09 03:25:02 metalgod Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-nsf/ChangeLog,v 1.15 2006/06/12 00:40:38 metalgod Exp $
+
+*xmms-nsf-0.0.3-r2 (12 Jun 2006)
+
+  12 Jun 2006; Luis Medinas <metalgod@gentoo.org>
+  +files/xmms-nsf-0.0.3-compilefixes.patch, +xmms-nsf-0.0.3-r2.ebuild:
+  Added a new patch to support compile fixes for gcc 3 and gcc4. Fixes for
+  gcc4 were made by Miguel Marte <miguelmarte@gmail.com> on bug #136358.
 
 *xmms-nsf-0.0.3-r1 (09 Nov 2005)
 
diff --git a/media-plugins/xmms-nsf/Manifest b/media-plugins/xmms-nsf/Manifest
index 51374d73f722..74a323ef4ff5 100644
--- a/media-plugins/xmms-nsf/Manifest
+++ b/media-plugins/xmms-nsf/Manifest
@@ -1,19 +1,56 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 3b22e65adc88131b61c11d1f18f65dfb ChangeLog 1742
-MD5 97224410e57c687737a5624e6ca43faa files/digest-xmms-nsf-0.0.3 66
-MD5 97224410e57c687737a5624e6ca43faa files/digest-xmms-nsf-0.0.3-r1 66
+AUX xmms-nsf-0.0.3-PIC.patch 1109 RMD160 b76f19cc27e772450d382b45d6abf2a3cbf6f4ad SHA1 a9a851e3c6b4a7bdfd2510b5b091cfb045581bf1 SHA256 0130b2049332a0b92d56d8c2a5740fa464b542a0650d0b1544e4899c060265c9
 MD5 8b5a150abf181904c2075418e276dc27 files/xmms-nsf-0.0.3-PIC.patch 1109
+RMD160 b76f19cc27e772450d382b45d6abf2a3cbf6f4ad files/xmms-nsf-0.0.3-PIC.patch 1109
+SHA256 0130b2049332a0b92d56d8c2a5740fa464b542a0650d0b1544e4899c060265c9 files/xmms-nsf-0.0.3-PIC.patch 1109
+AUX xmms-nsf-0.0.3-about.patch 6418 RMD160 4559976b6166be28cece6aef537c20e4de187ec4 SHA1 aad7c0c72b235ed3f720a4c149aa56a00c72ee88 SHA256 b6eb45ad3b33de3130d4e3c76a933cdf898666191c123e3e3917998402baa046
 MD5 5a49e69ded2a39ed299ddb5c3c7cb6df files/xmms-nsf-0.0.3-about.patch 6418
+RMD160 4559976b6166be28cece6aef537c20e4de187ec4 files/xmms-nsf-0.0.3-about.patch 6418
+SHA256 b6eb45ad3b33de3130d4e3c76a933cdf898666191c123e3e3917998402baa046 files/xmms-nsf-0.0.3-about.patch 6418
+AUX xmms-nsf-0.0.3-compilefixes.patch 19973 RMD160 f800a65c90f6afcaf3641155ab9269e03c7881fe SHA1 3862784ce2b279f20be528def7fb4d17d8efb2f1 SHA256 b82e85bd2fbe54105134f8dfce2a8f9dda3556999049a982d0f182289c41091d
+MD5 47875813ddc403ac614ed1590fc9a15c files/xmms-nsf-0.0.3-compilefixes.patch 19973
+RMD160 f800a65c90f6afcaf3641155ab9269e03c7881fe files/xmms-nsf-0.0.3-compilefixes.patch 19973
+SHA256 b82e85bd2fbe54105134f8dfce2a8f9dda3556999049a982d0f182289c41091d files/xmms-nsf-0.0.3-compilefixes.patch 19973
+AUX xmms-nsf-0.0.3-gcc3.patch 19364 RMD160 5390f0d2ab5052d174cab15748113a2289f8d353 SHA1 98a3cc32ff0c27cb6ef88d23a0c4c0006dc2c1c0 SHA256 024b6bd4d15317898bc55501e7e4b9a4d5faf2b4b89238ad0b469615a2bc41a4
 MD5 a4b5f9490c67aee61044efdc53229a3d files/xmms-nsf-0.0.3-gcc3.patch 19364
-MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+RMD160 5390f0d2ab5052d174cab15748113a2289f8d353 files/xmms-nsf-0.0.3-gcc3.patch 19364
+SHA256 024b6bd4d15317898bc55501e7e4b9a4d5faf2b4b89238ad0b469615a2bc41a4 files/xmms-nsf-0.0.3-gcc3.patch 19364
+DIST xmms-nsf-0.0.3.tar.gz 185683 RMD160 d7d70b55a9bcf4f36014bcf396f9b1e66855a448 SHA1 004b4930f9d57792df4a8f2abb304301ed3d9d45 SHA256 43480b65b7ccd64396248404ccc54b62eb8cb21949f240a6d45d3a6cc1d352cd
+EBUILD xmms-nsf-0.0.3-r1.ebuild 963 RMD160 9cdd11ea199affe4e0ff3e75e03998f9624ff32e SHA1 61fa855fc45bd6478ac4aaa435e8d60891ad612d SHA256 9245b1a1b4b277ffbf2e1363f086a1e355fcf7d4dadc70fd59a6cbcb02d16ad3
 MD5 f444d088c63ac9914bb47613191c2724 xmms-nsf-0.0.3-r1.ebuild 963
+RMD160 9cdd11ea199affe4e0ff3e75e03998f9624ff32e xmms-nsf-0.0.3-r1.ebuild 963
+SHA256 9245b1a1b4b277ffbf2e1363f086a1e355fcf7d4dadc70fd59a6cbcb02d16ad3 xmms-nsf-0.0.3-r1.ebuild 963
+EBUILD xmms-nsf-0.0.3-r2.ebuild 971 RMD160 96a1ba7421b83b012670098426963c95799f077e SHA1 e78b6625319f411d59fc2fa9e59eac7e0d15a69d SHA256 be1d4d2007add8a3ee9790ceef675f608271243fb471ddcb7858764f9be5258a
+MD5 643cc966618aa838e5beb1e0c834e825 xmms-nsf-0.0.3-r2.ebuild 971
+RMD160 96a1ba7421b83b012670098426963c95799f077e xmms-nsf-0.0.3-r2.ebuild 971
+SHA256 be1d4d2007add8a3ee9790ceef675f608271243fb471ddcb7858764f9be5258a xmms-nsf-0.0.3-r2.ebuild 971
+EBUILD xmms-nsf-0.0.3.ebuild 923 RMD160 87bd3ce16ee74f6c95b63aa64c532fb0362a3d9f SHA1 c55afd80bd8e640cf8523b6219e33842591006bf SHA256 447be3ce49c845fb82c009bbca31a6d7ab8e9d4aba2b8945282ec45082f808df
 MD5 12c7b44d3171faa9640f7012a9e4c2fd xmms-nsf-0.0.3.ebuild 923
+RMD160 87bd3ce16ee74f6c95b63aa64c532fb0362a3d9f xmms-nsf-0.0.3.ebuild 923
+SHA256 447be3ce49c845fb82c009bbca31a6d7ab8e9d4aba2b8945282ec45082f808df xmms-nsf-0.0.3.ebuild 923
+MISC ChangeLog 2046 RMD160 6ff2a913922c731da1766a2f3b231fc32705e0b9 SHA1 1c23f6fc55b48adae80932dcf567623e6e7854be SHA256 b7753bff9439015ea2214d9000772c7c21639bac96e05bea3102648c3cc932fb
+MD5 1339b723eee3a47ac9966389d78b05f8 ChangeLog 2046
+RMD160 6ff2a913922c731da1766a2f3b231fc32705e0b9 ChangeLog 2046
+SHA256 b7753bff9439015ea2214d9000772c7c21639bac96e05bea3102648c3cc932fb ChangeLog 2046
+MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158
+SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b metadata.xml 158
+MD5 c5e35729649ecb8fe44a8f4f4b6772c8 files/digest-xmms-nsf-0.0.3 244
+RMD160 c4696cac501f85d0f0e055a93329739808cffb0d files/digest-xmms-nsf-0.0.3 244
+SHA256 55f8247935f463fa151e30a6acaad36177b898293b95736f069ef47bf5130286 files/digest-xmms-nsf-0.0.3 244
+MD5 c5e35729649ecb8fe44a8f4f4b6772c8 files/digest-xmms-nsf-0.0.3-r1 244
+RMD160 c4696cac501f85d0f0e055a93329739808cffb0d files/digest-xmms-nsf-0.0.3-r1 244
+SHA256 55f8247935f463fa151e30a6acaad36177b898293b95736f069ef47bf5130286 files/digest-xmms-nsf-0.0.3-r1 244
+MD5 c5e35729649ecb8fe44a8f4f4b6772c8 files/digest-xmms-nsf-0.0.3-r2 244
+RMD160 c4696cac501f85d0f0e055a93329739808cffb0d files/digest-xmms-nsf-0.0.3-r2 244
+SHA256 55f8247935f463fa151e30a6acaad36177b898293b95736f069ef47bf5130286 files/digest-xmms-nsf-0.0.3-r2 244
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
+Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFDcWzdwUpWvClEHQoRAhQMAJ4lVCo4JPxbGodbnH1RvibQozmFtgCfQloL
-IiqenyDmw1HYC6Hn6ezQA60=
-=0pku
+iD8DBQFEjLbawUpWvClEHQoRAihGAJ44SLf4x5IeLnXsizBBVFCQFtulVwCdGwzH
+5vmyrEuG2FFWztZkgpjYSAM=
+=5RmA
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/xmms-nsf/files/digest-xmms-nsf-0.0.3 b/media-plugins/xmms-nsf/files/digest-xmms-nsf-0.0.3
index d462c5281aa9..6788cdad34a0 100644
--- a/media-plugins/xmms-nsf/files/digest-xmms-nsf-0.0.3
+++ b/media-plugins/xmms-nsf/files/digest-xmms-nsf-0.0.3
@@ -1 +1,3 @@
 MD5 45c55a17d81cd82d36d59bdb231777df xmms-nsf-0.0.3.tar.gz 185683
+RMD160 d7d70b55a9bcf4f36014bcf396f9b1e66855a448 xmms-nsf-0.0.3.tar.gz 185683
+SHA256 43480b65b7ccd64396248404ccc54b62eb8cb21949f240a6d45d3a6cc1d352cd xmms-nsf-0.0.3.tar.gz 185683
diff --git a/media-plugins/xmms-nsf/files/digest-xmms-nsf-0.0.3-r1 b/media-plugins/xmms-nsf/files/digest-xmms-nsf-0.0.3-r1
index d462c5281aa9..6788cdad34a0 100644
--- a/media-plugins/xmms-nsf/files/digest-xmms-nsf-0.0.3-r1
+++ b/media-plugins/xmms-nsf/files/digest-xmms-nsf-0.0.3-r1
@@ -1 +1,3 @@
 MD5 45c55a17d81cd82d36d59bdb231777df xmms-nsf-0.0.3.tar.gz 185683
+RMD160 d7d70b55a9bcf4f36014bcf396f9b1e66855a448 xmms-nsf-0.0.3.tar.gz 185683
+SHA256 43480b65b7ccd64396248404ccc54b62eb8cb21949f240a6d45d3a6cc1d352cd xmms-nsf-0.0.3.tar.gz 185683
diff --git a/media-plugins/xmms-nsf/files/digest-xmms-nsf-0.0.3-r2 b/media-plugins/xmms-nsf/files/digest-xmms-nsf-0.0.3-r2
new file mode 100644
index 000000000000..6788cdad34a0
--- /dev/null
+++ b/media-plugins/xmms-nsf/files/digest-xmms-nsf-0.0.3-r2
@@ -0,0 +1,3 @@
+MD5 45c55a17d81cd82d36d59bdb231777df xmms-nsf-0.0.3.tar.gz 185683
+RMD160 d7d70b55a9bcf4f36014bcf396f9b1e66855a448 xmms-nsf-0.0.3.tar.gz 185683
+SHA256 43480b65b7ccd64396248404ccc54b62eb8cb21949f240a6d45d3a6cc1d352cd xmms-nsf-0.0.3.tar.gz 185683
diff --git a/media-plugins/xmms-nsf/files/xmms-nsf-0.0.3-compilefixes.patch b/media-plugins/xmms-nsf/files/xmms-nsf-0.0.3-compilefixes.patch
new file mode 100644
index 000000000000..b4956f84a7d9
--- /dev/null
+++ b/media-plugins/xmms-nsf/files/xmms-nsf-0.0.3-compilefixes.patch
@@ -0,0 +1,518 @@
+diff -ur xmms-nsf-0.0.3/src/nes/handler.c xmms-nsf-0.0.3-gentoo/src/nes/handler.c
+--- xmms-nsf-0.0.3/src/nes/handler.c	2001-01-07 17:17:57.000000000 +1300
++++ xmms-nsf-0.0.3-gentoo/src/nes/handler.c	2003-10-12 19:56:48.000000000 +1300
+@@ -10,9 +10,9 @@
+ static NES_READ_HANDLER  *(nprh[0x10]) = { 0, };
+ static NES_WRITE_HANDLER *(npwh[0x10]) = { 0, };
+ #define EXTREADWRITE(p) \
+-static Uint __fastcall ExtRd##p##(Uint A) \
++static Uint __fastcall ExtRd##p (Uint A) \
+ { \
+-	NES_READ_HANDLER *ph = nprh[0x##p##]; \
++	NES_READ_HANDLER *ph = nprh[0x##p ]; \
+ 	do \
+ 	{ \
+ 		if (ph->min <= A && A <= ph->max) \
+@@ -22,9 +22,9 @@
+ 	} while ((ph = ph->next) != 0); \
+ 	return 0; \
+ } \
+-static void __fastcall ExtWr##p##(Uint A, Uint V) \
++static void __fastcall ExtWr##p (Uint A, Uint V) \
+ { \
+-	NES_WRITE_HANDLER *ph = npwh[0x##p##]; \
++	NES_WRITE_HANDLER *ph = npwh[0x##p ]; \
+ 	do \
+ 	{ \
+ 		if (ph->min <= A && A <= ph->max) \
+diff -ur xmms-nsf-0.0.3/src/nes/km6502/km6502cd.h xmms-nsf-0.0.3-gentoo/src/nes/km6502/km6502cd.h
+--- xmms-nsf-0.0.3/src/nes/km6502/km6502cd.h	2001-01-07 17:18:05.000000000 +1300
++++ xmms-nsf-0.0.3-gentoo/src/nes/km6502/km6502cd.h	2003-10-12 20:07:08.000000000 +1300
+@@ -361,27 +361,27 @@
+ 
+ /* --- ADC ---  */
+ #if BUILD_HUC6280
+-#define DEF_ADC(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
+-{ KMI_ADC(__THISP_ K_READ##p##(__THISP_ a(__THISP))); } \
+-static void OpcodeCall D_Opco##i##(__CONTEXT) \
+-{ KMI_ADC_D(__THISP_ K_READ##p##(__THISP_ a(__THISP))); } \
+-static void OpcodeCall T_Opco##i##(__CONTEXT) \
++#define DEF_ADC(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
++{ KMI_ADC(__THISP_ K_READ##p (__THISP_ a(__THISP))); } \
++static void OpcodeCall D_Opco##i (__CONTEXT) \
++{ KMI_ADC_D(__THISP_ K_READ##p (__THISP_ a(__THISP))); } \
++static void OpcodeCall T_Opco##i (__CONTEXT) \
+ { \
+ 	Uword saveA = KMI_PRET(__THISP); \
+-	KMI_ADC(__THISP_ K_READ##p##(__THISP_ a(__THISP))); \
++	KMI_ADC(__THISP_ K_READ##p (__THISP_ a(__THISP))); \
+ 	KMI_POSTT(__THISP_ saveA); \
+ } \
+-static void OpcodeCall TD_Opc##i##(__CONTEXT) \
++static void OpcodeCall TD_Opc##i (__CONTEXT) \
+ { \
+ 	Uword saveA = KMI_PRET(__THISP); \
+-	KMI_ADC_D(__THISP_ K_READ##p##(__THISP_ a(__THISP))); \
++	KMI_ADC_D(__THISP_ K_READ##p (__THISP_ a(__THISP))); \
+ 	KMI_POSTT(__THISP_ saveA); \
+ }
+ #else
+-#define DEF_ADC(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
+-{ KMI_ADC(__THISP_ K_READ##p##(__THISP_ a(__THISP))); } \
+-static void OpcodeCall D_Opco##i##(__CONTEXT) \
+-{ KMI_ADC_D(__THISP_ K_READ##p##(__THISP_ a(__THISP))); }
++#define DEF_ADC(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
++{ KMI_ADC(__THISP_ K_READ##p (__THISP_ a(__THISP))); } \
++static void OpcodeCall D_Opco##i (__CONTEXT) \
++{ KMI_ADC_D(__THISP_ K_READ##p (__THISP_ a(__THISP))); }
+ #endif
+ DEF_ADC(61,NP,KA_INDX)	/* 61 - ADC - (Indirect,X) */
+ DEF_ADC(65,ZP,KA_ZP)	/* 65 - ADC - Zero Page */
+@@ -397,17 +397,17 @@
+ 
+ /* --- AND ---  */
+ #if BUILD_HUC6280
+-#define DEF_AND(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
+-{ KM_AND(__THISP_ K_READ##p##(__THISP_ a(__THISP))); } \
+-static void OpcodeCall T_Opco##i##(__CONTEXT) \
++#define DEF_AND(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
++{ KM_AND(__THISP_ K_READ##p (__THISP_ a(__THISP))); } \
++static void OpcodeCall T_Opco##i (__CONTEXT) \
+ { \
+ 	Uword saveA = KMI_PRET(__THISP); \
+-	KM_AND(__THISP_ K_READ##p##(__THISP_ a(__THISP))); \
++	KM_AND(__THISP_ K_READ##p (__THISP_ a(__THISP))); \
+ 	KMI_POSTT(__THISP_ saveA); \
+ }
+ #else
+-#define DEF_AND(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
+-{ KM_AND(__THISP_ K_READ##p##(__THISP_ a(__THISP))); }
++#define DEF_AND(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
++{ KM_AND(__THISP_ K_READ##p (__THISP_ a(__THISP))); }
+ #endif
+ DEF_AND(21,NP,KA_INDX)	/* 21 - AND - (Indirect,X) */
+ DEF_AND(25,ZP,KA_ZP)	/* 25 - AND - Zero Page */
+@@ -422,10 +422,10 @@
+ #endif
+ 
+ /* --- ASL ---  */
+-#define DEF_ASL(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
++#define DEF_ASL(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
+ { \
+ 	Uword adr = a(__THISP); \
+-	K_WRITE##p##(__THISP_ adr, KM_ASL(__THISP_ K_READ##p##(__THISP_ adr))); \
++	K_WRITE##p (__THISP_ adr, KM_ASL(__THISP_ K_READ##p (__THISP_ adr))); \
+ }
+ DEF_ASL(06,ZP,KA_ZP)	/* 06 - ASL - Zero Page */
+ DEF_ASL(0E,NP,KA_ABS)	/* 0E - ASL - Absolute */
+@@ -436,7 +436,7 @@
+ 
+ #if BUILD_HUC6280
+ /* --- BBRi --- */
+-#define DEF_BBR(i,y) static void OpcodeCall Opcode##i##(__CONTEXT) \
++#define DEF_BBR(i,y) static void OpcodeCall Opcode##i (__CONTEXT) \
+ { \
+ 	Uword adr = KA_ZP(__THISP); \
+ 	Uword rel = K_READ(__THISP_ KA_IMM(__THISP)); \
+@@ -451,7 +451,7 @@
+ DEF_BBR(6F,6)			/* 6F - BBR6 */
+ DEF_BBR(7F,7)			/* 7F - BBR7 */
+ /* --- BBSi --- */
+-#define DEF_BBS(i,y) static void OpcodeCall Opcode##i##(__CONTEXT) \
++#define DEF_BBS(i,y) static void OpcodeCall Opcode##i (__CONTEXT) \
+ { \
+ 	Uword adr = KA_ZP(__THISP); \
+ 	Uword rel = K_READ(__THISP_ KA_IMM(__THISP)); \
+@@ -468,8 +468,8 @@
+ #endif
+ 
+ /* --- BIT ---  */
+-#define DEF_BIT(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
+-{ KM_BIT(__THISP_ K_READ##p##(__THISP_ a(__THISP))); }
++#define DEF_BIT(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
++{ KM_BIT(__THISP_ K_READ##p (__THISP_ a(__THISP))); }
+ DEF_BIT(24,ZP,KA_ZP)	/* 24 - BIT - Zero Page */
+ DEF_BIT(2C,NP,KA_ABS)	/* 2C - BIT - Absolute */
+ #if BUILD_HUC6280 || BUILD_M65C02
+@@ -479,7 +479,7 @@
+ #endif
+ 
+ /* --- Bcc ---  */
+-#define DEF_BRA(i,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
++#define DEF_BRA(i,a) static void OpcodeCall Opcode##i (__CONTEXT) \
+ { \
+ 	Uword rel = K_READ(__THISP_ KA_IMM(__THISP)); \
+ 	if (a) KM_BRA(__THISP_ rel); \
+@@ -536,8 +536,8 @@
+ { __THIS__.P &= ~V_FLAG; }
+ 
+ /* --- CMP --- */
+-#define DEF_CMP(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
+-{ KM_CMP(__THISP_ K_READ##p##(__THISP_ a(__THISP))); }
++#define DEF_CMP(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
++{ KM_CMP(__THISP_ K_READ##p (__THISP_ a(__THISP))); }
+ DEF_CMP(C1,NP,KA_INDX)	/* C1 - CMP - (Indirect,X) */
+ DEF_CMP(C5,ZP,KA_ZP)	/* C5 - CMP - Zero Page */
+ DEF_CMP(C9,NP,KA_IMM)	/* C9 - CMP - Immediate */
+@@ -551,24 +551,24 @@
+ #endif
+ 
+ /* --- CPX --- */
+-#define DEF_CPX(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
+-{ KM_CPX(__THISP_ K_READ##p##(__THISP_ a(__THISP))); }
++#define DEF_CPX(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
++{ KM_CPX(__THISP_ K_READ##p (__THISP_ a(__THISP))); }
+ DEF_CPX(E0,NP,KA_IMM)	/* E0 - CPX - Immediate */
+ DEF_CPX(E4,ZP,KA_ZP)	/* E4 - CPX - Zero Page */
+ DEF_CPX(EC,NP,KA_ABS)	/* EC - CPX - Absolute */
+ 
+ /* --- CPY --- */
+-#define DEF_CPY(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
+-{ KM_CPY(__THISP_ K_READ##p##(__THISP_ a(__THISP))); }
++#define DEF_CPY(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
++{ KM_CPY(__THISP_ K_READ##p (__THISP_ a(__THISP))); }
+ DEF_CPY(C0,NP,KA_IMM)	/* C0 - CPY - Immediate */
+ DEF_CPY(C4,ZP,KA_ZP)	/* C4 - CPY - Zero Page */
+ DEF_CPY(CC,NP,KA_ABS)	/* CC - CPY - Absolute */
+ 
+ /* --- DEC ---  */
+-#define DEF_DEC(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
++#define DEF_DEC(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
+ { \
+ 	Uword adr = a(__THISP); \
+-	K_WRITE##p##(__THISP_ adr, KM_DEC(__THISP_ K_READ##p##(__THISP_ adr))); \
++	K_WRITE##p (__THISP_ adr, KM_DEC(__THISP_ K_READ##p (__THISP_ adr))); \
+ }
+ DEF_DEC(C6,ZP,KA_ZP)	/* C6 - DEC - Zero Page */
+ DEF_DEC(CE,NP,KA_ABS)	/* CE - DEC - Absolute */
+@@ -585,17 +585,17 @@
+ 
+ /* --- EOR ---  */
+ #if BUILD_HUC6280
+-#define DEF_EOR(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
+-{ KM_EOR(__THISP_ K_READ##p##(__THISP_ a(__THISP))); } \
+-static void OpcodeCall T_Opco##i##(__CONTEXT) \
++#define DEF_EOR(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
++{ KM_EOR(__THISP_ K_READ##p (__THISP_ a(__THISP))); } \
++static void OpcodeCall T_Opco##i (__CONTEXT) \
+ { \
+ 	Uword saveA = KMI_PRET(__THISP); \
+-	KM_EOR(__THISP_ K_READ##p##(__THISP_ a(__THISP))); \
++	KM_EOR(__THISP_ K_READ##p (__THISP_ a(__THISP))); \
+ 	KMI_POSTT(__THISP_ saveA); \
+ }
+ #else
+-#define DEF_EOR(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
+-{ KM_EOR(__THISP_ K_READ##p##(__THISP_ a(__THISP))); }
++#define DEF_EOR(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
++{ KM_EOR(__THISP_ K_READ##p (__THISP_ a(__THISP))); }
+ #endif
+ DEF_EOR(41,NP,KA_INDX)	/* 41 - EOR - (Indirect,X) */
+ DEF_EOR(45,ZP,KA_ZP)	/* 45 - EOR - Zero Page */
+@@ -610,10 +610,10 @@
+ #endif
+ 
+ /* --- INC ---  */
+-#define DEF_INC(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
++#define DEF_INC(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
+ { \
+ 	Uword adr = a(__THISP); \
+-	K_WRITE##p##(__THISP_ adr, KM_INC(__THISP_ K_READ##p##(__THISP_ adr))); \
++	K_WRITE##p (__THISP_ adr, KM_INC(__THISP_ K_READ##p (__THISP_ adr))); \
+ }
+ DEF_INC(E6,ZP,KA_ZP)	/* E6 - INC - Zero Page */
+ DEF_INC(EE,NP,KA_ABS)	/* EE - INC - Absolute */
+@@ -629,12 +629,12 @@
+ { __THIS__.Y = KM_INC(__THISP_ __THIS__.Y); }
+ 
+ /* --- JMP ---  */
+-#define DEF_JMP(i,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
++#define DEF_JMP(i,a) static void OpcodeCall Opcode##i (__CONTEXT) \
+ { __THIS__.PC = KI_READWORD(__THISP_ a(__THISP)); }
+ #if BUILD_HUC6280 || BUILD_M65C02
+ #define DEF_JMPBUG(i,a) DEF_JMP(i,a)
+ #else
+-#define DEF_JMPBUG(i,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
++#define DEF_JMPBUG(i,a) static void OpcodeCall Opcode##i (__CONTEXT) \
+ { __THIS__.PC = KI_READWORDBUG(__THISP_ a(__THISP)); }
+ #endif
+ DEF_JMP(4C,KA_IMM16)	/* 4C - JMP - Immediate */
+@@ -653,8 +653,8 @@
+ }
+ 
+ /* --- LDA --- */
+-#define DEF_LDA(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
+-{ __THIS__.A = KM_LD(__THISP_ K_READ##p##(__THISP_ a(__THISP))); }
++#define DEF_LDA(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
++{ __THIS__.A = KM_LD(__THISP_ K_READ##p (__THISP_ a(__THISP))); }
+ DEF_LDA(A1,NP,KA_INDX)	/* A1 - LDA - (Indirect,X) */
+ DEF_LDA(A5,ZP,KA_ZP)	/* A5 - LDA - Zero Page */
+ DEF_LDA(A9,NP,KA_IMM)	/* A9 - LDA - Immediate */
+@@ -668,8 +668,8 @@
+ #endif
+ 
+ /* --- LDX ---  */
+-#define DEF_LDX(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
+-{ __THIS__.X = KM_LD(__THISP_ K_READ##p##(__THISP_ a(__THISP))); }
++#define DEF_LDX(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
++{ __THIS__.X = KM_LD(__THISP_ K_READ##p (__THISP_ a(__THISP))); }
+ DEF_LDX(A2,NP,KA_IMM)	/* A2 - LDX - Immediate */
+ DEF_LDX(A6,ZP,KA_ZP)	/* A6 - LDX - Zero Page */
+ DEF_LDX(AE,NP,KA_ABS)	/* AE - LDX - Absolute */
+@@ -677,8 +677,8 @@
+ DEF_LDX(BE,NP,KA_ABSY_)	/* BE - LDX - Absolute,Y */
+ 
+ /* --- LDY ---  */
+-#define DEF_LDY(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
+-{ __THIS__.Y = KM_LD(__THISP_ K_READ##p##(__THISP_ a(__THISP))); }
++#define DEF_LDY(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
++{ __THIS__.Y = KM_LD(__THISP_ K_READ##p (__THISP_ a(__THISP))); }
+ DEF_LDY(A0,NP,KA_IMM)	/* A0 - LDY - Immediate */
+ DEF_LDY(A4,ZP,KA_ZP)	/* A4 - LDY - Zero Page */
+ DEF_LDY(AC,NP,KA_ABS)	/* AC - LDY - Absolute */
+@@ -686,10 +686,10 @@
+ DEF_LDY(BC,NP,KA_ABSX_)	/* BC - LDY - Absolute,X */
+ 
+ /* --- LSR ---  */
+-#define DEF_LSR(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
++#define DEF_LSR(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
+ { \
+ 	Uword adr = a(__THISP); \
+-	K_WRITE##p##(__THISP_ adr, KM_LSR(__THISP_ K_READ##p##(__THISP_ adr))); \
++	K_WRITE##p (__THISP_ adr, KM_LSR(__THISP_ K_READ##p (__THISP_ adr))); \
+ }
+ DEF_LSR(46,ZP,KA_ZP)	/* 46 - LSR - Zero Page */
+ DEF_LSR(4E,NP,KA_ABS)	/* 4E - LSR - Absolute */
+@@ -705,17 +705,17 @@
+ 
+ /* --- ORA ---  */
+ #if BUILD_HUC6280
+-#define DEF_ORA(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
+-{ KM_ORA(__THISP_ K_READ##p##(__THISP_ a(__THISP))); } \
+-static void OpcodeCall T_Opco##i##(__CONTEXT) \
++#define DEF_ORA(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
++{ KM_ORA(__THISP_ K_READ##p (__THISP_ a(__THISP))); } \
++static void OpcodeCall T_Opco##i (__CONTEXT) \
+ { \
+ 	Uword saveA = KMI_PRET(__THISP); \
+-	KM_ORA(__THISP_ K_READ##p##(__THISP_ a(__THISP))); \
++	KM_ORA(__THISP_ K_READ##p (__THISP_ a(__THISP))); \
+ 	KMI_POSTT(__THISP_ saveA); \
+ }
+ #else
+-#define DEF_ORA(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
+-{ KM_ORA(__THISP_ K_READ##p##(__THISP_ a(__THISP))); }
++#define DEF_ORA(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
++{ KM_ORA(__THISP_ K_READ##p (__THISP_ a(__THISP))); }
+ #endif
+ DEF_ORA(01,NP,KA_INDX)	/* 01 - ORA - (Indirect,X) */
+ DEF_ORA(05,ZP,KA_ZP)	/* 05 - ORA - Zero Page */
+@@ -751,7 +751,7 @@
+ 
+ #if BUILD_HUC6280
+ /* --- RMBi --- */
+-#define DEF_RMB(i,y) static void OpcodeCall Opcode##i##(__CONTEXT) \
++#define DEF_RMB(i,y) static void OpcodeCall Opcode##i (__CONTEXT) \
+ { \
+ 	Uword adr = KA_ZP(__THISP); \
+ 	K_WRITEZP(__THISP_ adr, (Uword)(K_READZP(__THISP_ adr) & (~(1 << y)))); \
+@@ -765,7 +765,7 @@
+ DEF_RMB(67,6)	/* 67 - RMB6 */
+ DEF_RMB(77,7)	/* 77 - RMB7 */
+ /* --- SMBi --- */
+-#define DEF_SMB(i,y) static void OpcodeCall Opcode##i##(__CONTEXT) \
++#define DEF_SMB(i,y) static void OpcodeCall Opcode##i (__CONTEXT) \
+ { \
+ 	Uword adr = KA_ZP(__THISP); \
+ 	K_WRITEZP(__THISP_ adr, (Uword)(K_READZP(__THISP_ adr) | (1 << y))); \
+@@ -781,10 +781,10 @@
+ #endif
+ 
+ /* --- ROL ---  */
+-#define DEF_ROL(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
++#define DEF_ROL(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
+ { \
+ 	Uword adr = a(__THISP); \
+-	K_WRITE##p##(__THISP_ adr, KM_ROL(__THISP_ K_READ##p##(__THISP_ adr))); \
++	K_WRITE##p (__THISP_ adr, KM_ROL(__THISP_ K_READ##p (__THISP_ adr))); \
+ }
+ DEF_ROL(26,ZP,KA_ZP)	/* 26 - ROL - Zero Page */
+ DEF_ROL(2E,NP,KA_ABS)	/* 2E - ROL - Absolute */
+@@ -794,10 +794,10 @@
+ { __THIS__.A = KM_ROL(__THISP_ __THIS__.A); }
+ 
+ /* --- ROR ---  */
+-#define DEF_ROR(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
++#define DEF_ROR(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
+ { \
+ 	Uword adr = a(__THISP); \
+-	K_WRITE##p##(__THISP_ adr, KM_ROR(__THISP_ K_READ##p##(__THISP_ adr))); \
++	K_WRITE##p (__THISP_ adr, KM_ROR(__THISP_ K_READ##p (__THISP_ adr))); \
+ }
+ DEF_ROR(66,ZP,KA_ZP)	/* 66 - ROR - Zero Page */
+ DEF_ROR(6E,NP,KA_ABS)	/* 6E - ROR - Absolute */
+@@ -841,10 +841,10 @@
+ #endif
+ 
+ /* --- SBC ---  */
+-#define DEF_SBC(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
+-{ KMI_SBC(__THISP_ K_READ##p##(__THISP_ a(__THISP))); } \
+-static void OpcodeCall D_Opco##i##(__CONTEXT) \
+-{ KMI_SBC_D(__THISP_ K_READ##p##(__THISP_ a(__THISP))); }
++#define DEF_SBC(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
++{ KMI_SBC(__THISP_ K_READ##p (__THISP_ a(__THISP))); } \
++static void OpcodeCall D_Opco##i (__CONTEXT) \
++{ KMI_SBC_D(__THISP_ K_READ##p (__THISP_ a(__THISP))); }
+ DEF_SBC(E1,NP,KA_INDX)	/* E1 - SBC - (Indirect,X) */
+ DEF_SBC(E5,ZP,KA_ZP)	/* E5 - SBC - Zero Page */
+ DEF_SBC(E9,NP,KA_IMM)	/* E9 - SBC - Immediate */
+@@ -883,8 +883,8 @@
+ #endif
+ 
+ /* --- STA --- */
+-#define DEF_STA(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
+-{ K_WRITE##p##(__THISP_ a(__THISP), __THIS__.A); }
++#define DEF_STA(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
++{ K_WRITE##p (__THISP_ a(__THISP), __THIS__.A); }
+ DEF_STA(81,NP,KA_INDX)	/* 81 - STA - (Indirect,X) */
+ DEF_STA(85,ZP,KA_ZP)	/* 85 - STA - Zero Page */
+ DEF_STA(8D,NP,KA_ABS)	/* 8D - STA - Absolute */
+@@ -897,23 +897,23 @@
+ #endif
+ 
+ /* --- STX ---  */
+-#define DEF_STX(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
+-{ K_WRITE##p##(__THISP_ a(__THISP), __THIS__.X); }
++#define DEF_STX(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
++{ K_WRITE##p (__THISP_ a(__THISP), __THIS__.X); }
+ DEF_STX(86,ZP,KA_ZP)	/* 86 - STX - Zero Page */
+ DEF_STX(8E,NP,KA_ABS)	/* 8E - STX - Absolute */
+ DEF_STX(96,ZP,KA_ZPY)	/* 96 - STX - Zero Page,Y */
+ 
+ /* --- STY ---  */
+-#define DEF_STY(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
+-{ K_WRITE##p##(__THISP_ a(__THISP), __THIS__.Y); }
++#define DEF_STY(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
++{ K_WRITE##p (__THISP_ a(__THISP), __THIS__.Y); }
+ DEF_STY(84,ZP,KA_ZP)	/* 84 - STY - Zero Page */
+ DEF_STY(8C,NP,KA_ABS)	/* 8C - STY - Absolute */
+ DEF_STY(94,ZP,KA_ZPX)	/* 94 - STY - Zero Page,X */
+ 
+ #if BUILD_HUC6280 || BUILD_M65C02
+ /* --- STZ ---  */
+-#define DEF_STZ(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
+-{ K_WRITE##p##(__THISP_ a(__THISP), 0); }
++#define DEF_STZ(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
++{ K_WRITE##p (__THISP_ a(__THISP), 0); }
+ DEF_STZ(64,ZP,KA_ZP)	/* 64 - STZ - Zero Page */
+ DEF_STZ(9C,NP,KA_ABS)	/* 9C - STZ - Absolute */
+ DEF_STZ(74,ZP,KA_ZPX)	/* 74 - STZ - Zero Page,X */
+@@ -931,18 +931,18 @@
+ 
+ #if BUILD_HUC6280 || BUILD_M65C02
+ /* --- TRB --- */
+-#define DEF_TRB(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
++#define DEF_TRB(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
+ { \
+ 	Uword adr = a(__THISP); \
+-	K_WRITE##p##(__THISP_ adr, KM_TRB(__THISP_ K_READ##p##(__THISP_ adr))); \
++	K_WRITE##p (__THISP_ adr, KM_TRB(__THISP_ K_READ##p (__THISP_ adr))); \
+ }
+ DEF_TRB(14,ZP,KA_ZP)	/* 14 - TRB - Zero Page */
+ DEF_TRB(1C,NP,KA_ABS)	/* 1C - TRB - Absolute */
+ /* --- TSB --- */
+-#define DEF_TSB(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
++#define DEF_TSB(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
+ { \
+ 	Uword adr = a(__THISP); \
+-	K_WRITE##p##(__THISP_ adr, KM_TSB(__THISP_ K_READ##p##(__THISP_ adr))); \
++	K_WRITE##p (__THISP_ adr, KM_TSB(__THISP_ K_READ##p (__THISP_ adr))); \
+ }
+ DEF_TSB(04,ZP,KA_ZP)	/* 04 - TSB - Zero Page */
+ DEF_TSB(0C,NP,KA_ABS)	/* 0C - TSB - Absolute */
+@@ -950,10 +950,10 @@
+ 
+ #if BUILD_HUC6280
+ /* --- TST --- */
+-#define DEF_TST(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
++#define DEF_TST(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
+ { \
+ 	Uword imm = K_READ(__THISP_ KA_IMM(__THISP)); \
+-	KM_TST(__THISP_ imm, K_READ##p##(__THISP_ a(__THISP))); \
++	KM_TST(__THISP_ imm, K_READ##p (__THISP_ a(__THISP))); \
+ }
+ DEF_TST(83,ZP,KA_ZP)	/* 83 - TST - Zero Page */
+ DEF_TST(93,NP,KA_ABS)	/* 93 - TST - Absolute */
+diff -ur xmms-nsf-0.0.3/src/nes/km6502/km6502ot.h xmms-nsf-0.0.3-gentoo/src/nes/km6502/km6502ot.h
+--- xmms-nsf-0.0.3/src/nes/km6502/km6502ot.h	2001-01-07 17:18:05.000000000 +1300
++++ xmms-nsf-0.0.3-gentoo/src/nes/km6502/km6502ot.h	2003-10-12 20:09:41.000000000 +1300
+@@ -1,35 +1,35 @@
+ #define OPxx(i)
+ #define OP__(i) \
+-	case 0x##i##: \
+-		Opcode##i##(__THISP); \
++	case 0x##i : \
++		Opcode##i (__THISP); \
+ 		break;
+ #define OP_d(i) \
+-	case 0x##i##: \
++	case 0x##i : \
+ 		if (__THIS__.P & D_FLAG) \
+-			D_Opco##i##(__THISP); \
++			D_Opco##i (__THISP); \
+ 		else \
+-			Opcode##i##(__THISP); \
++			Opcode##i (__THISP); \
+ 		break;
+ #if BUILD_HUC6280
+ #define OPtd(i) \
+-	case 0x##i##: \
++	case 0x##i : \
+ 		if (__THIS__.P & T_FLAG) \
+ 			if (__THIS__.P & D_FLAG) \
+-				TD_Opc##i##(__THISP); \
++				TD_Opc##i (__THISP); \
+ 			else \
+-				T_Opco##i##(__THISP); \
++				T_Opco##i (__THISP); \
+ 		else \
+ 			if (__THIS__.P & D_FLAG) \
+-				D_Opco##i##(__THISP); \
++				D_Opco##i (__THISP); \
+ 			else \
+-				Opcode##i##(__THISP); \
++				Opcode##i (__THISP); \
+ 		break;
+ #define OPt_(i) \
+-	case 0x##i##: \
++	case 0x##i : \
+ 		if (__THIS__.P & T_FLAG) \
+-			T_Opco##i##(__THISP); \
++			T_Opco##i (__THISP); \
+ 		else \
+-			Opcode##i##(__THISP); \
++			Opcode##i (__THISP); \
+ 		break;
+ #else
+ #define OPtd OP_d
+
+--- xmms-nsf-0.0.3/src/xmms/nsf.c.orig	2006-06-11 01:07:15.000000000 -0400
++++ xmms-nsf-0.0.3/src/xmms/nsf.c	2006-06-11 01:00:28.000000000 -0400
+@@ -462,7 +462,7 @@
+ 				}
+ 				if (bytes > 0){
+ 					//read 1024byte = 512 sample * 2byte
+-					c = NESAudioRender(data, bytes/2);
++					c = NESAudioRender((Int16*)data, bytes/2);
+ 					if (c < 512)
+ 						count = 0;
+ 					else
+@@ -529,7 +529,7 @@
+ 	count = ftell(nsf_file->file);
+ 	fseek(nsf_file->file, 0, SEEK_SET);
+ 	
+-	(void*)buffer = g_malloc0(count);
++	buffer = (void*)g_malloc0(count);
+ 	for(i=0;i<count;i++){
+ 		*(buffer+i) = fgetc(nsf_file->file);
+ 	}
diff --git a/media-plugins/xmms-nsf/xmms-nsf-0.0.3-r2.ebuild b/media-plugins/xmms-nsf/xmms-nsf-0.0.3-r2.ebuild
new file mode 100644
index 000000000000..155827f0767b
--- /dev/null
+++ b/media-plugins/xmms-nsf/xmms-nsf-0.0.3-r2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-nsf/xmms-nsf-0.0.3-r2.ebuild,v 1.1 2006/06/12 00:40:38 metalgod Exp $
+
+inherit eutils gnuconfig autotools libtool
+
+IUSE=""
+
+DESCRIPTION="An xmms input-plugin for NSF-files (the nintendo 8-bit soundfiles) that uses source from NEZamp."
+HOMEPAGE="http://www.xmms.org/"
+SRC_URI="http://optronic.sourceforge.net/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+#-sparc: 0.0.3: Plays, but not completely... misses notes
+KEYWORDS="~x86 -sparc ~amd64 -ppc"
+
+DEPEND="media-sound/xmms
+	=x11-libs/gtk+-1.2*"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-about.patch
+	epatch ${FILESDIR}/${P}-PIC.patch
+	epatch ${FILESDIR}/${P}-compilefixes.patch
+
+	gnuconfig_update
+
+	export WANT_AUTOMAKE=1.4
+	eautomake
+	elibtoolize
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+	dodoc AUTHORS ChangeLog NEWS README
+}