[gentoo-commits] proj/musl:master commit in: dev-util/android-tools/files/, dev-util/android-tools/

[gentoo-commits] proj/musl:master commit in: dev-util/android-tools/files/, dev-util/android-tools/

[Aric Belsito]

commit:     4ac5d70b954e7ce9cb7f8def9d81f3a565f30fd1
Author:     Aric Belsito <lluixhi <AT> gmail <DOT> com>
AuthorDate: Mon Apr 24 18:48:44 2017 +0000
Commit:     Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Mon Apr 24 18:48:44 2017 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=4ac5d70b

dev-utils/android-tools: add 6.0.1_p79

The patch got more complicated.

 dev-util/android-tools/Manifest                    |  8 +++
 .../android-tools/android-tools-6.0.1_p79.ebuild   | 84 ++++++++++++++++++++++
 .../files/android-tools-deffilemode.patch          | 14 ++++
 dev-util/android-tools/metadata.xml                | 15 ++++
 4 files changed, 121 insertions(+)

diff --git a/dev-util/android-tools/Manifest b/dev-util/android-tools/Manifest
new file mode 100644
index 0000000..8a2645c
--- /dev/null
+++ b/dev-util/android-tools/Manifest
@@ -0,0 +1,8 @@
+AUX android-tools-deffilemode.patch 481 SHA256 efac75c80701c6f857b913bf8756b5d08c07c59d8bd3936d1f13c00b4efe62ed SHA512 0cffa8e5730a6581fd0ec5d14d421d116fcbe8e594375d2a17981c69356e48446c2df987f4b592d43f4358c7309e1887e62813276607437d2bfb232f0748c5c7 WHIRLPOOL 094c84f7c33c0c4212fbcb2da1eade5f2827226bd0091144fcc63713aa7c5fe0d02fba91db8e0f15c3f7024b4925b51459c48e52a853131da908bb4b682e46ba
+DIST android-tools-6.0.1_r79-arch.tar.gz 13466 SHA256 8e20e1c28f80e6d52070883e35cd333d3bb1dbd2f18ab2625bf64f74829b4f34 SHA512 90b8638d247897da33f6e861492c58df0e9877738650083c3307bd787d234d728e6c9097ac1401c254eb3daf4c6b18da4ee84dd16749acf6359fcb42781862fc WHIRLPOOL ce0ade8bf372bc01c20357f2bb7dfa1bebc4b7a3d08c9987a786b2d1563d12be47c51c8ca286c065165d3b66a03db3324fc8b7f11f58b2d7a76e92ed2ad2178b
+DIST android-tools-6.0.1_r79-core.tar.gz 1186562 SHA256 2de9f6327c2b00d6b1eca7f97ceccc5b4f3302bb8c2abcc0d51e855e5e6dd3af SHA512 a48f8c562305cbc951e008979920d9efe02e232c41997423457ff1e2f115e526b295c260a501d4050ce280ca7155793b95f7a60bad5cbc165ba80d6a225152f0 WHIRLPOOL 636921ad316590109a1fe8d97b4da257c7d14ac0379591341828c10de8934786fb1bb355f6aa6dc99d6cae2878bda5d3947cb978ea80ca99a74d02ba4db2f048
+DIST android-tools-6.0.1_r79-extras.tar.gz 648657 SHA256 4c39fca97a419ec2b3c1edc6c558cac2777b64213df4a24fe281a343632d4a75 SHA512 e10694737c518f591eff4e808bb826c83bf45dc44c5c1ee8a4082a6e0653350ffe2986e299348cb4a1219203192d01546a05e9354ce05e29897f856c147de8c3 WHIRLPOOL 212cd122f87bcaf7a3b9cf550653faa4eccd869113dfb2e11a38bc396fb748c339c717b2ac2075979a8bc69baceb0272e44e610ee96490e37004baf7b141b6e5
+DIST android-tools-6.0.1_r79-f2fs-tools.tar.gz 70255 SHA256 a69b7653b1886d58fb8e7104437b3751c440e9367051d8ec1b859db2202555ae SHA512 0871f99f78006028889b42668ec627b6515bb812ad3ec4a489f62187a79f64d2a74f66556698a5f05fc99932f75fefd8810dedceeab744b212beb764e97b82c8 WHIRLPOOL 23c2f6d95a92bb97290690534082810ff50817640e19e9567056194e4a01d28516433396bc0aa42c545b47738e739d21823007ffaa171e972789b7cb1c71be94
+DIST android-tools-6.0.1_r79-libselinux.tar.gz 50814 SHA256 f93426fa21aa4d57f95ed832d61edce3363b3c0e80c666b6fc98367fbc95003e SHA512 686557271271c4d59fb968c5aa76b433955009733f3151c4c86faa996ce846088d6632b0969b23699822b7a6f09eae60abedba6abb0edc9d444159bbdb5c6f91 WHIRLPOOL d82d53133a54044e92db534b3c546b92ba77759999cc2890b202673d68120a42d8cda169d1298a5bb36e466e65c9c5191d01bc29fdf53d8e621b30a2ccafcd75
+EBUILD android-tools-6.0.1_p79.ebuild 2481 SHA256 6b6b3f7c140c0b6806c24a83d8b7c1b9941d15104842be1ea8456f6893d8b3c2 SHA512 f81e7d6dc64904967b26132c673c828f58d7fef64962e930b35441ccb433aaa53b4d035efa9649f4ed57d37051a21b0a5e5a9ac528d28d8d65b28728012c2a62 WHIRLPOOL 0b5928bf51451bda305b55a6577b1f8261bc0d4b02f83e728293c855951407d9a0219378a5966fa94f81bfa8766b39d5ea30ecf2fccf58a89f5e5a86852d6a32
+MISC metadata.xml 643 SHA256 0f10169f0f70025ecabdc95c1cd83ebb7db16be7df670678fbf131c8b66f5882 SHA512 51ee41cf77548eb1ce543b2c1f5f37e9634250c2fa42b36a8128b4a80a73a270b90b9e9e1c2c58d7aeb6dee85238ec73345f1a3a4ac398a4f7b2cd8e8c6e84ee WHIRLPOOL ebb5e0bd8f8205f31350d501a98adf0147e57d7a695999c61eb8a2e3c8f0a58015ea2762ee2394df0b9059c8be862dd2073e539e632ce94507c837745dcb9ff7

diff --git a/dev-util/android-tools/android-tools-6.0.1_p79.ebuild b/dev-util/android-tools/android-tools-6.0.1_p79.ebuild
new file mode 100644
index 0000000..ed79538
--- /dev/null
+++ b/dev-util/android-tools/android-tools-6.0.1_p79.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit bash-completion-r1 eutils toolchain-funcs
+
+MY_PV="${PV/_p/_r}"
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="Android platform tools (adb, fastboot, and mkbootimg)"
+HOMEPAGE="https://android.googlesource.com/platform/system/core.git/"
+# Downloading git tarballs generated by android.googlesource.com
+# Archlinux package contains patches and build script generation mechanism.
+SRC_URI="https://git.archlinux.org/svntogit/community.git/snapshot/community-6a03c4736c9734f5ac3d6b5b912605690a6eaa5f.tar.gz -> ${MY_P}-arch.tar.gz
+https://github.com/android/platform_system_core/archive/android-${MY_PV}.tar.gz -> ${MY_P}-core.tar.gz
+mirror://gentoo/${MY_P}-extras.tar.gz
+mirror://gentoo/${MY_P}-libselinux.tar.gz
+mirror://gentoo/${MY_P}-f2fs-tools.tar.gz"
+
+# The entire source code is Apache-2.0, except for fastboot which is BSD-2.
+LICENSE="Apache-2.0 BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~arm-linux ~x86-linux"
+IUSE="libressl"
+
+RDEPEND="sys-libs/zlib:=
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	dev-libs/libpcre"
+# dev-lang/ruby is necessary for build script generation.
+DEPEND="${RDEPEND}
+	dev-lang/ruby:*"
+
+PATCHES=( "${FILESDIR}/${PN}-deffilemode.patch" )
+
+S=${WORKDIR}
+
+src_unpack() {
+	local dir filename
+	for filename in ${A}; do
+		if [[ ${filename} =~ ^${MY_P}-(.*)\.tar\.gz$ ]]; then
+			dir=${BASH_REMATCH[1]}
+			mkdir -p "${dir}" || die
+			pushd "${dir}" >/dev/null
+			unpack "${filename}"
+			popd > /dev/null
+		else
+			die "unrecognized file in \${A}: ${filename}"
+		fi
+	done
+}
+
+src_prepare() {
+	mv core/*/* core/ || die
+	epatch arch/*/trunk/fix_build.patch
+	cp arch/*/trunk/generate_build.rb ./ || die
+
+	default
+
+	#580686
+	find "${S}" -name '*.h' -exec \
+		sed -e 's|^#include <sys/cdefs.h>$|/* \0 */|' \
+		    -e 's|^__BEGIN_DECLS$|#ifdef __cplusplus\nextern "C" {\n#endif|' \
+		    -e 's|^__END_DECLS$|#ifdef __cplusplus\n}\n#endif|' \
+		    -i {} \; || die
+	sed -e 's|^#include <sys/cdefs.h>$|/* \0 */|' \
+	    -i extras/ext4_utils/sha1.c || die
+}
+
+src_compile() {
+	chmod +x ./generate_build.rb || die
+	./generate_build.rb > build.sh || die
+	chmod +x build.sh || die
+	./build.sh || die
+}
+
+src_install() {
+	dobin adb
+	dobin fastboot
+	dobin mkbootimg
+	# Omitting, app-shells/bash-completion contains completion for adb
+	#newbashcomp arch/*/trunk/bash_completion.adb adb
+	newbashcomp arch/*/trunk/bash_completion.fastboot fastboot
+}

diff --git a/dev-util/android-tools/files/android-tools-deffilemode.patch b/dev-util/android-tools/files/android-tools-deffilemode.patch
new file mode 100644
index 0000000..12aa988
--- /dev/null
+++ b/dev-util/android-tools/files/android-tools-deffilemode.patch
@@ -0,0 +1,14 @@
+diff -Naur android-tools.orig/core/include/utils/Compat.h android-tools/core/include/utils/Compat.h
+--- android-tools.orig/core/include/utils/Compat.h	2017-04-24 11:27:39.697736014 -0700
++++ android-tools/core/include/utils/Compat.h	2017-04-24 11:45:24.930908371 -0700
+@@ -41,6 +41,10 @@
+ #define DEFFILEMODE 0666
+ #endif /* _WIN32 */
+ 
++#if defined(__linux__) && !defined(__GLIBC__)
++#define DEFFILEMODE 0666
++#endif
++
+ #if defined(_WIN32)
+ #define ZD "%ld"
+ #define ZD_TYPE long

diff --git a/dev-util/android-tools/metadata.xml b/dev-util/android-tools/metadata.xml
new file mode 100644
index 0000000..27a6743
--- /dev/null
+++ b/dev-util/android-tools/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<upstream>
+		<bugs-to>https://code.google.com/p/android/issues/list</bugs-to>
+		<changelog>https://android.googlesource.com/platform/system/core.git/+log/HEAD</changelog>
+		<doc>https://android.googlesource.com/platform/system/core.git/+/master/adb/OVERVIEW.TXT</doc>
+		<remote-id type="github">android/platform_system_core</remote-id>
+		<remote-id type="launchpad">ubuntu</remote-id>
+	</upstream>
+	<maintainer type="person">
+		<email>zmedico@gentoo.org</email>
+		<name>Zac Medico</name>
+	</maintainer>
+</pkgmetadata>

[gentoo-commits] proj/musl:master commit in: dev-util/android-tools/files/, dev-util/android-tools/

[Aric Belsito]

commit:     5fcd64b166b2f212be146da7541114923af83fd9
Author:     Aric Belsito <lluixhi <AT> gmail <DOT> com>
AuthorDate: Mon Jan 29 20:23:34 2018 +0000
Commit:     Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Mon Jan 29 20:23:34 2018 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=5fcd64b1

dev-util/android-tools: more musl patches

 .../android-tools/android-tools-8.1.0_p1.ebuild    |  1 +
 .../files/android-tools-8.1.0_p1-musl.patch        | 42 ++++++++++++++++++++++
 2 files changed, 43 insertions(+)

diff --git a/dev-util/android-tools/android-tools-8.1.0_p1.ebuild b/dev-util/android-tools/android-tools-8.1.0_p1.ebuild
index 6160dd3..a1cc4d3 100644
--- a/dev-util/android-tools/android-tools-8.1.0_p1.ebuild
+++ b/dev-util/android-tools/android-tools-8.1.0_p1.ebuild
@@ -74,6 +74,7 @@ src_prepare() {
 	cd "${S}"/core
 	eapply "${WORKDIR}"/arch/trunk/fix_build_core.patch
 	eapply "${FILESDIR}"/${P}-build.patch
+	eapply "${FILESDIR}"/${P}-musl.patch
 	sed -i '1i#include <sys/sysmacros.h>' adb/client/usb_linux.cpp || die #616508
 
 	cd "${S}"/selinux

diff --git a/dev-util/android-tools/files/android-tools-8.1.0_p1-musl.patch b/dev-util/android-tools/files/android-tools-8.1.0_p1-musl.patch
new file mode 100644
index 0000000..4b25964
--- /dev/null
+++ b/dev-util/android-tools/files/android-tools-8.1.0_p1-musl.patch
@@ -0,0 +1,42 @@
+--- a/base/logging.cpp
++++ b/base/logging.cpp
+@@ -28,7 +28,7 @@
+ // For getprogname(3) or program_invocation_short_name.
+ #if defined(__ANDROID__) || defined(__APPLE__)
+ #include <stdlib.h>
+-#elif defined(__GLIBC__)
++#elif defined(__linux__)
+ #include <errno.h>
+ #endif
+ 
+@@ -90,7 +90,7 @@
+ }
+ 
+ namespace {
+-#if defined(__GLIBC__)
++#if defined(__linux__)
+ const char* getprogname() {
+   return program_invocation_short_name;
+ }
+--- a/adb/diagnose_usb.cpp	2018-01-29 12:05:10.466834056 -0800
++++ b/adb/diagnose_usb.cpp	2018-01-29 12:13:20.980825271 -0800
+@@ -33,7 +33,7 @@
+ // Returns a message describing any potential problems we find with udev, or an empty string if we
+ // can't find plugdev information (i.e. udev is not installed).
+ static std::string GetUdevProblem() {
+-#if defined(__linux__)
++#if defined(__GLIBC__)
+     errno = 0;
+     group* plugdev_group = getgrnam("plugdev");
+ 
+--- a/fastboot/socket.cpp	2018-01-29 12:05:10.493834055 -0800
++++ b/fastboot/socket.cpp	2018-01-29 12:17:23.666820925 -0800
+@@ -28,6 +28,8 @@
+ 
+ #include "socket.h"
+ 
++#include <sys/select.h>
++
+ #include <android-base/errors.h>
+ #include <android-base/stringprintf.h>
+