commit: dc37c459689824c2d03df7b353bba84c362e6b87
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 18 09:05:12 2019 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Mon Feb 18 09:08:15 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc37c459
dev-embedded/openocd: update to EAPI=7
A few changes:
- add a subslot depend on jimtcl
- switch to dostrip
Package-Manager: Portage-2.3.60, Repoman-2.3.12
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
.../openocd/{openocd-9999.ebuild => openocd-0.10.0-r1.ebuild} | 10 +++++-----
dev-embedded/openocd/openocd-9999.ebuild | 10 +++++-----
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/dev-embedded/openocd/openocd-9999.ebuild
b/dev-embedded/openocd/openocd-0.10.0-r1.ebuild
similarity index 95%
copy from dev-embedded/openocd/openocd-9999.ebuild
copy to dev-embedded/openocd/openocd-0.10.0-r1.ebuild
index 57ba7a8c69e..ce0f6e7381b 100644
--- a/dev-embedded/openocd/openocd-9999.ebuild
+++ b/dev-embedded/openocd/openocd-0.10.0-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="5"
+EAPI="7"
inherit eutils multilib flag-o-matic toolchain-funcs udev user
@@ -25,7 +25,7 @@ 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=">=dev-lang/jimtcl-0.76:0=
cmsis-dap? ( dev-libs/hidapi )
jlink? ( dev-embedded/libjaylink )
usb? (
@@ -43,7 +43,7 @@ pkg_setup() {
}
src_prepare() {
- epatch_user
+ default
if [[ ${PV} == "9999" ]] ; then
AT_NO_RECURSIVE=yes eautoreconf
@@ -136,7 +136,7 @@ src_configure() {
src_install() {
default
- env -uRESTRICT prepstrip "${ED}"/usr/bin
+ dostrip "${ED}"/usr/bin
udev_dorules "${D}"/usr/share/${PN}/contrib/*.rules
}
diff --git a/dev-embedded/openocd/openocd-9999.ebuild
b/dev-embedded/openocd/openocd-9999.ebuild
index 57ba7a8c69e..ce0f6e7381b 100644
--- a/dev-embedded/openocd/openocd-9999.ebuild
+++ b/dev-embedded/openocd/openocd-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="5"
+EAPI="7"
inherit eutils multilib flag-o-matic toolchain-funcs udev user
@@ -25,7 +25,7 @@ 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=">=dev-lang/jimtcl-0.76:0=
cmsis-dap? ( dev-libs/hidapi )
jlink? ( dev-embedded/libjaylink )
usb? (
@@ -43,7 +43,7 @@ pkg_setup() {
}
src_prepare() {
- epatch_user
+ default
if [[ ${PV} == "9999" ]] ; then
AT_NO_RECURSIVE=yes eautoreconf
@@ -136,7 +136,7 @@ src_configure() {
src_install() {
default
- env -uRESTRICT prepstrip "${ED}"/usr/bin
+ dostrip "${ED}"/usr/bin
udev_dorules "${D}"/usr/share/${PN}/contrib/*.rules
}
