gentoo auto-resync : 22:09:2024 - 14:47:12

3 files changed, 73 insertions, 10 deletions

diff --git a/sys-apps/dtc/Manifest b/sys-apps/dtc/Manifest
index cf68f2624192..a2e347a525fc 100644
--- a/sys-apps/dtc/Manifest
+++ b/sys-apps/dtc/Manifest
@@ -3,7 +3,9 @@ AUX dtc-1.7.0-meson-tests.patch 1265 BLAKE2B f121b676e2f711e6be75ff4f2c7a077b7e9
 AUX fix-tests-for-Python3.12.patch 1914 BLAKE2B bdb612e1aa3d42a6d17bf1663f40cec2ebc2222ebedcd67bcb6f20c4cdb389f9cc0c4f7513d56de659996f76d0311551dc0e513612cdd7cc367126ca26398de7 SHA512 2fc10469b4c1f5016cdccd1a1e24d1f0984267c88efe88d268d52d9a49c441d832f53bf004a5223810c82e0f10cf5b515d6a6ddb56e49ca5bb86b55724634f0b
 DIST dtc-1.6.0.tar.xz 158584 BLAKE2B 47b15b5df7f5d87369d6daaad87f2989a80865f2fab19f89d050d390a9f8319bcd86a36e12f7cc8d62947bb4d1335769071d0e3ea0a6e16861aea163e78f4696 SHA512 15433b24f1d6b7ed1f8066d050bd1bcbf988731aa38147564e3dd04b5f69af8d69e03befdc621a768526c620425a9bdd24aad4f9ff135930d6a1eeb0625f7de3
 DIST dtc-1.7.0.tar.xz 165548 BLAKE2B de433a1034b7ef75559bf39f85695d0b275cfd17bf100c12b6186e226a65659053f9b5a053f20e64a5a0670ea3e728edd0e624c26287bd264594569408065bab SHA512 d3ba6902a9a2f2cdbaff55f12fca3cfe4a1ec5779074a38e3d8b88097c7abc981835957e8ce72971e10c131e05fde0b1b961768e888ff96d89e42c75edb53afb
+DIST dtc-1.7.1.tar.xz 169524 BLAKE2B c9d9d7c60ce13c8e138ab8ddf3e8166d7cf3867ca4e5ea53621bf73514319faf6a6bac09fb96c971554db9f77dd3428e01d53990586041092a64849685d8854b SHA512 3195924b374680e367d7be6b9793691efc0441858068c8bc8d8a908db00bbae781a99184b5c5e272af39045ec58cb0f92adbdd00ff808480b635bd632aa74719
 EBUILD dtc-1.6.0.ebuild 1498 BLAKE2B 4453bd177443ef093b2b01820a05c1404d0449678d04087dd84f48c07367ce5e9bd145320e05753808fa03391305e43ee57291a79292ef96745bbc6d30bbf5ec SHA512 9320f0921b710a2a520586daf731c1bd0cc378e6313509bb995803f0f8b7f602617a10a1ebddde96978a60e18441cad3652a5c1e07afc82f6a5cc738c40db90f
 EBUILD dtc-1.7.0.ebuild 1650 BLAKE2B 11b1546968bcb4cd2d1b3919a192e901488d87a85928faf2e8716619f7165fe4cfba7fb40d5f30909c33710e6da7cfd715dc32a38d76a7e55d6a5448df2b1c38 SHA512 a09327a832bee4225d6b9872183692c2e5cc453181284bb0050e474f7f343c30c830a0b170e965ed4c3981d938e78aaf2449b30b333d5ccde4e1d763c991f250
-EBUILD dtc-9999.ebuild 1523 BLAKE2B 32f50798502404c1512e81014e743bb4db8d3fb48c359252853930d5448528bf37f174ecd0325225b064e73344f72dce3fafc467061643134320bec527836327 SHA512 f2f20d2ee1e39745b501a4be767bf77f5ff10103157305baf7fa2d9897ede00b832482c60dd9cfff8062c720ce87c0fc527624831f8f018476f73729022523c0
+EBUILD dtc-1.7.1.ebuild 1445 BLAKE2B 012b66db1ad5b5dd893702469f1a94f642eb55121d8b632fd04dec9b380bafae8265f0bd1b3cbb51fe60babdd29745c72a03d308c343979a0b2fea689101e000 SHA512 88747fa612955175018c74c22c8ca22f9f429126a9b2ec0d95598ee902cdc227d928b6ecb29f6ad45cc73cedb63a7e43fdee9bf5a29615b654eed2037c980eb1
+EBUILD dtc-9999.ebuild 1445 BLAKE2B 012b66db1ad5b5dd893702469f1a94f642eb55121d8b632fd04dec9b380bafae8265f0bd1b3cbb51fe60babdd29745c72a03d308c343979a0b2fea689101e000 SHA512 88747fa612955175018c74c22c8ca22f9f429126a9b2ec0d95598ee902cdc227d928b6ecb29f6ad45cc73cedb63a7e43fdee9bf5a29615b654eed2037c980eb1
 MISC metadata.xml 492 BLAKE2B dc331e157119b6db3bb419e04722511406295b39ee40bcae29dbbe3f8fa3737aa221c2d61b16b45b8361c1b6ffadd634ffa65377d33cc808d11a8128389bdfd0 SHA512 cf2441cf6ea1075cf633edf903a54a637cbaff2545ccd65290c1c1b3f5452ce3d74df5ce4ffe68ab15857eaea1ffeac7f3e80b42fb4dae3af1c3636e4b0766fb
diff --git a/sys-apps/dtc/dtc-1.7.1.ebuild b/sys-apps/dtc/dtc-1.7.1.ebuild
new file mode 100644
index 000000000000..6da2ddea52c2
--- /dev/null
+++ b/sys-apps/dtc/dtc-1.7.1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+inherit meson python-single-r1
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/dtc/dtc.git"
+	inherit git-r3
+else
+	SRC_URI="https://www.kernel.org/pub/software/utils/${PN}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+DESCRIPTION="Open Firmware device tree compiler"
+HOMEPAGE="https://devicetree.org/ https://git.kernel.org/cgit/utils/dtc/dtc.git/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="python static-libs test yaml"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+BDEPEND="
+	app-alternatives/yacc
+	app-alternatives/lex
+	virtual/pkgconfig
+	python? ( dev-lang/swig )
+"
+RDEPEND="
+	python? ( ${PYTHON_DEPS} )
+	yaml? ( >=dev-libs/libyaml-0.2.3 )
+"
+DEPEND="
+	${RDEPEND}
+"
+
+DOCS=(
+	Documentation/dt-object-internal.txt
+	Documentation/dts-format.txt
+	Documentation/manual.txt
+)
+
+pkg_setup() {
+	if use python ; then
+		export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+		python-single-r1_pkg_setup
+	fi
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dtools=true
+		-Dvalgrind=disabled # only used for some tests
+		$(meson_feature python)
+		$(meson_use test tests)
+		$(meson_feature yaml)
+	)
+
+	# bug #909366
+	use static-libs && emesonargs+=( -Dstatic-build=true )
+
+	meson_src_configure
+}
diff --git a/sys-apps/dtc/dtc-9999.ebuild b/sys-apps/dtc/dtc-9999.ebuild
index c58d58fb7840..6da2ddea52c2 100644
--- a/sys-apps/dtc/dtc-9999.ebuild
+++ b/sys-apps/dtc/dtc-9999.ebuild
@@ -33,7 +33,9 @@ RDEPEND="
 	python? ( ${PYTHON_DEPS} )
 	yaml? ( >=dev-libs/libyaml-0.2.3 )
 "
-DEPEND="${RDEPEND}"
+DEPEND="
+	${RDEPEND}
+"
 
 DOCS=(
 	Documentation/dt-object-internal.txt
@@ -48,19 +50,12 @@ pkg_setup() {
 	fi
 }
 
-src_prepare() {
-	default
-
-	if ! use test ; then
-		sed -i -e "/subdir('tests')/d" meson.build || die
-	fi
-}
-
 src_configure() {
 	local emesonargs=(
 		-Dtools=true
 		-Dvalgrind=disabled # only used for some tests
 		$(meson_feature python)
+		$(meson_use test tests)
 		$(meson_feature yaml)
 	)