diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2020-01-05 14:26:58 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2020-01-05 14:26:58 +0000 |
| commit | 8c994429a443ce6c0be637a02f55a42f070031f9 (patch) | |
| tree | 4420c101f199b09d1d91563cb18ad50b84566791 | |
| parent | 2020-01-05 13:50:51 UTC (diff) | |
| parent | cmake.eclass: Fix cmake-utils_src_make error message (diff) | |
| download | gentoo-8c994429a443ce6c0be637a02f55a42f070031f9.tar.gz gentoo-8c994429a443ce6c0be637a02f55a42f070031f9.tar.bz2 gentoo-8c994429a443ce6c0be637a02f55a42f070031f9.zip | |
Merge updates from master
| -rw-r--r-- | dev-python/toml/toml-0.10.0-r1.ebuild | 2 | ||||
| -rw-r--r-- | dev-python/tox/tox-3.14.3.ebuild | 2 | ||||
| -rw-r--r-- | eclass/cmake.eclass | 10 | ||||
| -rw-r--r-- | net-misc/mosh/metadata.xml | 5 | ||||
| -rw-r--r-- | net-misc/mosh/mosh-1.3.2.ebuild | 4 |
5 files changed, 15 insertions, 8 deletions
diff --git a/dev-python/toml/toml-0.10.0-r1.ebuild b/dev-python/toml/toml-0.10.0-r1.ebuild index 1e7c402fd4bf..b0108c2304ee 100644 --- a/dev-python/toml/toml-0.10.0-r1.ebuild +++ b/dev-python/toml/toml-0.10.0-r1.ebuild @@ -17,7 +17,7 @@ IUSE="test" LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~sparc ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" # peculiar testing depending on https://github.com/BurntSushi/toml-test. Not # particularly worth the trouble. diff --git a/dev-python/tox/tox-3.14.3.ebuild b/dev-python/tox/tox-3.14.3.ebuild index eb8c4fbba74e..8cccb8451fe1 100644 --- a/dev-python/tox/tox-3.14.3.ebuild +++ b/dev-python/tox/tox-3.14.3.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://github.com/tox-dev/tox/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm64 ~ia64 ~sparc ~x86" +KEYWORDS="~alpha ~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" # doc disabled because of missing deps in tree IUSE="test" diff --git a/eclass/cmake.eclass b/eclass/cmake.eclass index c91e2dd4ada2..dfccbad1a786 100644 --- a/eclass/cmake.eclass +++ b/eclass/cmake.eclass @@ -294,6 +294,8 @@ _cmake_modify-cmakelists() { cmake_src_prepare() { debug-print-function ${FUNCNAME} "$@" + # FIXME: workaround from cmake-utils; use current working directory instead, bug #704524 + # esp. test with 'special' pkgs like: app-arch/brotli, media-gfx/gmic, net-libs/quiche pushd "${S}" > /dev/null || die default_src_prepare @@ -566,8 +568,10 @@ cmake_build() { case ${CMAKE_MAKEFILE_GENERATOR} in emake) [[ -e Makefile ]] || die "Makefile not found. Error during configure stage." - [[ "${CMAKE_VERBOSE}" != "OFF" ]] && local verbosity="VERBOSE=1" - emake "${verbosity}" "$@" + case ${CMAKE_VERBOSE} in + OFF) emake "$@" ;; + *) emake VERBOSE=1 "$@" ;; + esac ;; ninja) [[ -e build.ninja ]] || die "build.ninja not found. Error during configure stage." @@ -583,7 +587,7 @@ cmake_build() { # @DESCRIPTION: # Banned. Use cmake_build instead. cmake-utils_src_make() { - die "cmake_src_make is banned. Use cmake_build instead" + die "cmake-utils_src_make is banned. Use cmake_build instead" } # @FUNCTION: cmake_src_test diff --git a/net-misc/mosh/metadata.xml b/net-misc/mosh/metadata.xml index 3bf153fbc079..0e7c205b7c03 100644 --- a/net-misc/mosh/metadata.xml +++ b/net-misc/mosh/metadata.xml @@ -1,7 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> + <maintainer type="person"> + <email>amynka@gentoo.org</email> + <name>Amy Liffey</name> + </maintainer> <use> <flag name="client">Build network client</flag> <flag name="examples">Include example scripts</flag> diff --git a/net-misc/mosh/mosh-1.3.2.ebuild b/net-misc/mosh/mosh-1.3.2.ebuild index be9bd1d1b4b8..d6f21d498fdb 100644 --- a/net-misc/mosh/mosh-1.3.2.ebuild +++ b/net-misc/mosh/mosh-1.3.2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit autotools bash-completion-r1 eutils vcs-snapshot +inherit autotools bash-completion-r1 eutils DESCRIPTION="Mobile shell that supports roaming and intelligent local echo" HOMEPAGE="https://mosh.org" |