Rev bump, adds upstream patch for gui issues with kde 4.8, fixes bug #402131.

Package-Manager: portage-2.2.0_alpha85/cvs/Linux x86_64

4 files changed, 222 insertions, 7 deletions

diff --git a/media-sound/amarok/ChangeLog b/media-sound/amarok/ChangeLog
index e8ec07f86369..6892bb13fe54 100644
--- a/media-sound/amarok/ChangeLog
+++ b/media-sound/amarok/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/amarok
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.419 2012/01/14 17:58:16 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.420 2012/02/09 16:54:21 johu Exp $
+
+*amarok-2.5.0-r2 (09 Feb 2012)
+
+  09 Feb 2012; Johannes Huber <johu@gentoo.org> +amarok-2.5.0-r2.ebuild,
+  +files/amarok-2.5.0-kde48.patch:
+  Rev bump, adds upstream patch for gui issues with kde 4.8, fixes bug #402131.
 
   14 Jan 2012; Thomas Kahle <tomka@gentoo.org> amarok-2.4.3-r1.ebuild:
   x86 stable per bug 389997
diff --git a/media-sound/amarok/Manifest b/media-sound/amarok/Manifest
index f36a204d4a42..b514ca3c1ed0 100644
--- a/media-sound/amarok/Manifest
+++ b/media-sound/amarok/Manifest
@@ -1,9 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX amarok-2.3.2-fix-qt-regression.patch 2958 RMD160 810ddadf7fa226302b75aaaf6945a19fe57472d2 SHA1 4f5c730f989c1f5aab57af72a9540223698bd7e1 SHA256 2f2a77552a06e6ec30106d8cb1f012f3f4213ac3354e64c7fe7f6933deb6d6ab
 AUX amarok-2.3.2-flac-fix.patch 1233 RMD160 ee3f98e2ccbd14798c2b75ed6def2d1709ead21e SHA1 3a4cb3edd6dc1a14410d3f13b6c9a7c0019c1a17 SHA256 f68f3c9b4fb8be02a37ac21d535d417b8fa6167d123e6e13e98c26fb758e40f1
 AUX amarok-2.4.0.90-fix-plugin-detection.patch 623 RMD160 897a669e6a26e2559e713004849c19b7bd7f1033 SHA1 c6915369c3ecbceac7a8c5b8246f485fb760c2f4 SHA256 aae0ceca58b36ae714516fe46f1a4011836a3e3256a7efd106fdb8568e1fdbcf
+AUX amarok-2.5.0-kde48.patch 2111 RMD160 4ebc2ddfc620cd1ea3d50cc250facb307b306e41 SHA1 8ec7be87e3f6d609e555a2149674f081316f9e28 SHA256 4ee6b27d79d42e7fbb5469f46c3ebaf69eef73ff83cb0882e44f4d993ba0ce51
 AUX amarok-fix-upnp-dep.patch 1896 RMD160 e0542160a01bde718555ac06bf7759fdc4078cf6 SHA1 d7a4e359bb13dde781605786d1f20017c5687a7b SHA256 e88481548d77d334adb51250ee2e70186249ee51164f060382a7b1ee2c6839d6
 DIST amarok-2.4.0.tar.bz2 15219572 RMD160 f32a664521b9827ef8e7d49100e39b69fa87dd29 SHA1 d37ecda0fecdba88bb239f11c6d4ff885d7ac23f SHA256 52be0e926d1362828a4bf64e2a174dc009c85f6f33da4ca589f0f09ab9b7085c
 DIST amarok-2.4.3.tar.bz2 17468203 RMD160 02026c400025e944c69f31b29013c8054a2575d2 SHA1 8a46fca6a550a4ca403a9be7f595728c819641c4 SHA256 6ce448ecd30cc3d45211617636904e3662c2082441b79ca1e36685c8b0be8208
@@ -12,13 +13,18 @@ EBUILD amarok-2.4.0.ebuild 4023 RMD160 a083182d5ef0a4a6bf3fb06f3a2ce94ab12b655c
 EBUILD amarok-2.4.3-r1.ebuild 3261 RMD160 dc9a404f568557bd5826d408ddbc7fc6aaf17b88 SHA1 33694f612e82b2f8adec89768bd56b87347656d6 SHA256 ad62ff5721786bb961cfc78a8846dec0fb3b536d63fcf80916b69b771eb30bc7
 EBUILD amarok-2.4.3.ebuild 3955 RMD160 b71ea0ee7caa1097c0714df7eef43fbf9f920353 SHA1 d7928abbd3d9add01cd089de5539458b7970067c SHA256 61deed11bcdb02c8160150b80c65c13004b01db680badd15813a3d0697ce119b
 EBUILD amarok-2.5.0-r1.ebuild 4039 RMD160 89ecb72828bd23f3069d288c036c2ea8f1295be9 SHA1 8919bb00a3657a423c8a8a7c3f0e518f7c3c0b89 SHA256 da7b3bc05636b90126ba28e4d0e89bbad553429a2bb5a3617c76e177464947a0
+EBUILD amarok-2.5.0-r2.ebuild 4084 RMD160 566be119703e6b11516583a46a62defc5b2646f5 SHA1 5f10d5f2e85154cdfbc391070fc1d4f1ad9eb472 SHA256 39d8b24436fa8b552641a3132545f6f18f4fb89262781c342189e04a9e7f3d1e
 EBUILD amarok-2.5.0.ebuild 3961 RMD160 9ca6c640799a9697ea3e86b0a561e7787b14688e SHA1 9a7cef7b24d85eef617b2a67e1bfb69c527d8f4e SHA256 8799d70ae5340af5b974493363fd71863794b2d0107d1a2a8d900b6bb84d3a1e
-MISC ChangeLog 71849 RMD160 984a53af7276490ddb90a8d9acde198d99c102e0 SHA1 2cb9b1f1ed442f419345d34bc71639bdb632b5bf SHA256 0f16a6c887e6badf392d2b4162dc08fe53ea1f99867d31179cc2d54194b0fb91
+MISC ChangeLog 72069 RMD160 40e7b9f3a77b6bade70f9882c8f87dd6f5f1b7d4 SHA1 05f80387e520c19cbe96f6a6bf95f92c5d6d6caf SHA256 5838d614c4434cd853e7bc0aed14ff6593f70fd359cb4facf96c0a14c3244b2e
 MISC metadata.xml 1739 RMD160 33e05987cb92cbe2d842d2570f14c2832d32c450 SHA1 7200789e72e26ccaabb97051b678ca528040b821 SHA256 d817903b822caa41353f1a32b8e6db9c84c86b824a1e5934ca1051f4fe297fed
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk8Rwj0ACgkQodBTJSDyo651xgD8CnixheJn1tmuP4mIxup6qRtc
-CG8IX0dk91gRH5VU2U0A/3+DvvsqBR4ajleJjXPbEHl71dPMqF+AdWx0lXD3SvFi
-=Hwl8
+iQEcBAEBCgAGBQJPM/n8AAoJEO+t9ga+3I3a28kIALuZgo/EnjDi7Xvthy+Ad7q2
+2/iGhoPGgqZ+7BzEA8Hz1wr5MtavpkiE/IfYqSIhglA0lOQJ5Myaq0A2NlG0Uf8y
+WNjw/0Ep12Mzt1Bx+mynpmUJ0OcNJI9jvYUVkjo7SOjS37Zv6Z2EAH2pkFxVpEMf
+/Uy2DRBHv+arVMG+eF81nZVVybwtYzN2Zaq3LOiGVuNiNNW7vfXswsDEhAsyirxs
+ETCuE5BdtMSk2Ru6JyWYJ8o72fjKWN+KADHDeSGP3VDZyPvmY5+YILSQyG6rQED2
+ecc2IwyWCKlWAtDNcj8kVTFHjiAC4T7NtKUyNg5ORpHlLkBtr0uMeyeR1zzM+AI=
+=CcKy
 -----END PGP SIGNATURE-----
diff --git a/media-sound/amarok/amarok-2.5.0-r2.ebuild b/media-sound/amarok/amarok-2.5.0-r2.ebuild
new file mode 100644
index 000000000000..ea46e901bb15
--- /dev/null
+++ b/media-sound/amarok/amarok-2.5.0-r2.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.5.0-r2.ebuild,v 1.1 2012/02/09 16:54:21 johu Exp $
+
+EAPI=4
+
+KDE_LINGUAS="af ar ast be bg bs ca ca@valencia cs csb da de el en_GB eo es et
+eu fa fi fr ga gl he hr hu is it ja km ko ku lt lv mai ml ms nb nds ne nl nn
+oc pa pl pt pt_BR ro ru se si sk sl sq sr sr@ijekavian sr@ijekavianlatin
+sr@Latn sv tg th tr ug uk wa zh_CN zh_TW"
+KDE_SCM="git"
+KDE_REQUIRED="never"
+inherit flag-o-matic kde4-base
+
+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.bz2"
+	KEYWORDS="~amd64 ~ppc ~x86"
+else
+	KEYWORDS=""
+fi
+
+LICENSE="GPL-2"
+SLOT="4"
+IUSE="cdda daap debug +embedded ipod lastfm mp3tunes mtp ofa opengl semantic-desktop +utils"
+
+# Tests require gmock - http://code.google.com/p/gmock/
+# It's not in the tree yet
+RESTRICT="test"
+
+# ipod requires gdk enabled and also gtk compiled in libgpod
+COMMONDEPEND="
+	app-crypt/qca:2
+	>=app-misc/strigi-0.5.7
+	$(add_kdebase_dep kdelibs 'opengl?,semantic-desktop?')
+	$(add_kdebase_dep kdebase-kioslaves)
+	>=media-libs/taglib-1.6.1[asf,mp4]
+	>=media-libs/taglib-extras-1.0.1
+	sys-libs/zlib
+	>=virtual/mysql-5.1[embedded?]
+	x11-libs/qt-script
+	>=x11-libs/qtscriptgenerator-0.1.0
+	cdda? (
+		$(add_kdebase_dep libkcddb)
+		$(add_kdebase_dep libkcompactdisc)
+		$(add_kdebase_dep kdemultimedia-kioslaves)
+	)
+	ipod? ( >=media-libs/libgpod-0.7.0[gtk] )
+	lastfm? ( >=media-libs/liblastfm-0.3.0 )
+	mp3tunes? (
+		dev-libs/glib:2
+		dev-libs/libxml2
+		dev-libs/openssl
+		net-libs/loudmouth
+		net-misc/curl
+		x11-libs/qt-core[glib]
+	)
+	mtp? ( >=media-libs/libmtp-1.0.0 )
+	ofa? ( >=media-libs/libofa-0.9.0 )
+	opengl? ( virtual/opengl )
+"
+DEPEND="${COMMONDEPEND}
+	dev-util/automoc
+	dev-util/pkgconfig
+"
+RDEPEND="${COMMONDEPEND}
+	$(add_kdebase_dep phonon-kde)
+	!media-sound/amarok-utils
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.5.0-kde48.patch"
+)
+
+src_prepare() {
+	# en locale is special in a way that it is always enabled. English Amarok
+	# handbook however lies in the doc/en_US folder and thus is not picked
+	# up by kde4-functions eclass. Rename it.
+	sed -e 's:add_subdirectory(en_US):add_subdirectory(en):' \
+		-i "${S}/doc/CMakeLists.txt" \
+		|| die "Replacing en_US by en in doc/CMakeLists.txt failed."
+	mv "${S}/doc/en_US" "${S}/doc/en" || die "Moving doc/en_US to doc/en failed."
+
+	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
+
+	# Mygpo-qt not yet in portage, add IUSE when available
+	mycmakeargs=(
+		-DWITH_PLAYER=ON
+		-DWITH_Libgcrypt=OFF
+		-DWITH_Mygpo-qt=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)
+	)
+
+	mycmakeargs+=(
+		$(cmake-utils_use_with utils UTILITIES)
+	)
+		# $(cmake-utils_use_with semantic-desktop Nepomuk)
+		# $(cmake-utils_use_with semantic-desktop Soprano)
+
+	kde4-base_src_configure
+}
+
+pkg_postinst() {
+	kde4-base_pkg_postinst
+
+	if use daap; then
+		echo
+		elog "You have installed amarok with daap support."
+		elog "You may be interested in installing www-servers/mongrel as well."
+		echo
+	fi
+
+	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.5.0-kde48.patch b/media-sound/amarok/files/amarok-2.5.0-kde48.patch
new file mode 100644
index 000000000000..b110eeb1018f
--- /dev/null
+++ b/media-sound/amarok/files/amarok-2.5.0-kde48.patch
@@ -0,0 +1,62 @@
+diff --git a/src/context/ToolbarView.cpp b/src/context/ToolbarView.cpp
+index f3b4916..840b99b 100644
+--- a/src/context/ToolbarView.cpp
++++ b/src/context/ToolbarView.cpp
+@@ -74,7 +74,9 @@ Context::ToolbarView::ToolbarView( Plasma::Containment* containment, QGraphicsSc
+     setVerticalScrollBarPolicy( Qt::ScrollBarAlwaysOff );
+ 
+     // now we create the toolbar
+-    m_toolbar = new AppletToolbar( containment );
++    m_toolbar = new AppletToolbar(0);
++    scene->addItem(m_toolbar.data());
++    m_toolbar.data()->setContainment( qobject_cast<Context::Containment *>(containment) );
+     m_toolbar.data()->setZValue( m_toolbar.data()->zValue() + 1000 );
+     m_toolbar.data()->setPos( TOOLBAR_X_OFFSET, 0 );
+ 
+@@ -96,7 +98,7 @@ Context::ToolbarView::ToolbarView( Plasma::Containment* containment, QGraphicsSc
+ 
+ Context::ToolbarView::~ToolbarView()
+ {
+-
++    delete m_toolbar.data();
+ }
+ 
+ void
+diff --git a/src/context/toolbar/AppletToolbar.cpp b/src/context/toolbar/AppletToolbar.cpp
+index 0e0deb5..c51762c 100644
+--- a/src/context/toolbar/AppletToolbar.cpp
++++ b/src/context/toolbar/AppletToolbar.cpp
+@@ -67,6 +67,19 @@ Context::AppletToolbar::~AppletToolbar()
+ }
+ 
+ void
++
++Context::AppletToolbar::setContainment( Containment * containment )
++{
++    m_cont = containment;
++}
++
++Context::Containment *
++Context::AppletToolbar::containment() const
++{
++    return m_cont;
++}
++
++void
+ Context::AppletToolbar::resizeEvent( QGraphicsSceneResizeEvent * event )
+ {
+     debug() << "setting layout to" << QRectF( QPointF( 0, 0 ), event->newSize() );
+diff --git a/src/context/toolbar/AppletToolbar.h b/src/context/toolbar/AppletToolbar.h
+index ee8a208..058baae 100644
+--- a/src/context/toolbar/AppletToolbar.h
++++ b/src/context/toolbar/AppletToolbar.h
+@@ -55,6 +55,9 @@ class AppletToolbar : public QGraphicsWidget
+         
+         void appletRemoved( Plasma::Applet* applet );
+ 
++        void setContainment( Containment * containment );
++        Containment* containment() const;
++
+     signals:
+         void showApplet( Plasma::Applet* );
+         void appletAddedToToolbar( Plasma::Applet* applet, int loc );