gentoo auto-resync : 06:08:2023 - 15:22:56

9 files changed, 197 insertions, 57 deletions

diff --git a/dev-embedded/Manifest.gz b/dev-embedded/Manifest.gz
index aaf2587e56de..91a0a4bd1ad1 100644
--- a/dev-embedded/Manifest.gz
+++ b/dev-embedded/Manifest.gz
diff --git a/dev-embedded/libftd2xx/Manifest b/dev-embedded/libftd2xx/Manifest
index b1cbaa4de700..9fca754d51b3 100644
--- a/dev-embedded/libftd2xx/Manifest
+++ b/dev-embedded/libftd2xx/Manifest
@@ -1,5 +1,5 @@
-DIST libftd2xx-arm-v6-hf-1.4.8.tar.gz 882724 BLAKE2B 4ffe647272467698cfe10a2ef201f8adb4bc991df517945ee8f057a07e55c4804bc4d541b6e2bd523fc4f6375b0a28ae7241fdafaed9eae61739d83d0327540a SHA512 bd07f57f9a75c2195aaf71ed1c229e04256a9c9a59f3d2e8f2111bef8a1c58c05457b5d04d7a8f77f9daf076ce3f0b77e317ff1cedce4e3cd4146422cd5cf634
-DIST libftd2xx-i386-1.4.8.tar.gz 891331 BLAKE2B 742be8418ac598b0c4b6b1e4be99a57c85e70310c2a15936dba3a765b0168eac37a080619ed92816a96f93106f96b812545d1cf212f5d6d32b03e5100870f6a7 SHA512 d66415b9ecdc2b38370c2c6b97e5d14c3891910ceaf5aee2740b2e893891c4f2ebf395960748d55508f4b63edd3d829d9c0020898c1b83b453496d18b4a85528
-DIST libftd2xx-x86_64-1.4.8.tar.gz 898269 BLAKE2B e491b58f66ec64014511469e7eb0a628e799ffa4cc52cb94ca66c082dbc56793e3435a80bde7433ce1bea96eea1a52461606ce78a9b2e447f3f9c5a7faef1f1b SHA512 b738b764bcebb5f93f5a968b266547b8775cbc72df8587bfcf67591ce95557b6a43dce2f5dbd9de451f8c9421ec41c25c8fb9bed37b76aec4cd5bac854d4af06
-EBUILD libftd2xx-1.4.8.ebuild 1218 BLAKE2B d727b3744f6c07d15a26757a473b685bf7eb07f14424b390fc696935f9f0e8694ea9aa72012806c8d678d15be82355ca6940a39b5cd6d98af9fca7435c96619f SHA512 a3914df0e03b47f7b79012d1460d185e582bd0fbe83500d5d316590bb8a18174e2227054e31c867f384b5ef15da45cb7374405f9366b3f2b4b1f7d3a9ed7bb80
-MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
+DIST libftd2xx-arm-v6-hf-1.4.27.tar.gz 629185 BLAKE2B 31a94f0bfb5fd66c603a1074ac8286f44a35155f77deab4b9f71485249073faa8a2ff4b448baab6153ea9d84e2f89b45629cb8e738e14f066bc847fc0f476b68 SHA512 80ad93a90e4a112f8a58267c9ff80e5483a45d60869eb02fa82a56b452a860ef68f2086ccb51f71a5f4d5b4dbbf30a85a6aac82a7a27b5337b9693535184387b
+DIST libftd2xx-x86_32-1.4.27.tar.gz 645954 BLAKE2B 11c4268f6a5d73609a596fcdf04844a4de1c1647aa713a0aa78fb794d81101020cf06a26e86a72e5aeac68be9133a32fc0b827b644c844a3c1b8e03a8da53e08 SHA512 22623d49eca62d6aebe1c9b1cdd2c74e121983518e5e0a331bbc2375788b19967c9ceb2699ca07b9805930e317172cdfae5c37fba118060a96a2d86f0a19752b
+DIST libftd2xx-x86_64-1.4.27.tar.gz 649157 BLAKE2B 7751002bb5920aa3746b92d5349b93e1c2c205f2c2cf46e73c13a823ce846067adeb07d0416a1b606f9554a703290297e205d30ea3db7e60a1b1189dca963246 SHA512 1eccbd69cd29716c1024f46564fa2c8f4a21795fd432448fed156b55c1f0ad5fc5c869ebd450e82774b65ce96a27f5f34843036c6843f57b083043139aabd38d
+EBUILD libftd2xx-1.4.27.ebuild 1126 BLAKE2B c7714fe55b06af0cc647d922d295bf8a1dee437cb7c27ec4aefe203e46db16a0c085ad54495ceba92ea603f28842ee502a808994548d9cc31e6ae2f390cd565d SHA512 ef8471da560b81bb971d81355de176e1e5fe62f2e6d59b38987921ed1e2f306629f773f2ab27b070aaf36be02a991c76c81beaa4e25f7bacbc389961b68b358a
+MISC metadata.xml 486 BLAKE2B 902eaabb16b4155ae2c7b985c83619fb2522fa4bfce6c5ced959533443c03fc959a72aa5920b1a3ca63f1ad448bf95825436bd121a2bf8480a1327932c6a5ddc SHA512 27610790bc68bff5373ac240a472897e333a39bb36027f8c9537ca22ca01ee1df85fa9accc2ef1f17e106df0c1da37d73f9364c071c0c8c5c2f9c487943d213c
diff --git a/dev-embedded/libftd2xx/libftd2xx-1.4.27.ebuild b/dev-embedded/libftd2xx/libftd2xx-1.4.27.ebuild
new file mode 100644
index 000000000000..3a51e746efc3
--- /dev/null
+++ b/dev-embedded/libftd2xx/libftd2xx-1.4.27.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Library that allows a direct access to a USB device"
+HOMEPAGE="https://ftdichip.com/drivers/d2xx-drivers/"
+# NOTE: We could include other arm versions here too.
+SRC_URI="
+	amd64? ( https://ftdichip.com/wp-content/uploads/2022/07/${PN}-x86_64-${PV}.tgz -> ${PN}-x86_64-${PV}.tar.gz )
+	arm? ( https://ftdichip.com/wp-content/uploads/2022/07/${PN}-arm-v6-hf-${PV}.tgz -> ${PN}-arm-v6-hf-${PV}.tar.gz )
+	x86? ( https://ftdichip.com/wp-content/uploads/2022/07/${PN}-x86_32-${PV}.tgz -> ${PN}-x86_32-${PV}.tar.gz )
+"
+S="${WORKDIR}"
+
+LICENSE="FTDI LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="examples"
+
+QA_PREBUILT="*"
+
+src_install() {
+	cd release/build || die
+
+	dolib.so ${PN}.so.${PV}
+	dosym ${PN}.so.${PV} /usr/$(get_libdir)/${PN}.so.${PV:0:1}
+	dosym ${PN}.so.${PV:0:1} /usr/$(get_libdir)/${PN}.so
+	insinto /usr/include
+	doins "${S}"/release/ftd2xx.h "${S}"/release/WinTypes.h
+
+	if use examples ; then
+		docinto sample
+		dodoc -r "${S}"/release/examples
+	fi
+
+	dodoc "${S}"/release/ReadMe.txt
+}
diff --git a/dev-embedded/libftd2xx/libftd2xx-1.4.8.ebuild b/dev-embedded/libftd2xx/libftd2xx-1.4.8.ebuild
deleted file mode 100644
index 7cc07d14af95..000000000000
--- a/dev-embedded/libftd2xx/libftd2xx-1.4.8.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Library that allows a direct access to a USB device"
-HOMEPAGE="https://www.ftdichip.com/drivers/d2xx-drivers/"
-# NOTE: We could include other arm versions here too.
-SRC_URI="
-	amd64? ( https://www.ftdichip.com/Drivers/D2XX/Linux/${PN}-x86_64-${PV}.gz -> ${PN}-x86_64-${PV}.tar.gz )
-	arm? ( https://www.ftdichip.com/Drivers/D2XX/Linux/${PN}-arm-v6-hf-${PV}.gz -> ${PN}-arm-v6-hf-${PV}.tar.gz )
-	x86? ( https://www.ftdichip.com/Drivers/D2XX/Linux/${PN}-i386-${PV}.gz -> ${PN}-i386-${PV}.tar.gz )
-"
-S="${WORKDIR}"
-
-LICENSE="FTDI LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="examples"
-
-QA_PREBUILT="*"
-
-src_install() {
-	cd release/build || die
-
-	into /opt
-	dolib.so ${PN}.so.${PV}
-	dosym ${PN}.so.${PV} /opt/$(get_libdir)/${PN}.so.${PV:0:1}
-	dosym ${PN}.so.${PV:0:1} /opt/$(get_libdir)/${PN}.so
-	insinto /usr/include
-	doins "${S}"/release/ftd2xx.h "${S}"/release/WinTypes.h
-
-	dodir /etc/env.d
-	echo "LDPATH=\"/opt/$(get_libdir)\"" > "${ED}"/etc/env.d/50libftd2xx || die
-
-	if use examples ; then
-		docinto sample
-		dodoc -r "${S}"/release/examples
-	fi
-
-	dodoc "${S}"/release/ReadMe.txt
-}
diff --git a/dev-embedded/libftd2xx/metadata.xml b/dev-embedded/libftd2xx/metadata.xml
index 85e4ed814fa2..d17e45aea3d5 100644
--- a/dev-embedded/libftd2xx/metadata.xml
+++ b/dev-embedded/libftd2xx/metadata.xml
@@ -1,5 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<maintainer type="person" proxied="yes">
+		<email>vowstar@gmail.com</email>
+		<name>Huang Rui</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>embedded@gentoo.org</email>
+		<name>Embedded Gentoo</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-embedded/urjtag/Manifest b/dev-embedded/urjtag/Manifest
index 57b6a758623b..3c525f56fda8 100644
--- a/dev-embedded/urjtag/Manifest
+++ b/dev-embedded/urjtag/Manifest
@@ -1,4 +1,7 @@
+AUX urjtag-2021.03-fix-python-setup.patch 598 BLAKE2B 9c466950fb3dad58c1eeb0b781f8dc2217fd6d44446d8592a35ac70f5edc755e543f63e895f07f9fac004e522a2d15ff4d8fdbfdf42b71487ffd8cec251cf644 SHA512 5be37a5313ae26adf38fbe33518f3b4412e6b7a9709d04a98a7055d05b3515c643f2a9967c6b43faf0ffd69dae89d74c2900ae3bcd95198153a0a649763c2226
 DIST urjtag-2019.12.tar.xz 1208432 BLAKE2B 69963cbd39dcbec1abd73778fc6e98d743e36f6d4a17ba673b8691598ac0d4cec97e8b9c79068ad8971e6e07de81553bfd3bf5f684515b4a19303dd95ed477a2 SHA512 e149e53410a6591bdadc2c0138c6f81dac0fd6e35601461e19d356decdb820ec8e6bd53d59a1fd9781dfa1fee88d23dcafbd8df9adc0f8e51256c626d2ee0f36
+DIST urjtag-2021.03.tar.xz 1208440 BLAKE2B 68d0f0ec15c25ef351e0523eea21c18e723871032a046d31c031809a2774b0b8339b0b5d1a6f11a681ab3d3074b7f5f4fcd819fa7de1fdcac5f20ab39c6a40dd SHA512 baf203e556d1d41437539d3f5c018b35fbb496f71391c2bec2786ffa47bff33d38654b3e7d106e38bcf36d075d86fc02b18eaaf634cdb65e2840ff50ca0da8b2
 EBUILD urjtag-2019.12.ebuild 1148 BLAKE2B 3f210baaa90c97bea2c2de5f3088cf55e005871a19a0f7cee62293f4c4dcea51c24a106633fb8638874183f9563965b4b14afcf4130be11f9e73032fa33a9294 SHA512 62b506b74a8ad33eb2ce39342079e4f734ced5ef20a8e31553340def5533900e9b091e949ba85f9ac3852effd21b9ceb81233b18339b298e59d270ab2d1e8d23
-EBUILD urjtag-9999.ebuild 1082 BLAKE2B 607bfe0c6ca0b8191e20d4f24c12251f27426adb16610c4f7009282759820e735577360f6312b1516a3227cb18732c318c2fc22205409355030ca98b722cca57 SHA512 5eb18ffb9eb0933b86f44b4ab67c8dc32dd5be0f0a62ee956e143d753fb46edff04badba7051ff516ad3bfc51e00f51a81ced285af81171b5d7ba47d0195a669
+EBUILD urjtag-2021.03.ebuild 1698 BLAKE2B aecea688ff1bf9e24885f3a23c1ee79e7581158ca3bcd18e64ec270f1adefc5e9ea5604de41a0fabc0a34abb70bead2ce45ed50f672730346219550296d9c36a SHA512 98b64310e34b26584e7ca9db1abddc4f762123c619c905bf5a64a92a6a2d712a6dbdfef0940c1f29248dd209398a34ffda6c435b78167aa5c354c7f375011b7a
+EBUILD urjtag-9999.ebuild 1698 BLAKE2B aecea688ff1bf9e24885f3a23c1ee79e7581158ca3bcd18e64ec270f1adefc5e9ea5604de41a0fabc0a34abb70bead2ce45ed50f672730346219550296d9c36a SHA512 98b64310e34b26584e7ca9db1abddc4f762123c619c905bf5a64a92a6a2d712a6dbdfef0940c1f29248dd209398a34ffda6c435b78167aa5c354c7f375011b7a
 MISC metadata.xml 541 BLAKE2B d55c3fb90be36d6e3f26aeff7e82f1a62cf0cedbf5b7260674b33fcf6269fa758c5012d106db60fa69cc9f7ae6b1f62290814948231c7339b3699700ba4cde88 SHA512 4c88c663470a1c04f6d94a28ddaf16f69d6fdc4c660a58c0e2d7daac5b92f9c8639e1287c2ca314d943bf1fd8409ea7aab3dedbf51439ffbeb7324db0662c73e
diff --git a/dev-embedded/urjtag/files/urjtag-2021.03-fix-python-setup.patch b/dev-embedded/urjtag/files/urjtag-2021.03-fix-python-setup.patch
new file mode 100644
index 000000000000..c6206fefee2e
--- /dev/null
+++ b/dev-embedded/urjtag/files/urjtag-2021.03-fix-python-setup.patch
@@ -0,0 +1,14 @@
+Subject: [PATCH] python: replace distutils with setuptools
+
+distutils is deprecated for sometime and it was removed in python 3.12.
+
+--- a/bindings/python/setup.py.in	2018-03-24 20:27:41.000000000 +0800
++++ b/bindings/python/setup.py.in	2023-08-06 10:31:12.932358441 +0800
+@@ -1,6 +1,6 @@
+ # python extension setup script for urjtag
+ 
+-from distutils.core import setup, Extension
++from setuptools import setup, Extension
+ 
+ libraries = ['urjtag']
+ libraries.extend( w.replace('-l', '') for w in "@LIBFTDI_LIBS@ @FTD2XXLIB@ @LIBUSB_LIBS@ @LIBINTL@".split() if w.replace('-l', '') not in libraries )
diff --git a/dev-embedded/urjtag/urjtag-2021.03.ebuild b/dev-embedded/urjtag/urjtag-2021.03.ebuild
new file mode 100644
index 000000000000..031c9e8c7232
--- /dev/null
+++ b/dev-embedded/urjtag/urjtag-2021.03.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit python-r1
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://git.code.sf.net/p/urjtag/git"
+	inherit git-r3 autotools
+	S="${WORKDIR}/${P}/${PN}"
+else
+	SRC_URI="mirror://sourceforge/urjtag/${P}.tar.xz"
+	KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+fi
+
+DESCRIPTION="Tool for communicating over JTAG with flash chips, CPUs, and many more"
+HOMEPAGE="https://urjtag.sourceforge.net/"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="ftdi ftd2xx python readline usb"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+DEPEND="ftdi? ( dev-embedded/libftdi:1 )
+	ftd2xx? ( dev-embedded/libftd2xx )
+	python? ( ${PYTHON_DEPS} )
+	readline? ( sys-libs/readline:= )
+	usb? ( virtual/libusb:1 )"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	python? ( dev-python/setuptools[${PYTHON_USEDEP}] )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2021.03-fix-python-setup.patch"
+)
+
+src_prepare() {
+	default
+
+	if [[ ${PV} == "9999" ]] ; then
+		mkdir -p m4 || die
+		eautopoint
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	econf \
+		--disable-werror \
+		--disable-python \
+		$(use_with readline) \
+		$(use_with ftdi libftdi) \
+		$(use_with ftd2xx) \
+		$(use_with usb libusb 1.0)
+}
+
+src_compile() {
+	use python && python_copy_sources
+
+	emake
+}
+
+src_install() {
+	default
+
+	if use python; then
+		installation() {
+			cd bindings/python || die
+			ln -s "${S}"/src/.libs ../../src/.libs || die
+			"${EPYTHON}" setup.py install \
+				--root="${D}" \
+				--prefix="${EPREFIX}/usr" || die
+		}
+		python_foreach_impl run_in_build_dir installation
+		python_foreach_impl python_optimize
+	fi
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-embedded/urjtag/urjtag-9999.ebuild b/dev-embedded/urjtag/urjtag-9999.ebuild
index 290a76a683c9..031c9e8c7232 100644
--- a/dev-embedded/urjtag/urjtag-9999.ebuild
+++ b/dev-embedded/urjtag/urjtag-9999.ebuild
@@ -1,7 +1,11 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit python-r1
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://git.code.sf.net/p/urjtag/git"
@@ -17,14 +21,23 @@ HOMEPAGE="https://urjtag.sourceforge.net/"
 
 LICENSE="GPL-2"
 SLOT="0"
-# TODO: Figure out if anyone wants the Python bindings
-IUSE="ftdi readline usb"
+
+IUSE="ftdi ftd2xx python readline usb"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 DEPEND="ftdi? ( dev-embedded/libftdi:1 )
+	ftd2xx? ( dev-embedded/libftd2xx )
+	python? ( ${PYTHON_DEPS} )
 	readline? ( sys-libs/readline:= )
 	usb? ( virtual/libusb:1 )"
-RDEPEND="${DEPEND}
-	!dev-embedded/jtag"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	python? ( dev-python/setuptools[${PYTHON_USEDEP}] )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2021.03-fix-python-setup.patch"
+)
 
 src_prepare() {
 	default
@@ -37,16 +50,35 @@ src_prepare() {
 }
 
 src_configure() {
-	use readline || export vl_cv_lib_readline=no
-
 	econf \
 		--disable-werror \
 		--disable-python \
+		$(use_with readline) \
 		$(use_with ftdi libftdi) \
-		$(use_with usb libusb)
+		$(use_with ftd2xx) \
+		$(use_with usb libusb 1.0)
+}
+
+src_compile() {
+	use python && python_copy_sources
+
+	emake
 }
 
 src_install() {
 	default
+
+	if use python; then
+		installation() {
+			cd bindings/python || die
+			ln -s "${S}"/src/.libs ../../src/.libs || die
+			"${EPYTHON}" setup.py install \
+				--root="${D}" \
+				--prefix="${EPREFIX}/usr" || die
+		}
+		python_foreach_impl run_in_build_dir installation
+		python_foreach_impl python_optimize
+	fi
+
 	find "${ED}" -name '*.la' -delete || die
 }