sys-devel/crossdev: Update crossdev to use new path for functions.sh

https://bugs.gentoo.org/show_bug.cgi?id=538656

diff --git a/sys-devel/crossdev/crossdev-20151026-r1.ebuild b/sys-devel/crossdev/crossdev-20151026-r1.ebuild
new file mode 100644 (file)
index 0000000..eb84933
--- /dev/null
+++ b/sys-devel/crossdev/crossdev-20151026-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+inherit eutils
+
+if [[ ${PV} == "99999999" ]] ; then
+       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"
+       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-devel/crossdev-wrappers"
+DEPEND="app-arch/xz-utils
+       sys-apps/gentoo-functions"
+
+src_prepare() {
+       epatch "${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 3b816c239cff79c475a097dd2dcda2a57ba8834a..eb84933ea66ac3a4c09f90907446cdb39247116a 100644 (file)
--- a/sys-devel/crossdev/crossdev-99999999.ebuild
+++ b/sys-devel/crossdev/crossdev-99999999.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="4"
+EAPI="5"
+inherit eutils
 
 if [[ ${PV} == "99999999" ]] ; then
        EGIT_REPO_URI="git://anongit.gentoo.org/proj/crossdev.git"
@@ -26,7 +27,12 @@ RDEPEND=">=sys-apps/portage-2.1
        >=app-portage/portage-utils-0.55
        app-shells/bash
        !sys-devel/crossdev-wrappers"
-DEPEND="app-arch/xz-utils"
+DEPEND="app-arch/xz-utils
+       sys-apps/gentoo-functions"
+
+src_prepare() {
+       epatch "${FILESDIR}"/use-new-path-for-functions.sh.patch
+}
 
 src_install() {
        default

diff --git a/sys-devel/crossdev/files/use-new-path-for-functions.sh.patch b/sys-devel/crossdev/files/use-new-path-for-functions.sh.patch
new file mode 100644 (file)
index 0000000..8607fc1
--- /dev/null
+++ b/sys-devel/crossdev/files/use-new-path-for-functions.sh.patch
@@ -0,0 +1,11 @@
+--- crossdev.orig      2016-02-18 12:28:49.926442767 -0200
++++ crossdev   2016-02-18 12:32:25.962433210 -0200
+@@ -15,7 +15,7 @@
+ 
+ CONFIGROOT="${PORTAGE_CONFIGROOT}/etc/portage"
+ 
+-source /etc/init.d/functions.sh || exit 1
++source /lib/gentoo/functions.sh || exit 1
+ esyslog() { :; }
+ die_logs() {
+       echo