commit: 37edfc28e4dad33f9bccbf3c7641b61a6032fbcf Author: Ben Kohler <bkohler <AT> gentoo <DOT> org> AuthorDate: Fri May 15 22:14:27 2020 +0000 Commit: Ben Kohler <bkohler <AT> gentoo <DOT> org> CommitDate: Fri May 15 22:14:27 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37edfc28
Revert "profiles/riscv: mask tests on protobuf" This reverts commit 87d6564b45a72bfaf7b64aa82490dbaf5245dd5a. Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org> app-portage/eix/Manifest | 1 - app-portage/eix/eix-0.34.1.ebuild | 110 --------------------------- dev-cpp/gtest/gtest-1.10.0.ebuild | 2 +- dev-cpp/gtest/gtest-1.8.0-r1.ebuild | 2 +- dev-cpp/gtest/gtest-1.8.0.ebuild | 2 +- dev-cpp/gtest/gtest-1.8.1-r1.ebuild | 2 +- dev-cpp/gtest/gtest-1.8.1.ebuild | 2 +- dev-cpp/gtest/gtest-1.9.0_pre20190607.ebuild | 2 +- dev-cpp/gtest/gtest-9999.ebuild | 2 +- dev-libs/protobuf/protobuf-3.10.1.ebuild | 2 +- dev-libs/protobuf/protobuf-3.11.2.ebuild | 2 +- dev-libs/protobuf/protobuf-3.11.4.ebuild | 2 +- dev-libs/protobuf/protobuf-9999.ebuild | 2 +- profiles/arch/riscv/package.use.mask | 22 +++--- 14 files changed, 24 insertions(+), 131 deletions(-) diff --git a/app-portage/eix/Manifest b/app-portage/eix/Manifest index a98ea31a6de..03b7b0eb348 100644 --- a/app-portage/eix/Manifest +++ b/app-portage/eix/Manifest @@ -1,3 +1,2 @@ DIST eix-0.33.11.tar.xz 623256 BLAKE2B 756feed85cb4f40ef9228a03d2a8b8470eb6017b00d93b364d67e3d11ecaacce2bb9c6afed388d9f70dfcb7a0b9ece13ca6ee523f5839b7d9bf80cf3b2721524 SHA512 2829d1482abfe479ae71e8b00da07abe74ba3090ba2a3f9d9a93437cb2d4d64213968bcd6c082a6703ec1d9c36dfcfaa0850172f3ffd4d256f553b98eeaf29e6 DIST eix-0.33.9.tar.xz 627944 BLAKE2B cb4add12301a4f08b6ca052df92be34c8a448b386aa700e8ac7e1fbe8563cd76047994007ac94d8989747d843f70a5e1731b401510f58badd9811b30c2ce3be8 SHA512 7539a91d5b5343532ceab1f4aeb82a95413c39b1a57b9e7922032acc937cc8b839494fc40f3510218349561c6d50e89e1861d2fce5e60eabed2465316b28a756 -DIST eix-0.34.1.tar.xz 626484 BLAKE2B 3f33df9d3f45abc073d7b80a7a6b3574ef6c1372042cb1ec4f0b0213842bc48d8d5a76c005ece2c060a39b1c8778764eb1f6808e75bc10af6e366e33e10aa6c7 SHA512 86289d8dcb0cf87ad48c739aae637626f9e63200a48d019fc96e74f2851b2791a61741d5db72ceaf3e5a375fb0dbf9302b04f766c3def69bcaabb393545dc767 diff --git a/app-portage/eix/eix-0.34.1.ebuild b/app-portage/eix/eix-0.34.1.ebuild deleted file mode 100644 index 05a255ac342..00000000000 --- a/app-portage/eix/eix-0.34.1.ebuild +++ /dev/null @@ -1,110 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools bash-completion-r1 flag-o-matic tmpfiles - -DESCRIPTION="Search and query ebuilds" -HOMEPAGE="https://github.com/vaeth/eix/"; -SRC_URI="https://github.com/vaeth/eix/releases/download/v${PV}/${P}.tar.xz"; - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="debug doc nls sqlite" - -BOTHDEPEND="nls? ( virtual/libintl ) - sqlite? ( >=dev-db/sqlite-3:= )" - -RDEPEND="${BOTHDEPEND} - >=app-shells/push-2.0-r1 - >=app-shells/quoter-3.0_p2-r1" - -DEPEND="${BOTHDEPEND} - app-arch/xz-utils - dev-libs/protobuf:= - nls? ( sys-devel/gettext )" - -pkg_setup() { - # remove stale cache file to prevent collisions - local old_cache=${EROOT}/var/cache/${PN} - if [[ -f ${old_cache} ]]; then - rm "${old_cache}" || die - fi -} - -src_prepare() { - default - sed -i -e "s:/:${EPREFIX}/:" tmpfiles.d/eix.conf || die - - sed -e "/eixf_source=/s:push.sh:cat \"${EPREFIX}/usr/share/push/push.sh\":" \ - -e "/eixf_source=/s:quoter_pipe.sh:cat \"${EPREFIX}/usr/share/quoter/quoter_pipe.sh\":" \ - -i src/eix-functions.sh.in || die - sed -e "s:'\$(bindir)/eix-functions.sh':cat \\\\\"${EPREFIX}/usr/share/eix/eix-functions\\\\\":" \ - -i src/Makefile.am || die - eautoreconf -} - -src_configure() { - local myconf=( - $(use_enable debug paranoic-asserts) - $(use_enable nls) - $(use_with doc extra-doc) - $(use_with sqlite) - - # default configuration - $(use_with prefix always-accept-keywords) - --with-dep-default - --with-required-use-default - - # paths - --with-portage-rootpath="${ROOTPATH}" - --with-eprefix-default="${EPREFIX}" - - # build a single executable with symlinks - --disable-separate-binaries - --disable-separate-tools - - # used purely to control/disrespect *FLAGS - --disable-debugging - --disable-new_dialect - --disable-optimization - --disable-strong-optimization - --disable-security - --disable-nopie-security - --disable-strong-security - ) - - # https://github.com/vaeth/eix/issues/35 - append-cxxflags -std=c++14 - - # work around https://github.com/vaeth/eix/issues/64, bug#687988 - local -x mv_fCXXFLAGS_cache='-mindirect-branch=thunk' - - econf "${myconf[@]}" -} - -src_install() { - default - dobashcomp bash/eix - dotmpfiles tmpfiles.d/eix.conf - - rm -r "${ED}"/usr/bin/eix-functions.sh || die - -} - -pkg_postinst() { - tmpfiles_process eix.conf - - local obs=${EROOT}/var/cache/eix.previous - if [[ -f ${obs} ]]; then - ewarn "Found obsolete ${obs}, please remove it" - fi -} - -pkg_postrm() { - if [[ ! -n ${REPLACED_BY_VERSION} ]]; then - rm -rf "${EROOT}/var/cache/${PN}" || die - fi -} diff --git a/dev-cpp/gtest/gtest-1.10.0.ebuild b/dev-cpp/gtest/gtest-1.10.0.ebuild index 80fb9b9f6d2..12d496c44be 100644 --- a/dev-cpp/gtest/gtest-1.10.0.ebuild +++ b/dev-cpp/gtest/gtest-1.10.0.ebuild @@ -20,7 +20,7 @@ else URI_PV=${MY_PV:=${GOOGLETEST_COMMIT}} fi SRC_URI="https://github.com/google/googletest/archive/${URI_PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" S="${WORKDIR}"/googletest-${MY_PV} fi diff --git a/dev-cpp/gtest/gtest-1.8.0-r1.ebuild b/dev-cpp/gtest/gtest-1.8.0-r1.ebuild index fb209ce48bb..bf4d578fa31 100644 --- a/dev-cpp/gtest/gtest-1.8.0-r1.ebuild +++ b/dev-cpp/gtest/gtest-1.8.0-r1.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://github.com/google/googletest/archive/release-${PV}.tar.gz -> ${ LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="doc examples test" RESTRICT="!test? ( test )" diff --git a/dev-cpp/gtest/gtest-1.8.0.ebuild b/dev-cpp/gtest/gtest-1.8.0.ebuild index 6b2cec3b167..2d1d2af328f 100644 --- a/dev-cpp/gtest/gtest-1.8.0.ebuild +++ b/dev-cpp/gtest/gtest-1.8.0.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://github.com/google/googletest/archive/release-${PV}.tar.gz -> ${ LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="doc examples test" RESTRICT="!test? ( test )" diff --git a/dev-cpp/gtest/gtest-1.8.1-r1.ebuild b/dev-cpp/gtest/gtest-1.8.1-r1.ebuild index 611f366b0f1..030ed3477e9 100644 --- a/dev-cpp/gtest/gtest-1.8.1-r1.ebuild +++ b/dev-cpp/gtest/gtest-1.8.1-r1.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]]; then EGIT_REPO_URI="https://github.com/google/googletest"; else SRC_URI="https://github.com/google/googletest/archive/release-${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" S="${WORKDIR}"/googletest-release-${PV} fi diff --git a/dev-cpp/gtest/gtest-1.8.1.ebuild b/dev-cpp/gtest/gtest-1.8.1.ebuild index f259e18836d..4c66697b04a 100644 --- a/dev-cpp/gtest/gtest-1.8.1.ebuild +++ b/dev-cpp/gtest/gtest-1.8.1.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]]; then EGIT_REPO_URI="https://github.com/google/googletest"; else SRC_URI="https://github.com/google/googletest/archive/release-${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" + KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" S="${WORKDIR}"/googletest-release-${PV} fi diff --git a/dev-cpp/gtest/gtest-1.9.0_pre20190607.ebuild b/dev-cpp/gtest/gtest-1.9.0_pre20190607.ebuild index 66524e68f5c..9aa2139201b 100644 --- a/dev-cpp/gtest/gtest-1.9.0_pre20190607.ebuild +++ b/dev-cpp/gtest/gtest-1.9.0_pre20190607.ebuild @@ -20,7 +20,7 @@ else MY_PV=${GOOGLETEST_COMMIT} fi SRC_URI="https://github.com/google/googletest/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" S="${WORKDIR}"/googletest-${MY_PV} fi diff --git a/dev-cpp/gtest/gtest-9999.ebuild b/dev-cpp/gtest/gtest-9999.ebuild index ad1a7782b26..753803041fc 100644 --- a/dev-cpp/gtest/gtest-9999.ebuild +++ b/dev-cpp/gtest/gtest-9999.ebuild @@ -19,7 +19,7 @@ else URI_PV=${MY_PV:=${GOOGLETEST_COMMIT}} fi SRC_URI="https://github.com/google/googletest/archive/${URI_PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" S="${WORKDIR}"/googletest-${MY_PV} fi diff --git a/dev-libs/protobuf/protobuf-3.10.1.ebuild b/dev-libs/protobuf/protobuf-3.10.1.ebuild index a17a7f7b3e5..207d865f940 100644 --- a/dev-libs/protobuf/protobuf-3.10.1.ebuild +++ b/dev-libs/protobuf/protobuf-3.10.1.ebuild @@ -22,7 +22,7 @@ fi LICENSE="BSD" SLOT="0/21" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" IUSE="emacs examples static-libs test zlib" RESTRICT="!test? ( test )" diff --git a/dev-libs/protobuf/protobuf-3.11.2.ebuild b/dev-libs/protobuf/protobuf-3.11.2.ebuild index 1f85b46836d..44c26d8d35e 100644 --- a/dev-libs/protobuf/protobuf-3.11.2.ebuild +++ b/dev-libs/protobuf/protobuf-3.11.2.ebuild @@ -22,7 +22,7 @@ fi LICENSE="BSD" SLOT="0/22" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" IUSE="emacs examples static-libs test zlib" RESTRICT="!test? ( test )" diff --git a/dev-libs/protobuf/protobuf-3.11.4.ebuild b/dev-libs/protobuf/protobuf-3.11.4.ebuild index 031399919f6..10dfc3a1a39 100644 --- a/dev-libs/protobuf/protobuf-3.11.4.ebuild +++ b/dev-libs/protobuf/protobuf-3.11.4.ebuild @@ -22,7 +22,7 @@ fi LICENSE="BSD" SLOT="0/22" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" IUSE="emacs examples static-libs test zlib" RESTRICT="!test? ( test )" diff --git a/dev-libs/protobuf/protobuf-9999.ebuild b/dev-libs/protobuf/protobuf-9999.ebuild index a7eb87c14c8..eebedecd5f1 100644 --- a/dev-libs/protobuf/protobuf-9999.ebuild +++ b/dev-libs/protobuf/protobuf-9999.ebuild @@ -22,7 +22,7 @@ fi LICENSE="BSD" SLOT="0/22" -KEYWORDS="~riscv" +KEYWORDS="" IUSE="emacs examples static-libs test zlib" RESTRICT="!test? ( test )" diff --git a/profiles/arch/riscv/package.use.mask b/profiles/arch/riscv/package.use.mask index 574f6374e5f..f9a94009e4d 100644 --- a/profiles/arch/riscv/package.use.mask +++ b/profiles/arch/riscv/package.use.mask @@ -1,10 +1,6 @@ # Copyright 2019-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -# Mikle Kolyada <[email protected]> (2020-05-16) -# missing keywords -dev-libs/protobuf test - # Lars Wendler <[email protected]> (2020-05-10) # Missing keyword media-libs/freetype brotli @@ -13,6 +9,14 @@ media-libs/freetype brotli # Mask until app-arch/lz4 is keyworded app-arch/zstd lz4 +# Sergei Trofimovich <[email protected]> (2020-05-07) +# Mask until app-arch/zstd is keyworded +sys-devel/gcc zstd + +# Zac Medico <[email protected]> (2020-05-07) +# Mask until app-arch/zstd is keyworded +sys-apps/portage binpkg-zstd + # Patrick McLean <[email protected]> (2020-04-16) # Lots of python dependencies, mask to facilitate keywording # keywording dev-libs/libfido2 @@ -50,7 +54,7 @@ dev-vcs/git pcre-jit app-admin/syslog-ng amqp dbi geoip geoip2 json kafka mongodb python redis spoof-source smtp snmp test app-admin/sysstat lm-sensors -app-arch/libarchive lz4 lzo +app-arch/libarchive lz4 lzo zstd app-arch/unzip natspec app-crypt/gnupg smartcard tofu wks-server app-crypt/mit-krb5 doc test xinetd @@ -62,7 +66,7 @@ app-text/asciidoc graphviz test app-text/po4a test app-text/xmlto text dev-lang/python tk -dev-libs/boost mpi numpy +dev-libs/boost mpi numpy zstd dev-libs/check doc subunit dev-libs/glib gtk-doc test dev-libs/icu doc @@ -85,7 +89,7 @@ dev-util/pkgconf test dev-util/strace unwind dev-vcs/git cvs highlight gnome-keyring subversion tk xinetd media-libs/freetype harfbuzz png -media-libs/tiff jbig jpeg test webp +media-libs/tiff jbig jpeg test webp zstd net-fs/nfs-utils nfsv41 net-libs/gnutls doc test-full net-libs/ldns doc python @@ -101,8 +105,8 @@ sys-block/thin-provisioning-tools test sys-devel/automake test sys-devel/gdb source-highlight sys-devel/gettext cvs -sys-fs/squashfs-tools lz4 lzma lzo +sys-fs/squashfs-tools lz4 lzma lzo zstd sys-libs/libcap-ng python sys-process/audit gssapi python sys-process/procps test -sys-fs/squashfs-tools-ng lz4 lzo +sys-fs/squashfs-tools-ng lz4 lzo zstd
