From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-915185-garchives=archives.gentoo.org@lists.gentoo.org> Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 7B4011395E2 for <garchives@archives.gentoo.org>; Mon, 5 Dec 2016 10:05:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3F74F21C038; Mon, 5 Dec 2016 10:05:54 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id EE8C421C038 for <gentoo-commits@lists.gentoo.org>; Mon, 5 Dec 2016 10:05:53 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EA65F341026 for <gentoo-commits@lists.gentoo.org>; Mon, 5 Dec 2016 10:05:51 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 381421F2F for <gentoo-commits@lists.gentoo.org>; Mon, 5 Dec 2016 10:05:50 +0000 (UTC) From: "Andreas Schuerch" <nativemad@gentoo.org> To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Schuerch" <nativemad@gentoo.org> Message-ID: <1480932293.51b9275bd7d5affbd79848efe2a3dafb6707cae3.nativemad@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-sound/ardour/Manifest media-sound/ardour/ardour-5.5.ebuild media-sound/ardour/ardour-9999.ebuild X-VCS-Directories: media-sound/ardour/ X-VCS-Committer: nativemad X-VCS-Committer-Name: Andreas Schuerch X-VCS-Revision: 51b9275bd7d5affbd79848efe2a3dafb6707cae3 X-VCS-Branch: master Date: Mon, 5 Dec 2016 10:05:50 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 33740154-ddab-468d-9afe-27f4990282bc X-Archives-Hash: db6343a0f5d5cfcf01036e884543cc88 commit: 51b9275bd7d5affbd79848efe2a3dafb6707cae3 Author: Andreas Schuerch <nativemad <AT> gentoo <DOT> org> AuthorDate: Mon Dec 5 10:03:34 2016 +0000 Commit: Andreas Schuerch <nativemad <AT> gentoo <DOT> org> CommitDate: Mon Dec 5 10:04:53 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51b9275b media-sound/ardour: bump to 5.5, eapi upgrade, lvm2 now mandatory Package-Manager: portage-2.3.0 media-sound/ardour/Manifest | 1 + .../{ardour-9999.ebuild => ardour-5.5.ebuild} | 24 ++++++++++------------ media-sound/ardour/ardour-9999.ebuild | 24 ++++++++++------------ 3 files changed, 23 insertions(+), 26 deletions(-) diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest index b633aa9..bc5cfa2 100644 --- a/media-sound/ardour/Manifest +++ b/media-sound/ardour/Manifest @@ -8,3 +8,4 @@ DIST ardour-4.6.tar.gz 10033725 SHA256 79a3b063f2413d79c4bb2930505e0f66288482580 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-9999.ebuild b/media-sound/ardour/ardour-5.5.ebuild similarity index 90% copy from media-sound/ardour/ardour-9999.ebuild copy to media-sound/ardour/ardour-5.5.ebuild index 233e102..66fea7c 100644 --- a/media-sound/ardour/ardour-9999.ebuild +++ b/media-sound/ardour/ardour-5.5.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 PYTHON_COMPAT=( python2_7 ) PYTHON_REQ_USE='threads(+)' #EPYTHON='python2.7' @@ -16,13 +16,13 @@ if [[ ${PV} == *9999* ]]; then inherit git-r3 else KEYWORDS="~amd64 ~x86" - SRC_URI="http://fossies.org/linux/misc/Ardour-${PV}.0.tar.bz2 -> ${P}.tar.bz2" + SRC_URI="mirror:gentoo/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" +IUSE="altivec doc jack cpu_flags_x86_sse cpu_flags_x86_mmx cpu_flags_x86_3dnow" RDEPEND=" >=dev-cpp/glibmm-2.32.0 @@ -56,14 +56,12 @@ RDEPEND=" >=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 - )" + >=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} @@ -80,11 +78,11 @@ pkg_setup() { } src_prepare(){ + eapply_user 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="" @@ -121,8 +119,8 @@ src_configure() { --configdir=/etc \ --nls \ --optimize \ + --lv2 \ $(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") } diff --git a/media-sound/ardour/ardour-9999.ebuild b/media-sound/ardour/ardour-9999.ebuild index 233e102..66fea7c 100644 --- a/media-sound/ardour/ardour-9999.ebuild +++ b/media-sound/ardour/ardour-9999.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 PYTHON_COMPAT=( python2_7 ) PYTHON_REQ_USE='threads(+)' #EPYTHON='python2.7' @@ -16,13 +16,13 @@ if [[ ${PV} == *9999* ]]; then inherit git-r3 else KEYWORDS="~amd64 ~x86" - SRC_URI="http://fossies.org/linux/misc/Ardour-${PV}.0.tar.bz2 -> ${P}.tar.bz2" + SRC_URI="mirror:gentoo/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" +IUSE="altivec doc jack cpu_flags_x86_sse cpu_flags_x86_mmx cpu_flags_x86_3dnow" RDEPEND=" >=dev-cpp/glibmm-2.32.0 @@ -56,14 +56,12 @@ RDEPEND=" >=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 - )" + >=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} @@ -80,11 +78,11 @@ pkg_setup() { } src_prepare(){ + eapply_user 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="" @@ -121,8 +119,8 @@ src_configure() { --configdir=/etc \ --nls \ --optimize \ + --lv2 \ $(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") }