Revision bump marks pax on /usr/bin/amarok, bug #481592. Adds a patch to unbreak build of tests with gmock-1.7.

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

4 files changed, 206 insertions, 3 deletions

diff --git a/media-sound/amarok/ChangeLog b/media-sound/amarok/ChangeLog
index 629b1ea5254a..b2a083c269e5 100644
--- a/media-sound/amarok/ChangeLog
+++ b/media-sound/amarok/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/amarok
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.467 2013/12/13 02:43:00 patrick Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.468 2014/03/14 14:47:58 johu Exp $
+
+*amarok-2.8.0-r1 (14 Mar 2014)
+
+  14 Mar 2014; Johannes Huber <johu@gentoo.org> +amarok-2.8.0-r1.ebuild,
+  +files/amarok-2.8.0-gmock-1.7.patch:
+  Revision bump marks pax on /usr/bin/amarok, bug #481592. Adds a patch to
+  unbreak build of tests with gmock-1.7.
 
   13 Dec 2013; Patrick Lauer <patrick@gentoo.org> metadata.xml:
   Remove unneeded useflag from metadata.xml
diff --git a/media-sound/amarok/Manifest b/media-sound/amarok/Manifest
index 05f7a7728448..6131f8dbf4ba 100644
--- a/media-sound/amarok/Manifest
+++ b/media-sound/amarok/Manifest
@@ -1,4 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX amarok-2.8.0-gmock-1.7.patch 1205 SHA256 3d780ba18dfda23eb19772dd803969a72b7bb47c5181060bdb18257cd16ce88b SHA512 6bbbdf633f65337523d023decd6b3ca889a2bf9b10e93d12f686e273144a58dd398813a99474adf8d35ad1184658f77626b040be288b44a9ac58424a51d05790 WHIRLPOOL a4c45a1386cd8f5c5b97e4fb6563b3e59de19de61d584669ee62f8884d5cafacdb746e6578b2e2f9adf20779ff059d758cea1686ced9c7392b1f9dd1b6ee5b87
 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.ebuild 3584 SHA256 67ed6b77d0f365efaad45bfe43d0719b62285871f82c11988eaee232dac48edf SHA512 2217db5bfbe0ed547201a4e5d473c0b56ca1d65bd16c8b422f6f4f7d4b4535d0b4e9eb8eee968f40234ba89b08e0bb53b61fdc9e66480243fe03dad59a271300 WHIRLPOOL 47777678cc16b9d4c3fd87ae424764f08fe75bf9c8715301db4e2d79ca2066c47c47f4d84cc63aea34cedf6e8c149879fbbf6e02a704986197ff80ebb3887236
-MISC ChangeLog 79392 SHA256 b02bbe4d545a1106df2053b477519c78fed9fb5ba315a191740bf01d9e1c397e SHA512 f851b0032788cf888f0ccc4cf8a749ae6e3336eac86964c7e519d0e62c44124c8694793f8f60d4a8d85687e08690014f2736f71788ca4accb2e922b181bbbe08 WHIRLPOOL aad0011aae424c7d5efb99ba9d7903eef568a4bd6925368d3e788b9de12663d5621be0eada25168819a1d5686cf600c41ca3bc36d7a663a41f71584a8aa1fd2c
+MISC ChangeLog 79650 SHA256 67a81f9ece5559863278ef96685859b57ec63dff6cc70a27b905c95a6c1640fa SHA512 4c0b10ac923c59ff83d296d4de4b6f283dd736ba18fcbcd0ef33661bafadea0d1fca3a561b2e5b1e0fbb82dfbb3883217797106aec43259a47adfbc65697c4ab WHIRLPOOL daa43dbb92ebbb0f2c30af6c74b66bdc99e444e0a1be29272d0b06abb9e7fcce84bf44117942bc6051929246f75f6e4d06aaac60167cf72be13e80278ce0312f
 MISC metadata.xml 976 SHA256 6fa627cd8f2b750d82864acd42b95ad76edcf91389356880728b21c071974f08 SHA512 e6b5cfd73a40577fbb8a3f082b1ab6c80185219b89f41badfd9b44686a6ae48254f225f4a46020dc45daed20d4b39c8c4120267ef7534a97cead0645eee89aca WHIRLPOOL 1766ac06339c55fabd2fa40d2a0b07260b26815224bd2c73dd6d67827f1c4a99c0318954fab95fd4304719de931664b6ed27035207a679b473d013a0152365b6
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iQIcBAEBCAAGBQJTIxajAAoJEGVpnaTzz9K9EfoQAKx0qpVCTdQCPb61acAvxJ5J
+kHAvgy4TVZBsY0Sbqj5VAoaklfcGidm543YVEfqxyCwtL1WxiGoOqJ/OznRfWfqA
+e4C+6dbWsYK1YJHjBtDgpSSWGcTuEPvNesxoAbBVRHNUqzgI7yZIUZONtZm2CFn4
+YwLbXJMM0wVM/G4FuxenPd8HRqt1vnDjER8kUDdi2S7N0q/FiqbzkmA9Dq4IKWZ/
+Ei1mW56Z6Wwe/cugyzbhAF9BwAyxsgkaNhX31QJdnkDop1ilhOsznba4LbrQb8hI
+Nqd4lWz88wXZI4TY0v0L5wURnY4rLjRv82t+Rrw8IxlOlAf/7QXuRS5+H+nvCYb0
+IsA2UgQJzElfZ5r+XAsA2Cl49GclNGQuikmXclEidZXCrJNuxJVwK3q0COrX9f+U
+wjUAmc6buhR3Z+N9+td74XTA/nP933sw9yP71eIBVm61gdFsfLtuVNc+rMj3ZOAQ
+n7QyU3oLChMus7FBrqUX44lca3E/RJ+WMOQNulvr803So2qmoBonxtW3/BtWxgWd
+72oi7PTcYuuwpQBa4ytNITbdSITVk7u0gwBKEqjkEJcUTOzvfhrbXykHjIkG9KAk
+oBYTvJSXkFY5T14nL0W5jQpcTwm+v8bkye4iJ21vA4K+6CKFNuW4KhX39FyhcLGQ
+53ExKch1TS2ynrjBB0Gz
+=Ra0Z
+-----END PGP SIGNATURE-----
diff --git a/media-sound/amarok/amarok-2.8.0-r1.ebuild b/media-sound/amarok/amarok-2.8.0-r1.ebuild
new file mode 100644
index 000000000000..8c2cfdddddc7
--- /dev/null
+++ b/media-sound/amarok/amarok-2.8.0-r1.ebuild
@@ -0,0 +1,139 @@
+# 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-r1.ebuild,v 1.1 2014/03/14 14:47:58 johu 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"
+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 ofa opengl semantic-desktop 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 'opengl?,semantic-desktop?' 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 )
+	ofa? ( >=media-libs/libofa-0.9.0 )
+	opengl? ( virtual/opengl )
+	semantic-desktop? ( >=kde-base/nepomuk-core-4.9.0 )
+"
+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" )
+
+src_prepare() {
+	if [[ ${KDE_BUILD_TYPE} != live ]]; then
+		mv doc/en_US doc/en || die
+		sed -e "s/en_US/en/" -i doc/CMakeLists.txt || die
+	fi
+
+	kde4-base_src_prepare
+}
+
+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 ofa LibOFA)
+		$(cmake-utils_use_with semantic-desktop Nepomuk)
+		$(cmake-utils_use_with semantic-desktop Soprano)
+		$(cmake-utils_use_with utils UTILITIES)
+	)
+
+	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-gmock-1.7.patch b/media-sound/amarok/files/amarok-2.8.0-gmock-1.7.patch
new file mode 100644
index 000000000000..1c0a7f45d25b
--- /dev/null
+++ b/media-sound/amarok/files/amarok-2.8.0-gmock-1.7.patch
@@ -0,0 +1,35 @@
+commit 5b3c84b29c16931e46bf7e1ddba16095245ce070
+Author: Mark Kretschmann <kretschmann@kde.org>
+Date:   Sat Dec 14 10:25:45 2013 +0100
+
+    Fix compilation with unit tests enabled.
+    
+    The problem was clashing symbols between KDE's kWarning macro and gmock.
+    Thanks go to Edward for help with fixing.
+    
+    CCMAIL: amarok-devel@kde.org
+
+diff --git a/tests/core/collections/MockCollectionLocationDelegate.h b/tests/core/collections/MockCollectionLocationDelegate.h
+index 019b096..a2f4504 100644
+--- a/tests/core/collections/MockCollectionLocationDelegate.h
++++ b/tests/core/collections/MockCollectionLocationDelegate.h
+@@ -23,6 +23,7 @@
+ 
+ #include "core/collections/CollectionLocationDelegate.h"
+ 
++#undef kWarning  // WORKAROUND: Prevent symbols clash with KDE's kWarning macro
+ #include <gmock/gmock.h>
+ 
+ namespace Collections {
+diff --git a/tests/mocks/MockTrack.h b/tests/mocks/MockTrack.h
+index 9f47956..fec6ef2 100644
+--- a/tests/mocks/MockTrack.h
++++ b/tests/mocks/MockTrack.h
+@@ -17,6 +17,7 @@
+ #ifndef META_MOCKTRACK_H
+ #define META_MOCKTRACK_H
+ 
++#undef kWarning  // WORKAROUND: Prevent symbols clash with KDE's kWarning macro
+ #include <gmock/gmock.h>
+ 
+ #include "core/meta/Meta.h"