Move to Sunrise version of abcmidi.

diff --git a/media-sound/abcmidi/ChangeLog b/media-sound/abcmidi/ChangeLog
new file mode 100644 (file)
index 0000000..54f2546
--- /dev/null
+++ b/media-sound/abcmidi/ChangeLog
@@ -0,0 +1,30 @@
+# ChangeLog for media-sound/abcmidi
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*abcmidi-2010.07.01 (04 Jul 2010)
+
+  04 Jul 2010; Michał Górny (sedzimir) <mgorny.3ehbo@mailnull.com>
+  -abcmidi-2010.02.09.ebuild, +abcmidi-2010.07.01.ebuild:
+  Version bump, use versionator, remove unnecessary quotes.
+
+  07 Mar 2010; Roman Zimmermann (torotil) <torotil@gmail.com>
+  -abcmidi-2009.12.21.ebuild, -files/abcmidi-2009.12.21_gentoo.patch,
+  +abcmidi-2010.02.09.ebuild, +files/abcmidi-2010.02.09_gentoo.patch:
+  version bump and switch to sourceforge mirrors
+
+  04 Jan 2010; Russell Harmon (eatnumber1) <russ@eatnumber1.com>
+  -abcmidi-2009.07.22.ebuild:
+  Remove abcmidi-2009.07.22
+
+  04 Jan 2010; Russell Harmon (eatnumber1) <russ@eatnumber1.com>
+  +abcmidi-2009.12.21.ebuild, +files/abcmidi-2009.12.21_gentoo.patch:
+  Version bumped abcmidi to 2009.12.21. Thanks to Russell Harmon
+
+  20 Sep 2009; Thomas Sachau (Tommy[D]) <tommy@gentoo.org> +Manifest:
+  Add missing Manifest
+
+  15 Sep 2009; Roman Zimmermann (mereandor) <mereandor@gmail.org>
+  +abcmidi-2009.07.22.ebuild, +metadata.xml:
+  New Ebuild for bug 76017 thanks to José Romildo Malaquias
+

diff --git a/media-sound/abcmidi/Manifest b/media-sound/abcmidi/Manifest
index 81a3fd5a2c6e062a031e1d4bbda7bd0ef49e5fd8..acc1f36e9e9ff089d21fd96b43e13b81c505fc58 100644 (file)
--- a/media-sound/abcmidi/Manifest
+++ b/media-sound/abcmidi/Manifest
@@ -1,3 +1,5 @@
-DIST abcMIDI-2009-10-28.zip 382339 RMD160 2a5ba0561e62fb28dee879871ff2b176e4551b30 SHA1 1a93b278163cbc474e92a69f205f62144abbf082 SHA256 8d5a9c9516d0059872b7bf09dc526d9fba1e766ab2c830a3d4bac97238268e64
-EBUILD abcmidi-2009.10.28.ebuild 733 RMD160 794b6c0a74051804ad3d64597313b72b4eb59b50 SHA1 52a0f3508d34df7ef620701a21143e63e106cf24 SHA256 d6d4500fe434c2567adcf8f7eb605a1218dc92e72707e7f70eed2a8e00ae97bb
-MISC metadata.xml 374 RMD160 3030e1f1d1b944795304ad77d37f5b8f8e24c0f1 SHA1 feee6b91b055793103737ef60b7b244f96d719c5 SHA256 90e03508b3a2ff32960dd125e6654e62d155de3ad61ff0f5de35c1ac22a7fe43
+AUX abcmidi-2010.02.09_gentoo.patch 3295 RMD160 8b95f4397d5b274d0639141e6529b8a44e4d703a SHA1 f48b5a8946ddece4a4589008056581bc0c645938 SHA256 36f1dd35ae7c5aa2f0ee3efba9fee5d917c27472009ee6be099bca44ab093dfb
+DIST abcMIDI-2010-07-01.zip 392769 RMD160 3cda05fbfb995b718dcf9d4433402a640225efca SHA1 39f9cd49cfe224eb32d5579e09721841a16403b7 SHA256 5977959003b2c936cd5b0d1a1def3678b43d82bd3ac210fe6157f5955150fcfb
+EBUILD abcmidi-2010.07.01.ebuild 834 RMD160 ca91769bcbc0d19512757c39aa1a1071385deda8 SHA1 7fef54bb9f0f6517e5cb33f931f9517f0f5c746a SHA256 2eb30a8f9723581a50a19c98d76fa2eeeea5f879597a76078f52b58a56832642
+MISC ChangeLog 1187 RMD160 4abf4cb6a6d521d69b08554cb218a119fcef36eb SHA1 f6dbb1a5de6c52c1bdf511c39b0fca34a8e86f38 SHA256 fc8791becb80df9b0d32838442dbf4460b4fd74b5dc3fb4cedcbd94b48f7167d
+MISC metadata.xml 229 RMD160 f0f6417bec31ce8baba6d476664f7210c8c84c98 SHA1 e5f94f5caadc6f843fc90bb7959570cd503676fd SHA256 3b08fca3c878bdfc4e7639f477dd542d55a4ab5dce39a475e82633071d13eb3f

diff --git a/media-sound/abcmidi/abcmidi-2009.10.28.ebuild b/media-sound/abcmidi/abcmidi-2009.10.28.ebuild
deleted file mode 100644 (file)
index 6eda921..0000000
--- a/media-sound/abcmidi/abcmidi-2009.10.28.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-IUSE=""
-
-inherit eutils
-
-MY_PV=${PV//./-}
-
-S=${WORKDIR}/${PN}
-
-DESCRIPTION="Programs for processing ABC music notation files"
-HOMEPAGE="http://abc.sourceforge.net/abcMIDI/"
-SRC_URI="http://ifdo.ca/~seymour/runabc/abcMIDI-${MY_PV}.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~amd64"
-
-DEPEND=""
-
-src_compile() {
-       cd ${S}
-       make -f makefiles/unix.mak CFLAGS="-c -DANSILIBS ${CFLAGS}"
-}
-
-src_install() {
-       dobin abc2abc abc2midi abcmatch mftext midi2abc midicopy yaps
-       doman doc/*.1
-       dodoc doc/AUTHORS doc/CHANGES doc/*.txt
-       docinto programming
-       dodoc doc/programming/*
-       insinto /usr/share/doc/${P}
-       doins demo.abc
-}

diff --git a/media-sound/abcmidi/abcmidi-2010.07.01.ebuild b/media-sound/abcmidi/abcmidi-2010.07.01.ebuild
new file mode 100644 (file)
index 0000000..0eeae36
--- /dev/null
+++ b/media-sound/abcmidi/abcmidi-2010.07.01.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=2
+
+inherit eutils toolchain-funcs versionator
+
+MY_PV=$(replace_all_version_separators -)
+DESCRIPTION="Programs for processing ABC music notation files"
+HOMEPAGE="http://abc.sourceforge.net/abcMIDI/"
+SRC_URI="mirror://sourceforge/abc/abcMIDI-${MY_PV}.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+       epatch "${FILESDIR}"/${PN}-2010.02.09_gentoo.patch
+       rm -rf doc/programming/cvs || die
+}
+
+src_compile() {
+       tc-export CC
+       export LNK="${CC}"
+       default
+}
+
+src_install() {
+       emake DESTDIR="${D}" install prefix="/usr" docdir="share/doc/${PF}" || die "Unable to install"
+       docinto programming
+       dodoc doc/programming/* *.abc || die "Unable to install documentation"
+}

diff --git a/media-sound/abcmidi/files/abcmidi-2010.02.09_gentoo.patch b/media-sound/abcmidi/files/abcmidi-2010.02.09_gentoo.patch
new file mode 100644 (file)
index 0000000..f103c8f
--- /dev/null
+++ b/media-sound/abcmidi/files/abcmidi-2010.02.09_gentoo.patch
@@ -0,0 +1,101 @@
+diff -ur a/makefile b/makefile
+--- a/makefile 2008-06-07 18:04:48.000000000 -0400
++++ b/makefile 2009-12-31 19:04:15.462990041 -0500
+@@ -31,10 +31,10 @@
+ # cure the problem, change this file from using PC-style end-of-line (carriage \r
+ # return and line feed) to unix style end-of-line (line feed).\r
+ \r
+-CC=gcc\r
++CC?=gcc\r
+ #CFLAGS=-DANSILIBS -O2 \r
+-CFLAGS=-DANSILIBS -g \r
+-LNK=gcc\r
++CFLAGS+=-DANSILIBS \r
++LNK?=gcc\r
+ INSTALL=install\r
+ \r
+ prefix=/usr/local\r
+@@ -48,26 +48,26 @@
+ \r
+ abc2midi : parseabc.o store.o genmidi.o midifile.o queues.o parser2.o\r
+       $(LNK) -o abc2midi parseabc.o store.o genmidi.o queues.o \\r
+-      parser2.o midifile.o\r
++      parser2.o midifile.o $(LDFLAGS)\r
+ \r
+ abc2abc : parseabc.o toabc.o\r
+-      $(LNK) -o abc2abc parseabc.o toabc.o\r
++      $(LNK) -o abc2abc parseabc.o toabc.o $(LDFLAGS)\r
+ \r
+ midi2abc : midifile.o midi2abc.o \r
+-      $(LNK) midifile.o midi2abc.o -o midi2abc\r
++      $(LNK) midifile.o midi2abc.o -o midi2abc $(LDFLAGS)\r
+ \r
+ mftext : midifile.o mftext.o crack.o\r
+-      $(LNK) midifile.o mftext.o crack.o -o mftext\r
++      $(LNK) midifile.o mftext.o crack.o -o mftext $(LDFLAGS)\r
+ \r
+ yaps : parseabc.o yapstree.o drawtune.o debug.o pslib.o position.o parser2.o\r
+       $(LNK) -o yaps parseabc.o yapstree.o drawtune.o debug.o \\r
+-      position.o pslib.o parser2.o -o yaps\r
++      position.o pslib.o parser2.o -o yaps $(LDFLAGS)\r
+ \r
+ midicopy : midicopy.o\r
+-      $(LNK) -o midicopy midicopy.o\r
++      $(LNK) -o midicopy midicopy.o $(LDFLAGS)\r
+ \r
+ abcmatch : abcmatch.o matchsup.o parseabc.o\r
+-      $(LNK) abcmatch.o matchsup.o parseabc.o -o abcmatch\r
++      $(LNK) abcmatch.o matchsup.o parseabc.o -o abcmatch $(LDFLAGS)\r
+ \r
+ parseabc.o : parseabc.c abc.h parseabc.h\r
+ \r
+diff -ur a/makefiles/unix.mak b/makefiles/unix.mak
+--- a/makefiles/unix.mak       2008-05-30 19:22:22.000000000 -0400
++++ b/makefiles/unix.mak       2009-12-31 19:04:28.373020771 -0500
+@@ -31,9 +31,9 @@
+ # cure the problem, change this file from using PC-style end-of-line (carriage \r
+ # return and line feed) to unix style end-of-line (line feed).\r
+ \r
+-CC=gcc\r
+-CFLAGS=-DANSILIBS -O2 \r
+-LNK=gcc\r
++CC?=gcc\r
++CFLAGS+=-DANSILIBS \r
++LNK?=gcc\r
+ INSTALL=install\r
+ \r
+ prefix=/usr/local\r
+@@ -47,26 +47,26 @@
+ \r
+ abc2midi : parseabc.o store.o genmidi.o midifile.o queues.o parser2.o\r
+       $(LNK) -o abc2midi parseabc.o store.o genmidi.o queues.o \\r
+-      parser2.o midifile.o\r
++      parser2.o midifile.o $(LDFLAGS)\r
+ \r
+ abc2abc : parseabc.o toabc.o\r
+-      $(LNK) -o abc2abc parseabc.o toabc.o\r
++      $(LNK) -o abc2abc parseabc.o toabc.o $(LDFLAGS)\r
+ \r
+ midi2abc : midifile.o midi2abc.o \r
+-      $(LNK) midifile.o midi2abc.o -o midi2abc\r
++      $(LNK) midifile.o midi2abc.o -o midi2abc $(LDFLAGS)\r
+ \r
+ mftext : midifile.o mftext.o crack.o\r
+-      $(LNK) midifile.o mftext.o crack.o -o mftext\r
++      $(LNK) midifile.o mftext.o crack.o -o mftext $(LDFLAGS)\r
+ \r
+ yaps : parseabc.o yapstree.o drawtune.o debug.o pslib.o position.o parser2.o\r
+       $(LNK) -o yaps parseabc.o yapstree.o drawtune.o debug.o \\r
+-      position.o pslib.o parser2.o -o yaps\r
++      position.o pslib.o parser2.o -o yaps $(LDFLAGS)\r
+ \r
+ midicopy : midicopy.o\r
+-      $(LNK) -o midicopy midicopy.o\r
++      $(LNK) -o midicopy midicopy.o $(LDFLAGS)\r
+ \r
+ abcmatch : abcmatch.o matchsup.o parseabc.o\r
+-      $(LNK) abcmatch.o matchsup.o parseabc.o -o abcmatch\r
++      $(LNK) abcmatch.o matchsup.o parseabc.o -o abcmatch $(LDFLAGS)\r
+ \r
+ parseabc.o : parseabc.c abc.h parseabc.h\r
+ \r

diff --git a/media-sound/abcmidi/metadata.xml b/media-sound/abcmidi/metadata.xml
index 379c8c2c13364e93b7af139c411ecfb594a5b0b1..e6233b5dc3a99a6f14179f9d922834f0db204a2a 100644 (file)
--- a/media-sound/abcmidi/metadata.xml
+++ b/media-sound/abcmidi/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-       <herd></herd>
-       <longdescription>
-               abcMIDI is a package of programs developed by James Allwright for processing
-               ABC music notation files. It consists of several programs: abc2midi, abc2abc,
-               yaps, and midi2abc.
-       </longdescription>
+<herd>no-herd</herd>
+<maintainer><email>maintainer-wanted@gentoo.org</email></maintainer>
 </pkgmetadata>