From: Sven Wegener <swegener@gentoo.org>
Date: Sun, 10 Jan 2016 10:13:21 +0000 (+0000)
Subject: dev-embedded/openocd: Lower libftdi SLOT dep restriction
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=827e04796294103251449be7d35467ac22ce03d2;p=gentoo.git

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 f1b389854be2..4b08ad2044c7 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 1f05725d1e6c..b300c69bc8ce 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 \