gentoo resync : 05.04.2019

6 files changed, 66 insertions, 172 deletions

diff --git a/sys-kernel/raspberrypi-image/Manifest b/sys-kernel/raspberrypi-image/Manifest
index 62d495ea2bca..2cfc0010e3cb 100644
--- a/sys-kernel/raspberrypi-image/Manifest
+++ b/sys-kernel/raspberrypi-image/Manifest
@@ -1,6 +1,4 @@
-DIST raspberrypi-firmware-1.20160209.tar.gz 114792438 BLAKE2B 10453495af56d4f50859ec2ee4bdccbba131518b1460dfdf61143d7e7965ccb53b7bf83a4ddc340caa88bb6653762ec58a55fbaf3e7fd72c65c714ce1df489b8 SHA512 281092c11d422d821e5e2b0479c3b8f891f8df66cfbf931992902d759c99ed40cbb2d9fada1f944372e5bcd8af69784739e79e9912db3482892b10bf668611f2
-DIST raspberrypi-firmware-1.20160309.tar.gz 115673896 BLAKE2B d08101180cd7373f9e93817ee8adc0c2798ff3f53e8a488232fff186707a602e38d916fee292662eac8858d7da857f66f10bac9837e479d657013d985b48d709 SHA512 30a6396ef52355c6f6404354645e8d0f5bbf70332b0e1661dfa8ef3456154d07e105d3b7b5bd64efb3e7397fa2fb8c36de1aa78040dc4118060b26949c2ab884
-EBUILD raspberrypi-image-4.1.17_p20160209.ebuild 1555 BLAKE2B 53adadcf72e97e5b0e3d4afda109691e5e80721eeb182d7448d79b465b8c730b46a8c032d4ad2899ef715ed04e66d5a183a1615a05918a0a55477331dccf17d4 SHA512 90220d107b52c6f655214ae44147bc90a1084c7f8fe9a863609931d5ba7ecf788d405a95118dfe0db6ac1e5a39fe72bcd098091dce0ce63ca6a98d3709183cf4
-EBUILD raspberrypi-image-4.1.19_p20160309.ebuild 1555 BLAKE2B 9cd484b5bb073eae255a2b95711834ccd6eee07a4fda1176fe6454f769b71e33e973b25db243352c31b353f62169e06d977650208337c2e9d61fb1d971268b43 SHA512 025ead2680601c6db610e0f1dd4a68ad3f2ad6bffe7696989f950a09b4d175275a0a6cd25d32333e2533556d0b1e5fa6ae9b0fe936e55df56cddfac83bf3b922
-EBUILD raspberrypi-image-9999.ebuild 1443 BLAKE2B 061885615be051d5f4de977fd396217fd5b63b39d992424fe689526539f6b708667ca3293365b5b32fba6458c5c951e8aef5a3b2b625b6a0e0473434eee5ae74 SHA512 a2df7c08572f0a3f53300c428ae63f2e908bde3c877cfd36de686ecfb5601b68b7cd583591579bf3088a43b40a8173d9ff0c44b7d7606e7b571abf1c35912061
-MISC metadata.xml 252 BLAKE2B 1c461429fdbec0a9f4de8dc86ced8c4962e1abffff9c40e54f33d68de319ed7fe39f583330dd1b233894ad198d0d317ff27d7f4949ecdc295e953d86c6214df7 SHA512 354547f73138a569b9313cfa5a36de392e6b67909d55b7b2b36ff56896ec0321ecc2ef914caa4bf28f350674a74aeecbec4f971554072fd589db78d5107bc507
+DIST raspberrypi-image-4.14.98_p20190215.tar.gz 123074917 BLAKE2B cefedb5c979db7dfd47938aad37a567d91d3ad78247c7a63f789362768ab7a39a1967ac116b4b0475e3b210ab11f6474706df042af85a622e8e7905c85ec7498 SHA512 082f26caf427222d838881e5f1e9fa0136765b3eaf74a84877fc33616fd07e49085db0889226c40c655039a9d41a10566510c7d752cfc48a67b4683616a51193
+EBUILD raspberrypi-image-4.14.98_p20190215.ebuild 850 BLAKE2B dae8b4af65b42cedec26326ead4b2e9afaed44affe568cc4bf04a09eaebd6bbd10f93f456327eb9f30b6493670e586cb2e09fe7c5306b883a6d8704c5f10d1c5 SHA512 8833a26f7b6521754ac02ef6024140ee9dc3d1dbe836b9accec13bd844a0a7a087730b9794031bc66cc7bd5ca5ef4ec4f1614c6ff6a609ebd4daa511eb636903
+EBUILD raspberrypi-image-9999.ebuild 850 BLAKE2B dae8b4af65b42cedec26326ead4b2e9afaed44affe568cc4bf04a09eaebd6bbd10f93f456327eb9f30b6493670e586cb2e09fe7c5306b883a6d8704c5f10d1c5 SHA512 8833a26f7b6521754ac02ef6024140ee9dc3d1dbe836b9accec13bd844a0a7a087730b9794031bc66cc7bd5ca5ef4ec4f1614c6ff6a609ebd4daa511eb636903
+MISC metadata.xml 566 BLAKE2B eef49a976d1b5143b04d07f6004b23bd3e4e44ecb6c5cdb85d20b9f84b7c1565ca10322f28c4a5e7e61a0c5e046f7d9bb4308b57190cb6451b05295df970cfee SHA512 733ae694ad07909feebb9c5ee02aeed354f7b615f2f7a2c653657344a79c31e4d8d34163483cb66f6b573631f95555f502a05f23540dff8ea9d5171a56c51f6a
diff --git a/sys-kernel/raspberrypi-image/metadata.xml b/sys-kernel/raspberrypi-image/metadata.xml
index 7775715c3dae..1bf4ea6603ba 100644
--- a/sys-kernel/raspberrypi-image/metadata.xml
+++ b/sys-kernel/raspberrypi-image/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>andrey_utkin@gentoo.org</email>
+		<name>Andrey Utkin</name>
+	</maintainer>
+	<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>
 	<upstream>
 		<remote-id type="github">raspberrypi/firmware</remote-id>
 	</upstream>
diff --git a/sys-kernel/raspberrypi-image/raspberrypi-image-4.1.17_p20160209.ebuild b/sys-kernel/raspberrypi-image/raspberrypi-image-4.1.17_p20160209.ebuild
deleted file mode 100644
index daf784d859f1..000000000000
--- a/sys-kernel/raspberrypi-image/raspberrypi-image-4.1.17_p20160209.ebuild
+++ /dev/null
@@ -1,62 +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"
-MY_PV="1.20160209"
-SRC_URI="https://github.com/raspberrypi/firmware/archive/${MY_PV} -> raspberrypi-firmware-${MY_PV}.tar.gz"
-
-LICENSE="GPL-2 raspberrypi-videocore-bin"
-SLOT="${PVR}"
-KEYWORDS="~arm -*"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-S=${WORKDIR}/firmware-${MY_PV}
-
-RESTRICT=""
-
-pkg_preinst() {
-	if [ -z "${REPLACING_VERSIONS}" ] ; then
-		local msg=""
-		if [ -e "${D}"/boot/cmdline.txt -a -e "${ROOT}"/boot/cmdline.txt ] ; then
-			msg+="/boot/cmdline.txt "
-		fi
-		if [ -e "${D}"/boot/config.txt -a -e "${ROOT}"/boot/config.txt ] ; then
-			msg+="/boot/config.txt "
-		fi
-		if [ -n "${msg}" ] ; then
-			msg="This package installs following files: ${msg}."
-			msg="${msg} Please remove(backup) your copies during install"
-			msg="${msg} and merge settings afterwards."
-			msg="${msg} Further updates will be CONFIG_PROTECTed."
-			die "${msg}"
-		fi
-	fi
-
-	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() {
-	insinto /lib/modules
-	doins -r modules/*
-	insinto /boot
-	newins boot/kernel.img kernel-${PV}.img
-	newins boot/kernel7.img kernel7-${PV}.img
-
-	readme.gentoo_create_doc
-}
-
-DOC_CONTENTS="Please configure your ram setup by editing /boot/config.txt"
diff --git a/sys-kernel/raspberrypi-image/raspberrypi-image-4.1.19_p20160309.ebuild b/sys-kernel/raspberrypi-image/raspberrypi-image-4.1.19_p20160309.ebuild
deleted file mode 100644
index 550713fe4a38..000000000000
--- a/sys-kernel/raspberrypi-image/raspberrypi-image-4.1.19_p20160309.ebuild
+++ /dev/null
@@ -1,62 +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"
-MY_PV="1.20160309"
-SRC_URI="https://github.com/raspberrypi/firmware/archive/${MY_PV} -> raspberrypi-firmware-${MY_PV}.tar.gz"
-
-LICENSE="GPL-2 raspberrypi-videocore-bin"
-SLOT="${PVR}"
-KEYWORDS="~arm -*"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-S=${WORKDIR}/firmware-${MY_PV}
-
-RESTRICT=""
-
-pkg_preinst() {
-	if [ -z "${REPLACING_VERSIONS}" ] ; then
-		local msg=""
-		if [ -e "${D}"/boot/cmdline.txt -a -e "${ROOT}"/boot/cmdline.txt ] ; then
-			msg+="/boot/cmdline.txt "
-		fi
-		if [ -e "${D}"/boot/config.txt -a -e "${ROOT}"/boot/config.txt ] ; then
-			msg+="/boot/config.txt "
-		fi
-		if [ -n "${msg}" ] ; then
-			msg="This package installs following files: ${msg}."
-			msg="${msg} Please remove(backup) your copies during install"
-			msg="${msg} and merge settings afterwards."
-			msg="${msg} Further updates will be CONFIG_PROTECTed."
-			die "${msg}"
-		fi
-	fi
-
-	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() {
-	insinto /lib/modules
-	doins -r modules/*
-	insinto /boot
-	newins boot/kernel.img kernel-${PV}.img
-	newins boot/kernel7.img kernel7-${PV}.img
-
-	readme.gentoo_create_doc
-}
-
-DOC_CONTENTS="Please configure your ram setup by editing /boot/config.txt"
diff --git a/sys-kernel/raspberrypi-image/raspberrypi-image-4.14.98_p20190215.ebuild b/sys-kernel/raspberrypi-image/raspberrypi-image-4.14.98_p20190215.ebuild
new file mode 100644
index 000000000000..6bd6d37a4aaf
--- /dev/null
+++ b/sys-kernel/raspberrypi-image/raspberrypi-image-4.14.98_p20190215.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit mount-boot
+
+DESCRIPTION="Raspberry Pi (all versions) kernel and modules"
+HOMEPAGE="https://github.com/raspberrypi/firmware"
+LICENSE="GPL-2 raspberrypi-videocore-bin"
+SLOT="0"
+RESTRICT="binchecks strip"
+
+RDEPEND="sys-boot/raspberrypi-firmware"
+
+if [[ "${PV}" == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/raspberrypi/firmware"
+	EGIT_CLONE_TYPE="shallow"
+else
+	[[ "$(ver_cut 4)" == 'p' ]] || die "Unsupported version format, tweak the ebuild."
+	MY_PV="1.$(ver_cut 5)"
+	SRC_URI="https://github.com/raspberrypi/firmware/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/firmware-${MY_PV}"
+	KEYWORDS="-* ~arm"
+fi
+
+src_install() {
+	insinto /lib/modules
+	doins -r modules/*
+	insinto /boot
+	doins boot/*.img
+}
diff --git a/sys-kernel/raspberrypi-image/raspberrypi-image-9999.ebuild b/sys-kernel/raspberrypi-image/raspberrypi-image-9999.ebuild
index 0e6d2da6e687..6bd6d37a4aaf 100644
--- a/sys-kernel/raspberrypi-image/raspberrypi-image-9999.ebuild
+++ b/sys-kernel/raspberrypi-image/raspberrypi-image-9999.ebuild
@@ -1,57 +1,33 @@
-# 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-r1
+inherit mount-boot
 
-DESCRIPTION="Raspberry PI boot loader and firmware"
+DESCRIPTION="Raspberry Pi (all versions) kernel and modules"
 HOMEPAGE="https://github.com/raspberrypi/firmware"
-SRC_URI=""
-
 LICENSE="GPL-2 raspberrypi-videocore-bin"
 SLOT="0"
-KEYWORDS=""
-IUSE=""
-
-EGIT_REPO_URI="https://github.com/raspberrypi/firmware"
-DOC_CONTENTS="Please configure your ram setup by editing /boot/config.txt"
-
 RESTRICT="binchecks strip"
 
-pkg_preinst() {
-	if [ -z "${REPLACING_VERSIONS}" ] ; then
-		local msg=""
-		if [ -e "${D}"/boot/cmdline.txt -a -e "${ROOT}"/boot/cmdline.txt ] ; then
-			msg+="/boot/cmdline.txt "
-		fi
-		if [ -e "${D}"/boot/config.txt -a -e "${ROOT}"/boot/config.txt ] ; then
-			msg+="/boot/config.txt "
-		fi
-		if [ -n "${msg}" ] ; then
-			msg="This package installs following files: ${msg}."
-			msg="${msg} Please remove(backup) your copies during install"
-			msg="${msg} and merge settings afterwards."
-			msg="${msg} Further updates will be CONFIG_PROTECTed."
-			die "${msg}"
-		fi
-	fi
+RDEPEND="sys-boot/raspberrypi-firmware"
 
-	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() { :; }
+if [[ "${PV}" == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/raspberrypi/firmware"
+	EGIT_CLONE_TYPE="shallow"
+else
+	[[ "$(ver_cut 4)" == 'p' ]] || die "Unsupported version format, tweak the ebuild."
+	MY_PV="1.$(ver_cut 5)"
+	SRC_URI="https://github.com/raspberrypi/firmware/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/firmware-${MY_PV}"
+	KEYWORDS="-* ~arm"
+fi
 
 src_install() {
 	insinto /lib/modules
 	doins -r modules/*
 	insinto /boot
-	newins boot/kernel.img kernel.img
-	newins boot/kernel7.img kernel7.img
-
-	readme.gentoo_create_doc
+	doins boot/*.img
 }