summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRepository mirror & CI <repomirrorci@gentoo.org>2022-05-17 03:23:01 +0000
committerRepository mirror & CI <repomirrorci@gentoo.org>2022-05-17 03:23:01 +0000
commite951c03317f9b1633407b1f68fcbaebe24fe50ff (patch)
tree7abcafcc0cedca0747ee78a6198ba695185a0066
parent2022-05-17 02:33:01 UTC (diff)
parentdev-util/ebuildtester: Version bump to v0.1.35 (diff)
downloadgentoo-e951c03317f9b1633407b1f68fcbaebe24fe50ff.tar.gz
gentoo-e951c03317f9b1633407b1f68fcbaebe24fe50ff.tar.bz2
gentoo-e951c03317f9b1633407b1f68fcbaebe24fe50ff.zip
Merge updates from master
-rw-r--r--dev-util/ebuildtester/Manifest1
-rw-r--r--dev-util/ebuildtester/ebuildtester-0.1.35.ebuild36
-rw-r--r--eclass/multilib.eclass12
3 files changed, 43 insertions, 6 deletions
diff --git a/dev-util/ebuildtester/Manifest b/dev-util/ebuildtester/Manifest
index ff785bf2f5df..f326e9a4cb62 100644
--- a/dev-util/ebuildtester/Manifest
+++ b/dev-util/ebuildtester/Manifest
@@ -1,3 +1,4 @@
DIST ebuildtester-0.1.27.tar.gz 17347 BLAKE2B 4b4b97235b073bfa1fc78dd3e4f5d03a2e64b277a8675669061beef3185e87c01f882ae830fc5c11b1ba97ea5deb50e93b7cc02b78cef5a0046bb7f2c7ac3433 SHA512 f50fb020e47750c318d0198628721adf166ee3d8544be50169b2012ad72370f063b1367e521af842df0574e491d469e5c2a6aba1576a9f364c95e72a9579950d
DIST ebuildtester-0.1.29.tar.gz 17446 BLAKE2B d0dccc4e290e9907b90d93ecd87cb263e842ee60944ea9e8a0cb3864029595a5979c16e3c13d59dfd6d5bdc989a6211bf56262b88bbf2f28a86b236f1c305fd9 SHA512 4093df87f85fc581dc1b286b7377929f111d0f1efc960d7623ff3cbd833ef997174b0508422567de819490c30a8246a431d6a29bf71f1e828064b3987bd129a4
DIST ebuildtester-0.1.30.tar.gz 17436 BLAKE2B 264a10b1f61fcb9ef0ef232118ab1f830da4754ddf724d9797beaabbbd03b6d8a6c790150847dde2f8a0436a71ea0351b547ea3996709da41abcaad02cdfcac8 SHA512 0138b220bfc109ea05a8052150150ca38e6612e7089926d88f5a8dc99f7c27b16adce10cce1779f981eb8bb4ee05a2aac381d5a875ef38ffa83243a2945d3666
+DIST ebuildtester-0.1.35.tar.gz 19842 BLAKE2B 3d562718680914a47bb078f38f4351e5b4575ef6d11fa39247d7f06b81868cca0a30ec29ba0e7b14330ef45a117330ad2351f5eea2b75f23cbaba9e37d0441d4 SHA512 c268c621c3b22aefb6945da7169a4049c7bd3f9cc198d43eb733bc144bf1ac46e251235af669d2af5231f5517ef997ffcd28f4bcbb1c945237f6dd2dca502c46
diff --git a/dev-util/ebuildtester/ebuildtester-0.1.35.ebuild b/dev-util/ebuildtester/ebuildtester-0.1.35.ebuild
new file mode 100644
index 000000000000..21d359bb819e
--- /dev/null
+++ b/dev-util/ebuildtester/ebuildtester-0.1.35.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="A dockerized approach to test a Gentoo package within a clean stage3 container"
+HOMEPAGE="https://ebuildtester.readthedocs.io/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ app-containers/docker
+ sys-fs/fuse
+"
+
+DEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ dev-python/setuptools_scm[${PYTHON_USEDEP}]
+ dev-python/sphinx[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests unittest
+
+src_install() {
+ distutils-r1_src_install
+ newbashcomp "${FILESDIR}/${PN}.bash-completion" "${PN}"
+}
diff --git a/eclass/multilib.eclass b/eclass/multilib.eclass
index ec2676cb6cfb..8590bbdfbff0 100644
--- a/eclass/multilib.eclass
+++ b/eclass/multilib.eclass
@@ -422,9 +422,9 @@ multilib_env() {
# the default abi is set to the 1-level libdir default
- local __libdir_riscvdefaultabi_variable="LIBDIR_${DEFAULT_ABI}"
- local __libdir_riscvdefaultabi=${!__libdir_riscvdefaultabi_variable}
- export ${__libdir_riscvdefaultabi_variable}=${__libdir_riscvdefaultabi:-lib64}
+ local _libdir_riscvdefaultabi_variable="LIBDIR_${DEFAULT_ABI}"
+ local _libdir_riscvdefaultabi=${!_libdir_riscvdefaultabi_variable}
+ export ${_libdir_riscvdefaultabi_variable}=${_libdir_riscvdefaultabi:-lib64}
# all other abi are set to the 2-level libdir default
@@ -454,9 +454,9 @@ multilib_env() {
# the default abi is set to the 1-level libdir default
- local __libdir_riscvdefaultabi_variable="LIBDIR_${DEFAULT_ABI}"
- local __libdir_riscvdefaultabi=${!__libdir_riscvdefaultabi_variable}
- export ${__libdir_riscvdefaultabi_variable}=${__libdir_riscvdefaultabi:-lib}
+ local _libdir_riscvdefaultabi_variable="LIBDIR_${DEFAULT_ABI}"
+ local _libdir_riscvdefaultabi=${!_libdir_riscvdefaultabi_variable}
+ export ${_libdir_riscvdefaultabi_variable}=${_libdir_riscvdefaultabi:-lib}
# all other abi are set to the 2-level libdir default