From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id D85901388C3 for ; Sun, 10 Jan 2016 11:17:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 72F04E07C2; Sun, 10 Jan 2016 11:17:54 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B23C0E07B3 for ; Sun, 10 Jan 2016 11:17:53 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C60DF34085D for ; Sun, 10 Jan 2016 11:17:52 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 55929BFF for ; Sun, 10 Jan 2016 11:17:50 +0000 (UTC) From: "Sven Wegener" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sven Wegener" Message-ID: <1452424658.827e04796294103251449be7d35467ac22ce03d2.swegener@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-embedded/openocd/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-embedded/openocd/openocd-0.6.1.ebuild dev-embedded/openocd/openocd-0.7.0-r1.ebuild X-VCS-Directories: dev-embedded/openocd/ X-VCS-Committer: swegener X-VCS-Committer-Name: Sven Wegener X-VCS-Revision: 827e04796294103251449be7d35467ac22ce03d2 X-VCS-Branch: master Date: Sun, 10 Jan 2016 11:17:50 +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-Archives-Salt: f8499e25-86e9-49ce-a16d-75990fd87a79 X-Archives-Hash: 51f7a2632e0eacb469d140f6d8009c8a commit: 827e04796294103251449be7d35467ac22ce03d2 Author: Sven Wegener gentoo org> AuthorDate: Sun Jan 10 10:13:21 2016 +0000 Commit: Sven Wegener gentoo org> CommitDate: Sun Jan 10 11:17:38 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=827e0479 dev-embedded/openocd: Lower libftdi SLOT dep restriction There's actually compat code inside the ebuild. Signed-off-by: Sven Wegener gentoo.org> dev-embedded/openocd/openocd-0.6.1.ebuild | 4 ++-- dev-embedded/openocd/openocd-0.7.0-r1.ebuild | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dev-embedded/openocd/openocd-0.6.1.ebuild b/dev-embedded/openocd/openocd-0.6.1.ebuild index f1b3898..4b08ad20 100644 --- a/dev-embedded/openocd/openocd-0.6.1.ebuild +++ b/dev-embedded/openocd/openocd-0.6.1.ebuild @@ -27,7 +27,7 @@ DEPEND=">=dev-lang/jimtcl-0.73 usb? ( virtual/libusb:0 ) presto? ( dev-embedded/libftd2xx ) ftd2xx? ( dev-embedded/libftd2xx ) - ftdi? ( dev-embedded/libftdi:0 )" + ftdi? ( dev-embedded/libftdi )" RDEPEND="${DEPEND}" REQUIRED_USE="blaster? ( || ( ftdi ftd2xx ) ) ftdi? ( !ftd2xx )" @@ -44,7 +44,7 @@ src_prepare() { configure || die if use ftdi ; then - local pc="libftdi$(has_version '=dev-embedded/libftdi-1*' && echo 1)" + local pc="libftdi$(has_version dev-embedded/libftdi:1 && echo 1)" # Use libftdi-1 paths #460916 local libs=$($(tc-getPKG_CONFIG) --libs ${pc}) sed -i \ diff --git a/dev-embedded/openocd/openocd-0.7.0-r1.ebuild b/dev-embedded/openocd/openocd-0.7.0-r1.ebuild index 1f05725..b300c69 100644 --- a/dev-embedded/openocd/openocd-0.7.0-r1.ebuild +++ b/dev-embedded/openocd/openocd-0.7.0-r1.ebuild @@ -30,7 +30,7 @@ DEPEND=">=dev-lang/jimtcl-0.73 usb? ( virtual/libusb:0 ) presto? ( dev-embedded/libftd2xx ) ftd2xx? ( dev-embedded/libftd2xx ) - ftdi? ( dev-embedded/libftdi:0 )" + ftdi? ( dev-embedded/libftdi:= )" RDEPEND="${DEPEND}" REQUIRED_USE="blaster? ( || ( ftdi ftd2xx ) ) ftdi? ( !ftd2xx )" @@ -49,7 +49,7 @@ src_prepare() { configure || die if use ftdi ; then - local pc="libftdi$(has_version '=dev-embedded/libftdi-1*' && echo 1)" + local pc="libftdi$(has_version dev-embedded/libftdi:1 && echo 1)" # Use libftdi-1 paths #460916 local libs=$($(tc-getPKG_CONFIG) --libs ${pc}) sed -i \