From f867e88467fc01fa06f90c5831e8c8bb7609fd22 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 19 Jun 2023 07:15:50 +0000 Subject: [PATCH] sys-apps/hwdata: Sync with Gentoo It's from Gentoo commit 3d106878c40744368a5ccfee43f40c17c3403b67. --- .../portage-stable/sys-apps/hwdata/Manifest | 1 + .../sys-apps/hwdata/hwdata-0.354.ebuild | 25 ------------------- .../sys-apps/hwdata/hwdata-0.369.ebuild | 2 +- .../sys-apps/hwdata/hwdata-0.370.ebuild | 2 +- ...wdata-0.353.ebuild => hwdata-0.371.ebuild} | 13 ++++++---- 5 files changed, 11 insertions(+), 32 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/hwdata/hwdata-0.354.ebuild rename sdk_container/src/third_party/portage-stable/sys-apps/hwdata/{hwdata-0.353.ebuild => hwdata-0.371.ebuild} (71%) diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/hwdata/Manifest b/sdk_container/src/third_party/portage-stable/sys-apps/hwdata/Manifest index c010772902..bb96b12e7a 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/hwdata/Manifest +++ b/sdk_container/src/third_party/portage-stable/sys-apps/hwdata/Manifest @@ -1,3 +1,4 @@ DIST hwdata-0.367.tar.gz 2313810 BLAKE2B 7f4be3f0b3c8ec6d90860031677b1e1bc6fac9159291ee772501e5f5aee0d43855e27fb6f9c4b0c65b04353fee1222f5e6c0f0a40fa743a32fdcb9509ebc772d SHA512 ed04282c4046193debb02b325b57cd0ef78d5ceb485d104f10d8aa1fe3ba42aeee8071ac806db95c03b40e6fc1d7c8c5f036adca7744a9d9376b0a146f6ec5a8 DIST hwdata-0.369.tar.gz 2328002 BLAKE2B b2b580bdb225ed0cf6d694b2e1d9e184f3ca7caa4cf93929df2c45866d7433256213afd489ffc816fa3509154b66c02d9d44a8070a2852d4688c9d01c38d2acd SHA512 a451ac7da77bdd26b0e37b64859c79e2dbe3359a3ba0490d49e6edae08b0abb4199598dea2f9b53f775825210da7e0d3263bfefe4e5c34fe65842522c328bc99 DIST hwdata-0.370.tar.gz 2332791 BLAKE2B 92c68ce6ff05a9cae24e77794eb665672df9ad635cb2830b246f042ea2e8418eca132e6dc7ccda647fcaecbe888477c9f7a1f7e0fdd94de962c61c2bd3a68779 SHA512 a7a3e7685dd6beecf19cd177082b36b2f799f580f1b5b3838495948a686b81f1a981d9335faae9a52a3d5845eed950357e0a6ac5a178564ce54ddef00448bce4 +DIST hwdata-0.371.tar.gz 2340297 BLAKE2B bb92b6d4f66879eacc1efae13ff1a5fe58014614c4af1906eca0489053f61d0ae2f4be777532cb6209cb2d133f8787774bc803a4d2cdf11a1014d7218bf25650 SHA512 62739cce61493f5d46a9cec5732bd4f9e0c86adec5b56cca31fa50c0d85e3a48d32f5abeaa5ca26f4ba42fc13affe4350b66a1838e958b037ddec7b30e726e86 diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/hwdata/hwdata-0.354.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/hwdata/hwdata-0.354.ebuild deleted file mode 100644 index e6dfcf28e7..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-apps/hwdata/hwdata-0.354.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="Hardware identification and configuration data" -HOMEPAGE="https://github.com/vcrhonek/hwdata" -SRC_URI="https://github.com/vcrhonek/hwdata/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" -RESTRICT="test" - -src_configure() { - # configure is not compatible with econf - local conf=( - ./configure - --prefix="${EPREFIX}/usr" - --libdir="${EPREFIX}/lib" - --datadir="${EPREFIX}/usr/share" - ) - echo "${conf[@]}" >&2 - "${conf[@]}" || die -} diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/hwdata/hwdata-0.369.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/hwdata/hwdata-0.369.ebuild index afddd20d2f..b5d599c17b 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/hwdata/hwdata-0.369.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/hwdata/hwdata-0.369.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/vcrhonek/hwdata/archive/refs/tags/v${PV}.tar.gz -> $ LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" RESTRICT="test" diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/hwdata/hwdata-0.370.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/hwdata/hwdata-0.370.ebuild index afddd20d2f..b5d599c17b 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/hwdata/hwdata-0.370.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/hwdata/hwdata-0.370.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/vcrhonek/hwdata/archive/refs/tags/v${PV}.tar.gz -> $ LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" RESTRICT="test" diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/hwdata/hwdata-0.353.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/hwdata/hwdata-0.371.ebuild similarity index 71% rename from sdk_container/src/third_party/portage-stable/sys-apps/hwdata/hwdata-0.353.ebuild rename to sdk_container/src/third_party/portage-stable/sys-apps/hwdata/hwdata-0.371.ebuild index 8819729202..b5d599c17b 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/hwdata/hwdata-0.353.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/hwdata/hwdata-0.371.ebuild @@ -1,7 +1,9 @@ -# Copyright 2021 Gentoo Authors +# Copyright 2022-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 + +inherit edo DESCRIPTION="Hardware identification and configuration data" HOMEPAGE="https://github.com/vcrhonek/hwdata" @@ -9,7 +11,8 @@ SRC_URI="https://github.com/vcrhonek/hwdata/archive/refs/tags/v${PV}.tar.gz -> $ LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" + RESTRICT="test" src_configure() { @@ -20,6 +23,6 @@ src_configure() { --libdir="${EPREFIX}/lib" --datadir="${EPREFIX}/usr/share" ) - echo "${conf[@]}" >&2 - "${conf[@]}" || die + + edo "${conf[@]}" }