Version bump to 2.7.0. Wrt Matej request on irc.

(Portage version: 2.2.0_alpha151/cvs/Linux x86_64, signed Manifest commit with key 8EEE3BE8)

3 files changed, 9 insertions, 44 deletions

diff --git a/media-sound/amarok/ChangeLog b/media-sound/amarok/ChangeLog
index 5106386c1435..e5610f787773 100644
--- a/media-sound/amarok/ChangeLog
+++ b/media-sound/amarok/ChangeLog
@@ -1,6 +1,12 @@
 # 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.441 2013/01/14 04:27:48 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.442 2013/01/18 12:48:03 scarabeus Exp $
+
+*amarok-2.7.0 (18 Jan 2013)
+
+  18 Jan 2013; Tomáš Chvátal <scarabeus@gentoo.org> +amarok-2.7.0.ebuild,
+  -amarok-2.6.90.ebuild, -files/amarok-2.6.90-fix-crash-lastfm.patch:
+  Version bump to 2.7.0. Wrt Matej request on irc.
 
   14 Jan 2013; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
   +files/amarok-2.6.90-fix-crash-lastfm.patch, amarok-2.6.90.ebuild:
diff --git a/media-sound/amarok/amarok-2.6.90.ebuild b/media-sound/amarok/amarok-2.7.0.ebuild
index 46f0f1b65d98..0b336cc122f7 100644
--- a/media-sound/amarok/amarok-2.6.90.ebuild
+++ b/media-sound/amarok/amarok-2.7.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.6.90.ebuild,v 1.2 2013/01/14 04:27:48 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.7.0.ebuild,v 1.1 2013/01/18 12:48:03 scarabeus Exp $
 
 EAPI=4
 
@@ -13,7 +13,7 @@ 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/unstable/${PN}/${PV}/src/${P}.tar.bz2"
+	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.bz2"
 	KEYWORDS="~amd64 ~ppc ~x86"
 else
 	KEYWORDS=""
@@ -71,13 +71,6 @@ RDEPEND="${COMMONDEPEND}
 	$(add_kdebase_dep phonon-kde)
 "
 
-# Reworked patch to apply cleanly on 2.6.90
-# commit 68f90970f51015b9410b0786fa4d861089ccd413
-# by Matěj Laitl <matej@laitl.cz>
-PATCHES=(
-	"${FILESDIR}/${P}-fix-crash-lastfm.patch"
-)
-
 src_configure() {
 	# Append minimal-toc cflag for ppc64, see bug 280552 and 292707
 	use ppc64 && append-flags -mminimal-toc
diff --git a/media-sound/amarok/files/amarok-2.6.90-fix-crash-lastfm.patch b/media-sound/amarok/files/amarok-2.6.90-fix-crash-lastfm.patch
deleted file mode 100644
index b298c92937ab..000000000000
--- a/media-sound/amarok/files/amarok-2.6.90-fix-crash-lastfm.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-commit 68f90970f51015b9410b0786fa4d861089ccd413
-Author: Matěj Laitl <matej@laitl.cz>
-Date:   Sat Dec 15 23:17:45 2012 +0100
-
-    ServiceBase::setModel(): prevent crash triggered by Last.fm rewrite
-    
-    BUGFIXES:
-     * Prevent crash in ServiceBase::setModel triggered by Last.fm rewrite.
-    
-    Lukáši, please test the patch so that we have no fear releasing 2.7
-    final.
-    
-    BUG: 311723
-    FIXED-IN: 2.7
-
-diff -urN a/amarok-2.6.90/src/services/ServiceBase.cpp b/amarok-2.6.90/src/services/ServiceBase.cpp
---- a/amarok-2.6.90/src/services/ServiceBase.cpp
-+++ b/amarok-2.6.90/src/services/ServiceBase.cpp
-@@ -173,10 +173,9 @@ ServiceBase::itemActivated ( const QModelIndex & index )
- void
- ServiceBase::setModel( QAbstractItemModel * model )
- {
--    //m_filterModel->setSourceModel( model );
--    //m_contentView->setModel( m_filterModel );
--    m_contentView->setModel( model );
--    m_model  = model;
-+    if( m_contentView )
-+        m_contentView->setModel( model );
-+    m_model = model;
- }
- 
- QAbstractItemModel *
-
-