From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 68360138334 for ; Sun, 10 Mar 2019 22:46:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AA41CE0DDB; Sun, 10 Mar 2019 22:46:34 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 661AEE0DD7 for ; Sun, 10 Mar 2019 22:46:34 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0CA93335D31 for ; Sun, 10 Mar 2019 22:46:32 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F051B570 for ; Sun, 10 Mar 2019 22:46:28 +0000 (UTC) From: "Andreas Sturmlechner" 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 Sturmlechner" Message-ID: <1552257954.c2cc32c6f18e60d91bae06f5b26971d3e6645552.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-plugins/calf/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-plugins/calf/calf-9999.ebuild X-VCS-Directories: media-plugins/calf/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: c2cc32c6f18e60d91bae06f5b26971d3e6645552 X-VCS-Branch: master Date: Sun, 10 Mar 2019 22:46:28 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: e67b178f-0570-498c-a823-d4314900aeae X-Archives-Hash: 0fa9d2f9565b4ca35a64e477b1b04a36 commit: c2cc32c6f18e60d91bae06f5b26971d3e6645552 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Mar 10 22:16:03 2019 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Mar 10 22:45:54 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2cc32c6 media-plugins/calf: Sync with 0.90.1 changes Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner gentoo.org> media-plugins/calf/calf-9999.ebuild | 66 ++++++++++++++++++++++--------------- 1 file changed, 39 insertions(+), 27 deletions(-) diff --git a/media-plugins/calf/calf-9999.ebuild b/media-plugins/calf/calf-9999.ebuild index f39ee8bb02a..e8aaa6330d7 100644 --- a/media-plugins/calf/calf-9999.ebuild +++ b/media-plugins/calf/calf-9999.ebuild @@ -1,8 +1,9 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -inherit autotools gnome2-utils +EAPI=7 + +inherit autotools xdg DESCRIPTION="A set of open source instruments and effects for digital audio workstations" HOMEPAGE="http://calf-studio-gear.org/" @@ -17,23 +18,35 @@ fi LICENSE="LGPL-2.1" SLOT="0" -IUSE="cpu_flags_x86_sse gtk jack lash lv2 static-libs experimental" +IUSE="cpu_flags_x86_sse experimental gtk jack lash lv2 static-libs" + +REQUIRED_USE="jack? ( gtk )" -RDEPEND="dev-libs/atk +BDEPEND=" + virtual/pkgconfig +" +DEPEND=" + dev-libs/atk dev-libs/expat dev-libs/glib:2 - media-sound/fluidsynth - jack? ( virtual/jack ) + media-sound/fluidsynth:= gtk? ( x11-libs/cairo - x11-libs/gtk+:2 x11-libs/gdk-pixbuf + x11-libs/gtk+:2 x11-libs/pango ) + jack? ( virtual/jack ) lash? ( media-sound/lash ) - lv2? ( media-libs/lv2 )" -DEPEND="${RDEPEND} - virtual/pkgconfig" + lv2? ( media-libs/lv2 ) +" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}/${PN}-0.90.1-no-automagic.patch" + "${FILESDIR}/${PN}-0.90.1-htmldir.patch" + "${FILESDIR}/${PN}-0.90.1-desktop.patch" +) src_prepare() { default @@ -41,24 +54,23 @@ src_prepare() { } src_configure() { - # automagic... - #$(use_with gtk gui) - #$(use_with jack) - econf \ - --prefix="${EPREFIX}"/usr \ - --without-obsolete-check \ - $(use_with lash) \ - $(use_with lv2 lv2) \ - $(usex lv2 "--with-lv2-dir=${EPREFIX}/usr/$(get_libdir)/lv2" "") \ - $(use_enable static-libs static) \ - $(use_enable cpu_flags_x86_sse sse) \ + local myeconfargs=( + --prefix="${EPREFIX}"/usr + --without-obsolete-check $(use_enable experimental) + $(use_enable gtk gui) + $(use_enable jack) + $(use_with lash) + $(use_with lv2 lv2) + $(usex lv2 "--with-lv2-dir=${EPREFIX}/usr/$(get_libdir)/lv2" "") + $(use_enable static-libs static) + $(use_enable cpu_flags_x86_sse sse) + ) + econf "${myeconfargs[@]}" } -pkg_postinst() { - gnome2_icon_cache_update -} - -pkg_postrm() { - gnome2_icon_cache_update +src_install() { + default + mv "${ED}"/usr/share/bash-completion/completions/calf \ + "${ED}"/usr/share/bash-completion/completions/calfjackhost }