nls usefalg removed #547620, jack configure changes in 9999 #548308. older 4.0 revisi...

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 07095c48333b95b42e729992f47e2aad9a67fc56..fbb3e8330ad89be10c45ab4d7c485496a37d29fd 100644 (file)
--- a/media-sound/ardour/ChangeLog
+++ b/media-sound/ardour/ChangeLog
@@ -1,6 +1,11 @@
 # 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.142 2015/04/24 07:16:52 nativemad Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ChangeLog,v 1.143 2015/05/03 12:32:14 nativemad Exp $
+
+  03 May 2015; Andreas Schuerch <nativemad@gentoo.org> ardour-4.0-r2.ebuild,
+  ardour-9999.ebuild:
+  nls useflag removed #547620. Changed jack configure options for 9999 #548308.
+  Also remove older 4.0 revisions.
 
 *ardour-4.0-r2 (24 Apr 2015)
 

diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest
index 8d7e2bd18129c51aa2e77ae555c96885a17c880b..8305c056b56a877537149550186143aa873ac8b5 100644 (file)
--- a/media-sound/ardour/Manifest
+++ b/media-sound/ardour/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX ardour-2.8.11-flags.patch 926 SHA256 1b4762c15c329dbc89dba7149358ba5f82670f4d3e550dc166d55dda4e243304 SHA512 fbce5a750aad9eb2ffb1546a61b247bd39ffd37f757cdd545c319bbe427a2077a7334ff9171bc40d32ed0c0c25ac4ff170da159f0628ab4af6976127dcf70499 WHIRLPOOL e887017f5c64d60cba6eb88122ad8e5ef12c177973a0991e66249a3a880a838788398f35f9c35c6ee77277bb5fa4dcc39508dcb5b67f68bc45b480955d72f0ca
 AUX ardour-2.8.14-boost-150.patch 446 SHA256 e4b463dc007bdfdbbafdaf686a2a52ff34b5a519c26ef68364f3c27b2947a685 SHA512 3bccf463afd7a647f398c60498566b7103ca88702e630215afe4b75954a4eb96a333aab2f02c056bed7499eb7e64454c430a81c3d5d7abe0a7cb323b3111f0ef WHIRLPOOL 4c53083e420042d3ff6fb8e97852b5b70b619e8c5664b6127e6dcb50cb660db1f0e575b28da76e249a2bc395ba5bce67d74082871ab89720dcb3ab8d5552ce5f
 AUX ardour-2.8.14-syslibs.patch 3766 SHA256 44ad92ade9e0e06bf557b52ade3e20a9bb2631846efb08a84b40a92a81b3dcdc SHA512 16d1d37ea3474d0d393839d0e815096094fb3d5a914ccd041154cee11a627f7c236f070aff2379b1b4098b4da3909f0434aaa3ab52c9ac3be1ff7c8e6d3468eb WHIRLPOOL 28ded8c29de811b4dbcd6f3659d8787ec81d29718194d9877aebd9d25c06aae7dedf9530028cc410e03dc49b0fe4c1424d6e08a4064874e199263093bd76e23d
@@ -24,26 +21,7 @@ EBUILD ardour-3.5.308-r1.ebuild 3200 SHA256 3c93b1b99a5d17d2183531705ccb623646a3
 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-4.0-r1.ebuild 3617 SHA256 ccc8a72e61e0d0f9459bab8d55688b12b588b9c62cd7fbac81e1627d7cc39339 SHA512 0e6f3a61b72a15bb718cb75b0a8ee634bad9db370bb52840448a78926c615973c2307b02b091e6d433394378fd1b97ef586ed04c277a696b22ff31de8305437b WHIRLPOOL 3456c18279f2130028549625be8a258624f5927007b5bd46148e168940cdb5b698940a6ea0665e2bf70c05c83f56c26d6a4ba16daf632a8ad9ff776a2656e2ba
-EBUILD ardour-4.0-r2.ebuild 3903 SHA256 407b6ee795c0951cfbcb96f3a5e5273933019b78e65b53c8902ee1272fc65b06 SHA512 5d87ccd5003a8b3987015aed03c941dd12c2d16deea8a34bae94305ee9d52d75a9f2072013c1f7f2b1dbd225e0030e72713d2635e72fa6951829f7b1c49f5276 WHIRLPOOL 3b1a2276c524770ca609b2ceb8ced4b4cc1f25fd6e5204bcd6456b0ae03c112a09a64d5e725785c7e4f3e9d916f89f1d2275b5debe493ae22ef4f40dc9dd81da
-EBUILD ardour-4.0.ebuild 3900 SHA256 e9fd51b51b49e29d3b32e50dfebfe866cfbf1a05d00fc2d66e89117af899cef7 SHA512 d5161a54d11886b030928b45ea7d0cb2e231f86ad045d4f48641d26f6a445918cae29d87d38ae4d3b438d1daafd72e0b4a34365cd3c0959fa151a325337137fa WHIRLPOOL c8cc6ba1967dc0a7d740acce8b77756408f5b0ea9742772ce0c63ac97791b840653aa43eb7490f7a2f108e2790436b213f9f85fc53b3691ed5dda402d80d9582
-EBUILD ardour-9999.ebuild 3902 SHA256 ff9f09d67e4e2cab47435202e0bcc92c11e5ebeecc33efeb4f64c8c037b18fea SHA512 984eb4385489aed9e2e0e0d3592e79f9bbef5b3d18ba49d31fc803e13149b94897185f46a9b4a17de6ba8bdf24e10d5ef07667d618acc3cba56bfb6eb8937c05 WHIRLPOOL cd9251f99f8f2480c46716aa30e95925e3181b50f902cb73d6cd742d28f177565f7cdab76a50febdb34cb64c166cd88ecdd5816c54da5af9f9051a029d4325c1
-MISC ChangeLog 23653 SHA256 3018313aba00711bdcf44549826f66ec3b63f532e182e731a33135b29fa67252 SHA512 b6d996af8b28725cd80a9ce336b102e950420d737cee280628d6c628647fbb760fd8cc6f0f8c41159c25b5da14e052abfa9f1679c9789975ba2eba043d5ae903 WHIRLPOOL e9c2e50ad121c93986c92d25a9d989b639f6efececd1b06ddfe92f6a4911c228504f1c3c084d5d1f2b0628e14cc281882921d3e13a7a7dbd63145e89df96386f
+EBUILD ardour-4.0-r2.ebuild 3850 SHA256 eb88c702d24c7a7b1b956cfac93798483acf8e5fd4ff851bbb72b7e4dbd48353 SHA512 10811b05abbb8816eaf54174aa7c97d1aa09d37b1c74e3353631a185dada2705f946dc4624d32b8fde8807a0c81cfe74c1a6f2c484d655e0c75e1c8a0a7e1b50 WHIRLPOOL 3b178b0cefbebe5d52c96a5dc5adbcc4659c5dac1250a7eb0e765d8198270b7a2cba3cb2dbe6b790bd3be3c2f554654452dafdb276abbf295b859ccbfa1aae35
+EBUILD ardour-9999.ebuild 3817 SHA256 f8307fc9e6c1a73cfc3f50951a93a8e6ec273c4623e06db26554340bf8a56fcd SHA512 e256b5fac9c3ad3ee84fbe0f7e96e49d1814337321c2b46cad6354c53562f6b6bfac8bc378700378773f82ccf879e5004ebf6c8aef533967a96dc5a839f94326 WHIRLPOOL f089ff841ed25fb438a9b0803d7fa3f3aa417d37a8f6815da7c58de81b8591708fc18a676c58428e3bbb37593cb787671ddbc99660cfa3d704cccd56ef88f093
+MISC ChangeLog 23868 SHA256 844a14efbe73daa796401c57df1843ef1b7e8e2c1fc1293e5741ac0bef977ccd SHA512 9af2d6116a1d6d11027e383f475d8ed516a9c82f05dc6421878cf04a7c1d8fafadeb5aa93a119856a3ebb594be522191535acc282ccf906f58ed3b64fc5f9055 WHIRLPOOL 3ca6f97fa344506ace1eadeb4bca5edb1861696196c91ca2366daed1c9992c0776f1ecd7392cd40a6e0bf96074eba2ed6eeed628d18334f041c856cbd7d80c52
 MISC metadata.xml 234 SHA256 20428aad08fee2f7a7507f1b456c7ee3ebccd0eba59b90bd70d78b972d2b0799 SHA512 ed4a455e15b346baee30ba9c76637a199fda7c1d7c144cee546d45e7312dc7cd1f50be64d80b0900834a5b7e3851ce82158b676696c3ee1b34809a341edca2a9 WHIRLPOOL 68998d2804aab1645e9cb386ecd149680486b967ccd65b281327247a5617ef3f7c5ee25be285a502d397e6c414db70f39111716a2fe5f7b7a012c327fbe5abae
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iQIcBAEBCAAGBQJVOe29AAoJEIug43o+kWudwT4P/ibET8hbG5VWvYQxTwgJxFQA
-CsoBCfGkbgSI1gF/c7HRgNoFzj9sG9Nh3fpcuxhisugpOcvEE57/1LSz6Pk1FAzA
-Ppfni3/cI6KvpXxebMOvkIQ20ki9lcfHFpPoHVYlzW9gQCCdz5GUqadVMEZV8mi8
-h7HKqsYHZ4Yq3MperIrqGc5OLSlO4njS6cIz1i777vAL386J8+PUXu/CXCd+e/gh
-K4GrEmQqDWumhTcnr3VPkcdmcHa2zCj7dSlClQmFcLC8gKBE8mG+eVM1ziIdBC26
-PhMtCUMG8OF0NoNw9Z2cU6NukpCQQsiLMbORt9sRfzl96Aj9laksC6FKdA+kBNH/
-DVlH4AXG6EdAj91BrdGTO7lxZx7OrRbb8qY2vpE+sjr1yiCE4h/pP9i382BzTDq3
-8bQuANGwXZ1+/ZlKTUXQTGs2ljWO4IHFJrMNC5RJOdbNbBzaCqjyrjJM7XTd1JKV
-4y8NePzJfK658NrZv38ZEpl/AtJSQl/XZIqpkCNuSII4r1g6cHSkzu28byXUafoD
-LpQMXEa0Q/ywe2Xg3dJFDYQoDFK9U95OGv9TC3+qL3CUAOsNVKSo4+ifYKC6wibX
-OG9HC0YKNZ/cOvTkoi4uj8CkHlVmVlTKz6zBzZJ1lytx58XybGcPgSsb/FJ801bF
-MXpjg22QFLOUTXMXXfle
-=D3Rv
------END PGP SIGNATURE-----

diff --git a/media-sound/ardour/ardour-4.0-r1.ebuild b/media-sound/ardour/ardour-4.0-r1.ebuild
deleted file mode 100644 (file)
index 576df32..0000000
--- a/media-sound/ardour/ardour-4.0-r1.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# 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-r1.ebuild,v 1.2 2015/04/24 07:16:52 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}"
-       waf-utils_src_configure \
-               --destdir="${D}" \
-               --prefix=/usr \
-               --configdir=/etc \
-               --optimize \
-               --no-jack-metadata \
-               $(use jack && echo "--with-backends=alsa,jack" || echo "--with-backends=alsa --no-jack --libjack=weak") \
-               $(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 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.0-r2.ebuild b/media-sound/ardour/ardour-4.0-r2.ebuild
index 224fe12e8523f993162e239026046b58fbd82d1f..a15c6650a6f72d824903b57d43840ee326ac983e 100644 (file)
--- a/media-sound/ardour/ardour-4.0-r2.ebuild
+++ b/media-sound/ardour/ardour-4.0-r2.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-4.0-r2.ebuild,v 1.1 2015/04/24 07:16:52 nativemad Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ardour-4.0-r2.ebuild,v 1.2 2015/05/03 12:32:14 nativemad Exp $
 
 EAPI=5
 
@@ -23,7 +23,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="4"
-IUSE="altivec doc jack nls lv2 cpu_flags_x86_sse"
+IUSE="altivec doc jack lv2 cpu_flags_x86_sse"
 
 RDEPEND="media-libs/aubio
        media-libs/liblo
@@ -68,7 +68,7 @@ DEPEND="${RDEPEND}
        ${PYTHON_DEPS}
        virtual/pkgconfig
        >=media-sound/jack-audio-connection-kit-0.120
-       nls? ( sys-devel/gettext )
+       sys-devel/gettext
        doc? ( app-doc/doxygen[dot] )"
        if ! [ ${PV} = 9999 ]; then
                DEPEND="${DEPEND}"
@@ -119,9 +119,9 @@ src_configure() {
                --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 nls && echo "--nls" || echo "--no-nls") \
                $({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization") \
                $(use doc && echo "--docs")
 }

diff --git a/media-sound/ardour/ardour-4.0.ebuild b/media-sound/ardour/ardour-4.0.ebuild
deleted file mode 100644 (file)
index d19192a..0000000
--- a/media-sound/ardour/ardour-4.0.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# 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 23cea2a7920af98b1da517e15650ea6b78466474..36b2bbf785991a349291cd2a381552478c380949 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.17 2015/04/24 07:16:52 nativemad Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ardour-9999.ebuild,v 1.18 2015/05/03 12:32:14 nativemad Exp $
 
 EAPI=5
 
@@ -23,7 +23,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="4"
-IUSE="altivec doc jack nls lv2 cpu_flags_x86_sse"
+IUSE="altivec doc jack lv2 cpu_flags_x86_sse"
 
 RDEPEND="media-libs/aubio
        media-libs/liblo
@@ -68,7 +68,7 @@ DEPEND="${RDEPEND}
        ${PYTHON_DEPS}
        virtual/pkgconfig
        >=media-sound/jack-audio-connection-kit-0.120
-       nls? ( sys-devel/gettext )
+       sys-devel/gettext
        doc? ( app-doc/doxygen[dot] )"
        if ! [ ${PV} = 9999 ]; then
                DEPEND="${DEPEND}"
@@ -118,10 +118,9 @@ src_configure() {
                --prefix=/usr \
                --configdir=/etc \
                --optimize \
-               --no-jack-metadata \
-               $(use jack && echo "--with-backends=alsa,jack" || echo "--with-backends=alsa --no-jack --libjack=weak") \
+               --nls \
+               $(use jack && echo "--with-backends=alsa,jack" || echo "--with-backends=alsa  --libjack=weak") \
                $(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")
 }