old

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)

5 files changed, 7 insertions, 161 deletions

diff --git a/media-sound/milkytracker/ChangeLog b/media-sound/milkytracker/ChangeLog
index 0c6396d851e6..a178bc6b6ac7 100644
--- a/media-sound/milkytracker/ChangeLog
+++ b/media-sound/milkytracker/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/milkytracker
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/milkytracker/ChangeLog,v 1.8 2014/08/29 13:35:29 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/milkytracker/ChangeLog,v 1.9 2014/08/29 13:40:33 ssuominen Exp $
+
+  29 Aug 2014; Samuli Suominen <ssuominen@gentoo.org>
+  -files/milkytracker-0.90.80-external_zlib.patch,
+  -files/milkytracker-0.90.85-64bit.patch, -milkytracker-0.90.80.ebuild,
+  -milkytracker-0.90.85.ebuild:
+  old
 
 *milkytracker-0.90.86 (29 Aug 2014)
 
diff --git a/media-sound/milkytracker/files/milkytracker-0.90.80-external_zlib.patch b/media-sound/milkytracker/files/milkytracker-0.90.80-external_zlib.patch
deleted file mode 100644
index c370890254c6..000000000000
--- a/media-sound/milkytracker/files/milkytracker-0.90.80-external_zlib.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -ur milkytracker-0.90.80.orig/src/compression/Makefile.am milkytracker-0.90.80/src/compression/Makefile.am
---- milkytracker-0.90.80.orig/src/compression/Makefile.am	2008-01-25 00:44:27.000000000 +0200
-+++ milkytracker-0.90.80/src/compression/Makefile.am	2009-07-22 09:52:08.000000000 +0300
-@@ -1,5 +1,6 @@
-+#zziplib has been customized, so we can't use system copy.
- noinst_LIBRARIES = libcompression.a
--libcompression_a_SOURCES = zlib/generic/adler32.cpp zlib/generic/compress.cpp zlib/generic/deflate.cpp zlib/generic/infback.cpp zlib/generic/inffast.cpp zlib/generic/inflate.cpp zlib/generic/inftrees.cpp zlib/generic/uncompr.cpp zlib/generic/crc32.cpp zlib/generic/trees.cpp zlib/generic/zutil.cpp zziplib/generic/dir.cpp zziplib/generic/err.cpp zziplib/generic/fetch.cpp zziplib/generic/file.cpp zziplib/generic/fseeko.cpp zziplib/generic/info.cpp zziplib/generic/plugin.cpp zziplib/generic/stat.cpp zziplib/generic/zip.cpp zziplib/MyIO.cpp PP20.cpp ZipExtractor.cpp
--noinst_HEADERS = zlib/generic/crc32.h zlib/generic/deflate.h zlib/generic/inffast.h zlib/generic/inffixed.h zlib/generic/inflate.h zlib/generic/inftrees.h zlib/generic/trees.h zlib/generic/zconf.h zlib/generic/zlib.h zlib/generic/zutil.h zziplib/generic/zzip.h zziplib/generic/zzip___debug.h zziplib/generic/zzip___dirent.h zziplib/generic/zzip___fnmatch.h zziplib/generic/zzip___hints.h zziplib/generic/zzip___mmap.h zziplib/generic/zzip__config.h zziplib/generic/zzip__msvc.h zziplib/generic/zzip_autoconf.h zziplib/generic/zzip_conf.h zziplib/generic/zzip_fetch.h zziplib/generic/zzip_file.h zziplib/generic/zzip_format.h zziplib/generic/zzip_fseeko.h zziplib/generic/zzip_info.h zziplib/generic/zzip_lib.h zziplib/generic/zzip_plugin.h zziplib/generic/zzip_stdint.h zziplib/generic/zzip_types.h zziplib/MyIO.h PP20.h ZipExtractor.h
--INCLUDES = -I$(top_srcdir)/src/milkyplay -I$(top_srcdir)/src/ppui -I$(top_srcdir)/src/ppui/osinterface/posix/ -I$(top_srcdir)/src/compression/zziplib -I$(top_srcdir)/src/compression/zziplib/generic -I$(top_srcdir)/src/compression/zlib/generic
-+libcompression_a_SOURCES = zziplib/generic/dir.cpp zziplib/generic/err.cpp zziplib/generic/fetch.cpp zziplib/generic/file.cpp zziplib/generic/fseeko.cpp zziplib/generic/info.cpp zziplib/generic/plugin.cpp zziplib/generic/stat.cpp zziplib/generic/zip.cpp zziplib/MyIO.cpp PP20.cpp ZipExtractor.cpp
-+noinst_HEADERS = zziplib/generic/zzip.h zziplib/generic/zzip___debug.h zziplib/generic/zzip___dirent.h zziplib/generic/zzip___fnmatch.h zziplib/generic/zzip___hints.h zziplib/generic/zzip___mmap.h zziplib/generic/zzip__config.h zziplib/generic/zzip__msvc.h zziplib/generic/zzip_autoconf.h zziplib/generic/zzip_conf.h zziplib/generic/zzip_fetch.h zziplib/generic/zzip_file.h zziplib/generic/zzip_format.h zziplib/generic/zzip_fseeko.h zziplib/generic/zzip_info.h zziplib/generic/zzip_lib.h zziplib/generic/zzip_plugin.h zziplib/generic/zzip_stdint.h zziplib/generic/zzip_types.h zziplib/MyIO.h PP20.h ZipExtractor.h
-+INCLUDES = -I$(top_srcdir)/src/milkyplay -I$(top_srcdir)/src/ppui -I$(top_srcdir)/src/ppui/osinterface/posix/ -I$(top_srcdir)/src/compression/zziplib -I$(top_srcdir)/src/compression/zziplib/generic
- #INCLUDES = -I../ppui -I../ppui/osinterface -I../ppui/osinterface/posix
-diff -ur milkytracker-0.90.80.orig/src/tracker/Makefile.am milkytracker-0.90.80/src/tracker/Makefile.am
---- milkytracker-0.90.80.orig/src/tracker/Makefile.am	2008-04-13 01:45:11.000000000 +0300
-+++ milkytracker-0.90.80/src/tracker/Makefile.am	2009-07-22 09:19:24.000000000 +0300
-@@ -7,5 +7,5 @@
- 	-I$(top_srcdir)/src/tracker -I$(top_srcdir)/src/midi/posix -I../midi/rtmidi \
- 	-I$(top_srcdir)/src/ppui/osinterface -I$(top_srcdir)/src/ppui/osinterface/sdl \
- 	-I$(top_srcdir)/src/ppui/osinterface/posix -I$(top_srcdir)/src/ppui/sdl -Isdl
--milkytracker_LDADD = $(top_builddir)/src/milkyplay/libmilkyplay.a $(top_builddir)/src/ppui/osinterface/libosinterface.a $(top_builddir)/src/ppui/libppui.a $(top_builddir)/src/ppui/osinterface/libosinterface.a $(top_builddir)/src/fx/libfx.a $(top_builddir)/src/compression/libcompression.a $(RTMIDI) $(SDL_LIBS)
--DIST_EXTRA = carbon/Carbon_Definitions.h carbon/Carbon_main.cpp carbon/InfoPlist.strings carbon/KeyTranslation.cpp carbon/KeyTranslation.h carbon/PreferencesDialog.cpp carbon/PreferencesDialog.h carbon/iGetKeys.cpp carbon/iGetKeys.h win32/PreferencesDialog.cpp win32/PreferencesDialog.h win32/ThreadTimer.cpp win32/ThreadTimer.h win32/Win32_main.cpp win32/Win32_resource.h win32/Win32_resources.rc wince/ButtonMapper.cpp wince/ButtonMapper.h wince/VirtualKeyToScanCodeTable.cpp wince/VirtualKeyToScanCodeTable.h wince/WaitStateThread.cpp wince/WaitStateThread.h wince/WinCE_NEWRES.H wince/WinCE_ThreadTimer.cpp wince/WinCE_ThreadTimer.h wince/WinCE_main.cpp wince/WinCE_main.h wince/WinCE_resource.h
-\ No newline at end of file
-+milkytracker_LDADD = $(top_builddir)/src/milkyplay/libmilkyplay.a $(top_builddir)/src/ppui/osinterface/libosinterface.a $(top_builddir)/src/ppui/libppui.a $(top_builddir)/src/ppui/osinterface/libosinterface.a $(top_builddir)/src/fx/libfx.a $(top_builddir)/src/compression/libcompression.a $(RTMIDI) $(SDL_LIBS) -lz
-+DIST_EXTRA = carbon/Carbon_Definitions.h carbon/Carbon_main.cpp carbon/InfoPlist.strings carbon/KeyTranslation.cpp carbon/KeyTranslation.h carbon/PreferencesDialog.cpp carbon/PreferencesDialog.h carbon/iGetKeys.cpp carbon/iGetKeys.h win32/PreferencesDialog.cpp win32/PreferencesDialog.h win32/ThreadTimer.cpp win32/ThreadTimer.h win32/Win32_main.cpp win32/Win32_resource.h win32/Win32_resources.rc wince/ButtonMapper.cpp wince/ButtonMapper.h wince/VirtualKeyToScanCodeTable.cpp wince/VirtualKeyToScanCodeTable.h wince/WaitStateThread.cpp wince/WaitStateThread.h wince/WinCE_NEWRES.H wince/WinCE_ThreadTimer.cpp wince/WinCE_ThreadTimer.h wince/WinCE_main.cpp wince/WinCE_main.h wince/WinCE_resource.h
diff --git a/media-sound/milkytracker/files/milkytracker-0.90.85-64bit.patch b/media-sound/milkytracker/files/milkytracker-0.90.85-64bit.patch
deleted file mode 100644
index 971d9a8efbaf..000000000000
--- a/media-sound/milkytracker/files/milkytracker-0.90.85-64bit.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-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.80.ebuild b/media-sound/milkytracker/milkytracker-0.90.80.ebuild
deleted file mode 100644
index 0be5fd11880b..000000000000
--- a/media-sound/milkytracker/milkytracker-0.90.80.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# 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.80.ebuild,v 1.9 2010/11/01 19:27:13 ssuominen Exp $
-
-EAPI=2
-inherit autotools eutils
-
-DESCRIPTION="FastTracker 2 inspired music tracker"
-HOMEPAGE="http://milkytracker.org/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="alsa jack"
-
-RDEPEND=">=media-libs/libsdl-1.2
-	alsa? ( media-libs/alsa-lib )
-	jack? ( media-sound/jack-audio-connection-kit )"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	rm -rf src/compression/zlib || die "rm -f failed"
-	epatch "${FILESDIR}"/${P}-external_zlib.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-dependency-tracking \
-		$(use_with alsa) \
-		$(use_with jack)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc AUTHORS docs/readme_unix
-	dohtml docs/{MilkyTracker,FAQ,ChangeLog}.html
-
-	newicon resources/pictures/carton.png ${PN}.png
-	make_desktop_entry ${PN} MilkyTracker ${PN} \
-		"AudioVideo;Audio;Sequencer"
-}
diff --git a/media-sound/milkytracker/milkytracker-0.90.85.ebuild b/media-sound/milkytracker/milkytracker-0.90.85.ebuild
deleted file mode 100644
index 3dc0ac843bc4..000000000000
--- a/media-sound/milkytracker/milkytracker-0.90.85.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# 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.3 2010/11/02 19:24:11 ssuominen Exp $
-
-EAPI=2
-inherit autotools eutils
-
-DESCRIPTION="FastTracker 2 inspired music tracker"
-HOMEPAGE="http://milkytracker.org/"
-SRC_URI="http://milkytracker.org/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"
-}