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-base/kdelibs/
Date: Tue, 21 Jan 2014 18:56:00
Message-Id: 1390330402.60afa0a456850e101908f9aae75017d6a9634466.kensington@gentoo
1 commit: 60afa0a456850e101908f9aae75017d6a9634466
2 Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jan 21 18:53:09 2014 +0000
4 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
5 CommitDate: Tue Jan 21 18:53:22 2014 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=60afa0a4
7
8 [kde-base/kdelibs] Do not remove man pages.
9
10 They were removed to avoid a conflict with kde-frameworks/kdoctools,
11 but they are now renamed upstream.
12
13 Package-Manager: portage-2.2.7
14
15 ---
16 kde-base/kdelibs/kdelibs-4.11.49.9999.ebuild | 3 ---
17 kde-base/kdelibs/kdelibs-4.12.49.9999.ebuild | 3 ---
18 kde-base/kdelibs/kdelibs-9999.ebuild | 3 ---
19 3 files changed, 9 deletions(-)
20
21 diff --git a/kde-base/kdelibs/kdelibs-4.11.49.9999.ebuild b/kde-base/kdelibs/kdelibs-4.11.49.9999.ebuild
22 index c6dcd68..48bba44 100644
23 --- a/kde-base/kdelibs/kdelibs-4.11.49.9999.ebuild
24 +++ b/kde-base/kdelibs/kdelibs-4.11.49.9999.ebuild
25 @@ -236,9 +236,6 @@ src_install() {
26 rm -f "${ED}"/usr/share/apps/kssl/ca-bundle.crt || die
27 dosym /etc/ssl/certs/ca-certificates.crt /usr/share/apps/kssl/ca-bundle.crt
28
29 - # conflict with kf5 tier2 - kdoctools
30 - rm -rf "${ED}"/usr/share/man/ || die
31 -
32 if use doc; then
33 einfo "Installing API documentation. This could take a bit of time."
34 cd "${S}"/doc/api/
35
36 diff --git a/kde-base/kdelibs/kdelibs-4.12.49.9999.ebuild b/kde-base/kdelibs/kdelibs-4.12.49.9999.ebuild
37 index b602dab..a85c77d 100644
38 --- a/kde-base/kdelibs/kdelibs-4.12.49.9999.ebuild
39 +++ b/kde-base/kdelibs/kdelibs-4.12.49.9999.ebuild
40 @@ -236,9 +236,6 @@ src_install() {
41 rm -f "${ED}"/usr/share/apps/kssl/ca-bundle.crt || die
42 dosym /etc/ssl/certs/ca-certificates.crt /usr/share/apps/kssl/ca-bundle.crt
43
44 - # conflict with kf5 tier2 - kdoctools
45 - rm -rf "${ED}"/usr/share/man/ || die
46 -
47 if use doc; then
48 einfo "Installing API documentation. This could take a bit of time."
49 cd "${S}"/doc/api/
50
51 diff --git a/kde-base/kdelibs/kdelibs-9999.ebuild b/kde-base/kdelibs/kdelibs-9999.ebuild
52 index fe5af53..db618a4 100644
53 --- a/kde-base/kdelibs/kdelibs-9999.ebuild
54 +++ b/kde-base/kdelibs/kdelibs-9999.ebuild
55 @@ -236,9 +236,6 @@ src_install() {
56 rm -f "${ED}"/usr/share/apps/kssl/ca-bundle.crt || die
57 dosym /etc/ssl/certs/ca-certificates.crt /usr/share/apps/kssl/ca-bundle.crt
58
59 - # conflict with kf5 tier2 - kdoctools
60 - rm -rf "${ED}"/usr/share/man/ || die
61 -
62 if use doc; then
63 einfo "Installing API documentation. This could take a bit of time."
64 cd "${S}"/doc/api/