gentoo resync : 16.01.2018

8 files changed, 63 insertions, 9 deletions

diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index b02f64a9587d..e7a6c65ad625 100644
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
diff --git a/app-portage/cpuid2cpuflags/Manifest b/app-portage/cpuid2cpuflags/Manifest
index d250b672f701..cca4eeadcb20 100644
--- a/app-portage/cpuid2cpuflags/Manifest
+++ b/app-portage/cpuid2cpuflags/Manifest
@@ -1,6 +1,6 @@
 DIST cpuid2cpuflags-5.tar.bz2 72050 BLAKE2B e9b7022ae5b7d51c88b5e41d9d7af1175498cb5a1f32876bfb766f785060f501d07ba3a5c346961e742bbf7022121faf3d0d068ec711ee9ed4e67cbdcd72a58a SHA512 41dcd2b974f6bd96867dea15a3839a8d63a3ff600189107ab16a67b5bc77ef421acbedb83f3e3b16ec90ac900d187aa8c44baae6fbdb4988f3bf7caa2d0d19a2
 DIST cpuinfo2cpuflags-1.tar.gz 1429 BLAKE2B 5126e643e5e2ea0be2418068fbcfbbae1781a0e3ab7903d909d4a5a291cb2e5db132a7a6a5c6db12a757688efca0557e4331a91f64af4b7e47deca415fd05b34 SHA512 68a21cfdb0fc8c6eb5aad5c6702d50dd56c927b2010efea1651dbc6a9657654b770bc5a4055fb11e790066c2c63c9ea29c3e03d91057abe187e7029e6797aede
 EBUILD cpuid2cpuflags-1.ebuild 1058 BLAKE2B 2f84de424a39c3f163dffffb5acf0b919e1abd2375b961e6f1f281011157fe7fabcebcee4ba771abfb2fef9407fbf4c67a104aa3ec4de2bf1d81b91cbc6e272c SHA512 ca30faabee1bd898fc80f7207fe71d205d6ee6a09e1697f242bfafaca1071fb343ab58623d713b15202096f6e3e240dd83600ce0b695be546721037c77e9c850
-EBUILD cpuid2cpuflags-5.ebuild 930 BLAKE2B 3e5303f56f197a2d2e7212d47fb7ca3cbd153401938274d3f262ab7266f4ac934c4cd5ae4d17438aab3ddc129b0df84d283229f27fba4393ac12fab5ed42b512 SHA512 428b39f888875375ecb735e2d75e562e4df447133e9eece95156e0eafcd6672baa09d2ffad96769f171027cd4207d1fc02d4e24f9cf900dcce0425183db3adc0
+EBUILD cpuid2cpuflags-5.ebuild 929 BLAKE2B a9568135089815a20bc27a37cf9584a36fca6dc1300d79d31f94359c871b1f577bb9e7d4cee1d45d9d3ed5c3cfa9126d47f6b81661e932baf957af9d0374625c SHA512 5ff8e6fcbda6428cf86a4580b04222266eafd24ecec7801b5242675a6300850b82eacc2895ed5c5ec3d65f7d8f7c09a95bf602d316c6d37e8c31e31010f7c01b
 EBUILD cpuid2cpuflags-9999.ebuild 410 BLAKE2B db323508784e37a7f4220c8d192460e854ab54bccfcebb40826821335de6834e97460dd4bc6dfbe11fc6d650171fb76a0a9196bb1bf6af81a08db35afda2e466 SHA512 02a38010f453641b73461f5afb980b7e1cb1817f3a688064d699827d698f94a3f27a65f7c0dddb7be287694cfe426bbfdd5ec03714d3b777a4975a38e5561b69
 MISC metadata.xml 343 BLAKE2B 29f607a891c673bbf997aa75bb445adfc43cffa35f63a30d1f2b06e4c5a7429ad503fae596c4c633b7e6680e26da674bd9f8aaea32a8a9bd8a3ac2c79a0a5667 SHA512 8ae8b8d61adaf555d1f59e50655e9e12f342e194ab8363f03a34390eed1455144acee39553b93306d9775b8c9fb119de52b8bb4d9284c71ddc39c3d3414a31dc
diff --git a/app-portage/cpuid2cpuflags/cpuid2cpuflags-5.ebuild b/app-portage/cpuid2cpuflags/cpuid2cpuflags-5.ebuild
index 318806faa56c..6467a205914b 100644
--- a/app-portage/cpuid2cpuflags/cpuid2cpuflags-5.ebuild
+++ b/app-portage/cpuid2cpuflags/cpuid2cpuflags-5.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/mgorny/cpuid2cpuflags/releases/download/v${PV}/${P}.
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 pkg_postinst() {
diff --git a/app-portage/gemato/Manifest b/app-portage/gemato/Manifest
index f4ba8684b56e..31f965926493 100644
--- a/app-portage/gemato/Manifest
+++ b/app-portage/gemato/Manifest
@@ -1,4 +1,6 @@
 DIST gemato-9.2.tar.gz 60217 BLAKE2B f46cb35b5ae71fe1743c7a43bfeff42a9d77517ef48dca1dd05c5c8cd569d5dcd9bdb0c0957d81d2db6b8d873099463fd6132121be04e0fd6f55bb130df48c2e SHA512 bb40abb910b528e455bdc01ed528071ca6f1390a8a5ae670692c93e6c3fc8fd7fc7e95d7321c81ad5144fc8a042676a8dac634c7b3f68e7f725edc98edd30c94
+DIST gemato-9.3.tar.gz 60601 BLAKE2B d85bf5910736da2ca887567799dee1823e9be6af9b17a8f9deb84ee24bb725c3550aafffa51b15484acb7d37ddbd5996aa4175a8f307b6e3a593f8b5497822be SHA512 7f81409b3b9bd65d295cd760af5cabfc7daf257740f00015f07cd7a0cffd02a40f219b59378179b58bf53b321fb543b308457d3a8b7adcb02981562282f1f46f
 EBUILD gemato-9.2-r1.ebuild 1576 BLAKE2B 53a4d0f449757f13b456e4ecd364fd8b4ab054f14bda9fd00f9ff4774fae47c902e874ba72d76c0808bf3a5dcf392d1f2f4339c0d31fce727d3d452a9e369b23 SHA512 510cc1699b35cb234d86e41ab43f84b4b2798ccf29f0e1209e8806c5598864b7317c559f0e7ff3763ba28b6067edf1c7088d979314709bbb6233d6408536dd1b
+EBUILD gemato-9.3.ebuild 1370 BLAKE2B 0fc7416830c23b65f8fbe9e2d766fd2e52f551654cd6dd583fec60dea70f7045f2d5e859cb9fb021b62deda75d9af6a4485abf862c1ac04e06617736d759b3de SHA512 efc1627f4874ecb324c047cf31cebf04db7e14c09652a0ece6c89311fa9416693c1fa52c2f23053b31b76ba927591d0e4f3f6f1d67ac69dd1616230091fb10d1
 EBUILD gemato-9999.ebuild 1373 BLAKE2B 7e8bc4fe97e744414e52bf382707c997ffc06b6f996e622c90c6d4dc1816889b947ea775efa64f2589c4801a039c18c7fa44796b75fa063c2a250923a575817c SHA512 b7f6a5f21aa92c933dc6ab0b66b35a76949ea8daca49a2e37a87505483b820c3e54fe03db9ccbc3d32e0b722a893681193fb5f5738e0d4e6b3f2d1be700e0f62
 MISC metadata.xml 785 BLAKE2B ad8381a17cee4fee5099ca5e4312b703eae026436ec8082f272954ec0850547844923e108c02d9041beb6bfcd33bf18c846344d797f56a61170fd6b4445557c2 SHA512 86ffb0a9b39e261b35430d1055deebe8c66eb2c285211274feb793bf003296389a3bbb38ccd33d350a8bf56fcd241edcf9576305fc3aaf68cab68401ad983b83
diff --git a/app-portage/gemato/gemato-9.3.ebuild b/app-portage/gemato/gemato-9.3.ebuild
new file mode 100644
index 000000000000..fc3300922c24
--- /dev/null
+++ b/app-portage/gemato/gemato-9.3.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# pyblake2 & pysha3 are broken with pypy*
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+inherit distutils-r1
+
+DESCRIPTION="Stand-alone Manifest generation & verification tool"
+HOMEPAGE="https://github.com/mgorny/gemato"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+blake2 bzip2 +gpg lzma +portage-postsync sha3 test"
+
+MODULE_RDEPEND="
+	blake2? ( $(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' python{2_7,3_4,3_5} pypy{,3}) )
+	bzip2? ( $(python_gen_cond_dep 'dev-python/bz2file[${PYTHON_USEDEP}]' python2_7 pypy) )
+	gpg? ( app-crypt/gnupg )
+	lzma? ( $(python_gen_cond_dep 'dev-python/backports-lzma[${PYTHON_USEDEP}]' python2_7 pypy) )
+	sha3? ( $(python_gen_cond_dep 'dev-python/pysha3[${PYTHON_USEDEP}]' python{2_7,3_4,3_5} pypy{,3}) )"
+
+RDEPEND="${MODULE_RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	portage-postsync? ( app-crypt/gentoo-keys )"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( ${MODULE_RDEPEND} )"
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if use portage-postsync; then
+		exeinto /etc/portage/repo.postsync.d
+		doexe utils/repo.postsync.d/00gemato
+	fi
+}
diff --git a/app-portage/grs/Manifest b/app-portage/grs/Manifest
index 8bf6e0042399..25c9a0e00328 100644
--- a/app-portage/grs/Manifest
+++ b/app-portage/grs/Manifest
@@ -1,6 +1,7 @@
+DIST ISO-1.tar.gz 2887967 BLAKE2B 0ae9d9c4078974316d6865a8601705f7c69c8305d8401835bfa544d14a90b3688ea6b881a1c07bcb969fe2b15f210d05f114ebaf3af5ba6f1ae3705d395f1603 SHA512 50bd9bcaa3d1900763936beb4801fd9e5cb963e39d51c39c9cc9a8d160469db1b0c6fffae01bbb5d5d5c6d4e42d84a6c499c465bbdd964835c2d190785eed52d
 DIST grs-0.5.tar.gz 34213 BLAKE2B 3745d68db8da65f72e3b82ed2350d8a8696848d451aa3da5c941174403be7fea9a4b7536cdf532d0d89b6014817c14f874d0dbca3408bdd8326e88396767f119 SHA512 85cb78d898c266fe4f1a5298d3add20fb127d43469cd00d32400bebf0c7350c07b581f9e8714a32db62c57f5a92fca0cbe66f0e2812dab86f57d9e8c66aaab7f
 DIST grs-0.6.tar.gz 34752 BLAKE2B cbd99ba7fea491db032d08cd1daa5a18cab8e8f21110bbe7d6d9c2b532776a9c9f55bd4a1d2b9bd6ea5fdaefdd2fb5af5b35beb6adcfe57d0d02b779c6ceaacb SHA512 ede5117ffe5dad982366b3acabc98bc018cc74aa079080f1a20fe31e86bca0b6ed48589ce22a400bf43d882f17dc630a4f7c99a7f7b4a4cb7c6f2f97974ecc5d
 EBUILD grs-0.5.ebuild 1037 BLAKE2B 715b4ca9f91d01a445de5bb151f30704db2ceceff33d24b35183c9d42b881e7c9336608956e827face1068059d594748bc9ebfcbfc1b3c604f1f8f2558cda123 SHA512 bd97ae2e24f527e13138fd6b9bf00ac453c566e10ad0051c985fc78ff4b26a205c71e36e0f98b691f8bbd9b90b3db5af5b3521c3715f4800cae43cef5327d04b
-EBUILD grs-0.6.ebuild 1096 BLAKE2B 3df3288f9efb43d596bb0fed93dd2c4d9cbc935f6844706ffdc2b05489e27808d439100ca91fa9326c63721e541463bdfbe913d7446103ca15319917243e0557 SHA512 1e68f0f68753d77a28cb87851fce63754a5694f5e916e65b10cf3aeb05acdc577acc950a0500d094d18773c007db5115b886c7e55a13354bc09bb53b27805e72
-EBUILD grs-9999.ebuild 1097 BLAKE2B 109c0ac7b7e35eb0b65f85b01349f28ef435431131ea9007e79cd18061de5aac6be6d5c5e30dfd03e2ba0ebc05c4ee113a1cb7c1767519f6368d6668f183a36a SHA512 bc8f4346b4348184f36b0ce304a74fec7a2f549269d77516d3491a90257872225e1294d3b75be017f02b622b19280b462e391c3328013ebacec8bf44985080e6
+EBUILD grs-0.6.ebuild 1101 BLAKE2B 411546307ad2b43b8c15a6dc35efbff288f42b7efa5cfe59f998722e8c9ea98d4320ec9179d36c34e62bae43452e58f8ee6244df9e5cbc1ad50db4e7063c9f82 SHA512 933c86210a1a8520a6e05d36a0a644fb659f153bf7015b629c6f144675d64caa527c31afe7ed0f51d276bb32dd43403a6e7e6efeffb13c12c085fcd5557468a6
+EBUILD grs-9999.ebuild 1326 BLAKE2B 0c6fe46c8f6d318367d2b23d08d28c2339bf29707a2fe273a2470fa8059514e6dd1f9c439e92dab290a5a3300575d7442d5f08d7979925533d3b7b670555ec81 SHA512 7076b8e574bda5525c9daa3a41e59d3191c04236ae2915c827b5b4df73993d3a9f1351ca5752573060df73060ceaa7a2be03a1be4982177b695a9d33d85930fa
 MISC metadata.xml 335 BLAKE2B 24dec8cf9113a9a1114ebac569e5f335f82bbd0e89efc87f4897fd79e7da509450e562aa825c01a20e3edfa82523bf443f0d24f8a0964b73f1074975eee821d8 SHA512 e753c37f63f2d42e2745076a5969ef57a87e71a9dc96b6f681d138c6d9c23d8903683208fa1519e91f08856f40e900812cba2b4d53c51c3827e18edd940b8d7b
diff --git a/app-portage/grs/grs-0.6.ebuild b/app-portage/grs/grs-0.6.ebuild
index 3ad135db3609..9f035617c7c3 100644
--- a/app-portage/grs/grs-0.6.ebuild
+++ b/app-portage/grs/grs-0.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://dev.gentoo.org/~blueness/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64"
+	KEYWORDS="amd64 ~x86"
 fi
 
 DESCRIPTION="Suite to build Gentoo Reference Systems"
diff --git a/app-portage/grs/grs-9999.ebuild b/app-portage/grs/grs-9999.ebuild
index 5e16f8b436e0..abf196bc0732 100644
--- a/app-portage/grs/grs-9999.ebuild
+++ b/app-portage/grs/grs-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -6,12 +6,16 @@ PYTHON_COMPAT=( python3_{4,5,6} )
 
 inherit distutils-r1 linux-info
 
+ISO="ISO-1.tar.gz"
+
 if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/grss.git"
+	SRC_URI="https://dev.gentoo.org/~blueness/${PN}/${ISO}"
 	inherit git-r3
 else
-	SRC_URI="https://dev.gentoo.org/~blueness/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64"
+	SRC_URI="https://dev.gentoo.org/~blueness/${PN}/${P}.tar.gz
+	https://dev.gentoo.org/~blueness/${PN}/${ISO}"
+	KEYWORDS="~amd64 ~x86"
 fi
 
 DESCRIPTION="Suite to build Gentoo Reference Systems"
@@ -50,4 +54,8 @@ src_install() {
 	distutils-r1_src_install
 	echo "CONFIG_PROTECT=\"/etc/grs/systems.conf\"" > "${T}"/20grs
 	doenvd "${T}"/20grs
+	if use server; then
+		mkdir ${D}/usr/share/${PN}
+		cp "${DISTDIR}"/${ISO} ${D}/usr/share/${PN}
+	fi
 }