Version bump wrt #301891 by "hiyuh" and Kim Nilsson.

Package-Manager: portage-2.2.0_alpha1/cvs/Linux x86_64

4 files changed, 102 insertions, 12 deletions

diff --git a/media-sound/milkytracker/ChangeLog b/media-sound/milkytracker/ChangeLog
index 2d12125640de..763018c32dc9 100644
--- a/media-sound/milkytracker/ChangeLog
+++ b/media-sound/milkytracker/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/milkytracker
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/milkytracker/ChangeLog,v 1.4 2010/08/09 07:05:50 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/milkytracker/ChangeLog,v 1.5 2010/10/31 14:41:14 ssuominen Exp $
+
+*milkytracker-0.90.85 (31 Oct 2010)
+
+  31 Oct 2010; Samuli Suominen <ssuominen@gentoo.org>
+  +milkytracker-0.90.85.ebuild, +files/milkytracker-0.90.85-64bit.patch:
+  Version bump wrt #301891 by "hiyuh" and Kim Nilsson.
 
   09 Aug 2010; Christian Faulhammer <fauli@gentoo.org>
   milkytracker-0.90.80.ebuild:
diff --git a/media-sound/milkytracker/Manifest b/media-sound/milkytracker/Manifest
index 7d6ead502017..bda94d81bf0a 100644
--- a/media-sound/milkytracker/Manifest
+++ b/media-sound/milkytracker/Manifest
@@ -1,15 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX milkytracker-0.90.80-external_zlib.patch 5839 RMD160 249b9e2895155469dba231ca63f14711b3d5942b SHA1 4cfed4945cfef762e4ae09546f5e06b020acc934 SHA256 0f32051b8979993180abba01b90f77557810313876b733deeeb152424c9dcb51
+AUX milkytracker-0.90.85-64bit.patch 1414 RMD160 f58d2ddc67f5246fba7a7752a4267113fcfe00de SHA1 c52bc4fbd4e7aec4a2f2a0589a9c8ddcaab3051e SHA256 8995a237ec12bf32b74e7d597b94f813daddedf060a493c870b777ad44475b40
 DIST milkytracker-0.90.80.tar.bz2 1799270 RMD160 cb535a50c29b8d722617007054921065e71c1615 SHA1 e6adedee56a6a1bf096b5311c319954ea54977dc SHA256 7cd804abead650c86d00014ccc086fa3d67a4c9c2c34cec3d4f26bbaac41a078
+DIST milkytracker-0.90.85.tar.bz2 2509060 RMD160 a7aa31c367a01fdcc2c5877243e6cb2e571f6908 SHA1 9b58a01e5da9b484308cc2acd2e55b1d8a5949f1 SHA256 59a0d294d63752be74b157e07b0c70252c9198c312d9b1ad0ca460129fe5bd80
 EBUILD milkytracker-0.90.80.ebuild 1135 RMD160 554e5ecf7824ac4e16e8a3fa9e2dbfe8ebf6505c SHA1 d6237dcd8d77c41d52ef8b7945a197247e33f053 SHA256 e706f56303a22f04e6c53e5b1e98b20961120f4294ace5e702912ac358a2f934
-MISC ChangeLog 855 RMD160 9391c859ed4da158b7ec95bb03cc868e51b50a29 SHA1 1e5c32d2982d4bf0200a77a65db015eaa3c412e5 SHA256 acf975ef059ea9192418084bcf4a45de641f496d9ee55fa9ce9fe5d8c9591cb3
+EBUILD milkytracker-0.90.85.ebuild 1135 RMD160 2f0fb41d699d8f555e4f9e9fb2f8414b29dca842 SHA1 8e0a8274a91827157ecc95dcfc4ff1636fd09753 SHA256 568a2f63b63a3e2dbd1eed2945081f3386fe64d2e76e3c3f52876120d8dbadcd
+MISC ChangeLog 1079 RMD160 8da798dbb6b9e36d8c4b5a60eac509d4420689a8 SHA1 799daf853bc535655c22e4ab4afc4050e6da1af8 SHA256 774bc76d8847017678c351286aed9abb695f745b0ff9ce75d17184bc24e2be50
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iEYEARECAAYFAkxfqYUACgkQNQqtfCuFneMJ3ACfVuv9Y5bykuoU4LVLwyIJ20XF
-bQYAnRBytK/xt2MZUQ81ICJzyRELM5h2
-=q3/A
------END PGP SIGNATURE-----
diff --git a/media-sound/milkytracker/files/milkytracker-0.90.85-64bit.patch b/media-sound/milkytracker/files/milkytracker-0.90.85-64bit.patch
new file mode 100644
index 000000000000..971d9a8efbaf
--- /dev/null
+++ b/media-sound/milkytracker/files/milkytracker-0.90.85-64bit.patch
@@ -0,0 +1,46 @@
+http://bugs.gentoo.org/301891
+
+--- src/tracker/sdl/SDL_Main.cpp
++++ src/tracker/sdl/SDL_Main.cpp
+@@ -751,8 +751,8 @@
+ 		case SDLUserEventLMouseRepeat:
+ 		{
+ 			PPPoint p;
+-			p.x = (pp_int32)event.data1;
+-			p.y = (pp_int32)event.data2;
++			p.x = reinterpret_cast<intptr_t> (event.data1);
++			p.y = reinterpret_cast<intptr_t> (event.data2);
+ 			PPEvent myEvent(eLMouseRepeat, &p, sizeof(PPPoint));		
+ 			RaiseEventSerialized(&myEvent);
+ 			break;
+@@ -761,8 +761,8 @@
+ 		case SDLUserEventRMouseRepeat:
+ 		{
+ 			PPPoint p;
+-			p.x = (pp_int32)event.data1;
+-			p.y = (pp_int32)event.data2;
++			p.x = reinterpret_cast<intptr_t> (event.data1);
++			p.y = reinterpret_cast<intptr_t> (event.data2);
+ 			PPEvent myEvent(eRMouseRepeat, &p, sizeof(PPPoint));		
+ 			RaiseEventSerialized(&myEvent);
+ 			break;
+@@ -770,8 +770,8 @@
+ 
+ 		case SDLUserEventMidiKeyDown:
+ 		{
+-			pp_int32 note = (pp_int32)event.data1;
+-			pp_int32 volume = (pp_int32)event.data2;
++			pp_int32 note = reinterpret_cast<intptr_t> (event.data1);
++			pp_int32 volume = reinterpret_cast<intptr_t> (event.data2);
+ 			globalMutex->lock();
+ 			myTracker->sendNoteDown(note, volume);
+ 			globalMutex->unlock();
+@@ -780,7 +780,7 @@
+ 
+ 		case SDLUserEventMidiKeyUp:
+ 		{
+-			pp_int32 note = (pp_int32)event.data1;
++			pp_int32 note = reinterpret_cast<intptr_t> (event.data1);
+ 			globalMutex->lock();
+ 			myTracker->sendNoteUp(note);
+ 			globalMutex->unlock();
diff --git a/media-sound/milkytracker/milkytracker-0.90.85.ebuild b/media-sound/milkytracker/milkytracker-0.90.85.ebuild
new file mode 100644
index 000000000000..0bb450457c21
--- /dev/null
+++ b/media-sound/milkytracker/milkytracker-0.90.85.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/milkytracker/milkytracker-0.90.85.ebuild,v 1.1 2010/10/31 14:41:14 ssuominen Exp $
+
+EAPI=2
+inherit autotools eutils
+
+DESCRIPTION="FastTracker 2 inspired music tracker"
+HOMEPAGE="http://www.milkytracker.net/"
+SRC_URI="http://www.milkytracker.net/files/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa jack"
+
+RDEPEND=">=media-libs/libsdl-1.2
+	sys-libs/zlib
+	alsa? ( media-libs/alsa-lib )
+	jack? ( media-sound/jack-audio-connection-kit )"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	sed -i -e '/PKG_CHECK_MODULES([ZZIP]/d' configure.in || die
+	epatch "${FILESDIR}"/${P}-64bit.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-dependency-tracking \
+		$(use_with alsa) \
+		$(use_with jack)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+
+	dodoc AUTHORS docs/readme_unix
+	dohtml docs/{ChangeLog,FAQ,MilkyTracker}.html
+
+	newicon resources/pictures/carton.png ${PN}.png
+	make_desktop_entry ${PN} MilkyTracker ${PN} \
+		"AudioVideo;Audio;Sequencer"
+}