[gentoo-commits] proj/kde:master commit in: kde-apps/kcontrol/

[Michael Palimaka]

commit:     4f403a1e55eaa16c3467b9dab9c4bacc28455a92
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Tue Sep  1 16:13:41 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue Sep  1 16:13:46 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=4f403a1e

kde-apps/kcontrol: punt trash handbook.

It collides with kde-apps/kio-extras which can be pulled in for KDE 4 users
via kde-apps/dolphin:5 version bump.

Package-Manager: portage-2.2.20.1

 kde-apps/kcontrol/kcontrol-15.08.49.9999.ebuild | 1 +
 kde-apps/kcontrol/kcontrol-9999.ebuild          | 1 +
 2 files changed, 2 insertions(+)

diff --git a/kde-apps/kcontrol/kcontrol-15.08.49.9999.ebuild 
b/kde-apps/kcontrol/kcontrol-15.08.49.9999.ebuild
index e5a25a9..6171e6b 100644
--- a/kde-apps/kcontrol/kcontrol-15.08.49.9999.ebuild
+++ b/kde-apps/kcontrol/kcontrol-15.08.49.9999.ebuild
@@ -21,5 +21,6 @@ src_prepare() {
        kde4-meta_src_prepare
        if use handbook; then
                sed -i -e "/add_subdirectory(kcm_ssl)/d" 
doc/kcontrol/CMakeLists.txt || die
+               sed -i -e "/add_subdirectory(trash)/d" 
doc/kcontrol/CMakeLists.txt || die
        fi
 }

diff --git a/kde-apps/kcontrol/kcontrol-9999.ebuild 
b/kde-apps/kcontrol/kcontrol-9999.ebuild
index e5a25a9..6171e6b 100644
--- a/kde-apps/kcontrol/kcontrol-9999.ebuild
+++ b/kde-apps/kcontrol/kcontrol-9999.ebuild
@@ -21,5 +21,6 @@ src_prepare() {
        kde4-meta_src_prepare
        if use handbook; then
                sed -i -e "/add_subdirectory(kcm_ssl)/d" 
doc/kcontrol/CMakeLists.txt || die
+               sed -i -e "/add_subdirectory(trash)/d" 
doc/kcontrol/CMakeLists.txt || die
        fi
 }