commit: 96238186ccf64f88d81a00a046444fbaafb727d9 Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com> AuthorDate: Tue May 26 18:37:27 2015 +0000 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> CommitDate: Wed May 27 12:07:04 2015 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=96238186
[kde-apps/kwalletmanager] Do not autoblock SLOT=4, add USE=minimal Things just got co-installable. https://bugs.kde.org/show_bug.cgi?id=346951 http://commits.kde.org/kwallet/bd78050904ce91f134b1f0bde93ed9512613e15f Package-Manager: portage-2.2.20 kde-apps/kwalletmanager/kwalletmanager-15.04.1.ebuild | 10 +++++++++- kde-apps/kwalletmanager/kwalletmanager-15.04.49.9999.ebuild | 10 +++++++++- kde-apps/kwalletmanager/kwalletmanager-5.9999.ebuild | 2 ++ kde-apps/kwalletmanager/kwalletmanager-9999.ebuild | 10 +++++++++- 4 files changed, 29 insertions(+), 3 deletions(-) diff --git a/kde-apps/kwalletmanager/kwalletmanager-15.04.1.ebuild b/kde-apps/kwalletmanager/kwalletmanager-15.04.1.ebuild index 29a8d34..e85a849 100644 --- a/kde-apps/kwalletmanager/kwalletmanager-15.04.1.ebuild +++ b/kde-apps/kwalletmanager/kwalletmanager-15.04.1.ebuild @@ -11,6 +11,14 @@ DESCRIPTION="KDE Wallet Management Tool" HOMEAGE="http://www.kde.org/applications/system/kwalletmanager http://utils.kde.org/projects/kwalletmanager" KEYWORDS=" ~amd64 ~x86" -IUSE="debug" +IUSE="debug minimal" RDEPEND="!kde-base/kwallet:4" + +src_install() { + kde4-base_src_install + + if use minimal ; then + rm -r "${D}"/usr/share/icons + fi +} diff --git a/kde-apps/kwalletmanager/kwalletmanager-15.04.49.9999.ebuild b/kde-apps/kwalletmanager/kwalletmanager-15.04.49.9999.ebuild index f40a47c..4dcdc26 100644 --- a/kde-apps/kwalletmanager/kwalletmanager-15.04.49.9999.ebuild +++ b/kde-apps/kwalletmanager/kwalletmanager-15.04.49.9999.ebuild @@ -11,6 +11,14 @@ DESCRIPTION="KDE Wallet Management Tool" HOMEAGE="http://www.kde.org/applications/system/kwalletmanager http://utils.kde.org/projects/kwalletmanager" KEYWORDS="" -IUSE="debug" +IUSE="debug minimal" RDEPEND="!kde-base/kwallet:4" + +src_install() { + kde4-base_src_install + + if use minimal ; then + rm -r "${D}"/usr/share/icons + fi +} diff --git a/kde-apps/kwalletmanager/kwalletmanager-5.9999.ebuild b/kde-apps/kwalletmanager/kwalletmanager-5.9999.ebuild index 296b31d..10be881 100644 --- a/kde-apps/kwalletmanager/kwalletmanager-5.9999.ebuild +++ b/kde-apps/kwalletmanager/kwalletmanager-5.9999.ebuild @@ -4,6 +4,7 @@ EAPI=5 +KDE_BLOCK_SLOT4="false" KDE_HANDBOOK="true" EGIT_BRANCH="frameworks" inherit kde5 @@ -36,5 +37,6 @@ DEPEND=" dev-qt/qtxml:5 " RDEPEND="${DEPEND} + !kde-apps/kwalletmanager:4[-minimal(-)] !kde-base/kwalletmanager:4 " diff --git a/kde-apps/kwalletmanager/kwalletmanager-9999.ebuild b/kde-apps/kwalletmanager/kwalletmanager-9999.ebuild index f40a47c..4dcdc26 100644 --- a/kde-apps/kwalletmanager/kwalletmanager-9999.ebuild +++ b/kde-apps/kwalletmanager/kwalletmanager-9999.ebuild @@ -11,6 +11,14 @@ DESCRIPTION="KDE Wallet Management Tool" HOMEAGE="http://www.kde.org/applications/system/kwalletmanager http://utils.kde.org/projects/kwalletmanager" KEYWORDS="" -IUSE="debug" +IUSE="debug minimal" RDEPEND="!kde-base/kwallet:4" + +src_install() { + kde4-base_src_install + + if use minimal ; then + rm -r "${D}"/usr/share/icons + fi +}
