gentoo resync : 05.04.2019

6 files changed, 56 insertions, 145 deletions

diff --git a/sys-boot/raspberrypi-firmware/Manifest b/sys-boot/raspberrypi-firmware/Manifest
index 12128d7850ca..15a974819ce0 100644
--- a/sys-boot/raspberrypi-firmware/Manifest
+++ b/sys-boot/raspberrypi-firmware/Manifest
@@ -1,17 +1,7 @@
 AUX raspberrypi-firmware-0_p20130711-cmdline.txt 203 BLAKE2B 2435f2d4f1dc4c1283e19459bc07fb3fb569042e13724d10c5ae18490fc9f04e0ed4e910947414761386d32fd678c6031d5e53cfb2804d5f547d77dd47ffb840 SHA512 ea4ddd6005bf8979d4299867a8889d67192c91467833beff8785bc01ac8d33544e712b2956da51b58a7b4ab1a1acaf4f27428d294f0dfae87ec91da8a71e3c9f
 AUX raspberrypi-firmware-0_p20130711-config.txt 1706 BLAKE2B a7086f2f91a3eb26887d6cb2e0edc74282b8c91ae1a6691071cafa29f455b9caff7f597a9a9df88250e6dab3fa74b742bd7733d7de24e150da3c64d1e09bc18e SHA512 2a0a19a84ab871d73e330e870b086b85a7776a1b17dd6054451be735249208a982249ca62f6d2fe51aba74c78f36266143d65ffe0549cdf8afbf20bcf637c78f
 AUX raspberrypi-firmware-0_p20130711-envd 53 BLAKE2B 52aa8814f82f9c8a5e2f4c3b2be80e6e62b2e969d03a96f3162a998a9aa4621ab79df48d573389d92cc963979c8dd7c0e012cd8d996e5e23252eb66f869f0e74 SHA512 032aa497cbde187ed8cfa5ba5adaf96b28f9dd2babb882d934d9009771ca50e9d8c6a8d5535551a8e8cf8e1932865dd0e4806ba56c9694952cbb3d93f9081ca7
-DIST raspberrypi-firmware-1.20160209.tar.gz 114792438 BLAKE2B 10453495af56d4f50859ec2ee4bdccbba131518b1460dfdf61143d7e7965ccb53b7bf83a4ddc340caa88bb6653762ec58a55fbaf3e7fd72c65c714ce1df489b8 SHA512 281092c11d422d821e5e2b0479c3b8f891f8df66cfbf931992902d759c99ed40cbb2d9fada1f944372e5bcd8af69784739e79e9912db3482892b10bf668611f2
-DIST raspberrypi-firmware-1.20160309.tar.gz 115673896 BLAKE2B d08101180cd7373f9e93817ee8adc0c2798ff3f53e8a488232fff186707a602e38d916fee292662eac8858d7da857f66f10bac9837e479d657013d985b48d709 SHA512 30a6396ef52355c6f6404354645e8d0f5bbf70332b0e1661dfa8ef3456154d07e105d3b7b5bd64efb3e7397fa2fb8c36de1aa78040dc4118060b26949c2ab884
-DIST raspberrypi-firmware-b2dbc04508-bootcode.bin 17816 BLAKE2B acd5b04051d6f721fd15463b5f52b4592fd41c1612c40d56f1552d65cb68c0991bcd2c0478aefd51f415ddf6df04941d1f717941b91961d1cc761740c09c7124 SHA512 5332b2554cbdd3abb32f52506b851f7b3dc2c76a6f9040ec8ad946f6d9faf479e502dda11070aba7706d83e1c3839ff92ca8fbf8e79b972f91814dedbe19ea48
-DIST raspberrypi-firmware-b2dbc04508-fixup.dat 5742 BLAKE2B a5b78c9655e66f6b24ddf236677f2cd4b8dcb529f476f0734671db2b69aabdba7bbf791c770dca55278900ddb2ade453fd516542656f795c73271af040c83030 SHA512 f701fce3db35bfcd204ca7130aa0db1a77a5c83815409ac0b85f1a57e495aea6cbdf81db985436b33b8862545a271743ea2edefd3b7c9ac0a5e5e30bafd206f3
-DIST raspberrypi-firmware-b2dbc04508-fixup_cd.dat 2032 BLAKE2B 7974f6f3a75da27667344c31cb457cafd5d6ef4dec6ff6cd936088c6eccf9f62e492f77d164f80c115357cefaf35446fab6e5843704da9a771ec1a144f59066a SHA512 c6b8b6fb7bc99f77c3aee5d51e1e07a5f9c4119d2ec64ade335315c0c28a2f6d310463a48b0becb424198d3771dc079fda1c15bb03b18c125bfb1b32f5c9867f
-DIST raspberrypi-firmware-b2dbc04508-fixup_x.dat 8693 BLAKE2B 860f75afd28f5b80324a5b37bf99bd83a9eec61b7006a6d5082f5331e42a01498b4d489236fb732fd0308ed63d273e7899a0964ddb24f72889d389b0b9cf8e04 SHA512 ea407fd4b6422a7c932e118260cebd4c578a15bbbbea07e76bf1175b9bf9776e006172997d085e50a2a2a28965afd036a66450b1f0b17fcda741f9f02673c20f
-DIST raspberrypi-firmware-b2dbc04508-start.elf 2494932 BLAKE2B 9e878a2d93414732c9995abaf120dc61323155b40e30223f87aed79fc9bc0c6ab4fd0f7d8f0094d5a8679afb153071b207c1bd1a7d9f7a770c3b745201058439 SHA512 bc1f5590de691b10bd375bc20acfe18a8658e4109736af4280ef7a3331024b61162330d8d687aca7da78bdb160beefd8bc38c90791e3e320282b8e98e091f670
-DIST raspberrypi-firmware-b2dbc04508-start_cd.elf 469560 BLAKE2B 176e89e0703c854584237949186e5403b32509b53329a0634195dfa1354e3621a19d1fd820bcc297888e56149a7f05852fa8a7c451593c7654ceddc339067a53 SHA512 bbd4b519ef6f830db7efdbb62f7f308a6092b9e99279fea96307771da08bf12898c664165d6dbd556799162728a479c1d0e1f8fd67ef2c2a7c731354dbea9d99
-DIST raspberrypi-firmware-b2dbc04508-start_x.elf 3462244 BLAKE2B b94b8cfb1eb4ad4c41534381ff308b257a094cf7841519f6d933b3365b0e1554264b76bb39456932e1f8283223e9aba34a0d0409a80c1983023efe9d8a086315 SHA512 4efb07958838d339b5635465e890cc433d734a47a5ec2d3e8b512755decc4fbffdd6b68f14c09b63284215f6b9d7716c222d77f18de0c783daa895e208796d2d
-EBUILD raspberrypi-firmware-1.20160209.ebuild 1156 BLAKE2B c45a7dd89ac3a7f40e14c90319e6efab4eb0da71b37243823eb2501ce53a503a6b077df7fff4aafae5e17a4b03b74b5f0deebc8a56b9edbb002df89ea64bdbf4 SHA512 b28b1633169d77f939ac0853898c828b34c0ba73589e20858ad07e836bdd604bd9392fe84d24e729b1eca360190a853461e04e87a08889a8e3e97df5a1fc83f5
-EBUILD raspberrypi-firmware-1.20160309.ebuild 1156 BLAKE2B c45a7dd89ac3a7f40e14c90319e6efab4eb0da71b37243823eb2501ce53a503a6b077df7fff4aafae5e17a4b03b74b5f0deebc8a56b9edbb002df89ea64bdbf4 SHA512 b28b1633169d77f939ac0853898c828b34c0ba73589e20858ad07e836bdd604bd9392fe84d24e729b1eca360190a853461e04e87a08889a8e3e97df5a1fc83f5
-EBUILD raspberrypi-firmware-1_pre20130807.ebuild 1639 BLAKE2B 25a4036ffbaa562752ee9d5452fecf0a8bc8cf30a22e2dd128d6703887e57a703653f9b5410f67412da4ce3a3c5481c85e5d3f405931d4676a7ba1d92684690f SHA512 ac655e12570990ad9bf7381b4205bddd4bb8a6248001f9b9def2988bcc3ec30ee828332423b993fed86dffeeaf94f48d0d21dab9c91da88a26329841c40a59fe
-EBUILD raspberrypi-firmware-9999.ebuild 1451 BLAKE2B 25f9ffe8bf55f56d060fd1f82f93d0b22940aa4644664e8e4dc5fee0fe559305a5662abfa85bf4a4a46629e02b8121367f6f421053cc73fd6a12f7ded759b80e SHA512 464eb652775d28e50aec7e7777826455376724ba0f66f76b731b72715cf492600f4de81f518e3967d5a23fa118ff614dda377059920af6d29b51a8d5b1013aa1
-MISC metadata.xml 252 BLAKE2B 1c461429fdbec0a9f4de8dc86ced8c4962e1abffff9c40e54f33d68de319ed7fe39f583330dd1b233894ad198d0d317ff27d7f4949ecdc295e953d86c6214df7 SHA512 354547f73138a569b9313cfa5a36de392e6b67909d55b7b2b36ff56896ec0321ecc2ef914caa4bf28f350674a74aeecbec4f971554072fd589db78d5107bc507
+DIST raspberrypi-firmware-1.20190215.tar.gz 123074917 BLAKE2B cefedb5c979db7dfd47938aad37a567d91d3ad78247c7a63f789362768ab7a39a1967ac116b4b0475e3b210ab11f6474706df042af85a622e8e7905c85ec7498 SHA512 082f26caf427222d838881e5f1e9fa0136765b3eaf74a84877fc33616fd07e49085db0889226c40c655039a9d41a10566510c7d752cfc48a67b4683616a51193
+EBUILD raspberrypi-firmware-1.20190215.ebuild 1634 BLAKE2B 2b9631bc1c22117fd1896a75938713e7b3c3fa796ff291fde38d71d44b40cfefcc32cab2d2158b0a09b2b72ec5c4dc1377ada8666cbda70e3889f6686c70dbec SHA512 122bf1379238e61b1b5fa1324ec3b2e37b14ccc571e6afbc053f44a5adc1466f3d0368467d105ed8ffc7c1c47077776f3513d92246fb182cf5d654a89e1997ce
+EBUILD raspberrypi-firmware-9999.ebuild 1634 BLAKE2B 2b9631bc1c22117fd1896a75938713e7b3c3fa796ff291fde38d71d44b40cfefcc32cab2d2158b0a09b2b72ec5c4dc1377ada8666cbda70e3889f6686c70dbec SHA512 122bf1379238e61b1b5fa1324ec3b2e37b14ccc571e6afbc053f44a5adc1466f3d0368467d105ed8ffc7c1c47077776f3513d92246fb182cf5d654a89e1997ce
+MISC metadata.xml 566 BLAKE2B 34fdc67dfee82a26f5e945fe7f63c2d239cc643a1aa5e4c4892facdd993c461a7ddc74fb5057e9429ab1eff4a39176398817dddcf2efa2e235a268d335c7f3db SHA512 ac35994d0f0432c9a0ee2e171b19a1e8d8a0c1f2d597b2489c37179b07ea86a0e94ac5d83e43348e65a01b64fade71022cf6e2ec83a779eb6b816b3907370daa
diff --git a/sys-boot/raspberrypi-firmware/metadata.xml b/sys-boot/raspberrypi-firmware/metadata.xml
index 7775715c3dae..ce5947791ef2 100644
--- a/sys-boot/raspberrypi-firmware/metadata.xml
+++ b/sys-boot/raspberrypi-firmware/metadata.xml
@@ -1,7 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>ck+gentoo@bl4ckb0x.de</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>andrey_utkin@gentoo.org</email>
+		<name>Andrey Utkin</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">raspberrypi/firmware</remote-id>
 	</upstream>
diff --git a/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20160209.ebuild b/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20160209.ebuild
deleted file mode 100644
index 7dc51e4b7b0b..000000000000
--- a/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20160209.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit readme.gentoo
-
-DESCRIPTION="Raspberry PI boot loader and firmware"
-HOMEPAGE="https://github.com/raspberrypi/firmware"
-SRC_URI="https://github.com/raspberrypi/firmware/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2 raspberrypi-videocore-bin"
-SLOT="0"
-KEYWORDS="~arm -*"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-S=${WORKDIR}/${P/raspberrypi-}
-
-RESTRICT="binchecks strip"
-
-pkg_preinst() {
-	if ! grep "${ROOT}boot" /proc/mounts >/dev/null 2>&1; then
-		ewarn "${ROOT}boot is not mounted, the files might not be installed at the right place"
-	fi
-}
-
-src_configure() { :; }
-
-src_compile() { :; }
-
-src_install() {
-	rm boot/{kernel{,7}.img,COPYING.linux,LICENCE.broadcom} || die
-	insinto /boot
-	doins -r boot/*
-
-	newenvd "${FILESDIR}"/${PN}-0_p20130711-envd 90${PN}
-	readme.gentoo_create_doc
-}
-
-DOC_CONTENTS=" config.txt and cmdline.txt need to be generated by you
-More information here:
-https://www.raspberrypi.org/documentation/configuration/config-txt.md
-Another good source http://elinux.org/RPi_config.txt
-http://elinux.org/RPi_cmdline.txt"
diff --git a/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20160309.ebuild b/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20160309.ebuild
deleted file mode 100644
index 7dc51e4b7b0b..000000000000
--- a/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20160309.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit readme.gentoo
-
-DESCRIPTION="Raspberry PI boot loader and firmware"
-HOMEPAGE="https://github.com/raspberrypi/firmware"
-SRC_URI="https://github.com/raspberrypi/firmware/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2 raspberrypi-videocore-bin"
-SLOT="0"
-KEYWORDS="~arm -*"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-S=${WORKDIR}/${P/raspberrypi-}
-
-RESTRICT="binchecks strip"
-
-pkg_preinst() {
-	if ! grep "${ROOT}boot" /proc/mounts >/dev/null 2>&1; then
-		ewarn "${ROOT}boot is not mounted, the files might not be installed at the right place"
-	fi
-}
-
-src_configure() { :; }
-
-src_compile() { :; }
-
-src_install() {
-	rm boot/{kernel{,7}.img,COPYING.linux,LICENCE.broadcom} || die
-	insinto /boot
-	doins -r boot/*
-
-	newenvd "${FILESDIR}"/${PN}-0_p20130711-envd 90${PN}
-	readme.gentoo_create_doc
-}
-
-DOC_CONTENTS=" config.txt and cmdline.txt need to be generated by you
-More information here:
-https://www.raspberrypi.org/documentation/configuration/config-txt.md
-Another good source http://elinux.org/RPi_config.txt
-http://elinux.org/RPi_cmdline.txt"
diff --git a/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1_pre20130807.ebuild b/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20190215.ebuild
index b4a3474a5182..4b06dfa49939 100644
--- a/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1_pre20130807.ebuild
+++ b/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20190215.ebuild
@@ -1,32 +1,27 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit readme.gentoo
+inherit mount-boot readme.gentoo-r1
 
-DESCRIPTION="Raspberry PI boot loader and firmware"
+DESCRIPTION="Raspberry Pi (all versions) bootloader and GPU firmware"
 HOMEPAGE="https://github.com/raspberrypi/firmware"
-MY_COMMIT="b2dbc04508"
-SRC_URI=""
-for my_src_uri in bootcode.bin fixup{,_cd,_x}.dat start{,_cd,_x}.elf ; do
-	SRC_URI="${SRC_URI} https://github.com/raspberrypi/firmware/raw/${MY_COMMIT}/boot/${my_src_uri} -> ${PN}-${MY_COMMIT}-${my_src_uri}"
-done
-
 LICENSE="GPL-2 raspberrypi-videocore-bin"
 SLOT="0"
-KEYWORDS="~arm -*"
-IUSE=""
-
-DEPEND=""
-RDEPEND="!sys-boot/raspberrypi-loader"
 
-S=${WORKDIR}
+if [[ "${PV}" == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/raspberrypi/firmware"
+	EGIT_CLONE_TYPE="shallow"
+else
+	SRC_URI="https://github.com/raspberrypi/firmware/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="-* ~arm"
+	S="${WORKDIR}/firmware-${PV}"
+fi
 
 RESTRICT="binchecks strip"
 
-src_unpack() { :; }
-
 pkg_preinst() {
 	if [ -z "${REPLACING_VERSIONS}" ] ; then
 		local msg=""
@@ -48,14 +43,18 @@ pkg_preinst() {
 
 src_install() {
 	insinto /boot
-	local a
-	for a in ${A} ; do
-		newins "${DISTDIR}"/${a} ${a#${PN}-${MY_COMMIT}-}
-	done
+	cd boot || die
+	doins bootcode.bin fixup*.dat start*elf
+	doins *.dtb
+	doins -r overlays
 	newins "${FILESDIR}"/${PN}-0_p20130711-config.txt config.txt
 	newins "${FILESDIR}"/${PN}-0_p20130711-cmdline.txt cmdline.txt
 	newenvd "${FILESDIR}"/${PN}-0_p20130711-envd 90${PN}
 	readme.gentoo_create_doc
 }
 
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
+
 DOC_CONTENTS="Please configure your ram setup by editing /boot/config.txt"
diff --git a/sys-boot/raspberrypi-firmware/raspberrypi-firmware-9999.ebuild b/sys-boot/raspberrypi-firmware/raspberrypi-firmware-9999.ebuild
index 8cdb8f63caa8..4b06dfa49939 100644
--- a/sys-boot/raspberrypi-firmware/raspberrypi-firmware-9999.ebuild
+++ b/sys-boot/raspberrypi-firmware/raspberrypi-firmware-9999.ebuild
@@ -1,23 +1,24 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit git-r3 readme.gentoo
+inherit mount-boot readme.gentoo-r1
 
-DESCRIPTION="Raspberry PI boot loader and firmware"
+DESCRIPTION="Raspberry Pi (all versions) bootloader and GPU firmware"
 HOMEPAGE="https://github.com/raspberrypi/firmware"
-SRC_URI=""
-
 LICENSE="GPL-2 raspberrypi-videocore-bin"
 SLOT="0"
-KEYWORDS=""
-IUSE=""
-
-DEPEND=""
-RDEPEND="!sys-boot/raspberrypi-loader"
 
-EGIT_REPO_URI="https://github.com/raspberrypi/firmware"
+if [[ "${PV}" == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/raspberrypi/firmware"
+	EGIT_CLONE_TYPE="shallow"
+else
+	SRC_URI="https://github.com/raspberrypi/firmware/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="-* ~arm"
+	S="${WORKDIR}/firmware-${PV}"
+fi
 
 RESTRICT="binchecks strip"
 
@@ -42,8 +43,8 @@ pkg_preinst() {
 
 src_install() {
 	insinto /boot
-	cd boot
-	doins bootcode.bin COPYING.linux fixup*.dat LICENCE.broadcom start*elf
+	cd boot || die
+	doins bootcode.bin fixup*.dat start*elf
 	doins *.dtb
 	doins -r overlays
 	newins "${FILESDIR}"/${PN}-0_p20130711-config.txt config.txt
@@ -52,4 +53,8 @@ src_install() {
 	readme.gentoo_create_doc
 }
 
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
+
 DOC_CONTENTS="Please configure your ram setup by editing /boot/config.txt"