diff --git a/srcpkgs/eudev/patches/restore-predictable-net-ifnames.patch b/srcpkgs/eudev/patches/restore-predictable-net-ifnames.patch deleted file mode 100644 index 61f85230ae6..00000000000 --- a/srcpkgs/eudev/patches/restore-predictable-net-ifnames.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 2eba1b80553e02054f649790b3b3dd426399b351 Mon Sep 17 00:00:00 2001 -From: "Anthony G. Basile" -Date: Tue, 2 Jun 2015 10:09:25 -0400 -Subject: [PATCH] 80-net-name-slot.rules: restored for issue #117. - -Signed-off-by: Anthony G. Basile ---- - rules/80-net-name-slot.rules | 14 ++++++++++++++ - rules/Makefile.am | 3 ++- - 2 files changed, 16 insertions(+), 1 deletion(-) - create mode 100644 rules/80-net-name-slot.rules - -diff --git rules/80-net-name-slot.rules rules/80-net-name-slot.rules -new file mode 100644 -index 0000000..c5f1b38 ---- /dev/null -+++ rules/80-net-name-slot.rules -@@ -0,0 +1,14 @@ -+# do not edit this file, it will be overwritten on update -+ -+ACTION!="add", GOTO="net_name_slot_end" -+SUBSYSTEM!="net", GOTO="net_name_slot_end" -+NAME!="", GOTO="net_name_slot_end" -+ -+IMPORT{cmdline}="net.ifnames" -+ENV{net.ifnames}=="0", GOTO="net_name_slot_end" -+ -+NAME=="", ENV{ID_NET_NAME_ONBOARD}!="", NAME="$env{ID_NET_NAME_ONBOARD}" -+NAME=="", ENV{ID_NET_NAME_SLOT}!="", NAME="$env{ID_NET_NAME_SLOT}" -+NAME=="", ENV{ID_NET_NAME_PATH}!="", NAME="$env{ID_NET_NAME_PATH}" -+ -+LABEL="net_name_slot_end" -diff --git rules/Makefile.am rules/Makefile.am -index 7e0927f..624a434 100644 ---- rules/Makefile.am -+++ rules/Makefile.am -@@ -18,7 +18,8 @@ dist_udevrules_DATA = \ - 70-touchpad.rules \ - 75-net-description.rules \ - 75-probe_mtd.rules \ -- 78-sound-card.rules -+ 78-sound-card.rules \ -+ 80-net-name-slot.rules - - if HAVE_BLKID - dist_udevrules_DATA += \ diff --git a/srcpkgs/eudev/template b/srcpkgs/eudev/template index d88bc624629..7343b38897e 100644 --- a/srcpkgs/eudev/template +++ b/srcpkgs/eudev/template @@ -3,12 +3,12 @@ _UDEV_VERSION="220" # compatible udev version provided pkgname=eudev -version=3.1 -revision=5 +version=3.1.1 +revision=1 build_pie=yes conf_files="/etc/udev/udev.conf" build_style=gnu-configure -configure_args="--sbindir=/usr/bin --enable-hwdb --enable-manpages $(vopt_enable gir introspection)" +configure_args="--enable-hwdb --enable-manpages $(vopt_enable gir introspection)" hostmakedepends="automake libtool pkg-config gperf glib-devel libxslt docbook-xsl" makedepends="libblkid-devel libkmod-devel libglib-devel $(vopt_if gir gobject-introspection)" short_desc="Gentoo's fork of systemd-udev (enhanced userland device daemon)" @@ -16,7 +16,7 @@ maintainer="Juan RP " license="GPL-2" homepage="http://www.gentoo.org/proj/en/eudev/" distfiles="http://dev.gentoo.org/~blueness/eudev/eudev-${version}.tar.gz" -checksum=5da313031001debd0983472d07aa03ad186e2db9bc9be0ce4769c9f16391372c +checksum=d3a0c7f613d4917b89afd57498860a1c35b9c59abf9fea22a09c30eec25c32e4 replaces="systemd>=0" # Package build options