Gentoo Archives: gentoo-commits

From: Michael Palimaka <kensington@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/kcontrol/
Date: Tue, 01 Sep 2015 16:14:23
Message-Id: 1441124026.4f403a1e55eaa16c3467b9dab9c4bacc28455a92.kensington@gentoo
1 commit: 4f403a1e55eaa16c3467b9dab9c4bacc28455a92
2 Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
3 AuthorDate: Tue Sep 1 16:13:41 2015 +0000
4 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
5 CommitDate: Tue Sep 1 16:13:46 2015 +0000
6 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=4f403a1e
7
8 kde-apps/kcontrol: punt trash handbook.
9
10 It collides with kde-apps/kio-extras which can be pulled in for KDE 4 users
11 via kde-apps/dolphin:5 version bump.
12
13 Package-Manager: portage-2.2.20.1
14
15 kde-apps/kcontrol/kcontrol-15.08.49.9999.ebuild | 1 +
16 kde-apps/kcontrol/kcontrol-9999.ebuild | 1 +
17 2 files changed, 2 insertions(+)
18
19 diff --git a/kde-apps/kcontrol/kcontrol-15.08.49.9999.ebuild b/kde-apps/kcontrol/kcontrol-15.08.49.9999.ebuild
20 index e5a25a9..6171e6b 100644
21 --- a/kde-apps/kcontrol/kcontrol-15.08.49.9999.ebuild
22 +++ b/kde-apps/kcontrol/kcontrol-15.08.49.9999.ebuild
23 @@ -21,5 +21,6 @@ src_prepare() {
24 kde4-meta_src_prepare
25 if use handbook; then
26 sed -i -e "/add_subdirectory(kcm_ssl)/d" doc/kcontrol/CMakeLists.txt || die
27 + sed -i -e "/add_subdirectory(trash)/d" doc/kcontrol/CMakeLists.txt || die
28 fi
29 }
30
31 diff --git a/kde-apps/kcontrol/kcontrol-9999.ebuild b/kde-apps/kcontrol/kcontrol-9999.ebuild
32 index e5a25a9..6171e6b 100644
33 --- a/kde-apps/kcontrol/kcontrol-9999.ebuild
34 +++ b/kde-apps/kcontrol/kcontrol-9999.ebuild
35 @@ -21,5 +21,6 @@ src_prepare() {
36 kde4-meta_src_prepare
37 if use handbook; then
38 sed -i -e "/add_subdirectory(kcm_ssl)/d" doc/kcontrol/CMakeLists.txt || die
39 + sed -i -e "/add_subdirectory(trash)/d" doc/kcontrol/CMakeLists.txt || die
40 fi
41 }