dev-embedded/openocd: Lower libftdi SLOT dep restriction

There's actually compat code inside the ebuild.

Signed-off-by: Sven Wegener <swegener@gentoo.org>

diff --git a/dev-embedded/openocd/openocd-0.6.1.ebuild b/dev-embedded/openocd/openocd-0.6.1.ebuild
index f1b389854be2db008fa0ed819faf1eda75834bf7..4b08ad2044c7fd2e9f498e0641eca1201f805e3d 100644 (file)
--- 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 1f05725d1e6c995d9d0e463a37a503ebfeaf40a0..b300c69bc8ce49838d7aaf1c758e46654edc8e42 100644 (file)
--- 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 \