version bump

Signed-off-by: aballier@gentoo.org
Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x160F534A

4 files changed, 83 insertions, 6 deletions

diff --git a/media-sound/zynaddsubfx/ChangeLog b/media-sound/zynaddsubfx/ChangeLog
index bf2077763e4d..a4baba469ab4 100644
--- a/media-sound/zynaddsubfx/ChangeLog
+++ b/media-sound/zynaddsubfx/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/zynaddsubfx
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/zynaddsubfx/ChangeLog,v 1.46 2014/08/10 21:13:12 slyfox Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/zynaddsubfx/ChangeLog,v 1.47 2015/03/17 11:29:36 aballier Exp $
+
+*zynaddsubfx-2.5.0 (17 Mar 2015)
+
+  17 Mar 2015; Alexis Ballier <aballier@gentoo.org> +zynaddsubfx-2.5.0.ebuild,
+  +files/zynaddsubfx-2.5.0-docs.patch:
+  version bump
 
   10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org> zynaddsubfx-2.4.1.ebuild,
   zynaddsubfx-2.4.2.ebuild, zynaddsubfx-2.4.3.ebuild:
diff --git a/media-sound/zynaddsubfx/Manifest b/media-sound/zynaddsubfx/Manifest
index 7d65cc62f536..525ae53f3b57 100644
--- a/media-sound/zynaddsubfx/Manifest
+++ b/media-sound/zynaddsubfx/Manifest
@@ -5,18 +5,21 @@ AUX zynaddsubfx-2.4.1-docs.patch 420 SHA256 379c61a8f911d4794f3369f5b12b46142b46
 AUX zynaddsubfx-2.4.1-fltk.patch 1492 SHA256 b4fab50f4fd3f91d655e9c613973b2a50750b73577044301cf6b7017d0714c47 SHA512 03cafdc4aafa8956d4b143fe3726f3187f0372c7b5e93d1acd26692c3a506d141ce8015aa96e9786576e89e5f0e6318e8505492095c9dbbefb5922e0d3d04b3d WHIRLPOOL 6bdd127d9c3e485223f2f8985b33acd5e6d45b0c92e9d51787e881bcf189c1453f3f67aadb79e307ce6533a3198119f3e8d3c4a5fe142fbd7fb9dac139b2d384
 AUX zynaddsubfx-2.4.1-fltk13.patch 1978 SHA256 34b328ae07ec901e0508914ae76f0b9b38cb0cf2e12afed585900eaee7048d22 SHA512 7fc4ddf564035b88ec7c9100eb1b29c0011a6b567c141d25861db1c1a76ab931d5dc6a704d9300d78ae524b00a05eca61612e1ea05f284026524b56af799ccdf WHIRLPOOL 91ab050f379fb7724c49486e0da31d70e72806e690b873f06201a7ce1be7b67f526846d0b1b73c3e70447fd60c10760f4f6494c724c484f9b785118bc0806b72
 AUX zynaddsubfx-2.4.3-nofltk.patch 487 SHA256 8428e1214a257a03ec6cdb3aa702d2ff55ad055c6ed59f4432ecb416af107528 SHA512 c0ecfc942eb3e3ceced6fffbd05f764fc4ded5e16eb74510b327c0c7ac7641d5a33cf219a1c111c6a2a48ce327a075dbe2f4f9768a0e67f260db9c2334328d9e WHIRLPOOL 97e7fae25a218cbb83c50bee855b6b7e10245a6ef7e92fbc28986492ca6eb27c4e84e64bb77cc22569c07b75032b3fc8435e4480e6f50d89e20068abb3348ac2
+AUX zynaddsubfx-2.5.0-docs.patch 544 SHA256 cd975892680d93b9d9b675de5a55e0d82c2b7aa0e1d7c45ea6153c29e4167364 SHA512 47dc77bb0f1dd37efc53dff4f71d75557787e0a726cb3d82ac7d66840cc60de6c34bc181102700e0bdb0e9a4cb30c0722511318fd2e79bd4b4a8db6f507bc51e WHIRLPOOL 84aa18074724b6dfdc0cc45effdb7cd2964f4950a992b6af4f89f4021006c39f3d294bb48c0a9c7611afae7019af8b2990080dc7ffb209f8a8cf02af5d8f6e2d
 DIST ZynAddSubFX-2.4.1.tar.bz2 2449356 SHA256 cf796e23c1f268307373dca3d0dacaf80a19d813da4bd290742b6773e0a3c5fe
 DIST ZynAddSubFX-2.4.2.tar.bz2 2447485 SHA256 7d43bfece3b02625528dab7139e0fbada5768ac2722df137794b157602f8e802 SHA512 558389a62d121242ae8d3f2e9501082a64ef9e2f4540873d4baaaa82bac7113e2941d5119268bbfee375953d0fe8a8d91006f06998de4035705588e9c56b56d7 WHIRLPOOL bdec8e7a05db9b20948e2537cb644836093148a3438db67097e523acd64ee85c86ad6c978c821e840fc4096b380e325609d6d330e3f0e4d61fedc2c0d757876a
 DIST ZynAddSubFX-2.4.3.tar.bz2 2536667 SHA256 b84b595660ccec3ebc364c29c2d29def7d28a6947fc1dfb26bd8c34ca0e7f54d SHA512 2314c456db1a8a032a38b012c7c9e01f0a487c5eeb0027a741a4ffd6a7eea3382fcd26a8cd97b89af40800613c1ba164bb683be800957ea403f97dd6f23df5ff WHIRLPOOL 46aa59378f310105504b0ab5903d35826aa03dd080e6c7313237e34a2c9c82cea1d9c0f2cd986c65da38320b1376477b33424b8c69fd8fa591a53325df0b4a65
+DIST zynaddsubfx-2.5.0.tar.gz 4185453 SHA256 a3810708291367298e04002eda29237ff5f70240e432be84ea48b54895746aa7 SHA512 830388593079690153ae9cdcfb35362bd33208d93d7d56d5f4967c626dc3a12c7717088281d382696fbe22294874e37efd1566874743fb17dba54fee0eb40b0a WHIRLPOOL 81ca9724906846fcfdbc91e04865da9d8d3ebbb5a19ac5cb42639f13228d709815e651c07a4fd80b3c2af7b0f2f2538d50c06b0026119bb7f9e7eb922a9ed6a3
 EBUILD zynaddsubfx-2.4.1.ebuild 1761 SHA256 ef0bf0483201552c6ccf9a27aa71d3111a41db16855ffd0ecf998bab1e4e5479 SHA512 e3ec3869d6d7b5d723db4079c92caf15aa5d9f5d1aa832c854bd3c29bc7fc28d1b2107f04f529425b7c6acf26a246db47409f916246e847b792023bbce0574a6 WHIRLPOOL 9e5ab385a11bf6f21386ed52b004eb4bbb25ea9464d782b1317fc3feee3f44c703e2bacc03c03e4abde4c500fbf4e19d08d9359f9f344e13eaa115489eb1f1be
 EBUILD zynaddsubfx-2.4.2.ebuild 1706 SHA256 0ee199c077e02ed1a60832a0cbbb7e02272cba466347a6e28854ef365e537ab8 SHA512 31f94b687207eb7753c67d5cb777095a6cfc1aa68f192eb1d1f5c00d6ef3098cbe6a8aab2e7ed4230126a3945348416da4217cc80089794ae95f74e92cb4f8ff WHIRLPOOL 7662d1836563d81f615d36eb26fb73fac7ba17f8f34357d14cbc3850d0f37d02b1c8a42d06f4e53b0d78f6066f53fa6c398fe5f84bdd8cb1b96e2438f218c254
 EBUILD zynaddsubfx-2.4.3.ebuild 1736 SHA256 d90760a3b93f627e344e09b16927af1485ba6b3e74f79024c90846d23cf37142 SHA512 72041fe40ff5aaff7460c5de5b3e8251a60b8c77a6552c73763d2cc0d0544fe56068770254a44ac4c4951e2637ec7e1e258f72831c192b40daeba358c3d6e1fe WHIRLPOOL 2336f730466646783a0a6a555999794b54288b0acb58ba214cb3d728be5d60423d2cbb142d46d4ad6578d59d6e4f871d2d5df0bbc09e825a86f52379dbc73955
-MISC ChangeLog 7973 SHA256 7e0c9b545edf90cad2158e5f6ae91a210992b8c61a172f5f8c45d0def2c68cfe SHA512 ce6255cf02c47c50d5f52c4beb5f31c001a58ea5f437ab09ad4d94891f48a0387d84ade4892dbe71a0978b18ea560b5b708b1987dec818426b52e6567e84a757 WHIRLPOOL b66ce64f27b1e5871407314d34cd244979d585e09e3dfab59a3592adcc21c48ee8082fe35c826dd57ad0d6b6b23df62c403e0c0d0e71353f93b59554f62c41db
+EBUILD zynaddsubfx-2.5.0.ebuild 1679 SHA256 30ea3bcd1919837f86374dc2ed39d33ebd92429637529354addcd19ccf302534 SHA512 92d222d424f62f76080cd10ee4b3b8b0bedb9030a95813da9484f72e98073886c297f141cd7766d5df6cd237475453d47d7f513c2873dcdcd85a9e9937f050ad WHIRLPOOL e8580aed3f89ee2f67a18a2a0ca163ce0f0e1fe6e0c91c8897055fcf1dc64ff9fa41f85d6ac5da036c4d1f55ab0ebcb1aaafd37a9c1c3c5832ee84a0669b2226
+MISC ChangeLog 8143 SHA256 f9c410e4d1d71c293253888688d9dc85f75df788ecc39b57ae490e4ea515f722 SHA512 59d7cea56c1d6460b0e63b0f1b92f464892eb293ea6c55bfda3d8a024adc0dd3a191728cdd5477551030dfb5500c8969d4555e59b678b52c33167bbf724e9d18 WHIRLPOOL a632edfa9897ec3e6b80c2cf69f9c2f294bb87ecca9adc39cd218788c5887184c74a0a965ed954b55e452bdccfc1b1b0ac2d6e6b858ab6812d4a29d9ce922440
 MISC metadata.xml 161 SHA256 0ba191421eefd954d1efe9f6c3384e8c8d7455d35a7e79457272e1c29211b09e SHA512 e9f8695c64d7b6aa86b9b6186490d50b5a75d593ac1c86b9698265c6345899c64fa712acdde3bdbfb2464139e44623efdae29b67b73c1c85bcbedfbd10e874fd WHIRLPOOL c01ec8b583f907a3a62da7d5bf74d09809244709021f437dc3f0064b2d52baa3dd4386369b46a9fd74020146017cf6117ad04b147e8538b1a2c7202e1b4a2dd5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlPn4GkACgkQcaHudmEf86rk0ACfboh2MuNXlpP36s2SYotOaiYA
-uPsAnRmbSo8B7ci8d4XhLzIHAqTHucEy
-=7N2z
+iEYEAREIAAYFAlUIECEACgkQvFcC4BYPU0p6KwCgpuFBTKeC9bI3WxK9oP2e0685
+xTMAoJyzpt2n/meSF3EZJLM0rCd7YN8+
+=c8T2
 -----END PGP SIGNATURE-----
diff --git a/media-sound/zynaddsubfx/files/zynaddsubfx-2.5.0-docs.patch b/media-sound/zynaddsubfx/files/zynaddsubfx-2.5.0-docs.patch
new file mode 100644
index 000000000000..a1b7d9332ea5
--- /dev/null
+++ b/media-sound/zynaddsubfx/files/zynaddsubfx-2.5.0-docs.patch
@@ -0,0 +1,14 @@
+Index: zynaddsubfx-2.5.0/CMakeLists.txt
+===================================================================
+--- zynaddsubfx-2.5.0.orig/CMakeLists.txt
++++ zynaddsubfx-2.5.0/CMakeLists.txt
+@@ -27,9 +27,6 @@ include(CTestConfig.cmake)
+ #Currently the only directory that uses cmake
+ add_subdirectory(src)
+ 
+-install(FILES AUTHORS.txt COPYING FAQ.txt HISTORY.txt README.adoc
+-	DESTINATION share/doc/zynaddsubfx
+-	)
+ install(FILES zynaddsubfx-jack.desktop zynaddsubfx-alsa.desktop
+     DESTINATION share/applications)
+ install(FILES zynaddsubfx.svg
diff --git a/media-sound/zynaddsubfx/zynaddsubfx-2.5.0.ebuild b/media-sound/zynaddsubfx/zynaddsubfx-2.5.0.ebuild
new file mode 100644
index 000000000000..13add9f02f00
--- /dev/null
+++ b/media-sound/zynaddsubfx/zynaddsubfx-2.5.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/zynaddsubfx/zynaddsubfx-2.5.0.ebuild,v 1.1 2015/03/17 11:29:36 aballier Exp $
+
+EAPI=5
+
+inherit eutils cmake-utils flag-o-matic
+
+DESCRIPTION="ZynAddSubFX is an opensource software synthesizer"
+HOMEPAGE="http://zynaddsubfx.sourceforge.net/"
+SRC_URI="mirror://sourceforge/zynaddsubfx/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="alsa +fltk jack lash"
+
+RDEPEND=">=dev-libs/mini-xml-2.2.1
+	sci-libs/fftw:3.0
+	alsa? ( media-libs/alsa-lib )
+	fltk? ( >=x11-libs/fltk-1.3:1 )
+	jack? ( media-sound/jack-audio-connection-kit )
+	lash? ( media-sound/lash )"
+#	portaudio? ( media-libs/portaudio )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+# Upstream uses the following preferences: alsa > jack > portaudio
+# At least one of them must be enabled
+# We do not support portaudio, so if alsa is disabled force jack.
+REQUIRED_USE="!alsa? ( jack )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.5.0-docs.patch
+)
+
+DOCS="ChangeLog FAQ.txt HISTORY.txt README.adoc bugs.txt"
+
+src_configure() {
+	append-cxxflags "-std=c++11"
+	use lash || sed -i -e 's/lash-1.0/lash_disabled/' "${S}"/src/CMakeLists.txt
+	mycmakeargs=(
+		`use fltk && echo "-DGuiModule=fltk" || echo "-DGuiModule=off"`
+		`use alsa && echo "-DOutputModule=alsa" || echo "-DOutputModule=jack"`
+		`use alsa && echo "-DAlsaMidiOutput=TRUE" || echo "-DAlsaMidiOutput=FALSE"`
+		`use jack && echo "-DJackOutput=TRUE" || echo "-DJackOutput=FALSE"`
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	insinto /usr/share/${PN}
+	doins -r "${S}"/instruments/*
+}