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 2640B138351 for ; Thu, 13 Feb 2020 23:20:29 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4642DE082D; Thu, 13 Feb 2020 23:20:27 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 19326E082B for ; Thu, 13 Feb 2020 23:20:27 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 09D6534EDA5 for ; Thu, 13 Feb 2020 23:20:26 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F26AC13F for ; Thu, 13 Feb 2020 23:20:08 +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: <1581635968.5bdb3b2fa3861ca76c7481192e33e4fce7c2ddde.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/mixxx/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-sound/mixxx/mixxx-2.2.3-r2.ebuild media-sound/mixxx/mixxx-9999.ebuild X-VCS-Directories: media-sound/mixxx/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 5bdb3b2fa3861ca76c7481192e33e4fce7c2ddde X-VCS-Branch: master Date: Thu, 13 Feb 2020 23:20:08 +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: ca0c3b76-e1c9-4982-95f1-5cadc5b1b531 X-Archives-Hash: 08ae18813aa5e5213dde9da1b10fa38d commit: 5bdb3b2fa3861ca76c7481192e33e4fce7c2ddde Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Feb 13 23:15:27 2020 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Feb 13 23:19:28 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5bdb3b2f media-sound/mixxx: Add missing dependency Closes: https://bugs.gentoo.org/704616 Package-Manager: Portage-2.3.88, Repoman-2.3.20 Signed-off-by: Andreas Sturmlechner gentoo.org> media-sound/mixxx/{mixxx-9999.ebuild => mixxx-2.2.3-r2.ebuild} | 10 ++++++---- media-sound/mixxx/mixxx-9999.ebuild | 6 +++--- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/media-sound/mixxx/mixxx-9999.ebuild b/media-sound/mixxx/mixxx-2.2.3-r2.ebuild similarity index 93% copy from media-sound/mixxx/mixxx-9999.ebuild copy to media-sound/mixxx/mixxx-2.2.3-r2.ebuild index c3949aa84c2..e6c04ed417b 100644 --- a/media-sound/mixxx/mixxx-9999.ebuild +++ b/media-sound/mixxx/mixxx-2.2.3-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -53,6 +53,7 @@ RDEPEND=" media-libs/vamp-plugin-sdk sci-libs/fftw:3.0= sys-power/upower + virtual/glu virtual/libusb:1 virtual/opengl x11-libs/libX11 @@ -70,20 +71,21 @@ RDEPEND=" ffmpeg? ( media-video/ffmpeg:0= ) " # media-libs/rubberband RDEPENDs on sci-libs/fftw:3.0 -DEPEND=" - ${RDEPEND} +DEPEND="${RDEPEND} virtual/pkgconfig dev-qt/qttest:5 dev-qt/qtxmlpatterns:5 " PATCHES=( + "${FILESDIR}"/${PN}-2.0.0-docs.patch "${FILESDIR}"/${PN}-2.2.0-lilv_include_fix.patch + "${FILESDIR}"/${P}-qt-5.14.patch ) src_prepare() { # use multilib compatible directory for plugins - sed -i -e "/env.Alias('install', docs)/d;"'/unix_lib_path =/!b;n;'"s/'lib'/'$(get_libdir)'/" SConscript || die + sed -i -e "/unix_lib_path =/s/'lib'/'$(get_libdir)'/" src/SConscript || die default } diff --git a/media-sound/mixxx/mixxx-9999.ebuild b/media-sound/mixxx/mixxx-9999.ebuild index c3949aa84c2..3c4c7d006b0 100644 --- a/media-sound/mixxx/mixxx-9999.ebuild +++ b/media-sound/mixxx/mixxx-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -53,6 +53,7 @@ RDEPEND=" media-libs/vamp-plugin-sdk sci-libs/fftw:3.0= sys-power/upower + virtual/glu virtual/libusb:1 virtual/opengl x11-libs/libX11 @@ -70,8 +71,7 @@ RDEPEND=" ffmpeg? ( media-video/ffmpeg:0= ) " # media-libs/rubberband RDEPENDs on sci-libs/fftw:3.0 -DEPEND=" - ${RDEPEND} +DEPEND="${RDEPEND} virtual/pkgconfig dev-qt/qttest:5 dev-qt/qtxmlpatterns:5