[gentoo-commits] proj/kde:master commit in: media-sound/amarok/
commit: 56e9626530dce9f054c9ba601e0239622eede7db
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Thu May 16 11:45:09 2024 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu May 16 11:45:44 2024 +
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 gentoo.org>
media-sound/amarok/amarok-.ebuild | 21 -
1 file changed, 16 insertions(+), 5 deletions(-)
diff --git a/media-sound/amarok/amarok-.ebuild
b/media-sound/amarok/amarok-.ebuild
index b23aff3caa..12c7cb3228 100644
--- a/media-sound/amarok/amarok-.ebuild
+++ b/media-sound/amarok/amarok-.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/
commit: 5bc4cedba8e40a000a82e4642a4f51a18d6f782a Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Mar 25 18:59:56 2024 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Mar 25 19:00:06 2024 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=5bc4cedb media-sound/amarok: add kde-invent upstream metadata Signed-off-by: Andreas Sturmlechner 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 @@ https://bugs.kde.org/ + multimedia/amarok Enable Last.fm streaming services support through media-libs/liblastfm
[gentoo-commits] proj/kde:master commit in: media-sound/amarok/
commit: 880af8bfd4156a07bfddc0a73401855dc1b93860
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Tue Feb 27 19:10:50 2024 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Tue Feb 27 19:10:50 2024 +
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 gentoo.org>
media-sound/amarok/amarok-.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-sound/amarok/amarok-.ebuild
b/media-sound/amarok/amarok-.ebuild
index 48444bb74d..44ed352bf4 100644
--- a/media-sound/amarok/amarok-.ebuild
+++ b/media-sound/amarok/amarok-.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/
commit: fae611a926c2beaceecfbcdb6422169202d378d8 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Dec 17 10:35:59 2023 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Dec 17 10:35:59 2023 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=fae611a9 media-sound/amarok: Cleanup metadata.xml Signed-off-by: Andreas Sturmlechner 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 @@ Enable Last.fm streaming services support through media-libs/liblastfm Prefer dev-db/mariadb-connector-c over dev-db/mysql-connector-c Enable support for libMTP (Plays4Sure) devices access through libmtp - Use media-libs/libofa to compute MusicDNS acoustic - fingerprints (used by MusicBrainz) Enable gpodder.net podcast support via media-libs/libmygpo-qt Enable wikipedia widget using dev-qt/qtwebengine
[gentoo-commits] proj/kde:master commit in: media-sound/amarok/
commit: c1adf2c2e1f8b40de76d19544f65d7ad722be690
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Dec 17 10:02:25 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Dec 17 10:02:25 2023 +
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 gentoo.org>
media-sound/amarok/amarok-.ebuild | 10 +++---
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/media-sound/amarok/amarok-.ebuild
b/media-sound/amarok/amarok-.ebuild
index 8ba31c55ff..e4568afce5 100644
--- a/media-sound/amarok/amarok-.ebuild
+++ b/media-sound/amarok/amarok-.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/
commit: d9b79e7d504adb776afe1f190193465b8b33fc32
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Tue Oct 11 14:47:35 2022 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Tue Oct 11 15:17:12 2022 +
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 gentoo.org>
media-sound/amarok/amarok-.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-sound/amarok/amarok-.ebuild
b/media-sound/amarok/amarok-.ebuild
index fab72a47b9..782ca67a22 100644
--- a/media-sound/amarok/amarok-.ebuild
+++ b/media-sound/amarok/amarok-.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/
commit: 2b64abf82a29fef9dfe1f2a5e9c5ad4d099bb4ce
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Tue May 4 15:15:54 2021 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Tue May 4 15:56:12 2021 +
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 gentoo.org>
media-sound/amarok/amarok-.ebuild | 36 ++-
1 file changed, 19 insertions(+), 17 deletions(-)
diff --git a/media-sound/amarok/amarok-.ebuild
b/media-sound/amarok/amarok-.ebuild
index 397a86c538..40c1222c75 100644
--- a/media-sound/amarok/amarok-.ebuild
+++ b/media-sound/amarok/amarok-.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/
commit: 26e8ae85e284ba49fef6ac7b2c7e74b697b3c2ed
Author: band-a-prend yandex ru>
AuthorDate: Tue Apr 13 21:00:22 2021 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Tue May 4 15:55:51 2021 +
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 yandex.ru>
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-sound/amarok/amarok-.ebuild | 37 +++
1 file changed, 33 insertions(+), 4 deletions(-)
diff --git a/media-sound/amarok/amarok-.ebuild
b/media-sound/amarok/amarok-.ebuild
index 4f26e37cef..397a86c538 100644
--- a/media-sound/amarok/amarok-.ebuild
+++ b/media-sound/amarok/amarok-.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/
commit: 55052fff7c790db45d76d23457ab84af1a38c207
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Wed Sep 30 18:49:53 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Wed Sep 30 18:53:03 2020 +
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 gentoo.org>
media-sound/amarok/amarok-.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-sound/amarok/amarok-.ebuild
b/media-sound/amarok/amarok-.ebuild
index 2bdbadffea..325fece1d7 100644
--- a/media-sound/amarok/amarok-.ebuild
+++ b/media-sound/amarok/amarok-.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/files/, media-sound/amarok/
commit: 0893880fb0286783f00a67f0c377aa1785139cb4
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Tue Sep 29 19:58:43 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Tue Sep 29 20:12:08 2020 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=0893880f
media-sound/amarok: Add IUSE=mariadb, update dependencies
- Set ECM_HANDBOOK="forceoptional"
- Drop obsolete patch
- Update MySQLe disable switch
- Update pkg_postinst info mechanism wrt USE mariadb state
Upstream commits:
f319fef25c654f726a056a7d09a290f447716235
6606c064f5a0cdcd1e51459fa76a7e3325ec4456
4337b3ef6e9ed30606fd06e15fd9ca350b1da01b
03ef605c9273d76a5802bdd2160cc5a52833f81c
822eddec49e1f976ee795d89c62bfea7210d2b61
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-sound/amarok/amarok-.ebuild| 20 ++--
.../amarok/files/amarok-2.8.90-mysqld-rpath.patch| 12
media-sound/amarok/metadata.xml | 8 ++--
3 files changed, 12 insertions(+), 28 deletions(-)
diff --git a/media-sound/amarok/amarok-.ebuild
b/media-sound/amarok/amarok-.ebuild
index c1b5f87557..2bdbadffea 100644
--- a/media-sound/amarok/amarok-.ebuild
+++ b/media-sound/amarok/amarok-.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-ECM_HANDBOOK="true"
+ECM_HANDBOOK="forceoptional"
KFMIN=5.60.0
QTMIN=5.12.3
inherit ecm kde.org
@@ -13,13 +13,12 @@ HOMEPAGE="https://amarok.kde.org/";
LICENSE="GPL-2"
SLOT="5"
-IUSE="ipod lastfm mtp ofa podcast wikipedia"
+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
- dev-db/mysql-connector-c:=
>=dev-qt/qtdbus-${QTMIN}:5
>=dev-qt/qtdeclarative-${QTMIN}:5
>=dev-qt/qtgui-${QTMIN}:5
@@ -73,32 +72,33 @@ DEPEND="
media-video/ffmpeg:=
)
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 )
"
RDEPEND="${DEPEND}
>=dev-qt/qtquickcontrols2-${QTMIN}:5
+ >=kde-frameworks/kirigami-${KFMIN}:5
!ofa? ( media-video/ffmpeg )
"
-PATCHES=( "${FILESDIR}"/${PN}-2.8.90-mysqld-rpath.patch )
-
src_configure() {
local mycmakeargs=(
-DWITH_MP3Tunes=OFF
-DWITH_PLAYER=ON
-DWITH_UTILITIES=ON
-DCMAKE_DISABLE_FIND_PACKAGE_Googlemock=ON
- -DWITH_MYSQL_EMBEDDED=OFF
+ -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)
)
-
use ipod && mycmakeargs+=( DWITH_GDKPixBuf=ON )
ecm_src_configure
@@ -112,9 +112,9 @@ pkg_postinst() {
}
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 "You'll have to configure amarok to use an external db
server:"
+ use mariadb && 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
diff --git a/media-sound/amarok/files/amarok-2.8.90-mysqld-rpath.patch
b/media-sound/amarok/files/amarok-2.8.90-mysqld-rpath.patch
deleted file mode 100644
index 08db5bbe37..00
--- a/media-sound/amarok/files/amarok-2.8.90-mysqld-rpath.patch
+++ /dev/null
@@ -1,12 +0,0 @@
a/src/core-impl/storage/sql/mysqlestorage/CMakeLists.txt 2016-05-04
11:01:25.0 -0400
-+++ b/src/core-impl/storage/sql/mysqlestorage/CMakeLists.txt 2016-05-04
11:05:24.216625165 -0400
-@@ -28,6 +28,9 @@
- ${ZLIB_LIBRARIES}
- )
-
-+SET_TARGET_PROPERTIES(amarok_storage-mysqlestorage PROPERTIES
BUILD_WITH_INSTALL_RPATH TRUE)
-+SET_TARGET_PROPERTIES(amarok_storage-mysqlestorage PROPERTIES INSTALL_RPATH
"${MYSQLD_DIR}")
-+
- if(NOT WIN32 AND NOT APPLE)
- target_link_libraries( amarok_storage-mysqlserverstorage crypt pthread )
- endif(NOT WIN32 AND NOT APPLE)
diff --git a/media-sound/amarok/metadata.xml b/media
[gentoo-commits] proj/kde:master commit in: media-sound/amarok/, kde-apps/dolphin/, kde-apps/gwenview/, kde-apps/kio-extras/, ...
5.19.49..ebuild kde-plasma/plasma-desktop/plasma-desktop-.ebuild kde-plasma/plasma-workspace/plasma-workspace-5.19.49..ebuild kde-plasma/plasma-workspace/plasma-workspace-.ebuild media-gfx/kphotoalbum/kphotoalbum-.ebuild media-libs/phonon-gstreamer/phonon-gstreamer-.ebuild media-libs/phonon-vlc/phonon-vlc-.ebuild media-sound/amarok/amarok-.ebuild media-video/kmplayer/kmplayer-.ebuild net-irc/konversation/konversation-2..ebuild net-irc/konversation/konversation-.ebuild net-p2p/ktorrent/ktorrent-.ebuild X-VCS-Directories: kde-apps/klettres/ kde-apps/kmousetool/ kde-misc/basket/ kde-apps/dragon/ kde-frameworks/knotifications/ kde-frameworks/knotifyconfig/ kde-plasma/plasma-workspace/ kde-apps/khangman/ media-libs/phonon-gstreamer/ kde-apps/kanagram/ kde-apps/kscd/ kde-apps/ktp-call-ui/ net-p2p/ktorrent/ kde-apps/okular/ media-video/kmplayer/ kde-apps/kalarm/ media-gfx/kphotoalbum/ kde-apps/libkcompactdisc/ kde-apps/blinken/ kde-apps/ksirk/ kde-apps/gwenview/ kde-apps/kio-extras/ media-sound/amarok/ kde-apps/dolphin/ kde-apps/juk/ kde-apps/kopete/ kde-plasma/plasma-desktop/ kde-apps/marble/ kde-frameworks/khtml/ kde-apps/kwordquiz/ app-office/calligra/ media-libs/phonon-vlc/ net-irc/konversation/ kde-apps/ktuberling/ kde-apps/mailcommon/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 25d13ebbfa75c5ad2839aa7432571fb731be77ef X-VCS-Branch: master Date: Sat, 29 Aug 2020 07:34:07 + (UTC) commit: 25d13ebbfa75c5ad2839aa7432571fb731be77ef Author: Andreas Sturmlechner gentoo org> AuthorDate: Fri Aug 28 19:54:24 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Aug 29 07:33:11 2020 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=25d13ebb */*: Cleanup media-libs/phonon[qt5(+)] and depend on >=media-libs/phonon-4.11.0 Standardise all on >=media-libs/phonon-4.11.0, first version to drop Qt4. Package-Manager: Portage-3.0.4, Repoman-3.0.1 Signed-off-by: Andreas Sturmlechner gentoo.org> app-office/calligra/calligra-.ebuild | 2 +- kde-apps/blinken/blinken-20.08.49..ebuild| 2 +- kde-apps/blinken/blinken-.ebuild | 2 +- kde-apps/dolphin/dolphin-20.08.49..ebuild| 2 +- kde-apps/dolphin/dolphin-.ebuild | 2 +- kde-apps/dragon/dragon-20.08.49..ebuild | 2 +- kde-apps/dragon/dragon-.ebuild | 2 +- kde-apps/gwenview/gwenview-20.08.49..ebuild | 2 +- kde-apps/gwenview/gwenview-.ebuild | 2 +- kde-apps/juk/juk-20.08.49..ebuild| 2 +- kde-apps/juk/juk-.ebuild | 2 +- kde-apps/kalarm/kalarm-20.08.49..ebuild | 2 +- kde-apps/kalarm/kalarm-.ebuild | 2 +- kde-apps/kanagram/kanagram-20.08.49..ebuild | 2 +- kde-apps/kanagram/kanagram-.ebuild | 2 +- kde-apps/khangman/khangman-20.08.49..ebuild | 2 +- kde-apps/khangman/khangman-.ebuild | 2 +- kde-apps/kio-extras/kio-extras-20.08.49..ebuild | 2 +- kde-apps/kio-extras/kio-extras-.ebuild | 2 +- kde-apps/klettres/klettres-20.08.49..ebuild | 2 +- kde-apps/klettres/klettres-.ebuild | 2 +- kde-apps/kmousetool/kmousetool-20.08.49..ebuild | 2 +- kde-apps/kmousetool/kmousetool-.ebuild | 2 +- kde-apps/kopete/kopete-20.08.49..ebuild | 2 +- kde-apps/kopete/kopete-.ebuild | 2 +- kde-apps/kscd/kscd-.ebuild | 2 +- kde-apps/ksirk/ksirk-20.08.49..ebuild| 2 +- kde-apps/ksirk/ksirk-.ebuild | 2 +- kde-apps/ktp-call-ui/ktp-call-ui-20.08.49..ebuild| 2 +- kde-apps/ktp-call-ui/ktp-call-ui-.ebuild | 2 +- kde-apps/ktuberling/ktuberling-20.08.49..ebuild | 2 +- kde-apps/ktuberling/ktuberling-.ebuild | 2 +- kde-apps/kwordquiz/kwordquiz-20.08.49..ebuild| 2 +- kde-apps/kwordquiz/kwordquiz-.ebuild | 2 +- kde-apps/libkcompactdisc/libkcompactdisc-20.08.49..ebuild| 2 +- kde-apps/libkcompactdisc/libkcompactdisc-.ebuild | 2 +- kde-apps/mailcommon/mailcommon-20.08.49..ebuild | 2 +- kde-apps/mailcommon/mailcommon-.ebuild | 2 +- kde-apps/marble/marble-20.08.49..ebuild | 2 +- kde-apps/marble/marble-.ebuild | 2 +- kde-apps/o
[gentoo-commits] proj/kde:master commit in: media-sound/amarok/, app-office/calligraplan/, kde-apps/ktp-auth-handler/, ...
commit: 6ea0f04cb68805a4bf42fe298189be559b4ac27e
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Fri Aug 28 19:40:18 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Fri Aug 28 19:54:44 2020 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=6ea0f04c
*/*: Cleanup app-crypt/qca[qca(+)] and depend on >=app-crypt/qca-2.3.0:2
Standardise all on >=app-crypt/qca-2.3.0:2, first version to have dropped Qt4.
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Andreas Sturmlechner gentoo.org>
app-editors/okteta/okteta-.ebuild | 2 +-
app-office/calligra/calligra-.ebuild| 2 +-
app-office/calligraplan/calligraplan-.ebuild| 2 +-
app-office/skrooge/skrooge-.ebuild | 2 +-
kde-apps/kget/kget-20.08.49..ebuild | 2 +-
kde-apps/kget/kget-.ebuild | 2 +-
kde-apps/kopete/kopete-20.08.49..ebuild | 6 +++---
kde-apps/kopete/kopete-.ebuild | 6 +++---
kde-apps/ksirk/ksirk-20.08.49..ebuild | 2 +-
kde-apps/ksirk/ksirk-.ebuild| 2 +-
kde-apps/ktp-auth-handler/ktp-auth-handler-20.08.49..ebuild | 4 ++--
kde-apps/ktp-auth-handler/ktp-auth-handler-.ebuild | 4 ++--
kde-apps/okular/okular-20.08.49..ebuild | 2 +-
kde-apps/okular/okular-.ebuild | 2 +-
kde-misc/kdeconnect/kdeconnect-20.08.49..ebuild | 2 +-
kde-misc/kdeconnect/kdeconnect-.ebuild | 2 +-
kde-plasma/plasma-nm/plasma-nm-5.19.49..ebuild | 2 +-
kde-plasma/plasma-nm/plasma-nm-.ebuild | 2 +-
media-sound/amarok/amarok-.ebuild | 2 +-
net-im/choqok/choqok-.ebuild| 2 +-
net-irc/konversation/konversation-2..ebuild | 4 ++--
net-irc/konversation/konversation-.ebuild | 4 ++--
net-libs/libktorrent/libktorrent-.ebuild| 2 +-
sys-libs/kpmcore/kpmcore-.ebuild| 4 ++--
24 files changed, 33 insertions(+), 33 deletions(-)
diff --git a/app-editors/okteta/okteta-.ebuild
b/app-editors/okteta/okteta-.ebuild
index a03835d9b8..8a83c7915c 100644
--- a/app-editors/okteta/okteta-.ebuild
+++ b/app-editors/okteta/okteta-.ebuild
@@ -50,7 +50,7 @@ DEPEND="
>=kde-frameworks/kservice-${KFMIN}:5
>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
>=kde-frameworks/kxmlgui-${KFMIN}:5
- crypt? ( app-crypt/qca:2[qt5(+)] )
+ crypt? ( >=app-crypt/qca-2.3.0:2 )
"
RDEPEND="${DEPEND}"
diff --git a/app-office/calligra/calligra-.ebuild
b/app-office/calligra/calligra-.ebuild
index 240ca9b02e..03cbf17a3e 100644
--- a/app-office/calligra/calligra-.ebuild
+++ b/app-office/calligra/calligra-.ebuild
@@ -73,7 +73,7 @@ COMMON_DEPEND="
virtual/libiconv
activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
charts? ( dev-libs/kdiagram:5 )
- crypt? ( app-crypt/qca:2[qt5(+)] )
+ crypt? ( >=app-crypt/qca-2.3.0:2 )
fontconfig? ( media-libs/fontconfig )
gemini? ( >=dev-qt/qtdeclarative-${QTMIN}:5[widgets] )
gsl? ( sci-libs/gsl )
diff --git a/app-office/calligraplan/calligraplan-.ebuild
b/app-office/calligraplan/calligraplan-.ebuild
index 0998d0ed17..fc312d1130 100644
--- a/app-office/calligraplan/calligraplan-.ebuild
+++ b/app-office/calligraplan/calligraplan-.ebuild
@@ -60,7 +60,7 @@ DEPEND="
activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
holidays? ( >=kde-frameworks/kholidays-${KFMIN}:5 )
kwallet? (
- app-crypt/qca:2[qt5(+)]
+ >=app-crypt/qca-2.3.0:2
>=kde-frameworks/kwallet-${KFMIN}:5
)
X? (
diff --git a/app-office/skrooge/skrooge-.ebuild
b/app-office/skrooge/skrooge-.ebuild
index 32ff2e965e..3ed8aceba6 100644
--- a/app-office/skrooge/skrooge-.ebuild
+++ b/app-office/skrooge/skrooge-.ebuild
@@ -29,7 +29,7 @@ BDEPEND="
virtual/pkgconfig
"
COMMON_DEPEND="
- app-crypt/qca:2[qt5(+)]
+ >=app-crypt/qca-2.3.0:2
dev-db/sqlcipher
dev-libs/grantlee:5
>=dev-qt/qtconcurrent-${QTMIN}:5
diff --git a/kde-apps/kget/kget-20.08.49..ebuild
b/kde-apps/kget/kget-20.08.49..ebuild
index f9855c3073..b796188447 100644
--- a/kde-apps/kget/kget-20.08.49..ebuild
+++ b/kde-apps/kget/kget-20.08.49..ebuild
@@ -19,6 +19,7 @@ KEYWORDS=""
IUSE="bittorrent gpg kde mms sqlite"
RDEPEND="
+ >=app-crypt/qca-2.3.0:2
>=dev-qt/qtdbus-${QTMIN}:5
>=dev-qt/qtgui-${QTMIN}:5
>=dev-qt/qtnetwork-${QTMIN}:5
@@ -46,7 +47,6 @@ RDEPEND="
>=kde-framew
[gentoo-commits] proj/kde:master commit in: media-sound/amarok/
commit: 1496629d99bf76f72c98b6038c60e5c53de80fcf
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Apr 26 10:59:51 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Apr 26 10:59:51 2020 +
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 gentoo.org>
media-sound/amarok/amarok-.ebuild | 1 -
1 file changed, 1 deletion(-)
diff --git a/media-sound/amarok/amarok-.ebuild
b/media-sound/amarok/amarok-.ebuild
index e3d0401d19..0fc8f0d83b 100644
--- a/media-sound/amarok/amarok-.ebuild
+++ b/media-sound/amarok/amarok-.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/
commit: 2f33275c2428d8280eab7f17a9c66493eb3d45c8
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Wed Apr 3 09:10:44 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Wed Apr 3 09:10:44 2019 +
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 gentoo.org>
media-sound/amarok/amarok-.ebuild | 9 +
1 file changed, 1 insertion(+), 8 deletions(-)
diff --git a/media-sound/amarok/amarok-.ebuild
b/media-sound/amarok/amarok-.ebuild
index 89c092f05d..9937a18bf8 100644
--- a/media-sound/amarok/amarok-.ebuild
+++ b/media-sound/amarok/amarok-.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/
commit: 6527a3959ec314a76c09376c077ba7eeaebc05ee
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Tue Feb 26 11:54:28 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Tue Feb 26 11:54:51 2019 +
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 gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
media-sound/amarok/amarok-.ebuild | 9 -
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/media-sound/amarok/amarok-.ebuild
b/media-sound/amarok/amarok-.ebuild
index 24231ebbd1..89c092f05d 100644
--- a/media-sound/amarok/amarok-.ebuild
+++ b/media-sound/amarok/amarok-.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/
commit: 54f292dd59cc6cceec9dc1cf24c0fa213a6e0b19
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Mon Feb 25 21:14:35 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Mon Feb 25 21:14:45 2019 +
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 gentoo.org>
media-sound/amarok/amarok-.ebuild | 20 +++-
1 file changed, 11 insertions(+), 9 deletions(-)
diff --git a/media-sound/amarok/amarok-.ebuild
b/media-sound/amarok/amarok-.ebuild
index 58fdd12eba..24231ebbd1 100644
--- a/media-sound/amarok/amarok-.ebuild
+++ b/media-sound/amarok/amarok-.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/
commit: 303548c5add9046a3c9465a2f5002b579580001c
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Thu Feb 7 22:50:12 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Feb 7 22:50:12 2019 +
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 gentoo.org>
media-sound/amarok/amarok-.ebuild | 15 +++
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/media-sound/amarok/amarok-.ebuild
b/media-sound/amarok/amarok-.ebuild
index 6ff515262e..58fdd12eba 100644
--- a/media-sound/amarok/amarok-.ebuild
+++ b/media-sound/amarok/amarok-.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/
commit: f40b1295267d2de5cceb3fa0a7df8c633d6b4a3d
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Thu Oct 4 21:29:54 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Oct 4 21:29:54 2018 +
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 gentoo.org>
Package-Manager: Portage-2.3.50, Repoman-2.3.11
media-sound/amarok/amarok-.ebuild | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/media-sound/amarok/amarok-.ebuild
b/media-sound/amarok/amarok-.ebuild
index b968cdafda..2e3a11ed15 100644
--- a/media-sound/amarok/amarok-.ebuild
+++ b/media-sound/amarok/amarok-.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/
commit: 31d9656979bd3c7e95fd66ba56039ef0cee80bf6 Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Oct 4 13:39:24 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Oct 4 13:39:24 2018 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=31d96569 media-sound/amarok: Add missing DEPEND Signed-off-by: Andreas Sturmlechner gentoo.org> Package-Manager: Portage-2.3.50, Repoman-2.3.11 media-sound/amarok/amarok-.ebuild | 1 + 1 file changed, 1 insertion(+) diff --git a/media-sound/amarok/amarok-.ebuild b/media-sound/amarok/amarok-.ebuild index e77534c589..b968cdafda 100644 --- a/media-sound/amarok/amarok-.ebuild +++ b/media-sound/amarok/amarok-.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/
commit: 0d874350637a971fd559aa4057d2d2badd718801
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Thu Sep 13 02:53:38 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Oct 4 12:20:00 2018 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=0d874350
media-sound/amarok: Sync with kde-sunset
Signed-off-by: Andreas Sturmlechner gentoo.org>
Package-Manager: Portage-2.3.50, Repoman-2.3.11
media-sound/amarok/amarok-.ebuild | 10 ++
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/media-sound/amarok/amarok-.ebuild
b/media-sound/amarok/amarok-.ebuild
index abd4d8ef2a..e77534c589 100644
--- a/media-sound/amarok/amarok-.ebuild
+++ b/media-sound/amarok/amarok-.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/
commit: ae92fcbbfd3f4a15439f5e178f7d1b9e68a11f89 Author: Michael Mair-Keimberger gmail com> AuthorDate: Sat Sep 22 13:01:30 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Oct 2 19:46:34 2018 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=ae92fcbb media-sound/amarok: remove unused eclass Signed-off-by: Michael Mair-Keimberger gmail.com> Closes: https://github.com/gentoo/kde/pull/873 media-sound/amarok/amarok-.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-sound/amarok/amarok-.ebuild b/media-sound/amarok/amarok-.ebuild index 04076a2005..abd4d8ef2a 100644 --- a/media-sound/amarok/amarok-.ebuild +++ b/media-sound/amarok/amarok-.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/
commit: 821e4e16adde547754ccc12c86c2c0c077e75bed Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Jun 7 17:10:14 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Jun 7 17:10:14 2018 + 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-.ebuild | 1 + 1 file changed, 1 insertion(+) diff --git a/media-sound/amarok/amarok-.ebuild b/media-sound/amarok/amarok-.ebuild index 6de602d64b..04076a2005 100644 --- a/media-sound/amarok/amarok-.ebuild +++ b/media-sound/amarok/amarok-.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/
commit: ce35b3f34594f3f3dab792589cf042939dd3edf4
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun May 27 05:44:22 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun May 27 05:44:22 2018 +
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-.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-sound/amarok/amarok-.ebuild
b/media-sound/amarok/amarok-.ebuild
index 26e3b6cdb5..6de602d64b 100644
--- a/media-sound/amarok/amarok-.ebuild
+++ b/media-sound/amarok/amarok-.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/
commit: 9741687bf8fa3b49b58bfb5744c2a9dfe26a0ef2
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat May 26 23:19:07 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat May 26 23:19:07 2018 +
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-.ebuild | 26 ++
media-sound/amarok/metadata.xml | 3 ---
2 files changed, 10 insertions(+), 19 deletions(-)
diff --git a/media-sound/amarok/amarok-.ebuild
b/media-sound/amarok/amarok-.ebuild
index 223a0ded30..26e3b6cdb5 100644
--- a/media-sound/amarok/amarok-.ebuild
+++ b/media-sound/amarok/amarok-.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 @@
Gentoo Sound project
- 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.
Enable Last.fm streaming services support
through
media-libs/liblastfm
Enable support for libMTP (Plays4Sure) devices
access through libmtp
[gentoo-commits] proj/kde:master commit in: media-sound/amarok/
commit: ff47b5781a536f0cc534531177fd5d8a4f357947
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun May 6 07:42:50 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun May 6 07:42:50 2018 +
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-.ebuild | 9 +
1 file changed, 1 insertion(+), 8 deletions(-)
diff --git a/media-sound/amarok/amarok-.ebuild
b/media-sound/amarok/amarok-.ebuild
index c7e76ed391..223a0ded30 100644
--- a/media-sound/amarok/amarok-.ebuild
+++ b/media-sound/amarok/amarok-.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/files/, media-sound/amarok/
commit: 4b0a8075fd9834060a509b1671ace4c7c486572d
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Thu Mar 22 17:38:02 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Mar 22 17:38:02 2018 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=4b0a8075
media-sound/amarok: Depend on correct liblastfm version
Package-Manager: Portage-2.3.24, Repoman-2.3.6
media-sound/amarok/amarok-.ebuild | 7 ++
.../amarok/files/amarok-liblastfm-headers.patch| 25 --
2 files changed, 2 insertions(+), 30 deletions(-)
diff --git a/media-sound/amarok/amarok-.ebuild
b/media-sound/amarok/amarok-.ebuild
index d573a1e07e..c7e76ed391 100644
--- a/media-sound/amarok/amarok-.ebuild
+++ b/media-sound/amarok/amarok-.ebuild
@@ -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-1.1.0_pre20150206 )
mtp? ( >=media-libs/libmtp-1.0.0 )
podcast? ( >=media-libs/libmygpo-qt-1.0.9[qt5(+)] )
wikipedia? ( $(add_qt_dep qtwebengine) )
@@ -87,10 +87,7 @@ RDEPEND="${COMMONDEPEND}
$(add_qt_dep qtquickcontrols2)
"
-PATCHES=(
- "${FILESDIR}"/${PN}-2.8.90-mysqld-rpath.patch
- "${FILESDIR}"/${PN}-liblastfm-headers.patch
-)
+PATCHES=( "${FILESDIR}"/${PN}-2.8.90-mysqld-rpath.patch )
src_configure() {
local mycmakeargs=(
diff --git a/media-sound/amarok/files/amarok-liblastfm-headers.patch
b/media-sound/amarok/files/amarok-liblastfm-headers.patch
deleted file mode 100644
index 7120db0412..00
--- a/media-sound/amarok/files/amarok-liblastfm-headers.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From b331e6e7c0e34dd896e21b9d1569214a0ec0fddb Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner
-Date: Mon, 19 Mar 2018 22:26:54 +0100
-Subject: [PATCH] Search for liblastfm header path without suffix
-
- cmake/modules/FindLibLastFm.cmake | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/cmake/modules/FindLibLastFm.cmake
b/cmake/modules/FindLibLastFm.cmake
-index a3a065f181..ef89423c90 100644
a/cmake/modules/FindLibLastFm.cmake
-+++ b/cmake/modules/FindLibLastFm.cmake
-@@ -13,7 +13,7 @@ find_path(LIBLASTFM_INCLUDE_DIR NAMES global.h
-/opt/local/include
-/usr/include
-/usr/local/include
-- PATH_SUFFIXES lastfm5
-+ PATH_SUFFIXES lastfm5 lastfm
- )
-
- find_library( LIBLASTFM_LIBRARY NAMES lastfm5
---
-2.16.2
-
[gentoo-commits] proj/kde:master commit in: media-sound/amarok/
commit: 81f72948e69c8e3b91e682e1d0e1888e79b12194
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Tue Mar 20 16:49:27 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Tue Mar 20 16:49:27 2018 +
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-.ebuild | 5 -
media-sound/amarok/metadata.xml | 1 +
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/media-sound/amarok/amarok-.ebuild
b/media-sound/amarok/amarok-.ebuild
index 863557895f..87a1bba632 100644
--- a/media-sound/amarok/amarok-.ebuild
+++ b/media-sound/amarok/amarok-.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)
Enable gpodder.net podcast support via
media-libs/libmygpo-qt
Build tagging and collection scanner
utilities
+ Enable wikipedia widget using
dev-qt/qtwebengine
[gentoo-commits] proj/kde:master commit in: media-sound/amarok/
commit: e8551e4ef8211db3f6f98107c5873e55ffdf001b
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Tue Mar 20 16:50:31 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Tue Mar 20 16:50:31 2018 +
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-.ebuild | 4 ++--
media-sound/amarok/metadata.xml | 1 -
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/media-sound/amarok/amarok-.ebuild
b/media-sound/amarok/amarok-.ebuild
index 87a1bba632..d573a1e07e 100644
--- a/media-sound/amarok/amarok-.ebuild
+++ b/media-sound/amarok/amarok-.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 @@
Use media-libs/libofa to compute
MusicDNS acoustic
fingerprints (used by MusicBrainz)
Enable gpodder.net podcast support via
media-libs/libmygpo-qt
- Build tagging and collection scanner
utilities
Enable wikipedia widget using
dev-qt/qtwebengine
[gentoo-commits] proj/kde:master commit in: media-sound/amarok/files/, media-sound/amarok/
commit: 70e741b9b265af7dbe13c21fb91dead0997d99e8
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Mon Mar 19 21:50:42 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Mon Mar 19 21:51:22 2018 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=70e741b9
media-sound/amarok: Find liblastfm header path
Package-Manager: Portage-2.3.24, Repoman-2.3.6
media-sound/amarok/amarok-.ebuild | 5 -
.../amarok/files/amarok-liblastfm-headers.patch| 25 ++
2 files changed, 29 insertions(+), 1 deletion(-)
diff --git a/media-sound/amarok/amarok-.ebuild
b/media-sound/amarok/amarok-.ebuild
index 6cfbeb8ca7..863557895f 100644
--- a/media-sound/amarok/amarok-.ebuild
+++ b/media-sound/amarok/amarok-.ebuild
@@ -85,7 +85,10 @@ RDEPEND="${COMMONDEPEND}
!media-sound/amarok:4
"
-PATCHES=( ${FILESDIR}/${PN}-2.8.90-mysqld-rpath.patch )
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.8.90-mysqld-rpath.patch
+ "${FILESDIR}"/${PN}-liblastfm-headers.patch
+)
src_configure() {
local mycmakeargs=(
diff --git a/media-sound/amarok/files/amarok-liblastfm-headers.patch
b/media-sound/amarok/files/amarok-liblastfm-headers.patch
new file mode 100644
index 00..7120db0412
--- /dev/null
+++ b/media-sound/amarok/files/amarok-liblastfm-headers.patch
@@ -0,0 +1,25 @@
+From b331e6e7c0e34dd896e21b9d1569214a0ec0fddb Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner
+Date: Mon, 19 Mar 2018 22:26:54 +0100
+Subject: [PATCH] Search for liblastfm header path without suffix
+
+---
+ cmake/modules/FindLibLastFm.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cmake/modules/FindLibLastFm.cmake
b/cmake/modules/FindLibLastFm.cmake
+index a3a065f181..ef89423c90 100644
+--- a/cmake/modules/FindLibLastFm.cmake
b/cmake/modules/FindLibLastFm.cmake
+@@ -13,7 +13,7 @@ find_path(LIBLASTFM_INCLUDE_DIR NAMES global.h
+/opt/local/include
+/usr/include
+/usr/local/include
+- PATH_SUFFIXES lastfm5
++ PATH_SUFFIXES lastfm5 lastfm
+ )
+
+ find_library( LIBLASTFM_LIBRARY NAMES lastfm5
+--
+2.16.2
+
[gentoo-commits] proj/kde:master commit in: media-sound/amarok/
commit: 9760bdfeb4c4a98453b0f0726f69ce59b3f07701
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Thu Mar 15 22:14:57 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Mar 15 22:14:57 2018 +
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-.ebuild | 4 +++-
media-sound/amarok/metadata.xml | 1 +
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/media-sound/amarok/amarok-.ebuild
b/media-sound/amarok/amarok-.ebuild
index c8422539ef..bede3747b5 100644
--- a/media-sound/amarok/amarok-.ebuild
+++ b/media-sound/amarok/amarok-.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 @@
Enable support for libMTP (Plays4Sure) devices
access through libmtp
Use media-libs/libofa to compute
MusicDNS acoustic
fingerprints (used by MusicBrainz)
+ Enable gpodder.net podcast support via
media-libs/libmygpo-qt
Build the utils - old
media-sound/amarok-utils
[gentoo-commits] proj/kde:master commit in: media-sound/amarok/
commit: 5f3f193e38be72ec810a3e2a22b28d6b158a71b3 Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Mar 15 22:21:15 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Mar 15 22:21:21 2018 + 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 @@ Use media-libs/libofa to compute MusicDNS acoustic fingerprints (used by MusicBrainz) Enable gpodder.net podcast support via media-libs/libmygpo-qt - Build the utils - old media-sound/amarok-utils + Build tagging and collection scanner utilities
[gentoo-commits] proj/kde:master commit in: media-sound/amarok/
commit: c4f13d355a27eacef9bd8b8f5af6d9fd1a72b258
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Thu Mar 15 22:25:55 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Mar 15 22:25:55 2018 +
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-.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-sound/amarok/amarok-.ebuild
b/media-sound/amarok/amarok-.ebuild
index ad7319edff..6cfbeb8ca7 100644
--- a/media-sound/amarok/amarok-.ebuild
+++ b/media-sound/amarok/amarok-.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/
commit: 3ce6804c0318f549879d3844db5d841313750b59
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Thu Mar 15 22:15:42 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Mar 15 22:15:42 2018 +
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-.ebuild | 1 -
1 file changed, 1 deletion(-)
diff --git a/media-sound/amarok/amarok-.ebuild
b/media-sound/amarok/amarok-.ebuild
index bede3747b5..ad7319edff 100644
--- a/media-sound/amarok/amarok-.ebuild
+++ b/media-sound/amarok/amarok-.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/
commit: b12757f6c5d1e71ea789726f4e31d2994648ee5d Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Mar 8 20:06:07 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Mar 8 20:06:07 2018 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=b12757f6 media-sound/amarok: Frameworks merged to master Reported-by: stephan wezel web.de> Closes: https://bugs.gentoo.org/649952 Package-Manager: Portage-2.3.24, Repoman-2.3.6 media-sound/amarok/amarok-.ebuild | 1 - 1 file changed, 1 deletion(-) diff --git a/media-sound/amarok/amarok-.ebuild b/media-sound/amarok/amarok-.ebuild index 8d250f..c8422539ef 100644 --- a/media-sound/amarok/amarok-.ebuild +++ b/media-sound/amarok/amarok-.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/
commit: ef703b49638651933c3c5bba59dd214bbe1cd132 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Mar 3 16:28:17 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Mar 3 16:29:43 2018 + 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 uni-dortmund.de> Closes: https://bugs.gentoo.org/649246 Package-Manager: Portage-2.3.24, Repoman-2.3.6 media-sound/amarok/amarok-.ebuild | 1 + 1 file changed, 1 insertion(+) diff --git a/media-sound/amarok/amarok-.ebuild b/media-sound/amarok/amarok-.ebuild index 1ceed38a56..8d250f 100644 --- a/media-sound/amarok/amarok-.ebuild +++ b/media-sound/amarok/amarok-.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/
commit: 6289ea5dc7472e4dd8c38802fee361ab6fd1db46 Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Feb 26 22:45:59 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Feb 26 22:45:59 2018 + 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-.ebuild | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/media-sound/amarok/amarok-.ebuild b/media-sound/amarok/amarok-.ebuild index 5c751705b8..1ceed38a56 100644 --- a/media-sound/amarok/amarok-.ebuild +++ b/media-sound/amarok/amarok-.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/
commit: fc66d5dffbf91eca05cb964a91d42492e56fa629 Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Feb 22 21:14:41 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Feb 22 21:14:41 2018 + 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-.ebuild | 5 + 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/media-sound/amarok/amarok-.ebuild b/media-sound/amarok/amarok-.ebuild index f9d3c78bbe..5c751705b8 100644 --- a/media-sound/amarok/amarok-.ebuild +++ b/media-sound/amarok/amarok-.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/
commit: a640a8cd9f78d0d8da09a6a4c4d35c34ebe55a51 Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Feb 22 20:22:54 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Feb 22 20:22:54 2018 + 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-.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/media-sound/amarok/amarok-.ebuild b/media-sound/amarok/amarok-.ebuild index 51a226b0d8..f9d3c78bbe 100644 --- a/media-sound/amarok/amarok-.ebuild +++ b/media-sound/amarok/amarok-.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/
commit: 13cfc40fa19f3c709ede5c380979bce5584280ae
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Jan 7 09:58:58 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Jan 7 09:58:58 2018 +
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-.ebuild | 5 -
1 file changed, 5 deletions(-)
diff --git a/media-sound/amarok/amarok-.ebuild
b/media-sound/amarok/amarok-.ebuild
index c69db629c1..51a226b0d8 100644
--- a/media-sound/amarok/amarok-.ebuild
+++ b/media-sound/amarok/amarok-.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/
commit: 33a6894c445897d7907f6ba205f0ecbe5b88416f
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Thu Dec 14 08:21:59 2017 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Dec 14 08:21:59 2017 +
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-.ebuild | 3 ---
1 file changed, 3 deletions(-)
diff --git a/media-sound/amarok/amarok-.ebuild
b/media-sound/amarok/amarok-.ebuild
index 60c2a83bdd..01bdc9a5ee 100644
--- a/media-sound/amarok/amarok-.ebuild
+++ b/media-sound/amarok/amarok-.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/
commit: 780d4ca9fca91e73850252d7ba505d72ea83616f
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Thu Dec 14 08:19:59 2017 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Dec 14 08:19:59 2017 +
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-.ebuild | 7 ++-
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/media-sound/amarok/amarok-.ebuild
b/media-sound/amarok/amarok-.ebuild
index eeb786a499..60c2a83bdd 100644
--- a/media-sound/amarok/amarok-.ebuild
+++ b/media-sound/amarok/amarok-.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/, media-sound/amarok/files/
commit: e7433606134f4cc3a5d2d3216d77bc2ec209a908
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Thu Dec 14 08:08:17 2017 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Dec 14 08:08:51 2017 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=e7433606
media-sound/amarok: Add mysqld-rpath fix
Package-Manager: Portage-2.3.13, Repoman-2.3.4
media-sound/amarok/amarok-.ebuild | 9 +++--
media-sound/amarok/files/amarok-2.8.90-mysqld-rpath.patch | 12
2 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/media-sound/amarok/amarok-.ebuild
b/media-sound/amarok/amarok-.ebuild
index d871c0fa3d..eeb786a499 100644
--- a/media-sound/amarok/amarok-.ebuild
+++ b/media-sound/amarok/amarok-.ebuild
@@ -90,6 +90,8 @@ RDEPEND="${COMMONDEPEND}
!media-sound/amarok:4
"
+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
@@ -98,17 +100,20 @@ src_configure() {
-DCMAKE_DISABLE_FIND_PACKAGE_QJSON=ON
-DWITH_MP3Tunes=OFF
-DWITH_PLAYER=ON
- -DWITH_SPECTRUM_ANALYZER=OFF
-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)
)
+ 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
}
diff --git a/media-sound/amarok/files/amarok-2.8.90-mysqld-rpath.patch
b/media-sound/amarok/files/amarok-2.8.90-mysqld-rpath.patch
new file mode 100644
index 00..08db5bbe37
--- /dev/null
+++ b/media-sound/amarok/files/amarok-2.8.90-mysqld-rpath.patch
@@ -0,0 +1,12 @@
+--- a/src/core-impl/storage/sql/mysqlestorage/CMakeLists.txt 2016-05-04
11:01:25.0 -0400
b/src/core-impl/storage/sql/mysqlestorage/CMakeLists.txt 2016-05-04
11:05:24.216625165 -0400
+@@ -28,6 +28,9 @@
+ ${ZLIB_LIBRARIES}
+ )
+
++SET_TARGET_PROPERTIES(amarok_storage-mysqlestorage PROPERTIES
BUILD_WITH_INSTALL_RPATH TRUE)
++SET_TARGET_PROPERTIES(amarok_storage-mysqlestorage PROPERTIES INSTALL_RPATH
"${MYSQLD_DIR}")
++
+ if(NOT WIN32 AND NOT APPLE)
+ target_link_libraries( amarok_storage-mysqlserverstorage crypt pthread )
+ endif(NOT WIN32 AND NOT APPLE)
[gentoo-commits] proj/kde:master commit in: media-sound/amarok/
commit: 6269f96f515a8b0ee0108ce30f6e56c2ec96eb25
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Jun 25 11:16:48 2017 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Jun 25 11:16:48 2017 +
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-.ebuild | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/media-sound/amarok/amarok-.ebuild
b/media-sound/amarok/amarok-.ebuild
index 361c4c3b87..21c239638a 100644
--- a/media-sound/amarok/amarok-.ebuild
+++ b/media-sound/amarok/amarok-.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/
commit: 03b5897b56a5fb14734fe3d8c975b6fa40e3d26d Author: Michael Palimaka gentoo org> AuthorDate: Thu Jul 21 09:40:32 2016 + Commit: Michael Palimaka gentoo org> CommitDate: Thu Jul 21 09:40:48 2016 + 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-.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-sound/amarok/amarok-.ebuild b/media-sound/amarok/amarok-.ebuild index 1cd2f58..4e63e5e 100644 --- a/media-sound/amarok/amarok-.ebuild +++ b/media-sound/amarok/amarok-.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/files/, media-sound/amarok/
commit: d7bd8b80fc776de1c90e9eedc9a3543aa3c22be8
Author: Johannes Huber gentoo org>
AuthorDate: Wed Apr 27 17:51:36 2016 +
Commit: Johannes Huber gentoo org>
CommitDate: Wed Apr 27 17:52:01 2016 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=d7bd8b80
media-sound/amarok: Remove 2.8.90
Moved to gentoo main tree.
Package-Manager: portage-2.2.28
media-sound/amarok/amarok-2.8.90.ebuild| 128 -
.../amarok/files/amarok-2.8.0-taglib110.patch | 40 ---
.../files/amarok-2.8.90-mysql-embedded.patch | 34 --
media-sound/amarok/metadata.xml| 1 -
4 files changed, 203 deletions(-)
diff --git a/media-sound/amarok/amarok-2.8.90.ebuild
b/media-sound/amarok/amarok-2.8.90.ebuild
deleted file mode 100644
index 4db4e97..000
--- a/media-sound/amarok/amarok-2.8.90.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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"
-VIRTUALX_REQUIRED="test"
-VIRTUALDBUS_TEST="true"
-inherit flag-o-matic kde4-base pax-utils
-
-DESCRIPTION="Advanced audio player based on KDE framework"
-HOMEPAGE="http://amarok.kde.org/";
-if [[ ${PV} != ** ]]; then
- SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
- 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 [[ ${KDE_BUILD_TYPE} == live ]]; then
- RESTRICT="test"
-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)
- >=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)
- )
- ipod? ( >=media-libs/libgpod-0.7.0[gtk] )
- lastfm? ( >=media-libs/liblastfm-1.0.3[qt4(+)] )
- mp3tunes? (
- 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]
- )
- 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_kdeapps_dep phonon-kde)
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-2.8.0-taglib110.patch"
- "${FILESDIR}/${P}-mysql-embedded.patch"
-)
-
-src_configure() {
- # Append minimal-toc cflag for ppc64, see bug 280552 and 292707
- use ppc64 && append-flags -mminimal-toc
-
- local mycmakeargs=(
- -DWITH_PLAYER=ON
- -DWITH_Libgcrypt=OFF
- -DWITH_SPECTRUM_ANALYZER=OFF
- -DWITH_NepomukCore=OFF
- -DWITH_Soprano=OFF
- -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
-}
-
-src_install() {
- kde4-base_src_install
-
- # bug 481592
- pax-mark m "${ED}"/usr/bin/amarok
-}
-
-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
-
[gentoo-commits] proj/kde:master commit in: media-sound/amarok/files/, media-sound/amarok/
commit: 01c937900910b60d2c59095de0aab41511bb7555
Author: Johannes Huber gentoo org>
AuthorDate: Tue Apr 12 17:41:38 2016 +
Commit: Johannes Huber gentoo org>
CommitDate: Tue Apr 12 17:41:38 2016 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=01c93790
media-sound/amarok: Fix build with USE -embedded
By adding upstreamed patch from Matt Whitlock mattwhitlock.name>.
Gentoo-bug: 566980
Package-Manager: portage-2.2.28
media-sound/amarok/amarok-2.8.90.ebuild| 5 +++-
.../files/amarok-2.8.90-mysql-embedded.patch | 34 ++
2 files changed, 38 insertions(+), 1 deletion(-)
diff --git a/media-sound/amarok/amarok-2.8.90.ebuild
b/media-sound/amarok/amarok-2.8.90.ebuild
index d9f9871..4db4e97 100644
--- a/media-sound/amarok/amarok-2.8.90.ebuild
+++ b/media-sound/amarok/amarok-2.8.90.ebuild
@@ -72,7 +72,10 @@ RDEPEND="${COMMONDEPEND}
$(add_kdeapps_dep phonon-kde)
"
-PATCHES=( "${FILESDIR}/${PN}-2.8.0-taglib110.patch" )
+PATCHES=(
+ "${FILESDIR}/${PN}-2.8.0-taglib110.patch"
+ "${FILESDIR}/${P}-mysql-embedded.patch"
+)
src_configure() {
# Append minimal-toc cflag for ppc64, see bug 280552 and 292707
diff --git a/media-sound/amarok/files/amarok-2.8.90-mysql-embedded.patch
b/media-sound/amarok/files/amarok-2.8.90-mysql-embedded.patch
new file mode 100644
index 000..b03aa18
--- /dev/null
+++ b/media-sound/amarok/files/amarok-2.8.90-mysql-embedded.patch
@@ -0,0 +1,34 @@
+From 048ca3d57228759f05af7b9553200fd362aeaa8b Mon Sep 17 00:00:00 2001
+From: Matt Whitlock
+Date: Tue, 29 Mar 2016 12:22:41 -0400
+Subject: [PATCH] Only link with MYSQL_EMBEDDED_LIBRARIES if
+ WITH_MYSQL_EMBEDDED
+
+REVIEW: 127523
+---
+ src/core-impl/collections/db/sql/mysqlcollection/CMakeLists.txt | 5 -
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/src/core-impl/collections/db/sql/mysqlcollection/CMakeLists.txt
b/src/core-impl/collections/db/sql/mysqlcollection/CMakeLists.txt
+index 244cde1..4c618fc 100644
+--- a/src/core-impl/collections/db/sql/mysqlcollection/CMakeLists.txt
b/src/core-impl/collections/db/sql/mysqlcollection/CMakeLists.txt
+@@ -21,11 +21,14 @@ target_link_libraries(amarok_collection-mysqlcollection
+ ${KDE4_KDECORE_LIBS}
+ ${QT_QTCORE_LIBRARY}
+ ${QT_QTGUI_LIBRARY}
+-${MYSQL_EMBEDDED_LIBRARIES}
+ ${CMAKE_DL_LIBS}
+ ${ZLIB_LIBRARIES}
+ )
+
++if(WITH_MYSQL_EMBEDDED)
++target_link_libraries( amarok_collection-mysqlcollection
${MYSQL_EMBEDDED_LIBRARIES} )
++endif(WITH_MYSQL_EMBEDDED)
++
+ if(NOT WIN32 AND NOT APPLE)
+ target_link_libraries( amarok_collection-mysqlcollection crypt pthread )
+ endif(NOT WIN32 AND NOT APPLE)
+--
+2.8.1
+
[gentoo-commits] proj/kde:master commit in: media-sound/amarok/
commit: a10673e4887162e71ab129a978f9caab1e72fe55
Author: Johannes Huber gentoo org>
AuthorDate: Mon Mar 28 11:23:48 2016 +
Commit: Johannes Huber gentoo org>
CommitDate: Mon Mar 28 11:23:48 2016 +
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..ebuild | 139
media-sound/amarok/amarok-.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..ebuild
b/media-sound/amarok/amarok-5..ebuild
deleted file mode 100644
index 17f6cd5..000
--- a/media-sound/amarok/amarok-5..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)
[gentoo-commits] proj/kde:master commit in: media-sound/amarok/, media-sound/amarok/files/
commit: bc5fe1b6d77b386819a63e651f3eda085fb13034
Author: Michael Palimaka gentoo org>
AuthorDate: Sun Feb 14 17:02:19 2016 +
Commit: Michael Palimaka gentoo org>
CommitDate: Sun Feb 14 17:02:19 2016 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=bc5fe1b6
media-sound/amarok: backport patch from upstream fixing build with
>=media-libs/taglib-1.10
Gentoo-bug: 574712
Package-Manager: portage-2.2.27
media-sound/amarok/amarok-2.8.90.ebuild| 2 ++
.../amarok/files/amarok-2.8.0-taglib110.patch | 40 ++
2 files changed, 42 insertions(+)
diff --git a/media-sound/amarok/amarok-2.8.90.ebuild
b/media-sound/amarok/amarok-2.8.90.ebuild
index 348f789..a8dc8a7 100644
--- a/media-sound/amarok/amarok-2.8.90.ebuild
+++ b/media-sound/amarok/amarok-2.8.90.ebuild
@@ -72,6 +72,8 @@ RDEPEND="${COMMONDEPEND}
$(add_kdeapps_dep phonon-kde)
"
+PATCHES=( "${FILESDIR}/${PN}-2.8.0-taglib110.patch" )
+
src_configure() {
# Append minimal-toc cflag for ppc64, see bug 280552 and 292707
use ppc64 && append-flags -mminimal-toc
diff --git a/media-sound/amarok/files/amarok-2.8.0-taglib110.patch
b/media-sound/amarok/files/amarok-2.8.0-taglib110.patch
new file mode 100644
index 000..0934816
--- /dev/null
+++ b/media-sound/amarok/files/amarok-2.8.0-taglib110.patch
@@ -0,0 +1,40 @@
+From: Omar Plummer
+Date: Thu, 06 Aug 2015 22:24:27 +
+Subject: Fix TagLib version check.
+X-Git-Url:
http://quickgit.kde.org/?p=amarok.git&a=commitdiff&h=fec8817c530ce42b6485fdabff6051784b8d9904
+---
+Fix TagLib version check.
+
+The version check compared version strings lexicographically, so "1.7"
+(the min version) compared as greater than "1.10.0".
+
+BUG: 351013
+REVIEW: 124639
+---
+
+
+--- a/cmake/modules/FindTaglib.cmake
b/cmake/modules/FindTaglib.cmake
+@@ -29,10 +29,10 @@
+
+ exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --version RETURN_VALUE
_return_VALUE OUTPUT_VARIABLE TAGLIB_VERSION)
+
+- if(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ if("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+ message(STATUS "TagLib version too old: version searched
:${TAGLIB_MIN_VERSION}, found ${TAGLIB_VERSION}")
+ set(TAGLIB_FOUND FALSE)
+- else(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ else("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+
+ exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE
_return_VALUE OUTPUT_VARIABLE TAGLIB_LIBRARIES)
+
+@@ -42,7 +42,7 @@
+ set(TAGLIB_FOUND TRUE)
+ endif(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS)
+ string(REGEX REPLACE " *-I" ";" TAGLIB_INCLUDES "${TAGLIB_CFLAGS}")
+- endif(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ endif("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+ mark_as_advanced(TAGLIB_CFLAGS TAGLIB_LIBRARIES TAGLIB_INCLUDES)
+
+ else(TAGLIBCONFIG_EXECUTABLE)
+
[gentoo-commits] proj/kde:master commit in: media-sound/amarok/
commit: d3c4371f15b0a9bcb94bb3f57b81bf34386199cb Author: Michael Palimaka gentoo org> AuthorDate: Thu Dec 31 09:17:17 2015 + Commit: Michael Palimaka gentoo org> CommitDate: Thu Dec 31 09:17:17 2015 + 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-.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-.ebuild b/media-sound/amarok/amarok-.ebuild index 4d2e5c1..eaab68b 100644 --- a/media-sound/amarok/amarok-.ebuild +++ b/media-sound/amarok/amarok-.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/
commit: fe883d4194271df3b0a0d7db22e27d74410b5d3d
Author: Andreas Sturmlechner gmail com>
AuthorDate: Sun Nov 22 23:10:57 2015 +
Commit: Michael Palimaka gentoo org>
CommitDate: Thu Nov 26 16:06:17 2015 +
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-.ebuild => amarok-2.8.90.ebuild} | 6 +-
media-sound/amarok/amarok-.ebuild | 2 +-
2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/media-sound/amarok/amarok-.ebuild
b/media-sound/amarok/amarok-2.8.90.ebuild
similarity index 94%
copy from media-sound/amarok/amarok-.ebuild
copy to media-sound/amarok/amarok-2.8.90.ebuild
index 1cc95d6..ebe5d85 100644
--- a/media-sound/amarok/amarok-.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} != ** ]]; 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-.ebuild
b/media-sound/amarok/amarok-.ebuild
index 1cc95d6..4d2e5c1 100644
--- a/media-sound/amarok/amarok-.ebuild
+++ b/media-sound/amarok/amarok-.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} != ** ]]; 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/
commit: 6962b6ead21d3e42c6b6147529c387d13c24e5c3 Author: Andreas Sturmlechner gmail com> AuthorDate: Sun Sep 13 22:21:05 2015 + Commit: Michael Palimaka gentoo org> CommitDate: Mon Sep 14 13:08:50 2015 + 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..ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/media-sound/amarok/amarok-5..ebuild b/media-sound/amarok/amarok-5..ebuild index 64f8283..f3c9bc0 100644 --- a/media-sound/amarok/amarok-5..ebuild +++ b/media-sound/amarok/amarok-5..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/
commit: 3332aa66fc197eeb7beadab87711b2250597b857
Author: Andreas Sturmlechner gmail com>
AuthorDate: Fri Jun 26 22:41:26 2015 +
Commit: Michael Palimaka gentoo org>
CommitDate: Thu Sep 10 18:15:48 2015 +
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..ebuild | 139
1 file changed, 139 insertions(+)
diff --git a/media-sound/amarok/amarok-5..ebuild
b/media-sound/amarok/amarok-5..ebuild
new file mode 100644
index 000..64f8283
--- /dev/null
+++ b/media-sound/amarok/amarok-5..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
[gentoo-commits] proj/kde:master commit in: media-sound/amarok/
commit: 4ed178d5d8d32368d8cb98537f9473b2720a83bf
Author: Johannes Huber gentoo org>
AuthorDate: Fri Aug 7 21:43:56 2015 +
Commit: Johannes Huber gentoo org>
CommitDate: Fri Aug 7 21:44:15 2015 +
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-.ebuild | 9 -
media-sound/amarok/metadata.xml | 1 -
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/media-sound/amarok/amarok-.ebuild
b/media-sound/amarok/amarok-.ebuild
index 9740197..8997a2a 100644
--- a/media-sound/amarok/amarok-.ebuild
+++ b/media-sound/amarok/amarok-.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 @@
media-libs/liblastfm
Enable mp3tunes integration
Enable support for libMTP (Plays4Sure) devices
access through libmtp
- Enable Nepomuk based semantic desktop
support (deprecated)
Use media-libs/libofa to compute
MusicDNS acoustic
fingerprints (used by MusicBrainz)
Build the utils - old
media-sound/amarok-utils
[gentoo-commits] proj/kde:master commit in: media-sound/amarok/
commit: dfe9183721623a4c6a264856c64236738f270b3e Author: Michael Palimaka gentoo org> AuthorDate: Tue Feb 17 13:51:00 2015 + Commit: Michael Palimaka gentoo org> CommitDate: Tue Feb 17 13:51:00 2015 + 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-.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-sound/amarok/amarok-.ebuild b/media-sound/amarok/amarok-.ebuild index d5bcdb6..25d9c55 100644 --- a/media-sound/amarok/amarok-.ebuild +++ b/media-sound/amarok/amarok-.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/
commit: e48320def752c73179f380ff73c6bd6b77d28113 Author: Michael Palimaka gentoo org> AuthorDate: Thu Jan 29 14:33:44 2015 + Commit: Michael Palimaka gentoo org> CommitDate: Thu Jan 29 14:33:44 2015 + 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-.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-sound/amarok/amarok-.ebuild b/media-sound/amarok/amarok-.ebuild index 9b72035..d5bcdb6 100644 --- a/media-sound/amarok/amarok-.ebuild +++ b/media-sound/amarok/amarok-.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/
commit: 466e51a34ab640ceba7229cb6c5ea8eba69ba831 Author: Johannes Huber gentoo org> AuthorDate: Thu Jan 29 00:03:07 2015 + Commit: Johannes Huber gentoo org> CommitDate: Thu Jan 29 00:03:07 2015 + 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-.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-sound/amarok/amarok-.ebuild b/media-sound/amarok/amarok-.ebuild index ba5585b..9b72035 100644 --- a/media-sound/amarok/amarok-.ebuild +++ b/media-sound/amarok/amarok-.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/
commit: 4ed3b0885b00775ba2a8a27752fd368f331642a3
Author: Michael Palimaka gentoo org>
AuthorDate: Thu Jul 17 13:04:37 2014 +
Commit: Michael Palimaka gentoo org>
CommitDate: Thu Jul 17 13:04:37 2014 +
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-.ebuild | 9 -
1 file changed, 9 deletions(-)
diff --git a/media-sound/amarok/amarok-.ebuild
b/media-sound/amarok/amarok-.ebuild
index 91106ad..156db7b 100644
--- a/media-sound/amarok/amarok-.ebuild
+++ b/media-sound/amarok/amarok-.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/
commit: e4ee94008839df67655489e7057394102dbd1243
Author: Johannes Huber gentoo org>
AuthorDate: Sun May 4 23:30:12 2014 +
Commit: Johannes Huber gentoo org>
CommitDate: Sun May 4 23:30:12 2014 +
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-.ebuild | 10 +-
media-sound/amarok/metadata.xml | 1 +
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/media-sound/amarok/amarok-.ebuild
b/media-sound/amarok/amarok-.ebuild
index aa180ca..91106ad 100644
--- a/media-sound/amarok/amarok-.ebuild
+++ b/media-sound/amarok/amarok-.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 @@
Enable mp3tunes integration
Enable support for libMTP (Plays4Sure) devices access
through libmtp
+ Enable Nepomuk based semantic desktop support
(deprecated)
Use media-libs/libofa to compute MusicDNS
acoustic
fingerprints (used by MusicBrainz)
[gentoo-commits] proj/kde:master commit in: media-sound/amarok/
commit: 167f9b0c154b7b806efd2b238a0d75813943dda1
Author: Johannes Huber gentoo org>
AuthorDate: Fri Mar 14 14:51:47 2014 +
Commit: Johannes Huber gentoo org>
CommitDate: Fri Mar 14 14:51:47 2014 +
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-.ebuild | 16
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/media-sound/amarok/amarok-.ebuild
b/media-sound/amarok/amarok-.ebuild
index e1f9f73..aa180ca 100644
--- a/media-sound/amarok/amarok-.ebuild
+++ b/media-sound/amarok/amarok-.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
