media-sound/abcmidi: Version bump, EAPI bump, updated doc installation.

svn path=/sunrise/; revision=12184

5 files changed, 31 insertions, 11 deletions

diff --git a/media-sound/abcmidi/ChangeLog b/media-sound/abcmidi/ChangeLog
index 54f25465b..441ad94c5 100644
--- a/media-sound/abcmidi/ChangeLog
+++ b/media-sound/abcmidi/ChangeLog
@@ -1,7 +1,13 @@
 # ChangeLog for media-sound/abcmidi
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  02 Jul 2011; Piotr Szymaniak <szarpaj@grubelek.pl>
+  -files/abcmidi-2010.02.09_gentoo.patch, -abcmidi-2010.07.01.ebuild,
+  +files/2010.02.09_gentoo.patch, +abcmidi-2011.06.10.ebuild,
+  +files/2011.06.10-makefile.patch:
+  Version bump, EAPI bump, updated doc installation.
+
 *abcmidi-2010.07.01 (04 Jul 2010)
 
   04 Jul 2010; Michał Górny (sedzimir) <mgorny.3ehbo@mailnull.com>
diff --git a/media-sound/abcmidi/Manifest b/media-sound/abcmidi/Manifest
index acc1f36e9..38ff5de67 100644
--- a/media-sound/abcmidi/Manifest
+++ b/media-sound/abcmidi/Manifest
@@ -1,5 +1,6 @@
-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
+AUX 2010.02.09_gentoo.patch 3295 RMD160 8b95f4397d5b274d0639141e6529b8a44e4d703a SHA1 f48b5a8946ddece4a4589008056581bc0c645938 SHA256 36f1dd35ae7c5aa2f0ee3efba9fee5d917c27472009ee6be099bca44ab093dfb
+AUX 2011.06.10-makefile.patch 533 RMD160 629f9df534959cf44bbe3506da44efdb3b199a56 SHA1 ee4d862528d895221fa6e7bd234fa1bb14c72d6c SHA256 b625eb7f51f348391462b2ec216dce74e4bef0ef1a3f488a764dbac17046f4a7
+DIST abcMIDI-2011-06-10.zip 408011 RMD160 c21554f3f0d669b8787d623079dd15e8ffae0416 SHA1 c24c5f6353cca6910d3eeff3802e79aa382da89b SHA256 59ca50241cce4405753f3ce8b797358399fbc2d3d7795409c4835e0da47e5e45
+EBUILD abcmidi-2011.06.10.ebuild 811 RMD160 e61b5248a64fc5d7154f63182399e560d37c332a SHA1 f5189aaa2ece67aa18492e07855ab48b92e98e53 SHA256 b4232196806a486225ec6b4a7aae989177099a9768d8f0e35b000d9c8b18cfe4
+MISC ChangeLog 1462 RMD160 8e59f0550059ed2c2018130c808affb619685f4b SHA1 6074fe57c84c9cc4a9af3815aaad9990f4cba7ba SHA256 54150ca20791e2f4109181bef34dcf1fa8a3f069fb40c7185c7fe5923fa20da7
 MISC metadata.xml 229 RMD160 f0f6417bec31ce8baba6d476664f7210c8c84c98 SHA1 e5f94f5caadc6f843fc90bb7959570cd503676fd SHA256 3b08fca3c878bdfc4e7639f477dd542d55a4ab5dce39a475e82633071d13eb3f
diff --git a/media-sound/abcmidi/abcmidi-2010.07.01.ebuild b/media-sound/abcmidi/abcmidi-2011.06.10.ebuild
index 0eeae3694..ea033af49 100644
--- a/media-sound/abcmidi/abcmidi-2010.07.01.ebuild
+++ b/media-sound/abcmidi/abcmidi-2011.06.10.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=2
+EAPI=4
 
 inherit eutils toolchain-funcs versionator
 
@@ -19,8 +19,9 @@ IUSE=""
 S=${WORKDIR}/${PN}
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2010.02.09_gentoo.patch
-	rm -rf doc/programming/cvs || die
+	epatch "${FILESDIR}"/2010.02.09_gentoo.patch
+	epatch "${FILESDIR}"/${MY_PV}_makefile.patch
+	rm -r doc/programming/cvs doc/gpl.txt || die
 }
 
 src_compile() {
@@ -30,7 +31,7 @@ src_compile() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install prefix="/usr" docdir="share/doc/${PF}" || die "Unable to install"
+	emake DESTDIR="${D}" install prefix="/usr" docdir="share/doc/${PF}"
 	docinto programming
-	dodoc doc/programming/* *.abc || die "Unable to install documentation"
+	dodoc doc/programming/*
 }
diff --git a/media-sound/abcmidi/files/abcmidi-2010.02.09_gentoo.patch b/media-sound/abcmidi/files/2010.02.09_gentoo.patch
index f103c8f5d..f103c8f5d 100644
--- a/media-sound/abcmidi/files/abcmidi-2010.02.09_gentoo.patch
+++ b/media-sound/abcmidi/files/2010.02.09_gentoo.patch
diff --git a/media-sound/abcmidi/files/2011.06.10-makefile.patch b/media-sound/abcmidi/files/2011.06.10-makefile.patch
new file mode 100644
index 000000000..0f013e1b2
--- /dev/null
+++ b/media-sound/abcmidi/files/2011.06.10-makefile.patch
@@ -0,0 +1,12 @@
+diff --git a/makefile b/makefile
+index 886cf0f..adf5381 100644
+--- a/makefile
++++ b/makefile
+@@ -123,7 +123,6 @@ install: abc2midi midi2abc abc2abc mftext midicopy yaps abcmatch
+ 	$(INSTALL) -m 644 doc/*.txt $(DESTDIR)${prefix}/${docdir}

+ 	$(INSTALL) -m 644 doc/AUTHORS $(DESTDIR)${prefix}/${docdir}

+ 	$(INSTALL) -m 644 doc/CHANGES $(DESTDIR)${prefix}/${docdir}

+-	$(INSTALL) -m 644 VERSION $(DESTDIR)${prefix}/${docdir}

+ 

+ 	# install manpages

+ 	test -d $(DESTDIR)${prefix}/${mandir} || mkdir -p $(DESTDIR)${prefix}/${mandir};