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

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

From: "Zac Medico" <zmedico@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/android-tools/files/, dev-util/android-tools/
Date: Sat, 10 Aug 2024 19:38:27 +0000 (UTC)	[thread overview]
Message-ID: <1723318488.e987962a39893738df90b693c49508a18cd13cea.zmedico@gentoo> (raw)

commit:     e987962a39893738df90b693c49508a18cd13cea
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 10 19:34:38 2024 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sat Aug 10 19:34:48 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e987962a

dev-util/android-tools: drop 34.0.0, 34.0.1

Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

 dev-util/android-tools/Manifest                    |  2 -
 dev-util/android-tools/android-tools-34.0.0.ebuild | 94 --------------------
 dev-util/android-tools/android-tools-34.0.1.ebuild | 99 ----------------------
 .../files/android-tools-34.0.0-protobuf.patch      | 41 ---------
 .../android-tools-34.0.1-include-algorithm.patch   | 45 ----------
 5 files changed, 281 deletions(-)

diff --git a/dev-util/android-tools/Manifest b/dev-util/android-tools/Manifest
index d4dcccbb0515..7e060f5bdad4 100644
--- a/dev-util/android-tools/Manifest
+++ b/dev-util/android-tools/Manifest
@@ -1,6 +1,4 @@
 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
-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-34.0.0.ebuild b/dev-util/android-tools/android-tools-34.0.0.ebuild
deleted file mode 100644
index d8ca6ca82456..000000000000
--- a/dev-util/android-tools/android-tools-34.0.0.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# 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
-}

diff --git a/dev-util/android-tools/android-tools-34.0.1.ebuild b/dev-util/android-tools/android-tools-34.0.1.ebuild
deleted file mode 100644
index 022d6d2fc5be..000000000000
--- a/dev-util/android-tools/android-tools-34.0.1.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-
-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/"
-
-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"
-	eapply "${FILESDIR}/${PN}-34.0.0-protobuf.patch"
-	eapply "${FILESDIR}/${PN}-34.0.1-include-algorithm.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() {
-	# bug 905713
-	use elibc_musl && append-flags -D_LARGEFILE64_SOURCE
-
-	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
-}

diff --git a/dev-util/android-tools/files/android-tools-34.0.0-protobuf.patch b/dev-util/android-tools/files/android-tools-34.0.0-protobuf.patch
deleted file mode 100644
index d7aa309410a4..000000000000
--- a/dev-util/android-tools/files/android-tools-34.0.0-protobuf.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-https://bugs.gentoo.org/912789
-https://github.com/nmeum/android-tools/commit/c5eae90a06072c6982e483f8154e490b47e620f7
-https://github.com/nmeum/android-tools/pull/120#issuecomment-1621066529
-
---- a/vendor/CMakeLists.txt
-+++ b/vendor/CMakeLists.txt
-@@ -73,6 +73,8 @@
- pkg_check_modules(libzstd REQUIRED IMPORTED_TARGET libzstd)
- 
-+find_package(Protobuf CONFIG)
- find_package(Protobuf REQUIRED)
-+set(PROTOBUF_LIBRARIES protobuf::libprotobuf)
- set(THREADS_PREFER_PTHREAD_FLAG ON)
- find_package(Threads REQUIRED)
- 
---- a/vendor/extras/libjsonpb/parse/jsonpb.cpp
-+++ b/vendor/extras/libjsonpb/parse/jsonpb.cpp
-@@ -50,8 +50,10 @@
-   if (!status.ok()) {
- #if GOOGLE_PROTOBUF_VERSION < 3016000
-     return MakeError<std::string>(status.error_message().as_string());
--#else
-+#elif GOOGLE_PROTOBUF_VERSION < 4022000
-     return MakeError<std::string>(status.message().as_string());
-+#else
-+    return MakeError<std::string>(std::string(status.message()));
- #endif
-   }
-   return ErrorOr<std::string>(std::move(json));
-@@ -67,8 +69,10 @@
-   if (!status.ok()) {
- #if GOOGLE_PROTOBUF_VERSION < 3016000
-     return MakeError<std::monostate>(status.error_message().as_string());
--#else
-+#elif GOOGLE_PROTOBUF_VERSION < 4022000
-     return MakeError<std::monostate>(status.message().as_string());
-+#else
-+    return MakeError<std::monostate>(std::string(status.message()));
- #endif
-   }
-   if (!message->ParseFromString(binary)) {

diff --git a/dev-util/android-tools/files/android-tools-34.0.1-include-algorithm.patch b/dev-util/android-tools/files/android-tools-34.0.1-include-algorithm.patch
deleted file mode 100644
index 79bd52c4c634..000000000000
--- a/dev-util/android-tools/files/android-tools-34.0.1-include-algorithm.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 805c7e385123c6c142c8fec941406fea62af4459 Mon Sep 17 00:00:00 2001
-From: Christopher Fore <csfore@posteo.net>
-Date: Sat, 9 Dec 2023 15:07:12 -0500
-Subject: [PATCH] dev-util/android-tools: Add patch to fix compilation on GCC 14
-
-https://github.com/gentoo/gentoo/pull/34201
----
-
-diff --git a/vendor/adb/client/incremental_utils.cpp b/vendor/adb/client/incremental_utils.cpp
-index 2f6958b..67f21a1 100644
---- a/vendor/adb/client/incremental_utils.cpp
-+++ b/vendor/adb/client/incremental_utils.cpp
-@@ -24,6 +24,7 @@
- #include <ziparchive/zip_archive.h>
- #include <ziparchive/zip_writer.h>
- 
-+#include <algorithm>
- #include <array>
- #include <cinttypes>
- #include <numeric>
-diff --git a/vendor/core/fs_mgr/liblp/super_layout_builder.cpp b/vendor/core/fs_mgr/liblp/super_layout_builder.cpp
-index 37f28e1..0db82e5 100644
---- a/vendor/core/fs_mgr/liblp/super_layout_builder.cpp
-+++ b/vendor/core/fs_mgr/liblp/super_layout_builder.cpp
-@@ -17,6 +17,8 @@
- 
- #include <liblp/liblp.h>
- 
-+#include <algorithm>
-+
- #include "images.h"
- #include "utility.h"
- #include "writer.h"
-diff --git a/vendor/core/fs_mgr/liblp/utility.cpp b/vendor/core/fs_mgr/liblp/utility.cpp
-index d8e171b..70c7b79 100644
---- a/vendor/core/fs_mgr/liblp/utility.cpp
-+++ b/vendor/core/fs_mgr/liblp/utility.cpp
-@@ -25,6 +25,7 @@
- #include <sys/ioctl.h>
- #endif
- 
-+#include <algorithm>
- #include <map>
- #include <string>
- #include <vector>

next             reply	other threads:[~2024-08-10 19:38 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-08-10 19:38 Zac Medico [this message]
  -- strict thread matches above, loose matches on Subject: below --
2022-10-16 23:41 [gentoo-commits] repo/gentoo:master commit in: dev-util/android-tools/files/, dev-util/android-tools/ Sam James
2022-08-12 16:38 Zac Medico
2021-10-08  8:33 Andreas Sturmlechner
2018-01-26 22:40 Mike Frysinger

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:d4dcccbb051 dfblob:7e060f5bdad dfblob:d8ca6ca8245
dfblob:022d6d2fc5b dfblob:d7aa309410a dfblob:79bd52c4c63 )
 OR (
bs:"[gentoo-commits] repo/gentoo:master commit in: dev-util/android-tools/files/, dev-util/android-tools/" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1723318488.e987962a39893738df90b693c49508a18cd13cea.zmedico@gentoo \
    --to=zmedico@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

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