commit: 0893880fb0286783f00a67f0c377aa1785139cb4 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Tue Sep 29 19:58:43 2020 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Tue Sep 29 20:12:08 2020 +0000 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 <asturm <AT> gentoo.org> media-sound/amarok/amarok-9999.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-9999.ebuild b/media-sound/amarok/amarok-9999.ebuild index c1b5f87557..2bdbadffea 100644 --- a/media-sound/amarok/amarok-9999.ebuild +++ b/media-sound/amarok/amarok-9999.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..0000000000 --- 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.000000000 -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-sound/amarok/metadata.xml index 98843fda4c..89bebc990c 100644 --- a/media-sound/amarok/metadata.xml +++ b/media-sound/amarok/metadata.xml @@ -9,13 +9,9 @@ <email>[email protected]</email> <name>Gentoo KDE Project</name> </maintainer> - <maintainer type="project"> - <email>[email protected]</email> - <name>Gentoo Sound project</name> - </maintainer> <use> - <flag name="lastfm">Enable Last.fm streaming services support through - <pkg>media-libs/liblastfm</pkg></flag> + <flag name="lastfm">Enable Last.fm streaming services support through <pkg>media-libs/liblastfm</pkg></flag> + <flag name="mariadb">Prefer <pkg>dev-db/mariadb-connector-c</pkg> over <pkg>dev-db/mysql-connector-c</pkg></flag> <flag name="mtp">Enable support for libMTP (Plays4Sure) devices access through libmtp</flag> <flag name="ofa">Use <pkg>media-libs/libofa</pkg> to compute MusicDNS acoustic fingerprints (used by MusicBrainz)</flag>
