| 1 |
commit: bbdf2757e5ebbb4f9ebae735f47693af9a10f247 |
| 2 |
Author: Johannes Huber <johu <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Nov 21 21:08:00 2013 +0000 |
| 4 |
Commit: Johannes Huber <johu <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Nov 21 21:08:00 2013 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=bbdf2757 |
| 7 |
|
| 8 |
[kde-base/kdelibs] Drop man pages conflicting with kf5 |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.7 |
| 11 |
|
| 12 |
--- |
| 13 |
kde-base/kdelibs/kdelibs-4.11.49.9999.ebuild | 3 +++ |
| 14 |
kde-base/kdelibs/kdelibs-9999.ebuild | 3 +++ |
| 15 |
2 files changed, 6 insertions(+) |
| 16 |
|
| 17 |
diff --git a/kde-base/kdelibs/kdelibs-4.11.49.9999.ebuild b/kde-base/kdelibs/kdelibs-4.11.49.9999.ebuild |
| 18 |
index 2aceb36..06e8a67 100644 |
| 19 |
--- a/kde-base/kdelibs/kdelibs-4.11.49.9999.ebuild |
| 20 |
+++ b/kde-base/kdelibs/kdelibs-4.11.49.9999.ebuild |
| 21 |
@@ -236,6 +236,9 @@ src_install() { |
| 22 |
rm -f "${ED}"/usr/share/apps/kssl/ca-bundle.crt || die |
| 23 |
dosym /etc/ssl/certs/ca-certificates.crt /usr/share/apps/kssl/ca-bundle.crt |
| 24 |
|
| 25 |
+ # conflict with kf5 tier2 - kdoctools |
| 26 |
+ rm -rf "${ED}"/usr/share/man/ || die |
| 27 |
+ |
| 28 |
if use doc; then |
| 29 |
einfo "Installing API documentation. This could take a bit of time." |
| 30 |
cd "${S}"/doc/api/ |
| 31 |
|
| 32 |
diff --git a/kde-base/kdelibs/kdelibs-9999.ebuild b/kde-base/kdelibs/kdelibs-9999.ebuild |
| 33 |
index bea7cb6..3b365f7 100644 |
| 34 |
--- a/kde-base/kdelibs/kdelibs-9999.ebuild |
| 35 |
+++ b/kde-base/kdelibs/kdelibs-9999.ebuild |
| 36 |
@@ -236,6 +236,9 @@ src_install() { |
| 37 |
rm -f "${ED}"/usr/share/apps/kssl/ca-bundle.crt || die |
| 38 |
dosym /etc/ssl/certs/ca-certificates.crt /usr/share/apps/kssl/ca-bundle.crt |
| 39 |
|
| 40 |
+ # conflict with kf5 tier2 - kdoctools |
| 41 |
+ rm -rf "${ED}"/usr/share/man/ || die |
| 42 |
+ |
| 43 |
if use doc; then |
| 44 |
einfo "Installing API documentation. This could take a bit of time." |
| 45 |
cd "${S}"/doc/api/ |
Archives