Rename lastfm.protocol file to amaroklasfm.protocol to avoid collisions with lastfmplayer. Thanks to Michael Weyershäuser in bug #139032.

Package-Manager: portage-2.1.1_pre2-r2

3 files changed, 14 insertions, 93 deletions

diff --git a/media-sound/amarok/Manifest b/media-sound/amarok/Manifest
index 59f151d08973..aea6b146c077 100644
--- a/media-sound/amarok/Manifest
+++ b/media-sound/amarok/Manifest
@@ -16,14 +16,14 @@ EBUILD amarok-1.4.0a-r1.ebuild 2492 RMD160 9d945a7756a04773ed1d782e180561a374e9d
 MD5 4051c2a83503960ab387d032e42b06be amarok-1.4.0a-r1.ebuild 2492
 RMD160 9d945a7756a04773ed1d782e180561a374e9da34 amarok-1.4.0a-r1.ebuild 2492
 SHA256 a0d30ab4295083193ddfe8c616008f5714375e1356cba06afd5940321d7fb356 amarok-1.4.0a-r1.ebuild 2492
-EBUILD amarok-1.4.1.ebuild 2174 RMD160 049770deab32d2aec71ccad686861686686e1c71 SHA1 14c1d6c34a1dcdc3c835ed392076d25942f1aae3 SHA256 2f976e4baf533c49012c331e675b6032cc42858788096f66f88dde51652c633a
-MD5 8e600deb3642c09df01f2e84c861feb4 amarok-1.4.1.ebuild 2174
-RMD160 049770deab32d2aec71ccad686861686686e1c71 amarok-1.4.1.ebuild 2174
-SHA256 2f976e4baf533c49012c331e675b6032cc42858788096f66f88dde51652c633a amarok-1.4.1.ebuild 2174
-MISC ChangeLog 23242 RMD160 5150e419a094deda6cda7a9b3b6236439f2a5365 SHA1 7f0626eafa400a97922c44c67bff2d1639d62f58 SHA256 2e371bafb5b091775343ca70a79758072449a1ad002dffc5dec7e413f4efe368
-MD5 92dace953ab052ca0a69be0dccb01c81 ChangeLog 23242
-RMD160 5150e419a094deda6cda7a9b3b6236439f2a5365 ChangeLog 23242
-SHA256 2e371bafb5b091775343ca70a79758072449a1ad002dffc5dec7e413f4efe368 ChangeLog 23242
+EBUILD amarok-1.4.1-r1.ebuild 2310 RMD160 b3722e1429e6b8b572bf3b5a63ee2051264bbd14 SHA1 a051010412cda418b86bfa5966fc4e3119fdfc6d SHA256 5e69a34bd15a468a52d360501bfcfa016afa10bd2e443a8e09cf5ff519442b50
+MD5 40ea8bdacda19aee595bffbaeed49758 amarok-1.4.1-r1.ebuild 2310
+RMD160 b3722e1429e6b8b572bf3b5a63ee2051264bbd14 amarok-1.4.1-r1.ebuild 2310
+SHA256 5e69a34bd15a468a52d360501bfcfa016afa10bd2e443a8e09cf5ff519442b50 amarok-1.4.1-r1.ebuild 2310
+MISC ChangeLog 23520 RMD160 c64026895a32240fe0419da652d53e277f70b401 SHA1 7120cc89e9e9747f06c912f054c3241744b9ad1c SHA256 adf96f69c880f5bfa7d0fc70b45d614bea752a5444e45524dce65dc1c1fc5c0a
+MD5 92a6fbfb32292934c5766ef31e738670 ChangeLog 23520
+RMD160 c64026895a32240fe0419da652d53e277f70b401 ChangeLog 23520
+SHA256 adf96f69c880f5bfa7d0fc70b45d614bea752a5444e45524dce65dc1c1fc5c0a ChangeLog 23520
 MISC metadata.xml 266 RMD160 3ce35cecb3927850e61ee5bad2e0e4b210c0df3e SHA1 d41658ffae344562e8579d219bd3f746d4cba624 SHA256 c2f316075bb660460a285a5474235615f5946bb47df6e6f0c9c4de9ed64edf26
 MD5 986cc6d7e9a21474e34336045796ffaa metadata.xml 266
 RMD160 3ce35cecb3927850e61ee5bad2e0e4b210c0df3e metadata.xml 266
@@ -34,13 +34,13 @@ SHA256 0904b3a3edc74467df4ec29c59ee0bb684eab9376ad863ab7a74b0323847bc53 files/di
 MD5 cdf1a1729e2f6c8062405c6312459f21 files/digest-amarok-1.4.0a-r1 250
 RMD160 1d3c3510efc7b822b36277d72e3131debd140f0d files/digest-amarok-1.4.0a-r1 250
 SHA256 f3b9961d6146de70b5f5c181f756e63fd23dbafdf7cfc254108ac7d876b304b2 files/digest-amarok-1.4.0a-r1 250
-MD5 ac4c9036a47681634edcf32f28379d66 files/digest-amarok-1.4.1 247
-RMD160 ad434383ba59bf02e36b766bfce2eb5f72329012 files/digest-amarok-1.4.1 247
-SHA256 b6e939431f1b0050daecc1e9ca12099743c1598de46b020aeb6b224aebbad03f files/digest-amarok-1.4.1 247
+MD5 ac4c9036a47681634edcf32f28379d66 files/digest-amarok-1.4.1-r1 247
+RMD160 ad434383ba59bf02e36b766bfce2eb5f72329012 files/digest-amarok-1.4.1-r1 247
+SHA256 b6e939431f1b0050daecc1e9ca12099743c1598de46b020aeb6b224aebbad03f files/digest-amarok-1.4.1-r1 247
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFEqNqJAiZjviIA2XgRAkqoAJsHTH1vb0L4fh8mOAztI54n8m5MtQCfeq9I
-+Ahx1aoA/lfX2t9vZ0PiXFs=
-=UWAQ
+iD8DBQFEqU9hAiZjviIA2XgRAqSEAKDszoLGNk/Yhl28e/A3KSNrjS3j7wCg2onH
+X+Hcd4UJEOdF9COc+6Wi7yA=
+=LdI0
 -----END PGP SIGNATURE-----
diff --git a/media-sound/amarok/amarok-1.4.1.ebuild b/media-sound/amarok/amarok-1.4.1.ebuild
deleted file mode 100644
index 2085faa76262..000000000000
--- a/media-sound/amarok/amarok-1.4.1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-1.4.1.ebuild,v 1.1 2006/07/03 08:50:57 flameeyes Exp $
-
-LANGS="az bg br ca cs cy da de el en_GB es et fi fr ga gl he hi hu is it ja ka
-km ko lt ms nb nl nn pa pl pt pt_BR ro ru rw sl sr sr@Latn sv ta tg th tr uk uz
-zh_CN zh_TW"
-LANGS_DOC="da de es et fr it nl pl pt pt_BR ru sv"
-
-USE_KEG_PACKAGING=1
-
-inherit kde eutils flag-o-matic
-
-PKG_SUFFIX=""
-
-MY_PV="${PV/_rc/_RC}"
-MY_PV="${MY_PV/_beta/-beta}${PKG_SUFFIX}"
-MY_BASE_PV="${MY_PV/_RC*/}"
-MY_BASE_PV="${MY_BASE_PV/-beta*/}"
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-DESCRIPTION="Advanced audio player based on KDE framework."
-HOMEPAGE="http://amarok.kde.org/"
-
-SRC_URI="mirror://sourceforge/amarok/${PN}-${MY_PV}.tar.bz2"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="aac kde mysql noamazon opengl postgres
-xmms visualization musicbrainz ipod ifp real"
-# kde: enables compilation of the konqueror sidebar plugin
-
-DEPEND="kde? ( || ( kde-base/konqueror kde-base/kdebase ) )
-	>=media-libs/xine-lib-1.1.2_pre20060328-r8
-	musicbrainz? ( >=media-libs/tunepimp-0.3 )
-	>=media-libs/taglib-1.4
-	mysql? ( >=dev-db/mysql-4.0.16 )
-	postgres? ( dev-db/postgresql )
-	opengl? ( virtual/opengl )
-	xmms? ( >=media-sound/xmms-1.2 )
-	visualization? ( media-libs/libsdl
-					 =media-plugins/libvisual-plugins-0.4* )
-	ipod? ( media-libs/libgpod )
-	aac? ( media-libs/libmp4v2 )
-	ifp? ( media-libs/libifp )
-	real? ( media-video/realplayer )"
-
-RDEPEND="${DEPEND}
-	dev-lang/ruby"
-
-DEPEND="${DEPEND}
-	>=dev-util/pkgconfig-0.9.0"
-
-need-kde 3.3
-
-src_compile() {
-	append-flags -fno-inline
-
-	# Extra, unsupported engines are forcefully disabled.
-	local myconf="$(use_enable mysql) $(use_enable postgres postgresql)
-				  $(use_with opengl) $(use_with xmms)
-				  $(use_with visualization libvisual)
-				  $(use_enable !noamazon amazon)
-				  $(use_with musicbrainz)
-				  $(use_with ipod libgpod)
-				  $(use_with aac mp4v2)
-				  $(use_with ifp)
-				  $(use_with real helix)
-				  --with-xine
-				  --without-mas
-				  --without-nmm"
-
-	kde_src_compile
-}
-
diff --git a/media-sound/amarok/files/digest-amarok-1.4.1 b/media-sound/amarok/files/digest-amarok-1.4.1
deleted file mode 100644
index 62510a3d95d4..000000000000
--- a/media-sound/amarok/files/digest-amarok-1.4.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 4ed6e766541c4227d1d8c8eb93d0b891 amarok-1.4.1.tar.bz2 13509939
-RMD160 d9df29c2a2a7b81aabb73c66b83190f0bc109094 amarok-1.4.1.tar.bz2 13509939
-SHA256 dbe4397d041a77f7ded063f50d5cfd2faf0e9efce9b4483589f751c20ff89ccd amarok-1.4.1.tar.bz2 13509939