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
commit797284ece83589c422656ac92803cef05e059293 (patch)
tree1e3359760f559013c34e1b4591a1560a9ac49394 /sys-fs
parentDummy commit to trigger update of packages.gentoo.org. (diff)
downloadhistorical-797284ece83589c422656ac92803cef05e059293.tar.gz
historical-797284ece83589c422656ac92803cef05e059293.tar.bz2
historical-797284ece83589c422656ac92803cef05e059293.zip
Fix duplicated docs, Bug #281137. Depend on glibc-2.7 to get signalfd-header, Bug #281520.
Package-Manager: portage-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/Manifest10
-rw-r--r--sys-fs/udev/udev-145.ebuild11
3 files changed, 19 insertions, 8 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/Manifest b/sys-fs/udev/Manifest
index 8a13ef9e849f..5ec6319a20ba 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -55,14 +55,14 @@ EBUILD udev-124-r1.ebuild 10678 RMD160 6b6267b7bbc071d5f36f7197badc7d8ac646e671
EBUILD udev-124-r2.ebuild 11035 RMD160 6d17242ff354b614312f6033d19e82a982cf1d7f SHA1 8157db46b65cf6e8de606f1345e4873974efeec9 SHA256 eeee3f1060b90828326f5ed63226769fc6e20aa91299e15d7983a9d2c54a1a57
EBUILD udev-141-r1.ebuild 13023 RMD160 ac7e1148dd14ee5315e7d3d2da45cd3a31b52abb SHA1 5803d0b73f84d2c0e24a3580cc8459c4d24656fe SHA256 0d6868c0ac752a3d86d4d0598dda40d20c17282c8ef098e292d41e0b4ab6aefd
EBUILD udev-141.ebuild 12473 RMD160 d94c24ea8d7085df6cf9c89ad15b50e80a61d891 SHA1 7ac3fb1f2c5d5194cf1a1ce608753b608b9782b3 SHA256 3c7b9033d05f9643dfdf4f8ddb64e73655e470170bd7f17df08dd6f00f292a26
-EBUILD udev-145.ebuild 13404 RMD160 19bfdddc5f862f932e802ad0cb753e5397224f37 SHA1 d377cef1db650eca2daefbbd05b21e766c99fa66 SHA256 6deed511e7f06545957a35da4fe3e64b538ae01c7bdda0c78b0a61a3ad850670
+EBUILD udev-145.ebuild 13606 RMD160 a2bd57707b9185835996138e7d9c32d499a49980 SHA1 fa92b8c7cbc2b81a81ff98c10bf7971466133359 SHA256 d7cf131e4c7c0f702cb5cea0bec01f4edb87c62f87b72facfe29019d70c1753c
EBUILD udev-9999.ebuild 13330 RMD160 c1965afa19708e151fda998138b7fb57d3e0d8c1 SHA1 70c2d2eb7e72105a6ca3f9a29f7eb26016e7bdaf SHA256 7f7bb4e126878499a1ce5fc20902e99264d2622783c25a933589f278808b52f6
-MISC ChangeLog 98614 RMD160 add8d91113202149e6edc5ff783fdbf9dbaf32d6 SHA1 22268ebd6895386353eadbed02367cfd87d011a0 SHA256 56aacac83305f19a3589d18843a519b190149d1d7eec88a27c89e276373d22df
+MISC ChangeLog 98780 RMD160 8c378081497a8b3a4fec2a6dbac06f908b83cffa SHA1 f53018d16be8db060e6a5c539f79c44c9808ede1 SHA256 a128513f2f00ff27cfc85661cce62cac15c98912723eb4d10e53d7224c5a2a33
MISC metadata.xml 402 RMD160 fad8844286866f47eadb2fd958f54f650976fe2a SHA1 c966d4e9e509d399523d1ba6ef54277e750334de SHA256 1c524286463bf115615462e9504c27710331f1d82a0828de5d78686f5e303ed5
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.11 (GNU/Linux)
-iEYEARECAAYFAkqAF08ACgkQt2vP6XvVdOeQ5ACcDIDobm+JmbCtfJQSMQ2Vvyiy
-VYgAni4XMAh4AyNwTXNgTUc4OYhHxBY4
-=L3IU
+iEYEARECAAYFAkqHNTgACgkQt2vP6XvVdOf4TACg5FOJ0kF3B+o9xq7AujjjTpS1
+joMAoIL5QnC0Ywl/B4dpPqUfssWIuaD+
+=Eiud
-----END PGP SIGNATURE-----
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