commit: d7bd8b80fc776de1c90e9eedc9a3543aa3c22be8 Author: Johannes Huber <johu <AT> gentoo <DOT> org> AuthorDate: Wed Apr 27 17:51:36 2016 +0000 Commit: Johannes Huber <johu <AT> gentoo <DOT> org> CommitDate: Wed Apr 27 17:52:01 2016 +0000 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..0000000 --- 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} != *9999* ]]; 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 - fi - fi -} diff --git a/media-sound/amarok/files/amarok-2.8.0-taglib110.patch b/media-sound/amarok/files/amarok-2.8.0-taglib110.patch deleted file mode 100644 index 0934816..0000000 --- a/media-sound/amarok/files/amarok-2.8.0-taglib110.patch +++ /dev/null @@ -1,40 +0,0 @@ -From: Omar Plummer <[email protected]> -Date: Thu, 06 Aug 2015 22:24:27 +0000 -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) - 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 deleted file mode 100644 index b03aa18..0000000 --- a/media-sound/amarok/files/amarok-2.8.90-mysql-embedded.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 048ca3d57228759f05af7b9553200fd362aeaa8b Mon Sep 17 00:00:00 2001 -From: Matt Whitlock <[email protected]> -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 - diff --git a/media-sound/amarok/metadata.xml b/media-sound/amarok/metadata.xml index 6043c6c..136f0c7 100644 --- a/media-sound/amarok/metadata.xml +++ b/media-sound/amarok/metadata.xml @@ -19,7 +19,6 @@ 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="mp3tunes">Enable mp3tunes integration</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>
