diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2023-06-16 14:18:49 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2023-06-16 14:18:49 +0000 |
| commit | 93890b738c924f27a6442762afa64d3985bb1f03 (patch) | |
| tree | dbe9191c955c76e722a01dea0a5d2ac0b10e4ddb | |
| parent | 2023-06-16 14:03:58 UTC (diff) | |
| parent | toolchain.eclass: Don't inherit eutils (diff) | |
| download | gentoo-93890b738c924f27a6442762afa64d3985bb1f03.tar.gz gentoo-93890b738c924f27a6442762afa64d3985bb1f03.tar.bz2 gentoo-93890b738c924f27a6442762afa64d3985bb1f03.zip | |
Merge updates from master
| -rw-r--r-- | dev-util/android-udev-rules/android-udev-rules-20230303.ebuild | 2 | ||||
| -rw-r--r-- | eclass/toolchain.eclass | 3 | ||||
| -rw-r--r-- | sys-apps/sandbox/sandbox-2.30-r1.ebuild | 2 |
3 files changed, 2 insertions, 5 deletions
diff --git a/dev-util/android-udev-rules/android-udev-rules-20230303.ebuild b/dev-util/android-udev-rules/android-udev-rules-20230303.ebuild index 62f49b941ae8..3f18e677567e 100644 --- a/dev-util/android-udev-rules/android-udev-rules-20230303.ebuild +++ b/dev-util/android-udev-rules/android-udev-rules-20230303.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/M0Rf30/android-udev-rules/archive/refs/tags/${PV}.ta LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~x86" +KEYWORDS="amd64 ~arm ~arm64 ~x86" # No tests RESTRICT="test" diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index 3578ac7f44ec..3013e5c9aeca 100644 --- a/eclass/toolchain.eclass +++ b/eclass/toolchain.eclass @@ -22,7 +22,6 @@ _TOOLCHAIN_ECLASS=1 DESCRIPTION="The GNU Compiler Collection" HOMEPAGE="https://gcc.gnu.org/" -[[ ${EAPI} == 7 ]] && inherit eutils inherit edo flag-o-matic gnuconfig libtool multilib pax-utils toolchain-funcs prefix tc_is_live() { @@ -61,7 +60,6 @@ is_crosscompile() { [[ ${CHOST} != ${CTARGET} ]] } - # @FUNCTION: tc_version_is_at_least # @USAGE: ver1 [ver2] # @DESCRIPTION: @@ -927,7 +925,6 @@ toolchain_src_configure() { # ;; # esac - ### Cross-compiler options if is_crosscompile ; then # Enable build warnings by default with cross-compilers when system diff --git a/sys-apps/sandbox/sandbox-2.30-r1.ebuild b/sys-apps/sandbox/sandbox-2.30-r1.ebuild index 194ac31979ba..d916ab7fa116 100644 --- a/sys-apps/sandbox/sandbox-2.30-r1.ebuild +++ b/sys-apps/sandbox/sandbox-2.30-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~floppym/dist/${P}.tar.xz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86" +KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86" IUSE="+nnp" # pax-utils lower bound for bug #265376 |