diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2015-07-26 21:34:24 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2015-07-26 21:34:24 +0000 |
| commit | 5933734c4f562873e9bc3bf1de4671cedbfef0db (patch) | |
| tree | 44c90dbe1625e567d0d3aa4b6c7dcc86fdad9c7f /kde-apps | |
| parent | Version bump. Update homepage and switch to cmake. https://github.com/gentoo/... (diff) | |
| download | historical-5933734c4f562873e9bc3bf1de4671cedbfef0db.tar.gz historical-5933734c4f562873e9bc3bf1de4671cedbfef0db.tar.bz2 historical-5933734c4f562873e9bc3bf1de4671cedbfef0db.zip | |
Fix conflicts with kf5-based apps. 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-apps')
| -rw-r--r-- | kde-apps/kdebase-runtime-meta/ChangeLog | 7 | ||||
| -rw-r--r-- | kde-apps/kdebase-runtime-meta/Manifest | 35 | ||||
| -rw-r--r-- | kde-apps/kdebase-runtime-meta/kdebase-runtime-meta-4.14.3.ebuild | 6 |
3 files changed, 28 insertions, 20 deletions
diff --git a/kde-apps/kdebase-runtime-meta/ChangeLog b/kde-apps/kdebase-runtime-meta/ChangeLog index daf12f211afd..72760c2f32a9 100644 --- a/kde-apps/kdebase-runtime-meta/ChangeLog +++ b/kde-apps/kdebase-runtime-meta/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for kde-apps/kdebase-runtime-meta # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-apps/kdebase-runtime-meta/ChangeLog,v 1.2 2015/07/22 16:02:14 kensington Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-apps/kdebase-runtime-meta/ChangeLog,v 1.3 2015/07/26 21:34:23 mgorny Exp $ + + 26 Jul 2015; Michał Górny <mgorny@gentoo.org> + kdebase-runtime-meta-4.14.3.ebuild: + Fix conflicts with kf5-based apps. https://github.com/gentoo/gentoo-portage- + rsync-mirror/pull/183 by a17r. 22 Jul 2015; Michael Palimaka <kensington@gentoo.org> kdebase-runtime-meta-4.14.3.ebuild: diff --git a/kde-apps/kdebase-runtime-meta/Manifest b/kde-apps/kdebase-runtime-meta/Manifest index c4aa837f2add..0184e0c3a4aa 100644 --- a/kde-apps/kdebase-runtime-meta/Manifest +++ b/kde-apps/kdebase-runtime-meta/Manifest @@ -1,24 +1,25 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -EBUILD kdebase-runtime-meta-4.14.3.ebuild 1753 SHA256 b55492cf5e6518e41e35f110f7e6a5f2ba9f9148dddd1f497bb733416c1309b8 SHA512 b183c5fc70808a891f33a80b4beb841d3f411d9af25e49d709fd8c3edb6a592261c8435acf897fdc12e7cf358ec96719dfe8cdc72c8946954c49cb8feb9d564c WHIRLPOOL ca4e7641ed1c819590da12214a94e8870ed30010be7f2b508554441e065ea4b57a213422dd1abb1af19e1c9fc774ccc1e1db91bb24b99a9135d101fc660904b7 -MISC ChangeLog 27458 SHA256 1ec8ed4fb199837dc28af0e2fbadf4d37d19c8fe49ec499ddc7b55a2ba5acc27 SHA512 2798a3c7ba0ead9361db23cadd06b152719cc0357bd4d15555299eb838242fd5f64ec78df6235f2fdc653d770f51b2e732dcb28eb255d6dbb670359a66946f97 WHIRLPOOL e75579bf32f69b1405dd83a7f7b584e62c04c069edf728aed89198020c298c94f4200247a685acb541e6c0eeda27b7bb07cff2965891b512dd02f3a392e16b2b +EBUILD kdebase-runtime-meta-4.14.3.ebuild 1852 SHA256 adbe32ad6695bd8c7bf97b3ef771b86b3061aa7c2bb35220c2574f968248410c SHA512 7ace6f560798818020eb0136ed4f591aeca80a3a68f4199e030da79173df345cead7f0265f9616c0f44056aa37a2e08df3bd0609a68c5061a860c202a0484ae5 WHIRLPOOL 524889627d5b715e276cf3e0192334222d806fd5d5b6fb565066a45f53044b43d28953f5035fb66a56cb7d3afe3f9bdb77608fe9ef1e59dedb94115cf324bdf6 +MISC ChangeLog 27655 SHA256 ede4cd2f11a82d214de11198d074c8ad709e926abed82f1288c753baa674e21e SHA512 dfbf66f7a744bbb6b4738aab4c5ff2207bd820dce4e3a6844dd48259523d8b960a76d3cb649f33164a60b01e50850091d7f4c541afabcb3f727e5d160242f7f3 WHIRLPOOL 90a8c984abd9adb55fb69805670d486783bcfe79fdedf88dc44b772d5ee7ed9b7bda7e3568eb6b82e0329a989f12dead1655ca3abe93db40ec21bf1643ee24ac MISC metadata.xml 372 SHA256 22dd11608f6d9bae35f0596329f98293599792caf4d002f5536081bb24bb6f85 SHA512 5f66df90c7408aab96866000d85a50a37f8c63d470ef3e71e5324514d5b523c423d715b754f9f6b3072c349fb0e579bccc133d19fae77b11b75996a083c3be99 WHIRLPOOL b64887a987911f52767fea93b3f80e5b714e34dcfc8a7e3dbbf42740aaad5256b9fab32dc5a545b35cdfcaa1d8fd5f7a0faa6f53e7a4f51d583e06f258698941 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0 +Version: GnuPG v2 -iQJiBAEBCABMBQJVr76KRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5 -MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh -7H4MD/9lCsqyfLpf6c1HFffT8huzvmLK4LAxuc+E+xSg9rlixwkQ0N28iQ/gV+zm -IegHNhFYgZJwtGLj9xlJmSrUmsJ9Egi4KCpyMjJho5zQ6IQfjupvzJbHieARpf8O -cczyKW9RFrz8AlPkHNsQGrGKLcDfBL2M+5kljUWfxP/6hJRAQCsX6wDAoRxZgdJO -AKTF82nnLJdEIKPN5TdjGhf/ZhABWhQFVQtr71HrjspYedAeESPKRex094jLwOwn -5Oz2uLQ6UnMdyymx0jXWXA3WM0PBBfAeTVBELxhkbe+5KpG59lo0cUq6VS/Cn7/J -rYc+FKSV08/jQu/AwxL+ZwRU2JlPjb3y3utzXZHp5yEowhcxc73yeW52hyEIWP5y -37dRMKxGsXlbjWV0tDh6iS4MDoQDwi0KBtW298dw68pi/GXMisuD/umElFJxGpqC -B86whVZZVbQ2EjNWtLesdV9zTIbvG7o7hXqCb2AEXoxOzJ6wpETZo5OhuktWQ8Xj -CH2IvN1HZX90Clzof916/Aloo9vUXOrkma4GQYRikJSO2h8dLAqpf2ZCxVtxzCDA -ZStcGsVSryBcPqo2qQVK3otWSCFst3s8ftopOM6StvZB7N3xB/xX736gPc5MR8iL -6RZRVMCHou4B9uikI1QH4Yad87Htp/45LrgQO+sBj0yzbpXO3A== -=t6sa +iQJ8BAEBCABmBQJVtVJgXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC +MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOzfsP/0l1Yo5y6ZZB2lUruQt5Hg+O +Jp286Ii/VElkbtLCGozDD3STV3NUuN1qpOL3DjR5sRaqY7pIVCIyuLr1/5PKKH+s +nLBOlnyx4xlSM1cuMlHooXlWShQgXuG8YtX/eQqd6AuCLBk8fOCgMV44e56EBRsQ +mFOGnPL20vbKtYgzA/8Da5GX72snkebP2oR35h8N1nJS0ToCX1PbrOzL3g0Lw0s8 +fI6x1QcJpFB3Zt904zGztCpsNEQ1URpJerynjyJxe2+HrqgMWsNFOADcnSNAEmQr +RVRpp970AZC5rCgUKBnbYISE/O8IT1NuJ0D4qPMmLmLwUM3wXOOcZxjT/QvdYsYy +12x/Rl+x9etM37C83tbT0UTsJVB1YTUlQ5dXz4dYcbxgzGCyDMhj9KsOU6XVAc2Q +QTbJIRrmH0EJ/kcZ684kzarareKdw9yBGpGZYnJa3EDv7AnTaINY4a0XogWcUUaH +/JdHpq6wcfDYIOCBjYJ98ymgyT/LaiKKqYKq7TAI70+6A+cFFc04e36u2Bo22Hs0 +dkrHBgcYYvT8DgJqcZYLG0eQmiysD9CiStr0p7p6C7zDYaCADsJX5GdRx4OyLaOE +zeMrTehS0PmSoJk97u8oBEW8oeO0yKoZ8Pj73HkJiib1rldl6dKx59lOrV4jODji +78qTdogxzPbpOv87eNw2 +=I6hf -----END PGP SIGNATURE----- diff --git a/kde-apps/kdebase-runtime-meta/kdebase-runtime-meta-4.14.3.ebuild b/kde-apps/kdebase-runtime-meta/kdebase-runtime-meta-4.14.3.ebuild index 195c299b54ec..35b1f1841fef 100644 --- a/kde-apps/kdebase-runtime-meta/kdebase-runtime-meta-4.14.3.ebuild +++ b/kde-apps/kdebase-runtime-meta/kdebase-runtime-meta-4.14.3.ebuild @@ -1,13 +1,13 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-apps/kdebase-runtime-meta/kdebase-runtime-meta-4.14.3.ebuild,v 1.2 2015/07/22 16:02:14 kensington Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-apps/kdebase-runtime-meta/kdebase-runtime-meta-4.14.3.ebuild,v 1.3 2015/07/26 21:34:23 mgorny Exp $ EAPI=5 inherit kde4-meta-pkg DESCRIPTION="Merge this to pull in all kdebase-runtime-derived packages" KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux" -IUSE="+crash-reporter +handbook minimal nepomuk" +IUSE="crash-reporter +handbook minimal nepomuk" RDEPEND=" $(add_kdeapps_dep kcmshell) @@ -44,6 +44,7 @@ RDEPEND=" $(add_kdebase_dep khelpcenter) kde-plasma/khelpcenter:5[compat(+)] ) ) + minimal? ( $(add_kdeapps_dep solid-runtime '-bluetooth') ) nepomuk? ( $(add_kdeapps_dep nepomuk) ) !minimal? ( $(add_kdeapps_dep attica) @@ -52,3 +53,4 @@ RDEPEND=" $(add_kdeapps_dep knetattach) ) " +REQUIRED_USE="minimal? ( !crash-reporter )" |