version bump, introduce jack useflag

Package-Manager: portage-2.2.18/cvs/Linux i686
Manifest-Sign-Key: 0x60373227

diff --git a/media-sound/ardour/ChangeLog b/media-sound/ardour/ChangeLog
index b5baba028b40a4e8632466fce125e9dcb463a38b..9ae1851957a3ff7180fcc6d0cb6f02d87e39ceb3 100644 (file)
--- a/media-sound/ardour/ChangeLog
+++ b/media-sound/ardour/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/ardour
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ChangeLog,v 1.139 2015/01/29 18:52:23 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ChangeLog,v 1.140 2015/04/22 13:42:22 nativemad Exp $
+
+*ardour-4.0 (22 Apr 2015)
+
+  22 Apr 2015; Andreas Schuerch <nativemad@gentoo.org> +ardour-4.0.ebuild,
+  ardour-9999.ebuild, +files/ardour-4.0-lv2.patch,
+  +files/ardour-4.0-revision-naming.patch:
+  Version bump, introduce jack useflag
 
   29 Jan 2015; Michał Górny <mgorny@gentoo.org> ardour-2.8.14-r1.ebuild,
   ardour-2.8.16.ebuild, ardour-3.5.308-r1.ebuild, ardour-3.5.357.ebuild,

diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest
index 762092a1cc587430c4ef278bbbf297ea59a4c2ec..d8caf6478ba05eeab8cdd7a8f9b8d1d0577336e5 100644 (file)
--- a/media-sound/ardour/Manifest
+++ b/media-sound/ardour/Manifest
@@ -9,37 +9,39 @@ AUX ardour-3.2-syslibs.patch 1743 SHA256 9ed8fecbc4ed28115a24675e987f41011afcfad
 AUX ardour-3.5-syslibs.patch 1568 SHA256 a69245a68df400d0961a189bdee5181ea84e95bf3fd6a68f20809096e26a5d02 SHA512 d086b48ef56292044570ac6d12474a60fac55d884b27a64720776538b5986651d4384d2b5c7f518fe608bb6c8e3ee184a27df62bfc6523456200fb60e4010474 WHIRLPOOL fef364e25ac1246ba6a08d08d7cee9fd8afeee4af9fd2ff50dd3f2438f70174f404d69a490f63feb098ce6ae4c5918a4fa0f5220aa3462144f4cb20c3502572d
 AUX ardour-3.5.403-sse.patch 1130 SHA256 1caf142b3a82369d39b734bd8459509da88ae6e10bf60bc713fbb2ad87f0b608 SHA512 72a25d45b5521469b39e09dab744d68b05b68359487cc0b60a507deda2d6b22744ee12032fc7682aebc193d2c595fcfbbc1e4a818634d0a57efe52c384330ef1 WHIRLPOOL 3e5a6f5ea4eabe642225f5c35ec131542a9df86f5a009757548ec8f0519c89837d8c1c7252378c88635a14e1b60675a2458ef837e32647b4a40d53133f08b941
 AUX ardour-3.5.7-syslibs.patch 1750 SHA256 6c4b9f69f273cd5e6eb8cff8cb674ce71858bf5b23130dd89444e2085146c414 SHA512 e97d07564becd5a01f622de5af3ff3bbac75d54bf8979080d09fdbba84568157ee6c91d63216cf9415bc766277e15daf1747808685c566ec22f221b4d1ff2b4a WHIRLPOOL 37636b205b79ae70aec6fba850be3ec604b6e43461ff25efe32c784a6a05740af16154d18143a49351912094d9f18863740de1686a88a698e1e578726db06762
+AUX ardour-4.0-lv2.patch 2095 SHA256 b6c598bcd614c72a1071eb75e9f656824af65b06b542bb87560046a1824f4fd2 SHA512 77688faf865874b8d64785b33d3837a47c16de640bcfc5ef20006aaf2f21df0b5a81c89c8d7cf1456dbf160cdea91c5c02488a15fad202d9bfdb5aff04cf1c73 WHIRLPOOL 4aa0938f445c9257ea3ab32b3573f6777237ef204f78f31f287f1e1a3617ad2bb69b1a6a503909eed6f855725610d1bbb27d5758a630b85ace75325e19fbbaa9
+AUX ardour-4.0-revision-naming.patch 2607 SHA256 77e816ad36ce1c28971153e7e27490060e3377f5f7af6f9f45efe35c51f6de74 SHA512 3519ec17744a5ba243c2d1e7cd0e91d44a76f6fdb258d5dd25858ef137c7dc0d6f4e524a28b5092ea96712736bcd616fe21b3a299ced6b8bab4c92a4147f11ad WHIRLPOOL ed40670247e9d50e5437461886c5d53ada772dff35d7bdff873a13c0d094cb110a087ba771a1c60c974e3ded828ea9c2a0ff8e231560be2af8f6a03cb1c138c3
 DIST ardour-2.8.14.tar.bz2 2169985 SHA256 e07e483a12354c00d821dafbec5f5d2690062b758205daceab723bf1e9a633fe SHA512 0d861cfe99645ff5f7847b5e3296a1dfb6d8f15e8686ac79819b114843988b669b117bcfce89a77435d7af252b50bbfa790eb206f69dfff39f7c97126cf26540 WHIRLPOOL 75382e17152d7eea18820f7e72fff2f29553edfd4e15609f73842411edf5605d1ca2a2a8497e08747f5c210393822dc32a1b90e72cdff9774ab4c2a060de6073
 DIST ardour-2.8.16.tar.bz2 2169916 SHA256 37ee32119ba105fa0883faa7e18c58ecd5276894568da224a554d9ef49075e40 SHA512 02e74883cf466fcd5588ec8f2fd9d032b4611071d630b412c853a7ae7cb46045c0cde4308abbc78da3f54aae0ab1c32a980b8d1e1a965c8633ef43d8e08e0d0d WHIRLPOOL 357b45e506da05b1ce17f006c3e2b22b17150b5556e06785b961b308d958fb66fa82b3e01d1d5e596e43caf6b9d1c83287696a6c694e54114fed5825e2fc5a51
 DIST ardour-3.5.308.tar.gz 8578598 SHA256 8fe7d396d182c1cecc377d70e788f4bcaeca6276dc7474a6589e6469acd77d8b SHA512 64b1719c8262840bf8f02d5843640efecd1a7cb1e0a706b778db9d8f849d7cb611bc34bec3fee8291f3b01491b913e5d5239c772ba40ce883ee00d6bfeb48b41 WHIRLPOOL a5422a5f8e6addcd0bd03a11d18a057e06d82c8b7039128f25de7f6d9c906c2fd05a7c46e54403e1f18c0b7b06c1722638c66a7a0f1d55f7e04d6b0dabfd2baf
 DIST ardour-3.5.357.tar.gz 8579943 SHA256 1c13a3200bfa0fb8c0adddd3439102e0caa7f219a0f2518a4ba0d233924ef0b7 SHA512 8ee6d3b3f8e05547b3e9487e56344c2795fbc4781f6ac03a0c1684c534940570e3138023df4e57ce904c99e152ff212ddf67d83c1c95ac8542cc55a6e379c90d WHIRLPOOL a32508b6b54909111bf9a074df72d312f164a18840c28e96d1c38e368a13f8ea8f9dc6d9fb4fc600af97e06ce79fdd21a58f1701125a02c5a26ea919d823d2ae
 DIST ardour-3.5.380.tar.gz 8580892 SHA256 476829114565b56f6dd9f05d1e93752d36db6db453f0f69c09ed43f6b3ed88e1 SHA512 286290186e400cdc9fe350dce3e785de8193adac7a7de951b78ee91d0ab8a29ee4dfb113f2e996a821e6e26079749a7a2f09583451b364f5497027c0b52d7f0d WHIRLPOOL 2a59c5618690d8570a782ea7b2ad2882de7affc7b98a1d0d834bdb2b2a36031570b7e9e68e83f2b8fd19e224fef2393601b47a633659f8fca5fbb11102b957f9
 DIST ardour-3.5.403.tar.gz 8583763 SHA256 46490623479d9a25e2ab98b817c1f5c42b1d042f62afba1d1828d869a0c2d395 SHA512 e00053faf6c4f62dc80c85d82bbdb4b65de2111c9c9efc9d9e03b73be353a7cd652c02a2989566fd30491b1a07d02a7ff15e4523966163cf2e5e4c708a12aac0 WHIRLPOOL 726b66d236a9488a58fe333cbe720bdbd6beaf993d0e738ff8757cf7f657be164d5d0e390da09c773ab3b590c3bcf73be03a358164d54bd19fa7b025ff13118b
+DIST ardour-4.0.tar.gz 9189038 SHA256 ea1131a24774d5f8dcab4ac7ea3b36bd427b1e4d0bef6f3db0681bc4ca131cf1 SHA512 2317c5818fe89386319f12062f0af0d08b07f569d6f775b7ecfa4f3a4bb1f565e05f3ff32f05f591c5628bdd402eda5bce4be4f8fa89da6c2092d5edb2c9ae7a WHIRLPOOL 854145ed135f6b23222ab2d6022e31b09221cac0d326fa17c5ee88e4e8ebd033e69c447fcbac35a925ff23974cc8b2b13c076014118977bbc88836124a912ad4
 EBUILD ardour-2.8.14-r1.ebuild 2020 SHA256 3dec9eca6b07672e344f49975ecd4741afe28205a7675a0872996755b612e5a9 SHA512 cee41a3a36f228e128af4adb8e5d89ba0f322fa193f656e79c3e4e0cdfd5d496fc06605c9328d0d5f273b3a77b1601d126bb9024c2b1bbe9027841aa700f87be WHIRLPOOL 41cdb3fb49c3236c4e8227a4c341a8875e871128b529f0baa4779cc9aff179643a96f34bfecb147beb0ace7fce1ff3e5100f6504366615e7fa9d965e8742586a
 EBUILD ardour-2.8.16.ebuild 2032 SHA256 beed4e986e57f3cb9b3b2ca8a556f26308c1a122dbb58d84901108cdc5ef7969 SHA512 ddfbe3599572136d14340732d8ac6fc26c9549cb215e08a110769f6a8f9ddaeb0be8944632b0d82b7ab63c3d8b05bd4e3849c4eefa3166d10cad844102289024 WHIRLPOOL e77727d63c27fd582fa5d18ec59ddb46abb0b94596222aeb7fb5e992f1a442f602b6f9da63f6c86f368633f2e049b8f17bc695e83bcc905fda1c976dfee606db
 EBUILD ardour-3.5.308-r1.ebuild 3200 SHA256 3c93b1b99a5d17d2183531705ccb623646a3d62845581a81e1e84d7a75fb899c SHA512 97bd3eef1198016023405bce1dc3faa554075940b4ed0c11cd387b28a5582d972cdd115edc4fb510e27641ed54fb3386f307636f93ff86b81bc383e1113e1dca WHIRLPOOL 8d7839da5a63534ba9049df52a878b718c29f4f21e0b30fe1e2b97bea7605c9899a0c8830792c33293cc8bbeacb52a82606c35223d6f693c4bcc8b8b099b24b5
 EBUILD ardour-3.5.357.ebuild 3197 SHA256 13ec34b6c51f469da1f2b713347c8bba27d3cf076ed2c946e24f0ced1c9513cf SHA512 c52a354231caa078cc04d147454526b2a8f161bf089c4a6acfd0ffa8e4eafcd2ac36afc0cadcf154d387ea2ac133d70e3cbe7eeea4871aa07d214501b13433dd WHIRLPOOL 1bdf2ef5710f21cdf48bf77a47c0d7ab02c0a5ce54c2332c23fd7093805369a53637d20da1580b76a24a120e8278995a63d235c4c6eb6d1c6748d9f2163ce2ae
 EBUILD ardour-3.5.380.ebuild 3311 SHA256 6d1f06ca01a8c775247a87d7fc8c3e2c66b2bd847386d6c9ed32f1ff98ed4494 SHA512 3ef5b97f108a3e1a63e175cf0847f67c3c519828f424e8b06c752874269a69fd9c6fa808df013f62f3c28eebdd4a68279d75dedbee6b7465d22447fcfdd73235 WHIRLPOOL b80335eef5690cf01db84834413d929b30bc88f9b723581e2400dffb13dc44f474eab65e50dfe0d9e8381015cfb55f59073695f526ee509eadcc134584dea731
 EBUILD ardour-3.5.403.ebuild 3732 SHA256 43b03f5333a2d89743484b9330d1ce9e57efbf13b828f6588b8d2698d9e1bd5d SHA512 227767a07bb2318d4b5191a0418b4a53fbc8411c02e8b431afe6d390d4caab2a7304a6570bf147cd0936bdd79a5a8e885374fb1b7364906b5141f2e47907d616 WHIRLPOOL 4fb8486e2ecff3b829abb55d7d06a00f67305c256b9222280360abfec32aefafa6846a702b6518aa854aea440589d17606cd79359f1a83e9e1583187c160a639
-EBUILD ardour-9999.ebuild 3781 SHA256 78551c0038e2994a7a68fab7a6629a45bb1c8e067771cef74968bf53400e5cae SHA512 03d229fc78389943f7a3ac9d370dad5aae63c1643f75085a397a217dd85ecedfee196f71a92c0687371b7afe2ce60d88f1bc7110812104c580f3c5bff77b0042 WHIRLPOOL 12c46478c641a40b76487dae9f25a3ecf8208a98731508d879ad543ef44cbda42ddb39691b68c144297e64c5f161ee5983edd700a9219c907277222593d26d69
-MISC ChangeLog 22957 SHA256 c22765336774246d04c0c96d64fd4722ee2194bd1437cd17070b841d086eb6d9 SHA512 67d9e6e4fa5c42f427fc05be9748f8e59517a5409f124be5cc6c07475f7a8a87208487411907f0126d27e67a9b331edd8f50891307b6048549f9bea87bdd8ca4 WHIRLPOOL 4bf41b703f9eb9da56b92ec5eaa1e8c09f3f4453ca5152299ff7308c6935f5264a6bd10501a07ea13cc0916b98b5fdc11efde75b9dd33ad0f33a8c96a4b4661b
+EBUILD ardour-4.0.ebuild 3900 SHA256 e9fd51b51b49e29d3b32e50dfebfe866cfbf1a05d00fc2d66e89117af899cef7 SHA512 d5161a54d11886b030928b45ea7d0cb2e231f86ad045d4f48641d26f6a445918cae29d87d38ae4d3b438d1daafd72e0b4a34365cd3c0959fa151a325337137fa WHIRLPOOL c8cc6ba1967dc0a7d740acce8b77756408f5b0ea9742772ce0c63ac97791b840653aa43eb7490f7a2f108e2790436b213f9f85fc53b3691ed5dda402d80d9582
+EBUILD ardour-9999.ebuild 3902 SHA256 d1662436fab53f3871afedc92371ae9926b3142bb5ab1d1817e965274e578439 SHA512 b0543f4f25f70bf0c15dfa8461facf067723620304d1b31fe8e3a9b2f39c439d94a5524b4c92e39a0707638359f09cebce512753c683ed6938aa15f9a65a75ff WHIRLPOOL 22addb436bd3e8a99b947def6ce2d58471ae8783c4a7770b1f749588f43d1e04c53171479b87e02218898470ff145302d852486af2ee6b1597b905aa4fc1a3c3
+MISC ChangeLog 23196 SHA256 063b6b6e351651631d7632198284b9719213040813be0f5cf8ddf41a820da6bb SHA512 090b9348c05d395e420cf1e6e510aab512351d16c5ae99aae642ff2ae8bad7e837c58b3a2949d6e7f6f38df1ff5d16d444f05e4b49114fc47176cf0604035791 WHIRLPOOL 1e050bc05b89b0288a018098c84011842ec0cdad52a635fc323b480c2f2c93997e9889aab68f58d0bf8e829dc76edfcaf1bbc9fd51e09c14969b879a9fe629bd
 MISC metadata.xml 234 SHA256 20428aad08fee2f7a7507f1b456c7ee3ebccd0eba59b90bd70d78b972d2b0799 SHA512 ed4a455e15b346baee30ba9c76637a199fda7c1d7c144cee546d45e7312dc7cd1f50be64d80b0900834a5b7e3851ce82158b676696c3ee1b34809a341edca2a9 WHIRLPOOL 68998d2804aab1645e9cb386ecd149680486b967ccd65b281327247a5617ef3f7c5ee25be285a502d397e6c414db70f39111716a2fe5f7b7a012c327fbe5abae
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJUyoFtXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOZTwP/RG1iupC+u8JCriGK030R9ty
-UoE6WHyKgNSSkeChdLHHpZwxAuBeVTYefq8uWsPt5Ja8LiCWJJUfr45+CWeV/Ebc
-QLwqAk0hzQxPO5v1yyMLpRlOtHCZd1uKqLhqGwSO+syviQFadkbHL9WUdTEvRLId
-T1+gKuBt7S0Kifk44G8rPJd9Sloc6Eg+Avrnlj35niEQatb+yPUn6DPBWylHbgDR
-bCmRY2yGN6ol/GB2sx7qY7RMoRzfCgs3ppH1K4HXZjzM+TKrpld1q4dj7ykP6xkL
-ooNXmlQa20iyRVj6vsfjH5DJlr6g2EUqK5MWjSHavLOufB3n6GjMTJ0IIQsHWefg
-kqGA1RCB5qUKmxfp9fV7Wz80Z81vpqFnTna5tlxz6Fay9VZeCyQgB0BCHwLQCUI1
-J6iqoWhD2RVhnz1LPqeUAW28nAKHttxR8xE43fhKuqJshRDQ569nyB3BqFr+EIDD
-xXp8xp5KtYbSB98Hk/PdOZ8SJuXDVZe/7ukir8hzyNXHaOTsS5c1QjW619G0dPmt
-oB06qvNjZG4SzMUa/i91dnqDq6V0kZhSEP9a2Bk0PLUkvugZjKRBlQT194ZWyxD2
-pVES/R7Rqr5b7obaOA01pPI48DbI0TBd+Whgqa7HZ+7MMfo3PuYTFWTVDZBNJr4C
-j+yr0eU42j73Ha88VGUZ
-=x/uU
+iQIcBAEBCAAGBQJVN6UZAAoJEIug43o+kWudKFAQALov2QjHUgS4o5AFIEfJ9Ccy
+YP3MAN2H5Klik6mqitRi/fLnHJ8TggA/XmR92SGkQ3A5ssqjp+U8l0xhcSpaYG6X
+dxY7nvYS08K1OYNO9DfNBC9Gc9n1bEF8e5SybH1yGytMAUm+3HiU8jqu5igwXWEw
+rBTcIynnZWBYGxcwBdBJ7shYpm/2RF7fnCytOoFJNYgkqiKXAkEy3BdXYw7YmFhf
+01+BYLvT6rRtoQeDY9nA8t4E+A/2Go6a+8tAB/EeHwMy4MZxRnMgGpydoFm5DUmp
+FElpkdz1omkfTE2D8v4oHVtaUrL71biVLQyS1PV98cIoJZag8JoRafFHQ5hPQZcH
+8LxMx4aSGslkIojMMBR5yScU8E4YBWWew1hE+t1DyGVqWysIIbc/a2HWFxdr+fyS
+h1knXtpQNANwX/5/UnQ3xNVJZUj1ufX0npClRkSbi4l3Z6aAFOmcTwTEF1jptv3c
+y8tBbyNbDa25zPXwDtNzOFL3q0TyyALf9ntm/rZO5cOoNb71JAM6zuB8GdZWR4c5
+1Am50V+X2U+7XMpaa5QBwn08LbfV4WmGmhVPsfWIw7KM53fB6XXnz2bQHGdahGPx
+HOkKuwwct5vy7cr0psXRO/b5di5ENdqgApfcRCxcnghAQzH1HEoD6fSY8LZ7oJ+6
+A+1/YDEapFwyq7OHw2NY
+=c365
 -----END PGP SIGNATURE-----

diff --git a/media-sound/ardour/ardour-4.0.ebuild b/media-sound/ardour/ardour-4.0.ebuild
new file mode 100644 (file)
index 0000000..d19192a
--- /dev/null
+++ b/media-sound/ardour/ardour-4.0.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ardour-4.0.ebuild,v 1.1 2015/04/22 13:42:22 nativemad Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='threads(+)'
+
+inherit eutils toolchain-funcs flag-o-matic python-any-r1 waf-utils
+
+DESCRIPTION="Digital Audio Workstation"
+HOMEPAGE="http://ardour.org/"
+
+if [ ${PV} = 9999 ]; then
+       KEYWORDS=""
+       EGIT_REPO_URI="http://git.ardour.org/ardour/ardour.git"
+       inherit git-2
+else
+       KEYWORDS="~amd64 ~x86"
+       SRC_URI="https://github.com/Ardour/ardour/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+LICENSE="GPL-2"
+SLOT="4"
+IUSE="altivec doc jack nls lv2 cpu_flags_x86_sse"
+
+RDEPEND="media-libs/aubio
+       media-libs/liblo
+       sci-libs/fftw:3.0
+       media-libs/freetype:2
+       >=dev-libs/glib-2.10.1:2
+       >=dev-cpp/glibmm-2.32.0
+       >=x11-libs/gtk+-2.8.1:2
+       >=dev-libs/libxml2-2.6:2
+       >=media-libs/libsndfile-1.0.18
+       >=media-libs/libsamplerate-0.1
+       >=media-libs/rubberband-1.6.0
+       >=media-libs/libsoundtouch-1.6.0
+       media-libs/flac
+       media-libs/raptor:2
+       >=media-libs/liblrdf-0.4.0-r20
+       >=gnome-base/libgnomecanvas-2
+       media-libs/vamp-plugin-sdk
+       dev-libs/libxslt
+       dev-libs/libsigc++:2
+       >=dev-cpp/gtkmm-2.16:2.4
+       >=dev-cpp/libgnomecanvasmm-2.26:2.6
+       media-libs/alsa-lib
+       x11-libs/pango
+       x11-libs/cairo
+       media-libs/libart_lgpl
+       virtual/libusb:0
+       dev-libs/boost
+       >=media-libs/taglib-1.7
+       net-misc/curl
+       jack? ( >=media-sound/jack-audio-connection-kit-0.120 )
+       lv2? (
+               >=media-libs/slv2-0.6.1
+               media-libs/lilv
+               media-libs/sratom
+               dev-libs/sord
+               >=media-libs/suil-0.6.10
+               >=media-libs/lv2-1.4.0
+       )"
+
+DEPEND="${RDEPEND}
+       ${PYTHON_DEPS}
+       virtual/pkgconfig
+       >=media-sound/jack-audio-connection-kit-0.120
+       nls? ( sys-devel/gettext )
+       doc? ( app-doc/doxygen[dot] )"
+       if ! [ ${PV} = 9999 ]; then
+               DEPEND="${DEPEND}"
+       fi
+
+src_unpack() {
+       if [ ${PV} = 9999 ]; then
+               git-2_src_unpack
+       else
+               unpack ${A}
+       fi
+}
+
+src_prepare(){
+       if ! [ ${PV} = 9999 ]; then
+               epatch "${FILESDIR}"/${PN}-4.0-revision-naming.patch
+               touch "${S}/libs/ardour/revision.cc"
+       fi
+       $(use lv2 || epatch "${FILESDIR}"/${PN}-4.0-lv2.patch)
+       epatch "${FILESDIR}"/${PN}-3.5.403-sse.patch
+       append-flags "-lboost_system"
+}
+
+src_configure() {
+       if use cpu_flags_x86_sse; then
+               MARCH=$(get-flag march)
+               for ARCHWOSSE in i686 i486; do
+                       if [[ ${MARCH} = ${ARCHWOSSE} ]]; then
+                               for SSEOPT in -msse -msse2 -msse3 -mssse3 -msse4 -msse4.1 -msse4.2; do
+                                       is-flag ${SSEOPT} && SSEON="yes"
+                               done
+                               if [ -z ${SSEON} ]; then
+                                       append-flags -msse
+                                       elog "You enabled sse but use an march that does not support sse!"
+                                       elog "We add -msse to the cflags now, but please consider switching your march in make.conf!"
+                               fi
+                       fi
+               done
+       fi
+       tc-export CC CXX
+       mkdir -p "${D}"
+       echo waf-utils_src_configure \
+               --destdir="${D}" \
+               --prefix=/usr \
+               --configdir=/etc \
+               --optimize \
+               $(use lv2 && echo "--lv2" || echo "--no-lv2") \
+               $(use nls && echo "--nls" || echo "--no-nls") \
+               $({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization") \
+               $(use doc && echo "--docs")
+       waf-utils_src_configure \
+               --destdir="${D}" \
+               --prefix=/usr \
+               --configdir=/etc \
+               --optimize \
+               $(use jack || echo "--no-jack --libjack=weak --no-jack-metadata") \
+               $(use lv2 && echo "--lv2" || echo "--no-lv2") \
+               $(use nls && echo "--nls" || echo "--no-nls") \
+               $({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization") \
+               $(use doc && echo "--docs")
+}
+
+src_install() {
+       waf-utils_src_install
+       mv ${PN}.1 ${PN}${SLOT}.1
+       doman ${PN}${SLOT}.1
+       newicon icons/icon/ardour_icon_mac.png ${PN}${SLOT}.png
+       make_desktop_entry ardour3 ardour3 ardour3 AudioVideo
+}
+
+pkg_postinst() {
+       elog "If you are using Ardour and want to keep its development alive"
+       elog "then please consider to do a donation upstream at ardour.org. Thanks!"
+}

diff --git a/media-sound/ardour/ardour-9999.ebuild b/media-sound/ardour/ardour-9999.ebuild
index 401e2722fce96007cb206408d88f073fb821889c..136f44a5f7230ad90c567fdcc7dfaf1993eb2710 100644 (file)
--- a/media-sound/ardour/ardour-9999.ebuild
+++ b/media-sound/ardour/ardour-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ardour-9999.ebuild,v 1.14 2015/01/29 18:52:23 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ardour-9999.ebuild,v 1.15 2015/04/22 13:42:22 nativemad Exp $
 
 EAPI=5
 
@@ -22,8 +22,8 @@ else
 fi
 
 LICENSE="GPL-2"
-SLOT="3"
-IUSE="altivec debug doc nls lv2 cpu_flags_x86_sse"
+SLOT="4"
+IUSE="altivec doc jack nls lv2 cpu_flags_x86_sse"
 
 RDEPEND="media-libs/aubio
        media-libs/liblo
@@ -40,7 +40,6 @@ RDEPEND="media-libs/aubio
        media-libs/flac
        media-libs/raptor:2
        >=media-libs/liblrdf-0.4.0-r20
-       >=media-sound/jack-audio-connection-kit-0.120
        >=gnome-base/libgnomecanvas-2
        media-libs/vamp-plugin-sdk
        dev-libs/libxslt
@@ -55,6 +54,7 @@ RDEPEND="media-libs/aubio
        dev-libs/boost
        >=media-libs/taglib-1.7
        net-misc/curl
+       jack? ( >=media-sound/jack-audio-connection-kit-0.120 )
        lv2? (
                >=media-libs/slv2-0.6.1
                media-libs/lilv
@@ -67,6 +67,7 @@ RDEPEND="media-libs/aubio
 DEPEND="${RDEPEND}
        ${PYTHON_DEPS}
        virtual/pkgconfig
+       >=media-sound/jack-audio-connection-kit-0.120
        nls? ( sys-devel/gettext )
        doc? ( app-doc/doxygen[dot] )"
        if ! [ ${PV} = 9999 ]; then
@@ -83,14 +84,11 @@ src_unpack() {
 
 src_prepare(){
        if ! [ ${PV} = 9999 ]; then
-               PVTEMP=$(echo "${PV}" | sed "s/\./-/2")
-               sed -e '/cmd = "git describe HEAD/,/utf-8/{s:cmd = \"git describe HEAD\":rev = \"'${PVTEMP}-gentoo'\":p;d}' -i "${S}"/wscript
-               sed -e 's/'os.getcwd\(\),\ \'.git'/'os.getcwd\(\),\ \'libs/'' -i "${S}"/wscript
-               sed -e 's/'os.path.exists\(\'.git'/'os.path.exists\(\'wscript/'' -i "${S}"/wscript
+               epatch "${FILESDIR}"/${PN}-4.0-revision-naming.patch
+               touch "${S}/libs/ardour/revision.cc"
        fi
-       epatch "${FILESDIR}"/${PN}-3.5.7-syslibs.patch
+       $(use lv2 || epatch "${FILESDIR}"/${PN}-4.0-lv2.patch)
        epatch "${FILESDIR}"/${PN}-3.5.403-sse.patch
-       sed 's/'FLAGS\'\,\ compiler_flags'/'FLAGS\'\,\ \'\''/g' -i "${S}"/wscript
        append-flags "-lboost_system"
 }
 
@@ -112,13 +110,23 @@ src_configure() {
        fi
        tc-export CC CXX
        mkdir -p "${D}"
+       echo waf-utils_src_configure \
+               --destdir="${D}" \
+               --prefix=/usr \
+               --configdir=/etc \
+               --optimize \
+               $(use lv2 && echo "--lv2" || echo "--no-lv2") \
+               $(use nls && echo "--nls" || echo "--no-nls") \
+               $({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization") \
+               $(use doc && echo "--docs")
        waf-utils_src_configure \
                --destdir="${D}" \
                --prefix=/usr \
                --configdir=/etc \
+               --optimize \
+               $(use jack || echo "--no-jack --libjack=weak --no-jack-metadata") \
                $(use lv2 && echo "--lv2" || echo "--no-lv2") \
                $(use nls && echo "--nls" || echo "--no-nls") \
-               $(use debug && echo "--stl-debug" || echo "--optimize") \
                $({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization") \
                $(use doc && echo "--docs")
 }

diff --git a/media-sound/ardour/files/ardour-4.0-lv2.patch b/media-sound/ardour/files/ardour-4.0-lv2.patch
new file mode 100644 (file)
index 0000000..a79e3f2
--- /dev/null
+++ b/media-sound/ardour/files/ardour-4.0-lv2.patch
@@ -0,0 +1,56 @@
+diff -rupN ardour-4.0-vanilla/libs/ardour/automatable.cc ardour-4.0/libs/ardour/automatable.cc
+--- ardour-4.0-vanilla/libs/ardour/automatable.cc       2015-04-18 00:23:10.000000000 +0200
++++ ardour-4.0/libs/ardour/automatable.cc       2015-04-21 16:32:14.943812000 +0200
+@@ -34,7 +34,11 @@
+ #include "ardour/plugin.h"
+ #include "ardour/plugin_insert.h"
+ #include "ardour/session.h"
++
++#ifdef LV2_SUPPORT
+ #include "ardour/uri_map.h"
++#endif
++
+ #include "ardour/value_as_string.h"
+ 
+ #include "i18n.h"
+diff -rupN ardour-4.0-vanilla/libs/ardour/buffer_set.cc ardour-4.0/libs/ardour/buffer_set.cc
+--- ardour-4.0-vanilla/libs/ardour/buffer_set.cc        2015-04-18 00:23:10.000000000 +0200
++++ ardour-4.0/libs/ardour/buffer_set.cc        2015-04-21 16:40:44.216812000 +0200
+@@ -34,8 +34,8 @@
+ #include "ardour/midi_buffer.h"
+ #include "ardour/port.h"
+ #include "ardour/port_set.h"
+-#include "ardour/uri_map.h"
+ #ifdef LV2_SUPPORT
++#include "ardour/uri_map.h"
+ #include "ardour/lv2_plugin.h"
+ #include "lv2_evbuf.h"
+ #endif
+diff -rupN ardour-4.0-vanilla/libs/ardour/event_type_map.cc ardour-4.0/libs/ardour/event_type_map.cc
+--- ardour-4.0-vanilla/libs/ardour/event_type_map.cc    2015-04-18 00:23:10.000000000 +0200
++++ ardour-4.0/libs/ardour/event_type_map.cc    2015-04-21 16:47:28.489812000 +0200
+@@ -24,7 +24,9 @@
+ #include "ardour/event_type_map.h"
+ #include "ardour/parameter_descriptor.h"
+ #include "ardour/parameter_types.h"
++#ifdef LV2_SUPPORT
+ #include "ardour/uri_map.h"
++#endif
+ #include "evoral/Parameter.hpp"
+ #include "evoral/ParameterDescriptor.hpp"
+ #include "evoral/midi_events.h"
+diff -rupN ardour-4.0-vanilla/libs/ardour/globals.cc ardour-4.0/libs/ardour/globals.cc
+--- ardour-4.0-vanilla/libs/ardour/globals.cc   2015-04-18 00:23:10.000000000 +0200
++++ ardour-4.0/libs/ardour/globals.cc   2015-04-21 16:54:33.404812000 +0200
+@@ -106,8 +106,9 @@
+ #include "ardour/runtime_functions.h"
+ #include "ardour/session_event.h"
+ #include "ardour/source_factory.h"
++#ifdef LV2_SUPPORT
+ #include "ardour/uri_map.h"
+-
++#endif
+ #include "audiographer/routines.h"
+ 
+ #if defined (__APPLE__)
+

diff --git a/media-sound/ardour/files/ardour-4.0-revision-naming.patch b/media-sound/ardour/files/ardour-4.0-revision-naming.patch
new file mode 100644 (file)
index 0000000..360ddc6
--- /dev/null
+++ b/media-sound/ardour/files/ardour-4.0-revision-naming.patch
@@ -0,0 +1,78 @@
+diff -rupN ardour-4.0-vanilla/wscript ardour-4.0/wscript
+--- ardour-4.0-vanilla/wscript  2015-04-18 00:23:10.000000000 +0200
++++ ardour-4.0/wscript  2015-04-20 18:26:50.849812000 +0200
+@@ -137,29 +137,29 @@ def fetch_tarball_revision ():
+     if not os.path.exists ('libs/ardour/revision.cc'):
+         print ('This tarball was not created correctly - it is missing libs/ardour/revision.cc')
+         sys.exit (1)
+-    with open('libs/ardour/revision.cc') as f:
+-        content = f.readlines()
+-        remove_punctuation_map = dict((ord(char), None) for char in '";')
+-        return content[1].decode('utf-8').strip().split(' ')[7].translate (remove_punctuation_map)
+-
+-if os.path.isdir (os.path.join(os.getcwd(), '.git')):
+-    rev = fetch_git_revision ()
+-else:
+-    rev = fetch_tarball_revision ()
++#    with open('libs/ardour/revision.cc') as f:
++#        content = f.readlines()
++#        remove_punctuation_map = dict((ord(char), None) for char in '";')
++#        return content[1].decode('utf-8').strip().split(' ')[7].translate (remove_punctuation_map)
++
++#if os.path.isdir (os.path.join(os.getcwd(), '.git')):
++#    rev = fetch_git_revision ()
++#else:
++#    rev = fetch_tarball_revision ()
+ 
+ #
+ # rev is now of the form MAJOR.MINOR[-rcX]-rev-commit
+ # or, if right at the same rev as a release, MAJOR.MINOR[-rcX]
+ #
+ 
+-parts = rev.split ('.', 1)
+-MAJOR = parts[0]
+-other = parts[1].split('-', 1)
+-MINOR = other[0]
+-if len(other) > 1:
+-    MICRO = other[1].rsplit('-',1)[0].replace('-','.')
+-else:
+-    MICRO = '0'
++#parts = rev.split ('.', 1)
++MAJOR = '4'
++#other = parts[1].split('-', 1)
++MINOR = '0'
++#if len(other) > 1:
++#    MICRO = other[1].rsplit('-',1)[0].replace('-','.')
++#else:
++MICRO = 'gentoo'
+ 
+ V = MAJOR + '.' + MINOR + '.' + MICRO
+ VERSION = V
+@@ -216,16 +216,16 @@ def fetch_gcc_version (CC):
+     return version
+ 
+ def create_stored_revision():
+-    rev = ""
+-    if os.path.exists('.git'):
+-        rev = fetch_git_revision();
+-        print("Git version: " + rev + "\n")
+-    elif os.path.exists('libs/ardour/revision.cc'):
+-        print("Using packaged revision")
+-        return
+-    else:
+-        print("Missing libs/ardour/revision.cc.  Blame the packager.")
+-        sys.exit(-1)
++    rev = "4.0-gentoo"
++#    if os.path.exists('.git'):
++#        rev = fetch_git_revision();
++#        print("Git version: " + rev + "\n")
++#    elif os.path.exists('libs/ardour/revision.cc'):
++#        print("Using packaged revision")
++#        return
++#    else:
++#        print("Missing libs/ardour/revision.cc.  Blame the packager.")
++#        sys.exit(-1)
+ 
+     try:
+         #
+