Version bump

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

5 files changed, 121 insertions, 8 deletions

diff --git a/sys-boot/raspberrypi-firmware/ChangeLog b/sys-boot/raspberrypi-firmware/ChangeLog
index c95b85431ae3..cd40ee5e5a3c 100644
--- a/sys-boot/raspberrypi-firmware/ChangeLog
+++ b/sys-boot/raspberrypi-firmware/ChangeLog
@@ -1,6 +1,16 @@
 # 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.2 2013/07/15 11:34:34 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/raspberrypi-firmware/ChangeLog,v 1.3 2013/07/17 19:10:26 xmw Exp $
+
+*raspberrypi-firmware-9999.3.9 (17 Jul 2013)
+*raspberrypi-firmware-1_pre20130715 (17 Jul 2013)
+*raspberrypi-firmware-9999.3.6 (17 Jul 2013)
+
+  17 Jul 2013; Michael Weber <xmw@gentoo.org>
+  +raspberrypi-firmware-1_pre20130715.ebuild,
+  +raspberrypi-firmware-9999.3.6.ebuild, +raspberrypi-firmware-9999.3.9.ebuild,
+  -raspberrypi-firmware-9999.ebuild:
+  Version bump
 
   15 Jul 2013; Michael Weber <xmw@gentoo.org>
   +files/raspberrypi-firmware-0_p20130711-cmdline.txt,
diff --git a/sys-boot/raspberrypi-firmware/Manifest b/sys-boot/raspberrypi-firmware/Manifest
index 789ca845e2c2..2e9ad8a8d68a 100644
--- a/sys-boot/raspberrypi-firmware/Manifest
+++ b/sys-boot/raspberrypi-firmware/Manifest
@@ -4,6 +4,13 @@ Hash: SHA256
 AUX raspberrypi-firmware-0_p20130711-cmdline.txt 203 SHA256 4a5b380215cf65e7849ec11071abde3fdb002335747886cda35fa45b6d93fdb3 SHA512 ea4ddd6005bf8979d4299867a8889d67192c91467833beff8785bc01ac8d33544e712b2956da51b58a7b4ab1a1acaf4f27428d294f0dfae87ec91da8a71e3c9f WHIRLPOOL 11245812d1a7363ab0ac2849d92e0fb927d6d1f7a4efdc95508c52db471822e2c62dd9781a3dcb6fa46c3c819392091bc3a271f8408c71ca15f32341729684c1
 AUX raspberrypi-firmware-0_p20130711-config.txt 1706 SHA256 e34a2735eb15dc3927ca0c8f782d7c3b6ba9aa7271aabfa794985eadb3ce5c5a SHA512 2a0a19a84ab871d73e330e870b086b85a7776a1b17dd6054451be735249208a982249ca62f6d2fe51aba74c78f36266143d65ffe0549cdf8afbf20bcf637c78f WHIRLPOOL ba3854d8bc2e352d1e15635d63fcb1508a2d74288e9e3dc6d19fdd79cff439c0ad4fb10f459f9ed88e1898d1f81c6aadb8a2a117c6dcd9d159ca0fd20ca0249d
 AUX raspberrypi-firmware-0_p20130711-envd 53 SHA256 5daacb075f5501dc76c7cacce643ce43b42da5ad69932098eab6d184e36104a8 SHA512 032aa497cbde187ed8cfa5ba5adaf96b28f9dd2babb882d934d9009771ca50e9d8c6a8d5535551a8e8cf8e1932865dd0e4806ba56c9694952cbb3d93f9081ca7 WHIRLPOOL d003045db57217f55c29d8f144a59fa3be7196945512e1d9c9135eb38440ff1c1247edcf8268393e65776f750eeae5136802f46b20065e3bf3783ee1c6f11955
+DIST raspberrypi-firmware-9e9acf8978-bootcode.bin 17816 SHA256 f89d19c5287e566320ecd7e1d70d649f308a1b9d05a29d88a0768c3ba7a2bd14 SHA512 5332b2554cbdd3abb32f52506b851f7b3dc2c76a6f9040ec8ad946f6d9faf479e502dda11070aba7706d83e1c3839ff92ca8fbf8e79b972f91814dedbe19ea48 WHIRLPOOL 24e179152e392fc303e92cdfb8b4ef64e323736854bc826ddd0132a5652c9aa441027791781ff7f16fa7fb761485629977bd0882561b008fb66d4503be171e05
+DIST raspberrypi-firmware-9e9acf8978-fixup.dat 5890 SHA256 1aa67a9627274b0e0d6642dcaa1f773d4f93f8b771bd7a4ab88985d00b6d8dd3 SHA512 5b3dcd0e491df9ede05974df42f669e14aec4825eead0d174e017088ea8b3b439dfd6341dded46db0fc8c2b93c09cf3b2d342e340287e582881007d4dd7dccea WHIRLPOOL dcddeb4bbdb4e50f5b2031c17d4539a117325419ab8b877ddcc97eb7823e5a9b051fbe9de4d7fbcdfc4ec538686a17527d8384ca498cac8049346b5a87af2dfd
+DIST raspberrypi-firmware-9e9acf8978-fixup_cd.dat 2032 SHA256 2821dffb274e61a79b2e142123982bd543cdad973d171a15c5b74fdc2b0818d4 SHA512 9aa054a1488e574547c7401f722c86c1c6493e492059c12b7abbb97bdefb1415d04748aba8012011aae02a6a7a1c7efd1fd956704036f8fda7ab97cbe4e72910 WHIRLPOOL 1c34e854cf2f5b110681af47b73d3ef4e4e353a16ecdbd09c01e7c07cc5896168c0fd9a923e69abc14c78556278003cef82112f639636ab0f8f11f25d514ea3b
+DIST raspberrypi-firmware-9e9acf8978-fixup_x.dat 8840 SHA256 5900d89bb81da1caa2eac0e04fde4d77cd38256d5c0698288e2a3277991767c8 SHA512 90035d3e2b79565846cd8c050ae63a73383efd6abdde5961bed60752a0ce38e3429bcd2a1457768097262ed3c17bf7f5b72ede721686b490db7953397e38c76d WHIRLPOOL db3c365117c602d25ee59721eee46b3f30b8ebd1022690defaa2fa12c3ed9f3d99d73cda393b865db23c68cad1b05e71b597418b35d54dd3ef6e1d3aa7624c4f
+DIST raspberrypi-firmware-9e9acf8978-start.elf 2690196 SHA256 8395d80a9bc9c29cdd617eb6c75d61f0de6f1f88240e13c1bfbf93b8667d8247 SHA512 dec57577e9956730f561319ad58c4ed0ec2151d3c49eb68002292c965bf7a907aba3c059daa4f4df4b5183d2f3bb9ced0d2a75e32aa808b26b1e496e1ed15b22 WHIRLPOOL b66e35bf1d1a347abe5d62e4781bb3f5ce7176100ba63140caba441a0d3cd73a4bbdfcbcd68a874c245dfb46b51f2aa63c9743e7a87ec99be352ff8ca22811c8
+DIST raspberrypi-firmware-9e9acf8978-start_cd.elf 469208 SHA256 bb14c3a3cd6ffe9dd7531cd2d780c0e5f10e202766b67add5a3c0ec3bd19a7db SHA512 b8ead6fe98b88e771e6ca207fc91aaa632f217da45b464b777a321eb4e1136600c52b99d97662e39488286c935423e707265b1caf6bc38a368837faf82b75e1c WHIRLPOOL 461f78a21b431faeb5e0fae645a8a69c4b5da812a881ae657b021870b66c80e62f6a6621b2012fe85705913686214843da659665f4b415e80cba459e5a9bbfc7
+DIST raspberrypi-firmware-9e9acf8978-start_x.elf 3657604 SHA256 811a3760c4ed70d8f1e1d28ec9786cfa382705aef9ea1b0806e9756d3c337ca6 SHA512 03de9ae03b13afa3a2a5a55a8dfef7ccbb53e1bda4f4afef5d79cb0fc1079a5e3214a9f68778bb3a907cb1d8579a27452a1615bc13f66462b97ba23bc92aff69 WHIRLPOOL 4390d30acfeb6e1832f87875625c4d0b5c9adf3da5b9bb7981c85c641cb90e72a4b6a971c25ff3adf75279940e829de90d8e6363ba54259ee13f74315a316591
 DIST raspberrypi-firmware-ba8059e890-bootcode.bin 17816 SHA256 f89d19c5287e566320ecd7e1d70d649f308a1b9d05a29d88a0768c3ba7a2bd14 SHA512 5332b2554cbdd3abb32f52506b851f7b3dc2c76a6f9040ec8ad946f6d9faf479e502dda11070aba7706d83e1c3839ff92ca8fbf8e79b972f91814dedbe19ea48 WHIRLPOOL 24e179152e392fc303e92cdfb8b4ef64e323736854bc826ddd0132a5652c9aa441027791781ff7f16fa7fb761485629977bd0882561b008fb66d4503be171e05
 DIST raspberrypi-firmware-ba8059e890-fixup.dat 5890 SHA256 f70019ed5b4deacb09cbf209c0881555374d3cdf2d136b1a69cfd9bab4e441da SHA512 1fc7b31892fa768f901b05b4b5ebc952b393eeb65a91847fbd346ff636808e9c585d67351280c5250557aab2b15f3563b733ba592b859c13cbd206a7f72fe58f WHIRLPOOL b3c3b7920446693122dc438d99dbda65019fecad1ac18f5f17946d8ee9bfd701d958a2cee2ff8f7a0f78eebd79fb92149b92d5bdd0b94f8cc9d8743f70abf55c
 DIST raspberrypi-firmware-ba8059e890-fixup_cd.dat 2022 SHA256 5cbecdc42a92dbbaa96d1d8c82712b6c3cfe448254ee62fcb6b0a303a86c64d5 SHA512 3d55ee733581d697762dfe39efbcad43ee24b6b369858736886918e539b7280c456d2a1dd7f0f1c07b2c83006e40756959c9f3b1ebc9c23f0bd834a21d1e2f76 WHIRLPOOL 386161d30e03c22f832265be3ae301927f10411c53b5cf2e1ab38d4b99351dc6ce732308409ee745fd763b0f3eb83335aaa791ef913a130cb724ba32c0eaeffb
@@ -12,13 +19,15 @@ DIST raspberrypi-firmware-ba8059e890-start.elf 2690132 SHA256 324a40f565f49dcb63
 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-9999.ebuild 1244 SHA256 6e6cc0a5f07412f6b5c3b392f67ac8598d471bddc6458c1e602cbffb081eeea3 SHA512 34cb4a1b9b4143470400c2640d3bc8b924b7d3171a2a7c08f79875bed9aa81b97c39403495116c83c70efac69baabcb9c55f9186553f43cded9c0c5e585f54e8 WHIRLPOOL 18586dd6abde6a0132402be252e3f86ad3d265e6ac81503eaf23b99664436b1ed1f7eaf125e017ec6b91aad6ca4c44e30a06ff9a6d1afbd8a1b6e52aa914ee61
-MISC ChangeLog 920 SHA256 3cdd191f0c341f68db734873a5db9215ce0466d47c78d05ed35e583ee661f18f SHA512 7fdcee1ca1f5bd9b107f0c71119fecd084548df9b9ddf63bc8655858455666064a7bd5efabb9711a716eda94f1b258ebf924a79136123a1b75236343c5f7e70a WHIRLPOOL e88c5fa6c8d94ee5ff2832adec35871e1e4c8235578e821af84a227f98dbe6fdd04935d325349594c8b865ff375b85e23eb42c4880f15fa05c4837c0bcc36bd1
+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
 MISC metadata.xml 223 SHA256 89097f936927d56068988263e382edb683f359b27293955708e9ade4d256220d SHA512 c9f6a48b2aa05afdf73b8bd824c65480d76e54b659ca39928398c66f764d34faf186255d8aea034737424a962cf35151b610d078a01f8193b027c63e1e3c51b5 WHIRLPOOL 1ce20c98a7e177b8f510ef41f3935b0db5e04b2ecf465a683b2f2515f6a3043c33e6e9efc87f5aaaf59b2ed9be376d9d16bc8beff66b11aaa50ea899bfdc1f62
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iF4EAREIAAYFAlHj3kcACgkQknrdDGLu8JAkFwD/cmamDmzWEWWDh4rEwyA7BocL
-+xIh/M4IbonGy9n2Hz4A/AoXJzH76OsxNRB1QF5kaiUVTrvFf4o+tvRA+he9xKGm
-=U6al
+iF4EAREIAAYFAlHm7B4ACgkQknrdDGLu8JAK7gD/dETBvlhPWO0HKEBRgVvcHQqA
+L3TOTcWqg36hRMVMG9YA/2K4KlXmPylmYM0D1XM94LOY/EwwBJ8CCAgCi8BJczF7
+=eSQW
 -----END PGP SIGNATURE-----
diff --git a/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1_pre20130715.ebuild b/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1_pre20130715.ebuild
new file mode 100644
index 000000000000..a7f62c0811b0
--- /dev/null
+++ b/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1_pre20130715.ebuild
@@ -0,0 +1,51 @@
+# 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 $
+
+EAPI=5
+
+inherit readme.gentoo
+
+DESCRIPTION="Raspberry PI boot loader and firmware"
+HOMEPAGE="https://github.com/raspberrypi/firmware"
+MY_COMMIT="9e9acf8978"
+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}
+
+RESTRICT="binchecks strip"
+
+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."
+		fi
+	fi
+}
+
+src_install() {
+	insinto /boot
+	local a
+	for a in ${A} ; do
+		newins "${DISTDIR}"/${a} ${a#${PN}-${MY_COMMIT}-}
+	done
+	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
+}
+
+DOC_CONTENTS="Please configure your ram setup by editing /boot/config.txt"
diff --git a/sys-boot/raspberrypi-firmware/raspberrypi-firmware-9999.3.6.ebuild b/sys-boot/raspberrypi-firmware/raspberrypi-firmware-9999.3.6.ebuild
new file mode 100644
index 000000000000..945fbd902632
--- /dev/null
+++ b/sys-boot/raspberrypi-firmware/raspberrypi-firmware-9999.3.6.ebuild
@@ -0,0 +1,42 @@
+# 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 $
+
+EAPI=5
+
+inherit git-2 readme.gentoo
+
+DESCRIPTION="Raspberry PI boot loader and firmware"
+HOMEPAGE="https://github.com/raspberrypi/firmware"
+EGIT_REPO_URI="https://github.com/raspberrypi/firmware.git"
+EGIT_PROJECT="raspberrypi-firmware.git"
+EGIT_BRANCH="master"
+
+LICENSE="GPL-2 raspberrypi-videocore-bin"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+DEPEND=""
+RDEPEND="!sys-boot/raspberrypi-loader"
+
+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."
+		fi
+	fi
+}
+
+src_install() {
+	insinto /boot
+	doins boot/bootcode.bin boot/fixup*.dat boot/start*.elf
+	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
+}
+
+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.3.9.ebuild
index 37b38beddfb7..01f7071dec1e 100644
--- a/sys-boot/raspberrypi-firmware/raspberrypi-firmware-9999.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.ebuild,v 1.2 2013/07/15 11:34:34 xmw Exp $
+# $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 $
 
 EAPI=5
 
@@ -10,6 +10,7 @@ DESCRIPTION="Raspberry PI boot loader and firmware"
 HOMEPAGE="https://github.com/raspberrypi/firmware"
 EGIT_REPO_URI="https://github.com/raspberrypi/firmware.git"
 EGIT_PROJECT="raspberrypi-firmware.git"
+EGIT_BRANCH="next"
 
 LICENSE="GPL-2 raspberrypi-videocore-bin"
 SLOT="0"
@@ -31,7 +32,7 @@ pkg_preinst() {
 
 src_install() {
 	insinto /boot
-	doins bootcode.bin boot/fixup*.dat boot/start*.elf
+	doins boot/bootcode.bin boot/fixup*.dat boot/start*.elf
 	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}