commit: 9741687bf8fa3b49b58bfb5744c2a9dfe26a0ef2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sat May 26 23:19:07 2018 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sat May 26 23:19:07 2018 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=9741687b
media-sound/amarok: Embedded MySQL is gone Package-Manager: Portage-2.3.38, Repoman-2.3.9 media-sound/amarok/amarok-9999.ebuild | 26 ++++++++++---------------- media-sound/amarok/metadata.xml | 3 --- 2 files changed, 10 insertions(+), 19 deletions(-) diff --git a/media-sound/amarok/amarok-9999.ebuild b/media-sound/amarok/amarok-9999.ebuild index 223a0ded30..26e3b6cdb5 100644 --- a/media-sound/amarok/amarok-9999.ebuild +++ b/media-sound/amarok/amarok-9999.ebuild @@ -10,7 +10,7 @@ DESCRIPTION="Advanced audio player based on KDE frameworks" HOMEPAGE="https://amarok.kde.org/"; LICENSE="GPL-2" -IUSE="+embedded ffmpeg ipod lastfm mtp ofa podcast wikipedia" +IUSE="ffmpeg ipod lastfm mtp ofa podcast wikipedia" # ipod requires gdk enabled and also gtk compiled in libgpod COMMONDEPEND=" @@ -56,7 +56,7 @@ COMMONDEPEND=" >=media-libs/taglib-extras-1.0.1 sci-libs/fftw:3.0 sys-libs/zlib - >=virtual/mysql-5.1[embedded?] + >=virtual/mysql-5.1 virtual/opengl ffmpeg? ( virtual/ffmpeg @@ -87,7 +87,7 @@ src_configure() { -DWITH_PLAYER=ON -DWITH_UTILITIES=ON -DCMAKE_DISABLE_FIND_PACKAGE_Googlemock=ON - -DWITH_MYSQL_EMBEDDED=$(usex embedded) + -DWITH_MYSQL_EMBEDDED=OFF $(cmake-utils_use_find_package ffmpeg FFmpeg) -DWITH_IPOD=$(usex ipod) $(cmake-utils_use_find_package lastfm LibLastFm) @@ -99,9 +99,6 @@ src_configure() { use ipod && mycmakeargs+=( DWITH_GDKPixBuf=ON ) - # bug 581554: add libmysqld location for rpath patch - use embedded && mycmakeargs+=( -DMYSQLD_DIR="${EPREFIX}/usr/$(get_libdir)/mysql" ) - kde5_src_configure } @@ -115,16 +112,13 @@ src_install() { pkg_postinst() { kde5_pkg_postinst - if ! use embedded; then - elog "You've disabled the amarok support for embedded mysql DBs." - elog "You'll have to configure amarok to use an external db server." - elog "Please read https://community.kde.org/Amarok/Community/MySQL for details on how" - elog "to configure the external db and migrate your data from the embedded database." + elog "You'll have to configure amarok to use an external db server." + elog "Please read https://community.kde.org/Amarok/Community/MySQL for details on how" + elog "to configure the external db and migrate your data from the embedded database." - if has_version "virtual/mysql[minimal]"; then - elog - elog "You built mysql with the minimal use flag, so it doesn't include the server." - elog "You won't be able to use the local mysql installation to store your amarok collection." - fi + if has_version "virtual/mysql[]"; then + elog + elog "You built mysql with the minimal use flag, so it doesn't include the server." + elog "You won't be able to use the local mysql installation to store your amarok collection." fi } diff --git a/media-sound/amarok/metadata.xml b/media-sound/amarok/metadata.xml index 19fd686064..98843fda4c 100644 --- a/media-sound/amarok/metadata.xml +++ b/media-sound/amarok/metadata.xml @@ -14,9 +14,6 @@ <name>Gentoo Sound project</name> </maintainer> <use> - <flag name="embedded">Use libmysqld, MySQL embedded server library. - Try disabling this if you encounter -PIC related in amarok, - it will make amarok rely only on standalone MySQL server.</flag> <flag name="lastfm">Enable Last.fm streaming services support through <pkg>media-libs/liblastfm</pkg></flag> <flag name="mtp">Enable support for libMTP (Plays4Sure) devices access through libmtp</flag>
