diff options
| -rw-r--r-- | eclass/kde4-base.eclass | 8 | ||||
| -rw-r--r-- | kde-base/kdelibs/Manifest | 2 | ||||
| -rw-r--r-- | kde-base/kdelibs/kdelibs-9999.ebuild | 3 | ||||
| -rw-r--r-- | kde-base/libknotificationitem/Manifest | 1 | ||||
| -rw-r--r-- | kde-base/libknotificationitem/libknotificationitem-9999.ebuild | 13 |
5 files changed, 7 insertions, 20 deletions
diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass index 664d989014d..235110fe644 100644 --- a/eclass/kde4-base.eclass +++ b/eclass/kde4-base.eclass @@ -230,8 +230,10 @@ kdecommondepend=" ) " if [[ ${PN} != kdelibs ]]; then - [[ ${PN} != libknotificationitem ]] && slot_is_at_least 4.3 ${KDE_MINIMAL} && local libknotificationitem_required=1 if [[ ${KDEBASE} = kde-base ]]; then + # All SLOT=4.3 and any SLOT=4.4 where PV < 4.3.66; only kde-base/ + [[ ${PN} != libknotificationitem ]] && slot_is_at_least 4.3 ${SLOT} && \ + [[ ${_pvn} < 4.3.66 || ${_pvn} == 4.3.9999 ]] && local libknotificationitem_required=1 kdecommondepend+=" kdeprefix? ( >=kde-base/kdelibs${_pv}[kdeprefix] ) !kdeprefix? ( >=kde-base/kdelibs${_pvn}[-kdeprefix] ) @@ -245,10 +247,6 @@ if [[ ${PN} != kdelibs ]]; then kdecommondepend+=" >=kde-base/kdelibs${_pv} " - [[ -n ${libknotificationitem_required} ]] && \ - kdecommondepend+=" - >=kde-base/libknotificationitem${_pv} - " fi fi unset _pv _pvn diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest index 80baf77fda5..54cf9cab9ce 100644 --- a/kde-base/kdelibs/Manifest +++ b/kde-base/kdelibs/Manifest @@ -8,5 +8,5 @@ DIST kdelibs-4.3.65.tar.lzma 10590625 RMD160 9954d8a838f274a5346d53471656d360961 EBUILD kdelibs-4.3.0-r2.ebuild 6442 RMD160 3e31ca3487288cc1095e6ab5988b74a54207565d SHA1 07b1d578f8e3d5a89eb1fcd048af6419e503378b SHA256 9374a92e1101505087d4c7406deb9b126df538ad7eace5f83962ecd83ab17508 EBUILD kdelibs-4.3.65-r1.ebuild 6284 RMD160 a7cbc7b77be6182f1f282e8042539d578aba1831 SHA1 157c3c43dc4c38d854e02a1d911555c6a06486b7 SHA256 576d8945e01a8245373b499c20a58378f4571bad1317b0ee7b1a5e2cf8ed4735 EBUILD kdelibs-4.3.9999.ebuild 6242 RMD160 1a906079d59632512d2e8186134113ec566bbe58 SHA1 25887f717b62662f990b99aca314be377e4b9ac5 SHA256 3082e976bb918d95d313b0f843aa3eb015464825a8d93e150a257e776f9b3242 -EBUILD kdelibs-9999.ebuild 6335 RMD160 2aaab7c043a31aaa6a4d6be3e0f974b73e985715 SHA1 5e513d72cfbb1d5149a64c260689f07df5e614d7 SHA256 ff4e68bd0d364043748abe852ce3ee6a7ab85d591b0b74665d20a01cb58ef059 +EBUILD kdelibs-9999.ebuild 6463 RMD160 480c0a9d74e32ab912fe57a193e6fc7603adf922 SHA1 4b9430e99778b47bf4b69984870a2bbb8c4410f6 SHA256 2c354cb53d793a08b53370510e383dace96f8e51cc0bf8464c1e67e50cac4596 MISC metadata.xml 241 RMD160 e23ea97bfdc981201294af826fc0f315ebc0c663 SHA1 65e562c9b76e5c338c984bdd9dd5f1026013c0d3 SHA256 3f6cec1e375ad99ac2929f89e8fbe74237333497106dfc52c36af0aa5629b139 diff --git a/kde-base/kdelibs/kdelibs-9999.ebuild b/kde-base/kdelibs/kdelibs-9999.ebuild index 86d1a831e0c..ebaaf075394 100644 --- a/kde-base/kdelibs/kdelibs-9999.ebuild +++ b/kde-base/kdelibs/kdelibs-9999.ebuild @@ -21,6 +21,7 @@ mmx nls openexr policykit +semantic-desktop spell sse sse2 ssl zeroconf" RESTRICT="test" COMMONDEPEND=" + app-crypt/qca:2 >=app-misc/strigi-0.6.3[dbus,qt4] dev-libs/libpcre dev-libs/libxml2 @@ -96,7 +97,9 @@ RDEPEND="${COMMONDEPEND} !kde-base/ktnef:4.1[-kdeprefix] !kde-base/libplasma[-kdeprefix] !kde-base/libkworkspace:4.2[-kdeprefix] + !kde-base/libknotificationitem[-kdeprefix] ) + kdeprefix? ( !kde-base/libknotificationitem:${SLOT}[kdeprefix] ) >=app-crypt/gnupg-2.0.11 x11-apps/iceauth x11-apps/rgb diff --git a/kde-base/libknotificationitem/Manifest b/kde-base/libknotificationitem/Manifest index be0d3b9861b..88e090e7495 100644 --- a/kde-base/libknotificationitem/Manifest +++ b/kde-base/libknotificationitem/Manifest @@ -1,5 +1,4 @@ DIST kdelibs-experimental-4.3.65.tar.lzma 25798 RMD160 8515e6faa9951e608788dbffae2cd53652075d54 SHA1 f01a2afb49de37a8915b879aaed172c235eab8f3 SHA256 bf6fec0dfb6db2e430c327e4a009345df66d9004c4e211960a51a74be8845396 EBUILD libknotificationitem-4.3.65.ebuild 280 RMD160 bc82b4d6e870e16a1ba5191bbf817a46448b324f SHA1 af780db7f90e3651393fdc3246f6bf7c2b586bc1 SHA256 609c3d8a0c17db3bd993671204520b50d5e1a9034aa0ee0a4bced18a0ec0200b EBUILD libknotificationitem-4.3.9999.ebuild 269 RMD160 89d5a36bac809f7e9709ca39d66503ba0617f7a9 SHA1 6d3f29eb2d6438c1162c47c16b641675285a6675 SHA256 1aaf99374423435cba217f71b571d77872d9d1dab80bf4ffb9cb01dc3a4a41b5 -EBUILD libknotificationitem-9999.ebuild 269 RMD160 89d5a36bac809f7e9709ca39d66503ba0617f7a9 SHA1 6d3f29eb2d6438c1162c47c16b641675285a6675 SHA256 1aaf99374423435cba217f71b571d77872d9d1dab80bf4ffb9cb01dc3a4a41b5 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a diff --git a/kde-base/libknotificationitem/libknotificationitem-9999.ebuild b/kde-base/libknotificationitem/libknotificationitem-9999.ebuild deleted file mode 100644 index f61978aa5ed..00000000000 --- a/kde-base/libknotificationitem/libknotificationitem-9999.ebuild +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="2" - -KMNAME="kdelibs-experimental" -KMMODULE="knotificationitem" -inherit kde4-meta - -DESCRIPTION="Notification library" -KEYWORDS="" -IUSE="debug" |