commit:     72c8f5aac8cdca4a8391bb7829dbb812860672fb
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Dec  6 09:00:48 2016 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Dec  6 09:48:24 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72c8f5aa

media-sound/ardour: Removed old.

Package-Manager: portage-2.3.3

 media-sound/ardour/Manifest                        |   7 -
 media-sound/ardour/ardour-2.8.14-r1.ebuild         |  84 ------------
 media-sound/ardour/ardour-4.0-r2.ebuild            | 140 --------------------
 media-sound/ardour/ardour-4.1.ebuild               | 139 --------------------
 media-sound/ardour/ardour-4.2-r1.ebuild            | 128 ------------------
 media-sound/ardour/ardour-4.4.ebuild               | 134 -------------------
 media-sound/ardour/ardour-4.6.ebuild               | 139 --------------------
 media-sound/ardour/ardour-5.0.ebuild               | 143 ---------------------
 media-sound/ardour/files/ardour-3.0-syslibs.patch  |  35 -----
 media-sound/ardour/files/ardour-3.2-syslibs.patch  |  35 -----
 media-sound/ardour/files/ardour-3.5-syslibs.patch  |  37 ------
 media-sound/ardour/files/ardour-3.5.403-sse.patch  |  24 ----
 .../ardour/files/ardour-3.5.7-syslibs.patch        |  36 ------
 .../ardour/files/ardour-4.0-revision-naming.patch  |  78 -----------
 14 files changed, 1159 deletions(-)

diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest
index bc5cfa2..34a7187 100644
--- a/media-sound/ardour/Manifest
+++ b/media-sound/ardour/Manifest
@@ -1,11 +1,4 @@
-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-4.0.tar.gz 9189038 SHA256 
ea1131a24774d5f8dcab4ac7ea3b36bd427b1e4d0bef6f3db0681bc4ca131cf1 SHA512 
2317c5818fe89386319f12062f0af0d08b07f569d6f775b7ecfa4f3a4bb1f565e05f3ff32f05f591c5628bdd402eda5bce4be4f8fa89da6c2092d5edb2c9ae7a
 WHIRLPOOL 
854145ed135f6b23222ab2d6022e31b09221cac0d326fa17c5ee88e4e8ebd033e69c447fcbac35a925ff23974cc8b2b13c076014118977bbc88836124a912ad4
-DIST ardour-4.1.tar.gz 9247567 SHA256 
1d5eac009f3c84aee11c4e7d1c548747cb5a43eddac92b4e640342b79cc808b9 SHA512 
5e13301ca5d8140498256d43729d770c6222b220d2c817651304746a7cc20fe8450b094d978bc9559b9ec7b5a7a95ca1c5131be5b51c78835e75b3b7bbb1be82
 WHIRLPOOL 
3699ea7f29c9df30ddfa3ad9a1e05f6a3cbccddaf5ae1804679b6c1a50e8b800e14f06760e8d9d44a4ac2631f32db595048640c01b9c967f060bfaee11f28a73
-DIST ardour-4.2.tar.gz 9484009 SHA256 
c8af454e974be3222bceb374d5b3d126af6c9766326f7e276acb8ef2fa21cfa4 SHA512 
cb1d8144216ff959dac1b371c5ec2b99e0fc2137c105fda5c38460c7f148d7f575761453b24ea5ab7c58139a6839b92ee863c6a5485ab4a009da7c362471a2b3
 WHIRLPOOL 
f9d7df4687c4d1a402c43ba43acee9f3b1423f8dcc691ef69590554f49530be5df0ef57f0f20b67ba0efb50690cdc744015f1917bb2051857d496c5cf000f948
-DIST ardour-4.4.tar.gz 9511090 SHA256 
d567e99c4476c0122006c85d09a8e4eab93db28be7be99d338ea66be8581bfcf SHA512 
8df3e4552b0ccdd76c5ccf06224594325bb8c02f897bb79bd983531a2f4f56c60185b6080e2f8eddb6a274b9d48dc93a47ddc5471e05b253d492c09be816dde0
 WHIRLPOOL 
86e298b7defa5249c0632368bae64ddde2175e5f5ece66b4932485a4216ae0613b81e2f736f54e7f00a600be5e238fe41559fe2290f3aebbb36b208184aefc25
-DIST ardour-4.6.tar.gz 10033725 SHA256 
79a3b063f2413d79c4bb2930505e0f6628848258051869095588a50940f49f6b SHA512 
8fdda5f6efde18a66d89605f0a4d14756ce573ffc5de54e7229c7aa76ab11cbba33bdb775fb5c5dde86f4d308c2a96b904a0298d7b9c598300ab35e835f2ea0a
 WHIRLPOOL 
0f4e054cdb2a1022f860354d70e4517bebee66e0711f16b4e3b19ebc8f354e364fd1a91e64aa3f7c692f3251ee261cdc2fda29215cef58c9a8cebcc20708af72
 DIST ardour-4.7.tar.gz 9863149 SHA256 
dfa3d102b3f7bb0702969153d22d9311ac98c587f691760ab0f1d3f4f455a86d SHA512 
5daff563ec0b2dc38ec6ca55bb12526ef54da9d8d5a29a9fd6d869f54b83e6fe5ff3c28ef654e6700455110b4a46ce42a33902eb66d96330c6c0948eb3cd3096
 WHIRLPOOL 
eb94b56a919d0088a312414f45475f53ee8c7f618d85f9ffcf5f27719422c2035ff4608108ecbe0f521d54ed1ad40c06ada0a1cb8f7d70531320f40aa107e4b4
-DIST ardour-5.0.tar.bz2 8825191 SHA256 
7278193d7583c6c4c08a0f64b3a61d9d276933483573f96fdb857750ceef4f48 SHA512 
3913e14e16906136422d573fc3d11d6159248e3dede8614acf6bb2e33950e3e5ff2e6597b394e3ce270b79e0bf926ae4b72d5daa2f01cd04da8e42d13bef7ba8
 WHIRLPOOL 
a354e8095a78bfccb3d7b9d55b5915165f8b21b7102bf0f129f43a9ba301be9b1a40598eff7421f0422892be2d24e479cf6eb555dfb563f8a860bf61f0afa533
 DIST ardour-5.3.tar.bz2 8244811 SHA256 
1289002cb81e372b663f9d66e2923c066b64c48f9bec3a9884f7a59cb007945a SHA512 
464c311cd3f3f4a580ad451be7a8143a3f2f7454364426c952e757999aba92af6611d0bc31f4d5e0ca301a3c79e4cd1ec19b01ec9941f34e6fa4cf338149291f
 WHIRLPOOL 
b7d999805f2b5dda2dc1fd92cbec76d499b15c0f7517c208e7c6b46b624dcd759b0c25a4ee9ec23d974500873c93a8b76e1f45395a25936d5641e47e3027f038
 DIST ardour-5.5.tar.bz2 9237459 SHA256 
867605614f6840341d37c388f6c5acf803579172b7d7edbebb4c8e36c8bfde1f SHA512 
63132681dda7890b8f455a8142935f0bdce28e718b98d1d79a9207ad86b25d31698285d28871bb5043b3b859efd8b1fb8b7b7324fa3abd952a7a9c8e1691e09c
 WHIRLPOOL 
16a7cdc5b5893bbd4e6e86bf3f6d06dc236ad3c7062ba51f313fc472fd46e63f9508f761e9d20ff929e915591fc1d3153098b115909671e4c357003b6c21f733

diff --git a/media-sound/ardour/ardour-2.8.14-r1.ebuild 
b/media-sound/ardour/ardour-2.8.14-r1.ebuild
deleted file mode 100644
index 5d99b70..00000000
--- a/media-sound/ardour/ardour-2.8.14-r1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-inherit eutils flag-o-matic toolchain-funcs scons-utils
-
-DESCRIPTION="Digital Audio Workstation"
-HOMEPAGE="http://ardour.org/";
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="~amd64 ~x86"
-IUSE="altivec curl debug 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
-       >=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
-       curl? ( net-misc/curl )
-       lv2? (
-               >=media-libs/slv2-0.6.1
-               media-libs/lilv
-               media-libs/suil
-       )"
-DEPEND="${RDEPEND}
-       virtual/pkgconfig
-       nls? ( sys-devel/gettext )"
-
-src_prepare() {
-       epatch \
-               "${FILESDIR}"/${PN}-2.8.11-flags.patch \
-               "${FILESDIR}"/${P}-syslibs.patch \
-               "${FILESDIR}"/${P}-boost-150.patch
-
-}
-
-src_compile() {
-       local FPU_OPTIMIZATION=$($(use altivec || use cpu_flags_x86_sse) && 
echo 1 || echo 0)
-       tc-export CC CXX
-       mkdir -p "${D}"
-
-       escons \
-               DESTDIR="${D}" \
-               FPU_OPTIMIZATION="${FPU_OPTIMIZATION}" \
-               PREFIX=/usr \
-               SYSLIBS=1 \
-               $(use_scons curl FREESOUND) \
-               $(use_scons debug DEBUG) \
-               $(use_scons nls NLS) \
-               $(use_scons lv2 LV2)
-}
-
-src_install() {
-       escons install
-       doman ${PN}.1
-       newicon icons/icon/ardour_icon_mac.png ${PN}.png
-       make_desktop_entry ardour2 ardour2 ardour AudioVideo
-}

diff --git a/media-sound/ardour/ardour-4.0-r2.ebuild 
b/media-sound/ardour/ardour-4.0-r2.ebuild
deleted file mode 100644
index 3c42277..00000000
--- a/media-sound/ardour/ardour-4.0-r2.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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 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
-       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
-       sed -e 's/'FLAGS\'\,\ compiler_flags'/'FLAGS\'\,\ program_flags'/g' -i 
"${S}"/wscript
-       sed -e 's/'compiler_flags.append\ 
\(\'-DPROGRAM_'/'program_flags.append\ \(\'-DPROGRAM_'/g' -i "${S}"/wscript
-       sed -e '/compiler_flags\ \=\ \[\]/a \ \ \ \ program_flags\ \=\ \[\]' -i 
"${S}"/wscript
-       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}"
-       waf-utils_src_configure \
-               --destdir="${D}" \
-               --prefix=/usr \
-               --configdir=/etc \
-               --optimize \
-               --no-jack-metadata \
-               --nls \
-               $(use jack && echo "--with-backends=alsa,jack" || echo 
"--with-backends=alsa --no-jack --libjack=weak") \
-               $(use lv2 && echo "--lv2" || echo "--no-lv2") \
-               $({ 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 ardour4 ardour4 ardour4 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-4.1.ebuild 
b/media-sound/ardour/ardour-4.1.ebuild
deleted file mode 100644
index 8506b89..00000000
--- a/media-sound/ardour/ardour-4.1.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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 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
-       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.x-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
-       sed -e 's/'FLAGS\'\,\ compiler_flags'/'FLAGS\'\,\ program_flags'/g' -i 
"${S}"/wscript
-       sed -e 's/'compiler_flags.append\ 
\(\'-DPROGRAM_'/'program_flags.append\ \(\'-DPROGRAM_'/g' -i "${S}"/wscript
-       sed -e '/compiler_flags\ \=\ \[\]/a \ \ \ \ program_flags\ \=\ \[\]' -i 
"${S}"/wscript
-       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}"
-       waf-utils_src_configure \
-               --destdir="${D}" \
-               --prefix=/usr \
-               --configdir=/etc \
-               --optimize \
-               --nls \
-               $(use jack && echo "--with-backends=alsa,jack" || echo 
"--with-backends=alsa  --libjack=weak") \
-               $(use lv2 && echo "--lv2" || echo "--no-lv2") \
-               $({ 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 ardour4 ardour4 ardour4 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-4.2-r1.ebuild 
b/media-sound/ardour/ardour-4.2-r1.ebuild
deleted file mode 100644
index 63d0028..00000000
--- a/media-sound/ardour/ardour-4.2-r1.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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
-       EGIT_REPO_URI="http://git.ardour.org/ardour/ardour.git";
-       inherit git-r3
-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 lv2 cpu_flags_x86_sse"
-
-RDEPEND="
-       >=dev-cpp/glibmm-2.32.0
-       >=dev-cpp/gtkmm-2.16:2.4
-       >=dev-cpp/libgnomecanvasmm-2.26:2.6
-       dev-libs/boost:=
-       >=dev-libs/glib-2.10.1:2
-       dev-libs/libsigc++:2
-       >=dev-libs/libxml2-2.6:2
-       dev-libs/libxslt
-       >=gnome-base/libgnomecanvas-2
-       media-libs/alsa-lib
-       media-libs/aubio
-       media-libs/flac
-       media-libs/freetype:2
-       media-libs/libart_lgpl
-       media-libs/liblo
-       >=media-libs/liblrdf-0.4.0-r20
-       >=media-libs/libsamplerate-0.1
-       >=media-libs/libsndfile-1.0.18
-       >=media-libs/libsoundtouch-1.6.0
-       media-libs/raptor:2
-       >=media-libs/rubberband-1.6.0
-       >=media-libs/taglib-1.7
-       media-libs/vamp-plugin-sdk
-       net-misc/curl
-       sci-libs/fftw:3.0
-       virtual/libusb:0
-       x11-libs/cairo
-       >=x11-libs/gtk+-2.8.1:2
-       x11-libs/pango
-       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}
-       >=media-sound/jack-audio-connection-kit-0.120
-       sys-devel/gettext
-       virtual/pkgconfig
-       doc? ( app-doc/doxygen[dot] )"
-
-src_prepare(){
-       if ! [[ ${PV} == *9999* ]]; then
-               epatch "${FILESDIR}"/${PN}-4.x-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
-       sed -e 's/'FLAGS\'\,\ compiler_flags'/'FLAGS\'\,\ program_flags'/g' \
-               -i "${S}"/wscript
-       sed -e 's/'compiler_flags.append\ 
\(\'-DPROGRAM_'/'program_flags.append\ \(\'-DPROGRAM_'/g' \
-               -i "${S}"/wscript
-       sed -e '/compiler_flags\ \=\ \[\]/a \ \ \ \ program_flags\ \=\ \[\]' \
-               -i "${S}"/wscript
-       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}"
-       waf-utils_src_configure \
-               --destdir="${D}" \
-               --prefix=/usr \
-               --configdir=/etc \
-               --optimize \
-               --nls \
-               $(usex jack "--with-backends=alsa,jack" "--with-backends=alsa  
--libjack=weak") \
-               $(usex lv2 "--lv2" "--no-lv2") \
-               $({ use altivec || use cpu_flags_x86_sse; } && echo 
"--fpu-optimization" || echo "--no-fpu-optimization") \
-               $(usex doc "--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 ardour4 ardour4 ardour4 AudioVideo
-}
-
-pkg_postinst() {
-       elog "If you are using Ardour and want to keep its development alive"
-       elog "then please consider to make a donation upstream at ${HOMEPAGE}"
-}

diff --git a/media-sound/ardour/ardour-4.4.ebuild 
b/media-sound/ardour/ardour-4.4.ebuild
deleted file mode 100644
index e679540..00000000
--- a/media-sound/ardour/ardour-4.4.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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
-       EGIT_REPO_URI="http://git.ardour.org/ardour/ardour.git";
-       inherit git-r3
-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 lv2 cpu_flags_x86_sse cpu_flags_x86_mmx 
cpu_flags_x86_3dnow"
-
-RDEPEND="
-       >=dev-cpp/glibmm-2.32.0
-       >=dev-cpp/gtkmm-2.16:2.4
-       >=dev-cpp/libgnomecanvasmm-2.26:2.6
-       dev-libs/boost:=
-       >=dev-libs/glib-2.10.1:2
-       dev-libs/libsigc++:2
-       >=dev-libs/libxml2-2.6:2
-       dev-libs/libxslt
-       >=gnome-base/libgnomecanvas-2
-       media-libs/alsa-lib
-       media-libs/aubio
-       media-libs/flac
-       media-libs/freetype:2
-       media-libs/libart_lgpl
-       media-libs/liblo
-       >=media-libs/liblrdf-0.4.0-r20
-       >=media-libs/libsamplerate-0.1
-       >=media-libs/libsndfile-1.0.18
-       >=media-libs/libsoundtouch-1.6.0
-       media-libs/raptor:2
-       >=media-libs/rubberband-1.6.0
-       >=media-libs/taglib-1.7
-       media-libs/vamp-plugin-sdk
-       net-misc/curl
-       sci-libs/fftw:3.0
-       virtual/libusb:0
-       x11-libs/cairo
-       >=x11-libs/gtk+-2.8.1:2
-       x11-libs/pango
-       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}
-       >=media-sound/jack-audio-connection-kit-0.120
-       sys-devel/gettext
-       virtual/pkgconfig
-       doc? ( app-doc/doxygen[dot] )"
-
-pkg_setup() {
-       if has_version \>=dev-libs/libsigc++-2.6 ; then
-               append-cxxflags -std=c++11
-       fi
-}
-
-src_prepare(){
-       if ! [[ ${PV} == *9999* ]]; then
-               epatch "${FILESDIR}"/${PN}-4.x-revision-naming.patch
-               touch "${S}/libs/ardour/revision.cc"
-       fi
-       use lv2 || epatch "${FILESDIR}"/${PN}-4.0-lv2.patch
-       sed 's/'full-optimization\'\ :\ \\[.*'/'full-optimization\'\ :\ 
\'\','/' -i "${S}"/wscript
-       MARCH=$(get-flag march)
-       if use cpu_flags_x86_sse; then
-               if [[ ${MARCH} == "i686" ]] || [[ ${MARCH} == "i486" ]]; then
-                       elog "You enabled sse but use an march that does not 
support sse!"
-                       elog "We add sse to the flags now, but please consider 
switching your march in make.conf!"
-               fi
-               OPTFLAGS="sse"
-       fi
-       if use cpu_flags_x86_mmx; then
-               if [[ ${MARCH} == "i486" ]]; then
-                   elog "You enabled mmx with i486 set as march! You have been 
warned!"
-               fi
-               OPTFLAGS="${OPTFLAGS} mmx"
-       fi
-       if use cpu_flags_x86_3dnow; then
-               OPTFLAGS="${OPTFLAGS} 3dnow"
-       fi
-       sed 's/flag_line\ =\ o.*/flag_line\ =\ \": '${OPTFLAGS}' just some 
place holders\"/' \
-               -i "${S}"/wscript
-       sed 's/cpu\ ==\ .*/cpu\ ==\ "LeaveMarchAsIs":/' -i "${S}"/wscript
-       append-flags "-lboost_system"
-}
-
-src_configure() {
-       tc-export CC CXX
-       mkdir -p "${D}"
-       waf-utils_src_configure \
-               --destdir="${D}" \
-               --prefix=/usr \
-               --configdir=/etc \
-               --nls \
-               --optimize \
-               $(usex jack "--with-backends=alsa,jack" "--with-backends=alsa  
--libjack=weak") \
-               $(usex lv2 "--lv2" "--no-lv2") \
-               $(usex doc "--docs" '') \
-               $({ use altivec || use cpu_flags_x86_sse; } && echo 
"--fpu-optimization" || echo "--no-fpu-optimization")
-}
-
-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 ardour4 ardour4 ardour4 AudioVideo
-}
-
-pkg_postinst() {
-       elog "If you are using Ardour and want to keep its development alive"
-       elog "then please consider to make a donation upstream at ${HOMEPAGE}"
-}

diff --git a/media-sound/ardour/ardour-4.6.ebuild 
b/media-sound/ardour/ardour-4.6.ebuild
deleted file mode 100644
index 6ef94c0..00000000
--- a/media-sound/ardour/ardour-4.6.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='threads(+)'
-#EPYTHON='python2.7'
-inherit eutils toolchain-funcs flag-o-matic python-any-r1 waf-utils
-
-DESCRIPTION="Digital Audio Workstation"
-HOMEPAGE="http://ardour.org/";
-
-if [[ ${PV} == *9999* ]]; then
-       EGIT_REPO_URI="http://git.ardour.org/ardour/ardour.git";
-       inherit git-r3
-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 lv2 cpu_flags_x86_sse cpu_flags_x86_mmx 
cpu_flags_x86_3dnow"
-
-RDEPEND="
-       >=dev-cpp/glibmm-2.32.0
-       >=dev-cpp/gtkmm-2.16:2.4
-       >=dev-cpp/libgnomecanvasmm-2.26:2.6
-       dev-libs/boost:=
-       >=dev-libs/glib-2.10.1:2
-       dev-libs/libsigc++:2
-       >=dev-libs/libxml2-2.6:2
-       dev-libs/libxslt
-       >=gnome-base/libgnomecanvas-2
-       media-libs/alsa-lib
-       media-libs/aubio
-       media-libs/flac
-       media-libs/freetype:2
-       media-libs/libart_lgpl
-       media-libs/liblo
-       >=media-libs/liblrdf-0.4.0-r20
-       >=media-libs/libsamplerate-0.1
-       >=media-libs/libsndfile-1.0.18
-       >=media-libs/libsoundtouch-1.6.0
-       media-libs/raptor:2
-       >=media-libs/rubberband-1.6.0
-       >=media-libs/taglib-1.7
-       media-libs/vamp-plugin-sdk
-       net-misc/curl
-       sci-libs/fftw:3.0
-       virtual/libusb:0
-       x11-libs/cairo
-       >=x11-libs/gtk+-2.8.1:2
-       x11-libs/pango
-       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}
-       jack? ( >=media-sound/jack-audio-connection-kit-0.120 )
-       sys-devel/gettext
-       virtual/pkgconfig
-       doc? ( app-doc/doxygen[dot] )"
-
-pkg_setup() {
-       if has_version \>=dev-libs/libsigc++-2.6 ; then
-               append-cxxflags -std=c++11
-       fi
-       python-any-r1_pkg_setup
-}
-
-src_prepare(){
-       if ! [[ ${PV} == *9999* ]]; then
-               epatch "${FILESDIR}"/${PN}-4.x-revision-naming.patch
-               touch "${S}/libs/ardour/revision.cc"
-       fi
-       use lv2 || epatch "${FILESDIR}"/${PN}-4.0-lv2.patch
-       sed 's/'full-optimization\'\ :\ \\[.*'/'full-optimization\'\ :\ 
\'\','/' -i "${S}"/wscript || die
-       MARCH=$(get-flag march)
-       OPTFLAGS=""
-       if use cpu_flags_x86_sse; then
-               if [[ ${MARCH} == "i686" ]] || [[ ${MARCH} == "i486" ]]; then
-                       elog "You enabled sse but use an march that does not 
support sse!"
-                       elog "We add -msse to the flags now, but please 
consider switching your march in make.conf!"
-               fi
-               OPTFLAGS="sse"
-       fi
-       if use cpu_flags_x86_mmx; then
-               if [[ ${MARCH} == "i486" ]]; then
-                   elog "You enabled mmx with i486 set as march! You have been 
warned!"
-               fi
-               OPTFLAGS="${OPTFLAGS} mmx"
-       fi
-       if use cpu_flags_x86_3dnow; then
-               OPTFLAGS="${OPTFLAGS} 3dnow"
-       fi
-       sed 's/flag_line\ =\ o.*/flag_line\ =\ \": '"${OPTFLAGS}"' just some 
place holders\"/' \
-               -i "${S}"/wscript || die
-       sed 's/cpu\ ==\ .*/cpu\ ==\ "LeaveMarchAsIs":/' -i "${S}"/wscript || die
-       append-flags "-lboost_system"
-       python_fix_shebang "${S}"/wscript
-       python_fix_shebang "${S}"/waf
-}
-
-src_configure() {
-       tc-export CC CXX
-       mkdir -p "${D}"
-       waf-utils_src_configure \
-               --destdir="${D}" \
-               --prefix=/usr \
-               --configdir=/etc \
-               --nls \
-               --optimize \
-               $(usex jack "--with-backends=alsa,jack" "--with-backends=alsa  
--libjack=weak") \
-               $(usex lv2 "--lv2" "--no-lv2") \
-               $(usex doc "--docs" '') \
-               $({ use altivec || use cpu_flags_x86_sse; } && echo 
"--fpu-optimization" || echo "--no-fpu-optimization")
-}
-
-src_install() {
-       waf-utils_src_install
-       mv ${PN}.1 ${PN}${SLOT}.1
-       doman ${PN}${SLOT}.1
-       newicon icons/icon/ardour_icon_tango_48px_red.png ${PN}${SLOT}.png
-       make_desktop_entry ardour4 ardour4 ardour4 AudioVideo
-}
-
-pkg_postinst() {
-       elog "If you are using Ardour and want to keep its development alive"
-       elog "then please consider to make a donation upstream at ${HOMEPAGE}"
-}

diff --git a/media-sound/ardour/ardour-5.0.ebuild 
b/media-sound/ardour/ardour-5.0.ebuild
deleted file mode 100644
index e5a98c6..00000000
--- a/media-sound/ardour/ardour-5.0.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='threads(+)'
-#EPYTHON='python2.7'
-inherit eutils toolchain-funcs flag-o-matic python-any-r1 waf-utils
-
-DESCRIPTION="Digital Audio Workstation"
-HOMEPAGE="http://ardour.org/";
-
-if [[ ${PV} == *9999* ]]; then
-       EGIT_REPO_URI="http://git.ardour.org/ardour/ardour.git";
-       inherit git-r3
-else
-       KEYWORDS="~amd64 ~x86"
-       SRC_URI="http://fossies.org/linux/misc/Ardour-${PV}.0.tar.bz2 -> 
${P}.tar.bz2"
-       S="${WORKDIR}/Ardour-${PV}.0"
-fi
-
-LICENSE="GPL-2"
-SLOT="5"
-IUSE="altivec doc jack lv2 cpu_flags_x86_sse cpu_flags_x86_mmx 
cpu_flags_x86_3dnow"
-
-RDEPEND="
-       >=dev-cpp/glibmm-2.32.0
-       >=dev-cpp/gtkmm-2.16:2.4
-       >=dev-cpp/libgnomecanvasmm-2.26:2.6
-       dev-libs/boost:=
-       >=dev-libs/glib-2.10.1:2
-       dev-libs/libsigc++:2
-       >=dev-libs/libxml2-2.6:2
-       dev-libs/libxslt
-       >=gnome-base/libgnomecanvas-2
-       media-libs/alsa-lib
-       media-libs/aubio
-       media-libs/flac
-       media-libs/freetype:2
-       media-libs/libart_lgpl
-       media-libs/liblo
-       >=media-libs/liblrdf-0.4.0-r20
-       >=media-libs/libsamplerate-0.1
-       >=media-libs/libsndfile-1.0.18
-       >=media-libs/libsoundtouch-1.6.0
-       media-libs/raptor:2
-       >=media-libs/rubberband-1.6.0
-       >=media-libs/taglib-1.7
-       media-libs/vamp-plugin-sdk
-       net-misc/curl
-       sci-libs/fftw:3.0[threads]
-       virtual/libusb:0
-       x11-libs/cairo
-       >=x11-libs/gtk+-2.8.1:2
-       x11-libs/pango
-       jack? ( virtual/jack )
-       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}
-       jack? ( >=media-sound/jack-audio-connection-kit-0.120 )
-       sys-devel/gettext
-       virtual/pkgconfig
-       doc? ( app-doc/doxygen[dot] )"
-
-pkg_setup() {
-       if has_version \>=dev-libs/libsigc++-2.6 ; then
-               append-cxxflags -std=c++11
-       fi
-       python-any-r1_pkg_setup
-}
-
-src_prepare(){
-       if ! [[ ${PV} == *9999* ]]; then
-               epatch "${FILESDIR}"/${PN}-4.x-revision-naming.patch
-               touch "${S}/libs/ardour/revision.cc"
-       fi
-       use lv2 || epatch "${FILESDIR}"/${PN}-4.0-lv2.patch
-       sed 's/'full-optimization\'\ :\ \\[.*'/'full-optimization\'\ :\ 
\'\','/' -i "${S}"/wscript || die
-       MARCH=$(get-flag march)
-       OPTFLAGS=""
-       if use cpu_flags_x86_sse; then
-               if [[ ${MARCH} == "i686" ]] || [[ ${MARCH} == "i486" ]]; then
-                       elog "You enabled sse but use an march that does not 
support sse!"
-                       elog "We add -msse to the flags now, but please 
consider switching your march in make.conf!"
-               fi
-               OPTFLAGS="sse"
-       fi
-       if use cpu_flags_x86_mmx; then
-               if [[ ${MARCH} == "i486" ]]; then
-                   elog "You enabled mmx with i486 set as march! You have been 
warned!"
-               fi
-               OPTFLAGS="${OPTFLAGS} mmx"
-       fi
-       if use cpu_flags_x86_3dnow; then
-               OPTFLAGS="${OPTFLAGS} 3dnow"
-       fi
-       sed 's/flag_line\ =\ o.*/flag_line\ =\ \": '"${OPTFLAGS}"' just some 
place holders\"/' \
-               -i "${S}"/wscript || die
-       sed 's/cpu\ ==\ .*/cpu\ ==\ "LeaveMarchAsIs":/' -i "${S}"/wscript || die
-       append-flags "-lboost_system"
-       python_fix_shebang "${S}"/wscript
-       python_fix_shebang "${S}"/waf
-}
-
-src_configure() {
-       tc-export CC CXX
-       mkdir -p "${D}"
-       waf-utils_src_configure \
-               --destdir="${D}" \
-               --prefix=/usr \
-               --configdir=/etc \
-               --nls \
-               --optimize \
-               $(usex jack "--with-backends=alsa,jack" "--with-backends=alsa  
--libjack=weak") \
-               $(usex lv2 "--lv2" "--no-lv2") \
-               $(usex doc "--docs" '') \
-               $({ use altivec || use cpu_flags_x86_sse; } && echo 
"--fpu-optimization" || echo "--no-fpu-optimization")
-}
-
-src_install() {
-       waf-utils_src_install
-       mv ${PN}.1 ${PN}${SLOT}.1
-       doman ${PN}${SLOT}.1
-       newicon "${S}/gtk2_ardour/resources/Ardour-icon_48px.png" 
${PN}${SLOT}.png
-       make_desktop_entry ardour5 ardour5 ardour5 AudioVideo
-}
-
-pkg_postinst() {
-       elog "If you are using Ardour and want to keep its development alive"
-       elog "then please consider to make a donation upstream at ${HOMEPAGE}."
-       elog "Please do _not_ report problems with the package to ${PN} 
upstream."
-       elog "If you think you've found a bug, check the upstream binary 
package"
-       elog "before you report anything to upstream."
-}

diff --git a/media-sound/ardour/files/ardour-3.0-syslibs.patch 
b/media-sound/ardour/files/ardour-3.0-syslibs.patch
deleted file mode 100644
index 6b8deb6..00000000
--- a/media-sound/ardour/files/ardour-3.0-syslibs.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -rupN ardour-3.0/libs/ardour/wscript newardour-3.0/libs/ardour/wscript
---- ardour-3.0/libs/ardour/wscript      2013-03-10 22:13:52.000000000 +0100
-+++ newardour-3.0/libs/ardour/wscript   2013-03-15 08:04:07.428001597 +0100
-@@ -287,7 +287,8 @@ def configure(conf):
- 
-     # we don't try to detect this, since its part of our source tree
- 
--    conf.define('HAVE_RUBBERBAND', 1) # controls whether we think we have it
-+    autowaf.check_pkg(conf, 'taglib', uselib_store='TAGLIB', 
atleast_version='1.7')
-+    autowaf.check_pkg(conf, 'rubberband', uselib_store='RUBBERBAND', 
atleast_version='1.4')
-     conf.define('USE_RUBBERBAND', 1)  # controls whether we actually use it
- 
-     conf.define('CURRENT_SESSION_FILE_VERSION', CURRENT_SESSION_FILE_VERSION)
-@@ -378,7 +379,7 @@ def build(bld):
-     obj.target       = 'ardour'
-     obj.uselib       = ['GLIBMM','GTHREAD','AUBIO','SIGCPP','XML','UUID',
-                         'JACK','SNDFILE','SAMPLERATE','LRDF','AUDIOUNITS',
--                        'OSX','BOOST','CURL','DL']
-+                        'OSX','BOOST','CURL','DL','RUBBERBAND','TAGLIB']
-     obj.use          = ['libpbd','libmidipp','libevoral','libvamphost',
-                         'libvampplugin','libtaglib','librubberband',
-                         'libaudiographer','libltc']
-diff -rupN ardour-3.0/wscript newardour-3.0/wscript
---- ardour-3.0/wscript  2013-03-10 22:13:59.000000000 +0100
-+++ newardour-3.0/wscript       2013-03-15 08:03:00.639999789 +0100
-@@ -31,9 +31,7 @@ children = [
-         'libs/vamp-sdk',
-         'libs/qm-dsp',
-         'libs/vamp-plugins',
--        'libs/taglib',
-         'libs/libltc',
--        'libs/rubberband',
-         'libs/surfaces',
-         'libs/panners',
-         'libs/timecode',

diff --git a/media-sound/ardour/files/ardour-3.2-syslibs.patch 
b/media-sound/ardour/files/ardour-3.2-syslibs.patch
deleted file mode 100644
index 6b8deb6..00000000
--- a/media-sound/ardour/files/ardour-3.2-syslibs.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -rupN ardour-3.0/libs/ardour/wscript newardour-3.0/libs/ardour/wscript
---- ardour-3.0/libs/ardour/wscript      2013-03-10 22:13:52.000000000 +0100
-+++ newardour-3.0/libs/ardour/wscript   2013-03-15 08:04:07.428001597 +0100
-@@ -287,7 +287,8 @@ def configure(conf):
- 
-     # we don't try to detect this, since its part of our source tree
- 
--    conf.define('HAVE_RUBBERBAND', 1) # controls whether we think we have it
-+    autowaf.check_pkg(conf, 'taglib', uselib_store='TAGLIB', 
atleast_version='1.7')
-+    autowaf.check_pkg(conf, 'rubberband', uselib_store='RUBBERBAND', 
atleast_version='1.4')
-     conf.define('USE_RUBBERBAND', 1)  # controls whether we actually use it
- 
-     conf.define('CURRENT_SESSION_FILE_VERSION', CURRENT_SESSION_FILE_VERSION)
-@@ -378,7 +379,7 @@ def build(bld):
-     obj.target       = 'ardour'
-     obj.uselib       = ['GLIBMM','GTHREAD','AUBIO','SIGCPP','XML','UUID',
-                         'JACK','SNDFILE','SAMPLERATE','LRDF','AUDIOUNITS',
--                        'OSX','BOOST','CURL','DL']
-+                        'OSX','BOOST','CURL','DL','RUBBERBAND','TAGLIB']
-     obj.use          = ['libpbd','libmidipp','libevoral','libvamphost',
-                         'libvampplugin','libtaglib','librubberband',
-                         'libaudiographer','libltc']
-diff -rupN ardour-3.0/wscript newardour-3.0/wscript
---- ardour-3.0/wscript  2013-03-10 22:13:59.000000000 +0100
-+++ newardour-3.0/wscript       2013-03-15 08:03:00.639999789 +0100
-@@ -31,9 +31,7 @@ children = [
-         'libs/vamp-sdk',
-         'libs/qm-dsp',
-         'libs/vamp-plugins',
--        'libs/taglib',
-         'libs/libltc',
--        'libs/rubberband',
-         'libs/surfaces',
-         'libs/panners',
-         'libs/timecode',

diff --git a/media-sound/ardour/files/ardour-3.5-syslibs.patch 
b/media-sound/ardour/files/ardour-3.5-syslibs.patch
deleted file mode 100644
index a80e3a3..00000000
--- a/media-sound/ardour/files/ardour-3.5-syslibs.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff --git a/libs/ardour/wscript b/libs/ardour/wscript
-index 4d56983..41dd54a 100644
---- a/libs/ardour/wscript
-+++ b/libs/ardour/wscript
-@@ -287,7 +287,8 @@ def configure(conf):
- 
-     # we don't try to detect this, since its part of our source tree
- 
--    conf.define('HAVE_RUBBERBAND', 1) # controls whether we think we have it
-+    autowaf.check_pkg(conf, 'taglib', uselib_store='TAGLIB', 
atleast_version='1.7')
-+    autowaf.check_pkg(conf, 'rubberband', uselib_store='RUBBERBAND', 
atleast_version='1.4')
-     conf.define('USE_RUBBERBAND', 1)  # controls whether we actually use it
- 
-     conf.define('CURRENT_SESSION_FILE_VERSION', CURRENT_SESSION_FILE_VERSION)
-@@ -332,7 +333,7 @@ def build(bld):
-     obj.target       = 'ardour'
-     obj.uselib       = ['GLIBMM','GTHREAD','AUBIO','SIGCPP','XML','UUID',
-                         'SNDFILE','SAMPLERATE','LRDF','AUDIOUNITS',
--                        'OSX','BOOST','CURL','DL']
-+                        'OSX','BOOST','CURL','DL','RUBBERBAND','TAGLIB']
-     obj.use          = ['libpbd','libmidipp','libevoral','libvamphost',
-                         'libvampplugin','libtaglib','librubberband',
-                         'libaudiographer','libltc','libtimecode']
-diff --git a/wscript b/wscript
-index 3d01632..e84f4bf 100644
---- a/wscript
-+++ b/wscript
-@@ -24,9 +24,7 @@ children = [
-         'libs/vamp-sdk',
-         'libs/qm-dsp',
-         'libs/vamp-plugins',
--        'libs/taglib',
-         'libs/libltc',
--        'libs/rubberband',
-         'libs/surfaces',
-         'libs/panners',
-         'libs/backends',

diff --git a/media-sound/ardour/files/ardour-3.5.403-sse.patch 
b/media-sound/ardour/files/ardour-3.5.403-sse.patch
deleted file mode 100644
index 194da5f..00000000
--- a/media-sound/ardour/files/ardour-3.5.403-sse.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -rupN ardouroriginal/libs/ardour/wscript 
ardour-3.5.403/libs/ardour/wscript
---- ardouroriginal/libs/ardour/wscript 2014-10-24 19:18:10.981000000 +0200
-+++ ardour-3.5.403/libs/ardour/wscript 2014-10-24 19:19:36.115000000 +0200
-@@ -385,7 +385,7 @@ def build(bld):
-     if bld.is_defined('AUDIOUNIT_SUPPORT'):
-         obj.source += [ 'audio_unit.cc' ]
- 
--    if Options.options.fpu_optimization:
-+    if bld.env['FPU_OPTIMIZATION']:
-         if (bld.env['build_target'] == 'i386' or bld.env['build_target'] == 
'i686'):
-             obj.source += [ 'sse_functions_xmm.cc', 'sse_functions.s' ]
-         elif bld.env['build_target'] == 'x86_64':
-diff -rupN ardouroriginal/wscript ardour-3.5.403/wscript
---- ardouroriginal/wscript     2014-10-24 19:18:10.989000000 +0200
-+++ ardour-3.5.403/wscript     2014-10-24 19:20:20.160000000 +0200
-@@ -675,6 +675,8 @@ def configure(conf):
-         conf.env['PHONE_HOME'] = True
-     if opts.fpu_optimization:
-         conf.env['FPU_OPTIMIZATION'] = True
-+    else:
-+      conf.env['FPU_OPTIMIZATION'] = False
-     if opts.nls:
-         conf.define('ENABLE_NLS', 1)
-         conf.env['ENABLE_NLS'] = True

diff --git a/media-sound/ardour/files/ardour-3.5.7-syslibs.patch 
b/media-sound/ardour/files/ardour-3.5.7-syslibs.patch
deleted file mode 100644
index 2f8ab10..00000000
--- a/media-sound/ardour/files/ardour-3.5.7-syslibs.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -rupN a/ardour-3.5.74/libs/ardour/wscript 
b/ardour-3.5.74/libs/ardour/wscript
---- a/ardour-3.5.74/libs/ardour/wscript 2013-11-05 20:20:03.000000000 +0100
-+++ b/ardour-3.5.74/libs/ardour/wscript 2013-11-08 09:51:41.553000000 +0100
-@@ -287,7 +287,8 @@ def configure(conf):
- 
-     # we don't try to detect this, since its part of our source tree
- 
--    conf.define('HAVE_RUBBERBAND', 1) # controls whether we think we have it
-+    autowaf.check_pkg(conf, 'taglib', uselib_store='TAGLIB', 
atleast_version='1.7')
-+    autowaf.check_pkg(conf, 'rubberband', uselib_store='RUBBERBAND', 
atleast_version='1.4')
-     conf.define('USE_RUBBERBAND', 1)  # controls whether we actually use it
- 
-     conf.define('CURRENT_SESSION_FILE_VERSION', CURRENT_SESSION_FILE_VERSION)
-@@ -332,7 +333,7 @@ def build(bld):
-     obj.target       = 'ardour'
-     obj.uselib       = ['GLIBMM','GTHREAD','AUBIO','SIGCPP','XML','UUID',
-                         'SNDFILE','SAMPLERATE','LRDF','AUDIOUNITS',
--                        'OSX','BOOST','CURL','DL']
-+                        'OSX','BOOST','CURL','DL','RUBBERBAND','TAGLIB']
-     obj.use          = ['libpbd','libmidipp','libevoral','libvampplugin',
-                         'libaudiographer','libltc','libtimecode']
-     if bld.is_defined('USE_EXTERNAL_LIBS'):
-diff -rupN a/ardour-3.5.74/wscript b/ardour-3.5.74/wscript
---- a/ardour-3.5.74/wscript     2013-11-05 20:20:03.000000000 +0100
-+++ b/ardour-3.5.74/wscript     2013-11-08 09:49:27.594000000 +0100
-@@ -56,9 +56,7 @@ children = [
-         'libs/vamp-sdk',
-         'libs/qm-dsp',
-         'libs/vamp-plugins',
--        'libs/taglib',
-         'libs/libltc',
--        'libs/rubberband',
-         'libs/surfaces',
-         'libs/panners',
-         'libs/backends',
-

diff --git a/media-sound/ardour/files/ardour-4.0-revision-naming.patch 
b/media-sound/ardour/files/ardour-4.0-revision-naming.patch
deleted file mode 100644
index 360ddc6..00000000
--- a/media-sound/ardour/files/ardour-4.0-revision-naming.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-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:
-         #
-

Reply via email to