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

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

[Andreas Sturmlechner]

commit:     303548c5add9046a3c9465a2f5002b579580001c
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Feb  7 22:50:12 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Feb  7 22:50:12 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=303548c5

media-sound/amarok: Remove virtual/mysql from RDEPEND, more postinst

There is a slim chance that someone indeed would run a shared DB instance.

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

 media-sound/amarok/amarok-9999.ebuild | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/media-sound/amarok/amarok-9999.ebuild b/media-sound/amarok/amarok-9999.ebuild
index 6ff515262e..58fdd12eba 100644
--- a/media-sound/amarok/amarok-9999.ebuild
+++ b/media-sound/amarok/amarok-9999.ebuild
@@ -77,7 +77,6 @@ DEPEND="
 RDEPEND="${DEPEND}
 	!media-sound/amarok:4
 	$(add_qt_dep qtquickcontrols2)
-	virtual/mysql
 "
 
 PATCHES=( "${FILESDIR}"/${PN}-2.8.90-mysqld-rpath.patch )
@@ -113,7 +112,15 @@ src_install() {
 pkg_postinst() {
 	kde5_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."
+	pkg_is_installed() {
+		echo "${1} ($(has_version ${1} || echo "not ")installed)"
+	}
+
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog "You'll have to configure amarok to use an external db server, one of:"
+		elog "    $(pkg_is_installed dev-db/mariadb)"
+		elog "    $(pkg_is_installed dev-db/mysql)"
+		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."
+	fi
 }

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

[Andreas Sturmlechner]

commit:     a22380e25c7176d1f4ddb76b4a4510d8cdc4a254
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 15 19:08:16 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Oct 15 20:10:19 2024 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=a22380e2

media-sound/amarok: Fix IUSE ipod cmake arg

Bug: https://bugs.gentoo.org/941528
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

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

diff --git a/media-sound/amarok/amarok-9999.ebuild b/media-sound/amarok/amarok-9999.ebuild
index 4c29047a8b..9b589d73ee 100644
--- a/media-sound/amarok/amarok-9999.ebuild
+++ b/media-sound/amarok/amarok-9999.ebuild
@@ -102,7 +102,7 @@ src_configure() {
 # 		$(cmake_use_find_package podcast Mygpo-qt5)
 		$(cmake_use_find_package wikipedia Qt6WebEngineWidgets)
 	)
-	use ipod && mycmakeargs+=( DWITH_GDKPixBuf=ON )
+	use ipod && mycmakeargs+=( -DWITH_GDKPixBuf=ON )
 
 	ecm_src_configure
 }

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

[Andreas Sturmlechner]

commit:     628a579bcea793d9314006df14694ef49c03af1e
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 13 10:49:19 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Oct 13 11:00:43 2024 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=628a579b

media-sound/amarok: Port to KF6

See also:
https://invent.kde.org/multimedia/amarok/-/issues/8

Bug: https://bugs.gentoo.org/931836
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-sound/amarok/amarok-9999.ebuild | 114 ++++++++++++++++------------------
 media-sound/amarok/metadata.xml       |   4 +-
 2 files changed, 57 insertions(+), 61 deletions(-)

diff --git a/media-sound/amarok/amarok-9999.ebuild b/media-sound/amarok/amarok-9999.ebuild
index 38ebe9e8dd..4c29047a8b 100644
--- a/media-sound/amarok/amarok-9999.ebuild
+++ b/media-sound/amarok/amarok-9999.ebuild
@@ -4,60 +4,58 @@
 EAPI=8
 
 ECM_HANDBOOK="forceoptional"
-KFMIN=5.115.0
-QTMIN=5.15.12
-PYTHON_COMPAT=( python3_{10..12} )
+KFMIN=6.5.0
+QTMIN=6.7.2
+PYTHON_COMPAT=( python3_{10..13} )
 inherit ecm kde.org optfeature python-any-r1
 
-DESCRIPTION="Advanced audio player based on KDE frameworks"
+DESCRIPTION="Advanced audio player based on KDE Frameworks"
 HOMEPAGE="https://amarok.kde.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="ipod lastfm mariadb mtp podcast wikipedia"
+IUSE="ipod mariadb mtp wikipedia" # lastfm podcast
 
 # ipod requires gdk enabled and also gtk compiled in libgpod
-COMMON_DEPEND="
-	>=app-crypt/qca-2.3.0:2[qt5(+)]
-	>=dev-qt/designer-${QTMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/attica-${KFMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/kdnssd-${KFMIN}:5
-	>=kde-frameworks/kglobalaccel-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kpackage-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktexteditor-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/solid-${KFMIN}:5
-	>=kde-frameworks/threadweaver-${KFMIN}:5
-	>=media-libs/phonon-4.12.0[qt5(-)]
+DEPEND="
+	>=app-crypt/qca-2.3.9:2[qt6(+)]
+	>=dev-qt/qt5compat-${QTMIN}:6
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,sql,widgets,xml]
+	>=dev-qt/qtdeclarative-${QTMIN}:6
+	>=dev-qt/qtsvg-${QTMIN}:6
+	>=dev-qt/qttools-${QTMIN}:6[designer]
+	>=kde-frameworks/attica-${KFMIN}:6
+	>=kde-frameworks/karchive-${KFMIN}:6
+	>=kde-frameworks/kcmutils-${KFMIN}:6
+	>=kde-frameworks/kcodecs-${KFMIN}:6
+	>=kde-frameworks/kcolorscheme-${KFMIN}:6
+	>=kde-frameworks/kcompletion-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/kdeclarative-${KFMIN}:6
+	>=kde-frameworks/kdnssd-${KFMIN}:6
+	>=kde-frameworks/kglobalaccel-${KFMIN}:6
+	>=kde-frameworks/kguiaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kiconthemes-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kitemviews-${KFMIN}:6
+	>=kde-frameworks/knewstuff-${KFMIN}:6
+	>=kde-frameworks/knotifications-${KFMIN}:6
+	>=kde-frameworks/kpackage-${KFMIN}:6
+	>=kde-frameworks/kservice-${KFMIN}:6
+	>=kde-frameworks/kstatusnotifieritem-${KFMIN}:6
+	>=kde-frameworks/ktexteditor-${KFMIN}:6
+	>=kde-frameworks/ktextwidgets-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kwindowsystem-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	>=kde-frameworks/solid-${KFMIN}:6
+	>=kde-frameworks/threadweaver-${KFMIN}:6
+	>=media-libs/phonon-4.12.0[qt6(+)]
 	>=media-libs/taglib-1.12:=
 	media-libs/taglib-extras
 	sci-libs/fftw:3.0
@@ -67,22 +65,19 @@ COMMON_DEPEND="
 		dev-libs/glib:2
 		media-libs/libgpod[gtk]
 	)
-	lastfm? ( >=media-libs/liblastfm-1.1.0_pre20150206 )
 	mariadb? ( dev-db/mariadb-connector-c:= )
 	!mariadb? ( dev-db/mysql-connector-c:= )
 	mtp? ( media-libs/libmtp )
-	podcast? ( >=media-libs/libmygpo-qt-1.0.9_p20180307 )
-	wikipedia? ( >=dev-qt/qtwebengine-${QTMIN}:5 )
+	wikipedia? ( >=dev-qt/qtwebengine-${QTMIN}:6[widgets] )
 "
-DEPEND="${COMMON_DEPEND}
-	>=dev-qt/linguist-tools-${QTMIN}:5
-"
-RDEPEND="${COMMON_DEPEND}
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
+# 	lastfm? ( >=media-libs/liblastfm-1.1.0_pre20150206 )
+# 	podcast? ( >=media-libs/libmygpo-qt-1.0.9_p20180307 )
+RDEPEND="${DEPEND}
+	>=kde-frameworks/kirigami-${KFMIN}:6
 	media-video/ffmpeg
 "
 BDEPEND="${PYTHON_DEPS}
+	>=dev-qt/qttools-${QTMIN}:6[linguist]
 	virtual/pkgconfig
 "
 
@@ -93,6 +88,7 @@ pkg_setup() {
 
 src_configure() {
 	local mycmakeargs=(
+		-DBUILD_WITH_QT6=ON
 		-DWITH_MP3Tunes=OFF
 		-DWITH_PLAYER=ON
 		-DWITH_UTILITIES=ON
@@ -100,11 +96,11 @@ src_configure() {
 		-DCMAKE_DISABLE_FIND_PACKAGE_LibOFA=ON
 		-DCMAKE_DISABLE_FIND_PACKAGE_MySQLe=ON
 		-DWITH_IPOD=$(usex ipod)
-		$(cmake_use_find_package lastfm LibLastFm)
+# 		$(cmake_use_find_package lastfm LibLastFm)
 		$(cmake_use_find_package !mariadb MySQL)
 		$(cmake_use_find_package mtp Mtp)
-		$(cmake_use_find_package podcast Mygpo-qt5)
-		$(cmake_use_find_package wikipedia Qt5WebEngine)
+# 		$(cmake_use_find_package podcast Mygpo-qt5)
+		$(cmake_use_find_package wikipedia Qt6WebEngineWidgets)
 	)
 	use ipod && mycmakeargs+=( DWITH_GDKPixBuf=ON )
 
@@ -122,7 +118,7 @@ pkg_postinst() {
 		use mariadb && echo "MariaDB" || echo "MySQL"
 	}
 
-	optfeature "Audio CD support" "kde-apps/audiocd-kio:5"
+	optfeature "Audio CD support" "kde-apps/audiocd-kio:6"
 
 	if [[ -z ${REPLACING_VERSIONS} ]]; then
 		elog "You must configure ${PN} to use an external database server."

diff --git a/media-sound/amarok/metadata.xml b/media-sound/amarok/metadata.xml
index 39967a10c3..c91d66d0e6 100644
--- a/media-sound/amarok/metadata.xml
+++ b/media-sound/amarok/metadata.xml
@@ -14,10 +14,10 @@
 		<remote-id type="kde-invent">multimedia/amarok</remote-id>
 	</upstream>
 	<use>
-		<flag name="lastfm">Enable Last.fm streaming services support through <pkg>media-libs/liblastfm</pkg></flag>
+<!-- 		<flag name="lastfm">Enable Last.fm streaming services support through <pkg>media-libs/liblastfm</pkg></flag> -->
 		<flag name="mariadb">Prefer <pkg>dev-db/mariadb-connector-c</pkg> over <pkg>dev-db/mysql-connector-c</pkg></flag>
 		<flag name="mtp">Enable support for libMTP (Plays4Sure) devices access through libmtp</flag>
-		<flag name="podcast">Enable gpodder.net podcast support via <pkg>media-libs/libmygpo-qt</pkg></flag>
+<!-- 		<flag name="podcast">Enable gpodder.net podcast support via <pkg>media-libs/libmygpo-qt</pkg></flag> -->
 		<flag name="wikipedia">Enable wikipedia widget using <pkg>dev-qt/qtwebengine</pkg></flag>
 	</use>
 </pkgmetadata>

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

[Andreas Sturmlechner]

commit:     56e9626530dce9f054c9ba601e0239622eede7db
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu May 16 11:45:09 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu May 16 11:45:44 2024 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=56e96265

media-sound/amarok: Update dependencies

Upstream commits:
3e11ccdd1417e70486eaaa84d8475182eec44c20
61066d8e1a614fe4aecb27a1ff76011178f2cba3
8a7c8c3d22fe2aa1cd47e23dc9441caabac87494
c9c4a673c9a8e05afd6a0743bfa01e3e7af6ec02

Bug: https://bugs.gentoo.org/931836
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-sound/amarok/amarok-9999.ebuild | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/media-sound/amarok/amarok-9999.ebuild b/media-sound/amarok/amarok-9999.ebuild
index b23aff3caa..12c7cb3228 100644
--- a/media-sound/amarok/amarok-9999.ebuild
+++ b/media-sound/amarok/amarok-9999.ebuild
@@ -6,7 +6,8 @@ EAPI=8
 ECM_HANDBOOK="forceoptional"
 KFMIN=5.115.0
 QTMIN=5.15.12
-inherit ecm kde.org optfeature
+PYTHON_COMPAT=( python3_{10..12} )
+inherit ecm kde.org optfeature python-any-r1
 
 DESCRIPTION="Advanced audio player based on KDE frameworks"
 HOMEPAGE="https://amarok.kde.org/"
@@ -16,8 +17,7 @@ SLOT="5"
 IUSE="ipod lastfm mariadb mtp podcast wikipedia"
 
 # ipod requires gdk enabled and also gtk compiled in libgpod
-BDEPEND="virtual/pkgconfig"
-DEPEND="
+COMMON_DEPEND="
 	>=app-crypt/qca-2.3.0:2[qt5(+)]
 	>=dev-qt/designer-${QTMIN}:5
 	>=dev-qt/qtdbus-${QTMIN}:5
@@ -58,7 +58,7 @@ DEPEND="
 	>=kde-frameworks/solid-${KFMIN}:5
 	>=kde-frameworks/threadweaver-${KFMIN}:5
 	>=media-libs/phonon-4.11.0[qt5(+)]
-	media-libs/taglib:=
+	>=media-libs/taglib-1.12:=
 	media-libs/taglib-extras
 	sci-libs/fftw:3.0
 	sys-libs/zlib
@@ -74,11 +74,22 @@ DEPEND="
 	podcast? ( >=media-libs/libmygpo-qt-1.0.9_p20180307 )
 	wikipedia? ( >=dev-qt/qtwebengine-${QTMIN}:5 )
 "
-RDEPEND="${DEPEND}
+DEPEND="${COMMON_DEPEND}
+	>=dev-qt/linguist-tools-${QTMIN}:5
+"
+RDEPEND="${COMMON_DEPEND}
 	>=dev-qt/qtquickcontrols2-${QTMIN}:5
 	>=kde-frameworks/kirigami-${KFMIN}:5
 	media-video/ffmpeg
 "
+BDEPEND="${PYTHON_DEPS}
+	virtual/pkgconfig
+"
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+	ecm_pkg_setup
+}
 
 src_configure() {
 	local mycmakeargs=(

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

[Andreas Sturmlechner]

commit:     5bc4cedba8e40a000a82e4642a4f51a18d6f782a
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 25 18:59:56 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Mar 25 19:00:06 2024 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=5bc4cedb

media-sound/amarok: add kde-invent upstream metadata

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-sound/amarok/metadata.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/media-sound/amarok/metadata.xml b/media-sound/amarok/metadata.xml
index f557bc0cb5..39967a10c3 100644
--- a/media-sound/amarok/metadata.xml
+++ b/media-sound/amarok/metadata.xml
@@ -11,6 +11,7 @@
 	</maintainer>
 	<upstream>
 		<bugs-to>https://bugs.kde.org/</bugs-to>
+		<remote-id type="kde-invent">multimedia/amarok</remote-id>
 	</upstream>
 	<use>
 		<flag name="lastfm">Enable Last.fm streaming services support through <pkg>media-libs/liblastfm</pkg></flag>

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

[Andreas Sturmlechner]

commit:     880af8bfd4156a07bfddc0a73401855dc1b93860
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 27 19:10:50 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Feb 27 19:10:50 2024 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=880af8bf

media-sound/amarok: Only works with kde-apps/audiocd-kio:5

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

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

diff --git a/media-sound/amarok/amarok-9999.ebuild b/media-sound/amarok/amarok-9999.ebuild
index 48444bb74d..44ed352bf4 100644
--- a/media-sound/amarok/amarok-9999.ebuild
+++ b/media-sound/amarok/amarok-9999.ebuild
@@ -111,7 +111,7 @@ pkg_postinst() {
 		use mariadb && echo "MariaDB" || echo "MySQL"
 	}
 
-	optfeature "Audio CD support" kde-apps/audiocd-kio
+	optfeature "Audio CD support" "kde-apps/audiocd-kio:5"
 
 	if [[ -z ${REPLACING_VERSIONS} ]]; then
 		elog "You must configure ${PN} to use an external database server."

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

[Andreas Sturmlechner]

commit:     fae611a926c2beaceecfbcdb6422169202d378d8
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 17 10:35:59 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Dec 17 10:35:59 2023 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=fae611a9

media-sound/amarok: Cleanup metadata.xml

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

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

diff --git a/media-sound/amarok/metadata.xml b/media-sound/amarok/metadata.xml
index 9c9ff3c77e..f557bc0cb5 100644
--- a/media-sound/amarok/metadata.xml
+++ b/media-sound/amarok/metadata.xml
@@ -16,8 +16,6 @@
 		<flag name="lastfm">Enable Last.fm streaming services support through <pkg>media-libs/liblastfm</pkg></flag>
 		<flag name="mariadb">Prefer <pkg>dev-db/mariadb-connector-c</pkg> over <pkg>dev-db/mysql-connector-c</pkg></flag>
 		<flag name="mtp">Enable support for libMTP (Plays4Sure) devices access through libmtp</flag>
-		<flag name="ofa">Use <pkg>media-libs/libofa</pkg> to compute MusicDNS acoustic
-		fingerprints (used by MusicBrainz)</flag>
 		<flag name="podcast">Enable gpodder.net podcast support via <pkg>media-libs/libmygpo-qt</pkg></flag>
 		<flag name="wikipedia">Enable wikipedia widget using <pkg>dev-qt/qtwebengine</pkg></flag>
 	</use>

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

[Andreas Sturmlechner]

commit:     c1adf2c2e1f8b40de76d19544f65d7ad722be690
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 17 10:02:25 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Dec 17 10:02:25 2023 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=c1adf2c2

media-sound/amarok: Drop IUSE ofa, media-libs/libofa was last-rited

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-sound/amarok/amarok-9999.ebuild | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/media-sound/amarok/amarok-9999.ebuild b/media-sound/amarok/amarok-9999.ebuild
index 8ba31c55ff..e4568afce5 100644
--- a/media-sound/amarok/amarok-9999.ebuild
+++ b/media-sound/amarok/amarok-9999.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://amarok.kde.org/"
 
 LICENSE="GPL-2"
 SLOT="5"
-IUSE="ipod lastfm mariadb mtp ofa podcast wikipedia"
+IUSE="ipod lastfm mariadb mtp podcast wikipedia"
 
 # ipod requires gdk enabled and also gtk compiled in libgpod
 BDEPEND="virtual/pkgconfig"
@@ -67,10 +67,6 @@ DEPEND="
 		dev-libs/glib:2
 		media-libs/libgpod[gtk]
 	)
-	ofa? (
-		media-libs/libofa
-		media-video/ffmpeg:=
-	)
 	lastfm? ( >=media-libs/liblastfm-1.1.0_pre20150206 )
 	mariadb? ( dev-db/mariadb-connector-c:= )
 	!mariadb? ( dev-db/mysql-connector-c:= )
@@ -81,7 +77,7 @@ DEPEND="
 RDEPEND="${DEPEND}
 	>=dev-qt/qtquickcontrols2-${QTMIN}:5
 	>=kde-frameworks/kirigami-${KFMIN}:5
-	!ofa? ( media-video/ffmpeg )
+	media-video/ffmpeg
 "
 
 src_configure() {
@@ -90,12 +86,12 @@ src_configure() {
 		-DWITH_PLAYER=ON
 		-DWITH_UTILITIES=ON
 		-DCMAKE_DISABLE_FIND_PACKAGE_Googlemock=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_LibOFA=ON
 		-DCMAKE_DISABLE_FIND_PACKAGE_MySQLe=ON
 		-DWITH_IPOD=$(usex ipod)
 		$(cmake_use_find_package lastfm LibLastFm)
 		$(cmake_use_find_package !mariadb MySQL)
 		$(cmake_use_find_package mtp Mtp)
-		$(cmake_use_find_package ofa LibOFA)
 		$(cmake_use_find_package podcast Mygpo-qt5)
 		$(cmake_use_find_package wikipedia Qt5WebEngine)
 	)

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

[Andreas Sturmlechner]

commit:     d9b79e7d504adb776afe1f190193465b8b33fc32
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 11 14:47:35 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Oct 11 15:17:12 2022 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=d9b79e7d

media-sound/amarok: Add app-crypt/qca[qt5(+)] USEdep

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

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

diff --git a/media-sound/amarok/amarok-9999.ebuild b/media-sound/amarok/amarok-9999.ebuild
index fab72a47b9..782ca67a22 100644
--- a/media-sound/amarok/amarok-9999.ebuild
+++ b/media-sound/amarok/amarok-9999.ebuild
@@ -18,7 +18,7 @@ IUSE="ipod lastfm mariadb mtp ofa podcast wikipedia"
 # ipod requires gdk enabled and also gtk compiled in libgpod
 BDEPEND="virtual/pkgconfig"
 DEPEND="
-	>=app-crypt/qca-2.3.0:2
+	>=app-crypt/qca-2.3.0:2[qt5(+)]
 	>=dev-qt/designer-${QTMIN}:5
 	>=dev-qt/qtdbus-${QTMIN}:5
 	>=dev-qt/qtdeclarative-${QTMIN}:5

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

[Andreas Sturmlechner]

commit:     26e8ae85e284ba49fef6ac7b2c7e74b697b3c2ed
Author:     band-a-prend <torokhov-s-a <AT> yandex <DOT> ru>
AuthorDate: Tue Apr 13 21:00:22 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue May  4 15:55:51 2021 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=26e8ae85

media-sound/amarok: Add optfeature and pkg_config to create database

Add optfeature 'kde-apps/audiocd-kio' for Audio CD support.

Add additional pkg_postinst() elog messages with URLs to pages
with preliminary configuration of MySQL/MariaDB Server.

Add elog messages with steps to create Amarok external database
with 'emerge --config amarok' command and switching to use it.

Add simple short pkg_config() to create Amarok external database
with it's default username/password.

Committer-comment: Drop unrelated minor changes and fix mix of ewarn/einfo.

Closes: https://github.com/gentoo/kde/pull/899
Signed-off-by: Sergey Torokhov <torokhov-s-a <AT> yandex.ru>
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-sound/amarok/amarok-9999.ebuild | 37 +++++++++++++++++++++++++++++++----
 1 file changed, 33 insertions(+), 4 deletions(-)

diff --git a/media-sound/amarok/amarok-9999.ebuild b/media-sound/amarok/amarok-9999.ebuild
index 4f26e37cef..397a86c538 100644
--- a/media-sound/amarok/amarok-9999.ebuild
+++ b/media-sound/amarok/amarok-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 ECM_HANDBOOK="forceoptional"
 KFMIN=5.74.0
 QTMIN=5.15.2
-inherit ecm kde.org
+inherit ecm kde.org optfeature
 
 DESCRIPTION="Advanced audio player based on KDE frameworks"
 HOMEPAGE="https://amarok.kde.org/"
@@ -111,11 +111,40 @@ pkg_postinst() {
 		echo "${1} ($(has_version ${1} || echo "not ")installed)"
 	}
 
+	optfeature "Audio CD support" kde-apps/audiocd-kio
+
 	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		elog "You'll have to configure amarok to use an external db server:"
-		use mariadb && elog "    $(pkg_is_installed dev-db/mariadb)" ||
+		elog "You'll have to configure amarok to use an external database server:"
+		if use mariadb ; then
+			elog "    $(pkg_is_installed dev-db/mariadb)"
+			elog "    For preliminary configuration of MariaDB Server please refer to"
+			elog "    https://wiki.gentoo.org/wiki/MariaDB#Configuration"
+		else
 			elog "    $(pkg_is_installed dev-db/mysql)"
+			elog "    For preliminary configuration of MySQL Server please refer to"
+			elog "    https://wiki.gentoo.org/wiki/MySQL#Configuration"
+		fi
 		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."
+		elog "to configure the external database and migrate your data from the embedded database."
+		elog "To create external amarok database with default user/password please:"
+		elog "    1. Make sure that MySQL or MariaDB is installed and configured (see above)"
+		elog "    2. Ensure that 'mysql' service is started and then run command 'emerge --config amarok'"
+		elog "    3. On 'Configure Amarok - Database' menu page check 'Use external MySQL database' and press OK"
+	fi
+}
+
+pkg_config() {
+	# Create external mysql database with amarok default user/password
+	local AMAROK_DB_NAME="amarokdb"
+	local AMAROK_DB_USER_NAME="amarokuser"
+	local AMAROK_DB_USER_PWD="password"
+
+	einfo "Initializing ${PN} MySQL database 'amarokdb':"
+	einfo "If prompted for a password, please enter your MySQL root password."
+	einfo
+
+	if [[ -e "${EROOT}"/usr/bin/mysql ]]; then
+		"${EROOT}"/usr/bin/mysql -u root -p -e "CREATE DATABASE IF NOT EXISTS ${AMAROK_DB_NAME}; GRANT ALL PRIVILEGES ON ${AMAROK_DB_NAME}.* TO '${AMAROK_DB_USER_NAME}' IDENTIFIED BY '${AMAROK_DB_USER_PWD}'; FLUSH PRIVILEGES;"
 	fi
+	einfo "${PN} MySQL database 'amarokdb' successfully initialized!"
 }

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

[Andreas Sturmlechner]

commit:     2b64abf82a29fef9dfe1f2a5e9c5ad4d099bb4ce
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue May  4 15:15:54 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue May  4 15:56:12 2021 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=2b64abf8

media-sound/amarok: Unclutter pkg_postinst() message

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

 media-sound/amarok/amarok-9999.ebuild | 36 ++++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/media-sound/amarok/amarok-9999.ebuild b/media-sound/amarok/amarok-9999.ebuild
index 397a86c538..40c1222c75 100644
--- a/media-sound/amarok/amarok-9999.ebuild
+++ b/media-sound/amarok/amarok-9999.ebuild
@@ -111,25 +111,27 @@ pkg_postinst() {
 		echo "${1} ($(has_version ${1} || echo "not ")installed)"
 	}
 
+	db_name() {
+		use mariadb && echo "MariaDB" || echo "MySQL"
+	}
+
 	optfeature "Audio CD support" kde-apps/audiocd-kio
 
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		elog "You'll have to configure amarok to use an external database server:"
-		if use mariadb ; then
-			elog "    $(pkg_is_installed dev-db/mariadb)"
-			elog "    For preliminary configuration of MariaDB Server please refer to"
-			elog "    https://wiki.gentoo.org/wiki/MariaDB#Configuration"
-		else
-			elog "    $(pkg_is_installed dev-db/mysql)"
-			elog "    For preliminary configuration of MySQL Server please refer to"
-			elog "    https://wiki.gentoo.org/wiki/MySQL#Configuration"
-		fi
-		elog "Please read https://community.kde.org/Amarok/Community/MySQL for details on how"
-		elog "to configure the external database and migrate your data from the embedded database."
-		elog "To create external amarok database with default user/password please:"
-		elog "    1. Make sure that MySQL or MariaDB is installed and configured (see above)"
-		elog "    2. Ensure that 'mysql' service is started and then run command 'emerge --config amarok'"
-		elog "    3. On 'Configure Amarok - Database' menu page check 'Use external MySQL database' and press OK"
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog "You must configure ${PN} to use an external database server."
+		elog " 1. Make sure either MySQL or MariaDB is installed and configured"
+		elog "    Checking local system:"
+		elog "      $(pkg_is_installed dev-db/mariadb)"
+		elog "      $(pkg_is_installed dev-db/mysql)"
+		elog "    For preliminary configuration of $(db_name) Server refer to"
+		elog "    https://wiki.gentoo.org/wiki/$(db_name)#Configuration"
+		elog " 2. Ensure 'mysql' service is started and run:"
+		elog "    # emerge --config amarok"
+		elog " 3. Run ${PN} and go to 'Configure Amarok - Database' menu page"
+		elog "    Check 'Use external MySQL database' and press OK"
+		elog
+		elog "For more information please read:"
+		elog "  https://community.kde.org/Amarok/Community/MySQL"
 	fi
 }
 

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

[Andreas Sturmlechner]

commit:     55052fff7c790db45d76d23457ab84af1a38c207
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 30 18:49:53 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Sep 30 18:53:03 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=55052fff

media-sound/amarok: Update DEPENDs

Upstream commits:
ce93fb34c396f1b7766daaf43669d82f949ff091
3973278a68275f12278244bc0e960c5947c931b9

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

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

diff --git a/media-sound/amarok/amarok-9999.ebuild b/media-sound/amarok/amarok-9999.ebuild
index 2bdbadffea..325fece1d7 100644
--- a/media-sound/amarok/amarok-9999.ebuild
+++ b/media-sound/amarok/amarok-9999.ebuild
@@ -19,11 +19,11 @@ IUSE="ipod lastfm mariadb mtp ofa podcast wikipedia"
 BDEPEND="virtual/pkgconfig"
 DEPEND="
 	>=app-crypt/qca-2.3.0:2
+	>=dev-qt/designer-${QTMIN}:5
 	>=dev-qt/qtdbus-${QTMIN}:5
 	>=dev-qt/qtdeclarative-${QTMIN}:5
 	>=dev-qt/qtgui-${QTMIN}:5
 	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtscript-${QTMIN}:5[scripttools]
 	>=dev-qt/qtsql-${QTMIN}:5
 	>=dev-qt/qtsvg-${QTMIN}:5
 	>=dev-qt/qtwidgets-${QTMIN}:5

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

[Andreas Sturmlechner]

commit:     1496629d99bf76f72c98b6038c60e5c53de80fcf
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 26 10:59:51 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Apr 26 10:59:51 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=1496629d

media-sound/amarok: Drop obsolete blocker

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

 media-sound/amarok/amarok-9999.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/media-sound/amarok/amarok-9999.ebuild b/media-sound/amarok/amarok-9999.ebuild
index e3d0401d19..0fc8f0d83b 100644
--- a/media-sound/amarok/amarok-9999.ebuild
+++ b/media-sound/amarok/amarok-9999.ebuild
@@ -78,7 +78,6 @@ DEPEND="
 	wikipedia? ( >=dev-qt/qtwebengine-${QTMIN}:5 )
 "
 RDEPEND="${DEPEND}
-	!media-sound/amarok:4
 	>=dev-qt/qtquickcontrols2-${QTMIN}:5
 	!ofa? ( media-video/ffmpeg )
 "

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

[Andreas Sturmlechner]

commit:     2f33275c2428d8280eab7f17a9c66493eb3d45c8
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Apr  3 09:10:44 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Apr  3 09:10:44 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=2f33275c

media-sound/amarok: Drop pax-utils

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

 media-sound/amarok/amarok-9999.ebuild | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/media-sound/amarok/amarok-9999.ebuild b/media-sound/amarok/amarok-9999.ebuild
index 89c092f05d..9937a18bf8 100644
--- a/media-sound/amarok/amarok-9999.ebuild
+++ b/media-sound/amarok/amarok-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 KDE_HANDBOOK="true"
-inherit kde5 pax-utils
+inherit kde5
 
 DESCRIPTION="Advanced audio player based on KDE frameworks"
 HOMEPAGE="https://amarok.kde.org/"
@@ -103,13 +103,6 @@ src_configure() {
 	kde5_src_configure
 }
 
-src_install() {
-	kde5_src_install
-
-	# bug 481592
-	pax-mark m "${ED}"/usr/bin/amarok
-}
-
 pkg_postinst() {
 	kde5_pkg_postinst
 

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

[Andreas Sturmlechner]

commit:     6527a3959ec314a76c09376c077ba7eeaebc05ee
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 26 11:54:28 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Feb 26 11:54:51 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=6527a395

media-sound/amarok: Drop obsolete use of ffmpeg in cmake args

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

 media-sound/amarok/amarok-9999.ebuild | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/media-sound/amarok/amarok-9999.ebuild b/media-sound/amarok/amarok-9999.ebuild
index 24231ebbd1..89c092f05d 100644
--- a/media-sound/amarok/amarok-9999.ebuild
+++ b/media-sound/amarok/amarok-9999.ebuild
@@ -61,15 +61,15 @@ DEPEND="
 	sci-libs/fftw:3.0
 	sys-libs/zlib
 	virtual/opengl
+	ipod? (
+		dev-libs/glib:2
+		media-libs/libgpod[gtk]
+	)
 	ofa? (
 		media-libs/libofa
 		!libav? ( media-video/ffmpeg:= )
 		libav? ( media-video/libav:= )
 	)
-	ipod? (
-		dev-libs/glib:2
-		media-libs/libgpod[gtk]
-	)
 	lastfm? ( >=media-libs/liblastfm-1.1.0_pre20150206 )
 	mtp? ( media-libs/libmtp )
 	podcast? ( >=media-libs/libmygpo-qt-1.0.9_p20180307 )
@@ -90,7 +90,6 @@ src_configure() {
 		-DWITH_UTILITIES=ON
 		-DCMAKE_DISABLE_FIND_PACKAGE_Googlemock=ON
 		-DWITH_MYSQL_EMBEDDED=OFF
-		$(cmake-utils_use_find_package ffmpeg FFmpeg)
 		-DWITH_IPOD=$(usex ipod)
 		$(cmake-utils_use_find_package lastfm LibLastFm)
 		$(cmake-utils_use_find_package mtp Mtp)

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

[Andreas Sturmlechner]

commit:     54f292dd59cc6cceec9dc1cf24c0fa213a6e0b19
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 25 21:14:35 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Feb 25 21:14:45 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=54f292dd

media-sound/amarok: USE ffmpeg -> libav, needs slot ops if USE=ofa

Small min versions cleanup.

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

 media-sound/amarok/amarok-9999.ebuild | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/media-sound/amarok/amarok-9999.ebuild b/media-sound/amarok/amarok-9999.ebuild
index 58fdd12eba..24231ebbd1 100644
--- a/media-sound/amarok/amarok-9999.ebuild
+++ b/media-sound/amarok/amarok-9999.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Advanced audio player based on KDE frameworks"
 HOMEPAGE="https://amarok.kde.org/"
 
 LICENSE="GPL-2"
-IUSE="ffmpeg ipod lastfm mtp ofa podcast wikipedia"
+IUSE="ipod lastfm libav mtp ofa podcast wikipedia"
 
 # ipod requires gdk enabled and also gtk compiled in libgpod
 BDEPEND="virtual/pkgconfig"
@@ -56,27 +56,29 @@ DEPEND="
 	app-crypt/qca:2[qt5(+)]
 	dev-db/mysql-connector-c:=
 	media-libs/phonon[qt5(+)]
-	>=media-libs/taglib-1.7[asf(+),mp4(+)]
-	>=media-libs/taglib-extras-1.0.1
+	media-libs/taglib
+	media-libs/taglib-extras
 	sci-libs/fftw:3.0
 	sys-libs/zlib
 	virtual/opengl
-	ffmpeg? (
-		virtual/ffmpeg
-		ofa? ( >=media-libs/libofa-0.9.0 )
+	ofa? (
+		media-libs/libofa
+		!libav? ( media-video/ffmpeg:= )
+		libav? ( media-video/libav:= )
 	)
 	ipod? (
 		dev-libs/glib:2
-		>=media-libs/libgpod-0.7.0[gtk]
+		media-libs/libgpod[gtk]
 	)
 	lastfm? ( >=media-libs/liblastfm-1.1.0_pre20150206 )
-	mtp? ( >=media-libs/libmtp-1.0.0 )
-	podcast? ( >=media-libs/libmygpo-qt-1.0.9[qt5(+)] )
+	mtp? ( media-libs/libmtp )
+	podcast? ( >=media-libs/libmygpo-qt-1.0.9_p20180307 )
 	wikipedia? ( $(add_qt_dep qtwebengine) )
 "
 RDEPEND="${DEPEND}
 	!media-sound/amarok:4
 	$(add_qt_dep qtquickcontrols2)
+	!ofa? ( virtual/ffmpeg )
 "
 
 PATCHES=( "${FILESDIR}"/${PN}-2.8.90-mysqld-rpath.patch )

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

[Andreas Sturmlechner]

commit:     f40b1295267d2de5cceb3fa0a7df8c633d6b4a3d
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Oct  4 21:29:54 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Oct  4 21:29:54 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=f40b1295

media-sound/amarok: Switch to dev-db/mysql-connector-c

Plus virtual/mysql[minimal] is no longer a thing apparently.

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

 media-sound/amarok/amarok-9999.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/media-sound/amarok/amarok-9999.ebuild b/media-sound/amarok/amarok-9999.ebuild
index b968cdafda..2e3a11ed15 100644
--- a/media-sound/amarok/amarok-9999.ebuild
+++ b/media-sound/amarok/amarok-9999.ebuild
@@ -53,12 +53,12 @@ COMMONDEPEND="
 	$(add_qt_dep qtwidgets)
 	$(add_qt_dep qtxml)
 	app-crypt/qca:2[qt5(+)]
+	dev-db/mysql-connector-c:=
 	media-libs/phonon[qt5(+)]
 	>=media-libs/taglib-1.7[asf(+),mp4(+)]
 	>=media-libs/taglib-extras-1.0.1
 	sci-libs/fftw:3.0
 	sys-libs/zlib
-	>=virtual/mysql-5.1[-minimal(-)]
 	virtual/opengl
 	ffmpeg? (
 		virtual/ffmpeg
@@ -79,6 +79,7 @@ DEPEND="${COMMONDEPEND}
 RDEPEND="${COMMONDEPEND}
 	!media-sound/amarok:4
 	$(add_qt_dep qtquickcontrols2)
+	virtual/mysql
 "
 
 PATCHES=( "${FILESDIR}"/${PN}-2.8.90-mysqld-rpath.patch )

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

[Andreas Sturmlechner]

commit:     31d9656979bd3c7e95fd66ba56039ef0cee80bf6
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Oct  4 13:39:24 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Oct  4 13:39:24 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=31d96569

media-sound/amarok: Add missing DEPEND

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

 media-sound/amarok/amarok-9999.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/media-sound/amarok/amarok-9999.ebuild b/media-sound/amarok/amarok-9999.ebuild
index e77534c589..b968cdafda 100644
--- a/media-sound/amarok/amarok-9999.ebuild
+++ b/media-sound/amarok/amarok-9999.ebuild
@@ -22,6 +22,7 @@ COMMONDEPEND="
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
 	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
 	$(add_frameworks_dep kdbusaddons)
 	$(add_frameworks_dep kdeclarative)
 	$(add_frameworks_dep kdnssd)

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

[Andreas Sturmlechner]

commit:     0d874350637a971fd559aa4057d2d2badd718801
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 13 02:53:38 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Oct  4 12:20:00 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=0d874350

media-sound/amarok: Sync with kde-sunset

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

 media-sound/amarok/amarok-9999.ebuild | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/media-sound/amarok/amarok-9999.ebuild b/media-sound/amarok/amarok-9999.ebuild
index abd4d8ef2a..e77534c589 100644
--- a/media-sound/amarok/amarok-9999.ebuild
+++ b/media-sound/amarok/amarok-9999.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
@@ -57,7 +57,7 @@ COMMONDEPEND="
 	>=media-libs/taglib-extras-1.0.1
 	sci-libs/fftw:3.0
 	sys-libs/zlib
-	>=virtual/mysql-5.1
+	>=virtual/mysql-5.1[-minimal(-)]
 	virtual/opengl
 	ffmpeg? (
 		virtual/ffmpeg
@@ -116,10 +116,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:master commit in: media-sound/amarok/

[Andreas Sturmlechner]

commit:     ae92fcbbfd3f4a15439f5e178f7d1b9e68a11f89
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sat Sep 22 13:01:30 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Oct  2 19:46:34 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=ae92fcbb

media-sound/amarok: remove unused eclass

Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/kde/pull/873

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

diff --git a/media-sound/amarok/amarok-9999.ebuild b/media-sound/amarok/amarok-9999.ebuild
index 04076a2005..abd4d8ef2a 100644
--- a/media-sound/amarok/amarok-9999.ebuild
+++ b/media-sound/amarok/amarok-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 KDE_HANDBOOK="true"
-inherit flag-o-matic kde5 pax-utils
+inherit kde5 pax-utils
 
 DESCRIPTION="Advanced audio player based on KDE frameworks"
 HOMEPAGE="https://amarok.kde.org/"

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

[Andreas Sturmlechner]

commit:     821e4e16adde547754ccc12c86c2c0c077e75bed
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jun  7 17:10:14 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jun  7 17:10:14 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=821e4e16

media-sound/amarok: Add new DEPEND

Upstream commit 497bf1ab30fdea1d8abc4fbac0dbebe77a9916be

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 media-sound/amarok/amarok-9999.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/media-sound/amarok/amarok-9999.ebuild b/media-sound/amarok/amarok-9999.ebuild
index 6de602d64b..04076a2005 100644
--- a/media-sound/amarok/amarok-9999.ebuild
+++ b/media-sound/amarok/amarok-9999.ebuild
@@ -14,6 +14,7 @@ IUSE="ffmpeg ipod lastfm mtp ofa podcast wikipedia"
 
 # ipod requires gdk enabled and also gtk compiled in libgpod
 COMMONDEPEND="
+	$(add_frameworks_dep attica)
 	$(add_frameworks_dep karchive)
 	$(add_frameworks_dep kcmutils)
 	$(add_frameworks_dep kcodecs)

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

[Andreas Sturmlechner]

commit:     ce35b3f34594f3f3dab792589cf042939dd3edf4
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun May 27 05:44:22 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun May 27 05:44:22 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=ce35b3f3

media-sound/amarok: Fix postinst

Package-Manager: Portage-2.3.40, Repoman-2.3.9

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

diff --git a/media-sound/amarok/amarok-9999.ebuild b/media-sound/amarok/amarok-9999.ebuild
index 26e3b6cdb5..6de602d64b 100644
--- a/media-sound/amarok/amarok-9999.ebuild
+++ b/media-sound/amarok/amarok-9999.ebuild
@@ -116,7 +116,7 @@ pkg_postinst() {
 	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[]"; then
+	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."

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

[Andreas Sturmlechner]

commit:     9741687bf8fa3b49b58bfb5744c2a9dfe26a0ef2
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat May 26 23:19:07 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat May 26 23:19:07 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=9741687b

media-sound/amarok: Embedded MySQL is gone

Package-Manager: Portage-2.3.38, Repoman-2.3.9

 media-sound/amarok/amarok-9999.ebuild | 26 ++++++++++----------------
 media-sound/amarok/metadata.xml       |  3 ---
 2 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/media-sound/amarok/amarok-9999.ebuild b/media-sound/amarok/amarok-9999.ebuild
index 223a0ded30..26e3b6cdb5 100644
--- a/media-sound/amarok/amarok-9999.ebuild
+++ b/media-sound/amarok/amarok-9999.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Advanced audio player based on KDE frameworks"
 HOMEPAGE="https://amarok.kde.org/"
 
 LICENSE="GPL-2"
-IUSE="+embedded ffmpeg ipod lastfm mtp ofa podcast wikipedia"
+IUSE="ffmpeg ipod lastfm mtp ofa podcast wikipedia"
 
 # ipod requires gdk enabled and also gtk compiled in libgpod
 COMMONDEPEND="
@@ -56,7 +56,7 @@ COMMONDEPEND="
 	>=media-libs/taglib-extras-1.0.1
 	sci-libs/fftw:3.0
 	sys-libs/zlib
-	>=virtual/mysql-5.1[embedded?]
+	>=virtual/mysql-5.1
 	virtual/opengl
 	ffmpeg? (
 		virtual/ffmpeg
@@ -87,7 +87,7 @@ src_configure() {
 		-DWITH_PLAYER=ON
 		-DWITH_UTILITIES=ON
 		-DCMAKE_DISABLE_FIND_PACKAGE_Googlemock=ON
-		-DWITH_MYSQL_EMBEDDED=$(usex embedded)
+		-DWITH_MYSQL_EMBEDDED=OFF
 		$(cmake-utils_use_find_package ffmpeg FFmpeg)
 		-DWITH_IPOD=$(usex ipod)
 		$(cmake-utils_use_find_package lastfm LibLastFm)
@@ -99,9 +99,6 @@ src_configure() {
 
 	use ipod && mycmakeargs+=( DWITH_GDKPixBuf=ON )
 
-	# bug 581554: add libmysqld location for rpath patch
-	use embedded && mycmakeargs+=( -DMYSQLD_DIR="${EPREFIX}/usr/$(get_libdir)/mysql" )
-
 	kde5_src_configure
 }
 
@@ -115,16 +112,13 @@ src_install() {
 pkg_postinst() {
 	kde5_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."
+	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
+	if has_version "virtual/mysql[]"; 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
 }

diff --git a/media-sound/amarok/metadata.xml b/media-sound/amarok/metadata.xml
index 19fd686064..98843fda4c 100644
--- a/media-sound/amarok/metadata.xml
+++ b/media-sound/amarok/metadata.xml
@@ -14,9 +14,6 @@
 		<name>Gentoo Sound project</name>
 	</maintainer>
 	<use>
-		<flag name="embedded">Use libmysqld, MySQL embedded server library.
-		Try disabling this if you encounter -PIC related in amarok,
-		it will make amarok rely only on standalone MySQL server.</flag>
 		<flag name="lastfm">Enable Last.fm streaming services support through
 		<pkg>media-libs/liblastfm</pkg></flag>
 		<flag name="mtp">Enable support for libMTP (Plays4Sure) devices access through libmtp</flag>

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

[Andreas Sturmlechner]

commit:     ff47b5781a536f0cc534531177fd5d8a4f357947
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun May  6 07:42:50 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun May  6 07:42:50 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=ff47b578

media-sound/amarok: Remove test support, dev-cpp/gmock is gone

Gentoo commit: aa89b1449bc88fc12783fea969cf5fe761d3498c
Upstream commit: f4a0e027b358c7a64d2065e8f22cec45c607afde

Package-Manager: Portage-2.3.36, Repoman-2.3.9

 media-sound/amarok/amarok-9999.ebuild | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/media-sound/amarok/amarok-9999.ebuild b/media-sound/amarok/amarok-9999.ebuild
index c7e76ed391..223a0ded30 100644
--- a/media-sound/amarok/amarok-9999.ebuild
+++ b/media-sound/amarok/amarok-9999.ebuild
@@ -4,9 +4,6 @@
 EAPI=6
 
 KDE_HANDBOOK="true"
-KDE_TEST="true"
-VIRTUALX_REQUIRED="test"
-VIRTUALDBUS_TEST="true"
 inherit flag-o-matic kde5 pax-utils
 
 DESCRIPTION="Advanced audio player based on KDE frameworks"
@@ -15,10 +12,6 @@ HOMEPAGE="https://amarok.kde.org/"
 LICENSE="GPL-2"
 IUSE="+embedded ffmpeg ipod lastfm mtp ofa podcast wikipedia"
 
-if [[ ${KDE_BUILD_TYPE} == live ]]; then
-	RESTRICT="test"
-fi
-
 # ipod requires gdk enabled and also gtk compiled in libgpod
 COMMONDEPEND="
 	$(add_frameworks_dep karchive)
@@ -80,7 +73,6 @@ COMMONDEPEND="
 "
 DEPEND="${COMMONDEPEND}
 	virtual/pkgconfig
-	test? ( dev-cpp/gmock )
 "
 RDEPEND="${COMMONDEPEND}
 	!media-sound/amarok:4
@@ -94,6 +86,7 @@ src_configure() {
 		-DWITH_MP3Tunes=OFF
 		-DWITH_PLAYER=ON
 		-DWITH_UTILITIES=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_Googlemock=ON
 		-DWITH_MYSQL_EMBEDDED=$(usex embedded)
 		$(cmake-utils_use_find_package ffmpeg FFmpeg)
 		-DWITH_IPOD=$(usex ipod)

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

[Andreas Sturmlechner]

commit:     e8551e4ef8211db3f6f98107c5873e55ffdf001b
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 20 16:50:31 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Mar 20 16:50:31 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=e8551e4e

media-sound/amarok: Drop USE=utils, build unconditionally

No extra dependencies, no point disabling.

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 media-sound/amarok/amarok-9999.ebuild | 4 ++--
 media-sound/amarok/metadata.xml       | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/media-sound/amarok/amarok-9999.ebuild b/media-sound/amarok/amarok-9999.ebuild
index 87a1bba632..d573a1e07e 100644
--- a/media-sound/amarok/amarok-9999.ebuild
+++ b/media-sound/amarok/amarok-9999.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Advanced audio player based on KDE frameworks"
 HOMEPAGE="https://amarok.kde.org/"
 
 LICENSE="GPL-2"
-IUSE="+embedded ffmpeg ipod lastfm mtp ofa podcast +utils wikipedia"
+IUSE="+embedded ffmpeg ipod lastfm mtp ofa podcast wikipedia"
 
 if [[ ${KDE_BUILD_TYPE} == live ]]; then
 	RESTRICT="test"
@@ -96,6 +96,7 @@ src_configure() {
 	local mycmakeargs=(
 		-DWITH_MP3Tunes=OFF
 		-DWITH_PLAYER=ON
+		-DWITH_UTILITIES=ON
 		-DWITH_MYSQL_EMBEDDED=$(usex embedded)
 		$(cmake-utils_use_find_package ffmpeg FFmpeg)
 		-DWITH_IPOD=$(usex ipod)
@@ -103,7 +104,6 @@ src_configure() {
 		$(cmake-utils_use_find_package mtp Mtp)
 		$(cmake-utils_use_find_package ofa LibOFA)
 		$(cmake-utils_use_find_package podcast Mygpo-qt5)
-		-DWITH_UTILITIES=$(usex utils)
 		$(cmake-utils_use_find_package wikipedia Qt5WebEngine)
 	)
 

diff --git a/media-sound/amarok/metadata.xml b/media-sound/amarok/metadata.xml
index 8342725066..19fd686064 100644
--- a/media-sound/amarok/metadata.xml
+++ b/media-sound/amarok/metadata.xml
@@ -23,7 +23,6 @@
 		<flag name="ofa">Use <pkg>media-libs/libofa</pkg> to compute MusicDNS acoustic
 		fingerprints (used by MusicBrainz)</flag>
 		<flag name="podcast">Enable gpodder.net podcast support via <pkg>media-libs/libmygpo-qt</pkg></flag>
-		<flag name="utils">Build tagging and collection scanner utilities</flag>
 		<flag name="wikipedia">Enable wikipedia widget using <pkg>dev-qt/qtwebengine</pkg></flag>
 	</use>
 </pkgmetadata>

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

[Andreas Sturmlechner]

commit:     81f72948e69c8e3b91e682e1d0e1888e79b12194
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 20 16:49:27 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Mar 20 16:49:27 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=81f72948

media-sound/amarok: Add USE=wikipedia

Upstream commit 7a63540fc23a4fead8ee6e2352ab9998ecca8cc2

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 media-sound/amarok/amarok-9999.ebuild | 5 ++++-
 media-sound/amarok/metadata.xml       | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/media-sound/amarok/amarok-9999.ebuild b/media-sound/amarok/amarok-9999.ebuild
index 863557895f..87a1bba632 100644
--- a/media-sound/amarok/amarok-9999.ebuild
+++ b/media-sound/amarok/amarok-9999.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Advanced audio player based on KDE frameworks"
 HOMEPAGE="https://amarok.kde.org/"
 
 LICENSE="GPL-2"
-IUSE="+embedded ffmpeg ipod lastfm mtp ofa podcast +utils"
+IUSE="+embedded ffmpeg ipod lastfm mtp ofa podcast +utils wikipedia"
 
 if [[ ${KDE_BUILD_TYPE} == live ]]; then
 	RESTRICT="test"
@@ -76,6 +76,7 @@ COMMONDEPEND="
 	lastfm? ( media-libs/liblastfm[qt5(+)] )
 	mtp? ( >=media-libs/libmtp-1.0.0 )
 	podcast? ( >=media-libs/libmygpo-qt-1.0.9[qt5(+)] )
+	wikipedia? ( $(add_qt_dep qtwebengine) )
 "
 DEPEND="${COMMONDEPEND}
 	virtual/pkgconfig
@@ -83,6 +84,7 @@ DEPEND="${COMMONDEPEND}
 "
 RDEPEND="${COMMONDEPEND}
 	!media-sound/amarok:4
+	$(add_qt_dep qtquickcontrols2)
 "
 
 PATCHES=(
@@ -102,6 +104,7 @@ src_configure() {
 		$(cmake-utils_use_find_package ofa LibOFA)
 		$(cmake-utils_use_find_package podcast Mygpo-qt5)
 		-DWITH_UTILITIES=$(usex utils)
+		$(cmake-utils_use_find_package wikipedia Qt5WebEngine)
 	)
 
 	use ipod && mycmakeargs+=( DWITH_GDKPixBuf=ON )

diff --git a/media-sound/amarok/metadata.xml b/media-sound/amarok/metadata.xml
index a06eebc6ca..8342725066 100644
--- a/media-sound/amarok/metadata.xml
+++ b/media-sound/amarok/metadata.xml
@@ -24,5 +24,6 @@
 		fingerprints (used by MusicBrainz)</flag>
 		<flag name="podcast">Enable gpodder.net podcast support via <pkg>media-libs/libmygpo-qt</pkg></flag>
 		<flag name="utils">Build tagging and collection scanner utilities</flag>
+		<flag name="wikipedia">Enable wikipedia widget using <pkg>dev-qt/qtwebengine</pkg></flag>
 	</use>
 </pkgmetadata>

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

[Andreas Sturmlechner]

commit:     9760bdfeb4c4a98453b0f0726f69ce59b3f07701
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 15 22:14:57 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Mar 15 22:14:57 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=9760bdfe

media-sound/amarok: Add USE=podcast

Upstream commit 4700309ebb0bc6a217a9ae51e0ef0c0dd0d44a5a

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 media-sound/amarok/amarok-9999.ebuild | 4 +++-
 media-sound/amarok/metadata.xml       | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/media-sound/amarok/amarok-9999.ebuild b/media-sound/amarok/amarok-9999.ebuild
index c8422539ef..bede3747b5 100644
--- a/media-sound/amarok/amarok-9999.ebuild
+++ b/media-sound/amarok/amarok-9999.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Advanced audio player based on KDE frameworks"
 HOMEPAGE="https://amarok.kde.org/"
 
 LICENSE="GPL-2"
-IUSE="+embedded ffmpeg ipod lastfm mtp ofa opengl +utils"
+IUSE="+embedded ffmpeg ipod lastfm mtp ofa opengl podcast +utils"
 
 if [[ ${KDE_BUILD_TYPE} == live ]]; then
 	RESTRICT="test"
@@ -75,6 +75,7 @@ COMMONDEPEND="
 	lastfm? ( media-libs/liblastfm[qt5(+)] )
 	mtp? ( >=media-libs/libmtp-1.0.0 )
 	opengl? ( virtual/opengl )
+	podcast? ( >=media-libs/libmygpo-qt-1.0.9[qt5(+)] )
 "
 DEPEND="${COMMONDEPEND}
 	virtual/pkgconfig
@@ -97,6 +98,7 @@ src_configure() {
 		$(cmake-utils_use_find_package lastfm LibLastFm)
 		$(cmake-utils_use_find_package mtp Mtp)
 		$(cmake-utils_use_find_package ofa LibOFA)
+		$(cmake-utils_use_find_package podcast Mygpo-qt5)
 		-DWITH_UTILITIES=$(usex utils)
 	)
 

diff --git a/media-sound/amarok/metadata.xml b/media-sound/amarok/metadata.xml
index 136f0c7a1c..34043f2641 100644
--- a/media-sound/amarok/metadata.xml
+++ b/media-sound/amarok/metadata.xml
@@ -22,6 +22,7 @@
 		<flag name="mtp">Enable support for libMTP (Plays4Sure) devices access through libmtp</flag>
 		<flag name="ofa">Use <pkg>media-libs/libofa</pkg> to compute MusicDNS acoustic
 		fingerprints (used by MusicBrainz)</flag>
+		<flag name="podcast">Enable gpodder.net podcast support via <pkg>media-libs/libmygpo-qt</pkg></flag>
 		<flag name="utils">Build the utils - old <pkg>media-sound/amarok-utils</pkg></flag>
 	</use>
 </pkgmetadata>

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

[Andreas Sturmlechner]

commit:     3ce6804c0318f549879d3844db5d841313750b59
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 15 22:15:42 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Mar 15 22:15:42 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=3ce6804c

media-sound/amarok: Drop obsolete build switch

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 media-sound/amarok/amarok-9999.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/media-sound/amarok/amarok-9999.ebuild b/media-sound/amarok/amarok-9999.ebuild
index bede3747b5..ad7319edff 100644
--- a/media-sound/amarok/amarok-9999.ebuild
+++ b/media-sound/amarok/amarok-9999.ebuild
@@ -89,7 +89,6 @@ PATCHES=( ${FILESDIR}/${PN}-2.8.90-mysqld-rpath.patch )
 
 src_configure() {
 	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_QJSON=ON
 		-DWITH_MP3Tunes=OFF
 		-DWITH_PLAYER=ON
 		-DWITH_MYSQL_EMBEDDED=$(usex embedded)

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

[Andreas Sturmlechner]

commit:     c4f13d355a27eacef9bd8b8f5af6d9fd1a72b258
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 15 22:25:55 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Mar 15 22:25:55 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=c4f13d35

media-sound/amarok: Drop no-op USE=opengl

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 media-sound/amarok/amarok-9999.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-sound/amarok/amarok-9999.ebuild b/media-sound/amarok/amarok-9999.ebuild
index ad7319edff..6cfbeb8ca7 100644
--- a/media-sound/amarok/amarok-9999.ebuild
+++ b/media-sound/amarok/amarok-9999.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Advanced audio player based on KDE frameworks"
 HOMEPAGE="https://amarok.kde.org/"
 
 LICENSE="GPL-2"
-IUSE="+embedded ffmpeg ipod lastfm mtp ofa opengl podcast +utils"
+IUSE="+embedded ffmpeg ipod lastfm mtp ofa podcast +utils"
 
 if [[ ${KDE_BUILD_TYPE} == live ]]; then
 	RESTRICT="test"
@@ -64,6 +64,7 @@ COMMONDEPEND="
 	sci-libs/fftw:3.0
 	sys-libs/zlib
 	>=virtual/mysql-5.1[embedded?]
+	virtual/opengl
 	ffmpeg? (
 		virtual/ffmpeg
 		ofa? ( >=media-libs/libofa-0.9.0 )
@@ -74,7 +75,6 @@ COMMONDEPEND="
 	)
 	lastfm? ( media-libs/liblastfm[qt5(+)] )
 	mtp? ( >=media-libs/libmtp-1.0.0 )
-	opengl? ( virtual/opengl )
 	podcast? ( >=media-libs/libmygpo-qt-1.0.9[qt5(+)] )
 "
 DEPEND="${COMMONDEPEND}

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

[Andreas Sturmlechner]

commit:     5f3f193e38be72ec810a3e2a22b28d6b158a71b3
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 15 22:21:15 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Mar 15 22:21:21 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=5f3f193e

media-sound/amarok: Improve USE=utils description

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 media-sound/amarok/metadata.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/amarok/metadata.xml b/media-sound/amarok/metadata.xml
index 34043f2641..a06eebc6ca 100644
--- a/media-sound/amarok/metadata.xml
+++ b/media-sound/amarok/metadata.xml
@@ -23,6 +23,6 @@
 		<flag name="ofa">Use <pkg>media-libs/libofa</pkg> to compute MusicDNS acoustic
 		fingerprints (used by MusicBrainz)</flag>
 		<flag name="podcast">Enable gpodder.net podcast support via <pkg>media-libs/libmygpo-qt</pkg></flag>
-		<flag name="utils">Build the utils - old <pkg>media-sound/amarok-utils</pkg></flag>
+		<flag name="utils">Build tagging and collection scanner utilities</flag>
 	</use>
 </pkgmetadata>

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

[Andreas Sturmlechner]

commit:     b12757f6c5d1e71ea789726f4e31d2994648ee5d
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Mar  8 20:06:07 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Mar  8 20:06:07 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=b12757f6

media-sound/amarok: Frameworks merged to master

Reported-by: stephan wezel <s.wezel <AT> web.de>
Closes: https://bugs.gentoo.org/649952
Package-Manager: Portage-2.3.24, Repoman-2.3.6

 media-sound/amarok/amarok-9999.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/media-sound/amarok/amarok-9999.ebuild b/media-sound/amarok/amarok-9999.ebuild
index 8d250fcccc..c8422539ef 100644
--- a/media-sound/amarok/amarok-9999.ebuild
+++ b/media-sound/amarok/amarok-9999.ebuild
@@ -3,7 +3,6 @@
 
 EAPI=6
 
-EGIT_BRANCH="kf5"
 KDE_HANDBOOK="true"
 KDE_TEST="true"
 VIRTUALX_REQUIRED="test"

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

[Andreas Sturmlechner]

commit:     ef703b49638651933c3c5bba59dd214bbe1cd132
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Mar  3 16:28:17 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Mar  3 16:29:43 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=ef703b49

media-sound/amarok: Add sci-libs/fftw:3.0 to DEPEND

Thanks-to: Till Schäfer <till2.schaefer <AT> uni-dortmund.de>
Closes: https://bugs.gentoo.org/649246
Package-Manager: Portage-2.3.24, Repoman-2.3.6

 media-sound/amarok/amarok-9999.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/media-sound/amarok/amarok-9999.ebuild b/media-sound/amarok/amarok-9999.ebuild
index 1ceed38a56..8d250fcccc 100644
--- a/media-sound/amarok/amarok-9999.ebuild
+++ b/media-sound/amarok/amarok-9999.ebuild
@@ -62,6 +62,7 @@ COMMONDEPEND="
 	media-libs/phonon[qt5(+)]
 	>=media-libs/taglib-1.7[asf(+),mp4(+)]
 	>=media-libs/taglib-extras-1.0.1
+	sci-libs/fftw:3.0
 	sys-libs/zlib
 	>=virtual/mysql-5.1[embedded?]
 	ffmpeg? (

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

[Andreas Sturmlechner]

commit:     6289ea5dc7472e4dd8c38802fee361ab6fd1db46
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 26 22:45:59 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Feb 26 22:45:59 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=6289ea5d

media-sound/amarok: Fix DEPENDs

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 media-sound/amarok/amarok-9999.ebuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/media-sound/amarok/amarok-9999.ebuild b/media-sound/amarok/amarok-9999.ebuild
index 5c751705b8..1ceed38a56 100644
--- a/media-sound/amarok/amarok-9999.ebuild
+++ b/media-sound/amarok/amarok-9999.ebuild
@@ -30,6 +30,7 @@ COMMONDEPEND="
 	$(add_frameworks_dep kconfigwidgets)
 	$(add_frameworks_dep kcoreaddons)
 	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdeclarative)
 	$(add_frameworks_dep kdnssd)
 	$(add_frameworks_dep kglobalaccel)
 	$(add_frameworks_dep kguiaddons)
@@ -39,16 +40,17 @@ COMMONDEPEND="
 	$(add_frameworks_dep kitemviews)
 	$(add_frameworks_dep knewstuff)
 	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kpackage)
 	$(add_frameworks_dep kservice)
 	$(add_frameworks_dep ktexteditor)
 	$(add_frameworks_dep ktextwidgets)
 	$(add_frameworks_dep kwidgetsaddons)
 	$(add_frameworks_dep kwindowsystem)
 	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep plasma)
 	$(add_frameworks_dep solid)
 	$(add_frameworks_dep threadweaver)
 	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtnetwork)
 	$(add_qt_dep qtscript 'scripttools')

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

[Andreas Sturmlechner]

commit:     fc66d5dffbf91eca05cb964a91d42492e56fa629
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 22 21:14:41 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Feb 22 21:14:41 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=fc66d5df

media-sound/amarok: Fix DEPENDs

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 media-sound/amarok/amarok-9999.ebuild | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/media-sound/amarok/amarok-9999.ebuild b/media-sound/amarok/amarok-9999.ebuild
index f9d3c78bbe..5c751705b8 100644
--- a/media-sound/amarok/amarok-9999.ebuild
+++ b/media-sound/amarok/amarok-9999.ebuild
@@ -29,7 +29,7 @@ COMMONDEPEND="
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
 	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep kdbusaddons)
 	$(add_frameworks_dep kdnssd)
 	$(add_frameworks_dep kglobalaccel)
 	$(add_frameworks_dep kguiaddons)
@@ -39,7 +39,6 @@ COMMONDEPEND="
 	$(add_frameworks_dep kitemviews)
 	$(add_frameworks_dep knewstuff)
 	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
 	$(add_frameworks_dep kservice)
 	$(add_frameworks_dep ktexteditor)
 	$(add_frameworks_dep ktextwidgets)
@@ -50,13 +49,11 @@ COMMONDEPEND="
 	$(add_frameworks_dep solid)
 	$(add_frameworks_dep threadweaver)
 	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtnetwork)
 	$(add_qt_dep qtscript 'scripttools')
 	$(add_qt_dep qtsql)
 	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwebkit)
 	$(add_qt_dep qtwidgets)
 	$(add_qt_dep qtxml)
 	app-crypt/qca:2[qt5(+)]

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

[Andreas Sturmlechner]

commit:     a640a8cd9f78d0d8da09a6a4c4d35c34ebe55a51
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 22 20:22:54 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Feb 22 20:22:54 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=a640a8cd

media-sound/amarok: Relax qca/liblastfm qt5-usedep

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 media-sound/amarok/amarok-9999.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-sound/amarok/amarok-9999.ebuild b/media-sound/amarok/amarok-9999.ebuild
index 51a226b0d8..f9d3c78bbe 100644
--- a/media-sound/amarok/amarok-9999.ebuild
+++ b/media-sound/amarok/amarok-9999.ebuild
@@ -59,7 +59,7 @@ COMMONDEPEND="
 	$(add_qt_dep qtwebkit)
 	$(add_qt_dep qtwidgets)
 	$(add_qt_dep qtxml)
-	app-crypt/qca:2[qt5]
+	app-crypt/qca:2[qt5(+)]
 	media-libs/phonon[qt5(+)]
 	>=media-libs/taglib-1.7[asf(+),mp4(+)]
 	>=media-libs/taglib-extras-1.0.1
@@ -73,7 +73,7 @@ COMMONDEPEND="
 		dev-libs/glib:2
 		>=media-libs/libgpod-0.7.0[gtk]
 	)
-	lastfm? ( media-libs/liblastfm[qt5] )
+	lastfm? ( media-libs/liblastfm[qt5(+)] )
 	mtp? ( >=media-libs/libmtp-1.0.0 )
 	opengl? ( virtual/opengl )
 "

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

[Andreas Sturmlechner]

commit:     13cfc40fa19f3c709ede5c380979bce5584280ae
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jan  7 09:58:58 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jan  7 09:58:58 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=13cfc40f

media-sound/amarok: Cleanup outdated comment

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 media-sound/amarok/amarok-9999.ebuild | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/media-sound/amarok/amarok-9999.ebuild b/media-sound/amarok/amarok-9999.ebuild
index c69db629c1..51a226b0d8 100644
--- a/media-sound/amarok/amarok-9999.ebuild
+++ b/media-sound/amarok/amarok-9999.ebuild
@@ -77,11 +77,6 @@ COMMONDEPEND="
 	mtp? ( >=media-libs/libmtp-1.0.0 )
 	opengl? ( virtual/opengl )
 "
-# 	cdda? (
-# 		$(add_kdeapps_dep libkcddb)
-# 		$(add_kdeapps_dep libkcompactdisc)
-# 		$(add_kdeapps_dep audiocd-kio)
-# 	)
 DEPEND="${COMMONDEPEND}
 	virtual/pkgconfig
 	test? ( dev-cpp/gmock )

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

[Andreas Sturmlechner]

commit:     33a6894c445897d7907f6ba205f0ecbe5b88416f
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 14 08:21:59 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Dec 14 08:21:59 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=33a6894c

media-sound/amarok: Cleanup obsolete comment

Package-Manager: Portage-2.3.13, Repoman-2.3.4

 media-sound/amarok/amarok-9999.ebuild | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/media-sound/amarok/amarok-9999.ebuild b/media-sound/amarok/amarok-9999.ebuild
index 60c2a83bdd..01bdc9a5ee 100644
--- a/media-sound/amarok/amarok-9999.ebuild
+++ b/media-sound/amarok/amarok-9999.ebuild
@@ -93,9 +93,6 @@ RDEPEND="${COMMONDEPEND}
 PATCHES=( ${FILESDIR}/${PN}-2.8.90-mysqld-rpath.patch )
 
 src_configure() {
-	# Append minimal-toc cflag for ppc64, see bug 280552 and 292707
-# 	use ppc64 && append-flags -mminimal-toc
-
 	local mycmakeargs=(
 		-DCMAKE_DISABLE_FIND_PACKAGE_QJSON=ON
 		-DWITH_MP3Tunes=OFF

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

[Andreas Sturmlechner]

commit:     780d4ca9fca91e73850252d7ba505d72ea83616f
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 14 08:19:59 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Dec 14 08:19:59 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=780d4ca9

media-sound/amarok: pkg_postinst: Fix MySQL config link

Package-Manager: Portage-2.3.13, Repoman-2.3.4

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

diff --git a/media-sound/amarok/amarok-9999.ebuild b/media-sound/amarok/amarok-9999.ebuild
index eeb786a499..60c2a83bdd 100644
--- a/media-sound/amarok/amarok-9999.ebuild
+++ b/media-sound/amarok/amarok-9999.ebuild
@@ -128,18 +128,15 @@ pkg_postinst() {
 	kde5_pkg_postinst
 
 	if ! use embedded; then
-		echo
 		elog "You've disabled the amarok support for embedded mysql DBs."
 		elog "You'll have to configure amarok to use an external db server."
-		echo
-		elog "Please read http://amarok.kde.org/wiki/MySQL_Server for details on how"
+		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."
-		echo
 
 		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."
-			echo
 		fi
 	fi
 }

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

[Andreas Sturmlechner]

commit:     6269f96f515a8b0ee0108ce30f6e56c2ec96eb25
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 25 11:16:48 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jun 25 11:16:48 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=6269f96f

media-sound/amarok: Block media-sound/amarok:4

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 media-sound/amarok/amarok-9999.ebuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/media-sound/amarok/amarok-9999.ebuild b/media-sound/amarok/amarok-9999.ebuild
index 361c4c3b87..21c239638a 100644
--- a/media-sound/amarok/amarok-9999.ebuild
+++ b/media-sound/amarok/amarok-9999.ebuild
@@ -86,7 +86,9 @@ DEPEND="${COMMONDEPEND}
 	virtual/pkgconfig
 	test? ( dev-cpp/gmock )
 "
-RDEPEND="${COMMONDEPEND}"
+RDEPEND="${COMMONDEPEND}
+	!media-sound/amarok:4
+"
 
 src_configure() {
 	# Append minimal-toc cflag for ppc64, see bug 280552 and 292707

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

[Michael Palimaka]

commit:     03b5897b56a5fb14734fe3d8c975b6fa40e3d26d
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 21 09:40:32 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Jul 21 09:40:48 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=03b5897b

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

Package-Manager: portage-2.3.0

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

diff --git a/media-sound/amarok/amarok-9999.ebuild b/media-sound/amarok/amarok-9999.ebuild
index 1cd2f58..4e63e5e 100644
--- a/media-sound/amarok/amarok-9999.ebuild
+++ b/media-sound/amarok/amarok-9999.ebuild
@@ -62,7 +62,7 @@ COMMONDEPEND="
 	$(add_qt_dep qtxml)
 	app-crypt/qca:2[qt5]
 	media-libs/phonon[qt5]
-	>=media-libs/taglib-1.7[asf,mp4]
+	>=media-libs/taglib-1.7[asf(+),mp4(+)]
 	>=media-libs/taglib-extras-1.0.1
 	sys-libs/zlib
 	>=virtual/mysql-5.1[embedded?]

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

[Johannes Huber]

commit:     a10673e4887162e71ab129a978f9caab1e72fe55
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 28 11:23:48 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Mon Mar 28 11:23:48 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=a10673e4

media-sound/amarok: EAPI 6

Package-Manager: portage-2.2.28

 media-sound/amarok/amarok-2.8.90.ebuild |  18 ++---
 media-sound/amarok/amarok-5.9999.ebuild | 139 --------------------------------
 media-sound/amarok/amarok-9999.ebuild   | 134 ++++++++++++++++--------------
 3 files changed, 82 insertions(+), 209 deletions(-)

diff --git a/media-sound/amarok/amarok-2.8.90.ebuild b/media-sound/amarok/amarok-2.8.90.ebuild
index a8dc8a7..d9f9871 100644
--- a/media-sound/amarok/amarok-2.8.90.ebuild
+++ b/media-sound/amarok/amarok-2.8.90.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_LINGUAS="bs ca ca@valencia cs da de el en_GB es et eu fi fr ga gl hu it ja
 lt lv nb nl pa pl pt pt_BR ro ru sl sr sr@ijekavian sr@ijekavianlatin sr@latin
@@ -84,14 +84,14 @@ src_configure() {
 		-DWITH_SPECTRUM_ANALYZER=OFF
 		-DWITH_NepomukCore=OFF
 		-DWITH_Soprano=OFF
-		$(cmake-utils_use embedded WITH_MYSQL_EMBEDDED)
-		$(cmake-utils_use_with ipod)
-		$(cmake-utils_use_with ipod Gdk)
-		$(cmake-utils_use_with lastfm LibLastFm)
-		$(cmake-utils_use_with mtp)
-		$(cmake-utils_use_with mp3tunes MP3Tunes)
-		$(cmake-utils_use_with ofa LibOFA)
-		$(cmake-utils_use_with utils UTILITIES)
+		-DWITH_MYSQL_EMBEDDED=$(usex embedded)
+		-DWITH_IPOD=$(usex ipod)
+		-DWITH_GDKPixBuf=$(usex ipod)
+		-DWITH_LibLastFm=$(usex lastfm)
+		-DWITH_MP3Tunes=$(usex mp3tunes)
+		-DWITH_Mtp=$(usex mtp)
+		-DWITH_LibOFA=$(usex ofa)
+		-DWITH_UTILITIES=$(usex utils)
 	)
 
 	kde4-base_src_configure

diff --git a/media-sound/amarok/amarok-5.9999.ebuild b/media-sound/amarok/amarok-5.9999.ebuild
deleted file mode 100644
index 17f6cd5..0000000
--- a/media-sound/amarok/amarok-5.9999.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-EGIT_BRANCH="kf5"
-KDE_HANDBOOK="true"
-KDE_TEST="true"
-VIRTUALX_REQUIRED="test"
-VIRTUALDBUS_TEST="true"
-inherit flag-o-matic kde5 pax-utils
-
-DESCRIPTION="Advanced audio player based on KDE framework"
-HOMEPAGE="https://amarok.kde.org/"
-
-LICENSE="GPL-2"
-IUSE="+embedded ffmpeg ipod lastfm mtp ofa opengl +utils"
-
-if [[ ${KDE_BUILD_TYPE} == live ]]; then
-	RESTRICT="test"
-fi
-
-# ipod requires gdk enabled and also gtk compiled in libgpod
-COMMONDEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep kdnssd)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktexteditor)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep plasma)
-	$(add_frameworks_dep solid)
-	$(add_frameworks_dep threadweaver)
-	app-crypt/qca:2[qt5]
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtscript 'scripttools')
-	$(add_qt_dep qtsql)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwebkit)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	media-libs/phonon[qt5]
-	>=media-libs/taglib-1.7[asf,mp4]
-	>=media-libs/taglib-extras-1.0.1
-	sys-libs/zlib
-	>=virtual/mysql-5.1[embedded?]
-	ffmpeg? (
-		virtual/ffmpeg
-		ofa? ( >=media-libs/libofa-0.9.0 )
-	)
-	ipod? (
-		dev-libs/glib:2
-		>=media-libs/libgpod-0.7.0[gtk]
-	)
-	lastfm? ( media-libs/liblastfm[qt5] )
-	mtp? ( >=media-libs/libmtp-1.0.0 )
-	opengl? ( virtual/opengl )
-"
-# 	cdda? (
-# 		$(add_kdeapps_dep libkcddb)
-# 		$(add_kdeapps_dep libkcompactdisc)
-# 		$(add_kdeapps_dep audiocd-kio)
-# 	)
-DEPEND="${COMMONDEPEND}
-	virtual/pkgconfig
-	test? ( dev-cpp/gmock )
-"
-RDEPEND="${COMMONDEPEND}"
-
-src_configure() {
-	# Append minimal-toc cflag for ppc64, see bug 280552 and 292707
-# 	use ppc64 && append-flags -mminimal-toc
-
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_QJSON=ON
-		-DWITH_MP3Tunes=OFF
-		-DWITH_PLAYER=ON
-		-DWITH_SPECTRUM_ANALYZER=OFF
-		$(cmake-utils_use embedded WITH_MYSQL_EMBEDDED)
-		$(cmake-utils_use_find_package ffmpeg FFmpeg)
-		$(cmake-utils_use_with ipod)
-		$(cmake-utils_use_find_package ipod GDKPixBuf)
-		$(cmake-utils_use_find_package lastfm LibLastFm)
-		$(cmake-utils_use_find_package mtp)
-		$(cmake-utils_use_find_package ofa LibOFA)
-		$(cmake-utils_use utils WITH_UTILITIES)
-	)
-
-	kde5_src_configure
-}
-
-src_install() {
-	kde5_src_install
-
-	# bug 481592
-	pax-mark m "${ED}"/usr/bin/amarok
-}
-
-pkg_postinst() {
-	kde5_pkg_postinst
-
-	if ! use embedded; then
-		echo
-		elog "You've disabled the amarok support for embedded mysql DBs."
-		elog "You'll have to configure amarok to use an external db server."
-		echo
-		elog "Please read http://amarok.kde.org/wiki/MySQL_Server for details on how"
-		elog "to configure the external db and migrate your data from the embedded database."
-		echo
-
-		if has_version "virtual/mysql[minimal]"; then
-			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."
-			echo
-		fi
-	fi
-}

diff --git a/media-sound/amarok/amarok-9999.ebuild b/media-sound/amarok/amarok-9999.ebuild
index 2ce653c..1cd2f58 100644
--- a/media-sound/amarok/amarok-9999.ebuild
+++ b/media-sound/amarok/amarok-9999.ebuild
@@ -2,33 +2,20 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
-KDE_LINGUAS="bs ca ca@valencia cs da de el en_GB es et eu fi fr ga gl hu it ja
-lt lv nb nl pa pl pt pt_BR ro ru sl sr sr@ijekavian sr@ijekavianlatin sr@latin
-sv tr uk zh_CN zh_TW"
-KDE_REQUIRED="never"
-KDE_HANDBOOK="optional"
+EGIT_BRANCH="kf5"
+KDE_HANDBOOK="true"
+KDE_TEST="true"
 VIRTUALX_REQUIRED="test"
 VIRTUALDBUS_TEST="true"
-inherit flag-o-matic kde4-base pax-utils
+inherit flag-o-matic kde5 pax-utils
 
-DESCRIPTION="Advanced audio player based on KDE framework"
-HOMEPAGE="http://amarok.kde.org/"
-if [[ ${PV} != *9999* ]]; then
-	if [[ $PV == *[6-9][0-9]* ]]; then
-		SRC_URI="mirror://kde/unstable/${PN}/${PV}/src/${P}.tar.bz2"
-	else
-		SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-	fi
-	KEYWORDS="~amd64 ~ppc ~x86"
-else
-	KEYWORDS=""
-fi
+DESCRIPTION="Advanced audio player based on KDE frameworks"
+HOMEPAGE="https://amarok.kde.org/"
 
 LICENSE="GPL-2"
-SLOT="4"
-IUSE="cdda debug +embedded ipod lastfm mp3tunes mtp ofa opengl test +utils"
+IUSE="+embedded ffmpeg ipod lastfm mtp ofa opengl +utils"
 
 if [[ ${KDE_BUILD_TYPE} == live ]]; then
 	RESTRICT="test"
@@ -36,78 +23,103 @@ fi
 
 # ipod requires gdk enabled and also gtk compiled in libgpod
 COMMONDEPEND="
-	app-crypt/qca:2[qt4(+)]
-	$(add_kdebase_dep kdelibs 'opengl?' 4.8.4)
-	$(add_kdeapps_dep kdebase-kioslaves)
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep kdnssd)
+	$(add_frameworks_dep kglobalaccel)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep knotifyconfig)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktexteditor)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep plasma)
+	$(add_frameworks_dep solid)
+	$(add_frameworks_dep threadweaver)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtscript 'scripttools')
+	$(add_qt_dep qtsql)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwebkit)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	app-crypt/qca:2[qt5]
+	media-libs/phonon[qt5]
 	>=media-libs/taglib-1.7[asf,mp4]
 	>=media-libs/taglib-extras-1.0.1
 	sys-libs/zlib
 	>=virtual/mysql-5.1[embedded?]
-	>=dev-qt/qtcore-4.8:4
-	>=dev-qt/qtdbus-4.8:4
-	>=dev-qt/qtscript-4.8:4
-	>=x11-libs/qtscriptgenerator-0.1.0
-	cdda? (
-		$(add_kdeapps_dep libkcddb)
-		$(add_kdeapps_dep libkcompactdisc)
-		$(add_kdeapps_dep audiocd-kio)
+	ffmpeg? (
+		virtual/ffmpeg
+		ofa? ( >=media-libs/libofa-0.9.0 )
 	)
-	ipod? ( >=media-libs/libgpod-0.7.0[gtk] )
-	lastfm? ( >=media-libs/liblastfm-1.0.3[qt4(+)] )
-	mp3tunes? (
+	ipod? (
 		dev-libs/glib:2
-		dev-libs/libxml2
-		dev-libs/openssl:0
-		net-libs/loudmouth
-		net-misc/curl
-		>=dev-qt/qtcore-4.8.4:4[glib]
+		>=media-libs/libgpod-0.7.0[gtk]
 	)
+	lastfm? ( media-libs/liblastfm[qt5] )
 	mtp? ( >=media-libs/libmtp-1.0.0 )
-	ofa? ( >=media-libs/libofa-0.9.0 )
 	opengl? ( virtual/opengl )
 "
+# 	cdda? (
+# 		$(add_kdeapps_dep libkcddb)
+# 		$(add_kdeapps_dep libkcompactdisc)
+# 		$(add_kdeapps_dep audiocd-kio)
+# 	)
 DEPEND="${COMMONDEPEND}
-	dev-util/automoc
 	virtual/pkgconfig
 	test? ( dev-cpp/gmock )
 "
-RDEPEND="${COMMONDEPEND}
-	!media-sound/amarok-utils
-	$(add_kdeapps_dep phonon-kde)
-"
+RDEPEND="${COMMONDEPEND}"
 
 src_configure() {
 	# Append minimal-toc cflag for ppc64, see bug 280552 and 292707
-	use ppc64 && append-flags -mminimal-toc
+# 	use ppc64 && append-flags -mminimal-toc
 
 	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_QJSON=ON
+		-DWITH_MP3Tunes=OFF
 		-DWITH_PLAYER=ON
-		-DWITH_Libgcrypt=OFF
 		-DWITH_SPECTRUM_ANALYZER=OFF
-		-DWITH_NepomukCore=OFF
-		-DWITH_Soprano=OFF
-		$(cmake-utils_use embedded WITH_MYSQL_EMBEDDED)
-		$(cmake-utils_use_with ipod)
-		$(cmake-utils_use_with ipod Gdk)
-		$(cmake-utils_use_with lastfm LibLastFm)
-		$(cmake-utils_use_with mtp)
-		$(cmake-utils_use_with mp3tunes MP3Tunes)
-		$(cmake-utils_use_with ofa LibOFA)
-		$(cmake-utils_use_with utils UTILITIES)
+		-DWITH_MYSQL_EMBEDDED=$(usex embedded)
+		$(cmake-utils_use_find_package ffmpeg FFmpeg)
+		-DWITH_IPOD=$(usex ipod)
+		$(cmake-utils_use_find_package ipod GDKPixBuf)
+		$(cmake-utils_use_find_package lastfm LibLastFm)
+		$(cmake-utils_use_find_package mtp Mtp)
+		$(cmake-utils_use_find_package ofa LibOFA)
+		-DWITH_UTILITIES=$(usex utils)
 	)
 
-	kde4-base_src_configure
+	kde5_src_configure
 }
 
 src_install() {
-	kde4-base_src_install
+	kde5_src_install
 
 	# bug 481592
 	pax-mark m "${ED}"/usr/bin/amarok
 }
 
 pkg_postinst() {
-	kde4-base_pkg_postinst
+	kde5_pkg_postinst
 
 	if ! use embedded; then
 		echo

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

[Michael Palimaka]

commit:     d3c4371f15b0a9bcb94bb3f57b81bf34386199cb
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 31 09:17:17 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Dec 31 09:17:17 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=d3c4371f

media-sound/amarok: add missing media-libs/liblastfm USE dependency

Package-Manager: portage-2.2.26

 media-sound/amarok/amarok-2.8.90.ebuild | 2 +-
 media-sound/amarok/amarok-9999.ebuild   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-sound/amarok/amarok-2.8.90.ebuild b/media-sound/amarok/amarok-2.8.90.ebuild
index ebe5d85..d0c4046 100644
--- a/media-sound/amarok/amarok-2.8.90.ebuild
+++ b/media-sound/amarok/amarok-2.8.90.ebuild
@@ -49,7 +49,7 @@ COMMONDEPEND="
 		$(add_kdeapps_dep audiocd-kio)
 	)
 	ipod? ( >=media-libs/libgpod-0.7.0[gtk] )
-	lastfm? ( >=media-libs/liblastfm-1.0.3 )
+	lastfm? ( >=media-libs/liblastfm-1.0.3[qt4(+)] )
 	mp3tunes? (
 		dev-libs/glib:2
 		dev-libs/libxml2

diff --git a/media-sound/amarok/amarok-9999.ebuild b/media-sound/amarok/amarok-9999.ebuild
index 4d2e5c1..eaab68b 100644
--- a/media-sound/amarok/amarok-9999.ebuild
+++ b/media-sound/amarok/amarok-9999.ebuild
@@ -53,7 +53,7 @@ COMMONDEPEND="
 		$(add_kdeapps_dep audiocd-kio)
 	)
 	ipod? ( >=media-libs/libgpod-0.7.0[gtk] )
-	lastfm? ( >=media-libs/liblastfm-1.0.3 )
+	lastfm? ( >=media-libs/liblastfm-1.0.3[qt4(+)] )
 	mp3tunes? (
 		dev-libs/glib:2
 		dev-libs/libxml2

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

[Michael Palimaka]

commit:     fe883d4194271df3b0a0d7db22e27d74410b5d3d
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sun Nov 22 23:10:57 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Nov 26 16:06:17 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=fe883d41

media-sound/amarok: Version bump to 2.8.90 beta

Package-Manager: portage-2.2.20.1

 media-sound/amarok/{amarok-9999.ebuild => amarok-2.8.90.ebuild} | 6 +-----
 media-sound/amarok/amarok-9999.ebuild                           | 2 +-
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/media-sound/amarok/amarok-9999.ebuild b/media-sound/amarok/amarok-2.8.90.ebuild
similarity index 94%
copy from media-sound/amarok/amarok-9999.ebuild
copy to media-sound/amarok/amarok-2.8.90.ebuild
index 1cc95d6..ebe5d85 100644
--- a/media-sound/amarok/amarok-9999.ebuild
+++ b/media-sound/amarok/amarok-2.8.90.ebuild
@@ -16,11 +16,7 @@ inherit flag-o-matic kde4-base pax-utils
 DESCRIPTION="Advanced audio player based on KDE framework"
 HOMEPAGE="http://amarok.kde.org/"
 if [[ ${PV} != *9999* ]]; then
-	if [[ $PV == *[6-9][0-9]* ]]; then
-		SRC_URI="mirror://kde/unstable/${PN}/${PV}/src/${P}.tar.bz2"
-	else
-		SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.bz2"
-	fi
+	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
 	KEYWORDS="~amd64 ~ppc ~x86"
 else
 	KEYWORDS=""

diff --git a/media-sound/amarok/amarok-9999.ebuild b/media-sound/amarok/amarok-9999.ebuild
index 1cc95d6..4d2e5c1 100644
--- a/media-sound/amarok/amarok-9999.ebuild
+++ b/media-sound/amarok/amarok-9999.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} != *9999* ]]; then
 	if [[ $PV == *[6-9][0-9]* ]]; then
 		SRC_URI="mirror://kde/unstable/${PN}/${PV}/src/${P}.tar.bz2"
 	else
-		SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.bz2"
+		SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
 	fi
 	KEYWORDS="~amd64 ~ppc ~x86"
 else

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

[Michael Palimaka]

commit:     6962b6ead21d3e42c6b6147529c387d13c24e5c3
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sun Sep 13 22:21:05 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Mon Sep 14 13:08:50 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=6962b6ea

media-sound/amarok: Fix DEPENDs

Package-Manager: portage-2.2.20.1

 media-sound/amarok/amarok-5.9999.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-sound/amarok/amarok-5.9999.ebuild b/media-sound/amarok/amarok-5.9999.ebuild
index 64f8283..f3c9bc0 100644
--- a/media-sound/amarok/amarok-5.9999.ebuild
+++ b/media-sound/amarok/amarok-5.9999.ebuild
@@ -55,7 +55,7 @@ COMMONDEPEND="
 	dev-qt/qtdeclarative:5
 	dev-qt/qtgui:5
 	dev-qt/qtnetwork:5
-	dev-qt/qtscript:5
+	dev-qt/qtscript:5[scripttools]
 	dev-qt/qtsql:5
 	dev-qt/qtsvg:5
 	dev-qt/qtwebkit:5
@@ -74,7 +74,7 @@ COMMONDEPEND="
 		dev-libs/glib:2
 		>=media-libs/libgpod-0.7.0[gtk]
 	)
-	lastfm? ( >=media-libs/liblastfm-1.0.3 )
+	lastfm? ( media-libs/liblastfm[qt5] )
 	mtp? ( >=media-libs/libmtp-1.0.0 )
 	opengl? ( virtual/opengl )
 "

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

[Michael Palimaka]

commit:     3332aa66fc197eeb7beadab87711b2250597b857
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Fri Jun 26 22:41:26 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Sep 10 18:15:48 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=3332aa66

media-sound/amarok: Add kf5 version

Merge pull request #368 from a17r/amarok

Package-Manager: portage-2.2.20

 media-sound/amarok/amarok-5.9999.ebuild | 139 ++++++++++++++++++++++++++++++++
 1 file changed, 139 insertions(+)

diff --git a/media-sound/amarok/amarok-5.9999.ebuild b/media-sound/amarok/amarok-5.9999.ebuild
new file mode 100644
index 0000000..64f8283
--- /dev/null
+++ b/media-sound/amarok/amarok-5.9999.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+EGIT_BRANCH="kf5"
+KDE_HANDBOOK="true"
+KDE_TEST="true"
+VIRTUALX_REQUIRED="test"
+VIRTUALDBUS_TEST="true"
+inherit flag-o-matic kde5 pax-utils
+
+DESCRIPTION="Advanced audio player based on KDE framework"
+HOMEPAGE="https://amarok.kde.org/"
+
+LICENSE="GPL-2"
+IUSE="+embedded ffmpeg ipod lastfm mtp ofa opengl +utils"
+
+if [[ ${KDE_BUILD_TYPE} == live ]]; then
+	RESTRICT="test"
+fi
+
+# ipod requires gdk enabled and also gtk compiled in libgpod
+COMMONDEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep kdnssd)
+	$(add_frameworks_dep kglobalaccel)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep knotifyconfig)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktexteditor)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep plasma)
+	$(add_frameworks_dep solid)
+	$(add_frameworks_dep threadweaver)
+	app-crypt/qca:2[qt5]
+	dev-qt/qtdbus:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtscript:5
+	dev-qt/qtsql:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwebkit:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	media-libs/phonon[qt5]
+	>=media-libs/taglib-1.7[asf,mp4]
+	>=media-libs/taglib-extras-1.0.1
+	sys-libs/zlib
+	>=virtual/mysql-5.1[embedded?]
+	ffmpeg? (
+		virtual/ffmpeg
+		ofa? ( >=media-libs/libofa-0.9.0 )
+	)
+	ipod? (
+		dev-libs/glib:2
+		>=media-libs/libgpod-0.7.0[gtk]
+	)
+	lastfm? ( >=media-libs/liblastfm-1.0.3 )
+	mtp? ( >=media-libs/libmtp-1.0.0 )
+	opengl? ( virtual/opengl )
+"
+# 	cdda? (
+# 		$(add_kdeapps_dep libkcddb)
+# 		$(add_kdeapps_dep libkcompactdisc)
+# 		$(add_kdeapps_dep audiocd-kio)
+# 	)
+DEPEND="${COMMONDEPEND}
+	virtual/pkgconfig
+	test? ( dev-cpp/gmock )
+"
+RDEPEND="${COMMONDEPEND}"
+
+src_configure() {
+	# Append minimal-toc cflag for ppc64, see bug 280552 and 292707
+# 	use ppc64 && append-flags -mminimal-toc
+
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_QJSON=ON
+		-DWITH_MP3Tunes=OFF
+		-DWITH_PLAYER=ON
+		-DWITH_SPECTRUM_ANALYZER=OFF
+		$(cmake-utils_use embedded WITH_MYSQL_EMBEDDED)
+		$(cmake-utils_use_find_package ffmpeg FFmpeg)
+		$(cmake-utils_use_with ipod)
+		$(cmake-utils_use_find_package ipod GDKPixBuf)
+		$(cmake-utils_use_find_package lastfm LibLastFm)
+		$(cmake-utils_use_find_package mtp)
+		$(cmake-utils_use_find_package ofa LibOFA)
+		$(cmake-utils_use utils WITH_UTILITIES)
+	)
+
+	kde5_src_configure
+}
+
+src_install() {
+	kde5_src_install
+
+	# bug 481592
+	pax-mark m "${ED}"/usr/bin/amarok
+}
+
+pkg_postinst() {
+	kde5_pkg_postinst
+
+	if ! use embedded; then
+		echo
+		elog "You've disabled the amarok support for embedded mysql DBs."
+		elog "You'll have to configure amarok to use an external db server."
+		echo
+		elog "Please read http://amarok.kde.org/wiki/MySQL_Server for details on how"
+		elog "to configure the external db and migrate your data from the embedded database."
+		echo
+
+		if has_version "virtual/mysql[minimal]"; then
+			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."
+			echo
+		fi
+	fi
+}

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

[Johannes Huber]

commit:     4ed178d5d8d32368d8cb98537f9473b2720a83bf
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Fri Aug  7 21:43:56 2015 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Fri Aug  7 21:44:15 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=4ed178d5

[media-sound/amarok] Drop deprecated Nepomuk support

Package-Manager: portage-2.2.20

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

diff --git a/media-sound/amarok/amarok-9999.ebuild b/media-sound/amarok/amarok-9999.ebuild
index 9740197..8997a2a 100644
--- a/media-sound/amarok/amarok-9999.ebuild
+++ b/media-sound/amarok/amarok-9999.ebuild
@@ -28,7 +28,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="4"
-IUSE="cdda debug +embedded ipod lastfm mp3tunes mtp nepomuk ofa opengl test +utils"
+IUSE="cdda debug +embedded ipod lastfm mp3tunes mtp ofa opengl test +utils"
 
 if [[ ${KDE_BUILD_TYPE} == live ]]; then
 	RESTRICT="test"
@@ -37,7 +37,7 @@ fi
 # ipod requires gdk enabled and also gtk compiled in libgpod
 COMMONDEPEND="
 	app-crypt/qca:2[qt4(+)]
-	$(add_kdebase_dep kdelibs 'nepomuk?,opengl?' 4.8.4)
+	$(add_kdebase_dep kdelibs 'opengl?' 4.8.4)
 	$(add_kdeapps_dep kdebase-kioslaves)
 	>=media-libs/taglib-1.7[asf,mp4]
 	>=media-libs/taglib-extras-1.0.1
@@ -63,7 +63,6 @@ COMMONDEPEND="
 		>=dev-qt/qtcore-4.8.4:4[glib]
 	)
 	mtp? ( >=media-libs/libmtp-1.0.0 )
-	nepomuk? ( >=kde-base/nepomuk-core-4.9.0 )
 	ofa? ( >=media-libs/libofa-0.9.0 )
 	opengl? ( virtual/opengl )
 "
@@ -85,14 +84,14 @@ src_configure() {
 		-DWITH_PLAYER=ON
 		-DWITH_Libgcrypt=OFF
 		-DWITH_SPECTRUM_ANALYZER=OFF
+		-DWITH_NepomukCore=OFF
+		-DWITH_Soprano=OFF
 		$(cmake-utils_use embedded WITH_MYSQL_EMBEDDED)
 		$(cmake-utils_use_with ipod)
 		$(cmake-utils_use_with ipod Gdk)
 		$(cmake-utils_use_with lastfm LibLastFm)
 		$(cmake-utils_use_with mtp)
 		$(cmake-utils_use_with mp3tunes MP3Tunes)
-		$(cmake-utils_use_with nepomuk)
-		$(cmake-utils_use_with nepomuk Soprano)
 		$(cmake-utils_use_with ofa LibOFA)
 		$(cmake-utils_use_with utils UTILITIES)
 	)

diff --git a/media-sound/amarok/metadata.xml b/media-sound/amarok/metadata.xml
index d486342..eb74211 100644
--- a/media-sound/amarok/metadata.xml
+++ b/media-sound/amarok/metadata.xml
@@ -15,7 +15,6 @@
 		<pkg>media-libs/liblastfm</pkg></flag>
 		<flag name="mp3tunes">Enable mp3tunes integration</flag>
 		<flag name="mtp">Enable support for libMTP (Plays4Sure) devices access through libmtp</flag>
-		<flag name="nepomuk">Enable Nepomuk based semantic desktop support (deprecated)</flag>
 		<flag name="ofa">Use <pkg>media-libs/libofa</pkg> to compute MusicDNS acoustic
 		fingerprints (used by MusicBrainz)</flag>
 		<flag name="utils">Build the utils - old <pkg>media-sound/amarok-utils</pkg></flag>

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

[Michael Palimaka]

commit:     dfe9183721623a4c6a264856c64236738f270b3e
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 17 13:51:00 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue Feb 17 13:51:00 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=dfe91837

[media-sound/amarok] Add missing dependency SLOT.

Package-Manager: portage-2.2.14

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

diff --git a/media-sound/amarok/amarok-9999.ebuild b/media-sound/amarok/amarok-9999.ebuild
index d5bcdb6..25d9c55 100644
--- a/media-sound/amarok/amarok-9999.ebuild
+++ b/media-sound/amarok/amarok-9999.ebuild
@@ -57,7 +57,7 @@ COMMONDEPEND="
 	mp3tunes? (
 		dev-libs/glib:2
 		dev-libs/libxml2
-		dev-libs/openssl
+		dev-libs/openssl:0
 		net-libs/loudmouth
 		net-misc/curl
 		>=dev-qt/qtcore-4.8.4:4[glib]

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

[Michael Palimaka]

commit:     e48320def752c73179f380ff73c6bd6b77d28113
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 29 14:33:44 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Jan 29 14:33:44 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=e48320de

[media-sound/amarok] Add USE default for app-crypt/qca[qt4].

Package-Manager: portage-2.2.14

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

diff --git a/media-sound/amarok/amarok-9999.ebuild b/media-sound/amarok/amarok-9999.ebuild
index 9b72035..d5bcdb6 100644
--- a/media-sound/amarok/amarok-9999.ebuild
+++ b/media-sound/amarok/amarok-9999.ebuild
@@ -36,7 +36,7 @@ fi
 
 # ipod requires gdk enabled and also gtk compiled in libgpod
 COMMONDEPEND="
-	app-crypt/qca:2[qt4]
+	app-crypt/qca:2[qt4(+)]
 	$(add_kdebase_dep kdelibs 'nepomuk?,opengl?' 4.8.4)
 	$(add_kdebase_dep kdebase-kioslaves)
 	>=media-libs/taglib-1.7[asf,mp4]

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

[Johannes Huber]

commit:     466e51a34ab640ceba7229cb6c5ea8eba69ba831
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 29 00:03:07 2015 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Thu Jan 29 00:03:07 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=466e51a3

[media-sound/amarok] Adjust use dependencies to handle >=app-crypt/qca-2.1

Package-Manager: portage-2.2.15

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

diff --git a/media-sound/amarok/amarok-9999.ebuild b/media-sound/amarok/amarok-9999.ebuild
index ba5585b..9b72035 100644
--- a/media-sound/amarok/amarok-9999.ebuild
+++ b/media-sound/amarok/amarok-9999.ebuild
@@ -36,7 +36,7 @@ fi
 
 # ipod requires gdk enabled and also gtk compiled in libgpod
 COMMONDEPEND="
-	app-crypt/qca:2
+	app-crypt/qca:2[qt4]
 	$(add_kdebase_dep kdelibs 'nepomuk?,opengl?' 4.8.4)
 	$(add_kdebase_dep kdebase-kioslaves)
 	>=media-libs/taglib-1.7[asf,mp4]

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

[Michael Palimaka]

commit:     4ed3b0885b00775ba2a8a27752fd368f331642a3
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 17 13:04:37 2014 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Jul 17 13:04:37 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=4ed3b088

[media-sound/amarok] Remove workaround now handled in the eclass.

See 8b044a866ca48bcfc3a6cd673a9f866c50e5e9d9.

Package-Manager: portage-2.2.10

---
 media-sound/amarok/amarok-9999.ebuild | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/media-sound/amarok/amarok-9999.ebuild b/media-sound/amarok/amarok-9999.ebuild
index 91106ad..156db7b 100644
--- a/media-sound/amarok/amarok-9999.ebuild
+++ b/media-sound/amarok/amarok-9999.ebuild
@@ -77,15 +77,6 @@ RDEPEND="${COMMONDEPEND}
 	$(add_kdebase_dep phonon-kde)
 "
 
-src_prepare() {
-	if [[ ${KDE_BUILD_TYPE} != live ]]; then
-		mv doc/en_US doc/en || die
-		sed -e "s/en_US/en/" -i doc/CMakeLists.txt || die
-	fi
-
-	kde4-base_src_prepare
-}
-
 src_configure() {
 	# Append minimal-toc cflag for ppc64, see bug 280552 and 292707
 	use ppc64 && append-flags -mminimal-toc

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

[Johannes Huber]

commit:     e4ee94008839df67655489e7057394102dbd1243
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sun May  4 23:30:12 2014 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sun May  4 23:30:12 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=e4ee9400

[media-sound/amarok] Introduce nepomuk USE flag, bug #508350

Package-Manager: portage-2.2.10

---
 media-sound/amarok/amarok-9999.ebuild | 10 +++++-----
 media-sound/amarok/metadata.xml       |  1 +
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/media-sound/amarok/amarok-9999.ebuild b/media-sound/amarok/amarok-9999.ebuild
index aa180ca..91106ad 100644
--- a/media-sound/amarok/amarok-9999.ebuild
+++ b/media-sound/amarok/amarok-9999.ebuild
@@ -28,7 +28,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="4"
-IUSE="cdda debug +embedded ipod lastfm mp3tunes mtp ofa opengl semantic-desktop test +utils"
+IUSE="cdda debug +embedded ipod lastfm mp3tunes mtp nepomuk ofa opengl test +utils"
 
 if [[ ${KDE_BUILD_TYPE} == live ]]; then
 	RESTRICT="test"
@@ -37,7 +37,7 @@ fi
 # ipod requires gdk enabled and also gtk compiled in libgpod
 COMMONDEPEND="
 	app-crypt/qca:2
-	$(add_kdebase_dep kdelibs 'opengl?,semantic-desktop?' 4.8.4)
+	$(add_kdebase_dep kdelibs 'nepomuk?,opengl?' 4.8.4)
 	$(add_kdebase_dep kdebase-kioslaves)
 	>=media-libs/taglib-1.7[asf,mp4]
 	>=media-libs/taglib-extras-1.0.1
@@ -63,9 +63,9 @@ COMMONDEPEND="
 		>=dev-qt/qtcore-4.8.4:4[glib]
 	)
 	mtp? ( >=media-libs/libmtp-1.0.0 )
+	nepomuk? ( >=kde-base/nepomuk-core-4.9.0 )
 	ofa? ( >=media-libs/libofa-0.9.0 )
 	opengl? ( virtual/opengl )
-	semantic-desktop? ( >=kde-base/nepomuk-core-4.9.0 )
 "
 DEPEND="${COMMONDEPEND}
 	dev-util/automoc
@@ -100,9 +100,9 @@ src_configure() {
 		$(cmake-utils_use_with lastfm LibLastFm)
 		$(cmake-utils_use_with mtp)
 		$(cmake-utils_use_with mp3tunes MP3Tunes)
+		$(cmake-utils_use_with nepomuk)
+		$(cmake-utils_use_with nepomuk Soprano)
 		$(cmake-utils_use_with ofa LibOFA)
-		$(cmake-utils_use_with semantic-desktop Nepomuk)
-		$(cmake-utils_use_with semantic-desktop Soprano)
 		$(cmake-utils_use_with utils UTILITIES)
 	)
 

diff --git a/media-sound/amarok/metadata.xml b/media-sound/amarok/metadata.xml
index c964fd8..e4da6b0 100644
--- a/media-sound/amarok/metadata.xml
+++ b/media-sound/amarok/metadata.xml
@@ -18,6 +18,7 @@
 	<flag name="mp3tunes">Enable mp3tunes integration</flag>
 	<flag name="mtp">Enable support for libMTP (Plays4Sure) devices access through libmtp
 	</flag>
+	<flag name="nepomuk">Enable Nepomuk based semantic desktop support (deprecated)</flag>
 	<flag name="ofa">Use <pkg>media-libs/libofa</pkg> to compute MusicDNS acoustic
 		fingerprints (used by MusicBrainz)
 	</flag>

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

[Johannes Huber]

commit:     167f9b0c154b7b806efd2b238a0d75813943dda1
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 14 14:51:47 2014 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Fri Mar 14 14:51:47 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=167f9b0c

[media-sound/amarok] Sync with tree

Package-Manager: portage-2.2.8-r1

---
 media-sound/amarok/amarok-9999.ebuild | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/media-sound/amarok/amarok-9999.ebuild b/media-sound/amarok/amarok-9999.ebuild
index e1f9f73..aa180ca 100644
--- a/media-sound/amarok/amarok-9999.ebuild
+++ b/media-sound/amarok/amarok-9999.ebuild
@@ -4,13 +4,14 @@
 
 EAPI=5
 
-KDE_LINGUAS="bs ca ca@valencia cs da de el en_GB es et eu fi fr
-ga gl hu it ja lt lv nb nl pa pl pt pt_BR ru sl sr sr@ijekavian
-sr@ijekavianlatin sr@latin sv uk zh_CN zh_TW"
+KDE_LINGUAS="bs ca ca@valencia cs da de el en_GB es et eu fi fr ga gl hu it ja
+lt lv nb nl pa pl pt pt_BR ro ru sl sr sr@ijekavian sr@ijekavianlatin sr@latin
+sv tr uk zh_CN zh_TW"
+KDE_REQUIRED="never"
 KDE_HANDBOOK="optional"
 VIRTUALX_REQUIRED="test"
 VIRTUALDBUS_TEST="true"
-inherit flag-o-matic kde4-base
+inherit flag-o-matic kde4-base pax-utils
 
 DESCRIPTION="Advanced audio player based on KDE framework."
 HOMEPAGE="http://amarok.kde.org/"
@@ -108,6 +109,13 @@ src_configure() {
 	kde4-base_src_configure
 }
 
+src_install() {
+	kde4-base_src_install
+
+	# bug 481592
+	pax-mark m "${ED}"/usr/bin/amarok
+}
+
 pkg_postinst() {
 	kde4-base_pkg_postinst
 

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

[Michael Palimaka]

commit:     0c04d57c21fb004488cf513b606797f6486214d2
Author:     Jekyll Wu <adaptee <AT> gmail <DOT> com>
AuthorDate: Thu Nov 28 02:53:14 2013 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Nov 28 02:53:14 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=0c04d57c

[media-sound/amarok] doesn't need strigi any more

---
 media-sound/amarok/amarok-9999.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/media-sound/amarok/amarok-9999.ebuild b/media-sound/amarok/amarok-9999.ebuild
index ffd4733..6133096 100644
--- a/media-sound/amarok/amarok-9999.ebuild
+++ b/media-sound/amarok/amarok-9999.ebuild
@@ -36,7 +36,6 @@ fi
 # ipod requires gdk enabled and also gtk compiled in libgpod
 COMMONDEPEND="
 	app-crypt/qca:2
-	>=app-misc/strigi-0.5.7
 	$(add_kdebase_dep kdelibs 'opengl?,semantic-desktop?' 4.8.4)
 	$(add_kdebase_dep kdebase-kioslaves)
 	>=media-libs/taglib-1.7[asf,mp4]

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

[Johannes Huber]

commit:     9d579d67a35745ceabeb49281da7c65270a2a551
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 23 22:08:48 2013 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sat Nov 23 22:08:48 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=9d579d67

[media-sound/amarok] Sync with tree

Package-Manager: portage-2.2.7

---
 media-sound/amarok/amarok-9999.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/media-sound/amarok/amarok-9999.ebuild b/media-sound/amarok/amarok-9999.ebuild
index 0c47609..ffd4733 100644
--- a/media-sound/amarok/amarok-9999.ebuild
+++ b/media-sound/amarok/amarok-9999.ebuild
@@ -9,6 +9,7 @@ ga gl hu it ja lt lv nb nl pa pl pt pt_BR ru sl sr sr@ijekavian
 sr@ijekavianlatin sr@latin sv uk zh_CN zh_TW"
 KDE_HANDBOOK="optional"
 VIRTUALX_REQUIRED="test"
+VIRTUALDBUS_TEST="true"
 inherit flag-o-matic kde4-base
 
 DESCRIPTION="Advanced audio player based on KDE framework."

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

[Chris Reffett]

commit:     1c6c0fd81f0c089d5300af53890d413f4d18611e
Author:     Chris Reffett <creffett <AT> gentoo <DOT> org>
AuthorDate: Sun Oct  6 06:05:10 2013 +0000
Commit:     Chris Reffett <creffett <AT> gentoo <DOT> org>
CommitDate: Sun Oct  6 06:05:10 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=1c6c0fd8

[media-sound/amarok] Conversion back to semantic-desktop

Package-Manager: portage-2.2.7

---
 media-sound/amarok/amarok-9999.ebuild | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/media-sound/amarok/amarok-9999.ebuild b/media-sound/amarok/amarok-9999.ebuild
index 01dd23e..0c47609 100644
--- a/media-sound/amarok/amarok-9999.ebuild
+++ b/media-sound/amarok/amarok-9999.ebuild
@@ -26,7 +26,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="4"
-IUSE="cdda debug +embedded ipod lastfm mp3tunes mtp ofa opengl test +utils"
+IUSE="cdda debug +embedded ipod lastfm mp3tunes mtp ofa opengl semantic-desktop test +utils"
 
 if [[ ${KDE_BUILD_TYPE} == live ]]; then
 	RESTRICT="test"
@@ -36,11 +36,10 @@ fi
 COMMONDEPEND="
 	app-crypt/qca:2
 	>=app-misc/strigi-0.5.7
-	$(add_kdebase_dep kdelibs 'opengl?,semantic-desktop(+)' 4.8.4)
+	$(add_kdebase_dep kdelibs 'opengl?,semantic-desktop?' 4.8.4)
 	$(add_kdebase_dep kdebase-kioslaves)
 	>=media-libs/taglib-1.7[asf,mp4]
 	>=media-libs/taglib-extras-1.0.1
-	$(add_kdebase_dep nepomuk-core '' 4.9.0)
 	sys-libs/zlib
 	>=virtual/mysql-5.1[embedded?]
 	>=dev-qt/qtcore-4.8:4
@@ -65,6 +64,7 @@ COMMONDEPEND="
 	mtp? ( >=media-libs/libmtp-1.0.0 )
 	ofa? ( >=media-libs/libofa-0.9.0 )
 	opengl? ( virtual/opengl )
+	semantic-desktop? ( >=kde-base/nepomuk-core-4.9.0 )
 "
 DEPEND="${COMMONDEPEND}
 	dev-util/automoc
@@ -100,6 +100,8 @@ src_configure() {
 		$(cmake-utils_use_with mtp)
 		$(cmake-utils_use_with mp3tunes MP3Tunes)
 		$(cmake-utils_use_with ofa LibOFA)
+		$(cmake-utils_use_with semantic-desktop Nepomuk)
+		$(cmake-utils_use_with semantic-desktop Soprano)
 		$(cmake-utils_use_with utils UTILITIES)
 	)
 

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

[Manuel Rüger]

commit:     788de3f2c9018ca8e59f9ceb436d70184897aafa
Author:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 18 13:10:42 2013 +0000
Commit:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
CommitDate: Sun Aug 18 13:10:42 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=788de3f2

[media-sound/amarok] Moved to tree

Package-Manager: portage-2.2.0

---
 media-sound/amarok/amarok-2.8.0.ebuild | 130 ---------------------------------
 1 file changed, 130 deletions(-)

diff --git a/media-sound/amarok/amarok-2.8.0.ebuild b/media-sound/amarok/amarok-2.8.0.ebuild
deleted file mode 100644
index add0717..0000000
--- a/media-sound/amarok/amarok-2.8.0.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-KDE_LINGUAS="bs ca ca@valencia cs da de el en_GB es et eu fi fr ga gl hu it
-ja lt lv nb nl pl pt pt_BR ro ru sl sr sr@ijekavian sr@ijekavianlatin
-sr@latin sv tr uk zh_CN zh_TW"
-KDE_REQUIRED="never"
-KDE_HANDBOOK="optional"
-VIRTUALX_REQUIRED="test"
-inherit flag-o-matic kde4-base
-
-DESCRIPTION="Advanced audio player based on KDE framework."
-HOMEPAGE="http://amarok.kde.org/"
-if [[ ${PV} != *9999* ]]; then
-	if [[ $PV == *[6-9][0-9]* ]]; then
-		SRC_URI="mirror://kde/unstable/${PN}/${PV}/src/${P}.tar.bz2"
-	else
-		SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.bz2"
-	fi
-	KEYWORDS="~amd64 ~ppc ~x86"
-else
-	KEYWORDS=""
-fi
-
-LICENSE="GPL-2"
-SLOT="4"
-IUSE="cdda debug +embedded ipod lastfm mp3tunes mtp ofa opengl test +utils"
-
-if [[ ${PV} == *9999* ]]; then
-	RESTRICT="test"
-fi
-
-# ipod requires gdk enabled and also gtk compiled in libgpod
-COMMONDEPEND="
-	app-crypt/qca:2
-	>=app-misc/strigi-0.5.7
-	$(add_kdebase_dep kdelibs 'opengl?,semantic-desktop(+)' 4.8.4)
-	$(add_kdebase_dep kdebase-kioslaves)
-	>=media-libs/taglib-1.7[asf,mp4]
-	>=media-libs/taglib-extras-1.0.1
-	$(add_kdebase_dep nepomuk-core '' 4.9.0)
-	sys-libs/zlib
-	>=virtual/mysql-5.1[embedded?]
-	>=dev-qt/qtcore-4.8:4
-	>=dev-qt/qtdbus-4.8:4
-	>=dev-qt/qtscript-4.8:4
-	>=x11-libs/qtscriptgenerator-0.1.0
-	cdda? (
-		$(add_kdebase_dep libkcddb)
-		$(add_kdebase_dep libkcompactdisc)
-		$(add_kdebase_dep audiocd-kio)
-	)
-	ipod? ( >=media-libs/libgpod-0.7.0[gtk] )
-	lastfm? ( >=media-libs/liblastfm-1.0.3 )
-	mp3tunes? (
-		dev-libs/glib:2
-		dev-libs/libxml2
-		dev-libs/openssl
-		net-libs/loudmouth
-		net-misc/curl
-		>=dev-qt/qtcore-4.8.4:4[glib]
-	)
-	mtp? ( >=media-libs/libmtp-1.0.0 )
-	ofa? ( >=media-libs/libofa-0.9.0 )
-	opengl? ( virtual/opengl )
-"
-DEPEND="${COMMONDEPEND}
-	dev-util/automoc
-	virtual/pkgconfig
-	test? ( dev-cpp/gmock )
-"
-RDEPEND="${COMMONDEPEND}
-	!media-sound/amarok-utils
-	$(add_kdebase_dep phonon-kde)
-"
-
-src_prepare() {
-	mv doc/en_US doc/en || die
-	sed -e "s/en_US/en/" -i doc/CMakeLists.txt || die
-
-	kde4-base_src_prepare
-}
-
-src_configure() {
-	# Append minimal-toc cflag for ppc64, see bug 280552 and 292707
-	use ppc64 && append-flags -mminimal-toc
-	local mycmakeargs
-
-	mycmakeargs=(
-		-DWITH_PLAYER=ON
-		-DWITH_Libgcrypt=OFF
-		-DWITH_SPECTRUM_ANALYZER=OFF
-		$(cmake-utils_use embedded WITH_MYSQL_EMBEDDED)
-		$(cmake-utils_use_with ipod)
-		$(cmake-utils_use_with ipod Gdk)
-		$(cmake-utils_use_with lastfm LibLastFm)
-		$(cmake-utils_use_with mtp)
-		$(cmake-utils_use_with mp3tunes MP3Tunes)
-		$(cmake-utils_use_with ofa LibOFA)
-	)
-
-	mycmakeargs+=(
-		$(cmake-utils_use_with utils UTILITIES)
-	)
-
-	kde4-base_src_configure
-}
-
-pkg_postinst() {
-	kde4-base_pkg_postinst
-
-	if ! use embedded; then
-		echo
-		elog "You've disabled the amarok support for embedded mysql DBs."
-		elog "You'll have to configure amarok to use an external db server."
-		echo
-		elog "Please read http://amarok.kde.org/wiki/MySQL_Server for details on how"
-		elog "to configure the external db and migrate your data from the embedded database."
-		echo
-
-		if has_version "virtual/mysql[minimal]"; then
-			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."
-			echo
-		fi
-	fi
-}

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

[Michael Palimaka]

commit:     bfa929258f318d0b9a338f85afdc9d70724363a6
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 17 14:36:46 2013 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Aug 17 14:36:46 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=bfa92925

[media-sound/amarok] Update LINGUAS and add handbook fixes.

Package-Manager: portage-2.2.0

---
 media-sound/amarok/amarok-2.8.0.ebuild | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/media-sound/amarok/amarok-2.8.0.ebuild b/media-sound/amarok/amarok-2.8.0.ebuild
index 4853296..add0717 100644
--- a/media-sound/amarok/amarok-2.8.0.ebuild
+++ b/media-sound/amarok/amarok-2.8.0.ebuild
@@ -4,11 +4,12 @@
 
 EAPI=5
 
-KDE_LINGUAS="bs ca ca@valencia cs da de el en_GB es et eu fi fr ga gl hu it ja
-lt lv nb nl pa pl pt pt_BR ro ru sl sr sr@ijekavian sr@ijekavianlatin sr@latin
-sv tr uk zh_CN zh_TW"
+KDE_LINGUAS="bs ca ca@valencia cs da de el en_GB es et eu fi fr ga gl hu it
+ja lt lv nb nl pl pt pt_BR ro ru sl sr sr@ijekavian sr@ijekavianlatin
+sr@latin sv tr uk zh_CN zh_TW"
 KDE_REQUIRED="never"
-VIRTUALX_REQUIRED=test
+KDE_HANDBOOK="optional"
+VIRTUALX_REQUIRED="test"
 inherit flag-o-matic kde4-base
 
 DESCRIPTION="Advanced audio player based on KDE framework."
@@ -76,6 +77,13 @@ RDEPEND="${COMMONDEPEND}
 	$(add_kdebase_dep phonon-kde)
 "
 
+src_prepare() {
+	mv doc/en_US doc/en || die
+	sed -e "s/en_US/en/" -i doc/CMakeLists.txt || die
+
+	kde4-base_src_prepare
+}
+
 src_configure() {
 	# Append minimal-toc cflag for ppc64, see bug 280552 and 292707
 	use ppc64 && append-flags -mminimal-toc

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

[Manuel Rüger]

commit:     f955ff87bd1c44e350e5de8740f5f2eeb19c7cc5
Author:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 16 03:31:32 2013 +0000
Commit:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
CommitDate: Fri Aug 16 03:31:32 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=f955ff87

[media-sound/amarok] Update KDE_LINGUAS

Package-Manager: portage-2.2.0

---
 media-sound/amarok/amarok-2.8.0.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/media-sound/amarok/amarok-2.8.0.ebuild b/media-sound/amarok/amarok-2.8.0.ebuild
index 0642359..4853296 100644
--- a/media-sound/amarok/amarok-2.8.0.ebuild
+++ b/media-sound/amarok/amarok-2.8.0.ebuild
@@ -4,9 +4,9 @@
 
 EAPI=5
 
-KDE_LINGUAS="ca ca@valencia cs da de el es et eu fi fr ga gl hu it ja lt lv nb
-nl pl pt pt_BR ru sl sr sr@ijekavian sr@ijekavianlatin sr@latin sv uk zh_CN
-zh_TW"
+KDE_LINGUAS="bs ca ca@valencia cs da de el en_GB es et eu fi fr ga gl hu it ja
+lt lv nb nl pa pl pt pt_BR ro ru sl sr sr@ijekavian sr@ijekavianlatin sr@latin
+sv tr uk zh_CN zh_TW"
 KDE_REQUIRED="never"
 VIRTUALX_REQUIRED=test
 inherit flag-o-matic kde4-base

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

[Manuel Rüger]

commit:     fe5aeda7d392247a27efa67c0184f155589f1110
Author:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 16 03:27:35 2013 +0000
Commit:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
CommitDate: Fri Aug 16 03:27:35 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=fe5aeda7

[media-sound/amarok] Version bump

Package-Manager: portage-2.2.0

---
 media-sound/amarok/{amarok-2.7.90.ebuild => amarok-2.8.0.ebuild} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/media-sound/amarok/amarok-2.7.90.ebuild b/media-sound/amarok/amarok-2.8.0.ebuild
similarity index 100%
rename from media-sound/amarok/amarok-2.7.90.ebuild
rename to media-sound/amarok/amarok-2.8.0.ebuild

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

[Michael Palimaka]

commit:     406f4676a61e3d7bec807eba0862583052023cbe
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Aug  1 12:29:19 2013 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Aug  1 12:29:19 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=406f4676

[media-sound/amarok] Remove daap USE flag wrt bug #477208.

Package-Manager: portage-2.1.13.2

---
 media-sound/amarok/amarok-2.7.90.ebuild | 9 +--------
 media-sound/amarok/amarok-9999.ebuild   | 9 +--------
 media-sound/amarok/metadata.xml         | 5 -----
 3 files changed, 2 insertions(+), 21 deletions(-)

diff --git a/media-sound/amarok/amarok-2.7.90.ebuild b/media-sound/amarok/amarok-2.7.90.ebuild
index a4bc4b1..0642359 100644
--- a/media-sound/amarok/amarok-2.7.90.ebuild
+++ b/media-sound/amarok/amarok-2.7.90.ebuild
@@ -26,7 +26,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="4"
-IUSE="cdda daap debug +embedded ipod lastfm mp3tunes mtp ofa opengl test +utils"
+IUSE="cdda debug +embedded ipod lastfm mp3tunes mtp ofa opengl test +utils"
 
 if [[ ${PV} == *9999* ]]; then
 	RESTRICT="test"
@@ -104,13 +104,6 @@ src_configure() {
 pkg_postinst() {
 	kde4-base_pkg_postinst
 
-	if use daap; then
-		echo
-		elog "You have installed amarok with daap support."
-		elog "You may be interested in installing www-servers/mongrel as well."
-		echo
-	fi
-
 	if ! use embedded; then
 		echo
 		elog "You've disabled the amarok support for embedded mysql DBs."

diff --git a/media-sound/amarok/amarok-9999.ebuild b/media-sound/amarok/amarok-9999.ebuild
index 5bd74e2..01dd23e 100644
--- a/media-sound/amarok/amarok-9999.ebuild
+++ b/media-sound/amarok/amarok-9999.ebuild
@@ -26,7 +26,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="4"
-IUSE="cdda daap debug +embedded ipod lastfm mp3tunes mtp ofa opengl test +utils"
+IUSE="cdda debug +embedded ipod lastfm mp3tunes mtp ofa opengl test +utils"
 
 if [[ ${KDE_BUILD_TYPE} == live ]]; then
 	RESTRICT="test"
@@ -109,13 +109,6 @@ src_configure() {
 pkg_postinst() {
 	kde4-base_pkg_postinst
 
-	if use daap && ! has_version www-servers/mongrel ; then
-		echo
-		elog "You have installed amarok with daap support."
-		elog "You may be interested in installing www-servers/mongrel as well."
-		echo
-	fi
-
 	if ! use embedded; then
 		echo
 		elog "You've disabled the amarok support for embedded mysql DBs."

diff --git a/media-sound/amarok/metadata.xml b/media-sound/amarok/metadata.xml
index 6a78f0d..c964fd8 100644
--- a/media-sound/amarok/metadata.xml
+++ b/media-sound/amarok/metadata.xml
@@ -8,11 +8,6 @@
 	<name>Jorge Manuel B. S. Vicetto</name>
 </maintainer>
 <use>
-	<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="embedded">Use libmysqld, MySQL embedded server library.
 		Try disabling this if you encounter -PIC related in amarok,
 		it will make amarok rely only on standalone MySQL server.

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

[Michael Palimaka]

commit:     ed88e4d0d5d865cc0542e66116a793bacccf9292
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Aug  1 11:02:01 2013 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Aug  1 11:02:01 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=ed88e4d0

[media-sound/amarok] Restore missing changes.

Package-Manager: portage-2.1.13.2

---
 media-sound/amarok/amarok-9999.ebuild | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/media-sound/amarok/amarok-9999.ebuild b/media-sound/amarok/amarok-9999.ebuild
index a4bc4b1..5bd74e2 100644
--- a/media-sound/amarok/amarok-9999.ebuild
+++ b/media-sound/amarok/amarok-9999.ebuild
@@ -4,11 +4,11 @@
 
 EAPI=5
 
-KDE_LINGUAS="ca ca@valencia cs da de el es et eu fi fr ga gl hu it ja lt lv nb
-nl pl pt pt_BR ru sl sr sr@ijekavian sr@ijekavianlatin sr@latin sv uk zh_CN
-zh_TW"
-KDE_REQUIRED="never"
-VIRTUALX_REQUIRED=test
+KDE_LINGUAS="bs ca ca@valencia cs da de el en_GB es et eu fi fr
+ga gl hu it ja lt lv nb nl pa pl pt pt_BR ru sl sr sr@ijekavian
+sr@ijekavianlatin sr@latin sv uk zh_CN zh_TW"
+KDE_HANDBOOK="optional"
+VIRTUALX_REQUIRED="test"
 inherit flag-o-matic kde4-base
 
 DESCRIPTION="Advanced audio player based on KDE framework."
@@ -28,7 +28,7 @@ LICENSE="GPL-2"
 SLOT="4"
 IUSE="cdda daap debug +embedded ipod lastfm mp3tunes mtp ofa opengl test +utils"
 
-if [[ ${PV} == *9999* ]]; then
+if [[ ${KDE_BUILD_TYPE} == live ]]; then
 	RESTRICT="test"
 fi
 
@@ -76,12 +76,20 @@ RDEPEND="${COMMONDEPEND}
 	$(add_kdebase_dep phonon-kde)
 "
 
+src_prepare() {
+	if [[ ${KDE_BUILD_TYPE} != live ]]; then
+		mv doc/en_US doc/en || die
+		sed -e "s/en_US/en/" -i doc/CMakeLists.txt || die
+	fi
+
+	kde4-base_src_prepare
+}
+
 src_configure() {
 	# Append minimal-toc cflag for ppc64, see bug 280552 and 292707
 	use ppc64 && append-flags -mminimal-toc
-	local mycmakeargs
 
-	mycmakeargs=(
+	local mycmakeargs=(
 		-DWITH_PLAYER=ON
 		-DWITH_Libgcrypt=OFF
 		-DWITH_SPECTRUM_ANALYZER=OFF
@@ -92,9 +100,6 @@ src_configure() {
 		$(cmake-utils_use_with mtp)
 		$(cmake-utils_use_with mp3tunes MP3Tunes)
 		$(cmake-utils_use_with ofa LibOFA)
-	)
-
-	mycmakeargs+=(
 		$(cmake-utils_use_with utils UTILITIES)
 	)
 
@@ -104,7 +109,7 @@ src_configure() {
 pkg_postinst() {
 	kde4-base_pkg_postinst
 
-	if use daap; then
+	if use daap && ! has_version www-servers/mongrel ; then
 		echo
 		elog "You have installed amarok with daap support."
 		elog "You may be interested in installing www-servers/mongrel as well."

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

[Manuel Rüger]

commit:     8cc4e95c9b47f571498f8d679596c41535156011
Author:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 18 03:22:42 2013 +0000
Commit:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
CommitDate: Thu Jul 18 03:22:42 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=8cc4e95c

[media-sound/amarok] Restore accidently commited changes in 07477b5dab0c00deb72adb0b309350edae0cf1cf

Package-Manager: portage-2.1.12.13

---
 media-sound/amarok/amarok-2.7.90.ebuild | 2 +-
 media-sound/amarok/amarok-9999.ebuild   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-sound/amarok/amarok-2.7.90.ebuild b/media-sound/amarok/amarok-2.7.90.ebuild
index c143107..a4bc4b1 100644
--- a/media-sound/amarok/amarok-2.7.90.ebuild
+++ b/media-sound/amarok/amarok-2.7.90.ebuild
@@ -36,7 +36,7 @@ fi
 COMMONDEPEND="
 	app-crypt/qca:2
 	>=app-misc/strigi-0.5.7
-	$(add_kdebase_dep kdelibs 'opengl?' 4.8.4)
+	$(add_kdebase_dep kdelibs 'opengl?,semantic-desktop(+)' 4.8.4)
 	$(add_kdebase_dep kdebase-kioslaves)
 	>=media-libs/taglib-1.7[asf,mp4]
 	>=media-libs/taglib-extras-1.0.1

diff --git a/media-sound/amarok/amarok-9999.ebuild b/media-sound/amarok/amarok-9999.ebuild
index c143107..a4bc4b1 100644
--- a/media-sound/amarok/amarok-9999.ebuild
+++ b/media-sound/amarok/amarok-9999.ebuild
@@ -36,7 +36,7 @@ fi
 COMMONDEPEND="
 	app-crypt/qca:2
 	>=app-misc/strigi-0.5.7
-	$(add_kdebase_dep kdelibs 'opengl?' 4.8.4)
+	$(add_kdebase_dep kdelibs 'opengl?,semantic-desktop(+)' 4.8.4)
 	$(add_kdebase_dep kdebase-kioslaves)
 	>=media-libs/taglib-1.7[asf,mp4]
 	>=media-libs/taglib-extras-1.0.1

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

[Manuel Rüger]

commit:     25a96d2777f2b5c53acda9298c44d3857dd8a2cc
Author:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
AuthorDate: Sat Jul  6 17:09:22 2013 +0000
Commit:     Manuel Rüger <gentoo <AT> rueg <DOT> eu>
CommitDate: Sat Jul  6 17:09:22 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=25a96d27

[media-sound/amarok] Clean up CVS header and sync with live ebuild

Package-Manager: portage-2.1.12.11

---
 media-sound/amarok/amarok-2.7.90.ebuild |  2 +-
 media-sound/amarok/amarok-9999.ebuild   | 29 ++++++++++++-----------------
 2 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/media-sound/amarok/amarok-2.7.90.ebuild b/media-sound/amarok/amarok-2.7.90.ebuild
index 5ddf08f..a4bc4b1 100644
--- a/media-sound/amarok/amarok-2.7.90.ebuild
+++ b/media-sound/amarok/amarok-2.7.90.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.7.1.ebuild,v 1.5 2013/07/01 09:06:50 ago Exp $
+# $Header: $
 
 EAPI=5
 

diff --git a/media-sound/amarok/amarok-9999.ebuild b/media-sound/amarok/amarok-9999.ebuild
index 5bd74e2..a4bc4b1 100644
--- a/media-sound/amarok/amarok-9999.ebuild
+++ b/media-sound/amarok/amarok-9999.ebuild
@@ -4,11 +4,11 @@
 
 EAPI=5
 
-KDE_LINGUAS="bs ca ca@valencia cs da de el en_GB es et eu fi fr
-ga gl hu it ja lt lv nb nl pa pl pt pt_BR ru sl sr sr@ijekavian
-sr@ijekavianlatin sr@latin sv uk zh_CN zh_TW"
-KDE_HANDBOOK="optional"
-VIRTUALX_REQUIRED="test"
+KDE_LINGUAS="ca ca@valencia cs da de el es et eu fi fr ga gl hu it ja lt lv nb
+nl pl pt pt_BR ru sl sr sr@ijekavian sr@ijekavianlatin sr@latin sv uk zh_CN
+zh_TW"
+KDE_REQUIRED="never"
+VIRTUALX_REQUIRED=test
 inherit flag-o-matic kde4-base
 
 DESCRIPTION="Advanced audio player based on KDE framework."
@@ -28,7 +28,7 @@ LICENSE="GPL-2"
 SLOT="4"
 IUSE="cdda daap debug +embedded ipod lastfm mp3tunes mtp ofa opengl test +utils"
 
-if [[ ${KDE_BUILD_TYPE} == live ]]; then
+if [[ ${PV} == *9999* ]]; then
 	RESTRICT="test"
 fi
 
@@ -76,20 +76,12 @@ RDEPEND="${COMMONDEPEND}
 	$(add_kdebase_dep phonon-kde)
 "
 
-src_prepare() {
-	if [[ ${KDE_BUILD_TYPE} != live ]]; then
-		mv doc/en_US doc/en || die
-		sed -e "s/en_US/en/" -i doc/CMakeLists.txt || die
-	fi
-
-	kde4-base_src_prepare
-}
-
 src_configure() {
 	# Append minimal-toc cflag for ppc64, see bug 280552 and 292707
 	use ppc64 && append-flags -mminimal-toc
+	local mycmakeargs
 
-	local mycmakeargs=(
+	mycmakeargs=(
 		-DWITH_PLAYER=ON
 		-DWITH_Libgcrypt=OFF
 		-DWITH_SPECTRUM_ANALYZER=OFF
@@ -100,6 +92,9 @@ src_configure() {
 		$(cmake-utils_use_with mtp)
 		$(cmake-utils_use_with mp3tunes MP3Tunes)
 		$(cmake-utils_use_with ofa LibOFA)
+	)
+
+	mycmakeargs+=(
 		$(cmake-utils_use_with utils UTILITIES)
 	)
 
@@ -109,7 +104,7 @@ src_configure() {
 pkg_postinst() {
 	kde4-base_pkg_postinst
 
-	if use daap && ! has_version www-servers/mongrel ; then
+	if use daap; then
 		echo
 		elog "You have installed amarok with daap support."
 		elog "You may be interested in installing www-servers/mongrel as well."

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

[Manuel Rüger]

commit:     eccd5180f5bb8581ea9a3733172133dc7c6235e0
Author:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
AuthorDate: Sat Jul  6 16:36:43 2013 +0000
Commit:     Manuel Rüger <gentoo <AT> rueg <DOT> eu>
CommitDate: Sat Jul  6 16:36:43 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=eccd5180

[media-sound/amarok] Version bump to the latest beta

Package-Manager: portage-2.1.12.11

---
 media-sound/amarok/amarok-2.7.90.ebuild | 129 ++++++++++++++++++++++++++++++++
 1 file changed, 129 insertions(+)

diff --git a/media-sound/amarok/amarok-2.7.90.ebuild b/media-sound/amarok/amarok-2.7.90.ebuild
new file mode 100644
index 0000000..5ddf08f
--- /dev/null
+++ b/media-sound/amarok/amarok-2.7.90.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.7.1.ebuild,v 1.5 2013/07/01 09:06:50 ago Exp $
+
+EAPI=5
+
+KDE_LINGUAS="ca ca@valencia cs da de el es et eu fi fr ga gl hu it ja lt lv nb
+nl pl pt pt_BR ru sl sr sr@ijekavian sr@ijekavianlatin sr@latin sv uk zh_CN
+zh_TW"
+KDE_REQUIRED="never"
+VIRTUALX_REQUIRED=test
+inherit flag-o-matic kde4-base
+
+DESCRIPTION="Advanced audio player based on KDE framework."
+HOMEPAGE="http://amarok.kde.org/"
+if [[ ${PV} != *9999* ]]; then
+	if [[ $PV == *[6-9][0-9]* ]]; then
+		SRC_URI="mirror://kde/unstable/${PN}/${PV}/src/${P}.tar.bz2"
+	else
+		SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.bz2"
+	fi
+	KEYWORDS="~amd64 ~ppc ~x86"
+else
+	KEYWORDS=""
+fi
+
+LICENSE="GPL-2"
+SLOT="4"
+IUSE="cdda daap debug +embedded ipod lastfm mp3tunes mtp ofa opengl test +utils"
+
+if [[ ${PV} == *9999* ]]; then
+	RESTRICT="test"
+fi
+
+# ipod requires gdk enabled and also gtk compiled in libgpod
+COMMONDEPEND="
+	app-crypt/qca:2
+	>=app-misc/strigi-0.5.7
+	$(add_kdebase_dep kdelibs 'opengl?,semantic-desktop(+)' 4.8.4)
+	$(add_kdebase_dep kdebase-kioslaves)
+	>=media-libs/taglib-1.7[asf,mp4]
+	>=media-libs/taglib-extras-1.0.1
+	$(add_kdebase_dep nepomuk-core '' 4.9.0)
+	sys-libs/zlib
+	>=virtual/mysql-5.1[embedded?]
+	>=dev-qt/qtcore-4.8:4
+	>=dev-qt/qtdbus-4.8:4
+	>=dev-qt/qtscript-4.8:4
+	>=x11-libs/qtscriptgenerator-0.1.0
+	cdda? (
+		$(add_kdebase_dep libkcddb)
+		$(add_kdebase_dep libkcompactdisc)
+		$(add_kdebase_dep audiocd-kio)
+	)
+	ipod? ( >=media-libs/libgpod-0.7.0[gtk] )
+	lastfm? ( >=media-libs/liblastfm-1.0.3 )
+	mp3tunes? (
+		dev-libs/glib:2
+		dev-libs/libxml2
+		dev-libs/openssl
+		net-libs/loudmouth
+		net-misc/curl
+		>=dev-qt/qtcore-4.8.4:4[glib]
+	)
+	mtp? ( >=media-libs/libmtp-1.0.0 )
+	ofa? ( >=media-libs/libofa-0.9.0 )
+	opengl? ( virtual/opengl )
+"
+DEPEND="${COMMONDEPEND}
+	dev-util/automoc
+	virtual/pkgconfig
+	test? ( dev-cpp/gmock )
+"
+RDEPEND="${COMMONDEPEND}
+	!media-sound/amarok-utils
+	$(add_kdebase_dep phonon-kde)
+"
+
+src_configure() {
+	# Append minimal-toc cflag for ppc64, see bug 280552 and 292707
+	use ppc64 && append-flags -mminimal-toc
+	local mycmakeargs
+
+	mycmakeargs=(
+		-DWITH_PLAYER=ON
+		-DWITH_Libgcrypt=OFF
+		-DWITH_SPECTRUM_ANALYZER=OFF
+		$(cmake-utils_use embedded WITH_MYSQL_EMBEDDED)
+		$(cmake-utils_use_with ipod)
+		$(cmake-utils_use_with ipod Gdk)
+		$(cmake-utils_use_with lastfm LibLastFm)
+		$(cmake-utils_use_with mtp)
+		$(cmake-utils_use_with mp3tunes MP3Tunes)
+		$(cmake-utils_use_with ofa LibOFA)
+	)
+
+	mycmakeargs+=(
+		$(cmake-utils_use_with utils UTILITIES)
+	)
+
+	kde4-base_src_configure
+}
+
+pkg_postinst() {
+	kde4-base_pkg_postinst
+
+	if use daap; then
+		echo
+		elog "You have installed amarok with daap support."
+		elog "You may be interested in installing www-servers/mongrel as well."
+		echo
+	fi
+
+	if ! use embedded; then
+		echo
+		elog "You've disabled the amarok support for embedded mysql DBs."
+		elog "You'll have to configure amarok to use an external db server."
+		echo
+		elog "Please read http://amarok.kde.org/wiki/MySQL_Server for details on how"
+		elog "to configure the external db and migrate your data from the embedded database."
+		echo
+
+		if has_version "virtual/mysql[minimal]"; then
+			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."
+			echo
+		fi
+	fi
+}

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

[Michael Palimaka]

commit:     d3e5cda04c3d4edc49703a07dd753f26a22d5000
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Jun  6 15:59:23 2013 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Jun  6 15:59:23 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=d3e5cda0

[media-sound/amarok] Fix docs only for releases wrt bug #472360.

Package-Manager: portage-2.1.12.2

---
 media-sound/amarok/amarok-9999.ebuild | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/media-sound/amarok/amarok-9999.ebuild b/media-sound/amarok/amarok-9999.ebuild
index 544a30f..5bd74e2 100644
--- a/media-sound/amarok/amarok-9999.ebuild
+++ b/media-sound/amarok/amarok-9999.ebuild
@@ -77,8 +77,10 @@ RDEPEND="${COMMONDEPEND}
 "
 
 src_prepare() {
-	mv doc/en_US doc/en || die
-	sed -e "s/en_US/en/" -i doc/CMakeLists.txt || die
+	if [[ ${KDE_BUILD_TYPE} != live ]]; then
+		mv doc/en_US doc/en || die
+		sed -e "s/en_US/en/" -i doc/CMakeLists.txt || die
+	fi
 
 	kde4-base_src_prepare
 }

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

[Michael Palimaka]

commit:     ca66b32375566e4364c44254c7c48ee7742607ec
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Tue Jun  4 11:26:59 2013 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue Jun  4 11:26:59 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=ca66b323

[media-sound/amarok] KDE actually is required. Fix docbook installation. Misc improvements.

Package-Manager: portage-2.1.12.2

---
 media-sound/amarok/amarok-9999.ebuild | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/media-sound/amarok/amarok-9999.ebuild b/media-sound/amarok/amarok-9999.ebuild
index a87423a..544a30f 100644
--- a/media-sound/amarok/amarok-9999.ebuild
+++ b/media-sound/amarok/amarok-9999.ebuild
@@ -7,8 +7,8 @@ EAPI=5
 KDE_LINGUAS="bs ca ca@valencia cs da de el en_GB es et eu fi fr
 ga gl hu it ja lt lv nb nl pa pl pt pt_BR ru sl sr sr@ijekavian
 sr@ijekavianlatin sr@latin sv uk zh_CN zh_TW"
-KDE_REQUIRED="never"
-VIRTUALX_REQUIRED=test
+KDE_HANDBOOK="optional"
+VIRTUALX_REQUIRED="test"
 inherit flag-o-matic kde4-base
 
 DESCRIPTION="Advanced audio player based on KDE framework."
@@ -28,7 +28,7 @@ LICENSE="GPL-2"
 SLOT="4"
 IUSE="cdda daap debug +embedded ipod lastfm mp3tunes mtp ofa opengl test +utils"
 
-if [[ ${PV} == *9999* ]]; then
+if [[ ${KDE_BUILD_TYPE} == live ]]; then
 	RESTRICT="test"
 fi
 
@@ -76,12 +76,18 @@ RDEPEND="${COMMONDEPEND}
 	$(add_kdebase_dep phonon-kde)
 "
 
+src_prepare() {
+	mv doc/en_US doc/en || die
+	sed -e "s/en_US/en/" -i doc/CMakeLists.txt || die
+
+	kde4-base_src_prepare
+}
+
 src_configure() {
 	# Append minimal-toc cflag for ppc64, see bug 280552 and 292707
 	use ppc64 && append-flags -mminimal-toc
-	local mycmakeargs
 
-	mycmakeargs=(
+	local mycmakeargs=(
 		-DWITH_PLAYER=ON
 		-DWITH_Libgcrypt=OFF
 		-DWITH_SPECTRUM_ANALYZER=OFF
@@ -92,9 +98,6 @@ src_configure() {
 		$(cmake-utils_use_with mtp)
 		$(cmake-utils_use_with mp3tunes MP3Tunes)
 		$(cmake-utils_use_with ofa LibOFA)
-	)
-
-	mycmakeargs+=(
 		$(cmake-utils_use_with utils UTILITIES)
 	)
 
@@ -104,7 +107,7 @@ src_configure() {
 pkg_postinst() {
 	kde4-base_pkg_postinst
 
-	if use daap; then
+	if use daap && ! has_version www-servers/mongrel ; then
 		echo
 		elog "You have installed amarok with daap support."
 		elog "You may be interested in installing www-servers/mongrel as well."

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

[Michael Palimaka]

commit:     e1b56eac46ad7bf8055dcf4f360773849c55d415
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu May 30 12:26:52 2013 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu May 30 12:26:52 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=e1b56eac

[media-sound/amarok] 2.7.1 is in the tree now.

Package-Manager: portage-2.1.12.2

---
 media-sound/amarok/amarok-2.7.1.ebuild | 131 ---------------------------------
 1 file changed, 131 deletions(-)

diff --git a/media-sound/amarok/amarok-2.7.1.ebuild b/media-sound/amarok/amarok-2.7.1.ebuild
deleted file mode 100644
index 5eae96a..0000000
--- a/media-sound/amarok/amarok-2.7.1.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-KDE_LINGUAS="bs ca ca@valencia cs da de el en_GB es et eu fi fr
-ga gl hu it ja lt lv nb nl pa pl pt pt_BR ru sl sr sr@ijekavian
-sr@ijekavianlatin sr@latin sv uk zh_CN zh_TW"
-KDE_REQUIRED="never"
-VIRTUALX_REQUIRED=test
-inherit flag-o-matic kde4-base
-
-DESCRIPTION="Advanced audio player based on KDE framework."
-HOMEPAGE="http://amarok.kde.org/"
-if [[ ${PV} != *9999* ]]; then
-	if [[ $PV == *[6-9][0-9]* ]]; then
-		SRC_URI="mirror://kde/unstable/${PN}/${PV}/src/${P}.tar.bz2"
-	else
-		SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.bz2"
-	fi
-	KEYWORDS="~amd64 ~ppc ~x86"
-else
-	KEYWORDS=""
-fi
-
-LICENSE="GPL-2"
-SLOT="4"
-IUSE="cdda daap debug +embedded ipod lastfm mp3tunes mtp ofa opengl semantic-desktop test +utils"
-
-if [[ ${PV} == *9999* ]]; then
-	RESTRICT="test"
-fi
-
-# ipod requires gdk enabled and also gtk compiled in libgpod
-COMMONDEPEND="
-	app-crypt/qca:2
-	>=app-misc/strigi-0.5.7
-	$(add_kdebase_dep kdelibs 'opengl?,semantic-desktop?' 4.8.4)
-	$(add_kdebase_dep kdebase-kioslaves)
-	>=media-libs/taglib-1.7[asf,mp4]
-	>=media-libs/taglib-extras-1.0.1
-	sys-libs/zlib
-	>=virtual/mysql-5.1[embedded?]
-	>=dev-qt/qtcore-4.8:4
-	>=dev-qt/qtdbus-4.8:4
-	>=dev-qt/qtscript-4.8:4
-	>=x11-libs/qtscriptgenerator-0.1.0
-	cdda? (
-		$(add_kdebase_dep libkcddb)
-		$(add_kdebase_dep libkcompactdisc)
-		$(add_kdebase_dep audiocd-kio)
-	)
-	ipod? ( >=media-libs/libgpod-0.7.0[gtk] )
-	lastfm? ( >=media-libs/liblastfm-1.0.3 )
-	mp3tunes? (
-		dev-libs/glib:2
-		dev-libs/libxml2
-		dev-libs/openssl
-		net-libs/loudmouth
-		net-misc/curl
-		>=dev-qt/qtcore-4.8.4:4[glib]
-	)
-	mtp? ( >=media-libs/libmtp-1.0.0 )
-	ofa? ( >=media-libs/libofa-0.9.0 )
-	opengl? ( virtual/opengl )
-	semantic-desktop? ( >=kde-base/nepomuk-core-4.9.0 )
-"
-DEPEND="${COMMONDEPEND}
-	dev-util/automoc
-	virtual/pkgconfig
-	test? ( dev-cpp/gmock )
-"
-RDEPEND="${COMMONDEPEND}
-	!media-sound/amarok-utils
-	$(add_kdebase_dep phonon-kde)
-"
-
-src_configure() {
-	# Append minimal-toc cflag for ppc64, see bug 280552 and 292707
-	use ppc64 && append-flags -mminimal-toc
-	local mycmakeargs
-
-	mycmakeargs=(
-		-DWITH_PLAYER=ON
-		-DWITH_Libgcrypt=OFF
-		-DWITH_SPECTRUM_ANALYZER=OFF
-		$(cmake-utils_use embedded WITH_MYSQL_EMBEDDED)
-		$(cmake-utils_use_with ipod)
-		$(cmake-utils_use_with ipod Gdk)
-		$(cmake-utils_use_with lastfm LibLastFm)
-		$(cmake-utils_use_with mtp)
-		$(cmake-utils_use_with mp3tunes MP3Tunes)
-		$(cmake-utils_use_with ofa LibOFA)
-		$(cmake-utils_use_with semantic-desktop Nepomuk)
-		$(cmake-utils_use_with semantic-desktop Soprano)
-	)
-
-	mycmakeargs+=(
-		$(cmake-utils_use_with utils UTILITIES)
-	)
-
-	kde4-base_src_configure
-}
-
-pkg_postinst() {
-	kde4-base_pkg_postinst
-
-	if use daap; then
-		echo
-		elog "You have installed amarok with daap support."
-		elog "You may be interested in installing www-servers/mongrel as well."
-		echo
-	fi
-
-	if ! use embedded; then
-		echo
-		elog "You've disabled the amarok support for embedded mysql DBs."
-		elog "You'll have to configure amarok to use an external db server."
-		echo
-		elog "Please read http://amarok.kde.org/wiki/MySQL_Server for details on how"
-		elog "to configure the external db and migrate your data from the embedded database."
-		echo
-
-		if has_version "virtual/mysql[minimal]"; then
-			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."
-			echo
-		fi
-	fi
-}

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

[David Heidelberger]

commit:     9d3e761d4bd887659058d56e17fc528e69bbf7ee
Author:     David Heidelberger <david.heidelberger <AT> ixit <DOT> cz>
AuthorDate: Thu May 16 00:04:22 2013 +0000
Commit:     David Heidelberger <d.okias <AT> gmail <DOT> com>
CommitDate: Thu May 16 00:04:22 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=9d3e761d

[media-sound/amarok] bump 2.7.1 and update amarok ebuilds

Package-Manager: portage-2.2.0_alpha174

---
 .../{amarok-9999.ebuild => amarok-2.7.1.ebuild}    |    9 +++++++--
 media-sound/amarok/amarok-9999.ebuild              |    9 +++++++--
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/media-sound/amarok/amarok-9999.ebuild b/media-sound/amarok/amarok-2.7.1.ebuild
similarity index 92%
copy from media-sound/amarok/amarok-9999.ebuild
copy to media-sound/amarok/amarok-2.7.1.ebuild
index 3fe2a0f..5eae96a 100644
--- a/media-sound/amarok/amarok-9999.ebuild
+++ b/media-sound/amarok/amarok-2.7.1.ebuild
@@ -5,15 +5,20 @@
 EAPI=5
 
 KDE_LINGUAS="bs ca ca@valencia cs da de el en_GB es et eu fi fr
-ga gl hu it ja lt lv nb nl pl pt pt_BR ru sl sr sr@ijekavian
+ga gl hu it ja lt lv nb nl pa pl pt pt_BR ru sl sr sr@ijekavian
 sr@ijekavianlatin sr@latin sv uk zh_CN zh_TW"
 KDE_REQUIRED="never"
+VIRTUALX_REQUIRED=test
 inherit flag-o-matic kde4-base
 
 DESCRIPTION="Advanced audio player based on KDE framework."
 HOMEPAGE="http://amarok.kde.org/"
 if [[ ${PV} != *9999* ]]; then
-	SRC_URI="mirror://kde/unstable/${PN}/${PV}/src/${P}.tar.bz2"
+	if [[ $PV == *[6-9][0-9]* ]]; then
+		SRC_URI="mirror://kde/unstable/${PN}/${PV}/src/${P}.tar.bz2"
+	else
+		SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.bz2"
+	fi
 	KEYWORDS="~amd64 ~ppc ~x86"
 else
 	KEYWORDS=""

diff --git a/media-sound/amarok/amarok-9999.ebuild b/media-sound/amarok/amarok-9999.ebuild
index 3fe2a0f..5eae96a 100644
--- a/media-sound/amarok/amarok-9999.ebuild
+++ b/media-sound/amarok/amarok-9999.ebuild
@@ -5,15 +5,20 @@
 EAPI=5
 
 KDE_LINGUAS="bs ca ca@valencia cs da de el en_GB es et eu fi fr
-ga gl hu it ja lt lv nb nl pl pt pt_BR ru sl sr sr@ijekavian
+ga gl hu it ja lt lv nb nl pa pl pt pt_BR ru sl sr sr@ijekavian
 sr@ijekavianlatin sr@latin sv uk zh_CN zh_TW"
 KDE_REQUIRED="never"
+VIRTUALX_REQUIRED=test
 inherit flag-o-matic kde4-base
 
 DESCRIPTION="Advanced audio player based on KDE framework."
 HOMEPAGE="http://amarok.kde.org/"
 if [[ ${PV} != *9999* ]]; then
-	SRC_URI="mirror://kde/unstable/${PN}/${PV}/src/${P}.tar.bz2"
+	if [[ $PV == *[6-9][0-9]* ]]; then
+		SRC_URI="mirror://kde/unstable/${PN}/${PV}/src/${P}.tar.bz2"
+	else
+		SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.bz2"
+	fi
 	KEYWORDS="~amd64 ~ppc ~x86"
 else
 	KEYWORDS=""

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

[Manuel Rüger]

commit:     1db269ace25be9793d9412547cae066e07c9fe14
Author:     Manuel Rüger <gentoo <AT> rueg <DOT> eu>
AuthorDate: Mon Apr 29 20:26:23 2013 +0000
Commit:     Manuel Rüger <gentoo <AT> rueg <DOT> eu>
CommitDate: Mon Apr 29 20:26:23 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=1db269ac

[media-sound/amarok] Drop outdated ebuild

Package-Manager: portage-2.1.11.62

---
 media-sound/amarok/amarok-2.6.0-r1.ebuild |  126 -----------------------------
 1 files changed, 0 insertions(+), 126 deletions(-)

diff --git a/media-sound/amarok/amarok-2.6.0-r1.ebuild b/media-sound/amarok/amarok-2.6.0-r1.ebuild
deleted file mode 100644
index 8700549..0000000
--- a/media-sound/amarok/amarok-2.6.0-r1.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.6.0.ebuild,v 1.2 2012/09/17 11:55:02 johu Exp $
-
-EAPI=4
-
-KDE_LINGUAS="bs ca cs da de el en_GB es et eu fi ga gl hu it ja lt lv nb nl pa
-pl pt pt_BR ru sl sr sr@latin sv uk zh_TW"
-KDE_SCM="git"
-KDE_REQUIRED="never"
-inherit flag-o-matic kde4-base
-
-DESCRIPTION="Advanced audio player based on KDE framework."
-HOMEPAGE="http://amarok.kde.org/"
-if [[ ${PV} != *9999* ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~ppc ~x86"
-else
-	KEYWORDS=""
-fi
-
-LICENSE="GPL-2"
-SLOT="4"
-IUSE="cdda daap debug +embedded ipod mp3tunes mtp ofa opengl semantic-desktop test +utils"
-
-# ipod requires gdk enabled and also gtk compiled in libgpod
-COMMONDEPEND="
-	app-crypt/qca:2
-	>=app-misc/strigi-0.5.7
-	$(add_kdebase_dep kdelibs 'opengl?,semantic-desktop?')
-	$(add_kdebase_dep kdebase-kioslaves)
-	>=media-libs/taglib-1.7[asf,mp4]
-	>=media-libs/taglib-extras-1.0.1
-	sys-libs/zlib
-	>=virtual/mysql-5.1[embedded?]
-	dev-qt/qtcore:4
-	dev-qt/qtdbus:4
-	dev-qt/qtscript:4
-	>=x11-libs/qtscriptgenerator-0.1.0
-	cdda? (
-		$(add_kdebase_dep libkcddb)
-		$(add_kdebase_dep libkcompactdisc)
-		|| (
-			$(add_kdebase_dep audiocd-kio)
-			$(add_kdebase_dep kdemultimedia-kioslaves)
-		)
-	)
-	ipod? ( >=media-libs/libgpod-0.7.0[gtk] )
-	mp3tunes? (
-		dev-libs/glib:2
-		dev-libs/libxml2
-		dev-libs/openssl
-		net-libs/loudmouth
-		net-misc/curl
-		dev-qt/qtcore:4[glib]
-	)
-	mtp? ( >=media-libs/libmtp-1.0.0 )
-	ofa? ( >=media-libs/libofa-0.9.0 )
-	opengl? ( virtual/opengl )
-"
-DEPEND="${COMMONDEPEND}
-	dev-util/automoc
-	virtual/pkgconfig
-	test? ( dev-cpp/gmock )
-"
-RDEPEND="${COMMONDEPEND}
-	!media-sound/amarok-utils
-	$(add_kdebase_dep phonon-kde)
-"
-
-PATCHES=()
-
-src_configure() {
-	# Append minimal-toc cflag for ppc64, see bug 280552 and 292707
-	use ppc64 && append-flags -mminimal-toc
-	local mycmakeargs
-
-	mycmakeargs=(
-		-DWITH_PLAYER=ON
-		-DWITH_Libgcrypt=OFF
-		-DWITH_SPECTRUM_ANALYZER=ON
-		-DWITH_LibLastFm=OFF
-		$(cmake-utils_use embedded WITH_MYSQL_EMBEDDED)
-		$(cmake-utils_use_with ipod)
-		$(cmake-utils_use_with ipod Gdk)
-		$(cmake-utils_use_with mtp)
-		$(cmake-utils_use_with mp3tunes MP3Tunes)
-		$(cmake-utils_use_with ofa LibOFA)
-	)
-
-	mycmakeargs+=(
-		$(cmake-utils_use_with utils UTILITIES)
-	)
-
-	# $(cmake-utils_use_with semantic-desktop Nepomuk)
-	# $(cmake-utils_use_with semantic-desktop Soprano)
-
-	kde4-base_src_configure
-}
-
-pkg_postinst() {
-	kde4-base_pkg_postinst
-
-	if use daap; then
-		echo
-		elog "You have installed amarok with daap support."
-		elog "You may be interested in installing www-servers/mongrel as well."
-		echo
-	fi
-
-	if ! use embedded; then
-		echo
-		elog "You've disabled the amarok support for embedded mysql DBs."
-		elog "You'll have to configure amarok to use an external db server."
-		echo
-		elog "Please read http://amarok.kde.org/wiki/MySQL_Server for details on how"
-		elog "to configure the external db and migrate your data from the embedded database."
-		echo
-
-		if has_version "virtual/mysql[minimal]"; then
-			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."
-			echo
-		fi
-	fi
-}

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

[Jorge Manuel B. S. Vicetto]

commit:     817b6f0ac34ccc2a62aa19a64226c52a3ef3f44c
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  7 11:14:03 2013 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Mon Jan  7 11:14:03 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=817b6f0a

[media-sound/amarok] Dropped 2.7 beta 1 as it's now in the tree.

---
 media-sound/amarok/amarok-2.6.90.ebuild |  126 -------------------------------
 1 files changed, 0 insertions(+), 126 deletions(-)

diff --git a/media-sound/amarok/amarok-2.6.90.ebuild b/media-sound/amarok/amarok-2.6.90.ebuild
deleted file mode 100644
index c2528ee..0000000
--- a/media-sound/amarok/amarok-2.6.90.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-KDE_LINGUAS="bs ca ca@valencia cs da de el en_GB es et eu fi fr
-ga gl hu it ja lt lv nb nl pl pt pt_BR ru sl sr sr@ijekavian
-sr@ijekavianlatin sr@latin sv uk zh_CN zh_TW"
-KDE_REQUIRED="never"
-inherit flag-o-matic kde4-base
-
-DESCRIPTION="Advanced audio player based on KDE framework."
-HOMEPAGE="http://amarok.kde.org/"
-if [[ ${PV} != *9999* ]]; then
-	SRC_URI="mirror://kde/unstable/${PN}/${PV}/src/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~ppc ~x86"
-else
-	KEYWORDS=""
-fi
-
-LICENSE="GPL-2"
-SLOT="4"
-IUSE="cdda daap debug +embedded ipod lastfm mp3tunes mtp ofa opengl semantic-desktop test +utils"
-
-if [[ ${PV} == *9999* ]]; then
-	RESTRICT="test"
-fi
-
-# ipod requires gdk enabled and also gtk compiled in libgpod
-COMMONDEPEND="
-	app-crypt/qca:2
-	>=app-misc/strigi-0.5.7
-	$(add_kdebase_dep kdelibs 'opengl?,semantic-desktop?' 4.8.4)
-	$(add_kdebase_dep kdebase-kioslaves)
-	>=media-libs/taglib-1.7[asf,mp4]
-	>=media-libs/taglib-extras-1.0.1
-	sys-libs/zlib
-	>=virtual/mysql-5.1[embedded?]
-	>=x11-libs/qt-core-4.8:4
-	>=x11-libs/qt-dbus-4.8:4
-	>=x11-libs/qt-script-4.8:4
-	>=x11-libs/qtscriptgenerator-0.1.0
-	cdda? (
-		$(add_kdebase_dep libkcddb)
-		$(add_kdebase_dep libkcompactdisc)
-		$(add_kdebase_dep audiocd-kio)
-	)
-	ipod? ( >=media-libs/libgpod-0.7.0[gtk] )
-	lastfm? ( >=media-libs/liblastfm-1.0.3 )
-	mp3tunes? (
-		dev-libs/glib:2
-		dev-libs/libxml2
-		dev-libs/openssl
-		net-libs/loudmouth
-		net-misc/curl
-		>=x11-libs/qt-core-4.8.4:4[glib]
-	)
-	mtp? ( >=media-libs/libmtp-1.0.0 )
-	ofa? ( >=media-libs/libofa-0.9.0 )
-	opengl? ( virtual/opengl )
-	semantic-desktop? ( >=kde-base/nepomuk-core-4.9.0 )
-"
-DEPEND="${COMMONDEPEND}
-	dev-util/automoc
-	virtual/pkgconfig
-	test? ( dev-cpp/gmock )
-"
-RDEPEND="${COMMONDEPEND}
-	!media-sound/amarok-utils
-	$(add_kdebase_dep phonon-kde)
-"
-
-src_configure() {
-	# Append minimal-toc cflag for ppc64, see bug 280552 and 292707
-	use ppc64 && append-flags -mminimal-toc
-	local mycmakeargs
-
-	mycmakeargs=(
-		-DWITH_PLAYER=ON
-		-DWITH_Libgcrypt=OFF
-		-DWITH_SPECTRUM_ANALYZER=OFF
-		$(cmake-utils_use embedded WITH_MYSQL_EMBEDDED)
-		$(cmake-utils_use_with ipod)
-		$(cmake-utils_use_with ipod Gdk)
-		$(cmake-utils_use_with lastfm LibLastFm)
-		$(cmake-utils_use_with mtp)
-		$(cmake-utils_use_with mp3tunes MP3Tunes)
-		$(cmake-utils_use_with ofa LibOFA)
-		$(cmake-utils_use_with semantic-desktop Nepomuk)
-		$(cmake-utils_use_with semantic-desktop Soprano)
-	)
-
-	mycmakeargs+=(
-		$(cmake-utils_use_with utils UTILITIES)
-	)
-
-	kde4-base_src_configure
-}
-
-pkg_postinst() {
-	kde4-base_pkg_postinst
-
-	if use daap; then
-		echo
-		elog "You have installed amarok with daap support."
-		elog "You may be interested in installing www-servers/mongrel as well."
-		echo
-	fi
-
-	if ! use embedded; then
-		echo
-		elog "You've disabled the amarok support for embedded mysql DBs."
-		elog "You'll have to configure amarok to use an external db server."
-		echo
-		elog "Please read http://amarok.kde.org/wiki/MySQL_Server for details on how"
-		elog "to configure the external db and migrate your data from the embedded database."
-		echo
-
-		if has_version "virtual/mysql[minimal]"; then
-			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."
-			echo
-		fi
-	fi
-}

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

[Paulos Ratis]

commit:     c4befdcb5834b672566edac30f786763a7b5f871
Author:     Pavlos Ratis <dastergon <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 18 02:57:51 2012 +0000
Commit:     Paulos Ratis <dastergon <AT> gmail <DOT> com>
CommitDate: Tue Dec 18 02:57:51 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=c4befdcb

[media-sound/amarok] fixed kdelibs dependency

---
 media-sound/amarok/amarok-2.6.90.ebuild |    2 +-
 media-sound/amarok/amarok-9999.ebuild   |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-sound/amarok/amarok-2.6.90.ebuild b/media-sound/amarok/amarok-2.6.90.ebuild
index 8abb8d1..d6ad40d 100644
--- a/media-sound/amarok/amarok-2.6.90.ebuild
+++ b/media-sound/amarok/amarok-2.6.90.ebuild
@@ -31,7 +31,7 @@ fi
 COMMONDEPEND="
 	app-crypt/qca:2
 	>=app-misc/strigi-0.5.7
-	$(add_kdebase_dep >=kdelibs-4.8.4 'opengl?,semantic-desktop?')
+	$(add_kdebase_dep kdelibs 'opengl?,semantic-desktop?' 4.8.4)
 	$(add_kdebase_dep kdebase-kioslaves)
 	>=media-libs/taglib-1.7[asf,mp4]
 	>=media-libs/taglib-extras-1.0.1

diff --git a/media-sound/amarok/amarok-9999.ebuild b/media-sound/amarok/amarok-9999.ebuild
index 8abb8d1..d6ad40d 100644
--- a/media-sound/amarok/amarok-9999.ebuild
+++ b/media-sound/amarok/amarok-9999.ebuild
@@ -31,7 +31,7 @@ fi
 COMMONDEPEND="
 	app-crypt/qca:2
 	>=app-misc/strigi-0.5.7
-	$(add_kdebase_dep >=kdelibs-4.8.4 'opengl?,semantic-desktop?')
+	$(add_kdebase_dep kdelibs 'opengl?,semantic-desktop?' 4.8.4)
 	$(add_kdebase_dep kdebase-kioslaves)
 	>=media-libs/taglib-1.7[asf,mp4]
 	>=media-libs/taglib-extras-1.0.1

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

[Jorge Manuel B. S. Vicetto]

commit:     8d79d6885dc0ebbd8039b3b1b2014e7a691b4b55
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 17 04:17:09 2012 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Mon Dec 17 04:17:09 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=8d79d688

[media-sound/amarok] Bump to 2.6.90 (2.7 beta) release.
Drop lastfm support from 2.6 release as it requires lastfm-0.3.
Sync and update all versions.

Package-Manager: portage-2.2.0_alpha142

---
 .../{amarok-9999.ebuild => amarok-2.6.0-r1.ebuild} |   26 ++++++------
 .../{amarok-9999.ebuild => amarok-2.6.90.ebuild}   |   42 ++++++++++----------
 media-sound/amarok/amarok-9999.ebuild              |   42 ++++++++++----------
 3 files changed, 55 insertions(+), 55 deletions(-)

diff --git a/media-sound/amarok/amarok-9999.ebuild b/media-sound/amarok/amarok-2.6.0-r1.ebuild
similarity index 85%
copy from media-sound/amarok/amarok-9999.ebuild
copy to media-sound/amarok/amarok-2.6.0-r1.ebuild
index ee61353..d56d9bf 100644
--- a/media-sound/amarok/amarok-9999.ebuild
+++ b/media-sound/amarok/amarok-2.6.0-r1.ebuild
@@ -1,18 +1,19 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.6.0.ebuild,v 1.2 2012/09/17 11:55:02 johu Exp $
 
 EAPI=4
 
-KDE_LINGUAS="bg ca cs da de en_GB es et eu fi fr it ja km nb nds nl pa
-pl pt pt_BR ru sl sr sr@latin sv th tr uk wa zh_TW"
+KDE_LINGUAS="bs ca cs da de el en_GB es et eu fi ga gl hu it ja lt lv nb nl pa
+pl pt pt_BR ru sl sr sr@latin sv uk zh_TW"
+KDE_SCM="git"
 KDE_REQUIRED="never"
 inherit flag-o-matic kde4-base
 
 DESCRIPTION="Advanced audio player based on KDE framework."
 HOMEPAGE="http://amarok.kde.org/"
 if [[ ${PV} != *9999* ]]; then
-	SRC_URI="mirror://kde/unstable/${PN}/${PV}/src/${P}.tar.bz2"
+	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.bz2"
 	KEYWORDS="~amd64 ~ppc ~x86"
 else
 	KEYWORDS=""
@@ -20,20 +21,16 @@ fi
 
 LICENSE="GPL-2"
 SLOT="4"
-IUSE="cdda daap debug +embedded ipod lastfm mp3tunes mtp ofa opengl semantic-desktop +utils"
-
-# Tests require gmock - http://code.google.com/p/gmock/
-# It's not in the tree yet
-RESTRICT="test"
+IUSE="cdda daap debug +embedded ipod mp3tunes mtp ofa opengl semantic-desktop test +utils"
 
 # ipod requires gdk enabled and also gtk compiled in libgpod
 COMMONDEPEND="
-	>=media-libs/taglib-1.7[asf,mp4]
-	>=media-libs/taglib-extras-1.0.1
 	app-crypt/qca:2
 	>=app-misc/strigi-0.5.7
 	$(add_kdebase_dep kdelibs 'opengl?,semantic-desktop?')
 	$(add_kdebase_dep kdebase-kioslaves)
+	>=media-libs/taglib-1.7[asf,mp4]
+	>=media-libs/taglib-extras-1.0.1
 	sys-libs/zlib
 	>=virtual/mysql-5.1[embedded?]
 	x11-libs/qt-core:4
@@ -49,7 +46,6 @@ COMMONDEPEND="
 		)
 	)
 	ipod? ( >=media-libs/libgpod-0.7.0[gtk] )
-	lastfm? ( >=media-libs/liblastfm-0.3.0 )
 	mp3tunes? (
 		dev-libs/glib:2
 		dev-libs/libxml2
@@ -65,12 +61,15 @@ COMMONDEPEND="
 DEPEND="${COMMONDEPEND}
 	dev-util/automoc
 	virtual/pkgconfig
+	test? ( dev-cpp/gmock )
 "
 RDEPEND="${COMMONDEPEND}
 	!media-sound/amarok-utils
 	$(add_kdebase_dep phonon-kde)
 "
 
+PATCHES=()
+
 src_configure() {
 	# Append minimal-toc cflag for ppc64, see bug 280552 and 292707
 	use ppc64 && append-flags -mminimal-toc
@@ -79,10 +78,11 @@ src_configure() {
 	mycmakeargs=(
 		-DWITH_PLAYER=ON
 		-DWITH_Libgcrypt=OFF
+		-DWITH_SPECTRUM_ANALYZER=ON
+		-DWITH_LibLastFm=OFF
 		$(cmake-utils_use embedded WITH_MYSQL_EMBEDDED)
 		$(cmake-utils_use_with ipod)
 		$(cmake-utils_use_with ipod Gdk)
-		$(cmake-utils_use_with lastfm LibLastFm)
 		$(cmake-utils_use_with mtp)
 		$(cmake-utils_use_with mp3tunes MP3Tunes)
 		$(cmake-utils_use_with ofa LibOFA)

diff --git a/media-sound/amarok/amarok-9999.ebuild b/media-sound/amarok/amarok-2.6.90.ebuild
similarity index 78%
copy from media-sound/amarok/amarok-9999.ebuild
copy to media-sound/amarok/amarok-2.6.90.ebuild
index ee61353..8abb8d1 100644
--- a/media-sound/amarok/amarok-9999.ebuild
+++ b/media-sound/amarok/amarok-2.6.90.ebuild
@@ -4,8 +4,9 @@
 
 EAPI=4
 
-KDE_LINGUAS="bg ca cs da de en_GB es et eu fi fr it ja km nb nds nl pa
-pl pt pt_BR ru sl sr sr@latin sv th tr uk wa zh_TW"
+KDE_LINGUAS="bs ca ca@valencia cs da de el en_GB es et eu fi fr
+ga gl hu it ja lt lv nb nl pl pt pt_BR ru sl sr sr@ijekavian
+sr@ijekavianlatin sr@latin sv uk zh_CN zh_TW"
 KDE_REQUIRED="never"
 inherit flag-o-matic kde4-base
 
@@ -20,51 +21,50 @@ fi
 
 LICENSE="GPL-2"
 SLOT="4"
-IUSE="cdda daap debug +embedded ipod lastfm mp3tunes mtp ofa opengl semantic-desktop +utils"
+IUSE="cdda daap debug +embedded ipod lastfm mp3tunes mtp ofa opengl semantic-desktop test +utils"
 
-# Tests require gmock - http://code.google.com/p/gmock/
-# It's not in the tree yet
-RESTRICT="test"
+if [[ ${PV} == *9999* ]]; then
+	RESTRICT="test"
+fi
 
 # ipod requires gdk enabled and also gtk compiled in libgpod
 COMMONDEPEND="
-	>=media-libs/taglib-1.7[asf,mp4]
-	>=media-libs/taglib-extras-1.0.1
 	app-crypt/qca:2
 	>=app-misc/strigi-0.5.7
-	$(add_kdebase_dep kdelibs 'opengl?,semantic-desktop?')
+	$(add_kdebase_dep >=kdelibs-4.8.4 'opengl?,semantic-desktop?')
 	$(add_kdebase_dep kdebase-kioslaves)
+	>=media-libs/taglib-1.7[asf,mp4]
+	>=media-libs/taglib-extras-1.0.1
 	sys-libs/zlib
 	>=virtual/mysql-5.1[embedded?]
-	x11-libs/qt-core:4
-	x11-libs/qt-dbus:4
-	x11-libs/qt-script:4
+	>=x11-libs/qt-core-4.8:4
+	>=x11-libs/qt-dbus-4.8:4
+	>=x11-libs/qt-script-4.8:4
 	>=x11-libs/qtscriptgenerator-0.1.0
 	cdda? (
 		$(add_kdebase_dep libkcddb)
 		$(add_kdebase_dep libkcompactdisc)
-		|| (
-			$(add_kdebase_dep audiocd-kio)
-			$(add_kdebase_dep kdemultimedia-kioslaves)
-		)
+		$(add_kdebase_dep audiocd-kio)
 	)
 	ipod? ( >=media-libs/libgpod-0.7.0[gtk] )
-	lastfm? ( >=media-libs/liblastfm-0.3.0 )
+	lastfm? ( >=media-libs/liblastfm-1.0.3 )
 	mp3tunes? (
 		dev-libs/glib:2
 		dev-libs/libxml2
 		dev-libs/openssl
 		net-libs/loudmouth
 		net-misc/curl
-		x11-libs/qt-core:4[glib]
+		>=x11-libs/qt-core-4.8.4:4[glib]
 	)
 	mtp? ( >=media-libs/libmtp-1.0.0 )
 	ofa? ( >=media-libs/libofa-0.9.0 )
 	opengl? ( virtual/opengl )
+	semantic-desktop? ( >=kde-base/nepomuk-core-4.9.0 )
 "
 DEPEND="${COMMONDEPEND}
 	dev-util/automoc
 	virtual/pkgconfig
+	test? ( dev-cpp/gmock )
 "
 RDEPEND="${COMMONDEPEND}
 	!media-sound/amarok-utils
@@ -79,6 +79,7 @@ src_configure() {
 	mycmakeargs=(
 		-DWITH_PLAYER=ON
 		-DWITH_Libgcrypt=OFF
+		-DWITH_SPECTRUM_ANALYZER=OFF
 		$(cmake-utils_use embedded WITH_MYSQL_EMBEDDED)
 		$(cmake-utils_use_with ipod)
 		$(cmake-utils_use_with ipod Gdk)
@@ -86,15 +87,14 @@ src_configure() {
 		$(cmake-utils_use_with mtp)
 		$(cmake-utils_use_with mp3tunes MP3Tunes)
 		$(cmake-utils_use_with ofa LibOFA)
+		$(cmake-utils_use_with semantic-desktop Nepomuk)
+		$(cmake-utils_use_with semantic-desktop Soprano)
 	)
 
 	mycmakeargs+=(
 		$(cmake-utils_use_with utils UTILITIES)
 	)
 
-	# $(cmake-utils_use_with semantic-desktop Nepomuk)
-	# $(cmake-utils_use_with semantic-desktop Soprano)
-
 	kde4-base_src_configure
 }
 

diff --git a/media-sound/amarok/amarok-9999.ebuild b/media-sound/amarok/amarok-9999.ebuild
index ee61353..8abb8d1 100644
--- a/media-sound/amarok/amarok-9999.ebuild
+++ b/media-sound/amarok/amarok-9999.ebuild
@@ -4,8 +4,9 @@
 
 EAPI=4
 
-KDE_LINGUAS="bg ca cs da de en_GB es et eu fi fr it ja km nb nds nl pa
-pl pt pt_BR ru sl sr sr@latin sv th tr uk wa zh_TW"
+KDE_LINGUAS="bs ca ca@valencia cs da de el en_GB es et eu fi fr
+ga gl hu it ja lt lv nb nl pl pt pt_BR ru sl sr sr@ijekavian
+sr@ijekavianlatin sr@latin sv uk zh_CN zh_TW"
 KDE_REQUIRED="never"
 inherit flag-o-matic kde4-base
 
@@ -20,51 +21,50 @@ fi
 
 LICENSE="GPL-2"
 SLOT="4"
-IUSE="cdda daap debug +embedded ipod lastfm mp3tunes mtp ofa opengl semantic-desktop +utils"
+IUSE="cdda daap debug +embedded ipod lastfm mp3tunes mtp ofa opengl semantic-desktop test +utils"
 
-# Tests require gmock - http://code.google.com/p/gmock/
-# It's not in the tree yet
-RESTRICT="test"
+if [[ ${PV} == *9999* ]]; then
+	RESTRICT="test"
+fi
 
 # ipod requires gdk enabled and also gtk compiled in libgpod
 COMMONDEPEND="
-	>=media-libs/taglib-1.7[asf,mp4]
-	>=media-libs/taglib-extras-1.0.1
 	app-crypt/qca:2
 	>=app-misc/strigi-0.5.7
-	$(add_kdebase_dep kdelibs 'opengl?,semantic-desktop?')
+	$(add_kdebase_dep >=kdelibs-4.8.4 'opengl?,semantic-desktop?')
 	$(add_kdebase_dep kdebase-kioslaves)
+	>=media-libs/taglib-1.7[asf,mp4]
+	>=media-libs/taglib-extras-1.0.1
 	sys-libs/zlib
 	>=virtual/mysql-5.1[embedded?]
-	x11-libs/qt-core:4
-	x11-libs/qt-dbus:4
-	x11-libs/qt-script:4
+	>=x11-libs/qt-core-4.8:4
+	>=x11-libs/qt-dbus-4.8:4
+	>=x11-libs/qt-script-4.8:4
 	>=x11-libs/qtscriptgenerator-0.1.0
 	cdda? (
 		$(add_kdebase_dep libkcddb)
 		$(add_kdebase_dep libkcompactdisc)
-		|| (
-			$(add_kdebase_dep audiocd-kio)
-			$(add_kdebase_dep kdemultimedia-kioslaves)
-		)
+		$(add_kdebase_dep audiocd-kio)
 	)
 	ipod? ( >=media-libs/libgpod-0.7.0[gtk] )
-	lastfm? ( >=media-libs/liblastfm-0.3.0 )
+	lastfm? ( >=media-libs/liblastfm-1.0.3 )
 	mp3tunes? (
 		dev-libs/glib:2
 		dev-libs/libxml2
 		dev-libs/openssl
 		net-libs/loudmouth
 		net-misc/curl
-		x11-libs/qt-core:4[glib]
+		>=x11-libs/qt-core-4.8.4:4[glib]
 	)
 	mtp? ( >=media-libs/libmtp-1.0.0 )
 	ofa? ( >=media-libs/libofa-0.9.0 )
 	opengl? ( virtual/opengl )
+	semantic-desktop? ( >=kde-base/nepomuk-core-4.9.0 )
 "
 DEPEND="${COMMONDEPEND}
 	dev-util/automoc
 	virtual/pkgconfig
+	test? ( dev-cpp/gmock )
 "
 RDEPEND="${COMMONDEPEND}
 	!media-sound/amarok-utils
@@ -79,6 +79,7 @@ src_configure() {
 	mycmakeargs=(
 		-DWITH_PLAYER=ON
 		-DWITH_Libgcrypt=OFF
+		-DWITH_SPECTRUM_ANALYZER=OFF
 		$(cmake-utils_use embedded WITH_MYSQL_EMBEDDED)
 		$(cmake-utils_use_with ipod)
 		$(cmake-utils_use_with ipod Gdk)
@@ -86,15 +87,14 @@ src_configure() {
 		$(cmake-utils_use_with mtp)
 		$(cmake-utils_use_with mp3tunes MP3Tunes)
 		$(cmake-utils_use_with ofa LibOFA)
+		$(cmake-utils_use_with semantic-desktop Nepomuk)
+		$(cmake-utils_use_with semantic-desktop Soprano)
 	)
 
 	mycmakeargs+=(
 		$(cmake-utils_use_with utils UTILITIES)
 	)
 
-	# $(cmake-utils_use_with semantic-desktop Nepomuk)
-	# $(cmake-utils_use_with semantic-desktop Soprano)
-
 	kde4-base_src_configure
 }
 

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

[Michael Palimaka]

commit:     3bd03b114a20b74df24d59b31a3c6b57720d4104
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 10 16:15:29 2012 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Mon Dec 10 16:15:29 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=3bd03b11

[media-sound/amarok] Drop ppc64 keyword due to unkeyworded required dependencies.

Package-Manager: portage-2.1.11.36

---
 media-sound/amarok/amarok-9999.ebuild |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/media-sound/amarok/amarok-9999.ebuild b/media-sound/amarok/amarok-9999.ebuild
index cf1cda0..ee61353 100644
--- a/media-sound/amarok/amarok-9999.ebuild
+++ b/media-sound/amarok/amarok-9999.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Advanced audio player based on KDE framework."
 HOMEPAGE="http://amarok.kde.org/"
 if [[ ${PV} != *9999* ]]; then
 	SRC_URI="mirror://kde/unstable/${PN}/${PV}/src/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~ppc ~x86"
 else
 	KEYWORDS=""
 fi

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

[Johannes Huber]

commit:     c1466fd222c19331ac9388aa69c0cd508c1b2871
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 17 11:53:41 2012 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Mon Sep 17 11:53:41 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=c1466fd2

[media-sound/amarok] Raise deps on taglib wrt bug #435268.

(Portage version: 2.2.0_alpha128/git/Linux x86_64, unsigned Manifest commit)

---
 media-sound/amarok/amarok-9999.ebuild |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/media-sound/amarok/amarok-9999.ebuild b/media-sound/amarok/amarok-9999.ebuild
index 890c5c7..cf1cda0 100644
--- a/media-sound/amarok/amarok-9999.ebuild
+++ b/media-sound/amarok/amarok-9999.ebuild
@@ -28,7 +28,7 @@ RESTRICT="test"
 
 # ipod requires gdk enabled and also gtk compiled in libgpod
 COMMONDEPEND="
-	>=media-libs/taglib-1.6.1[asf,mp4]
+	>=media-libs/taglib-1.7[asf,mp4]
 	>=media-libs/taglib-extras-1.0.1
 	app-crypt/qca:2
 	>=app-misc/strigi-0.5.7

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

[Chris Reffett]

commit:     4c97e03017b2b03c13329e18fb5cb773e6f0fc33
Author:     Chris Reffett <geekboy72 <AT> gmail <DOT> com>
AuthorDate: Fri Aug 24 01:58:20 2012 +0000
Commit:     Chris Reffett <geekboy72 <AT> gmail <DOT> com>
CommitDate: Fri Aug 24 01:58:20 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=4c97e030

[media-sound/amarok] Sync metadata.xml with tree to get fix for bug 432506

(Portage version: 2.2.0_alpha122/git/Linux x86_64, unsigned Manifest commit)

---
 media-sound/amarok/metadata.xml |   48 +++++---------------------------------
 1 files changed, 7 insertions(+), 41 deletions(-)

diff --git a/media-sound/amarok/metadata.xml b/media-sound/amarok/metadata.xml
index be772fc..6a78f0d 100644
--- a/media-sound/amarok/metadata.xml
+++ b/media-sound/amarok/metadata.xml
@@ -2,65 +2,31 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>kde</herd>
+<herd>sound</herd>
 <maintainer>
 	<email>jmbsvicetto@gentoo.org</email>
 	<name>Jorge Manuel B. S. Vicetto</name>
 </maintainer>
 <use>
-	<flag name="daap">
-		Enable the scripts for music sharing through DAAP. This flag adds
+	<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="embedded">
-		Use libmysqld, MySQL embedded server library.
+	<flag name="embedded">Use libmysqld, MySQL embedded server library.
 		Try disabling this if you encounter -PIC related in amarok,
 		it will make amarok rely only on standalone MySQL server.
 	</flag>
-	<flag name="lastfm">
-		Enable Last.fm streaming services support through
+	<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="mtp">
-		Enable support for libMTP (Plays4Sure) devices access through libmtp
+	<flag name="mtp">Enable support for libMTP (Plays4Sure) devices access through libmtp
 	</flag>
-	<flag name="ofa">
-		Use <pkg>media-libs/libofa</pkg> to compute MusicDNS acoustic
+	<flag name="ofa">Use <pkg>media-libs/libofa</pkg> to compute MusicDNS acoustic
 		fingerprints (used by MusicBrainz)
 	</flag>
-	<flag name="utils">
-		Build the utils - old <pkg>media-sound/amarok-utils</pkg>
+	<flag name="utils">Build the utils - old <pkg>media-sound/amarok-utils</pkg>
 	</flag>
-	<!--
-	<flag name="amazon">Enable support for downloading covers from amazon.com</flag>
-	<flag name="ifp">Enable support for iRiver devices access through libifp</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="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="visualization">
-		Support visualization plugins through <pkg>media-libs/libvisual</pkg>
-	</flag>
-	-->
 </use>
 </pkgmetadata>

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

[Michael Palimaka]

commit:     159fd1e52d79c5fb1d06924b1331f4d3c084c50e
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 14 17:52:55 2012 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Jul 14 17:52:55 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=159fd1e5

[media-sound/amarok] Add Qt slot deps.

(Portage version: 2.1.11.5/git/Linux x86_64, unsigned Manifest commit)

---
 media-sound/amarok/amarok-9999.ebuild |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/media-sound/amarok/amarok-9999.ebuild b/media-sound/amarok/amarok-9999.ebuild
index 43fdacf..ffd019a 100644
--- a/media-sound/amarok/amarok-9999.ebuild
+++ b/media-sound/amarok/amarok-9999.ebuild
@@ -37,9 +37,9 @@ COMMONDEPEND="
 	$(add_kdebase_dep kdebase-kioslaves)
 	sys-libs/zlib
 	>=virtual/mysql-5.1[embedded?]
-	x11-libs/qt-core
-	x11-libs/qt-dbus
-	x11-libs/qt-script
+	x11-libs/qt-core:4
+	x11-libs/qt-dbus:4
+	x11-libs/qt-script:4
 	>=x11-libs/qtscriptgenerator-0.1.0
 	cdda? (
 		$(add_kdebase_dep libkcddb)
@@ -57,7 +57,7 @@ COMMONDEPEND="
 		dev-libs/openssl
 		net-libs/loudmouth
 		net-misc/curl
-		x11-libs/qt-core[glib]
+		x11-libs/qt-core:4[glib]
 	)
 	mtp? ( >=media-libs/libmtp-1.0.0 )
 	ofa? ( >=media-libs/libofa-0.9.0 )

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

[Johannes Huber]

commit:     8c62649d5e55ecb67d6031cb5a1cd28de3dee668
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Mon Jul  9 09:36:28 2012 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Mon Jul  9 09:36:43 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=8c62649d

[media-sound/amarok] Removed, already in tree.

(Portage version: 2.2.0_alpha116/git/Linux x86_64, unsigned Manifest commit)

---
 media-sound/amarok/amarok-2.5.90-r1.ebuild |  127 ----------------------------
 1 files changed, 0 insertions(+), 127 deletions(-)

diff --git a/media-sound/amarok/amarok-2.5.90-r1.ebuild b/media-sound/amarok/amarok-2.5.90-r1.ebuild
deleted file mode 100644
index ccec98f..0000000
--- a/media-sound/amarok/amarok-2.5.90-r1.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-KDE_LINGUAS="bg ca cs da de en_GB es et eu fi fr it ja km nb nds nl pa
-pl pt pt_BR ru sl sr sr@latin sv th tr uk wa zh_TW"
-KDE_SCM="git"
-KDE_REQUIRED="never"
-inherit flag-o-matic kde4-base
-
-DESCRIPTION="Advanced audio player based on KDE framework."
-HOMEPAGE="http://amarok.kde.org/"
-if [[ ${PV} != *9999* ]]; then
-	SRC_URI="mirror://kde/unstable/${PN}/${PV}/src/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-else
-	KEYWORDS=""
-fi
-
-LICENSE="GPL-2"
-SLOT="4"
-IUSE="cdda daap debug +embedded ipod lastfm mp3tunes mtp ofa opengl semantic-desktop +utils"
-
-# Tests require gmock - http://code.google.com/p/gmock/
-# It's not in the tree yet
-RESTRICT="test"
-
-# ipod requires gdk enabled and also gtk compiled in libgpod
-COMMONDEPEND="
-	>=media-libs/taglib-1.6.1[asf,mp4]
-	>=media-libs/taglib-extras-1.0.1
-	app-crypt/qca:2
-	>=app-misc/strigi-0.5.7
-	$(add_kdebase_dep kdelibs 'opengl?,semantic-desktop?')
-	$(add_kdebase_dep kdebase-kioslaves)
-	sys-libs/zlib
-	>=virtual/mysql-5.1[embedded?]
-	x11-libs/qt-core
-	x11-libs/qt-dbus
-	x11-libs/qt-script
-	>=x11-libs/qtscriptgenerator-0.1.0
-	cdda? (
-		$(add_kdebase_dep libkcddb)
-		$(add_kdebase_dep libkcompactdisc)
-		|| (
-			$(add_kdebase_dep audiocd-kio)
-			$(add_kdebase_dep kdemultimedia-kioslaves)
-		)
-	)
-	ipod? ( >=media-libs/libgpod-0.7.0[gtk] )
-	lastfm? ( =media-libs/liblastfm-0.3* )
-	mp3tunes? (
-		dev-libs/glib:2
-		dev-libs/libxml2
-		dev-libs/openssl
-		net-libs/loudmouth
-		net-misc/curl
-		x11-libs/qt-core[glib]
-	)
-	mtp? ( >=media-libs/libmtp-1.0.0 )
-	ofa? ( >=media-libs/libofa-0.9.0 )
-	opengl? ( virtual/opengl )
-"
-DEPEND="${COMMONDEPEND}
-	dev-util/automoc
-	virtual/pkgconfig
-"
-RDEPEND="${COMMONDEPEND}
-	!media-sound/amarok-utils
-	$(add_kdebase_dep phonon-kde)
-"
-
-src_configure() {
-	# Append minimal-toc cflag for ppc64, see bug 280552 and 292707
-	use ppc64 && append-flags -mminimal-toc
-	local mycmakeargs
-
-	mycmakeargs=(
-		-DWITH_PLAYER=ON
-		-DWITH_Libgcrypt=OFF
-		$(cmake-utils_use embedded WITH_MYSQL_EMBEDDED)
-		$(cmake-utils_use_with ipod)
-		$(cmake-utils_use_with ipod Gdk)
-		$(cmake-utils_use_with lastfm LibLastFm)
-		$(cmake-utils_use_with mtp)
-		$(cmake-utils_use_with mp3tunes MP3Tunes)
-		$(cmake-utils_use_with ofa LibOFA)
-	)
-
-	mycmakeargs+=(
-		$(cmake-utils_use_with utils UTILITIES)
-	)
-
-	# $(cmake-utils_use_with semantic-desktop Nepomuk)
-	# $(cmake-utils_use_with semantic-desktop Soprano)
-
-	kde4-base_src_configure
-}
-
-pkg_postinst() {
-	kde4-base_pkg_postinst
-
-	if use daap; then
-		echo
-		elog "You have installed amarok with daap support."
-		elog "You may be interested in installing www-servers/mongrel as well."
-		echo
-	fi
-
-	if ! use embedded; then
-		echo
-		elog "You've disabled the amarok support for embedded mysql DBs."
-		elog "You'll have to configure amarok to use an external db server."
-		echo
-		elog "Please read http://amarok.kde.org/wiki/MySQL_Server for details on how"
-		elog "to configure the external db and migrate your data from the embedded database."
-		echo
-
-		if has_version "virtual/mysql[minimal]"; then
-			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."
-			echo
-		fi
-	fi
-}

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

[Jorge Manuel B. S. Vicetto]

commit:     2e5a6cc3c42fa2b55c600c9aded3341b29210eb5
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Sun Jul  8 14:36:42 2012 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Sun Jul  8 14:36:42 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=2e5a6cc3

[media-sound/amarok] metadata.xml fixes and sync with gentoo-x86.

---
 media-sound/amarok/metadata.xml |   20 +++++++++++---------
 1 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/media-sound/amarok/metadata.xml b/media-sound/amarok/metadata.xml
index 9fa39d5..be772fc 100644
--- a/media-sound/amarok/metadata.xml
+++ b/media-sound/amarok/metadata.xml
@@ -7,9 +7,6 @@
 	<name>Jorge Manuel B. S. Vicetto</name>
 </maintainer>
 <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
@@ -26,9 +23,18 @@
 		<pkg>media-libs/liblastfm</pkg>
 	</flag>
 	<flag name="mp3tunes">Enable mp3tunes integration</flag>
-	<flag name="mtp">Enable support for libMTP (Plays4Sure) devices access through libmtp</flag>
-	<flag name="utils">Build the utils - old <pkg>media-sound/amarok-utils</pkg></flag>
+	<flag name="mtp">
+		Enable support for libMTP (Plays4Sure) devices access through libmtp
+	</flag>
+	<flag name="ofa">
+		Use <pkg>media-libs/libofa</pkg> to compute MusicDNS acoustic
+		fingerprints (used by MusicBrainz)
+	</flag>
+	<flag name="utils">
+		Build the utils - old <pkg>media-sound/amarok-utils</pkg>
+	</flag>
 	<!--
+	<flag name="amazon">Enable support for downloading covers from amazon.com</flag>
 	<flag name="ifp">Enable support for iRiver devices access through libifp</flag>
 	<flag name="mp4">
 		Build the TagLib plugin for writing tags in Mp4 container files
@@ -38,10 +44,6 @@
 		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

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

[Jorge Manuel B. S. Vicetto]

commit:     9000328352237ae4b22f87c629a652188fe860b9
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Sun Jul  8 14:28:17 2012 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Sun Jul  8 14:28:17 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=90003283

[media-sound/amarok] Sync amarok-9999 and amarok-2.5.90-r1 ebuilds.
Drop the player use flag as there's no way to disable the build.
Add ofa use flag and deps for amarok-9999.

---
 media-sound/amarok/amarok-2.5.90-r1.ebuild |  151 +++++++++++----------------
 media-sound/amarok/amarok-9999.ebuild      |  149 +++++++++++----------------
 media-sound/amarok/metadata.xml            |   10 ++-
 3 files changed, 132 insertions(+), 178 deletions(-)

diff --git a/media-sound/amarok/amarok-2.5.90-r1.ebuild b/media-sound/amarok/amarok-2.5.90-r1.ebuild
index ea59165..ccec98f 100644
--- a/media-sound/amarok/amarok-2.5.90-r1.ebuild
+++ b/media-sound/amarok/amarok-2.5.90-r1.ebuild
@@ -21,7 +21,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="4"
-IUSE="cdda daap debug +embedded ipod lastfm mp3tunes mtp ofa opengl +player semantic-desktop +utils"
+IUSE="cdda daap debug +embedded ipod lastfm mp3tunes mtp ofa opengl semantic-desktop +utils"
 
 # Tests require gmock - http://code.google.com/p/gmock/
 # It's not in the tree yet
@@ -31,42 +31,37 @@ RESTRICT="test"
 COMMONDEPEND="
 	>=media-libs/taglib-1.6.1[asf,mp4]
 	>=media-libs/taglib-extras-1.0.1
-	player? (
-		app-crypt/qca:2
-		>=app-misc/strigi-0.5.7
-		$(add_kdebase_dep kdelibs 'opengl?,semantic-desktop?')
-		$(add_kdebase_dep kdebase-kioslaves)
-		sys-libs/zlib
-		>=virtual/mysql-5.1[embedded?]
-		x11-libs/qt-script
-		>=x11-libs/qtscriptgenerator-0.1.0
-		cdda? (
-			$(add_kdebase_dep libkcddb)
-			$(add_kdebase_dep libkcompactdisc)
-			|| (
-				$(add_kdebase_dep audiocd-kio)
-				$(add_kdebase_dep kdemultimedia-kioslaves)
-			)
+	app-crypt/qca:2
+	>=app-misc/strigi-0.5.7
+	$(add_kdebase_dep kdelibs 'opengl?,semantic-desktop?')
+	$(add_kdebase_dep kdebase-kioslaves)
+	sys-libs/zlib
+	>=virtual/mysql-5.1[embedded?]
+	x11-libs/qt-core
+	x11-libs/qt-dbus
+	x11-libs/qt-script
+	>=x11-libs/qtscriptgenerator-0.1.0
+	cdda? (
+		$(add_kdebase_dep libkcddb)
+		$(add_kdebase_dep libkcompactdisc)
+		|| (
+			$(add_kdebase_dep audiocd-kio)
+			$(add_kdebase_dep kdemultimedia-kioslaves)
 		)
-		ipod? ( >=media-libs/libgpod-0.7.0[gtk] )
-		lastfm? ( =media-libs/liblastfm-0.3* )
-		ofa? ( >=media-libs/libofa-0.9.0 )
-		mp3tunes? (
-			dev-libs/glib:2
-			dev-libs/libxml2
-			dev-libs/openssl
-			net-libs/loudmouth
-			net-misc/curl
-			x11-libs/qt-core[glib]
-		)
-		mtp? ( >=media-libs/libmtp-1.0.0 )
-		opengl? ( virtual/opengl )
 	)
-	utils? (
-		x11-libs/qt-core
-		x11-libs/qt-dbus
+	ipod? ( >=media-libs/libgpod-0.7.0[gtk] )
+	lastfm? ( =media-libs/liblastfm-0.3* )
+	mp3tunes? (
+		dev-libs/glib:2
+		dev-libs/libxml2
+		dev-libs/openssl
+		net-libs/loudmouth
+		net-misc/curl
+		x11-libs/qt-core[glib]
 	)
-	!player? ( !utils? ( media-sound/amarok[player] ) )
+	mtp? ( >=media-libs/libmtp-1.0.0 )
+	ofa? ( >=media-libs/libofa-0.9.0 )
+	opengl? ( virtual/opengl )
 "
 DEPEND="${COMMONDEPEND}
 	dev-util/automoc
@@ -74,51 +69,32 @@ DEPEND="${COMMONDEPEND}
 "
 RDEPEND="${COMMONDEPEND}
 	!media-sound/amarok-utils
-	player? ( $(add_kdebase_dep phonon-kde) )
+	$(add_kdebase_dep phonon-kde)
 "
 
-src_prepare() {
-	if ! use player; then
-		# Disable po processing
-		sed -e "s:include(MacroOptionalAddSubdirectory)::" \
-			-i "${S}/CMakeLists.txt" \
-			|| die "Removing include of MacroOptionalAddSubdirectory failed."
-		sed -e "s:macro_optional_add_subdirectory( po )::" \
-			-i "${S}/CMakeLists.txt" \
-			|| die "Removing include of MacroOptionalAddSubdirectory failed."
-	fi
-
-	kde4-base_src_prepare
-}
-
 src_configure() {
 	# Append minimal-toc cflag for ppc64, see bug 280552 and 292707
 	use ppc64 && append-flags -mminimal-toc
 	local mycmakeargs
 
-	if use player; then
-		mycmakeargs=(
-			-DWITH_PLAYER=ON
-			-DWITH_Libgcrypt=OFF
-			$(cmake-utils_use embedded WITH_MYSQL_EMBEDDED)
-			$(cmake-utils_use_with ipod)
-			$(cmake-utils_use_with ipod Gdk)
-			$(cmake-utils_use_with lastfm LibLastFm)
-			$(cmake-utils_use_with ofa LibOFA)
-			$(cmake-utils_use_with mtp)
-			$(cmake-utils_use_with mp3tunes MP3Tunes)
-		)
-	else
-		mycmakeargs=(
-			-DWITH_PLAYER=OFF
-		)
-	fi
+	mycmakeargs=(
+		-DWITH_PLAYER=ON
+		-DWITH_Libgcrypt=OFF
+		$(cmake-utils_use embedded WITH_MYSQL_EMBEDDED)
+		$(cmake-utils_use_with ipod)
+		$(cmake-utils_use_with ipod Gdk)
+		$(cmake-utils_use_with lastfm LibLastFm)
+		$(cmake-utils_use_with mtp)
+		$(cmake-utils_use_with mp3tunes MP3Tunes)
+		$(cmake-utils_use_with ofa LibOFA)
+	)
 
 	mycmakeargs+=(
 		$(cmake-utils_use_with utils UTILITIES)
 	)
-		# $(cmake-utils_use_with semantic-desktop Nepomuk)
-		# $(cmake-utils_use_with semantic-desktop Soprano)
+
+	# $(cmake-utils_use_with semantic-desktop Nepomuk)
+	# $(cmake-utils_use_with semantic-desktop Soprano)
 
 	kde4-base_src_configure
 }
@@ -126,29 +102,26 @@ src_configure() {
 pkg_postinst() {
 	kde4-base_pkg_postinst
 
-	if use player; then
-
-		if use daap; then
-			echo
-			elog "You have installed amarok with daap support."
-			elog "You may be interested in installing www-servers/mongrel as well."
-			echo
-		fi
+	if use daap; then
+		echo
+		elog "You have installed amarok with daap support."
+		elog "You may be interested in installing www-servers/mongrel as well."
+		echo
+	fi
 
-		if ! use embedded; then
-			echo
-			elog "You've disabled the amarok support for embedded mysql DBs."
-			elog "You'll have to configure amarok to use an external db server."
+	if ! use embedded; then
+		echo
+		elog "You've disabled the amarok support for embedded mysql DBs."
+		elog "You'll have to configure amarok to use an external db server."
+		echo
+		elog "Please read http://amarok.kde.org/wiki/MySQL_Server for details on how"
+		elog "to configure the external db and migrate your data from the embedded database."
+		echo
+
+		if has_version "virtual/mysql[minimal]"; then
+			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."
 			echo
-			elog "Please read http://amarok.kde.org/wiki/MySQL_Server for details on how"
-			elog "to configure the external db and migrate your data from the embedded database."
-			echo
-
-			if has_version "virtual/mysql[minimal]"; then
-				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."
-				echo
-			fi
 		fi
 	fi
 }

diff --git a/media-sound/amarok/amarok-9999.ebuild b/media-sound/amarok/amarok-9999.ebuild
index cccbabe..43fdacf 100644
--- a/media-sound/amarok/amarok-9999.ebuild
+++ b/media-sound/amarok/amarok-9999.ebuild
@@ -21,7 +21,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="4"
-IUSE="cdda daap debug +embedded ipod lastfm mp3tunes mtp opengl +player semantic-desktop +utils"
+IUSE="cdda daap debug +embedded ipod lastfm mp3tunes mtp ofa opengl semantic-desktop +utils"
 
 # Tests require gmock - http://code.google.com/p/gmock/
 # It's not in the tree yet
@@ -31,41 +31,37 @@ RESTRICT="test"
 COMMONDEPEND="
 	>=media-libs/taglib-1.6.1[asf,mp4]
 	>=media-libs/taglib-extras-1.0.1
-	player? (
-		app-crypt/qca:2
-		>=app-misc/strigi-0.5.7
-		$(add_kdebase_dep kdelibs 'opengl?,semantic-desktop?')
-		$(add_kdebase_dep kdebase-kioslaves)
-		sys-libs/zlib
-		>=virtual/mysql-5.1[embedded?]
-		x11-libs/qt-script
-		>=x11-libs/qtscriptgenerator-0.1.0
-		cdda? (
-			$(add_kdebase_dep libkcddb)
-			$(add_kdebase_dep libkcompactdisc)
-			|| (
-				$(add_kdebase_dep audiocd-kio)
-				$(add_kdebase_dep kdemultimedia-kioslaves)
-			)
+	app-crypt/qca:2
+	>=app-misc/strigi-0.5.7
+	$(add_kdebase_dep kdelibs 'opengl?,semantic-desktop?')
+	$(add_kdebase_dep kdebase-kioslaves)
+	sys-libs/zlib
+	>=virtual/mysql-5.1[embedded?]
+	x11-libs/qt-core
+	x11-libs/qt-dbus
+	x11-libs/qt-script
+	>=x11-libs/qtscriptgenerator-0.1.0
+	cdda? (
+		$(add_kdebase_dep libkcddb)
+		$(add_kdebase_dep libkcompactdisc)
+		|| (
+			$(add_kdebase_dep audiocd-kio)
+			$(add_kdebase_dep kdemultimedia-kioslaves)
 		)
-		ipod? ( >=media-libs/libgpod-0.7.0[gtk] )
-		lastfm? ( >=media-libs/liblastfm-0.3.0 )
-		mp3tunes? (
-			dev-libs/glib:2
-			dev-libs/libxml2
-			dev-libs/openssl
-			net-libs/loudmouth
-			net-misc/curl
-			x11-libs/qt-core[glib]
-		)
-		mtp? ( >=media-libs/libmtp-1.0.0 )
-		opengl? ( virtual/opengl )
 	)
-	utils? (
-		x11-libs/qt-core
-		x11-libs/qt-dbus
+	ipod? ( >=media-libs/libgpod-0.7.0[gtk] )
+	lastfm? ( >=media-libs/liblastfm-0.3.0 )
+	mp3tunes? (
+		dev-libs/glib:2
+		dev-libs/libxml2
+		dev-libs/openssl
+		net-libs/loudmouth
+		net-misc/curl
+		x11-libs/qt-core[glib]
 	)
-	!player? ( !utils? ( media-sound/amarok[player] ) )
+	mtp? ( >=media-libs/libmtp-1.0.0 )
+	ofa? ( >=media-libs/libofa-0.9.0 )
+	opengl? ( virtual/opengl )
 "
 DEPEND="${COMMONDEPEND}
 	dev-util/automoc
@@ -73,50 +69,32 @@ DEPEND="${COMMONDEPEND}
 "
 RDEPEND="${COMMONDEPEND}
 	!media-sound/amarok-utils
-	player? ( $(add_kdebase_dep phonon-kde) )
+	$(add_kdebase_dep phonon-kde)
 "
 
-src_prepare() {
-	if ! use player; then
-		# Disable po processing
-		sed -e "s:include(MacroOptionalAddSubdirectory)::" \
-			-i "${S}/CMakeLists.txt" \
-			|| die "Removing include of MacroOptionalAddSubdirectory failed."
-		sed -e "s:macro_optional_add_subdirectory( po )::" \
-			-i "${S}/CMakeLists.txt" \
-			|| die "Removing include of MacroOptionalAddSubdirectory failed."
-	fi
-
-	kde4-base_src_prepare
-}
-
 src_configure() {
 	# Append minimal-toc cflag for ppc64, see bug 280552 and 292707
 	use ppc64 && append-flags -mminimal-toc
 	local mycmakeargs
 
-	if use player; then
-		mycmakeargs=(
-			-DWITH_PLAYER=ON
-			-DWITH_Libgcrypt=OFF
-			$(cmake-utils_use embedded WITH_MYSQL_EMBEDDED)
-			$(cmake-utils_use_with ipod)
-			$(cmake-utils_use_with ipod Gdk)
-			$(cmake-utils_use_with lastfm LibLastFm)
-			$(cmake-utils_use_with mtp)
-			$(cmake-utils_use_with mp3tunes MP3Tunes)
-		)
-	else
-		mycmakeargs=(
-			-DWITH_PLAYER=OFF
-		)
-	fi
+	mycmakeargs=(
+		-DWITH_PLAYER=ON
+		-DWITH_Libgcrypt=OFF
+		$(cmake-utils_use embedded WITH_MYSQL_EMBEDDED)
+		$(cmake-utils_use_with ipod)
+		$(cmake-utils_use_with ipod Gdk)
+		$(cmake-utils_use_with lastfm LibLastFm)
+		$(cmake-utils_use_with mtp)
+		$(cmake-utils_use_with mp3tunes MP3Tunes)
+		$(cmake-utils_use_with ofa LibOFA)
+	)
 
 	mycmakeargs+=(
 		$(cmake-utils_use_with utils UTILITIES)
 	)
-		# $(cmake-utils_use_with semantic-desktop Nepomuk)
-		# $(cmake-utils_use_with semantic-desktop Soprano)
+
+	# $(cmake-utils_use_with semantic-desktop Nepomuk)
+	# $(cmake-utils_use_with semantic-desktop Soprano)
 
 	kde4-base_src_configure
 }
@@ -124,29 +102,26 @@ src_configure() {
 pkg_postinst() {
 	kde4-base_pkg_postinst
 
-	if use player; then
-
-		if use daap; then
-			echo
-			elog "You have installed amarok with daap support."
-			elog "You may be interested in installing www-servers/mongrel as well."
-			echo
-		fi
+	if use daap; then
+		echo
+		elog "You have installed amarok with daap support."
+		elog "You may be interested in installing www-servers/mongrel as well."
+		echo
+	fi
 
-		if ! use embedded; then
-			echo
-			elog "You've disabled the amarok support for embedded mysql DBs."
-			elog "You'll have to configure amarok to use an external db server."
+	if ! use embedded; then
+		echo
+		elog "You've disabled the amarok support for embedded mysql DBs."
+		elog "You'll have to configure amarok to use an external db server."
+		echo
+		elog "Please read http://amarok.kde.org/wiki/MySQL_Server for details on how"
+		elog "to configure the external db and migrate your data from the embedded database."
+		echo
+
+		if has_version "virtual/mysql[minimal]"; then
+			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."
 			echo
-			elog "Please read http://amarok.kde.org/wiki/MySQL_Server for details on how"
-			elog "to configure the external db and migrate your data from the embedded database."
-			echo
-
-			if has_version "virtual/mysql[minimal]"; then
-				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."
-				echo
-			fi
 		fi
 	fi
 }

diff --git a/media-sound/amarok/metadata.xml b/media-sound/amarok/metadata.xml
index dc695a6..9fa39d5 100644
--- a/media-sound/amarok/metadata.xml
+++ b/media-sound/amarok/metadata.xml
@@ -2,6 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>kde</herd>
+<maintainer>
+	<email>jmbsvicetto@gentoo.org</email>
+	<name>Jorge Manuel B. S. Vicetto</name>
+</maintainer>
 <use>
 	<!--
 	<flag name="amazon">Enable support for downloading covers from amazon.com</flag>
@@ -17,10 +21,12 @@
 		Try disabling this if you encounter -PIC related in amarok,
 		it will make amarok rely only on standalone MySQL server.
 	</flag>
-	<flag name="lastfm">Enable Last.fm streaming services support through <pkg>media-libs/liblastfm</pkg></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="mtp">Enable support for libMTP (Plays4Sure) devices access through libmtp</flag>
-	<flag name="player">Build the player</flag>
 	<flag name="utils">Build the utils - old <pkg>media-sound/amarok-utils</pkg></flag>
 	<!--
 	<flag name="ifp">Enable support for iRiver devices access through libifp</flag>

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

[Jorge Manuel B. S. Vicetto]

commit:     c549130dffd12a81341c1bba0465f59c294a93fc
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Sun Jul  8 14:05:24 2012 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Sun Jul  8 14:05:24 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=c549130d

[media-sound/amarok] Fix media-libs/liblastfm dependency - bug 423391.
Add back the ofa use flag and dependency.

---
 ...marok-2.5.90.ebuild => amarok-2.5.90-r1.ebuild} |    6 ++++--
 media-sound/amarok/metadata.xml                    |    4 ++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/media-sound/amarok/amarok-2.5.90.ebuild b/media-sound/amarok/amarok-2.5.90-r1.ebuild
similarity index 94%
rename from media-sound/amarok/amarok-2.5.90.ebuild
rename to media-sound/amarok/amarok-2.5.90-r1.ebuild
index cccbabe..ea59165 100644
--- a/media-sound/amarok/amarok-2.5.90.ebuild
+++ b/media-sound/amarok/amarok-2.5.90-r1.ebuild
@@ -21,7 +21,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="4"
-IUSE="cdda daap debug +embedded ipod lastfm mp3tunes mtp opengl +player semantic-desktop +utils"
+IUSE="cdda daap debug +embedded ipod lastfm mp3tunes mtp ofa opengl +player semantic-desktop +utils"
 
 # Tests require gmock - http://code.google.com/p/gmock/
 # It's not in the tree yet
@@ -49,7 +49,8 @@ COMMONDEPEND="
 			)
 		)
 		ipod? ( >=media-libs/libgpod-0.7.0[gtk] )
-		lastfm? ( >=media-libs/liblastfm-0.3.0 )
+		lastfm? ( =media-libs/liblastfm-0.3* )
+		ofa? ( >=media-libs/libofa-0.9.0 )
 		mp3tunes? (
 			dev-libs/glib:2
 			dev-libs/libxml2
@@ -103,6 +104,7 @@ src_configure() {
 			$(cmake-utils_use_with ipod)
 			$(cmake-utils_use_with ipod Gdk)
 			$(cmake-utils_use_with lastfm LibLastFm)
+			$(cmake-utils_use_with ofa LibOFA)
 			$(cmake-utils_use_with mtp)
 			$(cmake-utils_use_with mp3tunes MP3Tunes)
 		)

diff --git a/media-sound/amarok/metadata.xml b/media-sound/amarok/metadata.xml
index 5bd8293..dc695a6 100644
--- a/media-sound/amarok/metadata.xml
+++ b/media-sound/amarok/metadata.xml
@@ -32,6 +32,10 @@
 		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

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

[Jorge Manuel B. S. Vicetto]

commit:     fbd1ad6894c67ab9123f387243ab730992a42a80
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Mon Jun  4 19:11:47 2012 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Mon Jun  4 19:11:47 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=fbd1ad68

Add amarok-2.5.90 (2.6 beta1) for testing.

---
 media-sound/amarok/amarok-2.5.90.ebuild |  152 +++++++++++++++++++++++++++++++
 1 files changed, 152 insertions(+), 0 deletions(-)

diff --git a/media-sound/amarok/amarok-2.5.90.ebuild b/media-sound/amarok/amarok-2.5.90.ebuild
new file mode 100644
index 0000000..cccbabe
--- /dev/null
+++ b/media-sound/amarok/amarok-2.5.90.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KDE_LINGUAS="bg ca cs da de en_GB es et eu fi fr it ja km nb nds nl pa
+pl pt pt_BR ru sl sr sr@latin sv th tr uk wa zh_TW"
+KDE_SCM="git"
+KDE_REQUIRED="never"
+inherit flag-o-matic kde4-base
+
+DESCRIPTION="Advanced audio player based on KDE framework."
+HOMEPAGE="http://amarok.kde.org/"
+if [[ ${PV} != *9999* ]]; then
+	SRC_URI="mirror://kde/unstable/${PN}/${PV}/src/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+else
+	KEYWORDS=""
+fi
+
+LICENSE="GPL-2"
+SLOT="4"
+IUSE="cdda daap debug +embedded ipod lastfm mp3tunes mtp opengl +player semantic-desktop +utils"
+
+# Tests require gmock - http://code.google.com/p/gmock/
+# It's not in the tree yet
+RESTRICT="test"
+
+# ipod requires gdk enabled and also gtk compiled in libgpod
+COMMONDEPEND="
+	>=media-libs/taglib-1.6.1[asf,mp4]
+	>=media-libs/taglib-extras-1.0.1
+	player? (
+		app-crypt/qca:2
+		>=app-misc/strigi-0.5.7
+		$(add_kdebase_dep kdelibs 'opengl?,semantic-desktop?')
+		$(add_kdebase_dep kdebase-kioslaves)
+		sys-libs/zlib
+		>=virtual/mysql-5.1[embedded?]
+		x11-libs/qt-script
+		>=x11-libs/qtscriptgenerator-0.1.0
+		cdda? (
+			$(add_kdebase_dep libkcddb)
+			$(add_kdebase_dep libkcompactdisc)
+			|| (
+				$(add_kdebase_dep audiocd-kio)
+				$(add_kdebase_dep kdemultimedia-kioslaves)
+			)
+		)
+		ipod? ( >=media-libs/libgpod-0.7.0[gtk] )
+		lastfm? ( >=media-libs/liblastfm-0.3.0 )
+		mp3tunes? (
+			dev-libs/glib:2
+			dev-libs/libxml2
+			dev-libs/openssl
+			net-libs/loudmouth
+			net-misc/curl
+			x11-libs/qt-core[glib]
+		)
+		mtp? ( >=media-libs/libmtp-1.0.0 )
+		opengl? ( virtual/opengl )
+	)
+	utils? (
+		x11-libs/qt-core
+		x11-libs/qt-dbus
+	)
+	!player? ( !utils? ( media-sound/amarok[player] ) )
+"
+DEPEND="${COMMONDEPEND}
+	dev-util/automoc
+	virtual/pkgconfig
+"
+RDEPEND="${COMMONDEPEND}
+	!media-sound/amarok-utils
+	player? ( $(add_kdebase_dep phonon-kde) )
+"
+
+src_prepare() {
+	if ! use player; then
+		# Disable po processing
+		sed -e "s:include(MacroOptionalAddSubdirectory)::" \
+			-i "${S}/CMakeLists.txt" \
+			|| die "Removing include of MacroOptionalAddSubdirectory failed."
+		sed -e "s:macro_optional_add_subdirectory( po )::" \
+			-i "${S}/CMakeLists.txt" \
+			|| die "Removing include of MacroOptionalAddSubdirectory failed."
+	fi
+
+	kde4-base_src_prepare
+}
+
+src_configure() {
+	# Append minimal-toc cflag for ppc64, see bug 280552 and 292707
+	use ppc64 && append-flags -mminimal-toc
+	local mycmakeargs
+
+	if use player; then
+		mycmakeargs=(
+			-DWITH_PLAYER=ON
+			-DWITH_Libgcrypt=OFF
+			$(cmake-utils_use embedded WITH_MYSQL_EMBEDDED)
+			$(cmake-utils_use_with ipod)
+			$(cmake-utils_use_with ipod Gdk)
+			$(cmake-utils_use_with lastfm LibLastFm)
+			$(cmake-utils_use_with mtp)
+			$(cmake-utils_use_with mp3tunes MP3Tunes)
+		)
+	else
+		mycmakeargs=(
+			-DWITH_PLAYER=OFF
+		)
+	fi
+
+	mycmakeargs+=(
+		$(cmake-utils_use_with utils UTILITIES)
+	)
+		# $(cmake-utils_use_with semantic-desktop Nepomuk)
+		# $(cmake-utils_use_with semantic-desktop Soprano)
+
+	kde4-base_src_configure
+}
+
+pkg_postinst() {
+	kde4-base_pkg_postinst
+
+	if use player; then
+
+		if use daap; then
+			echo
+			elog "You have installed amarok with daap support."
+			elog "You may be interested in installing www-servers/mongrel as well."
+			echo
+		fi
+
+		if ! use embedded; then
+			echo
+			elog "You've disabled the amarok support for embedded mysql DBs."
+			elog "You'll have to configure amarok to use an external db server."
+			echo
+			elog "Please read http://amarok.kde.org/wiki/MySQL_Server for details on how"
+			elog "to configure the external db and migrate your data from the embedded database."
+			echo
+
+			if has_version "virtual/mysql[minimal]"; then
+				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."
+				echo
+			fi
+		fi
+	fi
+}

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

[Alexey Shvetsov]

commit:     2b5331b87f03831e3748927a7ad78ab52b7a9f5a
Author:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
AuthorDate: Sat May 26 16:11:00 2012 +0000
Commit:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
CommitDate: Sat May 26 16:11:00 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=2b5331b8

[media-sound/amarok] Allow installing with KDE SC 4.9

(Portage version: 2.2.0_alpha108/git/Linux x86_64, unsigned Manifest commit)

---
 media-sound/amarok/amarok-9999.ebuild |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/media-sound/amarok/amarok-9999.ebuild b/media-sound/amarok/amarok-9999.ebuild
index 39c0e3a..cccbabe 100644
--- a/media-sound/amarok/amarok-9999.ebuild
+++ b/media-sound/amarok/amarok-9999.ebuild
@@ -43,7 +43,10 @@ COMMONDEPEND="
 		cdda? (
 			$(add_kdebase_dep libkcddb)
 			$(add_kdebase_dep libkcompactdisc)
-			$(add_kdebase_dep kdemultimedia-kioslaves)
+			|| (
+				$(add_kdebase_dep audiocd-kio)
+				$(add_kdebase_dep kdemultimedia-kioslaves)
+			)
 		)
 		ipod? ( >=media-libs/libgpod-0.7.0[gtk] )
 		lastfm? ( >=media-libs/liblastfm-0.3.0 )

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

[Johannes Huber]

commit:     bc266ab483821173d52a9b585a9515c1ee1ea121
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Wed May  2 22:12:29 2012 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Wed May  2 22:12:29 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=bc266ab4

[media-sound/amarok] dev-util/pkgconfig -> virtual/pkgconfig

(Portage version: 2.2.0_alpha101/git/Linux i686, unsigned Manifest commit)

---
 media-sound/amarok/amarok-9999.ebuild |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/media-sound/amarok/amarok-9999.ebuild b/media-sound/amarok/amarok-9999.ebuild
index 12bb462..39c0e3a 100644
--- a/media-sound/amarok/amarok-9999.ebuild
+++ b/media-sound/amarok/amarok-9999.ebuild
@@ -66,7 +66,7 @@ COMMONDEPEND="
 "
 DEPEND="${COMMONDEPEND}
 	dev-util/automoc
-	dev-util/pkgconfig
+	virtual/pkgconfig
 "
 RDEPEND="${COMMONDEPEND}
 	!media-sound/amarok-utils

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

[Johannes Huber]

commit:     7aac23ce21a5b95aed3457d809d95b5f41007fe4
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Thu Feb  9 15:36:49 2012 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Thu Feb  9 15:36:49 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=7aac23ce

[media-sound/amarok] Removed, newer version in tree.

(Portage version: 2.2.0_alpha85/git/Linux x86_64, unsigned Manifest commit)

---
 media-sound/amarok/amarok-2.4.90.ebuild |  149 -------------------------------
 1 files changed, 0 insertions(+), 149 deletions(-)

diff --git a/media-sound/amarok/amarok-2.4.90.ebuild b/media-sound/amarok/amarok-2.4.90.ebuild
deleted file mode 100644
index 12bb462..0000000
--- a/media-sound/amarok/amarok-2.4.90.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-KDE_LINGUAS="bg ca cs da de en_GB es et eu fi fr it ja km nb nds nl pa
-pl pt pt_BR ru sl sr sr@latin sv th tr uk wa zh_TW"
-KDE_SCM="git"
-KDE_REQUIRED="never"
-inherit flag-o-matic kde4-base
-
-DESCRIPTION="Advanced audio player based on KDE framework."
-HOMEPAGE="http://amarok.kde.org/"
-if [[ ${PV} != *9999* ]]; then
-	SRC_URI="mirror://kde/unstable/${PN}/${PV}/src/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-else
-	KEYWORDS=""
-fi
-
-LICENSE="GPL-2"
-SLOT="4"
-IUSE="cdda daap debug +embedded ipod lastfm mp3tunes mtp opengl +player semantic-desktop +utils"
-
-# Tests require gmock - http://code.google.com/p/gmock/
-# It's not in the tree yet
-RESTRICT="test"
-
-# ipod requires gdk enabled and also gtk compiled in libgpod
-COMMONDEPEND="
-	>=media-libs/taglib-1.6.1[asf,mp4]
-	>=media-libs/taglib-extras-1.0.1
-	player? (
-		app-crypt/qca:2
-		>=app-misc/strigi-0.5.7
-		$(add_kdebase_dep kdelibs 'opengl?,semantic-desktop?')
-		$(add_kdebase_dep kdebase-kioslaves)
-		sys-libs/zlib
-		>=virtual/mysql-5.1[embedded?]
-		x11-libs/qt-script
-		>=x11-libs/qtscriptgenerator-0.1.0
-		cdda? (
-			$(add_kdebase_dep libkcddb)
-			$(add_kdebase_dep libkcompactdisc)
-			$(add_kdebase_dep kdemultimedia-kioslaves)
-		)
-		ipod? ( >=media-libs/libgpod-0.7.0[gtk] )
-		lastfm? ( >=media-libs/liblastfm-0.3.0 )
-		mp3tunes? (
-			dev-libs/glib:2
-			dev-libs/libxml2
-			dev-libs/openssl
-			net-libs/loudmouth
-			net-misc/curl
-			x11-libs/qt-core[glib]
-		)
-		mtp? ( >=media-libs/libmtp-1.0.0 )
-		opengl? ( virtual/opengl )
-	)
-	utils? (
-		x11-libs/qt-core
-		x11-libs/qt-dbus
-	)
-	!player? ( !utils? ( media-sound/amarok[player] ) )
-"
-DEPEND="${COMMONDEPEND}
-	dev-util/automoc
-	dev-util/pkgconfig
-"
-RDEPEND="${COMMONDEPEND}
-	!media-sound/amarok-utils
-	player? ( $(add_kdebase_dep phonon-kde) )
-"
-
-src_prepare() {
-	if ! use player; then
-		# Disable po processing
-		sed -e "s:include(MacroOptionalAddSubdirectory)::" \
-			-i "${S}/CMakeLists.txt" \
-			|| die "Removing include of MacroOptionalAddSubdirectory failed."
-		sed -e "s:macro_optional_add_subdirectory( po )::" \
-			-i "${S}/CMakeLists.txt" \
-			|| die "Removing include of MacroOptionalAddSubdirectory failed."
-	fi
-
-	kde4-base_src_prepare
-}
-
-src_configure() {
-	# Append minimal-toc cflag for ppc64, see bug 280552 and 292707
-	use ppc64 && append-flags -mminimal-toc
-	local mycmakeargs
-
-	if use player; then
-		mycmakeargs=(
-			-DWITH_PLAYER=ON
-			-DWITH_Libgcrypt=OFF
-			$(cmake-utils_use embedded WITH_MYSQL_EMBEDDED)
-			$(cmake-utils_use_with ipod)
-			$(cmake-utils_use_with ipod Gdk)
-			$(cmake-utils_use_with lastfm LibLastFm)
-			$(cmake-utils_use_with mtp)
-			$(cmake-utils_use_with mp3tunes MP3Tunes)
-		)
-	else
-		mycmakeargs=(
-			-DWITH_PLAYER=OFF
-		)
-	fi
-
-	mycmakeargs+=(
-		$(cmake-utils_use_with utils UTILITIES)
-	)
-		# $(cmake-utils_use_with semantic-desktop Nepomuk)
-		# $(cmake-utils_use_with semantic-desktop Soprano)
-
-	kde4-base_src_configure
-}
-
-pkg_postinst() {
-	kde4-base_pkg_postinst
-
-	if use player; then
-
-		if use daap; then
-			echo
-			elog "You have installed amarok with daap support."
-			elog "You may be interested in installing www-servers/mongrel as well."
-			echo
-		fi
-
-		if ! use embedded; then
-			echo
-			elog "You've disabled the amarok support for embedded mysql DBs."
-			elog "You'll have to configure amarok to use an external db server."
-			echo
-			elog "Please read http://amarok.kde.org/wiki/MySQL_Server for details on how"
-			elog "to configure the external db and migrate your data from the embedded database."
-			echo
-
-			if has_version "virtual/mysql[minimal]"; then
-				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."
-				echo
-			fi
-		fi
-	fi
-}

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

[Jorge Manuel B. S. Vicetto]

commit:     2e613d1925c1982ba710adcf35627b0ec7b278ab
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 15 04:48:01 2011 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Tue Nov 15 04:48:01 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=2e613d19

[media-sound/amarok] Update reference link on how to configure mysql with amarok.

(Portage version: 2.2.0_alpha73/git/Linux x86_64, unsigned Manifest commit)

---
 media-sound/amarok/amarok-2.4.90.ebuild |    2 +-
 media-sound/amarok/amarok-9999.ebuild   |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-sound/amarok/amarok-2.4.90.ebuild b/media-sound/amarok/amarok-2.4.90.ebuild
index 1f6ee9e..fa16b33 100644
--- a/media-sound/amarok/amarok-2.4.90.ebuild
+++ b/media-sound/amarok/amarok-2.4.90.ebuild
@@ -135,7 +135,7 @@ pkg_postinst() {
 			elog "You've disabled the amarok support for embedded mysql DBs."
 			elog "You'll have to configure amarok to use an external db server."
 			echo
-			elog "Please read http://amaroklive.com/wiki/MySQL_Server for details on how"
+			elog "Please read http://amarok.kde.org/wiki/MySQL_Server for details on how"
 			elog "to configure the external db and migrate your data from the embedded database."
 			echo
 

diff --git a/media-sound/amarok/amarok-9999.ebuild b/media-sound/amarok/amarok-9999.ebuild
index 1f6ee9e..fa16b33 100644
--- a/media-sound/amarok/amarok-9999.ebuild
+++ b/media-sound/amarok/amarok-9999.ebuild
@@ -135,7 +135,7 @@ pkg_postinst() {
 			elog "You've disabled the amarok support for embedded mysql DBs."
 			elog "You'll have to configure amarok to use an external db server."
 			echo
-			elog "Please read http://amaroklive.com/wiki/MySQL_Server for details on how"
+			elog "Please read http://amarok.kde.org/wiki/MySQL_Server for details on how"
 			elog "to configure the external db and migrate your data from the embedded database."
 			echo
 

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

[Jorge Manuel B. S. Vicetto]

commit:     296e5cab83feea3555633b2e58987cde881eaee0
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 15 04:21:22 2011 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Tue Nov 15 04:21:22 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=296e5cab

[media-sound/amarok] Added amarok-2.5 Beta 1.

(Portage version: 2.2.0_alpha73/git/Linux x86_64, unsigned Manifest commit)

---
 .../{amarok-9999.ebuild => amarok-2.4.90.ebuild}   |   12 +++---------
 media-sound/amarok/amarok-9999.ebuild              |   12 +++---------
 2 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/media-sound/amarok/amarok-9999.ebuild b/media-sound/amarok/amarok-2.4.90.ebuild
similarity index 95%
copy from media-sound/amarok/amarok-9999.ebuild
copy to media-sound/amarok/amarok-2.4.90.ebuild
index ae7012a..1f6ee9e 100644
--- a/media-sound/amarok/amarok-9999.ebuild
+++ b/media-sound/amarok/amarok-2.4.90.ebuild
@@ -33,11 +33,11 @@ COMMONDEPEND="
 	>=media-libs/taglib-extras-1.0.1
 	player? (
 		app-crypt/qca:2
-		app-misc/strigi
+		>=app-misc/strigi-0.5.7
 		$(add_kdebase_dep kdelibs 'opengl?,semantic-desktop?')
 		$(add_kdebase_dep kdebase-kioslaves)
 		sys-libs/zlib
-		>=virtual/mysql-5.1
+		>=virtual/mysql-5.1[embedded?]
 		x11-libs/qt-script
 		>=x11-libs/qtscriptgenerator-0.1.0
 		cdda? (
@@ -45,12 +45,6 @@ COMMONDEPEND="
 			$(add_kdebase_dep libkcompactdisc)
 			$(add_kdebase_dep kdemultimedia-kioslaves)
 		)
-		embedded? (
-			|| (
-				>=dev-db/mysql-5.1.50-r3[embedded]
-				>=dev-db/mariadb-5.1.50[embedded]
-			)
-		)
 		ipod? ( >=media-libs/libgpod-0.7.0[gtk] )
 		lastfm? ( >=media-libs/liblastfm-0.3.0 )
 		mp3tunes? (
@@ -145,7 +139,7 @@ pkg_postinst() {
 			elog "to configure the external db and migrate your data from the embedded database."
 			echo
 
-			if has_version "dev-db/mysql[minimal]"; then
+			if has_version "virtual/mysql[minimal]"; then
 				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."
 				echo

diff --git a/media-sound/amarok/amarok-9999.ebuild b/media-sound/amarok/amarok-9999.ebuild
index ae7012a..1f6ee9e 100644
--- a/media-sound/amarok/amarok-9999.ebuild
+++ b/media-sound/amarok/amarok-9999.ebuild
@@ -33,11 +33,11 @@ COMMONDEPEND="
 	>=media-libs/taglib-extras-1.0.1
 	player? (
 		app-crypt/qca:2
-		app-misc/strigi
+		>=app-misc/strigi-0.5.7
 		$(add_kdebase_dep kdelibs 'opengl?,semantic-desktop?')
 		$(add_kdebase_dep kdebase-kioslaves)
 		sys-libs/zlib
-		>=virtual/mysql-5.1
+		>=virtual/mysql-5.1[embedded?]
 		x11-libs/qt-script
 		>=x11-libs/qtscriptgenerator-0.1.0
 		cdda? (
@@ -45,12 +45,6 @@ COMMONDEPEND="
 			$(add_kdebase_dep libkcompactdisc)
 			$(add_kdebase_dep kdemultimedia-kioslaves)
 		)
-		embedded? (
-			|| (
-				>=dev-db/mysql-5.1.50-r3[embedded]
-				>=dev-db/mariadb-5.1.50[embedded]
-			)
-		)
 		ipod? ( >=media-libs/libgpod-0.7.0[gtk] )
 		lastfm? ( >=media-libs/liblastfm-0.3.0 )
 		mp3tunes? (
@@ -145,7 +139,7 @@ pkg_postinst() {
 			elog "to configure the external db and migrate your data from the embedded database."
 			echo
 
-			if has_version "dev-db/mysql[minimal]"; then
+			if has_version "virtual/mysql[minimal]"; then
 				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."
 				echo

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

[Johannes Huber]

commit:     820ce5d1888f324cf7e3b43f8ffb2414a7a3dd4d
Author:     Johannes Huber <johu <AT> gmx <DOT> de>
AuthorDate: Tue Nov  8 20:37:46 2011 +0000
Commit:     Johannes Huber <johu <AT> gmx <DOT> de>
CommitDate: Tue Nov  8 20:37:46 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=820ce5d1

[media-sound/amarok] No use-deps on strigi, bug 386259

(Portage version: 2.2.0_alpha72/git/Linux i686, unsigned Manifest commit)

---
 media-sound/amarok/amarok-9999.ebuild |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/media-sound/amarok/amarok-9999.ebuild b/media-sound/amarok/amarok-9999.ebuild
index 9c49589..ae7012a 100644
--- a/media-sound/amarok/amarok-9999.ebuild
+++ b/media-sound/amarok/amarok-9999.ebuild
@@ -33,7 +33,7 @@ COMMONDEPEND="
 	>=media-libs/taglib-extras-1.0.1
 	player? (
 		app-crypt/qca:2
-		>=app-misc/strigi-0.5.7[dbus,qt4]
+		app-misc/strigi
 		$(add_kdebase_dep kdelibs 'opengl?,semantic-desktop?')
 		$(add_kdebase_dep kdebase-kioslaves)
 		sys-libs/zlib

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

[Andreas Hüttel]

commit:     b726e08877568ad8ce0672c6624f5eab935e2da5
Author:     Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de>
AuthorDate: Tue Aug 23 21:56:22 2011 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Tue Aug 23 21:56:22 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=b726e088

[media-sound/amarok] Add dependency on kde-base/kdebase-kioslaves, bug 374399

(Portage version: 2.1.10.11/git/Linux x86_64, signed Manifest commit with key B6C5F7DE)

---
 media-sound/amarok/amarok-9999.ebuild |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/media-sound/amarok/amarok-9999.ebuild b/media-sound/amarok/amarok-9999.ebuild
index d91a37e..9c49589 100644
--- a/media-sound/amarok/amarok-9999.ebuild
+++ b/media-sound/amarok/amarok-9999.ebuild
@@ -35,6 +35,7 @@ COMMONDEPEND="
 		app-crypt/qca:2
 		>=app-misc/strigi-0.5.7[dbus,qt4]
 		$(add_kdebase_dep kdelibs 'opengl?,semantic-desktop?')
+		$(add_kdebase_dep kdebase-kioslaves)
 		sys-libs/zlib
 		>=virtual/mysql-5.1
 		x11-libs/qt-script

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

[Jorge Manuel B. S. Vicetto]

commit:     f1de26e7eb7e555983e61453fe934d246f30335e
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 31 00:20:29 2011 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Sun Jul 31 00:20:29 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=f1de26e7

[media-sound/amarok] Bumped to the 2.4.3 release - there won't be a 2.4.2 release any more.

(Portage version: 2.2.0_alpha49/git/Linux x86_64, signed Manifest commit with key BB0E6E98)

---
 .../{amarok-2.4.2.ebuild => amarok-2.4.3.ebuild}   |    0
 1 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/media-sound/amarok/amarok-2.4.2.ebuild b/media-sound/amarok/amarok-2.4.3.ebuild
similarity index 100%
rename from media-sound/amarok/amarok-2.4.2.ebuild
rename to media-sound/amarok/amarok-2.4.3.ebuild

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

[Johannes Huber]

commit:     a107539948439bba571622658fdc2f4248bf47c6
Author:     Johannes Huber <johu <AT> gmx <DOT> de>
AuthorDate: Sun Jul 10 00:28:36 2011 +0000
Commit:     Johannes Huber <johu <AT> gmx <DOT> de>
CommitDate: Sun Jul 10 00:28:36 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=a1075399

[media-sound/amarok] bump 2.4.2 beta 1

---
 media-sound/amarok/amarok-2.4.1.90.ebuild |  154 +++++++++++++++++++++++++++++
 1 files changed, 154 insertions(+), 0 deletions(-)

diff --git a/media-sound/amarok/amarok-2.4.1.90.ebuild b/media-sound/amarok/amarok-2.4.1.90.ebuild
new file mode 100644
index 0000000..d91a37e
--- /dev/null
+++ b/media-sound/amarok/amarok-2.4.1.90.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KDE_LINGUAS="bg ca cs da de en_GB es et eu fi fr it ja km nb nds nl pa
+pl pt pt_BR ru sl sr sr@latin sv th tr uk wa zh_TW"
+KDE_SCM="git"
+KDE_REQUIRED="never"
+inherit flag-o-matic kde4-base
+
+DESCRIPTION="Advanced audio player based on KDE framework."
+HOMEPAGE="http://amarok.kde.org/"
+if [[ ${PV} != *9999* ]]; then
+	SRC_URI="mirror://kde/unstable/${PN}/${PV}/src/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+else
+	KEYWORDS=""
+fi
+
+LICENSE="GPL-2"
+SLOT="4"
+IUSE="cdda daap debug +embedded ipod lastfm mp3tunes mtp opengl +player semantic-desktop +utils"
+
+# Tests require gmock - http://code.google.com/p/gmock/
+# It's not in the tree yet
+RESTRICT="test"
+
+# ipod requires gdk enabled and also gtk compiled in libgpod
+COMMONDEPEND="
+	>=media-libs/taglib-1.6.1[asf,mp4]
+	>=media-libs/taglib-extras-1.0.1
+	player? (
+		app-crypt/qca:2
+		>=app-misc/strigi-0.5.7[dbus,qt4]
+		$(add_kdebase_dep kdelibs 'opengl?,semantic-desktop?')
+		sys-libs/zlib
+		>=virtual/mysql-5.1
+		x11-libs/qt-script
+		>=x11-libs/qtscriptgenerator-0.1.0
+		cdda? (
+			$(add_kdebase_dep libkcddb)
+			$(add_kdebase_dep libkcompactdisc)
+			$(add_kdebase_dep kdemultimedia-kioslaves)
+		)
+		embedded? (
+			|| (
+				>=dev-db/mysql-5.1.50-r3[embedded]
+				>=dev-db/mariadb-5.1.50[embedded]
+			)
+		)
+		ipod? ( >=media-libs/libgpod-0.7.0[gtk] )
+		lastfm? ( >=media-libs/liblastfm-0.3.0 )
+		mp3tunes? (
+			dev-libs/glib:2
+			dev-libs/libxml2
+			dev-libs/openssl
+			net-libs/loudmouth
+			net-misc/curl
+			x11-libs/qt-core[glib]
+		)
+		mtp? ( >=media-libs/libmtp-1.0.0 )
+		opengl? ( virtual/opengl )
+	)
+	utils? (
+		x11-libs/qt-core
+		x11-libs/qt-dbus
+	)
+	!player? ( !utils? ( media-sound/amarok[player] ) )
+"
+DEPEND="${COMMONDEPEND}
+	dev-util/automoc
+	dev-util/pkgconfig
+"
+RDEPEND="${COMMONDEPEND}
+	!media-sound/amarok-utils
+	player? ( $(add_kdebase_dep phonon-kde) )
+"
+
+src_prepare() {
+	if ! use player; then
+		# Disable po processing
+		sed -e "s:include(MacroOptionalAddSubdirectory)::" \
+			-i "${S}/CMakeLists.txt" \
+			|| die "Removing include of MacroOptionalAddSubdirectory failed."
+		sed -e "s:macro_optional_add_subdirectory( po )::" \
+			-i "${S}/CMakeLists.txt" \
+			|| die "Removing include of MacroOptionalAddSubdirectory failed."
+	fi
+
+	kde4-base_src_prepare
+}
+
+src_configure() {
+	# Append minimal-toc cflag for ppc64, see bug 280552 and 292707
+	use ppc64 && append-flags -mminimal-toc
+	local mycmakeargs
+
+	if use player; then
+		mycmakeargs=(
+			-DWITH_PLAYER=ON
+			-DWITH_Libgcrypt=OFF
+			$(cmake-utils_use embedded WITH_MYSQL_EMBEDDED)
+			$(cmake-utils_use_with ipod)
+			$(cmake-utils_use_with ipod Gdk)
+			$(cmake-utils_use_with lastfm LibLastFm)
+			$(cmake-utils_use_with mtp)
+			$(cmake-utils_use_with mp3tunes MP3Tunes)
+		)
+	else
+		mycmakeargs=(
+			-DWITH_PLAYER=OFF
+		)
+	fi
+
+	mycmakeargs+=(
+		$(cmake-utils_use_with utils UTILITIES)
+	)
+		# $(cmake-utils_use_with semantic-desktop Nepomuk)
+		# $(cmake-utils_use_with semantic-desktop Soprano)
+
+	kde4-base_src_configure
+}
+
+pkg_postinst() {
+	kde4-base_pkg_postinst
+
+	if use player; then
+
+		if use daap; then
+			echo
+			elog "You have installed amarok with daap support."
+			elog "You may be interested in installing www-servers/mongrel as well."
+			echo
+		fi
+
+		if ! use embedded; then
+			echo
+			elog "You've disabled the amarok support for embedded mysql DBs."
+			elog "You'll have to configure amarok to use an external db server."
+			echo
+			elog "Please read http://amaroklive.com/wiki/MySQL_Server for details on how"
+			elog "to configure the external db and migrate your data from the embedded database."
+			echo
+
+			if has_version "dev-db/mysql[minimal]"; then
+				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."
+				echo
+			fi
+		fi
+	fi
+}