commit: 94cb7fe744cdc35d399b1390be9a3c6202e5821b
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 4 22:37:09 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> 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 <asturm <AT> 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)"
