gentoo resync : 20.02.2019

5 files changed, 156 insertions, 12 deletions

diff --git a/dev-embedded/openocd/Manifest b/dev-embedded/openocd/Manifest
index d6567ecbb1e8..9f40f475ed79 100644
--- a/dev-embedded/openocd/Manifest
+++ b/dev-embedded/openocd/Manifest
@@ -1,6 +1,7 @@
 DIST openocd-0.10.0.tar.gz 6124274 BLAKE2B 3b455fce6c62626b507e8609789e95e6a542038605423400d08ad2d14d6db0953194bb22d893e3919c79ef02a1b43ccb6396d3370273e375d340c41b587bdfbf SHA512 44b303b0df1d7c13bc18b8995493de64fed7a853704455d484dfc4a74a1ba4b0d42b4679a7009ec015dc71c47152e5556a1a02665cfafe7af80c608b68d8310a
 DIST openocd-0.9.0.tar.gz 4970346 BLAKE2B 96421b32a3e64fc1ed362288f5a444cc1249f3d6daab6307f920c86fff11cb74a0bbb9f021788b848a8755139ee1c43c54793ac57a429f4e39df47f0775c2538 SHA512 698b43867f8134da43a50f5d2ff2ae33b71df8ccffc45fb5c3d0bd7a6289fcd9e7bb3d89287ad4dbdb02e1871db69f3913db950965335eaf8559247f2e58c227
-EBUILD openocd-0.10.0.ebuild 2851 BLAKE2B b93a667ad7b8a4f785882425e86c5dca9d0265b3cf38f833102a90b0b4994195c816f997da90dc262e559ec58d627b74710ad1b09ab9dc97f2218ca7043744a2 SHA512 c70b8f2fa0158426218e359a6a20c696c7da50f49e2bab6dda9358cfcf536999922fa89f54e1973624eabcdc1231c5a80054c3c0dd414c8ef75a32e76daab905
-EBUILD openocd-0.9.0.ebuild 2712 BLAKE2B b3e38d7e98d3ee97e532a1ce04698469eb5dc3d1cfd9b83c040f1a2b4d8d327ed5b8777f0e8ffbef184bf5a91397c05242e170c76c1434fcd413af15ace7af0a SHA512 f3d3cf97d72977fd9eeebe13c8b99bceaafdf757a5ba94d316e49b9e9d216c92d057b707d6f46c750bc6204fb87b71bcf0c6d07979a3b8763f16c12b0f23bb06
-EBUILD openocd-9999.ebuild 2853 BLAKE2B bf48cba6416441f406287d9e477cdb6f10bd4f94f953a589a2dfbbebb1fb9e18180e658bc1dbe308aab62fac2aa9b4fdbfdba76e188d282e3a4ee70d7fa1f0c0 SHA512 6029e1706dd4d5e9ca742d036f8ad56f7b3b0c84f157eaa8f2ae5032ebb61f26bd294cb5ca131cc0d985ab5aff254259dc66a98ce24ff0c83fa51ab284e9887f
+EBUILD openocd-0.10.0-r1.ebuild 2832 BLAKE2B 95431b3b1fe66566760772c5ff12b5036c708613a1c422b5a02dc8f8d51c87b273f84b5f776702209ab9e3a931257dc9f11992354cee24da16f2f22c3a843103 SHA512 6e9d5bb38eddf68aff7accef4dd837c0cb454c5b219dc7a59408bd5463e6476a8e14feb0e1dbaff0582d551fba0076f9a2de6fe1037a07967bc30b094e06500d
+EBUILD openocd-0.10.0.ebuild 2806 BLAKE2B d46464e208310d3ec2a615535b4e54e4f73aa1977b1c72b94cc5fb9a165b6d53c2b2042d85c60b49559e64631b109adfceb55dc083a0fcf5836a1e3368da658f SHA512 90ce1e9b75251e998c4bb7ab2570154ebfa401e7f5b5fcf4d669b3c30505431e224bba45c5f2b26255cd8fb84f89cdafb00a615029acee993413a39552eb30c8
+EBUILD openocd-0.9.0.ebuild 2667 BLAKE2B 31aabad3b6f6e5006c007a28f7e8a5af4e946b5fb41f269cca67711a10e4a6a7f679b04529422cd25d6db154ca16321fa06a43518a76cce49d7a342cc72fc1ff SHA512 8acf019ba88414e2984edf5398bc98bc8eec74a267a7862c715aad851c76e9f369b40d35793cbfef0c04da159ff5a87e495ef01b42aeb4aab025daff0f3ce0c4
+EBUILD openocd-9999.ebuild 2832 BLAKE2B 95431b3b1fe66566760772c5ff12b5036c708613a1c422b5a02dc8f8d51c87b273f84b5f776702209ab9e3a931257dc9f11992354cee24da16f2f22c3a843103 SHA512 6e9d5bb38eddf68aff7accef4dd837c0cb454c5b219dc7a59408bd5463e6476a8e14feb0e1dbaff0582d551fba0076f9a2de6fe1037a07967bc30b094e06500d
 MISC metadata.xml 882 BLAKE2B f7ec7fcd46485cf4f0c9039718cda564607f6f048646b326781cf09b2383c8665b8d624a19070a659df718673f4639bc918808ae950d6013016a0349a9fa6cb3 SHA512 bd6d73764a65fb4df85ce70552f0db5d18d876a54f1f1b4f75cba7865bdc425de78797f747b77f96b1c1e5b342106dd883d02f9c638875914d91987604ea8b76
diff --git a/dev-embedded/openocd/openocd-0.10.0-r1.ebuild b/dev-embedded/openocd/openocd-0.10.0-r1.ebuild
new file mode 100644
index 000000000000..ce0f6e7381b5
--- /dev/null
+++ b/dev-embedded/openocd/openocd-0.10.0-r1.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit eutils multilib flag-o-matic toolchain-funcs udev user
+
+# One ebuild to rule them all
+if [[ ${PV} == *9999 ]] ; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://git.code.sf.net/p/${PN}/code"
+else
+	MY_PV="${PV/_/-}"
+	MY_P="${PN}-${MY_PV}"
+	S="${WORKDIR}"/${MY_P}
+	KEYWORDS="~amd64 ~arm ~x86"
+	SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${MY_PV}/${MY_P}.tar.gz"
+fi
+
+DESCRIPTION="OpenOCD - Open On-Chip Debugger"
+HOMEPAGE="http://openocd.sourceforge.net"
+
+LICENSE="GPL-2+"
+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=
+	cmsis-dap? ( dev-libs/hidapi )
+	jlink? ( dev-embedded/libjaylink )
+	usb? (
+		virtual/libusb:0
+		virtual/libusb:1
+	)
+	ftdi? ( dev-embedded/libftdi:= )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+[[ ${PV} == "9999" ]] && DEPEND+=" >=sys-apps/texinfo-5" #549946
+
+pkg_setup() {
+	enewgroup plugdev
+}
+
+src_prepare() {
+	default
+
+	if [[ ${PV} == "9999" ]] ; then
+		AT_NO_RECURSIVE=yes eautoreconf
+	fi
+}
+
+src_configure() {
+	# Here are some defaults
+	local myconf=(
+		--enable-buspirate
+		--disable-werror
+		--disable-internal-jimtcl
+		--disable-internal-libjaylink
+		--enable-amtjtagaccel
+		--enable-ep93xx
+		--enable-at91rm9200
+		--enable-gw16012
+		--enable-arm-jtag-ew
+		--enable-sysfsgpio
+		--enable-bcm2835gpio
+	)
+
+	# Adapters requiring usb/libusb-1.X support
+	if use usb; then
+		myconf+=(
+			--enable-aice
+			--enable-usb-blaster-2
+			--enable-ftdi
+			--enable-ti-icdi
+			--enable-ulink
+			--enable-osbdm
+			--enable-opendous
+			--enable-usbprog
+			--enable-rlink
+			--enable-stlink
+			--enable-vsllink
+			--enable-armjtagew
+			$(use_enable verbose-io verbose-usb-io)
+			$(use_enable verbose-io verbose_usb_comms)
+		)
+	else
+		myconf+=(
+			--disable-aice
+			--disable-usb-blaster-2
+			--disable-ftdi
+			--disable-ti-icdi
+			--disable-ulink
+			--disable-osbdm
+			--disable-opendous
+			--disable-usbprog
+			--disable-rlink
+			--disable-stlink
+			--disable-vsllink
+			--disable-armjtagew
+		)
+	fi
+
+	if use jlink; then
+		myconf+=(
+			--enable-jlink
+		)
+	else
+		myconf+=(
+			--disable-jlink
+		)
+	fi
+
+	if use ftdi; then
+		myconf+=(
+			--enable-usb-blaster
+			--enable-openjtag
+			--enable-presto
+		)
+	else
+		myconf+=(
+			--disable-openjtag
+			--disable-presto
+			--disable-usb-blaster
+		)
+	fi
+
+	econf \
+		$(use_enable dummy) \
+		$(use_enable cmsis-dap) \
+		$(use_enable parport) \
+		$(use_enable parport parport_ppdev) \
+		$(use_enable verbose-io verbose-jtag-io) \
+		"${myconf[@]}"
+}
+
+src_install() {
+	default
+	dostrip "${ED}"/usr/bin
+	udev_dorules "${D}"/usr/share/${PN}/contrib/*.rules
+}
+
+pkg_postinst() {
+	elog "To access openocd devices as user you must be in the plugdev group"
+}
diff --git a/dev-embedded/openocd/openocd-0.10.0.ebuild b/dev-embedded/openocd/openocd-0.10.0.ebuild
index 44c2c20d5379..72a0bbe07a5c 100644
--- a/dev-embedded/openocd/openocd-0.10.0.ebuild
+++ b/dev-embedded/openocd/openocd-0.10.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -136,7 +136,6 @@ src_configure() {
 
 src_install() {
 	default
-	env -uRESTRICT prepstrip "${ED}"/usr/bin
 	udev_dorules "${D}"/usr/share/${PN}/contrib/*.rules
 }
 
diff --git a/dev-embedded/openocd/openocd-0.9.0.ebuild b/dev-embedded/openocd/openocd-0.9.0.ebuild
index 7a694fd3a84d..d6d36ec4b0a1 100644
--- a/dev-embedded/openocd/openocd-0.9.0.ebuild
+++ b/dev-embedded/openocd/openocd-0.9.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -126,7 +126,6 @@ src_configure() {
 
 src_install() {
 	default
-	env -uRESTRICT prepstrip "${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 57ba7a8c69e9..ce0f6e7381b5 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
 }