commit: 3ce7001bc9c6f85955be022a5f08c56dfd0c08aa
Author: Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 21 07:28:54 2023 +0000
Commit: Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Fri Jul 21 07:35:15 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ce7001b
dev-embedded/sunxi-tools: sync live
Sync the live and last release ebuilds to have them identical.
Small changes to live (add new dependencies).
Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org>
dev-embedded/sunxi-tools/sunxi-tools-1.4.2.ebuild | 34 +++++++++++++--------
dev-embedded/sunxi-tools/sunxi-tools-9999.ebuild | 36 +++++++++++++++++++----
2 files changed, 53 insertions(+), 17 deletions(-)
diff --git a/dev-embedded/sunxi-tools/sunxi-tools-1.4.2.ebuild
b/dev-embedded/sunxi-tools/sunxi-tools-1.4.2.ebuild
index b5be36370bd2..d7ce94b79fc2 100644
--- a/dev-embedded/sunxi-tools/sunxi-tools-1.4.2.ebuild
+++ b/dev-embedded/sunxi-tools/sunxi-tools-1.4.2.ebuild
@@ -8,10 +8,21 @@ inherit toolchain-funcs
if [[ ${PV} = *9999* ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/linux-sunxi/sunxi-tools";
+ PROPERTIES="test_network"
+ RESTRICT="test"
+ RDEPEND="sys-apps/dtc
+ sys-libs/zlib"
else
KEYWORDS="~amd64"
+ # We need this as zip, it is used during src_test
SRC_URI="https://github.com/linux-sunxi/sunxi-tools/archive/v${PV}.tar.gz ->
${P}.tar.gz
- test? (
https://github.com/linux-sunxi/sunxi-boards/archive/bc7410fed9e5d9b31cd1d6ae90462d06b513660e.zip
-> ${P}-test.zip )"
+ test? (
https://github.com/linux-sunxi/sunxi-boards/archive/bc7410fed9e5d9b31cd1d6ae90462d06b513660e.zip
\
+ -> ${P}-test.zip )"
+ RESTRICT="!test? ( test )"
+
+ PATCHES=(
+ "${FILESDIR}/${PN}-1.4.1-fix-strncpy-compiler-warning.patch"
+ )
fi
DESCRIPTION="A collection of command line tools for ARM devices with Allwinner
SoCs"
@@ -20,9 +31,8 @@ HOMEPAGE="https://linux-sunxi.org/Main_Page";
LICENSE="GPL-2"
SLOT="0"
IUSE="test"
-RESTRICT="!test? ( test )"
-RDEPEND="acct-group/plugdev
+RDEPEND+=" acct-group/plugdev
virtual/libusb:1
virtual/udev"
@@ -30,22 +40,22 @@ DEPEND="${RDEPEND}
"
BDEPEND="virtual/pkgconfig
-test? ( app-arch/unzip )"
-
-PATCHES=(
- "${FILESDIR}/${PN}-1.4.1-fix-strncpy-compiler-warning.patch"
-)
+ test? ( app-arch/unzip )"
src_unpack() {
- unpack ${P}.tar.gz
- # No need to unpack testdata twice
+ if [[ ${PV} = *9999* ]]; then
+ git-r3_src_unpack
+ else
+ unpack ${P}.tar.gz
+ # No need to unpack testdata twice
+ fi
}
src_prepare() {
default
- if use test; then
- cp "${DISTDIR}/${P}-test.zip" "${S}/tests/sunxi-boards.zip"
+ if [[ ${PV} != *9999* ]] && use test; then
+ cp "${DISTDIR}/${P}-test.zip" "${S}/tests/sunxi-boards.zip" ||
die
sed -i
's$sunxi-boards-master$sunxi-boards-bc7410fed9e5d9b31cd1d6ae90462d06b513660e$'
tests/Makefile || die
sed -i 's|^coverage:.*|coverage: $(BOARDS_DIR)/README|'
tests/Makefile || die
fi
diff --git a/dev-embedded/sunxi-tools/sunxi-tools-9999.ebuild
b/dev-embedded/sunxi-tools/sunxi-tools-9999.ebuild
index 7b9cbffdec12..d7ce94b79fc2 100644
--- a/dev-embedded/sunxi-tools/sunxi-tools-9999.ebuild
+++ b/dev-embedded/sunxi-tools/sunxi-tools-9999.ebuild
@@ -10,10 +10,19 @@ if [[ ${PV} = *9999* ]]; then
EGIT_REPO_URI="https://github.com/linux-sunxi/sunxi-tools";
PROPERTIES="test_network"
RESTRICT="test"
+ RDEPEND="sys-apps/dtc
+ sys-libs/zlib"
else
KEYWORDS="~amd64"
-
SRC_URI="https://github.com/linux-sunxi/sunxi-tools/archive/v${PV}.tar.gz ->
${P}.tar.gz"
+ # We need this as zip, it is used during src_test
+
SRC_URI="https://github.com/linux-sunxi/sunxi-tools/archive/v${PV}.tar.gz ->
${P}.tar.gz
+ test? (
https://github.com/linux-sunxi/sunxi-boards/archive/bc7410fed9e5d9b31cd1d6ae90462d06b513660e.zip
\
+ -> ${P}-test.zip )"
RESTRICT="!test? ( test )"
+
+ PATCHES=(
+ "${FILESDIR}/${PN}-1.4.1-fix-strncpy-compiler-warning.patch"
+ )
fi
DESCRIPTION="A collection of command line tools for ARM devices with Allwinner
SoCs"
@@ -23,17 +32,34 @@ LICENSE="GPL-2"
SLOT="0"
IUSE="test"
-RDEPEND="acct-group/plugdev
+RDEPEND+=" acct-group/plugdev
virtual/libusb:1
virtual/udev"
DEPEND="${RDEPEND}
"
-BDEPEND="virtual/pkgconfig"
+BDEPEND="virtual/pkgconfig
+ test? ( app-arch/unzip )"
+
+src_unpack() {
+ if [[ ${PV} = *9999* ]]; then
+ git-r3_src_unpack
+ else
+ unpack ${P}.tar.gz
+ # No need to unpack testdata twice
+ fi
+}
-PATCHES=(
-)
+src_prepare() {
+ default
+
+ if [[ ${PV} != *9999* ]] && use test; then
+ cp "${DISTDIR}/${P}-test.zip" "${S}/tests/sunxi-boards.zip" ||
die
+ sed -i
's$sunxi-boards-master$sunxi-boards-bc7410fed9e5d9b31cd1d6ae90462d06b513660e$'
tests/Makefile || die
+ sed -i 's|^coverage:.*|coverage: $(BOARDS_DIR)/README|'
tests/Makefile || die
+ fi
+}
src_compile() {
tc-export PKG_CONFIG
