gentoo auto-resync : 31:03:2023 - 22:06:41

4 files changed, 196 insertions, 12 deletions

diff --git a/dev-embedded/libftdi/Manifest b/dev-embedded/libftdi/Manifest
index d6986e940af8..6089db082582 100644
--- a/dev-embedded/libftdi/Manifest
+++ b/dev-embedded/libftdi/Manifest
@@ -5,6 +5,8 @@ AUX libftdi-1.5-tests-no-cxx.patch 1017 BLAKE2B ff3e05ae2cc48a023c74142f986159f6
 DIST libftdi-0.20.tar.gz 423570 BLAKE2B f0aa420a704e18c4257b99a4593dbaf46a15806d980b24909fe8678b36e74b568cd5915db1e14f8b904541334fbf3d18f069dc479a0bf66b2ea8e113611cb82b SHA512 540e5eb201a65936c3dbabff70c251deba1615874b11ff27c5ca16c39d71c150cf61758a68b541135a444fe32ab403b0fba0daf55c587647aaf9b3f400f1dee7
 DIST libftdi1-1.5.tar.bz2 116297 BLAKE2B 460ab93026e14a452e31fcc6930d305638fdc0ed06cb44fb9d50ad8f80199b17057d2f48a27b8295b43b956934289c872a2ef1ddb7f93fa93c6816511ef7607d SHA512 c525b2ab6aff9ef9254971ae7d57f3549a36a36875765c48f947d52532814a2a004de1232389d4fe824a8c8ab84277b08427308573476e1da9b7db83db802f6f
 EBUILD libftdi-0.20-r1.ebuild 1872 BLAKE2B 4b881ee50115d6702542aacf5acc91dd144e5b9b5f30fb36a3c25efc3567d37209e7679313467c2fba62fa8feb082b60e27aced1881acdd109dac760b8f93ea8 SHA512 ddd327bc763da3dd9ab51e7f106858c5ba28eeaaddb36aecc0e71490ee5f1ff4d91c2e8baca8e6dd73e79b6b12829ba7dd40d15f8261e9aab0e46cb479f7466b
+EBUILD libftdi-0.20-r2.ebuild 1900 BLAKE2B 30ba6e86846edf900ef833c1184683043799c8fee58d078bddc19b2a095a93e79faf8d6cdc9dd6bed14495236c471e1cc2097776d728a380674be09b75c94d08 SHA512 f51216ee94e29ca3682acd885284cc3bc1a54725b9fc3539969dfce9b4830eed32d9c83f61aa9c0bfbb9025857cd0b0d72c30aee0e5d73ccd7b9313ab205ec9f
 EBUILD libftdi-1.5-r4.ebuild 1917 BLAKE2B 1964c36db9a1c0f1b24caaf393e6eedca049e98f27fe5234c1120d0d6ad882c49e6e1b32708b4e494f65768f773b5fb4c637af5c853e9c3bd73e7c6baaf8d697 SHA512 3d0321f0ecdcb5cec45e3d692398c9441336937e0cdb66f995694ba5125536da1309a9b06b844443df4cc61587b0ffa3002ca3d0a0d185bf63e43e327b35fed3
-EBUILD libftdi-9999.ebuild 1829 BLAKE2B 8a81147341c4de073d14156da4c3a71e8e59d4976afb4b8449d6cf0eac996d17ad91afec802adb17f69ee0c52043f35731aac775ea8e3104103334388657833d SHA512 1b7d9c7d2bc12b4859ccec14638bdc12a0861237d1f75dcdfe23ac26460d1485e07123f66d54656a4c5dc85203ff09a551b4e9ddeb882f52f4533364492a14c3
+EBUILD libftdi-1.5-r5.ebuild 1912 BLAKE2B 08190f83b1e5f1d677ddc321a701bc7f6e0a02e24c0fd651dcd1dc9ed11efbef04a80805f807896eef071a6a466f587332a519ef7e724b00073381390938d4f6 SHA512 4dea5b07b8b846a1bd0f7c71a548371de547ef97c84fa3b4a3856f14a3723c5b2803b3897ce2f03e89b7a551de483aeaf50f920cbe4a8902e1777615522f52e7
+EBUILD libftdi-9999.ebuild 1912 BLAKE2B 08190f83b1e5f1d677ddc321a701bc7f6e0a02e24c0fd651dcd1dc9ed11efbef04a80805f807896eef071a6a466f587332a519ef7e724b00073381390938d4f6 SHA512 4dea5b07b8b846a1bd0f7c71a548371de547ef97c84fa3b4a3856f14a3723c5b2803b3897ce2f03e89b7a551de483aeaf50f920cbe4a8902e1777615522f52e7
 MISC metadata.xml 318 BLAKE2B c2c9ab83d57a082ed6608367f53f0f9420056c909d4ee50641da5b8f12b6a6ca996740fbdcadb0fa08460cb0cbef36dbedfaaf98acaea3eeeeee6afcf7724f54 SHA512 313b5c5dfcf5feb7dc8e41c1cb74939619451cb0747c1a281c9a0e763d26e0850a43e05d8fd2a836389bd75c2a4f153b80986e11be8171e9d93ca234f9df05f2
diff --git a/dev-embedded/libftdi/libftdi-0.20-r2.ebuild b/dev-embedded/libftdi/libftdi-0.20-r2.ebuild
new file mode 100644
index 000000000000..6b805b7fd6d9
--- /dev/null
+++ b/dev-embedded/libftdi/libftdi-0.20-r2.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit cmake python-single-r1
+
+if [[ ${PV} == 9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="git://developer.intra2net.com/${PN}"
+else
+	SRC_URI="https://www.intra2net.com/en/developer/${PN}/download/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+DESCRIPTION="Userspace access to FTDI USB interface chips"
+HOMEPAGE="https://www.intra2net.com/en/developer/libftdi/"
+
+LICENSE="LGPL-2"
+SLOT="0"
+IUSE="cxx doc examples python static-libs"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	virtual/libusb:0
+	cxx? ( dev-libs/boost )
+	python? ( ${PYTHON_DEPS} )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	doc? ( app-doc/doxygen )
+	python? ( dev-lang/swig )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-cmake-include.patch
+	"${FILESDIR}"/${P}-cmake-version.patch
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	if use python; then
+		sed -i \
+			-e "s:[$]{PYTHON_LIB_INSTALL}/../site-packages:$(python_get_sitedir):" \
+			bindings/CMakeLists.txt || die
+	fi
+	sed -i \
+		-e '/SET(LIB_SUFFIX /d' \
+		CMakeLists.txt || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DFTDIPP=$(usex cxx)
+		-DDOCUMENTATION=$(usex doc)
+		-DEXAMPLES=$(usex examples)
+		-DPYTHON_BINDINGS=$(usex python)
+		-DCMAKE_SKIP_BUILD_RPATH=ON
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	use python && python_optimize
+	dodoc ChangeLog README
+
+	if use doc ; then
+		# Clean up man pages with too generic names. #356369
+		rm -vf "${BUILD_DIR}"/doc/man/man3/{_,usb_,deprecated}* || die
+
+		doman "${BUILD_DIR}"/doc/man/man3/*
+		dodoc -r "${BUILD_DIR}"/doc/html
+	fi
+
+	if use examples ; then
+		docinto examples
+		dodoc examples/*.c
+	fi
+
+	use static-libs || rm "${ED}"/usr/$(get_libdir)/${PN}.a || die
+}
diff --git a/dev-embedded/libftdi/libftdi-1.5-r5.ebuild b/dev-embedded/libftdi/libftdi-1.5-r5.ebuild
new file mode 100644
index 000000000000..263ee7edc9ea
--- /dev/null
+++ b/dev-embedded/libftdi/libftdi-1.5-r5.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit cmake python-single-r1
+
+MY_P="${PN}1-${PV}"
+if [[ ${PV} == 9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="git://developer.intra2net.com/${PN}"
+else
+	SRC_URI="https://www.intra2net.com/en/developer/${PN}/download/${MY_P}.tar.bz2"
+	S="${WORKDIR}/${MY_P}"
+
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+	PATCHES=(
+		"${FILESDIR}"/${P}-tests-no-cxx.patch
+		"${FILESDIR}"/${P}-cmake-cxx.patch
+	)
+fi
+
+DESCRIPTION="Userspace access to FTDI USB interface chips"
+HOMEPAGE="https://www.intra2net.com/en/developer/libftdi/"
+
+LICENSE="LGPL-2"
+SLOT="1"
+IUSE="cxx doc examples python test tools"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	virtual/libusb:1
+	cxx? ( dev-libs/boost )
+	python? ( ${PYTHON_DEPS} )
+	tools? ( dev-libs/confuse:= )
+"
+DEPEND="${RDEPEND}
+	test? ( dev-libs/boost )
+"
+BDEPEND="
+	doc? ( app-doc/doxygen )
+	python? ( dev-lang/swig )
+"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DFTDIPP=$(usex cxx)
+		-DDOCUMENTATION=$(usex doc)
+		-DEXAMPLES=$(usex examples)
+		-DPYTHON_BINDINGS=$(usex python)
+		-DBUILD_TESTS=$(usex test)
+		-DFTDI_EEPROM=$(usex tools)
+		-DCMAKE_SKIP_BUILD_RPATH=ON
+		-DSTATICLIBS=OFF
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	cd "${BUILD_DIR}/test" || die
+	LD_LIBRARY_PATH="${BUILD_DIR}/src" ./test_libftdi1 -l all || die
+}
+
+src_install() {
+	cmake_src_install
+
+	use python && python_optimize
+	dodoc AUTHORS ChangeLog README TODO
+
+	if use doc ; then
+		# Clean up man pages with too generic names. #356369
+		rm -vf "${BUILD_DIR}"/doc/man/man3/_* || die
+
+		doman "${BUILD_DIR}"/doc/man/man3/*
+		dodoc -r "${BUILD_DIR}"/doc/html
+	fi
+
+	if use examples ; then
+		docinto examples
+		dodoc examples/*.c
+	fi
+}
diff --git a/dev-embedded/libftdi/libftdi-9999.ebuild b/dev-embedded/libftdi/libftdi-9999.ebuild
index 52d409b5cacd..263ee7edc9ea 100644
--- a/dev-embedded/libftdi/libftdi-9999.ebuild
+++ b/dev-embedded/libftdi/libftdi-9999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 inherit cmake python-single-r1
 
 MY_P="${PN}1-${PV}"
@@ -14,7 +14,12 @@ else
 	SRC_URI="https://www.intra2net.com/en/developer/${PN}/download/${MY_P}.tar.bz2"
 	S="${WORKDIR}/${MY_P}"
 
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+	PATCHES=(
+		"${FILESDIR}"/${P}-tests-no-cxx.patch
+		"${FILESDIR}"/${P}-cmake-cxx.patch
+	)
 fi
 
 DESCRIPTION="Userspace access to FTDI USB interface chips"
@@ -26,20 +31,19 @@ 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
 	cxx? ( dev-libs/boost )
 	python? ( ${PYTHON_DEPS} )
-	tools? (
-		!<dev-embedded/ftdi_eeprom-1.0
-		dev-libs/confuse:=
-	)"
+	tools? ( dev-libs/confuse:= )
+"
 DEPEND="${RDEPEND}
 	test? ( dev-libs/boost )
 "
+BDEPEND="
+	doc? ( app-doc/doxygen )
+	python? ( dev-lang/swig )
+"
 
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
@@ -71,7 +75,7 @@ src_install() {
 	dodoc AUTHORS ChangeLog README TODO
 
 	if use doc ; then
-		# Clean up crap man pages. #356369
+		# Clean up man pages with too generic names. #356369
 		rm -vf "${BUILD_DIR}"/doc/man/man3/_* || die
 
 		doman "${BUILD_DIR}"/doc/man/man3/*