diff options
| author |   William Hubbs <williamh@gentoo.org> | 2012-08-15 19:44:05 +0000 |
|---|---|---|
| committer | William Hubbs <williamh@gentoo.org> | 2012-08-15 19:44:05 +0000 |
| commit | a87ffffda3a5effbd8cffab10b5ddcaf0ad74ee4 (patch) | |
| tree | c8e82cd7e5f370a27a9b0537a86b03d24a02e274 /sys-fs/udev | |
| parent | Version bump, release candidate for Emacs 24.2. (diff) | |
| download | historical-a87ffffda3a5effbd8cffab10b5ddcaf0ad74ee4.tar.gz historical-a87ffffda3a5effbd8cffab10b5ddcaf0ad74ee4.tar.bz2 historical-a87ffffda3a5effbd8cffab10b5ddcaf0ad74ee4.zip | |
sync live ebuild
Package-Manager: portage-2.2.0_alpha120/cvs/Linux i686
Diffstat (limited to 'sys-fs/udev')
| -rw-r--r-- | sys-fs/udev/Manifest | 8 | ||||
| -rw-r--r-- | sys-fs/udev/udev-9999.ebuild | 26 |
2 files changed, 22 insertions, 12 deletions
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest index fe373db74c93..cefe8bf647b1 100644 --- a/sys-fs/udev/Manifest +++ b/sys-fs/udev/Manifest @@ -31,14 +31,14 @@ EBUILD udev-171-r6.ebuild 15731 SHA256 f56cc93b03d4125ec219f6f624ae614135741deee EBUILD udev-187-r1.ebuild 10674 SHA256 52d7e9329db5fdd1f32b443918f085fb9f07651fb5410e9935ffd03ca692745a SHA512 a33f37aeff1aa582647b7cdf5e7c62402e5b660601b0166c57ab95e9b9fdfea77098c4e8220f332ba0478df5ea2e08260aef736aec88f409841a3ec0374552f3 WHIRLPOOL c494f459a0fd8d43cf7b8f26ece03e4c031695ab05236223cd1cac2678ac17b642520771cf11ee25925b3fce636dd6379939b7618bd689349746d37c8d909ae6 EBUILD udev-187-r3.ebuild 10393 SHA256 65b0e7b59ef358d0e5baa6f9cc5ff140acca15e01572dc058d07cdb770316277 SHA512 33c5d18d8f76dadf97a564e131eddee9c96e414fa3b5c6c1c625e0bea5103c4824a2d96573fef93b4dea7e69eaac284d3482574681428a5a3012914e534cba5c WHIRLPOOL ac6f7ce5833f28cd935eff8752f3db2dc59caa54cef352d7fc8f14635ca96c0e949febef8261856befc457ca139df07dd6ae064342c0fa9475a7349ad3a94c10 EBUILD udev-188.ebuild 10745 SHA256 d980c0d3ebbbc4dff94da2752a76e6a2e36a8d86030c206bcbd9f51dd1fa0978 SHA512 406a06cc0ab6471994a10e55bfb34e63c9de8223c844211f81c2e6da2e9aef7bb03305b8608761b9576c70782a74dad07bc3639b9ae29bb84440b94177a6ec95 WHIRLPOOL 42675e5950f93b2766d7255dc62ce36fcc0a17f9dc964cf61397ccee9502dcaaa0ebf51767c0fa0532b6ddc320867fedf724f8b19014152b3092a0a08898faf0 -EBUILD udev-9999.ebuild 10368 SHA256 2482c56ec7cdc6ccb42db4629b23ac1d0138fa7c5128c4c859dbec2dd33b9081 SHA512 64705d66203ae1155c37a588cfc9c3ba65c727b628f9a74a39d256307a0646e26fc17bb7af37bdb29b85f8588f5f134eefd0111771f022b8c59d490a36ec2435 WHIRLPOOL 9ebf0d7d7e6ea4845f3ed40b0f1d73334a0feea3d616c8eb1ed22f5b1f1a321ef681e2dd05129518786fe7b53e814b9732d26f4483bb32645904ad5ff8807192 +EBUILD udev-9999.ebuild 10747 SHA256 f9927dc6e15a7619ff30390b7ccec3aeb9da800f6a2bf09f2b269288d8a0933c SHA512 efd190719e9c7b6ee0f8150ce03ed5b9e39687ab489480d77032bc0acc385cf48ace2b66899ff995f4acce22f1892beb22102144c6161b5ecacad843ea2be35c WHIRLPOOL 1fef2d747c2347540edad62e296460a7c6ad7628f2f26217ac0627032dbb5417001d26a18dbb025c62fb50342a6d9ef25e0a358f915a0210d32efdac22fb1d95 MISC ChangeLog 39786 SHA256 7d2590de04bcdc233271f49d5889cf68c21be276544e4f770198e1d533fa069a SHA512 5d2e1e306e6bc708c7e8d0ca19f3a5cb4a00262285914dfd8bb4af224dd56a6573c66f168300b442fd968a5d2e9f103d260aa42df15976fed3dfd9fe2aa9c457 WHIRLPOOL 0216def3233994d12adb238820d9b0ff64ccf75b2b98c4a61009a17aa0756553bcc1ac2b6d4c3a77a9dea5e835e71b1da43371a98f487c1ea45c7a34d9039c66 MISC ChangeLog-2009 105929 SHA256 7a8d7123b7395dc5bbde09a8c0cee1c5110d24faf87a68a8210b0c6bdf862c1c SHA512 3b577c97224e7f85ae5fb0a0ead538f8aa83c738e6014fadaf5247f34d3863df4bc10f9d15a5e117813d081a8af1913ea41a5e60d00ed521ea0c1e5b71a91a2b WHIRLPOOL c9f527ba19e787f9973a26ed535dbf7af760c3a519f4b062cf2a8069e134a803ebe669450deace804be70619995b389529febf03e8aeb7183c3ea984c0dfdaa5 MISC metadata.xml 1219 SHA256 0ae3dd9577e914a82f647c359681a278220520270fe4ae1a4dbd7ea0c0071945 SHA512 bab691cd1183391798ef4bb1997c995573a30213afdd2565fbf3f33c9dd7953a915e40a9a8a2963b47f8950e97707e0204f41847f891e99cac8ec0db067d7b57 WHIRLPOOL fb116da30e0c1fbd84ec8eda60d2677ed9972a2144138f4b3e6bddb11d2a38b117522417f3c7c445801bfe9461cb870560a4019df1c7fd36b646ee0ebf9a06a9 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iEYEAREIAAYFAlAr2wAACgkQblQW9DDEZTjtTwCeLloiNgkdasygYgDbcGIeta6w -nRQAoKCVQpcWwpxe8o5TJlylE0aKVLMG -=oeJh +iEYEAREIAAYFAlAr/LsACgkQblQW9DDEZTheRACgmNBjqYAAH3Hhn3Qa1LNqAA8e +cVAAoK+j+p3WEOPiOX/gouwaWBLSMuN1 +=L8L/ -----END PGP SIGNATURE----- diff --git a/sys-fs/udev/udev-9999.ebuild b/sys-fs/udev/udev-9999.ebuild index ffbf3a61d2bf..2dc219ae44de 100644 --- a/sys-fs/udev/udev-9999.ebuild +++ b/sys-fs/udev/udev-9999.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-fs/udev/udev-9999.ebuild,v 1.109 2012/08/13 16:05:15 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.110 2012/08/15 19:44:05 williamh Exp $ EAPI=4 @@ -13,12 +13,12 @@ then EGIT_REPO_URI="git://anongit.freedesktop.org/systemd/systemd" inherit git-2 else - patchversion= + patchset= SRC_URI="http://www.freedesktop.org/software/systemd/systemd-${PV}.tar.xz" - if [[ -n "${patchversion}" ]] + if [[ -n "${patchset}" ]] then SRC_URI="${SRC_URI} - mirror://gentoo/${P}-patches-${patchversion}.tar.bz2" + http://dev.gentoo.org/~williamh/dist/${P}-patches-${patchset}.tar.bz2" fi KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" fi @@ -28,11 +28,12 @@ HOMEPAGE="http://www.freedesktop.org/wiki/Software/systemd" LICENSE="LGPL-2.1 MIT GPL-2" SLOT="0" -IUSE="doc gudev hwdb introspection keymap +openrc selinux static-libs" +IUSE="acl doc gudev hwdb introspection keymap +openrc selinux static-libs" RESTRICT="test" -COMMON_DEPEND="gudev? ( dev-libs/glib:2 ) +COMMON_DEPEND="acl? ( sys-apps/acl ) + gudev? ( dev-libs/glib:2 ) introspection? ( >=dev-libs/gobject-introspection-1.31.1 ) selinux? ( sys-libs/libselinux ) >=sys-apps/kmod-5 @@ -59,6 +60,7 @@ RDEPEND="${COMMON_DEPEND} openrc? ( >=sys-fs/udev-init-scripts-16 !<sys-apps/openrc-0.9.9 ) !sys-apps/coldplug + !=sys-apps/systemd-188 !<sys-fs/lvm2-2.02.45 !sys-fs/device-mapper !<sys-fs/udev-init-scripts-16 @@ -119,7 +121,7 @@ pkg_setup() src_prepare() { # backport some patches - if [[ -n "${patchversion}" ]] + if [[ -n "${patchset}" ]] then EPATCH_SUFFIX=patch EPATCH_FORCE=yes epatch fi @@ -162,7 +164,6 @@ src_configure() --with-rootlibdir=/usr/$(get_libdir) --with-rootprefix=/usr --with-usb-ids-path=/usr/share/misc/usb.ids - --disable-acl --disable-audit --disable-coredump --disable-hostnamed @@ -178,6 +179,7 @@ src_configure() --disable-tcpwrap --disable-timedated --disable-xz + $(use_enable acl) $(use_enable doc gtk-doc) $(use_enable gudev) $(use_enable introspection) @@ -231,6 +233,7 @@ src_install() install-binPROGRAMS install-rootlibexecPROGRAMS install-udevlibexecPROGRAMS + install-dist_systemunitDATA install-dist_udevconfDATA install-dist_udevhomeSCRIPTS install-dist_udevkeymapDATA @@ -239,11 +242,13 @@ src_install() install-girDATA install-man7 install-man8 + install-nodist_systemunitDATA install-pkgconfiglibDATA install-sharepkgconfigDATA install-typelibsDATA install-dist_docDATA udev-confdirs + systemd-install-hook ) if use gudev @@ -259,6 +264,11 @@ src_install() lib_LTLIBRARIES="${lib_LTLIBRARIES}" MANPAGES="man/udev.7 man/udevadm.8 man/systemd-udevd.service.8" MANPAGES_ALIAS="man/systemd-udevd.8" + dist_systemunit_DATA="units/systemd-udevd-control.socket \ + units/systemd-udevd-kernel.socket" + nodist_systemunit_DATA="units/systemd-udevd.service \ + units/systemd-udev-trigger.service \ + units/systemd-udev-settle.service" pkgconfiglib_DATA="${pkgconfiglib_DATA}" ) emake DESTDIR="${D}" "${targets[@]}" |