Correct .desktop file, See Bug 547518. Also set Cflags properly.

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 b5e3110a576113c9a64c1d661cc0fcf1e65c004c..07095c48333b95b42e729992f47e2aad9a67fc56 100644 (file)
--- a/media-sound/ardour/ChangeLog
+++ b/media-sound/ardour/ChangeLog
@@ -1,6 +1,12 @@
 # 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.141 2015/04/23 07:15:26 nativemad Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ChangeLog,v 1.142 2015/04/24 07:16:52 nativemad Exp $
+
+*ardour-4.0-r2 (24 Apr 2015)
+
+  24 Apr 2015; Andreas Schuerch <nativemad@gentoo.org> ardour-4.0-r1.ebuild,
+  +ardour-4.0-r2.ebuild, ardour-9999.ebuild:
+  Correct .desktop file, See Bug 547518. Also set Cflags properly.
 
 *ardour-4.0-r1 (23 Apr 2015)
 

diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest
index 8777744003e521fdf07e806eb727b19f1560dc0a..8d7e2bd18129c51aa2e77ae555c96885a17c880b 100644 (file)
--- a/media-sound/ardour/Manifest
+++ b/media-sound/ardour/Manifest
@@ -24,25 +24,26 @@ 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 35038e4bfbcfc8ce82e12b74acb3be5441a335713175f497f68e81405671724e SHA512 ced9ccb54a00db96253070a96cd525b12304be1d58f37adf8190f5628319f6da0ed97c5d4bcd0e99305ffa843560a7d59c16cffe40113f806b41af9cdf6a6a71 WHIRLPOOL d5c2bbe91af1af7f282f756f5a5fa6b9828c7b0c5ca25a3ab706fee5f5193cf5a3b32ff163ddb4c9dd134ce2604fe6c507c4b05d222a515dcf00e539769ad067
+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 3616 SHA256 cd7969b20a90feb7200e1865725493fa44ca89ac8cf94a7e769f38eede4109f1 SHA512 809e66b4677aa21f13e1d7cc4ec4afd7197a11d668592f7d614a77ba3c799f1796353931403db9073450f8a5f38682b59e4cb61b417892e391bc6d430a055131 WHIRLPOOL e16f6f3dccce08d02c7ce7555958f0aa64cfe5242ed5e2648a291091335dfae7a990e52227b45f370037372eb01d7d3762d7a6321ca54e94e0bd923d1513e9ce
-MISC ChangeLog 23433 SHA256 fcb0e23fe2ecac42740b08368ec939a28ff1ec46a0665f121ed205e950c3fbb8 SHA512 c8e87fd2816363385a0582ec907a41ed91b833d837e60113fc3b5639babba446a94a8738e584312a5b87a3670cd5502cd04e067569690b97dbbc3f9b87f38ba3 WHIRLPOOL 8c76a9cdc88586a61b774c1234f960a2d22631f5721488acafa90f1e2713273d18b3d1ad0c23200d2fce737735c410adbdf4b88c62f8d47049ff7120a5fafba0
+EBUILD ardour-9999.ebuild 3902 SHA256 ff9f09d67e4e2cab47435202e0bcc92c11e5ebeecc33efeb4f64c8c037b18fea SHA512 984eb4385489aed9e2e0e0d3592e79f9bbef5b3d18ba49d31fc803e13149b94897185f46a9b4a17de6ba8bdf24e10d5ef07667d618acc3cba56bfb6eb8937c05 WHIRLPOOL cd9251f99f8f2480c46716aa30e95925e3181b50f902cb73d6cd742d28f177565f7cdab76a50febdb34cb64c166cd88ecdd5816c54da5af9f9051a029d4325c1
+MISC ChangeLog 23653 SHA256 3018313aba00711bdcf44549826f66ec3b63f532e182e731a33135b29fa67252 SHA512 b6d996af8b28725cd80a9ce336b102e950420d737cee280628d6c628647fbb760fd8cc6f0f8c41159c25b5da14e052abfa9f1679c9789975ba2eba043d5ae903 WHIRLPOOL e9c2e50ad121c93986c92d25a9d989b639f6efececd1b06ddfe92f6a4911c228504f1c3c084d5d1f2b0628e14cc281882921d3e13a7a7dbd63145e89df96386f
 MISC metadata.xml 234 SHA256 20428aad08fee2f7a7507f1b456c7ee3ebccd0eba59b90bd70d78b972d2b0799 SHA512 ed4a455e15b346baee30ba9c76637a199fda7c1d7c144cee546d45e7312dc7cd1f50be64d80b0900834a5b7e3851ce82158b676696c3ee1b34809a341edca2a9 WHIRLPOOL 68998d2804aab1645e9cb386ecd149680486b967ccd65b281327247a5617ef3f7c5ee25be285a502d397e6c414db70f39111716a2fe5f7b7a012c327fbe5abae
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVOJvpAAoJEIug43o+kWudJpIP/jzA9/GmrwvA2/npWsN0LLRT
-T9ySNSiogpGYj15SyqYCb3Ma9oYc8Diz7Ep/qo5XnAc0YgLyImQYxba5YYYCcywG
-w40/nZ+2NesG54tjjCM8sGfhSforx7k5wEaqvu4RtkEPFqwwqVCmpjW/fvPdrZ2l
-j3yV780m6nhAu2SIUCw+eEdIesWCtLLMiBrqW9vAS95Nlq69/3zcD+4bNdVQx7Um
-oO9D/oyyNCFUqxZxlRhz6cw6OTTmBZd5NmYsKOTndQ7ivtkK+uvN+F8LkQGFEKav
-p4wiUTEI5qePGnH3AoiJp3DviUoLwewvFKtFRtpsPg3mz39ZvN9GOLZ7bmy2wUxg
-YPXpc/Nkqwo5sPg4+dp1oIYGy5NJWJaAWykxxgKSxd/n7XYHgK9d6AIf86PyavsJ
-e769Oak7hHkKMnbvF0Kt4tn/XFsgsPEfUEcEJNo8VvMZnAvNqLB3dVHR9qy7G6lu
-hlOp/VcUzNjmyWTGJJQjnGnfVf4xwOb18CxMddIo6rh0fNxz6i/pb0qdbq13Uu25
-1lBCmGCq5UfHTv/F26dM21rIEDrofYHhNoG/idAaUEOs7jUidAnPkrNfIX9fKmtE
-zZeH3XTK1kUsReFvZBzzZz6Qwivc/l+Ro3isWp2ePqxv7JqoXzQqLp2WDSORTmBK
-uzoOcwvYsYr7eWNIohj/
-=HxQc
+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
index b86015e13dfa20e247bb2f4df520b0fad81f9727..576df32416e3c953743e3a40e206c76585a74b6d 100644 (file)
--- a/media-sound/ardour/ardour-4.0-r1.ebuild
+++ b/media-sound/ardour/ardour-4.0-r1.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-r1.ebuild,v 1.1 2015/04/23 07:15:26 nativemad Exp $
+# $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
 
@@ -128,7 +128,7 @@ 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
+       make_desktop_entry ardour4 ardour4 ardour4 AudioVideo
 }
 
 pkg_postinst() {

diff --git a/media-sound/ardour/ardour-4.0-r2.ebuild b/media-sound/ardour/ardour-4.0-r2.ebuild
new file mode 100644 (file)
index 0000000..224fe12
--- /dev/null
+++ b/media-sound/ardour/ardour-4.0-r2.ebuild
@@ -0,0 +1,140 @@
+# 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 $
+
+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
+       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 \
+               $(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-9999.ebuild b/media-sound/ardour/ardour-9999.ebuild
index f21d6cd3e82eb5639034ade3196034954c0a8cfe..23cea2a7920af98b1da517e15650ea6b78466474 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.16 2015/04/23 07:15:26 nativemad Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ardour-9999.ebuild,v 1.17 2015/04/24 07:16:52 nativemad Exp $
 
 EAPI=5
 
@@ -89,6 +89,9 @@ src_prepare(){
        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"
 }
 
@@ -128,7 +131,7 @@ 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
+       make_desktop_entry ardour4 ardour4 ardour4 AudioVideo
 }
 
 pkg_postinst() {