Version bump (pre-release), and update also 9999-r1 to have a daap useflag to disable...

Package-Manager: portage-2.1.2-r5

diff --git a/media-sound/amarok/ChangeLog b/media-sound/amarok/ChangeLog
index c65c8fa5b1c6edc533f12973c7a764ad9cc9bcd1..1d2e1f0c53790cae9406fc3e4d12ff8c7716527b 100644 (file)
--- a/media-sound/amarok/ChangeLog
+++ b/media-sound/amarok/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/amarok
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.197 2007/01/31 14:01:19 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.198 2007/02/01 20:44:24 flameeyes Exp $
+
+*amarok-1.4.5 (01 Feb 2007)
+
+  01 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> +amarok-1.4.5.ebuild,
+  amarok-9999-r1.ebuild:
+  Version bump (pre-release), and update also 9999-r1 to have a daap useflag
+  to disable mongrel dependency.
 
   31 Jan 2007; Gustavo Zacarias <gustavoz@gentoo.org>
   amarok-1.4.4-r4.ebuild:

diff --git a/media-sound/amarok/Manifest b/media-sound/amarok/Manifest
index 8ddbaa842b620202e76204b4c56bead09b8392c4..82b374de4f34c4e5d3bb79cdbc49b8736471f870 100644 (file)
--- a/media-sound/amarok/Manifest
+++ b/media-sound/amarok/Manifest
@@ -11,6 +11,7 @@ RMD160 2e6a44eabe8691c209a3beba5764fa9ca59aa43c files/amarok-1.4.4+libgpod-0.4.0
 SHA256 8def3879b8adb5e2e32d4b4f724d4dd2d896791f6cbe99d5fffcb3f128b26b26 files/amarok-1.4.4+libgpod-0.4.0.patch 2738
 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
+DIST amarok-1.4.5.tar.bz2 18034058 RMD160 f8273dbe872421d219cb5fbd4042caf841a51b2b SHA1 f4cb7474c957a976313d1cc283e031fd9c44ede4 SHA256 a9d2214cab085ac9271c31354e0f797887f0a7cb6acd68ccbc7f94a71d805451
 EBUILD amarok-1.4.4-r3.ebuild 2243 RMD160 6b3856d91f5fa823761ef330472a138d62453c65 SHA1 9575ca2fd34d6a62ba6ee4d3bb5bc48f8ea6f2ac SHA256 8572bda6a3a8221652b2c4bb88499a8d04ef5d37a870c94953351a78ef0be0c3
 MD5 88d6fae4f34648898b448df3b67108e9 amarok-1.4.4-r3.ebuild 2243
 RMD160 6b3856d91f5fa823761ef330472a138d62453c65 amarok-1.4.4-r3.ebuild 2243
@@ -19,14 +20,18 @@ EBUILD amarok-1.4.4-r4.ebuild 2632 RMD160 775ec2947a06d4ac66ab193265ea424fbb6558
 MD5 df56d6431d532a811bfb0a960cfa85ed amarok-1.4.4-r4.ebuild 2632
 RMD160 775ec2947a06d4ac66ab193265ea424fbb655808 amarok-1.4.4-r4.ebuild 2632
 SHA256 c15a2633b71cbfea7f4365bf53e98ccd0c21e0653684429215ac339eed2fb3c8 amarok-1.4.4-r4.ebuild 2632
-EBUILD amarok-9999-r1.ebuild 2705 RMD160 8795534ecb6875ee04562fdb3ac548fa5a9ad774 SHA1 815d67ad7764dc4dd18d6301fbbf6c8ed5ced9be SHA256 7667adc8203d7cb4716d269641d751b72a40b92433ea9ff916fd2eb54baf4b1f
-MD5 483669a0028cd472931d6e3d9f123708 amarok-9999-r1.ebuild 2705
-RMD160 8795534ecb6875ee04562fdb3ac548fa5a9ad774 amarok-9999-r1.ebuild 2705
-SHA256 7667adc8203d7cb4716d269641d751b72a40b92433ea9ff916fd2eb54baf4b1f amarok-9999-r1.ebuild 2705
-MISC ChangeLog 32800 RMD160 5f7f022607d355ac4df494d9b9e4e1656709973d SHA1 5f74ccc2e44e104dac65bea2cf53d08aded6ded0 SHA256 42833dad074ea8d89146e89cab24f10c27920951fa8711d7cae0b3d9add097b3
-MD5 6ef478da50bc8583037fdd3b3053d2dc ChangeLog 32800
-RMD160 5f7f022607d355ac4df494d9b9e4e1656709973d ChangeLog 32800
-SHA256 42833dad074ea8d89146e89cab24f10c27920951fa8711d7cae0b3d9add097b3 ChangeLog 32800
+EBUILD amarok-1.4.5.ebuild 2558 RMD160 c9b187dbbb32bb69b4025b23b2bb3418193cbe1f SHA1 11d3986f9a4e0730f7766cc497e8a9e09e79559a SHA256 db15952aa15a66e5f855d0807ff774bc0e3f1e0d23f58c808aecd870f3efe60b
+MD5 a0a382c2b3994b15a76c11a578fe2052 amarok-1.4.5.ebuild 2558
+RMD160 c9b187dbbb32bb69b4025b23b2bb3418193cbe1f amarok-1.4.5.ebuild 2558
+SHA256 db15952aa15a66e5f855d0807ff774bc0e3f1e0d23f58c808aecd870f3efe60b amarok-1.4.5.ebuild 2558
+EBUILD amarok-9999-r1.ebuild 2743 RMD160 6756f9080982354ce74a36dee096adb012c9d0c2 SHA1 71334e3b63917354f1feb0cb9910d7c9826654fa SHA256 c201465de5b2b915f85ba3554b7d4ffc28309b0afb0126e2cf59124a54cff2f2
+MD5 d1763d6f01883f9a672ad42a312291dd amarok-9999-r1.ebuild 2743
+RMD160 6756f9080982354ce74a36dee096adb012c9d0c2 amarok-9999-r1.ebuild 2743
+SHA256 c201465de5b2b915f85ba3554b7d4ffc28309b0afb0126e2cf59124a54cff2f2 amarok-9999-r1.ebuild 2743
+MISC ChangeLog 33041 RMD160 67e00ba6a95e0dde60b3c8f85030a5495735ee9c SHA1 1b4e36507a0ab07b2f1a0ec44efc410d1600211f SHA256 c92aee1bdaed2aa24e965b142a458fd3c8989625afcae9991093ea6270ded29b
+MD5 abceb76c5feedd4939387b3767c6afaf ChangeLog 33041
+RMD160 67e00ba6a95e0dde60b3c8f85030a5495735ee9c ChangeLog 33041
+SHA256 c92aee1bdaed2aa24e965b142a458fd3c8989625afcae9991093ea6270ded29b ChangeLog 33041
 MISC metadata.xml 266 RMD160 3ce35cecb3927850e61ee5bad2e0e4b210c0df3e SHA1 d41658ffae344562e8579d219bd3f746d4cba624 SHA256 c2f316075bb660460a285a5474235615f5946bb47df6e6f0c9c4de9ed64edf26
 MD5 986cc6d7e9a21474e34336045796ffaa metadata.xml 266
 RMD160 3ce35cecb3927850e61ee5bad2e0e4b210c0df3e metadata.xml 266
@@ -37,13 +42,16 @@ SHA256 5684c57a46c61c81e4eb0204bdfd7b6baf02dd2e5f3613a76b1876d812fd5b23 files/di
 MD5 09d4216c683d6a633f4c8fb6dfe73719 files/digest-amarok-1.4.4-r4 503
 RMD160 f2b5a9cb52037ec05f9aafc0ce89015d9ca015a2 files/digest-amarok-1.4.4-r4 503
 SHA256 5684c57a46c61c81e4eb0204bdfd7b6baf02dd2e5f3613a76b1876d812fd5b23 files/digest-amarok-1.4.4-r4 503
+MD5 98e114758b8a4d34bf13a7ec46fcc9f5 files/digest-amarok-1.4.5 247
+RMD160 5eb647806f6caf92978241a31f5099c87a614b19 files/digest-amarok-1.4.5 247
+SHA256 2a8c961031bc77f5b11e893930a10d8968444fe738afbb6dc6e49025f9ffee65 files/digest-amarok-1.4.5 247
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-amarok-9999-r1 0
 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-amarok-9999-r1 0
 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-amarok-9999-r1 0
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6-ecc01.6 (GNU/Linux)
+Version: GnuPG v2.0.1 (GNU/Linux)
 
-iD8DBQFFwKE2KRy60XGEcJIRAlZ0AJ91/W+907iGFXRhrVfbWWopZ9m11ACffSSq
-XVz95nPF3ckqKhGOae/9OXo=
-=myJt
+iD8DBQFFwlE8AiZjviIA2XgRApPsAKC2Yz3EbWgvPVeRTS5cPb3qLWaLvQCg5LTy
+ht9qG3cb/Vrs3Twqu7867xw=
+=13lv
 -----END PGP SIGNATURE-----

diff --git a/media-sound/amarok/amarok-1.4.5.ebuild b/media-sound/amarok/amarok-1.4.5.ebuild
new file mode 100644 (file)
index 0000000..7e78d5e
--- /dev/null
+++ b/media-sound/amarok/amarok-1.4.5.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-1.4.5.ebuild,v 1.1 2007/02/01 20:44:24 flameeyes Exp $
+
+LANGS="af ar az bg br ca cs cy da de el en_GB es et fa 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 se 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 ~x86 ~x86-fbsd"
+IUSE="aac kde mysql noamazon opengl postgres
+visualization ipod ifp real njb mtp musicbrainz daap"
+# kde: enables compilation of the konqueror sidebar plugin
+
+RDEPEND="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/libpq )
+       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-0.1.1 )
+       musicbrainz? ( media-libs/tunepimp )
+       =dev-lang/ruby-1.8*"
+
+DEPEND="${RDEPEND}"
+
+RDEPEND="${RDEPEND}
+       daap? ( www-servers/mongrel )"
+
+need-kde 3.3
+
+src_compile() {
+       # 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)
+                                 $(use_with daap)
+                                 --with-xine
+                                 --without-mas
+                                 --without-nmm"
+
+       kde_src_compile
+}
+
+src_install() {
+       kde_src_install
+
+       # As much as I respect Ian, I'd rather leave Amarok to use mongrel
+       # from Portage, for security and policy reasons.
+       rm -rf "${D}"/usr/share/apps/amarok/ruby_lib/rbconfig \
+               "${D}"/usr/share/apps/amarok/ruby_lib/mongrel* \
+               "${D}"/usr/share/apps/amarok/ruby_lib/rubygems* \
+               "${D}"/usr/share/apps/amarok/ruby_lib/gem* \
+               "${D}"/usr/$(get_libdir)/ruby_lib
+}

diff --git a/media-sound/amarok/amarok-9999-r1.ebuild b/media-sound/amarok/amarok-9999-r1.ebuild
index d06c3b9af024854c705addcd0e32c6ba6c6b49de..b082563fdee89a72ba13f6245e9e786a7e0f4724 100644 (file)
--- a/media-sound/amarok/amarok-9999-r1.ebuild
+++ b/media-sound/amarok/amarok-9999-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-9999-r1.ebuild,v 1.1 2007/01/28 14:52:30 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-9999-r1.ebuild,v 1.2 2007/02/01 20:44:24 flameeyes Exp $
 
 inherit kde subversion
 
@@ -17,7 +17,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
 IUSE="aac kde mysql noamazon opengl postgres
-visualization ipod ifp real njb mtp musicbrainz"
+visualization ipod ifp real njb mtp musicbrainz daap"
 # kde: enables compilation of the konqueror sidebar plugin
 
 RDEPEND="kde? ( || ( kde-base/konqueror kde-base/kdebase ) )
@@ -33,14 +33,14 @@ RDEPEND="kde? ( || ( kde-base/konqueror kde-base/kdebase ) )
        ifp? ( media-libs/libifp )
        real? ( media-video/realplayer )
        njb? ( >=media-libs/libnjb-2.2.4 )
-       mtp? ( >=media-libs/libmtp-0.1.0 )
+       mtp? ( >=media-libs/libmtp-0.1.1 )
        musicbrainz? ( media-libs/tunepimp )
        =dev-lang/ruby-1.8*"
 
 DEPEND="${RDEPEND}"
 
 RDEPEND="${RDEPEND}
-       www-servers/mongrel"
+       daap? ( www-servers/mongrel )"
 
 need-kde 3.3
 
@@ -75,6 +75,7 @@ src_compile() {
                                  $(use_with njb libnjb)
                                  $(use_with mtp libmtp)
                                  $(use_with musicbrainz)
+                                 $(use_with daap)
                                  --with-xine
                                  --without-mas
                                  --without-nmm"

diff --git a/media-sound/amarok/files/digest-amarok-1.4.5 b/media-sound/amarok/files/digest-amarok-1.4.5
new file mode 100644 (file)
index 0000000..52f890b
--- /dev/null
+++ b/media-sound/amarok/files/digest-amarok-1.4.5
@@ -0,0 +1,3 @@
+MD5 81696ff44989334f0fc5dfd4142ded6d amarok-1.4.5.tar.bz2 18034058
+RMD160 f8273dbe872421d219cb5fbd4042caf841a51b2b amarok-1.4.5.tar.bz2 18034058
+SHA256 a9d2214cab085ac9271c31354e0f797887f0a7cb6acd68ccbc7f94a71d805451 amarok-1.4.5.tar.bz2 18034058