[gentoo-commits] repo/gentoo:master commit in: dev-embedded/openocd/

[Sven Wegener]

commit:     827e04796294103251449be7d35467ac22ce03d2
Author:     Sven Wegener <swegener <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 10 10:13:21 2016 +0000
Commit:     Sven Wegener <swegener <AT> gentoo <DOT> 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 <swegener <AT> 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 \