summaryrefslogtreecommitdiff
path: root/sys-fs
diff options
context:
space:
mode:
authorMatthias Schwarzott <zzam@gentoo.org>2009-08-15 22:22:42 +0000
committerMatthias Schwarzott <zzam@gentoo.org>2009-08-15 22:22:42 +0000
commit1264544308f1ded000a0c7215be3c040f0f77098 (patch)
treed4620e4b624ff24203c4ee812cc367ad4a79883e /sys-fs
parentDummy commit to trigger update of packages.gentoo.org. (diff)
downloadgentoo-2-1264544308f1ded000a0c7215be3c040f0f77098.tar.gz
gentoo-2-1264544308f1ded000a0c7215be3c040f0f77098.tar.bz2
gentoo-2-1264544308f1ded000a0c7215be3c040f0f77098.zip
Fix duplicated docs, Bug #281137. Depend on glibc-2.7 to get signalfd-header, Bug #281520.
(Portage version: 2.1.6.13/cvs/Linux i686)
Diffstat (limited to 'sys-fs')
-rw-r--r--sys-fs/udev/ChangeLog6
-rw-r--r--sys-fs/udev/udev-145.ebuild11
2 files changed, 14 insertions, 3 deletions
diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog
index 71a06730c0bf..89731c8164e7 100644
--- a/sys-fs/udev/ChangeLog
+++ b/sys-fs/udev/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-fs/udev
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.481 2009/08/10 12:49:13 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.482 2009/08/15 22:22:42 zzam Exp $
+
+ 15 Aug 2009; Matthias Schwarzott <zzam@gentoo.org> udev-145.ebuild:
+ Fix duplicated docs, Bug #281137. Depend on glibc-2.7 to get
+ signalfd-header, Bug #281520.
10 Aug 2009; Matthias Schwarzott <zzam@gentoo.org>
files/udev-9999-disable-doc.diff:
diff --git a/sys-fs/udev/udev-145.ebuild b/sys-fs/udev/udev-145.ebuild
index 5988f7129c11..35b5bce81974 100644
--- a/sys-fs/udev/udev-145.ebuild
+++ b/sys-fs/udev/udev-145.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-145.ebuild,v 1.2 2009/07/16 07:40:20 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-145.ebuild,v 1.3 2009/08/15 22:22:42 zzam Exp $
EAPI="1"
@@ -32,7 +32,8 @@ COMMON_DEPEND="selinux? ( sys-libs/libselinux )
>=sys-apps/util-linux-2.16"
DEPEND="${COMMON_DEPEND}
- extras? ( dev-util/gperf )"
+ extras? ( dev-util/gperf )
+ >=sys-libs/glibc-2.7"
RDEPEND="${COMMON_DEPEND}
!sys-apps/coldplug
@@ -253,6 +254,12 @@ src_install() {
# documentation
dodoc ChangeLog README TODO || die "failed installing docs"
+ # keep doc in just one directory, Bug #281137
+ rm -rf "${D}/usr/share/doc/${PN}"
+ if use extras; then
+ dodoc extras/keymap/README.keymap.txt || die "failed installing docs"
+ fi
+
cd docs/writing_udev_rules
mv index.html writing_udev_rules.html
dohtml *.html