diff options
| author |   Maciej Mrozowski <reavertm@gentoo.org> | 2011-10-02 18:43:55 +0000 |
|---|---|---|
| committer | Maciej Mrozowski <reavertm@gentoo.org> | 2011-10-02 18:43:55 +0000 |
| commit | f2f28dc1e0d6a9bec30f2717b1cef0401ffec07d (patch) | |
| tree | f9aca0fba921da9f073cdaaa4323891622d4cff4 /net-im | |
| parent | Bump rhel5 branch. (diff) | |
| download | historical-f2f28dc1e0d6a9bec30f2717b1cef0401ffec07d.tar.gz historical-f2f28dc1e0d6a9bec30f2717b1cef0401ffec07d.tar.bz2 historical-f2f28dc1e0d6a9bec30f2717b1cef0401ffec07d.zip | |
Fix phonon deps (should be 'alternative'). Reported by Tomasz Golinski.
Package-Manager: portage-2.2.0_alpha60/cvs/Linux x86_64
Diffstat (limited to 'net-im')
| -rw-r--r-- | net-im/kadu/ChangeLog | 5 | ||||
| -rw-r--r-- | net-im/kadu/Manifest | 10 | ||||
| -rw-r--r-- | net-im/kadu/kadu-0.10.0-r1.ebuild | 8 |
3 files changed, 14 insertions, 9 deletions
diff --git a/net-im/kadu/ChangeLog b/net-im/kadu/ChangeLog index b0636f72f16b..21d75a58e01f 100644 --- a/net-im/kadu/ChangeLog +++ b/net-im/kadu/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for net-im/kadu # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/kadu/ChangeLog,v 1.110 2011/09/30 21:41:27 reavertm Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/kadu/ChangeLog,v 1.111 2011/10/02 18:43:55 reavertm Exp $ + + 02 Oct 2011; Maciej Mrozowski <reavertm@gentoo.org> kadu-0.10.0-r1.ebuild: + Fix phonon deps (should be 'alternative'). Reported by Tomasz Golinski. *kadu-0.10.0-r1 (30 Sep 2011) diff --git a/net-im/kadu/Manifest b/net-im/kadu/Manifest index 2189908f0129..1040808189bb 100644 --- a/net-im/kadu/Manifest +++ b/net-im/kadu/Manifest @@ -8,16 +8,16 @@ AUX libgsm-ugly-code.patch 314 RMD160 5c613b7b4eb261d1116fcbd76a6c46b0cc0c3bb3 S DIST kadu-0.10.0.tar.bz2 5713074 RMD160 fa521ae2eef3bb969a0edce021dcdf84ecfea2c0 SHA1 1150f86bee44383094ac2ca39c6e714f6082193d SHA256 25a510dd3a89ec07b463d934afe3cab46f7762cd3acc7c0dda15ff6d3cea2d0d DIST kadu-0.6.5.4.tar.bz2 1774602 RMD160 5656b87e02952e6d47159996c86919d5d16973e4 SHA1 afd5b7d6c1568a3db03328d58d5ba6506dfa410f SHA256 9decd7b9de6d91095b4f6b47bebbbbc5ca56b9ba6e8f6ee80d8ad172ba676d25 DIST kadu-0.9.2.tar.bz2 6436856 RMD160 2d1bf5ba24032c5bbdc3e664c80e96f7d4782b23 SHA1 012a36a1c8d0fcc157475d7b3ffe37094aeb2c4c SHA256 0b8cbd7cc2b313faf7792baed699a94478f5288f3a0b03c9dea83725eae99716 -EBUILD kadu-0.10.0-r1.ebuild 2735 RMD160 700154ebb075bdfdceaa800fb92e2257885b30a8 SHA1 e47f1d87a2d06ba1ccccc894731c8a623121ff12 SHA256 a6e7ec8821559cfd574379805858639344bb565b0689cbebd5c75343efc9c2b1 +EBUILD kadu-0.10.0-r1.ebuild 2748 RMD160 6c2853968f2ef846ea35ffe4edad4356eb943b07 SHA1 b6a93e6918a357ca617f7e96fe81efc12ac3520b SHA256 6861e737eb5e9f5e6b208488e79decb20a8700b6c10ce902c45e6b938fa801b7 EBUILD kadu-0.10.0.ebuild 2759 RMD160 556036f23a39da783fb8afe26967519e815b9b9f SHA1 25209f6c7de53426bcdcfdbc4db9aefc4c895a97 SHA256 ec590d08018878b7afcdff2cc378095fbd51179a001e528e3ba8ca37873661dd EBUILD kadu-0.6.5.4.ebuild 5156 RMD160 be80321ce958631fddafce129875361d97089872 SHA1 e43377d6a2ca8269ea25b1ff45425de6c26088b3 SHA256 48fa8fbaa0990bebe3e7e02619a0f14d1d3bef5fed1a05ad5da9e2275e9b25a6 EBUILD kadu-0.9.2.ebuild 5535 RMD160 9f931edf21dee9a84a5c9bdaaf7cc0a45e53a826 SHA1 442279b4b826e37519b8775b5af00f9b5a8aade3 SHA256 db5e915286b21107e23dad68a8c43e03d3b1627ef2e079b188f84992f7a6c676 -MISC ChangeLog 16477 RMD160 5fa13af7c1bf690021fdbc6b5d7453cb17a9fd73 SHA1 a4885da69f93181d1d88cc6cd7193a8e059000af SHA256 4226f9f841788d329f4a36c5edbdda3389c3d64fdbd24d90aeaabcb55eba4e2f +MISC ChangeLog 16629 RMD160 d093c76d164589fbb81726db5dc57e4b356d43d9 SHA1 7a41e48eb37b5c631c0100b6e8515c23737d6c49 SHA256 a7ae1ca375d1822c04c261c8b9c80438e2b79f7a95ae7b5c7311bc267074eed9 MISC metadata.xml 658 RMD160 04f2dbd3c2c84b07ffe8359550ce30181ccec699 SHA1 5ff2de27121716eccaac6ba0727736f8e8510961 SHA256 cc87f9b34df5f514bd5e9a4d94c32436baec1f5f47a86d8f4058da6dbb542911 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk6GN4sACgkQFuHa/bHpVdswEACfee3hzUlj9PjTyyhl+7n49oMY -9oIAniCVkmFpL8TcqZYnLCaRhsV7xNRx -=Aspk +iEYEARECAAYFAk6IsPAACgkQFuHa/bHpVdu1ZwCghzZdbO3uiiSlaem+LWfEAxgv +CxMAn1l85WmbcCNl5Gt4ADxHzwAM7JcQ +=Fmbq -----END PGP SIGNATURE----- diff --git a/net-im/kadu/kadu-0.10.0-r1.ebuild b/net-im/kadu/kadu-0.10.0-r1.ebuild index ab926f2bc157..abeb0bc2755f 100644 --- a/net-im/kadu/kadu-0.10.0-r1.ebuild +++ b/net-im/kadu/kadu-0.10.0-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/kadu/kadu-0.10.0-r1.ebuild,v 1.1 2011/09/30 21:41:27 reavertm Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/kadu/kadu-0.10.0-r1.ebuild,v 1.2 2011/10/02 18:43:55 reavertm Exp $ EAPI="4" @@ -36,8 +36,10 @@ COMMON_DEPEND=" >=x11-libs/qt-webkit-4.7.0:4 gadu? ( >=x11-libs/qt-xmlpatterns-4.7.0:4 ) phonon? ( - media-libs/phonon - >=x11-libs/qt-phonon-4.7.0:4 + || ( + media-libs/phonon + >=x11-libs/qt-phonon-4.7.0:4 + ) ) spell? ( app-text/enchant ) xmpp? ( |