[gentoo-commits] dev/xmw:master commit in: dev-util/android-ndk/

[Michael Weber]

commit:     af5b860c593eed71a15beb21b630001f72c8aa0f
Author:     Michael Weber <michael <AT> xmw <DOT> de>
AuthorDate: Thu Apr 30 22:00:57 2015 +0000
Commit:     Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Thu Apr 30 22:00:57 2015 +0000
URL:        https://gitweb.gentoo.org/dev/xmw.git/commit/?id=af5b860c

Replace cp -pPR with mv to avoid replicating 3.3GB, add check-req test.

Package-Manager: portage-2.2.18
Manifest-Sign-Key: 62EEF090

 dev-util/android-ndk/ChangeLog              |  3 +++
 dev-util/android-ndk/android-ndk-10d.ebuild | 22 +++++++++++++---------
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/dev-util/android-ndk/ChangeLog b/dev-util/android-ndk/ChangeLog
index a10890c..8d472c6 100644
--- a/dev-util/android-ndk/ChangeLog
+++ b/dev-util/android-ndk/ChangeLog
@@ -1,3 +1,6 @@
+  30 Apr 2015; Michael Weber <xmw@g.o> android-ndk-10d.ebuild:
+  Replace cp -pPR with mv to avoid replicating 3.3GB, add check-req test.
+
 *android-ndk-10d (30 Apr 2015)
 
   30 Apr 2015; Michael Weber <xmw@g.o> +android-ndk-10d.ebuild,

diff --git a/dev-util/android-ndk/android-ndk-10d.ebuild b/dev-util/android-ndk/android-ndk-10d.ebuild
index 357c2e1..955f2ea 100644
--- a/dev-util/android-ndk/android-ndk-10d.ebuild
+++ b/dev-util/android-ndk/android-ndk-10d.ebuild
@@ -4,6 +4,8 @@
 
 EAPI=5
 
+inherit check-reqs
+
 DESCRIPTION="Open Handset Alliance's Android NDK (Native Dev Kit)"
 HOMEPAGE="http://developer.android.com/sdk/ndk/"
 SRC_URI="x86? (	http://dl.google.com/android/ndk/${PN}-r${PV}-linux-x86.bin )
@@ -25,6 +27,8 @@ ANDROID_NDK_DIR="opt/${PN}"
 
 QA_PREBUILT="*"
 
+CHECKREQS_DISK_BUILD="3300M"
+
 src_unpack() {
 	local my_a
 	for my_a in ${A} ; do
@@ -41,8 +45,16 @@ src_compile() {
 }
 
 src_install() {
+	ANDROID_PREFIX="${EPREFIX}/${ANDROID_NDK_DIR}"
+	ANDROID_PATH="${EPREFIX}/${ANDROID_NDK_DIR}"
+
+	for i in toolchains/*/prebuilt/linux-*/bin
+	do
+		ANDROID_PATH="${ANDROID_PATH}:${ANDROID_PREFIX}/${i}"
+	done
+
 	dodir "/${ANDROID_NDK_DIR}"
-	cp -pPR * "${ED}/${ANDROID_NDK_DIR}" || die
+	mv * "${ED}/${ANDROID_NDK_DIR}" || die
 
 	fowners -R root:android "/${ANDROID_NDK_DIR}"
 	fperms 0775 "/${ANDROID_NDK_DIR}/"{,build,docs,platforms,samples}
@@ -52,14 +64,6 @@ src_install() {
 	fowners root:android "/${ANDROID_NDK_DIR}/out"
 	fperms 3775 "/${ANDROID_NDK_DIR}/out"
 
-	ANDROID_PREFIX="${EPREFIX}/${ANDROID_NDK_DIR}"
-	ANDROID_PATH="${EPREFIX}/${ANDROID_NDK_DIR}"
-
-	for i in toolchains/*/prebuilt/linux-*/bin
-	do
-		ANDROID_PATH="${ANDROID_PATH}:${ANDROID_PREFIX}/${i}"
-	done
-
 	printf '%s' \
 		"PATH=\"${ANDROID_PATH}\"" \
 		$'\n' \