diff options
author | Johannes Huber <johu@gentoo.org> | 2013-11-21 21:09:40 +0000 |
---|---|---|
committer | Johannes Huber <johu@gentoo.org> | 2013-11-21 21:09:40 +0000 |
commit | 93e02c398c5aa76a509887a7bd093534ee22b9bb (patch) | |
tree | a847e7e31dde69da4bb9141ce073dbde73eabe98 /kde-base/kdelibs | |
parent | version bump (diff) | |
download | gentoo-2-93e02c398c5aa76a509887a7bd093534ee22b9bb.tar.gz gentoo-2-93e02c398c5aa76a509887a7bd093534ee22b9bb.tar.bz2 gentoo-2-93e02c398c5aa76a509887a7bd093534ee22b9bb.zip |
Revision bump drops man pages conflicting with kf5.
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key F3CFD2BD)
Diffstat (limited to 'kde-base/kdelibs')
-rw-r--r-- | kde-base/kdelibs/ChangeLog | 8 | ||||
-rw-r--r-- | kde-base/kdelibs/kdelibs-4.11.3-r1.ebuild (renamed from kde-base/kdelibs/kdelibs-4.11.3.ebuild) | 5 |
2 files changed, 11 insertions, 2 deletions
diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog index 63b897005eb1..de3f8d689610 100644 --- a/kde-base/kdelibs/ChangeLog +++ b/kde-base/kdelibs/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for kde-base/kdelibs # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.957 2013/11/05 22:22:57 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.958 2013/11/21 21:09:40 johu Exp $ + +*kdelibs-4.11.3-r1 (21 Nov 2013) + + 21 Nov 2013; Johannes Huber <johu@gentoo.org> +kdelibs-4.11.3-r1.ebuild, + -kdelibs-4.11.3.ebuild: + Revision bump drops man pages conflicting with kf5. *kdelibs-4.11.3 (05 Nov 2013) diff --git a/kde-base/kdelibs/kdelibs-4.11.3.ebuild b/kde-base/kdelibs/kdelibs-4.11.3-r1.ebuild index 691a943e03e8..3798dbbd4603 100644 --- a/kde-base/kdelibs/kdelibs-4.11.3.ebuild +++ b/kde-base/kdelibs/kdelibs-4.11.3-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.11.3.ebuild,v 1.1 2013/11/05 22:22:57 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.11.3-r1.ebuild,v 1.1 2013/11/21 21:09:40 johu Exp $ EAPI=5 @@ -236,6 +236,9 @@ src_install() { rm -f "${ED}"/usr/share/apps/kssl/ca-bundle.crt || die dosym /etc/ssl/certs/ca-certificates.crt /usr/share/apps/kssl/ca-bundle.crt + # conflict with kf5 tier2 - kdoctools + rm -rf "${ED}"/usr/share/man/ || die + if use doc; then einfo "Installing API documentation. This could take a bit of time." cd "${S}"/doc/api/ |