diff options
author | Anthony G. Basile <blueness@gentoo.org> | 2017-04-19 17:25:10 -0400 |
---|---|---|
committer | Anthony G. Basile <blueness@gentoo.org> | 2017-04-19 17:25:26 -0400 |
commit | ca879f958148cb768f0735c3d6c957b3646fa8e7 (patch) | |
tree | 6e223eb81156ebe18e7568ce234b0bfa33a663c3 /sys-fs | |
parent | sys-fs/eudev: version bump to 3.2.2 (diff) | |
download | gentoo-ca879f958148cb768f0735c3d6c957b3646fa8e7.tar.gz gentoo-ca879f958148cb768f0735c3d6c957b3646fa8e7.tar.bz2 gentoo-ca879f958148cb768f0735c3d6c957b3646fa8e7.zip |
sys-fs/eudev: remove older unstable version
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Diffstat (limited to 'sys-fs')
-rw-r--r-- | sys-fs/eudev/eudev-3.2.1-r1.ebuild | 244 | ||||
-rw-r--r-- | sys-fs/eudev/files/eudev-fix-new-gperf.patch | 22 |
2 files changed, 0 insertions, 266 deletions
diff --git a/sys-fs/eudev/eudev-3.2.1-r1.ebuild b/sys-fs/eudev/eudev-3.2.1-r1.ebuild deleted file mode 100644 index d873ba895bc1..000000000000 --- a/sys-fs/eudev/eudev-3.2.1-r1.ebuild +++ /dev/null @@ -1,244 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -KV_min=2.6.39 - -inherit autotools eutils linux-info multilib multilib-minimal user - -if [[ ${PV} = 9999* ]]; then - EGIT_REPO_URI="git://github.com/gentoo/eudev.git" - inherit git-2 -else - SRC_URI="https://dev.gentoo.org/~blueness/${PN}/${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~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="+hwdb +kmod introspection rule-generator selinux static-libs test" - -COMMON_DEPEND=">=sys-apps/util-linux-2.20 - introspection? ( >=dev-libs/gobject-introspection-1.38 ) - 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} - >=dev-util/gperf-3.1 - virtual/os-headers - virtual/pkgconfig - >=sys-devel/make-3.82-r4 - >=sys-kernel/linux-headers-${KV_min} - >=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=">=sys-fs/udev-init-scripts-26 - hwdb? ( >=sys-apps/hwids-20140304[udev] )" - -# 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() { - ewarn - ewarn "As of 2013-01-29, ${P} provides the new interface renaming functionality," - ewarn "as described in the URL below:" - ewarn "https://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: touch /etc/udev/rules.d/80-net-name-slot.rules" - ewarn -} - -pkg_setup() { - CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~UNIX" - 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() { - # upstream fix for new gperf versions - epatch "${FILESDIR}/${PN}-fix-new-gperf.patch" - # 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 - eautoreconf -} - -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= - --with-rootrundir=/run - --libdir="${EPREFIX}"/usr/$(get_libdir) - --with-rootlibexecdir="${EPREFIX}"/lib/udev - --enable-split-usr - --enable-manpages - --disable-hwdb - --exec-prefix="${EPREFIX}" - ) - - # 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="${EPREFIX}"/$(get_libdir) - $(use_enable introspection) - $(use_enable kmod) - $(use_enable static-libs static) - $(use_enable selinux) - $(use_enable rule-generator) - ) - else - econf_args+=( - --disable-static - --disable-introspection - --disable-kmod - --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/shared - emake -C src/libudev - fi -} - -multilib_src_install() { - if multilib_is_native_abi; then - emake DESTDIR="${D}" install - else - emake -C src/libudev 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 - - insinto /lib/udev/rules.d - doins "${FILESDIR}"/40-gentoo.rules - - use rule-generator && doinitd "${FILESDIR}"/udev-postmount -} - -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 - - # https://cgit.freedesktop.org/systemd/systemd/commit/rules/50-udev-default.rules?id=3dff3e00e044e2d53c76fa842b9a4759d4a50e69 - # https://bugs.gentoo.org/246847 - # https://bugs.gentoo.org/514174 - enewgroup input - - # REPLACING_VERSIONS should only ever have zero or 1 values but in case it doesn't, - # process it as a list. We only care about the zero case (new install) or the case where - # the same version is being re-emerged. If there is a second version, allow it to abort. - local rv rvres=doitnew - for rv in ${REPLACING_VERSIONS} ; do - if [[ ${rvres} == doit* ]]; then - if [[ ${rv%-r*} == ${PV} ]]; then - rvres=doit - else - rvres=${rv} - fi - fi - done - - if use hwdb && has_version 'sys-apps/hwids[udev]'; then - udevadm hwdb --update --root="${ROOT%/}" - - # https://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 [[ ${rvres} == doit* ]] && [[ ${ROOT%/} == "" ]] && [[ ${PV} != "9999" ]]; then - udevadm control --reload - fi - fi - if [[ ${rvres} != doitnew ]]; then - 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" - fi - - if use rule-generator && \ - [[ -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 " https://www.gentoo.org/doc/en/udev-guide.xml" - elog -} diff --git a/sys-fs/eudev/files/eudev-fix-new-gperf.patch b/sys-fs/eudev/files/eudev-fix-new-gperf.patch deleted file mode 100644 index b9c6c38eae37..000000000000 --- a/sys-fs/eudev/files/eudev-fix-new-gperf.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 5bab4d8de0dcbb8e2e7d4d5125b4aea1652a0d60 Mon Sep 17 00:00:00 2001 -From: "Anthony G. Basile" <blueness@gentoo.org> -Date: Thu, 5 Jan 2017 16:21:17 -0500 -Subject: [PATCH] src/udev/udev-builtin-keyboard.c: fix build with gperf 3.1 - -Signed-off-by: Anthony G. Basile <blueness@gentoo.org> ---- - src/udev/udev-builtin-keyboard.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/src/udev/udev-builtin-keyboard.c b/src/udev/udev-builtin-keyboard.c -index 73171c3..fad3520 100644 ---- a/src/udev/udev-builtin-keyboard.c -+++ b/src/udev/udev-builtin-keyboard.c -@@ -28,7 +28,6 @@ - - #include "udev.h" - --static const struct key *keyboard_lookup_key(const char *str, unsigned len); - #include "keyboard-keys-from-name.h" - #include "keyboard-keys-to-name.h" - |