| 1 |
commit: 83ff3dd2c6eea0aeb079ccfcd57f0608d9572827 |
| 2 |
Author: Lara Maia <dev <AT> lara <DOT> click> |
| 3 |
AuthorDate: Thu Feb 18 14:51:24 2016 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Feb 18 14:53:43 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83ff3dd2 |
| 7 |
|
| 8 |
sys-devel/crossdev: Update crossdev to use new path for functions.sh |
| 9 |
|
| 10 |
https://bugs.gentoo.org/show_bug.cgi?id=538656 |
| 11 |
|
| 12 |
...{crossdev-99999999.ebuild => crossdev-20151026-r1.ebuild} | 12 +++++++++--- |
| 13 |
sys-devel/crossdev/crossdev-99999999.ebuild | 12 +++++++++--- |
| 14 |
sys-devel/crossdev/files/use-new-path-for-functions.sh.patch | 11 +++++++++++ |
| 15 |
3 files changed, 29 insertions(+), 6 deletions(-) |
| 16 |
|
| 17 |
diff --git a/sys-devel/crossdev/crossdev-99999999.ebuild b/sys-devel/crossdev/crossdev-20151026-r1.ebuild |
| 18 |
similarity index 80% |
| 19 |
copy from sys-devel/crossdev/crossdev-99999999.ebuild |
| 20 |
copy to sys-devel/crossdev/crossdev-20151026-r1.ebuild |
| 21 |
index 3b816c2..eb84933 100644 |
| 22 |
--- a/sys-devel/crossdev/crossdev-99999999.ebuild |
| 23 |
+++ b/sys-devel/crossdev/crossdev-20151026-r1.ebuild |
| 24 |
@@ -1,8 +1,9 @@ |
| 25 |
-# Copyright 1999-2015 Gentoo Foundation |
| 26 |
+# Copyright 1999-2016 Gentoo Foundation |
| 27 |
# Distributed under the terms of the GNU General Public License v2 |
| 28 |
# $Id$ |
| 29 |
|
| 30 |
-EAPI="4" |
| 31 |
+EAPI="5" |
| 32 |
+inherit eutils |
| 33 |
|
| 34 |
if [[ ${PV} == "99999999" ]] ; then |
| 35 |
EGIT_REPO_URI="git://anongit.gentoo.org/proj/crossdev.git" |
| 36 |
@@ -26,7 +27,12 @@ RDEPEND=">=sys-apps/portage-2.1 |
| 37 |
>=app-portage/portage-utils-0.55 |
| 38 |
app-shells/bash |
| 39 |
!sys-devel/crossdev-wrappers" |
| 40 |
-DEPEND="app-arch/xz-utils" |
| 41 |
+DEPEND="app-arch/xz-utils |
| 42 |
+ sys-apps/gentoo-functions" |
| 43 |
+ |
| 44 |
+src_prepare() { |
| 45 |
+ epatch "${FILESDIR}"/use-new-path-for-functions.sh.patch |
| 46 |
+} |
| 47 |
|
| 48 |
src_install() { |
| 49 |
default |
| 50 |
|
| 51 |
diff --git a/sys-devel/crossdev/crossdev-99999999.ebuild b/sys-devel/crossdev/crossdev-99999999.ebuild |
| 52 |
index 3b816c2..eb84933 100644 |
| 53 |
--- a/sys-devel/crossdev/crossdev-99999999.ebuild |
| 54 |
+++ b/sys-devel/crossdev/crossdev-99999999.ebuild |
| 55 |
@@ -1,8 +1,9 @@ |
| 56 |
-# Copyright 1999-2015 Gentoo Foundation |
| 57 |
+# Copyright 1999-2016 Gentoo Foundation |
| 58 |
# Distributed under the terms of the GNU General Public License v2 |
| 59 |
# $Id$ |
| 60 |
|
| 61 |
-EAPI="4" |
| 62 |
+EAPI="5" |
| 63 |
+inherit eutils |
| 64 |
|
| 65 |
if [[ ${PV} == "99999999" ]] ; then |
| 66 |
EGIT_REPO_URI="git://anongit.gentoo.org/proj/crossdev.git" |
| 67 |
@@ -26,7 +27,12 @@ RDEPEND=">=sys-apps/portage-2.1 |
| 68 |
>=app-portage/portage-utils-0.55 |
| 69 |
app-shells/bash |
| 70 |
!sys-devel/crossdev-wrappers" |
| 71 |
-DEPEND="app-arch/xz-utils" |
| 72 |
+DEPEND="app-arch/xz-utils |
| 73 |
+ sys-apps/gentoo-functions" |
| 74 |
+ |
| 75 |
+src_prepare() { |
| 76 |
+ epatch "${FILESDIR}"/use-new-path-for-functions.sh.patch |
| 77 |
+} |
| 78 |
|
| 79 |
src_install() { |
| 80 |
default |
| 81 |
|
| 82 |
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 |
| 83 |
new file mode 100644 |
| 84 |
index 0000000..8607fc1 |
| 85 |
--- /dev/null |
| 86 |
+++ b/sys-devel/crossdev/files/use-new-path-for-functions.sh.patch |
| 87 |
@@ -0,0 +1,11 @@ |
| 88 |
+--- crossdev.orig 2016-02-18 12:28:49.926442767 -0200 |
| 89 |
++++ crossdev 2016-02-18 12:32:25.962433210 -0200 |
| 90 |
+@@ -15,7 +15,7 @@ |
| 91 |
+ |
| 92 |
+ CONFIGROOT="${PORTAGE_CONFIGROOT}/etc/portage" |
| 93 |
+ |
| 94 |
+-source /etc/init.d/functions.sh || exit 1 |
| 95 |
++source /lib/gentoo/functions.sh || exit 1 |
| 96 |
+ esyslog() { :; } |
| 97 |
+ die_logs() { |
| 98 |
+ echo |
Archives