Disable usage of deprecated TunePimp library wrt #410551

Package-Manager: portage-2.2.0_alpha98/cvs/Linux x86_64

4 files changed, 25 insertions, 21 deletions

diff --git a/kde-base/juk/ChangeLog b/kde-base/juk/ChangeLog
index 0af1492fb491..9601a52209cc 100644
--- a/kde-base/juk/ChangeLog
+++ b/kde-base/juk/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/juk
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/juk/ChangeLog,v 1.216 2012/03/23 07:37:24 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/juk/ChangeLog,v 1.217 2012/04/03 09:05:22 ssuominen Exp $
+
+  03 Apr 2012; Samuli Suominen <ssuominen@gentoo.org> juk-4.7.4.ebuild,
+  juk-4.8.1.ebuild:
+  Disable usage of deprecated TunePimp library wrt #410551
 
   23 Mar 2012; Johannes Huber <johu@gentoo.org> -juk-4.8.0.ebuild:
   Remove KDE SC 4.8.0
diff --git a/kde-base/juk/Manifest b/kde-base/juk/Manifest
index 6d4e33759c98..88285684bf6c 100644
--- a/kde-base/juk/Manifest
+++ b/kde-base/juk/Manifest
@@ -1,20 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 DIST kdemultimedia-4.7.4.tar.bz2 1644450 RMD160 c180dfed17735bfef4303802dd8065ed308cdd6a SHA1 e0001afac38e35e3ab7b919d79f74cd57e3c18dd SHA256 c1236ed17f575ff793869e5ade024f892ae36aba27a00edafb3495806fb81b28
 DIST kdemultimedia-4.8.1.tar.xz 1472892 RMD160 15662d3fbce6f3220c84c655a6307199cbc80f7f SHA1 9de14f08c7f1649201be029b8e683a296cc75f52 SHA256 d8c52583f3b3f3d4ba6b67424af31d987d8dbfa98b9cc46092a90deccb08a618
-EBUILD juk-4.7.4.ebuild 623 RMD160 d7d5de3c45c929490c99b02f58ce1bc17998aa15 SHA1 45026eb50f727246c6f430d99d725a77d0ea5b1e SHA256 95e3f1de163a8b56d33c7cced7ecc8c8a8ad053879f111cf5f4a129a3dc10adf
-EBUILD juk-4.8.1.ebuild 617 RMD160 932502df9d86ce857f69066f69edb8e1042d32ed SHA1 a00b640ea2eb6144d17692ec33161ef3cfb65a1a SHA256 b06aefc37ae63b148ddb801554781c3697f332bf3d152a9b36a135d57e39255e
-MISC ChangeLog 25082 RMD160 3a373ed520f1f27a7e7b8657e8322f4b4a99969b SHA1 806c60fd6398dd7070f22681e63bf82412ec2fdc SHA256 3ea7f02d438bc61233161e72a94b3206740ab2d1a7d30197a81d9061d7875bb2
+EBUILD juk-4.7.4.ebuild 626 RMD160 92bfbc45dcf094097fafb0a7a37f1099dee537b1 SHA1 3bb4d2d21be4f88af08232928fee5c45d0bce9c1 SHA256 822f557fbd8701593c52bbd5f61a2d4233d5506f43be6037d4ce93928cb4618e
+EBUILD juk-4.8.1.ebuild 617 RMD160 7aadbc271f6104b09f84e895f7bc9f1cb48d9d5a SHA1 acdf9acadbaa4ec9abdef99f5d142ef4f3117767 SHA256 4fd29aea79e303e1001228dc25ec01c170251893ac8a469019e95dd3b1550cdf
+MISC ChangeLog 25239 RMD160 2ae9ddd8bae964aaf500b13f6c2665bf0eb18717 SHA1 64005509e1dd14738c1f3af6e0e4e13041f81ca1 SHA256 5931de6969bfe83e3760babef4c2a4985e0a5e8cf8e5e8c0d78726c80d7b3ada
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCgAGBQJPbCgvAAoJEO+t9ga+3I3aXNoH/2P9pw/OzAo6tYrMInmPg5v2
-j2NIiV/BWBgMMlAkMRyiojW/PIoqdeMmgExz6lqFsjJnkjIcvhh+4gKMqhnJfiHv
-2ERq4dAGZyEiLgIU4pqzL2serJVUAE6kp3U2pGZdY77H9qSNq6l3EIcDA6QdNfCA
-ZlKxzgST8t3WwRAYu3Q2Z48lGA7/eyW96TULorx7Pg6LsFdboI7d139mn/OSYJgn
-+/qraukT4f4CTRa1CQ48XrHi1BKJ6ivPuRZrlYB8/sxpVcmaSa2ogfuJV9bsfz93
-iTw/PshmNWUvWdcG5JagxKypzdA4eSK0opoOIxcXSnyr9SP8w/Iqh7TbZC1WQUw=
-=I+ip
+iQEcBAEBAgAGBQJPer02AAoJEEdUh39IaPFNafAH/iwJZQGHztYKtIyZWp4BxiVD
+km0P/TP/dv8+BrRnlolcJpxYhSnu+xmSL7FgPgLpev1dWFPA0aXADBcee/fIwUci
+I4Wnkp8bTf1DieA/6bkpk3/KLjZ6/dryzOoVT/OoJw1suydmphHfNQZHkwlOEdOH
+pXmU4uv6Da/VdnTd0aO0266KGjd6Qmo87q9vSmUs0KC6g8TVCVqpuxSSGD5C6nMN
+KG2/3suA2TyhhyTVg816TBmQJThR1p9HSVuXVKgenClQPcZNhttZXAiWvg4SQaa4
+pTpuA6AjJhSSx9NpEEDXMmyZPMLOGsZh8xyO5+1SxWsdlHoZ5XLcSPCLNukWBc8=
+=E2OI
 -----END PGP SIGNATURE-----
diff --git a/kde-base/juk/juk-4.7.4.ebuild b/kde-base/juk/juk-4.7.4.ebuild
index 3ee79ccfef82..ac0ac9db8f8b 100644
--- a/kde-base/juk/juk-4.7.4.ebuild
+++ b/kde-base/juk/juk-4.7.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/juk/juk-4.7.4.ebuild,v 1.4 2012/02/18 14:51:09 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/juk/juk-4.7.4.ebuild,v 1.5 2012/04/03 09:05:22 ssuominen Exp $
 
 EAPI=4
 
@@ -10,17 +10,17 @@ inherit kde4-meta
 
 DESCRIPTION="Jukebox and music manager for KDE."
 KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug musicbrainz"
+IUSE="debug"
 
 DEPEND="
 	>=media-libs/taglib-1.6
-	musicbrainz? ( media-libs/tunepimp )
 "
 RDEPEND="${DEPEND}"
 
 src_configure() {
+	# http://bugs.gentoo.org/410551 for disabling deprecated TunePimp support
 	mycmakeargs=(
-		$(cmake-utils_use_with musicbrainz TunePimp)
+		-DWITH_TunePimp=OFF
 	)
 
 	kde4-meta_src_configure
diff --git a/kde-base/juk/juk-4.8.1.ebuild b/kde-base/juk/juk-4.8.1.ebuild
index 74997505c23b..2c31563c47c8 100644
--- a/kde-base/juk/juk-4.8.1.ebuild
+++ b/kde-base/juk/juk-4.8.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/juk/juk-4.8.1.ebuild,v 1.1 2012/03/06 23:35:11 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/juk/juk-4.8.1.ebuild,v 1.2 2012/04/03 09:05:22 ssuominen Exp $
 
 EAPI=4
 
@@ -10,17 +10,17 @@ inherit kde4-meta
 
 DESCRIPTION="Jukebox and music manager for KDE."
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug musicbrainz"
+IUSE="debug"
 
 DEPEND="
 	>=media-libs/taglib-1.6
-	musicbrainz? ( media-libs/tunepimp )
 "
 RDEPEND="${DEPEND}"
 
 src_configure() {
+	# http://bugs.gentoo.org/410551 for disabling deprecated TunePimp support
 	mycmakeargs=(
-		$(cmake-utils_use_with musicbrainz TunePimp)
+		-DWITH_TunePimp=OFF
 	)
 
 	kde4-meta_src_configure