From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 29B281382C5 for ; Mon, 28 Dec 2020 14:16:12 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CB00DE0C3A; Mon, 28 Dec 2020 14:16:10 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A08D9E0C3A for ; Mon, 28 Dec 2020 14:16:10 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E0F1D3412C2 for ; Mon, 28 Dec 2020 14:16:06 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5FF2A481 for ; Mon, 28 Dec 2020 14:16:03 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1609164935.7c920a1be3f8f839262ecd9ae17054671f9b443e.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-embedded/openocd/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-embedded/openocd/openocd-9999.ebuild X-VCS-Directories: dev-embedded/openocd/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 7c920a1be3f8f839262ecd9ae17054671f9b443e X-VCS-Branch: master Date: Mon, 28 Dec 2020 14:16:03 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 41fca98b-77b0-453d-958a-85b08207adc4 X-Archives-Hash: a6ca40247a2e83a6d9ed6ed50bf1bf6c commit: 7c920a1be3f8f839262ecd9ae17054671f9b443e Author: Jakov Smolic sartura hr> AuthorDate: Mon Dec 28 14:15:35 2020 +0000 Commit: David Seifert gentoo org> CommitDate: Mon Dec 28 14:15:35 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c920a1b dev-embedded/openocd: Sync live ebuild Package-Manager: Portage-3.0.9, Repoman-3.0.1 Signed-off-by: Jakov Smolic sartura.hr> Signed-off-by: David Seifert gentoo.org> dev-embedded/openocd/openocd-9999.ebuild | 123 ++++++++++--------------------- 1 file changed, 40 insertions(+), 83 deletions(-) diff --git a/dev-embedded/openocd/openocd-9999.ebuild b/dev-embedded/openocd/openocd-9999.ebuild index 99592e57a11..f7d5c4b834c 100644 --- a/dev-embedded/openocd/openocd-9999.ebuild +++ b/dev-embedded/openocd/openocd-9999.ebuild @@ -1,14 +1,13 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" +EAPI=7 -inherit eutils multilib flag-o-matic toolchain-funcs udev +inherit udev -# 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" + EGIT_REPO_URI=" https://repo.or.cz/openocd.git" else MY_PV="${PV/_/-}" MY_P="${PN}-${MY_PV}" @@ -29,113 +28,71 @@ RDEPEND=" acct-group/plugdev >=dev-lang/jimtcl-0.76:0= cmsis-dap? ( dev-libs/hidapi ) - jlink? ( >=dev-embedded/libjaylink-0.2 ) + jlink? ( >=dev-embedded/libjaylink-0.2.0 ) usb? ( virtual/libusb:0 virtual/libusb:1 ) ftdi? ( dev-embedded/libftdi:= )" -DEPEND="${RDEPEND} +DEPEND="${RDEPEND}" +BDEPEND=" + sys-apps/texinfo virtual/pkgconfig" -[[ ${PV} == "9999" ]] && DEPEND+=" >=sys-apps/texinfo-5" #549946 src_prepare() { default - if [[ ${PV} == "9999" ]] ; then + 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-arm-jtag-ew --enable-at91rm9200 + --enable-bcm2835gpio + --enable-buspirate + --enable-ep93xx --enable-gw16012 - --enable-arm-jtag-ew --enable-sysfsgpio - --enable-bcm2835gpio + --disable-internal-jimtcl + --disable-internal-libjaylink + --disable-werror + $(use_enable cmsis-dap) + $(use_enable dummy) + $(use_enable ftdi openjtag) + $(use_enable ftdi presto) + $(use_enable ftdi usb-blaster) + $(use_enable jlink) + $(use_enable parport) + $(use_enable parport parport_ppdev) + $(use_enable usb aice) + $(use_enable usb armjtagew) + $(use_enable usb ftdi) + $(use_enable usb osbdm) + $(use_enable usb opendous) + $(use_enable usb rlink) + $(use_enable usb stlink) + $(use_enable usb ti-icdi) + $(use_enable usb usbprog) + $(use_enable usb usb-blaster-2) + $(use_enable usb ulink) + $(use_enable usb vsllink) + $(use_enable verbose-io verbose-jtag-io) + $(use_enable verbose-io verbose-usb-io) + $(use_enable verbose-io verbose_usb_comms) ) - # 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[@]}" + econf "${myconf[@]}" } src_install() { default dostrip /usr/bin - udev_dorules "${D}"/usr/share/${PN}/contrib/*.rules + udev_dorules "${ED}"/usr/share/${PN}/contrib/*.rules } pkg_postinst() {