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

[David Seifert]

commit:     cce4f7dd97738aa11023f07b8279b86112b1fb63
Author:     Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr>
AuthorDate: Mon Dec 28 15:17:05 2020 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Mon Dec 28 15:17:05 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cce4f7dd

dev-embedded/libftdi: Disable static libs in 1.5 and 9999

Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr>
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 dev-embedded/libftdi/libftdi-1.5.ebuild  | 16 +++++++---------
 dev-embedded/libftdi/libftdi-9999.ebuild | 12 ++++++------
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/dev-embedded/libftdi/libftdi-1.5.ebuild 
b/dev-embedded/libftdi/libftdi-1.5.ebuild
index d5d1fe18543..cd5cc4c3539 100644
--- a/dev-embedded/libftdi/libftdi-1.5.ebuild
+++ b/dev-embedded/libftdi/libftdi-1.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8,9} )
+PYTHON_COMPAT=( python3_{6..9} )
 inherit cmake python-single-r1
 
 MY_P="${PN}1-${PV}"
@@ -21,15 +21,15 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="LGPL-2"
 SLOT="1"
-IUSE="cxx doc examples python static-libs test tools"
+IUSE="cxx doc examples python test tools"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 BDEPEND="
        doc? ( app-doc/doxygen )
-       python? ( dev-lang/swig )
-"
-RDEPEND="virtual/libusb:1
+       python? ( dev-lang/swig )"
+RDEPEND="
+       virtual/libusb:1
        cxx? ( dev-libs/boost )
        python? ( ${PYTHON_DEPS} )
        tools? (
@@ -40,9 +40,7 @@ DEPEND="${RDEPEND}
        test? ( dev-libs/boost )
 "
 
-PATCHES=(
-       "${FILESDIR}/${P}-tests-no-cxx.patch"
-)
+PATCHES=( "${FILESDIR}"/${P}-tests-no-cxx.patch )
 
 pkg_setup() {
        use python && python-single-r1_pkg_setup
@@ -54,10 +52,10 @@ src_configure() {
                -DDOCUMENTATION=$(usex doc)
                -DEXAMPLES=$(usex examples)
                -DPYTHON_BINDINGS=$(usex python)
-               -DSTATICLIBS=$(usex static-libs)
                -DBUILD_TESTS=$(usex test)
                -DFTDI_EEPROM=$(usex tools)
                -DCMAKE_SKIP_BUILD_RPATH=ON
+               -DSTATICLIBS=OFF
        )
        cmake_src_configure
 }

diff --git a/dev-embedded/libftdi/libftdi-9999.ebuild 
b/dev-embedded/libftdi/libftdi-9999.ebuild
index ac06a98e918..984ebde256d 100644
--- a/dev-embedded/libftdi/libftdi-9999.ebuild
+++ b/dev-embedded/libftdi/libftdi-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8,9} )
+PYTHON_COMPAT=( python3_{6..9} )
 inherit cmake python-single-r1
 
 MY_P="${PN}1-${PV}"
@@ -21,15 +21,15 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="LGPL-2"
 SLOT="1"
-IUSE="cxx doc examples python static-libs test tools"
+IUSE="cxx doc examples python test tools"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 BDEPEND="
        doc? ( app-doc/doxygen )
-       python? ( dev-lang/swig )
-"
-RDEPEND="virtual/libusb:1
+       python? ( dev-lang/swig )"
+RDEPEND="
+       virtual/libusb:1
        cxx? ( dev-libs/boost )
        python? ( ${PYTHON_DEPS} )
        tools? (
@@ -50,10 +50,10 @@ src_configure() {
                -DDOCUMENTATION=$(usex doc)
                -DEXAMPLES=$(usex examples)
                -DPYTHON_BINDINGS=$(usex python)
-               -DSTATICLIBS=$(usex static-libs)
                -DBUILD_TESTS=$(usex test)
                -DFTDI_EEPROM=$(usex tools)
                -DCMAKE_SKIP_BUILD_RPATH=ON
+               -DSTATICLIBS=OFF
        )
        cmake_src_configure
 }