[gentoo-commits] repo/gentoo:master commit in: dev-util/android-tools/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/gentoo:master commit in: dev-util/android-tools/
@ 2023-11-22 11:16 Arthur Zamarin
  0 siblings, 0 replies; 70+ messages in thread
From: Arthur Zamarin @ 2023-11-22 11:16 UTC (permalink / raw
  To: gentoo-commits

commit:     0268f3ce950474e828e8fb5130b204b28789db0f
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 22 11:15:37 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Wed Nov 22 11:15:37 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0268f3ce

dev-util/android-tools: Stabilize 34.0.1 amd64, #917668

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 dev-util/android-tools/android-tools-34.0.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/android-tools/android-tools-34.0.1.ebuild b/dev-util/android-tools/android-tools-34.0.1.ebuild
index 74e9b64d54ea..289192d2aae0 100644
--- a/dev-util/android-tools/android-tools-34.0.1.ebuild
+++ b/dev-util/android-tools/android-tools-34.0.1.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 # 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 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
 IUSE="python udev"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 


^ permalink raw reply related	[flat|nested] 70+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-util/android-tools/
@ 2024-09-05  5:36 Zac Medico
  0 siblings, 0 replies; 70+ messages in thread
From: Zac Medico @ 2024-09-05  5:36 UTC (permalink / raw
  To: gentoo-commits

commit:     754f240e6662ee4ac5d93fd52adca345d037f6c2
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Thu Sep  5 05:32:20 2024 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Thu Sep  5 05:36:17 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=754f240e

dev-util/android-tools: Depend on dev-cpp/abseil-cpp:=

Bug: https://bugs.gentoo.org/939089
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

 dev-util/android-tools/android-tools-33.0.3-r1.ebuild | 3 ++-
 dev-util/android-tools/android-tools-34.0.5.ebuild    | 1 +
 dev-util/android-tools/android-tools-35.0.1.ebuild    | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/dev-util/android-tools/android-tools-33.0.3-r1.ebuild b/dev-util/android-tools/android-tools-33.0.3-r1.ebuild
index 155cf7f10a4b..b79b27a92a04 100644
--- a/dev-util/android-tools/android-tools-33.0.3-r1.ebuild
+++ b/dev-util/android-tools/android-tools-33.0.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -28,6 +28,7 @@ DEPEND="
 	app-arch/brotli:=
 	app-arch/lz4:=
 	app-arch/zstd:=
+	dev-cpp/abseil-cpp:=
 	dev-libs/libpcre2:=
 	>=dev-libs/protobuf-3.0.0:=
 	sys-libs/zlib:=

diff --git a/dev-util/android-tools/android-tools-34.0.5.ebuild b/dev-util/android-tools/android-tools-34.0.5.ebuild
index 32ad5c7b7ab0..8cec6941f76e 100644
--- a/dev-util/android-tools/android-tools-34.0.5.ebuild
+++ b/dev-util/android-tools/android-tools-34.0.5.ebuild
@@ -28,6 +28,7 @@ DEPEND="
 	app-arch/brotli:=
 	app-arch/lz4:=
 	app-arch/zstd:=
+	dev-cpp/abseil-cpp:=
 	dev-libs/libpcre2:=
 	>=dev-libs/protobuf-3.0.0:=
 	sys-libs/zlib:=

diff --git a/dev-util/android-tools/android-tools-35.0.1.ebuild b/dev-util/android-tools/android-tools-35.0.1.ebuild
index 9dacbecf215d..3ffcb47e9012 100644
--- a/dev-util/android-tools/android-tools-35.0.1.ebuild
+++ b/dev-util/android-tools/android-tools-35.0.1.ebuild
@@ -28,6 +28,7 @@ DEPEND="
 	app-arch/brotli:=
 	app-arch/lz4:=
 	app-arch/zstd:=
+	dev-cpp/abseil-cpp:=
 	dev-libs/libpcre2:=
 	>=dev-libs/protobuf-3.0.0:=
 	sys-libs/zlib:=


^ permalink raw reply related	[flat|nested] 70+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-util/android-tools/
@ 2024-08-25  7:21 Zac Medico
  0 siblings, 0 replies; 70+ messages in thread
From: Zac Medico @ 2024-08-25  7:21 UTC (permalink / raw
  To: gentoo-commits

commit:     a0878db1c9b17cf2500b2f8ad434562042cbb1d9
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 25 07:16:22 2024 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sun Aug 25 07:21:33 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0878db1

dev-util/android-tools: Re-apply LTO-unsafe fix

Re-apply the LTO-unsafe fix from commit
0c03b34a1057b2859947e5c1f8c592ff412babf3.

Fixes: https://github.com/gentoo/gentoo/pull/38069
Closes: https://bugs.gentoo.org/937769
Reported-by: Eli Schwartz <eschwartz <AT> gentoo.org>
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

 dev-util/android-tools/android-tools-35.0.1.ebuild | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/dev-util/android-tools/android-tools-35.0.1.ebuild b/dev-util/android-tools/android-tools-35.0.1.ebuild
index 0ff6f3bbb94f..9dacbecf215d 100644
--- a/dev-util/android-tools/android-tools-35.0.1.ebuild
+++ b/dev-util/android-tools/android-tools-35.0.1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{10..12} )
 
-inherit cmake python-r1
+inherit cmake flag-o-matic python-r1
 
 DESCRIPTION="Android platform tools (adb, fastboot, and mkbootimg)"
 HOMEPAGE="https://github.com/nmeum/android-tools/ https://developer.android.com/"
@@ -54,11 +54,26 @@ src_prepare() {
 	eapply "${S}/patches/libziparchive/0004-Remove-the-useless-dependency-on-gtest.patch"
 
 	cd "${S}" || die
+
+	# why do we depend on libandroidfw? It is never linked to or used.
+	# https://github.com/nmeum/android-tools/issues/148
+	sed -i '/libandroidfw/d' vendor/CMakeLists.txt || die
+	rm -r vendor/base || die
+
 	rm -r patches || die
 	cmake_src_prepare
 }
 
 src_configure() {
+	# -Werror=odr, -Werror=lto-type-mismatch
+	#
+	# https://bugs.gentoo.org/858311
+	# https://issuetracker.google.com/issues/347247969
+	#
+	# and in vendored f2fs-tools copy:
+	# https://bugs.gentoo.org/863896
+	filter-lto
+
 	local mycmakeargs=(
 		# Statically link the bundled boringssl
 		-DCMAKE_BUILD_TYPE=Release \


^ permalink raw reply related	[flat|nested] 70+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-util/android-tools/
@ 2024-08-10 19:38 Zac Medico
  0 siblings, 0 replies; 70+ messages in thread
From: Zac Medico @ 2024-08-10 19:38 UTC (permalink / raw
  To: gentoo-commits

commit:     7dd40271d9f5637cab1e93cd7df57a6da7bed9bd
Author:     Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com>
AuthorDate: Wed Jun 12 23:13:06 2024 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sat Aug 10 19:22:50 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7dd40271

dev-util/android-tools: add 35.0.1

Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/38069
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

 dev-util/android-tools/Manifest                    |  1 +
 dev-util/android-tools/android-tools-35.0.1.ebuild | 99 ++++++++++++++++++++++
 2 files changed, 100 insertions(+)

diff --git a/dev-util/android-tools/Manifest b/dev-util/android-tools/Manifest
index a0025f84e65a..d4dcccbb0515 100644
--- a/dev-util/android-tools/Manifest
+++ b/dev-util/android-tools/Manifest
@@ -3,3 +3,4 @@ DIST android-tools-33.0.3.tar.xz 25300756 BLAKE2B 4254f0ab8657966cf56e2a7c3e9a3d
 DIST android-tools-34.0.0.tar.xz 37882448 BLAKE2B 19698c08dd650abba61e5cad9f7474ee3993f5b1fd2f173221560e5ccfc1677093758c325833993a68058c1427e132986b009f9e69a1eae9c4447053920b6feb SHA512 2d24cd95df7da1efa902fab3c848e2ebf09d3335fac61e667b19e1892e95c30a850413d354ceda72a402014623bbda4154cc33fb93a62c31fece8857efbbd596
 DIST android-tools-34.0.1.tar.xz 37904276 BLAKE2B 6b4d31dadbc646d52c8abd65602264dc16127eb36286d23be447539b0d9b46154592a04af37b3e7617933e62529e953b958db8cb77622e72cfe5ab176f822437 SHA512 413ddcca9a461d1c0a12d7fd19b9d8955619b281e1153318ed961bec17ad92bec103671abc8d63525bc83669376f37c11c887cc4cada85719120dff6c3951274
 DIST android-tools-34.0.5.tar.xz 19389824 BLAKE2B a86ad9d22c356d2b3d0d85dd17e5540b5d105a286dd07946659dac4ab6d1e8285eecbbf0377c542ac6ca78e0af8df320a97e24ea2b735bbec66a2d2b23d2099c SHA512 2edea0c7a4c2f63531a8b5f518ed4dc9c315d08d8b23d3fac3b7024e2297860465f6df9fad43c9925fb80b5a50f5f3f4744886b552818bf3e961ba0372212496
+DIST android-tools-35.0.1.tar.xz 21460424 BLAKE2B e87a4ad13e5b8030069c87cbbe47f3698888e797e319aa3a054a668ad55f4cdd7445e5ef7825f2d185f6891958fd52f815ee0cb3909649ee3ea703061d72d0ab SHA512 2dc3831f29a2c5ffc57978e4a6fa6d1469bcb0740750779b3e4f8239eaec87864f3474254a2d649ab630062be091d8b44a4e45c7e7b7e033f3b4481f81d76296

diff --git a/dev-util/android-tools/android-tools-35.0.1.ebuild b/dev-util/android-tools/android-tools-35.0.1.ebuild
new file mode 100644
index 000000000000..0ff6f3bbb94f
--- /dev/null
+++ b/dev-util/android-tools/android-tools-35.0.1.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit cmake python-r1
+
+DESCRIPTION="Android platform tools (adb, fastboot, and mkbootimg)"
+HOMEPAGE="https://github.com/nmeum/android-tools/ https://developer.android.com/"
+
+MY_PV="${PV//_/}"
+SRC_URI="https://github.com/nmeum/android-tools/releases/download/${MY_PV}/${PN}-${MY_PV}.tar.xz
+	https://dev.gentoo.org/~zmedico/dist/${PN}-31.0.3-no-gtest.patch
+"
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+# 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 ~arm ~arm64 ~x86"
+IUSE="python udev"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# dev-libs/libpcre only required for e2fsdroid
+DEPEND="
+	app-arch/brotli:=
+	app-arch/lz4:=
+	app-arch/zstd:=
+	dev-libs/libpcre2:=
+	>=dev-libs/protobuf-3.0.0:=
+	sys-libs/zlib:=
+	virtual/libusb:1=
+"
+RDEPEND="${DEPEND}
+	udev? ( dev-util/android-udev-rules )
+	python? ( ${PYTHON_DEPS} )
+"
+BDEPEND="
+	dev-lang/go
+	dev-lang/perl
+"
+
+DOCS=()
+
+src_prepare() {
+	eapply "${DISTDIR}/${PN}-31.0.3-no-gtest.patch"
+
+	cd "${S}/vendor/core" || die
+	eapply "${S}/patches/core/0011-Remove-the-useless-dependency-on-gtest.patch"
+
+	cd "${S}/vendor/libziparchive" || die
+	eapply "${S}/patches/libziparchive/0004-Remove-the-useless-dependency-on-gtest.patch"
+
+	cd "${S}" || die
+	rm -r patches || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		# Statically link the bundled boringssl
+		-DCMAKE_BUILD_TYPE=Release \
+		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
+		-DCMAKE_C_FLAGS="$CFLAGS" \
+		-DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON \
+		-Dprotobuf_MODULE_COMPATIBLE=ON
+		-DBUILD_SHARED_LIBS=OFF
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	export GOCACHE="${T}/go-build"
+	export GOFLAGS="-mod=vendor"
+	cmake_src_compile
+}
+
+src_install() {
+	cmake_src_install
+	rm "${ED}/usr/bin/mkbootimg" || die
+	rm "${ED}/usr/bin/unpack_bootimg" || die
+	rm "${ED}/usr/bin/repack_bootimg" || die
+	rm "${ED}/usr/bin/mkdtboimg" || die
+	rm "${ED}/usr/bin/avbtool" || die
+
+	if use python; then
+		python_foreach_impl python_newexe vendor/mkbootimg/mkbootimg.py mkbootimg
+		python_foreach_impl python_newexe vendor/mkbootimg/unpack_bootimg.py unpack_bootimg
+		python_foreach_impl python_newexe vendor/mkbootimg/repack_bootimg.py repack_bootimg
+		python_foreach_impl python_newexe vendor/libufdt/utils/src/mkdtboimg.py mkdtboimg
+		python_foreach_impl python_newexe vendor/avb/avbtool.py avbtool
+	fi
+	docinto adb
+	dodoc vendor/adb/*.{txt,TXT}
+	docinto fastboot
+	dodoc vendor/core/fastboot/README.md
+}


^ permalink raw reply related	[flat|nested] 70+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-util/android-tools/
@ 2024-06-17  1:47 Sam James
  0 siblings, 0 replies; 70+ messages in thread
From: Sam James @ 2024-06-17  1:47 UTC (permalink / raw
  To: gentoo-commits

commit:     0c03b34a1057b2859947e5c1f8c592ff412babf3
Author:     Eli Schwartz <eschwartz93 <AT> gmail <DOT> com>
AuthorDate: Sun Jun 16 19:02:49 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jun 17 01:46:48 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c03b34a

dev-util/android-tools: mark as LTO-unsafe

And delete some build system glop that has strict-aliasing errors but is
never actually used.

Closes: https://bugs.gentoo.org/858311
Signed-off-by: Eli Schwartz <eschwartz93 <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-util/android-tools/android-tools-34.0.5.ebuild | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/dev-util/android-tools/android-tools-34.0.5.ebuild b/dev-util/android-tools/android-tools-34.0.5.ebuild
index 7df559af43f4..32ad5c7b7ab0 100644
--- a/dev-util/android-tools/android-tools-34.0.5.ebuild
+++ b/dev-util/android-tools/android-tools-34.0.5.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{10..12} )
 
-inherit cmake python-r1
+inherit cmake flag-o-matic python-r1
 
 DESCRIPTION="Android platform tools (adb, fastboot, and mkbootimg)"
 HOMEPAGE="https://github.com/nmeum/android-tools/ https://developer.android.com/"
@@ -54,11 +54,26 @@ src_prepare() {
 	eapply "${S}/patches/libziparchive/0004-Remove-the-useless-dependency-on-gtest.patch"
 
 	cd "${S}" || die
+
+	# why do we depend on libandroidfw? It is never linked to or used.
+	# https://github.com/nmeum/android-tools/issues/148
+	sed -i '/libandroidfw/d' vendor/CMakeLists.txt || die
+	rm -r vendor/base || die
+
 	rm -r patches || die
 	cmake_src_prepare
 }
 
 src_configure() {
+	# -Werror=odr, -Werror=lto-type-mismatch
+	#
+	# https://bugs.gentoo.org/858311
+	# https://issuetracker.google.com/issues/347247969
+	#
+	# and in vendored f2fs-tools copy:
+	# https://bugs.gentoo.org/863896
+	filter-lto
+
 	local mycmakeargs=(
 		# Statically link the bundled boringssl
 		-DCMAKE_BUILD_TYPE=Release \


^ permalink raw reply related	[flat|nested] 70+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-util/android-tools/
@ 2024-05-13 12:32 Arthur Zamarin
  0 siblings, 0 replies; 70+ messages in thread
From: Arthur Zamarin @ 2024-05-13 12:32 UTC (permalink / raw
  To: gentoo-commits

commit:     f35f6282609a90c0b91f647d32a2aab331272d4a
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Mon May 13 12:32:51 2024 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Mon May 13 12:32:51 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f35f6282

dev-util/android-tools: Stabilize 34.0.5 arm64, #931747

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 dev-util/android-tools/android-tools-34.0.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/android-tools/android-tools-34.0.5.ebuild b/dev-util/android-tools/android-tools-34.0.5.ebuild
index b23eeacddd90..7df559af43f4 100644
--- a/dev-util/android-tools/android-tools-34.0.5.ebuild
+++ b/dev-util/android-tools/android-tools-34.0.5.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 # 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 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="python udev"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 


^ permalink raw reply related	[flat|nested] 70+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-util/android-tools/
@ 2024-05-11 15:16 Arthur Zamarin
  0 siblings, 0 replies; 70+ messages in thread
From: Arthur Zamarin @ 2024-05-11 15:16 UTC (permalink / raw
  To: gentoo-commits

commit:     da8ea10eacd4b89983e08718fb51fdd3dbcbd80e
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat May 11 15:16:20 2024 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat May 11 15:16:20 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da8ea10e

dev-util/android-tools: Stabilize 34.0.5 amd64, #931747

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 dev-util/android-tools/android-tools-34.0.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/android-tools/android-tools-34.0.5.ebuild b/dev-util/android-tools/android-tools-34.0.5.ebuild
index 0ff6f3bbb94f..8fc78639f60a 100644
--- a/dev-util/android-tools/android-tools-34.0.5.ebuild
+++ b/dev-util/android-tools/android-tools-34.0.5.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 # 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 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
 IUSE="python udev"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 


^ permalink raw reply related	[flat|nested] 70+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-util/android-tools/
@ 2024-05-11 15:16 Arthur Zamarin
  0 siblings, 0 replies; 70+ messages in thread
From: Arthur Zamarin @ 2024-05-11 15:16 UTC (permalink / raw
  To: gentoo-commits

commit:     91f2f21ef1068d3c31fb211d9aa09c3a005f49f6
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat May 11 15:16:21 2024 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat May 11 15:16:21 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91f2f21e

dev-util/android-tools: Stabilize 34.0.5 x86, #931747

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 dev-util/android-tools/android-tools-34.0.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/android-tools/android-tools-34.0.5.ebuild b/dev-util/android-tools/android-tools-34.0.5.ebuild
index 8fc78639f60a..b23eeacddd90 100644
--- a/dev-util/android-tools/android-tools-34.0.5.ebuild
+++ b/dev-util/android-tools/android-tools-34.0.5.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 # 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 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="python udev"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 


^ permalink raw reply related	[flat|nested] 70+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-util/android-tools/
@ 2024-03-25  0:23 Zac Medico
  0 siblings, 0 replies; 70+ messages in thread
From: Zac Medico @ 2024-03-25  0:23 UTC (permalink / raw
  To: gentoo-commits

commit:     0a5eb4ce61f87886331a491087b53b07a9609088
Author:     Aliaksei Urbanski <aliaksei.urbanski <AT> gmail <DOT> com>
AuthorDate: Fri Mar 22 21:53:04 2024 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Mon Mar 25 00:19:09 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a5eb4ce

dev-util/android-tools: add 34.0.5

Release:
  - https://github.com/nmeum/android-tools/releases/tag/34.0.5

Based on:
  - https://gitweb.gentoo.org/repo/gentoo.git/tree/dev-util/android-tools/android-tools-34.0.1.ebuild
  - https://gitlab.com/Perfect_Gentleman/PG_Overlay/-/blob/master/dev-util/android-tools/android-tools-34.0.4.ebuild

Co-authored-by: Perfect_Gentleman <Perfect007Gentleman <AT> GMail.com>
Signed-off-by: Aliaksei Urbanski <aliaksei.urbanski <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/35868
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

 dev-util/android-tools/Manifest                    |  1 +
 dev-util/android-tools/android-tools-34.0.5.ebuild | 99 ++++++++++++++++++++++
 dev-util/android-tools/metadata.xml                |  2 +-
 3 files changed, 101 insertions(+), 1 deletion(-)

diff --git a/dev-util/android-tools/Manifest b/dev-util/android-tools/Manifest
index d89c8e9b9823..a0025f84e65a 100644
--- a/dev-util/android-tools/Manifest
+++ b/dev-util/android-tools/Manifest
@@ -2,3 +2,4 @@ DIST android-tools-31.0.3-no-gtest.patch 3152 BLAKE2B da71e3cba87b21ffcb144602a0
 DIST android-tools-33.0.3.tar.xz 25300756 BLAKE2B 4254f0ab8657966cf56e2a7c3e9a3d889dfa9f26e61d8b46480bb74c5a8be33494f450827e3b2db4087006b3160892e6a846ef33719870cbbd032647cfc3ce78 SHA512 78c8141f5f13f1c0e5da474e1d79760a612e911519af4e9f21c0e5005f2ce99f3aeacf16f3fcdfe1250fc795a88190fa243592e1066a2156e1fd8d2b9c3d7f71
 DIST android-tools-34.0.0.tar.xz 37882448 BLAKE2B 19698c08dd650abba61e5cad9f7474ee3993f5b1fd2f173221560e5ccfc1677093758c325833993a68058c1427e132986b009f9e69a1eae9c4447053920b6feb SHA512 2d24cd95df7da1efa902fab3c848e2ebf09d3335fac61e667b19e1892e95c30a850413d354ceda72a402014623bbda4154cc33fb93a62c31fece8857efbbd596
 DIST android-tools-34.0.1.tar.xz 37904276 BLAKE2B 6b4d31dadbc646d52c8abd65602264dc16127eb36286d23be447539b0d9b46154592a04af37b3e7617933e62529e953b958db8cb77622e72cfe5ab176f822437 SHA512 413ddcca9a461d1c0a12d7fd19b9d8955619b281e1153318ed961bec17ad92bec103671abc8d63525bc83669376f37c11c887cc4cada85719120dff6c3951274
+DIST android-tools-34.0.5.tar.xz 19389824 BLAKE2B a86ad9d22c356d2b3d0d85dd17e5540b5d105a286dd07946659dac4ab6d1e8285eecbbf0377c542ac6ca78e0af8df320a97e24ea2b735bbec66a2d2b23d2099c SHA512 2edea0c7a4c2f63531a8b5f518ed4dc9c315d08d8b23d3fac3b7024e2297860465f6df9fad43c9925fb80b5a50f5f3f4744886b552818bf3e961ba0372212496

diff --git a/dev-util/android-tools/android-tools-34.0.5.ebuild b/dev-util/android-tools/android-tools-34.0.5.ebuild
new file mode 100644
index 000000000000..0ff6f3bbb94f
--- /dev/null
+++ b/dev-util/android-tools/android-tools-34.0.5.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit cmake python-r1
+
+DESCRIPTION="Android platform tools (adb, fastboot, and mkbootimg)"
+HOMEPAGE="https://github.com/nmeum/android-tools/ https://developer.android.com/"
+
+MY_PV="${PV//_/}"
+SRC_URI="https://github.com/nmeum/android-tools/releases/download/${MY_PV}/${PN}-${MY_PV}.tar.xz
+	https://dev.gentoo.org/~zmedico/dist/${PN}-31.0.3-no-gtest.patch
+"
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+# 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 ~arm ~arm64 ~x86"
+IUSE="python udev"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# dev-libs/libpcre only required for e2fsdroid
+DEPEND="
+	app-arch/brotli:=
+	app-arch/lz4:=
+	app-arch/zstd:=
+	dev-libs/libpcre2:=
+	>=dev-libs/protobuf-3.0.0:=
+	sys-libs/zlib:=
+	virtual/libusb:1=
+"
+RDEPEND="${DEPEND}
+	udev? ( dev-util/android-udev-rules )
+	python? ( ${PYTHON_DEPS} )
+"
+BDEPEND="
+	dev-lang/go
+	dev-lang/perl
+"
+
+DOCS=()
+
+src_prepare() {
+	eapply "${DISTDIR}/${PN}-31.0.3-no-gtest.patch"
+
+	cd "${S}/vendor/core" || die
+	eapply "${S}/patches/core/0011-Remove-the-useless-dependency-on-gtest.patch"
+
+	cd "${S}/vendor/libziparchive" || die
+	eapply "${S}/patches/libziparchive/0004-Remove-the-useless-dependency-on-gtest.patch"
+
+	cd "${S}" || die
+	rm -r patches || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		# Statically link the bundled boringssl
+		-DCMAKE_BUILD_TYPE=Release \
+		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
+		-DCMAKE_C_FLAGS="$CFLAGS" \
+		-DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON \
+		-Dprotobuf_MODULE_COMPATIBLE=ON
+		-DBUILD_SHARED_LIBS=OFF
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	export GOCACHE="${T}/go-build"
+	export GOFLAGS="-mod=vendor"
+	cmake_src_compile
+}
+
+src_install() {
+	cmake_src_install
+	rm "${ED}/usr/bin/mkbootimg" || die
+	rm "${ED}/usr/bin/unpack_bootimg" || die
+	rm "${ED}/usr/bin/repack_bootimg" || die
+	rm "${ED}/usr/bin/mkdtboimg" || die
+	rm "${ED}/usr/bin/avbtool" || die
+
+	if use python; then
+		python_foreach_impl python_newexe vendor/mkbootimg/mkbootimg.py mkbootimg
+		python_foreach_impl python_newexe vendor/mkbootimg/unpack_bootimg.py unpack_bootimg
+		python_foreach_impl python_newexe vendor/mkbootimg/repack_bootimg.py repack_bootimg
+		python_foreach_impl python_newexe vendor/libufdt/utils/src/mkdtboimg.py mkdtboimg
+		python_foreach_impl python_newexe vendor/avb/avbtool.py avbtool
+	fi
+	docinto adb
+	dodoc vendor/adb/*.{txt,TXT}
+	docinto fastboot
+	dodoc vendor/core/fastboot/README.md
+}

diff --git a/dev-util/android-tools/metadata.xml b/dev-util/android-tools/metadata.xml
index 3eaea76d509f..8efb50d598cb 100644
--- a/dev-util/android-tools/metadata.xml
+++ b/dev-util/android-tools/metadata.xml
@@ -6,7 +6,7 @@
 		<changelog>https://android.googlesource.com/platform/packages/modules/adb/+log</changelog>
 		<doc>https://android.googlesource.com/platform/packages/modules/adb/+/HEAD/OVERVIEW.TXT</doc>
 		<remote-id type="cpe">cpe:/a:google:android_debug_bridge</remote-id>
-		<remote-id type="github">android/platform_system_core</remote-id>
+		<remote-id type="github">nmeum/android-tools</remote-id>
 		<remote-id type="launchpad">ubuntu</remote-id>
 	</upstream>
 	<maintainer type="person">


^ permalink raw reply related	[flat|nested] 70+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-util/android-tools/
@ 2024-03-25  0:23 Zac Medico
  0 siblings, 0 replies; 70+ messages in thread
From: Zac Medico @ 2024-03-25  0:23 UTC (permalink / raw
  To: gentoo-commits

commit:     79429e7d0a3d11445044344e4e4c67a3e5aee130
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 25 00:20:18 2024 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Mon Mar 25 00:20:25 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79429e7d

dev-util/android-tools: remove launchpad upstream metadata

See: https://github.com/gentoo/gentoo/pull/35868/files#r1536264424
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

 dev-util/android-tools/metadata.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/dev-util/android-tools/metadata.xml b/dev-util/android-tools/metadata.xml
index 8efb50d598cb..e9527752ee29 100644
--- a/dev-util/android-tools/metadata.xml
+++ b/dev-util/android-tools/metadata.xml
@@ -7,7 +7,6 @@
 		<doc>https://android.googlesource.com/platform/packages/modules/adb/+/HEAD/OVERVIEW.TXT</doc>
 		<remote-id type="cpe">cpe:/a:google:android_debug_bridge</remote-id>
 		<remote-id type="github">nmeum/android-tools</remote-id>
-		<remote-id type="launchpad">ubuntu</remote-id>
 	</upstream>
 	<maintainer type="person">
 		<email>zmedico@gentoo.org</email>


^ permalink raw reply related	[flat|nested] 70+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-util/android-tools/
@ 2024-03-02 20:09 Andreas K. Hüttel
  0 siblings, 0 replies; 70+ messages in thread
From: Andreas K. Hüttel @ 2024-03-02 20:09 UTC (permalink / raw
  To: gentoo-commits

commit:     6166319da285e779e50e10fb4ff4a56dfacb2519
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Mar  2 20:08:37 2024 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Mar  2 20:09:12 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6166319d

dev-util/android-tools: Apply musl-1.2.4 largefile workaround

Bug: https://bugs.gentoo.org/905713
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 dev-util/android-tools/android-tools-34.0.1.ebuild | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/dev-util/android-tools/android-tools-34.0.1.ebuild b/dev-util/android-tools/android-tools-34.0.1.ebuild
index d939afa837a5..022d6d2fc5be 100644
--- a/dev-util/android-tools/android-tools-34.0.1.ebuild
+++ b/dev-util/android-tools/android-tools-34.0.1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{10..11} )
 
-inherit cmake python-r1
+inherit flag-o-matic cmake python-r1
 
 DESCRIPTION="Android platform tools (adb, fastboot, and mkbootimg)"
 HOMEPAGE="https://github.com/nmeum/android-tools/ https://developer.android.com/"
@@ -61,6 +61,9 @@ src_prepare() {
 }
 
 src_configure() {
+	# bug 905713
+	use elibc_musl && append-flags -D_LARGEFILE64_SOURCE
+
 	local mycmakeargs=(
 		# Statically link the bundled boringssl
 		-DBUILD_SHARED_LIBS=OFF


^ permalink raw reply related	[flat|nested] 70+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-util/android-tools/
@ 2024-01-17  5:50 Sam James
  0 siblings, 0 replies; 70+ messages in thread
From: Sam James @ 2024-01-17  5:50 UTC (permalink / raw
  To: gentoo-commits

commit:     7d86ccdced67e17e8dbd28a9509a493acf887b74
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 17 05:49:07 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jan 17 05:49:07 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d86ccdc

dev-util/android-tools: Stabilize 34.0.1 arm64, #922238

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-util/android-tools/android-tools-34.0.1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-util/android-tools/android-tools-34.0.1.ebuild b/dev-util/android-tools/android-tools-34.0.1.ebuild
index 71c640449d57..d939afa837a5 100644
--- a/dev-util/android-tools/android-tools-34.0.1.ebuild
+++ b/dev-util/android-tools/android-tools-34.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -19,7 +19,7 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 # 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 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="python udev"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 


^ permalink raw reply related	[flat|nested] 70+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-util/android-tools/
@ 2023-11-22 11:16 Arthur Zamarin
  0 siblings, 0 replies; 70+ messages in thread
From: Arthur Zamarin @ 2023-11-22 11:16 UTC (permalink / raw
  To: gentoo-commits

commit:     c9af27263389a8f8ba3211fb055edb2837d74f30
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 22 11:15:38 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Wed Nov 22 11:15:38 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9af2726

dev-util/android-tools: Stabilize 34.0.1 x86, #917668

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 dev-util/android-tools/android-tools-34.0.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/android-tools/android-tools-34.0.1.ebuild b/dev-util/android-tools/android-tools-34.0.1.ebuild
index 289192d2aae0..f39af8537f13 100644
--- a/dev-util/android-tools/android-tools-34.0.1.ebuild
+++ b/dev-util/android-tools/android-tools-34.0.1.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 # 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 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="python udev"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 


^ permalink raw reply related	[flat|nested] 70+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-util/android-tools/
@ 2023-08-22 21:27 Sam James
  0 siblings, 0 replies; 70+ messages in thread
From: Sam James @ 2023-08-22 21:27 UTC (permalink / raw
  To: gentoo-commits

commit:     2520021da5111192b213c366dafd964f4430d92d
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 22 21:27:22 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Aug 22 21:27:22 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2520021d

dev-util/android-tools: disable py3.9

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-util/android-tools/android-tools-34.0.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/android-tools/android-tools-34.0.1.ebuild b/dev-util/android-tools/android-tools-34.0.1.ebuild
index c878253d66a3..74e9b64d54ea 100644
--- a/dev-util/android-tools/android-tools-34.0.1.ebuild
+++ b/dev-util/android-tools/android-tools-34.0.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..11} )
 
 inherit cmake python-r1
 


^ permalink raw reply related	[flat|nested] 70+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-util/android-tools/
@ 2023-08-22 21:25 Sam James
  0 siblings, 0 replies; 70+ messages in thread
From: Sam James @ 2023-08-22 21:25 UTC (permalink / raw
  To: gentoo-commits

commit:     81669be28b8f4053b5a9abd53a68d78842d64a6f
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 22 21:25:14 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Aug 22 21:25:14 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81669be2

dev-util/android-tools: destabilize 34.0.1 for ~amd64, ~x86

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-util/android-tools/android-tools-34.0.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/android-tools/android-tools-34.0.1.ebuild b/dev-util/android-tools/android-tools-34.0.1.ebuild
index d8c292897706..c878253d66a3 100644
--- a/dev-util/android-tools/android-tools-34.0.1.ebuild
+++ b/dev-util/android-tools/android-tools-34.0.1.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 # 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 ~arm ~arm64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="python udev"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 


^ permalink raw reply related	[flat|nested] 70+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-util/android-tools/
@ 2023-04-19 11:07 Sam James
  0 siblings, 0 replies; 70+ messages in thread
From: Sam James @ 2023-04-19 11:07 UTC (permalink / raw
  To: gentoo-commits

commit:     639b53e88de39e3e7013276613429f08394c4cae
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 19 11:02:15 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Apr 19 11:04:06 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=639b53e8

dev-util/android-tools: Stabilize 34.0.0 x86, #903918

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-util/android-tools/android-tools-34.0.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/android-tools/android-tools-34.0.0.ebuild b/dev-util/android-tools/android-tools-34.0.0.ebuild
index 3107d7775df1..d8ca6ca82456 100644
--- a/dev-util/android-tools/android-tools-34.0.0.ebuild
+++ b/dev-util/android-tools/android-tools-34.0.0.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 # 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 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="python udev"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 


^ permalink raw reply related	[flat|nested] 70+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-util/android-tools/
@ 2023-04-19  6:49 Arthur Zamarin
  0 siblings, 0 replies; 70+ messages in thread
From: Arthur Zamarin @ 2023-04-19  6:49 UTC (permalink / raw
  To: gentoo-commits

commit:     f6dc6ac91a12e7f4918bf154d6d1d97cbbe8efae
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 19 06:49:05 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Wed Apr 19 06:49:05 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6dc6ac9

dev-util/android-tools: Stabilize 34.0.0 amd64, #903918

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 dev-util/android-tools/android-tools-34.0.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/android-tools/android-tools-34.0.0.ebuild b/dev-util/android-tools/android-tools-34.0.0.ebuild
index 499cca3d2025..3107d7775df1 100644
--- a/dev-util/android-tools/android-tools-34.0.0.ebuild
+++ b/dev-util/android-tools/android-tools-34.0.0.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 # 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 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
 IUSE="python udev"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 


^ permalink raw reply related	[flat|nested] 70+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-util/android-tools/
@ 2023-03-12 23:49 Zac Medico
  0 siblings, 0 replies; 70+ messages in thread
From: Zac Medico @ 2023-03-12 23:49 UTC (permalink / raw
  To: gentoo-commits

commit:     149cd622143dccf0198373e2d252d008644f583f
Author:     Jianhua Lu <lujianhua000 <AT> gmail <DOT> com>
AuthorDate: Sun Mar 12 09:00:44 2023 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sun Mar 12 23:42:11 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=149cd622

dev-util/android-tools: add 34.0.0

Bump from 33.0.3-r1 -> 34.0.0.
1. Remove apply adb patches statement line, as they has been merged.
2. Add mkdtboimg and avbtool python script.

Closes: https://github.com/gentoo/gentoo/pull/30073
Signed-off-by: Jianhua Lu <lujianhua000 <AT> gmail.com>
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

 dev-util/android-tools/Manifest                    |  1 +
 dev-util/android-tools/android-tools-34.0.0.ebuild | 94 ++++++++++++++++++++++
 2 files changed, 95 insertions(+)

diff --git a/dev-util/android-tools/Manifest b/dev-util/android-tools/Manifest
index ce460cffc27c..157b8efb06a8 100644
--- a/dev-util/android-tools/Manifest
+++ b/dev-util/android-tools/Manifest
@@ -1,2 +1,3 @@
 DIST android-tools-31.0.3-no-gtest.patch 3152 BLAKE2B da71e3cba87b21ffcb144602a06d7e269faabd173233363b757cd2191c051f8d3281f591117d4551d7acc029d6e2d421f702f9f836dfe0dec6c676aa39a2d9fe SHA512 a28d2264bf40c420a279acf1f4c3b4588d96ce2d6e2d6d322abbde62d773804bef10dc33f13dd52c7de80ace6c58f91ae28f5d4e8e97dfae4d2a8473d8537423
 DIST android-tools-33.0.3.tar.xz 25300756 BLAKE2B 4254f0ab8657966cf56e2a7c3e9a3d889dfa9f26e61d8b46480bb74c5a8be33494f450827e3b2db4087006b3160892e6a846ef33719870cbbd032647cfc3ce78 SHA512 78c8141f5f13f1c0e5da474e1d79760a612e911519af4e9f21c0e5005f2ce99f3aeacf16f3fcdfe1250fc795a88190fa243592e1066a2156e1fd8d2b9c3d7f71
+DIST android-tools-34.0.0.tar.xz 37882448 BLAKE2B 19698c08dd650abba61e5cad9f7474ee3993f5b1fd2f173221560e5ccfc1677093758c325833993a68058c1427e132986b009f9e69a1eae9c4447053920b6feb SHA512 2d24cd95df7da1efa902fab3c848e2ebf09d3335fac61e667b19e1892e95c30a850413d354ceda72a402014623bbda4154cc33fb93a62c31fece8857efbbd596

diff --git a/dev-util/android-tools/android-tools-34.0.0.ebuild b/dev-util/android-tools/android-tools-34.0.0.ebuild
new file mode 100644
index 000000000000..499cca3d2025
--- /dev/null
+++ b/dev-util/android-tools/android-tools-34.0.0.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit cmake python-r1
+
+DESCRIPTION="Android platform tools (adb, fastboot, and mkbootimg)"
+HOMEPAGE="https://github.com/nmeum/android-tools/ https://developer.android.com/"
+
+MY_PV="${PV//_/}"
+SRC_URI="https://github.com/nmeum/android-tools/releases/download/${MY_PV}/${PN}-${MY_PV}.tar.xz
+	https://dev.gentoo.org/~zmedico/dist/${PN}-31.0.3-no-gtest.patch
+"
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+# 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 ~arm ~arm64 ~x86"
+IUSE="python udev"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# dev-libs/libpcre only required for e2fsdroid
+DEPEND="
+	app-arch/brotli:=
+	app-arch/lz4:=
+	app-arch/zstd:=
+	dev-libs/libpcre2:=
+	>=dev-libs/protobuf-3.0.0:=
+	sys-libs/zlib:=
+	virtual/libusb:1=
+"
+RDEPEND="${DEPEND}
+	udev? ( dev-util/android-udev-rules )
+	python? ( ${PYTHON_DEPS} )
+"
+BDEPEND="
+	dev-lang/go
+	dev-lang/perl
+"
+
+DOCS=()
+
+src_prepare() {
+	eapply "${DISTDIR}/${PN}-31.0.3-no-gtest.patch"
+
+	cd "${S}/vendor/core" || die
+	eapply "${S}/patches/core/0011-Remove-the-useless-dependency-on-gtest.patch"
+
+	cd "${S}/vendor/libziparchive" || die
+	eapply "${S}/patches/libziparchive/0004-Remove-the-useless-dependency-on-gtest.patch"
+
+	cd "${S}" || die
+	rm -r patches || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		# Statically link the bundled boringssl
+		-DBUILD_SHARED_LIBS=OFF
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	export GOCACHE="${T}/go-build"
+	export GOFLAGS="-mod=vendor"
+	cmake_src_compile
+}
+
+src_install() {
+	cmake_src_install
+	rm "${ED}/usr/bin/mkbootimg" || die
+	rm "${ED}/usr/bin/unpack_bootimg" || die
+	rm "${ED}/usr/bin/repack_bootimg" || die
+	rm "${ED}/usr/bin/mkdtboimg" || die
+	rm "${ED}/usr/bin/avbtool" || die
+
+	if use python; then
+		python_foreach_impl python_newexe vendor/mkbootimg/mkbootimg.py mkbootimg
+		python_foreach_impl python_newexe vendor/mkbootimg/unpack_bootimg.py unpack_bootimg
+		python_foreach_impl python_newexe vendor/mkbootimg/repack_bootimg.py repack_bootimg
+		python_foreach_impl python_newexe vendor/libufdt/utils/src/mkdtboimg.py mkdtboimg
+		python_foreach_impl python_newexe vendor/avb/avbtool.py avbtool
+	fi
+	docinto adb
+	dodoc vendor/adb/*.{txt,TXT}
+	docinto fastboot
+	dodoc vendor/core/fastboot/README.md
+}


^ permalink raw reply related	[flat|nested] 70+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-util/android-tools/
@ 2022-11-05 23:14 Zac Medico
  0 siblings, 0 replies; 70+ messages in thread
From: Zac Medico @ 2022-11-05 23:14 UTC (permalink / raw
  To: gentoo-commits

commit:     fd9c418a816f93dcfbe8a4bacf45f472837e51fe
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sat Nov  5 23:12:33 2022 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sat Nov  5 23:13:04 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd9c418a

dev-util/android-tools: add udev USE flag

Closes: https://bugs.gentoo.org/879215
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

 dev-util/android-tools/android-tools-33.0.3-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-util/android-tools/android-tools-33.0.3-r1.ebuild b/dev-util/android-tools/android-tools-33.0.3-r1.ebuild
index da11dd000d4e..a4f094a9d561 100644
--- a/dev-util/android-tools/android-tools-33.0.3-r1.ebuild
+++ b/dev-util/android-tools/android-tools-33.0.3-r1.ebuild
@@ -20,7 +20,7 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 LICENSE="Apache-2.0 BSD-2"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="python"
+IUSE="python udev"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 # dev-libs/libpcre only required for e2fsdroid
@@ -34,7 +34,7 @@ DEPEND="
 	virtual/libusb:1=
 "
 RDEPEND="${DEPEND}
-	dev-util/android-udev-rules
+	udev? ( dev-util/android-udev-rules )
 	python? ( ${PYTHON_DEPS} )
 "
 BDEPEND="


^ permalink raw reply related	[flat|nested] 70+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-util/android-tools/
@ 2022-10-28  0:21 Zac Medico
  0 siblings, 0 replies; 70+ messages in thread
From: Zac Medico @ 2022-10-28  0:21 UTC (permalink / raw
  To: gentoo-commits

commit:     890a0363035e2cac3c3db3ddf196d64b175fc709
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 28 00:21:01 2022 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Fri Oct 28 00:21:12 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=890a0363

dev-util/android-tools: drop 31.0.3, 31.0.3_p2, 33.0.3

Bug: https://bugs.gentoo.org/878281
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

 dev-util/android-tools/Manifest                    |  4 --
 dev-util/android-tools/android-tools-31.0.3.ebuild | 84 ----------------------
 .../android-tools/android-tools-31.0.3_p2.ebuild   | 84 ----------------------
 dev-util/android-tools/android-tools-33.0.3.ebuild | 84 ----------------------
 4 files changed, 256 deletions(-)

diff --git a/dev-util/android-tools/Manifest b/dev-util/android-tools/Manifest
index 5a4c631218d2..ce460cffc27c 100644
--- a/dev-util/android-tools/Manifest
+++ b/dev-util/android-tools/Manifest
@@ -1,6 +1,2 @@
-DIST android-tools-31.0.3-disable-werror-boringssl.patch 1815 BLAKE2B 63e911ba27e2995a11b27e2e1501c5e881d694c5477a216cb910bf1c9c1bf9f9fedffa864748ea4df668a1008124501f7815997304bc355e4ee105bf9b61f75f SHA512 db626d3680ec9f18be394bb2720c8bc7e380aac227ae6f1058476edb83784343f653afc583b06e7a2acd3f2ff500fa37d613d5efca4a9a24daedbf61b5b84015
-DIST android-tools-31.0.3-install-e2fsdroid-ext2simg.patch 2164 BLAKE2B 7f0b43ff5ae820101628399540f3e5b87bf69224f4a61a6b76b8b6b3b06f8e7162a6c1e7ee43eee928cfa96824f5efff72317b4bbfe160d8e72d96aa84e0a1d6 SHA512 d5fd63c108ca6b880b1b79cf362468335f19fad7bf2042fb667b56e34dc95acc47e1bf9c9e72be1d2bd8252a529cd49eb030d141bf735524bdaeb85482d544a9
 DIST android-tools-31.0.3-no-gtest.patch 3152 BLAKE2B da71e3cba87b21ffcb144602a06d7e269faabd173233363b757cd2191c051f8d3281f591117d4551d7acc029d6e2d421f702f9f836dfe0dec6c676aa39a2d9fe SHA512 a28d2264bf40c420a279acf1f4c3b4588d96ce2d6e2d6d322abbde62d773804bef10dc33f13dd52c7de80ace6c58f91ae28f5d4e8e97dfae4d2a8473d8537423
-DIST android-tools-31.0.3.tar.xz 25768908 BLAKE2B e8ca8ff93fcd3936f447926769d7b45194dd96ad99cddd570183a1cbae34dbf49a23e0c53d9eb8f5c25dd09717e1f160829752dc7ebc9404c804b48de8de9889 SHA512 d2c16325b190f77a8ffa38de18ae1aea4bf6848926620f25d14873dc4a3fda3fe2b13349fa2eee197b960ca65738a4a1d2c1f28cf8286ab79e73502e7a8e6357
-DIST android-tools-31.0.3p2.tar.xz 22458776 BLAKE2B a51f839ac44e6e998092d802eb182566f4dc2a7f47a5687e0c877fa4fa6d419b16054f75066a6afe8e458e44f8bc5750ca88a2517619379d1044202d64b2ec80 SHA512 367a502c11a136ff15a060df44df14ceec46eb5eb386babb4d38783622e363421d2ec9a65a5810fb8f2b308912c2bdb980e6fce24ba532a111e413647efe67d5
 DIST android-tools-33.0.3.tar.xz 25300756 BLAKE2B 4254f0ab8657966cf56e2a7c3e9a3d889dfa9f26e61d8b46480bb74c5a8be33494f450827e3b2db4087006b3160892e6a846ef33719870cbbd032647cfc3ce78 SHA512 78c8141f5f13f1c0e5da474e1d79760a612e911519af4e9f21c0e5005f2ce99f3aeacf16f3fcdfe1250fc795a88190fa243592e1066a2156e1fd8d2b9c3d7f71

diff --git a/dev-util/android-tools/android-tools-31.0.3.ebuild b/dev-util/android-tools/android-tools-31.0.3.ebuild
deleted file mode 100644
index bb938d9eeee1..000000000000
--- a/dev-util/android-tools/android-tools-31.0.3.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit cmake python-r1
-
-DESCRIPTION="Android platform tools (adb, fastboot, and mkbootimg)"
-HOMEPAGE="https://github.com/nmeum/android-tools/ https://developer.android.com/"
-
-MY_PV="${PV//_/}"
-SRC_URI="https://github.com/nmeum/android-tools/releases/download/${MY_PV}/${PN}-${MY_PV}.tar.xz
-	https://dev.gentoo.org/~zmedico/dist/${P}-no-gtest.patch
-	https://dev.gentoo.org/~zmedico/dist/${P}-install-e2fsdroid-ext2simg.patch
-	https://dev.gentoo.org/~zmedico/dist/${P}-disable-werror-boringssl.patch
-"
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-# 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 ~arm ~arm64 x86 ~x86-linux"
-IUSE="python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# dev-libs/libpcre only required for e2fsdroid
-DEPEND="
-	app-arch/brotli:=
-	app-arch/lz4:=
-	app-arch/zstd:=
-	dev-libs/libpcre2:=
-	>=dev-libs/protobuf-3.0.0:=
-	sys-libs/zlib:=
-	virtual/libusb:1=
-"
-RDEPEND="${DEPEND}
-	python? ( ${PYTHON_DEPS} )
-"
-BDEPEND="
-	dev-lang/go
-"
-
-DOCS=()
-
-src_prepare() {
-	eapply "${DISTDIR}/${P}-no-gtest.patch"
-	cd "${S}/vendor/core" || die
-	eapply "${S}/patches/core/0011-Remove-the-useless-dependency-on-gtest.patch"
-	cd "${S}/vendor/libziparchive" || die
-	eapply "${S}/patches/libziparchive/0004-Remove-the-useless-dependency-on-gtest.patch"
-	cd "${S}"
-	eapply "${DISTDIR}/${P}-install-e2fsdroid-ext2simg.patch"
-	eapply "${DISTDIR}/${P}-disable-werror-boringssl.patch"
-	cd "${S}/vendor/boringssl" || die
-	eapply "${S}/patches/boringssl/0011-Disable-Werror.patch"
-	cd "${S}"
-	rm -r patches || die
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		# Statically link the bundled boringssl
-		-DBUILD_SHARED_LIBS=OFF
-	)
-	cmake_src_configure
-}
-
-src_compile() {
-	export GOCACHE="${T}/go-build"
-	export GOFLAGS="-mod=vendor"
-	cmake_src_compile
-}
-
-src_install() {
-	cmake_src_install
-	use python && python_foreach_impl python_newexe vendor/mkbootimg/mkbootimg.py mkbootimg
-	docinto adb
-	dodoc vendor/adb/*.{txt,TXT}
-	docinto fastboot
-	dodoc vendor/core/fastboot/README.md
-}

diff --git a/dev-util/android-tools/android-tools-31.0.3_p2.ebuild b/dev-util/android-tools/android-tools-31.0.3_p2.ebuild
deleted file mode 100644
index a67df1447ce7..000000000000
--- a/dev-util/android-tools/android-tools-31.0.3_p2.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7..11} )
-
-inherit cmake python-r1
-
-DESCRIPTION="Android platform tools (adb, fastboot, and mkbootimg)"
-HOMEPAGE="https://github.com/nmeum/android-tools/ https://developer.android.com/"
-
-MY_PV="${PV//_/}"
-SRC_URI="https://github.com/nmeum/android-tools/releases/download/${MY_PV}/${PN}-${MY_PV}.tar.xz
-	https://dev.gentoo.org/~zmedico/dist/${PN}-31.0.3-no-gtest.patch
-"
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-# 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 ~arm ~arm64 x86 ~x86-linux"
-IUSE="python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# dev-libs/libpcre only required for e2fsdroid
-DEPEND="
-	app-arch/brotli:=
-	app-arch/lz4:=
-	app-arch/zstd:=
-	dev-libs/libpcre2:=
-	>=dev-libs/protobuf-3.0.0:=
-	sys-libs/zlib:=
-	virtual/libusb:1=
-"
-RDEPEND="${DEPEND}
-	python? ( ${PYTHON_DEPS} )
-"
-BDEPEND="
-	dev-lang/go
-"
-
-DOCS=()
-
-src_prepare() {
-	eapply "${DISTDIR}/${PN}-31.0.3-no-gtest.patch"
-	cd "${S}/vendor/core" || die
-	eapply "${S}/patches/core/0011-Remove-the-useless-dependency-on-gtest.patch"
-	cd "${S}/vendor/libziparchive" || die
-	eapply "${S}/patches/libziparchive/0004-Remove-the-useless-dependency-on-gtest.patch"
-	cd "${S}"
-	rm -r patches || die
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		# Statically link the bundled boringssl
-		-DBUILD_SHARED_LIBS=OFF
-	)
-	cmake_src_configure
-}
-
-src_compile() {
-	export GOCACHE="${T}/go-build"
-	export GOFLAGS="-mod=vendor"
-	cmake_src_compile
-}
-
-src_install() {
-	cmake_src_install
-	rm "${ED}/usr/bin/mkbootimg" || die
-	rm "${ED}/usr/bin/unpack_bootimg" || die
-	rm "${ED}/usr/bin/repack_bootimg" || die
-	if use python; then
-		python_foreach_impl python_newexe vendor/mkbootimg/mkbootimg.py mkbootimg
-		python_foreach_impl python_newexe vendor/mkbootimg/unpack_bootimg.py unpack_bootimg
-		python_foreach_impl python_newexe vendor/mkbootimg/repack_bootimg.py repack_bootimg
-	fi
-	docinto adb
-	dodoc vendor/adb/*.{txt,TXT}
-	docinto fastboot
-	dodoc vendor/core/fastboot/README.md
-}

diff --git a/dev-util/android-tools/android-tools-33.0.3.ebuild b/dev-util/android-tools/android-tools-33.0.3.ebuild
deleted file mode 100644
index 412e78a5f808..000000000000
--- a/dev-util/android-tools/android-tools-33.0.3.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit cmake python-r1
-
-DESCRIPTION="Android platform tools (adb, fastboot, and mkbootimg)"
-HOMEPAGE="https://github.com/nmeum/android-tools/ https://developer.android.com/"
-
-MY_PV="${PV//_/}"
-SRC_URI="https://github.com/nmeum/android-tools/releases/download/${MY_PV}/${PN}-${MY_PV}.tar.xz
-	https://dev.gentoo.org/~zmedico/dist/${PN}-31.0.3-no-gtest.patch
-"
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-# 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 ~arm ~arm64 ~x86 ~x86-linux"
-IUSE="python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# dev-libs/libpcre only required for e2fsdroid
-DEPEND="
-	app-arch/brotli:=
-	app-arch/lz4:=
-	app-arch/zstd:=
-	dev-libs/libpcre2:=
-	>=dev-libs/protobuf-3.0.0:=
-	sys-libs/zlib:=
-	virtual/libusb:1=
-"
-RDEPEND="${DEPEND}
-	python? ( ${PYTHON_DEPS} )
-"
-BDEPEND="
-	dev-lang/go
-"
-
-DOCS=()
-
-src_prepare() {
-	eapply "${DISTDIR}/${PN}-31.0.3-no-gtest.patch"
-	cd "${S}/vendor/core" || die
-	eapply "${S}/patches/core/0011-Remove-the-useless-dependency-on-gtest.patch"
-	cd "${S}/vendor/libziparchive" || die
-	eapply "${S}/patches/libziparchive/0004-Remove-the-useless-dependency-on-gtest.patch"
-	cd "${S}"
-	rm -r patches || die
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		# Statically link the bundled boringssl
-		-DBUILD_SHARED_LIBS=OFF
-	)
-	cmake_src_configure
-}
-
-src_compile() {
-	export GOCACHE="${T}/go-build"
-	export GOFLAGS="-mod=vendor"
-	cmake_src_compile
-}
-
-src_install() {
-	cmake_src_install
-	rm "${ED}/usr/bin/mkbootimg" || die
-	rm "${ED}/usr/bin/unpack_bootimg" || die
-	rm "${ED}/usr/bin/repack_bootimg" || die
-	if use python; then
-		python_foreach_impl python_newexe vendor/mkbootimg/mkbootimg.py mkbootimg
-		python_foreach_impl python_newexe vendor/mkbootimg/unpack_bootimg.py unpack_bootimg
-		python_foreach_impl python_newexe vendor/mkbootimg/repack_bootimg.py repack_bootimg
-	fi
-	docinto adb
-	dodoc vendor/adb/*.{txt,TXT}
-	docinto fastboot
-	dodoc vendor/core/fastboot/README.md
-}


^ permalink raw reply related	[flat|nested] 70+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-util/android-tools/
@ 2022-10-27  7:57 Joonas Niilola
  0 siblings, 0 replies; 70+ messages in thread
From: Joonas Niilola @ 2022-10-27  7:57 UTC (permalink / raw
  To: gentoo-commits

commit:     cc8548eef105bfee407e530a33ddd697f1f1903a
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 27 07:56:14 2022 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu Oct 27 07:56:14 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc8548ee

dev-util/android-tools: add missing BDEPEND for perl

CMake Error at /usr/share/cmake/Modules/FindPackageHandleStandardArgs.cmake:230 (message):
  Could NOT find Perl (missing: PERL_EXECUTABLE)

Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 dev-util/android-tools/android-tools-33.0.3-r1.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev-util/android-tools/android-tools-33.0.3-r1.ebuild b/dev-util/android-tools/android-tools-33.0.3-r1.ebuild
index 283d0738b2bc..6f38aa5d5a8e 100644
--- a/dev-util/android-tools/android-tools-33.0.3-r1.ebuild
+++ b/dev-util/android-tools/android-tools-33.0.3-r1.ebuild
@@ -39,6 +39,7 @@ RDEPEND="${DEPEND}
 "
 BDEPEND="
 	dev-lang/go
+	dev-lang/perl
 "
 
 DOCS=()


^ permalink raw reply related	[flat|nested] 70+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-util/android-tools/
@ 2022-10-27  7:57 Joonas Niilola
  0 siblings, 0 replies; 70+ messages in thread
From: Joonas Niilola @ 2022-10-27  7:57 UTC (permalink / raw
  To: gentoo-commits

commit:     9a2004c62033875b3cc7762900557c955212a649
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 27 07:56:41 2022 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu Oct 27 07:56:41 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a2004c6

dev-util/android-tools: Stabilize 33.0.3-r1 x86, #878321

Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 dev-util/android-tools/android-tools-33.0.3-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/android-tools/android-tools-33.0.3-r1.ebuild b/dev-util/android-tools/android-tools-33.0.3-r1.ebuild
index 6f38aa5d5a8e..da11dd000d4e 100644
--- a/dev-util/android-tools/android-tools-33.0.3-r1.ebuild
+++ b/dev-util/android-tools/android-tools-33.0.3-r1.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 # 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 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 


^ permalink raw reply related	[flat|nested] 70+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-util/android-tools/
@ 2022-10-26 11:02 Sam James
  0 siblings, 0 replies; 70+ messages in thread
From: Sam James @ 2022-10-26 11:02 UTC (permalink / raw
  To: gentoo-commits

commit:     2941b84034c6c9af790f1c57677678f5b6e0178f
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 26 11:01:52 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Oct 26 11:01:52 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2941b840

dev-util/android-tools: Stabilize 33.0.3-r1 amd64, #878321

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-util/android-tools/android-tools-33.0.3-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/android-tools/android-tools-33.0.3-r1.ebuild b/dev-util/android-tools/android-tools-33.0.3-r1.ebuild
index 5aaa23ae15aa..283d0738b2bc 100644
--- a/dev-util/android-tools/android-tools-33.0.3-r1.ebuild
+++ b/dev-util/android-tools/android-tools-33.0.3-r1.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 # 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 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
 IUSE="python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 


^ permalink raw reply related	[flat|nested] 70+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-util/android-tools/
@ 2022-10-03  4:35 Zac Medico
  0 siblings, 0 replies; 70+ messages in thread
From: Zac Medico @ 2022-10-03  4:35 UTC (permalink / raw
  To: gentoo-commits

commit:     eb553bf1f5e93a11e880c492df85dff9a579e6e1
Author:     Alfred Wingate <parona <AT> protonmail <DOT> com>
AuthorDate: Thu Sep 29 13:13:55 2022 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Mon Oct  3 04:35:46 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb553bf1

dev-util/android-tools: revision with dependency to android-udev-rules

* drop x86-linux keyword as prefix and non-prefix keywords arent
  differentiated anymore #473598

Closes: https://github.com/gentoo/gentoo/pull/27588
Signed-off-by: Alfred Wingate <parona <AT> protonmail.com>
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

 .../android-tools/android-tools-33.0.3-r1.ebuild   | 85 ++++++++++++++++++++++
 1 file changed, 85 insertions(+)

diff --git a/dev-util/android-tools/android-tools-33.0.3-r1.ebuild b/dev-util/android-tools/android-tools-33.0.3-r1.ebuild
new file mode 100644
index 000000000000..5e81ccbffd54
--- /dev/null
+++ b/dev-util/android-tools/android-tools-33.0.3-r1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit cmake python-r1
+
+DESCRIPTION="Android platform tools (adb, fastboot, and mkbootimg)"
+HOMEPAGE="https://github.com/nmeum/android-tools/ https://developer.android.com/"
+
+MY_PV="${PV//_/}"
+SRC_URI="https://github.com/nmeum/android-tools/releases/download/${MY_PV}/${PN}-${MY_PV}.tar.xz
+	https://dev.gentoo.org/~zmedico/dist/${PN}-31.0.3-no-gtest.patch
+"
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+# 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 ~arm ~arm64 ~x86"
+IUSE="python"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# dev-libs/libpcre only required for e2fsdroid
+DEPEND="
+	app-arch/brotli:=
+	app-arch/lz4:=
+	app-arch/zstd:=
+	dev-libs/libpcre2:=
+	>=dev-libs/protobuf-3.0.0:=
+	sys-libs/zlib:=
+	virtual/libusb:1=
+"
+RDEPEND="${DEPEND}
+	dev-util/android-udev-rules
+	python? ( ${PYTHON_DEPS} )
+"
+BDEPEND="
+	dev-lang/go
+"
+
+DOCS=()
+
+src_prepare() {
+	eapply "${DISTDIR}/${PN}-31.0.3-no-gtest.patch"
+	cd "${S}/vendor/core" || die
+	eapply "${S}/patches/core/0011-Remove-the-useless-dependency-on-gtest.patch"
+	cd "${S}/vendor/libziparchive" || die
+	eapply "${S}/patches/libziparchive/0004-Remove-the-useless-dependency-on-gtest.patch"
+	cd "${S}"
+	rm -r patches || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		# Statically link the bundled boringssl
+		-DBUILD_SHARED_LIBS=OFF
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	export GOCACHE="${T}/go-build"
+	export GOFLAGS="-mod=vendor"
+	cmake_src_compile
+}
+
+src_install() {
+	cmake_src_install
+	rm "${ED}/usr/bin/mkbootimg" || die
+	rm "${ED}/usr/bin/unpack_bootimg" || die
+	rm "${ED}/usr/bin/repack_bootimg" || die
+	if use python; then
+		python_foreach_impl python_newexe vendor/mkbootimg/mkbootimg.py mkbootimg
+		python_foreach_impl python_newexe vendor/mkbootimg/unpack_bootimg.py unpack_bootimg
+		python_foreach_impl python_newexe vendor/mkbootimg/repack_bootimg.py repack_bootimg
+	fi
+	docinto adb
+	dodoc vendor/adb/*.{txt,TXT}
+	docinto fastboot
+	dodoc vendor/core/fastboot/README.md
+}


^ permalink raw reply related	[flat|nested] 70+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-util/android-tools/
@ 2022-09-23 18:11 Zac Medico
  0 siblings, 0 replies; 70+ messages in thread
From: Zac Medico @ 2022-09-23 18:11 UTC (permalink / raw
  To: gentoo-commits

commit:     98e825ea7cc7592640d2ed2e76d2e0022f30cfa5
Author:     Alfred Wingate <parona <AT> protonmail <DOT> com>
AuthorDate: Fri Sep 23 12:51:33 2022 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Fri Sep 23 18:06:05 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98e825ea

dev-util/android-tools: add 33.0.3

Closes: https://github.com/gentoo/gentoo/pull/27409
Signed-off-by: Alfred Wingate <parona <AT> protonmail.com>
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

 dev-util/android-tools/Manifest                    |  1 +
 dev-util/android-tools/android-tools-33.0.3.ebuild | 84 ++++++++++++++++++++++
 2 files changed, 85 insertions(+)

diff --git a/dev-util/android-tools/Manifest b/dev-util/android-tools/Manifest
index bd676ad4e3bf..5a4c631218d2 100644
--- a/dev-util/android-tools/Manifest
+++ b/dev-util/android-tools/Manifest
@@ -3,3 +3,4 @@ DIST android-tools-31.0.3-install-e2fsdroid-ext2simg.patch 2164 BLAKE2B 7f0b43ff
 DIST android-tools-31.0.3-no-gtest.patch 3152 BLAKE2B da71e3cba87b21ffcb144602a06d7e269faabd173233363b757cd2191c051f8d3281f591117d4551d7acc029d6e2d421f702f9f836dfe0dec6c676aa39a2d9fe SHA512 a28d2264bf40c420a279acf1f4c3b4588d96ce2d6e2d6d322abbde62d773804bef10dc33f13dd52c7de80ace6c58f91ae28f5d4e8e97dfae4d2a8473d8537423
 DIST android-tools-31.0.3.tar.xz 25768908 BLAKE2B e8ca8ff93fcd3936f447926769d7b45194dd96ad99cddd570183a1cbae34dbf49a23e0c53d9eb8f5c25dd09717e1f160829752dc7ebc9404c804b48de8de9889 SHA512 d2c16325b190f77a8ffa38de18ae1aea4bf6848926620f25d14873dc4a3fda3fe2b13349fa2eee197b960ca65738a4a1d2c1f28cf8286ab79e73502e7a8e6357
 DIST android-tools-31.0.3p2.tar.xz 22458776 BLAKE2B a51f839ac44e6e998092d802eb182566f4dc2a7f47a5687e0c877fa4fa6d419b16054f75066a6afe8e458e44f8bc5750ca88a2517619379d1044202d64b2ec80 SHA512 367a502c11a136ff15a060df44df14ceec46eb5eb386babb4d38783622e363421d2ec9a65a5810fb8f2b308912c2bdb980e6fce24ba532a111e413647efe67d5
+DIST android-tools-33.0.3.tar.xz 25300756 BLAKE2B 4254f0ab8657966cf56e2a7c3e9a3d889dfa9f26e61d8b46480bb74c5a8be33494f450827e3b2db4087006b3160892e6a846ef33719870cbbd032647cfc3ce78 SHA512 78c8141f5f13f1c0e5da474e1d79760a612e911519af4e9f21c0e5005f2ce99f3aeacf16f3fcdfe1250fc795a88190fa243592e1066a2156e1fd8d2b9c3d7f71

diff --git a/dev-util/android-tools/android-tools-33.0.3.ebuild b/dev-util/android-tools/android-tools-33.0.3.ebuild
new file mode 100644
index 000000000000..412e78a5f808
--- /dev/null
+++ b/dev-util/android-tools/android-tools-33.0.3.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit cmake python-r1
+
+DESCRIPTION="Android platform tools (adb, fastboot, and mkbootimg)"
+HOMEPAGE="https://github.com/nmeum/android-tools/ https://developer.android.com/"
+
+MY_PV="${PV//_/}"
+SRC_URI="https://github.com/nmeum/android-tools/releases/download/${MY_PV}/${PN}-${MY_PV}.tar.xz
+	https://dev.gentoo.org/~zmedico/dist/${PN}-31.0.3-no-gtest.patch
+"
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+# 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 ~arm ~arm64 ~x86 ~x86-linux"
+IUSE="python"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# dev-libs/libpcre only required for e2fsdroid
+DEPEND="
+	app-arch/brotli:=
+	app-arch/lz4:=
+	app-arch/zstd:=
+	dev-libs/libpcre2:=
+	>=dev-libs/protobuf-3.0.0:=
+	sys-libs/zlib:=
+	virtual/libusb:1=
+"
+RDEPEND="${DEPEND}
+	python? ( ${PYTHON_DEPS} )
+"
+BDEPEND="
+	dev-lang/go
+"
+
+DOCS=()
+
+src_prepare() {
+	eapply "${DISTDIR}/${PN}-31.0.3-no-gtest.patch"
+	cd "${S}/vendor/core" || die
+	eapply "${S}/patches/core/0011-Remove-the-useless-dependency-on-gtest.patch"
+	cd "${S}/vendor/libziparchive" || die
+	eapply "${S}/patches/libziparchive/0004-Remove-the-useless-dependency-on-gtest.patch"
+	cd "${S}"
+	rm -r patches || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		# Statically link the bundled boringssl
+		-DBUILD_SHARED_LIBS=OFF
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	export GOCACHE="${T}/go-build"
+	export GOFLAGS="-mod=vendor"
+	cmake_src_compile
+}
+
+src_install() {
+	cmake_src_install
+	rm "${ED}/usr/bin/mkbootimg" || die
+	rm "${ED}/usr/bin/unpack_bootimg" || die
+	rm "${ED}/usr/bin/repack_bootimg" || die
+	if use python; then
+		python_foreach_impl python_newexe vendor/mkbootimg/mkbootimg.py mkbootimg
+		python_foreach_impl python_newexe vendor/mkbootimg/unpack_bootimg.py unpack_bootimg
+		python_foreach_impl python_newexe vendor/mkbootimg/repack_bootimg.py repack_bootimg
+	fi
+	docinto adb
+	dodoc vendor/adb/*.{txt,TXT}
+	docinto fastboot
+	dodoc vendor/core/fastboot/README.md
+}


^ permalink raw reply related	[flat|nested] 70+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-util/android-tools/
@ 2022-09-18  0:19 Sam James
  0 siblings, 0 replies; 70+ messages in thread
From: Sam James @ 2022-09-18  0:19 UTC (permalink / raw
  To: gentoo-commits

commit:     8a3391848e14a71e34ddec1fde12565913a3c985
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 18 00:19:03 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Sep 18 00:19:03 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a339184

dev-util/android-tools: Stabilize 31.0.3_p2 x86, #870337

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-util/android-tools/android-tools-31.0.3_p2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/android-tools/android-tools-31.0.3_p2.ebuild b/dev-util/android-tools/android-tools-31.0.3_p2.ebuild
index 0b65a7221081..23f3a93fa47a 100644
--- a/dev-util/android-tools/android-tools-31.0.3_p2.ebuild
+++ b/dev-util/android-tools/android-tools-31.0.3_p2.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 # 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 ~arm ~arm64 ~x86 ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 x86 ~x86-linux"
 IUSE="python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 


^ permalink raw reply related	[flat|nested] 70+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-util/android-tools/
@ 2022-09-18  0:19 Sam James
  0 siblings, 0 replies; 70+ messages in thread
From: Sam James @ 2022-09-18  0:19 UTC (permalink / raw
  To: gentoo-commits

commit:     68893761bee5e149c5f760c7f3f07d3061ff4979
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 18 00:19:25 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Sep 18 00:19:25 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68893761

dev-util/android-tools: Stabilize 31.0.3_p2 amd64, #870337

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-util/android-tools/android-tools-31.0.3_p2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/android-tools/android-tools-31.0.3_p2.ebuild b/dev-util/android-tools/android-tools-31.0.3_p2.ebuild
index 23f3a93fa47a..a67df1447ce7 100644
--- a/dev-util/android-tools/android-tools-31.0.3_p2.ebuild
+++ b/dev-util/android-tools/android-tools-31.0.3_p2.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 # 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 ~arm ~arm64 x86 ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~x86-linux"
 IUSE="python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 


^ permalink raw reply related	[flat|nested] 70+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-util/android-tools/
@ 2022-08-12 16:38 Zac Medico
  0 siblings, 0 replies; 70+ messages in thread
From: Zac Medico @ 2022-08-12 16:38 UTC (permalink / raw
  To: gentoo-commits

commit:     f45943cd9b0075f1bf114283db971868f6f2d2f1
Author:     Esteve Varela Colominas <esteve.varela <AT> gmail <DOT> com>
AuthorDate: Thu Aug 11 22:44:45 2022 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Fri Aug 12 16:38:22 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f45943cd

dev-util/android-tools: Bump to 31.0.3_p2

Closes: https://github.com/gentoo/gentoo/pull/26830
Signed-off-by: Esteve Varela Colominas <esteve.varela <AT> gmail.com>
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

 dev-util/android-tools/Manifest                    |  1 +
 .../android-tools/android-tools-31.0.3_p2.ebuild   | 84 ++++++++++++++++++++++
 2 files changed, 85 insertions(+)

diff --git a/dev-util/android-tools/Manifest b/dev-util/android-tools/Manifest
index 551510bf1aad..4894b5c017a7 100644
--- a/dev-util/android-tools/Manifest
+++ b/dev-util/android-tools/Manifest
@@ -5,6 +5,7 @@ DIST android-tools-31.0.3-no-gtest.patch 3152 BLAKE2B da71e3cba87b21ffcb144602a0
 DIST android-tools-31.0.3.tar.xz 25768908 BLAKE2B e8ca8ff93fcd3936f447926769d7b45194dd96ad99cddd570183a1cbae34dbf49a23e0c53d9eb8f5c25dd09717e1f160829752dc7ebc9404c804b48de8de9889 SHA512 d2c16325b190f77a8ffa38de18ae1aea4bf6848926620f25d14873dc4a3fda3fe2b13349fa2eee197b960ca65738a4a1d2c1f28cf8286ab79e73502e7a8e6357
 DIST android-tools-31.0.3_p1-install-e2fsdroid-ext2simg.patch 2075 BLAKE2B f30c99f2b60acac239f6c604d1cfe36ca49a74884f54fce85dba3bf9aae0f73abc5c8ba6b5232772e73aefe75813170c3427cf769e3f0f5e1b962b4ec606d4e4 SHA512 2f706384e1709fc6cc7b5e9183051fb15aaf9d188d23c072d449052ed2297d0e47222e53aaee3709e8bdc3e1b88481307b4b0c0e904bafe444f3fc0c3ad3e0e7
 DIST android-tools-31.0.3p1.tar.xz 25760004 BLAKE2B 1ae58daed61b82180a5a40efa6a67b64b2ce12f4397442663700a4b970f3493576e468dcf8a4c0351c6d7d8c13def1fb0621f9c680d1c41461cbf458e862ccec SHA512 a811eb1d7682b8807f7c110beb83ff234e65fe0f20127466dbd173ea13e68260def8891b4598d5776489af9ff8aeb9f0a19086f49b6df27f68ba63096688afa1
+DIST android-tools-31.0.3p2.tar.xz 22458776 BLAKE2B a51f839ac44e6e998092d802eb182566f4dc2a7f47a5687e0c877fa4fa6d419b16054f75066a6afe8e458e44f8bc5750ca88a2517619379d1044202d64b2ec80 SHA512 367a502c11a136ff15a060df44df14ceec46eb5eb386babb4d38783622e363421d2ec9a65a5810fb8f2b308912c2bdb980e6fce24ba532a111e413647efe67d5
 DIST android-tools-dont-install-license.patch 1016 BLAKE2B da65a414d046995358e91a0ca037951bc9c5a3e790b3b2151716b234c2943301ecef4ed248914235736ddd949f772311bf823e9b3b3f1980b7a5c4b72e5bcd47 SHA512 747728723941091caa17c66e68e88d2145a2ff037e6f5724f89f680d2ce6f4031efebcda7dbcc5b459ca4f5f9ddbf4ba04b0451b9939d19eaf2fa9d9ab727284
 DIST android-tools-fix-gcc11.patch 137252 BLAKE2B 0e80aab92cb69e3223f81834d53c1d84aef866787261305fd539cb8cb75a21361c65f091b2f7d83f6f8236816f43510f4f0f8b51dee4b03d99af31c78dc53a79 SHA512 fb4d8d13f9022f0472c81fe6b9252000d93ba5f77b84d7ac7d6846753078b6fdac0687fcb7157e445bba02cbf008ea3744d84e8fc5d534ee3807f61674e3238c
 DIST android-tools-install-e2fsdroid-ext2simg.patch 2164 BLAKE2B 7f0b43ff5ae820101628399540f3e5b87bf69224f4a61a6b76b8b6b3b06f8e7162a6c1e7ee43eee928cfa96824f5efff72317b4bbfe160d8e72d96aa84e0a1d6 SHA512 d5fd63c108ca6b880b1b79cf362468335f19fad7bf2042fb667b56e34dc95acc47e1bf9c9e72be1d2bd8252a529cd49eb030d141bf735524bdaeb85482d544a9

diff --git a/dev-util/android-tools/android-tools-31.0.3_p2.ebuild b/dev-util/android-tools/android-tools-31.0.3_p2.ebuild
new file mode 100644
index 000000000000..0b65a7221081
--- /dev/null
+++ b/dev-util/android-tools/android-tools-31.0.3_p2.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{7..11} )
+
+inherit cmake python-r1
+
+DESCRIPTION="Android platform tools (adb, fastboot, and mkbootimg)"
+HOMEPAGE="https://github.com/nmeum/android-tools/ https://developer.android.com/"
+
+MY_PV="${PV//_/}"
+SRC_URI="https://github.com/nmeum/android-tools/releases/download/${MY_PV}/${PN}-${MY_PV}.tar.xz
+	https://dev.gentoo.org/~zmedico/dist/${PN}-31.0.3-no-gtest.patch
+"
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+# 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 ~arm ~arm64 ~x86 ~x86-linux"
+IUSE="python"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# dev-libs/libpcre only required for e2fsdroid
+DEPEND="
+	app-arch/brotli:=
+	app-arch/lz4:=
+	app-arch/zstd:=
+	dev-libs/libpcre2:=
+	>=dev-libs/protobuf-3.0.0:=
+	sys-libs/zlib:=
+	virtual/libusb:1=
+"
+RDEPEND="${DEPEND}
+	python? ( ${PYTHON_DEPS} )
+"
+BDEPEND="
+	dev-lang/go
+"
+
+DOCS=()
+
+src_prepare() {
+	eapply "${DISTDIR}/${PN}-31.0.3-no-gtest.patch"
+	cd "${S}/vendor/core" || die
+	eapply "${S}/patches/core/0011-Remove-the-useless-dependency-on-gtest.patch"
+	cd "${S}/vendor/libziparchive" || die
+	eapply "${S}/patches/libziparchive/0004-Remove-the-useless-dependency-on-gtest.patch"
+	cd "${S}"
+	rm -r patches || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		# Statically link the bundled boringssl
+		-DBUILD_SHARED_LIBS=OFF
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	export GOCACHE="${T}/go-build"
+	export GOFLAGS="-mod=vendor"
+	cmake_src_compile
+}
+
+src_install() {
+	cmake_src_install
+	rm "${ED}/usr/bin/mkbootimg" || die
+	rm "${ED}/usr/bin/unpack_bootimg" || die
+	rm "${ED}/usr/bin/repack_bootimg" || die
+	if use python; then
+		python_foreach_impl python_newexe vendor/mkbootimg/mkbootimg.py mkbootimg
+		python_foreach_impl python_newexe vendor/mkbootimg/unpack_bootimg.py unpack_bootimg
+		python_foreach_impl python_newexe vendor/mkbootimg/repack_bootimg.py repack_bootimg
+	fi
+	docinto adb
+	dodoc vendor/adb/*.{txt,TXT}
+	docinto fastboot
+	dodoc vendor/core/fastboot/README.md
+}


^ permalink raw reply related	[flat|nested] 70+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-util/android-tools/
@ 2022-03-15 22:26 Mike Frysinger
  0 siblings, 0 replies; 70+ messages in thread
From: Mike Frysinger @ 2022-03-15 22:26 UTC (permalink / raw
  To: gentoo-commits

commit:     47733f81d004a097a468b2aca1b8b0a7ddd8b7bc
Author:     Mike Frysinger <vapier <AT> chromium <DOT> org>
AuthorDate: Tue Mar 15 22:26:01 2022 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Tue Mar 15 22:26:01 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47733f81

dev-util/android-tools: update old site links

Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org>

 dev-util/android-tools/metadata.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev-util/android-tools/metadata.xml b/dev-util/android-tools/metadata.xml
index 602daeb0b395..3eaea76d509f 100644
--- a/dev-util/android-tools/metadata.xml
+++ b/dev-util/android-tools/metadata.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://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>
+		<bugs-to>https://source.android.com/setup/contribute/report-bugs</bugs-to>
+		<changelog>https://android.googlesource.com/platform/packages/modules/adb/+log</changelog>
+		<doc>https://android.googlesource.com/platform/packages/modules/adb/+/HEAD/OVERVIEW.TXT</doc>
 		<remote-id type="cpe">cpe:/a:google:android_debug_bridge</remote-id>
 		<remote-id type="github">android/platform_system_core</remote-id>
 		<remote-id type="launchpad">ubuntu</remote-id>


^ permalink raw reply related	[flat|nested] 70+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-util/android-tools/
@ 2022-01-06 16:38 Zac Medico
  0 siblings, 0 replies; 70+ messages in thread
From: Zac Medico @ 2022-01-06 16:38 UTC (permalink / raw
  To: gentoo-commits

commit:     8d80b8972747cdc46808c75f5b781e9dc47db63d
Author:     Esteve Varela Colominas <esteve.varela <AT> gmail <DOT> com>
AuthorDate: Thu Jan  6 14:48:20 2022 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Thu Jan  6 16:38:48 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d80b897

dev-utils/android-tools: Bump to 31.0.3_p1, EAPI 8

Also updated e2fsdroid patch to build on musl

Closes: https://github.com/gentoo/gentoo/pull/23673
Closes: https://bugs.gentoo.org/829152
Signed-off-by: Esteve Varela Colominas <esteve.varela <AT> gmail.com>
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

 dev-util/android-tools/Manifest                    |  2 +
 .../android-tools/android-tools-31.0.3_p1.ebuild   | 91 ++++++++++++++++++++++
 2 files changed, 93 insertions(+)

diff --git a/dev-util/android-tools/Manifest b/dev-util/android-tools/Manifest
index 7bdc215ec31b..551510bf1aad 100644
--- a/dev-util/android-tools/Manifest
+++ b/dev-util/android-tools/Manifest
@@ -3,6 +3,8 @@ DIST android-tools-31.0.3-disable-werror-boringssl.patch 1815 BLAKE2B 63e911ba27
 DIST android-tools-31.0.3-install-e2fsdroid-ext2simg.patch 2164 BLAKE2B 7f0b43ff5ae820101628399540f3e5b87bf69224f4a61a6b76b8b6b3b06f8e7162a6c1e7ee43eee928cfa96824f5efff72317b4bbfe160d8e72d96aa84e0a1d6 SHA512 d5fd63c108ca6b880b1b79cf362468335f19fad7bf2042fb667b56e34dc95acc47e1bf9c9e72be1d2bd8252a529cd49eb030d141bf735524bdaeb85482d544a9
 DIST android-tools-31.0.3-no-gtest.patch 3152 BLAKE2B da71e3cba87b21ffcb144602a06d7e269faabd173233363b757cd2191c051f8d3281f591117d4551d7acc029d6e2d421f702f9f836dfe0dec6c676aa39a2d9fe SHA512 a28d2264bf40c420a279acf1f4c3b4588d96ce2d6e2d6d322abbde62d773804bef10dc33f13dd52c7de80ace6c58f91ae28f5d4e8e97dfae4d2a8473d8537423
 DIST android-tools-31.0.3.tar.xz 25768908 BLAKE2B e8ca8ff93fcd3936f447926769d7b45194dd96ad99cddd570183a1cbae34dbf49a23e0c53d9eb8f5c25dd09717e1f160829752dc7ebc9404c804b48de8de9889 SHA512 d2c16325b190f77a8ffa38de18ae1aea4bf6848926620f25d14873dc4a3fda3fe2b13349fa2eee197b960ca65738a4a1d2c1f28cf8286ab79e73502e7a8e6357
+DIST android-tools-31.0.3_p1-install-e2fsdroid-ext2simg.patch 2075 BLAKE2B f30c99f2b60acac239f6c604d1cfe36ca49a74884f54fce85dba3bf9aae0f73abc5c8ba6b5232772e73aefe75813170c3427cf769e3f0f5e1b962b4ec606d4e4 SHA512 2f706384e1709fc6cc7b5e9183051fb15aaf9d188d23c072d449052ed2297d0e47222e53aaee3709e8bdc3e1b88481307b4b0c0e904bafe444f3fc0c3ad3e0e7
+DIST android-tools-31.0.3p1.tar.xz 25760004 BLAKE2B 1ae58daed61b82180a5a40efa6a67b64b2ce12f4397442663700a4b970f3493576e468dcf8a4c0351c6d7d8c13def1fb0621f9c680d1c41461cbf458e862ccec SHA512 a811eb1d7682b8807f7c110beb83ff234e65fe0f20127466dbd173ea13e68260def8891b4598d5776489af9ff8aeb9f0a19086f49b6df27f68ba63096688afa1
 DIST android-tools-dont-install-license.patch 1016 BLAKE2B da65a414d046995358e91a0ca037951bc9c5a3e790b3b2151716b234c2943301ecef4ed248914235736ddd949f772311bf823e9b3b3f1980b7a5c4b72e5bcd47 SHA512 747728723941091caa17c66e68e88d2145a2ff037e6f5724f89f680d2ce6f4031efebcda7dbcc5b459ca4f5f9ddbf4ba04b0451b9939d19eaf2fa9d9ab727284
 DIST android-tools-fix-gcc11.patch 137252 BLAKE2B 0e80aab92cb69e3223f81834d53c1d84aef866787261305fd539cb8cb75a21361c65f091b2f7d83f6f8236816f43510f4f0f8b51dee4b03d99af31c78dc53a79 SHA512 fb4d8d13f9022f0472c81fe6b9252000d93ba5f77b84d7ac7d6846753078b6fdac0687fcb7157e445bba02cbf008ea3744d84e8fc5d534ee3807f61674e3238c
 DIST android-tools-install-e2fsdroid-ext2simg.patch 2164 BLAKE2B 7f0b43ff5ae820101628399540f3e5b87bf69224f4a61a6b76b8b6b3b06f8e7162a6c1e7ee43eee928cfa96824f5efff72317b4bbfe160d8e72d96aa84e0a1d6 SHA512 d5fd63c108ca6b880b1b79cf362468335f19fad7bf2042fb667b56e34dc95acc47e1bf9c9e72be1d2bd8252a529cd49eb030d141bf735524bdaeb85482d544a9

diff --git a/dev-util/android-tools/android-tools-31.0.3_p1.ebuild b/dev-util/android-tools/android-tools-31.0.3_p1.ebuild
new file mode 100644
index 000000000000..ba179d04c56f
--- /dev/null
+++ b/dev-util/android-tools/android-tools-31.0.3_p1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{7..10} )
+
+inherit cmake python-r1
+
+DESCRIPTION="Android platform tools (adb, fastboot, and mkbootimg)"
+HOMEPAGE="https://github.com/nmeum/android-tools/ https://developer.android.com/"
+
+MY_PV="${PV//_/}"
+SRC_URI="https://github.com/nmeum/android-tools/releases/download/${MY_PV}/${PN}-${MY_PV}.tar.xz
+	https://dev.gentoo.org/~zmedico/dist/${PN}-31.0.3-no-gtest.patch
+	https://dev.gentoo.org/~zmedico/dist/${PN}-31.0.3-disable-werror-boringssl.patch
+	https://dev.gentoo.org/~zmedico/dist/${PN}-31.0.3_p1-install-e2fsdroid-ext2simg.patch
+"
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+# 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 ~arm ~arm64 ~x86 ~x86-linux"
+IUSE="python"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# dev-libs/libpcre only required for e2fsdroid
+DEPEND="
+	app-arch/brotli:=
+	app-arch/lz4:=
+	app-arch/zstd:=
+	dev-libs/libpcre2:=
+	>=dev-libs/protobuf-3.0.0:=
+	sys-libs/zlib:=
+	virtual/libusb:1=
+"
+RDEPEND="${DEPEND}
+	python? ( ${PYTHON_DEPS} )
+"
+BDEPEND="
+	dev-lang/go
+"
+
+DOCS=()
+
+src_prepare() {
+	eapply "${DISTDIR}/${PN}-31.0.3-no-gtest.patch"
+	cd "${S}/vendor/core" || die
+	eapply "${S}/patches/core/0011-Remove-the-useless-dependency-on-gtest.patch"
+	cd "${S}/vendor/libziparchive" || die
+	eapply "${S}/patches/libziparchive/0004-Remove-the-useless-dependency-on-gtest.patch"
+	cd "${S}"
+	eapply "${DISTDIR}/${PN}-31.0.3-disable-werror-boringssl.patch"
+	cd "${S}/vendor/boringssl" || die
+	eapply "${S}/patches/boringssl/0011-Disable-Werror.patch"
+	cd "${S}"
+	eapply "${DISTDIR}/${PN}-31.0.3_p1-install-e2fsdroid-ext2simg.patch"
+	rm -r patches || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		# Statically link the bundled boringssl
+		-DBUILD_SHARED_LIBS=OFF
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	export GOCACHE="${T}/go-build"
+	export GOFLAGS="-mod=vendor"
+	cmake_src_compile
+}
+
+src_install() {
+	cmake_src_install
+	rm "${ED}/usr/bin/mkbootimg" || die
+	rm "${ED}/usr/bin/unpack_bootimg" || die
+	rm "${ED}/usr/bin/repack_bootimg" || die
+	if use python; then
+		python_foreach_impl python_newexe vendor/mkbootimg/mkbootimg.py mkbootimg
+		python_foreach_impl python_newexe vendor/mkbootimg/unpack_bootimg.py unpack_bootimg
+		python_foreach_impl python_newexe vendor/mkbootimg/repack_bootimg.py repack_bootimg
+	fi
+	docinto adb
+	dodoc vendor/adb/*.{txt,TXT}
+	docinto fastboot
+	dodoc vendor/core/fastboot/README.md
+}


^ permalink raw reply related	[flat|nested] 70+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-util/android-tools/
@ 2021-12-13 22:54 Sam James
  0 siblings, 0 replies; 70+ messages in thread
From: Sam James @ 2021-12-13 22:54 UTC (permalink / raw
  To: gentoo-commits

commit:     21b1607479165c94822e2557eef4c170fb490472
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 13 22:53:06 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Dec 13 22:53:06 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21b16074

dev-util/android-tools: Stabilize 31.0.3 x86, #829069

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-util/android-tools/android-tools-31.0.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/android-tools/android-tools-31.0.3.ebuild b/dev-util/android-tools/android-tools-31.0.3.ebuild
index 1831087626f4..b7fa373ba19b 100644
--- a/dev-util/android-tools/android-tools-31.0.3.ebuild
+++ b/dev-util/android-tools/android-tools-31.0.3.ebuild
@@ -21,7 +21,7 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 # 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 ~arm ~arm64 ~x86 ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 x86 ~x86-linux"
 IUSE="python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 


^ permalink raw reply related	[flat|nested] 70+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-util/android-tools/
@ 2021-12-13 22:54 Sam James
  0 siblings, 0 replies; 70+ messages in thread
From: Sam James @ 2021-12-13 22:54 UTC (permalink / raw
  To: gentoo-commits

commit:     46f033c84feb6e065b0e541e31c5b4217fb53aad
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 13 22:53:55 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Dec 13 22:53:55 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46f033c8

dev-util/android-tools: Stabilize 31.0.3 amd64, #829069

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-util/android-tools/android-tools-31.0.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/android-tools/android-tools-31.0.3.ebuild b/dev-util/android-tools/android-tools-31.0.3.ebuild
index b7fa373ba19b..bb938d9eeee1 100644
--- a/dev-util/android-tools/android-tools-31.0.3.ebuild
+++ b/dev-util/android-tools/android-tools-31.0.3.ebuild
@@ -21,7 +21,7 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 # 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 ~arm ~arm64 x86 ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~x86-linux"
 IUSE="python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 


^ permalink raw reply related	[flat|nested] 70+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-util/android-tools/
@ 2021-11-01  4:05 Zac Medico
  0 siblings, 0 replies; 70+ messages in thread
From: Zac Medico @ 2021-11-01  4:05 UTC (permalink / raw
  To: gentoo-commits

commit:     4f73afb9524758e48b346b3f5608d94b49e86a3d
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Mon Nov  1 04:03:25 2021 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Mon Nov  1 04:05:38 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f73afb9

dev-util/android-tools: Fix RedundantUriRename

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

 dev-util/android-tools/android-tools-31.0.3.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev-util/android-tools/android-tools-31.0.3.ebuild b/dev-util/android-tools/android-tools-31.0.3.ebuild
index 9db1b736041..1831087626f 100644
--- a/dev-util/android-tools/android-tools-31.0.3.ebuild
+++ b/dev-util/android-tools/android-tools-31.0.3.ebuild
@@ -12,9 +12,9 @@ HOMEPAGE="https://github.com/nmeum/android-tools/ https://developer.android.com/
 
 MY_PV="${PV//_/}"
 SRC_URI="https://github.com/nmeum/android-tools/releases/download/${MY_PV}/${PN}-${MY_PV}.tar.xz
-	https://dev.gentoo.org/~zmedico/dist/android-tools-31.0.3-no-gtest.patch -> ${P}-no-gtest.patch
-	https://dev.gentoo.org/~zmedico/dist/android-tools-31.0.3-install-e2fsdroid-ext2simg.patch -> ${P}-install-e2fsdroid-ext2simg.patch
-	https://dev.gentoo.org/~zmedico/dist/android-tools-31.0.3-disable-werror-boringssl.patch -> ${P}-disable-werror-boringssl.patch
+	https://dev.gentoo.org/~zmedico/dist/${P}-no-gtest.patch
+	https://dev.gentoo.org/~zmedico/dist/${P}-install-e2fsdroid-ext2simg.patch
+	https://dev.gentoo.org/~zmedico/dist/${P}-disable-werror-boringssl.patch
 "
 S="${WORKDIR}/${PN}-${MY_PV}"
 


^ permalink raw reply related	[flat|nested] 70+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-util/android-tools/
@ 2021-11-01  3:13 Zac Medico
  0 siblings, 0 replies; 70+ messages in thread
From: Zac Medico @ 2021-11-01  3:13 UTC (permalink / raw
  To: gentoo-commits

commit:     5b11bde57598fb67000978bfcfa442ad1de79bc9
Author:     Esteve Varela Colominas <esteve.varela <AT> gmail <DOT> com>
AuthorDate: Tue Jul 20 11:57:47 2021 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Mon Nov  1 03:09:17 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b11bde5

dev-util/android-tools: Bump to 31.0.3

Closes: https://github.com/gentoo/gentoo/pull/21723
Signed-off-by: Esteve Varela Colominas <esteve.varela <AT> gmail.com>
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

 dev-util/android-tools/Manifest                    |  4 ++
 dev-util/android-tools/android-tools-31.0.3.ebuild | 84 ++++++++++++++++++++++
 2 files changed, 88 insertions(+)

diff --git a/dev-util/android-tools/Manifest b/dev-util/android-tools/Manifest
index 8f9d98bc04d..7bdc215ec31 100644
--- a/dev-util/android-tools/Manifest
+++ b/dev-util/android-tools/Manifest
@@ -1,4 +1,8 @@
 DIST android-tools-31.0.0p1.tar.xz 25135336 BLAKE2B abef4fa611541370d6c745c3f6df8f0326074ef23d4e656ab19443484b5459531fab0544936177397dece12b79ff37189003e818e49bfc4bb3d47e98955b917f SHA512 40bded59614a6d0543e5011038b7f1c6abcb64f0daa71a13175ecb75fe42cb9985ed3a6301d73ee8d4ea20e2c98e3ed8130824ee74dcebe75bc0d7f3052c9d3b
+DIST android-tools-31.0.3-disable-werror-boringssl.patch 1815 BLAKE2B 63e911ba27e2995a11b27e2e1501c5e881d694c5477a216cb910bf1c9c1bf9f9fedffa864748ea4df668a1008124501f7815997304bc355e4ee105bf9b61f75f SHA512 db626d3680ec9f18be394bb2720c8bc7e380aac227ae6f1058476edb83784343f653afc583b06e7a2acd3f2ff500fa37d613d5efca4a9a24daedbf61b5b84015
+DIST android-tools-31.0.3-install-e2fsdroid-ext2simg.patch 2164 BLAKE2B 7f0b43ff5ae820101628399540f3e5b87bf69224f4a61a6b76b8b6b3b06f8e7162a6c1e7ee43eee928cfa96824f5efff72317b4bbfe160d8e72d96aa84e0a1d6 SHA512 d5fd63c108ca6b880b1b79cf362468335f19fad7bf2042fb667b56e34dc95acc47e1bf9c9e72be1d2bd8252a529cd49eb030d141bf735524bdaeb85482d544a9
+DIST android-tools-31.0.3-no-gtest.patch 3152 BLAKE2B da71e3cba87b21ffcb144602a06d7e269faabd173233363b757cd2191c051f8d3281f591117d4551d7acc029d6e2d421f702f9f836dfe0dec6c676aa39a2d9fe SHA512 a28d2264bf40c420a279acf1f4c3b4588d96ce2d6e2d6d322abbde62d773804bef10dc33f13dd52c7de80ace6c58f91ae28f5d4e8e97dfae4d2a8473d8537423
+DIST android-tools-31.0.3.tar.xz 25768908 BLAKE2B e8ca8ff93fcd3936f447926769d7b45194dd96ad99cddd570183a1cbae34dbf49a23e0c53d9eb8f5c25dd09717e1f160829752dc7ebc9404c804b48de8de9889 SHA512 d2c16325b190f77a8ffa38de18ae1aea4bf6848926620f25d14873dc4a3fda3fe2b13349fa2eee197b960ca65738a4a1d2c1f28cf8286ab79e73502e7a8e6357
 DIST android-tools-dont-install-license.patch 1016 BLAKE2B da65a414d046995358e91a0ca037951bc9c5a3e790b3b2151716b234c2943301ecef4ed248914235736ddd949f772311bf823e9b3b3f1980b7a5c4b72e5bcd47 SHA512 747728723941091caa17c66e68e88d2145a2ff037e6f5724f89f680d2ce6f4031efebcda7dbcc5b459ca4f5f9ddbf4ba04b0451b9939d19eaf2fa9d9ab727284
 DIST android-tools-fix-gcc11.patch 137252 BLAKE2B 0e80aab92cb69e3223f81834d53c1d84aef866787261305fd539cb8cb75a21361c65f091b2f7d83f6f8236816f43510f4f0f8b51dee4b03d99af31c78dc53a79 SHA512 fb4d8d13f9022f0472c81fe6b9252000d93ba5f77b84d7ac7d6846753078b6fdac0687fcb7157e445bba02cbf008ea3744d84e8fc5d534ee3807f61674e3238c
 DIST android-tools-install-e2fsdroid-ext2simg.patch 2164 BLAKE2B 7f0b43ff5ae820101628399540f3e5b87bf69224f4a61a6b76b8b6b3b06f8e7162a6c1e7ee43eee928cfa96824f5efff72317b4bbfe160d8e72d96aa84e0a1d6 SHA512 d5fd63c108ca6b880b1b79cf362468335f19fad7bf2042fb667b56e34dc95acc47e1bf9c9e72be1d2bd8252a529cd49eb030d141bf735524bdaeb85482d544a9

diff --git a/dev-util/android-tools/android-tools-31.0.3.ebuild b/dev-util/android-tools/android-tools-31.0.3.ebuild
new file mode 100644
index 00000000000..9db1b736041
--- /dev/null
+++ b/dev-util/android-tools/android-tools-31.0.3.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..10} )
+
+inherit cmake python-r1
+
+DESCRIPTION="Android platform tools (adb, fastboot, and mkbootimg)"
+HOMEPAGE="https://github.com/nmeum/android-tools/ https://developer.android.com/"
+
+MY_PV="${PV//_/}"
+SRC_URI="https://github.com/nmeum/android-tools/releases/download/${MY_PV}/${PN}-${MY_PV}.tar.xz
+	https://dev.gentoo.org/~zmedico/dist/android-tools-31.0.3-no-gtest.patch -> ${P}-no-gtest.patch
+	https://dev.gentoo.org/~zmedico/dist/android-tools-31.0.3-install-e2fsdroid-ext2simg.patch -> ${P}-install-e2fsdroid-ext2simg.patch
+	https://dev.gentoo.org/~zmedico/dist/android-tools-31.0.3-disable-werror-boringssl.patch -> ${P}-disable-werror-boringssl.patch
+"
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+# 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 ~arm ~arm64 ~x86 ~x86-linux"
+IUSE="python"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# dev-libs/libpcre only required for e2fsdroid
+DEPEND="
+	app-arch/brotli:=
+	app-arch/lz4:=
+	app-arch/zstd:=
+	dev-libs/libpcre2:=
+	>=dev-libs/protobuf-3.0.0:=
+	sys-libs/zlib:=
+	virtual/libusb:1=
+"
+RDEPEND="${DEPEND}
+	python? ( ${PYTHON_DEPS} )
+"
+BDEPEND="
+	dev-lang/go
+"
+
+DOCS=()
+
+src_prepare() {
+	eapply "${DISTDIR}/${P}-no-gtest.patch"
+	cd "${S}/vendor/core" || die
+	eapply "${S}/patches/core/0011-Remove-the-useless-dependency-on-gtest.patch"
+	cd "${S}/vendor/libziparchive" || die
+	eapply "${S}/patches/libziparchive/0004-Remove-the-useless-dependency-on-gtest.patch"
+	cd "${S}"
+	eapply "${DISTDIR}/${P}-install-e2fsdroid-ext2simg.patch"
+	eapply "${DISTDIR}/${P}-disable-werror-boringssl.patch"
+	cd "${S}/vendor/boringssl" || die
+	eapply "${S}/patches/boringssl/0011-Disable-Werror.patch"
+	cd "${S}"
+	rm -r patches || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		# Statically link the bundled boringssl
+		-DBUILD_SHARED_LIBS=OFF
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	export GOCACHE="${T}/go-build"
+	export GOFLAGS="-mod=vendor"
+	cmake_src_compile
+}
+
+src_install() {
+	cmake_src_install
+	use python && python_foreach_impl python_newexe vendor/mkbootimg/mkbootimg.py mkbootimg
+	docinto adb
+	dodoc vendor/adb/*.{txt,TXT}
+	docinto fastboot
+	dodoc vendor/core/fastboot/README.md
+}


^ permalink raw reply related	[flat|nested] 70+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-util/android-tools/
@ 2021-10-25  1:01 Zac Medico
  0 siblings, 0 replies; 70+ messages in thread
From: Zac Medico @ 2021-10-25  1:01 UTC (permalink / raw
  To: gentoo-commits

commit:     5575d1e739767a0308c906796d10303d13607c3e
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 25 01:00:02 2021 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Mon Oct 25 01:01:26 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5575d1e7

dev-util/android-tools: Fetch patches from dev space

Theses patches no longer belong to a branch in github,
so fetch them from my dev space instead.

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

 dev-util/android-tools/android-tools-31.0.0_p1.ebuild | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev-util/android-tools/android-tools-31.0.0_p1.ebuild b/dev-util/android-tools/android-tools-31.0.0_p1.ebuild
index cd63e3a63f4..b322fd0f0ba 100644
--- a/dev-util/android-tools/android-tools-31.0.0_p1.ebuild
+++ b/dev-util/android-tools/android-tools-31.0.0_p1.ebuild
@@ -12,10 +12,10 @@ HOMEPAGE="https://github.com/nmeum/android-tools/ https://developer.android.com/
 
 MY_PV="${PV//_/}"
 SRC_URI="https://github.com/nmeum/android-tools/releases/download/${MY_PV}/${PN}-${MY_PV}.tar.xz
-	https://github.com/mid-kid/android-tools/commit/32d76cdbeb8a4fc2bb5fe22f496a9b82b68305a3.patch -> ${PN}-no-gtest.patch
-	https://github.com/mid-kid/android-tools/commit/9806fe4b730e15027ace235c62e166ae6148df56.patch -> ${PN}-fix-gcc11.patch
-	https://github.com/mid-kid/android-tools/commit/557182ba3f912327e747c3c3638d6ee7c529fb96.patch -> ${PN}-dont-install-license.patch
-	https://github.com/mid-kid/android-tools/commit/5971ec8ebab527fa17c91eaebe012d2a89a838db.patch -> ${PN}-install-e2fsdroid-ext2simg.patch
+	https://dev.gentoo.org/~zmedico/dist/android-tools-31.0.0_p1-no-gtest.patch -> ${PN}-no-gtest.patch
+	https://dev.gentoo.org/~zmedico/dist/android-tools-31.0.0_p1-fix-gcc11.patch -> ${PN}-fix-gcc11.patch
+	https://dev.gentoo.org/~zmedico/dist/android-tools-31.0.0_p1-dont-install-license.patch -> ${PN}-dont-install-license.patch
+	https://dev.gentoo.org/~zmedico/dist/android-tools-31.0.0_p1-install-e2fsdroid-ext2simg.patch -> ${PN}-install-e2fsdroid-ext2simg.patch
 "
 S="${WORKDIR}/${PN}-${MY_PV}"
 


^ permalink raw reply related	[flat|nested] 70+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-util/android-tools/
@ 2021-07-16  5:54 Zac Medico
  0 siblings, 0 replies; 70+ messages in thread
From: Zac Medico @ 2021-07-16  5:54 UTC (permalink / raw
  To: gentoo-commits

commit:     445e56f6156dcfdb8848c8fd0d84c067474a59bd
Author:     Esteve Varela Colominas <esteve.varela <AT> gmail <DOT> com>
AuthorDate: Sun Jul  4 23:50:08 2021 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Fri Jul 16 05:54:16 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=445e56f6

dev-util/android-tools: New upstream, version bump

Using a new upstream to consolidate packaging efforts for these tools.

Closes: https://github.com/gentoo/gentoo/pull/21530
Closes: https://bugs.gentoo.org/707568
Signed-off-by: Esteve Varela Colominas <esteve.varela <AT> gmail.com>
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

 dev-util/android-tools/Manifest                    |  5 ++
 .../android-tools/android-tools-31.0.0_p1.ebuild   | 95 ++++++++++++++++++++++
 2 files changed, 100 insertions(+)

diff --git a/dev-util/android-tools/Manifest b/dev-util/android-tools/Manifest
index 2975ba07170..a3fcbecfb6d 100644
--- a/dev-util/android-tools/Manifest
+++ b/dev-util/android-tools/Manifest
@@ -1,3 +1,4 @@
+DIST android-tools-31.0.0p1.tar.xz 25135336 BLAKE2B abef4fa611541370d6c745c3f6df8f0326074ef23d4e656ab19443484b5459531fab0544936177397dece12b79ff37189003e818e49bfc4bb3d47e98955b917f SHA512 40bded59614a6d0543e5011038b7f1c6abcb64f0daa71a13175ecb75fe42cb9985ed3a6301d73ee8d4ea20e2c98e3ed8130824ee74dcebe75bc0d7f3052c9d3b
 DIST android-tools-9.0.0_p3-bug-706946-fno-common.patch.xz 2696 BLAKE2B de8083846d6cb24d2fcb12789b302f5df766753989e004154746d4402a5777bbabff2e9c67758e9185c0ea56dde7e647a8a15dd696671c28f2f708703bcad9f0 SHA512 e65818e9d06295f7de8f8bc52270054f9936659b2bf07f7abc15f2ea7b138536396a24c39bb6a260a931250396b04022170f2045336f0ba6444cd90fb0dfdbb0
 DIST android-tools-9.0.0_p3-fix-build-with-glibc-2.30.patch 1262 BLAKE2B fa2d3cd31e82dd3b17bb840096c6158f1b117cb12b8b3c6f6c604efd85f880346c04e8e98b17bebd68d56e06cdc126677ad96dbd6214175544a9b93020292956 SHA512 21c2501fa24f59489e656ac5122c906476ad573e63f6dcc88605dafde9d4b8927ea904708caaababd12155153d969d2480aff591d98057859e8b885e94aa126a
 DIST android-tools-9.0.0_r3-arch.tar.gz 8451 BLAKE2B b28649333aa0e5a6f4bc83f9e42e1749a4d138075d03559c5871a24f782bf8608bcf07a609bd791ee29afabcb4435ece2ed8f8abc171265ef9d67da231c8a29e SHA512 d3409f89d2c334b66e694fd77e068e2d863dc9a99b9ef332b0a08c9c186c26eb9d969ef5cde5aa6e28b866847b4a85a4d3a4c2b0951a37752510b2f3b41c5943
@@ -7,4 +8,8 @@ DIST android-tools-9.0.0_r3-extras.tar.xz 1653548 BLAKE2B 1a8c2ee2e564adc04d646a
 DIST android-tools-9.0.0_r3-f2fs-tools.tar.xz 212092 BLAKE2B 32775e5b049bd2ff2ce7c9ea3362a602dcda6328e39036902020bd372a812898d84912f686cf347b225af630c2dea81ce30b601ac968b1168e2851b94ac2da2e SHA512 4fac8f18533c5c2270aed6e60b21721c643a44a27b37482ff8fd8fa4d7c875eb8a626d544ec4e6efb89c7408ae97e66ffd123588e90b98312e5291575ca8baa6
 DIST android-tools-9.0.0_r3-selinux.tar.xz 3202332 BLAKE2B 60a884eb1bd34fe5796f8fb33e5aefd7f9ffc85ac91784e0a8f0ca663010cf2222c80f4c419019b5817f9cbd8037ab78914e42417193e1b802a2682bb82c0097 SHA512 f0a77dc0ac91d434573370110c70529caabfd5f036c02ae5f1a4b2097e48324198d03ecdc92a622e1590012dd3f20f103384fed468f5e27aebcaf9315bb87078
 DIST android-tools-9.0.0_r3.ninja.xz 4244 BLAKE2B 14cea7523f22a7f4e02e93c32e4d4684e057abbe8e2b537b7e942cc27c13ea2aa13bcdb5c3ccafc261b8d7fc4b4cd4b9394e0970734b36111ccffbacecc5cfb9 SHA512 46956a608d6a9b93f1a035d6b0e153c476b55d4f8a2db4915b18ac9904a6d07befcbceb8e2e50054e7dbe2970be8539243134cd9722d2f2ec8a36a3153e03c56
+DIST android-tools-dont-install-license.patch 1016 BLAKE2B da65a414d046995358e91a0ca037951bc9c5a3e790b3b2151716b234c2943301ecef4ed248914235736ddd949f772311bf823e9b3b3f1980b7a5c4b72e5bcd47 SHA512 747728723941091caa17c66e68e88d2145a2ff037e6f5724f89f680d2ce6f4031efebcda7dbcc5b459ca4f5f9ddbf4ba04b0451b9939d19eaf2fa9d9ab727284
+DIST android-tools-fix-gcc11.patch 137252 BLAKE2B 0e80aab92cb69e3223f81834d53c1d84aef866787261305fd539cb8cb75a21361c65f091b2f7d83f6f8236816f43510f4f0f8b51dee4b03d99af31c78dc53a79 SHA512 fb4d8d13f9022f0472c81fe6b9252000d93ba5f77b84d7ac7d6846753078b6fdac0687fcb7157e445bba02cbf008ea3744d84e8fc5d534ee3807f61674e3238c
+DIST android-tools-install-e2fsdroid-ext2simg.patch 2164 BLAKE2B 7f0b43ff5ae820101628399540f3e5b87bf69224f4a61a6b76b8b6b3b06f8e7162a6c1e7ee43eee928cfa96824f5efff72317b4bbfe160d8e72d96aa84e0a1d6 SHA512 d5fd63c108ca6b880b1b79cf362468335f19fad7bf2042fb667b56e34dc95acc47e1bf9c9e72be1d2bd8252a529cd49eb030d141bf735524bdaeb85482d544a9
+DIST android-tools-no-gtest.patch 3152 BLAKE2B da71e3cba87b21ffcb144602a06d7e269faabd173233363b757cd2191c051f8d3281f591117d4551d7acc029d6e2d421f702f9f836dfe0dec6c676aa39a2d9fe SHA512 a28d2264bf40c420a279acf1f4c3b4588d96ce2d6e2d6d322abbde62d773804bef10dc33f13dd52c7de80ace6c58f91ae28f5d4e8e97dfae4d2a8473d8537423
 DIST boringssl-45210dd4e21ace9d28cb76b3f83303fcdd2efcce.tar.gz 13581532 BLAKE2B ca2f6757807adc265314a7444605c6199a19847fb426384bafa201bf63f4e3c7c567fb8094b740b8a00caf0d106bb1efea2893b00d45c9772740a81dc0a186f3 SHA512 c6695d078ee7b3694898dfdc0ee3382d01f9bb592ea46eb64026c73565735fd7251bbb0fd3e8c8552394bcdad5717de7ee5106cf1ed91aacec05d779ad693f6a

diff --git a/dev-util/android-tools/android-tools-31.0.0_p1.ebuild b/dev-util/android-tools/android-tools-31.0.0_p1.ebuild
new file mode 100644
index 00000000000..cd63e3a63f4
--- /dev/null
+++ b/dev-util/android-tools/android-tools-31.0.0_p1.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit cmake python-r1
+
+DESCRIPTION="Android platform tools (adb, fastboot, and mkbootimg)"
+HOMEPAGE="https://github.com/nmeum/android-tools/ https://developer.android.com/"
+
+MY_PV="${PV//_/}"
+SRC_URI="https://github.com/nmeum/android-tools/releases/download/${MY_PV}/${PN}-${MY_PV}.tar.xz
+	https://github.com/mid-kid/android-tools/commit/32d76cdbeb8a4fc2bb5fe22f496a9b82b68305a3.patch -> ${PN}-no-gtest.patch
+	https://github.com/mid-kid/android-tools/commit/9806fe4b730e15027ace235c62e166ae6148df56.patch -> ${PN}-fix-gcc11.patch
+	https://github.com/mid-kid/android-tools/commit/557182ba3f912327e747c3c3638d6ee7c529fb96.patch -> ${PN}-dont-install-license.patch
+	https://github.com/mid-kid/android-tools/commit/5971ec8ebab527fa17c91eaebe012d2a89a838db.patch -> ${PN}-install-e2fsdroid-ext2simg.patch
+"
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+# 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 ~arm ~arm64 x86 ~x86-linux"
+IUSE="python"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# dev-libs/libpcre only required for e2fsdroid
+DEPEND="
+	app-arch/brotli:=
+	app-arch/lz4:=
+	app-arch/zstd:=
+	dev-libs/libpcre2:=
+	>=dev-libs/protobuf-3.0.0:=
+	sys-libs/zlib:=
+	virtual/libusb:1=
+"
+RDEPEND="${DEPEND}
+	python? ( ${PYTHON_DEPS} )
+"
+BDEPEND="
+	dev-lang/go
+"
+
+DOCS=()
+
+src_prepare() {
+	eapply "${DISTDIR}/${PN}-no-gtest.patch"
+	cd "${S}/vendor/core" || die
+	eapply "${S}/patches/core/0011-Remove-the-useless-dependency-on-gtest.patch"
+	cd "${S}/vendor/libziparchive" || die
+	eapply "${S}/patches/libziparchive/0004-Remove-the-useless-dependency-on-gtest.patch"
+	cd "${S}"
+	eapply "${DISTDIR}/${PN}-fix-gcc11.patch"
+	cd "${S}/vendor/boringssl" || die
+	eapply "${S}/patches/boringssl/0001-Fix-mismatch-between-header-and-implementation-of-bn_sqr_comba8.patch"
+	eapply "${S}/patches/boringssl/0002-Use-an-unsized-helper-for-truncated-SHA-512-variants.patch"
+	eapply "${S}/patches/boringssl/0003-Fix-unnecessarily-direction-specific-tests-in-cipher_tests.txt.patch"
+	eapply "${S}/patches/boringssl/0004-Test-empty-EVP_CIPHER-inputs-and-fix-exact-memcpy-overlap.patch"
+	eapply "${S}/patches/boringssl/0005-Make-words-in-crypto-fipsmodule-modes-actually-words.patch"
+	eapply "${S}/patches/boringssl/0006-Move-load-store-helpers-to-crypto-internal.h.patch"
+	eapply "${S}/patches/boringssl/0007-Fold-ripemd-internal.h-into-ripemd.c.patch"
+	eapply "${S}/patches/boringssl/0008-Pull-HASH_TRANSFORM-out-of-md32_common.h.patch"
+	eapply "${S}/patches/boringssl/0009-Make-md32_common.h-single-included-and-use-an-unsized-helper-for-SHA-256.patch"
+	eapply "${S}/patches/boringssl/0010-Fix-array-parametes-warnings.patch"
+	cd "${S}"
+	eapply "${DISTDIR}/${PN}-dont-install-license.patch"
+	eapply "${DISTDIR}/${PN}-install-e2fsdroid-ext2simg.patch"
+	rm -r patches || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		# Statically link the bundled boringssl
+		-DBUILD_SHARED_LIBS=OFF
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	export GOCACHE="${T}/go-build"
+	export GOFLAGS="-mod=vendor"
+	cmake_src_compile
+}
+
+src_install() {
+	cmake_src_install
+	use python && python_foreach_impl python_newexe vendor/mkbootimg/mkbootimg.py mkbootimg
+	docinto adb
+	dodoc vendor/adb/*.{txt,TXT}
+	docinto fastboot
+	dodoc vendor/core/fastboot/README.md
+}


^ permalink raw reply related	[flat|nested] 70+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-util/android-tools/
@ 2021-01-05 15:47 Andreas K. Hüttel
  0 siblings, 0 replies; 70+ messages in thread
From: Andreas K. Hüttel @ 2021-01-05 15:47 UTC (permalink / raw
  To: gentoo-commits

commit:     bf8a53572b7c540dea7715ce81d6192604ad8025
Author:     Andreas K. Huettel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  4 22:00:47 2021 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Tue Jan  5 15:46:38 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf8a5357

dev-util/android-tools: Remove old

Bug: https://bugs.gentoo.org/706946
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Andreas K. Huettel <dilfridge <AT> gentoo.org>

 dev-util/android-tools/Manifest                    | 10 ---
 .../android-tools/android-tools-5.1.1_p13.ebuild   | 65 ----------------
 .../android-tools/android-tools-6.0.1_p79.ebuild   | 87 ----------------------
 3 files changed, 162 deletions(-)

diff --git a/dev-util/android-tools/Manifest b/dev-util/android-tools/Manifest
index 12a108bf7cd..2975ba07170 100644
--- a/dev-util/android-tools/Manifest
+++ b/dev-util/android-tools/Manifest
@@ -1,13 +1,3 @@
-DIST android-tools-5.1.1_r13-arch.tar.gz 4078 BLAKE2B 718f94b0854189533f11545a8962c2cc85bc01797057a77525babd7f5e01c76f12764cab0da30cf8abe364c0ec757193cc8c49bef3278925076efd3633fc5fcf SHA512 e38e0d1c966b569defc6df185c0e2b35b3766a7f89bcc3f60cea9b536f37b5b6b76f40457735b509d806c4c5b24f6b3805b51b85ffeb4d04fc14a731f81414c3
-DIST android-tools-5.1.1_r13-core.tar.gz 1210720 BLAKE2B 0ec56b07c206ab122d1286dfa55424c3ffa4382cbe3f55f6ca351ca9e4555537e9404a5ee239adb90667d91c9212de85c8c264662489b69d3b7846c4b4bcd80d SHA512 2ce2f03193840bd894cb4638bd23a321e53c6185e9816729193714b9e2d068f5ca4ebcee4edc7febaa4ea1ee3621aa6977217a5a84d2f116f35b000969a4af15
-DIST android-tools-5.1.1_r13-extras.tar.gz 282690 BLAKE2B b0be4168ca4cdf6c7ed359f01104b2b20cf36678153bae00ffb8cdc9d79e0518f850d9f1ad3eb3a2f998418a6fcd1c54cf4199a2ae37c696e5f657bbed8c778c SHA512 322d45be02d3d5a5bf677e3a38a44085258ee7b9a8c0a7bc08ddb4104168170d5969699ee54e19009a2bd0d7e0ac6ad7971ccc67e2a0311c6f1ba7fb76cfce83
-DIST android-tools-5.1.1_r13-f2fs-tools.tar.gz 65931 BLAKE2B 658bae1a0d713887522eba2264971ae1f68093d9f3cf8ac1c2de96600219fc9f3624595de273ca3af76a69edf3a36b8136d9bb6b75a147beb2fc804864fd7b82 SHA512 66f4be04164df8bb5138105db4e9d5b79c09cd8c28a0d30a6d1e6dead77961614172c96fa680953bf445b934f14b4dbbc21ce89a909d9f278f2eca1ca2e1e656
-DIST android-tools-5.1.1_r13-libselinux.tar.gz 49085 BLAKE2B 50136b205fd6a6b055f82b16fe4e234bf060d40400e62e2a53c9943f67181d35564b000ec27fa060c2e01f7e4dea441079c5b06d1b5de21a9bcd15e8fa271a9b SHA512 b1a8960b98206118a07f11e7e67429c0d4b8f89c4f65919bcd02a6ba1c7f30e5b73a9431ce8d10fc6ffa6e487b79061b84a969490bf22a49188dc5cd9dd46a2f
-DIST android-tools-6.0.1_r79-arch.tar.gz 13466 BLAKE2B ddb064303659468b648a46ea24aae648968088de4aaea2b64e7b9d946d867daaf6ed1f4094cb7b29beb803387d2253580c85a46e9392bc1ccb2461186f2e52ef SHA512 90b8638d247897da33f6e861492c58df0e9877738650083c3307bd787d234d728e6c9097ac1401c254eb3daf4c6b18da4ee84dd16749acf6359fcb42781862fc
-DIST android-tools-6.0.1_r79-core.tar.gz 1186562 BLAKE2B 473454d340e65f98201508cb04293118d6e2ecc06e33d0d76ca81c536ea00a7818ebe4c4ccd30efef36aaaa1a9ec6ee3a57c00e2a82af28cbc49f4c973ab46be SHA512 a48f8c562305cbc951e008979920d9efe02e232c41997423457ff1e2f115e526b295c260a501d4050ce280ca7155793b95f7a60bad5cbc165ba80d6a225152f0
-DIST android-tools-6.0.1_r79-extras.tar.gz 648657 BLAKE2B 4582ddd57b729492e08987e17304c62778504ffc316ab26df8c83fff1aed33226106474131d5ad0e3e302b577c83a2b78d0be04fef9711e39861a223580ab1b9 SHA512 e10694737c518f591eff4e808bb826c83bf45dc44c5c1ee8a4082a6e0653350ffe2986e299348cb4a1219203192d01546a05e9354ce05e29897f856c147de8c3
-DIST android-tools-6.0.1_r79-f2fs-tools.tar.gz 70255 BLAKE2B ab9ce3efd33c28a1a0a9cb8a5415057498dd493e059183cc9d3fcc9de1b5ca4d7488c75695c94700fc6a4e5503beb8647576c7096fa50229f98485d2983ce152 SHA512 0871f99f78006028889b42668ec627b6515bb812ad3ec4a489f62187a79f64d2a74f66556698a5f05fc99932f75fefd8810dedceeab744b212beb764e97b82c8
-DIST android-tools-6.0.1_r79-libselinux.tar.gz 50814 BLAKE2B f09f26c801be83bc97f4b18606f513ce0fae791126a30c90067e3b2066c991fa1390ab2d0fac2475f755f3245179718204d5014f47ece46801dc0f80caf9758b SHA512 686557271271c4d59fb968c5aa76b433955009733f3151c4c86faa996ce846088d6632b0969b23699822b7a6f09eae60abedba6abb0edc9d444159bbdb5c6f91
 DIST android-tools-9.0.0_p3-bug-706946-fno-common.patch.xz 2696 BLAKE2B de8083846d6cb24d2fcb12789b302f5df766753989e004154746d4402a5777bbabff2e9c67758e9185c0ea56dde7e647a8a15dd696671c28f2f708703bcad9f0 SHA512 e65818e9d06295f7de8f8bc52270054f9936659b2bf07f7abc15f2ea7b138536396a24c39bb6a260a931250396b04022170f2045336f0ba6444cd90fb0dfdbb0
 DIST android-tools-9.0.0_p3-fix-build-with-glibc-2.30.patch 1262 BLAKE2B fa2d3cd31e82dd3b17bb840096c6158f1b117cb12b8b3c6f6c604efd85f880346c04e8e98b17bebd68d56e06cdc126677ad96dbd6214175544a9b93020292956 SHA512 21c2501fa24f59489e656ac5122c906476ad573e63f6dcc88605dafde9d4b8927ea904708caaababd12155153d969d2480aff591d98057859e8b885e94aa126a
 DIST android-tools-9.0.0_r3-arch.tar.gz 8451 BLAKE2B b28649333aa0e5a6f4bc83f9e42e1749a4d138075d03559c5871a24f782bf8608bcf07a609bd791ee29afabcb4435ece2ed8f8abc171265ef9d67da231c8a29e SHA512 d3409f89d2c334b66e694fd77e068e2d863dc9a99b9ef332b0a08c9c186c26eb9d969ef5cde5aa6e28b866847b4a85a4d3a4c2b0951a37752510b2f3b41c5943

diff --git a/dev-util/android-tools/android-tools-5.1.1_p13.ebuild b/dev-util/android-tools/android-tools-5.1.1_p13.ebuild
deleted file mode 100644
index 62e4096698a..00000000000
--- a/dev-util/android-tools/android-tools-5.1.1_p13.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-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/"
-# For stable digests, git tarballs generated by android.googlesource.com
-# are fetched from mirror://gentoo/.
-SRC_URI="https://projects.archlinux.org/svntogit/community.git/snapshot/community-caa300cf262afcf5bdb4dcc923dee54e3715fd5c.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 ~x86-linux"
-IUSE="libressl"
-
-RDEPEND="sys-libs/zlib:=
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	dev-libs/libpcre"
-DEPEND="${RDEPEND}"
-
-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
-	sed -e 's|#include <dlfcn.h>|\0\n#include <stddef.h>\n#include <string.h>\n|' \
-		-i extras/f2fs_utils/f2fs_utils.c  || die
-	mv arch/*/trunk/Makefile ./ || die
-	sed -i '1i#include <sys/sysmacros.h>' core/adb/usb_linux.c || die #580058
-	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 extras/ext4_utils/sha1.{c,h} || die #580686
-	tc-export CC
-}
-
-src_install() {
-	emake DESTDIR="${ED}" install
-	newbashcomp arch/*/trunk/bash_completion fastboot
-}

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
deleted file mode 100644
index 6ad2b514792..00000000000
--- a/dev-util/android-tools/android-tools-6.0.1_p79.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# 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 ~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}
-	virtual/rubygems"
-
-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
-	sed -i '1i#include <sys/sysmacros.h>' core/adb/usb_linux.cpp || die #616508
-	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 extras/ext4_utils/sha1.{c,h} || die #580686
-	default
-}
-
-src_compile() {
-	# Dynamically detect rubygems interpreter (bug 631398).
-	local ruby_bin=$(type -P ruby) ruby_error_log=${T}/generate_build.rb.log success=
-	for ruby_bin in "${ruby_bin}" "${ruby_bin}"[[:digit:]][[:digit:]]; do
-		"${ruby_bin}" ./generate_build.rb 1> build.sh 2> "${ruby_error_log}" && \
-			{ success=1; break; }
-	done
-	if [[ -z ${success} ]]; then
-		cat "${ruby_error_log}" >&2
-		die "${ruby_bin} ./generate_build.rb failed"
-	fi
-	sed -e 's:^gcc:${CC}:' -e 's:^g++:${CXX}:' -i build.sh || die
-	chmod +x build.sh || die
-	tc-export CC CXX
-	bash -e ./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
-}


^ permalink raw reply related	[flat|nested] 70+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-util/android-tools/
@ 2021-01-01  0:59 Michał Górny
  0 siblings, 0 replies; 70+ messages in thread
From: Michał Górny @ 2021-01-01  0:59 UTC (permalink / raw
  To: gentoo-commits

commit:     a8a0fd5e5ba2886d2f86548e1dda6b408cd921ff
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Jan  1 00:57:19 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Jan  1 00:57:19 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8a0fd5e

dev-util/android-tools: Remove old (py3.6)

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-util/android-tools/Manifest                    |   7 --
 .../android-tools/android-tools-8.1.0_p1.ebuild    | 125 ---------------------
 2 files changed, 132 deletions(-)

diff --git a/dev-util/android-tools/Manifest b/dev-util/android-tools/Manifest
index 0fd7758e457..12a108bf7cd 100644
--- a/dev-util/android-tools/Manifest
+++ b/dev-util/android-tools/Manifest
@@ -8,12 +8,6 @@ DIST android-tools-6.0.1_r79-core.tar.gz 1186562 BLAKE2B 473454d340e65f98201508c
 DIST android-tools-6.0.1_r79-extras.tar.gz 648657 BLAKE2B 4582ddd57b729492e08987e17304c62778504ffc316ab26df8c83fff1aed33226106474131d5ad0e3e302b577c83a2b78d0be04fef9711e39861a223580ab1b9 SHA512 e10694737c518f591eff4e808bb826c83bf45dc44c5c1ee8a4082a6e0653350ffe2986e299348cb4a1219203192d01546a05e9354ce05e29897f856c147de8c3
 DIST android-tools-6.0.1_r79-f2fs-tools.tar.gz 70255 BLAKE2B ab9ce3efd33c28a1a0a9cb8a5415057498dd493e059183cc9d3fcc9de1b5ca4d7488c75695c94700fc6a4e5503beb8647576c7096fa50229f98485d2983ce152 SHA512 0871f99f78006028889b42668ec627b6515bb812ad3ec4a489f62187a79f64d2a74f66556698a5f05fc99932f75fefd8810dedceeab744b212beb764e97b82c8
 DIST android-tools-6.0.1_r79-libselinux.tar.gz 50814 BLAKE2B f09f26c801be83bc97f4b18606f513ce0fae791126a30c90067e3b2066c991fa1390ab2d0fac2475f755f3245179718204d5014f47ece46801dc0f80caf9758b SHA512 686557271271c4d59fb968c5aa76b433955009733f3151c4c86faa996ce846088d6632b0969b23699822b7a6f09eae60abedba6abb0edc9d444159bbdb5c6f91
-DIST android-tools-8.1.0_r1-arch.tar.gz 6250 BLAKE2B 65447517a33438c8531a9d707c6107703eaccb558e505e51a88ef51e70f83488620f76eb0240dc0899211cf120e9e1ffbea041086f1d8133f30b56358aba76d6 SHA512 5746e0b2f6aae37ebe60b7b1e939699a11de2f44286497f77d700c3896e02559d55002f036ecdc1c412844bfce4ab245b9086193dc982e6be74bcaea61010c5c
-DIST android-tools-8.1.0_r1-core.tar.gz 5227179 BLAKE2B afb280d67fe1b926e1f1ad68409584ad0209eb48921542e2bd490448c888cdf4bf6fb4c6f9552d580c7a396e79c2c85019e79a9a6c9881ea962c2f1064c33d82 SHA512 2c8e67232ca6348a4fd4b5d7077715491d2168c46fc8e336635a961bbbed156ef480718ee58393501196e9315c6c1bda807f8966944e3bc209dd5a0f7088642e
-DIST android-tools-8.1.0_r1-extras.tar.xz 275952 BLAKE2B 0fd3c536fee6ffbe2cdd4321604d32dc3a2b48a1b3edcb9121e83ceea760e491b47b301c3d8126565efd6b11adabd4f89c79bbe8731585660ce395af9e643fe7 SHA512 bfe3af89eadf38ce6805637e41f3fb15feb85455902f6a43e52a2f95dd1595cc896a9f46ccc82ab8db433f56a05f2f4c0ba85b77f40b03d5d69c8fec4082a2da
-DIST android-tools-8.1.0_r1-f2fs-tools.tar.xz 93924 BLAKE2B b8b6c7ba4c3f5309bfcfc91bd57d018d7af66f8dd25590207fd545f0dba02961826bf9963a56c7994feea5db8f9caedfe4fe62870420d9544283f87ec337cfb8 SHA512 de726be0691c58a5093098bd30cfc06c4312c44bec040cbecd594694cb7b38742dafd1f00b08c18f1b70abf56571738eb3e85e612f082e09e51a98980444e069
-DIST android-tools-8.1.0_r1-selinux.tar.xz 3188060 BLAKE2B 8c513d858e8dcaed705975ad61f362d7b1c2252685a63a1ad6035f36b0b402f1857ac5d2635d35ffa10f05b4a2605f30f27dcc5e9d91930eb0656f3ce2da036d SHA512 8799f10b4dba840ecea8f6abb8166c2e137eb3f0d9c5cfb132c661cf17800f2eeaafb1b4ec9e8974fc3324fae99e3654e52397c987faf1d48ab6148152d84f11
-DIST android-tools-8.1.0_r1.ninja.xz 2740 BLAKE2B 34473e33970cefdaf82bbe4524665fd50e6617cf867757ca07cdccc2e7356f43ef4bb455080ef4bac516ddba3c4e4120f0b27306e84725f8d5738a81800e3a53 SHA512 707e0e1c53832a42384e93d363f80007b76f18166b9f3f7d516431410b05319b1acc804daa1fddc218e11feb48de48683efb5203f4fa6d80646dcb1a2953139f
 DIST android-tools-9.0.0_p3-bug-706946-fno-common.patch.xz 2696 BLAKE2B de8083846d6cb24d2fcb12789b302f5df766753989e004154746d4402a5777bbabff2e9c67758e9185c0ea56dde7e647a8a15dd696671c28f2f708703bcad9f0 SHA512 e65818e9d06295f7de8f8bc52270054f9936659b2bf07f7abc15f2ea7b138536396a24c39bb6a260a931250396b04022170f2045336f0ba6444cd90fb0dfdbb0
 DIST android-tools-9.0.0_p3-fix-build-with-glibc-2.30.patch 1262 BLAKE2B fa2d3cd31e82dd3b17bb840096c6158f1b117cb12b8b3c6f6c604efd85f880346c04e8e98b17bebd68d56e06cdc126677ad96dbd6214175544a9b93020292956 SHA512 21c2501fa24f59489e656ac5122c906476ad573e63f6dcc88605dafde9d4b8927ea904708caaababd12155153d969d2480aff591d98057859e8b885e94aa126a
 DIST android-tools-9.0.0_r3-arch.tar.gz 8451 BLAKE2B b28649333aa0e5a6f4bc83f9e42e1749a4d138075d03559c5871a24f782bf8608bcf07a609bd791ee29afabcb4435ece2ed8f8abc171265ef9d67da231c8a29e SHA512 d3409f89d2c334b66e694fd77e068e2d863dc9a99b9ef332b0a08c9c186c26eb9d969ef5cde5aa6e28b866847b4a85a4d3a4c2b0951a37752510b2f3b41c5943
@@ -23,5 +17,4 @@ DIST android-tools-9.0.0_r3-extras.tar.xz 1653548 BLAKE2B 1a8c2ee2e564adc04d646a
 DIST android-tools-9.0.0_r3-f2fs-tools.tar.xz 212092 BLAKE2B 32775e5b049bd2ff2ce7c9ea3362a602dcda6328e39036902020bd372a812898d84912f686cf347b225af630c2dea81ce30b601ac968b1168e2851b94ac2da2e SHA512 4fac8f18533c5c2270aed6e60b21721c643a44a27b37482ff8fd8fa4d7c875eb8a626d544ec4e6efb89c7408ae97e66ffd123588e90b98312e5291575ca8baa6
 DIST android-tools-9.0.0_r3-selinux.tar.xz 3202332 BLAKE2B 60a884eb1bd34fe5796f8fb33e5aefd7f9ffc85ac91784e0a8f0ca663010cf2222c80f4c419019b5817f9cbd8037ab78914e42417193e1b802a2682bb82c0097 SHA512 f0a77dc0ac91d434573370110c70529caabfd5f036c02ae5f1a4b2097e48324198d03ecdc92a622e1590012dd3f20f103384fed468f5e27aebcaf9315bb87078
 DIST android-tools-9.0.0_r3.ninja.xz 4244 BLAKE2B 14cea7523f22a7f4e02e93c32e4d4684e057abbe8e2b537b7e942cc27c13ea2aa13bcdb5c3ccafc261b8d7fc4b4cd4b9394e0970734b36111ccffbacecc5cfb9 SHA512 46956a608d6a9b93f1a035d6b0e153c476b55d4f8a2db4915b18ac9904a6d07befcbceb8e2e50054e7dbe2970be8539243134cd9722d2f2ec8a36a3153e03c56
-DIST boringssl-14308731e5446a73ac2258688a9688b524483cb6.tar.gz 13030361 BLAKE2B 6982416b6e193e7faccd41fff3bd35f80b11d7495251d876e6b081bd94a887ec3c6bf5b7852d9595594fc2bdc57353f268272ef01fb79f7c93b52d46cbda69ac SHA512 171b524b0452a48853b2c8010ff5e14d5d720e69eeaf1d3b79f675838f3afa94aee9de2f47b37303feb2d92cbf77639efe585786625b7b37b8cc2ba727c37fdc
 DIST boringssl-45210dd4e21ace9d28cb76b3f83303fcdd2efcce.tar.gz 13581532 BLAKE2B ca2f6757807adc265314a7444605c6199a19847fb426384bafa201bf63f4e3c7c567fb8094b740b8a00caf0d106bb1efea2893b00d45c9772740a81dc0a186f3 SHA512 c6695d078ee7b3694898dfdc0ee3382d01f9bb592ea46eb64026c73565735fd7251bbb0fd3e8c8552394bcdad5717de7ee5106cf1ed91aacec05d779ad693f6a

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
deleted file mode 100644
index 86a31b64479..00000000000
--- a/dev-util/android-tools/android-tools-8.1.0_p1.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_6 )
-CMAKE_MAKEFILE_GENERATOR="ninja"
-
-inherit flag-o-matic bash-completion-r1 ninja-utils toolchain-funcs cmake-utils python-r1
-
-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/"
-# See helper scripts in files/ for creating these tarballs and getting this hash.
-BORINGSSL_SHA1="14308731e5446a73ac2258688a9688b524483cb6"
-# The ninja file was created by running the ruby script from archlinux by hand and fixing the build vars.
-# No point in depending on something large/uncommon like ruby just to generate a ninja file.
-SRC_URI="https://git.archlinux.org/svntogit/community.git/snapshot/community-2b7f9774cc468205fec145e64e9103aee8e5c6f9.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
-	https://github.com/google/boringssl/archive/${BORINGSSL_SHA1}.tar.gz -> boringssl-${BORINGSSL_SHA1}.tar.gz
-	mirror://gentoo/${MY_P}-extras.tar.xz https://dev.gentoo.org/~vapier/dist/${MY_P}-extras.tar.xz
-	mirror://gentoo/${MY_P}-selinux.tar.xz https://dev.gentoo.org/~vapier/dist/${MY_P}-selinux.tar.xz
-	mirror://gentoo/${MY_P}-f2fs-tools.tar.xz https://dev.gentoo.org/~vapier/dist/${MY_P}-f2fs-tools.tar.xz
-	mirror://gentoo/${MY_P}.ninja.xz https://dev.gentoo.org/~vapier/dist/${MY_P}.ninja.xz"
-
-# 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 ~arm x86 ~x86-linux"
-IUSE="python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-DEPEND="sys-libs/zlib:=
-	dev-libs/libpcre2:=
-	virtual/libusb:1="
-RDEPEND="${DEPEND}
-	python? ( ${PYTHON_DEPS} )"
-DEPEND+="
-	dev-lang/go"
-
-S=${WORKDIR}
-CMAKE_USE_DIR="${S}/boringssl"
-
-unpack_into() {
-	local archive="$1"
-	local dir="$2"
-
-	mkdir -p "${dir}"
-	pushd "${dir}" >/dev/null || die
-	unpack "${archive}"
-	if [[ ${dir} != ./* ]] ; then
-		mv */* ./ || die
-	fi
-	popd >/dev/null
-}
-
-src_unpack() {
-	unpack_into "${MY_P}-arch.tar.gz" arch
-	unpack_into "${MY_P}-core.tar.gz" core
-	unpack_into "${MY_P}-extras.tar.xz" extras
-	unpack_into "${MY_P}-f2fs-tools.tar.xz" ./f2fs-tools
-	unpack_into "${MY_P}-selinux.tar.xz" ./selinux
-	unpack_into boringssl-${BORINGSSL_SHA1}.tar.gz boringssl
-
-	unpack "${MY_P}.ninja.xz"
-	mv "${MY_P}.ninja" "build.ninja" || die
-
-	# Avoid depending on gtest just for its prod headers when boringssl bundles it.
-	ln -s ../../boringssl/third_party/googletest/include/gtest core/include/ || die
-}
-
-src_prepare() {
-	cd "${S}"/core
-	eapply "${WORKDIR}"/arch/trunk/fix_build_core.patch
-	eapply "${FILESDIR}"/${P}-build.patch
-	sed -i '1i#include <sys/sysmacros.h>' adb/client/usb_linux.cpp || die #616508
-
-	cd "${S}"/selinux
-	eapply "${WORKDIR}"/arch/trunk/fix_build_selinux.patch
-
-	cd "${S}"/extras
-	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 ext4_utils/sha1.{c,h} || die #580686
-
-	cd "${S}"
-	default
-
-	# The pregenerated ninja file expects the build/ dir.
-	BUILD_DIR="${CMAKE_USE_DIR}/build"
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	append-lfs-flags
-
-	cmake-utils_src_configure
-
-	sed -i \
-		-e "s|@CC@|$(tc-getCC)|g" \
-		-e "s|@CXX@|$(tc-getCXX)|g" \
-		-e "s|@CFLAGS@|${CFLAGS}|g" \
-		-e "s|@CPPFLAGS@|${CPPFLAGS}|g" \
-		-e "s|@CXXFLAGS@|${CXXFLAGS}|g" \
-		-e "s|@LDFLAGS@|${LDFLAGS}|g" \
-		-e "s|@PV@|${PV}|g" \
-		build.ninja || die
-}
-
-src_compile() {
-	# We only need a few libs from boringssl.
-	cmake-utils_src_compile libcrypto.a libssl.a
-
-	eninja
-}
-
-src_install() {
-	dobin adb fastboot
-	dodoc core/adb/*.{txt,TXT} core/fastboot/README.md
-	use python && python_foreach_impl python_doexe core/mkbootimg/mkbootimg
-	newbashcomp arch/trunk/bash_completion.fastboot fastboot
-}


^ permalink raw reply related	[flat|nested] 70+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-util/android-tools/
@ 2020-10-13 17:05 Zac Medico
  0 siblings, 0 replies; 70+ messages in thread
From: Zac Medico @ 2020-10-13 17:05 UTC (permalink / raw
  To: gentoo-commits

commit:     e1917ae08d6e355a448c236c3175e29e757582e8
Author:     Gergely Nagy <ngg <AT> ngg <DOT> hu>
AuthorDate: Tue Oct 13 14:33:40 2020 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Tue Oct 13 17:05:36 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1917ae0

dev-util/android-tools: fix broken SRC_URI

Closes: https://github.com/gentoo/gentoo/pull/17913
Closes: https://bugs.gentoo.org/748492
Signed-off-by: Gergely Nagy <ngg <AT> ngg.hu>
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

 dev-util/android-tools/Manifest                         | 1 +
 dev-util/android-tools/android-tools-9.0.0_p3-r1.ebuild | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/dev-util/android-tools/Manifest b/dev-util/android-tools/Manifest
index 2fe91c4dc74..40321351b6a 100644
--- a/dev-util/android-tools/Manifest
+++ b/dev-util/android-tools/Manifest
@@ -16,6 +16,7 @@ DIST android-tools-8.1.0_r1-selinux.tar.xz 3188060 BLAKE2B 8c513d858e8dcaed70597
 DIST android-tools-8.1.0_r1.ninja.xz 2740 BLAKE2B 34473e33970cefdaf82bbe4524665fd50e6617cf867757ca07cdccc2e7356f43ef4bb455080ef4bac516ddba3c4e4120f0b27306e84725f8d5738a81800e3a53 SHA512 707e0e1c53832a42384e93d363f80007b76f18166b9f3f7d516431410b05319b1acc804daa1fddc218e11feb48de48683efb5203f4fa6d80646dcb1a2953139f
 DIST android-tools-9.0.0_p3-bug-706946-fno-common.patch.xz 2696 BLAKE2B de8083846d6cb24d2fcb12789b302f5df766753989e004154746d4402a5777bbabff2e9c67758e9185c0ea56dde7e647a8a15dd696671c28f2f708703bcad9f0 SHA512 e65818e9d06295f7de8f8bc52270054f9936659b2bf07f7abc15f2ea7b138536396a24c39bb6a260a931250396b04022170f2045336f0ba6444cd90fb0dfdbb0
 DIST android-tools-9.0.0_p3-fix-build-with-glibc-2.30.patch 1262 BLAKE2B fa2d3cd31e82dd3b17bb840096c6158f1b117cb12b8b3c6f6c604efd85f880346c04e8e98b17bebd68d56e06cdc126677ad96dbd6214175544a9b93020292956 SHA512 21c2501fa24f59489e656ac5122c906476ad573e63f6dcc88605dafde9d4b8927ea904708caaababd12155153d969d2480aff591d98057859e8b885e94aa126a
+DIST android-tools-9.0.0_r3-arch.tar.gz 8451 BLAKE2B b28649333aa0e5a6f4bc83f9e42e1749a4d138075d03559c5871a24f782bf8608bcf07a609bd791ee29afabcb4435ece2ed8f8abc171265ef9d67da231c8a29e SHA512 d3409f89d2c334b66e694fd77e068e2d863dc9a99b9ef332b0a08c9c186c26eb9d969ef5cde5aa6e28b866847b4a85a4d3a4c2b0951a37752510b2f3b41c5943
 DIST android-tools-9.0.0_r3-arch.tar.xz 7628 BLAKE2B d0d7267d41ade2031d72236c18850ea329afbdd57a2b5bf25837e405d3e66d7aaef5b48996e7aafd4cf6e4543de03ba6549823845e5e8cb35c6d4bc900b8e275 SHA512 534d99fe15b3a3ba4f2a7331662fdb8645424830122cc4c1ff0b44d43059280610389147d4a916c55b3be71ac84d019223c90993cbdae2588f9e9737f0b5606d
 DIST android-tools-9.0.0_r3-core.tar.gz 27484684 BLAKE2B d071adacd5be0341a9114e57242fe51f623773683b9db2735eac9231a77cc22651f09e1c63682e729494aa6409939696a5635afcd5e8a40ec0f75d2784c00ffc SHA512 0edc8b02b57085ce88b39c987284af1c681870594b20ab9ecf4be98a0cfdff2905bc80f5d8eeb7fbc7f4604b800b6f95bc6b2b0321c900bf833313dfcbb2eefb
 DIST android-tools-9.0.0_r3-e2fsprogs.tar.xz 5255616 BLAKE2B 5fe62da70686148d755c60c1cef4b64d80f0c6a891d13a778d2a3209f950b0f9c5b19bf39ed28c5d38d01103ef1ea474133f57b7104a4fdf80eafd8edc17a3a5 SHA512 a9c3c180ddb96f10710a18794b20cfc641d40af3643a1133091127a40c27fa724b6e6f1af8e66fc1e1ca33053e33499b910880eab05979a2de95a0d3d7a79f93

diff --git a/dev-util/android-tools/android-tools-9.0.0_p3-r1.ebuild b/dev-util/android-tools/android-tools-9.0.0_p3-r1.ebuild
index 0a5d152abd2..b2b942ac225 100644
--- a/dev-util/android-tools/android-tools-9.0.0_p3-r1.ebuild
+++ b/dev-util/android-tools/android-tools-9.0.0_p3-r1.ebuild
@@ -18,7 +18,7 @@ BORINGSSL_SHA1="45210dd4e21ace9d28cb76b3f83303fcdd2efcce"
 GLIBC_GETTID_PATCH="${P}-fix-build-with-glibc-2.30.patch"
 # The ninja file was created by running the ruby script from archlinux by hand and fixing the build vars.
 # No point in depending on something large/uncommon like ruby just to generate a ninja file.
-SRC_URI="https://git.archlinux.org/svntogit/community.git/snapshot/community-0ffb7b41d599741d100a6a00a4bb20e162cd3f90.tar.xz -> ${MY_P}-arch.tar.xz
+SRC_URI="https://github.com/archlinux/svntogit-community/archive/0ffb7b41d599741d100a6a00a4bb20e162cd3f90.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
 	https://github.com/google/boringssl/archive/${BORINGSSL_SHA1}.tar.gz -> boringssl-${BORINGSSL_SHA1}.tar.gz
 	mirror://gentoo/${MY_P}-e2fsprogs.tar.xz https://dev.gentoo.org/~zmedico/dist/${MY_P}-e2fsprogs.tar.xz
@@ -61,7 +61,7 @@ unpack_into() {
 }
 
 src_unpack() {
-	unpack_into "${MY_P}-arch.tar.xz" arch
+	unpack_into "${MY_P}-arch.tar.gz" arch
 	unpack_into "${MY_P}-core.tar.gz" core
 	unpack_into "${MY_P}-e2fsprogs.tar.xz" ./e2fsprogs
 	unpack_into "${MY_P}-extras.tar.xz" extras


^ permalink raw reply related	[flat|nested] 70+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-util/android-tools/
@ 2020-10-13 17:05 Zac Medico
  0 siblings, 0 replies; 70+ messages in thread
From: Zac Medico @ 2020-10-13 17:05 UTC (permalink / raw
  To: gentoo-commits

commit:     8289fe4f21492499dc7164640077fcd5ff82ee7f
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 13 16:56:00 2020 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Tue Oct 13 17:05:36 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8289fe4f

dev-util/android-tools: Remove old version 9.0.0_p3

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

 dev-util/android-tools/Manifest                    |   1 -
 .../android-tools/android-tools-9.0.0_p3.ebuild    | 132 ---------------------
 2 files changed, 133 deletions(-)

diff --git a/dev-util/android-tools/Manifest b/dev-util/android-tools/Manifest
index 40321351b6a..0fd7758e457 100644
--- a/dev-util/android-tools/Manifest
+++ b/dev-util/android-tools/Manifest
@@ -17,7 +17,6 @@ DIST android-tools-8.1.0_r1.ninja.xz 2740 BLAKE2B 34473e33970cefdaf82bbe4524665f
 DIST android-tools-9.0.0_p3-bug-706946-fno-common.patch.xz 2696 BLAKE2B de8083846d6cb24d2fcb12789b302f5df766753989e004154746d4402a5777bbabff2e9c67758e9185c0ea56dde7e647a8a15dd696671c28f2f708703bcad9f0 SHA512 e65818e9d06295f7de8f8bc52270054f9936659b2bf07f7abc15f2ea7b138536396a24c39bb6a260a931250396b04022170f2045336f0ba6444cd90fb0dfdbb0
 DIST android-tools-9.0.0_p3-fix-build-with-glibc-2.30.patch 1262 BLAKE2B fa2d3cd31e82dd3b17bb840096c6158f1b117cb12b8b3c6f6c604efd85f880346c04e8e98b17bebd68d56e06cdc126677ad96dbd6214175544a9b93020292956 SHA512 21c2501fa24f59489e656ac5122c906476ad573e63f6dcc88605dafde9d4b8927ea904708caaababd12155153d969d2480aff591d98057859e8b885e94aa126a
 DIST android-tools-9.0.0_r3-arch.tar.gz 8451 BLAKE2B b28649333aa0e5a6f4bc83f9e42e1749a4d138075d03559c5871a24f782bf8608bcf07a609bd791ee29afabcb4435ece2ed8f8abc171265ef9d67da231c8a29e SHA512 d3409f89d2c334b66e694fd77e068e2d863dc9a99b9ef332b0a08c9c186c26eb9d969ef5cde5aa6e28b866847b4a85a4d3a4c2b0951a37752510b2f3b41c5943
-DIST android-tools-9.0.0_r3-arch.tar.xz 7628 BLAKE2B d0d7267d41ade2031d72236c18850ea329afbdd57a2b5bf25837e405d3e66d7aaef5b48996e7aafd4cf6e4543de03ba6549823845e5e8cb35c6d4bc900b8e275 SHA512 534d99fe15b3a3ba4f2a7331662fdb8645424830122cc4c1ff0b44d43059280610389147d4a916c55b3be71ac84d019223c90993cbdae2588f9e9737f0b5606d
 DIST android-tools-9.0.0_r3-core.tar.gz 27484684 BLAKE2B d071adacd5be0341a9114e57242fe51f623773683b9db2735eac9231a77cc22651f09e1c63682e729494aa6409939696a5635afcd5e8a40ec0f75d2784c00ffc SHA512 0edc8b02b57085ce88b39c987284af1c681870594b20ab9ecf4be98a0cfdff2905bc80f5d8eeb7fbc7f4604b800b6f95bc6b2b0321c900bf833313dfcbb2eefb
 DIST android-tools-9.0.0_r3-e2fsprogs.tar.xz 5255616 BLAKE2B 5fe62da70686148d755c60c1cef4b64d80f0c6a891d13a778d2a3209f950b0f9c5b19bf39ed28c5d38d01103ef1ea474133f57b7104a4fdf80eafd8edc17a3a5 SHA512 a9c3c180ddb96f10710a18794b20cfc641d40af3643a1133091127a40c27fa724b6e6f1af8e66fc1e1ca33053e33499b910880eab05979a2de95a0d3d7a79f93
 DIST android-tools-9.0.0_r3-extras.tar.xz 1653548 BLAKE2B 1a8c2ee2e564adc04d646ab54e1913d17e9ed0fb0ef3872bd8a459ecad5fbf7324830c1120c367d9515607ecc659fb0f27c4f7db740fda318fd13be1300a6a51 SHA512 13dc145faf919c1f7cc183f823ca46330568daff19ffb110af383876cdb6b0e9f0a83690a4e22633b572c1e6c2aba14ef0181c01720095173d258320229e9108

diff --git a/dev-util/android-tools/android-tools-9.0.0_p3.ebuild b/dev-util/android-tools/android-tools-9.0.0_p3.ebuild
deleted file mode 100644
index 36c89fee7e7..00000000000
--- a/dev-util/android-tools/android-tools-9.0.0_p3.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_{6,7} )
-CMAKE_MAKEFILE_GENERATOR="ninja"
-
-inherit flag-o-matic bash-completion-r1 ninja-utils toolchain-funcs cmake-utils python-r1
-
-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/"
-# See helper scripts in files/ for creating these tarballs and getting this hash.
-BORINGSSL_SHA1="45210dd4e21ace9d28cb76b3f83303fcdd2efcce"
-# The ninja file was created by running the ruby script from archlinux by hand and fixing the build vars.
-# No point in depending on something large/uncommon like ruby just to generate a ninja file.
-SRC_URI="https://git.archlinux.org/svntogit/community.git/snapshot/community-0ffb7b41d599741d100a6a00a4bb20e162cd3f90.tar.xz -> ${MY_P}-arch.tar.xz
-	https://github.com/android/platform_system_core/archive/android-${MY_PV}.tar.gz -> ${MY_P}-core.tar.gz
-	https://github.com/google/boringssl/archive/${BORINGSSL_SHA1}.tar.gz -> boringssl-${BORINGSSL_SHA1}.tar.gz
-	mirror://gentoo/${MY_P}-e2fsprogs.tar.xz https://dev.gentoo.org/~zmedico/dist/${MY_P}-e2fsprogs.tar.xz
-	mirror://gentoo/${MY_P}-extras.tar.xz https://dev.gentoo.org/~zmedico/dist/${MY_P}-extras.tar.xz
-	mirror://gentoo/${MY_P}-selinux.tar.xz https://dev.gentoo.org/~zmedico/dist/${MY_P}-selinux.tar.xz
-	mirror://gentoo/${MY_P}-f2fs-tools.tar.xz https://dev.gentoo.org/~zmedico/dist/${MY_P}-f2fs-tools.tar.xz
-	mirror://gentoo/${MY_P}.ninja.xz https://dev.gentoo.org/~zmedico/dist/${MY_P}.ninja.xz"
-
-# 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 ~arm x86 ~x86-linux"
-IUSE="python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-DEPEND="sys-libs/zlib:=
-	dev-libs/libpcre2:=
-	virtual/libusb:1="
-RDEPEND="${DEPEND}
-	python? ( ${PYTHON_DEPS} )"
-DEPEND+="
-	dev-lang/go"
-
-S=${WORKDIR}
-CMAKE_USE_DIR="${S}/boringssl"
-
-unpack_into() {
-	local archive="$1"
-	local dir="$2"
-
-	mkdir -p "${dir}"
-	pushd "${dir}" >/dev/null || die
-	unpack "${archive}"
-	if [[ ${dir} != ./* ]] ; then
-		mv */* ./ || die
-	fi
-	popd >/dev/null
-}
-
-src_unpack() {
-	unpack_into "${MY_P}-arch.tar.xz" arch
-	unpack_into "${MY_P}-core.tar.gz" core
-	unpack_into "${MY_P}-e2fsprogs.tar.xz" ./e2fsprogs
-	unpack_into "${MY_P}-extras.tar.xz" extras
-	unpack_into "${MY_P}-f2fs-tools.tar.xz" ./f2fs-tools
-	unpack_into "${MY_P}-selinux.tar.xz" ./selinux
-	unpack_into boringssl-${BORINGSSL_SHA1}.tar.gz boringssl
-
-	unpack "${MY_P}.ninja.xz"
-	mv "${MY_P}.ninja" "build.ninja" || die
-
-	# Avoid depending on gtest just for its prod headers when boringssl bundles it.
-	ln -s ../../boringssl/third_party/googletest/include/gtest core/include/ || die
-}
-
-src_prepare() {
-	sed -e 's:elseif (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "i386"):\0\n  set(ARCH "x86")\nelseif (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "i586"):' \
-		-i "${S}"/boringssl/CMakeLists.txt || die #668792
-
-	cd "${S}"/core || die
-	eapply "${WORKDIR}"/arch/trunk/fix_build_core.patch
-	eapply "${FILESDIR}"/android-tools-8.1.0_p1-build.patch
-
-	cd "${S}"/selinux || die
-	eapply "${WORKDIR}"/arch/trunk/fix_build_selinux.patch
-
-	cd "${S}"/e2fsprogs || die
-	eapply "${WORKDIR}"/arch/trunk/fix_build_e2fsprogs.patch
-
-	cd "${S}"/extras
-	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 ext4_utils/include/ext4_utils/ext4_crypt{,_init_extensions}.h || die #580686
-
-	cd "${S}" || die
-	default
-
-	sed -E \
-		-e "s|^(CC =).*|\\1 $(tc-getCC)|g" \
-		-e "s|^(CXX =).*|\\1 $(tc-getCXX)|g" \
-		-e "s|^(CFLAGS =).*|\\1 ${CFLAGS}|g" \
-		-e "s|^(CPPFLAGS =).*|\\1 ${CPPFLAGS}|g" \
-		-e "s|^(CXXFLAGS =).*|\\1 ${CXXFLAGS}|g" \
-		-e "s|^(LDFLAGS =).*|\\1 ${LDFLAGS}|g" \
-		-e "s|^(PKGVER =).*|\\1 ${MY_PV}|g" \
-		-i build.ninja || die
-
-	# The pregenerated ninja file expects the build/ dir.
-	BUILD_DIR="${CMAKE_USE_DIR}/build"
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	append-lfs-flags
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	# We only need a few libs from boringssl.
-	cmake-utils_src_compile libcrypto.a libssl.a
-
-	eninja
-}
-
-src_install() {
-	dobin adb e2fsdroid ext2simg fastboot mke2fs.android
-	dodoc core/adb/*.{txt,TXT} core/fastboot/README.md
-	use python && python_foreach_impl python_doexe core/mkbootimg/mkbootimg
-	newbashcomp arch/trunk/bash_completion.fastboot fastboot
-}


^ permalink raw reply related	[flat|nested] 70+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-util/android-tools/
@ 2020-08-12 16:22 Zac Medico
  0 siblings, 0 replies; 70+ messages in thread
From: Zac Medico @ 2020-08-12 16:22 UTC (permalink / raw
  To: gentoo-commits

commit:     1fb7c74fc392fbc0fc211686da755d3cc0911f4a
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 12 16:22:07 2020 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Wed Aug 12 16:22:31 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1fb7c74f

dev-util/android-tools: PYTHON_COMPAT+=(python3_{8,9})

Closes: https://bugs.gentoo.org/725574
Package-Manager: Portage-3.0.2, Repoman-2.3.23
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

 dev-util/android-tools/android-tools-9.0.0_p3-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/android-tools/android-tools-9.0.0_p3-r1.ebuild b/dev-util/android-tools/android-tools-9.0.0_p3-r1.ebuild
index 6b20417c2d1..0a5d152abd2 100644
--- a/dev-util/android-tools/android-tools-9.0.0_p3-r1.ebuild
+++ b/dev-util/android-tools/android-tools-9.0.0_p3-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6..9} )
 CMAKE_MAKEFILE_GENERATOR="ninja"
 
 inherit flag-o-matic bash-completion-r1 ninja-utils toolchain-funcs cmake-utils python-r1


^ permalink raw reply related	[flat|nested] 70+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-util/android-tools/
@ 2020-07-25 19:56 Sam James
  0 siblings, 0 replies; 70+ messages in thread
From: Sam James @ 2020-07-25 19:56 UTC (permalink / raw
  To: gentoo-commits

commit:     77d6d3c25a16fee7a698fd18ef28a27944df32ac
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 25 19:53:35 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jul 25 19:53:51 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77d6d3c2

dev-util/android-tools: arm64 keyworded (bug #733892)

Package-Manager: Portage-3.0.0, Repoman-2.3.23
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-util/android-tools/android-tools-9.0.0_p3-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/android-tools/android-tools-9.0.0_p3-r1.ebuild b/dev-util/android-tools/android-tools-9.0.0_p3-r1.ebuild
index 47c2fc39aa4..6b20417c2d1 100644
--- a/dev-util/android-tools/android-tools-9.0.0_p3-r1.ebuild
+++ b/dev-util/android-tools/android-tools-9.0.0_p3-r1.ebuild
@@ -32,7 +32,7 @@ SRC_URI="https://git.archlinux.org/svntogit/community.git/snapshot/community-0ff
 # 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 ~arm x86 ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~x86-linux"
 IUSE="python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 


^ permalink raw reply related	[flat|nested] 70+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-util/android-tools/
@ 2020-07-19  0:27 Zac Medico
  0 siblings, 0 replies; 70+ messages in thread
From: Zac Medico @ 2020-07-19  0:27 UTC (permalink / raw
  To: gentoo-commits

commit:     4fe61107fdc40bd1a35726f42c5c3cb47608356e
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 19 00:24:21 2020 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sun Jul 19 00:27:15 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4fe61107

dev-util/android-tools: fix 8.1.0_p1 for colon in CFLAGS

Reported-by: Toralf Förster <toralf <AT> gentoo.org>
Closes: https://bugs.gentoo.org/733160
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

 dev-util/android-tools/android-tools-8.1.0_p1.ebuild | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

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 95483f44470..86a31b64479 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
@@ -100,13 +100,13 @@ src_configure() {
 	cmake-utils_src_configure
 
 	sed -i \
-		-e "s:@CC@:$(tc-getCC):g" \
-		-e "s:@CXX@:$(tc-getCXX):g" \
-		-e "s:@CFLAGS@:${CFLAGS}:g" \
-		-e "s:@CPPFLAGS@:${CPPFLAGS}:g" \
-		-e "s:@CXXFLAGS@:${CXXFLAGS}:g" \
-		-e "s:@LDFLAGS@:${LDFLAGS}:g" \
-		-e "s:@PV@:${PV}:g" \
+		-e "s|@CC@|$(tc-getCC)|g" \
+		-e "s|@CXX@|$(tc-getCXX)|g" \
+		-e "s|@CFLAGS@|${CFLAGS}|g" \
+		-e "s|@CPPFLAGS@|${CPPFLAGS}|g" \
+		-e "s|@CXXFLAGS@|${CXXFLAGS}|g" \
+		-e "s|@LDFLAGS@|${LDFLAGS}|g" \
+		-e "s|@PV@|${PV}|g" \
 		build.ninja || die
 }
 


^ permalink raw reply related	[flat|nested] 70+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-util/android-tools/
@ 2020-06-30  3:51 Zac Medico
  0 siblings, 0 replies; 70+ messages in thread
From: Zac Medico @ 2020-06-30  3:51 UTC (permalink / raw
  To: gentoo-commits

commit:     65aac3a0d26254abf858e82eab4329f0a4d4b402
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 30 03:41:36 2020 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Tue Jun 30 03:51:09 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65aac3a0

dev-util/android-tools: support -fno-common (bug 706946)

Add -fno-common patch by Peter Levine.

Closes: https://bugs.gentoo.org/706946
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

 dev-util/android-tools/Manifest                         | 1 +
 dev-util/android-tools/android-tools-9.0.0_p3-r1.ebuild | 8 ++++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/dev-util/android-tools/Manifest b/dev-util/android-tools/Manifest
index 1420ab0f3a9..2fe91c4dc74 100644
--- a/dev-util/android-tools/Manifest
+++ b/dev-util/android-tools/Manifest
@@ -14,6 +14,7 @@ DIST android-tools-8.1.0_r1-extras.tar.xz 275952 BLAKE2B 0fd3c536fee6ffbe2cdd432
 DIST android-tools-8.1.0_r1-f2fs-tools.tar.xz 93924 BLAKE2B b8b6c7ba4c3f5309bfcfc91bd57d018d7af66f8dd25590207fd545f0dba02961826bf9963a56c7994feea5db8f9caedfe4fe62870420d9544283f87ec337cfb8 SHA512 de726be0691c58a5093098bd30cfc06c4312c44bec040cbecd594694cb7b38742dafd1f00b08c18f1b70abf56571738eb3e85e612f082e09e51a98980444e069
 DIST android-tools-8.1.0_r1-selinux.tar.xz 3188060 BLAKE2B 8c513d858e8dcaed705975ad61f362d7b1c2252685a63a1ad6035f36b0b402f1857ac5d2635d35ffa10f05b4a2605f30f27dcc5e9d91930eb0656f3ce2da036d SHA512 8799f10b4dba840ecea8f6abb8166c2e137eb3f0d9c5cfb132c661cf17800f2eeaafb1b4ec9e8974fc3324fae99e3654e52397c987faf1d48ab6148152d84f11
 DIST android-tools-8.1.0_r1.ninja.xz 2740 BLAKE2B 34473e33970cefdaf82bbe4524665fd50e6617cf867757ca07cdccc2e7356f43ef4bb455080ef4bac516ddba3c4e4120f0b27306e84725f8d5738a81800e3a53 SHA512 707e0e1c53832a42384e93d363f80007b76f18166b9f3f7d516431410b05319b1acc804daa1fddc218e11feb48de48683efb5203f4fa6d80646dcb1a2953139f
+DIST android-tools-9.0.0_p3-bug-706946-fno-common.patch.xz 2696 BLAKE2B de8083846d6cb24d2fcb12789b302f5df766753989e004154746d4402a5777bbabff2e9c67758e9185c0ea56dde7e647a8a15dd696671c28f2f708703bcad9f0 SHA512 e65818e9d06295f7de8f8bc52270054f9936659b2bf07f7abc15f2ea7b138536396a24c39bb6a260a931250396b04022170f2045336f0ba6444cd90fb0dfdbb0
 DIST android-tools-9.0.0_p3-fix-build-with-glibc-2.30.patch 1262 BLAKE2B fa2d3cd31e82dd3b17bb840096c6158f1b117cb12b8b3c6f6c604efd85f880346c04e8e98b17bebd68d56e06cdc126677ad96dbd6214175544a9b93020292956 SHA512 21c2501fa24f59489e656ac5122c906476ad573e63f6dcc88605dafde9d4b8927ea904708caaababd12155153d969d2480aff591d98057859e8b885e94aa126a
 DIST android-tools-9.0.0_r3-arch.tar.xz 7628 BLAKE2B d0d7267d41ade2031d72236c18850ea329afbdd57a2b5bf25837e405d3e66d7aaef5b48996e7aafd4cf6e4543de03ba6549823845e5e8cb35c6d4bc900b8e275 SHA512 534d99fe15b3a3ba4f2a7331662fdb8645424830122cc4c1ff0b44d43059280610389147d4a916c55b3be71ac84d019223c90993cbdae2588f9e9737f0b5606d
 DIST android-tools-9.0.0_r3-core.tar.gz 27484684 BLAKE2B d071adacd5be0341a9114e57242fe51f623773683b9db2735eac9231a77cc22651f09e1c63682e729494aa6409939696a5635afcd5e8a40ec0f75d2784c00ffc SHA512 0edc8b02b57085ce88b39c987284af1c681870594b20ab9ecf4be98a0cfdff2905bc80f5d8eeb7fbc7f4604b800b6f95bc6b2b0321c900bf833313dfcbb2eefb

diff --git a/dev-util/android-tools/android-tools-9.0.0_p3-r1.ebuild b/dev-util/android-tools/android-tools-9.0.0_p3-r1.ebuild
index 67c0ac57ad6..47c2fc39aa4 100644
--- a/dev-util/android-tools/android-tools-9.0.0_p3-r1.ebuild
+++ b/dev-util/android-tools/android-tools-9.0.0_p3-r1.ebuild
@@ -26,7 +26,8 @@ SRC_URI="https://git.archlinux.org/svntogit/community.git/snapshot/community-0ff
 	mirror://gentoo/${MY_P}-selinux.tar.xz https://dev.gentoo.org/~zmedico/dist/${MY_P}-selinux.tar.xz
 	mirror://gentoo/${MY_P}-f2fs-tools.tar.xz https://dev.gentoo.org/~zmedico/dist/${MY_P}-f2fs-tools.tar.xz
 	mirror://gentoo/${MY_P}.ninja.xz https://dev.gentoo.org/~zmedico/dist/${MY_P}.ninja.xz
-	https://raw.githubusercontent.com/nmeum/android-tools/8a30dba5768304176fd78aaa131242f6b880f828/patches/core/0022-Use-glibc-s-gettid-when-using-glibc-2.30.patch -> ${GLIBC_GETTID_PATCH}"
+	https://raw.githubusercontent.com/nmeum/android-tools/8a30dba5768304176fd78aaa131242f6b880f828/patches/core/0022-Use-glibc-s-gettid-when-using-glibc-2.30.patch -> ${GLIBC_GETTID_PATCH}
+	https://dev.gentoo.org/~zmedico/dist/${P}-bug-706946-fno-common.patch.xz"
 
 # The entire source code is Apache-2.0, except for fastboot which is BSD-2.
 LICENSE="Apache-2.0 BSD-2"
@@ -71,6 +72,8 @@ src_unpack() {
 	unpack "${MY_P}.ninja.xz"
 	mv "${MY_P}.ninja" "build.ninja" || die
 
+	unpack "${P}-bug-706946-fno-common.patch.xz"
+
 	# Avoid depending on gtest just for its prod headers when boringssl bundles it.
 	ln -s ../../boringssl/third_party/googletest/include/gtest core/include/ || die
 }
@@ -97,7 +100,8 @@ src_prepare() {
 		-i ext4_utils/include/ext4_utils/ext4_crypt{,_init_extensions}.h || die #580686
 
 	cd "${S}" || die
-	default
+
+	eapply "${WORKDIR}/${P}-bug-706946-fno-common.patch"
 
 	sed -E \
 		-e "s|^(CC =).*|\\1 $(tc-getCC)|g" \


^ permalink raw reply related	[flat|nested] 70+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-util/android-tools/
@ 2020-05-28  6:21 Zac Medico
  0 siblings, 0 replies; 70+ messages in thread
From: Zac Medico @ 2020-05-28  6:21 UTC (permalink / raw
  To: gentoo-commits

commit:     b0e6ca5b5a6abc85d0e0415455cc1e7986a99586
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Thu May 28 06:13:10 2020 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Thu May 28 06:21:19 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0e6ca5b

dev-util/android-tools: remove -Werror (bug 706946)

Bug: https://bugs.gentoo.org/706946
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

 dev-util/android-tools/android-tools-9.0.0_p3-r1.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dev-util/android-tools/android-tools-9.0.0_p3-r1.ebuild b/dev-util/android-tools/android-tools-9.0.0_p3-r1.ebuild
index b00003af78a..67c0ac57ad6 100644
--- a/dev-util/android-tools/android-tools-9.0.0_p3-r1.ebuild
+++ b/dev-util/android-tools/android-tools-9.0.0_p3-r1.ebuild
@@ -109,6 +109,8 @@ src_prepare() {
 		-e "s|^(PKGVER =).*|\\1 ${MY_PV}|g" \
 		-i build.ninja || die
 
+	grep -rlZ -- -Werror . | xargs -0 sed -e 's:-Werror ::g' -e 's: -Werror::g' -i || die #706946
+
 	# The pregenerated ninja file expects the build/ dir.
 	BUILD_DIR="${CMAKE_USE_DIR}/build"
 	cmake-utils_src_prepare


^ permalink raw reply related	[flat|nested] 70+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-util/android-tools/
@ 2020-02-10 21:00 Michał Górny
  0 siblings, 0 replies; 70+ messages in thread
From: Michał Górny @ 2020-02-10 21:00 UTC (permalink / raw
  To: gentoo-commits

commit:     2ae07008069b0e7b18b4747db55607e233a2a60f
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 10 20:53:42 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Feb 10 21:00:05 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ae07008

dev-util/android-tools: Remove py2

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-util/android-tools/android-tools-8.1.0_p1.ebuild    | 2 +-
 dev-util/android-tools/android-tools-9.0.0_p3-r1.ebuild | 2 +-
 dev-util/android-tools/android-tools-9.0.0_p3.ebuild    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

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 f3ef5da339e..95483f44470 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
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 CMAKE_MAKEFILE_GENERATOR="ninja"
 
 inherit flag-o-matic bash-completion-r1 ninja-utils toolchain-funcs cmake-utils python-r1

diff --git a/dev-util/android-tools/android-tools-9.0.0_p3-r1.ebuild b/dev-util/android-tools/android-tools-9.0.0_p3-r1.ebuild
index f1d554c1c7d..b00003af78a 100644
--- a/dev-util/android-tools/android-tools-9.0.0_p3-r1.ebuild
+++ b/dev-util/android-tools/android-tools-9.0.0_p3-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 CMAKE_MAKEFILE_GENERATOR="ninja"
 
 inherit flag-o-matic bash-completion-r1 ninja-utils toolchain-funcs cmake-utils python-r1

diff --git a/dev-util/android-tools/android-tools-9.0.0_p3.ebuild b/dev-util/android-tools/android-tools-9.0.0_p3.ebuild
index d7c9ae9def7..36c89fee7e7 100644
--- a/dev-util/android-tools/android-tools-9.0.0_p3.ebuild
+++ b/dev-util/android-tools/android-tools-9.0.0_p3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 CMAKE_MAKEFILE_GENERATOR="ninja"
 
 inherit flag-o-matic bash-completion-r1 ninja-utils toolchain-funcs cmake-utils python-r1


^ permalink raw reply related	[flat|nested] 70+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-util/android-tools/
@ 2019-12-29  9:56 David Seifert
  0 siblings, 0 replies; 70+ messages in thread
From: David Seifert @ 2019-12-29  9:56 UTC (permalink / raw
  To: gentoo-commits

commit:     61f460c55a0c3d3dd0ff27b1965014d662a25b5e
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 29 09:55:18 2019 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Dec 29 09:55:18 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61f460c5

dev-util/android-tools: [QA] Remove explicit python-utils-r1 inherit

Package-Manager: Portage-2.3.83, Repoman-2.3.20
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 dev-util/android-tools/android-tools-8.1.0_p1.ebuild    | 2 +-
 dev-util/android-tools/android-tools-9.0.0_p3-r1.ebuild | 2 +-
 dev-util/android-tools/android-tools-9.0.0_p3.ebuild    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

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 db699e1b682..a37b43e4e75 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
@@ -6,7 +6,7 @@ EAPI="6"
 PYTHON_COMPAT=( python2_7 python3_{5,6} )
 CMAKE_MAKEFILE_GENERATOR="ninja"
 
-inherit flag-o-matic bash-completion-r1 ninja-utils toolchain-funcs cmake-utils python-r1 python-utils-r1
+inherit flag-o-matic bash-completion-r1 ninja-utils toolchain-funcs cmake-utils python-r1
 
 MY_PV="${PV/_p/_r}"
 MY_P=${PN}-${MY_PV}

diff --git a/dev-util/android-tools/android-tools-9.0.0_p3-r1.ebuild b/dev-util/android-tools/android-tools-9.0.0_p3-r1.ebuild
index 973b6de27c5..5682b04a979 100644
--- a/dev-util/android-tools/android-tools-9.0.0_p3-r1.ebuild
+++ b/dev-util/android-tools/android-tools-9.0.0_p3-r1.ebuild
@@ -6,7 +6,7 @@ EAPI="6"
 PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 CMAKE_MAKEFILE_GENERATOR="ninja"
 
-inherit flag-o-matic bash-completion-r1 ninja-utils toolchain-funcs cmake-utils python-r1 python-utils-r1
+inherit flag-o-matic bash-completion-r1 ninja-utils toolchain-funcs cmake-utils python-r1
 
 MY_PV="${PV/_p/_r}"
 MY_P=${PN}-${MY_PV}

diff --git a/dev-util/android-tools/android-tools-9.0.0_p3.ebuild b/dev-util/android-tools/android-tools-9.0.0_p3.ebuild
index ad1df383e85..1aec0b7c4c5 100644
--- a/dev-util/android-tools/android-tools-9.0.0_p3.ebuild
+++ b/dev-util/android-tools/android-tools-9.0.0_p3.ebuild
@@ -6,7 +6,7 @@ EAPI="6"
 PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 CMAKE_MAKEFILE_GENERATOR="ninja"
 
-inherit flag-o-matic bash-completion-r1 ninja-utils toolchain-funcs cmake-utils python-r1 python-utils-r1
+inherit flag-o-matic bash-completion-r1 ninja-utils toolchain-funcs cmake-utils python-r1
 
 MY_PV="${PV/_p/_r}"
 MY_P=${PN}-${MY_PV}


^ permalink raw reply related	[flat|nested] 70+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-util/android-tools/
@ 2019-12-09  4:03 Zac Medico
  0 siblings, 0 replies; 70+ messages in thread
From: Zac Medico @ 2019-12-09  4:03 UTC (permalink / raw
  To: gentoo-commits

commit:     ce40dac7505118d5fcff820d21e338b571ab79ed
Author:     Tobias M <tmmonckton <AT> gmail <DOT> com>
AuthorDate: Sun Nov 10 17:37:00 2019 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Mon Dec  9 04:03:32 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce40dac7

dev-util/android-tools: 9.0.0_p3-r1 revbump for bug 691764

This patch prevents collisions with the gettid() function in glibc-2.30.

Closes: https://bugs.gentoo.org/691764
Package-Manager: Portage-2.3.81, Repoman-2.3.20
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

 dev-util/android-tools/Manifest                    |   1 +
 .../android-tools/android-tools-9.0.0_p3-r1.ebuild | 135 +++++++++++++++++++++
 2 files changed, 136 insertions(+)

diff --git a/dev-util/android-tools/Manifest b/dev-util/android-tools/Manifest
index fb65eeeaa15..1420ab0f3a9 100644
--- a/dev-util/android-tools/Manifest
+++ b/dev-util/android-tools/Manifest
@@ -14,6 +14,7 @@ DIST android-tools-8.1.0_r1-extras.tar.xz 275952 BLAKE2B 0fd3c536fee6ffbe2cdd432
 DIST android-tools-8.1.0_r1-f2fs-tools.tar.xz 93924 BLAKE2B b8b6c7ba4c3f5309bfcfc91bd57d018d7af66f8dd25590207fd545f0dba02961826bf9963a56c7994feea5db8f9caedfe4fe62870420d9544283f87ec337cfb8 SHA512 de726be0691c58a5093098bd30cfc06c4312c44bec040cbecd594694cb7b38742dafd1f00b08c18f1b70abf56571738eb3e85e612f082e09e51a98980444e069
 DIST android-tools-8.1.0_r1-selinux.tar.xz 3188060 BLAKE2B 8c513d858e8dcaed705975ad61f362d7b1c2252685a63a1ad6035f36b0b402f1857ac5d2635d35ffa10f05b4a2605f30f27dcc5e9d91930eb0656f3ce2da036d SHA512 8799f10b4dba840ecea8f6abb8166c2e137eb3f0d9c5cfb132c661cf17800f2eeaafb1b4ec9e8974fc3324fae99e3654e52397c987faf1d48ab6148152d84f11
 DIST android-tools-8.1.0_r1.ninja.xz 2740 BLAKE2B 34473e33970cefdaf82bbe4524665fd50e6617cf867757ca07cdccc2e7356f43ef4bb455080ef4bac516ddba3c4e4120f0b27306e84725f8d5738a81800e3a53 SHA512 707e0e1c53832a42384e93d363f80007b76f18166b9f3f7d516431410b05319b1acc804daa1fddc218e11feb48de48683efb5203f4fa6d80646dcb1a2953139f
+DIST android-tools-9.0.0_p3-fix-build-with-glibc-2.30.patch 1262 BLAKE2B fa2d3cd31e82dd3b17bb840096c6158f1b117cb12b8b3c6f6c604efd85f880346c04e8e98b17bebd68d56e06cdc126677ad96dbd6214175544a9b93020292956 SHA512 21c2501fa24f59489e656ac5122c906476ad573e63f6dcc88605dafde9d4b8927ea904708caaababd12155153d969d2480aff591d98057859e8b885e94aa126a
 DIST android-tools-9.0.0_r3-arch.tar.xz 7628 BLAKE2B d0d7267d41ade2031d72236c18850ea329afbdd57a2b5bf25837e405d3e66d7aaef5b48996e7aafd4cf6e4543de03ba6549823845e5e8cb35c6d4bc900b8e275 SHA512 534d99fe15b3a3ba4f2a7331662fdb8645424830122cc4c1ff0b44d43059280610389147d4a916c55b3be71ac84d019223c90993cbdae2588f9e9737f0b5606d
 DIST android-tools-9.0.0_r3-core.tar.gz 27484684 BLAKE2B d071adacd5be0341a9114e57242fe51f623773683b9db2735eac9231a77cc22651f09e1c63682e729494aa6409939696a5635afcd5e8a40ec0f75d2784c00ffc SHA512 0edc8b02b57085ce88b39c987284af1c681870594b20ab9ecf4be98a0cfdff2905bc80f5d8eeb7fbc7f4604b800b6f95bc6b2b0321c900bf833313dfcbb2eefb
 DIST android-tools-9.0.0_r3-e2fsprogs.tar.xz 5255616 BLAKE2B 5fe62da70686148d755c60c1cef4b64d80f0c6a891d13a778d2a3209f950b0f9c5b19bf39ed28c5d38d01103ef1ea474133f57b7104a4fdf80eafd8edc17a3a5 SHA512 a9c3c180ddb96f10710a18794b20cfc641d40af3643a1133091127a40c27fa724b6e6f1af8e66fc1e1ca33053e33499b910880eab05979a2de95a0d3d7a79f93

diff --git a/dev-util/android-tools/android-tools-9.0.0_p3-r1.ebuild b/dev-util/android-tools/android-tools-9.0.0_p3-r1.ebuild
new file mode 100644
index 00000000000..973b6de27c5
--- /dev/null
+++ b/dev-util/android-tools/android-tools-9.0.0_p3-r1.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+CMAKE_MAKEFILE_GENERATOR="ninja"
+
+inherit flag-o-matic bash-completion-r1 ninja-utils toolchain-funcs cmake-utils python-r1 python-utils-r1
+
+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/"
+# See helper scripts in files/ for creating these tarballs and getting this hash.
+BORINGSSL_SHA1="45210dd4e21ace9d28cb76b3f83303fcdd2efcce"
+GLIBC_GETTID_PATCH="${P}-fix-build-with-glibc-2.30.patch"
+# The ninja file was created by running the ruby script from archlinux by hand and fixing the build vars.
+# No point in depending on something large/uncommon like ruby just to generate a ninja file.
+SRC_URI="https://git.archlinux.org/svntogit/community.git/snapshot/community-0ffb7b41d599741d100a6a00a4bb20e162cd3f90.tar.xz -> ${MY_P}-arch.tar.xz
+	https://github.com/android/platform_system_core/archive/android-${MY_PV}.tar.gz -> ${MY_P}-core.tar.gz
+	https://github.com/google/boringssl/archive/${BORINGSSL_SHA1}.tar.gz -> boringssl-${BORINGSSL_SHA1}.tar.gz
+	mirror://gentoo/${MY_P}-e2fsprogs.tar.xz https://dev.gentoo.org/~zmedico/dist/${MY_P}-e2fsprogs.tar.xz
+	mirror://gentoo/${MY_P}-extras.tar.xz https://dev.gentoo.org/~zmedico/dist/${MY_P}-extras.tar.xz
+	mirror://gentoo/${MY_P}-selinux.tar.xz https://dev.gentoo.org/~zmedico/dist/${MY_P}-selinux.tar.xz
+	mirror://gentoo/${MY_P}-f2fs-tools.tar.xz https://dev.gentoo.org/~zmedico/dist/${MY_P}-f2fs-tools.tar.xz
+	mirror://gentoo/${MY_P}.ninja.xz https://dev.gentoo.org/~zmedico/dist/${MY_P}.ninja.xz
+	https://raw.githubusercontent.com/nmeum/android-tools/8a30dba5768304176fd78aaa131242f6b880f828/patches/core/0022-Use-glibc-s-gettid-when-using-glibc-2.30.patch -> ${GLIBC_GETTID_PATCH}"
+
+# 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 ~arm x86 ~x86-linux"
+IUSE="python"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+DEPEND="sys-libs/zlib:=
+	dev-libs/libpcre2:=
+	virtual/libusb:1="
+RDEPEND="${DEPEND}
+	python? ( ${PYTHON_DEPS} )"
+DEPEND+="
+	dev-lang/go"
+
+S=${WORKDIR}
+CMAKE_USE_DIR="${S}/boringssl"
+
+unpack_into() {
+	local archive="$1"
+	local dir="$2"
+
+	mkdir -p "${dir}"
+	pushd "${dir}" >/dev/null || die
+	unpack "${archive}"
+	if [[ ${dir} != ./* ]] ; then
+		mv */* ./ || die
+	fi
+	popd >/dev/null
+}
+
+src_unpack() {
+	unpack_into "${MY_P}-arch.tar.xz" arch
+	unpack_into "${MY_P}-core.tar.gz" core
+	unpack_into "${MY_P}-e2fsprogs.tar.xz" ./e2fsprogs
+	unpack_into "${MY_P}-extras.tar.xz" extras
+	unpack_into "${MY_P}-f2fs-tools.tar.xz" ./f2fs-tools
+	unpack_into "${MY_P}-selinux.tar.xz" ./selinux
+	unpack_into boringssl-${BORINGSSL_SHA1}.tar.gz boringssl
+
+	unpack "${MY_P}.ninja.xz"
+	mv "${MY_P}.ninja" "build.ninja" || die
+
+	# Avoid depending on gtest just for its prod headers when boringssl bundles it.
+	ln -s ../../boringssl/third_party/googletest/include/gtest core/include/ || die
+}
+
+src_prepare() {
+	sed -e 's:elseif (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "i386"):\0\n  set(ARCH "x86")\nelseif (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "i586"):' \
+		-i "${S}"/boringssl/CMakeLists.txt || die #668792
+
+	cd "${S}"/core || die
+	eapply "${WORKDIR}"/arch/trunk/fix_build_core.patch
+	eapply "${FILESDIR}"/android-tools-8.1.0_p1-build.patch
+	eapply "${DISTDIR}/${GLIBC_GETTID_PATCH}"
+
+	cd "${S}"/selinux || die
+	eapply "${WORKDIR}"/arch/trunk/fix_build_selinux.patch
+
+	cd "${S}"/e2fsprogs || die
+	eapply "${WORKDIR}"/arch/trunk/fix_build_e2fsprogs.patch
+
+	cd "${S}"/extras
+	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 ext4_utils/include/ext4_utils/ext4_crypt{,_init_extensions}.h || die #580686
+
+	cd "${S}" || die
+	default
+
+	sed -E \
+		-e "s|^(CC =).*|\\1 $(tc-getCC)|g" \
+		-e "s|^(CXX =).*|\\1 $(tc-getCXX)|g" \
+		-e "s|^(CFLAGS =).*|\\1 ${CFLAGS}|g" \
+		-e "s|^(CPPFLAGS =).*|\\1 ${CPPFLAGS}|g" \
+		-e "s|^(CXXFLAGS =).*|\\1 ${CXXFLAGS}|g" \
+		-e "s|^(LDFLAGS =).*|\\1 ${LDFLAGS}|g" \
+		-e "s|^(PKGVER =).*|\\1 ${MY_PV}|g" \
+		-i build.ninja || die
+
+	# The pregenerated ninja file expects the build/ dir.
+	BUILD_DIR="${CMAKE_USE_DIR}/build"
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	append-lfs-flags
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	# We only need a few libs from boringssl.
+	cmake-utils_src_compile libcrypto.a libssl.a
+
+	eninja
+}
+
+src_install() {
+	dobin adb e2fsdroid ext2simg fastboot mke2fs.android
+	dodoc core/adb/*.{txt,TXT} core/fastboot/README.md
+	use python && python_foreach_impl python_doexe core/mkbootimg/mkbootimg
+	newbashcomp arch/trunk/bash_completion.fastboot fastboot
+}


^ permalink raw reply related	[flat|nested] 70+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-util/android-tools/
@ 2019-08-12 20:16 Michał Górny
  0 siblings, 0 replies; 70+ messages in thread
From: Michał Górny @ 2019-08-12 20:16 UTC (permalink / raw
  To: gentoo-commits

commit:     7c53124afcb548880e9a24d3b20ebeb367e6d4ce
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 12 20:13:25 2019 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Aug 12 20:16:05 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c53124a

dev-util/android-tools: Add missing PYTHON_REQUIRED_USE

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-util/android-tools/android-tools-8.1.0_p1.ebuild | 1 +
 dev-util/android-tools/android-tools-9.0.0_p3.ebuild | 1 +
 2 files changed, 2 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 9e63f95cdd3..db699e1b682 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
@@ -30,6 +30,7 @@ LICENSE="Apache-2.0 BSD-2"
 SLOT="0"
 KEYWORDS="amd64 ~arm x86 ~x86-linux"
 IUSE="python"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 DEPEND="sys-libs/zlib:=
 	dev-libs/libpcre2:=

diff --git a/dev-util/android-tools/android-tools-9.0.0_p3.ebuild b/dev-util/android-tools/android-tools-9.0.0_p3.ebuild
index 7ba1bd76235..ad1df383e85 100644
--- a/dev-util/android-tools/android-tools-9.0.0_p3.ebuild
+++ b/dev-util/android-tools/android-tools-9.0.0_p3.ebuild
@@ -31,6 +31,7 @@ LICENSE="Apache-2.0 BSD-2"
 SLOT="0"
 KEYWORDS="amd64 ~arm x86 ~x86-linux"
 IUSE="python"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 DEPEND="sys-libs/zlib:=
 	dev-libs/libpcre2:=


^ permalink raw reply related	[flat|nested] 70+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-util/android-tools/
@ 2019-04-02  9:16 Mikle Kolyada
  0 siblings, 0 replies; 70+ messages in thread
From: Mikle Kolyada @ 2019-04-02  9:16 UTC (permalink / raw
  To: gentoo-commits

commit:     a7171c5b214414fc4f2718d1935e0146a92d80d2
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Tue Apr  2 09:16:00 2019 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Tue Apr  2 09:16:00 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7171c5b

dev-util/android-tools: amd64 stable wrt bug #681606

Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
RepoMan-Options: --include-arches="amd64"

 dev-util/android-tools/android-tools-9.0.0_p3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/android-tools/android-tools-9.0.0_p3.ebuild b/dev-util/android-tools/android-tools-9.0.0_p3.ebuild
index 81d61c1df5e..6a157340caa 100644
--- a/dev-util/android-tools/android-tools-9.0.0_p3.ebuild
+++ b/dev-util/android-tools/android-tools-9.0.0_p3.ebuild
@@ -29,7 +29,7 @@ SRC_URI="https://git.archlinux.org/svntogit/community.git/snapshot/community-0ff
 # 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 ~arm x86 ~x86-linux"
+KEYWORDS="amd64 ~arm x86 ~x86-linux"
 IUSE="python"
 
 DEPEND="sys-libs/zlib:=


^ permalink raw reply related	[flat|nested] 70+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-util/android-tools/
@ 2018-12-31  9:11 Zac Medico
  0 siblings, 0 replies; 70+ messages in thread
From: Zac Medico @ 2018-12-31  9:11 UTC (permalink / raw
  To: gentoo-commits

commit:     e0d7fc6a25fcbe8dfc7853e3e878bd42148422dc
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 31 09:08:27 2018 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Mon Dec 31 09:08:42 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0d7fc6a

dev-util/android-tools: fix 9.9.0_p3 CC bug 674162

Reported-by: Toralf Förster <toralf <AT> gentoo.org>
Closes: https://bugs.gentoo.org/674162
Package-Manager: Portage-2.3.53, Repoman-2.3.12
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

 dev-util/android-tools/android-tools-9.0.0_p3.ebuild | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/dev-util/android-tools/android-tools-9.0.0_p3.ebuild b/dev-util/android-tools/android-tools-9.0.0_p3.ebuild
index 6399a1eb13c..5a8c4c5ac0c 100644
--- a/dev-util/android-tools/android-tools-9.0.0_p3.ebuild
+++ b/dev-util/android-tools/android-tools-9.0.0_p3.ebuild
@@ -95,6 +95,16 @@ src_prepare() {
 	cd "${S}" || die
 	default
 
+	sed -E \
+		-e "s|^(CC =).*|\\1 $(tc-getCC)|g" \
+		-e "s|^(CXX =).*|\\1 $(tc-getCXX)|g" \
+		-e "s|^(CFLAGS =).*|\\1 ${CFLAGS}|g" \
+		-e "s|^(CPPFLAGS =).*|\\1 ${CPPFLAGS}|g" \
+		-e "s|^(CXXFLAGS =).*|\\1 ${CXXFLAGS}|g" \
+		-e "s|^(LDFLAGS =).*|\\1 ${LDFLAGS}|g" \
+		-e "s|^(PKGVER =).*|\\1 ${MY_PV}|g" \
+		-i build.ninja || die
+
 	# The pregenerated ninja file expects the build/ dir.
 	BUILD_DIR="${CMAKE_USE_DIR}/build"
 	cmake-utils_src_prepare
@@ -104,16 +114,6 @@ src_configure() {
 	append-lfs-flags
 
 	cmake-utils_src_configure
-
-	sed -i \
-		-e "s:@CC@:$(tc-getCC):g" \
-		-e "s:@CXX@:$(tc-getCXX):g" \
-		-e "s:@CFLAGS@:${CFLAGS}:g" \
-		-e "s:@CPPFLAGS@:${CPPFLAGS}:g" \
-		-e "s:@CXXFLAGS@:${CXXFLAGS}:g" \
-		-e "s:@LDFLAGS@:${LDFLAGS}:g" \
-		-e "s:@PV@:${PV}:g" \
-		build.ninja || die
 }
 
 src_compile() {


^ permalink raw reply related	[flat|nested] 70+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-util/android-tools/
@ 2018-12-31  5:10 Zac Medico
  0 siblings, 0 replies; 70+ messages in thread
From: Zac Medico @ 2018-12-31  5:10 UTC (permalink / raw
  To: gentoo-commits

commit:     97efbbf30d14f2b2206c7382c01dc5eac6c3dccc
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 31 05:05:49 2018 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Mon Dec 31 05:10:42 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97efbbf3

dev-util/android-tools: version bump to 9.0.0_p3

Closes: https://bugs.gentoo.org/674146
Closes: https://bugs.gentoo.org/668792
Package-Manager: Portage-2.3.53, Repoman-2.3.12
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

 dev-util/android-tools/Manifest                    |   8 ++
 .../android-tools/android-tools-9.0.0_p3.ebuild    | 131 +++++++++++++++++++++
 2 files changed, 139 insertions(+)

diff --git a/dev-util/android-tools/Manifest b/dev-util/android-tools/Manifest
index 15a69b3f57d..fb65eeeaa15 100644
--- a/dev-util/android-tools/Manifest
+++ b/dev-util/android-tools/Manifest
@@ -14,4 +14,12 @@ DIST android-tools-8.1.0_r1-extras.tar.xz 275952 BLAKE2B 0fd3c536fee6ffbe2cdd432
 DIST android-tools-8.1.0_r1-f2fs-tools.tar.xz 93924 BLAKE2B b8b6c7ba4c3f5309bfcfc91bd57d018d7af66f8dd25590207fd545f0dba02961826bf9963a56c7994feea5db8f9caedfe4fe62870420d9544283f87ec337cfb8 SHA512 de726be0691c58a5093098bd30cfc06c4312c44bec040cbecd594694cb7b38742dafd1f00b08c18f1b70abf56571738eb3e85e612f082e09e51a98980444e069
 DIST android-tools-8.1.0_r1-selinux.tar.xz 3188060 BLAKE2B 8c513d858e8dcaed705975ad61f362d7b1c2252685a63a1ad6035f36b0b402f1857ac5d2635d35ffa10f05b4a2605f30f27dcc5e9d91930eb0656f3ce2da036d SHA512 8799f10b4dba840ecea8f6abb8166c2e137eb3f0d9c5cfb132c661cf17800f2eeaafb1b4ec9e8974fc3324fae99e3654e52397c987faf1d48ab6148152d84f11
 DIST android-tools-8.1.0_r1.ninja.xz 2740 BLAKE2B 34473e33970cefdaf82bbe4524665fd50e6617cf867757ca07cdccc2e7356f43ef4bb455080ef4bac516ddba3c4e4120f0b27306e84725f8d5738a81800e3a53 SHA512 707e0e1c53832a42384e93d363f80007b76f18166b9f3f7d516431410b05319b1acc804daa1fddc218e11feb48de48683efb5203f4fa6d80646dcb1a2953139f
+DIST android-tools-9.0.0_r3-arch.tar.xz 7628 BLAKE2B d0d7267d41ade2031d72236c18850ea329afbdd57a2b5bf25837e405d3e66d7aaef5b48996e7aafd4cf6e4543de03ba6549823845e5e8cb35c6d4bc900b8e275 SHA512 534d99fe15b3a3ba4f2a7331662fdb8645424830122cc4c1ff0b44d43059280610389147d4a916c55b3be71ac84d019223c90993cbdae2588f9e9737f0b5606d
+DIST android-tools-9.0.0_r3-core.tar.gz 27484684 BLAKE2B d071adacd5be0341a9114e57242fe51f623773683b9db2735eac9231a77cc22651f09e1c63682e729494aa6409939696a5635afcd5e8a40ec0f75d2784c00ffc SHA512 0edc8b02b57085ce88b39c987284af1c681870594b20ab9ecf4be98a0cfdff2905bc80f5d8eeb7fbc7f4604b800b6f95bc6b2b0321c900bf833313dfcbb2eefb
+DIST android-tools-9.0.0_r3-e2fsprogs.tar.xz 5255616 BLAKE2B 5fe62da70686148d755c60c1cef4b64d80f0c6a891d13a778d2a3209f950b0f9c5b19bf39ed28c5d38d01103ef1ea474133f57b7104a4fdf80eafd8edc17a3a5 SHA512 a9c3c180ddb96f10710a18794b20cfc641d40af3643a1133091127a40c27fa724b6e6f1af8e66fc1e1ca33053e33499b910880eab05979a2de95a0d3d7a79f93
+DIST android-tools-9.0.0_r3-extras.tar.xz 1653548 BLAKE2B 1a8c2ee2e564adc04d646ab54e1913d17e9ed0fb0ef3872bd8a459ecad5fbf7324830c1120c367d9515607ecc659fb0f27c4f7db740fda318fd13be1300a6a51 SHA512 13dc145faf919c1f7cc183f823ca46330568daff19ffb110af383876cdb6b0e9f0a83690a4e22633b572c1e6c2aba14ef0181c01720095173d258320229e9108
+DIST android-tools-9.0.0_r3-f2fs-tools.tar.xz 212092 BLAKE2B 32775e5b049bd2ff2ce7c9ea3362a602dcda6328e39036902020bd372a812898d84912f686cf347b225af630c2dea81ce30b601ac968b1168e2851b94ac2da2e SHA512 4fac8f18533c5c2270aed6e60b21721c643a44a27b37482ff8fd8fa4d7c875eb8a626d544ec4e6efb89c7408ae97e66ffd123588e90b98312e5291575ca8baa6
+DIST android-tools-9.0.0_r3-selinux.tar.xz 3202332 BLAKE2B 60a884eb1bd34fe5796f8fb33e5aefd7f9ffc85ac91784e0a8f0ca663010cf2222c80f4c419019b5817f9cbd8037ab78914e42417193e1b802a2682bb82c0097 SHA512 f0a77dc0ac91d434573370110c70529caabfd5f036c02ae5f1a4b2097e48324198d03ecdc92a622e1590012dd3f20f103384fed468f5e27aebcaf9315bb87078
+DIST android-tools-9.0.0_r3.ninja.xz 4244 BLAKE2B 14cea7523f22a7f4e02e93c32e4d4684e057abbe8e2b537b7e942cc27c13ea2aa13bcdb5c3ccafc261b8d7fc4b4cd4b9394e0970734b36111ccffbacecc5cfb9 SHA512 46956a608d6a9b93f1a035d6b0e153c476b55d4f8a2db4915b18ac9904a6d07befcbceb8e2e50054e7dbe2970be8539243134cd9722d2f2ec8a36a3153e03c56
 DIST boringssl-14308731e5446a73ac2258688a9688b524483cb6.tar.gz 13030361 BLAKE2B 6982416b6e193e7faccd41fff3bd35f80b11d7495251d876e6b081bd94a887ec3c6bf5b7852d9595594fc2bdc57353f268272ef01fb79f7c93b52d46cbda69ac SHA512 171b524b0452a48853b2c8010ff5e14d5d720e69eeaf1d3b79f675838f3afa94aee9de2f47b37303feb2d92cbf77639efe585786625b7b37b8cc2ba727c37fdc
+DIST boringssl-45210dd4e21ace9d28cb76b3f83303fcdd2efcce.tar.gz 13581532 BLAKE2B ca2f6757807adc265314a7444605c6199a19847fb426384bafa201bf63f4e3c7c567fb8094b740b8a00caf0d106bb1efea2893b00d45c9772740a81dc0a186f3 SHA512 c6695d078ee7b3694898dfdc0ee3382d01f9bb592ea46eb64026c73565735fd7251bbb0fd3e8c8552394bcdad5717de7ee5106cf1ed91aacec05d779ad693f6a

diff --git a/dev-util/android-tools/android-tools-9.0.0_p3.ebuild b/dev-util/android-tools/android-tools-9.0.0_p3.ebuild
new file mode 100644
index 00000000000..6399a1eb13c
--- /dev/null
+++ b/dev-util/android-tools/android-tools-9.0.0_p3.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
+CMAKE_MAKEFILE_GENERATOR="ninja"
+
+inherit flag-o-matic bash-completion-r1 ninja-utils toolchain-funcs cmake-utils python-r1 python-utils-r1
+
+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/"
+# See helper scripts in files/ for creating these tarballs and getting this hash.
+BORINGSSL_SHA1="45210dd4e21ace9d28cb76b3f83303fcdd2efcce"
+# The ninja file was created by running the ruby script from archlinux by hand and fixing the build vars.
+# No point in depending on something large/uncommon like ruby just to generate a ninja file.
+SRC_URI="https://git.archlinux.org/svntogit/community.git/snapshot/community-0ffb7b41d599741d100a6a00a4bb20e162cd3f90.tar.xz -> ${MY_P}-arch.tar.xz
+	https://github.com/android/platform_system_core/archive/android-${MY_PV}.tar.gz -> ${MY_P}-core.tar.gz
+	https://github.com/google/boringssl/archive/${BORINGSSL_SHA1}.tar.gz -> boringssl-${BORINGSSL_SHA1}.tar.gz
+	mirror://gentoo/${MY_P}-e2fsprogs.tar.xz https://dev.gentoo.org/~zmedico/dist/${MY_P}-e2fsprogs.tar.xz
+	mirror://gentoo/${MY_P}-extras.tar.xz https://dev.gentoo.org/~zmedico/dist/${MY_P}-extras.tar.xz
+	mirror://gentoo/${MY_P}-selinux.tar.xz https://dev.gentoo.org/~zmedico/dist/${MY_P}-selinux.tar.xz
+	mirror://gentoo/${MY_P}-f2fs-tools.tar.xz https://dev.gentoo.org/~zmedico/dist/${MY_P}-f2fs-tools.tar.xz
+	mirror://gentoo/${MY_P}.ninja.xz https://dev.gentoo.org/~zmedico/dist/${MY_P}.ninja.xz"
+
+# 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 ~arm ~x86 ~x86-linux"
+IUSE="python"
+
+DEPEND="sys-libs/zlib:=
+	dev-libs/libpcre2:=
+	virtual/libusb:1="
+RDEPEND="${DEPEND}
+	python? ( ${PYTHON_DEPS} )"
+DEPEND+="
+	dev-lang/go"
+
+S=${WORKDIR}
+CMAKE_USE_DIR="${S}/boringssl"
+
+unpack_into() {
+	local archive="$1"
+	local dir="$2"
+
+	mkdir -p "${dir}"
+	pushd "${dir}" >/dev/null || die
+	unpack "${archive}"
+	if [[ ${dir} != ./* ]] ; then
+		mv */* ./ || die
+	fi
+	popd >/dev/null
+}
+
+src_unpack() {
+	unpack_into "${MY_P}-arch.tar.xz" arch
+	unpack_into "${MY_P}-core.tar.gz" core
+	unpack_into "${MY_P}-e2fsprogs.tar.xz" ./e2fsprogs
+	unpack_into "${MY_P}-extras.tar.xz" extras
+	unpack_into "${MY_P}-f2fs-tools.tar.xz" ./f2fs-tools
+	unpack_into "${MY_P}-selinux.tar.xz" ./selinux
+	unpack_into boringssl-${BORINGSSL_SHA1}.tar.gz boringssl
+
+	unpack "${MY_P}.ninja.xz"
+	mv "${MY_P}.ninja" "build.ninja" || die
+
+	# Avoid depending on gtest just for its prod headers when boringssl bundles it.
+	ln -s ../../boringssl/third_party/googletest/include/gtest core/include/ || die
+}
+
+src_prepare() {
+	sed -e 's:elseif (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "i386"):\0\n  set(ARCH "x86")\nelseif (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "i586"):' \
+		-i "${S}"/boringssl/CMakeLists.txt || die #668792
+
+	cd "${S}"/core || die
+	eapply "${WORKDIR}"/arch/trunk/fix_build_core.patch
+	eapply "${FILESDIR}"/android-tools-8.1.0_p1-build.patch
+
+	cd "${S}"/selinux || die
+	eapply "${WORKDIR}"/arch/trunk/fix_build_selinux.patch
+
+	cd "${S}"/e2fsprogs || die
+	eapply "${WORKDIR}"/arch/trunk/fix_build_e2fsprogs.patch
+
+	cd "${S}"/extras
+	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 ext4_utils/include/ext4_utils/ext4_crypt{,_init_extensions}.h || die #580686
+
+	cd "${S}" || die
+	default
+
+	# The pregenerated ninja file expects the build/ dir.
+	BUILD_DIR="${CMAKE_USE_DIR}/build"
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	append-lfs-flags
+
+	cmake-utils_src_configure
+
+	sed -i \
+		-e "s:@CC@:$(tc-getCC):g" \
+		-e "s:@CXX@:$(tc-getCXX):g" \
+		-e "s:@CFLAGS@:${CFLAGS}:g" \
+		-e "s:@CPPFLAGS@:${CPPFLAGS}:g" \
+		-e "s:@CXXFLAGS@:${CXXFLAGS}:g" \
+		-e "s:@LDFLAGS@:${LDFLAGS}:g" \
+		-e "s:@PV@:${PV}:g" \
+		build.ninja || die
+}
+
+src_compile() {
+	# We only need a few libs from boringssl.
+	cmake-utils_src_compile libcrypto.a libssl.a
+
+	eninja
+}
+
+src_install() {
+	dobin adb e2fsdroid ext2simg fastboot mke2fs.android
+	dodoc core/adb/*.{txt,TXT} core/fastboot/README.md
+	use python && python_foreach_impl python_doexe core/mkbootimg/mkbootimg
+	newbashcomp arch/trunk/bash_completion.fastboot fastboot
+}


^ permalink raw reply related	[flat|nested] 70+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-util/android-tools/
@ 2018-09-28  7:44 Mikle Kolyada
  0 siblings, 0 replies; 70+ messages in thread
From: Mikle Kolyada @ 2018-09-28  7:44 UTC (permalink / raw
  To: gentoo-commits

commit:     64d34887f39be689ccd5cb75f8d86f0f930d3844
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 28 07:44:45 2018 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Fri Sep 28 07:44:45 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64d34887

dev-util/android-tools: amd64 stable wrt bug #666846

Package-Manager: Portage-2.3.49, Repoman-2.3.10

 dev-util/android-tools/android-tools-8.1.0_p1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 8a9ca42d09b..e895b2f9e30 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
@@ -28,7 +28,7 @@ SRC_URI="https://git.archlinux.org/svntogit/community.git/snapshot/community-2b7
 # 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 ~arm x86 ~x86-linux"
+KEYWORDS="amd64 ~arm x86 ~x86-linux"
 IUSE="python"
 
 DEPEND="sys-libs/zlib:=


^ permalink raw reply related	[flat|nested] 70+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-util/android-tools/
@ 2017-11-13 19:50 Manuel Rüger
  0 siblings, 0 replies; 70+ messages in thread
From: Manuel Rüger @ 2017-11-13 19:50 UTC (permalink / raw
  To: gentoo-commits

commit:     bfef129e38de288a9cf1241a0b236c2e670d69d7
Author:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 13 19:01:52 2017 +0000
Commit:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
CommitDate: Mon Nov 13 19:50:08 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bfef129e

dev-util/android-tools: Stable on amd64

Package-Manager: Portage-2.3.13, Repoman-2.3.4

 dev-util/android-tools/android-tools-6.0.1_p79.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
index 5e7dddfe2e6..3da6d296e88 100644
--- a/dev-util/android-tools/android-tools-6.0.1_p79.ebuild
+++ b/dev-util/android-tools/android-tools-6.0.1_p79.ebuild
@@ -20,7 +20,7 @@ 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"
+KEYWORDS="amd64 x86 ~arm-linux ~x86-linux"
 IUSE="libressl"
 
 RDEPEND="sys-libs/zlib:=


^ permalink raw reply related	[flat|nested] 70+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-util/android-tools/
@ 2017-10-27 12:54 Thomas Deutschmann
  0 siblings, 0 replies; 70+ messages in thread
From: Thomas Deutschmann @ 2017-10-27 12:54 UTC (permalink / raw
  To: gentoo-commits

commit:     f4d977bdc552f3d950b08b3b916581d2026f851e
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 27 11:58:53 2017 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Fri Oct 27 12:54:00 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4d977bd

dev-util/android-tools: x86 stable (bug #630344)

Package-Manager: Portage-2.3.11, Repoman-2.3.3

 dev-util/android-tools/android-tools-6.0.1_p79.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
index c08ea80eb0d..5e7dddfe2e6 100644
--- a/dev-util/android-tools/android-tools-6.0.1_p79.ebuild
+++ b/dev-util/android-tools/android-tools-6.0.1_p79.ebuild
@@ -20,7 +20,7 @@ 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"
+KEYWORDS="~amd64 x86 ~arm-linux ~x86-linux"
 IUSE="libressl"
 
 RDEPEND="sys-libs/zlib:=


^ permalink raw reply related	[flat|nested] 70+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-util/android-tools/
@ 2017-09-19 19:37 Zac Medico
  0 siblings, 0 replies; 70+ messages in thread
From: Zac Medico @ 2017-09-19 19:37 UTC (permalink / raw
  To: gentoo-commits

commit:     107da21cdbb7f32f52206dd9f46a9eb0b2553588
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 19 19:31:42 2017 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Tue Sep 19 19:37:31 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=107da21c

dev-util/android-tools: detect rubygems interpreter for bug 631398

Fixes: https://bugs.gentoo.org/631398
Package-Manager: Portage-2.3.8, Repoman-2.3.3

 dev-util/android-tools/android-tools-6.0.1_p79.ebuild | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

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
index 954e418c562..c08ea80eb0d 100644
--- a/dev-util/android-tools/android-tools-6.0.1_p79.ebuild
+++ b/dev-util/android-tools/android-tools-6.0.1_p79.ebuild
@@ -29,7 +29,7 @@ RDEPEND="sys-libs/zlib:=
 	dev-libs/libpcre"
 # dev-lang/ruby is necessary for build script generation.
 DEPEND="${RDEPEND}
-	dev-lang/ruby:*"
+	virtual/rubygems"
 
 S=${WORKDIR}
 
@@ -61,8 +61,16 @@ src_prepare() {
 }
 
 src_compile() {
-	chmod +x ./generate_build.rb || die
-	./generate_build.rb > build.sh || die
+	# Dynamically detect rubygems interpreter (bug 631398).
+	local ruby_bin=$(type -P ruby) ruby_error_log=${T}/generate_build.rb.log success=
+	for ruby_bin in "${ruby_bin}" "${ruby_bin}"[[:digit:]][[:digit:]]; do
+		"${ruby_bin}" ./generate_build.rb 1> build.sh 2> "${ruby_error_log}" && \
+			{ success=1; break; }
+	done
+	if [[ -z ${success} ]]; then
+		cat "${ruby_error_log}" >&2
+		die "${ruby_bin} ./generate_build.rb failed"
+	fi
 	sed -e 's:^gcc:${CC}:' -e 's:^g++:${CXX}:' -i build.sh || die
 	chmod +x build.sh || die
 	tc-export CC CXX


^ permalink raw reply related	[flat|nested] 70+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-util/android-tools/
@ 2017-04-26 21:05 Zac Medico
  0 siblings, 0 replies; 70+ messages in thread
From: Zac Medico @ 2017-04-26 21:05 UTC (permalink / raw
  To: gentoo-commits

commit:     54925c65de7b497408327f6eae03c3a35f7b82f3
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 26 21:04:12 2017 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Wed Apr 26 21:05:31 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54925c65

dev-util/android-tools: respect CC and CXX variables

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 dev-util/android-tools/android-tools-6.0.1_p79.ebuild | 2 ++
 1 file changed, 2 insertions(+)

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
index bfab989f55e..954e418c562 100644
--- a/dev-util/android-tools/android-tools-6.0.1_p79.ebuild
+++ b/dev-util/android-tools/android-tools-6.0.1_p79.ebuild
@@ -63,7 +63,9 @@ src_prepare() {
 src_compile() {
 	chmod +x ./generate_build.rb || die
 	./generate_build.rb > build.sh || die
+	sed -e 's:^gcc:${CC}:' -e 's:^g++:${CXX}:' -i build.sh || die
 	chmod +x build.sh || die
+	tc-export CC CXX
 	bash -e ./build.sh || die
 }
 


^ permalink raw reply related	[flat|nested] 70+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-util/android-tools/
@ 2017-04-26 20:02 Zac Medico
  0 siblings, 0 replies; 70+ messages in thread
From: Zac Medico @ 2017-04-26 20:02 UTC (permalink / raw
  To: gentoo-commits

commit:     74d23e41f76e6655be74b1902b3a3022906ee1d2
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 26 20:01:48 2017 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Wed Apr 26 20:02:47 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74d23e41

dev-util/android-tools: fix call to build.sh without shebang (bug 616598)

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 dev-util/android-tools/android-tools-6.0.1_p79.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
index 8947945cab6..bfab989f55e 100644
--- a/dev-util/android-tools/android-tools-6.0.1_p79.ebuild
+++ b/dev-util/android-tools/android-tools-6.0.1_p79.ebuild
@@ -64,7 +64,7 @@ src_compile() {
 	chmod +x ./generate_build.rb || die
 	./generate_build.rb > build.sh || die
 	chmod +x build.sh || die
-	./build.sh || die
+	bash -e ./build.sh || die
 }
 
 src_install() {


^ permalink raw reply related	[flat|nested] 70+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-util/android-tools/
@ 2017-04-24 21:06 Zac Medico
  0 siblings, 0 replies; 70+ messages in thread
From: Zac Medico @ 2017-04-24 21:06 UTC (permalink / raw
  To: gentoo-commits

commit:     85ed4f680c625c5510e894841bdb54fcf2c5ceeb
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 24 21:06:00 2017 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Mon Apr 24 21:06:32 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85ed4f68

dev-util/android-tools: include sysmacros for bug 616508

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 dev-util/android-tools/android-tools-6.0.1_p79.ebuild | 1 +
 1 file changed, 1 insertion(+)

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
index f5e1750c542..8947945cab6 100644
--- a/dev-util/android-tools/android-tools-6.0.1_p79.ebuild
+++ b/dev-util/android-tools/android-tools-6.0.1_p79.ebuild
@@ -52,6 +52,7 @@ src_prepare() {
 	mv core/*/* core/ || die
 	epatch arch/*/trunk/fix_build.patch
 	cp arch/*/trunk/generate_build.rb ./ || die
+	sed -i '1i#include <sys/sysmacros.h>' core/adb/usb_linux.cpp || die #616508
 	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|' \


^ permalink raw reply related	[flat|nested] 70+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-util/android-tools/
@ 2017-04-24  2:00 Zac Medico
  0 siblings, 0 replies; 70+ messages in thread
From: Zac Medico @ 2017-04-24  2:00 UTC (permalink / raw
  To: gentoo-commits

commit:     289418fab1a93a03a18851cfed83f0c77e80ad72
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 24 01:59:45 2017 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Mon Apr 24 01:59:45 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=289418fa

dev-util/android-tools: re-apply fix for bug 580686

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 dev-util/android-tools/android-tools-6.0.1_p79.ebuild | 4 ++++
 1 file changed, 4 insertions(+)

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
index 61a84f5ea64..f5e1750c542 100644
--- a/dev-util/android-tools/android-tools-6.0.1_p79.ebuild
+++ b/dev-util/android-tools/android-tools-6.0.1_p79.ebuild
@@ -52,6 +52,10 @@ src_prepare() {
 	mv core/*/* core/ || die
 	epatch arch/*/trunk/fix_build.patch
 	cp arch/*/trunk/generate_build.rb ./ || die
+	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 extras/ext4_utils/sha1.{c,h} || die #580686
 	default
 }
 


^ permalink raw reply related	[flat|nested] 70+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-util/android-tools/
@ 2017-04-24  1:28 Zac Medico
  0 siblings, 0 replies; 70+ messages in thread
From: Zac Medico @ 2017-04-24  1:28 UTC (permalink / raw
  To: gentoo-commits

commit:     a15118e530db51aa438f0c605eba297c5adda83b
Author:     cryptogopher <github <AT> michalczyk <DOT> pro>
AuthorDate: Sun Apr 23 15:52:22 2017 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Mon Apr 24 01:22:26 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a15118e5

dev-util/android-tools: version bump 6.0.1_p79

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 dev-util/android-tools/Manifest                    |  5 ++
 .../android-tools/android-tools-6.0.1_p79.ebuild   | 72 ++++++++++++++++++++++
 2 files changed, 77 insertions(+)

diff --git a/dev-util/android-tools/Manifest b/dev-util/android-tools/Manifest
index a0210d8aeda..12f70f3fcab 100644
--- a/dev-util/android-tools/Manifest
+++ b/dev-util/android-tools/Manifest
@@ -3,3 +3,8 @@ DIST android-tools-5.1.1_r13-core.tar.gz 1210720 SHA256 f62ad7eb61650bc69cafd081
 DIST android-tools-5.1.1_r13-extras.tar.gz 282690 SHA256 35440226e2dd41e91b96f4791fd389d38e98aedd596c09bdb80b9d27bb8fdf82 SHA512 322d45be02d3d5a5bf677e3a38a44085258ee7b9a8c0a7bc08ddb4104168170d5969699ee54e19009a2bd0d7e0ac6ad7971ccc67e2a0311c6f1ba7fb76cfce83 WHIRLPOOL 3b8e0cc2d00a88f9e00a6de8a88fbe6c5374e82929859045602fbd96d5f4cf5e06f257b27b0a8ba1aebde981c6d4fe090c1a75fe737ca514d93f78cb51964752
 DIST android-tools-5.1.1_r13-f2fs-tools.tar.gz 65931 SHA256 46aed56344b6661e1e638994ce57a7010c391356396b28cb207fc77f082c60cd SHA512 66f4be04164df8bb5138105db4e9d5b79c09cd8c28a0d30a6d1e6dead77961614172c96fa680953bf445b934f14b4dbbc21ce89a909d9f278f2eca1ca2e1e656 WHIRLPOOL 5aa59b453c6fa31bb76a5568553ab25376d72a35cb96b97a1e7d956b2901f8467f4c7d56b73046c559fc3714e73acace31649f0929899f4e043ccb998de12fdc
 DIST android-tools-5.1.1_r13-libselinux.tar.gz 49085 SHA256 0950aaa63e22c3d4399142f9795adaee9c0a866b7f037f6b7306642d46327bc2 SHA512 b1a8960b98206118a07f11e7e67429c0d4b8f89c4f65919bcd02a6ba1c7f30e5b73a9431ce8d10fc6ffa6e487b79061b84a969490bf22a49188dc5cd9dd46a2f WHIRLPOOL da4d532bf033aa8bd1f423b596b95e6768b963d65c6fb23f856a07c636882b9584354fd147b04f1393219cc2a45281e440ed6a4f8f5472bd5a39119f81ce9209
+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

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 00000000000..61a84f5ea64
--- /dev/null
+++ b/dev-util/android-tools/android-tools-6.0.1_p79.ebuild
@@ -0,0 +1,72 @@
+# 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:*"
+
+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
+}
+
+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
+}


^ permalink raw reply related	[flat|nested] 70+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-util/android-tools/
@ 2016-07-03  9:45 Zac Medico
  0 siblings, 0 replies; 70+ messages in thread
From: Zac Medico @ 2016-07-03  9:45 UTC (permalink / raw
  To: gentoo-commits

commit:     adf3ef79910e02ae17d510d21c00224daad708ca
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sun Jul  3 09:44:45 2016 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sun Jul  3 09:45:53 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=adf3ef79

dev-util/android-tools: add ${EPREFIX} to emake DESTDIR

Package-Manager: portage-2.3.0

 dev-util/android-tools/android-tools-5.1.1_p13.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/android-tools/android-tools-5.1.1_p13.ebuild b/dev-util/android-tools/android-tools-5.1.1_p13.ebuild
index 9708ad4..bfb9485 100644
--- a/dev-util/android-tools/android-tools-5.1.1_p13.ebuild
+++ b/dev-util/android-tools/android-tools-5.1.1_p13.ebuild
@@ -61,6 +61,6 @@ src_prepare() {
 }
 
 src_install() {
-	default
+	emake DESTDIR="${ED}" install
 	newbashcomp arch/*/trunk/bash_completion fastboot
 }


^ permalink raw reply related	[flat|nested] 70+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-util/android-tools/
@ 2016-06-26 19:30 Zac Medico
  0 siblings, 0 replies; 70+ messages in thread
From: Zac Medico @ 2016-06-26 19:30 UTC (permalink / raw
  To: gentoo-commits

commit:     f0e60ce4e36a0f5706ba584a3ac5d1df3df63b4b
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 26 19:28:15 2016 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sun Jun 26 19:30:12 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0e60ce4

dev-util/android-tools: remove old version 0_p20130218

Package-Manager: portage-2.3.0

 dev-util/android-tools/Manifest                    |  3 --
 .../android-tools/android-tools-0_p20130218.ebuild | 56 ----------------------
 2 files changed, 59 deletions(-)

diff --git a/dev-util/android-tools/Manifest b/dev-util/android-tools/Manifest
index 23b4a71..a0210d8 100644
--- a/dev-util/android-tools/Manifest
+++ b/dev-util/android-tools/Manifest
@@ -3,6 +3,3 @@ DIST android-tools-5.1.1_r13-core.tar.gz 1210720 SHA256 f62ad7eb61650bc69cafd081
 DIST android-tools-5.1.1_r13-extras.tar.gz 282690 SHA256 35440226e2dd41e91b96f4791fd389d38e98aedd596c09bdb80b9d27bb8fdf82 SHA512 322d45be02d3d5a5bf677e3a38a44085258ee7b9a8c0a7bc08ddb4104168170d5969699ee54e19009a2bd0d7e0ac6ad7971ccc67e2a0311c6f1ba7fb76cfce83 WHIRLPOOL 3b8e0cc2d00a88f9e00a6de8a88fbe6c5374e82929859045602fbd96d5f4cf5e06f257b27b0a8ba1aebde981c6d4fe090c1a75fe737ca514d93f78cb51964752
 DIST android-tools-5.1.1_r13-f2fs-tools.tar.gz 65931 SHA256 46aed56344b6661e1e638994ce57a7010c391356396b28cb207fc77f082c60cd SHA512 66f4be04164df8bb5138105db4e9d5b79c09cd8c28a0d30a6d1e6dead77961614172c96fa680953bf445b934f14b4dbbc21ce89a909d9f278f2eca1ca2e1e656 WHIRLPOOL 5aa59b453c6fa31bb76a5568553ab25376d72a35cb96b97a1e7d956b2901f8467f4c7d56b73046c559fc3714e73acace31649f0929899f4e043ccb998de12fdc
 DIST android-tools-5.1.1_r13-libselinux.tar.gz 49085 SHA256 0950aaa63e22c3d4399142f9795adaee9c0a866b7f037f6b7306642d46327bc2 SHA512 b1a8960b98206118a07f11e7e67429c0d4b8f89c4f65919bcd02a6ba1c7f30e5b73a9431ce8d10fc6ffa6e487b79061b84a969490bf22a49188dc5cd9dd46a2f WHIRLPOOL da4d532bf033aa8bd1f423b596b95e6768b963d65c6fb23f856a07c636882b9584354fd147b04f1393219cc2a45281e440ed6a4f8f5472bd5a39119f81ce9209
-DIST android-tools-e89e09dd2b9b42184973e3ade291186a2737bced.patch 1115 SHA256 3bac2ec91d6d53cc7a2bd31f0670ff2e560b15d8722d3961e7b24b2f41cf5932 SHA512 2239e883269dc2cbd9f25dde9159cff8de8525b021ea9e2a243d4553e60c28398cb8e830117cc20e7cfe1b951f2841430e9bc950916d30b0f6c9e6dbd154f6b9 WHIRLPOOL 1bdbb65ebbf94e8c732f4893f090f895d24173928f6cc48b53160595449efc0457130ab67e6be132f77763110fd08e7aeba6701effa27de6fe3c0bdc0d82a8d1
-DIST android-tools_4.2.2+git20130218-3ubuntu36.debian.tar.gz 152459 SHA256 1bb63a418dc785277173ce971711a86f66d35d4ca7053cd1ff4afff8001cc7a6 SHA512 8e03fa08433f0cc358855d116926e50f0e6346c29ab3d1a865eb5b0e3be00091d861bd3ac2f3bc236a9028b35bf40988ab8130f566c3aca8c4ccbd7066a317f9 WHIRLPOOL 50c152c32a6d7f505a86faf24d2645053362073608990228eaa88f25e86c54b2a4dcab51f8d52941af493ac68628cf75c2abd320ec7c80a7aa89431277578e6c
-DIST android-tools_4.2.2+git20130218.orig.tar.xz 215868 SHA256 9bfba987e1351b12aa983787b9ae4424ab752e9e646d8e93771538dc1e5d932f SHA512 c5bfd3c8e514809db257ba5559c865742768b7520b38aa2f53185aff5c328e5cf7fb328a6ff6450eeddd5056985f232d492eba63a87978440e2147e26d62f458 WHIRLPOOL 0ad784e8524adf1d23958336b73f22fe504074b85c93f17e023a10e57f4e413d8b803c619a0dd7ff495ff8910681d3023932d7a87a008f3e44bacbe6c1fd70a4

diff --git a/dev-util/android-tools/android-tools-0_p20130218.ebuild b/dev-util/android-tools/android-tools-0_p20130218.ebuild
deleted file mode 100644
index 91c0f05..0000000
--- a/dev-util/android-tools/android-tools-0_p20130218.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils toolchain-funcs
-
-MY_VERSION="${PV##*_p}"
-GIT_SHA1="e89e09dd2b9b42184973e3ade291186a2737bced"
-
-DESCRIPTION="Android platform tools (adb and fastboot)"
-HOMEPAGE="https://android.googlesource.com/platform/system/core.git/"
-SRC_URI="https://launchpad.net/ubuntu/+archive/primary/+files/android-tools_4.2.2+git${MY_VERSION}.orig.tar.xz
-	https://launchpad.net/ubuntu/+archive/primary/+files/android-tools_4.2.2+git${MY_VERSION}-3ubuntu36.debian.tar.gz
-	https://github.com/android/platform_system_core/commit/${GIT_SHA1}.patch -> ${PN}-${GIT_SHA1}.patch"
-
-# The entire source code is Apache-2.0, except for fastboot which is BSD.
-LICENSE="Apache-2.0 BSD"
-SLOT="0"
-KEYWORDS="amd64 x86 ~arm-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="sys-libs/zlib:=
-	dev-libs/openssl:0="
-
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${PN}
-
-src_prepare() {
-	pushd core >/dev/null || die
-	epatch "${DISTDIR}"/${PN}-${GIT_SHA1}.patch #500480
-	popd >/dev/null
-	epatch ../debian/patches/*.patch
-	mv ../debian/makefiles/adb.mk core/adb/Makefile || die
-	mv ../debian/makefiles/fastboot.mk core/fastboot/Makefile || die
-
-	# Avoid libselinux dependency.
-	sed -e 's: -lselinux::' -i core/fastboot/Makefile || die
-	sed -e '/#include <selinux\/selinux.h>/d' \
-		-e 's:#include <selinux/label.h>:struct selabel_handle;:' \
-		-i extras/ext4_utils/make_ext4fs.h || die
-	sed -e '62,63d;180,189d;231,234d;272,274d;564,579d' \
-		-i extras/ext4_utils/make_ext4fs.c || die
-
-	tc-export CC
-}
-
-src_compile() {
-	emake -C core/adb adb
-	emake -C core/fastboot fastboot
-}
-
-src_install() {
-	dobin core/adb/adb core/fastboot/fastboot
-}


^ permalink raw reply related	[flat|nested] 70+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-util/android-tools/
@ 2016-06-10 13:53 Agostino Sarubbo
  0 siblings, 0 replies; 70+ messages in thread
From: Agostino Sarubbo @ 2016-06-10 13:53 UTC (permalink / raw
  To: gentoo-commits

commit:     b43543f915662d8bea0b96fe0eab12a1634cddfd
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 10 13:53:02 2016 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Fri Jun 10 13:53:02 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b43543f9

dev-util/android-tools: amd64 stable wrt bug #585356

Package-Manager: portage-2.2.28
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 dev-util/android-tools/android-tools-5.1.1_p13.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/android-tools/android-tools-5.1.1_p13.ebuild b/dev-util/android-tools/android-tools-5.1.1_p13.ebuild
index 4111441..74a5e88 100644
--- a/dev-util/android-tools/android-tools-5.1.1_p13.ebuild
+++ b/dev-util/android-tools/android-tools-5.1.1_p13.ebuild
@@ -21,7 +21,7 @@ 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"
+KEYWORDS="amd64 ~x86 ~arm-linux ~x86-linux"
 IUSE="libressl"
 
 RDEPEND="sys-libs/zlib:=


^ permalink raw reply related	[flat|nested] 70+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-util/android-tools/
@ 2016-05-16  0:07 Zac Medico
  0 siblings, 0 replies; 70+ messages in thread
From: Zac Medico @ 2016-05-16  0:07 UTC (permalink / raw
  To: gentoo-commits

commit:     11389cfde3266d32dc425e66c46a934c24647c8c
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Mon May 16 00:05:57 2016 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Mon May 16 00:07:01 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11389cfd

dev-util/android-tools: fix cdefs.h usage for musl bug 580686

Package-Manager: portage-2.2.28

 dev-util/android-tools/android-tools-5.1.1_p13.ebuild | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/dev-util/android-tools/android-tools-5.1.1_p13.ebuild b/dev-util/android-tools/android-tools-5.1.1_p13.ebuild
index 5b4a2fc..4111441 100644
--- a/dev-util/android-tools/android-tools-5.1.1_p13.ebuild
+++ b/dev-util/android-tools/android-tools-5.1.1_p13.ebuild
@@ -53,6 +53,10 @@ src_prepare() {
 		-i extras/f2fs_utils/f2fs_utils.c  || die
 	mv arch/*/trunk/Makefile ./ || die
 	sed -i '1i#include <sys/sysmacros.h>' core/adb/usb_linux.c || die #580058
+	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 extras/ext4_utils/sha1.{c,h} || die #580686
 	tc-export CC
 }
 


^ permalink raw reply related	[flat|nested] 70+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-util/android-tools/
@ 2016-04-19  6:37 Mike Frysinger
  0 siblings, 0 replies; 70+ messages in thread
From: Mike Frysinger @ 2016-04-19  6:37 UTC (permalink / raw
  To: gentoo-commits

commit:     c9dbeec72b23c6ac8d14f90467785344765c5d2a
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 19 06:37:21 2016 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Tue Apr 19 06:37:21 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9dbeec7

dev-util/android-tools: fix building w/newer glibc #580058

 dev-util/android-tools/android-tools-5.1.1_p13.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev-util/android-tools/android-tools-5.1.1_p13.ebuild b/dev-util/android-tools/android-tools-5.1.1_p13.ebuild
index be74cda..5b4a2fc 100644
--- a/dev-util/android-tools/android-tools-5.1.1_p13.ebuild
+++ b/dev-util/android-tools/android-tools-5.1.1_p13.ebuild
@@ -52,6 +52,7 @@ src_prepare() {
 	sed -e 's|#include <dlfcn.h>|\0\n#include <stddef.h>\n#include <string.h>\n|' \
 		-i extras/f2fs_utils/f2fs_utils.c  || die
 	mv arch/*/trunk/Makefile ./ || die
+	sed -i '1i#include <sys/sysmacros.h>' core/adb/usb_linux.c || die #580058
 	tc-export CC
 }
 


^ permalink raw reply related	[flat|nested] 70+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-util/android-tools/
@ 2016-03-31  7:00 Zac Medico
  0 siblings, 0 replies; 70+ messages in thread
From: Zac Medico @ 2016-03-31  7:00 UTC (permalink / raw
  To: gentoo-commits

commit:     9e9333a877abf3ec002ab6b33dab4f4a81ae20fb
Author:     Boris Staletic <boris.staletic <AT> gmail <DOT> com>
AuthorDate: Thu Mar 31 06:55:50 2016 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Thu Mar 31 07:00:37 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e9333a8

dev-util/android-tools: add libresslsupport, bug 578150

Package-Manager: portage-2.2.28

 dev-util/android-tools/android-tools-5.1.1_p13.ebuild | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/dev-util/android-tools/android-tools-5.1.1_p13.ebuild b/dev-util/android-tools/android-tools-5.1.1_p13.ebuild
index c124266..be74cda 100644
--- a/dev-util/android-tools/android-tools-5.1.1_p13.ebuild
+++ b/dev-util/android-tools/android-tools-5.1.1_p13.ebuild
@@ -22,10 +22,11 @@ mirror://gentoo/${MY_P}-f2fs-tools.tar.gz"
 LICENSE="Apache-2.0 BSD-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~arm-linux ~x86-linux"
-IUSE=""
+IUSE="libressl"
 
 RDEPEND="sys-libs/zlib:=
-	dev-libs/openssl:0=
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
 	dev-libs/libpcre"
 DEPEND="${RDEPEND}"
 


^ permalink raw reply related	[flat|nested] 70+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-util/android-tools/
@ 2016-02-04 18:47 Mike Frysinger
  0 siblings, 0 replies; 70+ messages in thread
From: Mike Frysinger @ 2016-02-04 18:47 UTC (permalink / raw
  To: gentoo-commits

commit:     92198a7f1ba7c1df8f4e05f88646ed2c06e35198
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Thu Feb  4 18:46:30 2016 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Thu Feb  4 18:46:54 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92198a7f

dev-util/android-tools: depend on libpcre

The fastboot code uses pcre, so make sure we pull it in.

URL: http://crbug.com/583612

 dev-util/android-tools/android-tools-5.1.1_p13.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev-util/android-tools/android-tools-5.1.1_p13.ebuild b/dev-util/android-tools/android-tools-5.1.1_p13.ebuild
index 8558b9e..c124266 100644
--- a/dev-util/android-tools/android-tools-5.1.1_p13.ebuild
+++ b/dev-util/android-tools/android-tools-5.1.1_p13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -25,8 +25,8 @@ KEYWORDS="~amd64 ~x86 ~arm-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="sys-libs/zlib:=
-	dev-libs/openssl:0="
-
+	dev-libs/openssl:0=
+	dev-libs/libpcre"
 DEPEND="${RDEPEND}"
 
 S=${WORKDIR}


^ permalink raw reply related	[flat|nested] 70+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-util/android-tools/
@ 2015-09-15 22:03 Zac Medico
  0 siblings, 0 replies; 70+ messages in thread
From: Zac Medico @ 2015-09-15 22:03 UTC (permalink / raw
  To: gentoo-commits

commit:     9d1608e76e8a535d9c389c20db73337e00603d25
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 15 21:58:30 2015 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Tue Sep 15 22:03:16 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d1608e7

dev-util/android-tools: fix 5.1.1_p13 bash-completion adb file collision

Package-Manager: portage-2.2.20.1

 dev-util/android-tools/android-tools-5.1.1_p13.ebuild | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/dev-util/android-tools/android-tools-5.1.1_p13.ebuild b/dev-util/android-tools/android-tools-5.1.1_p13.ebuild
index 8c0d4ea..8558b9e 100644
--- a/dev-util/android-tools/android-tools-5.1.1_p13.ebuild
+++ b/dev-util/android-tools/android-tools-5.1.1_p13.ebuild
@@ -56,6 +56,5 @@ src_prepare() {
 
 src_install() {
 	default
-	newbashcomp arch/*/trunk/bash_completion adb
-	bashcomp_alias adb fastboot
+	newbashcomp arch/*/trunk/bash_completion fastboot
 }


^ permalink raw reply related	[flat|nested] 70+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-util/android-tools/
@ 2015-09-15 21:45 Zac Medico
  0 siblings, 0 replies; 70+ messages in thread
From: Zac Medico @ 2015-09-15 21:45 UTC (permalink / raw
  To: gentoo-commits

commit:     a93daa3e70d77f43db98d5daa8337405a749dca2
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 15 21:37:33 2015 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Tue Sep 15 21:44:55 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a93daa3e

dev-util/android-tools: version bump to 5.1.1_p13, fixes bug 552198

Package-Manager: portage-2.2.20.1

 dev-util/android-tools/Manifest                    |  5 ++
 .../android-tools/android-tools-5.1.1_p13.ebuild   | 61 ++++++++++++++++++++++
 2 files changed, 66 insertions(+)

diff --git a/dev-util/android-tools/Manifest b/dev-util/android-tools/Manifest
index 7a1e58d..23b4a71 100644
--- a/dev-util/android-tools/Manifest
+++ b/dev-util/android-tools/Manifest
@@ -1,3 +1,8 @@
+DIST android-tools-5.1.1_r13-arch.tar.gz 4078 SHA256 3d341733bf2de1d7f0127e59b1578514b7874924ae6c2e3afbaab42c21137d4e SHA512 e38e0d1c966b569defc6df185c0e2b35b3766a7f89bcc3f60cea9b536f37b5b6b76f40457735b509d806c4c5b24f6b3805b51b85ffeb4d04fc14a731f81414c3 WHIRLPOOL 82c62b2567e0d26a686329d0c654b1d3a074f9cb1f73c4b3c0d2d99fbcc4a7b3c1cf158a23b3b8f46d8332dc90fa1990094511c466a457b4ee1ae582ec063f14
+DIST android-tools-5.1.1_r13-core.tar.gz 1210720 SHA256 f62ad7eb61650bc69cafd0810194732a3ba5f42c7443c2dd6f45ae285a3668dd SHA512 2ce2f03193840bd894cb4638bd23a321e53c6185e9816729193714b9e2d068f5ca4ebcee4edc7febaa4ea1ee3621aa6977217a5a84d2f116f35b000969a4af15 WHIRLPOOL 61a5c3c50aa0821fd3dcb8848209a1049e6956196e697e41fb2da80ca2ba7e91bdbc1ad6cac15ec072c006661755412f058cde6f36782a58de1a6e3c50812870
+DIST android-tools-5.1.1_r13-extras.tar.gz 282690 SHA256 35440226e2dd41e91b96f4791fd389d38e98aedd596c09bdb80b9d27bb8fdf82 SHA512 322d45be02d3d5a5bf677e3a38a44085258ee7b9a8c0a7bc08ddb4104168170d5969699ee54e19009a2bd0d7e0ac6ad7971ccc67e2a0311c6f1ba7fb76cfce83 WHIRLPOOL 3b8e0cc2d00a88f9e00a6de8a88fbe6c5374e82929859045602fbd96d5f4cf5e06f257b27b0a8ba1aebde981c6d4fe090c1a75fe737ca514d93f78cb51964752
+DIST android-tools-5.1.1_r13-f2fs-tools.tar.gz 65931 SHA256 46aed56344b6661e1e638994ce57a7010c391356396b28cb207fc77f082c60cd SHA512 66f4be04164df8bb5138105db4e9d5b79c09cd8c28a0d30a6d1e6dead77961614172c96fa680953bf445b934f14b4dbbc21ce89a909d9f278f2eca1ca2e1e656 WHIRLPOOL 5aa59b453c6fa31bb76a5568553ab25376d72a35cb96b97a1e7d956b2901f8467f4c7d56b73046c559fc3714e73acace31649f0929899f4e043ccb998de12fdc
+DIST android-tools-5.1.1_r13-libselinux.tar.gz 49085 SHA256 0950aaa63e22c3d4399142f9795adaee9c0a866b7f037f6b7306642d46327bc2 SHA512 b1a8960b98206118a07f11e7e67429c0d4b8f89c4f65919bcd02a6ba1c7f30e5b73a9431ce8d10fc6ffa6e487b79061b84a969490bf22a49188dc5cd9dd46a2f WHIRLPOOL da4d532bf033aa8bd1f423b596b95e6768b963d65c6fb23f856a07c636882b9584354fd147b04f1393219cc2a45281e440ed6a4f8f5472bd5a39119f81ce9209
 DIST android-tools-e89e09dd2b9b42184973e3ade291186a2737bced.patch 1115 SHA256 3bac2ec91d6d53cc7a2bd31f0670ff2e560b15d8722d3961e7b24b2f41cf5932 SHA512 2239e883269dc2cbd9f25dde9159cff8de8525b021ea9e2a243d4553e60c28398cb8e830117cc20e7cfe1b951f2841430e9bc950916d30b0f6c9e6dbd154f6b9 WHIRLPOOL 1bdbb65ebbf94e8c732f4893f090f895d24173928f6cc48b53160595449efc0457130ab67e6be132f77763110fd08e7aeba6701effa27de6fe3c0bdc0d82a8d1
 DIST android-tools_4.2.2+git20130218-3ubuntu36.debian.tar.gz 152459 SHA256 1bb63a418dc785277173ce971711a86f66d35d4ca7053cd1ff4afff8001cc7a6 SHA512 8e03fa08433f0cc358855d116926e50f0e6346c29ab3d1a865eb5b0e3be00091d861bd3ac2f3bc236a9028b35bf40988ab8130f566c3aca8c4ccbd7066a317f9 WHIRLPOOL 50c152c32a6d7f505a86faf24d2645053362073608990228eaa88f25e86c54b2a4dcab51f8d52941af493ac68628cf75c2abd320ec7c80a7aa89431277578e6c
 DIST android-tools_4.2.2+git20130218.orig.tar.xz 215868 SHA256 9bfba987e1351b12aa983787b9ae4424ab752e9e646d8e93771538dc1e5d932f SHA512 c5bfd3c8e514809db257ba5559c865742768b7520b38aa2f53185aff5c328e5cf7fb328a6ff6450eeddd5056985f232d492eba63a87978440e2147e26d62f458 WHIRLPOOL 0ad784e8524adf1d23958336b73f22fe504074b85c93f17e023a10e57f4e413d8b803c619a0dd7ff495ff8910681d3023932d7a87a008f3e44bacbe6c1fd70a4

diff --git a/dev-util/android-tools/android-tools-5.1.1_p13.ebuild b/dev-util/android-tools/android-tools-5.1.1_p13.ebuild
new file mode 100644
index 0000000..8c0d4ea
--- /dev/null
+++ b/dev-util/android-tools/android-tools-5.1.1_p13.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+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/"
+# For stable digests, git tarballs generated by android.googlesource.com
+# are fetched from mirror://gentoo/.
+SRC_URI="https://projects.archlinux.org/svntogit/community.git/snapshot/community-caa300cf262afcf5bdb4dcc923dee54e3715fd5c.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=""
+
+RDEPEND="sys-libs/zlib:=
+	dev-libs/openssl:0="
+
+DEPEND="${RDEPEND}"
+
+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
+	sed -e 's|#include <dlfcn.h>|\0\n#include <stddef.h>\n#include <string.h>\n|' \
+		-i extras/f2fs_utils/f2fs_utils.c  || die
+	mv arch/*/trunk/Makefile ./ || die
+	tc-export CC
+}
+
+src_install() {
+	default
+	newbashcomp arch/*/trunk/bash_completion adb
+	bashcomp_alias adb fastboot
+}


^ permalink raw reply related	[flat|nested] 70+ messages in thread

end of thread, other threads:[~2024-09-05  5:36 UTC | newest]

Thread overview: 70+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-11-22 11:16 [gentoo-commits] repo/gentoo:master commit in: dev-util/android-tools/ Arthur Zamarin
  -- strict thread matches above, loose matches on Subject: below --
2024-09-05  5:36 Zac Medico
2024-08-25  7:21 Zac Medico
2024-08-10 19:38 Zac Medico
2024-06-17  1:47 Sam James
2024-05-13 12:32 Arthur Zamarin
2024-05-11 15:16 Arthur Zamarin
2024-05-11 15:16 Arthur Zamarin
2024-03-25  0:23 Zac Medico
2024-03-25  0:23 Zac Medico
2024-03-02 20:09 Andreas K. Hüttel
2024-01-17  5:50 Sam James
2023-11-22 11:16 Arthur Zamarin
2023-08-22 21:27 Sam James
2023-08-22 21:25 Sam James
2023-04-19 11:07 Sam James
2023-04-19  6:49 Arthur Zamarin
2023-03-12 23:49 Zac Medico
2022-11-05 23:14 Zac Medico
2022-10-28  0:21 Zac Medico
2022-10-27  7:57 Joonas Niilola
2022-10-27  7:57 Joonas Niilola
2022-10-26 11:02 Sam James
2022-10-03  4:35 Zac Medico
2022-09-23 18:11 Zac Medico
2022-09-18  0:19 Sam James
2022-09-18  0:19 Sam James
2022-08-12 16:38 Zac Medico
2022-03-15 22:26 Mike Frysinger
2022-01-06 16:38 Zac Medico
2021-12-13 22:54 Sam James
2021-12-13 22:54 Sam James
2021-11-01  4:05 Zac Medico
2021-11-01  3:13 Zac Medico
2021-10-25  1:01 Zac Medico
2021-07-16  5:54 Zac Medico
2021-01-05 15:47 Andreas K. Hüttel
2021-01-01  0:59 Michał Górny
2020-10-13 17:05 Zac Medico
2020-10-13 17:05 Zac Medico
2020-08-12 16:22 Zac Medico
2020-07-25 19:56 Sam James
2020-07-19  0:27 Zac Medico
2020-06-30  3:51 Zac Medico
2020-05-28  6:21 Zac Medico
2020-02-10 21:00 Michał Górny
2019-12-29  9:56 David Seifert
2019-12-09  4:03 Zac Medico
2019-08-12 20:16 Michał Górny
2019-04-02  9:16 Mikle Kolyada
2018-12-31  9:11 Zac Medico
2018-12-31  5:10 Zac Medico
2018-09-28  7:44 Mikle Kolyada
2017-11-13 19:50 Manuel Rüger
2017-10-27 12:54 Thomas Deutschmann
2017-09-19 19:37 Zac Medico
2017-04-26 21:05 Zac Medico
2017-04-26 20:02 Zac Medico
2017-04-24 21:06 Zac Medico
2017-04-24  2:00 Zac Medico
2017-04-24  1:28 Zac Medico
2016-07-03  9:45 Zac Medico
2016-06-26 19:30 Zac Medico
2016-06-10 13:53 Agostino Sarubbo
2016-05-16  0:07 Zac Medico
2016-04-19  6:37 Mike Frysinger
2016-03-31  7:00 Zac Medico
2016-02-04 18:47 Mike Frysinger
2015-09-15 22:03 Zac Medico
2015-09-15 21:45 Zac Medico

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox