diff options
author | Anthony G. Basile <blueness@gentoo.org> | 2014-07-25 12:04:32 +0000 |
---|---|---|
committer | Anthony G. Basile <blueness@gentoo.org> | 2014-07-25 12:04:32 +0000 |
commit | d7bb1f209f4e406fa8db3dc690b6418b4c570da5 (patch) | |
tree | cc9f6e3d33847206f6a714cf3843bd78875376f3 /sys-fs/eudev | |
parent | version bump (diff) | |
download | historical-d7bb1f209f4e406fa8db3dc690b6418b4c570da5.tar.gz historical-d7bb1f209f4e406fa8db3dc690b6418b4c570da5.tar.bz2 historical-d7bb1f209f4e406fa8db3dc690b6418b4c570da5.zip |
Remove older unstable versions
Package-Manager: portage-2.2.8-r1/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.7.ebuild | 265 | ||||
-rw-r--r-- | sys-fs/eudev/eudev-1.8.ebuild | 273 | ||||
-rw-r--r-- | sys-fs/eudev/files/eudev-fix-typo-util.c.patch | 28 | ||||
-rw-r--r-- | sys-fs/eudev/files/eudev-hwdb-offset-root.patch | 212 |
6 files changed, 20 insertions, 789 deletions
diff --git a/sys-fs/eudev/ChangeLog b/sys-fs/eudev/ChangeLog index be9560337e1c..1cdf150165aa 100644 --- a/sys-fs/eudev/ChangeLog +++ b/sys-fs/eudev/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-fs/eudev # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/ChangeLog,v 1.127 2014/07/19 17:34:03 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/ChangeLog,v 1.128 2014/07/25 12:04:22 blueness Exp $ + + 25 Jul 2014; Anthony G. Basile <blueness@gentoo.org> -eudev-1.7.ebuild, + -eudev-1.8.ebuild, -files/eudev-fix-typo-util.c.patch, + -files/eudev-hwdb-offset-root.patch: + Remove older unstable versions 19 Jul 2014; Jeroen Roovers <jer@gentoo.org> eudev-1.9-r1.ebuild: Stable for HPPA (bug #516524). diff --git a/sys-fs/eudev/Manifest b/sys-fs/eudev/Manifest index f46a1d097150..56eaef5c4f74 100644 --- a/sys-fs/eudev/Manifest +++ b/sys-fs/eudev/Manifest @@ -2,27 +2,31 @@ 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 AUX eudev-selinux-timespan.patch 844 SHA256 4693649ebe9d0d76edbdb5828c4d5768004c3156128705425828ea318cfc682b SHA512 1acc0124eccb754338ee0969a438c5a184bba1df315fff790960309e7e8f9e104ac6960fdc37930f5da561a92b78b12e6feefcf5b642783eebaafcca9a884f66 WHIRLPOOL 5d4c4c3af3796a7c8273abb2cbcd6e1537b255f28adf638e083da13f4708b9b9cc5e77614ff5f4af8edf06778a93e66cc6acdfdefbc9799acdaf78c582a97c63 AUX udev-postmount 1207 SHA256 0220e949b1f31832a205021c0a8615e77b27b73b7c9b16ef4a61bbd2774aeecb SHA512 a69338328fee67617cddab8375d5008bbed41e82c67610cb9df168ffd95bfa016e3b63544b380afa0b98bb1731e4d76960efbdec5c79bb5e844ca10d6c334e2f WHIRLPOOL c1f027a7200a435d163c7ac66a0afc0b004c97ee9c1ecc8406f981b05e6ef95221d0df51d3abc46e494d3a35a07831cbab8d393b3a7d05b5f0aec70e88d894a2 DIST eudev-1.3.tar.gz 1679385 SHA256 6f1f0b15971a53c7070a44c902c7c1303f952927aa6370dbdf4d84d8bc09fac2 SHA512 5e0016fbe15eebfa68bb04fa7b5aedd7edc7a508afdc030adb7cbec4e9eca84fe16119ca73f5724ec290ad4bba179b42d2d0bc56f3aaf2a07e3c48b18374b3b3 WHIRLPOOL db748742f9149b7a232b0d630a8734e81fb1077ed581fcde88f57f299b6746bcadec0bdd9e7ad914dae848ace9199c7d664006003dc4999af3bfa1e14099f366 DIST eudev-1.5.3.tar.gz 1724415 SHA256 8e4362979572719562f600bfd7decd42d4e21506db5483e3d2e88f725396c57b SHA512 c00f34d76d76ebd5c2862310a2ba3d7bf2f8d348a96e0120ed02aa9014857df736e3a2280a4478e50f2537cabc9082b8f5f5e57ef7b3cf925fae6dc3a4688ddb WHIRLPOOL b3fc943f6c3eaeba92aed72dee417738a840f4176182e08f7564a1fd34baa3cf2a52787ac8e936f74f6c13b7896eb929a2f83cf087b8b09e5b8c7d7858471dd5 -DIST eudev-1.7.tar.gz 1755909 SHA256 7c4186904a87e553ec731458478e53a2bed97331e6ba215c4c480a8e2e6e1930 SHA512 dc7e2a9468dd65da6a2ef3c5b8599df2d3cdc0ca872a6af44557f9d572128d6e7a937f714a89d8d0ed495e5fdd9372a9632716add57bdc2655d9df568c36af2c WHIRLPOOL 796192b3feb72563d6da24717cac92ecf2da7bbdd54f3916729e36fc9e4bb09feecfa27d1e7bec45e32553cd7223f784efa454914a132ea77a0aac5c50056a2d -DIST eudev-1.8.tar.gz 1756918 SHA256 fb7d4d98e6c91cf0354c3b702b5919d1caac5f50d1fc64b33f5854dd68792010 SHA512 c217519a5e864fbc8528eef37d5c6cf64ccc647118d93f44de5f91c66b030a3c07ac035df4583f4a4cac4b863aec1c9043721a4ff387fbc1898b6341460b8288 WHIRLPOOL c32bc50f1e7ba1d5b6d9abf12e634867128ecad6ff16faf2797631ce014f411c04be873b6e730174380b09fd7975f639b593535e6357c063038b6f993e017f6a DIST eudev-1.9.tar.gz 1762520 SHA256 8f17e92f1177ce9352bde00360e227a7cbb3b97ac8816174bee34be80e44cef0 SHA512 13bd7df42d686818f499856d260e5dfaf10425f06e05449bf4cc8318667b166e2ae9c5e8b519008285aeaab9284ec5fde1f9f19e536dd4bae09a5439c86336b3 WHIRLPOOL d0504f05e191e94229bf60a497cab82fe461f52072ba7ed2171654e684397e4ffa9ba47c8b18cd0cc6d0168701dcac3b7d4b6c73168382e2432c7c229b2d0293 EBUILD eudev-1.3.ebuild 7910 SHA256 c859ec0746f5dcd792ec12a0c9403ea04450b775c210f2c9f57d7d350f094fcc SHA512 3017a5fa2e1af8f242aee15989615f8f50bf88060353092ccef02d2b3135d5848c8efc89dc9a89914e801a3442d06b0e0a3219be5407623e39073c81571f1d4c WHIRLPOOL 4ec4ba4da39a55e4c59085b69278bdba395c46044ca3dd6cd618f8f07bbb047d41dc72f20c459a95625dbd8a6811985bed248c6dfa76a9d1825ecd133d4f7799 EBUILD eudev-1.5.3-r1.ebuild 8126 SHA256 5a50ff7a099f06d1ff7316d28acf9d68243992fea4a3ad0b48ecf2afe36d6350 SHA512 f868ef1c7f05c5ead0924a9fe2af97eaaec12701fc17b2c7de1992fd31817eb6db8fe95d6784fd10ab3d658a2abc22328b3c590526338fc07f2094731a43006d WHIRLPOOL 8990d5e7490653f79d7c9f3bd4ca156510aa6e1dd493c0de368799bb279fbdb252bc13e5161c62821ed64ed63b1d4461d49060ee44eccfa730a1c3997f9c273b -EBUILD eudev-1.7.ebuild 8205 SHA256 388279aeb0d68e4fd0c86ae4ef1d7969c12d30b0e759ebb11051104e82412b3e SHA512 badc5db6f60da557cd7c1545fe3f396cd569a15d71212d763fd5f88809d6afac9260be24c4f5e51f7f10fff0922f2a90b3d6c7c1592511ebac2d57fcf5ce9618 WHIRLPOOL 82f8dfa2c2a01966d0dfbfd7f665dd4e5c34c71dbb0fb855f2b99fc4d01e5ae16382b61fc4d147199f07fc8ff459f3633fb015cae00fade668338606956b41e4 -EBUILD eudev-1.8.ebuild 8292 SHA256 48b1ab4cdf6a8941626e63f42ead959a4cd1f20b6790ec3eb395caf7775cf87f SHA512 d2926f77a47537b52a7bd0b545fc4ca013af55102b688b7073a9c4f24c6459c306218da72d18576363a5f5b1e9b7c77322111ada0188b375337becd089a2a2eb WHIRLPOOL c415d3271257aea9a3309707aca3c4d81d15633281e321ac8d782edae094edb85103f7616dd779a68fd2bb9e82e13e4a2da02e297539ecb77cc4fc1367a75c09 EBUILD eudev-1.9-r1.ebuild 9213 SHA256 fa156eeb4179435d618a0cab741f1a54ba6c5dc7820639fd6e526a27ccc04976 SHA512 76efef024c024f1663e9b6bd370476264dab2759f29cd3f8b98bf518109ed2d0eb47f600d1791414a796c8bc44d57a1fe7c391fd2f1e3cc190bda5ac45e1b982 WHIRLPOOL e19a74282b537c03f1ac15c8356f62c0cf48a2c3fe2dd40d92553475336cf8b117c342080b646a1627b1bda7781ebd20bde674b1dee8ee542f89f4149fd4cb84 EBUILD eudev-9999.ebuild 9223 SHA256 c56fd27886f24bb06a4cbbb17a2b65d93d0b941c93d23fc832d6f5c5975441c7 SHA512 2f17f9078d9da815958492b3b8f9340c7dec30bb24b7f5e7a50356ffed85189690621d351070526467bf6c23a827d750e5e9444a383028f50bdc01f5049164a1 WHIRLPOOL 406a6d6b518db5c9070a51037bb24ff1b6b1f12409999a410417a1ea6f4ae1817c28b4045108e285c8a407c00724af3b01bb9397ec3f77435abf7b936ef01ceb -MISC ChangeLog 18813 SHA256 29d9aca199c01535e79164d30a55a0ba62e57b0c0cd5f82ec54d9f7630b15700 SHA512 dc5250f42b4627244028a78283f3e6163c64571ddc5247e67e1d99b379f9ebbaa5d03094631e60d0cbb10d48b2bf11489b63bbc338e80a64b9f25102710cd480 WHIRLPOOL 471e713cc78cb93d9b275a6ad62f5062f57440adf723c07896f4a54d3a38cd87a80197dd7e4b3e4e3feeb48383b072cc9c5eb5d87354e4980543d42a4496df13 +MISC ChangeLog 19022 SHA256 1cdf87f641791afd41811c92fabe084bd18cee1fc5cef80b60a3e470d97ea1ee SHA512 6478b856d50e5602a311e417cde0cc0800512c8026c4a5344f8d02e0fb65cfb8ff4830b9a01579969658f9e5500df9daf0ca15c1f303481be90d0cff4d28d066 WHIRLPOOL 1de6abd866e2c46e12933e5364022255b63907bb50483cea72e868ffa098d702504f2684c7022653437e74d6c7b3b41b9b631baebcfdf29dc5f800970168d08a MISC metadata.xml 978 SHA256 273446e57cfba7f612e72c3dcc2e1b93ac0003f878c504aa72daa762f2cdbba5 SHA512 244dc230cf7123afef2c4c0f0caa418bbc621f3da0e6303f7cecfb4f3cc53290fcf0adddf2d176ff208991a5bb27801c5c9f6ad5ea3bada513f7ebb22d02d06a WHIRLPOOL e39a5caec32bcd404eb2fdb54e3abff5631f7115786d039a6f2f04a8503e445f971a993dedd0564022e148133e2f15c4579b3cc664ffd393003a858ac77166c5 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iEYEAREIAAYFAlPKrAwACgkQVWmRsqeSphMM3gCdHMipU+5LtXth44ydq1NZ3b4e -Hl0AmwVCp5u+3mcyKm24ry+WtJISd8S2 -=GVaQ +iQIcBAEBCAAGBQJT0kgaAAoJEJOE+m71LUu66fsP/08iqUMe3W4XX4nmMTUD0wyy +tYEziKadAqjvxvQBBt0+qj0jsZYZIeIFllUuCK4IuUnKeYvq4LF52yUgvh87Bo3d +LwaG8wu5iskTfhbBY4p8i3OlMoJpV6T9gzg4R8Bz8obfVK9N923B51yxqiRovG9o +PA4YT+Z1kLK8tUiy9X7JGrRzCkHV+FPU4jB+9Ws7uzDcYMGSWbRP3GMum1mH4QGh +wSVHZu0FRSllag2t8zRZUaoARAffTOz/qOUpFERCl1eEhBr6YYp+8ieOnp/eCQQA +UL6inRkzg+DowAY8UF4QNOrPK7tIlvAmtD5T8FnSSG6+RuRq4xiNSO6cHWzync8p +XOdfYw/uPr50aUVEXKYzp4sFkQ4xXopWgSrO4QL1m9+d5osXM7OK9Oqmcicx0fVG +4/1DkP7Lvz6D0m0ukmdp5K4jofwcmId4dFXvUP0fhlh+peODBKMXkY2OjdKeDMzM +wfAjpaTaQxV+giBt4HNgojyrTl6X4buX/LBuUNIwkpenaCMM+cx7PiHkXfAGG7FY +dqc3+qE/+OxFOff68+7YCgQo4ZjuRdf+NuqeVIk1SzEHOua05KosVyX5eukfwI9v +B3As5lnPl1PrU6YK83fkjxZjyfg4XznJ7d73o3ZALqr5Q6esPw8ag1iF660AXJeW +uT87WLeJnKfG8hpRAUZo +=02M8 -----END PGP SIGNATURE----- diff --git a/sys-fs/eudev/eudev-1.7.ebuild b/sys-fs/eudev/eudev-1.7.ebuild deleted file mode 100644 index 92a1c256f001..000000000000 --- a/sys-fs/eudev/eudev-1.7.ebuild +++ /dev/null @@ -1,265 +0,0 @@ -# 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.7.ebuild,v 1.3 2014/06/24 22:17:02 mgorny Exp $ - -EAPI="5" - -KV_min=2.6.39 - -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=">=sys-apps/util-linux-2.20 - gudev? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] ) - introspection? ( >=dev-libs/gobject-introspection-1.31.1 ) - kmod? ( >=sys-apps/kmod-16 ) - selinux? ( >=sys-libs/libselinux-2.1.9 ) - !<sys-libs/glibc-2.11 - !sys-apps/gentoo-systemd-integration - !sys-apps/systemd - 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 ) - virtual/os-headers - virtual/pkgconfig - >=sys-devel/make-3.82-r4 - >=sys-kernel/linux-headers-${KV_min} - doc? ( >=dev-util/gtk-doc-1.18 ) - app-text/docbook-xml-dtd:4.2 - app-text/docbook-xml-dtd:4.5 - app-text/docbook-xsl-stylesheets - dev-libs/libxslt - >=dev-util/intltool-0.50 - test? ( app-text/tree dev-lang/perl )" - -RDEPEND="${COMMON_DEPEND} - !<sys-fs/lvm2-2.02.103 - !<sec-policy/selinux-base-2.20120725-r10 - !sys-fs/udev - !sys-apps/systemd" - -PDEPEND="hwdb? ( >=sys-apps/hwids-20140304[udev] ) - keymap? ( >=sys-apps/hwids-20140304[udev] ) - openrc? ( >=sys-fs/udev-init-scripts-26 )" - -REQUIRED_USE="keymap? ( hwdb )" - -# The multilib-build.eclass doesn't handle situation where the installed headers -# are different in ABIs. In this case, we install libgudev headers in native -# ABI but not for non-native ABI. -multilib_check_headers() { :; } - -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() { - CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET" - 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. - 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() { - tc-export CC #463846 - export cc_cv_CFLAGS__flto=no #502950 - - # Keep sorted by ./configure --help and only pass --disable flags - # when *required* to avoid external deps or unnecessary compile - 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=/ - - $(use_enable gudev) - ) - - # Only build libudev for non-native_abi, and only install it to libdir, - # that means all options only apply to native_abi - if multilib_is_native_abi; then - econf_args+=( - --with-rootlibdir=/$(get_libdir) - $(use_enable doc gtk-doc) - $(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,introspection,keymap,libkmod,modules,static,selinux,rule-generator}) - ) - fi - ECONF_SOURCE="${S}" econf "${econf_args[@]}" -} - -multilib_src_compile() { - if multilib_is_native_abi; then - emake - else - emake -C src/libudev - use gudev && emake -C src/gudev - fi -} - -multilib_src_install() { - if multilib_is_native_abi; then - emake DESTDIR="${D}" install - else - emake -C src/libudev DESTDIR="${D}" install - use gudev && emake -C src/gudev DESTDIR="${D}" install - fi -} - -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_is_native_abi; then - addread /sys - addwrite /dev - addwrite /run - default_src_test - fi -} - -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 your remove /dev/loop," - ewarn "else losetup may be confused when looking for unused devices." - 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 && \ - [[ -x $(type -P rc-update) ]] && rc-update show | grep udev-postmount | grep -qsv 'boot\|default\|sysinit'; 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 -} diff --git a/sys-fs/eudev/eudev-1.8.ebuild b/sys-fs/eudev/eudev-1.8.ebuild deleted file mode 100644 index 5b3c7edbc1ea..000000000000 --- a/sys-fs/eudev/eudev-1.8.ebuild +++ /dev/null @@ -1,273 +0,0 @@ -# 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.8.ebuild,v 1.3 2014/06/27 20:39:40 blueness Exp $ - -EAPI="5" - -KV_min=2.6.39 - -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=">=sys-apps/util-linux-2.20 - gudev? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] ) - introspection? ( >=dev-libs/gobject-introspection-1.31.1 ) - kmod? ( >=sys-apps/kmod-16 ) - selinux? ( >=sys-libs/libselinux-2.1.9 ) - !<sys-libs/glibc-2.11 - !sys-apps/gentoo-systemd-integration - !sys-apps/systemd - 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 ) - virtual/os-headers - virtual/pkgconfig - >=sys-devel/make-3.82-r4 - >=sys-kernel/linux-headers-${KV_min} - doc? ( >=dev-util/gtk-doc-1.18 ) - app-text/docbook-xml-dtd:4.2 - app-text/docbook-xml-dtd:4.5 - app-text/docbook-xsl-stylesheets - dev-libs/libxslt - >=dev-util/intltool-0.50 - test? ( app-text/tree dev-lang/perl )" - -RDEPEND="${COMMON_DEPEND} - !<sys-fs/lvm2-2.02.103 - !<sec-policy/selinux-base-2.20120725-r10 - !sys-fs/udev - !sys-apps/systemd" - -PDEPEND="hwdb? ( >=sys-apps/hwids-20140304[udev] ) - keymap? ( >=sys-apps/hwids-20140304[udev] ) - openrc? ( >=sys-fs/udev-init-scripts-26 )" - -REQUIRED_USE="keymap? ( hwdb )" - -# The multilib-build.eclass doesn't handle situation where the installed headers -# are different in ABIs. In this case, we install libgudev headers in native -# ABI but not for non-native ABI. -multilib_check_headers() { :; } - -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() { - CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET" - 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. - 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() { - tc-export CC #463846 - export cc_cv_CFLAGS__flto=no #502950 - - # Keep sorted by ./configure --help and only pass --disable flags - # when *required* to avoid external deps or unnecessary compile - 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=/ - - $(use_enable gudev) - ) - - # Only build libudev for non-native_abi, and only install it to libdir, - # that means all options only apply to native_abi - if multilib_is_native_abi; then - econf_args+=( - --with-rootlibdir=/$(get_libdir) - $(use_enable doc gtk-doc) - $(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+=( - --disable-static - --disable-gtk-doc - --disable-introspection - --disable-keymap - --disable-libkmod - --disable-modules - --disable-selinux - --disable-rule-generator - ) - fi - ECONF_SOURCE="${S}" econf "${econf_args[@]}" -} - -multilib_src_compile() { - if multilib_is_native_abi; then - emake - else - emake -C src/libudev - use gudev && emake -C src/gudev - fi -} - -multilib_src_install() { - if multilib_is_native_abi; then - emake DESTDIR="${D}" install - else - emake -C src/libudev DESTDIR="${D}" install - use gudev && emake -C src/gudev DESTDIR="${D}" install - fi -} - -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_is_native_abi; then - addread /sys - addwrite /dev - addwrite /run - default_src_test - fi -} - -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 your remove /dev/loop," - ewarn "else losetup may be confused when looking for unused devices." - 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 && \ - [[ -x $(type -P rc-update) ]] && rc-update show | grep udev-postmount | grep -qsv 'boot\|default\|sysinit'; 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 -} diff --git a/sys-fs/eudev/files/eudev-fix-typo-util.c.patch b/sys-fs/eudev/files/eudev-fix-typo-util.c.patch deleted file mode 100644 index 371471e17733..000000000000 --- a/sys-fs/eudev/files/eudev-fix-typo-util.c.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 82f60023e3d4b33624c85a149915b411b504e426 Mon Sep 17 00:00:00 2001 -From: "Anthony G. Basile" <blueness@gentoo.org> -Date: Wed, 23 Jan 2013 20:16:57 -0500 -Subject: [PATCH] src/libudev/util.c: fix typo introduce at commit 1ebf647 - -The first argument of fcntl should be 'fd', the file descriptor. - -Signed-off-by: Anthony G. Basile <blueness@gentoo.org> ---- - src/libudev/util.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/libudev/util.c b/src/libudev/util.c -index 1d57a01..d3982b9 100644 ---- a/src/libudev/util.c -+++ b/src/libudev/util.c -@@ -4586,7 +4586,7 @@ int fopen_temporary(const char *path, FILE **_f, char **_temp_path) { - fd = mkostemp(t, O_WRONLY|O_CLOEXEC); - #else - fd = mkstemp(t); -- fcntl(t, F_SETFD, FD_CLOEXEC); -+ fcntl(fd, F_SETFD, FD_CLOEXEC); - #endif - if (fd < 0) { - free(t); --- -1.7.12.4 - diff --git a/sys-fs/eudev/files/eudev-hwdb-offset-root.patch b/sys-fs/eudev/files/eudev-hwdb-offset-root.patch deleted file mode 100644 index 40ba471d031f..000000000000 --- a/sys-fs/eudev/files/eudev-hwdb-offset-root.patch +++ /dev/null @@ -1,212 +0,0 @@ -From 96da532526fec9bbfc9f53f2c5819520b971710c Mon Sep 17 00:00:00 2001 -From: Luca Barbato <lu_zero@gentoo.org> -Date: Thu, 7 Feb 2013 13:53:28 +0100 -Subject: [PATCH] udevadm: support updating hwdb from an offset root - -Introduce `--root` option to make users run udevadm on rootfs not -mounted as / - -Ease the life of distribution packagers. ---- - src/libudev/conf-files.c | 34 ++++++++++++++++++++++++++++------ - src/libudev/conf-files.h | 10 ++++++++-- - src/udev/udev-rules.c | 2 +- - src/udev/udevadm-hwdb.c | 32 +++++++++++++++++++++++++------- - 4 files changed, 62 insertions(+), 16 deletions(-) - -diff --git a/src/libudev/conf-files.c b/src/libudev/conf-files.c -index 34b8629..8e8edd0 100644 ---- a/src/libudev/conf-files.c -+++ b/src/libudev/conf-files.c -@@ -37,11 +37,27 @@ - #include "hashmap.h" - #include "conf-files.h" - --static int files_add(Hashmap *h, const char *path, const char *suffix) { -+static int files_add(Hashmap *h, -+ const char *prefix, -+ const char *path, -+ const char *suffix) { - DIR *dir; - int r = 0; - -- dir = opendir(path); -+ if (prefix) { -+ char *p = NULL; -+ -+ if (asprintf(&p, "%s/%s", prefix, path) < 0) { -+ r = -ENOMEM; -+ goto finish; -+ } -+ -+ dir = opendir(p); -+ free(p); -+ } else { -+ dir = opendir(path); -+ } -+ - if (!dir) { - if (errno == ENOENT) - return 0; -@@ -90,7 +106,10 @@ static int base_cmp(const void *a, const void *b) { - return strcmp(path_get_file_name(s1), path_get_file_name(s2)); - } - --int conf_files_list_strv(char ***strv, const char *suffix, const char **dirs) { -+int conf_files_list_strv(char ***strv, -+ const char *prefix, -+ const char *suffix, -+ const char **dirs) { - Hashmap *fh = NULL; - char **files = NULL; - const char **p; -@@ -105,7 +124,7 @@ int conf_files_list_strv(char ***strv, const char *suffix, const char **dirs) { - } - - STRV_FOREACH(p, dirs) { -- r = files_add(fh, *p, suffix); -+ r = files_add(fh, prefix, *p, suffix); - if (r < 0) - log_warning("Failed to search for files in %s: %s", - *p, strerror(-r)); -@@ -126,7 +145,10 @@ finish: - return r; - } - --int conf_files_list(char ***strv, const char *suffix, const char *dir, ...) { -+int conf_files_list(char ***strv, -+ const char *prefix, -+ const char *suffix, -+ const char *dir, ...) { - char **dirs = NULL; - va_list ap; - int r; -@@ -145,7 +167,7 @@ int conf_files_list(char ***strv, const char *suffix, const char *dir, ...) { - } - strv_uniq(dirs); - -- r = conf_files_list_strv(strv, suffix, (const char **)dirs); -+ r = conf_files_list_strv(strv, prefix, suffix, (const char **)dirs); - - finish: - strv_free(dirs); -diff --git a/src/libudev/conf-files.h b/src/libudev/conf-files.h -index f37ee1f..c2c59dc 100644 ---- a/src/libudev/conf-files.h -+++ b/src/libudev/conf-files.h -@@ -25,7 +25,13 @@ - - #include "macro.h" - --int conf_files_list(char ***strv, const char *suffix, const char *dir, ...); --int conf_files_list_strv(char ***strv, const char *suffix, const char **dirs); -+int conf_files_list(char ***strv, -+ const char *prefix, -+ const char *suffix, -+ const char *dir, ...); -+int conf_files_list_strv(char ***strv, -+ const char *prefix, -+ const char *suffix, -+ const char **dirs); - - #endif -diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c -index ab75521..0fcad5d 100644 ---- a/src/udev/udev-rules.c -+++ b/src/udev/udev-rules.c -@@ -1639,7 +1639,7 @@ struct udev_rules *udev_rules_new(struct udev *udev, int resolve_names) - return udev_rules_unref(rules); - udev_rules_check_timestamp(rules); - -- r = conf_files_list_strv(&files, ".rules", (const char **)rules->dirs); -+ r = conf_files_list_strv(&files, NULL, ".rules", (const char **)rules->dirs); - if (r < 0) { - log_error("failed to enumerate rules files: %s\n", strerror(-r)); - return udev_rules_unref(rules); -diff --git a/src/udev/udevadm-hwdb.c b/src/udev/udevadm-hwdb.c -index 279e925..917d1e0 100644 ---- a/src/udev/udevadm-hwdb.c -+++ b/src/udev/udevadm-hwdb.c -@@ -474,7 +474,7 @@ static int import_file(struct trie *trie, const char *filename) { - } - - static void help(void) { -- printf("Usage: udevadm hwdb [--create] [--help]\n" -+ printf("Usage: udevadm hwdb [--create] [--help] [--root <root_path>]\n" - " --update update the hardware database\n" - " --test <modalias> query database and print result\n" - " --help\n\n"); -@@ -483,11 +483,13 @@ static void help(void) { - static int adm_hwdb(struct udev *udev, int argc, char *argv[]) { - static const struct option options[] = { - { "update", no_argument, NULL, 'u' }, -+ { "root", required_argument, NULL, 'r' }, - { "test", required_argument, NULL, 't' }, - { "help", no_argument, NULL, 'h' }, - {} - }; -- const char *test = NULL; -+ const char *test = NULL, *root_path = NULL; -+ char *udev_hwdb_path = UDEV_HWDB_BIN; - bool update = false; - struct trie *trie = NULL; - int err; -@@ -496,7 +498,7 @@ static int adm_hwdb(struct udev *udev, int argc, char *argv[]) { - for (;;) { - int option; - -- option = getopt_long(argc, argv, "ut:h", options, NULL); -+ option = getopt_long(argc, argv, "ut:r:h", options, NULL); - if (option == -1) - break; - -@@ -507,6 +509,9 @@ static int adm_hwdb(struct udev *udev, int argc, char *argv[]) { - case 't': - test = optarg; - break; -+ case 'r': -+ root_path = optarg; -+ break; - case 'h': - help(); - return EXIT_SUCCESS; -@@ -542,7 +547,7 @@ static int adm_hwdb(struct udev *udev, int argc, char *argv[]) { - } - trie->nodes_count++; - -- err = conf_files_list_strv(&files, ".hwdb", (const char **)conf_file_dirs); -+ err = conf_files_list_strv(&files, root_path, ".hwdb", (const char **)conf_file_dirs); - if (err < 0) { - log_error("failed to enumerate hwdb files: %s\n", strerror(-err)); - rc = EXIT_FAILURE; -@@ -570,11 +575,24 @@ static int adm_hwdb(struct udev *udev, int argc, char *argv[]) { - log_debug("strings dedup'ed: %8zu bytes (%8zu)\n", - trie->strings->dedup_len, trie->strings->dedup_count); - -- mkdir_parents(UDEV_HWDB_BIN, 0755); -- err = trie_store(trie, UDEV_HWDB_BIN); -+ if (root_path) { -+ if (asprintf(&udev_hwdb_path, -+ "%s/%s", root_path, udev_hwdb_path) < 0) { -+ rc = EXIT_FAILURE; -+ goto out; -+ } -+ } -+ -+ mkdir_parents(udev_hwdb_path, 0755); -+ err = trie_store(trie, udev_hwdb_path); -+ -+ if (root_path) { -+ free(udev_hwdb_path); -+ } -+ - if (err < 0) { - log_error("Failure writing hardware database '%s': %s", -- UDEV_HWDB_BIN, strerror(-err)); -+ udev_hwdb_path, strerror(-err)); - rc = EXIT_FAILURE; - } - } --- -1.8.0.2 - |