add -vserver and -lxc keywords to udev-mount and udev-postmount, fix a typo in udev...
authorWilliam Hubbs <williamh@gentoo.org>
Thu, 29 Dec 2011 19:32:46 +0000 (19:32 +0000)
committerWilliam Hubbs <williamh@gentoo.org>
Thu, 29 Dec 2011 19:32:46 +0000 (19:32 +0000)
Package-Manager: portage-2.2.0_alpha84/cvs/Linux i686

sys-fs/udev/ChangeLog
sys-fs/udev/Manifest
sys-fs/udev/udev-141-r1.ebuild
sys-fs/udev/udev-141.ebuild
sys-fs/udev/udev-146-r1.ebuild
sys-fs/udev/udev-149.ebuild
sys-fs/udev/udev-151-r4.ebuild
sys-fs/udev/udev-164-r2.ebuild
sys-fs/udev/udev-171-r5.ebuild [new file with mode: 0644]
sys-fs/udev/udev-175-r1.ebuild
sys-fs/udev/udev-9999.ebuild

index a977ee95338585e1dc2ff44421958274772b1d7e..67df95714ba6731718539c2f5a06e7c3154172c6 100644 (file)
@@ -1,6 +1,15 @@
 # ChangeLog for sys-fs/udev
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.626 2011/12/25 04:59:48 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.627 2011/12/29 19:32:46 williamh Exp $
+
+*udev-171-r5 (29 Dec 2011)
+
+  29 Dec 2011; William Hubbs <williamh@gentoo.org> udev-141.ebuild,
+  udev-141-r1.ebuild, udev-146-r1.ebuild, udev-149.ebuild, udev-151-r4.ebuild,
+  udev-164-r2.ebuild, +udev-171-r5.ebuild, udev-175-r1.ebuild,
+  udev-9999.ebuild:
+  add -vserver and -lxc keywords to udev-mount and udev-postmount, fix a typo
+  in udev script and several repoman fixes.
 
   25 Dec 2011; William Hubbs <williamh@gentoo.org> udev-9999.ebuild:
   udev now needs >=sys-apps/util-linux-2.20
index 24e495965b5c0712382babdacae94c437c5a436c..69da4f93352caae5c8714051145a5af819034018 100644 (file)
@@ -117,26 +117,28 @@ DIST udev-171.tar.bz2 597937 RMD160 5b8f9f1e7ba353c58fef851f6f4e1f4c468540b4 SHA
 DIST udev-175.tar.bz2 616780 RMD160 3e568f3137e4f768be2122382b57bf1ceac2385c SHA1 2ef42ca4b11e6b9d0d5c7f47da39eb2e64695e44 SHA256 4c7937fe5a1521316ea571188745b9a00a9fdf314228cffc53a7ba9e5968b7ab
 DIST udev-gentoo-scripts-164-v2.tar.bz2 9504 RMD160 826fe14de7cd4d60688dbc2a35daa38377b2e706 SHA1 d27d615d48133dc4411cdc47e3edfed04a78b385 SHA256 5fff00a00da6f6bfc47e375d2a8da6679a4e1de152d9f30f16b4bc8c6d79a5ef
 DIST udev-gentoo-scripts-6.tar.bz2 16242 RMD160 f6ba565ca36cd12a5ed07fdffda0f5dc864c271a SHA1 5891ac0550db26112cc180904ce46f3be43f950a SHA256 d319dd8a5496361561344c1c190dde1b9ffc0023a29875647a407ed577f2727f
+DIST udev-gentoo-scripts-7.tar.bz2 16248 RMD160 51d58ff81f24dc5eb5c696c54739cc4048503295 SHA1 261ee037dec7f3a4abee22e5bd31522cc69d01e0 SHA256 cef8d47fe3b023c40dde621e0c91a9d38b7e7b83de5bae53e71a9027dfc65de7
 EBUILD udev-114.ebuild 9021 RMD160 64b07c73985d287107db391785c626aa10ff5414 SHA1 a5754bfee36dd35e2abade6abedf0f31b7fd08d4 SHA256 0ae31d95d25a9553c2313c9e23eaf5542b309955b949fc8379ab50f20a3790d1
 EBUILD udev-115-r1.ebuild 10098 RMD160 dbe906361bd6fb6eea0e6b9efec1727ba5c0fa5c SHA1 3f021a8b10e7e82ca82a0feb24f2ee3e276c0c2f SHA256 5eb4847f2ddff4db3065eacdc2c4c2fbae73024f52165caad1bb25f719f4f515
 EBUILD udev-119.ebuild 10136 RMD160 1b40a739bc73d093e036c050aa3b388379820197 SHA1 c08a8084a5de801fd2fa38e8a9200c7a772281b0 SHA256 b7a893347f7379f8a032df17daf4bc033e56fc0c07f64252d16643dab1174673
 EBUILD udev-124-r1.ebuild 10647 RMD160 72051c7ae6fa4caccc6456f2c6019bcc7c938537 SHA1 fc3461d9ea72d0f87bf50f514a95a0085bc3be64 SHA256 44dbb5da1cc5b4fdab668543c052f927949f42e300678fcb3c1768984afadbe5
 EBUILD udev-124-r2.ebuild 11004 RMD160 ce06ab607f5f8c6218490e877fd7c7acbb0d6235 SHA1 0414529640509e0cf3ad793b301b332dd81770b3 SHA256 fe002ade74627d024ffa49aee3300dbb7d47678853f1274178bcf5bef652a6c9
-EBUILD udev-141-r1.ebuild 13057 RMD160 2902cba65032afecfa2c52f70b01050d4c66fb71 SHA1 f57a0274b9f20a470be88eb0de0d37c6e87b1ee2 SHA256 46053abec89b66a9bd04e5c913671318a4498fe415a86288fe8e64ed451d33af
-EBUILD udev-141.ebuild 12391 RMD160 816ab11d38411cb1b8790a5d25d864263f40dc7b SHA1 b0e28044e9f44c112f7b972b6641ed9ba031509f SHA256 a2348924d374a28e86cc88c7c0e70ad9eddcde75b3ee49e07e3fad367d85ce6a
-EBUILD udev-146-r1.ebuild 15455 RMD160 35fec6e1eb5112d852c3e6a0e57b576d13620acc SHA1 fd7d44caa49d1f6e804c5806b381afd8dd34db25 SHA256 9c3cf52f029b7224e88d26c616fec0675c9f570bf9cdcfa062b06fd03a2871e1
-EBUILD udev-149.ebuild 16613 RMD160 65d46a5b3188f7bcfcdb9d8a8ff3b6d34829e314 SHA1 5c88835ffd735ea90db62713daba5f08a4551b64 SHA256 a04300cfafd64abd0f67c1d628f4b5d8ebfdf4dca90102f5764b3b739ed41453
-EBUILD udev-151-r4.ebuild 16852 RMD160 e0d2c7041c102e0e5979a1ed5c99d9f4d5820842 SHA1 907db35a89e1ad163c631941e76a5e8105ffd196 SHA256 c2657e3c93dbb8bd3e6dda1c779150aa6127f7a525ed2f04342e33afb4306cfb
-EBUILD udev-164-r2.ebuild 15290 RMD160 9562519d52fe37bf1e1fec735d683bb051ff6c64 SHA1 0269d2b4297ea5cb452f0cef3d83cd803dd9c3ec SHA256 31e9092e1877e254874157950f482805ec09ac809827e9de33e710cc90ceaf06
+EBUILD udev-141-r1.ebuild 13064 RMD160 88f2ec92be8af4c2f574fb067fbb56ad3cc7faec SHA1 374e6ff5ae3799c1b01cbdc99413dc4d2f6b700a SHA256 8873f7ef03aca012ae0115c09ff3433e94236436375b2015784f78780f491e04
+EBUILD udev-141.ebuild 12398 RMD160 805662597ea064c2af2ba597fcaaa926d910d93a SHA1 8f2c6c3ea7a92edbddaa51c29abb2fe43dc09774 SHA256 203de548c314c6e6d57795260879c97df17e0946f1a8b65e0b6dcd5c5d9a613d
+EBUILD udev-146-r1.ebuild 15457 RMD160 70cef8018ec0371ba7ee8c389ae9fff1aa85cd6a SHA1 e23caf06d25590ce41e2648e7d7fdc48dc2e06fc SHA256 62a7fee5d6efc302b477628c13b623344c97c278fa59659987fb4abef626b3b2
+EBUILD udev-149.ebuild 16615 RMD160 03518a87dbf75a07d92e36b4f2502205b9b9bf9e SHA1 91ad8a896333d6470299df02675797c338b0067d SHA256 d4d46ad8fc348020dff33e16b1d807a43316f6ec0742b0b0f6b6e02b0b37a543
+EBUILD udev-151-r4.ebuild 16854 RMD160 2a3020c386c7febec51547f11adb56047d014ba6 SHA1 193231e2d153210345eff34a29de29e0848e46b2 SHA256 0f23858a6e5b7e88062d44230b8682a26a7f658fb054d0dffffdbb055dfc6c3c
+EBUILD udev-164-r2.ebuild 15293 RMD160 5ecd48a263c88c1943c9a8666e3f5189cce17917 SHA1 012c6929f96d77c59e15311dc62de36469189b5b SHA256 04ba93884db303008bf4027494775eb42b02d7ffd50d0620e3f2dbbc42bf37bc
 EBUILD udev-171-r4.ebuild 15559 RMD160 74fe6aa5874b266ec6dc1ee9d17b24d8320acaf5 SHA1 cdc7306e50ab0304d5bc8d292a6e3eaf32c01fc7 SHA256 5d523637e1ebf68c4c297362556f2daeda7360c3254c761ccf9a78f1a0fd69bf
-EBUILD udev-175-r1.ebuild 12554 RMD160 6b2042c42100cc226bbd52e4bacb384ddd9ab8b4 SHA1 3ce7f532c80ac5e1d6cc3cd66835fcfe7097e0fe SHA256 58e3bdc7a16d314ab0315029dab844729f2d3521bb017efcd05c2e032b42d8c1
-EBUILD udev-9999.ebuild 12399 RMD160 567514c958b7f61b8273ace718c4df3277a99987 SHA1 588eec32ddb685ed8b2e104d70200012c0442789 SHA256 4673d5d2b14def832d27a867b8f854ee9a712f7967e6c1b2ec4eb4de53150b5a
-MISC ChangeLog 127443 RMD160 aa2f48b5c3843be29c067ba66046515f09d5d7d6 SHA1 bc4ec1eaf0c32c9aaf7146aa9fb7f4debe3103d5 SHA256 d353f1d5f31d9a2d29fbc8af54f90d2d258c05a0ce673d7e67dba886168e2a55
+EBUILD udev-171-r5.ebuild 15561 RMD160 bc5f202faa0744571fd1ecb9f47ca92b47f5dc94 SHA1 f0d1b4e6d00795b5a8bc06df16687a94f2708502 SHA256 e2475435b4b20a2400585dca9845cf9244cd4ac914d463a1fc4910b099f3336c
+EBUILD udev-175-r1.ebuild 12553 RMD160 fde4a1f6f5efff377d83943be9b6c4cea0548940 SHA1 fb80d3a1e52ee7165ec80be0ea8ad56a43a55479 SHA256 795df1ec343abee162d679c581ac89a67e285dce6fad21f784366f021fb2c8d4
+EBUILD udev-9999.ebuild 12396 RMD160 d4a0d680d94d316cde14158a702eaf47c51522b1 SHA1 77ee95bb85d56d8df66e70f47fb898c016c073c2 SHA256 e4624b5bc0643ad2cdbeeddbbbb2441c8d3ee30b9cffd9e45498f2c144eee9e0
+MISC ChangeLog 127824 RMD160 dc5f4e40b3caf753404097a9c4f0200b550faafb SHA1 1d6be35602c57128aafc87401b96cd9f6c063099 SHA256 cb015d53f0e439e5769e1992fdc6c6168f80c24070ea837b2747de25b367a75d
 MISC metadata.xml 1235 RMD160 36ff4665ed99aa392ff8003e9351bd620cc79424 SHA1 3fd0e915598c248b5c7d609b6a98a4cde8431b05 SHA256 dbbbd093a910a5cb541d7be160f749dc87fc699d72165c184965fa056d60f24b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk72re8ACgkQblQW9DDEZTixBACfUXGyLKAxXHiZjw+PKHsKSkHZ
-NkgAniivHye5qnktHKh1LvPU0NeR7luD
-=hnh7
+iEYEARECAAYFAk78v8gACgkQblQW9DDEZTgA3ACfXVDgtvUYO5ui9lcdxnoHxHK4
+910AoL1KZSMLVMAk/RFObBmvxIjy2Riv
+=N5Df
 -----END PGP SIGNATURE-----
index 75538f1ad6f323ea3be2e36efa5bc934a71fe3c9..7886e44699671f8a875cd162a2dcc973d83ca6fd 100644 (file)
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-141-r1.ebuild,v 1.5 2011/04/15 21:55:18 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-141-r1.ebuild,v 1.6 2011/12/29 19:32:46 williamh Exp $
 
 #
 # Please do not remove this version:
@@ -14,7 +14,7 @@ inherit eutils flag-o-matic multilib toolchain-funcs versionator
 if [[ ${PV} == "9999" ]]; then
        EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/hotplug/udev.git"
        EGIT_BRANCH="master"
-       inherit git autotools
+       inherit git-2 autotools
 else
        SRC_URI="mirror://kernel/linux/utils/kernel/hotplug/${P}.tar.bz2"
 fi
index 9509c86a4a1a011cf140cc85f635d70d9aa013df..4d12b8cb4938de8120328c01780609f5879fa215 100644 (file)
@@ -1,13 +1,13 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-141.ebuild,v 1.10 2011/04/15 21:55:18 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-141.ebuild,v 1.11 2011/12/29 19:32:46 williamh Exp $
 
 inherit eutils flag-o-matic multilib toolchain-funcs versionator
 
 if [[ ${PV} == "9999" ]]; then
        EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/hotplug/udev.git"
        EGIT_BRANCH="master"
-       inherit git autotools
+       inherit git-2 autotools
 else
        SRC_URI="mirror://kernel/linux/utils/kernel/hotplug/${P}.tar.bz2"
 fi
index 79c208c36754bae4dfe05e391065d53e76f59d92..abe6878ba7063762c5e5e251169b2de7ed5bbcca 100644 (file)
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-146-r1.ebuild,v 1.15 2011/07/06 16:44:44 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-146-r1.ebuild,v 1.16 2011/12/29 19:32:46 williamh Exp $
 
 EAPI="1"
 
@@ -11,7 +11,7 @@ PATCHSET=${P}-gentoo-patchset-v1
 if [[ ${PV} == "9999" ]]; then
        EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/hotplug/udev.git"
        EGIT_BRANCH="master"
-       inherit git autotools
+       inherit git-2 autotools
 else
        SRC_URI="mirror://kernel/linux/utils/kernel/hotplug/${P}.tar.bz2
                        mirror://gentoo/${PATCHSET}.tar.bz2"
index f69d03fbc33be03f01837622fab2694b81df1c81..308f38725407a09b7eeeddb0d591e35366e3604e 100644 (file)
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-149.ebuild,v 1.19 2011/07/06 16:44:44 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-149.ebuild,v 1.20 2011/12/29 19:32:46 williamh Exp $
 
 EAPI="1"
 
@@ -11,7 +11,7 @@ PATCHSET=${P}-gentoo-patchset-v1
 if [[ ${PV} == "9999" ]]; then
        EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/hotplug/udev.git"
        EGIT_BRANCH="master"
-       inherit git autotools
+       inherit git-2 autotools
 else
        # please update testsys-tarball whenever udev-xxx/test/sys/ is changed
        SRC_URI="mirror://kernel/linux/utils/kernel/hotplug/${P}.tar.bz2
index 3e5ab17dedbd985567a613f8d5ab3f6391cd3d13..c221e2a0e8e58fb50753fc4489b317d7c37b3617 100644 (file)
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-151-r4.ebuild,v 1.17 2011/07/06 16:44:44 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-151-r4.ebuild,v 1.18 2011/12/29 19:32:46 williamh Exp $
 
 EAPI="1"
 
@@ -11,7 +11,7 @@ inherit eutils flag-o-matic multilib toolchain-funcs linux-info
 if [[ ${PV} == "9999" ]]; then
        EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/hotplug/udev.git"
        EGIT_BRANCH="master"
-       inherit git autotools
+       inherit git-2 autotools
 else
        # please update testsys-tarball whenever udev-xxx/test/sys/ is changed
        SRC_URI="mirror://kernel/linux/utils/kernel/hotplug/${P}.tar.bz2
index d766b246a885a22a16aca8e8882cc5ebf42b1f49..52902e0717002b918158c5d64e331ec68af151bb 100644 (file)
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-164-r2.ebuild,v 1.16 2011/12/17 18:16:48 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-164-r2.ebuild,v 1.17 2011/12/29 19:32:46 williamh Exp $
 
 EAPI="1"
 
@@ -13,7 +13,7 @@ scriptname=${PN}-gentoo-scripts-${scriptversion}
 if [[ ${PV} == "9999" ]]; then
        EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/hotplug/udev.git"
        EGIT_BRANCH="master"
-       inherit git autotools
+       inherit git-2 autotools
 else
        # please update testsys-tarball whenever udev-xxx/test/sys/ is changed
        SRC_URI="mirror://kernel/linux/utils/kernel/hotplug/${P}.tar.bz2
diff --git a/sys-fs/udev/udev-171-r5.ebuild b/sys-fs/udev/udev-171-r5.ebuild
new file mode 100644 (file)
index 0000000..0dd7dcb
--- /dev/null
@@ -0,0 +1,572 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-171-r5.ebuild,v 1.1 2011/12/29 19:32:46 williamh Exp $
+
+EAPI=4
+
+KV_min=2.6.32
+KV_reliable=2.6.32
+PATCHSET=${P}-gentoo-patchset-v1
+scriptversion=7
+scriptname=udev-gentoo-scripts
+[[ -n "${scriptversion}" ]] && scriptname="${scriptname}-${scriptversion}"
+
+if [[ ${PV} == "9999" ]]
+then
+       EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/hotplug/udev.git"
+       EGIT_BRANCH="master"
+       vcs="git-2 autotools"
+fi
+
+inherit ${vcs} eutils flag-o-matic multilib toolchain-funcs linux-info systemd libtool
+
+if [[ ${PV} != "9999" ]]
+then
+       KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-linux"
+       # please update testsys-tarball whenever udev-xxx/test/sys/ is changed
+       SRC_URI="mirror://kernel/linux/utils/kernel/hotplug/${P}.tar.bz2
+                        test? ( mirror://gentoo/${PN}-171-testsys.tar.bz2 )"
+       if [[ -n "${PATCHSET}" ]]
+       then
+               SRC_URI="${SRC_URI} mirror://gentoo/${PATCHSET}.tar.bz2"
+       fi
+fi
+SRC_URI="${SRC_URI} mirror://gentoo/${scriptname}.tar.bz2"
+
+DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
+HOMEPAGE="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="build selinux test debug +rule_generator hwdb acl gudev introspection
+       keymap floppy edd action_modeswitch extras"
+
+COMMON_DEPEND="selinux? ( sys-libs/libselinux )
+       extras? ( sys-apps/acl
+               dev-libs/glib:2
+               dev-libs/gobject-introspection
+               virtual/libusb:0 )
+       acl? ( sys-apps/acl dev-libs/glib:2 )
+       gudev? ( dev-libs/glib:2 )
+       introspection? ( dev-libs/gobject-introspection )
+       action_modeswitch? ( virtual/libusb:0 )
+       >=sys-apps/util-linux-2.16
+       >=sys-libs/glibc-2.10"
+
+DEPEND="${COMMON_DEPEND}
+       keymap? ( dev-util/gperf )
+       extras? ( dev-util/gperf )
+       dev-util/pkgconfig
+       virtual/os-headers
+       !<sys-kernel/linux-headers-2.6.34
+       test? ( app-text/tree )"
+
+RDEPEND="${COMMON_DEPEND}
+       hwdb?
+       (
+               >=sys-apps/usbutils-0.82
+               sys-apps/pciutils[-zlib]
+       )
+       extras?
+       (
+               >=sys-apps/usbutils-0.82
+               sys-apps/pciutils
+       )
+       !sys-apps/coldplug
+       !<sys-fs/lvm2-2.02.45
+       !sys-fs/device-mapper
+       >=sys-apps/baselayout-1.12.5"
+
+if [[ ${PV} == "9999" ]]
+then
+       # for documentation processing with xsltproc
+       DEPEND="${DEPEND}
+               app-text/docbook-xsl-stylesheets
+               app-text/docbook-xml-dtd
+               dev-util/gtk-doc"
+fi
+
+# required kernel options
+CONFIG_CHECK="~INOTIFY_USER ~SIGNALFD ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2
+       ~!IDE ~BLK_DEV_BSG"
+
+# Return values:
+# 2 - reliable
+# 1 - unreliable
+# 0 - too old
+udev_check_KV() {
+       local ok=0
+       if kernel_is -ge ${KV_reliable//./ }
+       then
+               ok=2
+       elif kernel_is -ge ${KV_min//./ }
+       then
+               ok=1
+       fi
+       return $ok
+}
+
+pkg_setup() {
+       linux-info_pkg_setup
+
+       # always print kernel version requirements
+       ewarn
+       ewarn "${P} does not support Linux kernel before version ${KV_min}!"
+       if [[ ${KV_min} != ${KV_reliable} ]]
+       then
+               ewarn "For a reliable udev, use at least kernel ${KV_reliable}"
+       fi
+
+       udev_check_KV
+       case "$?" in
+               2)      einfo "Your kernel version (${KV_FULL}) is new enough to run ${P} reliably." ;;
+               1)      ewarn "Your kernel version (${KV_FULL}) is new enough to run ${P},"
+                       ewarn "but it may be unreliable in some cases."
+                       ;;
+               0)      eerror "Your kernel version (${KV_FULL}) is too old to run ${P}"
+                       ;;
+       esac
+
+       KV_FULL_SRC=${KV_FULL}
+       get_running_version
+       udev_check_KV
+       if [[ "$?" = "0" ]]
+       then
+               eerror
+               eerror "udev cannot be restarted after emerging,"
+               eerror "as your running kernel version (${KV_FULL}) is too old."
+               eerror "You really need to use a newer kernel after a reboot!"
+               NO_RESTART=1
+       fi
+}
+
+src_unpack() {
+       unpack ${A}
+       if [[ ${PV} == "9999" ]]
+       then
+               git-2_src_unpack
+       fi
+}
+
+src_prepare() {
+       if use test && [[ -d "${WORKDIR}"/test/sys ]]
+       then
+               mv "${WORKDIR}"/test/sys "${S}"/test/
+       fi
+
+       # patches go here...
+
+       # backport some patches
+       if [[ -n "${PATCHSET}" ]]
+       then
+               EPATCH_SOURCE="${WORKDIR}/${PATCHSET}" EPATCH_SUFFIX="patch" \
+                         EPATCH_FORCE="yes" epatch
+       fi
+
+       # change rules back to group uucp instead of dialout for now
+       sed -e 's/GROUP="dialout"/GROUP="uucp"/' \
+               -i rules/{rules.d,arch}/*.rules \
+       || die "failed to change group dialout to uucp"
+
+       if [[ ${PV} != 9999 ]]
+       then
+               # Make sure there is no sudden changes to upstream rules file
+               # (more for my own needs than anything else ...)
+               MD5=$(md5sum < "${S}/rules/rules.d/50-udev-default.rules")
+               MD5=${MD5/  -/}
+               if [[ ${MD5} != a9954d57e97aa0ad2e0ed53899d9559a ]]
+               then
+                       eerror "50-udev-default.rules has been updated, please validate!"
+                       eerror "md5sum: ${MD5}"
+                       die "50-udev-default.rules has been updated, please validate!"
+               fi
+       fi
+
+       if [[ ${PV} == 9999 ]]
+       then
+               gtkdocize --copy || die "gtkdocize failed"
+               eautoreconf
+       else
+               elibtoolize
+       fi
+}
+
+use_extras() { use extras && echo "--enable-${2:-$1}" || use_enable "$@" ; }
+src_configure() {
+       econf \
+               --prefix="${EPREFIX}/usr" \
+               --sysconfdir="${EPREFIX}/etc" \
+               --sbindir="${EPREFIX}/sbin" \
+               --libdir="${EPREFIX}/usr/$(get_libdir)" \
+               --with-rootlibdir="${EPREFIX}/$(get_libdir)" \
+               --libexecdir="${EPREFIX}/lib/udev" \
+               --enable-logging \
+               --enable-static \
+               $(use_with selinux) \
+               $(use_enable debug) \
+               $(use_extras rule_generator) \
+               $(use_extras hwdb) \
+               --with-pci-ids-path="${EPREFIX}/usr/share/misc/pci.ids" \
+               --with-usb-ids-path="${EPREFIX}/usr/share/misc/usb.ids" \
+               $(use_extras acl udev_acl) \
+               $(use_extras gudev) \
+               $(use_extras introspection) \
+               $(use_extras keymap) \
+               $(use_extras floppy) \
+               $(use_extras edd) \
+               $(use_extras action_modeswitch) \
+               $(systemd_with_unitdir)
+}
+
+src_compile() {
+       filter-flags -fprefetch-loop-arrays
+
+       emake
+}
+
+src_install() {
+       into /
+       emake DESTDIR="${D}" install
+
+       exeinto /lib/udev
+       keepdir /lib/udev/state
+       keepdir /lib/udev/devices
+
+       # create symlinks for these utilities to /sbin
+       # where multipath-tools expect them to be (Bug #168588)
+       dosym "../lib/udev/scsi_id" /sbin/scsi_id
+
+       # Add gentoo stuff to udev.conf
+       echo "# If you need to change mount-options, do it in /etc/fstab" \
+       >> "${ED}"/etc/udev/udev.conf
+
+       # let the dir exist at least
+       keepdir /etc/udev/rules.d
+
+       # Now installing rules
+       cd "${S}"/rules
+       insinto /lib/udev/rules.d/
+
+       # support older kernels
+       doins misc/30-kernel-compat.rules
+
+       # Adding arch specific rules
+       if [[ -f arch/40-${ARCH}.rules ]]
+       then
+               doins "arch/40-${ARCH}.rules"
+       fi
+       cd "${S}"
+
+       insinto /etc/modprobe.d
+       newins "${FILESDIR}"/blacklist-146 blacklist.conf
+       newins "${FILESDIR}"/pnp-aliases pnp-aliases.conf
+
+       # documentation
+       dodoc ChangeLog README TODO
+
+       # keep doc in just one directory, Bug #281137
+       rm -rf "${ED}/usr/share/doc/${PN}"
+       if use keymap
+       then
+               dodoc extras/keymap/README.keymap.txt
+       fi
+
+       cd "${WORKDIR}/${scriptname}"
+       sed -i -e 's/2.6.34/2.6.32/' init.d/udev
+       doconfd conf.d/*
+       exeinto /lib/udev
+       doexe helpers/*
+doexe "${FILESDIR}"/shell-compat-KV.sh
+       doinitd init.d/*
+       insinto /etc/modprobe.d
+       doins modprobe.d/*
+       insinto /lib/udev/rules.d
+       doins rules.d/*
+}
+
+src_test() {
+       local emake_cmd="${MAKE:-make} ${MAKEOPTS} ${EXTRA_EMAKE}"
+
+       cd "${S}"
+       vecho ">>> Test phase [udev:check]: ${CATEGORY}/${PF}"
+       has userpriv $FEATURES && einfo "Disable FEATURES userpriv to run the udev tests"
+       if ! $emake_cmd -j1 check
+       then
+               has test $FEATURES && die "udev: Make test failed. See above for details."
+               has test $FEATURES || eerror "udev: Make test failed. See above for details."
+       fi
+}
+
+pkg_preinst() {
+       # moving old files to support newer modprobe, 12 May 2009
+       local f dir=${EROOT}/etc/modprobe.d/
+       for f in pnp-aliases blacklist; do
+               if [[ -f $dir/$f && ! -f $dir/$f.conf ]]
+               then
+                       elog "Moving $dir/$f to $f.conf"
+                       mv -f "$dir/$f" "$dir/$f.conf"
+               fi
+       done
+
+       if [[ -d ${EROOT}/lib/udev-state ]]
+       then
+               mv -f "${EROOT}"/lib/udev-state/* "${ED}"/lib/udev/state/
+               rm -r "${EROOT}"/lib/udev-state
+       fi
+
+       if [[ -f ${EROOT}/etc/udev/udev.config &&
+                ! -f ${EROOT}/etc/udev/udev.rules ]]
+       then
+               mv -f "${EROOT}"/etc/udev/udev.config "${EROOT}"/etc/udev/udev.rules
+       fi
+
+       # delete the old udev.hotplug symlink if it is present
+       if [[ -h ${EROOT}/etc/hotplug.d/default/udev.hotplug ]]
+       then
+               rm -f "${EROOT}"/etc/hotplug.d/default/udev.hotplug
+       fi
+
+       # delete the old wait_for_sysfs.hotplug symlink if it is present
+       if [[ -h ${EROOT}/etc/hotplug.d/default/05-wait_for_sysfs.hotplug ]]
+       then
+               rm -f "${EROOT}"/etc/hotplug.d/default/05-wait_for_sysfs.hotplug
+       fi
+
+       # delete the old wait_for_sysfs.hotplug symlink if it is present
+       if [[ -h ${EROOT}/etc/hotplug.d/default/10-udev.hotplug ]]
+       then
+               rm -f "${EROOT}"/etc/hotplug.d/default/10-udev.hotplug
+       fi
+
+       has_version "=${CATEGORY}/${PN}-103-r3"
+       previous_equal_to_103_r3=$?
+
+       has_version "<${CATEGORY}/${PN}-104-r5"
+       previous_less_than_104_r5=$?
+
+       has_version "<${CATEGORY}/${PN}-106-r5"
+       previous_less_than_106_r5=$?
+
+       has_version "<${CATEGORY}/${PN}-113"
+       previous_less_than_113=$?
+}
+
+# 19 Nov 2008
+fix_old_persistent_net_rules() {
+       local rules=${EROOT}/etc/udev/rules.d/70-persistent-net.rules
+       [[ -f ${rules} ]] || return
+
+       elog
+       elog "Updating persistent-net rules file"
+
+       # Change ATTRS to ATTR matches, Bug #246927
+       sed -i -e 's/ATTRS{/ATTR{/g' "${rules}"
+
+       # Add KERNEL matches if missing, Bug #246849
+       sed -ri \
+               -e '/KERNEL/ ! { s/NAME="(eth|wlan|ath)([0-9]+)"/KERNEL=="\1*", NAME="\1\2"/}' \
+               "${rules}"
+}
+
+# See Bug #129204 for a discussion about restarting udevd
+restart_udevd() {
+       if [[ ${NO_RESTART} = "1" ]]
+       then
+               ewarn "Not restarting udevd, as your kernel is too old!"
+               return
+       fi
+
+       # need to merge to our system
+       [[ ${EROOT} = / ]] || return
+
+       # check if root of init-process is identical to ours (not in chroot)
+       [[ -r /proc/1/root && /proc/1/root/ -ef /proc/self/root/ ]] || return
+
+       # abort if there is no udevd running
+       [[ -n $(pidof udevd) ]] || return
+
+       # abort if no /dev/.udev exists
+       [[ -e /dev/.udev ]] || return
+
+       elog
+       elog "restarting udevd now."
+
+       killall -15 udevd &>/dev/null
+       sleep 1
+       killall -9 udevd &>/dev/null
+
+       /sbin/udevd --daemon
+       sleep 3
+       if [[ ! -n $(pidof udevd) ]]
+       then
+               eerror "FATAL: udev died, please check your kernel is"
+               eerror "new enough and configured correctly for ${P}."
+               eerror
+               eerror "Please have a look at this before rebooting."
+               eerror "If in doubt, please downgrade udev back to your old version"
+       fi
+}
+
+postinst_init_scripts() {
+       local enable_postmount=false
+
+       # FIXME: inconsistent handling of init-scripts here
+       #  * udev is added to sysinit in openrc-ebuild
+       #  * we add udev-postmount to default in here
+       #
+
+       # If we are building stages, add udev to the sysinit runlevel automatically.
+       if use build
+       then
+               if [[ -x "${EROOT}"/etc/init.d/udev  \
+                       && -d "${EROOT}"/etc/runlevels/sysinit ]]
+               then
+                       ln -s "${EPREFIX}"/etc/init.d/udev "${EROOT}"/etc/runlevels/sysinit/udev
+               fi
+               enable_postmount=true
+       fi
+
+       # migration to >=openrc-0.4
+       if [[ -e "${EROOT}"/etc/runlevels/sysinit && ! -e "${EROOT}"/etc/runlevels/sysinit/udev ]]
+       then
+               ewarn
+               ewarn "You need to add the udev init script to the runlevel sysinit,"
+               ewarn "else your system will not be able to boot"
+               ewarn "after updating to >=openrc-0.4.0"
+               ewarn "Run this to enable udev for >=openrc-0.4.0:"
+               ewarn "\trc-update add udev sysinit"
+               ewarn
+       fi
+
+       # add udev-postmount to default runlevel instead of that ugly injecting
+       # like a hotplug event, 2009/10/15
+
+       # already enabled?
+       [[ -e "${EROOT}"/etc/runlevels/default/udev-postmount ]] && return
+
+       [[ -e "${EROOT}"/etc/runlevels/sysinit/udev ]] && enable_postmount=true
+       [[ "${EROOT}" = "/" && -d /dev/.udev/ ]] && enable_postmount=true
+
+       if $enable_postmount
+       then
+               local initd=udev-postmount
+
+               if [[ -e ${EROOT}/etc/init.d/${initd} ]] && \
+                       [[ ! -e ${EROOT}/etc/runlevels/default/${initd} ]]
+               then
+                       ln -snf "${EPREFIX}"/etc/init.d/${initd} "${EROOT}"/etc/runlevels/default/${initd}
+                       elog "Auto-adding '${initd}' service to your default runlevel"
+               fi
+       else
+               elog "You should add the udev-postmount service to default runlevel."
+               elog "Run this to add it:"
+               elog "\trc-update add udev-postmount default"
+       fi
+}
+
+pkg_postinst() {
+       fix_old_persistent_net_rules
+
+       # "losetup -f" is confused if there is an empty /dev/loop/, Bug #338766
+       # So try to remove it here (will only work if empty).
+       rmdir "${EROOT}"/dev/loop 2>/dev/null
+       if [[ -d "${EROOT}"/dev/loop ]]
+       then
+               ewarn "Please make sure your remove /dev/loop,"
+               ewarn "else losetup may be confused when looking for unused devices."
+       fi
+
+       restart_udevd
+
+       postinst_init_scripts
+
+       # people want reminders, I'll give them reminders.  Odds are they will
+       # just ignore them anyway...
+
+       # delete 40-scsi-hotplug.rules, it is integrated in 50-udev.rules, 19 Jan 2007
+       if [[ $previous_equal_to_103_r3 = 0 ]] &&
+               [[ -e ${EROOT}/etc/udev/rules.d/40-scsi-hotplug.rules ]]
+       then
+               ewarn "Deleting stray 40-scsi-hotplug.rules"
+               ewarn "installed by sys-fs/udev-103-r3"
+               rm -f "${EROOT}"/etc/udev/rules.d/40-scsi-hotplug.rules
+       fi
+
+       # Removing some device-nodes we thought we need some time ago, 25 Jan 2007
+       if [[ -d ${EROOT}/lib/udev/devices ]]
+       then
+               rm -f "${EROOT}"/lib/udev/devices/{null,zero,console,urandom}
+       fi
+
+       # Removing some old file, 29 Jan 2007
+       if [[ $previous_less_than_104_r5 = 0 ]]
+       then
+               rm -f "${EROOT}"/etc/dev.d/net/hotplug.dev
+               rmdir --ignore-fail-on-non-empty "${EROOT}"/etc/dev.d/net 2>/dev/null
+       fi
+
+       # 19 Mar 2007
+       if [[ $previous_less_than_106_r5 = 0 ]] &&
+               [[ -e ${EROOT}/etc/udev/rules.d/95-net.rules ]]
+       then
+               rm -f "${EROOT}"/etc/udev/rules.d/95-net.rules
+       fi
+
+       # Try to remove /etc/dev.d as that is obsolete, 23 Apr 2007
+       if [[ -d ${EROOT}/etc/dev.d ]]
+       then
+               rmdir --ignore-fail-on-non-empty "${EROOT}"/etc/dev.d/default "${EROOT}"/etc/dev.d 2>/dev/null
+               if [[ -d ${EROOT}/etc/dev.d ]]
+               then
+                       ewarn "You still have the directory /etc/dev.d on your system."
+                       ewarn "This is no longer used by udev and can be removed."
+               fi
+       fi
+
+       # 64-device-mapper.rules now gets installed by sys-fs/device-mapper
+       # remove it if user don't has sys-fs/device-mapper installed, 27 Jun 2007
+       if [[ $previous_less_than_113 = 0 ]] &&
+               [[ -f ${EROOT}/etc/udev/rules.d/64-device-mapper.rules ]] &&
+               ! has_version sys-fs/device-mapper
+       then
+                       rm -f "${EROOT}"/etc/udev/rules.d/64-device-mapper.rules
+                       einfo "Removed unneeded file 64-device-mapper.rules"
+       fi
+
+       # requested in Bug #225033:
+       elog
+       elog "persistent-net does assigning fixed names to network devices."
+       elog "If you have problems with the persistent-net rules,"
+       elog "just delete the rules file"
+       elog "\trm ${EROOT}etc/udev/rules.d/70-persistent-net.rules"
+       elog "and then reboot."
+       elog
+       elog "This may however number your devices in a different way than they are now."
+
+       ewarn
+       ewarn "If you build an initramfs including udev, then please"
+       ewarn "make sure that the /sbin/udevadm binary gets included,"
+       ewarn "and your scripts changed to use it,as it replaces the"
+       ewarn "old helper apps udevinfo, udevtrigger, ..."
+
+       ewarn
+       ewarn "mount options for directory /dev are no longer"
+       ewarn "set in /etc/udev/udev.conf, but in /etc/fstab"
+       ewarn "as for other directories."
+
+       ewarn
+       ewarn "If you use /dev/md/*, /dev/loop/* or /dev/rd/*,"
+       ewarn "then please migrate over to using the device names"
+       ewarn "/dev/md*, /dev/loop* and /dev/ram*."
+       ewarn "The devfs-compat rules have been removed."
+       ewarn "For reference see Bug #269359."
+
+       ewarn
+       ewarn "Rules for /dev/hd* devices have been removed"
+       ewarn "Please migrate to libata."
+
+       elog
+       elog "For more information on udev on Gentoo, writing udev rules, and"
+       elog "         fixing known issues visit:"
+       elog "         http://www.gentoo.org/doc/en/udev-guide.xml"
+}
index 06cd8fcaf57d9780290ce7966d2c3b1691473874..4487eeb3cb56da7af04976d2d5b6c4c013e2a56d 100644 (file)
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-175-r1.ebuild,v 1.2 2011/12/09 20:43:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-175-r1.ebuild,v 1.3 2011/12/29 19:32:46 williamh Exp $
 
 EAPI=4
 
@@ -357,7 +357,7 @@ ismounted()
        while read a m a; do
                [ "$m" = "$1" ] && return 0
        done < "${EROOT}"/proc/mounts
-    return 1
+       return 1
 }
 
 pkg_postinst()
index e4bd4e29366c45e58ac2f5d2fa5a09aaa99c69e1..f8227e6424d0c10b5d61dbdcb4654f8d32456afa 100644 (file)
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.66 2011/12/25 04:59:48 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.67 2011/12/29 19:32:46 williamh Exp $
 
 EAPI=4
 
@@ -357,7 +357,7 @@ ismounted()
        while read a m a; do
                [ "$m" = "$1" ] && return 0
        done < "${ROOT}"/proc/mounts
-    return 1
+       return 1
 }
 
 pkg_postinst()