[gentoo-commits] proj/kde-sunset:master commit in: media-sound/amarok/

[gentoo-commits] proj/kde-sunset:master commit in: media-sound/amarok/

[Andreas Sturmlechner]

commit:     e1d7d29edb86b927d61574de3514a3247b60740d
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 12 20:40:51 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Sep 12 20:40:51 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=e1d7d29e

media-sound/amarok: Drop USE=embedded, fix USE=test

virtual/mysql[embedded] is gone and has no future.

 media-sound/amarok/amarok-2.8.90-r5.ebuild | 33 +++++++++++++-----------------
 1 file changed, 14 insertions(+), 19 deletions(-)

diff --git a/media-sound/amarok/amarok-2.8.90-r5.ebuild b/media-sound/amarok/amarok-2.8.90-r5.ebuild
index ee89cf9..6df63b2 100644
--- a/media-sound/amarok/amarok-2.8.90-r5.ebuild
+++ b/media-sound/amarok/amarok-2.8.90-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,7 +19,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="4"
-IUSE="debug +embedded ipod lastfm mp3tunes mtp ofa test +utils"
+IUSE="debug ipod lastfm mp3tunes mtp ofa test +utils"
 
 if [[ ${KDE_BUILD_TYPE} == live ]]; then
 	RESTRICT+=" test"
@@ -36,7 +36,7 @@ COMMONDEPEND="
 	>=media-libs/taglib-1.7[asf(+),mp4(+)]
 	>=media-libs/taglib-extras-1.0.1
 	sys-libs/zlib
-	>=virtual/mysql-5.1[embedded?]
+	>=virtual/mysql-5.1
 	>=x11-libs/qtscriptgenerator-0.1.0
 	ipod? ( >=media-libs/libgpod-0.7.0[gtk] )
 	lastfm? ( >=media-libs/liblastfm-1.0.3[qt4] )
@@ -54,7 +54,7 @@ COMMONDEPEND="
 DEPEND="${COMMONDEPEND}
 	dev-util/automoc
 	virtual/pkgconfig
-	test? ( dev-cpp/gmock )
+	test? ( >=dev-cpp/gtest-1.8.0 )
 "
 RDEPEND="${COMMONDEPEND}
 	!media-sound/amarok-utils
@@ -94,7 +94,7 @@ src_configure() {
 		-DWITH_PLAYER=ON
 		-DWITH_NepomukCore=OFF
 		-DWITH_Soprano=OFF
-		-DWITH_MYSQL_EMBEDDED=$(usex embedded)
+		-DWITH_MYSQL_EMBEDDED=OFF
 		-DWITH_IPOD=$(usex ipod)
 		-DWITH_LibLastFm=$(usex lastfm)
 		-DWITH_MP3Tunes=$(usex mp3tunes)
@@ -106,9 +106,6 @@ src_configure() {
 	use ipod && mycmakeargs+=( DWITH_GDKPixBuf=ON )
 	use mp3tunes && mycmakeargs+=( -DWITH_Libgcrypt=OFF )
 
-	# bug 581554: add libmysqld location for rpath patch
-	use embedded && mycmakeargs+=( -DMYSQLD_DIR="${EPREFIX}/usr/$(get_libdir)/mysql" )
-
 	kde4-base_src_configure
 }
 
@@ -122,16 +119,14 @@ src_install() {
 pkg_postinst() {
 	kde4-base_pkg_postinst
 
-	if ! use embedded; then
-		elog "You've disabled the amarok support for embedded mysql DBs."
-		elog "You'll have to configure amarok to use an external db server."
-		elog "Please read https://community.kde.org/Amarok/Community/MySQL for details on how"
-		elog "to configure the external db and migrate your data from the embedded database."
-
-		if has_version "virtual/mysql[minimal]"; then
-			elog
-			elog "You built mysql with the minimal use flag, so it doesn't include the server."
-			elog "You won't be able to use the local mysql installation to store your amarok collection."
-		fi
+	elog "You've disabled the amarok support for embedded mysql DBs."
+	elog "You'll have to configure amarok to use an external db server."
+	elog "Please read https://community.kde.org/Amarok/Community/MySQL for details on how"
+	elog "to configure the external db and migrate your data from the embedded database."
+
+	if has_version "virtual/mysql[minimal]"; then
+		elog
+		elog "You built mysql with the minimal use flag, so it doesn't include the server."
+		elog "You won't be able to use the local mysql installation to store your amarok collection."
 	fi
 }

[gentoo-commits] proj/kde-sunset:master commit in: media-sound/amarok/

[Andreas Sturmlechner]

commit:     83cf34656728bb859b525fe91fa1717fc5512924
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 12 20:20:14 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Sep 12 20:20:39 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=83cf3465

media-sound/amarok: Drop invalid maintainer entry

 media-sound/amarok/metadata.xml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/media-sound/amarok/metadata.xml b/media-sound/amarok/metadata.xml
index d2cdd9d..a08ee0e 100644
--- a/media-sound/amarok/metadata.xml
+++ b/media-sound/amarok/metadata.xml
@@ -2,9 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <!-- maintainer-needed -->
-  <maintainer>
-    <email>jmbsvicetto@gentoo.org</email>
-  </maintainer>
   <use>
     <flag name="amazon">Enable support for downloading covers from amazon.com</flag>
     <flag name="daap">

[gentoo-commits] proj/kde-sunset:master commit in: media-sound/amarok/

[Andreas Sturmlechner]

commit:     aced358851d2c4f83ddb35773694f5932e50d4a2
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 12 20:44:14 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Sep 12 20:44:14 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=aced3588

media-sound/amarok: Enforce virtual/mysql[-minimal] in DEPENDs

Now that we do not have a choice anymore.

 media-sound/amarok/amarok-2.8.90-r5.ebuild | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/media-sound/amarok/amarok-2.8.90-r5.ebuild b/media-sound/amarok/amarok-2.8.90-r5.ebuild
index 6df63b2..0a6200a 100644
--- a/media-sound/amarok/amarok-2.8.90-r5.ebuild
+++ b/media-sound/amarok/amarok-2.8.90-r5.ebuild
@@ -36,7 +36,7 @@ COMMONDEPEND="
 	>=media-libs/taglib-1.7[asf(+),mp4(+)]
 	>=media-libs/taglib-extras-1.0.1
 	sys-libs/zlib
-	>=virtual/mysql-5.1
+	>=virtual/mysql-5.1[-minimal(-)]
 	>=x11-libs/qtscriptgenerator-0.1.0
 	ipod? ( >=media-libs/libgpod-0.7.0[gtk] )
 	lastfm? ( >=media-libs/liblastfm-1.0.3[qt4] )
@@ -123,10 +123,4 @@ pkg_postinst() {
 	elog "You'll have to configure amarok to use an external db server."
 	elog "Please read https://community.kde.org/Amarok/Community/MySQL for details on how"
 	elog "to configure the external db and migrate your data from the embedded database."
-
-	if has_version "virtual/mysql[minimal]"; then
-		elog
-		elog "You built mysql with the minimal use flag, so it doesn't include the server."
-		elog "You won't be able to use the local mysql installation to store your amarok collection."
-	fi
 }

[gentoo-commits] proj/kde-sunset:master commit in: media-sound/amarok/

[Andreas Sturmlechner]

commit:     4b4cac8b74c6c33104aad1636968c8ff1782495a
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 23 15:21:18 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Aug 23 19:05:30 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=4b4cac8b

media-sound/amarok: Depend on app-crypt/qca:2-qt4 +some fixes

Add missing IUSE="ofa,utils" metadata.xml descriptions

Package-Manager: Portage-3.0.4, Repoman-3.0.1
RepoMan-Options: --force
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-sound/amarok/amarok-2.8.90-r5.ebuild | 4 ++--
 media-sound/amarok/metadata.xml            | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/media-sound/amarok/amarok-2.8.90-r5.ebuild b/media-sound/amarok/amarok-2.8.90-r5.ebuild
index 0a6200a1..51e61eb6 100644
--- a/media-sound/amarok/amarok-2.8.90-r5.ebuild
+++ b/media-sound/amarok/amarok-2.8.90-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -28,7 +28,7 @@ fi
 # ipod requires gdk enabled and also gtk compiled in libgpod
 COMMONDEPEND="
 	$(add_kdeapps_dep kdebase-kioslaves)
-	app-crypt/qca:2[qt4]
+	app-crypt/qca:2-qt4
 	>=dev-qt/qtcore-4.8:4
 	>=dev-qt/qtdbus-4.8:4
 	>=dev-qt/qtscript-4.8:4

diff --git a/media-sound/amarok/metadata.xml b/media-sound/amarok/metadata.xml
index a08ee0ef..600d6c87 100644
--- a/media-sound/amarok/metadata.xml
+++ b/media-sound/amarok/metadata.xml
@@ -21,6 +21,9 @@
       GPL-incompatible license.
     </flag>
     <flag name="njb">Enable support for NJB (Creative) devices access through libnjb</flag>
+    <flag name="ofa">Use <pkg>media-libs/libofa</pkg> to compute MusicDNS acoustic
+      fingerprints (used by MusicBrainz)
+    </flag>
     <flag name="python">
       Install the Amarok scripts written in Python, depending on
       <pkg>dev-python/PyQt</pkg>. At the moment the only script
@@ -35,6 +38,7 @@
       package will not be redistributable, as it links to the non-GPL compatible
       RealPlayer.
     </flag>
+    <flag name="utils">Build the utils - old media-sound/amarok-utils</flag>
     <flag name="visualization">
       Support visualization plugins through <pkg>media-libs/libvisual</pkg>
     </flag>

[gentoo-commits] proj/kde-sunset:master commit in: media-sound/amarok/

[Andreas Sturmlechner]

commit:     b8e3f0c34e6e7f221a8a213c96b3949b2f670b08
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 24 14:46:42 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Nov 30 00:51:52 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=b8e3f0c3

media-sound/amarok: Cleanup metadata.xml

Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-sound/amarok/metadata.xml | 33 ---------------------------------
 1 file changed, 33 deletions(-)

diff --git a/media-sound/amarok/metadata.xml b/media-sound/amarok/metadata.xml
index 600d6c87..6934b264 100644
--- a/media-sound/amarok/metadata.xml
+++ b/media-sound/amarok/metadata.xml
@@ -3,44 +3,11 @@
 <pkgmetadata>
   <!-- maintainer-needed -->
   <use>
-    <flag name="amazon">Enable support for downloading covers from amazon.com</flag>
-    <flag name="daap">
-      Enable the scripts for music sharing through DAAP. This flag adds
-      dependencies on <pkg>www-servers/mongrel</pkg> to allow sharing of
-      the Amarok music collection through DAAP protocol. Please note
-      that turning this flag off has no effect on DAAP browsing.
-    </flag>
-    <flag name="ifp">Enable support for iRiver devices access through libifp</flag>
     <flag name="lastfm">Enable Last.fm streaming services support through <pkg>media-libs/liblastfm</pkg></flag>
     <flag name="mp3tunes">Enable mp3tunes integration</flag>
-    <flag name="mp4">
-      Build the TagLib plugin for writing tags in Mp4 container files
-      (m4a). Please note that by enabling this USE flag, the resulting
-      package will not be redistributable, as it links to
-      <pkg>media-libs/libmp4v2</pkg>, distributed under a
-      GPL-incompatible license.
-    </flag>
-    <flag name="njb">Enable support for NJB (Creative) devices access through libnjb</flag>
     <flag name="ofa">Use <pkg>media-libs/libofa</pkg> to compute MusicDNS acoustic
       fingerprints (used by MusicBrainz)
     </flag>
-    <flag name="python">
-      Install the Amarok scripts written in Python, depending on
-      <pkg>dev-python/PyQt</pkg>. At the moment the only script
-      installed by this flag is the webcontrol script.
-    </flag>
-    <flag name="real">
-      Build the Helix engine for Amarok, linked against
-      <pkg>media-video/realplayer</pkg>. This is an alternative engine
-      to the xine one, which supports a different set of formats. Only
-      available for x86 architecture as it uses the binary version of
-      RealPlayer. Please note that by enabling this USE flag, the resulting
-      package will not be redistributable, as it links to the non-GPL compatible
-      RealPlayer.
-    </flag>
     <flag name="utils">Build the utils - old media-sound/amarok-utils</flag>
-    <flag name="visualization">
-      Support visualization plugins through <pkg>media-libs/libvisual</pkg>
-    </flag>
   </use>
 </pkgmetadata>

[gentoo-commits] proj/kde-sunset:master commit in: media-sound/amarok/

[Andreas Sturmlechner]

commit:     9c6d426c32fdc6b2a2c89164927f0ca2807fc0f4
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Dec  3 00:32:57 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Dec  3 00:45:57 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=9c6d426c

media-sound/amarok: Fix MissingUseDepDefault, obsolete live switches

Package-Manager: Portage-3.0.11, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-sound/amarok/amarok-2.8.90-r5.ebuild | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/media-sound/amarok/amarok-2.8.90-r5.ebuild b/media-sound/amarok/amarok-2.8.90-r5.ebuild
index 51e61eb6..2e91ab06 100644
--- a/media-sound/amarok/amarok-2.8.90-r5.ebuild
+++ b/media-sound/amarok/amarok-2.8.90-r5.ebuild
@@ -12,19 +12,13 @@ inherit flag-o-matic kde4-base pax-utils
 
 DESCRIPTION="Advanced audio player based on KDE framework"
 HOMEPAGE="https://amarok.kde.org/"
-if [[ ${PV} != *9999* ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-	KEYWORDS="amd64 x86"
-fi
+SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="4"
+KEYWORDS="amd64 x86"
 IUSE="debug ipod lastfm mp3tunes mtp ofa test +utils"
 
-if [[ ${KDE_BUILD_TYPE} == live ]]; then
-	RESTRICT+=" test"
-fi
-
 # ipod requires gdk enabled and also gtk compiled in libgpod
 COMMONDEPEND="
 	$(add_kdeapps_dep kdebase-kioslaves)
@@ -39,7 +33,7 @@ COMMONDEPEND="
 	>=virtual/mysql-5.1[-minimal(-)]
 	>=x11-libs/qtscriptgenerator-0.1.0
 	ipod? ( >=media-libs/libgpod-0.7.0[gtk] )
-	lastfm? ( >=media-libs/liblastfm-1.0.3[qt4] )
+	lastfm? ( >=media-libs/liblastfm-1.0.3[qt4(-)] )
 	mp3tunes? (
 		dev-libs/glib:2
 		dev-libs/libxml2

[gentoo-commits] proj/kde-sunset:master commit in: media-sound/amarok/

[Andreas Sturmlechner]

commit:     bb7cd047e1d6447a46987135e355ac42b3d3f54b
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Dec  7 23:29:48 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Dec  7 23:29:48 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=bb7cd047

media-sound/amarok: Switch to media-libs/liblastfm:0-qt4

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-sound/amarok/amarok-2.8.90-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/amarok/amarok-2.8.90-r5.ebuild b/media-sound/amarok/amarok-2.8.90-r5.ebuild
index 2e91ab06..512712a6 100644
--- a/media-sound/amarok/amarok-2.8.90-r5.ebuild
+++ b/media-sound/amarok/amarok-2.8.90-r5.ebuild
@@ -33,7 +33,7 @@ COMMONDEPEND="
 	>=virtual/mysql-5.1[-minimal(-)]
 	>=x11-libs/qtscriptgenerator-0.1.0
 	ipod? ( >=media-libs/libgpod-0.7.0[gtk] )
-	lastfm? ( >=media-libs/liblastfm-1.0.3[qt4(-)] )
+	lastfm? ( media-libs/liblastfm:0-qt4 )
 	mp3tunes? (
 		dev-libs/glib:2
 		dev-libs/libxml2