Version bump, dropped ~ppc ~ppc64 and ~sparc keywords because of missing dependencies. This version will go in ~arch.

(Portage version: 2.1_pre7-r5)

5 files changed, 41 insertions, 23 deletions

diff --git a/media-sound/amarok/ChangeLog b/media-sound/amarok/ChangeLog
index b6936638c393..73633702d559 100644
--- a/media-sound/amarok/ChangeLog
+++ b/media-sound/amarok/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/amarok
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.120 2006/03/27 00:57:00 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.121 2006/04/10 02:28:25 flameeyes Exp $
+
+*amarok-1.4_beta3 (10 Apr 2006)
+
+  10 Apr 2006; Diego Pettenò <flameeyes@gentoo.org>
+  -amarok-1.4_beta2-r1.ebuild, +amarok-1.4_beta3.ebuild:
+  Version bump, dropped ~ppc ~ppc64 and ~sparc keywords because of missing
+  dependencies. This version will go in ~arch.
 
   27 Mar 2006; Diego Pettenò <flameeyes@gentoo.org> amarok-1.3.9.ebuild:
   Restrict mirroring of 1.3.9 release and update digest as the tarball was
diff --git a/media-sound/amarok/Manifest b/media-sound/amarok/Manifest
index 2bcc80cd526b..71191a968d8f 100644
--- a/media-sound/amarok/Manifest
+++ b/media-sound/amarok/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 e0f32991a79ea1493da6327f429edb98 ChangeLog 19080
 RMD160 c96d1a80957fd010c078442a6c0576107f3603ca ChangeLog 19080
 SHA256 85bcaaf660ee75f47ab534d2859ecd57e683ddbdcdc14099819a7147cc222fb7 ChangeLog 19080
@@ -16,6 +13,9 @@ SHA256 0f302cfd84b408f5a28da5b84cec6d3d37f4d70f192d9d59d792faedc9dce9ab amarok-1
 MD5 2aef8d33737fc1248fdfadd9848f58bb amarok-1.4_beta2-r1.ebuild 2952
 RMD160 72ee3d67e433f4316b648ee889537404d8d4eb4c amarok-1.4_beta2-r1.ebuild 2952
 SHA256 61aa35236365a3e8c57e44c33e68969a08ef2b2884969f5a8b3d3e5e52a7f142 amarok-1.4_beta2-r1.ebuild 2952
+MD5 93731f245ef49b25af09414ef3c7cd12 amarok-1.4_beta3.ebuild 3396
+RMD160 2a195abb77a43ebb420fd36aa3af18239ab2064d amarok-1.4_beta3.ebuild 3396
+SHA256 fac4508f4469af5a857e69c43d187f4527dd331ed823931bade9e809eb9b8892 amarok-1.4_beta3.ebuild 3396
 MD5 d8cfb3a78866379e2ac9b439de887551 files/digest-amarok-1.3.6 66
 RMD160 79e1a1bc29d9522e664a3f0988ef0424a89cd5fb files/digest-amarok-1.3.6 66
 SHA256 1724cb7613dce986faa95f8afd7bd13aab23c086a3a5c37b6352a706501239f0 files/digest-amarok-1.3.6 66
@@ -28,13 +28,9 @@ SHA256 af812465dbb251dc569fea48afbcaf72968f0676cf5c6fd3cdbe695aa318fd47 files/di
 MD5 a2cbf713a42feda7eb45a7e0a11959cd files/digest-amarok-1.4_beta2-r1 259
 RMD160 14b33493147f2211c2713352589c0cdbe0b165ad files/digest-amarok-1.4_beta2-r1 259
 SHA256 ad5f2c72401dfc4ee83d8e67c7df8d7fa459aac50350f2f2dc234d23cc41ca5c files/digest-amarok-1.4_beta2-r1 259
+MD5 ae65331e1a0f9c1b5e508a354391a54d files/digest-amarok-1.4_beta3 259
+RMD160 620ace70a1143daebef483b922f1d60204b385cb files/digest-amarok-1.4_beta3 259
+SHA256 17ce71325485656987c6f3932305315240340462059defb70ee3962e7272f7c4 files/digest-amarok-1.4_beta3 259
 MD5 b23600108f12c98a4fd574d3487ee598 metadata.xml 175
 RMD160 b83c98cecf42dee70ceb6176e04d25bd0ca3bb47 metadata.xml 175
 SHA256 bef114df47e8714056f8ba499d57edbba26f1a7e0dbaca7dbfbe4beae4272729 metadata.xml 175
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
-
-iD8DBQFEJzhqAiZjviIA2XgRAiuZAKDBBCIRXANKqVVubTfpmORUH0Y06QCg19ij
-Ej9w8zSs25+shC29DVbKTYU=
-=YN56
------END PGP SIGNATURE-----
diff --git a/media-sound/amarok/amarok-1.4_beta2-r1.ebuild b/media-sound/amarok/amarok-1.4_beta3.ebuild
index b6b66ac55e4a..e962ac309751 100644
--- a/media-sound/amarok/amarok-1.4_beta2-r1.ebuild
+++ b/media-sound/amarok/amarok-1.4_beta3.ebuild
@@ -1,27 +1,33 @@
 # 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_beta2-r1.ebuild,v 1.3 2006/03/15 13:58:23 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-1.4_beta3.ebuild,v 1.1 2006/04/10 02:28:25 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 ko
-lt nb nl nn pa pl pt pt_BR ro ru rw sl sr sr@Latn sv ta tg th tr uk uz xx zh_CN
-zh_TW"
+LANGS="az bg br ca cs cy da de el en_GB es et fi fr ga gl he hi hu is it ja km
+ko lt nb nl nn pa pl pt pt_BR ro ru rw sl sr sr@Latn sv ta tg th tr uk uz xx
+zh_CN zh_TW"
 LANGS_DOC="da de es et fr it nl pt pt_BR ru sv"
 
 USE_KEG_PACKAGING=1
 
 inherit kde eutils flag-o-matic
 
-MY_P="${P/_rc/_RC}"
-MY_P="${MY_P/_beta/-beta}"
-S="${WORKDIR}/${MY_P/_RC*//}"
+MY_PV="${PV/_rc/_RC}"
+MY_PV="${MY_PV/_beta/-beta}"
+S="${WORKDIR}/${PN}-${MY_PV/_RC*/}"
 
 DESCRIPTION="amaroK - the audio player for KDE."
 HOMEPAGE="http://amarok.kde.org/"
-SRC_URI="mirror://sourceforge/amarok/${MY_P}.tar.bz2"
+
+if [[ ${MY_PV} == ${MY_PV/_RC*/} ]]; then
+	SRC_URI="mirror://sourceforge/amarok/${PN}-${MY_PV}.tar.bz2"
+else
+	RESTRICT="nomirror"
+	SRC_URI="http://rokymotion.pwsp.net/nightly-builds/${MY_PV/_RC*/}/${PN}-${MY_PV}.tar.bz2"
+fi
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="aac arts exscalibar flac gstreamer kde mysql noamazon opengl postgres xine
 xmms visualization musicbrainz ipod akode real ifp"
 # kde: enables compilation of the konqueror sidebar plugin
@@ -70,6 +76,15 @@ pkg_setup() {
 	append-flags -fno-inline
 }
 
+src_unpack() {
+	kde_src_unpack
+
+	# On KDE 3.4.x this fails, apply this change that should fix it for
+	# non-3.5.x. Thanks to Pascal Bleser for the info.
+	find "${S}"/doc -name '*.docbook' -print0 | xargs -0 \
+		sed -i -e 's:&RMB;:right mouse button:g'
+}
+
 src_compile() {
 	# Extra, unsupported engines are forcefully disabled.
 	local myconf="$(use_with arts) $(use_with xine)
diff --git a/media-sound/amarok/files/digest-amarok-1.4_beta2-r1 b/media-sound/amarok/files/digest-amarok-1.4_beta2-r1
deleted file mode 100644
index 31563e0256b9..000000000000
--- a/media-sound/amarok/files/digest-amarok-1.4_beta2-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 0c7e2a5e8ea2d73d8e73b986090cfc37 amarok-1.4-beta2.tar.bz2 10102269
-RMD160 a8652dc464f6f38a39120406ac2157f2b24e2168 amarok-1.4-beta2.tar.bz2 10102269
-SHA256 a93f3c7940e07caaa71738300562427c12739e11da27be76b55e93e36febca42 amarok-1.4-beta2.tar.bz2 10102269
diff --git a/media-sound/amarok/files/digest-amarok-1.4_beta3 b/media-sound/amarok/files/digest-amarok-1.4_beta3
new file mode 100644
index 000000000000..2cb57aca7296
--- /dev/null
+++ b/media-sound/amarok/files/digest-amarok-1.4_beta3
@@ -0,0 +1,3 @@
+MD5 38978c3dc252c1ab40033fe94c4bc660 amarok-1.4-beta3.tar.bz2 12198518
+RMD160 c035c5b98446d04ded49fab8b13db4b653b98b0a amarok-1.4-beta3.tar.bz2 12198518
+SHA256 73641c27c5347375e68c255e5479f572bd9d81e2fd3a1af3d4d5787b04abad58 amarok-1.4-beta3.tar.bz2 12198518