diff options
author | 2014-02-28 22:51:30 +0000 | |
---|---|---|
committer | 2014-02-28 22:51:30 +0000 | |
commit | 8745da5a87dd06e3725d7fc7434ada71ef54f089 (patch) | |
tree | 234044ec9c83b35feb16c497385e1b34ccd1cdb6 /sys-fs/eudev | |
parent | Fix up doc install, delete a bit of debug code, keep the old src_unpack to av... (diff) | |
download | historical-8745da5a87dd06e3725d7fc7434ada71ef54f089.tar.gz historical-8745da5a87dd06e3725d7fc7434ada71ef54f089.tar.bz2 historical-8745da5a87dd06e3725d7fc7434ada71ef54f089.zip |
Version bump
Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xF52D4BBA
Diffstat (limited to 'sys-fs/eudev')
-rw-r--r-- | sys-fs/eudev/ChangeLog | 7 | ||||
-rw-r--r-- | sys-fs/eudev/Manifest | 24 | ||||
-rw-r--r-- | sys-fs/eudev/eudev-1.5.ebuild | 280 |
3 files changed, 309 insertions, 2 deletions
diff --git a/sys-fs/eudev/ChangeLog b/sys-fs/eudev/ChangeLog index 86ba0a2befe7..6f365d1ad5e9 100644 --- a/sys-fs/eudev/ChangeLog +++ b/sys-fs/eudev/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-fs/eudev # Copyright 1999- Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/ChangeLog,v 1.90 2014/02/07 04:50:58 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/ChangeLog,v 1.91 2014/02/28 22:51:06 blueness Exp $ + +*eudev-1.5 (28 Feb 2014) + + 28 Feb 2014; Anthony G. Basile <blueness@gentoo.org> +eudev-1.5.ebuild: + Version bump 07 Feb 2014; Patrick Lauer <patrick@gentoo.org> -eudev-1.1.ebuild: Remove old ebuild with broken sys-apps/hwids dep diff --git a/sys-fs/eudev/Manifest b/sys-fs/eudev/Manifest index f4173b3e1617..b9ba3fd5d563 100644 --- a/sys-fs/eudev/Manifest +++ b/sys-fs/eudev/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + AUX 40-gentoo.rules 365 SHA256 e11d66732dc0d629fdb8c06357db8be5339f2ecf28c2572c5af8637449f549ec SHA512 7554879eaeb12869a78835e4ac814b63c41ddd8715ff9b8d1b75e5b13edf697906371eb10d6c4f0a4c6cb9a44b21a4839985811a3357e18d3b8a842181666e0b WHIRLPOOL 54d962fa515255df5f37bc5c71a3774a909a809809138dba12ed22c6fda78ef336f4e98014f37dbc44289de1ba08f5f2ea31311e14b29a0bbe2cc3d6587d7425 AUX eudev-fix-typo-util.c.patch 889 SHA256 9c9811d8a71939a69ce94e9cff2989326458c7715da4fe0baebfb8f90dab915c SHA512 67ac0fe35dc0c8064c62ab2bcc5db3fe06fb5cff58d4716b5e36a595958fe4c599bb7fe66cf54696eb096ace5f24c97d11f4a179674e0b55d60c32d06f6905d2 WHIRLPOOL c923be2ab69119a5496938efab16f8960d82699aa1ecd6963d56aaa80c755aad3eff668cbf7d7912d87989ef596a52a17ee58a2b84a62c3d890549ca0ed05610 AUX eudev-hwdb-offset-root.patch 8128 SHA256 c8ae85b2bc69e360b96d9b47fb55b3cec5c44d3ed9cb0ed20f70d05ac2e2d230 SHA512 596cf5f936a1a9ae25ea77ebe2a414271998e2d6931bada6d0548efbdbfde73dba21717157508e5bd89925b868f3bee41492ea149c8ea8a339b3319010798f99 WHIRLPOOL 420c422ce99818f2c321d920fcacf8a37980dc7f540bacc57d87bf426c18dc5d650ef5e70cac3ae3a33cfc4b6632307d97ceb219c9f4518b2ab7a473273881cc @@ -6,10 +9,29 @@ AUX udev-postmount 1207 SHA256 0220e949b1f31832a205021c0a8615e77b27b73b7c9b16ef4 DIST eudev-1.2.tar.gz 1677976 SHA256 f9f78c2154eb174a6aab08afde9f5705a9072fc4069031a9f686cabc20beaa22 SHA512 673cd53339d62b23db615e1f67def71ed8d313dcf18edda37498db5fd507a2556073c798f81d16525594b0176fa5f0c9567bea6e4715cc0732b7651d24af4be5 WHIRLPOOL 3329ed127f0fa9696ce4fec406a2e6ff8e9d616ee4fbc6fac0a14a8b80909b6def983dd16c40e7c6abdc93f4da96805fbbb855460daddb1b1352815077b2e009 DIST eudev-1.3.tar.gz 1679385 SHA256 6f1f0b15971a53c7070a44c902c7c1303f952927aa6370dbdf4d84d8bc09fac2 SHA512 5e0016fbe15eebfa68bb04fa7b5aedd7edc7a508afdc030adb7cbec4e9eca84fe16119ca73f5724ec290ad4bba179b42d2d0bc56f3aaf2a07e3c48b18374b3b3 WHIRLPOOL db748742f9149b7a232b0d630a8734e81fb1077ed581fcde88f57f299b6746bcadec0bdd9e7ad914dae848ace9199c7d664006003dc4999af3bfa1e14099f366 DIST eudev-1.4.tar.gz 1712371 SHA256 66da90fdd228444b7ac1868d36f1c0fe52476b966e766398bac7448e105c9f53 SHA512 5be490b3c29ae26c22f9dcf60df26e599ab4dd2841cccadd8bf204f6e6d8103e689708ab0ad484c30ba656c3a693f594fb38cd2eef3b4ece8727bdbeaf8dd4d4 WHIRLPOOL 3f448d1b87253f17c35c9268739fa3d01660192956d70d23c5ed3bbb983ecefb39cf193f8658019ecefce81706667022eaa0170cc6ba3a624fbeca9e148ac839 +DIST eudev-1.5.tar.gz 1713415 SHA256 1064c1be7ccb57766defe1e8afe004b972d65b3dba236e393c68e6f3f463858b SHA512 e169512a75f714ca0bb44ad4c7ab5a6244f76c059dcde89684c4285222deb50a6058c20ecb3cefdba9850e7663fc4afa97a8b9e51bf32a0e84682be2e0e45649 WHIRLPOOL 818fd69821cb98b85ec5ce3984c496cd3e73db754d68a3b7ee98951d16312a3fcfd6d47671710436c62058ddeaebb6ae653c7ebf2338643e9a6a404a1e522c2a EBUILD eudev-1.2-r1.ebuild 7831 SHA256 64e04905164c2563caec4ab0bd3534f11250e6698b4e747838ef9fa0806556d8 SHA512 33d48b5d5cc724a43a6f196347d575e00a385a676793830a195d81014a5aa6392bb7ed74409d601e4b5505fa17ff2a14060e77be2bc4088a4ea6096cdf6fd9bb WHIRLPOOL 09c53f350519345c9059eafab46a75ea41dac34621f3ce1cbad200d97b5218d3ebfbb7ba94f62b3c41d78e1ddd64a1465ea9996eba465252448e5d269c08f4d1 EBUILD eudev-1.2.ebuild 6875 SHA256 0b1f3e857e95748cccba297fb54199af85f2644d0feb6d50a94774498a170dee SHA512 63ac1c3303ee3b754bff194b3c653642ae7f338c5201e8777040c2f6debcfdd8470a048e825f0b43e49439e0e4082e8041aa13c1dba777248a3bd22f2bc44d6a WHIRLPOOL 896d28327c5780a3fb3597e03902bf5aa19bb8a654dab5e0c1d4ea12d043c22e8d1a0b6e77324370db2ae3b9380aed8abadff8ceef72f19ab300eeed951d1cf7 EBUILD eudev-1.3.ebuild 7934 SHA256 8e5b74693deaab4c4951e53052f9f13d66373dff7096887c9b7e3fd7ae171bd1 SHA512 339118158dddac94ec550ff82c4bc402f7820e9d74e8ac0bc0ccb665095537e8d533872196998fc1b4412d4bef75651825749b7077783612fe30c5e238100f3d WHIRLPOOL fb2b7a7121e0fa31403d061ee3c7c39119daf960a5ad10ea115cca38e5b2f187d4c3de9ff1e764d15c50f00a3e9919f2deff6aeb7da940a78b13b7dd94115755 EBUILD eudev-1.4-r1.ebuild 7951 SHA256 8c3534cc148093f506f403a2d148de4b2218d70e177816a4052a35f09b3231e5 SHA512 f76bd152ea192c954448631a8d2f48cfc01d47b80893e5686271da7910cec1cba8669fec149aa5d7366702e77dab9df2fd19c6d403f4690b4eecfd7c067d9827 WHIRLPOOL 6a6f751ada95d1be23f4cef16acb793c2d1d16e0556cfb8fba0c0c4a142c6dc540c08d40e51c32c191709a156bc13bbb9540a73b0738c1417e4fba85689e8107 +EBUILD eudev-1.5.ebuild 7948 SHA256 cf42ab1062c004bd51b265a82a0ffcf059a4e6bc8d6ff5056cf8f16236c79da1 SHA512 b80930819fe03b6d3910f0489cb6b422cee5d1fcc22ba3b88e0471d869a1febd5c8f6e8fbb1b93c693ff539f2075b71bd6781a8ba24048d87e0dc79c6c4abe9b WHIRLPOOL 5150e0bc5f66db1a4e96f43896ee666573ebaef8b7387573addb6a024fff52689144560899a574e059d247732bf2447b037443db7440a89e71ecf80afcf5cd3b EBUILD eudev-9999.ebuild 7950 SHA256 27876275702b6ddf3af6b68dd7df50fc093c553deb7d51715e095271c12c0cc2 SHA512 492eaa88f95b31c8d2c5d7b018960d4a06256358afd64b32f232eac418109c89241cf8f73bac8763918b5369455ae68d70f95ae778db6763e77fc4943efa5109 WHIRLPOOL 20b58257342c4c3b1cacd951b2fe4dd54d6011ec48c569238de96bbb84b22771a6e0d6eb4075dab41d9c4686da25ee8d67e85540e08a214f791d09dbac1428e2 -MISC ChangeLog 13653 SHA256 c95eacd1a41b460d63aba0118dcd31e82a8af4030b419961adff7df8b8b9cefc SHA512 14154b1989fde1f29c54cfe41297ae9c07d92bc937c8cab9cc3b29814f4f095f34eecb695caa619edf5857fd6c628b506ff186247ff2f4b3bc15d2aa379d70f1 WHIRLPOOL 37513704afed018b0fb85085baabcf5612a1e12b5712616761d99e71582a0dc43f95345aa96f977eb570a01a5db26d20bda3cb1c3ac7a07f2804955fad2fda94 +MISC ChangeLog 13770 SHA256 0e5609f51ce97101ae0f67f87c15694a418712b3304a5580b1256b83c3833215 SHA512 b689c6609702b8f31f80c8723fca10ebc5dc89c2352c7a0035c469c261762880c322842c2cc2c978ba85b95c870033dc69d45737fe9fb1c8d661d1fa5b7b977e WHIRLPOOL 191c01bbe2d501be07659824c45e9d6d79c75ed119129337cd6bd0e01b611829c7f93fd849017c0b7ff60039b54fae24ac6b96e3b55b6f8b68bb6aa3ffd1c1a5 MISC metadata.xml 978 SHA256 273446e57cfba7f612e72c3dcc2e1b93ac0003f878c504aa72daa762f2cdbba5 SHA512 244dc230cf7123afef2c4c0f0caa418bbc621f3da0e6303f7cecfb4f3cc53290fcf0adddf2d176ff208991a5bb27801c5c9f6ad5ea3bada513f7ebb22d02d06a WHIRLPOOL e39a5caec32bcd404eb2fdb54e3abff5631f7115786d039a6f2f04a8503e445f971a993dedd0564022e148133e2f15c4579b3cc664ffd393003a858ac77166c5 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.22 (GNU/Linux) + +iQIcBAEBCAAGBQJTERNaAAoJEJOE+m71LUu6Sk8P+wV2btthhhQPBeO4Lt/GhJ1B +KYu3Gist6TAn5Ahjdqw96QEplYmdNLAkjEslHaOEeM0kqJeErNmTdhm1RECjj3Dh +AuPPQA4AViQTx++JTb7NzzhfsA6fnwM7RFvVOD0ikDH0AXfFOvogAAp3oBKHh/wp +vK09NYGhDDY4n8zMMZzEyV8nzYCNfTEbOv1r1PB43YHd6xal5iYdYuSjAw6N53ei +XqPqsW5LEXUpgfwWyTw4a9gzmFyOmzZ0NNu4752b4fvWn20MePxUXPiaHzqMa0VR +bWrx+ooFs8jpkMtdPlAZA/Mj/3+0s8g43WgbNiPzk5w/gwYrVn2H66CNdSJ2f3lh +dv0TTvQNmGqmdrPoN8nXNQ/0YIo47yX2PIpyQIdpj46ihTB8iGoAVw2Ei+2EuYY6 +UDG8AYjKmwtVhQK49IEfnPFRfJDnr7QHBL9E5XxzM5911mv4yujuZaIyGGbmYUfU +yJH1pc9wwYskj8CjaWz8tgzDzkqna5Xog3If9+fwK2w2IwwgnNcq9jhuHEbytFQS +61rr3afhBXDT2jAmnxvl8XVoluzsa8x16gSgI1QbenAGB6YFomxALNZx6MkVOxiJ +JZXGivY2RO/1G3A1qFrpCP070vKFvWqejBed/qgV9vcIQzIUpcc3d6Ekt3HQTtnl +6yGBslPiZCkE9yBBEB3S +=sXDC +-----END PGP SIGNATURE----- diff --git a/sys-fs/eudev/eudev-1.5.ebuild b/sys-fs/eudev/eudev-1.5.ebuild new file mode 100644 index 000000000000..684c2574a65f --- /dev/null +++ b/sys-fs/eudev/eudev-1.5.ebuild @@ -0,0 +1,280 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/eudev-1.5.ebuild,v 1.1 2014/02/28 22:51:06 blueness Exp $ + +EAPI="5" + +KV_min=2.6.31 + +inherit autotools eutils multilib linux-info multilib-minimal + +if [[ ${PV} = 9999* ]] +then + EGIT_REPO_URI="git://github.com/gentoo/eudev.git" + inherit git-2 +else + SRC_URI="http://dev.gentoo.org/~blueness/${PN}/${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86" +fi + +DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)" +HOMEPAGE="https://github.com/gentoo/eudev" + +LICENSE="LGPL-2.1 MIT GPL-2" +SLOT="0" +IUSE="doc gudev +hwdb kmod introspection +keymap +modutils +openrc +rule-generator selinux static-libs test" + +COMMON_DEPEND="gudev? ( dev-libs/glib:2 ) + kmod? ( sys-apps/kmod ) + introspection? ( >=dev-libs/gobject-introspection-1.31.1 ) + selinux? ( sys-libs/libselinux ) + >=sys-apps/util-linux-2.20 + !<sys-libs/glibc-2.11 + abi_x86_32? ( + !<=app-emulation/emul-linux-x86-baselibs-20130224-r7 + !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] + )" + +DEPEND="${COMMON_DEPEND} + keymap? ( dev-util/gperf ) + >=dev-util/intltool-0.40.0 + virtual/pkgconfig + virtual/os-headers + !<sys-kernel/linux-headers-${KV_min} + doc? ( dev-util/gtk-doc ) + app-text/docbook-xsl-stylesheets + dev-libs/libxslt + test? ( app-text/tree dev-lang/perl )" + +RDEPEND="${COMMON_DEPEND} + !sys-fs/udev + !sys-apps/coldplug + !sys-apps/systemd + !<sys-fs/lvm2-2.02.97 + !sys-fs/device-mapper + !<sys-fs/udev-init-scripts-18" + +PDEPEND="hwdb? ( >=sys-apps/hwids-20130717-r1[udev] ) + keymap? ( >=sys-apps/hwids-20130717-r1[udev] ) + >=virtual/udev-206-r2 + openrc? ( >=sys-fs/udev-init-scripts-18 )" + +REQUIRED_USE="keymap? ( hwdb )" + +pkg_pretend() +{ + if ! use rule-generator; then + ewarn + ewarn "As of 2013-01-29, ${P} provides the new interface renaming functionality," + ewarn "as described in the URL below:" + ewarn "http://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames" + ewarn + ewarn "This functionality is enabled BY DEFAULT because eudev has no means of synchronizing" + ewarn "between the default or user-modified choice of sys-fs/udev. If you wish to disable" + ewarn "this new iface naming, please be sure that /etc/udev/rules.d/80-net-name-slot.rules" + ewarn "exists:" + ewarn "\ttouch /etc/udev/rules.d/80-net-name-slot.rules" + ewarn + ewarn "We are working on a better solution for the next beta release." + ewarn + fi +} + +pkg_setup() +{ + linux-info_pkg_setup + get_running_version + + # These are required kernel options, but we don't error out on them + # because you can build under one kernel and run under another. + CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~SIGNALFD ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2" + + if kernel_is lt ${KV_min//./ }; then + ewarn + ewarn "Your current running kernel version ${KV_FULL} is too old to run ${P}." + ewarn "Make sure to run udev under kernel version ${KV_min} or above." + ewarn + fi +} + +src_prepare() +{ + # change rules back to group uucp instead of dialout for now + sed -e 's/GROUP="dialout"/GROUP="uucp"/' -i rules/*.rules \ + || die "failed to change group dialout to uucp" + + epatch_user + + if [[ ! -e configure ]] + then + if use doc + then + gtkdocize --docdir docs || die "gtkdocize failed" + else + echo 'EXTRA_DIST =' > docs/gtk-doc.make + fi + eautoreconf + else + elibtoolize + fi +} + +multilib_src_configure() +{ + local econf_args + + econf_args=( + ac_cv_search_cap_init= + ac_cv_header_sys_capability_h=yes + DBUS_CFLAGS=' ' + DBUS_LIBS=' ' + --with-rootprefix= + --docdir=/usr/share/doc/${PF} + --libdir=/usr/$(get_libdir) + --with-firmware-path="${EPREFIX}usr/lib/firmware/updates:${EPREFIX}usr/lib/firmware:${EPREFIX}lib/firmware/updates:${EPREFIX}lib/firmware" + --with-html-dir="/usr/share/doc/${PF}/html" + --enable-split-usr + --exec-prefix=/ + ) + + # Only build libudev for non-native_abi, and only install it to libdir, + # that means all options only apply to native_abi + if multilib_build_binaries; then econf_args+=( + --with-rootlibdir=/$(get_libdir) + $(use_enable doc gtk-doc) + $(use_enable gudev) + $(use_enable introspection) + $(use_enable keymap) + $(use_enable kmod libkmod) + $(usex kmod --enable-modules $(use_enable modutils modules)) + $(use_enable static-libs static) + $(use_enable selinux) + $(use_enable rule-generator) + ) + else econf_args+=( + $(echo --disable-{gtk-doc,gudev,introspection,keymap,libkmod,modules,static,selinux,rule-generator}) + ) + fi + ECONF_SOURCE="${S}" econf "${econf_args[@]}" +} + +multilib_src_compile() +{ + if ! multilib_build_binaries; then + cd src/libudev || die "Could not change directory" + fi + emake +} + +multilib_src_install() +{ + if ! multilib_build_binaries; then + cd src/libudev || die "Could not change directory" + fi + emake DESTDIR="${D}" install +} + +multilib_src_test() +{ + # make sandbox get out of the way + # these are safe because there is a fake root filesystem put in place, + # but sandbox seems to evaluate the paths of the test i/o instead of the + # paths of the actual i/o that results. + # also only test for native abi + if multilib_build_binaries; then + addread /sys + addwrite /dev + addwrite /run + default_src_test + fi +} + +# disable header checks because we only install libudev headers for non-native abi +multilib_check_headers() +{ + : +} + +multilib_src_install_all() +{ + prune_libtool_files --all + rm -rf "${ED}"/usr/share/doc/${PF}/LICENSE.* + + use rule-generator && use openrc && doinitd "${FILESDIR}"/udev-postmount + + # drop distributed hwdb files, they override sys-apps/hwids + rm -f "${ED}"/etc/udev/hwdb.d/*.hwdb + + insinto /lib/udev/rules.d + doins "${FILESDIR}"/40-gentoo.rules +} + +pkg_preinst() +{ + local htmldir + for htmldir in gudev libudev; do + if [[ -d ${EROOT}usr/share/gtk-doc/html/${htmldir} ]] + then + rm -rf "${EROOT}"usr/share/gtk-doc/html/${htmldir} + fi + if [[ -d ${ED}/usr/share/doc/${PF}/html/${htmldir} ]] + then + dosym ../../doc/${PF}/html/${htmldir} \ + /usr/share/gtk-doc/html/${htmldir} + fi + done +} + +pkg_postinst() +{ + mkdir -p "${EROOT}"run + + # "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 you remove /dev/loop, else losetup" + ewarn "may be confused when looking for unused devices." + 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 [[ -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 + + if use hwdb && has_version 'sys-apps/hwids[udev]'; then + udevadm hwdb --update --root="${ROOT%/}" + + # http://cgit.freedesktop.org/systemd/systemd/commit/?id=1fab57c209035f7e66198343074e9cee06718bda + # reload database after it has be rebuilt, but only if we are not upgrading + # also pass if we are -9999 since who knows what hwdb related changes there might be + if [[ ${REPLACING_VERSIONS%-r*} == ${PV} || -z ${REPLACING_VERSIONS} ]] && \ + [[ ${ROOT%/} == "" ]] && [[ ${PV} != "9999" ]]; then + udevadm control --reload + fi + fi + + ewarn + ewarn "You need to restart eudev as soon as possible to make the" + ewarn "upgrade go into effect:" + ewarn "\t/etc/init.d/udev --nodeps restart" + + if use rule-generator && use openrc; then + ewarn + ewarn "Please add the udev-postmount init script to your default runlevel" + ewarn "to ensure the legacy rule-generator functionality works as reliably" + ewarn "as possible." + ewarn "\trc-update add udev-postmount default" + fi + + elog + elog "For more information on eudev on Gentoo, writing udev rules, and" + elog "fixing known issues visit:" + elog " http://www.gentoo.org/doc/en/udev-guide.xml" + elog +} |