summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2012-04-05 18:40:59 +0000
committerMichał Górny <mgorny@gentoo.org>2012-04-05 18:40:59 +0000
commitff7c5c7d4d8717f4213751e02ed4c68a09dbfa49 (patch)
tree15b52726179cbb3bff3f2c62f44a93cc97e675f6 /sys-apps/systemd
parentCleanup (diff)
downloadhistorical-ff7c5c7d4d8717f4213751e02ed4c68a09dbfa49.tar.gz
historical-ff7c5c7d4d8717f4213751e02ed4c68a09dbfa49.tar.bz2
historical-ff7c5c7d4d8717f4213751e02ed4c68a09dbfa49.zip
Avoid installing duplicate systemadm manpage.
Package-Manager: portage-2.2.0_alpha99_p2/cvs/Linux x86_64
Diffstat (limited to 'sys-apps/systemd')
-rw-r--r--sys-apps/systemd/ChangeLog5
-rw-r--r--sys-apps/systemd/systemd-44.ebuild4
2 files changed, 7 insertions, 2 deletions
diff --git a/sys-apps/systemd/ChangeLog b/sys-apps/systemd/ChangeLog
index 060c5fdca2a3..3ae572f220c6 100644
--- a/sys-apps/systemd/ChangeLog
+++ b/sys-apps/systemd/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for sys-apps/systemd
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.27 2012/04/05 11:15:27 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.28 2012/04/05 18:40:59 mgorny Exp $
+
+ 05 Apr 2012; Michał Górny <mgorny@gentoo.org> systemd-44.ebuild:
+ Avoid installing duplicate systemadm manpage.
*systemd-44 (05 Apr 2012)
diff --git a/sys-apps/systemd/systemd-44.ebuild b/sys-apps/systemd/systemd-44.ebuild
index 4216d8f6795e..563da5a8894f 100644
--- a/sys-apps/systemd/systemd-44.ebuild
+++ b/sys-apps/systemd/systemd-44.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-44.ebuild,v 1.1 2012/04/05 11:15:27 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-44.ebuild,v 1.2 2012/04/05 18:40:59 mgorny Exp $
EAPI=4
@@ -101,6 +101,8 @@ src_install() {
rm "${D}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 \
|| die
rm "${D}"/usr/share/man/man1/init.1 || die
+ # collision with -ui
+ rm "${D}"/usr/share/man/man1/systemadm.1 || die
# Create /run/lock as required by new baselay/OpenRC compat.
insinto /usr/lib/tmpfiles.d