Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-embedded/libftdi/
Date: Mon, 28 Dec 2020 15:17:50
Message-Id: 1609168624.70e8d37416dd70bc56f21c23b5294091b4f46f97.soap@gentoo
1 commit: 70e8d37416dd70bc56f21c23b5294091b4f46f97
2 Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr>
3 AuthorDate: Mon Dec 28 15:17:04 2020 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Mon Dec 28 15:17:04 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70e8d374
7
8 dev-embedded/libftdi: Port to EAPI 7
9
10 * Disable static-libs
11 * Port to cmake eclass
12
13 Closes: https://bugs.gentoo.org/732476
14 Package-Manager: Portage-3.0.9, Repoman-3.0.1
15 Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr>
16 Signed-off-by: David Seifert <soap <AT> gentoo.org>
17
18 .../{libftdi-1.4.ebuild => libftdi-1.4-r1.ebuild} | 35 +++++++++++-----------
19 1 file changed, 18 insertions(+), 17 deletions(-)
20
21 diff --git a/dev-embedded/libftdi/libftdi-1.4.ebuild b/dev-embedded/libftdi/libftdi-1.4-r1.ebuild
22 similarity index 70%
23 rename from dev-embedded/libftdi/libftdi-1.4.ebuild
24 rename to dev-embedded/libftdi/libftdi-1.4-r1.ebuild
25 index 64b53c03c61..ff35d3bfef0 100644
26 --- a/dev-embedded/libftdi/libftdi-1.4.ebuild
27 +++ b/dev-embedded/libftdi/libftdi-1.4-r1.ebuild
28 @@ -1,18 +1,19 @@
29 # Copyright 1999-2020 Gentoo Authors
30 # Distributed under the terms of the GNU General Public License v2
31
32 -EAPI=6
33 +EAPI=7
34
35 -PYTHON_COMPAT=( python3_{6,7,8,9} )
36 -inherit cmake-utils python-single-r1
37 +PYTHON_COMPAT=( python3_{6..9} )
38 +inherit cmake python-single-r1
39
40 -MY_P="${PN}1-${PV}"
41 if [[ ${PV} == 9999* ]] ; then
42 inherit git-r3
43 EGIT_REPO_URI="git://developer.intra2net.com/${PN}"
44 else
45 + MY_P="${PN}1-${PV}"
46 SRC_URI="https://www.intra2net.com/en/developer/${PN}/download/${MY_P}.tar.bz2"
47 KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 sparc x86"
48 + S=${WORKDIR}/${MY_P}
49 fi
50
51 DESCRIPTION="Userspace access to FTDI USB interface chips"
52 @@ -20,52 +21,52 @@ HOMEPAGE="https://www.intra2net.com/en/developer/libftdi/"
53
54 LICENSE="LGPL-2"
55 SLOT="1"
56 -IUSE="cxx doc examples python static-libs test tools"
57 +IUSE="cxx doc examples python test tools"
58 RESTRICT="!test? ( test )"
59 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
60
61 -RDEPEND="virtual/libusb:1
62 +RDEPEND="
63 + virtual/libusb:1
64 cxx? ( dev-libs/boost )
65 python? ( ${PYTHON_DEPS} )
66 tools? (
67 !<dev-embedded/ftdi_eeprom-1.0
68 dev-libs/confuse:=
69 )"
70 -DEPEND="${RDEPEND}
71 - python? ( dev-lang/swig )
72 - doc? ( app-doc/doxygen )"
73 +DEPEND="${RDEPEND}"
74 +BDEPEND="
75 + doc? ( app-doc/doxygen )
76 + python? ( dev-lang/swig )"
77
78 pkg_setup() {
79 use python && python-single-r1_pkg_setup
80 }
81
82 -S=${WORKDIR}/${MY_P}
83 -
84 src_configure() {
85 local mycmakeargs=(
86 -DFTDIPP=$(usex cxx)
87 -DDOCUMENTATION=$(usex doc)
88 -DEXAMPLES=$(usex examples)
89 -DPYTHON_BINDINGS=$(usex python)
90 - -DSTATICLIBS=$(usex static-libs)
91 -DBUILD_TESTS=$(usex test)
92 -DFTDI_EEPROM=$(usex tools)
93 + -DSTATICLIBS=OFF
94 -DCMAKE_SKIP_BUILD_RPATH=ON
95 )
96 - cmake-utils_src_configure
97 + cmake_src_configure
98 }
99
100 src_install() {
101 - cmake-utils_src_install
102 + cmake_src_install
103 use python && python_optimize
104 dodoc AUTHORS ChangeLog README TODO
105
106 if use doc ; then
107 # Clean up crap man pages. #356369
108 - rm -vf "${CMAKE_BUILD_DIR}"/doc/man/man3/_* || die
109 + rm -vf "${BUILD_DIR}"/doc/man/man3/_* || die
110
111 - doman "${CMAKE_BUILD_DIR}"/doc/man/man3/*
112 - dodoc -r "${CMAKE_BUILD_DIR}"/doc/html
113 + doman "${BUILD_DIR}"/doc/man/man3/*
114 + dodoc -r "${BUILD_DIR}"/doc/html
115 fi
116 if use examples ; then
117 docinto examples