gentoo resync : 18.11.2018

5 files changed, 75 insertions, 60 deletions

diff --git a/app-portage/grs/Manifest b/app-portage/grs/Manifest
index d1fc177f392e..0a7de676d69c 100644
--- a/app-portage/grs/Manifest
+++ b/app-portage/grs/Manifest
@@ -1,7 +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-r1.ebuild 1136 BLAKE2B 1f7b978a9648202c738d231a27a8572a68b014fe1a461312052dc8b3cc261062360bd1fbe23ada78d7aa34f9dc52acca0d59724f7443a70537d239ff4e2273c2 SHA512 1ceafda1d51f8afa45bf412bff3870ab0aa9191798bdaf87d61403c3429543924a7634b21e709d32cc065f386515a7bd960c7f20d2658369563b69d32c46d7c0
-EBUILD grs-9999.ebuild 1362 BLAKE2B 46a18645f931045f3ab9984ce8a28b9aa82a4ca1c0021619d43e3ae20773d7e5ea32c00b2e635f5ebe73f30bdb36db26cb7f3e1a873b5d6ccacaa91f1f046c4e SHA512 034c51c2f6d9bacc504925f92ca37a2b6151b701d1b8564a8e2af39802c5d6206a5618b195d3ef4be82a79d92d3013e81e4206c2b49396d1dc138c55dcd94caa
+DIST grs-0.7.tar.gz 36330 BLAKE2B 9e835262656f8a51969810f92a1ae801bc058c4529c01fe1998227fa8b81939c1d7db9f335f5a18f18d9cbd53ec809d289efd80ba7543b3b61a8dee1296bd780 SHA512 b530d66e3402e34f1c4efdff0af0e1d0f0ccf311c440c8d5ee050f8a8ab178d663433f766d507c5b1280ef9056fd97d05915e65e07a1a59bb8a3c80fd4bab4c6
+EBUILD grs-0.6-r1.ebuild 1137 BLAKE2B 2e3b9bf26a56e68c99ce6948f1dae78a6773a117f3354a4979865e96a56242ba3c792050f93729a0699175d59c08f0ecce477b1bdc6d3f533b382378dc9dbcb7 SHA512 718f231d2ba04966a408b7c02ebf47c2eee83cd7f1c4274eb5e818346f38681dea56b0a45d8cc96447c7b7777e49efb486825e03298f0b13104a5f8714d690a0
+EBUILD grs-0.7.ebuild 1368 BLAKE2B a52038471b4e024aebd20c5d8a5179bdd2d4443961172869cb1df24a2a3c643f35e842a2c418c3c7d832e995546078d19abfc79f9d36af8acc611ef92080a902 SHA512 9ce761b4865fdd6bb3c3472da74e86b5cb1130620a820cbc2f7c9c3ee6317315ad65fa4ba3c2a5315d1d2894296f3ee30efe87e931983d69eb40b3fba62a6df6
+EBUILD grs-9999.ebuild 1368 BLAKE2B a52038471b4e024aebd20c5d8a5179bdd2d4443961172869cb1df24a2a3c643f35e842a2c418c3c7d832e995546078d19abfc79f9d36af8acc611ef92080a902 SHA512 9ce761b4865fdd6bb3c3472da74e86b5cb1130620a820cbc2f7c9c3ee6317315ad65fa4ba3c2a5315d1d2894296f3ee30efe87e931983d69eb40b3fba62a6df6
 MISC metadata.xml 335 BLAKE2B 24dec8cf9113a9a1114ebac569e5f335f82bbd0e89efc87f4897fd79e7da509450e562aa825c01a20e3edfa82523bf443f0d24f8a0964b73f1074975eee821d8 SHA512 e753c37f63f2d42e2745076a5969ef57a87e71a9dc96b6f681d138c6d9c23d8903683208fa1519e91f08856f40e900812cba2b4d53c51c3827e18edd940b8d7b
diff --git a/app-portage/grs/grs-0.5.ebuild b/app-portage/grs/grs-0.5.ebuild
deleted file mode 100644
index ef064c9ea51b..000000000000
--- a/app-portage/grs/grs-0.5.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python3_{4,5,6} )
-
-inherit distutils-r1 linux-info
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/grss.git"
-	inherit git-r3
-else
-	SRC_URI="https://dev.gentoo.org/~blueness/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64"
-fi
-
-DESCRIPTION="Suite to build Gentoo Reference Systems"
-HOMEPAGE="https://dev.gentoo.org/~blueness/${PN}"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND="
-	app-arch/tar[xattr]
-	app-crypt/md5deep
-	dev-libs/libcgroup
-	dev-vcs/git
-	net-misc/rsync
-	sys-apps/portage
-	sys-fs/squashfs-tools
-	virtual/cdrtools
-	|| (
-		sys-kernel/genkernel
-		sys-kernel/genkernel-next
-	)"
-
-pkg_setup() {
-	local CONFIG_CHECK="~CGROUPS"
-	local ERROR_CGROUPS="WARNING: grsrun requires CONFIG_CGROUPS enabled in the kernel."
-	linux-info_pkg_setup
-}
-
-src_install() {
-	distutils-r1_src_install
-	echo "CONFIG_PROTECT=\"/etc/grs/systems.conf\"" > "${T}"/20grs
-	doenvd "${T}"/20grs
-}
diff --git a/app-portage/grs/grs-0.6-r1.ebuild b/app-portage/grs/grs-0.6-r1.ebuild
index 171b185d8595..c5876bba4ff5 100644
--- a/app-portage/grs/grs-0.6-r1.ebuild
+++ b/app-portage/grs/grs-0.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # 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 x86"
+	KEYWORDS="amd64 arm x86"
 fi
 
 DESCRIPTION="Suite to build Gentoo Reference Systems"
diff --git a/app-portage/grs/grs-0.7.ebuild b/app-portage/grs/grs-0.7.ebuild
new file mode 100644
index 000000000000..c741dcba3eaa
--- /dev/null
+++ b/app-portage/grs/grs-0.7.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+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
+	https://dev.gentoo.org/~blueness/${PN}/${ISO}"
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+DESCRIPTION="Suite to build Gentoo Reference Systems"
+HOMEPAGE="https://dev.gentoo.org/~blueness/${PN}"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="server"
+
+DEPEND=""
+RDEPEND="
+	|| (
+		sys-apps/portage
+		sys-apps/portage-mgorny
+	)
+	server? (
+		app-arch/tar[xattr]
+		app-crypt/md5deep
+		dev-libs/libcgroup
+		dev-vcs/git
+		net-misc/rsync
+		sys-fs/squashfs-tools
+		virtual/cdrtools
+		|| (
+			sys-kernel/genkernel
+			sys-kernel/genkernel-next
+		)
+	)"
+
+pkg_setup() {
+	if use server; then
+		local CONFIG_CHECK="~CGROUPS"
+		local ERROR_CGROUPS="WARNING: grsrun requires CONFIG_CGROUPS enabled in the kernel."
+		linux-info_pkg_setup
+	fi
+}
+
+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
+}
diff --git a/app-portage/grs/grs-9999.ebuild b/app-portage/grs/grs-9999.ebuild
index aa1fb650569d..c741dcba3eaa 100644
--- a/app-portage/grs/grs-9999.ebuild
+++ b/app-portage/grs/grs-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 PYTHON_COMPAT=( python3_{4,5,6} )
 
 inherit distutils-r1 linux-info
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]] ; then
 else
 	SRC_URI="https://dev.gentoo.org/~blueness/${PN}/${P}.tar.gz
 	https://dev.gentoo.org/~blueness/${PN}/${ISO}"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~arm ~x86"
 fi
 
 DESCRIPTION="Suite to build Gentoo Reference Systems"
@@ -58,7 +58,7 @@ 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}
+		mkdir "${D}"/usr/share/${PN}
+		cp "${DISTDIR}"/${ISO} "${D}"/usr/share/${PN}
 	fi
 }