diff options
| -rw-r--r-- | Documentation/package.keywords/kde-live.d/kdelibs-live | 1 | ||||
| -rw-r--r-- | Documentation/package.keywords/kde-live.keywords | 1 | ||||
| -rw-r--r-- | Documentation/package.unmask/kde-live | 1 | ||||
| -rw-r--r-- | Documentation/sets/paludis/kdelibs-live.conf | 1 | ||||
| -rw-r--r-- | eclass/kde4-base.eclass | 7 | ||||
| -rw-r--r-- | kde-base/kdelibs/Manifest | 2 | ||||
| -rw-r--r-- | kde-base/kdelibs/kdelibs-9999.ebuild | 7 | ||||
| -rw-r--r-- | profiles/package.mask | 1 | ||||
| -rw-r--r-- | sets/kdelibs-live | 1 |
9 files changed, 9 insertions, 13 deletions
diff --git a/Documentation/package.keywords/kde-live.d/kdelibs-live b/Documentation/package.keywords/kde-live.d/kdelibs-live index a78e787c9e7..62d998f623f 100644 --- a/Documentation/package.keywords/kde-live.d/kdelibs-live +++ b/Documentation/package.keywords/kde-live.d/kdelibs-live @@ -1,5 +1,4 @@ ~kde-base/kde-env-9999 ** ~kde-base/kdelibs-9999 ** ~kde-base/kdepimlibs-9999 ** -~kde-base/libknotificationitem-9999 ** ~kde-base/oxygen-icons-9999 ** diff --git a/Documentation/package.keywords/kde-live.keywords b/Documentation/package.keywords/kde-live.keywords index 4e3131e02aa..580279eb6f5 100644 --- a/Documentation/package.keywords/kde-live.keywords +++ b/Documentation/package.keywords/kde-live.keywords @@ -188,7 +188,6 @@ ~kde-base/kde-env-9999 ** ~kde-base/kdelibs-9999 ** ~kde-base/kdepimlibs-9999 ** -~kde-base/libknotificationitem-9999 ** ~kde-base/oxygen-icons-9999 ** ~kde-base/dragonplayer-9999 ** ~kde-base/juk-9999 ** diff --git a/Documentation/package.unmask/kde-live b/Documentation/package.unmask/kde-live index 65e25ae7f02..9a684fdcfb2 100644 --- a/Documentation/package.unmask/kde-live +++ b/Documentation/package.unmask/kde-live @@ -250,7 +250,6 @@ kde-base/thumbnailers:live kde-base/kde-env:live kde-base/kdelibs:live kde-base/kdepimlibs:live -kde-base/libknotificationitem:live kde-base/oxygen-icons:live kde-base/dragonplayer:live kde-base/juk:live diff --git a/Documentation/sets/paludis/kdelibs-live.conf b/Documentation/sets/paludis/kdelibs-live.conf index 579bb06574f..efc78980080 100644 --- a/Documentation/sets/paludis/kdelibs-live.conf +++ b/Documentation/sets/paludis/kdelibs-live.conf @@ -3,5 +3,4 @@ ?: kde-base/kde-env:live ?: kde-base/kdelibs:live ?: kde-base/kdepimlibs:live -?: kde-base/libknotificationitem:live ?: kde-base/oxygen-icons:live diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass index 235110fe644..c51c6022e21 100644 --- a/eclass/kde4-base.eclass +++ b/eclass/kde4-base.eclass @@ -232,8 +232,11 @@ kdecommondepend=" if [[ ${PN} != kdelibs ]]; then 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 + if [[ ${PN} != libknotificationitem ]]; then + if [[ ${SLOT} == 4.3 ]] || [[ ${SLOT} == 4.4 ]] && [[ ${PV} < 4.3.66 ]]; then + local libknotificationitem_required=1 + fi + fi kdecommondepend+=" kdeprefix? ( >=kde-base/kdelibs${_pv}[kdeprefix] ) !kdeprefix? ( >=kde-base/kdelibs${_pvn}[-kdeprefix] ) diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest index 54cf9cab9ce..e4f16885870 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 6463 RMD160 480c0a9d74e32ab912fe57a193e6fc7603adf922 SHA1 4b9430e99778b47bf4b69984870a2bbb8c4410f6 SHA256 2c354cb53d793a08b53370510e383dace96f8e51cc0bf8464c1e67e50cac4596 +EBUILD kdelibs-9999.ebuild 6442 RMD160 1505b89739aaf590b48cf2aa35a296819d77997d SHA1 2386658770e4bbe2eb24bc22aeb9d3b5a906f120 SHA256 54934e7e239e6cb33b3b16bf59e6d3e972496b3a48436f6b9314d9f0fefba898 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 ebaaf075394..326e4a8d987 100644 --- a/kde-base/kdelibs/kdelibs-9999.ebuild +++ b/kde-base/kdelibs/kdelibs-9999.ebuild @@ -128,10 +128,9 @@ src_prepare() { sed -e "s|@REPLACE_MENU_PREFIX@|${menu_prefix}|" \ -i kded/vfolder_menu.cpp || die "Sed on vfolder_menu.cpp failed." - # FIXME Remove experimental folder from CMakeLists - we have - # kde-base/libknotificationitem for now - sed -e "/macro_optional_add_subdirectory( experimental )/ s:^:#:" \ - -i CMakeLists.txt || die "Failed to sed-out experimental." + # FIXME Remove experimental folder from CMakeLists - add back if needed again + # sed -e "/macro_optional_add_subdirectory( experimental )/ s:^:#:" \ + # -i CMakeLists.txt || die "Failed to sed-out experimental." } src_configure() { diff --git a/profiles/package.mask b/profiles/package.mask index 2470a615fce..7d9f70986ff 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -544,7 +544,6 @@ kde-base/thumbnailers:live kde-base/kde-env:live kde-base/kdelibs:live kde-base/kdepimlibs:live -kde-base/libknotificationitem:live kde-base/oxygen-icons:live kde-base/dragonplayer:live kde-base/juk:live diff --git a/sets/kdelibs-live b/sets/kdelibs-live index 7edb03854f3..ab4094eb895 100644 --- a/sets/kdelibs-live +++ b/sets/kdelibs-live @@ -1,5 +1,4 @@ kde-base/kde-env:live kde-base/kdelibs:live kde-base/kdepimlibs:live -kde-base/libknotificationitem:live kde-base/oxygen-icons:live |