Clearify message about /boot/{config,cmdline}.txt, only warn if files exist (INSTALL_MASK, thanks TomWij).

Package-Manager: portage-2.2.0_alpha188/cvs/Linux x86_64
Manifest-Sign-Key: 0x62EEF090

6 files changed, 72 insertions, 21 deletions

diff --git a/sys-boot/raspberrypi-firmware/ChangeLog b/sys-boot/raspberrypi-firmware/ChangeLog
index cd40ee5e5a3c..f98ba0f57f29 100644
--- a/sys-boot/raspberrypi-firmware/ChangeLog
+++ b/sys-boot/raspberrypi-firmware/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-boot/raspberrypi-firmware
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/raspberrypi-firmware/ChangeLog,v 1.3 2013/07/17 19:10:26 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/raspberrypi-firmware/ChangeLog,v 1.4 2013/07/19 12:43:29 xmw Exp $
+
+  19 Jul 2013; Michael Weber <xmw@gentoo.org>
+  raspberrypi-firmware-0_p20130711.ebuild,
+  raspberrypi-firmware-1_pre20130715.ebuild,
+  raspberrypi-firmware-9999.3.6.ebuild, raspberrypi-firmware-9999.3.9.ebuild:
+  Clearify message about /boot/{config,cmdline}.txt, only warn if files exist
+  (INSTALL_MASK, thanks TomWij).
 
 *raspberrypi-firmware-9999.3.9 (17 Jul 2013)
 *raspberrypi-firmware-1_pre20130715 (17 Jul 2013)
diff --git a/sys-boot/raspberrypi-firmware/Manifest b/sys-boot/raspberrypi-firmware/Manifest
index 2e9ad8a8d68a..a3b74beb64b4 100644
--- a/sys-boot/raspberrypi-firmware/Manifest
+++ b/sys-boot/raspberrypi-firmware/Manifest
@@ -18,16 +18,16 @@ DIST raspberrypi-firmware-ba8059e890-fixup_x.dat 8842 SHA256 356d1e0efc343545aa1
 DIST raspberrypi-firmware-ba8059e890-start.elf 2690132 SHA256 324a40f565f49dcb63282133c2ae60c7d113c4a362a09c45d45918c6dba30ac9 SHA512 4e7e3c817936f576a2a033bbf95940804ac19ef133ece9c9603e56e97bee0a1aa46b107c714cb37018bc18bbc4dccbbfabaedc3a7d870eee262763e07130e9fc WHIRLPOOL 3feaf69da05d41bd98e4788f38b3ccf4865cfb8a8f53fd18f11a9689a8018fd0634dddfecc51d4ed118735523e234aa043f4dd649ba1d0081a69e9497c421558
 DIST raspberrypi-firmware-ba8059e890-start_cd.elf 469176 SHA256 5035acc265979ff84a6c96ae6999ee51af9dc4db0630da2351f99500f8cb750e SHA512 5928bb24b476fed695c1a3b18ee19bd719e2f41cfa7af819d7cca27b123b21c304c894347a87fb2399faf59d544ea934b83517c4b9590d42d7e6bbf9155e8cac WHIRLPOOL dddb4d4dee3015e1dd2cbb259b2f1224cc4824890b52aeb407bcadb4e4e51b9a5db0770220e944ff0a522bfa37e0778509bdabf6a9194fd2799b66a1b537ca34
 DIST raspberrypi-firmware-ba8059e890-start_x.elf 3657572 SHA256 9d2e0e7e41521f84de3d2a9ee9330757be0c69015dd47ee4987776284329d998 SHA512 fb815ed410c0d1672aec6d5c17a9f9db88ee8a11e2e637256e52566a26a6e72d5fa13030dec89f7e69efe52431edd87fe352f152b9899db1ed265f877c1833b3 WHIRLPOOL e4f8fa01b7d65a6bf8c70033280b589ff9d25e24cfaca4b27dcce58ba2a9fa6377c961df2acb4ae994f4426cc5df5e164dc5f70146a964f59fbe6bfbab8afba2
-EBUILD raspberrypi-firmware-0_p20130711.ebuild 1469 SHA256 6c2d5aa9d946d3e3641bd45c90b0faf6e234bbf8e551dfb0b80e09d73f814186 SHA512 a631f575c133a285b5de4fd2061e452a2dc38aa614c463197f8e5cbaf475cfa8b8015b276b8e00c23113ea6325846438b3ea3e0505a4f8bdfe6b48aeef415350 WHIRLPOOL d26f3614e7ea3e47a896968374de64e40d80d3598b0914fbb3202462a2aabfcde268de68f56aa5577496582f300b110c1296ca9ea6ec531629f2725faf18c206
-EBUILD raspberrypi-firmware-1_pre20130715.ebuild 1471 SHA256 692a4b55181a2b210c75b373c119fb6a05d1b66cf830e3741ee2194f24002e58 SHA512 04e6825b2c9e22c0d1765f258db7877c93cbabcc9c9d2e0c4b2af1f149f03755015ea0bf20f285ceba91610221135be830eb563661208d84d557c663e27f0f6a WHIRLPOOL 22f7b6d075a6e299df80ea288f547812eaad501a73c0260dfd4b87a0917a8084b333d2b516459d398fc48fa5e6919de2ce5fcdc0ae47066e5df0f10866502908
-EBUILD raspberrypi-firmware-9999.3.6.ebuild 1274 SHA256 cf424ce45eaa94f32e8fdce5d114015acd437241167fe14fefe366b76713a9a9 SHA512 2a43e150419287b5f49c6f9299ac9c45df3a2ab21968ef439b7053e94e25085aba17338cfe5dbd838dae2ffa57d8bc191e085c314040dea772f6359701d58b74 WHIRLPOOL 6188a3c4bfc7fe1f1fbd9c80631e7fa69ba07144f54b7fbc70f74d89d05af83cc3d5b92d7edd04588a025965d3f7f5dc557c676a280f37a0189d39dd2e5f0617
-EBUILD raspberrypi-firmware-9999.3.9.ebuild 1272 SHA256 67175a4ce9a8b38376605ce7a48bf6f3a77609a9bd97fcd59da70674b8db2360 SHA512 686981d9a8f35e3ce7e7ca74ef772bf6e88a871f1589b241009e72577196b4eb31f8fca08afd799ff318e08193a13a71201c14fe59c1f24720b61e91b89488fe WHIRLPOOL a20c010184f7d6d3dc890e4eab1c35a7a5d234987e8d030f11bd2ca0203a5a5dbf9fc2918eb66c79410facb1d8c685bd41905fb2ea5757944e517e505cac8f61
-MISC ChangeLog 1286 SHA256 42fdb1ddd32cfbfc4cb0e9524d7ffccd3b17faa91bf836951417dfbac2ffbe9b SHA512 c8d07b0dc156896180f6c078cd6ae8c437c21cab1d56d30d98c02b51d4e062a5cf1b97f5c6847125b13002f8be1d42048a9dd6024d610709a097f81d937739fa WHIRLPOOL 9bc4a82346f13ec0006f3033059be925a15623c2f2d12eaf4728e47ff51ac90589df1a155ded1695cc2d79d8b5763c76e73352f8d5496a079243bf6d5daafa89
+EBUILD raspberrypi-firmware-0_p20130711.ebuild 1780 SHA256 bb1cdcf3504aa45e64842cfd2ede517604f327312b9ca4444a3dcb3995749e35 SHA512 5058e99ae44e109266441050fcdc25526f9aecbb7ef673be078d2c907b386abb3429a094fe310f26f6e28729fb0f87416527027fb42f82a590e46452ca871a08 WHIRLPOOL f07c24d338a3141ecf8afb4a6975863041ad358722ed6d60bc30663de24e7ea6885f4921070a256618ae12cb2c4f0689ae24606273ae3120e7c44b153525878e
+EBUILD raspberrypi-firmware-1_pre20130715.ebuild 1782 SHA256 05e572abb8d4f9ee0396395b3d27b45937b27fbd1826313003729ab289f1f71e SHA512 a4ff97f54f05dcb7e3991f0951b0315bac80e84f419828ed649d78730adc2eda10eaf4efb97d759cbe2bfb1c02f48149dcfa8620469c2bff5c5cd56556f3e997 WHIRLPOOL 0db2eed2d4406ec7cee0545113e69a9e5d03be4df4218e069dbe77f1eb692df01971fe3c69aec05f40961216145a1926fe8f4e9b7d0a893e6dd9b411b4f6c652
+EBUILD raspberrypi-firmware-9999.3.6.ebuild 1585 SHA256 22e251f023069f3f3e52f3f341d3a3f945164366d58015e1c3de06ab63ec0faf SHA512 b7673a348b4e329beea232d8b516c1100e945c1bafba36e587450689d4acccd6bc8af56b43281ada520954d31177a286b774114b2dc3b89528229853f151565d WHIRLPOOL eee31587723bf09059dd5b7922b8e79f91ed85db204e67a173ceb09f924dc96e92c866d4162f51aceb63ee47f25ff3b86df672a2922b1132cf42b6bfcef48e86
+EBUILD raspberrypi-firmware-9999.3.9.ebuild 1583 SHA256 60dfb0f39191db9f1e97853b41dc2ad55f98818b8f97131b8a966a88980b17fe SHA512 3d79d2a56271581f9a4898751a6599d02e9e3757303b6884d88b5d8437c5ba4ae879e47bebc6e7647207809a65e582c3fd4b477ee5f056ad11e6b5dee3262602 WHIRLPOOL 7778a39ac85e452be3e2f1049d9c7a74d69a96e936185076eb305dd09aa7d018ed1228335f3d77e761113ab45ee822d0aea70f8bd49c0e18f5d4c04b6d4e5775
+MISC ChangeLog 1610 SHA256 c11f4cccb306c7018e7308b9ecf3fd28e9b3d897826e121c72bc530365b764a1 SHA512 466d1c332b3e667f7a3ee1556360f427c250ba2c44ee6c5bcb1dc67c4d516e9f24b17a751094d3c45e2acd5ff0d9b65a0a95231c40320112455782460aea1c70 WHIRLPOOL 3fba1122a1841b980932b06739d80871f4397e39c5ca6bf891354bd4b86a3493a80c9aea3b8d465215583113c5d76cec20ae7a92b437e5dc0bcbf47bf12c417c
 MISC metadata.xml 223 SHA256 89097f936927d56068988263e382edb683f359b27293955708e9ade4d256220d SHA512 c9f6a48b2aa05afdf73b8bd824c65480d76e54b659ca39928398c66f764d34faf186255d8aea034737424a962cf35151b610d078a01f8193b027c63e1e3c51b5 WHIRLPOOL 1ce20c98a7e177b8f510ef41f3935b0db5e04b2ecf465a683b2f2515f6a3043c33e6e9efc87f5aaaf59b2ed9be376d9d16bc8beff66b11aaa50ea899bfdc1f62
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iF4EAREIAAYFAlHm7B4ACgkQknrdDGLu8JAK7gD/dETBvlhPWO0HKEBRgVvcHQqA
-L3TOTcWqg36hRMVMG9YA/2K4KlXmPylmYM0D1XM94LOY/EwwBJ8CCAgCi8BJczF7
-=eSQW
+iF4EAREIAAYFAlHpNHIACgkQknrdDGLu8JCyewD9F/l3+0wbiqcGOiSMauq9wir1
+zQLv7q7iv5Il1QWlj+MBAIJSaJBbqBVPtYjAmtEDKyVoCGwfswuDTosvjTHBeY2S
+=yrIg
 -----END PGP SIGNATURE-----
diff --git a/sys-boot/raspberrypi-firmware/raspberrypi-firmware-0_p20130711.ebuild b/sys-boot/raspberrypi-firmware/raspberrypi-firmware-0_p20130711.ebuild
index 54a3a8cf157d..2604f1c592cc 100644
--- a/sys-boot/raspberrypi-firmware/raspberrypi-firmware-0_p20130711.ebuild
+++ b/sys-boot/raspberrypi-firmware/raspberrypi-firmware-0_p20130711.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/raspberrypi-firmware/raspberrypi-firmware-0_p20130711.ebuild,v 1.2 2013/07/15 11:34:34 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/raspberrypi-firmware/raspberrypi-firmware-0_p20130711.ebuild,v 1.3 2013/07/19 12:43:29 xmw Exp $
 
 EAPI=5
 
@@ -30,8 +30,19 @@ src_unpack() { :; }
 
 pkg_preinst() {
 	if [ -z "${REPLACING_VERSIONS}" ] ; then
-		if [ -e /boot/cmdline.txt -o -e /boot/config.txt ] ; then
-			die "Please backup and remove /boot/cmdline.txt and /boot/config.txt to and merge configs after installation."
+		local msg=""
+		if [ -e "${D}"/boot/cmdline.txt -a -e /boot/cmdline.txt ] ; then
+			msg+="/boot/cmdline.txt "
+		fi
+		if [ -e "${D}"/boot/config.txt -a -e /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 durning install"
+			msg="${msg} and merge settings afterwards."
+			msg="${msg} Further updates will be CONFIG_PROTECTed."
+			die "${msg}"
 		fi
 	fi
 }
diff --git a/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1_pre20130715.ebuild b/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1_pre20130715.ebuild
index a7f62c0811b0..19b667186808 100644
--- a/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1_pre20130715.ebuild
+++ b/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1_pre20130715.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1_pre20130715.ebuild,v 1.1 2013/07/17 19:10:26 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1_pre20130715.ebuild,v 1.2 2013/07/19 12:43:29 xmw Exp $
 
 EAPI=5
 
@@ -30,8 +30,19 @@ src_unpack() { :; }
 
 pkg_preinst() {
 	if [ -z "${REPLACING_VERSIONS}" ] ; then
-		if [ -e /boot/cmdline.txt -o -e /boot/config.txt ] ; then
-			die "Please backup and remove /boot/cmdline.txt and /boot/config.txt to and merge configs after installation."
+		local msg=""
+		if [ -e "${D}"/boot/cmdline.txt -a -e /boot/cmdline.txt ] ; then
+			msg+="/boot/cmdline.txt "
+		fi
+		if [ -e "${D}"/boot/config.txt -a -e /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 durning install"
+			msg="${msg} and merge settings afterwards."
+			msg="${msg} Further updates will be CONFIG_PROTECTed."
+			die "${msg}"
 		fi
 	fi
 }
diff --git a/sys-boot/raspberrypi-firmware/raspberrypi-firmware-9999.3.6.ebuild b/sys-boot/raspberrypi-firmware/raspberrypi-firmware-9999.3.6.ebuild
index 945fbd902632..86aca6780f42 100644
--- a/sys-boot/raspberrypi-firmware/raspberrypi-firmware-9999.3.6.ebuild
+++ b/sys-boot/raspberrypi-firmware/raspberrypi-firmware-9999.3.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/raspberrypi-firmware/raspberrypi-firmware-9999.3.6.ebuild,v 1.1 2013/07/17 19:10:26 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/raspberrypi-firmware/raspberrypi-firmware-9999.3.6.ebuild,v 1.2 2013/07/19 12:43:29 xmw Exp $
 
 EAPI=5
 
@@ -24,8 +24,19 @@ RESTRICT="binchecks strip"
 
 pkg_preinst() {
 	if [ -z "${REPLACING_VERSIONS}" ] ; then
-		if [ -e /boot/cmdline.txt -o -e /boot/config.txt ] ; then
-			die "Please backup and remove /boot/cmdline.txt and /boot/config.txt to and merge configs after installation."
+		local msg=""
+		if [ -e "${D}"/boot/cmdline.txt -a -e /boot/cmdline.txt ] ; then
+			msg+="/boot/cmdline.txt "
+		fi
+		if [ -e "${D}"/boot/config.txt -a -e /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 durning install"
+			msg="${msg} and merge settings afterwards."
+			msg="${msg} Further updates will be CONFIG_PROTECTed."
+			die "${msg}"
 		fi
 	fi
 }
diff --git a/sys-boot/raspberrypi-firmware/raspberrypi-firmware-9999.3.9.ebuild b/sys-boot/raspberrypi-firmware/raspberrypi-firmware-9999.3.9.ebuild
index 01f7071dec1e..ce4e6b9c4eb4 100644
--- a/sys-boot/raspberrypi-firmware/raspberrypi-firmware-9999.3.9.ebuild
+++ b/sys-boot/raspberrypi-firmware/raspberrypi-firmware-9999.3.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/raspberrypi-firmware/raspberrypi-firmware-9999.3.9.ebuild,v 1.1 2013/07/17 19:10:26 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/raspberrypi-firmware/raspberrypi-firmware-9999.3.9.ebuild,v 1.2 2013/07/19 12:43:29 xmw Exp $
 
 EAPI=5
 
@@ -24,8 +24,19 @@ RESTRICT="binchecks strip"
 
 pkg_preinst() {
 	if [ -z "${REPLACING_VERSIONS}" ] ; then
-		if [ -e /boot/cmdline.txt -o -e /boot/config.txt ] ; then
-			die "Please backup and remove /boot/cmdline.txt and /boot/config.txt to and merge configs after installation."
+		local msg=""
+		if [ -e "${D}"/boot/cmdline.txt -a -e /boot/cmdline.txt ] ; then
+			msg+="/boot/cmdline.txt "
+		fi
+		if [ -e "${D}"/boot/config.txt -a -e /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 durning install"
+			msg="${msg} and merge settings afterwards."
+			msg="${msg} Further updates will be CONFIG_PROTECTed."
+			die "${msg}"
 		fi
 	fi
 }