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

2025-06-12 Thread Sam James 
commit: ec2f88274c49883f7226c9d3d9344925ce4440d7
Author: Nicolas PARLANT  parhuet  fr>
AuthorDate: Tue Jun 10 21:06:03 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun 12 11:08:41 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec2f8827

media-sound/cantata: Bump to 3.3.1

Add a patch to fix ODR violations with cddb or udisks enabled

Signed-off-by: Nicolas PARLANT  parhuet.fr>
Part-of: https://github.com/gentoo/gentoo/pull/42541
Signed-off-by: Sam James  gentoo.org>

 media-sound/cantata/Manifest   |   1 +
 media-sound/cantata/cantata-3.3.1.ebuild   | 108 
 .../cantata/files/cantata-3.3.0-fix_odr.patch  | 139 +
 3 files changed, 248 insertions(+)

diff --git a/media-sound/cantata/Manifest b/media-sound/cantata/Manifest
index f23d8fe6f4fd..46bf29360fa4 100644
--- a/media-sound/cantata/Manifest
+++ b/media-sound/cantata/Manifest
@@ -1 +1,2 @@
 DIST cantata-3.3.0.tar.gz 4783803 BLAKE2B 
78995492080cacf4d5f01e923a71edb2208baa9238d269679f6ea0112cf06066295bbeb40b18439bcd45fea8079ea6c52422f5515ed6f0c1511f7942f3b96f15
 SHA512 
ec011a2e544a882c68a808d27752457e4702f20b0ed66124dcc10586c8f5cc975690a4fc7368abc2747fd4f603f19b787a45f5a664f3ace8bcc9f1f86369253e
+DIST cantata-3.3.1.tar.gz 4787884 BLAKE2B 
0769ddc8e19370694d5a4cde9bf50c4563dd132e6471478bcd2842d15fc73b47e6f542096e907da6b162d9408a495ccf4af04d6def61cf751ef0f45e5459269e
 SHA512 
1d70f5be223d20e75faedefcb2db3833d77ef28fab2ba747ebb77fdb20b45416c19e453b49f61bcd7dbbc77c166e640adf474c40b80e71fdbd0f05b653e02c81

diff --git a/media-sound/cantata/cantata-3.3.1.ebuild 
b/media-sound/cantata/cantata-3.3.1.ebuild
new file mode 100644
index ..8b8f9a8286a7
--- /dev/null
+++ b/media-sound/cantata/cantata-3.3.1.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake xdg
+
+DESCRIPTION="Featureful and configurable Qt client for the music player daemon 
(MPD)"
+HOMEPAGE="https://github.com/nullobsi/cantata";
+SRC_URI="https://github.com/nullobsi/cantata/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="cdda cddb http-server mtp musicbrainz replaygain streaming +taglib 
udisks zeroconf"
+REQUIRED_USE="
+   cdda? ( taglib udisks || ( cddb musicbrainz ) )
+   cddb? ( cdda taglib )
+   mtp? ( taglib udisks )
+   musicbrainz? ( cdda taglib )
+   replaygain? ( taglib )
+   udisks? ( taglib )
+"
+
+COMMON_DEPEND="
+   dev-qt/qtbase:6[dbus,gui,network,sql,sqlite,widgets,xml]
+   dev-qt/qtsvg:6
+   sys-libs/zlib
+   cdda? ( || (
+   dev-libs/libcdio-paranoia
+   media-sound/cdparanoia
+   ) )
+   cddb? ( media-libs/libcddb )
+   mtp? ( media-libs/libmtp:= )
+   musicbrainz? ( media-libs/musicbrainz:5= )
+   replaygain? (
+   media-libs/libebur128:=
+   media-sound/mpg123-base
+   media-video/ffmpeg:0=
+   )
+   streaming? ( dev-qt/qtmultimedia:6 )
+   taglib? ( >=media-libs/taglib-2:= )
+   udisks? ( kde-frameworks/solid:6 )
+   zeroconf? ( net-dns/avahi )
+"
+RDEPEND="${COMMON_DEPEND}
+   dev-lang/perl[perl_features_ithreads]
+"
+DEPEND="${COMMON_DEPEND}
+   dev-qt/qtbase:6[concurrent]
+"
+BDEPEND="
+   dev-qt/qttools:6[linguist]
+   virtual/pkgconfig
+"
+
+PATCHES=(
+   # unbundle KF6ItemViews and KF6Solid
+   "${FILESDIR}"/${PN}-3.3.0-rm-vendor.patch
+
+   # Fix ODR violations with cddb or udisks enabled
+   # https://github.com/nullobsi/cantata/pull/71.patch
+   "${FILESDIR}"/${PN}-3.3.0-fix_odr.patch
+)
+
+src_prepare() {
+   cmake_src_prepare
+
+   # Unbundle 3rd party libs
+   # keep knotifications : 
https://github.com/nullobsi/cantata/commit/719adb5
+   rm -r 
3rdparty/{ebur128,kcategorizedview,qtsingleapplication,qxt,solid-lite} || die
+}
+
+src_configure() {
+   local mycmakeargs=(
+   # Buggy https://github.com/nullobsi/cantata/commit/18236
+   -DENABLE_CATEGORIZED_VIEW=OFF
+   -DENABLE_CDPARANOIA=$(usex cdda)
+   -DENABLE_CDDB=$(usex cddb)
+   -DENABLE_CDIOPARANOIA=$(usex cdda)
+   -DENABLE_HTTP_SERVER=$(usex http-server)
+   -DENABLE_MTP=$(usex mtp)
+   -DENABLE_MUSICBRAINZ=$(usex musicbrainz)
+   -DENABLE_FFMPEG=$(usex replaygain)
+   -DENABLE_MPG123=$(usex replaygain)
+   -DENABLE_HTTP_STREAM_PLAYBACK=$(usex streaming)
+   -DENABLE_TAGLIB=$(usex taglib)
+   -DENABLE_DEVICES_SUPPORT=$(usex udisks)
+   -DENABLE_AVAHI=$(usex zeroconf)
+   -DENABLE_REMOTE_DEVICES=OFF
+   # use solid/udisks2 instead of udisks
+   -DENABLE_UDISKS2=ON
+   )
+
+   cmake_src_configure
+}
+
+pkg_postinst() {
+

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

2025-04-01 Thread Andreas Sturmlechner 
commit: 58878c87b38de60499a315f2257efd3a8f23590f
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Apr  1 19:14:25 2025 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Apr  1 19:15:10 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58878c87

media-sound/cantata: drop 2.5.0-r3

Closes: https://bugs.gentoo.org/927073
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-sound/cantata/Manifest   |   1 -
 media-sound/cantata/cantata-2.5.0-r3.ebuild| 117 -
 .../cantata/files/cantata-2.2.0-headers.patch  |  48 -
 .../files/cantata-2.5.0-fix-build-taglib2.patch|  42 
 media-sound/cantata/metadata.xml   |   1 -
 5 files changed, 209 deletions(-)

diff --git a/media-sound/cantata/Manifest b/media-sound/cantata/Manifest
index 4000e6fa53d0..f23d8fe6f4fd 100644
--- a/media-sound/cantata/Manifest
+++ b/media-sound/cantata/Manifest
@@ -1,2 +1 @@
-DIST cantata-2.5.0.tar.bz2 2487031 BLAKE2B 
ad77987aae205695393a4fc782dc442a467ca392ce60251efdc68d12d29b3d2f24270f462a0dbfe0c375905f9356b8c649ff139021629ba58fd7de80819fdba0
 SHA512 
42f28321d01e0bc3a315030066b738dead8f8f8caed8c1115729a3d370d68d9d845f00576fc81ddba694bba6a4ae57c3f7de714b2e39874458548c3e5bb8b2d2
 DIST cantata-3.3.0.tar.gz 4783803 BLAKE2B 
78995492080cacf4d5f01e923a71edb2208baa9238d269679f6ea0112cf06066295bbeb40b18439bcd45fea8079ea6c52422f5515ed6f0c1511f7942f3b96f15
 SHA512 
ec011a2e544a882c68a808d27752457e4702f20b0ed66124dcc10586c8f5cc975690a4fc7368abc2747fd4f603f19b787a45f5a664f3ace8bcc9f1f86369253e

diff --git a/media-sound/cantata/cantata-2.5.0-r3.ebuild 
b/media-sound/cantata/cantata-2.5.0-r3.ebuild
deleted file mode 100644
index e804a0c16cd9..
--- a/media-sound/cantata/cantata-2.5.0-r3.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PLOCALES="cs da de en_GB es fi fr hu it ja ko nl pl pt_BR ru zh_CN"
-inherit cmake plocale xdg
-
-DESCRIPTION="Featureful and configurable Qt client for the music player daemon 
(MPD)"
-HOMEPAGE="https://github.com/CDrummond/cantata";
-SRC_URI="https://github.com/CDrummond/${PN}/releases/download/v${PV}/${P}.tar.bz2";
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 ~x86"
-IUSE="cdda cddb cdio http-server mtp musicbrainz replaygain streaming taglib 
udisks zeroconf"
-REQUIRED_USE="
-   ?? ( cdda cdio )
-   cdda? ( udisks || ( cddb musicbrainz ) )
-   cddb? ( || ( cdio cdda ) taglib )
-   cdio? ( udisks || ( cddb musicbrainz ) )
-   mtp? ( taglib udisks )
-   musicbrainz? ( || ( cdio cdda ) taglib )
-   replaygain? ( taglib )
-"
-# cantata has no tests
-RESTRICT="test"
-
-COMMON_DEPEND="
-   dev-qt/qtcore:5
-   dev-qt/qtdbus:5
-   dev-qt/qtgui:5
-   dev-qt/qtnetwork:5
-   dev-qt/qtsql:5[sqlite]
-   dev-qt/qtsvg:5
-   dev-qt/qtwidgets:5
-   dev-qt/qtxml:5
-   sys-libs/zlib
-   virtual/libudev:=
-   cdda? ( media-sound/cdparanoia )
-   cddb? ( media-libs/libcddb )
-   cdio? ( dev-libs/libcdio-paranoia:= )
-   mtp? ( media-libs/libmtp:= )
-   musicbrainz? ( media-libs/musicbrainz:5= )
-   replaygain? (
-   media-libs/libebur128:=
-   media-sound/mpg123
-   media-video/ffmpeg:0=
-   )
-   streaming? ( dev-qt/qtmultimedia:5 )
-   taglib? (
-   media-libs/taglib:=[asf(+),mp4(+)]
-   udisks? ( sys-fs/udisks:2 )
-   )
-   zeroconf? ( net-dns/avahi )
-"
-RDEPEND="${COMMON_DEPEND}
-   dev-lang/perl[perl_features_ithreads]
-   || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* )
-"
-DEPEND="${COMMON_DEPEND}
-   dev-qt/qtconcurrent:5
-"
-BDEPEND="dev-qt/linguist-tools:5"
-
-PATCHES=(
-   "${FILESDIR}/${PN}-2.2.0-headers.patch"
-   "${FILESDIR}/${PN}-2.5.0-fix-build-taglib2.patch"
-)
-
-src_prepare() {
-   remove_locale() {
-   rm "translations/${PN}_${1}".ts || die
-   }
-
-   cmake_src_prepare
-
-   # Unbundle 3rd party libs
-   rm -r 3rdparty/{ebur128,qtsingleapplication} || die
-
-   plocale_find_changes "translations" "${PN}_" ".ts"
-   plocale_for_each_disabled_locale remove_locale
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DCANTATA_HELPERS_LIB_DIR="$(get_libdir)"
-   -DENABLE_CDPARANOIA=$(usex cdda)
-   -DENABLE_CDDB=$(usex cddb)
-   -DENABLE_CDIOPARANOIA=$(usex cdio)
-   -DENABLE_HTTP_SERVER=$(usex http-server)
-   -DENABLE_MTP=$(usex mtp)
-   -DENABLE_MUSICBRAINZ=$(usex musicbrainz)
-   -DENABLE_FFMPEG=$(usex replaygain)
-   -DENABLE_MPG123=$(usex replaygain)
-   -DENABLE_HTTP_STREAM_PLAYBACK=$(usex streaming)
-   -DENABLE_TAGLIB=$(usex taglib)
-   -DENABLE_DEVI

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

2022-05-15 Thread Andreas Sturmlechner 
commit: db53ae9aaf5ca4a26e7a37d1b543316584cfa296
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun May 15 10:38:13 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun May 15 10:55:42 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db53ae9a

media-sound/cantata: Drop 2.4.2

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

 media-sound/cantata/Manifest   |   1 -
 media-sound/cantata/cantata-2.4.2.ebuild   | 121 -
 .../cantata/files/cantata-2.4.2-main-musl.patch|  34 --
 .../cantata/files/cantata-2.4.2-solid-musl.patch   |  29 -
 4 files changed, 185 deletions(-)

diff --git a/media-sound/cantata/Manifest b/media-sound/cantata/Manifest
index c8ac65fd7ed6..b546787031ac 100644
--- a/media-sound/cantata/Manifest
+++ b/media-sound/cantata/Manifest
@@ -1,2 +1 @@
-DIST cantata-2.4.2.tar.bz2 2498460 BLAKE2B 
82486a644fa90567f2c1c997645817d9adee841b79fb782c4984143a0ef25758e8b6605de86eed1c09b2b63b9d570adc0c647245c5e0e900652c0444671c67a7
 SHA512 
c2459a53d86e12df7e6a8f7c19880f1c353c13893401a0906ec730c34ccbf1ef070c226b55c4e772e9a54a94e7cf3a2f96b0e9223ff20057045c888c4f91d87b
 DIST cantata-2.5.0.tar.bz2 2487031 BLAKE2B 
ad77987aae205695393a4fc782dc442a467ca392ce60251efdc68d12d29b3d2f24270f462a0dbfe0c375905f9356b8c649ff139021629ba58fd7de80819fdba0
 SHA512 
42f28321d01e0bc3a315030066b738dead8f8f8caed8c1115729a3d370d68d9d845f00576fc81ddba694bba6a4ae57c3f7de714b2e39874458548c3e5bb8b2d2

diff --git a/media-sound/cantata/cantata-2.4.2.ebuild 
b/media-sound/cantata/cantata-2.4.2.ebuild
deleted file mode 100644
index 0b6da7338566..
--- a/media-sound/cantata/cantata-2.4.2.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PLOCALES="cs da de en_GB es fi fr hu it ja ko nl pl pt_BR ru zh_CN"
-inherit cmake plocale qmake-utils xdg
-
-DESCRIPTION="Featureful and configurable Qt client for the music player daemon 
(MPD)"
-HOMEPAGE="https://github.com/CDrummond/cantata";
-SRC_URI="https://github.com/CDrummond/${PN}/releases/download/v${PV}/${P}.tar.bz2";
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
-IUSE="cdda cddb cdio http-server mtp musicbrainz replaygain streaming taglib 
udisks zeroconf"
-REQUIRED_USE="
-   ?? ( cdda cdio )
-   cdda? ( udisks || ( cddb musicbrainz ) )
-   cddb? ( || ( cdio cdda ) taglib )
-   cdio? ( udisks || ( cddb musicbrainz ) )
-   mtp? ( taglib udisks )
-   musicbrainz? ( || ( cdio cdda ) taglib )
-   replaygain? ( taglib )
-"
-# cantata has no tests
-RESTRICT="test"
-
-COMMON_DEPEND="
-   dev-qt/qtcore:5
-   dev-qt/qtdbus:5
-   dev-qt/qtgui:5
-   dev-qt/qtnetwork:5
-   dev-qt/qtsql:5[sqlite]
-   dev-qt/qtsvg:5
-   dev-qt/qtwidgets:5
-   dev-qt/qtxml:5
-   sys-libs/zlib
-   virtual/libudev:=
-   cdda? ( media-sound/cdparanoia )
-   cddb? ( media-libs/libcddb )
-   cdio? ( dev-libs/libcdio-paranoia:= )
-   mtp? ( media-libs/libmtp:= )
-   musicbrainz? ( media-libs/musicbrainz:5= )
-   replaygain? (
-   media-libs/libebur128:=
-   media-sound/mpg123
-   media-video/ffmpeg:0=
-   )
-   streaming? ( dev-qt/qtmultimedia:5 )
-   taglib? (
-   media-libs/taglib[asf(+),mp4(+)]
-   udisks? ( sys-fs/udisks:2 )
-   )
-   zeroconf? ( net-dns/avahi )
-"
-RDEPEND="${COMMON_DEPEND}
-   dev-lang/perl[ithreads]
-   || ( kde-frameworks/breeze-icons:5 kde-frameworks/oxygen-icons:* )
-"
-DEPEND="${COMMON_DEPEND}
-   dev-qt/qtconcurrent:5
-"
-BDEPEND="
-   dev-qt/linguist-tools:5
-"
-
-PATCHES=(
-   "${FILESDIR}/${PN}-2.2.0-headers.patch"
-   "${FILESDIR}/${P}-solid-musl.patch" # bug 792555
-   "${FILESDIR}/${P}-main-musl.patch" # bug 807763
-)
-
-src_prepare() {
-   remove_locale() {
-   rm "translations/${PN}_${1}".ts || die
-   }
-
-   cmake_src_prepare
-
-   # Unbundle 3rd party libs
-   rm -r 3rdparty/{ebur128,qtsingleapplication} || die
-
-   plocale_find_changes "translations" "${PN}_" ".ts"
-   plocale_for_each_disabled_locale remove_locale
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DCANTATA_HELPERS_LIB_DIR="$(get_libdir)"
-   -DENABLE_CDPARANOIA=$(usex cdda)
-   -DENABLE_CDDB=$(usex cddb)
-   -DENABLE_CDIOPARANOIA=$(usex cdio)
-   -DENABLE_HTTP_SERVER=$(usex http-server)
-   -DENABLE_MTP=$(usex mtp)
-   -DENABLE_MUSICBRAINZ=$(usex musicbrainz)
-   -DLRELEASE_EXECUTABLE="$(qt5_get_bindir)/lrelease"
-   -DENABLE_FFMPEG=$(usex replaygain)
-   -DENABLE_MPG123=$(usex replaygain)
-   -DENABLE_HTTP_STREAM_PLAYBACK=$(usex streaming)
-   -

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

2021-08-05 Thread Andreas Sturmlechner 
commit: 656f75dd8ebd952db3a9e8dca9684bd59443f3ad
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Aug  5 19:06:51 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Aug  5 19:08:21 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=656f75dd

media-sound/cantata: Fix build with musl libc

Upstream commit 835e48074834fb5b888d53b00f84967701d6d78a

Reported-by: ernsteiswuerfel  mailbox.org>
Closes: https://bugs.gentoo.org/792555
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-sound/cantata/cantata-2.4.2.ebuild   |  5 +++-
 .../cantata/files/cantata-2.4.2-solid-musl.patch   | 29 ++
 2 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/media-sound/cantata/cantata-2.4.2.ebuild 
b/media-sound/cantata/cantata-2.4.2.ebuild
index 3c42d80b49d..19e2a7c4abd 100644
--- a/media-sound/cantata/cantata-2.4.2.ebuild
+++ b/media-sound/cantata/cantata-2.4.2.ebuild
@@ -66,7 +66,10 @@ DEPEND="${COMMON_DEPEND}
 # cantata has no tests
 RESTRICT="test"
 
-PATCHES=( "${FILESDIR}/${PN}-2.2.0-headers.patch" )
+PATCHES=(
+   "${FILESDIR}/${PN}-2.2.0-headers.patch"
+   "${FILESDIR}/${P}-solid-musl.patch" # bug 792555
+)
 
 src_prepare() {
remove_locale() {

diff --git a/media-sound/cantata/files/cantata-2.4.2-solid-musl.patch 
b/media-sound/cantata/files/cantata-2.4.2-solid-musl.patch
new file mode 100644
index 000..6b541536c62
--- /dev/null
+++ b/media-sound/cantata/files/cantata-2.4.2-solid-musl.patch
@@ -0,0 +1,29 @@
+From 835e48074834fb5b888d53b00f84967701d6d78a Mon Sep 17 00:00:00 2001
+From: Michael Pyne 
+Date: Sun, 23 Jul 2017 11:37:10 -0400
+Subject: [PATCH] Require sys/types.h for dev_t unconditionally.
+
+Fixes a build error with musl libc.  Turns out this is the required
+header for dev_t, and not just for FreeBSD.  That it works without on
+glibc is just an accident.
+
+Differential Revision: https://phabricator.kde.org/D6596
+
+(cherry picked from commit 2382c3f8d3669c473130f4baefb68d244dcb5cbc)
+---
+ 3rdparty/solid-lite/backends/udisks2/udisksblock.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/3rdparty/solid-lite/backends/udisks2/udisksblock.h 
b/3rdparty/solid-lite/backends/udisks2/udisksblock.h
+index 87c358099a..7b7305d73e 100644
+--- a/3rdparty/solid-lite/backends/udisks2/udisksblock.h
 b/3rdparty/solid-lite/backends/udisks2/udisksblock.h
+@@ -24,6 +24,8 @@
+ #include 
+ #include "udisksdeviceinterface.h"
+ 
++#include  // dev_t
++
+ namespace Solid
+ {
+ namespace Backends

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

2019-02-21 Thread Andreas Sturmlechner 
commit: fa83b63af8f2c35c1fb318ab7c664f2ddaadd557
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Feb 20 19:02:11 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Feb 21 10:29:08 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa83b63a

media-sound/cantata: Drop 2.3.2

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

 media-sound/cantata/Manifest   |   1 -
 media-sound/cantata/cantata-2.3.2.ebuild   | 126 -
 .../cantata/files/cantata-2.3.2-opusfile.patch |  22 
 3 files changed, 149 deletions(-)

diff --git a/media-sound/cantata/Manifest b/media-sound/cantata/Manifest
index 7fa872f1377..a36a1c3c6c0 100644
--- a/media-sound/cantata/Manifest
+++ b/media-sound/cantata/Manifest
@@ -1,2 +1 @@
-DIST cantata-2.3.2.tar.bz2 2440595 BLAKE2B 
d77a41752ff9660f27da11748497b394667f456edf52d785b3ebf31446045a4de2bcc9b22ac2d68dfd4e0f00d10a53ae9e79643e116783879eb68bab48b59589
 SHA512 
d55ee5f2194626db3465d8c499459bac82656e12bdb5f771581eef9d6a42ee25fc9b31e8bb5cea8913cbd47a967141f990efddb353797f81e722b7b99a73b1a4
 DIST cantata-2.3.3.tar.bz2 2445139 BLAKE2B 
679ac68afa6219aa684aed1202bb2268552f6fe560db36e17748b9b220ae6ec4ef103ff68b3bcc7127835f8a2debd32895f5edf319a759ce78bc161c4e540a84
 SHA512 
8314930c9e16a5811f607f131ce7134daa0c6de81c5f87d45967c076895540b388b89b3f2cbd82950f6defb1087e61923c1719670f19b4ed3c074f05fe8577c6

diff --git a/media-sound/cantata/cantata-2.3.2.ebuild 
b/media-sound/cantata/cantata-2.3.2.ebuild
deleted file mode 100644
index e65a73704d8..000
--- a/media-sound/cantata/cantata-2.3.2.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="cs da de en_GB es fr hu it ja ko pl pt_BR ru zh_CN"
-inherit cmake-utils gnome2-utils l10n qmake-utils xdg-utils
-
-DESCRIPTION="Featureful and configurable Qt client for the music player daemon 
(MPD)"
-HOMEPAGE="https://github.com/CDrummond/cantata";
-SRC_URI="https://github.com/CDrummond/cantata/releases/download/v${PV}/${P}.tar.bz2";
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="cdda cddb cdio http-server libav mtp musicbrainz replaygain streaming 
taglib udisks zeroconf"
-REQUIRED_USE="
-   ?? ( cdda cdio )
-   cdda? ( udisks || ( cddb musicbrainz ) )
-   cddb? ( || ( cdio cdda ) taglib )
-   cdio? ( udisks || ( cddb musicbrainz ) )
-   mtp? ( taglib udisks )
-   musicbrainz? ( || ( cdio cdda ) taglib )
-   replaygain? ( taglib )
-"
-
-COMMON_DEPEND="
-   dev-qt/qtcore:5
-   dev-qt/qtdbus:5
-   dev-qt/qtgui:5
-   dev-qt/qtnetwork:5
-   dev-qt/qtsql:5[sqlite]
-   dev-qt/qtsvg:5
-   dev-qt/qtwidgets:5
-   dev-qt/qtxml:5
-   || ( kde-frameworks/breeze-icons:5 kde-frameworks/oxygen-icons:* )
-   sys-libs/zlib
-   virtual/libudev:=
-   cdda? ( media-sound/cdparanoia )
-   cddb? ( media-libs/libcddb )
-   cdio? ( dev-libs/libcdio-paranoia )
-   mtp? ( media-libs/libmtp )
-   musicbrainz? ( media-libs/musicbrainz:5= )
-   replaygain? (
-   media-libs/libebur128
-   media-sound/mpg123
-   libav? ( media-video/libav:= )
-   !libav? ( media-video/ffmpeg:0= )
-   )
-   streaming? ( dev-qt/qtmultimedia:5 )
-   taglib? (
-   media-libs/taglib[asf(+),mp4(+)]
-   udisks? ( sys-fs/udisks:2 )
-   )
-   zeroconf? ( net-dns/avahi )
-"
-RDEPEND="${COMMON_DEPEND}
-   dev-lang/perl[ithreads]
-"
-DEPEND="${COMMON_DEPEND}
-   dev-qt/qtconcurrent:5
-   dev-qt/linguist-tools:5
-"
-
-# cantata has no tests
-RESTRICT="test"
-
-PATCHES=(
-   "${FILESDIR}/${PN}-2.2.0-headers.patch"
-   "${FILESDIR}/${P}-opusfile.patch"
-)
-
-src_prepare() {
-   remove_locale() {
-   rm "translations/${PN}_${1}".ts || die
-   }
-
-   cmake-utils_src_prepare
-
-   # Unbundle 3rd party libs
-   rm -r 3rdparty/{ebur128,qtsingleapplication} || die
-
-   l10n_find_plocales_changes "translations" "${PN}_" ".ts"
-   l10n_for_each_disabled_locale_do remove_locale
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DCANTATA_HELPERS_LIB_DIR="$(get_libdir)"
-   -DENABLE_CDPARANOIA=$(usex cdda)
-   -DENABLE_CDDB=$(usex cddb)
-   -DENABLE_CDIOPARANOIA=$(usex cdio)
-   -DENABLE_HTTP_SERVER=$(usex http-server)
-   -DENABLE_MTP=$(usex mtp)
-   -DENABLE_MUSICBRAINZ=$(usex musicbrainz)
-   -DLRELEASE_EXECUTABLE="$(qt5_get_bindir)/lrelease"
-   -DENABLE_FFMPEG=$(usex replaygain)
-   -DENABLE_MPG123=$(usex replaygain)
-   -DENABLE_HTTP_STREAM_PLAYBACK=$(usex streaming)
-   -DENABLE_TAGLIB=$(usex taglib)
-   -DENABLE_DEVICES_SUPPORT

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

2018-09-03 Thread Andreas Sturmlechner 
commit: 87766f4f5741763d21be52b3cbb0ff48085c4a9f
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Sep  3 20:05:42 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Sep  3 20:05:42 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87766f4f

media-sound/cantata: Drop old

Package-Manager: Portage-2.3.48, Repoman-2.3.10

 media-sound/cantata/Manifest   |   1 -
 media-sound/cantata/cantata-2.2.0-r2.ebuild| 125 -
 media-sound/cantata/cantata-2.3.1.ebuild   | 124 
 .../cantata/files/cantata-2.2.0-qtsql-5.10.patch   |  23 
 4 files changed, 273 deletions(-)

diff --git a/media-sound/cantata/Manifest b/media-sound/cantata/Manifest
index cef8831345c..3104e3b1882 100644
--- a/media-sound/cantata/Manifest
+++ b/media-sound/cantata/Manifest
@@ -1,3 +1,2 @@
 DIST cantata-2.2.0.tar.bz2 2251649 BLAKE2B 
9b28a4e3a77245fcf00f81780adecdc51e066f068798f92300ef8527872313f5fb56d4b90a6f5511caf951ba9fcd5c094dd5e9062fe3d314b75412b3e8e03d37
 SHA512 
519a2e24c8b2a1c98a2006a1f590945e1bd5e98a2c3a1b5da23e40f2297f1477d48d69b48ec669219f5ab8fdc955486fe29db6914abeef1fba2a47377f694ecd
-DIST cantata-2.3.1.tar.bz2 2414702 BLAKE2B 
c44f7e95091dd4f84e630236e7f681d2ea47cd90705cdeeb17d3e892d4e0b978f88d4cb648841543494670c5dbc1a00ba9e2377dfd684b2fdee9223d4b6b28e3
 SHA512 
8199b08b1f3d2111fc50fbc4e5b1edced6ac480fd213a11eee569deeebf3a3f1167c2b53c3117bb90b2b81b46792c56b99b65eae5d2b290c0f3b3f90736108e5
 DIST cantata-2.3.2.tar.bz2 2440595 BLAKE2B 
d77a41752ff9660f27da11748497b394667f456edf52d785b3ebf31446045a4de2bcc9b22ac2d68dfd4e0f00d10a53ae9e79643e116783879eb68bab48b59589
 SHA512 
d55ee5f2194626db3465d8c499459bac82656e12bdb5f771581eef9d6a42ee25fc9b31e8bb5cea8913cbd47a967141f990efddb353797f81e722b7b99a73b1a4

diff --git a/media-sound/cantata/cantata-2.2.0-r2.ebuild 
b/media-sound/cantata/cantata-2.2.0-r2.ebuild
deleted file mode 100644
index c9cd47b8623..000
--- a/media-sound/cantata/cantata-2.2.0-r2.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="cs de en_GB es fr hu it ja ko pl ru zh_CN"
-inherit cmake-utils gnome2-utils l10n qmake-utils xdg
-
-DESCRIPTION="Featureful and configurable Qt client for the music player daemon 
(MPD)"
-HOMEPAGE="https://github.com/CDrummond/cantata";
-SRC_URI="https://github.com/CDrummond/cantata/releases/download/v${PV}/${P}.tar.bz2";
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cdda cddb cdio http-server mtp musicbrainz replaygain streaming taglib 
udisks"
-REQUIRED_USE="
-   ?? ( cdda cdio )
-   cdda? ( udisks || ( cddb musicbrainz ) )
-   cddb? ( || ( cdio cdda ) taglib )
-   cdio? ( udisks || ( cddb musicbrainz ) )
-   mtp? ( taglib udisks )
-   musicbrainz? ( || ( cdio cdda ) taglib )
-   replaygain? ( taglib )
-"
-
-COMMON_DEPEND="
-   dev-qt/qtcore:5
-   dev-qt/qtdbus:5
-   dev-qt/qtgui:5
-   dev-qt/qtnetwork:5
-   dev-qt/qtsql:5[sqlite]
-   dev-qt/qtsvg:5
-   dev-qt/qtwidgets:5
-   dev-qt/qtxml:5
-   || ( kde-frameworks/breeze-icons:5 kde-frameworks/oxygen-icons:* )
-   sys-libs/zlib
-   virtual/libudev:=
-   cdda? ( media-sound/cdparanoia )
-   cddb? ( media-libs/libcddb )
-   cdio? ( dev-libs/libcdio-paranoia )
-   mtp? ( media-libs/libmtp )
-   musicbrainz? ( media-libs/musicbrainz:5= )
-   replaygain? (
-   media-libs/libebur128
-   media-sound/mpg123
-   virtual/ffmpeg
-   )
-   streaming? ( media-video/vlc:0= )
-   taglib? (
-   media-libs/taglib[asf(+),mp4(+)]
-   media-libs/taglib-extras
-   udisks? ( sys-fs/udisks:2 )
-   )
-"
-RDEPEND="${COMMON_DEPEND}
-   dev-lang/perl[ithreads]
-"
-DEPEND="${COMMON_DEPEND}
-   dev-qt/qtconcurrent:5
-   dev-qt/linguist-tools:5
-"
-
-# cantata has no tests
-RESTRICT="test"
-
-PATCHES=(
-   "${FILESDIR}/${P}-headers.patch"
-   "${FILESDIR}/${P}-qtsql-5.10.patch" # bug 642196
-)
-
-src_prepare() {
-   remove_locale() {
-   rm "translations/${PN}_${1}".ts || die
-   }
-
-   cmake-utils_src_prepare
-
-   # Unbundle 3rd party libs
-   rm -r 3rdparty/{ebur128,qtsingleapplication} || die
-
-   l10n_find_plocales_changes "translations" "${PN}_" ".ts"
-   l10n_for_each_disabled_locale_do remove_locale
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DCANTATA_HELPERS_LIB_DIR="$(get_libdir)"
-   -DENABLE_CDPARANOIA=$(usex cdda)
-   -DENABLE_CDDB=$(usex cddb)
-   -DENABLE_CDIOPARANOIA=$(usex cdio)
-   -DENABLE_HTTP_SERVER=$(usex http-server)
-   -DENABLE_MTP=$(usex mtp)
-   -DENABLE_MUSICBRAINZ=$(usex musicbrainz)
-   -DLRELEASE_EXECUTABLE="$(qt5_get_b

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

2017-11-18 Thread Michael Palimaka 
commit: 666f2a154ac99ba327e37434988fa7a537491339
Author: Michael Palimaka  gentoo  org>
AuthorDate: Sun Nov 19 06:11:52 2017 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sun Nov 19 06:14:21 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=666f2a15

media-sound/cantata: remove 2.1.0

Package-Manager: Portage-2.3.8, Repoman-2.3.4

 media-sound/cantata/Manifest   |   1 -
 media-sound/cantata/cantata-2.1.0.ebuild   | 115 -
 .../cantata/files/cantata-2.1.0-headers.patch  |  42 
 3 files changed, 158 deletions(-)

diff --git a/media-sound/cantata/Manifest b/media-sound/cantata/Manifest
index 12946bb8abe..d15290fb66d 100644
--- a/media-sound/cantata/Manifest
+++ b/media-sound/cantata/Manifest
@@ -1,2 +1 @@
-DIST cantata-2.1.0.tar.bz2 2207271 SHA256 
9317afcae75c709ec733da069d4245b47e6e2c297a259eaf87a181fa9d1cd4c4 SHA512 
bf03933785110d0d0c1dfbfc27f4974869ae7c79afe3cf1da1f3024c95d86733d8bea77f2a882887de79a7897ffcdac4262e58747dd4e979824943991675c5d2
 WHIRLPOOL 
5d58b84290c387d535e556553e64bba36520a099565c44bed1c4e9cf800c2a432ac09296b989a557e72d81a951c926b4bb638f2d2ab7976735059ebb74b8c8e2
 DIST cantata-2.2.0.tar.bz2 2251649 SHA256 
c84691eb1778d3c512d70cb422267f7a137290082cdd1ff0a871b4a8e5c0 SHA512 
519a2e24c8b2a1c98a2006a1f590945e1bd5e98a2c3a1b5da23e40f2297f1477d48d69b48ec669219f5ab8fdc955486fe29db6914abeef1fba2a47377f694ecd
 WHIRLPOOL 
50a44192368ee90708ecf906401c28d6a06878d61cfefae04bcab3463343c11bcfe3054880364886e57f797cc303fe14a4f2010e87ad873ba4de3738c05399e7

diff --git a/media-sound/cantata/cantata-2.1.0.ebuild 
b/media-sound/cantata/cantata-2.1.0.ebuild
deleted file mode 100644
index 57c74fe9299..000
--- a/media-sound/cantata/cantata-2.1.0.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="cs de en_GB es fr hu it ja ko pl ru zh_CN"
-inherit cmake-utils gnome2-utils l10n qmake-utils xdg
-
-DESCRIPTION="Featureful and configurable Qt client for the music player daemon 
(MPD)"
-HOMEPAGE="https://github.com/CDrummond/cantata";
-SRC_URI="https://github.com/CDrummond/cantata/releases/download/v${PV}/${P}.tar.bz2";
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="cdda cddb cdio http-server mtp musicbrainz replaygain taglib udisks"
-REQUIRED_USE="
-   ?? ( cdda cdio )
-   cdda? ( udisks || ( cddb musicbrainz ) )
-   cddb? ( || ( cdio cdda ) taglib )
-   cdio? ( udisks || ( cddb musicbrainz ) )
-   mtp? ( taglib udisks )
-   musicbrainz? ( || ( cdio cdda ) taglib )
-   replaygain? ( taglib )
-"
-
-RDEPEND="
-   dev-qt/qtcore:5
-   dev-qt/qtdbus:5
-   dev-qt/qtgui:5
-   dev-qt/qtnetwork:5
-   dev-qt/qtsql:5[sqlite]
-   dev-qt/qtsvg:5
-   dev-qt/qtwidgets:5
-   dev-qt/qtxml:5
-   || ( kde-frameworks/breeze-icons:5 kde-frameworks/oxygen-icons:* )
-   sys-libs/zlib
-   virtual/libudev:=
-   cdda? ( media-sound/cdparanoia )
-   cdio? ( dev-libs/libcdio-paranoia )
-   cddb? ( media-libs/libcddb )
-   mtp? ( media-libs/libmtp )
-   musicbrainz? ( media-libs/musicbrainz:5= )
-   replaygain? (
-   media-libs/libebur128
-   media-sound/mpg123
-   virtual/ffmpeg
-   )
-   taglib? (
-   media-libs/taglib[asf(+),mp4(+)]
-   media-libs/taglib-extras
-   udisks? ( sys-fs/udisks:2 )
-   )
-"
-DEPEND="${RDEPEND}
-   dev-qt/qtconcurrent:5
-   dev-qt/linguist-tools:5
-"
-
-# cantata has no tests
-RESTRICT="test"
-
-PATCHES=( "${FILESDIR}/${P}-headers.patch" )
-
-src_prepare() {
-   remove_locale() {
-   rm "translations/${PN}_${1}".ts || die
-   }
-
-   cmake-utils_src_prepare
-
-   # Unbundle 3rd party libs
-   rm -r 3rdparty/{ebur128,qtsingleapplication} || die
-
-   l10n_find_plocales_changes "translations" "${PN}_" ".ts"
-   l10n_for_each_disabled_locale_do remove_locale
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DCANTATA_HELPERS_LIB_DIR="$(get_libdir)"
-   -DENABLE_CDPARANOIA=$(usex cdda)
-   -DENABLE_CDIOPARANOIA=$(usex cdio)
-   -DENABLE_CDDB=$(usex cddb)
-   -DENABLE_HTTP_SERVER=$(usex http-server)
-   -DENABLE_MTP=$(usex mtp)
-   -DENABLE_MUSICBRAINZ=$(usex musicbrainz)
-   -DLRELEASE_EXECUTABLE="$(qt5_get_bindir)/lrelease"
-   -DENABLE_FFMPEG=$(usex replaygain)
-   -DENABLE_MPG123=$(usex replaygain)
-   -DENABLE_TAGLIB=$(usex taglib)
-   -DENABLE_TAGLIB_EXTRAS=$(usex taglib)
-   -DENABLE_DEVICES_SUPPORT=$(usex udisks)
-   -DENABLE_HTTP_STREAM_PLAYBACK=OFF
-   -DENABLE_REMOTE_DEVICES=OFF
-   -DENABLE_UDISKS2=ON
-   )
-
-   cmake-utils_src_configu

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

2017-10-08 Thread Johannes Huber 
commit: 489ce9b104f23d1f14def66c2663c2a8381a598a
Author: Johannes Huber  gentoo  org>
AuthorDate: Sun Oct  8 19:22:02 2017 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Sun Oct  8 19:23:21 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=489ce9b1

media-sound/cantata: Version bump 2.2.0

Adds new use flag streaming which controls supports for playback of MPD
HTTP streams using LibVLC (media-video/vlc).

Reported-by: Hendrik v. Raven  consetetur.de>
Closes: https://bugs.gentoo.org/633634
Package-Manager: Portage-2.3.11, Repoman-2.3.3

 media-sound/cantata/Manifest   |   1 +
 media-sound/cantata/cantata-2.2.0.ebuild   | 116 +
 .../cantata/files/cantata-2.2.0-headers.patch  |  48 +
 media-sound/cantata/metadata.xml   |   1 +
 4 files changed, 166 insertions(+)

diff --git a/media-sound/cantata/Manifest b/media-sound/cantata/Manifest
index 220f9d133c3..12946bb8abe 100644
--- a/media-sound/cantata/Manifest
+++ b/media-sound/cantata/Manifest
@@ -1 +1,2 @@
 DIST cantata-2.1.0.tar.bz2 2207271 SHA256 
9317afcae75c709ec733da069d4245b47e6e2c297a259eaf87a181fa9d1cd4c4 SHA512 
bf03933785110d0d0c1dfbfc27f4974869ae7c79afe3cf1da1f3024c95d86733d8bea77f2a882887de79a7897ffcdac4262e58747dd4e979824943991675c5d2
 WHIRLPOOL 
5d58b84290c387d535e556553e64bba36520a099565c44bed1c4e9cf800c2a432ac09296b989a557e72d81a951c926b4bb638f2d2ab7976735059ebb74b8c8e2
+DIST cantata-2.2.0.tar.bz2 2251649 SHA256 
c84691eb1778d3c512d70cb422267f7a137290082cdd1ff0a871b4a8e5c0 SHA512 
519a2e24c8b2a1c98a2006a1f590945e1bd5e98a2c3a1b5da23e40f2297f1477d48d69b48ec669219f5ab8fdc955486fe29db6914abeef1fba2a47377f694ecd
 WHIRLPOOL 
50a44192368ee90708ecf906401c28d6a06878d61cfefae04bcab3463343c11bcfe3054880364886e57f797cc303fe14a4f2010e87ad873ba4de3738c05399e7

diff --git a/media-sound/cantata/cantata-2.2.0.ebuild 
b/media-sound/cantata/cantata-2.2.0.ebuild
new file mode 100644
index 000..3a22fc20439
--- /dev/null
+++ b/media-sound/cantata/cantata-2.2.0.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="cs de en_GB es fr hu it ja ko pl ru zh_CN"
+inherit cmake-utils gnome2-utils l10n qmake-utils xdg
+
+DESCRIPTION="Featureful and configurable Qt client for the music player daemon 
(MPD)"
+HOMEPAGE="https://github.com/CDrummond/cantata";
+SRC_URI="https://github.com/CDrummond/cantata/releases/download/v${PV}/${P}.tar.bz2";
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cdda cddb cdio http-server mtp musicbrainz replaygain streaming taglib 
udisks"
+REQUIRED_USE="
+   ?? ( cdda cdio )
+   cdda? ( udisks || ( cddb musicbrainz ) )
+   cddb? ( || ( cdio cdda ) taglib )
+   cdio? ( udisks || ( cddb musicbrainz ) )
+   mtp? ( taglib udisks )
+   musicbrainz? ( || ( cdio cdda ) taglib )
+   replaygain? ( taglib )
+"
+
+RDEPEND="
+   dev-qt/qtcore:5
+   dev-qt/qtdbus:5
+   dev-qt/qtgui:5
+   dev-qt/qtnetwork:5
+   dev-qt/qtsql:5[sqlite]
+   dev-qt/qtsvg:5
+   dev-qt/qtwidgets:5
+   dev-qt/qtxml:5
+   || ( kde-frameworks/breeze-icons:5 kde-frameworks/oxygen-icons:* )
+   sys-libs/zlib
+   virtual/libudev:=
+   cdda? ( media-sound/cdparanoia )
+   cdio? ( dev-libs/libcdio-paranoia )
+   cddb? ( media-libs/libcddb )
+   mtp? ( media-libs/libmtp )
+   musicbrainz? ( media-libs/musicbrainz:5= )
+   replaygain? (
+   media-libs/libebur128
+   media-sound/mpg123
+   virtual/ffmpeg
+   )
+   streaming? ( media-video/vlc:0= )
+   taglib? (
+   media-libs/taglib[asf(+),mp4(+)]
+   media-libs/taglib-extras
+   udisks? ( sys-fs/udisks:2 )
+   )
+"
+DEPEND="${RDEPEND}
+   dev-qt/qtconcurrent:5
+   dev-qt/linguist-tools:5
+"
+
+# cantata has no tests
+RESTRICT="test"
+
+PATCHES=( "${FILESDIR}/${P}-headers.patch" )
+
+src_prepare() {
+   remove_locale() {
+   rm "translations/${PN}_${1}".ts || die
+   }
+
+   cmake-utils_src_prepare
+
+   # Unbundle 3rd party libs
+   rm -r 3rdparty/{ebur128,qtsingleapplication} || die
+
+   l10n_find_plocales_changes "translations" "${PN}_" ".ts"
+   l10n_for_each_disabled_locale_do remove_locale
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DCANTATA_HELPERS_LIB_DIR="$(get_libdir)"
+   -DENABLE_CDPARANOIA=$(usex cdda)
+   -DENABLE_CDIOPARANOIA=$(usex cdio)
+   -DENABLE_CDDB=$(usex cddb)
+   -DENABLE_HTTP_SERVER=$(usex http-server)
+   -DENABLE_MTP=$(usex mtp)
+   -DENABLE_MUSICBRAINZ=$(usex musicbrainz)
+   -DLRELEASE_EXECUTABLE="$(qt5_get_bindir)/lrelease"
+   -DENABLE_FFMPEG=$(usex replaygain)
+   -DENABLE_MPG123=$(usex replaygain)
+

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

2017-08-05 Thread Andreas Sturmlechner 
commit: 5f761feca7e6e7468e541c410660ed61b18bcd40
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Aug  5 09:18:38 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Aug  5 09:37:40 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f761fec

media-sound/cantata: Fix build with USE=replaygain

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 media-sound/cantata/cantata-2.1.0.ebuild   |  2 ++
 .../cantata/files/cantata-2.1.0-headers.patch  | 42 ++
 2 files changed, 44 insertions(+)

diff --git a/media-sound/cantata/cantata-2.1.0.ebuild 
b/media-sound/cantata/cantata-2.1.0.ebuild
index 65f1626c7dd..e60ac6b3c74 100644
--- a/media-sound/cantata/cantata-2.1.0.ebuild
+++ b/media-sound/cantata/cantata-2.1.0.ebuild
@@ -60,6 +60,8 @@ DEPEND="${RDEPEND}
 # cantata has no tests
 RESTRICT="test"
 
+PATCHES=( "${FILESDIR}/${P}-headers.patch" )
+
 src_prepare() {
remove_locale() {
rm "translations/${PN}_${1}".ts || die

diff --git a/media-sound/cantata/files/cantata-2.1.0-headers.patch 
b/media-sound/cantata/files/cantata-2.1.0-headers.patch
new file mode 100644
index 000..a442a2c1022
--- /dev/null
+++ b/media-sound/cantata/files/cantata-2.1.0-headers.patch
@@ -0,0 +1,42 @@
+Description: Fix include location for ebur128 files
+ The Debian packages for ebur128 are shipping the headers in:
+
+libebur128-dev: /usr/include/ebur128.h
+
+ while the upstream code expects ebur128/ebur128.h
+
+Author: Stuart Prescott 
+Forwarded: not sure -- check interaction with cmake rules
+--- a/replaygain/ffmpeginput.cpp
 b/replaygain/ffmpeginput.cpp
+@@ -31,7 +31,7 @@
+ #include 
+ #include 
+ #include 
+-#include "ebur128/ebur128.h"
++#include "ebur128.h"
+ #include "ffmpeginput.h"
+ 
+ static QMutex mutex;
+--- a/replaygain/mpg123input.cpp
 b/replaygain/mpg123input.cpp
+@@ -18,7 +18,7 @@
+ #include 
+ #include 
+ #include 
+-#include "ebur128/ebur128.h"
++#include "ebur128.h"
+ #include "mpg123input.h"
+ 
+ struct Mpg123Input::Handle {
+--- a/replaygain/trackscanner.h
 b/replaygain/trackscanner.h
+@@ -25,7 +25,7 @@
+ #define _SCANNER_H_
+ 
+ #include "jobcontroller.h"
+-#include "ebur128/ebur128.h"
++#include "ebur128.h"
+ 
+ class Input;
+

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

2016-05-04 Thread Johannes Huber 
commit: 06f9b9bb9f1ef48268fe62845c5dd8816cb3b58f
Author: [email protected]  gentoo  org>
AuthorDate: Tue Mar 29 23:18:56 2016 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Wed May  4 07:14:35 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06f9b9bb

media-sound/cantata: version bump 2.0.0

Gentoo-bug: 544734

Package-Manager: portage-2.2.28

Signed-off-by: Johannes Huber  gentoo.org>

 media-sound/cantata/Manifest   |   1 +
 media-sound/cantata/cantata-2.0.0.ebuild   | 145 +
 .../cantata/files/cantata-2.0.0-ffmpeg-3.0.patch   |  12 ++
 media-sound/cantata/files/cantata-2.0.0-gcc5.patch |  15 +++
 4 files changed, 173 insertions(+)

diff --git a/media-sound/cantata/Manifest b/media-sound/cantata/Manifest
index 1db0610..b30446d 100644
--- a/media-sound/cantata/Manifest
+++ b/media-sound/cantata/Manifest
@@ -1 +1,2 @@
 DIST cantata-1.5.1.tar.bz2 1986772 SHA256 
57173bdd0033a2c0c2829a6e05f7579b0f13ae7794d843167c013e1c971dfe78 SHA512 
bd41bbe3a9c2fa6a4e653deb62a82b928febe3876a6023d4c9bff4fb71133aca5a8e34ae77b440d10ae42c0d024ebd1c460b367a75cefa29858275d707cf4e38
 WHIRLPOOL 
55054c1e8d95f1dc9322b7224dfa04fd8e8430b89c5a21883fdecf0829eca60720186e6b549d80216c4035429208e2191d2e5ae31608ede3a6afc8e5046e173f
+DIST cantata-2.0.0.tar.bz2 2147821 SHA256 
6817611652e3e37a221e7b68fb41223b421ccc09688bfd718b1f5a2e34e81fa8 SHA512 
53cb56411bc6c79692e97d39d8d8cbf5cbbe683fe0c32a8f1222e477deba0ff0e71f5daf0a49cc9c72cefb113278692193964a99ad008a6f9fc0f59304482ed0
 WHIRLPOOL 
bffdc313a97e979f28be4ec28c2a06bf0406e6f23ccf7be2403d9167638d806f5f3e1d5f2e1ca1b376285b6d1586b955be5ba60dd546299d8ef5309ef0878c92

diff --git a/media-sound/cantata/cantata-2.0.0.ebuild 
b/media-sound/cantata/cantata-2.0.0.ebuild
new file mode 100644
index 000..09091f2
--- /dev/null
+++ b/media-sound/cantata/cantata-2.0.0.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PLOCALES="cs de en_GB es hu ko pl ru zh_CN"
+inherit cmake-utils gnome2-utils l10n qmake-utils xdg
+
+DESCRIPTION="Featureful and configurable Qt client for the music player daemon 
(MPD)"
+HOMEPAGE="https://github.com/CDrummond/cantata";
+SRC_URI="https://github.com/CDrummond/cantata/releases/download/v${PV}/${P}.tar.bz2";
+
+LICENSE="GPL-2"
+SLOT="4"
+KEYWORDS="~amd64 ~x86"
+IUSE="cdda cddb http-server kde mtp musicbrainz qt5 replaygain taglib udisks"
+REQUIRED_USE="
+   cdda? ( udisks || ( cddb musicbrainz ) )
+   cddb? ( cdda taglib )
+   mtp? ( taglib udisks )
+   musicbrainz? ( cdda taglib )
+   qt5? ( !kde )
+   replaygain? ( taglib )
+"
+
+RDEPEND="
+   dev-db/sqlite:3
+   sys-libs/zlib
+   x11-libs/libX11
+   || ( kde-frameworks/breeze-icons:5 kde-frameworks/oxygen-icons:* )
+   cdda? ( media-sound/cdparanoia )
+   cddb? ( media-libs/libcddb )
+   kde? ( kde-base/kdelibs:4 )
+   mtp? ( media-libs/libmtp )
+   musicbrainz? ( media-libs/musicbrainz:5 )
+   qt5? (
+   dev-qt/qtconcurrent:5
+   dev-qt/qtcore:5
+   dev-qt/qtdbus:5
+   dev-qt/qtgui:5
+   dev-qt/qtnetwork:5
+   dev-qt/qtsql:5
+   dev-qt/qtsvg:5
+   dev-qt/qtwidgets:5
+   dev-qt/qtxml:5
+   )
+   !qt5? (
+   dev-libs/qjson
+   dev-qt/qtcore:4
+   dev-qt/qtdbus:4
+   dev-qt/qtgui:4
+   dev-qt/qtsql:4
+   dev-qt/qtsvg:4
+   )
+   replaygain? (
+   media-libs/libebur128
+   media-sound/mpg123
+   virtual/ffmpeg
+   )
+   taglib? (
+   media-libs/taglib[asf,mp4]
+   media-libs/taglib-extras
+   !kde? ( udisks? ( sys-fs/udisks:2 ) )
+   )
+"
+DEPEND="${RDEPEND}
+   kde? ( sys-devel/gettext )
+   !kde? ( qt5? ( dev-qt/linguist-tools:5 ) )
+"
+
+# cantata has no tests
+RESTRICT="test"
+PATCHES=(
+   "${FILESDIR}/${P}-gcc5.patch"
+   "${FILESDIR}/${P}-ffmpeg-3.0.patch"
+)
+
+src_prepare() {
+   cmake-utils_src_prepare
+
+   # Unbundle 3rd party libs
+   rm -rf 3rdparty/qtsingleapplication/ || die
+   rm -rf 3rdparty/libebur128/ || die
+   # qjson ebuild does not support Qt5 yet
+   use qt5 || { rm -rf 3rdparty/qjson/ || die ;}
+   use kde && { rm -rf 3rdparty/solid-lite/ || die ;}
+
+   l10n_find_plocales_changes 'po' '' '.po'
+}
+
+src_configure() {
+   local langs="$(l10n_get_locales)"
+
+   local mycmakeargs=(
+   -DCANTATA_TRANSLATIONS="${langs// /;}"
+   -DENABLE_CDPARANOIA=$(usex cdda)
+   -DENABLE_CDDB=$(usex cddb)
+   -DENABLE_HTTP_SERVER=$(usex http-server)
+   -DENABLE_KDE=$(usex kde)
+   -DENABLE_MTP=$(usex mtp)
+   -DENABLE_MUSICBRAINZ=$(usex musicbra