[gentoo-commits] repo/gentoo:master commit in: media-sound/clementine/, media-sound/clementine/files/

2023-01-02 Thread Viorel Munteanu 
commit: 80c425d6a843dda3f36264fa06241b31de6bc6f9
Author: Alexey Sokolov  asokolov  org>
AuthorDate: Wed Dec 21 01:37:17 2022 +
Commit: Viorel Munteanu  gentoo  org>
CommitDate: Mon Jan  2 12:29:02 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80c425d6

media-sound/clementine: fix deps and link

crypto++ was required only for spotify which is gone
(https://bugs.gentoo.org/885529)

Closes: https://bugs.gentoo.org/887105
Closes: https://bugs.gentoo.org/887163
Signed-off-by: Alexey Sokolov  asokolov.org>
Closes: https://github.com/gentoo/gentoo/pull/28722
Signed-off-by: Viorel Munteanu  gentoo.org>

 ...c2-r1.ebuild => clementine-1.4.0_rc2-r2.ebuild} | 37 +++---
 media-sound/clementine/clementine-.ebuild  | 33 +--
 .../clementine/files/clementine-1.4.0_rc2-lz.patch | 33 +++
 3 files changed, 67 insertions(+), 36 deletions(-)

diff --git a/media-sound/clementine/clementine-1.4.0_rc2-r1.ebuild 
b/media-sound/clementine/clementine-1.4.0_rc2-r2.ebuild
similarity index 94%
rename from media-sound/clementine/clementine-1.4.0_rc2-r1.ebuild
rename to media-sound/clementine/clementine-1.4.0_rc2-r2.ebuild
index 68143124af82..c10ccef43172 100644
--- a/media-sound/clementine/clementine-1.4.0_rc2-r1.ebuild
+++ b/media-sound/clementine/clementine-1.4.0_rc2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,8 +14,8 @@ if [[ ${PV} == ** ]]; then
EGIT_REPO_URI="https://github.com/clementine-player/Clementine.git;
inherit git-r3
 else
-   S="${WORKDIR}/Clementine-${PV/_}"

SRC_URI="https://github.com/clementine-player/Clementine/archive/refs/tags/${PV/_}.tar.gz
 -> ${P}.tar.gz"
+   S="${WORKDIR}/Clementine-${PV/_}"
KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 fi
 
@@ -29,19 +29,8 @@ REQUIRED_USE="
wiimote? ( dbus )
 "
 
-BDEPEND="
-   >=dev-cpp/gtest-1.8.0
-   dev-qt/linguist-tools:5
-   sys-devel/gettext
-   virtual/pkgconfig
-   test? (
-   dev-qt/qttest:5
-   gnome-base/gsettings-desktop-schemas
-   )
-"
 COMMON_DEPEND="
dev-db/sqlite:3
-   dev-libs/crypto++:=
dev-libs/glib:2
dev-libs/protobuf:=
dev-qt/qtconcurrent:5
@@ -64,12 +53,13 @@ COMMON_DEPEND="
ipod? ( >=media-libs/libgpod-0.8.0 )
lastfm? ( >=media-libs/liblastfm-1.1.0_pre20150206 )
moodbar? ( sci-libs/fftw:3.0= )
-   mtp? ( >=media-libs/libmtp-1.0.0 )
+   mtp? ( >=media-libs/libmtp-1.0.0:= )
projectm? (
media-libs/glew:=
>=media-libs/libprojectm-3.1.12:0=
virtual/opengl
)
+   pulseaudio? ( media-libs/libpulse )
 "
 RDEPEND="${COMMON_DEPEND}
media-plugins/gst-plugins-meta:1.0
@@ -88,10 +78,23 @@ DEPEND="${COMMON_DEPEND}
box? ( dev-cpp/sparsehash )
dropbox? ( dev-cpp/sparsehash )
googledrive? ( dev-cpp/sparsehash )
-   pulseaudio? ( media-sound/pulseaudio )
seafile? ( dev-cpp/sparsehash )
skydrive? ( dev-cpp/sparsehash )
 "
+BDEPEND="
+   >=dev-cpp/gtest-1.8.0
+   dev-qt/linguist-tools:5
+   sys-devel/gettext
+   virtual/pkgconfig
+   test? (
+   dev-qt/qttest:5
+   gnome-base/gsettings-desktop-schemas
+   )
+"
+
+PATCHES=(
+   "${FILESDIR}/clementine-1.4.0_rc2-lz.patch"
+)
 
 DOCS=( Changelog README.md )
 
@@ -116,9 +119,6 @@ src_configure() {
# spotify is not in portage
local mycmakeargs=(
-DBUILD_WERROR=OFF
-   # force to find crypto++ see bug #548544
-   -DCRYPTOPP_LIBRARIES="cryptopp"
-   -DCRYPTOPP_FOUND=ON
# avoid automagically enabling of ccache (bug #611010)
-DCCACHE_EXECUTABLE=OFF
-DENABLE_BREAKPAD=OFF  #< disable crash reporting
@@ -144,6 +144,7 @@ src_configure() {
-DENABLE_LIBPULSE="$(usex pulseaudio)"
-DENABLE_UDISKS2="$(usex udisks)"
-DENABLE_WIIMOTEDEV="$(usex wiimote)"
+   "$(cmake_use_find_package alsa ALSA)"
)
 
use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT

diff --git a/media-sound/clementine/clementine-.ebuild 
b/media-sound/clementine/clementine-.ebuild
index 395332d8f569..249aacb20819 100644
--- a/media-sound/clementine/clementine-.ebuild
+++ b/media-sound/clementine/clementine-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,8 +14,8 @@ if [[ ${PV} == ** ]]; then
EGIT_REPO_URI="https://github.com/clementine-player/Clementine.git;
inherit git-r3
 else
-   S="${WORKDIR}/Clementine-${PV/_}"

[gentoo-commits] repo/gentoo:master commit in: media-sound/clementine/, media-sound/clementine/files/

2020-05-28 Thread Lars Wendler 
commit: 922013719ab545531b37dcb72a743c3b98db38be
Author: Lars Wendler  gentoo  org>
AuthorDate: Thu May 28 08:37:37 2020 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Thu May 28 08:56:11 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92201371

media-sound/clementine: Fixed build with qt-5.15

Thanks-to: Nick Andrade  gmail.com>
Closes: https://bugs.gentoo.org/725678
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Lars Wendler  gentoo.org>

 media-sound/clementine/clementine-1.4.0_rc1.ebuild |  4 ++
 ...clementine-1.4.0_rc1-QPainterPath_include.patch | 50 ++
 2 files changed, 54 insertions(+)

diff --git a/media-sound/clementine/clementine-1.4.0_rc1.ebuild 
b/media-sound/clementine/clementine-1.4.0_rc1.ebuild
index 7ee8c3edfb6..0808dceb128 100644
--- a/media-sound/clementine/clementine-1.4.0_rc1.ebuild
+++ b/media-sound/clementine/clementine-1.4.0_rc1.ebuild
@@ -106,6 +106,10 @@ RESTRICT="test"
 
 DOCS=( Changelog README.md )
 
+PATCHES=(
+   "${FILESDIR}/${P}-QPainterPath_include.patch" #725678
+)
+
 src_prepare() {
l10n_find_plocales_changes "src/translations" "" ".po"
 

diff --git 
a/media-sound/clementine/files/clementine-1.4.0_rc1-QPainterPath_include.patch 
b/media-sound/clementine/files/clementine-1.4.0_rc1-QPainterPath_include.patch
new file mode 100644
index 000..3a441412ba2
--- /dev/null
+++ 
b/media-sound/clementine/files/clementine-1.4.0_rc1-QPainterPath_include.patch
@@ -0,0 +1,50 @@
+From 7715ae5c01528213a97369e14d5461efd264cc27 Mon Sep 17 00:00:00 2001
+From: SDNick484 
+Date: Thu, 28 May 2020 10:34:31 +0200
+Subject: [PATCH] Adds missing QPainterPath include
+
+---
+ src/widgets/freespacebar.cpp | 1 +
+ src/widgets/osdpretty.cpp| 1 +
+ src/widgets/sliderwidget.cpp | 1 +
+ 3 files changed, 3 insertions(+)
+
+diff --git a/src/widgets/freespacebar.cpp b/src/widgets/freespacebar.cpp
+index 3067f722b..c9789d353 100644
+--- a/src/widgets/freespacebar.cpp
 b/src/widgets/freespacebar.cpp
+@@ -20,6 +20,7 @@
+ 
+ #include 
+ #include 
++#include 
+ 
+ const int FreeSpaceBar::kBarHeight = 20;
+ const int FreeSpaceBar::kBarBorderRadius = 8;
+diff --git a/src/widgets/osdpretty.cpp b/src/widgets/osdpretty.cpp
+index 9d95716d8..30cef7dae 100644
+--- a/src/widgets/osdpretty.cpp
 b/src/widgets/osdpretty.cpp
+@@ -26,6 +26,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ #include 
+ #include 
+ #include 
+diff --git a/src/widgets/sliderwidget.cpp b/src/widgets/sliderwidget.cpp
+index 581a0de7b..96bbc0e5e 100644
+--- a/src/widgets/sliderwidget.cpp
 b/src/widgets/sliderwidget.cpp
+@@ -27,6 +27,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ #include 
+ #include 
+ #include 
+-- 
+2.27.0.rc2
+

[gentoo-commits] repo/gentoo:master commit in: media-sound/clementine/, media-sound/clementine/files/

2018-12-02 Thread Andreas Sturmlechner 
commit: 6f170caf208f8995d0b81f4a031e2906db459ed4
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Dec  2 00:05:13 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Dec  2 18:43:34 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f170caf

media-sound/clementine: 1.3.1_p20181201 snapshot bump

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-sound/clementine/Manifest|   1 +
 .../clementine/clementine-1.3.1_p20181201.ebuild   | 182 +
 .../files/clementine-1.3.1_p20181201-cmake.patch   | 165 +++
 3 files changed, 348 insertions(+)

diff --git a/media-sound/clementine/Manifest b/media-sound/clementine/Manifest
index 914ef63abe0..cd11a00b680 100644
--- a/media-sound/clementine/Manifest
+++ b/media-sound/clementine/Manifest
@@ -1,2 +1,3 @@
 DIST clementine-1.3.1_p20180416.tar.gz 8489387 BLAKE2B 
37412428cf030a71f0011ba68a7ce71a3bbdc59402dc6d6349cca8ee44b208052cee9add1597a9577e5a6ed4bb2ebf16c4e1f79612d12be265f637caffd02a76
 SHA512 
8f38554571c637d9f79df43679ac2a76383f7a9b4ee8e921a16175889180e72afadc352dd40d73a671aa8ae9b01f6a251ae7b94b010043f8bcb8d8f42dcfff62
 DIST clementine-1.3.1_p20181112.tar.gz 8526632 BLAKE2B 
da3f155006ef5e94233104011aadad41e974ec339827b91bd3c5c0c2420b23199be852a9d0cb7c9b0112ba2d43ff3e3e87388db92679f8e64da5c3fa3e578c1d
 SHA512 
eed16cec7323b142e4602a4bd81d7363e9cf4fc203c3b8b341aadbe883fdbd571dff0792260eec8af2f91e79fe905c3510d1e7ce1b06e9d4698016820cc771fa
+DIST clementine-1.3.1_p20181201.tar.gz 8535075 BLAKE2B 
c4b6660ee9718054cc13c6b4fc2e1dccf9c117319f5b682dc5de2861fc40cc129e079449e1c2e15733faf14b6e18b42f37c228000a8e6c121b7fdcb2e48bc7b9
 SHA512 
fcc062857b95a5cabc41449143bb876df9955cdaaa59868f147d7a165dea13e2e4e1c11ea23f4309c8af7bef42d694a82867420245513af8e4dfbd91ab6f9a2c

diff --git a/media-sound/clementine/clementine-1.3.1_p20181201.ebuild 
b/media-sound/clementine/clementine-1.3.1_p20181201.ebuild
new file mode 100644
index 000..3d3061880f8
--- /dev/null
+++ b/media-sound/clementine/clementine-1.3.1_p20181201.ebuild
@@ -0,0 +1,182 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="af ar be bg bn br bs ca cs cy da de el en en_CA en_GB eo es et eu fa 
fi fr ga gl he he_IL hi hr hu hy ia id is it ja ka kk ko lt lv mk_MK mr ms my 
nb nl oc pa pl pt pt_BR ro ru si_LK sk sl sr sr@latin sv te tr tr_TR uk uz vi 
zh_CN zh_TW"
+
+MY_P="${P/_}"
+if [[ ${PV} == ** ]]; then
+   EGIT_BRANCH="qt5"
+   EGIT_REPO_URI="https://github.com/clementine-player/Clementine.git;
+   GIT_ECLASS="git-r3"
+else
+   COMMIT=d87307fbc718a57ca38b5354f196db05b560036c
+   
SRC_URI="https://github.com/${PN}-player/${PN^}/archive/${COMMIT}.tar.gz -> 
${P}.tar.gz"
+   KEYWORDS="~amd64 ~x86"
+fi
+inherit cmake-utils flag-o-matic gnome2-utils l10n virtualx xdg-utils 
${GIT_ECLASS}
+unset GIT_ECLASS
+
+DESCRIPTION="Modern music player and library organizer based on Amarok 1.4 and 
Qt"
+HOMEPAGE="https://www.clementine-player.org 
https://github.com/clementine-player/Clementine;
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp 
projectm pulseaudio seafile skydrive test +udisks wiimote"
+
+REQUIRED_USE="
+   udisks? ( dbus )
+   wiimote? ( dbus )
+"
+
+COMMON_DEPEND="
+   app-crypt/qca:2[qt5(+)]
+   dev-db/sqlite:=
+   dev-libs/crypto++[asm]
+   dev-libs/glib:2
+   dev-libs/libxml2
+   dev-libs/protobuf:=
+   dev-qt/qtconcurrent:5
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qtnetwork:5[ssl]
+   dev-qt/qtsql:5[sqlite]
+   dev-qt/qtwidgets:5
+   media-libs/chromaprint:=
+   media-libs/gstreamer:1.0
+   media-libs/gst-plugins-base:1.0
+   >=media-libs/libmygpo-qt-1.0.9[qt5(+)]
+   >=media-libs/taglib-1.11.1_p20181028
+   sys-libs/zlib
+   virtual/glu
+   x11-libs/libX11
+   cdda? ( dev-libs/libcdio:= )
+   dbus? ( dev-qt/qtdbus:5 )
+   ipod? ( >=media-libs/libgpod-0.8.0 )
+   lastfm? ( >=media-libs/liblastfm-1.1.0_pre20150206 )
+   moodbar? ( sci-libs/fftw:3.0 )
+   mtp? ( >=media-libs/libmtp-1.0.0 )
+   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;
+# Libprojectm-1.2 seems to work fine, so no reason to use bundled version; 
check clementine's patches:
+# 
https://github.com/clementine-player/Clementine/tree/master/3rdparty/libprojectm/patches
+# Still possibly essential but not applied yet patches are:
+# 06-fix-numeric-locale.patch
+# 08-stdlib.h-for-rand.patch
+RDEPEND="${COMMON_DEPEND}
+   media-plugins/gst-plugins-meta:1.0
+

[gentoo-commits] repo/gentoo:master commit in: media-sound/clementine/, media-sound/clementine/files/

2018-12-02 Thread Andreas Sturmlechner 
commit: 2539602e02f8797712d44f12f5f5fd5871fa8b81
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Dec  2 17:03:48 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Dec  2 18:43:35 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2539602e

media-sound/clementine: Drop 1.3.1_p20181112 snapshot

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-sound/clementine/Manifest|   1 -
 .../clementine/clementine-1.3.1_p20181112.ebuild   | 182 -
 .../files/clementine-1.3.1_p20181112-no-dbus.patch |  41 -
 3 files changed, 224 deletions(-)

diff --git a/media-sound/clementine/Manifest b/media-sound/clementine/Manifest
index cd11a00b680..20346bcffb3 100644
--- a/media-sound/clementine/Manifest
+++ b/media-sound/clementine/Manifest
@@ -1,3 +1,2 @@
 DIST clementine-1.3.1_p20180416.tar.gz 8489387 BLAKE2B 
37412428cf030a71f0011ba68a7ce71a3bbdc59402dc6d6349cca8ee44b208052cee9add1597a9577e5a6ed4bb2ebf16c4e1f79612d12be265f637caffd02a76
 SHA512 
8f38554571c637d9f79df43679ac2a76383f7a9b4ee8e921a16175889180e72afadc352dd40d73a671aa8ae9b01f6a251ae7b94b010043f8bcb8d8f42dcfff62
-DIST clementine-1.3.1_p20181112.tar.gz 8526632 BLAKE2B 
da3f155006ef5e94233104011aadad41e974ec339827b91bd3c5c0c2420b23199be852a9d0cb7c9b0112ba2d43ff3e3e87388db92679f8e64da5c3fa3e578c1d
 SHA512 
eed16cec7323b142e4602a4bd81d7363e9cf4fc203c3b8b341aadbe883fdbd571dff0792260eec8af2f91e79fe905c3510d1e7ce1b06e9d4698016820cc771fa
 DIST clementine-1.3.1_p20181201.tar.gz 8535075 BLAKE2B 
c4b6660ee9718054cc13c6b4fc2e1dccf9c117319f5b682dc5de2861fc40cc129e079449e1c2e15733faf14b6e18b42f37c228000a8e6c121b7fdcb2e48bc7b9
 SHA512 
fcc062857b95a5cabc41449143bb876df9955cdaaa59868f147d7a165dea13e2e4e1c11ea23f4309c8af7bef42d694a82867420245513af8e4dfbd91ab6f9a2c

diff --git a/media-sound/clementine/clementine-1.3.1_p20181112.ebuild 
b/media-sound/clementine/clementine-1.3.1_p20181112.ebuild
deleted file mode 100644
index 0840a685935..000
--- a/media-sound/clementine/clementine-1.3.1_p20181112.ebuild
+++ /dev/null
@@ -1,182 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="af ar be bg bn br bs ca cs cy da de el en en_CA en_GB eo es et eu fa 
fi fr ga gl he he_IL hi hr hu hy ia id is it ja ka kk ko lt lv mk_MK mr ms my 
nb nl oc pa pl pt pt_BR ro ru si_LK sk sl sr sr@latin sv te tr tr_TR uk uz vi 
zh_CN zh_TW"
-
-MY_P="${P/_}"
-if [[ ${PV} == ** ]]; then
-   EGIT_BRANCH="qt5"
-   EGIT_REPO_URI="https://github.com/clementine-player/Clementine.git;
-   GIT_ECLASS="git-r3"
-else
-   COMMIT=b8eea8ccc116388b67e4b042a5b81e87bf7a24e5
-   
SRC_URI="https://github.com/${PN}-player/${PN^}/archive/${COMMIT}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="~amd64 ~x86"
-fi
-inherit cmake-utils flag-o-matic gnome2-utils l10n virtualx xdg-utils 
${GIT_ECLASS}
-unset GIT_ECLASS
-
-DESCRIPTION="Modern music player and library organizer based on Amarok 1.4 and 
Qt"
-HOMEPAGE="https://www.clementine-player.org 
https://github.com/clementine-player/Clementine;
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp 
projectm pulseaudio seafile skydrive test +udisks wiimote"
-
-REQUIRED_USE="
-   udisks? ( dbus )
-   wiimote? ( dbus )
-"
-
-COMMON_DEPEND="
-   app-crypt/qca:2[qt5(+)]
-   dev-db/sqlite:=
-   dev-libs/crypto++[asm]
-   dev-libs/glib:2
-   dev-libs/libxml2
-   dev-libs/protobuf:=
-   dev-qt/qtconcurrent:5
-   dev-qt/qtcore:5
-   dev-qt/qtgui:5
-   dev-qt/qtnetwork:5[ssl]
-   dev-qt/qtsql:5[sqlite]
-   dev-qt/qtwidgets:5
-   media-libs/chromaprint:=
-   media-libs/gstreamer:1.0
-   media-libs/gst-plugins-base:1.0
-   >=media-libs/libmygpo-qt-1.0.9[qt5(+)]
-   >=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 )
-   ipod? ( >=media-libs/libgpod-0.8.0 )
-   lastfm? ( >=media-libs/liblastfm-1.1.0_pre20150206 )
-   moodbar? ( sci-libs/fftw:3.0 )
-   mtp? ( >=media-libs/libmtp-1.0.0 )
-   projectm? (
-   media-libs/glew:=
-   >=media-libs/libprojectm-1.2.0
-   )
-"
-# Note: sqlite driver of dev-qt/qtsql is bundled, so no sqlite use is 
required; check if this can be overcome someway;
-# Libprojectm-1.2 seems to work fine, so no reason to use bundled version; 
check clementine's patches:
-# 
https://github.com/clementine-player/Clementine/tree/master/3rdparty/libprojectm/patches
-# Still possibly essential but not applied yet patches are:
-# 06-fix-numeric-locale.patch
-# 08-stdlib.h-for-rand.patch
-RDEPEND="${COMMON_DEPEND}
-   media-plugins/gst-plugins-meta:1.0
-   media-plugins/gst-plugins-soup:1.0
-

[gentoo-commits] repo/gentoo:master commit in: media-sound/clementine/, media-sound/clementine/files/

2018-04-25 Thread Andreas Sturmlechner 
commit: c50ce6be0d1de5a792daa90fe043026c49f1ad0b
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Apr 25 19:39:58 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Apr 26 03:29:33 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c50ce6be

media-sound/clementine: Drop old Qt4-based

Bug: https://bugs.gentoo.org/650692
Package-Manager: Portage-2.3.31, Repoman-2.3.9

 media-sound/clementine/Manifest|   1 -
 .../clementine-1.3.1_p20171113-r1.ebuild   | 167 -
 .../files/clementine-1.3-fix-tokenizer.patch   |  21 ---
 3 files changed, 189 deletions(-)

diff --git a/media-sound/clementine/Manifest b/media-sound/clementine/Manifest
index ab3c9e5fb0c..4b0aa4198c4 100644
--- a/media-sound/clementine/Manifest
+++ b/media-sound/clementine/Manifest
@@ -1,2 +1 @@
-DIST clementine-1.3.1_p20171113.tar.gz 8467904 BLAKE2B 
bf1f59b987c0e4ec5c2ced00fab07c1a7e1df0eb5a46e90358b37eaaeaa916fb3e6a08ad79fc5fb791342d857783f615eb3726974dcfef9388da2793b1b7fe6a
 SHA512 
39c459be8e4c5dd53ab9de6cdfd57f947926ccc2cd39ce2f72460bb991f7b2a28e6bc074e7bc23b0eba81c3d630e91dc2373794832c1089a9b5de7b212b94674
 DIST clementine-1.3.1_p20180416.tar.gz 8489387 BLAKE2B 
37412428cf030a71f0011ba68a7ce71a3bbdc59402dc6d6349cca8ee44b208052cee9add1597a9577e5a6ed4bb2ebf16c4e1f79612d12be265f637caffd02a76
 SHA512 
8f38554571c637d9f79df43679ac2a76383f7a9b4ee8e921a16175889180e72afadc352dd40d73a671aa8ae9b01f6a251ae7b94b010043f8bcb8d8f42dcfff62

diff --git a/media-sound/clementine/clementine-1.3.1_p20171113-r1.ebuild 
b/media-sound/clementine/clementine-1.3.1_p20171113-r1.ebuild
deleted file mode 100644
index fe90073e56b..000
--- a/media-sound/clementine/clementine-1.3.1_p20171113-r1.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-COMMIT=83e860eabd9f4a864c553f110742027cdd01b76f
-EGIT_REPO_URI="https://github.com/clementine-player/Clementine.git;
-
-PLOCALES="af ar be bg bn br bs ca cs cy da de el en en_CA en_GB eo es et eu fa 
fi fr ga gl he he_IL hi hr hu hy ia id is it ja ka kk ko lt lv mk_MK mr ms my 
nb nl oc pa pl pt pt_BR ro ru si_LK sk sl sr sr@latin sv te tr tr_TR uk uz vi 
zh_CN zh_TW"
-
-inherit cmake-utils flag-o-matic gnome2-utils l10n vcs-snapshot virtualx 
xdg-utils
-
-DESCRIPTION="Modern music player and library organizer based on Amarok 1.4 and 
Qt"
-HOMEPAGE="https://www.clementine-player.org 
https://github.com/clementine-player/Clementine;
-SRC_URI="https://github.com/${PN}-player/${PN^}/archive/${COMMIT}.tar.gz -> 
${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp 
projectm pulseaudio seafile skydrive test +udisks wiimote"
-
-REQUIRED_USE="
-   udisks? ( dbus )
-   wiimote? ( dbus )
-"
-
-COMMON_DEPEND="
-   dev-db/sqlite:=
-   dev-libs/crypto++
-   dev-libs/glib:2
-   dev-libs/libxml2
-   dev-libs/protobuf:=
-   dev-libs/qjson
-   dev-qt/qtcore:4[ssl]
-   dev-qt/qtgui:4
-   dev-qt/qtopengl:4
-   dev-qt/qtsql:4
-   media-libs/chromaprint:=
-   media-libs/gstreamer:1.0
-   media-libs/gst-plugins-base:1.0
-   >=media-libs/libmygpo-qt-1.0.9[qt4]
-   media-libs/taglib[mp4(+)]
-   sys-libs/zlib
-   virtual/glu
-   virtual/opengl
-   x11-libs/libX11
-   cdda? ( dev-libs/libcdio:= )
-   dbus? ( dev-qt/qtdbus:4 )
-   ipod? ( >=media-libs/libgpod-0.8.0 )
-   lastfm? ( >=media-libs/liblastfm-1[qt4] )
-   moodbar? ( sci-libs/fftw:3.0 )
-   mtp? ( >=media-libs/libmtp-1.0.0 )
-   projectm? (
-   media-libs/glew:=
-   >=media-libs/libprojectm-1.2.0
-   )
-"
-# Note: sqlite driver of dev-qt/qtsql is bundled, so no sqlite use is 
required; check if this can be overcome someway;
-# Libprojectm-1.2 seems to work fine, so no reason to use bundled version; 
check clementine's patches:
-# 
https://github.com/clementine-player/Clementine/tree/master/3rdparty/libprojectm/patches
-# Still possibly essential but not applied yet patches are:
-# 06-fix-numeric-locale.patch
-# 08-stdlib.h-for-rand.patch
-RDEPEND="${COMMON_DEPEND}
-   media-plugins/gst-plugins-meta:1.0
-   media-plugins/gst-plugins-soup:1.0
-   media-plugins/gst-plugins-taglib:1.0
-   mms? ( media-plugins/gst-plugins-libmms:1.0 )
-   mtp? ( gnome-base/gvfs[mtp] )
-   udisks? ( sys-fs/udisks:2 )
-"
-DEPEND="${COMMON_DEPEND}
-   >=dev-cpp/gtest-1.8.0
-   dev-libs/boost
-   sys-devel/gettext
-   virtual/pkgconfig
-   box? ( dev-cpp/sparsehash )
-   dropbox? ( dev-cpp/sparsehash )
-   googledrive? ( dev-cpp/sparsehash )
-   pulseaudio? ( media-sound/pulseaudio )
-   seafile? ( dev-cpp/sparsehash )
-   skydrive? ( dev-cpp/sparsehash )
-   test? (
-   dev-qt/qttest:4
-

[gentoo-commits] repo/gentoo:master commit in: media-sound/clementine/, media-sound/clementine/files/

2018-03-22 Thread Andreas Sturmlechner 
commit: cea612c3ab27af4fa0c42df97e9b3c5aae345e15
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Mar 22 17:55:20 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Mar 22 18:02:24 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cea612c3

media-sound/clementine: Drop old snapshot

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 media-sound/clementine/Manifest|   1 -
 .../clementine/clementine-1.3.1_p20180314.ebuild   | 192 -
 .../files/clementine-1.3.1_p20180314-qt-5.11.patch |  51 --
 3 files changed, 244 deletions(-)

diff --git a/media-sound/clementine/Manifest b/media-sound/clementine/Manifest
index c0358b6dd38..71bcdbbfc07 100644
--- a/media-sound/clementine/Manifest
+++ b/media-sound/clementine/Manifest
@@ -1,3 +1,2 @@
 DIST clementine-1.3.1_p20171113.tar.gz 8467904 BLAKE2B 
bf1f59b987c0e4ec5c2ced00fab07c1a7e1df0eb5a46e90358b37eaaeaa916fb3e6a08ad79fc5fb791342d857783f615eb3726974dcfef9388da2793b1b7fe6a
 SHA512 
39c459be8e4c5dd53ab9de6cdfd57f947926ccc2cd39ce2f72460bb991f7b2a28e6bc074e7bc23b0eba81c3d630e91dc2373794832c1089a9b5de7b212b94674
-DIST clementine-1.3.1_p20180314.tar.gz 8486396 BLAKE2B 
978651924c50ee3669f82a51f98978869103edac3f7f7cfef372dc1f1483caa2f543d9d626a4552647acaeabb4f329a69cb5c76d8c6e9b8d605de2f86025344c
 SHA512 
5c21540a91dae9f0db336947552548e44eec80fc9e6ebf95cbca3d2ab60cd096be963aec105f0c8d72d2628777cb6628e4a7e50f54a3edbcc22708c59f620e4a
 DIST clementine-1.3.1_p20180319.tar.gz 8488685 BLAKE2B 
2f4c412f9274a8957584bbc2d6482144fd6892adc629cdc0aeb750d592d8e4e62ad5b7bbb56288ecb993a9f5221b54e47e18c3f2b76c7a80670ead37ba5be3b0
 SHA512 
bbe288ca654ad0ed36abca288187abe452524e8fec23839973ff3f1d61ce479a979cbc45edcba10d6d15ff9b23e95bb7e6d31a0090ca8e32bd547114e1ec

diff --git a/media-sound/clementine/clementine-1.3.1_p20180314.ebuild 
b/media-sound/clementine/clementine-1.3.1_p20180314.ebuild
deleted file mode 100644
index 296ae7151df..000
--- a/media-sound/clementine/clementine-1.3.1_p20180314.ebuild
+++ /dev/null
@@ -1,192 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="af ar be bg bn br bs ca cs cy da de el en en_CA en_GB eo es et eu fa 
fi fr ga gl he he_IL hi hr hu hy ia id is it ja ka kk ko lt lv mk_MK mr ms my 
nb nl oc pa pl pt pt_BR ro ru si_LK sk sl sr sr@latin sv te tr tr_TR uk uz vi 
zh_CN zh_TW"
-
-MY_P="${P/_}"
-if [[ ${PV} == ** ]]; then
-   EGIT_BRANCH="qt5"
-   EGIT_REPO_URI="https://github.com/clementine-player/Clementine.git;
-   GIT_ECLASS="git-r3"
-else
-   COMMIT=2d7894915dfc9043da9282d216775ef75041c773
-   
SRC_URI="https://github.com/${PN}-player/${PN^}/archive/${COMMIT}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="~amd64 ~x86"
-fi
-inherit cmake-utils flag-o-matic gnome2-utils l10n virtualx xdg-utils 
${GIT_ECLASS} vcs-snapshot
-unset GIT_ECLASS
-
-DESCRIPTION="Modern music player and library organizer based on Amarok 1.4 and 
Qt"
-HOMEPAGE="https://www.clementine-player.org 
https://github.com/clementine-player/Clementine;
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp 
projectm pulseaudio seafile skydrive test +udisks wiimote"
-
-REQUIRED_USE="
-   udisks? ( dbus )
-   wiimote? ( dbus )
-"
-
-COMMON_DEPEND="
-   app-crypt/qca:2[qt5(+)]
-   dev-db/sqlite:=
-   dev-libs/crypto++
-   dev-libs/glib:2
-   dev-libs/libxml2
-   dev-libs/protobuf:=
-   dev-qt/qtconcurrent:5
-   dev-qt/qtcore:5
-   dev-qt/qtgui:5
-   dev-qt/qtnetwork:5[ssl]
-   dev-qt/qtsql:5[sqlite]
-   dev-qt/qtwidgets:5
-   dev-qt/qtx11extras:5
-   dev-qt/qtxml:5
-   media-libs/chromaprint:=
-   media-libs/gstreamer:1.0
-   media-libs/gst-plugins-base:1.0
-   >=media-libs/libmygpo-qt-1.0.9[qt5(+)]
-   media-libs/taglib
-   sys-libs/zlib
-   virtual/glu
-   virtual/opengl
-   x11-libs/libX11
-   cdda? ( dev-libs/libcdio:= )
-   dbus? ( dev-qt/qtdbus:5 )
-   ipod? ( >=media-libs/libgpod-0.8.0 )
-   lastfm? ( >=media-libs/liblastfm-1[qt5(+)] )
-   moodbar? ( sci-libs/fftw:3.0 )
-   mtp? ( >=media-libs/libmtp-1.0.0 )
-   projectm? (
-   media-libs/glew:=
-   >=media-libs/libprojectm-1.2.0
-   )
-"
-# Note: sqlite driver of dev-qt/qtsql is bundled, so no sqlite use is 
required; check if this can be overcome someway;
-# Libprojectm-1.2 seems to work fine, so no reason to use bundled version; 
check clementine's patches:
-# 
https://github.com/clementine-player/Clementine/tree/master/3rdparty/libprojectm/patches
-# Still possibly essential but not applied yet patches are:
-# 06-fix-numeric-locale.patch
-# 08-stdlib.h-for-rand.patch
-RDEPEND="${COMMON_DEPEND}
-   media-plugins/gst-plugins-meta:1.0
-   media-plugins/gst-plugins-soup:1.0
-

[gentoo-commits] repo/gentoo:master commit in: media-sound/clementine/, media-sound/clementine/files/

2017-12-08 Thread Andreas Sturmlechner 
commit: d62fad681f5f95e386f11fe247df81b2ba3b7a19
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Dec  8 16:58:07 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Dec  8 18:30:40 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d62fad68

media-sound/clementine: Drop old

Package-Manager: Portage-2.3.17, Repoman-2.3.6

 media-sound/clementine/clementine-1.3.1-r6.ebuild  | 180 -
 ...ine-1.3.1-add-missing-functional-includes.patch |  51 --
 2 files changed, 231 deletions(-)

diff --git a/media-sound/clementine/clementine-1.3.1-r6.ebuild 
b/media-sound/clementine/clementine-1.3.1-r6.ebuild
deleted file mode 100644
index 13b223ccee9..000
--- a/media-sound/clementine/clementine-1.3.1-r6.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_REPO_URI="https://github.com/clementine-player/Clementine.git;
-
-LANGS=" af ar be bg bn br bs ca cs cy da de el en_CA en_GB eo es et eu fa fi 
fr ga gl he he_IL hi hr hu hy ia id is it ja ka kk ko lt lv mr ms my nb nl oc 
pa pl pt pt_BR ro ru si_LK sk sl sr sr@latin sv te tr tr_TR uk uz vi zh_CN 
zh_TW"
-
-inherit cmake-utils flag-o-matic xdg-utils gnome2-utils virtualx
-[[ ${PV} == ** ]] && inherit git-r3
-
-DESCRIPTION="Modern music player and library organizer based on Amarok 1.4 and 
Qt"
-HOMEPAGE="https://www.clementine-player.org 
https://github.com/clementine-player/Clementine;
-[[ ${PV} == ** ]] || \
-SRC_URI="https://github.com/clementine-player/Clementine/archive/${PV/_}.tar.gz
 -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-[[ ${PV} == ** ]] || \
-KEYWORDS="~amd64 ~x86"
-IUSE="amazoncloud box cdda +dbus debug dropbox googledrive ipod lastfm mms 
moodbar mtp projectm pulseaudio skydrive test +udisks wiimote"
-IUSE+="${LANGS// / linguas_}"
-
-REQUIRED_USE="
-   udisks? ( dbus )
-   wiimote? ( dbus )
-"
-
-COMMON_DEPEND="
-   dev-db/sqlite:=
-   >=dev-libs/glib-2.24.1-r1
-   dev-libs/libxml2
-   dev-libs/protobuf:=
-   dev-libs/qjson
-   >=dev-qt/qtcore-4.5:4[ssl]
-   >=dev-qt/qtgui-4.5:4
-   >=dev-qt/qtopengl-4.5:4
-   >=dev-qt/qtsql-4.5:4
-   >=media-libs/chromaprint-0.6
-   media-libs/gstreamer:1.0
-   media-libs/gst-plugins-base:1.0
-   >=media-libs/libmygpo-qt-1.0.9[qt4(+)]
-   >=media-libs/taglib-1.8[mp4(+)]
-   sys-libs/zlib
-   dev-libs/crypto++
-   virtual/glu
-   virtual/opengl
-   x11-libs/libX11
-   cdda? ( dev-libs/libcdio )
-   dbus? ( >=dev-qt/qtdbus-4.5:4 )
-   ipod? ( >=media-libs/libgpod-0.8.0 )
-   lastfm? ( >=media-libs/liblastfm-1[qt4(+)] )
-   mtp? ( >=media-libs/libmtp-1.0.0 )
-   moodbar? ( sci-libs/fftw:3.0 )
-   projectm? ( media-libs/glew:=
-   >=media-libs/libprojectm-1.2.0 )
-"
-# Note: sqlite driver of dev-qt/qtsql is bundled, so no sqlite use is 
required; check if this can be overcome someway;
-# Libprojectm-1.2 seams to work fine, so no reasons to use bundled version; 
check the clementine's patches:
-# 
https://github.com/clementine-player/Clementine/tree/master/3rdparty/libprojectm/patches
-# Still possibly essential but not applied yet patches are:
-# 06-fix-numeric-locale.patch
-# 08-stdlib.h-for-rand.patch
-RDEPEND="${COMMON_DEPEND}
-   dbus? ( udisks? ( sys-fs/udisks:0 ) )
-   mms? ( media-plugins/gst-plugins-libmms:1.0 )
-   mtp? ( gnome-base/gvfs[mtp] )
-   media-plugins/gst-plugins-meta:1.0
-   media-plugins/gst-plugins-soup:1.0
-   media-plugins/gst-plugins-taglib:1.0
-"
-DEPEND="${COMMON_DEPEND}
-   >=dev-libs/boost-1.39:=
-   virtual/pkgconfig
-   sys-devel/gettext
-   dev-qt/qttest:4
-   || (
-   >=dev-cpp/gtest-1.8.0
-   dev-cpp/gmock
-   )
-   amazoncloud? ( dev-cpp/sparsehash )
-   box? ( dev-cpp/sparsehash )
-   dropbox? ( dev-cpp/sparsehash )
-   googledrive? ( dev-cpp/sparsehash )
-   pulseaudio? ( media-sound/pulseaudio )
-   skydrive? ( dev-cpp/sparsehash )
-   test? ( gnome-base/gsettings-desktop-schemas )
-"
-DOCS=( Changelog README.md )
-
-MY_P="${P/_}"
-[[ ${PV} == ** ]] || \
-S="${WORKDIR}/${MY_P^}"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-1.3-fix-tokenizer.patch
-   "${FILESDIR}"/${P}-fix-desktop-file.patch
-   "${FILESDIR}"/${P}-chromaprint14.patch #603662
-   "${FILESDIR}"/${P}-libechonest_removal.patch
-   "${FILESDIR}"/${P}-add-missing-functional-includes.patch #618214
-)
-
-src_prepare() {
-   cmake-utils_src_prepare
-
-   # some tests fail or hang
-   sed -i \
-   -e '/add_test_file(translations_test.cpp/d' \
-   tests/CMakeLists.txt || die
-}
-
-src_configure() {
-   local langs x
-   for x in ${LANGS}; do
-   use linguas_${x} && langs+=" ${x}"
-   done
-
-   # spotify

[gentoo-commits] repo/gentoo:master commit in: media-sound/clementine/, media-sound/clementine/files/

2017-11-21 Thread Andreas Sturmlechner 
commit: bd2bf56ec969421c7e8b112c1c8342e1efc295a5
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Nov 21 10:18:36 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Nov 21 10:19:40 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd2bf56e

media-sound/clementine: qt5-lconvert.patch upstreamed

Package-Manager: Portage-2.3.13, Repoman-2.3.4

 media-sound/clementine/clementine-.ebuild  |  5 +---
 .../clementine/files/clementine-qt5-lconvert.patch | 28 --
 2 files changed, 1 insertion(+), 32 deletions(-)

diff --git a/media-sound/clementine/clementine-.ebuild 
b/media-sound/clementine/clementine-.ebuild
index 50ae57df046..b0f63f84244 100644
--- a/media-sound/clementine/clementine-.ebuild
+++ b/media-sound/clementine/clementine-.ebuild
@@ -106,10 +106,7 @@ MY_P="${P/_}"
 [[ ${PV} == ** ]] || \
 S="${WORKDIR}/${MY_P^}"
 
-PATCHES=(
-   "${FILESDIR}"/${PN}-fts3-tokenizer.patch
-   "${FILESDIR}"/${PN}-qt5-lconvert.patch
-)
+PATCHES=( "${FILESDIR}"/${PN}-fts3-tokenizer.patch )
 
 src_prepare() {
l10n_find_plocales_changes "src/translations" "" ".po"

diff --git a/media-sound/clementine/files/clementine-qt5-lconvert.patch 
b/media-sound/clementine/files/clementine-qt5-lconvert.patch
deleted file mode 100644
index 8565f30cee0..000
--- a/media-sound/clementine/files/clementine-qt5-lconvert.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 5f75801a08a606073c700bd829ea694950de0729 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner 
-Date: Sun, 19 Nov 2017 16:00:55 +0100
-Subject: [PATCH] Properly find Qt5LinguistTools
-

- CMakeLists.txt | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 4022c383b..5bdb2a00e 100644
 a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -45,9 +45,8 @@ if(NOT APPLE)
-   find_package(Qt5 COMPONENTS WebKitWidgets)
- endif(NOT APPLE)
- 
--# Find Qt's lconvert binary.  Try qt's binary dir first, fall back to looking 
in PATH
--find_program(QT_LCONVERT_EXECUTABLE NAMES lconvert lconvert-qt5 PATHS 
${QT_BINARY_DIR} NO_DEFAULT_PATH)
--find_program(QT_LCONVERT_EXECUTABLE NAMES lconvert lconvert-qt5)
-+find_package(Qt5LinguistTools CONFIG REQUIRED)
-+set(QT_LCONVERT_EXECUTABLE Qt5::lconvert)
- 
- if(APPLE)
-   if(NOT QT_MAC_USE_COCOA)
--- 
-2.15.0
-

[gentoo-commits] repo/gentoo:master commit in: media-sound/clementine/, media-sound/clementine/files/

2017-05-16 Thread Lars Wendler 
commit: 520806d82fc698f86da9f1d35761327e9a3c5dbd
Author: Alexander Golubev  gmail  com>
AuthorDate: Tue May 16 03:30:31 2017 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Tue May 16 19:52:57 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=520806d8

media-sound/clementine: fix compilation with gcc-7.1

Gentoo-Bug: 618214
Closes: https://github.com/gentoo/gentoo/pull/4640

 media-sound/clementine/clementine-1.3.1-r6.ebuild  |  3 +-
 ...ine-1.3.1-add-missing-functional-includes.patch | 51 ++
 2 files changed, 53 insertions(+), 1 deletion(-)

diff --git a/media-sound/clementine/clementine-1.3.1-r6.ebuild 
b/media-sound/clementine/clementine-1.3.1-r6.ebuild
index 6dfba6c726c..6d4916f0f57 100644
--- a/media-sound/clementine/clementine-1.3.1-r6.ebuild
+++ b/media-sound/clementine/clementine-1.3.1-r6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -95,6 +95,7 @@ PATCHES=(
"${FILESDIR}"/${P}-fix-desktop-file.patch
"${FILESDIR}"/${P}-chromaprint14.patch #603662
"${FILESDIR}"/${P}-libechonest_removal.patch
+   "${FILESDIR}"/${P}-add-missing-functional-includes.patch #618214
 )
 
 src_prepare() {

diff --git 
a/media-sound/clementine/files/clementine-1.3.1-add-missing-functional-includes.patch
 
b/media-sound/clementine/files/clementine-1.3.1-add-missing-functional-includes.patch
new file mode 100644
index 000..e480212b883
--- /dev/null
+++ 
b/media-sound/clementine/files/clementine-1.3.1-add-missing-functional-includes.patch
@@ -0,0 +1,51 @@
+From 8a6cc8b5069265e1e92e22def985e22c5955e503 Mon Sep 17 00:00:00 2001
+From: Morris Hafner 
+Date: Mon, 13 Feb 2017 17:46:46 +0100
+Subject: [PATCH] Add missing  includes (#5630)
+
+---
+ src/core/mergedproxymodel.cpp | 1 +
+ src/devices/giolister.cpp | 1 +
+ src/library/groupbydialog.cpp | 2 ++
+ 3 files changed, 4 insertions(+)
+
+diff --git a/src/core/mergedproxymodel.cpp b/src/core/mergedproxymodel.cpp
+index 56217f6..8c210d3 100644
+--- a/src/core/mergedproxymodel.cpp
 b/src/core/mergedproxymodel.cpp
+@@ -23,6 +23,7 @@
+ 
+ #include 
+ 
++#include 
+ #include 
+ 
+ // boost::multi_index still relies on these being in the global namespace.
+diff --git a/src/devices/giolister.cpp b/src/devices/giolister.cpp
+index aa3bddb..5f63ef2 100644
+--- a/src/devices/giolister.cpp
 b/src/devices/giolister.cpp
+@@ -17,6 +17,7 @@
+ 
+ #include "config.h"
+ 
++#include 
+ #include 
+ 
+ #include 
+diff --git a/src/library/groupbydialog.cpp b/src/library/groupbydialog.cpp
+index 5efdc9f..e5f711b 100644
+--- a/src/library/groupbydialog.cpp
 b/src/library/groupbydialog.cpp
+@@ -20,6 +20,8 @@
+ 
+ #include 
+ 
++#include 
++
+ // boost::multi_index still relies on these being in the global namespace.
+ using std::placeholders::_1;
+ using std::placeholders::_2;
+-- 
+2.10.2
+

[gentoo-commits] repo/gentoo:master commit in: media-sound/clementine/, media-sound/clementine/files/

2017-01-04 Thread Lars Wendler 
commit: aae3b9701faba2fce4d87edb8f53a7a56a3d0df5
Author: Lars Wendler  gentoo  org>
AuthorDate: Wed Jan  4 15:07:10 2017 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Wed Jan  4 15:07:23 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aae3b970

media-sound/clementine: Removed old.

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 media-sound/clementine/Manifest|   1 -
 media-sound/clementine/clementine-1.2.3-r2.ebuild  | 169 ---
 media-sound/clementine/clementine-1.2.3.ebuild | 169 ---
 ...tine-1.2.3-hide_boost_includes_from_q_moc.patch | 181 -
 .../files/clementine-1.2.3-namespaces.patch|  36 
 5 files changed, 556 deletions(-)

diff --git a/media-sound/clementine/Manifest b/media-sound/clementine/Manifest
index c30a99a..cc01afb 100644
--- a/media-sound/clementine/Manifest
+++ b/media-sound/clementine/Manifest
@@ -1,2 +1 @@
-DIST clementine-1.2.3.tar.gz 9076977 SHA256 
7df5650445a005c09f5f0e1a1b0d077037c37ecbe4ee77baf9d45f121308a1bf SHA512 
fd43a7dcfec360d4478a56d0600300b6913b294f127afb0249971b45b54b48475d128861e06885c482bbdd37b09aa56b1c238675763fdb8c50329005b066bec3
 WHIRLPOOL 
23d0fb971118b0d73ec4a52cfa3f8829118ab65c12fb01ce30433541f5da081b52c5dd485aa0efdda2b4b57b286f59702aa686f9b7ce17a0a2595b208b95d524
 DIST clementine-1.3.1.tar.gz 8501827 SHA256 
f885931a9ab7c88607d07b50c64fcce46fc05f13dd2c0a04188c94eff938f37c SHA512 
1942a046be24a583b5e2095dd39dc736c1b14a47dc4aad61d6252c1fccf745c26d7b35da907a220d5dc8c0736f5b589d050ed9582de343aa3cb5abc607001790
 WHIRLPOOL 
20a57177dc740865f35c407b981e146d9ddec6aff39e662a27dfe0e238f3baa87b331cc6dc50eebf848279c8860fb74454b4997924e2d4d93357a870364af1a7

diff --git a/media-sound/clementine/clementine-1.2.3-r2.ebuild 
b/media-sound/clementine/clementine-1.2.3-r2.ebuild
deleted file mode 100644
index 7b60fa8..
--- a/media-sound/clementine/clementine-1.2.3-r2.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-EGIT_REPO_URI="https://github.com/clementine-player/Clementine.git;
-
-LANGS=" af ar be bg bn br bs ca cs cy da de el en_CA en_GB eo es es_AR et eu 
fa fi fr ga gl he hi hr hu hy ia id is it ja ka kk ko lt lv mr ms nb nl oc pa 
pl pt pt_BR ro ru sk sl sr sr@latin sv te tr uk uz vi zh_CN zh_TW"
-
-inherit cmake-utils flag-o-matic fdo-mime gnome2-utils virtualx
-[[ ${PV} == ** ]] && inherit git-2
-
-DESCRIPTION="A modern music player and library organizer based on Amarok 1.4 
and Qt4"
-HOMEPAGE="http://www.clementine-player.org 
https://github.com/clementine-player/Clementine;
-[[ ${PV} == ** ]] || \
-SRC_URI="https://github.com/clementine-player/Clementine/archive/${PV}.tar.gz 
-> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-[[ ${PV} == ** ]] || \
-KEYWORDS="amd64 x86"
-IUSE="ayatana box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar 
mtp projectm skydrive system-sqlite test ubuntu-one +udisks wiimote"
-IUSE+="${LANGS// / linguas_}"
-
-REQUIRED_USE="
-   udisks? ( dbus )
-   wiimote? ( dbus )
-"
-
-# qca dep is temporary for bug #489850
-COMMON_DEPEND="
-   app-crypt/qca:2[qt4(+)]
-   >=dev-qt/qtcore-4.5:4[ssl]
-   >=dev-qt/qtgui-4.5:4
-   dbus? ( >=dev-qt/qtdbus-4.5:4 )
-   >=dev-qt/qtopengl-4.5:4
-   >=dev-qt/qtsql-4.5:4[sqlite]
-   system-sqlite? ( dev-db/sqlite:3[fts3(+)] )
-   >=media-libs/taglib-1.8[mp4(+)]
-   >=dev-libs/glib-2.24.1-r1
-   dev-libs/libxml2
-   dev-libs/protobuf:=
-   dev-libs/qjson
-   media-libs/libechonest:=[qt4(+)]
-   >=media-libs/libmygpo-qt-1.0.7[qt4(+)]
-   >=media-libs/chromaprint-0.6
-   media-libs/gstreamer:0.10
-   media-libs/gst-plugins-base:0.10
-   sys-libs/zlib
-   virtual/glu
-   virtual/opengl
-   x11-libs/libX11
-   ayatana? ( dev-libs/libindicate-qt )
-   cdda? ( dev-libs/libcdio )
-   ipod? ( >=media-libs/libgpod-0.8.0 )
-   lastfm? ( >=media-libs/liblastfm-1[qt4(+)] )
-   mtp? ( >=media-libs/libmtp-1.0.0 )
-   moodbar? ( sci-libs/fftw:3.0 )
-   projectm? ( media-libs/glew:= )
-"
-# now only presets are used, libprojectm is internal
-# 
https://github.com/clementine-player/Clementine/tree/master/3rdparty/libprojectm/patches
-# r1966 "Compile with a static sqlite by default, since Qt 4.7 doesn't seem to 
expose the symbols we need to use FTS"
-RDEPEND="${COMMON_DEPEND}
-   dbus? ( udisks? ( sys-fs/udisks:0 ) )
-   mms? ( media-plugins/gst-plugins-libmms:0.10 )
-   mtp? ( gnome-base/gvfs[mtp] )
-   projectm? ( >=media-libs/libprojectm-1.2.0 )
-   media-plugins/gst-plugins-meta:0.10
-   media-plugins/gst-plugins-gio:0.10
-   media-plugins/gst-plugins-soup:0.10
-   media-plugins/gst-plugins-taglib:0.10
-"
-DEPEND="${COMMON_DEPEND}
-   >=dev-libs/boost-1.39:=
-   virtual/pkgconfig
-

[gentoo-commits] repo/gentoo:master commit in: media-sound/clementine/, media-sound/clementine/files/

2016-12-26 Thread Lars Wendler 
commit: 38d0e53184badc23e1fa9f2d532f276b2f729e0f
Author: Lars Wendler  gentoo  org>
AuthorDate: Mon Dec 26 16:13:27 2016 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Mon Dec 26 16:13:27 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38d0e531

media-sound/clementine: Fixed building against >=media-libs/chromaprint-1.4

This fixes Gentoo bug #603662

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 media-sound/clementine/clementine-1.3.1-r4.ebuild  |  1 +
 .../files/clementine-chromaprint14.patch   | 41 ++
 2 files changed, 42 insertions(+)

diff --git a/media-sound/clementine/clementine-1.3.1-r4.ebuild 
b/media-sound/clementine/clementine-1.3.1-r4.ebuild
index ed118c2..a61c2fe 100644
--- a/media-sound/clementine/clementine-1.3.1-r4.ebuild
+++ b/media-sound/clementine/clementine-1.3.1-r4.ebuild
@@ -95,6 +95,7 @@ S="${WORKDIR}/${MY_P^}"
 PATCHES=(
"${FILESDIR}"/${PN}-1.3-fix-tokenizer.patch
"${FILESDIR}"/${P}-fix-desktop-file.patch
+   "${FILESDIR}"/${PN}-chromaprint14.patch #603662
 )
 
 src_prepare() {

diff --git a/media-sound/clementine/files/clementine-chromaprint14.patch 
b/media-sound/clementine/files/clementine-chromaprint14.patch
new file mode 100644
index ..bfdc492
--- /dev/null
+++ b/media-sound/clementine/files/clementine-chromaprint14.patch
@@ -0,0 +1,41 @@
+From ded312685735fc266d4154d355286eeb86db3bcd Mon Sep 17 00:00:00 2001
+From: Chocobozzz 
+Date: Thu, 8 Dec 2016 23:12:17 +0100
+Subject: [PATCH] Add compatibility with chromaprint >= 1.4
+
+---
+ src/musicbrainz/chromaprinter.cpp | 14 +++---
+ 1 file changed, 11 insertions(+), 3 deletions(-)
+
+diff --git a/src/musicbrainz/chromaprinter.cpp 
b/src/musicbrainz/chromaprinter.cpp
+index 9579b62..c7ad99e 100644
+--- a/src/musicbrainz/chromaprinter.cpp
 b/src/musicbrainz/chromaprinter.cpp
+@@ -143,16 +143,24 @@ QString Chromaprinter::CreateFingerprint() {
+   ChromaprintContext* chromaprint =
+   chromaprint_new(CHROMAPRINT_ALGORITHM_DEFAULT);
+   chromaprint_start(chromaprint, kDecodeRate, kDecodeChannels);
+-  chromaprint_feed(chromaprint, reinterpret_cast(data.data()),
++  chromaprint_feed(chromaprint, reinterpret_cast(data.data()),
+data.size() / 2);
+   chromaprint_finish(chromaprint);
+ 
+-  void* fprint = nullptr;
+   int size = 0;
++
++#if CHROMAPRINT_VERSION_MAJOR >= 1 && CHROMAPRINT_VERSION_MINOR >= 4
++  u_int32_t *fprint = nullptr;
++  char *encoded = nullptr;
++#else
++  void *fprint = nullptr;
++  void *encoded = nullptr;
++#endif
++
+   int ret = chromaprint_get_raw_fingerprint(chromaprint, , );
++
+   QByteArray fingerprint;
+   if (ret == 1) {
+-void* encoded = nullptr;
+ int encoded_size = 0;
+ chromaprint_encode_fingerprint(fprint, size, 
CHROMAPRINT_ALGORITHM_DEFAULT,
+, _size, 1);

[gentoo-commits] repo/gentoo:master commit in: media-sound/clementine/, media-sound/clementine/files/

2016-09-13 Thread David Seifert 
commit: 1d8124918ec0cf8cec6dbac8aa84cbd84855b2ea
Author: Alexander Golubev  gmail  com>
AuthorDate: Mon Sep 12 17:27:32 2016 +
Commit: David Seifert  gentoo  org>
CommitDate: Tue Sep 13 07:49:22 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d812491

media-sound/clementine: fix desktop file QA notice

This fixes QA notice complaning that OnlyShowIn key for action groups is
deprecated.
See gentoo bug 460412#3
Closes: https://github.com/gentoo/gentoo/pull/2311

Signed-off-by: David Seifert  gentoo.org>

 ...-1.3.1-r2.ebuild => clementine-1.3.1-r3.ebuild} |  1 +
 .../files/clementine-1.3.1-fix-desktop-file.patch  | 52 ++
 2 files changed, 53 insertions(+)

diff --git a/media-sound/clementine/clementine-1.3.1-r2.ebuild 
b/media-sound/clementine/clementine-1.3.1-r3.ebuild
similarity index 99%
rename from media-sound/clementine/clementine-1.3.1-r2.ebuild
rename to media-sound/clementine/clementine-1.3.1-r3.ebuild
index 18f42ef..d0baf97 100644
--- a/media-sound/clementine/clementine-1.3.1-r2.ebuild
+++ b/media-sound/clementine/clementine-1.3.1-r3.ebuild
@@ -94,6 +94,7 @@ S="${WORKDIR}/${MY_P^}"
 
 PATCHES=(
"${FILESDIR}"/${PN}-1.3-fix-tokenizer.patch
+   "${FILESDIR}"/${P}-fix-desktop-file.patch
 )
 
 src_prepare() {

diff --git 
a/media-sound/clementine/files/clementine-1.3.1-fix-desktop-file.patch 
b/media-sound/clementine/files/clementine-1.3.1-fix-desktop-file.patch
new file mode 100644
index ..bb56131
--- /dev/null
+++ b/media-sound/clementine/files/clementine-1.3.1-fix-desktop-file.patch
@@ -0,0 +1,52 @@
+This patch fixes gentoo QA notices against the desktop file (see gentoo bug 
460412#3)
+Based upon patch extracted from upstream git; original patch info:
+commit 04f73d125365d97fa6f72677ec5d220292690e56
+Author: Golubev Alexander 
+Date:   Mon Jul 18 13:45:03 2016 +0400
+
+Remove OnlyShowIn=Unity from clementine.desktop's action sections (#5444)
+
+diff --git a/dist/clementine.desktop b/dist/clementine.desktop
+index 2fb9559..9ee881e 100644
+--- a/dist/clementine.desktop
 b/dist/clementine.desktop
+@@ -38,7 +38,6 @@ Actions=Play;Pause;Stop;Previous;Next;
+ [Desktop Action Play]
+ Name=Play
+ Exec=clementine --play
+-OnlyShowIn=Unity;
+ Name[af]=Speel
+ Name[be]=Прайграць
+ Name[bg]=Възпроизвеждане
+@@ -89,7 +88,6 @@ Name[zh_TW]=播放
+ [Desktop Action Pause]
+ Name=Pause
+ Exec=clementine --pause
+-OnlyShowIn=Unity;
+ Name[be]=Прыпыніць
+ Name[bg]=Пауза
+ Name[br]=Ehan
+@@ -135,7 +133,6 @@ Name[zh_TW]=暫停
+ [Desktop Action Stop]
+ Name=Stop
+ Exec=clementine --stop
+-OnlyShowIn=Unity;
+ Name[be]=Спыніць
+ Name[bg]=Спиране
+ Name[br]=Paouez
+@@ -184,7 +181,6 @@ Name[zh_TW]=停止
+ [Desktop Action Previous]
+ Name=Previous
+ Exec=clementine --previous
+-OnlyShowIn=Unity;
+ Name[af]=Vorige
+ Name[be]=Папярэдні
+ Name[bg]=Предишна
+@@ -232,7 +228,6 @@ Name[zh_TW]=往前
+ [Desktop Action Next]
+ Name=Next
+ Exec=clementine --next
+-OnlyShowIn=Unity;
+ Name[af]=Volgende
+ Name[be]=Далей
+ Name[bg]=Следваща

[gentoo-commits] repo/gentoo:master commit in: media-sound/clementine/, media-sound/clementine/files/

2016-05-03 Thread Lars Wendler 
commit: 30db61f8b0b251adb75237b0535199436e04a71e
Author: Alexander Golubev  gmail  com>
AuthorDate: Sat Apr 30 15:21:30 2016 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Tue May  3 14:48:59 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30db61f8

media-sound/clementine: several cleanups and fixes

- Clean up dependencies
- Fix dependencies upon dev-libs/crypto++ (see 580134)
- Synchronise live ebuild with latest release
- Remove obsolte comments
- Reorder cmake params
- Reenable testing
- add missing USE flags:
  * added 3 missing USE flags in ebuilds of recent version: amazoncloud,
  pulseaudio and vkontakte
  * removed USE=ubuntu-one due to remove in upstream
  * slightly change description for other USEs

Signed-off-by: Lars Wendler  gentoo.org>

 media-sound/clementine/clementine-1.3.1.ebuild | 49 +++---
 media-sound/clementine/clementine-1.3.ebuild   | 49 +++---
 media-sound/clementine/clementine-.ebuild  | 78 +++---
 .../files/clementine-1.3_rc1-cmake.patch   | 32 -
 media-sound/clementine/metadata.xml|  4 +-
 5 files changed, 92 insertions(+), 120 deletions(-)

diff --git a/media-sound/clementine/clementine-1.3.1.ebuild 
b/media-sound/clementine/clementine-1.3.1.ebuild
index 2e12657..b348bfe 100644
--- a/media-sound/clementine/clementine-1.3.1.ebuild
+++ b/media-sound/clementine/clementine-1.3.1.ebuild
@@ -9,7 +9,7 @@ 
EGIT_REPO_URI="https://github.com/clementine-player/Clementine.git;
 LANGS=" af ar be bg bn br bs ca cs cy da de el en_CA en_GB eo es et eu fa fi 
fr ga gl he he_IL hi hr hu hy ia id is it ja ka kk ko lt lv mr ms my nb nl oc 
pa pl pt pt_BR ro ru si_LK sk sl sr sr@latin sv te tr tr_TR uk uz vi zh_CN 
zh_TW"
 
 inherit cmake-utils flag-o-matic fdo-mime gnome2-utils virtualx
-[[ ${PV} == ** ]] && inherit git-2
+[[ ${PV} == ** ]] && inherit git-r3
 
 DESCRIPTION="A modern music player and library organizer based on Amarok 1.4 
and Qt4"
 HOMEPAGE="http://www.clementine-player.org 
https://github.com/clementine-player/Clementine;
@@ -20,7 +20,7 @@ LICENSE="GPL-3"
 SLOT="0"
 [[ ${PV} == ** ]] || \
 KEYWORDS="~amd64 ~x86"
-IUSE="box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp 
projectm skydrive test ubuntu-one +udisks wiimote"
+IUSE="amazoncloud box cdda +dbus debug dropbox googledrive ipod lastfm mms 
moodbar mtp projectm pulseaudio skydrive test +udisks vkontakte wiimote"
 IUSE+="${LANGS// / linguas_}"
 
 REQUIRED_USE="
@@ -28,7 +28,6 @@ REQUIRED_USE="
wiimote? ( dbus )
 "
 
-# qca dep is temporary for bug #489850
 COMMON_DEPEND="
dev-db/sqlite:=
>=dev-libs/glib-2.24.1-r1
@@ -38,7 +37,7 @@ COMMON_DEPEND="
>=dev-qt/qtcore-4.5:4
>=dev-qt/qtgui-4.5:4
>=dev-qt/qtopengl-4.5:4
-   >=dev-qt/qtsql-4.5:4[sqlite]
+   >=dev-qt/qtsql-4.5:4
>=media-libs/chromaprint-0.6
media-libs/gstreamer:1.0
media-libs/gst-plugins-base:1.0
@@ -46,6 +45,7 @@ COMMON_DEPEND="
>=media-libs/libmygpo-qt-1.0.8
>=media-libs/taglib-1.8[mp4]
sys-libs/zlib
+   dev-libs/crypto++
virtual/glu
virtual/opengl
x11-libs/libX11
@@ -55,16 +55,19 @@ COMMON_DEPEND="
lastfm? ( >=media-libs/liblastfm-1[qt4(+)] )
mtp? ( >=media-libs/libmtp-1.0.0 )
moodbar? ( sci-libs/fftw:3.0 )
-   projectm? ( media-libs/glew:= )
+   projectm? ( media-libs/glew:=
+   >=media-libs/libprojectm-1.2.0 )
 "
-# now only presets are used, libprojectm is internal
+# Note: sqlite driver of dev-qt/qtsql is bundled, so no sqlite use is 
required; check if this can be overcome someway;
+# Libprojectm-1.2 seams to work fine, so no reasons to use bundled version; 
check the clementine's patches:
 # 
https://github.com/clementine-player/Clementine/tree/master/3rdparty/libprojectm/patches
-# r1966 "Compile with a static sqlite by default, since Qt 4.7 doesn't seem to 
expose the symbols we need to use FTS"
+# Still possibly essential but not applied yet patches are:
+# 06-fix-numeric-locale.patch
+# 08-stdlib.h-for-rand.patch
 RDEPEND="${COMMON_DEPEND}
dbus? ( udisks? ( sys-fs/udisks:2 ) )
mms? ( media-plugins/gst-plugins-libmms:1.0 )
mtp? ( gnome-base/gvfs )
-   projectm? ( >=media-libs/libprojectm-1.2.0 )
media-plugins/gst-plugins-meta:1.0
media-plugins/gst-plugins-soup:1.0
media-plugins/gst-plugins-taglib:1.0
@@ -75,27 +78,21 @@ DEPEND="${COMMON_DEPEND}
sys-devel/gettext
dev-qt/qttest:4
dev-cpp/gmock
+   amazoncloud? ( dev-cpp/sparsehash )
box? ( dev-cpp/sparsehash )
dropbox? ( dev-cpp/sparsehash )
googledrive? ( dev-cpp/sparsehash )
+   pulseaudio? ( media-sound/pulseaudio )
skydrive? ( dev-cpp/sparsehash )
-   ubuntu-one? ( dev-cpp/sparsehash )
test? ( gnome-base/gsettings-desktop-schemas )
 "

[gentoo-commits] repo/gentoo:master commit in: media-sound/clementine/, media-sound/clementine/files/

2016-04-27 Thread Lars Wendler 
commit: df9bc12fb6a7b2c33a9b608e3859b4a063ad
Author: Lars Wendler  gentoo  org>
AuthorDate: Wed Apr 27 12:21:40 2016 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Wed Apr 27 12:21:56 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df9bc12f

media-sound/clementine: Removed old.

Package-Manager: portage-2.2.28
Signed-off-by: Lars Wendler  gentoo.org>

 media-sound/clementine/Manifest|   1 -
 media-sound/clementine/clementine-1.2.2.ebuild | 167 -
 .../files/clementine-1.2.2-fix-build.patch |  25 ---
 .../files/clementine-1.2.2-fix-build2.patch|  38 -
 .../clementine/files/clementine-1.2.2-gcc49.patch  |  17 ---
 5 files changed, 248 deletions(-)

diff --git a/media-sound/clementine/Manifest b/media-sound/clementine/Manifest
index 624eb88..3839234 100644
--- a/media-sound/clementine/Manifest
+++ b/media-sound/clementine/Manifest
@@ -1,4 +1,3 @@
-DIST clementine-1.2.2.tar.gz 9076752 SHA256 
1f674c42f05c476baf74f1dd37b1aa357ff9199e4493173052c856a53e5f0a96 SHA512 
48e934ed1f18724c4cc79eaf7ac16dcb2ecc9d268a4986a8a421c6518d7a13bd81a5b7d249b4ff146c860bed520a59d2062139fb57672609019b8c2c84e495ca
 WHIRLPOOL 
13c3f129566c0789e67b23b2382d7ed1f756221647c4b2cc1b4b1b1efcb5e04571837a843c8ff7c099f9bcd3f9b1dd481b1fa75fe1c4b27e90169026e8880840
 DIST clementine-1.2.3.tar.gz 9076977 SHA256 
7df5650445a005c09f5f0e1a1b0d077037c37ecbe4ee77baf9d45f121308a1bf SHA512 
fd43a7dcfec360d4478a56d0600300b6913b294f127afb0249971b45b54b48475d128861e06885c482bbdd37b09aa56b1c238675763fdb8c50329005b066bec3
 WHIRLPOOL 
23d0fb971118b0d73ec4a52cfa3f8829118ab65c12fb01ce30433541f5da081b52c5dd485aa0efdda2b4b57b286f59702aa686f9b7ce17a0a2595b208b95d524
 DIST clementine-1.3.1.tar.gz 8501827 SHA256 
f885931a9ab7c88607d07b50c64fcce46fc05f13dd2c0a04188c94eff938f37c SHA512 
1942a046be24a583b5e2095dd39dc736c1b14a47dc4aad61d6252c1fccf745c26d7b35da907a220d5dc8c0736f5b589d050ed9582de343aa3cb5abc607001790
 WHIRLPOOL 
20a57177dc740865f35c407b981e146d9ddec6aff39e662a27dfe0e238f3baa87b331cc6dc50eebf848279c8860fb74454b4997924e2d4d93357a870364af1a7
 DIST clementine-1.3.tar.gz 8500723 SHA256 
55e8d283ed02e3f2376a88b012cd2003e00fef95a98b6a919d67cb57e96b8617 SHA512 
eccebb8a4d7e4abf39af7b75f40d38d184650932d2c40859cdfb3cfda24d2a35fea8518b03d9fb24f21c4dae6f11baffe2b00fe6989ec14fed99a4ccbb85ca54
 WHIRLPOOL 
cbd6922fa586cce6be29ef0fd6151d6d89ce95aa6e237cf2716e7493ba6be2026d11a44012dc84be2e033c606c79c3e9e0338cbbd5927d7f16f358718c016895

diff --git a/media-sound/clementine/clementine-1.2.2.ebuild 
b/media-sound/clementine/clementine-1.2.2.ebuild
deleted file mode 100644
index 9e0a825..000
--- a/media-sound/clementine/clementine-1.2.2.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-EGIT_REPO_URI="https://github.com/clementine-player/Clementine.git;
-
-LANGS=" af ar be bg bn br bs ca cs cy da de el en_CA en_GB eo es es_AR et eu 
fa fi fr ga gl he hi hr hu hy ia id is it ja ka kk ko lt lv mr ms nb nl oc pa 
pl pt pt_BR ro ru sk sl sr sr@latin sv te tr uk uz vi zh_CN zh_TW"
-
-inherit cmake-utils flag-o-matic fdo-mime gnome2-utils virtualx
-[[ ${PV} == ** ]] && inherit git-2
-
-DESCRIPTION="A modern music player and library organizer based on Amarok 1.4 
and Qt4"
-HOMEPAGE="http://www.clementine-player.org 
https://github.com/clementine-player/Clementine;
-[[ ${PV} == ** ]] || \
-SRC_URI="https://github.com/clementine-player/Clementine/archive/${PV}.tar.gz 
-> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-[[ ${PV} == ** ]] || \
-KEYWORDS="amd64 x86"
-IUSE="ayatana box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar 
mtp projectm skydrive system-sqlite test ubuntu-one +udisks wiimote"
-IUSE+="${LANGS// / linguas_}"
-
-REQUIRED_USE="
-   udisks? ( dbus )
-   wiimote? ( dbus )
-"
-
-# qca dep is temporary for bug #489850
-COMMON_DEPEND="
-   app-crypt/qca:2[qt4(+)]
-   >=dev-qt/qtgui-4.5:4
-   dbus? ( >=dev-qt/qtdbus-4.5:4 )
-   >=dev-qt/qtopengl-4.5:4
-   >=dev-qt/qtsql-4.5:4[sqlite]
-   system-sqlite? ( dev-db/sqlite[fts3(+)] )
-   >=media-libs/taglib-1.8[mp4]
-   >=dev-libs/glib-2.24.1-r1
-   dev-libs/libxml2
-   dev-libs/protobuf:=
-   dev-libs/qjson
-   media-libs/libechonest:=
-   >=media-libs/libmygpo-qt-1.0.7
-   >=media-libs/chromaprint-0.6
-   media-libs/gstreamer:0.10
-   media-libs/gst-plugins-base:0.10
-   virtual/glu
-   virtual/opengl
-   ayatana? ( dev-libs/libindicate-qt )
-   cdda? ( dev-libs/libcdio )
-   ipod? ( >=media-libs/libgpod-0.8.0 )
-   lastfm? ( >=media-libs/liblastfm-1[qt4(+)] )
-   mtp? ( >=media-libs/libmtp-1.0.0 )
-   moodbar? ( sci-libs/fftw:3.0 )
-   projectm? ( media-libs/glew )
-"
-# now only presets are used, libprojectm is internal
-#

[gentoo-commits] repo/gentoo:master commit in: media-sound/clementine/, media-sound/clementine/files/

2016-04-16 Thread Jason Donenfeld 
commit: 829f315b73c749c00f47d6b67886bf2935523cd7
Author: Jason A. Donenfeld  gentoo  org>
AuthorDate: Sun Apr 17 04:31:51 2016 +
Commit: Jason Donenfeld  gentoo  org>
CommitDate: Sun Apr 17 04:32:57 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=829f315b

media-sound/clementine: version bump

Package-Manager: portage-2.2.28

 media-sound/clementine/Manifest|   2 +-
 ...entine-1.3_rc1.ebuild => clementine-1.3.ebuild} |   5 +-
 .../clementine/clementine-1.3_rc1-r1.ebuild| 168 -
 media-sound/clementine/clementine-.ebuild  |   1 -
 .../files/clementine-1.3_rc1-cmake.patch   |  41 -
 .../files/clementine-1.3_rc1-fix-tokenizer.patch   |  21 ---
 6 files changed, 2 insertions(+), 236 deletions(-)

diff --git a/media-sound/clementine/Manifest b/media-sound/clementine/Manifest
index 9a18ea5..da3271b 100644
--- a/media-sound/clementine/Manifest
+++ b/media-sound/clementine/Manifest
@@ -1,3 +1,3 @@
 DIST clementine-1.2.2.tar.gz 9076752 SHA256 
1f674c42f05c476baf74f1dd37b1aa357ff9199e4493173052c856a53e5f0a96 SHA512 
48e934ed1f18724c4cc79eaf7ac16dcb2ecc9d268a4986a8a421c6518d7a13bd81a5b7d249b4ff146c860bed520a59d2062139fb57672609019b8c2c84e495ca
 WHIRLPOOL 
13c3f129566c0789e67b23b2382d7ed1f756221647c4b2cc1b4b1b1efcb5e04571837a843c8ff7c099f9bcd3f9b1dd481b1fa75fe1c4b27e90169026e8880840
 DIST clementine-1.2.3.tar.gz 9076977 SHA256 
7df5650445a005c09f5f0e1a1b0d077037c37ecbe4ee77baf9d45f121308a1bf SHA512 
fd43a7dcfec360d4478a56d0600300b6913b294f127afb0249971b45b54b48475d128861e06885c482bbdd37b09aa56b1c238675763fdb8c50329005b066bec3
 WHIRLPOOL 
23d0fb971118b0d73ec4a52cfa3f8829118ab65c12fb01ce30433541f5da081b52c5dd485aa0efdda2b4b57b286f59702aa686f9b7ce17a0a2595b208b95d524
-DIST clementine-1.3_rc1.tar.gz 8477665 SHA256 
f08b797b47305b8a0b7e1713d11977df12e09911f05c577c9f81641369f252a0 SHA512 
973410a0d2baf0646a77eb5bcbea2af3f34a4baa5671f7a81fa99203703c478d38dd2f32ce0ccac9babf8add56717fd5fdec8a4bacefe8b9b8fa0256ec509edb
 WHIRLPOOL 
968ca43b4a15169926ad68a009c568ae03ef17e8b0542fe6c4ebd07fc4e64ae6782ab63d3a05851064e288522e44e885a9a1dc52b94246e016c60c91e41e0a76
+DIST clementine-1.3.tar.gz 8500723 SHA256 
55e8d283ed02e3f2376a88b012cd2003e00fef95a98b6a919d67cb57e96b8617 SHA512 
eccebb8a4d7e4abf39af7b75f40d38d184650932d2c40859cdfb3cfda24d2a35fea8518b03d9fb24f21c4dae6f11baffe2b00fe6989ec14fed99a4ccbb85ca54
 WHIRLPOOL 
cbd6922fa586cce6be29ef0fd6151d6d89ce95aa6e237cf2716e7493ba6be2026d11a44012dc84be2e033c606c79c3e9e0338cbbd5927d7f16f358718c016895

diff --git a/media-sound/clementine/clementine-1.3_rc1.ebuild 
b/media-sound/clementine/clementine-1.3.ebuild
similarity index 98%
rename from media-sound/clementine/clementine-1.3_rc1.ebuild
rename to media-sound/clementine/clementine-1.3.ebuild
index 79b9c7d..3eb1742 100644
--- a/media-sound/clementine/clementine-1.3_rc1.ebuild
+++ b/media-sound/clementine/clementine-1.3.ebuild
@@ -56,6 +56,7 @@ COMMON_DEPEND="
mtp? ( >=media-libs/libmtp-1.0.0 )
moodbar? ( sci-libs/fftw:3.0 )
projectm? ( media-libs/glew:= )
+   >=dev-libs/crypto++-5.6.2-r4
 "
 # now only presets are used, libprojectm is internal
 # 
https://github.com/clementine-player/Clementine/tree/master/3rdparty/libprojectm/patches
@@ -92,10 +93,6 @@ MY_P="${P/_}"
 [[ ${PV} == ** ]] || \
 S="${WORKDIR}/C${MY_P:1}"
 
-PATCHES=(
-   "${FILESDIR}"/${PN}-1.3_rc1-cmake.patch
-)
-
 src_prepare() {
cmake-utils_src_prepare
 

diff --git a/media-sound/clementine/clementine-1.3_rc1-r1.ebuild 
b/media-sound/clementine/clementine-1.3_rc1-r1.ebuild
deleted file mode 100644
index debdf11..000
--- a/media-sound/clementine/clementine-1.3_rc1-r1.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-EGIT_REPO_URI="https://github.com/clementine-player/Clementine.git;
-
-LANGS=" af ar be bg bn br bs ca cs cy da de el en_CA en_GB eo es et eu fa fi 
fr ga gl he he_IL hi hr hu hy ia id is it ja ka kk ko lt lv mr ms my nb nl oc 
pa pl pt pt_BR ro ru si_LK sk sl sr sr@latin sv te tr tr_TR uk uz vi zh_CN 
zh_TW"
-
-inherit cmake-utils flag-o-matic fdo-mime gnome2-utils virtualx
-[[ ${PV} == ** ]] && inherit git-2
-
-DESCRIPTION="A modern music player and library organizer based on Amarok 1.4 
and Qt4"
-HOMEPAGE="http://www.clementine-player.org 
https://github.com/clementine-player/Clementine;
-[[ ${PV} == ** ]] || \
-SRC_URI="https://github.com/clementine-player/Clementine/archive/${PV/_}.tar.gz
 -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-[[ ${PV} == ** ]] || \
-KEYWORDS="~amd64 ~x86"
-IUSE="box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp 
projectm skydrive test ubuntu-one +udisks wiimote"
-IUSE+="${LANGS// / linguas_}"
-
-REQUIRED_USE="
-   udisks? ( dbus )
-   wiimote? ( dbus )
-"
-
-# qca dep is temporary for bug #489850
-COMMON_DEPEND="
-

[gentoo-commits] repo/gentoo:master commit in: media-sound/clementine/, media-sound/clementine/files/

2016-03-15 Thread Jason Donenfeld 
commit: bd4a5b8e468ba801b5f6d5f790af73d0cbc84c52
Author: Jason A. Donenfeld  gentoo  org>
AuthorDate: Wed Mar 16 00:42:39 2016 +
Commit: Jason Donenfeld  gentoo  org>
CommitDate: Wed Mar 16 00:48:36 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd4a5b8e

media-sound/clementine: fix tokenizer segfault

Package-Manager: portage-2.2.28

 .../clementine/clementine-1.3_rc1-r1.ebuild| 168 +
 .../files/clementine-1.3_rc1-fix-tokenizer.patch   |  21 +++
 2 files changed, 189 insertions(+)

diff --git a/media-sound/clementine/clementine-1.3_rc1-r1.ebuild 
b/media-sound/clementine/clementine-1.3_rc1-r1.ebuild
new file mode 100644
index 000..debdf11
--- /dev/null
+++ b/media-sound/clementine/clementine-1.3_rc1-r1.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+EGIT_REPO_URI="https://github.com/clementine-player/Clementine.git;
+
+LANGS=" af ar be bg bn br bs ca cs cy da de el en_CA en_GB eo es et eu fa fi 
fr ga gl he he_IL hi hr hu hy ia id is it ja ka kk ko lt lv mr ms my nb nl oc 
pa pl pt pt_BR ro ru si_LK sk sl sr sr@latin sv te tr tr_TR uk uz vi zh_CN 
zh_TW"
+
+inherit cmake-utils flag-o-matic fdo-mime gnome2-utils virtualx
+[[ ${PV} == ** ]] && inherit git-2
+
+DESCRIPTION="A modern music player and library organizer based on Amarok 1.4 
and Qt4"
+HOMEPAGE="http://www.clementine-player.org 
https://github.com/clementine-player/Clementine;
+[[ ${PV} == ** ]] || \
+SRC_URI="https://github.com/clementine-player/Clementine/archive/${PV/_}.tar.gz
 -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+[[ ${PV} == ** ]] || \
+KEYWORDS="~amd64 ~x86"
+IUSE="box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp 
projectm skydrive test ubuntu-one +udisks wiimote"
+IUSE+="${LANGS// / linguas_}"
+
+REQUIRED_USE="
+   udisks? ( dbus )
+   wiimote? ( dbus )
+"
+
+# qca dep is temporary for bug #489850
+COMMON_DEPEND="
+   dev-db/sqlite:=
+   >=dev-libs/glib-2.24.1-r1
+   dev-libs/libxml2
+   dev-libs/protobuf:=
+   dev-libs/qjson
+   >=dev-qt/qtcore-4.5:4
+   >=dev-qt/qtgui-4.5:4
+   >=dev-qt/qtopengl-4.5:4
+   >=dev-qt/qtsql-4.5:4[sqlite]
+   >=media-libs/chromaprint-0.6
+   media-libs/gstreamer:1.0
+   media-libs/gst-plugins-base:1.0
+   media-libs/libechonest:=[qt4]
+   >=media-libs/libmygpo-qt-1.0.8
+   >=media-libs/taglib-1.8[mp4]
+   sys-libs/zlib
+   virtual/glu
+   virtual/opengl
+   x11-libs/libX11
+   cdda? ( dev-libs/libcdio )
+   dbus? ( >=dev-qt/qtdbus-4.5:4 )
+   ipod? ( >=media-libs/libgpod-0.8.0 )
+   lastfm? ( >=media-libs/liblastfm-1[qt4(+)] )
+   mtp? ( >=media-libs/libmtp-1.0.0 )
+   moodbar? ( sci-libs/fftw:3.0 )
+   projectm? ( media-libs/glew:= )
+"
+# now only presets are used, libprojectm is internal
+# 
https://github.com/clementine-player/Clementine/tree/master/3rdparty/libprojectm/patches
+# r1966 "Compile with a static sqlite by default, since Qt 4.7 doesn't seem to 
expose the symbols we need to use FTS"
+RDEPEND="${COMMON_DEPEND}
+   dbus? ( udisks? ( sys-fs/udisks:2 ) )
+   mms? ( media-plugins/gst-plugins-libmms:1.0 )
+   mtp? ( gnome-base/gvfs )
+   projectm? ( >=media-libs/libprojectm-1.2.0 )
+   media-plugins/gst-plugins-meta:1.0
+   media-plugins/gst-plugins-soup:1.0
+   media-plugins/gst-plugins-taglib:1.0
+"
+DEPEND="${COMMON_DEPEND}
+   >=dev-libs/boost-1.39
+   virtual/pkgconfig
+   sys-devel/gettext
+   dev-qt/qttest:4
+   dev-cpp/gmock
+   box? ( dev-cpp/sparsehash )
+   dropbox? ( dev-cpp/sparsehash )
+   googledrive? ( dev-cpp/sparsehash )
+   skydrive? ( dev-cpp/sparsehash )
+   ubuntu-one? ( dev-cpp/sparsehash )
+   test? ( gnome-base/gsettings-desktop-schemas )
+"
+DOCS="Changelog"
+
+# https://github.com/clementine-player/Clementine/issues/3935
+RESTRICT="test"
+
+MY_P="${P/_}"
+# Switch to ^ when we switch to EAPI=6.
+[[ ${PV} == ** ]] || \
+S="${WORKDIR}/C${MY_P:1}"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-1.3_rc1-cmake.patch
+   "${FILESDIR}"/${PN}-1.3_rc1-fix-tokenizer.patch
+)
+
+src_prepare() {
+   cmake-utils_src_prepare
+
+   # some tests fail or hang
+   sed -i \
+   -e '/add_test_file(translations_test.cpp/d' \
+   tests/CMakeLists.txt || die
+}
+
+src_configure() {
+   local langs x
+   for x in ${LANGS}; do
+   use linguas_${x} && langs+=" ${x}"
+   done
+
+   # spotify is not in portage
+   local mycmakeargs=(
+   -DBUILD_WERROR=OFF
+   -DLINGUAS="${langs}"
+   -DBUNDLE_PROJECTM_PRESETS=OFF
+   -DUSE_SYSTEM_PROJECTM=ON
+   $(cmake-utils_use cdda ENABLE_AUDIOCD)
+   $(cmake-utils_use dbus ENABLE_DBUS)
+   $(cmake-utils_use