[gentoo-commits] repo/gentoo:master commit in: sys-apps/dtc/files/, sys-apps/dtc/

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     b25d3af826ad3b3031ea9f14502a0b1a0c71f0ea
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 13 08:26:42 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Nov 11 19:25:55 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b25d3af8

sys-apps/dtc: drop 1.6.0, 1.7.0

Closes: https://bugs.gentoo.org/940100
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 sys-apps/dtc/Manifest                             |  2 -
 sys-apps/dtc/dtc-1.6.0.ebuild                     | 82 -----------------------
 sys-apps/dtc/dtc-1.7.0.ebuild                     | 77 ---------------------
 sys-apps/dtc/files/dtc-1.7.0-meson-macos.patch    | 39 -----------
 sys-apps/dtc/files/dtc-1.7.0-meson-tests.patch    | 27 --------
 sys-apps/dtc/files/fix-tests-for-Python3.12.patch | 43 ------------
 6 files changed, 270 deletions(-)

diff --git a/sys-apps/dtc/Manifest b/sys-apps/dtc/Manifest
index 3bca2a9fbccc..331bf1ab5539 100644
--- a/sys-apps/dtc/Manifest
+++ b/sys-apps/dtc/Manifest
@@ -1,3 +1 @@
-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

diff --git a/sys-apps/dtc/dtc-1.6.0.ebuild b/sys-apps/dtc/dtc-1.6.0.ebuild
deleted file mode 100644
index 5490e3ded516..000000000000
--- a/sys-apps/dtc/dtc-1.6.0.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://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="static-libs yaml"
-
-BDEPEND="
-	app-alternatives/yacc
-	app-alternatives/lex
-	virtual/pkgconfig
-"
-RDEPEND="yaml? ( dev-libs/libyaml )"
-DEPEND="${RDEPEND}"
-
-DOCS="
-	Documentation/dt-object-internal.txt
-	Documentation/dts-format.txt
-	Documentation/manual.txt
-"
-
-_emake() {
-	# valgrind is used only in 'make checkm'
-	emake \
-		NO_PYTHON=1 \
-		NO_VALGRIND=1 \
-		NO_YAML=$(usex !yaml 1 0) \
-		\
-		AR="$(tc-getAR)" \
-		CC="$(tc-getCC)" \
-		PKG_CONFIG="$(tc-getPKG_CONFIG)" \
-		\
-		V=1 \
-		\
-		PREFIX="${EPREFIX}/usr" \
-		\
-		LIBDIR="\$(PREFIX)/$(get_libdir)" \
-		\
-		"$@"
-}
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e '/^CFLAGS =/s:=:+=:' \
-		-e '/^CPPFLAGS =/s:=:+=:' \
-		-e 's:-Werror::' \
-		-e 's:-g -Os::' \
-		Makefile || die
-
-	tc-export AR CC PKG_CONFIG
-}
-
-src_compile() {
-	_emake
-}
-
-src_test() {
-	_emake check
-}
-
-src_install() {
-	_emake DESTDIR="${D}" install
-
-	use static-libs || find "${ED}" -name '*.a' -delete
-}

diff --git a/sys-apps/dtc/dtc-1.7.0.ebuild b/sys-apps/dtc/dtc-1.7.0.ebuild
deleted file mode 100644
index 664c10ab974b..000000000000
--- a/sys-apps/dtc/dtc-1.7.0.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# 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 )
-"
-DEPEND="${RDEPEND}"
-
-DOCS=(
-	Documentation/dt-object-internal.txt
-	Documentation/dts-format.txt
-	Documentation/manual.txt
-)
-
-PATCHES=(
-	"${FILESDIR}"/${P}-meson-tests.patch
-	"${FILESDIR}"/${P}-meson-macos.patch
-	"${FILESDIR}"/fix-tests-for-Python3.12.patch
-)
-
-pkg_setup() {
-	if use python ; then
-		export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-		python-single-r1_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_feature yaml)
-	)
-
-	# bug #909366
-	use static-libs && emesonargs+=( -Dstatic-build=true )
-
-	meson_src_configure
-}

diff --git a/sys-apps/dtc/files/dtc-1.7.0-meson-macos.patch b/sys-apps/dtc/files/dtc-1.7.0-meson-macos.patch
deleted file mode 100644
index 473cd9a29e1a..000000000000
--- a/sys-apps/dtc/files/dtc-1.7.0-meson-macos.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-https://git.kernel.org/pub/scm/utils/dtc/dtc.git/commit/?id=71a8b8ef0adf01af4c78c739e04533a35c1dc89c
-
-From 71a8b8ef0adf01af4c78c739e04533a35c1dc89c Mon Sep 17 00:00:00 2001
-From: Otavio Salvador <otavio@ossystems.com.br>
-Date: Wed, 31 May 2023 11:41:42 -0300
-Subject: libfdt: meson: Fix linking on macOS linker
-
--undefined error is the equivalent of --no-undefined for the macOS
-linker, but -undefined would also be understood as a valid argument for
-GNU ld so we use the supported linker variant.
-
-Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
-Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
---- a/libfdt/meson.build
-+++ b/libfdt/meson.build
-@@ -16,10 +16,20 @@ sources = files(
-   'fdt_wip.c',
- )
- 
-+link_args = []
-+if cc.has_link_argument('-Wl,--no-undefined')
-+    link_args += '-Wl,--no-undefined'
-+else
-+    # -undefined error is the equivalent of --no-undefined for the macOS linker,
-+    # but -undefined would also be understood as a valid argument for GNU ld!
-+    link_args += cc.get_supported_link_arguments('-Wl,-undefined,error')
-+endif
-+
-+link_args += version_script
- libfdt = library(
-   'fdt', sources,
-   version: '1.6.0',
--  link_args: ['-Wl,--no-undefined', version_script],
-+  link_args: link_args,
-   link_depends: 'version.lds',
-   install: true,
- )
--- 
-cgit

diff --git a/sys-apps/dtc/files/dtc-1.7.0-meson-tests.patch b/sys-apps/dtc/files/dtc-1.7.0-meson-tests.patch
deleted file mode 100644
index 0bc2d71aea1c..000000000000
--- a/sys-apps/dtc/files/dtc-1.7.0-meson-tests.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-https://git.kernel.org/pub/scm/utils/dtc/dtc.git/patch/?id=32174a66efa4ad19fc6a2a6422e4af2ae4f055cb
-
-From 32174a66efa4ad19fc6a2a6422e4af2ae4f055cb Mon Sep 17 00:00:00 2001
-From: David Gibson <david@gibson.dropbear.id.au>
-Date: Tue, 28 Feb 2023 10:33:58 +1100
-Subject: meson: Fix cell overflow tests when running from meson
-
-Because meson always builds out-of-tree we need to reference things in the
-original source tree via $SRCDIR from run_tests.sh.  We forgot a couple of
-cases for the cell overflow tests.  Fix them.
-
-Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
---- a/tests/run_tests.sh
-+++ b/tests/run_tests.sh
-@@ -519,8 +519,8 @@ libfdt_tests () {
-     check_tests "$SRCDIR/phandle-args-overflow.dts" clocks_property
- 
-     ## https://github.com/dgibson/dtc/issues/74
--    run_dtc_test -I dts -O dtb -o cell-overflow-results.test.dtb cell-overflow-results.dts
--    run_dtc_test -I dts -O dtb -o cell-overflow.test.dtb cell-overflow.dts
-+    run_dtc_test -I dts -O dtb -o cell-overflow-results.test.dtb "$SRCDIR/cell-overflow-results.dts"
-+    run_dtc_test -I dts -O dtb -o cell-overflow.test.dtb "$SRCDIR/cell-overflow.dts"
-     run_test dtbs_equal_ordered cell-overflow.test.dtb cell-overflow-results.test.dtb
- 
-     # check full tests
--- 
-cgit

diff --git a/sys-apps/dtc/files/fix-tests-for-Python3.12.patch b/sys-apps/dtc/files/fix-tests-for-Python3.12.patch
deleted file mode 100644
index 7a08648f3835..000000000000
--- a/sys-apps/dtc/files/fix-tests-for-Python3.12.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Description: Python3.12 causes breakage for get_mem_rsv in pylibfdt.
- 
- Author: Héctor Orón Martínez <zumbi@debian.org>
-
----
-
-Bug: https://github.com/dgibson/dtc/issues/123
-Bug-Debian: https://bugs.debian.org/1061318
-Bug-Ubuntu: https://launchpad.net/bugs/2051399
-Last-Update: 2024-01-30
-
---- device-tree-compiler-1.7.0.orig/tests/pylibfdt_tests.py
-+++ device-tree-compiler-1.7.0/tests/pylibfdt_tests.py
-@@ -418,9 +418,14 @@ class PyLibfdtBasicTests(unittest.TestCa
-     def testReserveMap(self):
-         """Test that we can access the memory reserve map"""
-         self.assertEqual(2, self.fdt.num_mem_rsv())
--        self.assertEqual([ 0xdeadbeef00000000, 0x100000],
--                          self.fdt.get_mem_rsv(0))
--        self.assertEqual([123456789, 0o10000], self.fdt.get_mem_rsv(1))
-+        if sys.version_info.major >= 3 and sys.version_info.minor >= 12:
-+            self.assertEqual([0, 0xdeadbeef00000000, 0x100000],
-+                             self.fdt.get_mem_rsv(0))
-+            self.assertEqual([0, 123456789, 0o10000], self.fdt.get_mem_rsv(1))
-+        else:
-+            self.assertEqual([0xdeadbeef00000000, 0x100000],
-+                             self.fdt.get_mem_rsv(0))
-+            self.assertEqual([123456789, 0o10000], self.fdt.get_mem_rsv(1))
- 
-     def testEmpty(self):
-         """Test that we can create an empty tree"""
-@@ -615,7 +620,10 @@ class PyLibfdtSwTests(unittest.TestCase)
- 
-         fdt = sw.as_fdt()
-         self.assertEqual(2, fdt.num_mem_rsv())
--        self.assertEqual([TEST_ADDR_1, TEST_SIZE_1], fdt.get_mem_rsv(0))
-+        if sys.version_info.major >= 3 and sys.version_info.minor >= 12:
-+            self.assertEqual([0, TEST_ADDR_1, TEST_SIZE_1], fdt.get_mem_rsv(0))
-+        else:
-+            self.assertEqual([TEST_ADDR_1, TEST_SIZE_1], fdt.get_mem_rsv(0))
- 
-         # Make sure we can add a few more things
-         with sw.add_node('another'):