commit: 83ff3dd2c6eea0aeb079ccfcd57f0608d9572827 Author: Lara Maia <dev <AT> lara <DOT> click> AuthorDate: Thu Feb 18 14:51:24 2016 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Thu Feb 18 14:53:43 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83ff3dd2
sys-devel/crossdev: Update crossdev to use new path for functions.sh https://bugs.gentoo.org/show_bug.cgi?id=538656 ...{crossdev-99999999.ebuild => crossdev-20151026-r1.ebuild} | 12 +++++++++--- sys-devel/crossdev/crossdev-99999999.ebuild | 12 +++++++++--- sys-devel/crossdev/files/use-new-path-for-functions.sh.patch | 11 +++++++++++ 3 files changed, 29 insertions(+), 6 deletions(-) diff --git a/sys-devel/crossdev/crossdev-99999999.ebuild b/sys-devel/crossdev/crossdev-20151026-r1.ebuild similarity index 80% copy from sys-devel/crossdev/crossdev-99999999.ebuild copy to sys-devel/crossdev/crossdev-20151026-r1.ebuild index 3b816c2..eb84933 100644 --- a/sys-devel/crossdev/crossdev-99999999.ebuild +++ b/sys-devel/crossdev/crossdev-20151026-r1.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/crossdev-99999999.ebuild b/sys-devel/crossdev/crossdev-99999999.ebuild index 3b816c2..eb84933 100644 --- 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 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
