From 3779cde67f5530c11bd607ac75dedf698340f91c Mon Sep 17 00:00:00 2001
From: Bertrand Jacquin <bertrand@jacquin.bzh>
Date: Mon, 12 Sep 2016 22:36:38 +0100
Subject: [PATCH] sys-devel/crossdev: Move to EAPI 6 and git-r3.

Package-Manager: portage-2.2.28
Closes: https://github.com/gentoo/gentoo/pull/2317
---
 .../crossdev/crossdev-20160602-r1.ebuild      | 39 +++++++++++++++++++
 sys-devel/crossdev/crossdev-99999999.ebuild   | 15 +++----
 2 files changed, 45 insertions(+), 9 deletions(-)
 create mode 100644 sys-devel/crossdev/crossdev-20160602-r1.ebuild

diff --git a/sys-devel/crossdev/crossdev-20160602-r1.ebuild b/sys-devel/crossdev/crossdev-20160602-r1.ebuild
new file mode 100644
index 000000000000..459e55e4fb0d
--- /dev/null
+++ b/sys-devel/crossdev/crossdev-20160602-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+
+if [[ ${PV} == "99999999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="git://anongit.gentoo.org/proj/crossdev.git"
+else
+	SRC_URI="mirror://gentoo/${P}.tar.xz
+		https://dev.gentoo.org/~vapier/dist/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+fi
+
+DESCRIPTION="Gentoo Cross-toolchain generator"
+HOMEPAGE="https://www.gentoo.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+RDEPEND=">=sys-apps/portage-2.1
+	>=app-portage/portage-utils-0.55
+	app-shells/bash
+	sys-apps/gentoo-functions
+	!sys-devel/crossdev-wrappers"
+DEPEND="app-arch/xz-utils"
+
+PATCHES=(
+	"${FILESDIR}"/use-new-path-for-functions.sh.patch
+)
+
+src_install() {
+	default
+	if [[ "${PV}" == "99999999" ]] ; then
+		sed -i "s:@CDEVPV@:${EGIT_VERSION}:" "${ED%/}"/usr/bin/crossdev || die
+	fi
+}
diff --git a/sys-devel/crossdev/crossdev-99999999.ebuild b/sys-devel/crossdev/crossdev-99999999.ebuild
index d9e38620c110..459e55e4fb0d 100644
--- a/sys-devel/crossdev/crossdev-99999999.ebuild
+++ b/sys-devel/crossdev/crossdev-99999999.ebuild
@@ -2,14 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="5"
-inherit eutils
+EAPI="6"
 
 if [[ ${PV} == "99999999" ]] ; then
+	inherit git-r3
 	EGIT_REPO_URI="git://anongit.gentoo.org/proj/crossdev.git"
-	inherit git-2
-	SRC_URI=""
-	#KEYWORDS=""
 else
 	SRC_URI="mirror://gentoo/${P}.tar.xz
 		https://dev.gentoo.org/~vapier/dist/${P}.tar.xz"
@@ -30,13 +27,13 @@ RDEPEND=">=sys-apps/portage-2.1
 	!sys-devel/crossdev-wrappers"
 DEPEND="app-arch/xz-utils"
 
-src_prepare() {
-	epatch "${FILESDIR}"/use-new-path-for-functions.sh.patch
-}
+PATCHES=(
+	"${FILESDIR}"/use-new-path-for-functions.sh.patch
+)
 
 src_install() {
 	default
 	if [[ "${PV}" == "99999999" ]] ; then
-		sed -i "s:@CDEVPV@:${EGIT_VERSION}:" "${ED}"/usr/bin/crossdev || die
+		sed -i "s:@CDEVPV@:${EGIT_VERSION}:" "${ED%/}"/usr/bin/crossdev || die
 	fi
 }
-- 
2.26.2