Add patch from Markus Kaufhold in KDE bug #127388 to fix audiocd playing with xine engine.

Package-Manager: portage-2.1_rc1-r1

3 files changed, 18 insertions, 99 deletions

diff --git a/media-sound/amarok/Manifest b/media-sound/amarok/Manifest
index 1a7722433d12..da2427ffe695 100644
--- a/media-sound/amarok/Manifest
+++ b/media-sound/amarok/Manifest
@@ -1,20 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX amarok-1.4.0-audiocd.patch 606 RMD160 941a70b1233d629d061e15aa564631417a1190a6 SHA1 d781e5d6fb7cb5523d29ebf551e63d4efb2e7e8f SHA256 05d066c039fc28eb5edf412d6c29d8ebd8336845e082b0f8b07dd7f5e2aeaa8a size 606
+MD5 13bb43a6851365b3502a83dfd0286901 files/amarok-1.4.0-audiocd.patch 606
+RMD160 941a70b1233d629d061e15aa564631417a1190a6 files/amarok-1.4.0-audiocd.patch 606
+SHA256 05d066c039fc28eb5edf412d6c29d8ebd8336845e082b0f8b07dd7f5e2aeaa8a files/amarok-1.4.0-audiocd.patch 606
 DIST amarok-1.3.8.tar.bz2 8728423 RMD160 14c5e38a515b4ebb11dd93f74511fa2f6247809b SHA256 6159837fd52c56bd00855cdd8ae8ba85f803572571ebb86efb01bf36e898a0a1 size 8728423
 DIST amarok-1.4.0.tar.bz2 12900236 RMD160 bdc10c80c4a94a42ffdd0b22da12e7b2710a9772 SHA256 376de34693c1128a0c34ac7d9bded7a1217f67bfb31bda79a520216e4a22afb8 size 12900236
 EBUILD amarok-1.3.8.ebuild 3848 RMD160 c6c5124840c076ec2e85cd1e2abc5d509429f578 SHA1 563fce342fbb53304765d222c18af69618995f10 SHA256 3724dc0d40224e832639c05f4e2eaafd16b08d71bf03a4edef36db55f4a27fbb size 3848
 MD5 e5331d004269117991b9f31ef5de1623 amarok-1.3.8.ebuild 3848
 RMD160 c6c5124840c076ec2e85cd1e2abc5d509429f578 amarok-1.3.8.ebuild 3848
 SHA256 3724dc0d40224e832639c05f4e2eaafd16b08d71bf03a4edef36db55f4a27fbb amarok-1.3.8.ebuild 3848
-EBUILD amarok-1.4.0.ebuild 2451 RMD160 f2c3349a7f4593ddb5f94672c27f6bcf8f338476 SHA1 d2696c649c98a5898b58a4a065b22577f8bed49d SHA256 7030493d0cc4f8307d8eb3d5ca0720eb7160a2efea89fbbea978a2829e38360f size 2451
-MD5 d7c432a25d0cf1dce1fec5282193d8a2 amarok-1.4.0.ebuild 2451
-RMD160 f2c3349a7f4593ddb5f94672c27f6bcf8f338476 amarok-1.4.0.ebuild 2451
-SHA256 7030493d0cc4f8307d8eb3d5ca0720eb7160a2efea89fbbea978a2829e38360f amarok-1.4.0.ebuild 2451
-MISC ChangeLog 21363 RMD160 97f881dbf31f9711171a3a03d1c8a561be58ac23 SHA1 bc929dfac064bfd07f3d91f578a715645d154285 SHA256 406bec4a5d805f517f4df38082f3f7bbdca3402606146946ac9985880750697a size 21363
-MD5 1b61580b4f15793bae96c20979078695 ChangeLog 21363
-RMD160 97f881dbf31f9711171a3a03d1c8a561be58ac23 ChangeLog 21363
-SHA256 406bec4a5d805f517f4df38082f3f7bbdca3402606146946ac9985880750697a ChangeLog 21363
+EBUILD amarok-1.4.0-r1.ebuild 2496 RMD160 9bd20a41ccadbf1d414526b3420c806fd910840c SHA1 94014f13c4815cc82cb696d8245df53d5987d8a4 SHA256 c7bbcf67cfad44b66686f3036e0318db39d79ce013580ed24c02118e457fcb0f size 2496
+MD5 ec3b75152d1743456d4980f60ec463cd amarok-1.4.0-r1.ebuild 2496
+RMD160 9bd20a41ccadbf1d414526b3420c806fd910840c amarok-1.4.0-r1.ebuild 2496
+SHA256 c7bbcf67cfad44b66686f3036e0318db39d79ce013580ed24c02118e457fcb0f amarok-1.4.0-r1.ebuild 2496
+MISC ChangeLog 21630 RMD160 079d7b439152570c3fc2b6e2d497165c8b753a80 SHA1 4b958bde61d73a3a81c4c4affc2ed3837f788489 SHA256 a918957225853009bca5dfd5271b06b897d6e2907f33426bff975589b5ec88c1 size 21630
+MD5 b9a456d2f03e194fac49b724f0fcdb8e ChangeLog 21630
+RMD160 079d7b439152570c3fc2b6e2d497165c8b753a80 ChangeLog 21630
+SHA256 a918957225853009bca5dfd5271b06b897d6e2907f33426bff975589b5ec88c1 ChangeLog 21630
 MISC metadata.xml 266 RMD160 3ce35cecb3927850e61ee5bad2e0e4b210c0df3e SHA1 d41658ffae344562e8579d219bd3f746d4cba624 SHA256 c2f316075bb660460a285a5474235615f5946bb47df6e6f0c9c4de9ed64edf26 size 266
 MD5 986cc6d7e9a21474e34336045796ffaa metadata.xml 266
 RMD160 3ce35cecb3927850e61ee5bad2e0e4b210c0df3e metadata.xml 266
@@ -22,13 +26,13 @@ SHA256 c2f316075bb660460a285a5474235615f5946bb47df6e6f0c9c4de9ed64edf26 metadata
 MD5 c9356df38468f5d54a80b65120d6671a files/digest-amarok-1.3.8 244
 RMD160 d32b5bd06c970f017e1232a4ab28cd91ae330549 files/digest-amarok-1.3.8 244
 SHA256 0904b3a3edc74467df4ec29c59ee0bb684eab9376ad863ab7a74b0323847bc53 files/digest-amarok-1.3.8 244
-MD5 b9731c14ae095b563049aa963c1af7af files/digest-amarok-1.4.0 247
-RMD160 c602463cf5c904cfabef4447d5793b87dbd55f99 files/digest-amarok-1.4.0 247
-SHA256 45c895c9238952acc3357153aed0df305c77183f5a13bc53c3c2d48eb1b41612 files/digest-amarok-1.4.0 247
+MD5 b9731c14ae095b563049aa963c1af7af files/digest-amarok-1.4.0-r1 247
+RMD160 c602463cf5c904cfabef4447d5793b87dbd55f99 files/digest-amarok-1.4.0-r1 247
+SHA256 45c895c9238952acc3357153aed0df305c77183f5a13bc53c3c2d48eb1b41612 files/digest-amarok-1.4.0-r1 247
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEaJ/cAiZjviIA2XgRApvsAJ95x4uIh2wjT5UeDJTJg/QwQy/7AQCdECqU
-pOWaySJS1zhocABuBqIYK0k=
-=6qZW
+iD8DBQFEaPQdAiZjviIA2XgRAvKRAJ48HAs3o6YxpUcv80CYOT/jxOZkLACdHQ5B
+IXJ4vVVYCK4ciyjE/8zvWR0=
+=qdP+
 -----END PGP SIGNATURE-----
diff --git a/media-sound/amarok/amarok-1.4.0.ebuild b/media-sound/amarok/amarok-1.4.0.ebuild
deleted file mode 100644
index c2130ac99d7e..000000000000
--- a/media-sound/amarok/amarok-1.4.0.ebuild
+++ /dev/null
@@ -1,82 +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.0.ebuild,v 1.2 2006/05/15 15:35:37 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
-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}"
-S="${WORKDIR}/${PN}-${MY_PV/_RC*/}"
-
-DESCRIPTION="amaroK - the audio player for KDE."
-HOMEPAGE="http://amarok.kde.org/"
-
-if [[ ${MY_PV} == ${MY_PV/_RC*/} ]]; then
-#	SRC_URI="mirror://sourceforge/amarok/${PN}-${MY_PV}.tar.bz2"
-	SRC_URI="mirror://gentoo/${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"
-IUSE="aac exscalibar flac 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_rc4
-	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.2 )
-	ipod? ( media-libs/libgpod )
-	aac? ( media-libs/libmp4v2 )
-	exscalibar? ( media-libs/exscalibar )
-	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 exscalibar)
-				  $(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.0 b/media-sound/amarok/files/digest-amarok-1.4.0
deleted file mode 100644
index eda3a290db41..000000000000
--- a/media-sound/amarok/files/digest-amarok-1.4.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 d716442c46a4446954492d1016f8af02 amarok-1.4.0.tar.bz2 12900236
-RMD160 bdc10c80c4a94a42ffdd0b22da12e7b2710a9772 amarok-1.4.0.tar.bz2 12900236
-SHA256 376de34693c1128a0c34ac7d9bded7a1217f67bfb31bda79a520216e4a22afb8 amarok-1.4.0.tar.bz2 12900236