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 B4C40138334 for ; Fri, 4 Jan 2019 22:38:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 52F8FE08EB; Fri, 4 Jan 2019 22:37:59 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 11096E08EB for ; Fri, 4 Jan 2019 22:37:58 +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 3038E335D1A for ; Fri, 4 Jan 2019 22:37:56 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9CF8C506 for ; Fri, 4 Jan 2019 22:37:54 +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: <1546641429.94cb7fe744cdc35d399b1390be9a3c6202e5821b.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/clementine/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-sound/clementine/clementine-9999.ebuild X-VCS-Directories: media-sound/clementine/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 94cb7fe744cdc35d399b1390be9a3c6202e5821b X-VCS-Branch: master Date: Fri, 4 Jan 2019 22:37:54 +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: 70eb8683-7ba5-4179-89b9-f7a1fb05ee1e X-Archives-Hash: e6e4cce84ce94fca3292ac9992a86ec7 commit: 94cb7fe744cdc35d399b1390be9a3c6202e5821b Author: Andreas Sturmlechner gentoo org> AuthorDate: Fri Jan 4 22:37:09 2019 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri Jan 4 22:37:09 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94cb7fe7 media-sound/clementine: Patch upstreamed Upstream commit 4ff370ce1ef41a8dc9b95a367c23eef43a918ad9 Package-Manager: Portage-2.3.54, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner gentoo.org> media-sound/clementine/clementine-9999.ebuild | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/media-sound/clementine/clementine-9999.ebuild b/media-sound/clementine/clementine-9999.ebuild index 78421f8b116..8fcba65622c 100644 --- a/media-sound/clementine/clementine-9999.ebuild +++ b/media-sound/clementine/clementine-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -11,9 +11,10 @@ if [[ ${PV} == *9999* ]]; then EGIT_REPO_URI="https://github.com/clementine-player/Clementine.git" GIT_ECLASS="git-r3" else - SRC_URI="https://github.com/clementine-player/Clementine/archive/${PV/_}.tar.gz -> ${P}.tar.gz" + COMMIT= + SRC_URI="https://github.com/${PN}-player/${PN^}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64 ~x86" - S="${WORKDIR}/${MY_P^}" + S="${WORKDIR}/${PN^}-${COMMIT}" fi inherit cmake-utils flag-o-matic gnome2-utils l10n virtualx xdg-utils ${GIT_ECLASS} unset GIT_ECLASS @@ -50,7 +51,6 @@ COMMON_DEPEND=" >=media-libs/taglib-1.11.1_p20181028 sys-libs/zlib virtual/glu - virtual/opengl x11-libs/libX11 cdda? ( dev-libs/libcdio:= ) dbus? ( dev-qt/qtdbus:5 ) @@ -61,6 +61,7 @@ COMMON_DEPEND=" projectm? ( media-libs/glew:= >=media-libs/libprojectm-1.2.0 + virtual/opengl ) " # Note: sqlite driver of dev-qt/qtsql is bundled, so no sqlite use is required; check if this can be overcome someway; @@ -81,7 +82,6 @@ DEPEND="${COMMON_DEPEND} >=dev-cpp/gtest-1.8.0 dev-libs/boost dev-qt/linguist-tools:5 - dev-qt/qtopengl:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 sys-devel/gettext @@ -89,6 +89,7 @@ DEPEND="${COMMON_DEPEND} box? ( dev-cpp/sparsehash ) dropbox? ( dev-cpp/sparsehash ) googledrive? ( dev-cpp/sparsehash ) + projectm? ( dev-qt/qtopengl:5 ) pulseaudio? ( media-sound/pulseaudio ) seafile? ( dev-cpp/sparsehash ) skydrive? ( dev-cpp/sparsehash ) @@ -136,7 +137,7 @@ src_configure() { -DLINGUAS="$(l10n_get_locales)" -DENABLE_BOX="$(usex box)" -DENABLE_AUDIOCD="$(usex cdda)" - -DENABLE_DBUS="$(usex dbus)" + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5DBus=$(usex !dbus) -DENABLE_DROPBOX="$(usex dropbox)" -DENABLE_GOOGLE_DRIVE="$(usex googledrive)" -DENABLE_LIBGPOD="$(usex ipod)"