removed old ebuilds and bumped to 3.5.357

Package-Manager: portage-2.2.7/cvs/Linux i686
Manifest-Sign-Key: 0xC1DE54B2

11 files changed, 18 insertions, 814 deletions

diff --git a/media-sound/ardour/ChangeLog b/media-sound/ardour/ChangeLog
index e60dac9e8661..f8bf612fa6ac 100644
--- a/media-sound/ardour/ChangeLog
+++ b/media-sound/ardour/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-sound/ardour
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ChangeLog,v 1.127 2014/02/07 14:22:44 nativemad Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ChangeLog,v 1.128 2014/02/25 16:17:24 nativemad Exp $
+
+*ardour-3.5.357 (25 Feb 2014)
+
+  25 Feb 2014; Andreas Schuerch <nativemad@gentoo.org> -ardour-3.0.ebuild,
+  -ardour-3.2.ebuild, -ardour-3.3.ebuild, -ardour-3.4.ebuild,
+  -ardour-3.5.14.ebuild, -ardour-3.5.143.ebuild, -ardour-3.5.308.ebuild,
+  +ardour-3.5.357.ebuild:
+  remove old 3.X ebuilds and bump to 3.5.357
 
 *ardour-3.5.308-r1 (07 Feb 2014)
 
diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest
index a32b5ae3c502..cfaaafe6a53f 100644
--- a/media-sound/ardour/Manifest
+++ b/media-sound/ardour/Manifest
@@ -8,34 +8,21 @@ AUX ardour-3.0-syslibs.patch 1743 SHA256 9ed8fecbc4ed28115a24675e987f41011afcfad
 AUX ardour-3.2-syslibs.patch 1743 SHA256 9ed8fecbc4ed28115a24675e987f41011afcfad299096060219a91b9dc0e6109 SHA512 c1303dc9c6c73c02a722c4ef90dc10eb940c0b65977159174b49a0cdcc9835d8a960419ea53cf5356f1f3780efd45050b37335333dfe2672306f5dfaed40c67f WHIRLPOOL 77eacac4eec1fa6e87f9f37c96742b79c2c63f5c99a171da549f73f9d33687094da84d4cc782d3b237c7db150555e1bec96e2200ae9d7c732750403fa15a692b
 AUX ardour-3.5-syslibs.patch 1568 SHA256 a69245a68df400d0961a189bdee5181ea84e95bf3fd6a68f20809096e26a5d02 SHA512 d086b48ef56292044570ac6d12474a60fac55d884b27a64720776538b5986651d4384d2b5c7f518fe608bb6c8e3ee184a27df62bfc6523456200fb60e4010474 WHIRLPOOL fef364e25ac1246ba6a08d08d7cee9fd8afeee4af9fd2ff50dd3f2438f70174f404d69a490f63feb098ce6ae4c5918a4fa0f5220aa3462144f4cb20c3502572d
 AUX ardour-3.5.7-syslibs.patch 1750 SHA256 6c4b9f69f273cd5e6eb8cff8cb674ce71858bf5b23130dd89444e2085146c414 SHA512 e97d07564becd5a01f622de5af3ff3bbac75d54bf8979080d09fdbba84568157ee6c91d63216cf9415bc766277e15daf1747808685c566ec22f221b4d1ff2b4a WHIRLPOOL 37636b205b79ae70aec6fba850be3ec604b6e43461ff25efe32c784a6a05740af16154d18143a49351912094d9f18863740de1686a88a698e1e578726db06762
-DIST Ardour3-3.2.tar.bz2 7313774 SHA256 7e0c5c1e7e5a664fcf940270b35526d1ed75028a8e04c8b725397b447c83eb6a SHA512 be7bc47058643e7d0a1256bcc75bebc312496b088627ab9abd9d430b6dbb5a6c434c1bcede3cc8bd0359b58b7452a299da022e66d3a4ca11283b426d42b11bb1 WHIRLPOOL 494d2522129ce28b2d96436e0b02f4e0d4744e0f49fbe5778db27c88ca94fdbd015818c9c336ceb120148135ff64a4ac893347095dd824ec29756bf1cf7bc43b
-DIST Ardour3-3.3.tar.bz2 7539302 SHA256 44f6596d5750bb3bf9babd6114f217f7ab7b281607e97631c8ce01d0749038e9 SHA512 31dade4a1343dd2a605f88adc3657d30ab2de9b7c45dbfaf4e57ce00b30aa52c528a6e821e0ad7ada1222f2bc1ede7a9c9a8e4b9808eeba4dbe6506ccebcdce8 WHIRLPOOL c5c0bee338d0090b6db508648fa6c48531933e994428da15bea9430768e08066261af64856443faf7514491a7f9112d9d4c3ff11ca30a7139b0bd2d93a2f44d7
 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.0.tar.bz2 8173156 SHA256 2a77f2cd506d66c93ae0b7ce2c36a1e8f7f85a5cf2540f6419e9ef431b36760b SHA512 fc9dede5fbf1de1e78b66b59a67df72f0f3a7d6fe5a7e7df52f5c978cbfb41ff8538b1474736cfddbd5ba4a78cc257f254cdab25634348a42171906bb4e43093 WHIRLPOOL 94eb6adc2ca4f6dddb2b939b7df932ecf18fb169a3300857e9c438a9c73094a49dc12abdb1a693577fe78411c051c2910f24f89cd56e220cb1c129f245d2834f
-DIST ardour-3.5.14.zip 10570934 SHA256 e7c43842859992358ceb80f80032ea1a87e4655764e147057c3749e97dc079a8 SHA512 9aa4319141ea8b011001cada1c7228ce78cb42f1588d5850e61dc5c023dc39ceb94147d4f3c190dd426e3f2788b16edf301eb3f51459219da5ffbef1a7e6f95f WHIRLPOOL c3b3d5da1118a87ec0ccabeba3f7580e34ccaffe8bf4b62d8e7e6d4437dd0723e9bdaa38f23adc9db1bb97f052da85880a443574114c014f6caee14ba07c6c93
-DIST ardour-3.5.143.tar.gz 8557867 SHA256 c9bc6a89358158b84916ccb45a977dc6d82b475372d7a1806df62f94dee34daf SHA512 2ff8a693eb74f2f37a9765844e574fdc40c4c757953ca2de99ebec856e59b00f93a4b2a093fb47f85465ceccfed95124ca7402a2c749a27325333999289fb8e1 WHIRLPOOL a5287cfe7913bb9c7034dac9c0d77acef54479baa19ddc80b8e03c90b04e5f8c6aa27d7eefdc44777b240f3386d3571adab8df40ac37dde373437d4014e8a8d6
 DIST ardour-3.5.308.tar.gz 8578598 SHA256 8fe7d396d182c1cecc377d70e788f4bcaeca6276dc7474a6589e6469acd77d8b SHA512 64b1719c8262840bf8f02d5843640efecd1a7cb1e0a706b778db9d8f849d7cb611bc34bec3fee8291f3b01491b913e5d5239c772ba40ce883ee00d6bfeb48b41 WHIRLPOOL a5422a5f8e6addcd0bd03a11d18a057e06d82c8b7039128f25de7f6d9c906c2fd05a7c46e54403e1f18c0b7b06c1722638c66a7a0f1d55f7e04d6b0dabfd2baf
-DIST ardour-3.5.74.zip 10326171 SHA256 fc47a990d7a0e602e015f0415540a9449de1b546da55da604e071ded68c0119a SHA512 bc8fb4761f2972a41b213c17c712126e794997dd1e16199afb7c03410b41f830c0ed8e90bbacfca1ced050d0748dca0756d8dc359227e91decfa3fb31aea0ac5 WHIRLPOOL 2a34f4939a3df5c042d07d209067fd22a9e7ebe7f1519279741185ef078d9a78c3c6b0d52cc519e24a482f12bcd510fd4445b4499e6f5d2037cfab50b0511b68
+DIST ardour-3.5.357.tar.gz 8579943 SHA256 1c13a3200bfa0fb8c0adddd3439102e0caa7f219a0f2518a4ba0d233924ef0b7 SHA512 8ee6d3b3f8e05547b3e9487e56344c2795fbc4781f6ac03a0c1684c534940570e3138023df4e57ce904c99e152ff212ddf67d83c1c95ac8542cc55a6e379c90d WHIRLPOOL a32508b6b54909111bf9a074df72d312f164a18840c28e96d1c38e368a13f8ea8f9dc6d9fb4fc600af97e06ce79fdd21a58f1701125a02c5a26ea919d823d2ae
 EBUILD ardour-2.8.14-r1.ebuild 1995 SHA256 5217fea5b18e164f4e340d64d86e7deb8853ddc707dbdcfa02b1ba76aa00281d SHA512 3a71c41baa07c6c3f9e98715b064a655aa65ec430f88fc1a52a9926b65dcd544d79dc32287a1fe2c45cb94d799d32f2274d6b67793bae7deea1b589a33a45e37 WHIRLPOOL 088ad8ecda65d6a39a81334228783758eef0d18ed7553941f6efc1d5673f875ec5e7b488739c32ddc417ea7c427c97804ca2907aa5a83d12cf23eb6afbc286fb
 EBUILD ardour-2.8.16.ebuild 2007 SHA256 4158499194ec45dae26c1d1d2dbe8de5ae4c42073b8c021b34ffd22b0639fc3e SHA512 245ff5fa0156cb1e3a645f1b1dd711f0041b42a41e79e4832e4a3c7e4999f4e193a6b005291aef15ca94239212ed65f52801d519fed8aa80a3f49d5963ec3122 WHIRLPOOL a6604007ab9a11bbf99c4972527838285b422da66901c422b72a6c41569314409a50ce312043ce72cd5121ef9964ecd97c874d880cab2d12975e54e3f6977dea
-EBUILD ardour-3.0.ebuild 2173 SHA256 32d5ddb7d093f92e172c6009b41101c1a7d6af6ef581f93105b3a3a224ee146f SHA512 251fe23480f12226a1537c7d800de252260a202b7a7246d4a6743cb4f62882b273b13e0b640c035ae413a42413f8a0bd2114ba0c7a96282836fa1f58c3779859 WHIRLPOOL 05bc560451fbf605bff5e06f70cf7ef262523a7114a814dde2e5b73e5035d4ae45b2f8c90598e55e69f0c45c10e584d6acfca574fdb7bdda8dde8af73a88e945
-EBUILD ardour-3.2.ebuild 2239 SHA256 4e991181f740780b229196f27fd26fce9a3c8bf2e2e5d4d3b3cd56b3a40e96a1 SHA512 9497f5444ea9fad8a8f6bf37607b52e1dbbe8797381b5bf671849f987f7c5c33b30739fa29712aa189f549b1f0010eff22b1fe4eeefaa1133e6c9367b80bd80a WHIRLPOOL 142632d0508807fd14440a4fd9af1cda82ffdf65612b04c4b230adf1cc30f1ef97cbd10140f88c2445b06274283e8693a2343532485fe79e07c4322a47ffdcd1
-EBUILD ardour-3.3-r1.ebuild 2212 SHA256 64e53e6ba502c04c5b065393ff42d0f7d35003c3fe7d25e2a4686fafd33a4c1f SHA512 a2b43166401a58030cb41515ea96e2f8766334efa432ce7438280a20587c847e578989c88e6463ebd118c366c70f87aba13242c1e7fa8225c973a9ab90e5dd2f WHIRLPOOL a904b917e8ca236cf2145416c23e44e1eea5ea208186b3dfb2d626b77a7ed79e8866be55219fb6aa242c7aab8aa704e81ed9ceedb4bb1091d650143b09c6ed6b
-EBUILD ardour-3.3.ebuild 2244 SHA256 1485c09e0a43b4d1c7d7f0c8041be571b7d78c705b5e18bc7f1cff11d03de83d SHA512 39ad90008d2fd28c0f3722dd790b1e25afc65076e8fa31dfce77f53fd0906ff2d5923d96b238a0001020bca7269e4c183742720d2680143c89b5e1a03657a2b7 WHIRLPOOL 8fc1149abe7ef7104f11058890f3d22ecb637455192bdcedae775edfbc359902734159addc375a1aa7f89e17fb30957c3ea40656a3b928ad77ed2586b6dcf3e0
-EBUILD ardour-3.4.ebuild 2271 SHA256 ec523813fe81ab54f93a0601ab684ea7ecfd8431dfbc482430fcdf981db93f88 SHA512 e171a425f02f4f02437cf03f5ad68917b864d54877a7e8b3a0ae41028b2c5ca53545c4febf0194b36b4c8074c23143f7c931dd7fce47011205441292bf9f84a7 WHIRLPOOL 4b0549fef78560ac248432e67cda96257c11447b048e519839891d5265a3a601f1b67e28943799e06ab8ac26cb49f4883070a8db25e0186169d591892e33d34c
-EBUILD ardour-3.5.14.ebuild 2729 SHA256 0d14003a5a74ef508d95bfa63ce7ea05fc0c02053fccc051ba13beb97808ae0b SHA512 a5273a808ea770efb4195fe2efd4e2c5f06a6f0d4c20e718cc66e257f426c5353d8f49ac690fccd1714c03b8180b7a016739b0f906f83b30223dca81b6f47c58 WHIRLPOOL abc3c7c23162e8330bd811ba9b0f5be6614c752d9bf898f12bd0ac39ca7060c8961d8d5f7795c5d07a99719e37ad4665b50fe34081a9dc91d5a361c779d4112b
-EBUILD ardour-3.5.143.ebuild 3016 SHA256 a8da0e03d4549f618b89109c5089a7a92455d09d8d2e7a75f8eca6ecd2ee3117 SHA512 d7b52cd134c02e48dcfb849cef0f8843d67c6c5a1c30d162691263cfc649a47e05e10061a85830bc3123eba133cc1e8579ec3c445804d85600b1c3418989db45 WHIRLPOOL 83431687aae7d6eee6777dda9eea6da644c25131e7fcc978f6c1c1d389b4d50f05de75ea78514591b36ac48dc240640036475f978b6c1c61e57dca44ade5edeb
 EBUILD ardour-3.5.308-r1.ebuild 3119 SHA256 ea9b25fbed8fa708fbacb9f0e99ddb49c34fcb7a39c715d7bdee5ab7d55cb3e8 SHA512 417c0d34645a8c2fa60301b820c5496684f508237a42943c74d65c437a37e9b076b9a0fb7b7aa3424f6747068f1b4ace2e195544887a32eaa1947b0753073ee5 WHIRLPOOL 6a98dae2279d502d77f87212ce177a4f1a11135d4ee624c59d3725409b7590b5159abd320792844557bef8572c7a970d8fe92bbc825b9b5b6c2a31b462333287
-EBUILD ardour-3.5.308.ebuild 3016 SHA256 f9ad98be33fb0b24b480502951ba69d3401f881c601e3d82afb8aab246365d74 SHA512 64bef0ea966a98e91fe192ca1911f6166101f6ec0e85ddd75f15078498e30ddbf981f01c85295fa22157288b0aca5a2be431c5b30b7c89e9a74d604df9dc185c WHIRLPOOL 40105e262e4c041c3becef502cf5e40ff1b686eb6d4108bc89d4cd0429ed80474982b6a758999dec0fe50bc65a33cc2c00663b6b085903303aac427fdede87b9
-EBUILD ardour-3.5.74.ebuild 3026 SHA256 5ad264d14d03c95b834a80805213ee75bd6a5e6e7b2d792305e0e2ba2ee9180d SHA512 9a5ee4f035a4ed5a539ef69aa88317fe90b38e0b8e4f8d39780e3668a45a0520013658fe5fb706013155d401d0d23ee9034c35e35d2b0dadbdb4a557a85ccbae WHIRLPOOL 65e6a3b370fd3770b92b84d0412b3a367495e4d2dd5ccb45d31b399162c956f30c2ab686f5d486b2f07cb97d5665d2cb95afaba6fa9a9ff29fa338215a1ce8cc
+EBUILD ardour-3.5.357.ebuild 3116 SHA256 cbba15965a485f5d042e48e70a7e119068391761f91dd5c27713328228cb0250 SHA512 0a9c60fed8c20f22edd3441f60ee9eb3e00dd2606b7ae175c8f621069237bfbd44a44b56ed147faa20886f0202878d85ec19fd81795a00cf18a35c157dcabe98 WHIRLPOOL 4e846646ff18c890a672ffb752143094477f8b4707ffd035d058de59b68160e51db24a04614bfa0ebbe44d633e61e2337a1090b57a63554994415a8f9bf5cb5d
 EBUILD ardour-9999.ebuild 3113 SHA256 acca9097fbcd869072e3716871b65355abcc0679fba55a006b0da12925012a7b SHA512 d47064a2471725317f07a2f7e881bec955611f2030f3ad4cb2430a2b1c8c204a4bcf31f43dc0bbe0de08f5e83226367b2aaa140d04a805c9e4cbda8557643365 WHIRLPOOL 40dd9d07e4a912be5ae8a0d0c31dd5e33f5c22c353265101569687219bf292dcbe723750cf8cf095d5d2c55d6a28d518f387d2f38c99f0f9fc2e57c0154cf19d
-MISC ChangeLog 20866 SHA256 263eb8c37cedc4a3b1dd17f0fe2c3cf2063633b33c625b1ce5aa349c91e4120d SHA512 56c081e5b4f3bcb9f364596f029ebe0c5232cc03e8bdff659832810994e6dcd0a29e4c4c4d865a5d5d6fe8e700c39e91ab7f8bf791271ec0ad26e0a4af1b93ea WHIRLPOOL aefd7d66845113fdaeb8c59ba5ceca6d2d75bd45ad15767b7c615ddb98c5e4be5b7de9e3f75352b8a198a057721e9245b951a084b804aa90d69a4abd9399c3c0
+MISC ChangeLog 21179 SHA256 3b728561a20186f6e1f317bff209bac3676586915dac91abc77ee5eb434eb9d5 SHA512 336a6cddb676a6e45fd035b1f4dd9a834e8246b17e5c383506cd751bce20afa4a31f468c1cdf800a5bd7af86edc21992354b2ae228041abcb0ba8eab025de60c WHIRLPOOL 71c86a387f3d10bd2428deb27a9b74bf811bfc256ee64e443b1c7e72779266c62a097eaca6c25ad62b52089e9e75f15a3536f4e2728c3acbcc0449698e59bea6
 MISC metadata.xml 234 SHA256 20428aad08fee2f7a7507f1b456c7ee3ebccd0eba59b90bd70d78b972d2b0799 SHA512 ed4a455e15b346baee30ba9c76637a199fda7c1d7c144cee546d45e7312dc7cd1f50be64d80b0900834a5b7e3851ce82158b676696c3ee1b34809a341edca2a9 WHIRLPOOL 68998d2804aab1645e9cb386ecd149680486b967ccd65b281327247a5617ef3f7c5ee25be285a502d397e6c414db70f39111716a2fe5f7b7a012c327fbe5abae
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlL06uEACgkQakKUmsHeVLLT7QCfZyuilff8b+BlIJDHtlaHUSYG
-FGUAn2a8W5sJOH/XpfFbUuWqKFG3JH5C
-=sIdJ
+iEYEAREIAAYFAlMMwJgACgkQakKUmsHeVLIflACfX7V+CsDCwd5xCTR8yWd0sNfd
+G7sAn2tP4mtx6DlA+V9QE6nfqLp6f3t/
+=oriU
 -----END PGP SIGNATURE-----
diff --git a/media-sound/ardour/ardour-3.0.ebuild b/media-sound/ardour/ardour-3.0.ebuild
deleted file mode 100644
index c4d5d98f4249..000000000000
--- a/media-sound/ardour/ardour-3.0.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ardour-3.0.ebuild,v 1.4 2013/04/09 06:02:23 nativemad Exp $
-
-EAPI=5
-inherit eutils flag-o-matic toolchain-funcs waf-utils
-
-DESCRIPTION="Digital Audio Workstation"
-HOMEPAGE="http://ardour.org/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="3"
-KEYWORDS="~amd64 ~x86"
-IUSE="altivec curl debug doc nls lv2 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
-	>=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
-	>=media-sound/jack-audio-connection-kit-0.120
-	>=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
-	curl? ( net-misc/curl )
-	lv2? (
-		>=media-libs/slv2-0.6.1
-		media-libs/lilv
-		media-libs/sratom
-		dev-libs/sord
-	)"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	doc? ( app-doc/doxygen[dot] )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-syslibs.patch
-	sed 's/python/python2/' -i waf
-}
-
-src_configure() {
-	tc-export CC CXX
-	mkdir -p "${D}"
-	waf-utils_src_configure \
-		--destdir="${D}" \
-		--prefix=/usr \
-		$(use lv2 && echo "--lv2" || echo "--no-lv2") \
-		$(use nls && echo "--nls" || echo "--no-nls") \
-		$(use debug && echo "--stl-debug" && echo "--rt-alloc-debug") \
-		$((use altivec || use sse) && echo "--fpu-optimization" || echo "--no-fpu-optimization") \
-		$(use curl || echo "--no-freesound") \
-		$(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
-}
diff --git a/media-sound/ardour/ardour-3.2.ebuild b/media-sound/ardour/ardour-3.2.ebuild
deleted file mode 100644
index c8e4c3c56e73..000000000000
--- a/media-sound/ardour/ardour-3.2.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ardour-3.2.ebuild,v 1.1 2013/06/25 17:19:07 nativemad Exp $
-
-EAPI=5
-inherit eutils flag-o-matic toolchain-funcs waf-utils
-
-MY_PN="Ardour3"
-MY_P="${MY_PN}-${PV}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Digital Audio Workstation"
-HOMEPAGE="http://ardour.org/"
-SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="3"
-KEYWORDS="~amd64 ~x86"
-IUSE="altivec curl debug doc nls lv2 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
-	>=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
-	>=media-sound/jack-audio-connection-kit-0.120
-	>=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
-	curl? ( net-misc/curl )
-	lv2? (
-		>=media-libs/slv2-0.6.1
-		media-libs/lilv
-		media-libs/sratom
-		dev-libs/sord
-		>=media-libs/suil-0.6.10
-
-	)"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	doc? ( app-doc/doxygen[dot] )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-syslibs.patch
-	sed 's/python/python2/' -i waf
-}
-
-src_configure() {
-	tc-export CC CXX
-	mkdir -p "${D}"
-	waf-utils_src_configure \
-		--destdir="${D}" \
-		--prefix=/usr \
-		$(use lv2 && echo "--lv2" || echo "--no-lv2") \
-		$(use nls && echo "--nls" || echo "--no-nls") \
-		$(use debug && echo "--stl-debug") \
-		$((use altivec || use sse) && echo "--fpu-optimization" || echo "--no-fpu-optimization") \
-		$(use curl || echo "--no-freesound") \
-		$(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
-}
diff --git a/media-sound/ardour/ardour-3.3-r1.ebuild b/media-sound/ardour/ardour-3.3-r1.ebuild
deleted file mode 100644
index a87fc86c6576..000000000000
--- a/media-sound/ardour/ardour-3.3-r1.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ardour-3.3-r1.ebuild,v 1.3 2013/07/27 11:31:55 nativemad Exp $
-
-EAPI=5
-inherit eutils flag-o-matic toolchain-funcs waf-utils
-
-MY_PN="Ardour3"
-MY_P="${MY_PN}-${PV}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Digital Audio Workstation"
-HOMEPAGE="http://ardour.org/"
-SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="3"
-KEYWORDS="~amd64 ~x86"
-IUSE="altivec debug doc nls lv2 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
-	>=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
-	>=media-sound/jack-audio-connection-kit-0.120
-	>=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
-	lv2? (
-		>=media-libs/slv2-0.6.1
-		media-libs/lilv
-		media-libs/sratom
-		dev-libs/sord
-		>=media-libs/suil-0.6.10
-
-	)"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	doc? ( app-doc/doxygen[dot] )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.2-syslibs.patch
-	sed 's/python/python2/' -i waf
-}
-
-src_configure() {
-	tc-export CC CXX
-	mkdir -p "${D}"
-	waf-utils_src_configure \
-		--destdir="${D}" \
-		--prefix=/usr \
-		--configdir=/etc \
-		$(use lv2 && echo "--lv2" || echo "--no-lv2") \
-		$(use nls && echo "--nls" || echo "--no-nls") \
-		$(use debug && echo "--stl-debug") \
-		$((use altivec || use 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
-}
diff --git a/media-sound/ardour/ardour-3.3.ebuild b/media-sound/ardour/ardour-3.3.ebuild
deleted file mode 100644
index cc880094cbbf..000000000000
--- a/media-sound/ardour/ardour-3.3.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ardour-3.3.ebuild,v 1.1 2013/07/22 09:23:36 nativemad Exp $
-
-EAPI=5
-inherit eutils flag-o-matic toolchain-funcs waf-utils
-
-MY_PN="Ardour3"
-MY_P="${MY_PN}-${PV}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Digital Audio Workstation"
-HOMEPAGE="http://ardour.org/"
-SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="3"
-KEYWORDS="~amd64 ~x86"
-IUSE="altivec curl debug doc nls lv2 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
-	>=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
-	>=media-sound/jack-audio-connection-kit-0.120
-	>=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
-	curl? ( net-misc/curl )
-	lv2? (
-		>=media-libs/slv2-0.6.1
-		media-libs/lilv
-		media-libs/sratom
-		dev-libs/sord
-		>=media-libs/suil-0.6.10
-
-	)"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	doc? ( app-doc/doxygen[dot] )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.2-syslibs.patch
-	sed 's/python/python2/' -i waf
-}
-
-src_configure() {
-	tc-export CC CXX
-	mkdir -p "${D}"
-	waf-utils_src_configure \
-		--destdir="${D}" \
-		--prefix=/usr \
-		$(use lv2 && echo "--lv2" || echo "--no-lv2") \
-		$(use nls && echo "--nls" || echo "--no-nls") \
-		$(use debug && echo "--stl-debug") \
-		$((use altivec || use sse) && echo "--fpu-optimization" || echo "--no-fpu-optimization") \
-		$(use curl || echo "--no-freesound") \
-		$(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
-}
diff --git a/media-sound/ardour/ardour-3.4.ebuild b/media-sound/ardour/ardour-3.4.ebuild
deleted file mode 100644
index d3384872ef90..000000000000
--- a/media-sound/ardour/ardour-3.4.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ardour-3.4.ebuild,v 1.1 2013/09/10 20:14:00 nativemad Exp $
-
-EAPI=4
-inherit eutils git-2 toolchain-funcs flag-o-matic waf-utils
-
-DESCRIPTION="Digital Audio Workstation"
-HOMEPAGE="http://ardour.org/"
-EGIT_REPO_URI="git://git.ardour.org/ardour/ardour.git"
-
-if [ ${PV} = 9999 ]; then
-	KEYWORDS=""
-else
-	EGIT_COMMIT="${PV}"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="3"
-IUSE="altivec debug doc nls lv2 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
-	>=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
-	>=media-sound/jack-audio-connection-kit-0.120
-	>=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
-	lv2? (
-		>=media-libs/slv2-0.6.1
-		media-libs/lilv
-		media-libs/sratom
-		dev-libs/sord
-		>=media-libs/suil-0.6.10
-
-	)"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	doc? ( app-doc/doxygen[dot] )"
-
-src_unpack() {
-	git-2_src_unpack
-}
-
-src_prepare(){
-	epatch "${FILESDIR}"/${PN}-3.2-syslibs.patch
-	sed 's/python/python2/' -i waf
-}
-
-src_configure() {
-	tc-export CC CXX
-	mkdir -p "${D}"
-	waf-utils_src_configure \
-		--destdir="${D}" \
-		--prefix=/usr \
-		--configdir=/etc \
-		$(use lv2 && echo "--lv2" || echo "--no-lv2") \
-		$(use nls && echo "--nls" || echo "--no-nls") \
-		$(use debug && echo "--stl-debug") \
-		$((use altivec || use 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
-}
diff --git a/media-sound/ardour/ardour-3.5.14.ebuild b/media-sound/ardour/ardour-3.5.14.ebuild
deleted file mode 100644
index 6e4902c027a2..000000000000
--- a/media-sound/ardour/ardour-3.5.14.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ardour-3.5.14.ebuild,v 1.4 2013/11/08 12:34:31 nativemad Exp $
-
-EAPI=4
-inherit eutils toolchain-funcs flag-o-matic 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}.zip -> ${P}.zip"
-fi
-
-LICENSE="GPL-2"
-SLOT="3"
-IUSE="altivec debug doc nls lv2 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
-	>=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
-	>=media-sound/jack-audio-connection-kit-0.120
-	>=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
-	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}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	doc? ( app-doc/doxygen[dot] )"
-	if ! [ ${PV} = 9999 ]; then
-		DEPEND="${DEPEND}
-		app-arch/unzip"
-	fi
-
-src_unpack() {
-	if [ ${PV} = 9999 ]; then
-		git-2_src_unpack
-	else
-		unpack ${A}
-	fi
-}
-
-src_prepare(){
-	if ! [ ${PV} = 9999 ]; then
-		sed -e '/cmd = "git describe --tags/,/utf-8/{s:cmd = \"git describe --tags HEAD\":rev = \"'${PV}'\":p;d}' -i "${S}"/wscript
-		sed -e 's/'os.path.exists\(\'.git'/'os.path.exists\(\'wscript/'' -i "${S}"/wscript
-	fi
-	epatch "${FILESDIR}"/${PN}-3.5-syslibs.patch
-	sed 's/python/python2/' -i waf
-}
-
-src_configure() {
-	tc-export CC CXX
-	mkdir -p "${D}"
-	waf-utils_src_configure \
-		--destdir="${D}" \
-		--prefix=/usr \
-		--configdir=/etc \
-		$(use lv2 && echo "--lv2" || echo "--no-lv2") \
-		$(use nls && echo "--nls" || echo "--no-nls") \
-		$(use debug && echo "--stl-debug") \
-		$((use altivec || use 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
-}
diff --git a/media-sound/ardour/ardour-3.5.143.ebuild b/media-sound/ardour/ardour-3.5.143.ebuild
deleted file mode 100644
index f37d965e7bc9..000000000000
--- a/media-sound/ardour/ardour-3.5.143.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ardour-3.5.143.ebuild,v 1.1 2014/01/16 08:16:34 nativemad Exp $
-
-EAPI=4
-inherit eutils toolchain-funcs flag-o-matic 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="3"
-IUSE="altivec debug doc nls lv2 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
-	>=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
-	>=media-sound/jack-audio-connection-kit-0.120
-	>=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
-	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}
-	virtual/pkgconfig
-	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
-		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
-
-	fi
-	epatch "${FILESDIR}"/${PN}-3.5.7-syslibs.patch
-	sed 's/python/python2/' -i waf
-}
-
-src_configure() {
-	tc-export CC CXX
-	mkdir -p "${D}"
-	waf-utils_src_configure \
-		--destdir="${D}" \
-		--prefix=/usr \
-		--configdir=/etc \
-		$(use lv2 && echo "--lv2" || echo "--no-lv2") \
-		$(use nls && echo "--nls" || echo "--no-nls") \
-		$(use debug && echo "--stl-debug") \
-		$((use altivec || use 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-3.5.308.ebuild b/media-sound/ardour/ardour-3.5.357.ebuild
index 72668413e12c..4509976f9fce 100644
--- a/media-sound/ardour/ardour-3.5.308.ebuild
+++ b/media-sound/ardour/ardour-3.5.357.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ardour-3.5.308.ebuild,v 1.1 2014/01/29 13:38:35 nativemad Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ardour-3.5.357.ebuild,v 1.1 2014/02/25 16:17:24 nativemad Exp $
 
 EAPI=4
 inherit eutils toolchain-funcs flag-o-matic waf-utils
@@ -86,6 +86,7 @@ src_prepare(){
 	fi
 	epatch "${FILESDIR}"/${PN}-3.5.7-syslibs.patch
 	sed 's/python/python2/' -i waf
+	sed 's/'FLAGS\'\,\ optimization_flags'/'FLAGS\'\,\ \'\''/g' -i "${S}"/wscript
 }
 
 src_configure() {
@@ -97,7 +98,7 @@ src_configure() {
 		--configdir=/etc \
 		$(use lv2 && echo "--lv2" || echo "--no-lv2") \
 		$(use nls && echo "--nls" || echo "--no-nls") \
-		$(use debug && echo "--stl-debug") \
+		$(use debug && echo "--stl-debug" || echo "--optimize") \
 		$((use altivec || use sse) && echo "--fpu-optimization" || echo "--no-fpu-optimization") \
 		$(use doc && echo "--docs")
 }
diff --git a/media-sound/ardour/ardour-3.5.74.ebuild b/media-sound/ardour/ardour-3.5.74.ebuild
deleted file mode 100644
index d41345c92958..000000000000
--- a/media-sound/ardour/ardour-3.5.74.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ardour-3.5.74.ebuild,v 1.1 2013/11/08 12:34:31 nativemad Exp $
-
-EAPI=4
-inherit eutils toolchain-funcs flag-o-matic 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}.zip -> ${P}.zip"
-fi
-
-LICENSE="GPL-2"
-SLOT="3"
-IUSE="altivec debug doc nls lv2 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
-	>=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
-	>=media-sound/jack-audio-connection-kit-0.120
-	>=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
-	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}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	doc? ( app-doc/doxygen[dot] )"
-	if ! [ ${PV} = 9999 ]; then
-		DEPEND="${DEPEND}
-		app-arch/unzip"
-	fi
-
-src_unpack() {
-	if [ ${PV} = 9999 ]; then
-		git-2_src_unpack
-	else
-		unpack ${A}
-	fi
-}
-
-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
-
-	fi
-	epatch "${FILESDIR}"/${PN}-3.5.7-syslibs.patch
-	sed 's/python/python2/' -i waf
-}
-
-src_configure() {
-	tc-export CC CXX
-	mkdir -p "${D}"
-	waf-utils_src_configure \
-		--destdir="${D}" \
-		--prefix=/usr \
-		--configdir=/etc \
-		$(use lv2 && echo "--lv2" || echo "--no-lv2") \
-		$(use nls && echo "--nls" || echo "--no-nls") \
-		$(use debug && echo "--stl-debug") \
-		$((use altivec || use 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!"
-}