Update to 1.4-beta3c and re-enable helix.

Package-Manager: portage-2.1_pre7-r5

5 files changed, 28 insertions, 31 deletions

diff --git a/media-sound/amarok/ChangeLog b/media-sound/amarok/ChangeLog
index 6bc1c039df4a..141a60fba9ef 100644
--- a/media-sound/amarok/ChangeLog
+++ b/media-sound/amarok/ChangeLog
@@ -1,6 +1,12 @@
 # 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.126 2006/04/11 08:54:06 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.127 2006/04/11 12:56:26 flameeyes Exp $
+
+*amarok-1.4_beta3-r2 (11 Apr 2006)
+
+  11 Apr 2006; Diego Pettenò <flameeyes@gentoo.org>
+  -amarok-1.4_beta3-r1.ebuild, +amarok-1.4_beta3-r2.ebuild:
+  Update to 1.4-beta3c and re-enable helix.
 
   11 Apr 2006; Jason Wever <weeve@gentoo.org> amarok-1.4_beta3-r1.ebuild:
   Added ~sparc keyword wrt bug #129409.
diff --git a/media-sound/amarok/Manifest b/media-sound/amarok/Manifest
index 21be295a91f5..3acced9b6aad 100644
--- a/media-sound/amarok/Manifest
+++ b/media-sound/amarok/Manifest
@@ -1,9 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 4225e56a1683f57f215b8c01e97911d5 ChangeLog 20055
-RMD160 afa9c2550c9caa7c9475de87e64c960fda7502df ChangeLog 20055
-SHA256 8b24ef7837f4fa8ecca1adb3fa4a17be52cb077ff25311c026b267d73d3f6a3c ChangeLog 20055
+MD5 2356492759555490a089503daa49f0e4 ChangeLog 20249
+RMD160 e71f0a4e36c5210f5d3c09d0621a869b3e4fc69c ChangeLog 20249
+SHA256 d1c9ee00e2e8584f1d5b942f9f04a43ff66b68fab500dc4e493dea3ed194f7ad ChangeLog 20249
 MD5 1e105a96a7b5945e07d2e2febbf464a6 amarok-1.3.6.ebuild 3206
 RMD160 5a191332318d240ec23ed6532e96542ced169856 amarok-1.3.6.ebuild 3206
 SHA256 0f0d337d50f5e51832803ef3ef5b15b1b84ef13814d0e35094392bb73b1eeb80 amarok-1.3.6.ebuild 3206
@@ -13,9 +13,9 @@ SHA256 3724dc0d40224e832639c05f4e2eaafd16b08d71bf03a4edef36db55f4a27fbb amarok-1
 MD5 770859b971073d5202c7bbc54131a722 amarok-1.3.9.ebuild 3960
 RMD160 5da873650f7ae180463d48e3478fd1a487e5a0b1 amarok-1.3.9.ebuild 3960
 SHA256 0f302cfd84b408f5a28da5b84cec6d3d37f4d70f192d9d59d792faedc9dce9ab amarok-1.3.9.ebuild 3960
-MD5 b135ea61fa69f87a9fc1b2d7da835bd6 amarok-1.4_beta3-r1.ebuild 2916
-RMD160 e55edf2c10eb7a77093ffed294da1967160d1b9f amarok-1.4_beta3-r1.ebuild 2916
-SHA256 8300ac409b84b887b9ad3904828720e66d3039716d5ab5c815ada3abb16ab930 amarok-1.4_beta3-r1.ebuild 2916
+MD5 75308fe9dd01abb2601fa35d35d44c01 amarok-1.4_beta3-r2.ebuild 2657
+RMD160 3c261a817f797320f686735b4a35305b7103cfc9 amarok-1.4_beta3-r2.ebuild 2657
+SHA256 ea9ca8eca3379f9e27219384cd2d386f59bc69c50a95e790bbb3ca845ab04935 amarok-1.4_beta3-r2.ebuild 2657
 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
@@ -25,16 +25,16 @@ SHA256 9077a159e1b9d0b8da962a219de739c0ae90f5de27dad4c50b84a91b59ec6de0 files/di
 MD5 b594cdfaf854a454d04a51c57d1e1d1d files/digest-amarok-1.3.9 247
 RMD160 8cd8312dd073a9af7f3d299680a936e69aeca314 files/digest-amarok-1.3.9 247
 SHA256 af812465dbb251dc569fea48afbcaf72968f0676cf5c6fd3cdbe695aa318fd47 files/digest-amarok-1.3.9 247
-MD5 b42931b8b4c0ab083da42b00a10dd2e0 files/digest-amarok-1.4_beta3-r1 262
-RMD160 7fd73d6bc3058b58550a6c43456eed525fda6ee2 files/digest-amarok-1.4_beta3-r1 262
-SHA256 359f355ca90f268c5f8274974c948dcf4258d52375f868bb5182271284d8499f files/digest-amarok-1.4_beta3-r1 262
+MD5 248e877bd481e53ba57d7c3f206dee1f files/digest-amarok-1.4_beta3-r2 262
+RMD160 d264b293b3e91986039f9e7508f694bef926e0dd files/digest-amarok-1.4_beta3-r2 262
+SHA256 42dc6160a29379e83e2535fbb21f87c5d4fadf69eec228d7b94a7a4af061dec8 files/digest-amarok-1.4_beta3-r2 262
 MD5 986cc6d7e9a21474e34336045796ffaa metadata.xml 266
 RMD160 3ce35cecb3927850e61ee5bad2e0e4b210c0df3e metadata.xml 266
 SHA256 c2f316075bb660460a285a5474235615f5946bb47df6e6f0c9c4de9ed64edf26 metadata.xml 266
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFEO27FAiZjviIA2XgRAp1PAJoCS7wpbo/R8GyaScEF5//Wfm0dUQCfWaiF
-vKJqjPF2lCqp2/jCkEG+IAQ=
-=lrGs
+iD8DBQFEO6eYAiZjviIA2XgRAga6AKCeGuLcXtVj95MBkRnuxiomO0exgACaAy3d
+iuvaA+HcUQCADMrUD08cGLQ=
+=jhYw
 -----END PGP SIGNATURE-----
diff --git a/media-sound/amarok/amarok-1.4_beta3-r1.ebuild b/media-sound/amarok/amarok-1.4_beta3-r2.ebuild
index fff1af4664d1..86301d624ea6 100644
--- a/media-sound/amarok/amarok-1.4_beta3-r1.ebuild
+++ b/media-sound/amarok/amarok-1.4_beta3-r2.ebuild
@@ -1,6 +1,6 @@
 # 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_beta3-r1.ebuild,v 1.3 2006/04/11 08:54:06 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-1.4_beta3-r2.ebuild,v 1.1 2006/04/11 12:56:26 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 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
@@ -11,7 +11,7 @@ USE_KEG_PACKAGING=1
 
 inherit kde eutils flag-o-matic
 
-PKG_SUFFIX="b"
+PKG_SUFFIX="c"
 
 MY_PV="${PV/_rc/_RC}"
 MY_PV="${MY_PV/_beta/-beta}${PKG_SUFFIX}"
@@ -31,7 +31,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~sparc ~x86"
 IUSE="aac exscalibar flac gstreamer kde mysql noamazon opengl postgres
-xmms visualization musicbrainz ipod akode ifp" # real
+xmms visualization musicbrainz ipod akode ifp real"
 # kde: enables compilation of the konqueror sidebar plugin
 
 DEPEND="kde? ( || ( kde-base/konqueror kde-base/kdebase )
@@ -51,8 +51,8 @@ DEPEND="kde? ( || ( kde-base/konqueror kde-base/kdebase )
 	akode? ( media-libs/akode )
 	aac? ( media-libs/libmp4v2 )
 	exscalibar? ( media-libs/exscalibar )
-	ifp? ( media-libs/libifp )"
-#	real? ( media-video/realplayer )
+	ifp? ( media-libs/libifp )
+	real? ( media-video/realplayer )"
 
 RDEPEND="${DEPEND}
 	dev-lang/ruby"
@@ -62,15 +62,6 @@ DEPEND="${DEPEND}
 
 need-kde 3.3
 
-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() {
 	append-flags -fno-inline
 
@@ -86,10 +77,10 @@ src_compile() {
 				  $(use_with akode)
 				  $(use_with aac mp4v2)
 				  $(use_with ifp)
+				  $(use_with real helix)
 				  --with-xine
 	              --without-mas
 	              --without-nmm"
-#				  $(use_with real helix)
 
 	kde_src_compile
 }
diff --git a/media-sound/amarok/files/digest-amarok-1.4_beta3-r1 b/media-sound/amarok/files/digest-amarok-1.4_beta3-r1
deleted file mode 100644
index d706defc422f..000000000000
--- a/media-sound/amarok/files/digest-amarok-1.4_beta3-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 189744300b2f8c9c8d179ac997294e8d amarok-1.4-beta3b.tar.bz2 12294584
-RMD160 65e2297a7bcaa935dae13b9cdbf699e6a8f940e8 amarok-1.4-beta3b.tar.bz2 12294584
-SHA256 c9cbaf18facfff59df5b8264a57c595c1533714a2488d1909b45bda457a24706 amarok-1.4-beta3b.tar.bz2 12294584
diff --git a/media-sound/amarok/files/digest-amarok-1.4_beta3-r2 b/media-sound/amarok/files/digest-amarok-1.4_beta3-r2
new file mode 100644
index 000000000000..d635fa8fea47
--- /dev/null
+++ b/media-sound/amarok/files/digest-amarok-1.4_beta3-r2
@@ -0,0 +1,3 @@
+MD5 b92433b46005f0b2fc31e0ce0bf4cb3a amarok-1.4-beta3c.tar.bz2 12293775
+RMD160 2fb394e7693a9cb372a6ffdbd815c54d33a9447a amarok-1.4-beta3c.tar.bz2 12293775
+SHA256 4cfe68b2093da2976502e766e45ea81343b90ac3f81150c4f92b7ec06268df01 amarok-1.4-beta3c.tar.bz2 12293775