amd64 fix wrt to bug #153094

Package-Manager: portage-2.1.2_rc1-r4

7 files changed, 162 insertions, 14 deletions

diff --git a/media-sound/gmorgan/ChangeLog b/media-sound/gmorgan/ChangeLog
index d98e2ad6733a..93d26d58baef 100644
--- a/media-sound/gmorgan/ChangeLog
+++ b/media-sound/gmorgan/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/gmorgan
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gmorgan/ChangeLog,v 1.14 2005/11/07 10:47:00 flameeyes Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gmorgan/ChangeLog,v 1.15 2006/11/07 17:29:41 aballier Exp $
+
+  07 Nov 2006; Alexis Ballier <aballier@gentoo.org>
+  +files/gmorgan-amd64.patch, gmorgan-0.23.ebuild:
+  amd64 fix wrt to bug #153094
 
   07 Nov 2005; Diego Pettenò <flameeyes@gentoo.org> gmorgan-0.16.ebuild,
   gmorgan-0.22-r1.ebuild:
diff --git a/media-sound/gmorgan/Manifest b/media-sound/gmorgan/Manifest
index ae0445bb940d..a4ae248b9e1a 100644
--- a/media-sound/gmorgan/Manifest
+++ b/media-sound/gmorgan/Manifest
@@ -1,18 +1,46 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 0bdaf2cfc686c6167fd0873d8cb5a26b ChangeLog 1991
-MD5 62394940168b5d609833cdbc5a89d3cd files/digest-gmorgan-0.16 64
-MD5 19dd8c42204a066ea57a537453d294be files/digest-gmorgan-0.22-r1 64
-MD5 1228b302acf942da77c35e02c1a4c170 files/digest-gmorgan-0.23 64
+AUX gmorgan-amd64.patch 2767 RMD160 3fa0db6ef20d06ec59e757bbfa7beccbe7a5f208 SHA1 608bb5b2bf791fc39234d9f2523c0c0ff70bd821 SHA256 07355b2ca25bae3a15b3286e7d6b05fe049a600800b2a290f29d4549a095f4f5
+MD5 b8c5bc54a83d0142b39d1e27a7ee6aaa files/gmorgan-amd64.patch 2767
+RMD160 3fa0db6ef20d06ec59e757bbfa7beccbe7a5f208 files/gmorgan-amd64.patch 2767
+SHA256 07355b2ca25bae3a15b3286e7d6b05fe049a600800b2a290f29d4549a095f4f5 files/gmorgan-amd64.patch 2767
+DIST gmorgan-0.16.tar.gz 486822 RMD160 20ef1357f00b0a8d55bebbec162da87f8723755f SHA1 ebe8bc5fe661fc4319126cb6b7dc3324d80b387c SHA256 7aa519df76b3b4a961caf8a82c8049c55379f30ebabd61f47721fa1f5de1869d
+DIST gmorgan-0.22.tar.gz 899547 RMD160 b23249922881462b5ba55ae483d6db504f64e600 SHA1 ac58f821c1771c295e03c04887936abc124472ec SHA256 c5cd1d198b0ba70668dd55563174d11e9d6ecf137b50ad9f10d0e916d2b0f474
+DIST gmorgan-0.23.tar.gz 893951 RMD160 6d958d18ef0b6c21a7b1f0911271cf63ed85e3c5 SHA1 8d53518cb7d9b6828e3c036cf7b604e145c19813 SHA256 ef46c3203db88ade2451f3ee34762783b75727030b55b3fd08e509ac8041fcc9
+EBUILD gmorgan-0.16.ebuild 617 RMD160 d17e9feeec03614f134485f3c79ad4b91c8fd32c SHA1 a08a29497099b7cec8ec31e118914ef2179e0612 SHA256 8b6d00b43930ee604b4d9a0f20026e91e95ff07eb708f5cf3458857f7b8ca143
 MD5 9f9c7e33e88dfa646f1dc907afbee901 gmorgan-0.16.ebuild 617
+RMD160 d17e9feeec03614f134485f3c79ad4b91c8fd32c gmorgan-0.16.ebuild 617
+SHA256 8b6d00b43930ee604b4d9a0f20026e91e95ff07eb708f5cf3458857f7b8ca143 gmorgan-0.16.ebuild 617
+EBUILD gmorgan-0.22-r1.ebuild 861 RMD160 f87ea598d4fcc065e86f32cbe5af7a11dea047f2 SHA1 79de5777733ce349073d2b08be48b140f44e60f5 SHA256 c71ac84b87589020fe3a3533fc1bfeb762264e9aac5cef7676d82a89addbaf35
 MD5 7c6c082c2f00e5b80d2fa2591b9fc6cb gmorgan-0.22-r1.ebuild 861
-MD5 6354f8e7b9bdc8d0cea81e4fae2c87c2 gmorgan-0.23.ebuild 859
+RMD160 f87ea598d4fcc065e86f32cbe5af7a11dea047f2 gmorgan-0.22-r1.ebuild 861
+SHA256 c71ac84b87589020fe3a3533fc1bfeb762264e9aac5cef7676d82a89addbaf35 gmorgan-0.22-r1.ebuild 861
+EBUILD gmorgan-0.23.ebuild 986 RMD160 1dcb7c4d38fac88c2b895e1fe28fe3baa3a29a9c SHA1 ee477decce552e546dbf88870303ef39b83e84ca SHA256 456b2414113244ce34d9721b90805712ee88c085556de44eb4aebe73f13ffe73
+MD5 bd699554d1a53b9ca137a39f64b14431 gmorgan-0.23.ebuild 986
+RMD160 1dcb7c4d38fac88c2b895e1fe28fe3baa3a29a9c gmorgan-0.23.ebuild 986
+SHA256 456b2414113244ce34d9721b90805712ee88c085556de44eb4aebe73f13ffe73 gmorgan-0.23.ebuild 986
+MISC ChangeLog 2125 RMD160 ad2bd3fa77eb395c4e90de9a4cb6c241ab0c2129 SHA1 1d0395603fa2ceab71f2116a8e1733c883995e08 SHA256 a29f7c1367b3c27c1805835dbc0b74da571794e14ba8ada2ef537a183dd2597e
+MD5 bcb36ed85914d928d91c72a0615bcb83 ChangeLog 2125
+RMD160 ad2bd3fa77eb395c4e90de9a4cb6c241ab0c2129 ChangeLog 2125
+SHA256 a29f7c1367b3c27c1805835dbc0b74da571794e14ba8ada2ef537a183dd2597e ChangeLog 2125
+MISC metadata.xml 219 RMD160 1311be2ec3797b97e67acd02afa5083523d06721 SHA1 8d1e8571dd1d104255107dd46473ddc08e0de932 SHA256 5cceaad9e92392f27e672ac3a4c7127bf5b8f60a737788cd6d4856568e2f795c
 MD5 4e5a50f7aee667b932576ab7fdcfc85f metadata.xml 219
+RMD160 1311be2ec3797b97e67acd02afa5083523d06721 metadata.xml 219
+SHA256 5cceaad9e92392f27e672ac3a4c7127bf5b8f60a737788cd6d4856568e2f795c metadata.xml 219
+MD5 76c0c37d8c62944bb44ebda6bb8b7054 files/digest-gmorgan-0.16 238
+RMD160 f82a7ac96f6c49a0199f4ab666b38ba741c8c76a files/digest-gmorgan-0.16 238
+SHA256 37400a0e38e2a820ab144ebe3aaa2cf4187d1089d3f5ba06156a391e59a1e640 files/digest-gmorgan-0.16 238
+MD5 342223a56a4f52287e54eaab6a795367 files/digest-gmorgan-0.22-r1 238
+RMD160 66f8ebb5645d3bb2dfc931b0bc7e2487da8438d4 files/digest-gmorgan-0.22-r1 238
+SHA256 5c1f3576cee4c08f0adb99a7cc7927e6e8c154abe5763e5ff8603783133af6fe files/digest-gmorgan-0.22-r1 238
+MD5 69f8fea1d4dbc019b6340a994be6f790 files/digest-gmorgan-0.23 238
+RMD160 295974e0d858fa449aae6b37355ed7ba368ccf6b files/digest-gmorgan-0.23 238
+SHA256 10b26c575faa21c9be5426ce15b16bac42bd7224fd07e374b99c47d662d4c54d files/digest-gmorgan-0.23 238
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFDbzC6j5H05b2HAEkRAu2pAJ9Sv/BMCnbqz48Ekj6PIYAk/lh1bACdFifn
-7X8pIjCbsaRNrOA3g5h3SOk=
-=CKkZ
+iD8DBQFFUMJVvFcC4BYPU0oRAtiXAJ9L+S7NUGERUU8DottVnDSi7chnrwCgk6J+
+oe9fpeCruYfUpO50fNq19dA=
+=5I6z
 -----END PGP SIGNATURE-----
diff --git a/media-sound/gmorgan/files/digest-gmorgan-0.16 b/media-sound/gmorgan/files/digest-gmorgan-0.16
index 38183b326772..93ce57adf461 100644
--- a/media-sound/gmorgan/files/digest-gmorgan-0.16
+++ b/media-sound/gmorgan/files/digest-gmorgan-0.16
@@ -1 +1,3 @@
 MD5 7a2a05e7951052f82bbc3c15de3bb29b gmorgan-0.16.tar.gz 486822
+RMD160 20ef1357f00b0a8d55bebbec162da87f8723755f gmorgan-0.16.tar.gz 486822
+SHA256 7aa519df76b3b4a961caf8a82c8049c55379f30ebabd61f47721fa1f5de1869d gmorgan-0.16.tar.gz 486822
diff --git a/media-sound/gmorgan/files/digest-gmorgan-0.22-r1 b/media-sound/gmorgan/files/digest-gmorgan-0.22-r1
index 44238fd3f401..dc64c7615d50 100644
--- a/media-sound/gmorgan/files/digest-gmorgan-0.22-r1
+++ b/media-sound/gmorgan/files/digest-gmorgan-0.22-r1
@@ -1 +1,3 @@
 MD5 c1a124753522991252631a3f7c15486c gmorgan-0.22.tar.gz 899547
+RMD160 b23249922881462b5ba55ae483d6db504f64e600 gmorgan-0.22.tar.gz 899547
+SHA256 c5cd1d198b0ba70668dd55563174d11e9d6ecf137b50ad9f10d0e916d2b0f474 gmorgan-0.22.tar.gz 899547
diff --git a/media-sound/gmorgan/files/digest-gmorgan-0.23 b/media-sound/gmorgan/files/digest-gmorgan-0.23
index c459012acd67..42578488d1c1 100644
--- a/media-sound/gmorgan/files/digest-gmorgan-0.23
+++ b/media-sound/gmorgan/files/digest-gmorgan-0.23
@@ -1 +1,3 @@
 MD5 a779baeb4916945496b72c6530d81245 gmorgan-0.23.tar.gz 893951
+RMD160 6d958d18ef0b6c21a7b1f0911271cf63ed85e3c5 gmorgan-0.23.tar.gz 893951
+SHA256 ef46c3203db88ade2451f3ee34762783b75727030b55b3fd08e509ac8041fcc9 gmorgan-0.23.tar.gz 893951
diff --git a/media-sound/gmorgan/files/gmorgan-amd64.patch b/media-sound/gmorgan/files/gmorgan-amd64.patch
new file mode 100644
index 000000000000..86b80e836c6f
--- /dev/null
+++ b/media-sound/gmorgan/files/gmorgan-amd64.patch
@@ -0,0 +1,102 @@
+--- gmorgan-0.23/src/GMORGAN.cxx.old	2006-11-07 14:01:15.000000000 +0100
++++ gmorgan-0.23/src/GMORGAN.cxx	2006-11-07 18:14:56.000000000 +0100
+@@ -29997,7 +29997,7 @@
+ }
+ 
+ inline void GMORGAN::a_ver_i(Fl_Slider* o, void*) {
+-  int kd = (int) o->user_data();
++  long kd = (long) o->user_data();
+ int kv = (int) o->value();
+ veloplus[kd] = kv;
+ }
+@@ -30540,7 +30540,7 @@
+ }
+ 
+ inline void GMORGAN::song_call_i(Fl_Input* o, void*) {
+-  int kd = (int) o->user_data();
++  long kd = (long) o->user_data();
+ 
+ if (kd <= 128) strcpy(S[kd].ch1,(char *) o->value());
+ if ((kd > 128) && (kd <=256)) strcpy(S[kd-128].ch2,(char *) o->value());
+@@ -30555,7 +30555,7 @@
+ }
+ 
+ inline void GMORGAN::song_call1_i(Fl_Value_Input* o, void*) {
+-  int kd = (int) o->user_data();
++  long kd = (long) o->user_data();
+ if ((kd > 896) && (kd <=1024)) S[kd-896].times = (int) o->value();
+ if ((kd > 1024) && (kd <=1152)) S[kd-1024].pattern = (int) o->value();
+ if ((kd > 1792) && (kd <=1920)) S[kd-1792].atimes = (int) o->value();
+@@ -30567,7 +30567,7 @@
+ 
+ inline void GMORGAN::song_call2_i(Fl_Button* o, void*) {
+   int i;
+-int kd = (int) o->user_data();
++long kd = (long) o->user_data();
+ if ((kd > 256) && (kd <=384))
+ {
+  for(i=1; i<=128; i++)
+@@ -30868,7 +30868,7 @@
+ inline void GMORGAN::dr_call1_i(Fl_Value_Input* o, void*) {
+   int i,j;
+ 
+-int kd = (int) o->user_data();
++long kd = (long) o->user_data();
+ int kv = (int) o->value();
+ i = kd / 130;
+ j = kd % 130;
+@@ -30881,7 +30881,7 @@
+ 
+ inline void GMORGAN::dr_call2_i(Fl_Output* o, void*) {
+   lastcasdr = sde + 10000;
+-int kd = (int) o->user_data();
++long kd = (long) o->user_data();
+ if (kd != lastcasdr) cambiacasdr = 1;
+ o->cursor_color(FL_WHITE);
+ o->color(FL_WHITE);
+@@ -31873,7 +31873,7 @@
+ inline void GMORGAN::ctrl_call1_i(Fl_Value_Input* o, void*) {
+   int i,j;
+ 
+-int kd = (int) o->user_data();
++long kd = (long) o->user_data();
+ int kv = (int) o->value();
+ i = kd / 130;
+ j = kd % 130;
+@@ -31886,7 +31886,7 @@
+ 
+ inline void GMORGAN::ctrl_call2_i(Fl_Output* o, void*) {
+   lastcascr = sdec + 10000;
+-int kd = (int) o->user_data();
++long kd = (long) o->user_data();
+ if (kd != lastcascr) cambiacascr=1;
+ sdec = kd-10000;
+ o->color(FL_WHITE);
+@@ -32956,11 +32956,11 @@
+ 
+ void GMORGAN::PonColores(int usdata) {
+   int i;
+-int ladata;
++long ladata;
+ for(i=0; i<61; i++)
+ 
+ {
+-ladata = (int) Scroll1->child(i)->user_data();
++ladata = (long) Scroll1->child(i)->user_data();
+ if ( ladata == usdata) 
+ {
+ Scroll1->child(i)->color(59);
+@@ -32972,11 +32972,11 @@
+ 
+ void GMORGAN::PonColores2(int usdata) {
+   int i;
+-int ladata;
++long ladata;
+ for(i=0; i<32; i++)
+ 
+ {
+-ladata = (int) CScroll1->child(i)->user_data();
++ladata = (long) CScroll1->child(i)->user_data();
+ if ( ladata == usdata) 
+ {
+ CScroll1->child(i)->color(59);
diff --git a/media-sound/gmorgan/gmorgan-0.23.ebuild b/media-sound/gmorgan/gmorgan-0.23.ebuild
index 5d1bc0810dc2..f4c0cd32286f 100644
--- a/media-sound/gmorgan/gmorgan-0.23.ebuild
+++ b/media-sound/gmorgan/gmorgan-0.23.ebuild
@@ -1,6 +1,11 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gmorgan/gmorgan-0.23.ebuild,v 1.4 2004/12/19 05:42:47 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gmorgan/gmorgan-0.23.ebuild,v 1.5 2006/11/07 17:29:41 aballier Exp $
+
+WANT_AUTOMAKE=1.9
+WANT_AUTOCONF=2.5
+
+inherit eutils autotools
 
 IUSE="nls"
 
@@ -20,8 +25,11 @@ DEPEND="${RDEPEND}
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}/po
+	cd "${S}/po"
 	sed -i "/mkinstalldirs =/s%.*%mkinstalldirs = ../mkinstalldirs%" Makefile.in.in
+	cd "${S}"
+	epatch "${FILESDIR}/${PN}-amd64.patch"
+	eautoreconf
 }
 
 src_install() {