From b977185e928d09d6f5dc994e54855a5dc0d09d28 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Micha=C5=82=20G=C3=B3rny?= Date: Fri, 13 Sep 2019 14:16:01 +0200 Subject: [PATCH] dev-embedded/openocd: Use acct-group/plugdev MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Górny --- dev-embedded/openocd/openocd-0.10.0-r1.ebuild | 10 ++++------ dev-embedded/openocd/openocd-0.10.0.ebuild | 10 ++++------ dev-embedded/openocd/openocd-0.9.0.ebuild | 10 ++++------ dev-embedded/openocd/openocd-9999.ebuild | 10 ++++------ 4 files changed, 16 insertions(+), 24 deletions(-) diff --git a/dev-embedded/openocd/openocd-0.10.0-r1.ebuild b/dev-embedded/openocd/openocd-0.10.0-r1.ebuild index 3afa1fad8b47..168fc2499564 100644 --- a/dev-embedded/openocd/openocd-0.10.0-r1.ebuild +++ b/dev-embedded/openocd/openocd-0.10.0-r1.ebuild @@ -3,7 +3,7 @@ EAPI="7" -inherit eutils multilib flag-o-matic toolchain-funcs udev user +inherit eutils multilib flag-o-matic toolchain-funcs udev # One ebuild to rule them all if [[ ${PV} == *9999 ]] ; then @@ -25,7 +25,9 @@ SLOT="0" IUSE="+cmsis-dap dummy +ftdi +jlink parport +usb verbose-io" RESTRICT="strip" # includes non-native binaries -RDEPEND=">=dev-lang/jimtcl-0.76:0= +RDEPEND=" + acct-group/plugdev + >=dev-lang/jimtcl-0.76:0= cmsis-dap? ( dev-libs/hidapi ) jlink? ( dev-embedded/libjaylink ) usb? ( @@ -38,10 +40,6 @@ DEPEND="${RDEPEND} virtual/pkgconfig" [[ ${PV} == "9999" ]] && DEPEND+=" >=sys-apps/texinfo-5" #549946 -pkg_setup() { - enewgroup plugdev -} - src_prepare() { default diff --git a/dev-embedded/openocd/openocd-0.10.0.ebuild b/dev-embedded/openocd/openocd-0.10.0.ebuild index 72a0bbe07a5c..671c16ab48f7 100644 --- a/dev-embedded/openocd/openocd-0.10.0.ebuild +++ b/dev-embedded/openocd/openocd-0.10.0.ebuild @@ -3,7 +3,7 @@ EAPI="5" -inherit eutils multilib flag-o-matic toolchain-funcs udev user +inherit eutils multilib flag-o-matic toolchain-funcs udev # One ebuild to rule them all if [[ ${PV} == *9999 ]] ; then @@ -25,7 +25,9 @@ SLOT="0" IUSE="+cmsis-dap dummy +ftdi +jlink parport +usb verbose-io" RESTRICT="strip" # includes non-native binaries -RDEPEND=">=dev-lang/jimtcl-0.76 +RDEPEND=" + acct-group/plugdev + >=dev-lang/jimtcl-0.76 cmsis-dap? ( dev-libs/hidapi ) jlink? ( dev-embedded/libjaylink ) usb? ( @@ -38,10 +40,6 @@ DEPEND="${RDEPEND} virtual/pkgconfig" [[ ${PV} == "9999" ]] && DEPEND+=" >=sys-apps/texinfo-5" #549946 -pkg_setup() { - enewgroup plugdev -} - src_prepare() { epatch_user diff --git a/dev-embedded/openocd/openocd-0.9.0.ebuild b/dev-embedded/openocd/openocd-0.9.0.ebuild index d6d36ec4b0a1..c7878693cd02 100644 --- a/dev-embedded/openocd/openocd-0.9.0.ebuild +++ b/dev-embedded/openocd/openocd-0.9.0.ebuild @@ -3,7 +3,7 @@ EAPI="5" -inherit eutils multilib flag-o-matic toolchain-funcs udev user +inherit eutils multilib flag-o-matic toolchain-funcs udev # One ebuild to rule them all if [[ ${PV} == *9999 ]] ; then @@ -25,7 +25,9 @@ SLOT="0" IUSE="cmsis-dap dummy ftdi parport +usb verbose-io" RESTRICT="strip" # includes non-native binaries -RDEPEND=">=dev-lang/jimtcl-0.76 +RDEPEND=" + acct-group/plugdev + >=dev-lang/jimtcl-0.76 cmsis-dap? ( dev-libs/hidapi ) usb? ( virtual/libusb:0 @@ -36,10 +38,6 @@ RDEPEND=">=dev-lang/jimtcl-0.76 DEPEND="${RDEPEND} virtual/pkgconfig" -pkg_setup() { - enewgroup plugdev -} - src_prepare() { epatch_user diff --git a/dev-embedded/openocd/openocd-9999.ebuild b/dev-embedded/openocd/openocd-9999.ebuild index 3afa1fad8b47..168fc2499564 100644 --- a/dev-embedded/openocd/openocd-9999.ebuild +++ b/dev-embedded/openocd/openocd-9999.ebuild @@ -3,7 +3,7 @@ EAPI="7" -inherit eutils multilib flag-o-matic toolchain-funcs udev user +inherit eutils multilib flag-o-matic toolchain-funcs udev # One ebuild to rule them all if [[ ${PV} == *9999 ]] ; then @@ -25,7 +25,9 @@ SLOT="0" IUSE="+cmsis-dap dummy +ftdi +jlink parport +usb verbose-io" RESTRICT="strip" # includes non-native binaries -RDEPEND=">=dev-lang/jimtcl-0.76:0= +RDEPEND=" + acct-group/plugdev + >=dev-lang/jimtcl-0.76:0= cmsis-dap? ( dev-libs/hidapi ) jlink? ( dev-embedded/libjaylink ) usb? ( @@ -38,10 +40,6 @@ DEPEND="${RDEPEND} virtual/pkgconfig" [[ ${PV} == "9999" ]] && DEPEND+=" >=sys-apps/texinfo-5" #549946 -pkg_setup() { - enewgroup plugdev -} - src_prepare() { default -- 2.26.2