From e80777b54c5b430ca044e16878f59a2020423d48 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Thu, 10 Nov 2022 09:27:33 +0000
Subject: gentoo auto-resync : 10:11:2022 - 09:27:33

---
 dev-embedded/Manifest.gz                   | Bin 9209 -> 9209 bytes
 dev-embedded/libftdi/Manifest              |   4 +-
 dev-embedded/libftdi/libftdi-1.5-r3.ebuild |  96 -----------------------------
 dev-embedded/libftdi/libftdi-1.5-r4.ebuild |  90 +++++++++++++++++++++++++++
 dev-embedded/libftdi/libftdi-9999.ebuild   |  14 ++---
 5 files changed, 96 insertions(+), 108 deletions(-)
 delete mode 100644 dev-embedded/libftdi/libftdi-1.5-r3.ebuild
 create mode 100644 dev-embedded/libftdi/libftdi-1.5-r4.ebuild

(limited to 'dev-embedded')

diff --git a/dev-embedded/Manifest.gz b/dev-embedded/Manifest.gz
index 4612e40d1a58..e74e6245f246 100644
Binary files a/dev-embedded/Manifest.gz and b/dev-embedded/Manifest.gz differ
diff --git a/dev-embedded/libftdi/Manifest b/dev-embedded/libftdi/Manifest
index eb16bef312af..70dd5e2e38fd 100644
--- a/dev-embedded/libftdi/Manifest
+++ b/dev-embedded/libftdi/Manifest
@@ -5,6 +5,6 @@ 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 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
+EBUILD libftdi-1.5-r4.ebuild 1910 BLAKE2B 2c12c3d063368833363249cb01e5e78e11509f9f325e29aaa6bdac63c39215cd4aaf1abf9f3dfcb0811bb553b4d11833a5acc88c2eba2c199a61b08640aa235e SHA512 a12bbb908a8a0c02ef204bc325e2f26f4fedc6e813dab7bacd80b4aac5493aba93b06c464662033aeda1248a165c49ea4adbda4b0147ccd4969c99b071a7f995
+EBUILD libftdi-9999.ebuild 1829 BLAKE2B 4a413ebc6e38e4ba393791f1d2d0ab17f13e2c15a105aeec4f8ac1c4dc01c9b9a7770874eb69caeae4a2b38f825386bf354ebc18f05f48b9b2c771da327f1f01 SHA512 4447f8d14a48df19f3197585efa49158f56f062e327769dc242db8758a721648135c0be717472e2d03c833006803a873c985ab95361a1601d7d524c2c00a0b8c
 MISC metadata.xml 318 BLAKE2B c2c9ab83d57a082ed6608367f53f0f9420056c909d4ee50641da5b8f12b6a6ca996740fbdcadb0fa08460cb0cbef36dbedfaaf98acaea3eeeeee6afcf7724f54 SHA512 313b5c5dfcf5feb7dc8e41c1cb74939619451cb0747c1a281c9a0e763d26e0850a43e05d8fd2a836389bd75c2a4f153b80986e11be8171e9d93ca234f9df05f2
diff --git a/dev-embedded/libftdi/libftdi-1.5-r3.ebuild b/dev-embedded/libftdi/libftdi-1.5-r3.ebuild
deleted file mode 100644
index e9ceec3285f5..000000000000
--- a/dev-embedded/libftdi/libftdi-1.5-r3.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-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 ~riscv 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
-	"${FILESDIR}"/${P}-cmake-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
-}
diff --git a/dev-embedded/libftdi/libftdi-1.5-r4.ebuild b/dev-embedded/libftdi/libftdi-1.5-r4.ebuild
new file mode 100644
index 000000000000..aff84e7671eb
--- /dev/null
+++ b/dev-embedded/libftdi/libftdi-1.5-r4.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+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 ~mips 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="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
+	"${FILESDIR}"/${P}-cmake-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
+
+	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-9999.ebuild b/dev-embedded/libftdi/libftdi-9999.ebuild
index 36487c2e0df9..e59e64110b94 100644
--- a/dev-embedded/libftdi/libftdi-9999.ebuild
+++ b/dev-embedded/libftdi/libftdi-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit cmake python-single-r1
 
 MY_P="${PN}1-${PV}"
@@ -12,12 +12,13 @@ if [[ ${PV} == 9999* ]] ; then
 	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"
+	S="${WORKDIR}/${MY_P}"
+
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~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"
@@ -66,13 +67,6 @@ src_test() {
 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
 
-- 
cgit v1.2.3