Merge branch 'master' of git.calculate.ru:dev/overlay

Conflicts:
	sys-boot/calcboot/Manifest

profiles/calculate/package.keywords/defaults

@@ -13,8 +13,6 @@
 
 ~sys-apps/man-db-2.5.7 amd64 x86
 
-~sys-boot/calcboot-3.86.0 amd64 x86
-~sys-boot/syslinux-3.86 amd64 x86
 ~sys-apps/baselayout-2.0.1 amd64 x86
 
 ~net-wireless/iwl5150-ucode-8.24.2.2 amd64 x86

profiles/calculate/package.mask

@@ -3,3 +3,7 @@ sys-fs/device-mapper
 
 # hasn't patch for Calculate profiles
 >app-admin/eselect-1.2.10
+
+#for support sys-boot/unetbootin
+>=sys-boot/calcboot-4.0
+>=sys-boot/syslinux-4.0

sys-boot/calcboot/ChangeLog

@@ -2,6 +2,10 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  22 Dec 2010; Трацевский Александр
+  <atratsevskiy@gentoo.org> calcboot-4.02.1.ebuild:
+  Mask calcboot-4.02.1 for support unetbootin 494
+
 *calcboot-3.86.0 (17 Aug 2010)
 
   17 Aug 2010; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>

sys-boot/calcboot/Manifest

@@ -18,6 +18,6 @@ EBUILD calcboot-3.82.0-r1.ebuild 1598 RMD160 37fe9a71c0e6b5dedc87b3b7c316c2fd1bf
 EBUILD calcboot-3.83.0.ebuild 1598 RMD160 37fe9a71c0e6b5dedc87b3b7c316c2fd1bfd633e SHA1 618de70fc3a47cf1382bd7becb03cac4e8ea4743 SHA256 2d848f319edc1f767bcc1d74ee2c1782bbf2b9615c893298fa286b3292cf561a
 EBUILD calcboot-3.86.1.ebuild 1597 RMD160 154001af6106e6f8995df23d77775c477640cc01 SHA1 6641ed97e34719444eaccd15b9ce7f18a7ef4f7f SHA256 7689ddf1a2f6ddd8e40b0adf6c4466072b4c415a26bb69f9268bd6362ccf4b92
 EBUILD calcboot-3.86.2.ebuild 1597 RMD160 154001af6106e6f8995df23d77775c477640cc01 SHA1 6641ed97e34719444eaccd15b9ce7f18a7ef4f7f SHA256 7689ddf1a2f6ddd8e40b0adf6c4466072b4c415a26bb69f9268bd6362ccf4b92
-EBUILD calcboot-4.02.1.ebuild 1548 RMD160 524430e952a85425657877cbcffc57744f91c99a SHA1 62218ff9281b4c17de2c79db571d6bdb1b611312 SHA256 457c7d8a859054c6cb9e59b692c44fc147b9fcb9973dad7c551cac1eae40f9a3
-MISC ChangeLog 1042 RMD160 f03eff4144659e17b98550f3431d59293af91b3a SHA1 eb775d53d7be8fd2f0b08bd90334cf148535040e SHA256 74a82adf2dacfa72e743173c597f1fc640044a013d21810a3de06e063eb16192
+EBUILD calcboot-4.02.1.ebuild 1550 RMD160 881bd80ddb5367cb58a1d05dbf43aff647faaff0 SHA1 d3088e523d20a9e6042198adbcddb26038d7b0d0 SHA256 3187a8e754229eebc6842f41d2f1781d413491dcf08ec11bb1e4f4212602e4fd
+MISC ChangeLog 1200 RMD160 6ab4f62a6eef60bc027113e74178f04495e545d6 SHA1 f1b4f9d3743ffcdba74d4d32395e013900290b72 SHA256 74b36a709c7fa15fe3bb1f00b324dd46305394f1df45e7883ecbfc74edbadecf
 MISC metadata.xml 252 RMD160 e886f2ac14de406bbadb647631df7b3de928794e SHA1 ea46203f8029e9877a5656756196cf6fa4643594 SHA256 4352693c8bde260bfcdaad19c5e9f5e116ae56492f1223d4b3c713b4c24a1997

sys-boot/calcboot/calcboot-4.02.1.ebuild

@@ -17,7 +17,7 @@ SRC_URI="mirror://kernel/linux/utils/boot/syslinux/${SYSLINUX_PV:0:1}.xx/${SYSLI
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="~sys-boot/${SYSLINUX_P}"