From 6615126d2da5b99b1fd8dff7832114cbf1f2dc25 Mon Sep 17 00:00:00 2001 From: Johannes Huber Date: Wed, 4 May 2016 22:00:55 +0200 Subject: media-sound/amarok: Fix rpath on mysqld Patch rebased for current version by Peter Levine , was unfortunately dropped in kde overlay for version bump. Gentoo-bug: 581554 Package-Manager: portage-2.2.28 --- media-sound/amarok/amarok-2.8.90-r1.ebuild | 132 +++++++++++++++++++++ media-sound/amarok/amarok-2.8.90.ebuild | 128 -------------------- .../amarok/files/amarok-2.8.90-mysqld-rpath.patch | 12 ++ 3 files changed, 144 insertions(+), 128 deletions(-) create mode 100644 media-sound/amarok/amarok-2.8.90-r1.ebuild delete mode 100644 media-sound/amarok/amarok-2.8.90.ebuild create mode 100644 media-sound/amarok/files/amarok-2.8.90-mysqld-rpath.patch diff --git a/media-sound/amarok/amarok-2.8.90-r1.ebuild b/media-sound/amarok/amarok-2.8.90-r1.ebuild new file mode 100644 index 000000000000..3012de23e91b --- /dev/null +++ b/media-sound/amarok/amarok-2.8.90-r1.ebuild @@ -0,0 +1,132 @@ +# 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" + "${FILESDIR}/${P}-mysqld-rpath.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) + ) + + # bug 581554: add libmysqld location for rpath patch + use embedded && mycmakeargs+=( -DMYSQLD_DIR="${EPREFIX}/usr/$(get_libdir)/mysql" ) + + 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/amarok-2.8.90.ebuild b/media-sound/amarok/amarok-2.8.90.ebuild deleted file mode 100644 index 4db4e9724a99..000000000000 --- 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.90-mysqld-rpath.patch b/media-sound/amarok/files/amarok-2.8.90-mysqld-rpath.patch new file mode 100644 index 000000000000..c84975df7f2f --- /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.old 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) -- cgit v1.2.3-65-gdbad