Version bump.

Package-Manager: portage-2.2.0_alpha174/cvs/Linux x86_64
Manifest-Sign-Key: 0x4AB3E85B4F064CA3

10 files changed, 243 insertions, 27 deletions

diff --git a/media-sound/abcmidi/ChangeLog b/media-sound/abcmidi/ChangeLog
index 19db7e0faf8b..2c7e2ffc1c51 100644
--- a/media-sound/abcmidi/ChangeLog
+++ b/media-sound/abcmidi/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/abcmidi
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/abcmidi/ChangeLog,v 1.36 2013/05/08 09:58:13 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/abcmidi/ChangeLog,v 1.37 2013/05/13 07:31:46 radhermit Exp $
+
+*abcmidi-2013.05.10 (13 May 2013)
+
+  13 May 2013; Tim Harder <radhermit@gentoo.org> +abcmidi-2013.05.10.ebuild:
+  Version bump.
 
 *abcmidi-2013.05.07 (08 May 2013)
 
diff --git a/media-sound/abcmidi/Manifest b/media-sound/abcmidi/Manifest
index 8bf03d8b192e..fcdac0c05cfa 100644
--- a/media-sound/abcmidi/Manifest
+++ b/media-sound/abcmidi/Manifest
@@ -6,20 +6,22 @@ DIST abcMIDI-2013-03-26.zip 489972 SHA256 2a93f0931a137a0808a2a4385bbea5f65cadf3
 DIST abcMIDI-2013-04-15.zip 493716 SHA256 427a21864baebbf39facbfcca50f75c8ad8d5bf6606022cb0de35456ce3fdc62 SHA512 08e36626abd8614f6cc18b5f041a356118e5537f6bb4fee1c977752180bb04cb7fd1ee84ff096801a6f66d6e876c5135b7fa9b8f05bd280e741f34885aea1417 WHIRLPOOL 471d1b35e1c768e13c81d026c34ac0e48f3e39be368be91fc6079ada2f0fcced3a8a58d3d04562a16f24ad4680b3b2bcc1602a810650e47ebd4d338293fcfad3
 DIST abcMIDI-2013-04-24.zip 494722 SHA256 c7ae3c41543b681f5e11f604ec88573c02a917042f16e41fe884f8300a63c492 SHA512 b1115d5bf7dd4c767433cf6e2deeceb27aa5671a7112debe22d1f9178301032939d1f3a708431cd770b44d52607523de43347aa4240afd8c9a0864e2c89bd2a3 WHIRLPOOL 546562b697142c23cb0b8c2c41755ddade94a753fb03b4f48d6649e154ba07738204a9180690b7807a5f86ee6a6a9baa640c116080e6a94af9daf5f50c088040
 DIST abcMIDI-2013-05-07.zip 495852 SHA256 b446871f325b3f9659d4a7ce98598280f4e12ac007f0f05b0ccdc06e1c4592bf SHA512 8eb273120fa2d13569702c0b9cb7965418a0c4d59a453e7da3f3b45effd8a3d17727902526860d1928e889679b0d6f76ce4f38d1caee54ed146e817b26f2b355 WHIRLPOOL b33ab78afd07e099e3fb6ca60a01513ab09435095a4e26715f21dcd7ffcdad33f6808832ed97e53362a61bba71823d123f234b3710756d5b30f2f8cd1bc155d2
+DIST abcMIDI-2013-05-10.zip 496011 SHA256 232c84d5d75b446f12804ad9021577b8c9843b6e51f94e6ea2d7af566a7f871a SHA512 ba075519d06761bfbcf1cb22283af6f180527ea2ee29f0814091a6a072ef79afb8de2b77e700dfe2b5980ce49e33ec7ec1f37a7238614bac580ae4c4274ac753 WHIRLPOOL 009886fe0018b88795ed3b224657439af08fac58928aa2acec672b9ffca37fa99cdb16711f839ec2b0cac7b7610b943bb87e98b44179c9e37ba483aa7adbc457
 EBUILD abcmidi-2013.03.26.ebuild 958 SHA256 315e5a912f9ffb411240fb1575590de5d57722a2251e7531a8d64c19414939f2 SHA512 13c752140920c0d11eafa3601303cb7f2498d299833c29aa1eb00746a24eaffe2cd87d9f604b4fe1eb3e489229e29e6cfc049d3b17225f6b43af4c56dbfca1f7 WHIRLPOOL 7b7928402d14b9a6bf1f23e5eced7d710c0efa11ec7ec0627858141594d4d65f5c97f7835f73aaba3ac9ee396cfe020167db5e94044aadd5b1a66664169e4971
 EBUILD abcmidi-2013.04.15.ebuild 958 SHA256 ef5d1236bc15331279db6edd62ccfa6683a14ebb4a49f6e6ba576b4abf66dadb SHA512 d2dcef68bdf123fcfbc4e19b623b55f50a9c765fcf3fdad16b3473447ce19d069d411a4c072e485270f86dbe4954a9c218827112fc7fd2998eb1835b6b1c5497 WHIRLPOOL a684d2e99d655d49326cd290a41bc783dc573e213b90e6050c153dc7a6cffa8c3a9dbcb15663ee0249d2ef2cd7e240ece533a7e6b2d9f8151076bbc552c24ebb
 EBUILD abcmidi-2013.04.24.ebuild 958 SHA256 889c38f6c24140b9fd0a1bf98b06b2f6d7f57a755fa79231a3e2492083fd4217 SHA512 877f99590139b0fbd0c902d1cb4bd4e4ee8575ee3aee605c2f9ad7e31176160e1d49c42b8952066a182d6c2c07f1f333b40e1f544454246a048dc8f3793c44b9 WHIRLPOOL 6951dacdfd83379b85b91ee601cf87e59d3ec133a66db7655a0adcd4ea08f000cf62854b3fc9df191c67d98825aad76cfa64e98966fa7caa71ea5a45ed2c0bee
 EBUILD abcmidi-2013.05.07.ebuild 958 SHA256 be2abf70d70b983ff9b392fdc380c9eae8d555b6d7ca097b1c72c3c92a0e6ada SHA512 06cd69cee24a505f9ee25c16098fa1aab4a638271cd3c47b70f3816ecc0b98f0f77948208f41dc9584f6d874db69513f41e61d7f39ba73c0e645d7a12c167843 WHIRLPOOL 991391947046d175c288654339413903949f64df3e3ca69e2d270bb0191a169f7f73e131231356ac1068fced9bbff7c7c3c28f7fb2344b36ac2ffe08d83abca6
-MISC ChangeLog 4978 SHA256 97216c0a0f07d548e8a95a5cc5fdf16a309e66225e1f14f270a19b9957d51b55 SHA512 41deac579bb1f8fffb8fb3266114b9919f4e313363c1776166f8ab8aa61a0baff14b535c6fbc610da952b9616527be17d52faf75f1695cbfa87bef8a0612fdeb WHIRLPOOL 13f02bed32b977456a4fbf43a13f5353939fbcb5c0773bc252cf42ae86eb45aa2473174a347df99914111ef49e05da3072e875dcd543b2d1b6df106dd1db3f06
+EBUILD abcmidi-2013.05.10.ebuild 958 SHA256 0951d52d76f98d72116aa434112d97b0f76d47fc169de22ade5b200101331ae0 SHA512 69b58ca6a0fcb2bafb810383fc709b4ad917add26ae74bc4d14a7c5e5dfcc26e610397fe6c6a042e5360383f7ef6624efa9d6f5dfacf7613be9e3aa88ce61c65 WHIRLPOOL dfeb86e4e9dcfbbb35ebe7cf0d6f5379793bef7eb98c74665f213623dcca70ef265c890dd475404a1f90aacb008c881a5177f76d0529d01b93d5da64aeb857a5
+MISC ChangeLog 5107 SHA256 bde63fa88f39c006773261cb8c12631d685cf4bb06442244dfff207c1f36d3d3 SHA512 a8cfb1572e145705e7fcc8c2eb2fd0b0b47912fb85a9cf21a8571b5e15695f36e3e036621690025b7a3602d3e5ad531040425d06691ca22b64c38b902aa2e770 WHIRLPOOL cf8eb18bf8caa3f081367b601a8eaa795ced5a1f8036a791d3ba0d18a37270a7be621f08ee11212ca51f4cc63bacc859816240ddcd2203075fc554140036e38b
 MISC metadata.xml 158 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b SHA512 90f74979d228a35f81de50665ead63d228bc4f0d11f3def4832c9607f4242cbc4562db0a123bdcf2c4b6e0be78fc5565a65f75cdb53ed4c8d45544ebf74255dc WHIRLPOOL a90483bd4fa01ed5fa21bfe9f59c11b97c793146e3031eae342a3355c6dc2e4ef2b356af0bf711b5e16e16551c91d63ecdbb48e708df606017264e8bff5e9fe9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRiiG2AAoJEEqz6FtPBkyjN+4IAIhe+b0JVNupYTVs7oUDmC+o
-3lxM639HPpS9xoTCxllZeKyJD9LAWyZxpjfE3HAE2kvXOqpYIUBBUriPTuJW2Pwm
-R04Nf2QS0oYgGZRFev8GSiiH9PqQx3Q2xAeBN85s5oJ0CiN4tKx9hEmEkp5XJDbV
-Lsr7Cmrul0Jrv6PzIj8Oo5SCfgxlBnyaeDc93jAxd/uy2hz8/s998uVbkK8gyJ5u
-RKOGxqI0XfIiweJUB9zt7sW629dKzElmrrYbrs4NkIp58V4xTyVQ0+jQhuTuYWQw
-fWEGiq8zonVNi7CQEYkMm4JelgNsUtfbo+4JtWlNtX2q0sVOeSa8KcR0WBDpR/I=
-=G2Yb
+iQEcBAEBCAAGBQJRkJbkAAoJEEqz6FtPBkyjIPUH/2rZpLuIa/6eon/Aa3npuMaU
+zODa/LjhaFUvnacT8E3UzQXxo+YBBiky4R/ixYAbV9uP0k07pbP7GRWO7RVsG0OD
+bsBh9YRzURsXvJnaN9YeLxG2ZDU72B4t+jHXuIBoUC14vWA4WZ7X1wS1QU6C1kS6
+/d2ycOFdB2yOWd8rTliice65sqM3qYkdPAZIYopg+vVCajYTZIPNEM3iWT8e8W+R
+Sbog8Hcw2LN1HgihMAaY6jH8dBto/6pRx1T2BF7LaRRoy5t+1aDjJiP26tDf0+i1
+ZRZZ0NL+ssZl+RdLgavuAoa9DzE775+TC6+lMotpgcZZ2FpkcyW459Y9NIeZRVI=
+=UrbD
 -----END PGP SIGNATURE-----
diff --git a/media-sound/abcmidi/abcmidi-2013.05.10.ebuild b/media-sound/abcmidi/abcmidi-2013.05.10.ebuild
new file mode 100644
index 000000000000..c6872c521d99
--- /dev/null
+++ b/media-sound/abcmidi/abcmidi-2013.05.10.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/abcmidi/abcmidi-2013.05.10.ebuild,v 1.1 2013/05/13 07:31:46 radhermit Exp $
+
+EAPI=5
+
+inherit eutils versionator autotools
+
+MY_P="abcMIDI-$(replace_all_version_separators '-')"
+DESCRIPTION="Programs for processing ABC music notation files"
+HOMEPAGE="http://abc.sourceforge.net/abcMIDI/"
+SRC_URI="http://ifdo.pugmarks.com/~seymour/runabc/${MY_P}.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+DEPEND="app-arch/unzip"
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2011.10.19-install.patch
+	rm configure makefile || die
+	sed -i -e "s:-O2::" configure.ac || die
+	eautoreconf
+}
+
+src_install() {
+	default
+	dodoc doc/{AUTHORS,CHANGES,abcguide.txt,abcmatch.txt,history.txt,readme.txt,yapshelp.txt}
+
+	if use examples ; then
+		docinto examples
+		dodoc samples/*.abc
+	fi
+}
diff --git a/media-sound/lilypond/ChangeLog b/media-sound/lilypond/ChangeLog
index 9960cf7a7f31..eb405ee07475 100644
--- a/media-sound/lilypond/ChangeLog
+++ b/media-sound/lilypond/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/lilypond
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/lilypond/ChangeLog,v 1.150 2013/05/09 05:58:22 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lilypond/ChangeLog,v 1.151 2013/05/13 07:35:31 radhermit Exp $
+
+*lilypond-2.17.18 (13 May 2013)
+
+  13 May 2013; Tim Harder <radhermit@gentoo.org> +lilypond-2.17.18.ebuild:
+  Version bump.
 
   09 May 2013; Tim Harder <radhermit@gentoo.org> -lilypond-2.17.13.ebuild,
   -lilypond-2.17.14.ebuild, -lilypond-2.17.15.ebuild:
diff --git a/media-sound/lilypond/Manifest b/media-sound/lilypond/Manifest
index 18371cd5da62..32437b4445c3 100644
--- a/media-sound/lilypond/Manifest
+++ b/media-sound/lilypond/Manifest
@@ -8,21 +8,23 @@ DIST lilypond-2.14.2.tar.gz 15224418 SHA256 243a6b3845722a37083d73ed681e69ffde0b
 DIST lilypond-2.16.2.tar.gz 16062982 SHA256 1f4326cf8f9363076a83ce3cbe35f747188084f7492000ed3a7ccc3ce60aa1cb SHA512 3ead74ddb7e51be274aa5aa607b776261ae5d0e9863ebe745451875e62a60fac2376f7e80546df66010cdec2752c271e7006275608f30ce9a2d1b88f22dc1d8d WHIRLPOOL a25539dac5e508220e1ddeeaed261b730e76fd26c5dbc0f97683b65bcbc5907ef6bfbe8c16a7f6a15d12950d4a7d547ee1716e25cdfb5b750e235c913a8ef38e
 DIST lilypond-2.17.16.tar.gz 16262898 SHA256 593bcdf80753f3b60eb53ae011f8f931ec5f9b0356cc39f8cc0fee883bb1ca18 SHA512 51c326efa8bb31a4450036278159c409037465b56440c9f67b157f453ec4a23656a910a07d83e79da1b9f556ad0bd7b117ef23b3cc10b4b600ea0c7b8f9dab94 WHIRLPOOL fddd2a598d7567336201ce842a9111e5924d3d77186b7b7edc12d6641fe758f1cd970a0af0fb836beb20ebf677b4125d48468bcc68331feed9a5b3077fadf3ea
 DIST lilypond-2.17.17.tar.gz 16302761 SHA256 e7583b5a97b4a44f9c81c7576af058e9a6538abf840ebc963d7c883e70a8859a SHA512 66e3cd2de13c91a994fe339e1341c682d8ac41979956cc3293bd18463017c4575cc8d95f1e0e6b694413ab93ece8d1bc7c7fe634be376749a1d3d39fb5a5ab3f WHIRLPOOL a31dfde76996603523aed349de0a760c6b2949c41b3db06f9e8a43f99fd1fc58dae4c3b18088ee36ae5d505b94e9da91512f28b193a5b822e223fafee5b3e7d4
+DIST lilypond-2.17.18.tar.gz 16307798 SHA256 6fd1f46cb17215ce9a09b7cad3ef4953bf739c2c4b7cb9cb8a92fa115062540a SHA512 09a513752faf2afa2fc35e1a5bb15250a9dfb1d132b4ba062990c1d03b8632aeda443b233c29260b2b6e1614d24eff8c74049d0bd0883e9f18b1abd14d724653 WHIRLPOOL 5039b25a43668977c860d6e937e0d1dcbda1537a4db34d31f576c8c3399c7c5b5775a0a9e3685c264a43803e39ebf9699ad63c092a4e935f285380177f7814a6
 EBUILD lilypond-2.14.2.ebuild 2331 SHA256 474da368f5a2d9ac9fb0381eafba65ec004c7d897bf3b970fad9c46fc1ac8c79 SHA512 00e02dcf5d10c08c9b8f064eb3e04259fa9831d49693c2a2ff4ffd9f30de1a955628862727ef6ea7c1b19049888f27b462885b13d139317da2c99900741de4b6 WHIRLPOOL 356eb215adf6310157b07d4300901464cfa0a3877206177441aacb732830842e72972739727112ddc55f0f01829d3bcf91c51682aaa77b7ab22684e947505a92
 EBUILD lilypond-2.16.2.ebuild 2531 SHA256 d40e5d256cb5b270a931d0fc405acc1500a9987bce9efbb47e0c0eda0ca014fb SHA512 3696e216e38e623e3ccb210a1f7a027b89b174474e5d5d5b011771bc924b56b13758cf19f11c2afb29f06b8da7d530b6dee41fc783af0a3b5849f9ead84ca068 WHIRLPOOL 8060e56a3fab0f8bc4db61b1fa91c0c7dafa54c6634949bdbdbfecc8c38c00ef5181ee4617601f1e7d6a316f4ff3237061328853575018023afa968a854b651b
 EBUILD lilypond-2.17.16.ebuild 2526 SHA256 48324ece336ea78d32f87b069a8b009e8426601f46b4844cec7f4316be918226 SHA512 7a2fdd1c6aa0fdd7c40eff7c055026631dcc770bb48a66dc2793d47bfc1be499b4f2bda492e4903312fdf0a6e2c949d790dc3db13173b3eb2cb90406a2693490 WHIRLPOOL 18edda9e55a96ff5ed35c8467162a5e974b9f7c6ef629b57aab11ce656bb0a1331699166a466c0b4dbc1b4b1a79a30ac3fe718005c79eca6cafa347091b870d0
 EBUILD lilypond-2.17.17.ebuild 2526 SHA256 0cb66be46aa4a6ffd1eebcb3afe87c89034267f1a44d4dccf3fab8156f6be413 SHA512 cf5c763425f70a8813b34dfb229d4672bda43f5fa99d7bf53f8c02ad8c7759b16ea858524ae01d6ba85d620521d68895f7f55b498bec453301345276430d166c WHIRLPOOL 8687db65a069911a0b0356dc3d9c7b0606f982afe98a41389415345a961857c186a3d19f1fe8457496382bdecd61393a5fa952e373a1f7dd36a4206f95f035a0
+EBUILD lilypond-2.17.18.ebuild 2526 SHA256 bb48e647c59084f2b10ad7805bcda65b058d6215dae431f572a6a9e00a2d76b1 SHA512 09428bd60b04f3b0e319dba974daa7b609909768fb2b24fcbb6f39d9515516d92c113a252e4fcfebd515462ad849c50abc80ab8719c8a5c3d770a752d629ee0c WHIRLPOOL 896136bfdfaaf6501ec8e9ac4f646aa52a4c27d1a8028d6ebd46485b1cdce38787c5274152ac6303886dbe46e7f76fc0da13ace5008e1a019f56bfc6debb6fca
 EBUILD lilypond-9999.ebuild 2242 SHA256 363a6cdcd8ab5e5d215a7b4ad89201b337c2c8af3c3a1dbc87641deb5e35a7e9 SHA512 899fa95bc3efba02951da3b6a40df0cbe799ddd0a05a4afbf3b014d6d438769903b6f9aa28faf52f5e8a51c8d2ce83953e55451825daf3960f3c0239010e2271 WHIRLPOOL 96f07fbf308d65759134e368326644e33fe1eee131d997805a9ed32ff2f610777dea8f1fa59416436b54c6e48196c31f366df95697467e85cbd138f511729378
-MISC ChangeLog 24196 SHA256 270041e5984650e81fce85bd2dace506a0a8afee41508dbed07608021a88458f SHA512 ceaad7661b8e96d2eab47db21724430f9adc50346905a77831ffdb9954310e6abc29d7987fa32d825a33ac2369d779d1fc1381003e98324800eec229e9b4f58d WHIRLPOOL 9202947904bc3156fda600c9590378587d1f406974dd9d2bde30bcf8234f436d041987b4e790bd539e73f3c763b238ba9362586fdb7b42935acc9aed67bd3ee2
+MISC ChangeLog 24321 SHA256 182fe521ce61d3aeec6e388faff1508c610857e7931fc3c1f922614c6ce8109c SHA512 7114c62cb02804996d00026c36180c100ecb957ada49986388ed1e5a32b4ea35ca57583838fe371de090b517f79f68352cc1a28f278037fdc2008ebf59ef946a WHIRLPOOL 40146f7b184c049e05ca5bd767c0939abc936d5484e910c4dd962499a866d1fe8edb6c6dc2f037e5939008de63ff55a910be98ee6011dffc29f88332b0762100
 MISC metadata.xml 534 SHA256 9d9d5dba892fde9a346843a9cacaeac7ce9236f643d1c0f778333cc65181a025 SHA512 711b4d7ff31d686c01cc9f67bbd84bd69da5a955e60a759b814a9379d20079061d019a53da9906a75a4a408654307406eef99129655fb38a21953eaf209215e1 WHIRLPOOL 87cddb2db014ae47a3e2408fb696fcce7118632a8574d0b8be21ef603d3ecdc4714f2736a7a3388fc907e6b2b984feabca1f77b603e34ff1477920260cb696b4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRizr/AAoJEEqz6FtPBkyjTF4H/3uWSUa3oF2p00jfkHSH7TmX
-UqWYIaIph3AJUcFEXl3d42VpAJOw0cNj85pJNt2X3EozT6UlWpFdBsEPFdDt2+1y
-JHI0YC/uWPK4+ifvdCaUNbT8GfoEFvtwq85hwSgrwZulzLP0SttSGv+kdbDMmbGz
-3uZeRkd99+voT1jlLnhzZI+dcWTx3v1o02jUcxgngr9KXpJlW+ZZQxoHPiL+YBfQ
-9Ry4TnOUia3L6RfP+E/7OI915quJ2knM6D8uak+UTB6J+cW7HB7C+FIoNbaSB9pe
-FejDdK50WYWUODUlP5E1C2TUz9dejA9BMEO/mP25BKPQ8tzT9jV5VUzdj8wjGTE=
-=FoYx
+iQEcBAEBCAAGBQJRkJfEAAoJEEqz6FtPBkyjQJsH/1cDZcxKFl9itB9ykn0MBxO+
+qWazcAKwM3YL+EwnbwM3AkoIanE4bH5QpbI+QiYYThOc7RPqmW/XpEsV0G6Pnk5e
+bcsXw0G1ijIJyiAv9BOT7IpUXjW5HmXDtvKrHw/ZLkBmysfsTAfk6c7BZRjgXo0U
+8fDYnjmYdUqLccJasT7YbgGy6qsdBQPi2bTVZtoAYbwBQHaw73K+iGiA4F22yG0P
+r5PzBGg/qeZo4CrWxd2Myhc8RttheJUYwCn3QitnEqJqUbme+2XxuHSdX4Vj2yLO
+VuegrtNdB60jRmfJnyvB5IEYjFNvlUC8zkCMlrczbS1ckZv7aEoLi9MxbFCDVw4=
+=RqcQ
 -----END PGP SIGNATURE-----
diff --git a/media-sound/lilypond/lilypond-2.17.18.ebuild b/media-sound/lilypond/lilypond-2.17.18.ebuild
new file mode 100644
index 000000000000..6e52c05256f1
--- /dev/null
+++ b/media-sound/lilypond/lilypond-2.17.18.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lilypond/lilypond-2.17.18.ebuild,v 1.1 2013/05/13 07:35:31 radhermit Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+
+inherit elisp-common autotools eutils python-single-r1
+
+DESCRIPTION="GNU Music Typesetter"
+SRC_URI="http://download.linuxaudio.org/lilypond/sources/v${PV:0:4}/${P}.tar.gz"
+HOMEPAGE="http://lilypond.org/"
+
+SLOT="0"
+LICENSE="GPL-3 FDL-1.3"
+KEYWORDS="~amd64 ~hppa ~x86"
+LANGS=" ca cs da de el eo es fi fr it ja nl ru sv tr uk vi zh_TW"
+IUSE="debug emacs profile vim-syntax ${LANGS// / linguas_}"
+
+RDEPEND=">=app-text/ghostscript-gpl-8.15
+	>=dev-scheme/guile-1.8.2[deprecated,regex]
+	media-fonts/urw-fonts
+	media-libs/fontconfig
+	media-libs/freetype:2
+	>=x11-libs/pango-1.12.3
+	emacs? ( virtual/emacs )
+	${PYTHON_DEPS}"
+DEPEND="${RDEPEND}
+	app-text/t1utils
+	dev-lang/perl
+	dev-texlive/texlive-metapost
+	virtual/pkgconfig
+	media-gfx/fontforge
+	>=sys-apps/texinfo-4.11
+	>=sys-devel/bison-2.0
+	sys-devel/flex
+	sys-devel/gettext
+	sys-devel/make"
+
+# Correct output data for tests isn't bundled with releases
+RESTRICT="test"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.17.2-tex-docs.patch
+
+	if ! use vim-syntax ; then
+		sed -i -e "s/vim//" GNUmakefile.in || die
+	fi
+
+	sed -i -e "s/OPTIMIZE -g/OPTIMIZE/" aclocal.m4 || die
+
+	for lang in ${LANGS}; do
+		use linguas_${lang} || rm po/${lang}.po || die
+	done
+
+	eautoreconf
+}
+
+src_configure() {
+	# documentation generation currently not supported since it requires a newer
+	# version of texi2html than is currently in the tree
+
+	econf \
+		--with-ncsb-dir=/usr/share/fonts/urw-fonts \
+		--disable-documentation \
+		--disable-optimising \
+		--disable-pipe \
+		$(use_enable debug debugging) \
+		$(use_enable profile profiling)
+}
+
+src_compile() {
+	default
+
+	if use emacs ; then
+		elisp-compile elisp/lilypond-{font-lock,indent,mode,what-beat}.el \
+			|| die "elisp-compile failed"
+	fi
+}
+
+src_install () {
+	emake DESTDIR="${D}" vimdir=/usr/share/vim/vimfiles install
+
+	# remove elisp files since they are in the wrong directory
+	rm -r "${ED}"/usr/share/emacs || die
+
+	if use emacs ; then
+		elisp-install ${PN} elisp/*.{el,elc} elisp/out/*.el \
+			|| die "elisp-install failed"
+		elisp-site-file-install "${FILESDIR}"/50${PN}-gentoo.el
+	fi
+
+	python_fix_shebang "${ED}"
+
+	dodoc AUTHORS.txt HACKING NEWS.txt README.txt
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/media-sound/yoshimi/ChangeLog b/media-sound/yoshimi/ChangeLog
index 8b132c1387f0..e4894db479c7 100644
--- a/media-sound/yoshimi/ChangeLog
+++ b/media-sound/yoshimi/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/yoshimi
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/yoshimi/ChangeLog,v 1.12 2013/01/14 04:16:13 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/yoshimi/ChangeLog,v 1.13 2013/05/13 07:30:17 radhermit Exp $
+
+*yoshimi-1.1.0 (13 May 2013)
+
+  13 May 2013; Tim Harder <radhermit@gentoo.org> +yoshimi-1.1.0.ebuild,
+  +files/yoshimi-1.1.0-desktop-version.patch:
+  Version bump.
 
   14 Jan 2013; Tim Harder <radhermit@gentoo.org> -yoshimi-0.060.12.ebuild,
   -files/yoshimi-0.060.12-desktop.patch:
diff --git a/media-sound/yoshimi/Manifest b/media-sound/yoshimi/Manifest
index c3c2557ebe4e..d185a97b212e 100644
--- a/media-sound/yoshimi/Manifest
+++ b/media-sound/yoshimi/Manifest
@@ -1,18 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX yoshimi-1.1.0-desktop-version.patch 286 SHA256 97b33a4826451f80164bc0dc6487480094665679b0599a7cefd3f6f5914b0868 SHA512 9266c101a612a329a238d30757b2df7748aec36ab835d0d6f3f998d23a0467b6123227aad1d7c03aadbf707944dded20c5f317cc2a60e3225f3eb29843e78635 WHIRLPOOL 5d94a385d61fd7c04af9ce73de635cc4eb7f636f50ea97e1e1c43123f340d712fb15cfd3798e121ac84772a9029a727fa6964158cbe232e821b60d40abc9ba44
 DIST yoshimi-1.0.0.tar.bz2 1424814 SHA256 4c0d6f5a8f856f05ff594cbac7d0dc113f1fccd20d33fd166308a71983d9b1ab SHA512 e6a67a167ff050c1dc2e2c17f687e343982b769a2bc3e0612f085fac882c982c2dd8afa8adf221c18fc85d7b658a24a3b3ebeaa58bd9e769c3f2dab00f265efd WHIRLPOOL b2321e8db999e82eec0fff83d28788fb5e3f0820b58b31398e62267c46674a3b32af050d44949a138fee54c2e0c0b158dc20c1a5cc4d73b2f83e1e66a1dd9a15
+DIST yoshimi-1.1.0.tar.bz2 2210595 SHA256 7be9e7730231f9d7aa8036a4fa429f58ae19e48bca3dd96a1c52298d17c06065 SHA512 a158a6fdd07e3d6dea30be8f110112dd60d8c07d333216e761cfe558cb6f138d1b8cb51f8ebb329514eb90b8d6eaff271b5350462d19b65e79a39ed82638243e WHIRLPOOL b97aa55cd150d063a9a13e14806e1486e728c94fddafaf7574940c318294749096c077c24fcd85039788597350f4ed3d154737e9dd0faf13255835913d114a1d
 EBUILD yoshimi-1.0.0.ebuild 862 SHA256 8595ddfe938e994f6bc888a8a019f746443bc5a50b30454eddfd33e3737c3bf6 SHA512 fdbd1a0101878a64429049f111a2f5aa290fc268d35f49f2e3b433c7cef450b88d96d2f28e2235bbb74b1e035c5ba0f2abc4bc9cf1e6263753239d04a2072ca8 WHIRLPOOL 7d99d5422fead3652b010fbc55c7d6c315acefa42a7e43756be3e1a73cfd94b76b73fa07d2aa66c16cb67a43aab3292690ee9d9cc0e48ec575682ebb3d2e9718
-MISC ChangeLog 1916 SHA256 97fab3859233ee9d50187f2ed37802861d1e399519cddcb5c273002b8dbf50b0 SHA512 5e616651978692948d4dbd8ad3cd02f76fd551b938391bf475b7cb95eef2369d223183b93924c260c5a181d6ef22c4c606c8a52aa104b2a065205f2c116d92d9 WHIRLPOOL 688a26f6412890f4a85f2ba99d7137f0689b6745332f83d2f381c84ab7be2fc1f7a5a339e54fdfa6fb5eb21335cd2e8f1d349e06a1d96c7d467921de6ba5e463
+EBUILD yoshimi-1.1.0.ebuild 963 SHA256 5b2241eadc6e4e87a7f96a2c052013fef8f5af82e2f151881b7d4354b2946488 SHA512 6ea83ed812e1c537c019da8bfaa6ed07f52e6190f2c5e4a78b4d9b449b10f60669b2fbf6c12888218deb0e327a928550c69874f85fbc9cab81fb48e3204387e4 WHIRLPOOL 6a13ca8fd281c63651eb5ac7949bcb4d170370e4e547868599a99a53367e3a213d8c8a1c814bd8038bd250f071e4953ae47d950bf4ab48f26049b891863354cf
+MISC ChangeLog 2081 SHA256 9701e19f9bf86c1f1ce47a7a3ee8a81546daeb77fdf1c3480d671c2438d66733 SHA512 e7b12f8a1b97114566665728ea3bac5ef1f0419eb4a13691d8de674048077f94e37808e3f4e66188c8f652f20befc434bd1049dacb86cc46ecf21884a4634f24 WHIRLPOOL 8d5d05490de2a62ee6c69d403aae0cf83cd1d26cae682a53060f1bb46c91b2346b475a85a7501ffc33eb6b4eac6585155b249750929d21d536fdb30542228cb0
 MISC metadata.xml 158 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b SHA512 90f74979d228a35f81de50665ead63d228bc4f0d11f3def4832c9607f4242cbc4562db0a123bdcf2c4b6e0be78fc5565a65f75cdb53ed4c8d45544ebf74255dc WHIRLPOOL a90483bd4fa01ed5fa21bfe9f59c11b97c793146e3031eae342a3355c6dc2e4ef2b356af0bf711b5e16e16551c91d63ecdbb48e708df606017264e8bff5e9fe9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQ84aPAAoJEEqz6FtPBkyjVsIH/13zjBrLYdX+c7rfz6wxskNL
-1i0xoW05gL0rIpHZZK62MXjpwoHS/RJqSnJA/uKMuKrLNaTfxB11NQJGyNoWcMKo
-9YbVDyoADtS0pOCM7/cxgD1l0NO9VzXlP34YNbcswWdIa1GcY9d7HdSGxYRn7OES
-J0F1JSjNHMFLVmoO6srRRtHOK0CPalaZ3raLZfn3smC43jnhE9SuqrrFhTvQ9EVu
-AirH6xdrm2t9drPMtLHqt3F3kL74BYYcPaf4g/lPXf2/tcDssxAiF4Pu3aCtBDKS
-SPXpSga+1Hfitq9H6aYvAFgKRIXzR1jtVMbbPwvN+Dffmk1CpicdaYWCQmOH9B4=
-=xGF+
+iQEcBAEBCAAGBQJRkJaNAAoJEEqz6FtPBkyjxqUH/iSzCv5XrUEmJ+MKNXMZ0jp3
+hlNfAvN5dgulMwdUzLLHORLJj/phRJ754id6qp0WarXZMRibt/BWOAK3Pk/BM3Pl
+j8SR2y9nML59wx8pa/chmTAGobL3duZNYeSp8GLqOBMsGtP9eDz7NuWBJdjbCE35
+rFISQHXIYzoVltmA42tTiIz4PYe7jZ2RSykFlEWQB/II1b+38U47qlsB7+SJx5aK
+lJxeu3456TvIi/FluV3r6ak72j1V1rDAlIS5MeMkhH9g7VCmHQql0ixaqi0Nmb4k
+jaXrRKh7SOluf1jxMWXPUZ9k7YDd5P/zQhAsa8Ugo9r4DQkvTgxsSBWYRoFr1D4=
+=8te1
 -----END PGP SIGNATURE-----
diff --git a/media-sound/yoshimi/files/yoshimi-1.1.0-desktop-version.patch b/media-sound/yoshimi/files/yoshimi-1.1.0-desktop-version.patch
new file mode 100644
index 000000000000..9b159eb1b211
--- /dev/null
+++ b/media-sound/yoshimi/files/yoshimi-1.1.0-desktop-version.patch
@@ -0,0 +1,11 @@
+--- yoshimi-1.1.0/desktop/yoshimi.desktop.in
++++ yoshimi-1.1.0/desktop/yoshimi.desktop.in
+@@ -2,7 +2,7 @@
+ Name=Yoshimi
+ Comment=Real Time Synthesizer
+ GenericName=Synthesizer
+-Version=@YOSHIMI_VERSION@
++Version=1.0
+ Type=Application
+ Categories=AudioVideo;X-Sound;Audio;
+ Exec=yoshimi
diff --git a/media-sound/yoshimi/yoshimi-1.1.0.ebuild b/media-sound/yoshimi/yoshimi-1.1.0.ebuild
new file mode 100644
index 000000000000..2192c0351ba0
--- /dev/null
+++ b/media-sound/yoshimi/yoshimi-1.1.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/yoshimi/yoshimi-1.1.0.ebuild,v 1.1 2013/05/13 07:30:17 radhermit Exp $
+
+EAPI=5
+inherit eutils cmake-utils
+
+DESCRIPTION="A software synthesizer based on ZynAddSubFX"
+HOMEPAGE="http://yoshimi.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-libs/mini-xml-2.5
+	>=media-libs/alsa-lib-1.0.17
+	media-libs/fontconfig
+	media-libs/libsndfile
+	>=media-sound/jack-audio-connection-kit-0.115.6
+	sci-libs/fftw:3.0
+	sys-libs/zlib
+	x11-libs/cairo
+	x11-libs/fltk:1[opengl]"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${P}/src
+
+DOCS="../${PV}.notes"
+
+src_prepare() {
+	sed -i \
+		-e '/set (CMAKE_CXX_FLAGS_RELEASE/d' \
+		CMakeLists.txt || die
+
+	EPATCH_OPTS="-d .." epatch "${FILESDIR}"/${P}-desktop-version.patch
+}