diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2015-07-26 21:35:10 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2015-07-26 21:35:10 +0000 |
| commit | 98d2f126f6fd248780a0dd47ecb4fed8f0dfe655 (patch) | |
| tree | cf0dc060b57dc583aed5f4ab97b1961084feec97 /kde-base | |
| parent | Fix conflicts with kf5-based apps. https://github.com/gentoo/gentoo-portage-r... (diff) | |
| download | historical-98d2f126f6fd248780a0dd47ecb4fed8f0dfe655.tar.gz historical-98d2f126f6fd248780a0dd47ecb4fed8f0dfe655.tar.bz2 historical-98d2f126f6fd248780a0dd47ecb4fed8f0dfe655.zip | |
Fix conflict with kf5-based kdepim. https://github.com/gentoo/gentoo-portage-rsync-mirror/pull/183 by a17r.
Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!
Diffstat (limited to 'kde-base')
| -rw-r--r-- | kde-base/kde-meta/ChangeLog | 6 | ||||
| -rw-r--r-- | kde-base/kde-meta/Manifest | 35 | ||||
| -rw-r--r-- | kde-base/kde-meta/kde-meta-4.14.3.ebuild | 3 |
3 files changed, 25 insertions, 19 deletions
diff --git a/kde-base/kde-meta/ChangeLog b/kde-base/kde-meta/ChangeLog index 7c1362ff0691..e1ebe8b2c3b0 100644 --- a/kde-base/kde-meta/ChangeLog +++ b/kde-base/kde-meta/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/kde-meta # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-meta/ChangeLog,v 1.347 2015/06/04 18:39:13 kensington Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-meta/ChangeLog,v 1.348 2015/07/26 21:35:07 mgorny Exp $ + + 26 Jul 2015; Michał Górny <mgorny@gentoo.org> kde-meta-4.14.3.ebuild: + Fix conflict with kf5-based kdepim. https://github.com/gentoo/gentoo-portage- + rsync-mirror/pull/183 by a17r. 04 Jun 2015; Michael Palimaka <kensington@gentoo.org> kde-meta-4.14.3.ebuild: Move various kde-base packages to kde-apps. diff --git a/kde-base/kde-meta/Manifest b/kde-base/kde-meta/Manifest index f6502eae2fa9..67b9aeb00786 100644 --- a/kde-base/kde-meta/Manifest +++ b/kde-base/kde-meta/Manifest @@ -1,24 +1,25 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -EBUILD kde-meta-4.14.3.ebuild 1144 SHA256 cc1a748280cb5d46e915e2b0fe0fcad01321f1c5b7233f886962b37c4502f848 SHA512 04add0b32b66c5c99feab1dc7f18ce380c13262e65eb32a33b765d50fcaf238278776f1e3406ba7e5186a5272e187b13b3c56a72b2f59af14e32bd632386bf6a WHIRLPOOL 492b689bb3bffc1ad5476b670808b97fc3d37a9fcec1bffed55326a8820d0c1e75db6cc09853e2df5abe6b4a633b9ed9c65621df244193c6cbe9b100c609d6bd -MISC ChangeLog 41414 SHA256 ad1e05feae58a975a9d5d673b900c2cd310d9d4e1aa873fc38b01771b7c42bb4 SHA512 114020a963c2f5aadd14d2837fc963d63aba4cf1ac4a8edb83295888c35faf824de8fc9477a303331636bff06369848dd134a5c8e4fd5e1b7a41229247498dd1 WHIRLPOOL e2554dd290e90426c295798e61c98f45dde80d450ce7f7ec7d3558e4a2c519ee66ae5cafd5f5913dabc23456fe55e1b9fc1e1458b2b361880d8829f1a14a69de +EBUILD kde-meta-4.14.3.ebuild 1176 SHA256 ab22c2c09cdd71ab9eabe3318c80c8977e64e5d7f1b8193f32c8aec34958c1dd SHA512 8a4dd0578b633b24e32b4cf177ef333d7537d4d2a26141eeffdbd87c60c845fe47c99afccb592beb7cd38240f63758214bd91844419adad24b9215d9e52e8bf7 WHIRLPOOL d5128a504d68ba61b238b4458ccfde2af7f44719a4f55475cbb105d92fb2c86e85e944f2fb8881f034dc1a6184e21f4609fcd96c2f9439f532efe9bc11f8db35 +MISC ChangeLog 41598 SHA256 39296966d72cbb0eed6b1f4c065477633f39a854910db3c44155fa540f9b5d03 SHA512 7f6a335cc3a0b4552a421ca813f1940124b57609d8c101f6b5fcf11e49bd2a742c64a929be68bfc8dd97442f68f7ef4bb313458c88e2b98a4c9e3f5fbc4124cd WHIRLPOOL b67ba1825354c6ae57b352310e56feebd60802bf9eb6ae5a2796073bb3261689ab9fdd3362faa525386fb4968388dc3b4c4eea8ce2229cfaab87bb2eb9307cb3 MISC metadata.xml 284 SHA256 2c558f12bb5b42ec8d1b7d3712546be35a862f90ddcbacb891c03df1d4354463 SHA512 a350a3cabe1d57497795720c6f569c1f48d6513b653141f3e4e232b52e55bd216e7ae7846fe310a8f00958b04e7bc38c4312bd2002dbe243679e7360b2988f9f WHIRLPOOL 4174104c1370b0d4bd7eea57728e464c6fd669b8419875cb3b4d101bba0e7026aae9d5ce828aa19da577aaeb4d4c2a8ab68c5ba14c4630c3a2d181849da264b7 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0 +Version: GnuPG v2 -iQJiBAEBCABMBQJVcJtURRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5 -MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh -7OzlEADE+uDRfJaY+zle7GlJsb7qF16QaKNxO5sq2aw3VUpw0GdkKVpTZn0wldKu -aubtqbgndnSPl/e7a/Eabm9CFPVAdrI0Dipn5MxugncI6JlJRzAyjAoyosz+s0b0 -DFe/O66n7WXknSKy2XIKlOcJStD0v7sSnFpq0JPBzjUrmbX3xMH+bjvtnpQKmBKu -vvxwHnPLRrapXFFX67PqKDx31BLgCZXQjBdKXYMHS+ldaWga+BhBguAca98rD2tS -rH/WDTmv3rny7LfDqto5e8M0z+Fub84A+3/p0bx58OuZbqeBI+bB4H+ymfnxXZMt -4z2QQ8+Yqd4sc4mzkLRnOq0Nw5EB47EmPwqauQKvTm0VVHtbm6sw4Mum1pq52VN3 -keWQpIo6icT++N1GFnity+MlnuvAepthhAN2Z9YOWP8jA/Kz06GLwa+y+Ct74Bri -EiUQb7lirZzHziec31k+mgJBuGd7db3T6tOMEqWsR0QmcWLClP6J76IEisrxSp84 -q5CyEW45L8v9P61dQ3Zn/V4qQe/BxKiY07eAzNwxgWuzFV9zbiiV0DqQhCn2UuXx -p+1GZXheBhhLH8LLyN8mXBpnhMIBqpoL6rz95/dlXHgZnkQTGobs6qYFJuAyKuWc -auku7BjHQlji2zu0nL9Qjd8AftW3Qoz27LkGhQgVEa/E6lTOhA== -=kQdK +iQJ8BAEBCABmBQJVtVKNXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC +MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOZU4QAN6I9YPtc1bR4wzdhk8tvQ54 +4On/kxBKDFx87vU59XIb6regjRMYvYxRaX5HUsrJ3XpKEew+ZLaAdWKmicAAcYTv +BZlrFzNpFKuCqv/CkazIfnGsrmkjxrjxAraJvfMKRClih7COUQxU97EYT0d94Jzz +CDD7KPg6JRqQUOg+qWOtwBWhIpIeWHbKb4FN1M+29egUyPkwl6p2rRohxnHQtsA1 +FIM0gRaKo/Q7h87OB/npvjm2E0sVxJknfQVeizHGMDHOUMl/06qKdfzUhR1u8ODr +P9ecMQI3jIP1Jr8bjKpQFCVuZ1VBVEBbd9/6l6mPhQ7V92FM2sWxzCh4Cq9ezzhz +Gswmtnwe1Hf9XJrU4jJeIHeKQj5fD6dFIN/tXfhQloerMjmB82PM6hIOrEKlv/+0 +q/LJlcvXMcrr3CKYpD7obLVFtuqW/PNXtaWmj0+1nMKO7wnpf3Q8xG2MipAi+Rus +jVQKp+jIV77bsSQaoZ4eXpivcMdAQXSBYzSj/CdB0aC5HT2SBvxIL7evayJkllJ0 +w+z8uzssAcAkIxw6BRW23hWTZXVluAhj57bVdKq+WDKn0npZxKvwMWzs0gVDN4k1 +sslDEWInc0zW4F6KI7mJW6GuYUqlgrAuX+6tp4xiNXyKHw+rquhy9x2BLP9JqBOE +lo7mJUmZDHDhb17y0k6n +=+hwm -----END PGP SIGNATURE----- diff --git a/kde-base/kde-meta/kde-meta-4.14.3.ebuild b/kde-base/kde-meta/kde-meta-4.14.3.ebuild index daa56a95af3b..ab26d261b0d8 100644 --- a/kde-base/kde-meta/kde-meta-4.14.3.ebuild +++ b/kde-base/kde-meta/kde-meta-4.14.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-meta/kde-meta-4.14.3.ebuild,v 1.6 2015/06/04 18:39:13 kensington Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-meta/kde-meta-4.14.3.ebuild,v 1.7 2015/07/26 21:35:07 mgorny Exp $ EAPI=5 inherit kde4-meta-pkg @@ -31,3 +31,4 @@ RDEPEND=" ) !minimal? ( $(add_kdebase_dep kdeplasma-addons) ) " +REQUIRED_USE="minimal? ( !kdepim )" |