sys-fs/udev: replace uucp sed with a patch

Bug: https://bugs.gentoo.org/625720
Package-Manager: Portage-2.3.6_p34, Repoman-2.3.3_p12

diff --git a/sys-fs/udev/files/234-uucp-group.patch b/sys-fs/udev/files/234-uucp-group.patch
new file mode 100644 (file)
index 0000000..89cf552
--- /dev/null
+++ b/sys-fs/udev/files/234-uucp-group.patch
@@ -0,0 +1,11 @@
+--- a/rules/50-udev-default.rules.in
++++ b/rules/50-udev-default.rules.in
+@@ -22,7 +22,7 @@
+ SUBSYSTEM=="tty", KERNEL=="ttysclp[0-9]*", GROUP="tty", MODE="0620"
+ SUBSYSTEM=="tty", KERNEL=="3270/tty[0-9]*", GROUP="tty", MODE="0620"
+ SUBSYSTEM=="vc", KERNEL=="vcs*|vcsa*", GROUP="tty"
+-KERNEL=="tty[A-Z]*[0-9]|pppox[0-9]*|ircomm[0-9]*|noz[0-9]*|rfcomm[0-9]*", GROUP="dialout"
++KERNEL=="tty[A-Z]*[0-9]|pppox[0-9]*|ircomm[0-9]*|noz[0-9]*|rfcomm[0-9]*", GROUP="uucp"
+ 
+ SUBSYSTEM=="mem", KERNEL=="mem|kmem|port", GROUP="kmem", MODE="0640"
+ 

diff --git a/sys-fs/udev/udev-234.ebuild b/sys-fs/udev/udev-234-r1.ebuild
similarity index 95%
rename from sys-fs/udev/udev-234.ebuild
rename to sys-fs/udev/udev-234-r1.ebuild
index e8469928824480e6d54668f6010a2e3ddd2b38cb..03c1796fcacbd8f776791177361086f329ae9df8 100644 (file)
--- a/sys-fs/udev/udev-234.ebuild
+++ b/sys-fs/udev/udev-234-r1.ebuild
@@ -9,13 +9,7 @@ if [[ ${PV} = 9999* ]]; then
        EGIT_REPO_URI="https://github.com/systemd/systemd.git"
        inherit git-r3
 else
-       patchset=
        SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> systemd-${PV}.tar.gz"
-       if [[ -n "${patchset}" ]]; then
-               SRC_URI+="
-                       https://dev.gentoo.org/~williamh/dist/${P}-patches-${patchset}.tar.xz
-                       https://dev.gentoo.org/~ssuominen/${P}-patches-${patchset}.tar.xz"
-       fi
        KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
 fi
 
@@ -92,22 +86,17 @@ src_prepare() {
                fi
        fi
 
-       # backport some patches
-       if [[ -n "${patchset}" ]]; then
-               eapply "${WORKDIR}"/patch
-       fi
-
        cat <<-EOF > "${T}"/40-gentoo.rules
        # Gentoo specific floppy and usb groups
        ACTION=="add", SUBSYSTEM=="block", KERNEL=="fd[0-9]", GROUP="floppy"
        ACTION=="add", SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", GROUP="usb"
        EOF
 
-       # change rules back to group uucp instead of dialout for now wrt #454556
-       sed -i -e 's/GROUP="dialout"/GROUP="uucp"/' rules/*.rules || die
+       local PATCHES=(
+               "${FILESDIR}/234-uucp-group.patch"
+       )
 
-       # apply user patches
-       eapply_user
+       default
 
        if ! use elibc_glibc; then #443030
                echo '#define secure_getenv(x) NULL' >> config.h.in

diff --git a/sys-fs/udev/udev-9999.ebuild b/sys-fs/udev/udev-9999.ebuild
index b7834ccec24c7709f5f06db7a1f14ee2cd3dd30b..03c1796fcacbd8f776791177361086f329ae9df8 100644 (file)
--- a/sys-fs/udev/udev-9999.ebuild
+++ b/sys-fs/udev/udev-9999.ebuild
@@ -9,14 +9,8 @@ if [[ ${PV} = 9999* ]]; then
        EGIT_REPO_URI="https://github.com/systemd/systemd.git"
        inherit git-r3
 else
-       patchset=
        SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> systemd-${PV}.tar.gz"
-       if [[ -n "${patchset}" ]]; then
-               SRC_URI+="
-                       https://dev.gentoo.org/~williamh/dist/${P}-patches-${patchset}.tar.xz
-                       https://dev.gentoo.org/~ssuominen/${P}-patches-${patchset}.tar.xz"
-       fi
-       KEYWORDS="~amd64 ~x86"
+       KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
 fi
 
 DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
@@ -92,22 +86,17 @@ src_prepare() {
                fi
        fi
 
-       # backport some patches
-       if [[ -n "${patchset}" ]]; then
-               eapply "${WORKDIR}"/patch
-       fi
-
        cat <<-EOF > "${T}"/40-gentoo.rules
        # Gentoo specific floppy and usb groups
        ACTION=="add", SUBSYSTEM=="block", KERNEL=="fd[0-9]", GROUP="floppy"
        ACTION=="add", SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", GROUP="usb"
        EOF
 
-       # change rules back to group uucp instead of dialout for now wrt #454556
-       sed -i -e 's/GROUP="dialout"/GROUP="uucp"/' rules/*.rules || die
+       local PATCHES=(
+               "${FILESDIR}/234-uucp-group.patch"
+       )
 
-       # apply user patches
-       eapply_user
+       default
 
        if ! use elibc_glibc; then #443030
                echo '#define secure_getenv(x) NULL' >> config.h.in