Revision bump to fix libmysqld rpath. Patch by Gabriel Marcano <gabemarcano@yahoo.com> from bug 508824. Ack by

jmbsvicetto

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x67C78E1D

4 files changed, 168 insertions, 17 deletions

diff --git a/media-sound/amarok/ChangeLog b/media-sound/amarok/ChangeLog
index aa3bda03ee42..db21540a343e 100644
--- a/media-sound/amarok/ChangeLog
+++ b/media-sound/amarok/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/amarok
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.470 2014/07/17 13:22:57 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.471 2014/07/30 23:58:57 grknight Exp $
+
+*amarok-2.8.0-r3 (30 Jul 2014)
+
+  30 Jul 2014; Brian Evans <grknight@gentoo.org> +amarok-2.8.0-r3.ebuild,
+  +files/amarok-2.8.0-mysqld-rpath.patch:
+  Revision bump to fix libmysqld rpath.  Patch by Gabriel Marcano
+  <gabemarcano@yahoo.com> from bug 508824. Ack by  jmbsvicetto
 
   17 Jul 2014; Michael Palimaka <kensington@gentoo.org> amarok-2.8.0-r2.ebuild:
   Remove workaround now handled in the eclass.
diff --git a/media-sound/amarok/Manifest b/media-sound/amarok/Manifest
index 9f83888f4101..0d12f789763c 100644
--- a/media-sound/amarok/Manifest
+++ b/media-sound/amarok/Manifest
@@ -2,27 +2,22 @@
 Hash: SHA256
 
 AUX amarok-2.8.0-gmock-1.7.patch 1205 SHA256 3d780ba18dfda23eb19772dd803969a72b7bb47c5181060bdb18257cd16ce88b SHA512 6bbbdf633f65337523d023decd6b3ca889a2bf9b10e93d12f686e273144a58dd398813a99474adf8d35ad1184658f77626b040be288b44a9ac58424a51d05790 WHIRLPOOL a4c45a1386cd8f5c5b97e4fb6563b3e59de19de61d584669ee62f8884d5cafacdb746e6578b2e2f9adf20779ff059d758cea1686ced9c7392b1f9dd1b6ee5b87
+AUX amarok-2.8.0-mysqld-rpath.patch 602 SHA256 b8a10620877962ecd4fd4b3f466bb2418fdd3a17c4fa5b69a655978557996bfd SHA512 7e2b4581a49424d51b47073bcc45d976eb0195b8a87c02a6e012e85d7e771b9c207f351bf9571038b2d7cb3cecc8118d688e50b7faf4eb176d204b590b17ed2e WHIRLPOOL 8d1d5311b907f982d031ad7083771f7b081af7c1808da337ab0413ca50974dfa8f33b33bd30baa9e09ab3a4aa3996e15622b125de22b7150814a0d35f5b12d33
 DIST amarok-2.8.0.tar.bz2 39950028 SHA256 f4b89b28f217a6d947e55fb0890de22fad8c404794c6beeb2dcaf2711b4f8ec6 SHA512 09f7f675f1223d36fb9df2f8c88923c6616524e022ad83b12bcb770dfbf60cb6b191e4035633f2ea2eee5fb7b38e6d5092cf69fe222ef9c3f3c46ba8f157a62d WHIRLPOOL 108cfd95d65e74f28f85a846f605bc349e5b2962b7f9a357415225f3e48ff87148d7f50a642665cc3c809bb2cb4c22f339ad049cdeb4659bb7c0a48e798833ad
 EBUILD amarok-2.8.0-r1.ebuild 3777 SHA256 ec2b5fca44fc58098509a56b2def1fa476a7017bf47103a90c4bc3834bdc1ca3 SHA512 3290e311763aa97a50fa2b1c1027afc8459c424015cfdfb028ffb213b0f13433c3514c76e95372b146f45c5af6c52d8b4b249bb9d2ce1ec42331f66332fc6031 WHIRLPOOL a1cceea348e43a1c27e4550e7e5ecb5c4a4499eb4ab483b1c8d119fcacd82e7ed58859739e94e27d2718b6085522114cda7ff94bcbff1d8e918b599e01aa5715
 EBUILD amarok-2.8.0-r2.ebuild 3581 SHA256 d2bd34459aaa0710ca68aa92006fe7d0067a56ff40f7bcf4253c7de64e44fac2 SHA512 70a344467a15292c4cbf56825d9f144783dea89ab951c6b3fde79af8d4e81264b3feb1afa8832e697b3519eddff20771bf04787f286a66f70ff40b144de1bf44 WHIRLPOOL 8a37780a912cda264a56e91998a04ed3283410639d1da5f7e7abab8e379886df22dd0e39cd9aa0caeba564d083685cedb4fefacde4332fb2ca770f2d504e7567
+EBUILD amarok-2.8.0-r3.ebuild 3756 SHA256 e4ac47f8a1067f6934f02779c74a3286c26201eac5d5049fc1ecbb99a1411a95 SHA512 db9ac0d38861982b330b4d1eae8a4e24591ef82f88edc21501cf4805fe391a2d37ada2199f512a2c6865e85019648cb488b2a21b68dc0513fb2a08b8bccefff8 WHIRLPOOL a715e2029c9badc7bb3b644705d855c4ab871f59ac5dc7e74a282a646af24eba09efb52bf69efddfd6abe015ee4dc52b9172cd6af66a3d6b0062d7d053b14649
 EBUILD amarok-2.8.0.ebuild 3584 SHA256 67ed6b77d0f365efaad45bfe43d0719b62285871f82c11988eaee232dac48edf SHA512 2217db5bfbe0ed547201a4e5d473c0b56ca1d65bd16c8b422f6f4f7d4b4535d0b4e9eb8eee968f40234ba89b08e0bb53b61fdc9e66480243fe03dad59a271300 WHIRLPOOL 47777678cc16b9d4c3fd87ae424764f08fe75bf9c8715301db4e2d79ca2066c47c47f4d84cc63aea34cedf6e8c149879fbbf6e02a704986197ff80ebb3887236
-MISC ChangeLog 79964 SHA256 2b49359f74234be4578acfd2f061fe9887923aeb4776b031cc3762a58699bbff SHA512 f9c2e9c7e44eb97bde7ab3e8d5781a1b3ecab438c1636556d77f4bb74f59cf32d30befb1e7d69e7877cb27dd085130a681729ce3b268b0e2c4a49124524df915 WHIRLPOOL 33b9ff5b817888a5d955f48a00eab1f4cd4670e1d6333f25a58145ca1f5c4405890d3f7da78482f511117bd17e7a6cbf98acef61599d157a48e7cd719a2cb67e
+MISC ChangeLog 80240 SHA256 68ac0ada0f284a9a3afa0257c3f18bcc013cd82a04ae929cceb23bd86d609a32 SHA512 eaa91551970517091f2d78b5ecb19a900258fbd4959aeda53b0d695f2c47193215b4f121bb09802665748653d71c5946816db4d30638d659e9355786c7adead6 WHIRLPOOL 598c6d1db7d18fe57eda9db122f683a98c3206f74d511ffa7473014938093ab2afd3b5d5fc182a4b947d43afdb99a9f70e6de11375fab4d8c65dea478010632d
 MISC metadata.xml 1064 SHA256 8e46a720b86b83508c2bf4a5a3be43bbdabb1bf8e057b547dc881912fea035e6 SHA512 d576c1e66b3e76e899f4580a908d41a0ad2faaae0346b47fe5e4d925763428e705be2fe7246f4109a4b470c6a75acd445215722fc3b3e82709af765d659e7705 WHIRLPOOL 9b1235b62922630dbb2968c62dda7cac97eddc48a4857232d6a0aa25abdb756dad474281d39f2e342e719adb9f6311a6004e3b629496975e8b82f68d4487f96e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJiBAEBCABMBQJTx840RRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
-MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
-7FHYD/wPDiSi6ljT+BvAnw37kHr9/UwNqN0qEEEOoy65vE0s8jDEKXFNFZSsc4F+
-Z9j+SRlWx+oF+R0EsjYEIfuyr3mtjcIhzhiNbFlxiu6/Q+CRhkmLfgTvhpxSW3JL
-q0MeaNVey58q4Ha0bMSZQM1JmCBenXiMAUqzaE/4s4z3MkvAZ9XlWxVi68LRs3H5
-xPiHETXLCZIwDCqG+u6hmuCbiyYPGjI9L7Ytqki2HtVLMH4lOovest0+pPoOlIK6
-eBg4LCtaXgJds7ifgdVqOLnkZ3GsRjdWb6SviemL43It7Zc8Xkr7H/PGRgY59Dt6
-soFSFh0ki/9MvefaoAOKJLXpCwoCHcuxkD37M2GEhGfzsgqKaLNru+Usc8wrqnVg
-OZqqe9yecgU4pWbfqLfvDbekAsEZNf0H+g7EpmtQhPPryX5OFTtxBSEARHZS+hIX
-fiDSiKyz9qZ3U5LpaK7wq/ZJvfFTOILANMyS5wVEDOJyZwPiPqVIGOe7QT1XlF0A
-9Fb/0QjMVRyQMpw/OYQz5/cWPbwMQEWKH6I6DUqI/VS6atI2JclZOZMad9EvTWbb
-pBgEc7+0FLY6g1pEtOoJtaAFpu/soXuOvY7ZAv5XRN2g+2o/IDTRAy/rwkuaJToa
-wZQSV2qkYZ+RtYxqUDmF5+l7l4V/NAz6xo+5VVsYpzmf+TD2lw==
-=5azd
+iQEcBAEBCAAGBQJT2YbGAAoJEE4V4vFnx44d5KoH/3+9tQXH1bs5/9KnhGiBJXQ/
+QGbdtZVrbnY57dNCvDcQ5g9QEfa8BB2Tuu7RUf00zYfV7YK23xV2Wm0gMaAkpvEg
+MYvWBvXVSWW5o/RcVbbd+mtB6q40UkRamHJaI+iKk2x1laeNAll4azNTiXHezxlT
+j9gZOUwkXhZuWOp0ig8XIlt869R9Gvoqli6t3vj06C2Jl6KWM35kvLQjwKa58eax
+0NauPIQTFwoY/0VZQRr2ia36vj9JrzX9hr8ioRBCe6EZeJX9GvM9JAOzIujzDvoE
+ur8YZvJ3FXlN5Xe98IzWfItySa7HpEG1VeKUNFvoL4Jp1gcASRcOKn4Q9jTYr2I=
+=gqcE
 -----END PGP SIGNATURE-----
diff --git a/media-sound/amarok/amarok-2.8.0-r3.ebuild b/media-sound/amarok/amarok-2.8.0-r3.ebuild
new file mode 100644
index 000000000000..2555902e1226
--- /dev/null
+++ b/media-sound/amarok/amarok-2.8.0-r3.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.8.0-r3.ebuild,v 1.1 2014/07/30 23:58:57 grknight Exp $
+
+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 ro ru sl sr sr@ijekavian sr@ijekavianlatin sr@latin
+sv tr uk zh_CN zh_TW"
+KDE_REQUIRED="never"
+KDE_HANDBOOK="optional"
+KDE_MINIMAL="4.13.1"
+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
+	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
+	KEYWORDS="~amd64 ~ppc ~x86"
+else
+	KEYWORDS=""
+fi
+
+LICENSE="GPL-2"
+SLOT="4"
+IUSE="cdda debug +embedded ipod lastfm mp3tunes mtp nepomuk 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
+	$(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
+	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_kdebase_dep libkcddb)
+		$(add_kdebase_dep libkcompactdisc)
+		$(add_kdebase_dep audiocd-kio)
+	)
+	ipod? ( >=media-libs/libgpod-0.7.0[gtk] )
+	lastfm? ( >=media-libs/liblastfm-1.0.3 )
+	mp3tunes? (
+		dev-libs/glib:2
+		dev-libs/libxml2
+		dev-libs/openssl
+		net-libs/loudmouth
+		net-misc/curl
+		>=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 )
+"
+DEPEND="${COMMONDEPEND}
+	dev-util/automoc
+	virtual/pkgconfig
+	test? ( dev-cpp/gmock )
+"
+RDEPEND="${COMMONDEPEND}
+	!media-sound/amarok-utils
+	$(add_kdebase_dep phonon-kde)
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-gmock-1.7.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
+		$(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)
+	)
+
+	# Add libmysqld location for rpath patch; bug 508824
+	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/files/amarok-2.8.0-mysqld-rpath.patch b/media-sound/amarok/files/amarok-2.8.0-mysqld-rpath.patch
new file mode 100644
index 000000000000..80dc93dc6b14
--- /dev/null
+++ b/media-sound/amarok/files/amarok-2.8.0-mysqld-rpath.patch
@@ -0,0 +1,12 @@
+--- src/core-impl/collections/db/sql/mysqlecollection/CMakeLists.txt.orig	2014-06-15 18:31:07.362415065 -0400
++++ src/core-impl/collections/db/sql/mysqlecollection/CMakeLists.txt	2014-06-15 18:33:19.612419882 -0400
+@@ -28,6 +28,9 @@
+     ${ZLIB_LIBRARIES}
+ )
+
++SET_TARGET_PROPERTIES(amarok_collection-mysqlecollection PROPERTIES BUILD_WITH_INSTALL_RPATH TRUE)
++SET_TARGET_PROPERTIES(amarok_collection-mysqlecollection PROPERTIES INSTALL_RPATH "${MYSQLD_DIR}")
++
+ if(NOT WIN32 AND NOT APPLE)
+     target_link_libraries( amarok_collection-mysqlecollection crypt pthread )
+ endif(NOT WIN32 AND NOT APPLE)