From 0cfdd5bf073ac7ec1bbe8b23cbbb3dd33a110a61 Mon Sep 17 00:00:00 2001
From: Michał Górny <mgorny@gentoo.org>
Date: Wed, 21 Mar 2018 18:10:24 +0100
Subject: app-portage/grs: Support sys-apps/portage-mgorny

---
 app-portage/grs/grs-0.6-r1.ebuild | 56 +++++++++++++++++++++++++++++++++++++++
 app-portage/grs/grs-0.6.ebuild    | 53 ------------------------------------
 app-portage/grs/grs-9999.ebuild   |  5 +++-
 3 files changed, 60 insertions(+), 54 deletions(-)
 create mode 100644 app-portage/grs/grs-0.6-r1.ebuild
 delete mode 100644 app-portage/grs/grs-0.6.ebuild

(limited to 'app-portage')

diff --git a/app-portage/grs/grs-0.6-r1.ebuild b/app-portage/grs/grs-0.6-r1.ebuild
new file mode 100644
index 000000000000..171b185d8595
--- /dev/null
+++ b/app-portage/grs/grs-0.6-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+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 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
+}
diff --git a/app-portage/grs/grs-0.6.ebuild b/app-portage/grs/grs-0.6.ebuild
deleted file mode 100644
index 0ebcdf129559..000000000000
--- a/app-portage/grs/grs-0.6.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-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 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
-	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
-}
diff --git a/app-portage/grs/grs-9999.ebuild b/app-portage/grs/grs-9999.ebuild
index abf196bc0732..aa1fb650569d 100644
--- a/app-portage/grs/grs-9999.ebuild
+++ b/app-portage/grs/grs-9999.ebuild
@@ -27,7 +27,10 @@ IUSE="server"
 
 DEPEND=""
 RDEPEND="
-	sys-apps/portage
+	|| (
+		sys-apps/portage
+		sys-apps/portage-mgorny
+	)
 	server? (
 		app-arch/tar[xattr]
 		app-crypt/md5deep
-- 
cgit v1.2.3-65-gdbad