Add patch to fix bug #157752 thanks to Grant McDorman for reporting; correct dependen...

Package-Manager: portage-2.1.2_rc3-r9

diff --git a/media-sound/amarok/Manifest b/media-sound/amarok/Manifest
index b68a987e7d7a83da72309662d914d10e7f6b4643..7c208cf1ab32e7960a7d927a4889ec72b2f152b9 100644 (file)
--- a/media-sound/amarok/Manifest
+++ b/media-sound/amarok/Manifest
@@ -5,48 +5,21 @@ AUX amarok-1.4.3-playlist-encoding.patch 365 RMD160 5add54202bcc34ad1d695b938c07
 MD5 0e211053265ad86a0f6656c07463b43a files/amarok-1.4.3-playlist-encoding.patch 365
 RMD160 5add54202bcc34ad1d695b938c075dd030bf6705 files/amarok-1.4.3-playlist-encoding.patch 365
 SHA256 71ac78fbac11d404017ab1c9a942b0b72ac24638739498ca6f761298a906b11d files/amarok-1.4.3-playlist-encoding.patch 365
-AUX amarok-1.4.4-asneeded.patch 913 RMD160 741f0922030462bc532dfc9936e6ba5feb5e5f46 SHA1 8e5dbc4ab532558fa36ac89639c6f7fb81ab72b7 SHA256 578181192829e82892ab75ae0944f8547bf35e0d203a46c8ad2a111bd33bcb30
-MD5 b62b6de4b6c4fd25c70ef2578b32d37a files/amarok-1.4.4-asneeded.patch 913
-RMD160 741f0922030462bc532dfc9936e6ba5feb5e5f46 files/amarok-1.4.4-asneeded.patch 913
-SHA256 578181192829e82892ab75ae0944f8547bf35e0d203a46c8ad2a111bd33bcb30 files/amarok-1.4.4-asneeded.patch 913
-AUX amarok-1.4.4-lastfm+xine-lib-1.1.3.patch 1204 RMD160 f6b2fcd7512a94943cca13865ba16cc400c3b73e SHA1 8b3fd4b7ff8d3705e8b995780b95edae0eaa7334 SHA256 6af69567fa879f4158bf1d8add56ee3c64a157674e344906b6c4689ce6c0f24c
-MD5 a6f6df181f4cc032a9d53057a94692c4 files/amarok-1.4.4-lastfm+xine-lib-1.1.3.patch 1204
-RMD160 f6b2fcd7512a94943cca13865ba16cc400c3b73e files/amarok-1.4.4-lastfm+xine-lib-1.1.3.patch 1204
-SHA256 6af69567fa879f4158bf1d8add56ee3c64a157674e344906b6c4689ce6c0f24c files/amarok-1.4.4-lastfm+xine-lib-1.1.3.patch 1204
-AUX amarok-1.4.4-musicbrainz.patch 689 RMD160 29603a73a4f3b7b95763fe4aadb5840b8c2dad53 SHA1 89ddce92308186f7544e8dc7c12b9211eed13a5f SHA256 bcfdc90e0ec0f22816ed6a7777a507b0368f1bd3cf949207488ed416b452a864
-MD5 e9751b4bc77b342662cdd9c9191ee058 files/amarok-1.4.4-musicbrainz.patch 689
-RMD160 29603a73a4f3b7b95763fe4aadb5840b8c2dad53 files/amarok-1.4.4-musicbrainz.patch 689
-SHA256 bcfdc90e0ec0f22816ed6a7777a507b0368f1bd3cf949207488ed416b452a864 files/amarok-1.4.4-musicbrainz.patch 689
-AUX amarok-1.4.4-podcast-fix.patch 1149 RMD160 f2c7a47f36bd06788ffefa697a0b5264933a0b49 SHA1 72ab2f91b307e1bf7274b17e8ebdb35eb7a84114 SHA256 b595d0009d7c60e1631004348b3ceadcb8539e69ef83573d02b2547b9ad4bfe4
-MD5 78734806316aa6acc2b742334cfdadfd files/amarok-1.4.4-podcast-fix.patch 1149
-RMD160 f2c7a47f36bd06788ffefa697a0b5264933a0b49 files/amarok-1.4.4-podcast-fix.patch 1149
-SHA256 b595d0009d7c60e1631004348b3ceadcb8539e69ef83573d02b2547b9ad4bfe4 files/amarok-1.4.4-podcast-fix.patch 1149
-AUX amarok-1.4.4-sparc.patch 403 RMD160 1b8c951dd338eefa2fbfa0b88fc508e147041eca SHA1 161baeb1308c94f4702ba61795f596ae295910ae SHA256 3aa352e11290dd9d073a26b68842e38b10763c5134fd259b06c94fb5e4b5dc02
-MD5 56cfb8af9130d2755de9942a8e9d8a55 files/amarok-1.4.4-sparc.patch 403
-RMD160 1b8c951dd338eefa2fbfa0b88fc508e147041eca files/amarok-1.4.4-sparc.patch 403
-SHA256 3aa352e11290dd9d073a26b68842e38b10763c5134fd259b06c94fb5e4b5dc02 files/amarok-1.4.4-sparc.patch 403
 DIST amarok-1.4.3.tar.bz2 17175603 RMD160 287d6652868f50023d8602941fdc99aed5296d22 SHA1 624b5f9fd74ead1c0e75f7d8f935abcaf0313e70 SHA256 e9f6d8728d1c49467a2b72232c7ce907621e8e3792aa7dd9f206985b1450a847
+DIST amarok-1.4.4-gentoo.tar.bz2 2830 RMD160 75c42ba3bab6aa363aa71bfd17d9532555abc040 SHA1 0a9bb86e197f4af47e17a4aaa5cb82eb4850b49d SHA256 d874db4cd1b63084df4c20b26ef461e95c242579c4d6e4ca80ccff046d149b33
 DIST amarok-1.4.4.tar.bz2 17635707 RMD160 61cd2748ce0111f4ba388a71e9504abb7362b0d7 SHA1 932ab971407172a86746e473a1d1cf6871aea93c SHA256 760d30337cb73c86b9298e5c2c9836b3a753c39805b54f75b1eea82c15e9a0ea
-EBUILD amarok-1.4.3-r1.ebuild 2101 RMD160 5b7fe84275fb2a82c0fe57bfc69dd9e328c89e93 SHA1 4f7b200cf7fa4389797ada8f12a523240821542d SHA256 c292d18ebaa672369f9cc2431fc6665f27fd1e365fe3e43d905a204dea28216f
-MD5 3b1d014c5ece65e1cccca4200f37a54b amarok-1.4.3-r1.ebuild 2101
-RMD160 5b7fe84275fb2a82c0fe57bfc69dd9e328c89e93 amarok-1.4.3-r1.ebuild 2101
-SHA256 c292d18ebaa672369f9cc2431fc6665f27fd1e365fe3e43d905a204dea28216f amarok-1.4.3-r1.ebuild 2101
-EBUILD amarok-1.4.4-r1.ebuild 2292 RMD160 504d5a98fc38436e8116ed7d2382803387832204 SHA1 6099b57bb1726089ca6c68d154f5d58d15c440fe SHA256 afad829852af688348275297f85155b4c42298b1b94177d42887328d532be1ac
-MD5 b536acf7bd5c158ec5d297f7e10b5c1b amarok-1.4.4-r1.ebuild 2292
-RMD160 504d5a98fc38436e8116ed7d2382803387832204 amarok-1.4.4-r1.ebuild 2292
-SHA256 afad829852af688348275297f85155b4c42298b1b94177d42887328d532be1ac amarok-1.4.4-r1.ebuild 2292
-EBUILD amarok-1.4.4-r2.ebuild 2356 RMD160 2f6ff7c866d2f78c597b566f7f5a2b0c46a379f9 SHA1 2887dd68a0409a4756758339e891baf58585a6c5 SHA256 ddf007e6186a82dbb2b97fcd1e22951d0c57bf846b776543494ff3020dfc3882
-MD5 c5b1b4349a3bd2717c68c42db27e58f7 amarok-1.4.4-r2.ebuild 2356
-RMD160 2f6ff7c866d2f78c597b566f7f5a2b0c46a379f9 amarok-1.4.4-r2.ebuild 2356
-SHA256 ddf007e6186a82dbb2b97fcd1e22951d0c57bf846b776543494ff3020dfc3882 amarok-1.4.4-r2.ebuild 2356
-EBUILD amarok-1.4.4.ebuild 2215 RMD160 8199dca69ca68a0ec2223d198a08fa558568dd11 SHA1 e6a135fc0756781885e096bb930d493ea5eb4a4d SHA256 a98c2b0f4dd378b626be255f44e458720aa1245473ba709bb3865e4552cd4a0d
-MD5 d47f708aa6a827e0d6241a0d9daee811 amarok-1.4.4.ebuild 2215
-RMD160 8199dca69ca68a0ec2223d198a08fa558568dd11 amarok-1.4.4.ebuild 2215
-SHA256 a98c2b0f4dd378b626be255f44e458720aa1245473ba709bb3865e4552cd4a0d amarok-1.4.4.ebuild 2215
-MISC ChangeLog 30145 RMD160 454694295f95c0c3bc699cac467891ae529e0cc1 SHA1 58191a9e19b76fd5457609d2d73e06a8297d6017 SHA256 5a98ae22307683c53f3ad11bb4463282efcf88317173421ea3a7dc31f7bcb06c
-MD5 d537876971f9204db04f952b66fc7d15 ChangeLog 30145
-RMD160 454694295f95c0c3bc699cac467891ae529e0cc1 ChangeLog 30145
-SHA256 5a98ae22307683c53f3ad11bb4463282efcf88317173421ea3a7dc31f7bcb06c ChangeLog 30145
+EBUILD amarok-1.4.3-r1.ebuild 2101 RMD160 1f5f9a3f6196cada0c991cf49bfaef4f2e1d4730 SHA1 2e00ef3c4cb616f6452c74bb2d9c281033520d18 SHA256 1fa7844ed89fcb170d9477031eed546c34e0b9a762a21aca41d42f7eb1d2a035
+MD5 92afad9b9a442e3e05ed835f67ee5517 amarok-1.4.3-r1.ebuild 2101
+RMD160 1f5f9a3f6196cada0c991cf49bfaef4f2e1d4730 amarok-1.4.3-r1.ebuild 2101
+SHA256 1fa7844ed89fcb170d9477031eed546c34e0b9a762a21aca41d42f7eb1d2a035 amarok-1.4.3-r1.ebuild 2101
+EBUILD amarok-1.4.4-r3.ebuild 2166 RMD160 6d04fafb49b52fec7f3faadc8574e84ab62f0d71 SHA1 196142d2c67af7bfe85e44b5c5a75cefb97c509f SHA256 be1ebb4541966fbb11f0480770add03762f731bb93b3eab310a94a31ed7e6d6e
+MD5 6359a22a2f8834cbfdbcf7e4b36128f2 amarok-1.4.4-r3.ebuild 2166
+RMD160 6d04fafb49b52fec7f3faadc8574e84ab62f0d71 amarok-1.4.4-r3.ebuild 2166
+SHA256 be1ebb4541966fbb11f0480770add03762f731bb93b3eab310a94a31ed7e6d6e amarok-1.4.4-r3.ebuild 2166
+MISC ChangeLog 30802 RMD160 89bbc7c02b167c126565b55c0b3c8728a92ab8db SHA1 b4bc3edf215ecae4c40ccb652ef29ea9833a8183 SHA256 2f444744c304245897122c6f592b2af70c74279b0ca44af17b5e827f6ea0e695
+MD5 3aa59854bd32fdae51f59e29d406abcc ChangeLog 30802
+RMD160 89bbc7c02b167c126565b55c0b3c8728a92ab8db ChangeLog 30802
+SHA256 2f444744c304245897122c6f592b2af70c74279b0ca44af17b5e827f6ea0e695 ChangeLog 30802
 MISC metadata.xml 266 RMD160 3ce35cecb3927850e61ee5bad2e0e4b210c0df3e SHA1 d41658ffae344562e8579d219bd3f746d4cba624 SHA256 c2f316075bb660460a285a5474235615f5946bb47df6e6f0c9c4de9ed64edf26
 MD5 986cc6d7e9a21474e34336045796ffaa metadata.xml 266
 RMD160 3ce35cecb3927850e61ee5bad2e0e4b210c0df3e metadata.xml 266
@@ -54,19 +27,13 @@ SHA256 c2f316075bb660460a285a5474235615f5946bb47df6e6f0c9c4de9ed64edf26 metadata
 MD5 ecfb45bf9511daa1e0894c64f2ff6112 files/digest-amarok-1.4.3-r1 247
 RMD160 8eb0e628f823ab06d97dab32bc6a1e3476c37871 files/digest-amarok-1.4.3-r1 247
 SHA256 30a763884b75f16b9a733b1eeb468f2316f2b6ae1e7500459463fee5cbd94493 files/digest-amarok-1.4.3-r1 247
-MD5 9f156ab461bfba79010fb33bc4ad4fe5 files/digest-amarok-1.4.4 247
-RMD160 29ee4c16ee0ddf9601876f19a0d5da8363bc2bab files/digest-amarok-1.4.4 247
-SHA256 f64c0ac76dac35f78b85d46ff97aa000a0ccdeedac69dfc7f0259c28fb81acac files/digest-amarok-1.4.4 247
-MD5 9f156ab461bfba79010fb33bc4ad4fe5 files/digest-amarok-1.4.4-r1 247
-RMD160 29ee4c16ee0ddf9601876f19a0d5da8363bc2bab files/digest-amarok-1.4.4-r1 247
-SHA256 f64c0ac76dac35f78b85d46ff97aa000a0ccdeedac69dfc7f0259c28fb81acac files/digest-amarok-1.4.4-r1 247
-MD5 9f156ab461bfba79010fb33bc4ad4fe5 files/digest-amarok-1.4.4-r2 247
-RMD160 29ee4c16ee0ddf9601876f19a0d5da8363bc2bab files/digest-amarok-1.4.4-r2 247
-SHA256 f64c0ac76dac35f78b85d46ff97aa000a0ccdeedac69dfc7f0259c28fb81acac files/digest-amarok-1.4.4-r2 247
+MD5 09d4216c683d6a633f4c8fb6dfe73719 files/digest-amarok-1.4.4-r3 503
+RMD160 f2b5a9cb52037ec05f9aafc0ce89015d9ca015a2 files/digest-amarok-1.4.4-r3 503
+SHA256 5684c57a46c61c81e4eb0204bdfd7b6baf02dd2e5f3613a76b1876d812fd5b23 files/digest-amarok-1.4.4-r3 503
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5-ecc0.1.6 (GNU/Linux)
+Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFFcJC/KRy60XGEcJIRAun/AKCfNM3BtbCJkG9tjly980GZIdOigQCfZwwZ
-BA2IOB7TazgYD9fq8As88GQ=
-=edDa
+iD8DBQFFjAKCAiZjviIA2XgRAvU+AKCEb53m/qaYTMaYyox2S+Ya07FqfwCdFZwm
+dz6OOtraIxxMN4+fI+0FtDw=
+=KcbP
 -----END PGP SIGNATURE-----

diff --git a/media-sound/amarok/amarok-1.4.4-r1.ebuild b/media-sound/amarok/amarok-1.4.4-r1.ebuild
deleted file mode 100644 (file)
index 798a3e9..0000000
--- a/media-sound/amarok/amarok-1.4.4-r1.ebuild
+++ /dev/null
@@ -1,80 +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.4-r1.ebuild,v 1.2 2006/11/30 22:34:41 mabi Exp $
-
-LANGS="af ar 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 sk sl sq 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_P="${P/_/-}"
-S="${WORKDIR}/${P/_/-}"
-
-DESCRIPTION="Advanced audio player based on KDE framework."
-HOMEPAGE="http://amarok.kde.org/"
-
-SRC_URI="mirror://kde/stable/amarok/${PV}/src/${MY_P}.tar.bz2"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
-IUSE="aac kde mysql noamazon opengl postgres
-visualization ipod ifp real njb mtp musicbrainz"
-# 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
-       >=media-libs/taglib-1.4
-       mysql? ( >=virtual/mysql-4.0 )
-       postgres? ( dev-db/postgresql )
-       opengl? ( virtual/opengl )
-       visualization? ( media-libs/libsdl
-                                        =media-plugins/libvisual-plugins-0.4* )
-       ipod? ( >=media-libs/libgpod-0.3 )
-       aac? ( media-libs/libmp4v2 )
-       ifp? ( media-libs/libifp )
-       real? ( media-video/realplayer )
-       njb? ( >=media-libs/libnjb-2.2.4 )
-       mtp? ( media-libs/libmtp )
-       musicbrainz? ( media-libs/tunepimp )
-       =dev-lang/ruby-1.8*"
-
-RDEPEND="${DEPEND}"
-
-DEPEND="${DEPEND}
-       >=dev-util/pkgconfig-0.9.0"
-
-need-kde 3.3
-
-PATCHES="${FILESDIR}/${P}-podcast-fix.patch
-       ${FILESDIR}/${P}-sparc.patch
-       ${FILESDIR}/${P}-asneeded.patch
-       ${FILESDIR}/${P}-musicbrainz.patch"
-
-src_compile() {
-       append-flags -fno-inline
-
-       # Extra, unsupported engines are forcefully disabled.
-       local myconf="$(use_enable mysql) $(use_enable postgres postgresql)
-                                 $(use_with opengl) --without-xmms
-                                 $(use_with visualization libvisual)
-                                 $(use_enable !noamazon amazon)
-                                 $(use_with ipod libgpod)
-                                 $(use_with aac mp4v2)
-                                 $(use_with ifp)
-                                 $(use_with real helix)
-                                 $(use_with njb libnjb)
-                                 $(use_with mtp libmtp)
-                                 $(use_with musicbrainz)
-                                 --with-xine
-                                 --without-mas
-                                 --without-nmm"
-
-       kde_src_compile
-}

diff --git a/media-sound/amarok/amarok-1.4.4-r2.ebuild b/media-sound/amarok/amarok-1.4.4-r2.ebuild
deleted file mode 100644 (file)
index e950343..0000000
--- a/media-sound/amarok/amarok-1.4.4-r2.ebuild
+++ /dev/null
@@ -1,81 +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.4-r2.ebuild,v 1.4 2006/12/01 20:29:39 gustavoz Exp $
-
-LANGS="af ar 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 sk sl sq 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_P="${P/_/-}"
-S="${WORKDIR}/${P/_/-}"
-
-DESCRIPTION="Advanced audio player based on KDE framework."
-HOMEPAGE="http://amarok.kde.org/"
-
-SRC_URI="mirror://kde/stable/amarok/${PV}/src/${MY_P}.tar.bz2"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="aac kde mysql noamazon opengl postgres
-visualization ipod ifp real njb mtp musicbrainz"
-# 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
-       >=media-libs/taglib-1.4
-       mysql? ( >=virtual/mysql-4.0 )
-       postgres? ( dev-db/postgresql )
-       opengl? ( virtual/opengl )
-       visualization? ( media-libs/libsdl
-                                        =media-plugins/libvisual-plugins-0.4* )
-       ipod? ( >=media-libs/libgpod-0.3 )
-       aac? ( media-libs/libmp4v2 )
-       ifp? ( media-libs/libifp )
-       real? ( media-video/realplayer )
-       njb? ( >=media-libs/libnjb-2.2.4 )
-       mtp? ( media-libs/libmtp )
-       musicbrainz? ( media-libs/tunepimp )
-       =dev-lang/ruby-1.8*"
-
-RDEPEND="${DEPEND}"
-
-DEPEND="${DEPEND}
-       >=dev-util/pkgconfig-0.9.0"
-
-need-kde 3.3
-
-PATCHES="${FILESDIR}/${P}-podcast-fix.patch
-       ${FILESDIR}/${P}-sparc.patch
-       ${FILESDIR}/${P}-asneeded.patch
-       ${FILESDIR}/${P}-musicbrainz.patch
-       ${FILESDIR}/${P}-lastfm+xine-lib-1.1.3.patch"
-
-src_compile() {
-       append-flags -fno-inline
-
-       # Extra, unsupported engines are forcefully disabled.
-       local myconf="$(use_enable mysql) $(use_enable postgres postgresql)
-                                 $(use_with opengl) --without-xmms
-                                 $(use_with visualization libvisual)
-                                 $(use_enable !noamazon amazon)
-                                 $(use_with ipod libgpod)
-                                 $(use_with aac mp4v2)
-                                 $(use_with ifp)
-                                 $(use_with real helix)
-                                 $(use_with njb libnjb)
-                                 $(use_with mtp libmtp)
-                                 $(use_with musicbrainz)
-                                 --with-xine
-                                 --without-mas
-                                 --without-nmm"
-
-       kde_src_compile
-}

diff --git a/media-sound/amarok/amarok-1.4.4.ebuild b/media-sound/amarok/amarok-1.4.4.ebuild
deleted file mode 100644 (file)
index ff44c63..0000000
--- a/media-sound/amarok/amarok-1.4.4.ebuild
+++ /dev/null
@@ -1,78 +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.4.ebuild,v 1.9 2006/11/23 17:40:51 vivo Exp $
-
-LANGS="af ar 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 sk sl sq 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_P="${P/_/-}"
-S="${WORKDIR}/${P/_/-}"
-
-DESCRIPTION="Advanced audio player based on KDE framework."
-HOMEPAGE="http://amarok.kde.org/"
-
-SRC_URI="mirror://kde/stable/amarok/${PV}/src/${MY_P}.tar.bz2"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="aac kde mysql noamazon opengl postgres
-visualization ipod ifp real njb mtp"
-# 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
-       >=media-libs/taglib-1.4
-       mysql? ( >=virtual/mysql-4.0 )
-       postgres? ( dev-db/postgresql )
-       opengl? ( virtual/opengl )
-       visualization? ( media-libs/libsdl
-                                        =media-plugins/libvisual-plugins-0.4* )
-       ipod? ( >=media-libs/libgpod-0.3 )
-       aac? ( media-libs/libmp4v2 )
-       ifp? ( media-libs/libifp )
-       real? ( media-video/realplayer )
-       njb? ( >=media-libs/libnjb-2.2.4 )
-       mtp? ( media-libs/libmtp )
-       =dev-lang/ruby-1.8*"
-
-RDEPEND="${DEPEND}"
-
-DEPEND="${DEPEND}
-       >=dev-util/pkgconfig-0.9.0"
-
-need-kde 3.3
-
-PATCHES="${FILESDIR}/${P}-podcast-fix.patch
-       ${FILESDIR}/${P}-sparc.patch
-       ${FILESDIR}/${P}-asneeded.patch"
-
-src_compile() {
-       append-flags -fno-inline
-
-       # Extra, unsupported engines are forcefully disabled.
-       local myconf="$(use_enable mysql) $(use_enable postgres postgresql)
-                                 $(use_with opengl) --without-xmms
-                                 $(use_with visualization libvisual)
-                                 $(use_enable !noamazon amazon)
-                                 $(use_with ipod libgpod)
-                                 $(use_with aac mp4v2)
-                                 $(use_with ifp)
-                                 $(use_with real helix)
-                                 $(use_with njb libnjb)
-                                 $(use_with mtp libmtp)
-                                 --without-musicbrainz
-                                 --with-xine
-                                 --without-mas
-                                 --without-nmm"
-
-       kde_src_compile
-}

diff --git a/media-sound/amarok/files/amarok-1.4.4-asneeded.patch b/media-sound/amarok/files/amarok-1.4.4-asneeded.patch
deleted file mode 100644 (file)
index 90eb2b9..0000000
--- a/media-sound/amarok/files/amarok-1.4.4-asneeded.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: amarok/configure.in.in
-===================================================================
---- amarok/configure.in.in     (revision 606189)
-+++ amarok/configure.in.in     (revision 606190)
-@@ -886,10 +886,10 @@
-         if test "x$have_libgpod" = "xyes"; then
-             ac_cppflags_save=$CPPFLAGS
-             ac_cflags_save=$CFLAGS
--            ac_ldflags_save=$LDFLAGS
-+            ac_libs_save=$LIBS
-             CPPFLAGS="$CPPFLAGS $LIBGPOD_INCLUDES"
-             CFLAGS="$CFLAGS $LIBGPOD_CFLAGS"
--            LDFLAGS="$LDFLAGS $LIBGPOD_LIBS"
-+            LIBS="$LIBS $LIBGPOD_LIBS"
- 
-             AC_CHECK_FUNCS(itdb_track_set_thumbnails, have_libgpod_artwork=yes)
-             AC_CHECK_FUNCS(itdb_get_mountpoint)
-@@ -917,7 +917,7 @@
- 
-             CPPFLAGS=$ac_cppflags_save
-             CFLAGS=$ac_cflags_save
--            LDFLAGS=$ac_ldflags_save
-+            LIBS=$ac_libs_save
-         fi
-     fi
- fi

diff --git a/media-sound/amarok/files/amarok-1.4.4-lastfm+xine-lib-1.1.3.patch b/media-sound/amarok/files/amarok-1.4.4-lastfm+xine-lib-1.1.3.patch
deleted file mode 100644 (file)
index fde2e41..0000000
--- a/media-sound/amarok/files/amarok-1.4.4-lastfm+xine-lib-1.1.3.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Index: amarok-1.4.4/amark/src/amarok_proxy.rb
-===================================================================
---- amarok-1.4.4/amarok/src/amarok_proxy.rb    (revision 609364)
-+++ amarok-1.4.4/amarok/src/amarok_proxy.rb    (revision 609365)
-@@ -117,6 +117,11 @@
-   def cp_to_empty_outward( income, output )
-     myputs "cp_to_empty_outward( income => #{income.inspect}, output => #{output.inspect}"
-     income.each_line do |data|
-+      if data =~ /User-Agent: xine\/([0-9.]+)/
-+        version = $1.split(".").collect { |v| v.to_i }
-+        myputs("Found xine user agent version #{version.join(".")}")
-+        @xineworkaround = ( version[0] <= 1 && version[1] <= 1 && version[2] <= 2 )
-+      end
-       myputs( data )
-       data.chomp!
-       safe_write( output, data )
-@@ -142,7 +147,7 @@
- 
-   def cp_all_inward( income, output )
-     myputs( "cp_all( income => #{income.inspect}, output => #{output.inspect}" )
--    if self.is_a?( LastFM ) and @engine == 'xine-engine'
-+    if self.is_a?( LastFM ) and @xineworkaround
-       myputs( "Using buffer fill workaround." )
-       filler = Array.new( 4096, 0 )
-       safe_write( output, filler ) # HACK: Fill xine's buffer so that xine_open() won't block

diff --git a/media-sound/amarok/files/amarok-1.4.4-musicbrainz.patch b/media-sound/amarok/files/amarok-1.4.4-musicbrainz.patch
deleted file mode 100644 (file)
index 76af067..0000000
--- a/media-sound/amarok/files/amarok-1.4.4-musicbrainz.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: amarok-1.4.4/amarok/src/tagdialog.cpp
-===================================================================
---- amarok-1.4.4.orig/amarok/src/tagdialog.cpp
-+++ amarok-1.4.4/amarok/src/tagdialog.cpp
-@@ -286,6 +286,7 @@ TagDialog::musicbrainzQuery() //SLOT
-     m_mbTrack = m_bundle.url();
-     KTRMLookup* ktrm = new KTRMLookup( m_mbTrack.path(), true );
-     connect( ktrm, SIGNAL( sigResult( KTRMResultList, QString ) ), SLOT( queryDone( KTRMResultList, QString ) ) );
-+    connect( pushButton_cancel, SIGNAL(clicked()), ktrm, SLOT(deleteLater()));
- 
-     pushButton_musicbrainz->setEnabled( false );
-     pushButton_musicbrainz->setText( i18n( "Generating audio fingerprint..." ) );

diff --git a/media-sound/amarok/files/amarok-1.4.4-podcast-fix.patch b/media-sound/amarok/files/amarok-1.4.4-podcast-fix.patch
deleted file mode 100644 (file)
index 26a5974..0000000
--- a/media-sound/amarok/files/amarok-1.4.4-podcast-fix.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: amarok-1.4.4/amarok/src/playlistbrowseritem.cpp
-===================================================================
---- amarok-1.4.4.orig/amarok/src/playlistbrowseritem.cpp
-+++ amarok-1.4.4/amarok/src/playlistbrowseritem.cpp
-@@ -2051,10 +2051,10 @@ PodcastChannel::episodeExists( const QDo
-         }
- 
-         QString episodeTitle = xml.namedItem( "title" ).toElement().text();
--        QString episodeURL   = xml.namedItem( "enclosure" ).toElement().attribute( "url" );
-+        KURL episodeURL      = xml.namedItem( "enclosure" ).toElement().attribute( "url" );
-         command = QString("SELECT id FROM podcastepisodes WHERE parent='%1' AND url='%2' AND title='%3';")
-                           .arg( CollectionDB::instance()->escapeString( url().url() ),
--                                CollectionDB::instance()->escapeString( episodeURL ),
-+                                CollectionDB::instance()->escapeString( episodeURL.url() ),
-                                 CollectionDB::instance()->escapeString( episodeTitle ) );
-         QStringList values = CollectionDB::instance()->query( command );
-         return !values.isEmpty();

diff --git a/media-sound/amarok/files/amarok-1.4.4-sparc.patch b/media-sound/amarok/files/amarok-1.4.4-sparc.patch
deleted file mode 100644 (file)
index 5cb14ac..0000000
--- a/media-sound/amarok/files/amarok-1.4.4-sparc.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- amarok/src/mediadevice/daap/mongrel/http11/Makefile.am.orig        2006-11-02 23:22:08.000000000 -0800
-+++ amarok/src/mediadevice/daap/mongrel/http11/Makefile.am     2006-11-02 23:22:22.000000000 -0800
-@@ -4,7 +4,7 @@
- 
- amarokrubylib_DATA = http11.rb
- 
--INCLUDES = -I$(ruby_includes) -Dinline=__inline__
-+INCLUDES = -I$(ruby_includes) -Dinline=__inline__ -Dasm=__asm__
- 
- libhttp11_la_LDFLAGS = \
-       -shared \

diff --git a/media-sound/amarok/files/digest-amarok-1.4.4 b/media-sound/amarok/files/digest-amarok-1.4.4
deleted file mode 100644 (file)
index 9f4ed3a..0000000
--- a/media-sound/amarok/files/digest-amarok-1.4.4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 56a9aec42088c338b81252f8e0651781 amarok-1.4.4.tar.bz2 17635707
-RMD160 61cd2748ce0111f4ba388a71e9504abb7362b0d7 amarok-1.4.4.tar.bz2 17635707
-SHA256 760d30337cb73c86b9298e5c2c9836b3a753c39805b54f75b1eea82c15e9a0ea amarok-1.4.4.tar.bz2 17635707

diff --git a/media-sound/amarok/files/digest-amarok-1.4.4-r1 b/media-sound/amarok/files/digest-amarok-1.4.4-r1
deleted file mode 100644 (file)
index 9f4ed3a..0000000
--- a/media-sound/amarok/files/digest-amarok-1.4.4-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 56a9aec42088c338b81252f8e0651781 amarok-1.4.4.tar.bz2 17635707
-RMD160 61cd2748ce0111f4ba388a71e9504abb7362b0d7 amarok-1.4.4.tar.bz2 17635707
-SHA256 760d30337cb73c86b9298e5c2c9836b3a753c39805b54f75b1eea82c15e9a0ea amarok-1.4.4.tar.bz2 17635707

diff --git a/media-sound/amarok/files/digest-amarok-1.4.4-r2 b/media-sound/amarok/files/digest-amarok-1.4.4-r2
deleted file mode 100644 (file)
index 9f4ed3a..0000000
--- a/media-sound/amarok/files/digest-amarok-1.4.4-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 56a9aec42088c338b81252f8e0651781 amarok-1.4.4.tar.bz2 17635707
-RMD160 61cd2748ce0111f4ba388a71e9504abb7362b0d7 amarok-1.4.4.tar.bz2 17635707
-SHA256 760d30337cb73c86b9298e5c2c9836b3a753c39805b54f75b1eea82c15e9a0ea amarok-1.4.4.tar.bz2 17635707