sys-devel/crossdev: Sync with upstream

Package-Manager: portage-2.2.28

7 files changed, 30 insertions, 58 deletions

diff --git a/sys-devel/crossdev/Manifest b/sys-devel/crossdev/Manifest
index 5daeec52..c4094fe8 100644
--- a/sys-devel/crossdev/Manifest
+++ b/sys-devel/crossdev/Manifest
@@ -1,6 +1,6 @@
-AUX 20150716-BUG-MEDIUM-cross-pkg-config-Do-not-unset-PKG_CONFIG_.patch 944 SHA256 daaa17bcd3fafc7868a85100a56e93a0e0e43df549749caab6c140d31dbc2d67 WHIRLPOOL 0bae360cea6f7fd588d589164542811133ad2c88bcf4f2ae5ce3d4f2f5e8fb31c78590e53290c3fcb466b0c9fc25054b3dc4d8ff6cbd00fb2943a236ff6316aa
-AUX 20150716-BUG-MINOR-crossdev-source-only-once-user-env-setting.patch 1360 SHA256 16e54a4ca57b5d63ad7d98007e83d80f33c819a49dadf20e253c34738e519200 WHIRLPOOL d5fbce3e239d2d951c3d99cee7eec816ce4b9f411d6fde79bf9a909f87321a22d6bbb866364712cc0a94bd211ba6049b837a1360aafc296dd8bf8d0531612fc7
-AUX 20150716-MAJOR-cross-pkg-config-Sanity-check-should-include-P.patch 1617 SHA256 875389fa10ddf9c8c335b196ed808262d5d1ba046178e514db991dfa0f0b6144 WHIRLPOOL 9e891d06dd7b1979d0c56d821ce5dd6ecda31587d6ad71c704bd8f65707f7f13c6c8f06c880c2d2f14cc9125fd2db1a4a9d897315976f3991dd0797162f62ed6
-DIST crossdev-20150716.tar.xz 22152 SHA256 3988039ebc5363cba752a04ba00df18b0d8c1ac10be342880feda5f848a20a22 WHIRLPOOL 39f3e941a2dcb5915f8e81725d8d8abaf3fd9dfa676d7c7096cb188b75c9af439c6e75b34207bd3404f9a1f15954999d8a42dfaf09646aa3c6a0925bf40fb963
-EBUILD crossdev-20150716.ebuild 1161 SHA256 85da898a691fdf2e2720393ba158231e800f4c236f92a39bcafe9bf3eaca671d WHIRLPOOL bcc33e354afc8573ad1a1938455a380b6dfbe47a6c26beb48f1f88f718b79d601351828b1e6512e763c85cc3496a4235b1787160ff86fcaa48e8fb1d18417218
-MISC metadata.xml 244 SHA256 5431488a9792fce5a4d11743e355abefa2c5016c9b542c2e53d87072d553a37f WHIRLPOOL 831226e1c2bab3af85242e42a117d3e660aa146c1e3a5ceef39f9bfd855b1402e902f7ae1504fc8e23a8b3bbb4871f6033326367f86da701034c5b52dd5fd29b
+AUX 20160602-BUG-MEDIUM-cross-pkg-config-Do-not-unset-PKG_CONFIG_.patch 944 SHA256 daaa17bcd3fafc7868a85100a56e93a0e0e43df549749caab6c140d31dbc2d67 WHIRLPOOL 0bae360cea6f7fd588d589164542811133ad2c88bcf4f2ae5ce3d4f2f5e8fb31c78590e53290c3fcb466b0c9fc25054b3dc4d8ff6cbd00fb2943a236ff6316aa
+AUX 20160602-MAJOR-cross-pkg-config-Sanity-check-should-include-P.patch 1617 SHA256 875389fa10ddf9c8c335b196ed808262d5d1ba046178e514db991dfa0f0b6144 WHIRLPOOL 9e891d06dd7b1979d0c56d821ce5dd6ecda31587d6ad71c704bd8f65707f7f13c6c8f06c880c2d2f14cc9125fd2db1a4a9d897315976f3991dd0797162f62ed6
+AUX use-new-path-for-functions.sh.patch 298 SHA256 f7b5752c70296552e5520aad107c0bd9543e1c2065622b354cf9064f5c6e99ca WHIRLPOOL 6d3a39f0c783c043775fdec49060f938d8c2b33ce53d91c0ecbfff571064be9278e98c621cfd7bed2136aadee585306b05ddca381f85297fd05b0ae47c0b46ff
+DIST crossdev-20160602.tar.xz 22292 SHA256 12dcbbdedc3f89a7b782c2b61c2956da050cfc95eef860a2f2701bfc89c77ce9 WHIRLPOOL 7ccc23cd01030e1b55266784448187ab30ded10b229b03886faf739fd5d1ed07d73c60fb950c1c28c81e7dd309324bd740d8439640113241f493973ba79b53cd
+EBUILD crossdev-20160602.ebuild 1159 SHA256 4d01a0c853c077b9249eab8422aed7daf87b2ee7fe5070fb41fc820145ed0d03 WHIRLPOOL 9e50469f842e53749666e8ec1b456b75dd9afa0a8303091c780c73ed398f513a72e9e44ef960d2320710c76042ce1daceb15d45e34638d86e5d95edcd4f1ac9c
+MISC metadata.xml 435 SHA256 e94c62eea9868ab7f11ef68b2fdc243334a74f084d11a2e5b609681942da9d60 WHIRLPOOL 9afc41289a89b15268286c92facf16009b84dd23a3b736d713febe1674586ca730fce2d3d4e9a603ca1132ea6c3e0ebdb0df3e9f8b817d2b4c1f9d97ffd1c425
diff --git a/sys-devel/crossdev/crossdev-20150716.ebuild b/sys-devel/crossdev/crossdev-20160602.ebuild
index d5fc25f9..3c336b0c 100644
--- a/sys-devel/crossdev/crossdev-20150716.ebuild
+++ b/sys-devel/crossdev/crossdev-20160602.ebuild
@@ -1,8 +1,8 @@
-# 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
@@ -26,13 +26,14 @@ 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"
 
 src_prepare() {
 	epatch "${FILESDIR}/${PV}-BUG-MEDIUM-cross-pkg-config-Do-not-unset-PKG_CONFIG_.patch"
-	epatch "${FILESDIR}/${PV}-BUG-MINOR-crossdev-source-only-once-user-env-setting.patch"
 	epatch "${FILESDIR}/${PV}-MAJOR-cross-pkg-config-Sanity-check-should-include-P.patch"
+	epatch "${FILESDIR}"/use-new-path-for-functions.sh.patch
 }
 
 src_install() {
diff --git a/sys-devel/crossdev/files/20150716-BUG-MINOR-crossdev-source-only-once-user-env-setting.patch b/sys-devel/crossdev/files/20150716-BUG-MINOR-crossdev-source-only-once-user-env-setting.patch
deleted file mode 100644
index dda8a67a..00000000
--- a/sys-devel/crossdev/files/20150716-BUG-MINOR-crossdev-source-only-once-user-env-setting.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From e9931fcf953d8a508e9010e8695247ab8fce8a7c Mon Sep 17 00:00:00 2001
-From: Bertrand Jacquin <bertrand@jacquin.bzh>
-Date: Fri, 21 Mar 2014 21:53:29 +0100
-Subject: [PATCH 2/3] BUG/MINOR: crossdev: source only once user env settings
-
-When /etc/portage/crossdev/${CTARGET} exist, output look like :
-
- * Restoring generic user env settings
- * Restoring generic user env settings
- * Restoring generic user env settings
- * Restoring generic user env settings
- * Restoring generic user env settings
- * Restoring generic user env settings
- * Restoring generic user env settings
- * Restoring generic user env settings
- * Restoring generic user env settings
- * Restoring generic user env settings
----
- crossdev | 9 +++++----
- 1 file changed, 5 insertions(+), 4 deletions(-)
-
-diff --git a/crossdev b/crossdev
-index 74fd390..16246e1 100755
---- a/crossdev
-+++ b/crossdev
-@@ -725,12 +725,13 @@ for v in MULTILIB_ABIS USE BVER GVER KVER LVER STAGE CFLAGS LDFLAGS ASFLAGS ; do
- 		export ${v}="$(<"${d}"/${v})"
- 		einfo "Restoring user setting '${v}' to '${!v}'"
- 	fi
--	if [[ -e ${d}/env ]] ; then
--		einfo "Restoring generic user env settings"
--		source "${d}"/env
--	fi
- done
- 
-+if [[ -e ${d}/env ]] ; then
-+	einfo "Restoring generic user env settings"
-+	source "${d}"/env
-+fi
-+
- # parse multilib settings until profiles are sane
- multilib_env() {
- 	local var=$1
--- 
-2.4.10
-
diff --git a/sys-devel/crossdev/files/20150716-BUG-MEDIUM-cross-pkg-config-Do-not-unset-PKG_CONFIG_.patch b/sys-devel/crossdev/files/20160602-BUG-MEDIUM-cross-pkg-config-Do-not-unset-PKG_CONFIG_.patch
index 206bef19..206bef19 100644
--- a/sys-devel/crossdev/files/20150716-BUG-MEDIUM-cross-pkg-config-Do-not-unset-PKG_CONFIG_.patch
+++ b/sys-devel/crossdev/files/20160602-BUG-MEDIUM-cross-pkg-config-Do-not-unset-PKG_CONFIG_.patch
diff --git a/sys-devel/crossdev/files/20150716-MAJOR-cross-pkg-config-Sanity-check-should-include-P.patch b/sys-devel/crossdev/files/20160602-MAJOR-cross-pkg-config-Sanity-check-should-include-P.patch
index 62040314..62040314 100644
--- a/sys-devel/crossdev/files/20150716-MAJOR-cross-pkg-config-Sanity-check-should-include-P.patch
+++ b/sys-devel/crossdev/files/20160602-MAJOR-cross-pkg-config-Sanity-check-should-include-P.patch
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 00000000..8607fc13
--- /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
diff --git a/sys-devel/crossdev/metadata.xml b/sys-devel/crossdev/metadata.xml
index 33d71234..bc5c2580 100644
--- a/sys-devel/crossdev/metadata.xml
+++ b/sys-devel/crossdev/metadata.xml
@@ -1,9 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>embedded</herd>
-<herd>toolchain</herd>
-<maintainer>
+<maintainer type="person">
 <email>vapier@gentoo.org</email>
 </maintainer>
+<maintainer type="project">
+<email>embedded@gentoo.org</email>
+<name>Embedded Gentoo</name>
+</maintainer>
+<maintainer type="project">
+<email>toolchain@gentoo.org</email>
+<name>Gentoo Toolchain Project</name>
+</maintainer>
 </pkgmetadata>