summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2013-11-24 08:38:45 +0000
committerMichał Górny <mgorny@gentoo.org>2013-11-24 08:38:45 +0000
commit8078d9a76d5523a0f95a5820bed754da030dfd20 (patch)
tree71c55a648f68eb63d62f100359213f6d59debf40 /sys-apps/attr
parentMask omptagger and id3lib-ruby for removal, bug 488676. (diff)
downloadgentoo-2-8078d9a76d5523a0f95a5820bed754da030dfd20.tar.gz
gentoo-2-8078d9a76d5523a0f95a5820bed754da030dfd20.tar.bz2
gentoo-2-8078d9a76d5523a0f95a5820bed754da030dfd20.zip
Clean up manpages in the same code path as they are installed, bug #485494.
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Diffstat (limited to 'sys-apps/attr')
-rw-r--r--sys-apps/attr/ChangeLog5
-rw-r--r--sys-apps/attr/attr-2.4.47-r1.ebuild13
2 files changed, 12 insertions, 6 deletions
diff --git a/sys-apps/attr/ChangeLog b/sys-apps/attr/ChangeLog
index db802b10a7cb..723c976e152c 100644
--- a/sys-apps/attr/ChangeLog
+++ b/sys-apps/attr/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for sys-apps/attr
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/attr/ChangeLog,v 1.159 2013/10/14 18:20:05 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/attr/ChangeLog,v 1.160 2013/11/24 08:38:45 mgorny Exp $
+
+ 24 Nov 2013; Michał Górny <mgorny@gentoo.org> attr-2.4.47-r1.ebuild:
+ Clean up manpages in the same code path as they are installed, bug #485494.
14 Oct 2013; Michał Górny <mgorny@gentoo.org> attr-2.4.47-r1.ebuild:
Explicitly call einstalldocs in multilib_src_install_all() to accomodate bug
diff --git a/sys-apps/attr/attr-2.4.47-r1.ebuild b/sys-apps/attr/attr-2.4.47-r1.ebuild
index 49e77674b0eb..d7d97f956bf4 100644
--- a/sys-apps/attr/attr-2.4.47-r1.ebuild
+++ b/sys-apps/attr/attr-2.4.47-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/sys-apps/attr/attr-2.4.47-r1.ebuild,v 1.3 2013/10/14 18:20:05 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/attr/attr-2.4.47-r1.ebuild,v 1.4 2013/11/24 08:38:45 mgorny Exp $
EAPI="4"
@@ -54,13 +54,16 @@ multilib_src_install() {
DIST_ROOT="${D}" \
install install-lib install-dev
- # we install attr into /bin, so we need the shared lib with it
- multilib_is_native_abi && gen_usr_ldscript -a attr
+ if multilib_is_native_abi; then
+ # we install attr into /bin, so we need the shared lib with it
+ gen_usr_ldscript -a attr
+ # the man-pages packages provides the man2 files
+ # note: man-pages are installed by TOOL_SUBDIRS
+ rm -r "${ED}"/usr/share/man/man2 || die
+ fi
}
multilib_src_install_all() {
use static-libs || prune_libtool_files --all
einstalldocs
- # the man-pages packages provides the man2 files
- rm -r "${ED}"/usr/share/man/man2 || die
}