gentoo resync : 25.08.2020

6 files changed, 226 insertions, 27 deletions

diff --git a/sys-apps/dtc/Manifest b/sys-apps/dtc/Manifest
index 69538b2ecf37..96d6a229d180 100644
--- a/sys-apps/dtc/Manifest
+++ b/sys-apps/dtc/Manifest
@@ -2,6 +2,9 @@ AUX dtc-1.4.4-posix-shell.patch 1232 BLAKE2B eadb56c06e7ff7699d462e3c4c50d1f2c6e
 AUX dtc-1.5.0-fdt_check_full-visibility.patch 259 BLAKE2B db9ba9d714c16c07d3b138e1cb50d39dcb991f98bdb8b1c819018827f143e9554621c7eb2dc42b746076a39cce6f66246f8e1d304a45b91c5ee42c3b04d6b596 SHA512 49d11a3b85342ecc81f7af167439c216dcd9b94621ac2ceb8ffcb96775164b65a11047dce7b19352d73621c587c1d0c242179542c98d87a1772e7b6e3424d9a0
 AUX dtc-1.5.0-gcc-10.patch 1693 BLAKE2B 4887f0fc548343605930dc434a1a426435446d0c1d44cbf633218aa3cf90001bb97142b4a6851d5a163b893f138bd282f18d47278a1d782647c4ba1fae46be50 SHA512 2b0cf9e111b461684da7900f7f13062514c46be4c071f39ae7895be56456d80fa6a73a3798f533017a14d769194eca5458504fdebc1c9740eab149c5a2f29811
 DIST dtc-1.5.0.tar.xz 152936 BLAKE2B 4ad9cf8f8fd0ccde0c7b8b66c0039eb9b012ed26e51387c06c03fa7950ca194878bbb23b50be5b80c4d4e18140d6316092a9f0eea87e5d713856635dcfc1b0ec SHA512 fd1e692a1b7bf7987f921ad17d9be6719f7b3aa7915873b45fa86f4ecb1398a0a62cdf53c1fddf98a0f7fed9bf34a79f684018bd01a2b5e88746b50879bf7102
-EBUILD dtc-1.5.0.ebuild 1286 BLAKE2B 6e0ce034cbbc4934a2d05a74a7cdbc4928fa08364883a00d20e916e9b41b96be27db8c423d92af519bff28115980b0d3417c0c574a6bba60cebc54cf41eb3080 SHA512 66fe6ccf274a83d98595fc952eec76732dfb6ea935b398aef92a056a87e8f6e828b1eab7600c909303681bd854611d0d74d5a716ca8487954c2658e6fcbf92cb
-EBUILD dtc-9999.ebuild 1185 BLAKE2B 0acd0e3949624defcb575043ab9fca611ed7a0aa382e1f29634a5fa1c9b1e343b378e3e3c8519fb46d716ab5053d5c588742f92fcc4eae2600aa4586aa712c0f SHA512 4e82ae7cd17e6c3f02c759165945f5499f989e8385f4a9a0ce04ad96222b16763ee31ce491f309227f05c99c979319b65e86e4c39eac60ce2bae0a72006435c0
-MISC metadata.xml 416 BLAKE2B 550a9af835cd395d8cc77230f5ee6e7dcd0ff70c3290af7771bb04e5c5c6a9b5508c634555a4444e6bdac9ad007ff2bed10a05dfee57db432eb1fcf15ef57022 SHA512 7d9e26636a6fb8c5bd06cc06c837b42643313be040b2a36ff09056d81a0e75608a4593f37bb7fb2471d5e4eec5db3bd12cb8f3ddce49a8036122c2c1d8fe5187
+DIST dtc-1.6.0.tar.xz 158584 BLAKE2B 47b15b5df7f5d87369d6daaad87f2989a80865f2fab19f89d050d390a9f8319bcd86a36e12f7cc8d62947bb4d1335769071d0e3ea0a6e16861aea163e78f4696 SHA512 15433b24f1d6b7ed1f8066d050bd1bcbf988731aa38147564e3dd04b5f69af8d69e03befdc621a768526c620425a9bdd24aad4f9ff135930d6a1eeb0625f7de3
+EBUILD dtc-1.5.0-r2.ebuild 1663 BLAKE2B a819481eb057a777ff6f405b06a90c0af5e45f27d644b71835954af2e1f5fcb6a268a1553fba2119058516df17120da7221fc5a85fcc4e1da7dcc8a1bd784555 SHA512 7feab3bfbe64fda933b8034e1aee397244e7937502fea343512f6908709e9ae746aa43cbb8b25ba27ffb94ff90269a3d881cd08fdf9a764c05ed0bd90a2fdd4d
+EBUILD dtc-1.5.0.ebuild 1296 BLAKE2B c233996dc4f35d0ba521de4ede3a3eb37533c8cfd7655dac83602c70cb55093fa631e16785469ad41244dbf61836ef4cabf541ec166694c34e8960b0576f75ad SHA512 7b5dacd6a422da8e2353047f36cf47269a473e4c39809e0b71401e99bc27b7d37a2be743afe033fe444f00ed244e329bc82999d3cfef005504a3024160e918d1
+EBUILD dtc-1.6.0.ebuild 1506 BLAKE2B e5a5878e19541b6e4072b448e0fdda5538a6a7a5db03d7d9ce7e692894a851728cfe88c1993837c110302acdfc2ee1bc14f1565c230e4daf295e54631f97c573 SHA512 11061dea5cdd017080d32a56f4aefa534d67de2d816249ef570f924ce02866d8fe5cb1d72697142e22dead7f9d4bb9c51da0d17afc6977abb6ea76d86fdccc76
+EBUILD dtc-9999.ebuild 1506 BLAKE2B e5a5878e19541b6e4072b448e0fdda5538a6a7a5db03d7d9ce7e692894a851728cfe88c1993837c110302acdfc2ee1bc14f1565c230e4daf295e54631f97c573 SHA512 11061dea5cdd017080d32a56f4aefa534d67de2d816249ef570f924ce02866d8fe5cb1d72697142e22dead7f9d4bb9c51da0d17afc6977abb6ea76d86fdccc76
+MISC metadata.xml 491 BLAKE2B e57c27c911b37572b2836c634b03b2fb52bae256c22972af19637113f467e3eaa270e8dca070dbb9522495db5bad1f1b4441fcaae9d47e7eff8efd0b4127628a SHA512 9e328b8fd47363cf6caaf40832df015d9055ae746118dd9c501311af24a12d5377781cfb2ad8d42d2c82539709597310c1dbded4e522d0b0272b23859735506a
diff --git a/sys-apps/dtc/dtc-1.5.0-r2.ebuild b/sys-apps/dtc/dtc-1.5.0-r2.ebuild
new file mode 100644
index 000000000000..ac119788204b
--- /dev/null
+++ b/sys-apps/dtc/dtc-1.5.0-r2.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit multilib toolchain-funcs eutils
+
+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 ~ia64 ~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="
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+"
+RDEPEND="yaml? ( dev-libs/libyaml )"
+DEPEND="${RDEPEND}"
+
+DOCS="
+	Documentation/dt-object-internal.txt
+	Documentation/dts-format.txt
+	Documentation/manual.txt
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.4.4-posix-shell.patch
+	"${FILESDIR}"/${PN}-1.5.0-fdt_check_full-visibility.patch
+	"${FILESDIR}"/${PN}-1.5.0-gcc-10.patch
+)
+
+_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.5.0.ebuild b/sys-apps/dtc/dtc-1.5.0.ebuild
index 7abe2f748886..f2284dee2e44 100644
--- a/sys-apps/dtc/dtc-1.5.0.ebuild
+++ b/sys-apps/dtc/dtc-1.5.0.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://www.kernel.org/pub/software/utils/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 fi
 
 DESCRIPTION="Open Firmware device tree compiler"
@@ -47,7 +47,7 @@ src_prepare() {
 		-e "/^LIBDIR =/s:=.*:= \$(PREFIX)/$(get_libdir):" \
 		Makefile || die
 
-	tc-export AR CC
+	tc-export AR CC PKG_CONFIG
 	export V=1
 }
 
diff --git a/sys-apps/dtc/dtc-1.6.0.ebuild b/sys-apps/dtc/dtc-1.6.0.ebuild
new file mode 100644
index 000000000000..5d8cb20a5b37
--- /dev/null
+++ b/sys-apps/dtc/dtc-1.6.0.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit multilib toolchain-funcs eutils
+
+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 ~ia64 ~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="
+	sys-devel/bison
+	sys-devel/flex
+	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-9999.ebuild b/sys-apps/dtc/dtc-9999.ebuild
index d60b43b0b331..5d8cb20a5b37 100644
--- a/sys-apps/dtc/dtc-9999.ebuild
+++ b/sys-apps/dtc/dtc-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 inherit multilib toolchain-funcs eutils
 
 if [[ ${PV} == "9999" ]] ; then
@@ -9,7 +9,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://www.kernel.org/pub/software/utils/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 DESCRIPTION="Open Firmware device tree compiler"
@@ -17,21 +17,41 @@ HOMEPAGE="https://devicetree.org/ https://git.kernel.org/cgit/utils/dtc/dtc.git/
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="static-libs"
+IUSE="static-libs yaml"
 
-DEPEND="
+BDEPEND="
 	sys-devel/bison
 	sys-devel/flex
+	virtual/pkgconfig
 "
+RDEPEND="yaml? ( dev-libs/libyaml )"
+DEPEND="${RDEPEND}"
+
 DOCS="
 	Documentation/dt-object-internal.txt
 	Documentation/dts-format.txt
 	Documentation/manual.txt
 "
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.4.4-posix-shell.patch
-)
+_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
@@ -41,16 +61,21 @@ src_prepare() {
 		-e '/^CPPFLAGS =/s:=:+=:' \
 		-e 's:-Werror::' \
 		-e 's:-g -Os::' \
-		-e "/^PREFIX =/s:=.*:= ${EPREFIX}/usr:" \
-		-e "/^LIBDIR =/s:=.*:= \$(PREFIX)/$(get_libdir):" \
 		Makefile || die
 
-	tc-export AR CC
-	export V=1
+	tc-export AR CC PKG_CONFIG
+}
+
+src_compile() {
+	_emake
+}
+
+src_test() {
+	_emake check
 }
 
 src_install() {
-	default
+	_emake DESTDIR="${D}" install
 
 	use static-libs || find "${ED}" -name '*.a' -delete
 }
diff --git a/sys-apps/dtc/metadata.xml b/sys-apps/dtc/metadata.xml
index 9d02ff2575d4..17bad4a3b9b4 100644
--- a/sys-apps/dtc/metadata.xml
+++ b/sys-apps/dtc/metadata.xml
@@ -1,14 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>lu_zero@gentoo.org</email>
-</maintainer>
-<maintainer type="project">
-	<email>ppc@gentoo.org</email>
-	<name>Gentoo Linux PowerPC Development</name>
-</maintainer>
-<upstream>
-	<remote-id type="cpe">cpe:/a:dtc_project:dtc</remote-id>
-</upstream>
+	<maintainer type="person">
+		<email>lu_zero@gentoo.org</email>
+	</maintainer>
+	<maintainer type="project">
+		<email>embedded@gentoo.org</email>
+		<name>Embedded Gentoo</name>
+	</maintainer>
+	<use>
+		<flag name="yaml">support .yaml-encoded device trees</flag>
+	</use>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:dtc_project:dtc</remote-id>
+	</upstream>
 </pkgmetadata>