gentoo resync : 12.05.2022

4 files changed, 3 insertions, 174 deletions

diff --git a/dev-embedded/libftdi/Manifest b/dev-embedded/libftdi/Manifest
index 0982df92150a..eb16bef312af 100644
--- a/dev-embedded/libftdi/Manifest
+++ b/dev-embedded/libftdi/Manifest
@@ -3,11 +3,8 @@ AUX libftdi-0.20-cmake-version.patch 1010 BLAKE2B cd88bc50cebb22a5e982d8f7985014
 AUX libftdi-1.5-cmake-cxx.patch 1448 BLAKE2B f43c592cc17481e21dc1b0fe4a4cf583c3b2f192197133443f90dc1f9bd134fe903598dc9d12f92a8376bcd58f4cb698b9bd34ff4c06cf2df180260d2456126c SHA512 9881153611aa75dcc53f739bd510898f55d9fc56a07cec41e09fed37768c462663160d8491f7eaaa5dd7bc8935d36f33379d3529cfe355a3391507415a9e7cae
 AUX libftdi-1.5-tests-no-cxx.patch 1017 BLAKE2B ff3e05ae2cc48a023c74142f986159f68b6a3e49ccf9684c94b4de2fd03c8d5c53e600810d1e8933e09ed7aa167fab15101344a6bdc8b9e00647f2c86801f694 SHA512 6d0fa3923f8f1e92b22538448368016db24d194b886c4702731eb5038b65c8a03773cfe0a02459cf040574845ab482fb676f01a97f26d5c48065fd9427a11eeb
 DIST libftdi-0.20.tar.gz 423570 BLAKE2B f0aa420a704e18c4257b99a4593dbaf46a15806d980b24909fe8678b36e74b568cd5915db1e14f8b904541334fbf3d18f069dc479a0bf66b2ea8e113611cb82b SHA512 540e5eb201a65936c3dbabff70c251deba1615874b11ff27c5ca16c39d71c150cf61758a68b541135a444fe32ab403b0fba0daf55c587647aaf9b3f400f1dee7
-DIST libftdi1-1.4.tar.bz2 109521 BLAKE2B 4186342afb2a0118c454230a925ccff2ed0aedd942cdd3afb1ac59519f1cd48db7f04421ecdb5aa6e53993666a903de00ce447fd81d00839806f8cc0d34c6e52 SHA512 dbab74f7bc35ca835b9c6dd5b70a64816948d65da1f73a9ece37a0f0f630bd0df1a676543acc517b02a718bc34ba4f7a30cbc48b6eed1c154c917f8ef0a358fc
 DIST libftdi1-1.5.tar.bz2 116297 BLAKE2B 460ab93026e14a452e31fcc6930d305638fdc0ed06cb44fb9d50ad8f80199b17057d2f48a27b8295b43b956934289c872a2ef1ddb7f93fa93c6816511ef7607d SHA512 c525b2ab6aff9ef9254971ae7d57f3549a36a36875765c48f947d52532814a2a004de1232389d4fe824a8c8ab84277b08427308573476e1da9b7db83db802f6f
-EBUILD libftdi-0.20-r1.ebuild 1865 BLAKE2B d8ab414f3cb68b292a278e255539a0d9405f28cec65f9e2dd987977546e165c755ef016bf73cc82f8d3902af8ebdcf96b7f7249f1522a2070f06ce413ea1f30e SHA512 7fb88f7af1926878f39bada106db0027bde6e664b858be06eb76021b7e5ae497e6bd708f0c47a4eee0c966cc9810384312e3f365095b2d2de0016c611b5c7a0a
-EBUILD libftdi-1.4-r1.ebuild 1670 BLAKE2B ea9034c38431f1fae4f2c9dbbeba20fb2f6d32c4d4647478e0db36e312df74a5c5345b9deaf11b6ac63a314d56cadd0c91c0405f98a8aae5a98c2871f2d3248a SHA512 f9db8c7b9684a31d5f4aab93bad3554923ca163773e5cdec69207f358431e5f4234860ba1326723b4d4e083eed03fcf7758febc60c93b5d3682218aa6e5aed8f
-EBUILD libftdi-1.5-r2.ebuild 2114 BLAKE2B dbf8580b54472c409190380262a20411ce7ffa5240378658822e4a6f775d34324af8295487363c06d460d8fb492860b2c58ef6d5cdf0277f82f2e95e212e9c5c SHA512 06e30bf4d68716f18573c4ed2797252dba1cb7bea1341b4541e94477d1e80d3d1afbc5df42455b8c908b7511bf1f3235673a37085f7ec3d6db971c2fcd48e6e6
+EBUILD libftdi-0.20-r1.ebuild 1865 BLAKE2B 4f05cfeed6c13b4f5c8e28a084aed8066ade89c9540eafdc985b92b3e0d130547760695e1beab9420d1f1eda701c40c59e548e91b4898d69eac835d7b883326d SHA512 01c49655a48494976bdda22045a22ed8c3d3ae6747cfb3ef9a040e032925f3e3a4f4d4fd36de80db226d7c9fab43711e2ec4eb71c03a2ee5c8371fb45ac9fbfe
 EBUILD libftdi-1.5-r3.ebuild 2159 BLAKE2B 37f16150cdfbd9062e68159db7ba60b349aaac2a528114c3fd021ef0fed9ab2607a38818796ff984ef6dc8f30154ecbe281200f53ac835812f4ff7653255547a SHA512 01ee27b0c73e71c7cffb2e939415563265717784e596f111b7a5e7d35eb78cb5d06a0ffe4c574b1e53217f2c35d3c24746172f128fff876709439c60321f5057
 EBUILD libftdi-9999.ebuild 2071 BLAKE2B dfc52ea7939a177867d14e6ad201ecc1432696018e79342b1ea1ede35985aa9d0a0a19ec14db8bc80f5f20df8f9e503e24cc2c207a336d2658bce4e8998d7e07 SHA512 f1d12721f6a0c1757ee96782c114a7de4af502a46b039ba04ddb1c5d071d776ef92da39d4d6337cd4ae2818457baf32f2bdc3400936ef0ae18539de21258fffb
 MISC metadata.xml 318 BLAKE2B c2c9ab83d57a082ed6608367f53f0f9420056c909d4ee50641da5b8f12b6a6ca996740fbdcadb0fa08460cb0cbef36dbedfaaf98acaea3eeeeee6afcf7724f54 SHA512 313b5c5dfcf5feb7dc8e41c1cb74939619451cb0747c1a281c9a0e763d26e0850a43e05d8fd2a836389bd75c2a4f153b80986e11be8171e9d93ca234f9df05f2
diff --git a/dev-embedded/libftdi/libftdi-0.20-r1.ebuild b/dev-embedded/libftdi/libftdi-0.20-r1.ebuild
index ebf844aaa8c5..c12bf68d6ff9 100644
--- a/dev-embedded/libftdi/libftdi-0.20-r1.ebuild
+++ b/dev-embedded/libftdi/libftdi-0.20-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit cmake python-single-r1
 
 if [[ ${PV} == 9999* ]] ; then
diff --git a/dev-embedded/libftdi/libftdi-1.4-r1.ebuild b/dev-embedded/libftdi/libftdi-1.4-r1.ebuild
deleted file mode 100644
index 9a39562ff955..000000000000
--- a/dev-embedded/libftdi/libftdi-1.4-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-inherit cmake python-single-r1
-
-if [[ ${PV} == 9999* ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="git://developer.intra2net.com/${PN}"
-else
-	MY_P="${PN}1-${PV}"
-	SRC_URI="https://www.intra2net.com/en/developer/${PN}/download/${MY_P}.tar.bz2"
-	KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 sparc x86"
-	S=${WORKDIR}/${MY_P}
-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-embedded/ftdi_eeprom-1.0
-		dev-libs/confuse:=
-	)"
-DEPEND="${RDEPEND}"
-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)
-		-DSTATICLIBS=OFF
-		-DCMAKE_SKIP_BUILD_RPATH=ON
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	use python && python_optimize
-	dodoc AUTHORS ChangeLog README TODO
-
-	if use doc ; then
-		# Clean up crap man pages. #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-1.5-r2.ebuild b/dev-embedded/libftdi/libftdi-1.5-r2.ebuild
deleted file mode 100644
index e2753eafd084..000000000000
--- a/dev-embedded/libftdi/libftdi-1.5-r2.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-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"
-	KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 sparc x86"
-fi
-
-DESCRIPTION="Userspace access to FTDI USB interface chips"
-HOMEPAGE="https://www.intra2net.com/en/developer/libftdi/"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="LGPL-2"
-SLOT="1"
-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:=
-	)"
-DEPEND="${RDEPEND}
-	test? ( dev-libs/boost )
-"
-
-PATCHES=( "${FILESDIR}"/${P}-tests-no-cxx.patch )
-
-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
-
-	# Fix up pkgconfig files
-	# bug #766818
-	if use cxx ; then
-		sed -i -e "s/libftdipp1/libftdi1/" "${ED}"/usr/$(get_libdir)/pkgconfig/libftdi1.pc || die
-		sed -i -e "s/libftdi1/libftdipp1/" "${ED}"/usr/$(get_libdir)/pkgconfig/libftdipp1.pc || die
-	fi
-
-	use python && python_optimize
-	dodoc AUTHORS ChangeLog README TODO
-
-	if use doc ; then
-		# Clean up crap man pages. #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
-}