subject:"\[gentoo\-commits\] repo\/gentoo\:master commit in\: media\-sound\/cantata\/"

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

2024-05-07 Thread Andreas K. Hüttel

commit: 0dabc18c770a8efa5c9a40dce6a81c35e870aca8
Author: Andreas K. Hüttel  gentoo  org>
AuthorDate: Sun Apr 21 11:29:13 2024 +
Commit: Andreas K. Hüttel  gentoo  org>
CommitDate: Tue May  7 07:55:19 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0dabc18c

media-sound/cantata: Port to PERL_FEATURES

Signed-off-by: Andreas K. Hüttel  gentoo.org>

 .../cantata/{cantata-2.5.0-r1.ebuild => cantata-2.5.0-r2.ebuild}  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-sound/cantata/cantata-2.5.0-r1.ebuild 
b/media-sound/cantata/cantata-2.5.0-r2.ebuild
similarity index 95%
rename from media-sound/cantata/cantata-2.5.0-r1.ebuild
rename to media-sound/cantata/cantata-2.5.0-r2.ebuild
index 59af4a9d39c5..334a2e24c048 100644
--- a/media-sound/cantata/cantata-2.5.0-r1.ebuild
+++ b/media-sound/cantata/cantata-2.5.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -55,7 +55,7 @@ COMMON_DEPEND="
zeroconf? ( net-dns/avahi )
 "
 RDEPEND="${COMMON_DEPEND}
-   dev-lang/perl[ithreads]
+   || ( >=dev-lang/perl-5.38.2-r3[perl_features_ithreads]

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

2023-11-26 Thread Andreas Sturmlechner

commit: 174ab1b74be5da0cbde17df73105acb80132f9be
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Nov 26 23:24:45 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Nov 26 23:29:03 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=174ab1b7

media-sound/cantata: Relax kde-frameworks/breeze-icons slot dep to :*

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-sound/cantata/{cantata-2.5.0.ebuild => cantata-2.5.0-r1.ebuild} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-sound/cantata/cantata-2.5.0.ebuild 
b/media-sound/cantata/cantata-2.5.0-r1.ebuild
similarity index 96%
rename from media-sound/cantata/cantata-2.5.0.ebuild
rename to media-sound/cantata/cantata-2.5.0-r1.ebuild
index 7dfeddc9814b..59af4a9d39c5 100644
--- a/media-sound/cantata/cantata-2.5.0.ebuild
+++ b/media-sound/cantata/cantata-2.5.0-r1.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
@@ -56,7 +56,7 @@ COMMON_DEPEND="
 "
 RDEPEND="${COMMON_DEPEND}
dev-lang/perl[ithreads]
-   || ( kde-frameworks/breeze-icons:5 kde-frameworks/oxygen-icons:* )
+   || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* )
 "
 DEPEND="${COMMON_DEPEND}
dev-qt/qtconcurrent:5

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

2022-10-10 Thread Andreas Sturmlechner

commit: 37910e59dee9ed4c035a6e02185daee41a5ba96b
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Oct 10 08:39:21 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Oct 10 08:39:43 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37910e59

media-sound/cantata: keyword 2.5.0 for ~ppc

Tested-by: ernsteiswuerfel  mailbox.org>
Closes: https://bugs.gentoo.org/874726
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-sound/cantata/cantata-2.5.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/cantata/cantata-2.5.0.ebuild 
b/media-sound/cantata/cantata-2.5.0.ebuild
index b913e18ae0c2..7dfeddc9814b 100644
--- a/media-sound/cantata/cantata-2.5.0.ebuild
+++ b/media-sound/cantata/cantata-2.5.0.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://github.com/CDrummond/${PN}/releases/download/v${PV}/${P}.tar.bz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE="cdda cddb cdio http-server mtp musicbrainz replaygain streaming taglib 
udisks zeroconf"
 REQUIRED_USE="
?? ( cdda cdio )

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

2022-07-17 Thread Andreas Sturmlechner

commit: b6df296f66bc218001e4e829dba4d74a9a24f5a9
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Jul 17 06:36:50 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Jul 17 07:21:09 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6df296f

media-sound/cantata: Drop unused qmake-utils.eclass

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

 media-sound/cantata/cantata-2.5.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/cantata/cantata-2.5.0.ebuild 
b/media-sound/cantata/cantata-2.5.0.ebuild
index c080848b8213..b913e18ae0c2 100644
--- a/media-sound/cantata/cantata-2.5.0.ebuild
+++ b/media-sound/cantata/cantata-2.5.0.ebuild
@@ -4,7 +4,7 @@
 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 qmake-utils xdg
+inherit cmake plocale xdg
 
 DESCRIPTION="Featureful and configurable Qt client for the music player daemon 
(MPD)"
 HOMEPAGE="https://github.com/CDrummond/cantata;

[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/

2022-05-09 Thread Jakov Smolić

commit: 1c5a3a005f8920d4843897990870b6f337a6a74b
Author: Jakov Smolić  gentoo  org>
AuthorDate: Mon May  9 07:32:30 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Mon May  9 07:32:30 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c5a3a00

media-sound/cantata: Stabilize 2.5.0 amd64, #843365

Signed-off-by: Jakov Smolić  gentoo.org>

 media-sound/cantata/cantata-2.5.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/cantata/cantata-2.5.0.ebuild 
b/media-sound/cantata/cantata-2.5.0.ebuild
index 47c0c06bb587..18214926c97b 100644
--- a/media-sound/cantata/cantata-2.5.0.ebuild
+++ b/media-sound/cantata/cantata-2.5.0.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://github.com/CDrummond/${PN}/releases/download/v${PV}/${P}.tar.bz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 ~x86"
 IUSE="cdda cddb cdio http-server mtp musicbrainz replaygain streaming taglib 
udisks zeroconf"
 REQUIRED_USE="
?? ( cdda cdio )

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

2022-05-09 Thread Jakov Smolić

commit: 60fb000798647b0bf94ed24dbde3482d465d6f9b
Author: Jakov Smolić  gentoo  org>
AuthorDate: Mon May  9 07:32:46 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Mon May  9 07:32:46 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60fb0007

media-sound/cantata: Stabilize 2.5.0 x86, #843365

Signed-off-by: Jakov Smolić  gentoo.org>

 media-sound/cantata/cantata-2.5.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/cantata/cantata-2.5.0.ebuild 
b/media-sound/cantata/cantata-2.5.0.ebuild
index 18214926c97b..c080848b8213 100644
--- a/media-sound/cantata/cantata-2.5.0.ebuild
+++ b/media-sound/cantata/cantata-2.5.0.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://github.com/CDrummond/${PN}/releases/download/v${PV}/${P}.tar.bz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 x86"
 IUSE="cdda cddb cdio http-server mtp musicbrainz replaygain streaming taglib 
udisks zeroconf"
 REQUIRED_USE="
?? ( cdda cdio )

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

2022-03-16 Thread Andreas Sturmlechner

commit: 2549baab1858b49a4edd9fb80f019dd8beda990a
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Mar 16 16:25:33 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Mar 16 16:40:29 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2549baab

media-sound/cantata: 2.5.0 version bump, final release; EAPI-8 bump

Upstream repository was made read-only.

Categorized view was disabled, see also:
https://github.com/CDrummond/cantata/issues/1530

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.5.0.ebuild | 114 +++
 2 files changed, 115 insertions(+)

diff --git a/media-sound/cantata/Manifest b/media-sound/cantata/Manifest
index d00b45ad1fc2..c8ac65fd7ed6 100644
--- a/media-sound/cantata/Manifest
+++ b/media-sound/cantata/Manifest
@@ -1 +1,2 @@
 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.5.0.ebuild 
b/media-sound/cantata/cantata-2.5.0.ebuild
new file mode 100644
index ..47c0c06bb587
--- /dev/null
+++ b/media-sound/cantata/cantata-2.5.0.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2022 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 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" )
+
+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_DEVICES_SUPPORT=$(usex udisks)
+   -DENABLE_AVAHI=$(usex zeroconf)
+

[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/

2020-11-02 Thread Andreas Sturmlechner

commit: a3118c3f2709b05221293310649ec60160ab95c0
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Nov  2 14:03:39 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Nov  2 14:13:57 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3118c3f

media-sound/cantata: Drop 2.4.1

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

 media-sound/cantata/Manifest |   1 -
 media-sound/cantata/cantata-2.4.1.ebuild | 118 ---
 2 files changed, 119 deletions(-)

diff --git a/media-sound/cantata/Manifest b/media-sound/cantata/Manifest
index f01db8070d3..d00b45ad1fc 100644
--- a/media-sound/cantata/Manifest
+++ b/media-sound/cantata/Manifest
@@ -1,2 +1 @@
-DIST cantata-2.4.1.tar.bz2 2550982 BLAKE2B 
1d965ce4a5a73d4695b51def9753c95376b71367f2e6abf69681aad84e387d86d87abcf623f613a517e5e08a633e4e9bf2bae2d28858535fac2f05ade73a6c01
 SHA512 
9bb9953f41ad562e186c201505db6ea42dccdcb0b60e0c6eda0c5521428ecafdba95b51e8827de3498b2b25284d36f800bfa96a49839d2a69e0f92705f44a439
 DIST cantata-2.4.2.tar.bz2 2498460 BLAKE2B 
82486a644fa90567f2c1c997645817d9adee841b79fb782c4984143a0ef25758e8b6605de86eed1c09b2b63b9d570adc0c647245c5e0e900652c0444671c67a7
 SHA512 
c2459a53d86e12df7e6a8f7c19880f1c353c13893401a0906ec730c34ccbf1ef070c226b55c4e772e9a54a94e7cf3a2f96b0e9223ff20057045c888c4f91d87b

diff --git a/media-sound/cantata/cantata-2.4.1.ebuild 
b/media-sound/cantata/cantata-2.4.1.ebuild
deleted file mode 100644
index 22ab01578b8..000
--- a/media-sound/cantata/cantata-2.4.1.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2020 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 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/${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 )
-"
-
-BDEPEND="
-   dev-qt/linguist-tools:5
-"
-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
-"
-
-# cantata has no tests
-RESTRICT="test"
-
-PATCHES=( "${FILESDIR}/${PN}-2.2.0-headers.patch" )
-
-src_prepare() {
-   remove_locale() {
-   rm "translations/${PN}_${1}".ts || die
-   }
-
-   cmake_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=$(usex udisks)
-   -DENABLE_AVAHI=$(usex zeroconf)
-   -DENABLE_REMOTE_DEVICES=OFF
-   -DENABLE_UDISKS2=ON
-   )
-
-   cmake_src_configure
-}
-

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

2020-11-02 Thread Sam James

commit: d575ed500ffd1de884dacaae7b1e196c6de0fdcc
Author: Sam James  gentoo  org>
AuthorDate: Mon Nov  2 12:48:08 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Nov  2 12:48:08 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d575ed50

media-sound/cantata: Stabilize 2.4.2 amd64, #749783

Signed-off-by: Sam James  gentoo.org>

 media-sound/cantata/cantata-2.4.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/cantata/cantata-2.4.2.ebuild 
b/media-sound/cantata/cantata-2.4.2.ebuild
index 603e7026296..e9a9d73dcc3 100644
--- a/media-sound/cantata/cantata-2.4.2.ebuild
+++ b/media-sound/cantata/cantata-2.4.2.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://github.com/CDrummond/${PN}/releases/download/v${PV}/${P}.tar.bz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 x86"
+KEYWORDS="amd64 ~ppc64 x86"
 IUSE="cdda cddb cdio http-server mtp musicbrainz replaygain streaming taglib 
udisks zeroconf"
 REQUIRED_USE="
?? ( cdda cdio )

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

2020-10-18 Thread Thomas Deutschmann

commit: b9ee705e771b998c3db73d5f5c60521ed5c9fc60
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sun Oct 18 18:02:45 2020 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sun Oct 18 18:02:45 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9ee705e

media-sound/cantata: x86 stable (bug #749783)

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Thomas Deutschmann  gentoo.org>

 media-sound/cantata/cantata-2.4.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/cantata/cantata-2.4.2.ebuild 
b/media-sound/cantata/cantata-2.4.2.ebuild
index d4dca81aed0..603e7026296 100644
--- a/media-sound/cantata/cantata-2.4.2.ebuild
+++ b/media-sound/cantata/cantata-2.4.2.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://github.com/CDrummond/${PN}/releases/download/v${PV}/${P}.tar.bz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc64 x86"
 IUSE="cdda cddb cdio http-server mtp musicbrainz replaygain streaming taglib 
udisks zeroconf"
 REQUIRED_USE="
?? ( cdda cdio )

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

2020-09-20 Thread Andreas Sturmlechner

commit: cea34f7d193e5554d32d633fd50cce95f6edd473
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Sep 20 16:31:23 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Sep 20 22:01:38 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cea34f7d

media-sound/cantata: 2.4.2 version bump

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

 media-sound/cantata/Manifest |   1 +
 media-sound/cantata/cantata-2.4.2.ebuild | 118 +++
 2 files changed, 119 insertions(+)

diff --git a/media-sound/cantata/Manifest b/media-sound/cantata/Manifest
index 4e50119d2f5..f01db8070d3 100644
--- a/media-sound/cantata/Manifest
+++ b/media-sound/cantata/Manifest
@@ -1 +1,2 @@
 DIST cantata-2.4.1.tar.bz2 2550982 BLAKE2B 
1d965ce4a5a73d4695b51def9753c95376b71367f2e6abf69681aad84e387d86d87abcf623f613a517e5e08a633e4e9bf2bae2d28858535fac2f05ade73a6c01
 SHA512 
9bb9953f41ad562e186c201505db6ea42dccdcb0b60e0c6eda0c5521428ecafdba95b51e8827de3498b2b25284d36f800bfa96a49839d2a69e0f92705f44a439
+DIST cantata-2.4.2.tar.bz2 2498460 BLAKE2B 
82486a644fa90567f2c1c997645817d9adee841b79fb782c4984143a0ef25758e8b6605de86eed1c09b2b63b9d570adc0c647245c5e0e900652c0444671c67a7
 SHA512 
c2459a53d86e12df7e6a8f7c19880f1c353c13893401a0906ec730c34ccbf1ef070c226b55c4e772e9a54a94e7cf3a2f96b0e9223ff20057045c888c4f91d87b

diff --git a/media-sound/cantata/cantata-2.4.2.ebuild 
b/media-sound/cantata/cantata-2.4.2.ebuild
new file mode 100644
index 000..d4dca81aed0
--- /dev/null
+++ b/media-sound/cantata/cantata-2.4.2.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2020 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 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/${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 )
+"
+
+BDEPEND="
+   dev-qt/linguist-tools:5
+"
+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
+"
+
+# cantata has no tests
+RESTRICT="test"
+
+PATCHES=( "${FILESDIR}/${PN}-2.2.0-headers.patch" )
+
+src_prepare() {
+   remove_locale() {
+   rm "translations/${PN}_${1}".ts || die
+   }
+
+   cmake_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=$(usex udisks)
+   -DENABLE_AVAHI=$(usex zeroconf)
+   -DENABLE_REMOTE_DEVICES=OFF
+   -DENABLE_UDISKS2=ON
+   )
+
+   cmake_src_configure

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

2020-04-26 Thread David Seifert

commit: ef043b463f9dd9b8e8d87ac8a7835741533a515d
Author: David Seifert  gentoo  org>
AuthorDate: Sun Apr 26 12:25:45 2020 +
Commit: David Seifert  gentoo  org>
CommitDate: Sun Apr 26 12:25:45 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef043b46

media-sound/cantata: Remove media-video/libav

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: David Seifert  gentoo.org>

 media-sound/cantata/cantata-2.4.1.ebuild | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/media-sound/cantata/cantata-2.4.1.ebuild 
b/media-sound/cantata/cantata-2.4.1.ebuild
index 830330e2fe1..22ab01578b8 100644
--- a/media-sound/cantata/cantata-2.4.1.ebuild
+++ b/media-sound/cantata/cantata-2.4.1.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="https://github.com/CDrummond/${PN}/releases/download/v${PV}/${P}.tar.bz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~ppc64 x86"
-IUSE="cdda cddb cdio http-server libav mtp musicbrainz replaygain streaming 
taglib udisks zeroconf"
+IUSE="cdda cddb cdio http-server mtp musicbrainz replaygain streaming taglib 
udisks zeroconf"
 REQUIRED_USE="
?? ( cdda cdio )
cdda? ( udisks || ( cddb musicbrainz ) )
@@ -46,8 +46,7 @@ COMMON_DEPEND="
replaygain? (
media-libs/libebur128
media-sound/mpg123
-   libav? ( media-video/libav:= )
-   !libav? ( media-video/ffmpeg:0= )
+   media-video/ffmpeg:0=
)
streaming? ( dev-qt/qtmultimedia:5 )
taglib? (

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

2020-03-25 Thread Andreas Sturmlechner

commit: d46312c6d1cb76d6d2191da8f8133bda9bf85690
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Mar 25 15:55:44 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Mar 25 18:20:33 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d46312c6

media-sound/cantata: Drop 2.3.3-r1

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

 media-sound/cantata/Manifest   |   1 -
 media-sound/cantata/cantata-2.3.3-r1.ebuild| 122 -
 .../files/cantata-2.3.3-solidlite-static.patch |  29 -
 3 files changed, 152 deletions(-)

diff --git a/media-sound/cantata/Manifest b/media-sound/cantata/Manifest
index dbc8d81d796..4e50119d2f5 100644
--- a/media-sound/cantata/Manifest
+++ b/media-sound/cantata/Manifest
@@ -1,2 +1 @@
-DIST cantata-2.3.3.tar.bz2 2445139 BLAKE2B 
679ac68afa6219aa684aed1202bb2268552f6fe560db36e17748b9b220ae6ec4ef103ff68b3bcc7127835f8a2debd32895f5edf319a759ce78bc161c4e540a84
 SHA512 
8314930c9e16a5811f607f131ce7134daa0c6de81c5f87d45967c076895540b388b89b3f2cbd82950f6defb1087e61923c1719670f19b4ed3c074f05fe8577c6
 DIST cantata-2.4.1.tar.bz2 2550982 BLAKE2B 
1d965ce4a5a73d4695b51def9753c95376b71367f2e6abf69681aad84e387d86d87abcf623f613a517e5e08a633e4e9bf2bae2d28858535fac2f05ade73a6c01
 SHA512 
9bb9953f41ad562e186c201505db6ea42dccdcb0b60e0c6eda0c5521428ecafdba95b51e8827de3498b2b25284d36f800bfa96a49839d2a69e0f92705f44a439

diff --git a/media-sound/cantata/cantata-2.3.3-r1.ebuild 
b/media-sound/cantata/cantata-2.3.3-r1.ebuild
deleted file mode 100644
index b29c21cf273..000
--- a/media-sound/cantata/cantata-2.3.3-r1.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PLOCALES="cs da de en_GB es fr hu it ja ko pl pt_BR ru zh_CN"
-inherit cmake 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/${PN}/releases/download/v${PV}/${P}.tar.bz2;
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 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 )
-"
-
-BDEPEND="
-   dev-qt/linguist-tools:5
-"
-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
-   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]
-   || ( kde-frameworks/breeze-icons:5 kde-frameworks/oxygen-icons:* )
-"
-DEPEND="${COMMON_DEPEND}
-   dev-qt/qtconcurrent:5
-"
-
-# cantata has no tests
-RESTRICT="test"
-
-PATCHES=(
-   "${FILESDIR}/${PN}-2.2.0-headers.patch"
-   "${FILESDIR}/${P}-solidlite-static.patch" # bug 678228
-)
-
-src_prepare() {
-   remove_locale() {
-   rm "translations/${PN}_${1}".ts || die
-   }
-
-   cmake_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)
-

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

2020-03-21 Thread Andreas Sturmlechner

commit: ee7e540aef1cd389e4005a6bead6572aeefc49ba
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Mar 21 17:45:11 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Mar 21 17:45:11 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee7e540a

media-sound/cantata: Update PLOCALES

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

 media-sound/cantata/cantata-2.4.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/cantata/cantata-2.4.1.ebuild 
b/media-sound/cantata/cantata-2.4.1.ebuild
index 3a8db8b4bd5..3fe432347ea 100644
--- a/media-sound/cantata/cantata-2.4.1.ebuild
+++ b/media-sound/cantata/cantata-2.4.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PLOCALES="cs da de en_GB es fr hu it ja ko pl pt_BR ru zh_CN"
+PLOCALES="cs da de en_GB es fi fr hu it ja ko nl pl pt_BR ru zh_CN"
 inherit cmake l10n qmake-utils xdg
 
 DESCRIPTION="Featureful and configurable Qt client for the music player daemon 
(MPD)"

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

2020-02-24 Thread Andreas Sturmlechner

commit: 99edc2f04df89189e9cef058d384235087451c48
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Feb 24 20:02:43 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Feb 24 22:14:48 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99edc2f0

media-sound/cantata: 2.4.1 version bump

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

 media-sound/cantata/Manifest |   1 +
 media-sound/cantata/cantata-2.4.1.ebuild | 119 +++
 2 files changed, 120 insertions(+)

diff --git a/media-sound/cantata/Manifest b/media-sound/cantata/Manifest
index a36a1c3c6c0..dbc8d81d796 100644
--- a/media-sound/cantata/Manifest
+++ b/media-sound/cantata/Manifest
@@ -1 +1,2 @@
 DIST cantata-2.3.3.tar.bz2 2445139 BLAKE2B 
679ac68afa6219aa684aed1202bb2268552f6fe560db36e17748b9b220ae6ec4ef103ff68b3bcc7127835f8a2debd32895f5edf319a759ce78bc161c4e540a84
 SHA512 
8314930c9e16a5811f607f131ce7134daa0c6de81c5f87d45967c076895540b388b89b3f2cbd82950f6defb1087e61923c1719670f19b4ed3c074f05fe8577c6
+DIST cantata-2.4.1.tar.bz2 2550982 BLAKE2B 
1d965ce4a5a73d4695b51def9753c95376b71367f2e6abf69681aad84e387d86d87abcf623f613a517e5e08a633e4e9bf2bae2d28858535fac2f05ade73a6c01
 SHA512 
9bb9953f41ad562e186c201505db6ea42dccdcb0b60e0c6eda0c5521428ecafdba95b51e8827de3498b2b25284d36f800bfa96a49839d2a69e0f92705f44a439

diff --git a/media-sound/cantata/cantata-2.4.1.ebuild 
b/media-sound/cantata/cantata-2.4.1.ebuild
new file mode 100644
index 000..3a8db8b4bd5
--- /dev/null
+++ b/media-sound/cantata/cantata-2.4.1.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PLOCALES="cs da de en_GB es fr hu it ja ko pl pt_BR ru zh_CN"
+inherit cmake 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/${PN}/releases/download/v${PV}/${P}.tar.bz2;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~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 )
+"
+
+BDEPEND="
+   dev-qt/linguist-tools:5
+"
+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
+   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]
+   || ( kde-frameworks/breeze-icons:5 kde-frameworks/oxygen-icons:* )
+"
+DEPEND="${COMMON_DEPEND}
+   dev-qt/qtconcurrent:5
+"
+
+# cantata has no tests
+RESTRICT="test"
+
+PATCHES=( "${FILESDIR}/${PN}-2.2.0-headers.patch" )
+
+src_prepare() {
+   remove_locale() {
+   rm "translations/${PN}_${1}".ts || die
+   }
+
+   cmake_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=$(usex udisks)
+   -DENABLE_AVAHI=$(usex zeroconf)
+   -DENABLE_REMOTE_DEVICES=OFF
+

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

2019-07-15 Thread Andreas Sturmlechner

commit: 979ca7172427d327d9c996ec11fc33e2f7986fd1
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Jul 15 20:07:04 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Jul 15 20:51:57 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=979ca717

media-sound/cantata: 2.3.3-r1 ~ppc64 added

Thanks-to: ernsteiswuerfel  mailbox.org>
Closes: https://bugs.gentoo.org/689610
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-sound/cantata/cantata-2.3.3-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/cantata/cantata-2.3.3-r1.ebuild 
b/media-sound/cantata/cantata-2.3.3-r1.ebuild
index ccd0d2f5b44..05ee35f5109 100644
--- a/media-sound/cantata/cantata-2.3.3-r1.ebuild
+++ b/media-sound/cantata/cantata-2.3.3-r1.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://github.com/CDrummond/${PN}/releases/download/v${PV}/${P}.tar.bz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~ppc64 x86"
 IUSE="cdda cddb cdio http-server libav mtp musicbrainz replaygain streaming 
taglib udisks zeroconf"
 REQUIRED_USE="
?? ( cdda cdio )

[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)
-

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

2019-02-20 Thread Mikle Kolyada

commit: 24882a2cd7127efc15dd72b8d89c632ea37f9f88
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Wed Feb 20 13:22:54 2019 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Wed Feb 20 13:22:54 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24882a2c

media-sound/cantata: amd64 stable wrt bug #677112

Signed-off-by: Mikle Kolyada  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
RepoMan-Options: --include-arches="amd64"

 media-sound/cantata/cantata-2.3.3-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/cantata/cantata-2.3.3-r1.ebuild 
b/media-sound/cantata/cantata-2.3.3-r1.ebuild
index 0e490d59668..ccd0d2f5b44 100644
--- a/media-sound/cantata/cantata-2.3.3-r1.ebuild
+++ b/media-sound/cantata/cantata-2.3.3-r1.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://github.com/CDrummond/${PN}/releases/download/v${PV}/${P}.tar.bz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="cdda cddb cdio http-server libav mtp musicbrainz replaygain streaming 
taglib udisks zeroconf"
 REQUIRED_USE="
?? ( cdda cdio )

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

2019-02-17 Thread Andreas Sturmlechner

commit: 564cb54b235260ec1550e33bc2e4750cafc2226f
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Feb 17 16:11:25 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Feb 17 16:12:59 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=564cb54b

media-sound/cantata: Fix bundled solid-lite static linking

Thanks-to: Bigos  gmail.com>
Closes: https://bugs.gentoo.org/678228
Package-Manager: Portage-2.3.60, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-sound/cantata/cantata-2.3.3-r1.ebuild| 122 +
 .../files/cantata-2.3.3-solidlite-static.patch |  29 +
 2 files changed, 151 insertions(+)

diff --git a/media-sound/cantata/cantata-2.3.3-r1.ebuild 
b/media-sound/cantata/cantata-2.3.3-r1.ebuild
new file mode 100644
index 000..0e490d59668
--- /dev/null
+++ b/media-sound/cantata/cantata-2.3.3-r1.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PLOCALES="cs da de en_GB es fr hu it ja ko pl pt_BR ru zh_CN"
+inherit cmake-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/${PN}/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 )
+"
+
+BDEPEND="
+   dev-qt/linguist-tools:5
+"
+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
+   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]
+   || ( kde-frameworks/breeze-icons:5 kde-frameworks/oxygen-icons:* )
+"
+DEPEND="${COMMON_DEPEND}
+   dev-qt/qtconcurrent:5
+"
+
+# cantata has no tests
+RESTRICT="test"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-2.2.0-headers.patch"
+   "${FILESDIR}/${P}-solidlite-static.patch" # bug 678228
+)
+
+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=$(usex udisks)
+   -DENABLE_AVAHI=$(usex zeroconf)
+   -DENABLE_REMOTE_DEVICES=OFF
+   -DENABLE_UDISKS2=ON
+   )
+
+   cmake-utils_src_configure
+}
+
+pkg_postinst() {
+   xdg_pkg_postinst
+
+   has_version media-sound/mpd || \
+   elog "An instance of media-sound/mpd, local or remote, is 
required to set up Cantata."
+
+   if ! has_version app-misc/media-player-info; then
+   elog "Install app-misc/media-player-info to enable 
identification"
+   elog "and querying of portable media players"
+   fi
+}

diff --git a/media-sound/cantata/files/cantata-2.3.3-solidlite-static.patch 
b/media-sound/cantata/files/cantata-2.3.3-solidlite-static.patch
new file mode

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

2019-02-17 Thread Andreas Sturmlechner

commit: 4ca21723994cd431f55ccb3cde88566a6684f37c
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Feb 17 16:18:48 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Feb 17 16:18:48 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ca21723

media-sound/cantata: Drop 2.3.3 (r0)

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

 media-sound/cantata/cantata-2.3.3.ebuild | 119 ---
 1 file changed, 119 deletions(-)

diff --git a/media-sound/cantata/cantata-2.3.3.ebuild 
b/media-sound/cantata/cantata-2.3.3.ebuild
deleted file mode 100644
index db0b51d4e8d..000
--- a/media-sound/cantata/cantata-2.3.3.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PLOCALES="cs da de en_GB es fr hu it ja ko pl pt_BR ru zh_CN"
-inherit cmake-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/${PN}/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 )
-"
-
-BDEPEND="
-   dev-qt/linguist-tools:5
-"
-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
-   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]
-   || ( kde-frameworks/breeze-icons:5 kde-frameworks/oxygen-icons:* )
-"
-DEPEND="${COMMON_DEPEND}
-   dev-qt/qtconcurrent:5
-"
-
-# cantata has no tests
-RESTRICT="test"
-
-PATCHES=( "${FILESDIR}/${PN}-2.2.0-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_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=$(usex udisks)
-   -DENABLE_AVAHI=$(usex zeroconf)
-   -DENABLE_REMOTE_DEVICES=OFF
-   -DENABLE_UDISKS2=ON
-   )
-
-   cmake-utils_src_configure
-}
-
-pkg_postinst() {
-   xdg_pkg_postinst
-
-   has_version media-sound/mpd || \
-   elog "An instance of media-sound/mpd, local or remote, is 
required to set up Cantata."
-
-   if ! has_version app-misc/media-player-info; then
-   elog "Install app-misc/media-player-info to enable 
identification"
-   elog "and querying of portable media players"
-   fi
-}

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

2019-02-14 Thread Andreas Sturmlechner

commit: a1def98d550e9b6f2071f9afe2e3b60a0d8b2183
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Feb 14 18:04:14 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Feb 14 18:36:12 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1def98d

media-sound/cantata: Switch from gnome2-utils to xdg, EAPI-7 bump

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

 media-sound/cantata/cantata-2.3.3.ebuild | 16 ++--
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/media-sound/cantata/cantata-2.3.3.ebuild 
b/media-sound/cantata/cantata-2.3.3.ebuild
index 0db70f0c745..063ffce416a 100644
--- a/media-sound/cantata/cantata-2.3.3.ebuild
+++ b/media-sound/cantata/cantata-2.3.3.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 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
+inherit cmake-utils l10n qmake-utils xdg
 
 DESCRIPTION="Featureful and configurable Qt client for the music player daemon 
(MPD)"
 HOMEPAGE="https://github.com/CDrummond/cantata;
@@ -24,6 +24,9 @@ REQUIRED_USE="
replaygain? ( taglib )
 "
 
+BDEPEND="
+   dev-qt/linguist-tools:5
+"
 COMMON_DEPEND="
dev-qt/qtcore:5
dev-qt/qtdbus:5
@@ -59,7 +62,6 @@ RDEPEND="${COMMON_DEPEND}
 "
 DEPEND="${COMMON_DEPEND}
dev-qt/qtconcurrent:5
-   dev-qt/linguist-tools:5
 "
 
 # cantata has no tests
@@ -105,8 +107,7 @@ src_configure() {
 }
 
 pkg_postinst() {
-   gnome2_icon_cache_update
-   xdg_desktop_database_update
+   xdg_pkg_postinst
 
has_version media-sound/mpd || \
elog "An instance of media-sound/mpd, local or remote, is 
required to set up Cantata."
@@ -116,8 +117,3 @@ pkg_postinst() {
elog "and querying of portable media players"
fi
 }
-
-pkg_postrm() {
-   gnome2_icon_cache_update
-   xdg_desktop_database_update
-}

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

2019-01-06 Thread Andreas Sturmlechner

commit: bb9d5a161827c0c51c7b7e73b5209f1633556151
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Jan  6 20:34:59 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Jan  6 20:53:12 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb9d5a16

media-sound/cantata: 2.3.3 version bump

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

 media-sound/cantata/Manifest |   1 +
 media-sound/cantata/cantata-2.3.3.ebuild | 123 +++
 2 files changed, 124 insertions(+)

diff --git a/media-sound/cantata/Manifest b/media-sound/cantata/Manifest
index 594c43ddce2..7fa872f1377 100644
--- a/media-sound/cantata/Manifest
+++ b/media-sound/cantata/Manifest
@@ -1 +1,2 @@
 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.3.ebuild 
b/media-sound/cantata/cantata-2.3.3.ebuild
new file mode 100644
index 000..0db70f0c745
--- /dev/null
+++ b/media-sound/cantata/cantata-2.3.3.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2019 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/${PN}/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
+   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]
+   || ( kde-frameworks/breeze-icons:5 kde-frameworks/oxygen-icons:* )
+"
+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" )
+
+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=$(usex udisks)
+   -DENABLE_AVAHI=$(usex zeroconf)
+   -DENABLE_REMOTE_DEVICES=OFF
+

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

2018-11-29 Thread Andreas Sturmlechner

commit: 7419ba1f7e7c77bc196f4b6c2f55fe4114911cbb
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Nov 29 19:39:18 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Nov 29 20:18:46 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7419ba1f

media-sound/cantata: Drop 2.2.0

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

 media-sound/cantata/Manifest |   1 -
 media-sound/cantata/cantata-2.2.0.ebuild | 119 ---
 2 files changed, 120 deletions(-)

diff --git a/media-sound/cantata/Manifest b/media-sound/cantata/Manifest
index 3104e3b1882..594c43ddce2 100644
--- a/media-sound/cantata/Manifest
+++ b/media-sound/cantata/Manifest
@@ -1,2 +1 @@
-DIST cantata-2.2.0.tar.bz2 2251649 BLAKE2B 
9b28a4e3a77245fcf00f81780adecdc51e066f068798f92300ef8527872313f5fb56d4b90a6f5511caf951ba9fcd5c094dd5e9062fe3d314b75412b3e8e03d37
 SHA512 
519a2e24c8b2a1c98a2006a1f590945e1bd5e98a2c3a1b5da23e40f2297f1477d48d69b48ec669219f5ab8fdc955486fe29db6914abeef1fba2a47377f694ecd
 DIST cantata-2.3.2.tar.bz2 2440595 BLAKE2B 
d77a41752ff9660f27da11748497b394667f456edf52d785b3ebf31446045a4de2bcc9b22ac2d68dfd4e0f00d10a53ae9e79643e116783879eb68bab48b59589
 SHA512 
d55ee5f2194626db3465d8c499459bac82656e12bdb5f771581eef9d6a42ee25fc9b31e8bb5cea8913cbd47a967141f990efddb353797f81e722b7b99a73b1a4

diff --git a/media-sound/cantata/cantata-2.2.0.ebuild 
b/media-sound/cantata/cantata-2.2.0.ebuild
deleted file mode 100644
index 388cff4d561..000
--- a/media-sound/cantata/cantata-2.2.0.ebuild
+++ /dev/null
@@ -1,119 +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 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 )
-   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 )
-   )
-"
-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_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_TAGLIB_EXTRAS=$(usex taglib)
-   -DENABLE_DEVICES_SUPPORT=$(usex udisks)
-   -DENABLE_REMOTE_DEVICES=OFF
-   -DENABLE_UDISKS2=ON
-   )
-
-   cmake-utils_src_configure
-}
-
-pkg_preinst() {
-   gnome2_icon_savelist
-   xdg_pkg_preinst
-}
-
-pkg_postinst() {
-

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

2018-10-05 Thread Andreas Sturmlechner

commit: 3cec59b15d7ddbce1447c1d687d23805250a7ee1
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Oct  5 20:21:59 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Oct  5 20:59:40 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3cec59b1

media-sound/cantata: 2.3.2 amd64 stable

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

 media-sound/cantata/cantata-2.3.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/cantata/cantata-2.3.2.ebuild 
b/media-sound/cantata/cantata-2.3.2.ebuild
index 78ed9592e59..e65a73704d8 100644
--- a/media-sound/cantata/cantata-2.3.2.ebuild
+++ b/media-sound/cantata/cantata-2.3.2.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://github.com/CDrummond/cantata/releases/download/v${PV}/${P}.tar.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="cdda cddb cdio http-server libav mtp musicbrainz replaygain streaming 
taglib udisks zeroconf"
 REQUIRED_USE="
?? ( cdda cdio )

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

2018-10-04 Thread Thomas Deutschmann

commit: 95dffd5745040c5e75e7ccde52ff5f530cbc9d9b
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Fri Oct  5 03:42:35 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Fri Oct  5 03:42:35 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95dffd57

media-sound/cantata: x86 stable (bug #667418)

Package-Manager: Portage-2.3.50, Repoman-2.3.11
Signed-off-by: Thomas Deutschmann  gentoo.org>

 media-sound/cantata/cantata-2.3.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/cantata/cantata-2.3.2.ebuild 
b/media-sound/cantata/cantata-2.3.2.ebuild
index 79a23ad4e10..78ed9592e59 100644
--- a/media-sound/cantata/cantata-2.3.2.ebuild
+++ b/media-sound/cantata/cantata-2.3.2.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://github.com/CDrummond/cantata/releases/download/v${PV}/${P}.tar.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="cdda cddb cdio http-server libav mtp musicbrainz replaygain streaming 
taglib udisks zeroconf"
 REQUIRED_USE="
?? ( cdda cdio )

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

2018-09-30 Thread Andreas Sturmlechner

commit: fed872dce23dda1e1956952b7fc8307787309eeb
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Sep 30 21:53:11 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Sep 30 22:00:56 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fed872dc

media-sound/cantata: Replace virtual/ffmpeg w/ USE +-libav

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

 media-sound/cantata/cantata-2.3.2.ebuild | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/media-sound/cantata/cantata-2.3.2.ebuild 
b/media-sound/cantata/cantata-2.3.2.ebuild
index db85ccf2fbc..79a23ad4e10 100644
--- a/media-sound/cantata/cantata-2.3.2.ebuild
+++ b/media-sound/cantata/cantata-2.3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ 
SRC_URI="https://github.com/CDrummond/cantata/releases/download/v${PV}/${P}.tar.
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="cdda cddb cdio http-server mtp musicbrainz replaygain streaming taglib 
udisks zeroconf"
+IUSE="cdda cddb cdio http-server libav mtp musicbrainz replaygain streaming 
taglib udisks zeroconf"
 REQUIRED_USE="
?? ( cdda cdio )
cdda? ( udisks || ( cddb musicbrainz ) )
@@ -44,7 +44,8 @@ COMMON_DEPEND="
replaygain? (
media-libs/libebur128
media-sound/mpg123
-   virtual/ffmpeg
+   libav? ( media-video/libav:= )
+   !libav? ( media-video/ffmpeg:0= )
)
streaming? ( dev-qt/qtmultimedia:5 )
taglib? (

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

2018-09-03 Thread Andreas Sturmlechner

commit: 7d434c0351d4a9b48f353a5d89eb13bd46735be9
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Sep  3 20:04:52 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Sep  3 20:04:52 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d434c03

media-sound/cantata: 2.3.2 version bump

Package-Manager: Portage-2.3.48, Repoman-2.3.10

 media-sound/cantata/Manifest   |   1 +
 media-sound/cantata/cantata-2.3.2.ebuild   | 125 +
 .../cantata/files/cantata-2.3.2-opusfile.patch |  22 
 3 files changed, 148 insertions(+)

diff --git a/media-sound/cantata/Manifest b/media-sound/cantata/Manifest
index 28f944978e8..cef8831345c 100644
--- a/media-sound/cantata/Manifest
+++ b/media-sound/cantata/Manifest
@@ -1,2 +1,3 @@
 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.3.2.ebuild 
b/media-sound/cantata/cantata-2.3.2.ebuild
new file mode 100644
index 000..db85ccf2fbc
--- /dev/null
+++ b/media-sound/cantata/cantata-2.3.2.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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 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
+   virtual/ffmpeg
+   )
+   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)

[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)
-

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

2018-06-23 Thread Andreas Sturmlechner

commit: 4d244ad3a4e4fb453abcb6dae1967f1125c1d96d
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Jun 23 19:18:38 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Jun 23 19:56:11 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d244ad3

media-sound/cantata: 2.3.1 version bump

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 media-sound/cantata/Manifest |   1 +
 media-sound/cantata/cantata-2.3.1.ebuild | 124 +++
 2 files changed, 125 insertions(+)

diff --git a/media-sound/cantata/Manifest b/media-sound/cantata/Manifest
index 672a3131729..28f944978e8 100644
--- a/media-sound/cantata/Manifest
+++ b/media-sound/cantata/Manifest
@@ -1 +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

diff --git a/media-sound/cantata/cantata-2.3.1.ebuild 
b/media-sound/cantata/cantata-2.3.1.ebuild
new file mode 100644
index 000..4bc76c731c1
--- /dev/null
+++ b/media-sound/cantata/cantata-2.3.1.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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 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 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
+   virtual/ffmpeg
+   )
+   streaming? ( media-video/vlc:0= )
+   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"
+)
+
+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=$(usex udisks)
+   -DENABLE_AVAHI=$(usex zeroconf)
+   -DENABLE_REMOTE_DEVICES=OFF
+   -DENABLE_UDISKS2=ON
+   )
+
+   cmake-utils_src_configure
+}
+
+pkg_postinst() {
+

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

2018-04-25 Thread Andreas Sturmlechner

commit: c48adfe60caa9cab0fca9a7b844b4e7e71a93a50
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Apr 25 16:33:14 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Apr 25 16:33:52 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c48adfe6

media-sound/cantata: Drop 2.2.0-r1

Package-Manager: Portage-2.3.31, Repoman-2.3.9

 media-sound/cantata/cantata-2.2.0-r1.ebuild | 122 
 1 file changed, 122 deletions(-)

diff --git a/media-sound/cantata/cantata-2.2.0-r1.ebuild 
b/media-sound/cantata/cantata-2.2.0-r1.ebuild
deleted file mode 100644
index 9b255bbabbb..000
--- a/media-sound/cantata/cantata-2.2.0-r1.ebuild
+++ /dev/null
@@ -1,122 +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 )
-"
-
-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 )
-   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 )
-   )
-"
-DEPEND="${RDEPEND}
-   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_bindir)/lrelease"
-   -DENABLE_FFMPEG=$(usex replaygain)
-   -DENABLE_MPG123=$(usex replaygain)
-   -DENABLE_HTTP_STREAM_PLAYBACK=$(usex streaming)
-   -DENABLE_TAGLIB=$(usex taglib)
-   -DENABLE_TAGLIB_EXTRAS=$(usex taglib)
-   -DENABLE_DEVICES_SUPPORT=$(usex udisks)
-   -DENABLE_REMOTE_DEVICES=OFF
-   -DENABLE_UDISKS2=ON
-   )
-
-   cmake-utils_src_configure
-}
-
-pkg_preinst() {
-   gnome2_icon_savelist
-   xdg_pkg_preinst
-}
-
-pkg_postinst() {
-   gnome2_icon_cache_update
-   xdg_pkg_postinst
-
-   has_version media-sound/mpd || \
-   elog "An instance of media-sound/mpd, local or remote, is 
required to set up Cantata."
-}
-
-pkg_postrm() {
-   gnome2_icon_cache_update
-   xdg_pkg_postrm
-}

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

2018-04-25 Thread Andreas Sturmlechner

commit: 534b580dc755c95a43953096ce12953fd5d01ba4
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Apr 25 16:32:50 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Apr 25 16:33:52 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=534b580d

media-sound/cantata: Add missing RDEPEND

Closes: https://bugs.gentoo.org/653918
Package-Manager: Portage-2.3.31, Repoman-2.3.9

 media-sound/cantata/cantata-2.2.0-r2.ebuild | 125 
 1 file changed, 125 insertions(+)

diff --git a/media-sound/cantata/cantata-2.2.0-r2.ebuild 
b/media-sound/cantata/cantata-2.2.0-r2.ebuild
new file mode 100644
index 000..c9cd47b8623
--- /dev/null
+++ b/media-sound/cantata/cantata-2.2.0-r2.ebuild
@@ -0,0 +1,125 @@
+# 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_bindir)/lrelease"
+   -DENABLE_FFMPEG=$(usex replaygain)
+   -DENABLE_MPG123=$(usex replaygain)
+   -DENABLE_HTTP_STREAM_PLAYBACK=$(usex streaming)
+   -DENABLE_TAGLIB=$(usex taglib)
+   -DENABLE_TAGLIB_EXTRAS=$(usex taglib)
+   -DENABLE_DEVICES_SUPPORT=$(usex udisks)
+   -DENABLE_REMOTE_DEVICES=OFF
+   -DENABLE_UDISKS2=ON
+   )
+
+   cmake-utils_src_configure
+}
+
+pkg_preinst() {
+   gnome2_icon_savelist
+   xdg_pkg_preinst
+}
+
+pkg_postinst() {
+   gnome2_icon_cache_update
+   xdg_pkg_postinst
+
+   has_version media-sound/mpd || \
+   elog "An instance of media-sound/mpd, local or remote, is 
required to set up Cantata."
+}
+
+pkg_postrm() {
+   gnome2_icon_cache_update
+   xdg_pkg_postrm
+}

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

2018-03-16 Thread Andreas Sturmlechner

commit: 95bbffe23369fa825ded61227a0ff6a40a277086
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Mar 16 20:56:40 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Mar 16 21:29:58 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95bbffe2

media-sound/cantata: Fix runtime crash w/ >=dev-qt/qtsql-5.10

Reported-by: Franz Fellner  gmail.com>
Closes: https://bugs.gentoo.org/642196
Package-Manager: Portage-2.3.24, Repoman-2.3.6

 media-sound/cantata/cantata-2.2.0-r1.ebuild| 122 +
 .../cantata/files/cantata-2.2.0-qtsql-5.10.patch   |  23 
 2 files changed, 145 insertions(+)

diff --git a/media-sound/cantata/cantata-2.2.0-r1.ebuild 
b/media-sound/cantata/cantata-2.2.0-r1.ebuild
new file mode 100644
index 000..9b255bbabbb
--- /dev/null
+++ b/media-sound/cantata/cantata-2.2.0-r1.ebuild
@@ -0,0 +1,122 @@
+# 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 )
+"
+
+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 )
+   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 )
+   )
+"
+DEPEND="${RDEPEND}
+   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_bindir)/lrelease"
+   -DENABLE_FFMPEG=$(usex replaygain)
+   -DENABLE_MPG123=$(usex replaygain)
+   -DENABLE_HTTP_STREAM_PLAYBACK=$(usex streaming)
+   -DENABLE_TAGLIB=$(usex taglib)
+   -DENABLE_TAGLIB_EXTRAS=$(usex taglib)
+   -DENABLE_DEVICES_SUPPORT=$(usex udisks)
+   -DENABLE_REMOTE_DEVICES=OFF
+   -DENABLE_UDISKS2=ON
+   )
+
+   cmake-utils_src_configure
+}
+
+pkg_preinst() {
+   gnome2_icon_savelist
+   xdg_pkg_preinst
+}
+
+pkg_postinst() {
+   gnome2_icon_cache_update
+   xdg_pkg_postinst
+
+   has_version media-sound/mpd || \
+   elog "An instance of media-sound/mpd, local or remote, is 
required to set up Cantata."
+}
+
+pkg_postrm() {
+   gnome2_icon_cache_update
+   xdg_pkg_postrm
+}

diff --git a/media-sound/cantata/files/cantata-2.2.0-qtsql-5.10.patch 
b/media-sound/cantata/files/cantata-2.2.0-qtsql-5.10.patch
new file mode 100644
index 000..16cb6d8c2d1
--- /dev/null
+++ b/media-sound/cantata/files/cantata-2.2.0-qtsql-5.10.patch
@@ -0,0 +1,23 @@
+From 4da7a9128f2c5eaf23ae2a5006d300dc4f21fc6a Mon Sep 17 00:00:00 2001
+From: Craig Drummond

[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
-   )
-
-

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

2017-11-18 Thread Michael Palimaka

commit: 869ffef741f62957caf6de82ed41bc8066d51625
Author: Michael Palimaka  gentoo  org>
AuthorDate: Sun Nov 19 06:09:55 2017 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sun Nov 19 06:10:10 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=869ffef7

media-sound/cantata: stabilise 2.2.0 for amd64

Bug: https://bugs.gentoo.org/637166
Package-Manager: Portage-2.3.8, Repoman-2.3.4

 media-sound/cantata/cantata-2.2.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/cantata/cantata-2.2.0.ebuild 
b/media-sound/cantata/cantata-2.2.0.ebuild
index 077a4a9f8be..388cff4d561 100644
--- a/media-sound/cantata/cantata-2.2.0.ebuild
+++ b/media-sound/cantata/cantata-2.2.0.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://github.com/CDrummond/cantata/releases/download/v${PV}/${P}.tar.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="cdda cddb cdio http-server mtp musicbrainz replaygain streaming taglib 
udisks"
 REQUIRED_USE="
?? ( cdda cdio )

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

2017-11-14 Thread Thomas Deutschmann

commit: c3c478f5f550fcac7665ac749ae8911a9bfae8bf
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Tue Nov 14 21:37:18 2017 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Tue Nov 14 21:37:18 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3c478f5

media-sound/cantata: x86 stable (bug #637166)

Package-Manager: Portage-2.3.13, Repoman-2.3.4

 media-sound/cantata/cantata-2.2.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/cantata/cantata-2.2.0.ebuild 
b/media-sound/cantata/cantata-2.2.0.ebuild
index 90ad03106b6..077a4a9f8be 100644
--- a/media-sound/cantata/cantata-2.2.0.ebuild
+++ b/media-sound/cantata/cantata-2.2.0.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://github.com/CDrummond/cantata/releases/download/v${PV}/${P}.tar.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="cdda cddb cdio http-server mtp musicbrainz replaygain streaming taglib 
udisks"
 REQUIRED_USE="
?? ( cdda cdio )

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

2017-11-11 Thread Andreas Sturmlechner

commit: 4da5ede43011555c0c24f1389bbbdf4d3d1dc0f4
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Nov 11 19:07:36 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Nov 11 19:38:36 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4da5ede4

media-sound/cantata: Add elog message about MPD

Closes: https://bugs.gentoo.org/637138
Package-Manager: Portage-2.3.13, Repoman-2.3.4

 media-sound/cantata/cantata-2.2.0.ebuild | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/media-sound/cantata/cantata-2.2.0.ebuild 
b/media-sound/cantata/cantata-2.2.0.ebuild
index 3a22fc20439..90ad03106b6 100644
--- a/media-sound/cantata/cantata-2.2.0.ebuild
+++ b/media-sound/cantata/cantata-2.2.0.ebuild
@@ -37,8 +37,8 @@ RDEPEND="
sys-libs/zlib
virtual/libudev:=
cdda? ( media-sound/cdparanoia )
-   cdio? ( dev-libs/libcdio-paranoia )
cddb? ( media-libs/libcddb )
+   cdio? ( dev-libs/libcdio-paranoia )
mtp? ( media-libs/libmtp )
musicbrainz? ( media-libs/musicbrainz:5= )
replaygain? (
@@ -81,8 +81,8 @@ src_configure() {
local mycmakeargs=(
-DCANTATA_HELPERS_LIB_DIR="$(get_libdir)"
-DENABLE_CDPARANOIA=$(usex cdda)
-   -DENABLE_CDIOPARANOIA=$(usex cdio)
-DENABLE_CDDB=$(usex cddb)
+   -DENABLE_CDIOPARANOIA=$(usex cdio)
-DENABLE_HTTP_SERVER=$(usex http-server)
-DENABLE_MTP=$(usex mtp)
-DENABLE_MUSICBRAINZ=$(usex musicbrainz)
@@ -108,6 +108,9 @@ pkg_preinst() {
 pkg_postinst() {
gnome2_icon_cache_update
xdg_pkg_postinst
+
+   has_version media-sound/mpd || \
+   elog "An instance of media-sound/mpd, local or remote, is 
required to set up Cantata."
 }
 
 pkg_postrm() {

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

2017-10-28 Thread Andreas Sturmlechner

commit: c9a795211531009f97065677d544f9638b8bcb30
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Oct 27 21:03:46 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Oct 28 07:40:41 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9a79521

media-sound/cantata: amd64 stable, bug #630618

Package-Manager: Portage-2.3.12, Repoman-2.3.4

 media-sound/cantata/cantata-2.1.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/cantata/cantata-2.1.0.ebuild 
b/media-sound/cantata/cantata-2.1.0.ebuild
index ae961cb8a2b..57c74fe9299 100644
--- a/media-sound/cantata/cantata-2.1.0.ebuild
+++ b/media-sound/cantata/cantata-2.1.0.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://github.com/CDrummond/cantata/releases/download/v${PV}/${P}.tar.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="cdda cddb cdio http-server mtp musicbrainz replaygain taglib udisks"
 REQUIRED_USE="
?? ( cdda cdio )

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

2017-10-27 Thread Thomas Deutschmann

commit: d0431552cf6ec0d9abc39d26e298741848aefec4
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Fri Oct 27 11:57:56 2017 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Fri Oct 27 12:53:59 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0431552

media-sound/cantata: x86 stable (bug #630618)

Package-Manager: Portage-2.3.11, Repoman-2.3.3

 media-sound/cantata/cantata-2.1.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/cantata/cantata-2.1.0.ebuild 
b/media-sound/cantata/cantata-2.1.0.ebuild
index e60ac6b3c74..ae961cb8a2b 100644
--- a/media-sound/cantata/cantata-2.1.0.ebuild
+++ b/media-sound/cantata/cantata-2.1.0.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://github.com/CDrummond/cantata/releases/download/v${PV}/${P}.tar.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="cdda cddb cdio http-server mtp musicbrainz replaygain taglib udisks"
 REQUIRED_USE="
?? ( cdda cdio )

[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/, media-sound/cantata/files/

2017-08-02 Thread Andreas Sturmlechner

commit: 8606353ff85e982c42f8d10e519af8cf15d47b48
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Aug  2 21:33:55 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Aug  2 21:34:32 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8606353f

media-sound/cantata: Drop old

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 media-sound/cantata/Manifest   |   1 -
 media-sound/cantata/cantata-2.0.1-r1.ebuild| 120 -
 .../files/cantata-2.0.1-mpris-plasma57.patch   |  46 
 .../cantata/files/cantata-2.0.1-mpris-true.patch   | 100 -
 .../cantata/files/cantata-2.0.1-qt5-no-X11.patch   |  14 ---
 5 files changed, 281 deletions(-)

diff --git a/media-sound/cantata/Manifest b/media-sound/cantata/Manifest
index 6b8b4883803..220f9d133c3 100644
--- a/media-sound/cantata/Manifest
+++ b/media-sound/cantata/Manifest
@@ -1,2 +1 @@
-DIST cantata-2.0.1.tar.bz2 2151126 SHA256 
122bda13c0b4078b84640dabef444b37d705d71c6f95209a2d949acd28a0bbca SHA512 
69ae0c67970ec43f407c5ad11c0ddf254060a16de5023b2fdaf14ad9637ad8be06101ebe6c5cb07283e058400b24d80177b89f10a7be486cdb994aed1ff5ba02
 WHIRLPOOL 
138fab5ebbe9418b2c2d37b5c479fa7118a4c567f9ecd2a1fe2f4f1ff53e78803ca1f0192c126940ab2409b13448631a6e96e4e1542255378ff2f237df46ea3c
 DIST cantata-2.1.0.tar.bz2 2207271 SHA256 
9317afcae75c709ec733da069d4245b47e6e2c297a259eaf87a181fa9d1cd4c4 SHA512 
bf03933785110d0d0c1dfbfc27f4974869ae7c79afe3cf1da1f3024c95d86733d8bea77f2a882887de79a7897ffcdac4262e58747dd4e979824943991675c5d2
 WHIRLPOOL 
5d58b84290c387d535e556553e64bba36520a099565c44bed1c4e9cf800c2a432ac09296b989a557e72d81a951c926b4bb638f2d2ab7976735059ebb74b8c8e2

diff --git a/media-sound/cantata/cantata-2.0.1-r1.ebuild 
b/media-sound/cantata/cantata-2.0.1-r1.ebuild
deleted file mode 100644
index 5b524f4a4fb..000
--- a/media-sound/cantata/cantata-2.0.1-r1.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="cs de en_GB es fr 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="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cdda cddb http-server mtp musicbrainz replaygain taglib udisks"
-REQUIRED_USE="
-   cdda? ( udisks || ( cddb musicbrainz ) )
-   cddb? ( cdda taglib )
-   mtp? ( taglib udisks )
-   musicbrainz? ( cdda taglib )
-   replaygain? ( taglib )
-"
-
-RDEPEND="
-   dev-db/sqlite:3
-   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
-   sys-libs/zlib
-   || ( kde-frameworks/breeze-icons:5 kde-frameworks/oxygen-icons:* )
-   cdda? ( media-sound/cdparanoia )
-   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/linguist-tools:5
-"
-
-# cantata has no tests
-RESTRICT="test"
-
-PATCHES=(
-   "${FILESDIR}/${P}-mpris-true.patch"
-   "${FILESDIR}/${P}-mpris-plasma57.patch"
-   "${FILESDIR}/${P}-qt5-no-X11.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
-   rm -rf 3rdparty/qjson/ || die
-
-   l10n_find_plocales_changes 'po' '' '.po'
-}
-
-src_configure() {
-   local langs="$(l10n_get_locales)"
-
-   local mycmakeargs=(
-   -DCANTATA_HELPERS_LIB_DIR="$(get_libdir)"
-   -DCANTATA_TRANSLATIONS="${langs// /;}"
-   -DENABLE_CDPARANOIA=$(usex cdda)
-   -DENABLE_CDDB=$(usex cddb)
-   -DENABLE_HTTP_SERVER=$(usex http-server)
-   -DENABLE_MTP=$(usex mtp)
-   -DENABLE_MUSICBRAINZ=$(usex musicbrainz)
-   -DENABLE_QT5=ON
-   -DLCONVERT_EXECUTABLE="$(qt5_get_bindir)/lconvert"
-   -DLRELEASE_EXECUTABLE="$(qt5_get_bindir)/lrelease"
-   -DENABLE_FFMPEG=$(usex replaygain)
-   -DENABLE_MPG123=$(usex replaygain)
-   -DENABLE_TAGLIB=$(usex taglib)
-   -DENABLE_TAGLIB_EXTRAS=$(usex taglib)
-

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

2017-08-02 Thread Andreas Sturmlechner

commit: d4bd1d8d39b9a6d785e11f8eb804cc4977ce8ae1
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Aug  2 06:25:13 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Aug  2 19:29:50 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4bd1d8d

media-sound/cantata: 2.1.0 version bump

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 media-sound/cantata/Manifest |   1 +
 media-sound/cantata/cantata-2.1.0.ebuild | 113 +++
 media-sound/cantata/metadata.xml |   1 +
 3 files changed, 115 insertions(+)

diff --git a/media-sound/cantata/Manifest b/media-sound/cantata/Manifest
index c7c120f44e4..6b8b4883803 100644
--- a/media-sound/cantata/Manifest
+++ b/media-sound/cantata/Manifest
@@ -1 +1,2 @@
 DIST cantata-2.0.1.tar.bz2 2151126 SHA256 
122bda13c0b4078b84640dabef444b37d705d71c6f95209a2d949acd28a0bbca SHA512 
69ae0c67970ec43f407c5ad11c0ddf254060a16de5023b2fdaf14ad9637ad8be06101ebe6c5cb07283e058400b24d80177b89f10a7be486cdb994aed1ff5ba02
 WHIRLPOOL 
138fab5ebbe9418b2c2d37b5c479fa7118a4c567f9ecd2a1fe2f4f1ff53e78803ca1f0192c126940ab2409b13448631a6e96e4e1542255378ff2f237df46ea3c
+DIST cantata-2.1.0.tar.bz2 2207271 SHA256 
9317afcae75c709ec733da069d4245b47e6e2c297a259eaf87a181fa9d1cd4c4 SHA512 
bf03933785110d0d0c1dfbfc27f4974869ae7c79afe3cf1da1f3024c95d86733d8bea77f2a882887de79a7897ffcdac4262e58747dd4e979824943991675c5d2
 WHIRLPOOL 
5d58b84290c387d535e556553e64bba36520a099565c44bed1c4e9cf800c2a432ac09296b989a557e72d81a951c926b4bb638f2d2ab7976735059ebb74b8c8e2

diff --git a/media-sound/cantata/cantata-2.1.0.ebuild 
b/media-sound/cantata/cantata-2.1.0.ebuild
new file mode 100644
index 000..65f1626c7dd
--- /dev/null
+++ b/media-sound/cantata/cantata-2.1.0.ebuild
@@ -0,0 +1,113 @@
+# 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"
+
+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_configure
+}
+
+pkg_preinst() {
+   gnome2_icon_savelist
+

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

2016-12-20 Thread Johannes Huber

commit: 72e243a2e2600cbd0caee6641dc7975a9c7af33f
Author: Johannes Huber  gentoo  org>
AuthorDate: Tue Dec 20 09:30:42 2016 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Tue Dec 20 09:31:02 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72e243a2

media-sound/cantata: Remove 2.0.1 (r0)

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 media-sound/cantata/cantata-2.0.1.ebuild | 141 ---
 1 file changed, 141 deletions(-)

diff --git a/media-sound/cantata/cantata-2.0.1.ebuild 
b/media-sound/cantata/cantata-2.0.1.ebuild
deleted file mode 100644
index 9990398..
--- a/media-sound/cantata/cantata-2.0.1.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# 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 fr 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="0"
-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"
-
-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 musicbrainz)
-   -DENABLE_QT5=$(usex qt5)
-   -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
-   -DUSE_SYSTEM_MENU_ICON=OFF
-   )
-
-   if ! use kde; then
-   if use qt5; then
-   mycmakeargs+=(
-   
-DLCONVERT_EXECUTABLE="$(qt5_get_bindir)/lconvert"
-   
-DLRELEASE_EXECUTABLE="$(qt5_get_bindir)/lrelease"
-   )
-   else
-   mycmakeargs+=(
-   
-DLCONVERT_EXECUTABLE="$(qt4_get_bindir)/lconvert"
-   
-DLRELEASE_EXECUTABLE="$(qt4_get_bindir)/lrelease"
-   )
-   fi
-   fi
-
-   cmake-utils_src_configure
-}
-
-pkg_preinst() {
-   gnome2_icon_savelist
-   xdg_pkg_preinst
-}
-
-pkg_postinst() {
-   gnome2_icon_cache_update
-   xdg_pkg_postinst
-}
-
-pkg_postrm() {
-

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

2016-12-20 Thread Johannes Huber

commit: b6224b26bea8ef639c3d4329e8d60a05e4d1c969
Author: Johannes Huber  gentoo  org>
AuthorDate: Tue Dec 20 09:28:13 2016 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Tue Dec 20 09:31:01 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6224b26

media-sound/cantata: Use subslot on media-libs/musicbrainz

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 media-sound/cantata/cantata-2.0.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/cantata/cantata-2.0.1-r1.ebuild 
b/media-sound/cantata/cantata-2.0.1-r1.ebuild
index 43f6652..b6f84c2 100644
--- a/media-sound/cantata/cantata-2.0.1-r1.ebuild
+++ b/media-sound/cantata/cantata-2.0.1-r1.ebuild
@@ -39,7 +39,7 @@ RDEPEND="
cdda? ( media-sound/cdparanoia )
cddb? ( media-libs/libcddb )
mtp? ( media-libs/libmtp )
-   musicbrainz? ( media-libs/musicbrainz:5 )
+   musicbrainz? ( media-libs/musicbrainz:5= )
replaygain? (
media-libs/libebur128
media-sound/mpg123

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

2016-11-05 Thread Michael Palimaka

commit: 7fddf1fb363c0d5389d2c58c4bbf54a605413ebd
Author: Michael Palimaka  gentoo  org>
AuthorDate: Sat Nov  5 16:00:55 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sat Nov  5 16:06:48 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7fddf1fb

media-sound/cantata: fix multilib-strict violation

Package-Manager: portage-2.3.2

 media-sound/cantata/cantata-2.0.1-r1.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/media-sound/cantata/cantata-2.0.1-r1.ebuild 
b/media-sound/cantata/cantata-2.0.1-r1.ebuild
index 21f2057..43f6652 100644
--- a/media-sound/cantata/cantata-2.0.1-r1.ebuild
+++ b/media-sound/cantata/cantata-2.0.1-r1.ebuild
@@ -80,6 +80,7 @@ src_configure() {
local langs="$(l10n_get_locales)"
 
local mycmakeargs=(
+   -DCANTATA_HELPERS_LIB_DIR="$(get_libdir)"
-DCANTATA_TRANSLATIONS="${langs// /;}"
-DENABLE_CDPARANOIA=$(usex cdda)
-DENABLE_CDDB=$(usex cddb)

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

2016-11-05 Thread Michael Palimaka

commit: aa524fbca2084f51b86b8c4054016162cee73e00
Author: Andreas Sturmlechner  gmail  com>
AuthorDate: Thu Oct 27 21:34:43 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sat Nov  5 15:42:50 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa524fbc

media-sound/cantata: slotmove 4 -> 0

Package-Manager: portage-2.3.0

 media-sound/cantata/cantata-2.0.1-r1.ebuild | 2 +-
 media-sound/cantata/cantata-2.0.1.ebuild| 2 +-
 profiles/updates/4Q-2016| 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/media-sound/cantata/cantata-2.0.1-r1.ebuild 
b/media-sound/cantata/cantata-2.0.1-r1.ebuild
index b04563d..21f2057 100644
--- a/media-sound/cantata/cantata-2.0.1-r1.ebuild
+++ b/media-sound/cantata/cantata-2.0.1-r1.ebuild
@@ -12,7 +12,7 @@ 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"
+SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="cdda cddb http-server mtp musicbrainz replaygain taglib udisks"
 REQUIRED_USE="

diff --git a/media-sound/cantata/cantata-2.0.1.ebuild 
b/media-sound/cantata/cantata-2.0.1.ebuild
index 2854beb..9990398 100644
--- a/media-sound/cantata/cantata-2.0.1.ebuild
+++ b/media-sound/cantata/cantata-2.0.1.ebuild
@@ -12,7 +12,7 @@ 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"
+SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="cdda cddb http-server kde mtp musicbrainz qt5 replaygain taglib udisks"
 REQUIRED_USE="

diff --git a/profiles/updates/4Q-2016 b/profiles/updates/4Q-2016
index bb95fef..d85f062 100644
--- a/profiles/updates/4Q-2016
+++ b/profiles/updates/4Q-2016
@@ -18,3 +18,4 @@ move kde-base/ksysguard kde-plasma/ksysguard
 move dev-perl/google-api-adwords-perl dev-perl/Google-Ads-AdWords-Client
 move kde-misc/kscreen kde-plasma/kscreen
 move x11-libs/libkscreen kde-plasma/libkscreen
+slotmove media-sound/cantata 4 0

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

2016-11-05 Thread Michael Palimaka

commit: 54401847549e3a5ad53811646e63b69327a57376
Author: Andreas Sturmlechner  gmail  com>
AuthorDate: Sat Oct 22 21:09:00 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sat Nov  5 15:42:50 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54401847

media-sound/cantata: Drop USE=kde,qt5 and simplify ebuild

Add fixes for MPRIS and >=Plasma-5.7
X not used with Qt5 - upstream commit c934ae9ed5b8aeb3d8ff6a6b108b3cfe4fb30dea

Package-Manager: portage-2.3.0

 media-sound/cantata/cantata-2.0.1-r1.ebuild| 120 +
 .../files/cantata-2.0.1-mpris-plasma57.patch   |  46 
 .../cantata/files/cantata-2.0.1-mpris-true.patch   | 100 +
 .../cantata/files/cantata-2.0.1-qt5-no-X11.patch   |  14 +++
 4 files changed, 280 insertions(+)

diff --git a/media-sound/cantata/cantata-2.0.1-r1.ebuild 
b/media-sound/cantata/cantata-2.0.1-r1.ebuild
new file mode 100644
index ..b04563d
--- /dev/null
+++ b/media-sound/cantata/cantata-2.0.1-r1.ebuild
@@ -0,0 +1,120 @@
+# 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 fr 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 mtp musicbrainz replaygain taglib udisks"
+REQUIRED_USE="
+   cdda? ( udisks || ( cddb musicbrainz ) )
+   cddb? ( cdda taglib )
+   mtp? ( taglib udisks )
+   musicbrainz? ( cdda taglib )
+   replaygain? ( taglib )
+"
+
+RDEPEND="
+   dev-db/sqlite:3
+   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
+   sys-libs/zlib
+   || ( kde-frameworks/breeze-icons:5 kde-frameworks/oxygen-icons:* )
+   cdda? ( media-sound/cdparanoia )
+   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/linguist-tools:5
+"
+
+# cantata has no tests
+RESTRICT="test"
+
+PATCHES=(
+   "${FILESDIR}/${P}-mpris-true.patch"
+   "${FILESDIR}/${P}-mpris-plasma57.patch"
+   "${FILESDIR}/${P}-qt5-no-X11.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
+   rm -rf 3rdparty/qjson/ || 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_MTP=$(usex mtp)
+   -DENABLE_MUSICBRAINZ=$(usex musicbrainz)
+   -DENABLE_QT5=ON
+   -DLCONVERT_EXECUTABLE="$(qt5_get_bindir)/lconvert"
+   -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
+   -DUSE_SYSTEM_MENU_ICON=OFF
+   )
+#  -DENABLE_KDE=$(usex kde)# not yet ported to KF5
+
+   cmake-utils_src_configure
+}
+
+pkg_preinst() {
+   gnome2_icon_savelist
+   xdg_pkg_preinst
+}
+
+pkg_postinst() {
+   gnome2_icon_cache_update
+   xdg_pkg_postinst
+}
+
+pkg_postrm() {
+   gnome2_icon_cache_update
+   xdg_pkg_postrm
+}

diff --git a/media-sound/cantata/files/cantata-2.0.1-mpris-plasma57.patch 
b/media-sound/cantata/files/cantata-2.0.1-mpris-plasma57.patch
new file mode 100644
index ..3965b42
--- /dev/null
+++ b/media-sound/cantata/files/cantata-2.0.1-mpris-plasma57.patch
@@ -0,0 +1,46 @@
+Work-around KDE 5.7 MPRIS issues. 
+
+diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp
+index cc2b532..37eec9e 100644
+---

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

2016-07-21 Thread Michael Palimaka

commit: 838057b035a13d7c7d93b3f11575e12a46e3927c
Author: Michael Palimaka  gentoo  org>
AuthorDate: Thu Jul 21 09:39:31 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Thu Jul 21 09:40:15 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=838057b0

media-sound/cantata: >=media-libs/taglib-1.11 dropped asf and mp4 USE flags

Package-Manager: portage-2.3.0

 media-sound/cantata/cantata-2.0.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/cantata/cantata-2.0.1.ebuild 
b/media-sound/cantata/cantata-2.0.1.ebuild
index e78b448..2854beb 100644
--- a/media-sound/cantata/cantata-2.0.1.ebuild
+++ b/media-sound/cantata/cantata-2.0.1.ebuild
@@ -59,7 +59,7 @@ RDEPEND="
virtual/ffmpeg
)
taglib? (
-   media-libs/taglib[asf,mp4]
+   media-libs/taglib[asf(+),mp4(+)]
media-libs/taglib-extras
!kde? ( udisks? ( sys-fs/udisks:2 ) )
)

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

2016-06-06 Thread Johannes Huber

commit: 77470920402d7113bdec436af2ca5bc0a8c7057a
Author: Johannes Huber  gentoo  org>
AuthorDate: Mon Jun  6 07:06:28 2016 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Mon Jun  6 07:07:25 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77470920

media-sound/cantata: Version bump 2.0.1

Package-Manager: portage-2.3.0_rc1

 media-sound/cantata/Manifest |   1 +
 media-sound/cantata/cantata-2.0.1.ebuild | 141 +++
 2 files changed, 142 insertions(+)

diff --git a/media-sound/cantata/Manifest b/media-sound/cantata/Manifest
index 1f13682..574a44a 100644
--- a/media-sound/cantata/Manifest
+++ b/media-sound/cantata/Manifest
@@ -1 +1,2 @@
 DIST cantata-2.0.0.tar.bz2 2147821 SHA256 
6817611652e3e37a221e7b68fb41223b421ccc09688bfd718b1f5a2e34e81fa8 SHA512 
53cb56411bc6c79692e97d39d8d8cbf5cbbe683fe0c32a8f1222e477deba0ff0e71f5daf0a49cc9c72cefb113278692193964a99ad008a6f9fc0f59304482ed0
 WHIRLPOOL 
bffdc313a97e979f28be4ec28c2a06bf0406e6f23ccf7be2403d9167638d806f5f3e1d5f2e1ca1b376285b6d1586b955be5ba60dd546299d8ef5309ef0878c92
+DIST cantata-2.0.1.tar.bz2 2151126 SHA256 
122bda13c0b4078b84640dabef444b37d705d71c6f95209a2d949acd28a0bbca SHA512 
69ae0c67970ec43f407c5ad11c0ddf254060a16de5023b2fdaf14ad9637ad8be06101ebe6c5cb07283e058400b24d80177b89f10a7be486cdb994aed1ff5ba02
 WHIRLPOOL 
138fab5ebbe9418b2c2d37b5c479fa7118a4c567f9ecd2a1fe2f4f1ff53e78803ca1f0192c126940ab2409b13448631a6e96e4e1542255378ff2f237df46ea3c

diff --git a/media-sound/cantata/cantata-2.0.1.ebuild 
b/media-sound/cantata/cantata-2.0.1.ebuild
new file mode 100644
index 000..e78b448
--- /dev/null
+++ b/media-sound/cantata/cantata-2.0.1.ebuild
@@ -0,0 +1,141 @@
+# 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 fr 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"
+
+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 musicbrainz)
+   -DENABLE_QT5=$(usex qt5)
+   -DENABLE_FFMPEG=$(usex replaygain)
+   -DENABLE_MPG123=$(usex replaygain)
+   -DENABLE_TAGLIB=$(usex taglib)
+   -DENABLE_TAGLIB_EXTRAS=$(usex taglib)
+

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

2016-06-06 Thread Johannes Huber

commit: 1742f8a68cf972a7de7e9e321c279ec008f33396
Author: Johannes Huber  gentoo  org>
AuthorDate: Mon Jun  6 07:07:17 2016 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Mon Jun  6 07:07:25 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1742f8a6

media-sound/cantata: Remove 2.0.0

Package-Manager: portage-2.3.0_rc1

 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 deletions(-)

diff --git a/media-sound/cantata/Manifest b/media-sound/cantata/Manifest
index 574a44a..c7c120f 100644
--- a/media-sound/cantata/Manifest
+++ b/media-sound/cantata/Manifest
@@ -1,2 +1 @@
-DIST cantata-2.0.0.tar.bz2 2147821 SHA256 
6817611652e3e37a221e7b68fb41223b421ccc09688bfd718b1f5a2e34e81fa8 SHA512 
53cb56411bc6c79692e97d39d8d8cbf5cbbe683fe0c32a8f1222e477deba0ff0e71f5daf0a49cc9c72cefb113278692193964a99ad008a6f9fc0f59304482ed0
 WHIRLPOOL 
bffdc313a97e979f28be4ec28c2a06bf0406e6f23ccf7be2403d9167638d806f5f3e1d5f2e1ca1b376285b6d1586b955be5ba60dd546299d8ef5309ef0878c92
 DIST cantata-2.0.1.tar.bz2 2151126 SHA256 
122bda13c0b4078b84640dabef444b37d705d71c6f95209a2d949acd28a0bbca SHA512 
69ae0c67970ec43f407c5ad11c0ddf254060a16de5023b2fdaf14ad9637ad8be06101ebe6c5cb07283e058400b24d80177b89f10a7be486cdb994aed1ff5ba02
 WHIRLPOOL 
138fab5ebbe9418b2c2d37b5c479fa7118a4c567f9ecd2a1fe2f4f1ff53e78803ca1f0192c126940ab2409b13448631a6e96e4e1542255378ff2f237df46ea3c

diff --git a/media-sound/cantata/cantata-2.0.0.ebuild 
b/media-sound/cantata/cantata-2.0.0.ebuild
deleted file mode 100644
index 09091f2..000
--- a/media-sound/cantata/cantata-2.0.0.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# 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 musicbrainz)
-   -DENABLE_QT5=$(usex qt5)
-

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

2016-05-17 Thread Johannes Huber

commit: beb01c50a352b56bfa0f9af5dc475e19919b1a6e
Author: Johannes Huber  gentoo  org>
AuthorDate: Tue May 17 13:28:10 2016 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Tue May 17 13:28:56 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=beb01c50

media-sound/cantata: Remove 1.5.1

Package-Manager: portage-2.3.0_rc1

 media-sound/cantata/Manifest |   1 -
 media-sound/cantata/cantata-1.5.1.ebuild | 121 ---
 media-sound/cantata/metadata.xml |   3 -
 3 files changed, 125 deletions(-)

diff --git a/media-sound/cantata/Manifest b/media-sound/cantata/Manifest
index b30446d..1f13682 100644
--- a/media-sound/cantata/Manifest
+++ b/media-sound/cantata/Manifest
@@ -1,2 +1 @@
-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-1.5.1.ebuild 
b/media-sound/cantata/cantata-1.5.1.ebuild
deleted file mode 100644
index a116dd7..000
--- a/media-sound/cantata/cantata-1.5.1.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_REQUIRED="optional"
-PLOCALES="cs de en_GB es hu ko pl ru zh_CN"
-inherit kde4-base l10n
-
-DESCRIPTION="Featureful and configurable Qt client for the music player daemon 
(MPD)"
-HOMEPAGE="https://github.com/cdrummond/cantata;
-SRC_URI="https://drive.google.com/uc?export=download=0Bzghs6gQWi60UktwaTRMTjRIUW8
 -> ${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="4"
-KEYWORDS="~amd64 ~x86"
-IUSE="cddb cdda dynamic http-server kde lame mtp musicbrainz online-services 
qt5 replaygain streams taglib udisks"
-REQUIRED_USE="
-   cddb? ( cdda taglib )
-   cdda? ( udisks || ( cddb musicbrainz )  )
-   lame? ( cdda taglib )
-   mtp? ( taglib udisks )
-   musicbrainz? ( cdda taglib )
-   online-services? ( taglib )
-   qt5? ( !kde )
-   replaygain? ( taglib )
-"
-
-RDEPEND="
-   sys-libs/zlib
-   x11-libs/libX11
-   kde-frameworks/oxygen-icons
-   cdda? ( media-sound/cdparanoia )
-   cddb? ( media-libs/libcddb )
-   kde? ( $(add_kdeapps_dep kwalletd) )
-   lame? ( media-sound/lame )
-   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/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/qtsvg:4
-   )
-   replaygain? (
-   media-sound/mpg123
-   virtual/ffmpeg
-   )
-   taglib? (
-   media-libs/taglib[asf,mp4]
-   media-libs/taglib-extras
-   !kde? ( udisks? ( sys-fs/udisks:2 ) )
-   )
-"
-DEPEND="${RDEPEND}
-   sys-devel/gettext
-   qt5? ( dev-qt/linguist-tools:5 )
-"
-RDEPEND="${RDEPEND}
-   dynamic? (
-   dev-lang/perl[ithreads]
-   dev-perl/URI
-   )
-"
-
-# cantata has no tests
-RESTRICT="test"
-
-src_prepare() {
-   kde4-base_src_prepare
-
-   rm -rf 3rdparty/qtsingleapplication/ || 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// /;}"
-   $(cmake-utils_use_enable cdda CDPARANOIA)
-   $(cmake-utils_use_enable cddb)
-   $(cmake-utils_use_enable dynamic)
-   $(cmake-utils_use_enable http-server HTTP_SERVER)
-   $(cmake-utils_use_enable kde)
-   $(cmake-utils_use_enable kde kwallet)
-   $(cmake-utils_use_enable lame)
-   $(cmake-utils_use_enable mtp)
-   $(cmake-utils_use_enable musicbrainz)
-   $(cmake-utils_use_enable

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

2016-05-04 Thread Johannes Huber

commit: 06f9b9bb9f1ef48268fe62845c5dd8816cb3b58f
Author: ci...@gentoo.org  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

[gentoo-commits] repo/gentoo:master commit in: media-sound/cantata/, virtual/freedesktop-icon-theme/, www-client/chromium/, ...

2015-11-13 Thread Michael Palimaka

commit: b9db3a043ecd2585f5bbcc9d28362e7fab44fdac
Author: Andreas Sturmlechner  gmail  com>
AuthorDate: Tue Nov 10 02:16:40 2015 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Fri Nov 13 16:46:20 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9db3a04

kde-apps/oxygen-icons: pkgmove to kde-frameworks/oxygen-icons

kde4-base.eclass: Recognize KDEBASE in kde-frameworks
kde4-functions.eclass: Change RDEPEND
chromium.eclass: Minor change
Various ebuilds: kde-apps/oxygen-icons -> kde-frameworks/oxygen-icons

Package-Manager: portage-2.2.23

 app-leechcraft/lc-core/lc-core-0.6.60.ebuild  | 2 +-
 app-leechcraft/lc-core/lc-core-0.6.65.ebuild  | 2 +-
 app-leechcraft/lc-core/lc-core-0.6.70.ebuild  | 2 +-
 app-leechcraft/lc-core/lc-core-.ebuild| 2 +-
 eclass/chromium.eclass| 2 +-
 eclass/kde4-base.eclass   | 2 +-
 eclass/kde4-functions.eclass  | 2 +-
 {kde-apps => kde-frameworks}/oxygen-icons/Manifest| 0
 {kde-apps => kde-frameworks}/oxygen-icons/metadata.xml| 0
 {kde-apps => kde-frameworks}/oxygen-icons/oxygen-icons-4.14.3.ebuild  | 0
 lxqt-base/lxqt-meta/lxqt-meta-0.9.0-r2.ebuild | 4 ++--
 media-sound/cantata/cantata-1.5.1.ebuild  | 2 +-
 net-im/qutim/qutim-0.3.2.ebuild   | 2 +-
 net-im/qutim/qutim-0.3.3_p1.ebuild| 2 +-
 net-irc/quassel/quassel-0.12.2-r2.ebuild  | 2 +-
 net-irc/quassel/quassel-0.12.2.ebuild | 2 +-
 net-irc/quassel/quassel-.ebuild   | 2 +-
 profiles/updates/4Q-2015  | 1 +
 virtual/freedesktop-icon-theme/freedesktop-icon-theme-0.ebuild| 2 +-
 www-client/chromium/chromium-46.0.2490.86.ebuild  | 2 +-
 www-client/chromium/chromium-47.0.2526.49.ebuild  | 2 +-
 www-client/chromium/chromium-47.0.2526.58.ebuild  | 2 +-
 www-client/chromium/chromium-48.0.2547.0.ebuild   | 2 +-
 www-client/chromium/chromium-48.0.2552.0.ebuild   | 2 +-
 .../google-chrome-unstable-48.0.2560.0_p1.ebuild  | 2 +-
 www-client/google-chrome/google-chrome-46.0.2490.86_p1.ebuild | 2 +-
 x11-themes/oxygen-molecule/oxygen-molecule-3.2.ebuild | 2 +-
 x11-themes/tangerine-icon-theme/tangerine-icon-theme-0.27.ebuild  | 2 +-
 28 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/app-leechcraft/lc-core/lc-core-0.6.60.ebuild 
b/app-leechcraft/lc-core/lc-core-0.6.60.ebuild
index e811201..4f1323d 100644
--- a/app-leechcraft/lc-core/lc-core-0.6.60.ebuild
+++ b/app-leechcraft/lc-core/lc-core-0.6.60.ebuild
@@ -29,7 +29,7 @@ DEPEND="${COMMON_DEPEND}
 RDEPEND="${COMMON_DEPEND}
dev-qt/qtsvg:4
|| (
-   kde-apps/oxygen-icons
+   kde-frameworks/oxygen-icons
x11-themes/kfaenza
 )"
 

diff --git a/app-leechcraft/lc-core/lc-core-0.6.65.ebuild 
b/app-leechcraft/lc-core/lc-core-0.6.65.ebuild
index 80761a9..1df615c 100644
--- a/app-leechcraft/lc-core/lc-core-0.6.65.ebuild
+++ b/app-leechcraft/lc-core/lc-core-0.6.65.ebuild
@@ -29,7 +29,7 @@ DEPEND="${COMMON_DEPEND}
 RDEPEND="${COMMON_DEPEND}
dev-qt/qtsvg:4
|| (
-   kde-apps/oxygen-icons
+   kde-frameworks/oxygen-icons
x11-themes/kfaenza
 )"
 

diff --git a/app-leechcraft/lc-core/lc-core-0.6.70.ebuild 
b/app-leechcraft/lc-core/lc-core-0.6.70.ebuild
index 5defdda..f7ca3c9 100644
--- a/app-leechcraft/lc-core/lc-core-0.6.70.ebuild
+++ b/app-leechcraft/lc-core/lc-core-0.6.70.ebuild
@@ -30,7 +30,7 @@ DEPEND="${COMMON_DEPEND}
 RDEPEND="${COMMON_DEPEND}
dev-qt/qtsvg:4
|| (
-   kde-apps/oxygen-icons
+   kde-frameworks/oxygen-icons
x11-themes/kfaenza
 )"
 

diff --git a/app-leechcraft/lc-core/lc-core-.ebuild 
b/app-leechcraft/lc-core/lc-core-.ebuild
index df3e7fb..a0eb2c1 100644
--- a/app-leechcraft/lc-core/lc-core-.ebuild
+++ b/app-leechcraft/lc-core/lc-core-.ebuild
@@ -30,7 +30,7 @@ DEPEND="${COMMON_DEPEND}
 RDEPEND="${COMMON_DEPEND}
dev-qt/qtsvg:4
|| (
-   kde-apps/oxygen-icons
+   kde-frameworks/oxygen-icons
x11-themes/kfaenza
 )"
 

diff --git a/eclass/chromium.eclass b/eclass/chromium.eclass
index e4da665..ae6a84b 100644
--- a/eclass/chromium.eclass
+++ b/eclass/chromium.eclass
@@ -140,7 +140,7 @@ chromium_pkg_postinst() {
elog "Depending on your desktop environment, you may need"

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

2015-09-01 Thread Tobias Klausmann

commit: c86866fd045e5ce494c180ae0bf537572d271e7b
Author: Tobias Klausmann  gentoo  org>
AuthorDate: Tue Sep  1 19:44:45 2015 +
Commit: Tobias Klausmann  gentoo  org>
CommitDate: Tue Sep  1 19:45:31 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c86866fd

media-sound/cantata: Fixing HOMEPAGE move due to code.google.com shutdown

Package-Manager: portage-2.2.20.1

 media-sound/cantata/cantata-1.5.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/cantata/cantata-1.5.1.ebuild 
b/media-sound/cantata/cantata-1.5.1.ebuild
index 7112c05..743ff14 100644
--- a/media-sound/cantata/cantata-1.5.1.ebuild
+++ b/media-sound/cantata/cantata-1.5.1.ebuild
@@ -9,7 +9,7 @@ PLOCALES="cs de en_GB es hu ko pl ru zh_CN"
 inherit kde4-base l10n
 
 DESCRIPTION="Featureful and configurable Qt client for the music player daemon 
(MPD)"
-HOMEPAGE="https://code.google.com/p/cantata/;
+HOMEPAGE="https://github.com/cdrummond/cantata;
 
SRC_URI="https://drive.google.com/uc?export=download=0Bzghs6gQWi60UktwaTRMTjRIUW8
 -> ${P}.tar.bz2"
 
 LICENSE="GPL-2"

56 matches

Mail list logo