From a362d4a681709153edd479b261790faffecd7215 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Manuel=20R=C3=BCger?= Date: Sat, 13 Dec 2014 01:39:49 +0000 Subject: [PATCH] Add support for kde applications dependency. Package-Manager: portage-2.2.15/cvs/Linux x86_64 --- media-sound/amarok/ChangeLog | 5 ++++- media-sound/amarok/Manifest | 16 ++-------------- media-sound/amarok/amarok-2.8.0-r3.ebuild | 21 +++++++++++++++------ 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/media-sound/amarok/ChangeLog b/media-sound/amarok/ChangeLog index 6023abc5320b..068aaf02e8e7 100644 --- a/media-sound/amarok/ChangeLog +++ b/media-sound/amarok/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-sound/amarok # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.473 2014/12/12 15:29:29 zlogene Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.474 2014/12/13 01:39:45 mrueg Exp $ + + 13 Dec 2014; Manuel Rüger amarok-2.8.0-r3.ebuild: + Add support for kde applications dependency. 12 Dec 2014; Mikle Kolyada amarok-2.8.0-r3.ebuild: amd64 stable wrt bug #517344 diff --git a/media-sound/amarok/Manifest b/media-sound/amarok/Manifest index 13347f5007b4..a670c8c72ebd 100644 --- a/media-sound/amarok/Manifest +++ b/media-sound/amarok/Manifest @@ -1,21 +1,9 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - AUX amarok-2.8.0-gmock-1.7.patch 1205 SHA256 3d780ba18dfda23eb19772dd803969a72b7bb47c5181060bdb18257cd16ce88b SHA512 6bbbdf633f65337523d023decd6b3ca889a2bf9b10e93d12f686e273144a58dd398813a99474adf8d35ad1184658f77626b040be288b44a9ac58424a51d05790 WHIRLPOOL a4c45a1386cd8f5c5b97e4fb6563b3e59de19de61d584669ee62f8884d5cafacdb746e6578b2e2f9adf20779ff059d758cea1686ced9c7392b1f9dd1b6ee5b87 AUX amarok-2.8.0-mysqld-rpath.patch 602 SHA256 b8a10620877962ecd4fd4b3f466bb2418fdd3a17c4fa5b69a655978557996bfd SHA512 7e2b4581a49424d51b47073bcc45d976eb0195b8a87c02a6e012e85d7e771b9c207f351bf9571038b2d7cb3cecc8118d688e50b7faf4eb176d204b590b17ed2e WHIRLPOOL 8d1d5311b907f982d031ad7083771f7b081af7c1808da337ab0413ca50974dfa8f33b33bd30baa9e09ab3a4aa3996e15622b125de22b7150814a0d35f5b12d33 DIST amarok-2.8.0.tar.bz2 39950028 SHA256 f4b89b28f217a6d947e55fb0890de22fad8c404794c6beeb2dcaf2711b4f8ec6 SHA512 09f7f675f1223d36fb9df2f8c88923c6616524e022ad83b12bcb770dfbf60cb6b191e4035633f2ea2eee5fb7b38e6d5092cf69fe222ef9c3f3c46ba8f157a62d WHIRLPOOL 108cfd95d65e74f28f85a846f605bc349e5b2962b7f9a357415225f3e48ff87148d7f50a642665cc3c809bb2cb4c22f339ad049cdeb4659bb7c0a48e798833ad EBUILD amarok-2.8.0-r1.ebuild 3778 SHA256 0e79975ed5ad8bb310bca486ded5655907cdc77db92101fc2161bcb836cfe147 SHA512 c032820d7be8fbce87298717ba8a0bc388863af08deeb322b262c5c56087c2f79517166a466c6b7f910b1261ce91e9840cbe27e155a7a4da7fb173326e34bee1 WHIRLPOOL aa2c227af9bb4262179fbdf6444887f0d27846f7b535a5af8dd6833f6912e8574c8111a834780ff7a2b8e0e14f892fb438c30d580656f0d16fe134407762fe11 EBUILD amarok-2.8.0-r2.ebuild 3576 SHA256 2b1570bde2b3cc227737e2d1c194a90475e8764c5c5de0bf6c1ba467e44953b6 SHA512 e1bbbbf8f622e0e255173bcd07e47dc28cc5c2a9ca34f66e6b3f6d2fcbaf81f7e3cf44ad55527c85670168e871e50f3c41162c865eb51ad177052374938a0f13 WHIRLPOOL 8be04dc12737274e99bf6abf6d32a5e67ad57a25a2c7e4f159e0aa963ac3ffb92f5c5a4fe6e41bd44f1b828b387fd1c380ea3bf618631dd62749b96a84e6484c -EBUILD amarok-2.8.0-r3.ebuild 3753 SHA256 e841d96e16577457eea5a6a15b7ac89a1499f9cf30b8af7f490450b1f036c66e SHA512 bd04e9dcf9c9d5a617566b7b18378158336a4b8073d3aa13452394aff98ac994247a7a78bd388234cc6ddfbf56c758ea308572e490c0268ba69ddc2a6576300e WHIRLPOOL 64d791019cae471278d2b171d9db94d6434f43210097975f39f8136af9fdb5f0cfd8e4b90ad4ec74bf26d86071910975791eb9d39110baa6ef57ebc9662f8284 +EBUILD amarok-2.8.0-r3.ebuild 3932 SHA256 911f051129430337fdcdbda7d00ef2c86c1f4c3a99fb08386e9fb971b6a4b829 SHA512 ade7f1dc037fc04a6554a81b0d20f3fa28c657799d2e43d570e374e8df74128c2e840010e1733c0214b8d3ba44a0534bb8dc7a9597309c04cec591c88a375e5c WHIRLPOOL 6d433e1ed9a2d0f3bc0951215be76617c1162fd0046c407fc638f7b05748528af6f68e935046d9f97f327ccd929d409f5b94242ede17c7414f82dc0692bc5e2c EBUILD amarok-2.8.0.ebuild 3586 SHA256 46501342da286ecdaf1f01397319d7b55d4e5cde599d939e42f64fbb72041377 SHA512 85aae1d88dd54190205c6ce47f96cfbedc9b5b5e7fc1f11582cd5997029952157a60965d4425d129e22fcffde0cd6cc6256d75eb5aeb13e20d5dc20b1fd0edfc WHIRLPOOL 7e5675648b6150d19312c3f1cd5ac4b0e9e38528548acf03a2b185e96c807098f0bb0d4ebf49d8e1a211be0c153ee61ab0623c82c5bbadc2e95cc2e8fb2c4be2 -MISC ChangeLog 80536 SHA256 bdb39afd0e2b632b2591c157a1621cce84bd1d2657c51237866399de299ea231 SHA512 fa83fcbfa12e78acd1e6567c313de8f2e2112ab09be4a1e7ec9ee8505d16f73727a15eb45f0aa8cd8135cc9ba0a40f96d3b90859121ed551ba6278279a780c83 WHIRLPOOL e00d2562247967164807bc4d14dd47761041110f111fd5a0999c43183515ec2ede3bb00d57070acde5a0691e0ed40d478e4386c2498abfd44ef161f375dfe14f +MISC ChangeLog 80654 SHA256 62e66ccc1a8f380aa46cee7859ff8a9e193817e291474d2f754211cfae892fbd SHA512 96d1d13d35b6e813718ac52a2ae47cdd8925aaa631fb63e152c684e721a1a329265776369d26b728c275d340a8d530679a9d5f8ab26456f490a9e9e49bb5e87e WHIRLPOOL ffdf21574dda4f88f191a4d389c6179d651d91db76d4b08076f3c678c7a6b5143e2895867c51330f5af3d580135ce9a3a89c2806e5cde0cb6ffddb42df1a4681 MISC metadata.xml 1064 SHA256 8e46a720b86b83508c2bf4a5a3be43bbdabb1bf8e057b547dc881912fea035e6 SHA512 d576c1e66b3e76e899f4580a908d41a0ad2faaae0346b47fe5e4d925763428e705be2fe7246f4109a4b470c6a75acd445215722fc3b3e82709af765d659e7705 WHIRLPOOL 9b1235b62922630dbb2968c62dda7cac97eddc48a4857232d6a0aa25abdb756dad474281d39f2e342e719adb9f6311a6004e3b629496975e8b82f68d4487f96e ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2 - -iJwEAQEIAAYFAlSLCYIACgkQG9wOWsQutdZTkwQAwHTJ6E8uL0TYp10g27Hr1VEE -h18bjeE6wlMPGjcx0IwPC6t5TO5w227vwvZLTQFMpUu+Fi8r5YNd1telseH2RMbZ -dFalY0o0pxZoHcxnwhU4XqLHacs/8HqSCbOCUd6VzaVt6Nz1gR5+mc9nqRdGiaEK -+p3XFJfx7C/RRGT+JRI= -=B6rv ------END PGP SIGNATURE----- diff --git a/media-sound/amarok/amarok-2.8.0-r3.ebuild b/media-sound/amarok/amarok-2.8.0-r3.ebuild index 23aee9b73546..ba405477f714 100644 --- a/media-sound/amarok/amarok-2.8.0-r3.ebuild +++ b/media-sound/amarok/amarok-2.8.0-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.8.0-r3.ebuild,v 1.3 2014/12/12 15:29:29 zlogene Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.8.0-r3.ebuild,v 1.4 2014/12/13 01:39:45 mrueg Exp $ EAPI=5 @@ -39,7 +39,8 @@ fi COMMONDEPEND=" app-crypt/qca:2 $(add_kdebase_dep kdelibs 'nepomuk?,opengl?' 4.8.4) - $(add_kdebase_dep kdebase-kioslaves) + || ( kde-apps/kdebase-kioslaves:4 + $(add_kdebase_dep kdebase-kioslaves) ) >=media-libs/taglib-1.7[asf,mp4] >=media-libs/taglib-extras-1.0.1 sys-libs/zlib @@ -49,9 +50,16 @@ COMMONDEPEND=" >=dev-qt/qtscript-4.8:4 >=x11-libs/qtscriptgenerator-0.1.0 cdda? ( - $(add_kdebase_dep libkcddb) - $(add_kdebase_dep libkcompactdisc) - $(add_kdebase_dep audiocd-kio) + || ( + ( kde-apps/libkcddb:4 + kde-apps/libkcompactdisc:4 + kde-apps/audiocd-kio:4 + ) + ( $(add_kdebase_dep libkcddb) + $(add_kdebase_dep libkcompactdisc) + $(add_kdebase_dep audiocd-kio) + ) + ) ) ipod? ( >=media-libs/libgpod-0.7.0[gtk] ) lastfm? ( >=media-libs/liblastfm-1.0.3 ) @@ -75,7 +83,8 @@ DEPEND="${COMMONDEPEND} " RDEPEND="${COMMONDEPEND} !media-sound/amarok-utils - $(add_kdebase_dep phonon-kde) + || ( kde-apps/phonon-kde:4 + $(add_kdebase_dep phonon-kde) ) " PATCHES=( -- 2.26.2