summaryrefslogtreecommitdiff
path: root/dev-libs
diff options
context:
space:
mode:
Diffstat (limited to 'dev-libs')
-rw-r--r--dev-libs/Ice/Ice-3.6.4.ebuild357
-rw-r--r--dev-libs/Ice/Manifest1
-rw-r--r--dev-libs/Manifest.gzbin84577 -> 84583 bytes
-rw-r--r--dev-libs/appstream/Manifest2
-rw-r--r--dev-libs/appstream/appstream-0.12.10.ebuild72
-rw-r--r--dev-libs/atk/Manifest4
-rw-r--r--dev-libs/atk/atk-2.34.1.ebuild2
-rw-r--r--dev-libs/atk/atk-2.36.0.ebuild2
-rw-r--r--dev-libs/botan/Manifest7
-rw-r--r--dev-libs/botan/botan-1.10.17-r2.ebuild160
-rw-r--r--dev-libs/botan/botan-2.11.0.ebuild102
-rw-r--r--dev-libs/botan/botan-2.14.0.ebuild102
-rw-r--r--dev-libs/botan/files/botan-1.10.17-build.patch25
-rw-r--r--dev-libs/botan/files/botan-1.10.17-libressl.patch40
-rw-r--r--dev-libs/clhpp/Manifest2
-rw-r--r--dev-libs/clhpp/clhpp-2.0.12.ebuild28
-rw-r--r--dev-libs/crypto++/Manifest6
-rw-r--r--dev-libs/crypto++/crypto++-7.0.0-r3.ebuild2
-rw-r--r--dev-libs/crypto++/crypto++-8.2.0-r2.ebuild4
-rw-r--r--dev-libs/crypto++/crypto++-8.2.0.ebuild2
-rw-r--r--dev-libs/cyberjack/Manifest3
-rw-r--r--dev-libs/cyberjack/cyberjack-3.99.5_p14.ebuild10
-rw-r--r--dev-libs/cyberjack/files/cyberjack-3.99.5_p14-gcc10.patch13
-rw-r--r--dev-libs/efl/Manifest4
-rw-r--r--dev-libs/efl/efl-1.24.3.ebuild (renamed from dev-libs/efl/efl-1.24.2.ebuild)24
-rw-r--r--dev-libs/ell/Manifest2
-rw-r--r--dev-libs/ell/ell-0.32.ebuild60
-rw-r--r--dev-libs/fribidi/Manifest2
-rw-r--r--dev-libs/fribidi/fribidi-1.0.9.ebuild2
-rw-r--r--dev-libs/fstrm/Manifest2
-rw-r--r--dev-libs/fstrm/fstrm-0.3.0.ebuild2
-rw-r--r--dev-libs/gjs/Manifest6
-rw-r--r--dev-libs/gjs/gjs-1.56.2.ebuild67
-rw-r--r--dev-libs/gjs/gjs-1.58.6.ebuild2
-rw-r--r--dev-libs/gjs/gjs-1.58.7.ebuild64
-rw-r--r--dev-libs/glib/Manifest4
-rw-r--r--dev-libs/glib/glib-2.62.6.ebuild2
-rw-r--r--dev-libs/glib/glib-2.64.3.ebuild2
-rw-r--r--dev-libs/gobject-introspection/Manifest4
-rw-r--r--dev-libs/gobject-introspection/gobject-introspection-1.62.0-r1.ebuild (renamed from dev-libs/gobject-introspection/gobject-introspection-1.62.0.ebuild)0
-rw-r--r--dev-libs/gobject-introspection/gobject-introspection-1.64.1-r1.ebuild (renamed from dev-libs/gobject-introspection/gobject-introspection-1.64.1.ebuild)0
-rw-r--r--dev-libs/hsa-ext-rocr/Manifest4
-rw-r--r--dev-libs/hsa-ext-rocr/hsa-ext-rocr-1.1.30500.0.ebuild (renamed from dev-libs/hsa-ext-rocr/hsa-ext-rocr-1.1.30300.0.ebuild)4
-rw-r--r--dev-libs/icu-layoutex/Manifest2
-rw-r--r--dev-libs/icu-layoutex/icu-layoutex-67.1.ebuild2
-rw-r--r--dev-libs/icu-le-hb/Manifest2
-rw-r--r--dev-libs/icu-le-hb/icu-le-hb-1.0.3-r1.ebuild2
-rw-r--r--dev-libs/json-glib/Manifest2
-rw-r--r--dev-libs/json-glib/json-glib-1.4.4.ebuild2
-rw-r--r--dev-libs/keystone/Manifest3
-rw-r--r--dev-libs/keystone/keystone-0.9.1-r1.ebuild92
-rw-r--r--dev-libs/keystone/keystone-9999.ebuild41
-rw-r--r--dev-libs/libappindicator/Manifest2
-rw-r--r--dev-libs/libappindicator/libappindicator-12.10.0-r301.ebuild2
-rw-r--r--dev-libs/libbpf/Manifest2
-rw-r--r--dev-libs/libbpf/libbpf-0.0.9.ebuild47
-rw-r--r--dev-libs/libcroco/Manifest2
-rw-r--r--dev-libs/libcroco/libcroco-0.6.13.ebuild2
-rw-r--r--dev-libs/libcss/Manifest2
-rw-r--r--dev-libs/libcss/libcss-0.9.1.ebuild52
-rw-r--r--dev-libs/libdbusmenu/Manifest2
-rw-r--r--dev-libs/libdbusmenu/libdbusmenu-16.04.0-r1.ebuild2
-rw-r--r--dev-libs/libevdev/Manifest4
-rw-r--r--dev-libs/libevdev/libevdev-1.9.0.ebuild2
-rw-r--r--dev-libs/libevdev/libevdev-9999.ebuild2
-rw-r--r--dev-libs/libfido2/Manifest1
-rw-r--r--dev-libs/libfido2/files/libfido2-1.3.0-remove-openssh-middleware.patch45
-rw-r--r--dev-libs/libgcrypt/Manifest7
-rw-r--r--dev-libs/libgcrypt/libgcrypt-1.8.3-r1.ebuild75
-rw-r--r--dev-libs/libgcrypt/libgcrypt-1.8.3.ebuild74
-rw-r--r--dev-libs/libgcrypt/libgcrypt-1.8.4.ebuild75
-rw-r--r--dev-libs/libgcrypt/libgcrypt-1.8.5.ebuild3
-rw-r--r--dev-libs/libgnt/Manifest2
-rw-r--r--dev-libs/libgnt/libgnt-2.14.0.ebuild1
-rw-r--r--dev-libs/libgpg-error/Manifest4
-rw-r--r--dev-libs/libgpg-error/files/libgpg-error-1.38-cross_compile.patch40
-rw-r--r--dev-libs/libgpg-error/libgpg-error-1.38.ebuild15
-rw-r--r--dev-libs/libgudev/Manifest2
-rw-r--r--dev-libs/libgudev/libgudev-233-r1.ebuild2
-rw-r--r--dev-libs/libgusb/Manifest4
-rw-r--r--dev-libs/libgusb/libgusb-0.3.3.ebuild2
-rw-r--r--dev-libs/libgusb/libgusb-0.3.4.ebuild2
-rw-r--r--dev-libs/libindicator/Manifest4
-rw-r--r--dev-libs/libindicator/libindicator-12.10.1-r201.ebuild2
-rw-r--r--dev-libs/libindicator/libindicator-12.10.1-r301.ebuild2
-rw-r--r--dev-libs/libinput/Manifest4
-rw-r--r--dev-libs/libinput/libinput-1.15.5.ebuild2
-rw-r--r--dev-libs/libinput/libinput-1.15.6.ebuild83
-rw-r--r--dev-libs/libjcat/Manifest6
-rw-r--r--dev-libs/libjcat/libjcat-0.1.2.ebuild2
-rw-r--r--dev-libs/libjcat/libjcat-0.1.3.ebuild (renamed from dev-libs/libjcat/libjcat-0.1.1.ebuild)2
-rw-r--r--dev-libs/libmoe/Manifest9
-rw-r--r--dev-libs/libmoe/files/libmoe-1.5.8-gentoo.patch9
-rw-r--r--dev-libs/libmoe/files/libmoe-gcc-5.patch (renamed from dev-libs/libmoe/files/libmoe-1.5.8-gcc5.patch)0
-rw-r--r--dev-libs/libmoe/files/libmoe-gentoo.patch (renamed from dev-libs/libmoe/files/libmoe-1.5.8-makefile.patch)28
-rw-r--r--dev-libs/libmoe/libmoe-1.5.8-r3.ebuild34
-rw-r--r--dev-libs/libmoe/metadata.xml8
-rw-r--r--dev-libs/libnsfb/Manifest2
-rw-r--r--dev-libs/libnsfb/libnsfb-0.2.2.ebuild51
-rw-r--r--dev-libs/libnsutils/Manifest2
-rw-r--r--dev-libs/libnsutils/libnsutils-0.1.0.ebuild31
-rw-r--r--dev-libs/libparserutils/Manifest1
-rw-r--r--dev-libs/libparserutils/libparserutils-0.2.4-r2.ebuild44
-rw-r--r--dev-libs/librdkafka/Manifest2
-rw-r--r--dev-libs/librdkafka/librdkafka-1.4.2-r1.ebuild83
-rw-r--r--dev-libs/librdkafka/librdkafka-1.4.2-r2.ebuild83
-rw-r--r--dev-libs/librelp/Manifest2
-rw-r--r--dev-libs/librelp/librelp-1.6.0.ebuild2
-rw-r--r--dev-libs/libressl/Manifest2
-rw-r--r--dev-libs/libressl/libressl-3.1.3.ebuild63
-rw-r--r--dev-libs/libtasn1/Manifest2
-rw-r--r--dev-libs/libtasn1/libtasn1-4.16.0.ebuild2
-rw-r--r--dev-libs/libucl/Manifest4
-rw-r--r--dev-libs/libucl/libucl-0.8.1-r1.ebuild (renamed from dev-libs/libucl/libucl-0.8.1.ebuild)7
-rw-r--r--dev-libs/libucl/libucl-9999.ebuild7
-rw-r--r--dev-libs/libuv/Manifest8
-rw-r--r--dev-libs/libuv/libuv-1.35.0.ebuild2
-rw-r--r--dev-libs/libuv/libuv-1.37.0.ebuild2
-rw-r--r--dev-libs/libuv/libuv-1.38.0-r1.ebuild2
-rw-r--r--dev-libs/libuv/libuv-9999.ebuild2
-rw-r--r--dev-libs/libwapcaplet/Manifest2
-rw-r--r--dev-libs/libwapcaplet/libwapcaplet-0.4.3.ebuild45
-rw-r--r--dev-libs/libxls/Manifest2
-rw-r--r--dev-libs/libxls/libxls-1.5.3.ebuild39
-rw-r--r--dev-libs/libxml2/Manifest1
-rw-r--r--dev-libs/libxml2/libxml2-2.9.9-r2.ebuild224
-rw-r--r--dev-libs/libxmlb/Manifest2
-rw-r--r--dev-libs/libxmlb/libxmlb-0.1.15.ebuild2
-rw-r--r--dev-libs/libzip/Manifest2
-rw-r--r--dev-libs/libzip/libzip-1.7.1.ebuild112
-rw-r--r--dev-libs/nettle/Manifest2
-rw-r--r--dev-libs/nettle/nettle-3.6-r2.ebuild1
-rw-r--r--dev-libs/nsgenbind/Manifest2
-rw-r--r--dev-libs/nsgenbind/nsgenbind-0.8.ebuild33
-rw-r--r--dev-libs/nss/Manifest11
-rw-r--r--dev-libs/nss/files/nss-3.53-gentoo-fixups.patch290
-rw-r--r--dev-libs/nss/nss-3.51.1-r1.ebuild (renamed from dev-libs/nss/nss-3.51.1.ebuild)2
-rw-r--r--dev-libs/nss/nss-3.51.ebuild2
-rw-r--r--dev-libs/nss/nss-3.52.1-r1.ebuild2
-rw-r--r--dev-libs/nss/nss-3.52.ebuild2
-rw-r--r--dev-libs/nss/nss-3.53.1.ebuild350
-rw-r--r--dev-libs/opencl-clang/Manifest6
-rw-r--r--dev-libs/opencl-clang/opencl-clang-10.0.0.1.ebuild (renamed from dev-libs/opencl-clang/opencl-clang-9.0.0.ebuild)15
-rw-r--r--dev-libs/opencl-clang/opencl-clang-8.0.1_p20191001-r1.ebuild36
-rw-r--r--dev-libs/opencl-icd-loader/Manifest2
-rw-r--r--dev-libs/opencl-icd-loader/opencl-icd-loader-2020.06.16.ebuild50
-rw-r--r--dev-libs/opensc/Manifest3
-rw-r--r--dev-libs/opensc/files/opensc-0.20.0-gcc10.patch37
-rw-r--r--dev-libs/opensc/opensc-0.20.0.ebuild4
-rw-r--r--dev-libs/protobuf-c/Manifest2
-rw-r--r--dev-libs/protobuf-c/protobuf-c-1.3.2.ebuild2
-rw-r--r--dev-libs/protobuf/Manifest6
-rw-r--r--dev-libs/protobuf/protobuf-3.10.1.ebuild4
-rw-r--r--dev-libs/protobuf/protobuf-3.11.2.ebuild124
-rw-r--r--dev-libs/protobuf/protobuf-3.11.4.ebuild4
-rw-r--r--dev-libs/re2/Manifest2
-rw-r--r--dev-libs/re2/re2-0.2020.06.01.ebuild52
-rw-r--r--dev-libs/redland-bindings/Manifest2
-rw-r--r--dev-libs/redland-bindings/redland-bindings-1.0.17.1-r1.ebuild10
-rw-r--r--dev-libs/serd/Manifest2
-rw-r--r--dev-libs/serd/serd-0.30.4.ebuild53
-rw-r--r--dev-libs/tre/Manifest2
-rw-r--r--dev-libs/tre/tre-0.8.0-r2.ebuild2
-rw-r--r--dev-libs/xmlsec/Manifest2
-rw-r--r--dev-libs/xmlsec/xmlsec-1.2.30.ebuild61
165 files changed, 2183 insertions, 1857 deletions
diff --git a/dev-libs/Ice/Ice-3.6.4.ebuild b/dev-libs/Ice/Ice-3.6.4.ebuild
deleted file mode 100644
index e89fe01a3f02..000000000000
--- a/dev-libs/Ice/Ice-3.6.4.ebuild
+++ /dev/null
@@ -1,357 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-RUBY_OPTIONAL="yes"
-USE_RUBY="ruby24"
-
-PHP_EXT_NAME="IcePHP"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-
-PHP_EXT_OPTIONAL_USE=php
-
-USE_PHP="php7-0"
-
-# This variable does not belong to any eclass. It is solely used in this ebuild
-# db:6.2 breaks the build process
-BERKDB_SLOTS=( 6.1 5.3 5.1 4.8 )
-
-inherit db-use mono-env php-ext-source-r3 python-r1 ruby-ng toolchain-funcs eapi7-ver
-
-DESCRIPTION="ICE middleware C++ library and generator tools"
-HOMEPAGE="https://zeroc.com/products/ice"
-SRC_URI="https://github.com/zeroc-ice/ice/archive/v${PV}.tar.gz -> ${P}.tar.gz
- doc? ( http://download.zeroc.com/Ice/$(ver_cut 1-2)/${P}.pdf )"
-LICENSE="GPL-2"
-SLOT="0/36"
-KEYWORDS="amd64 ~arm x86"
-IUSE="doc examples libressl +ncurses mono php python ruby test debug"
-RESTRICT="test"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND=">=dev-libs/expat-2.0.1
- >=app-arch/bzip2-1.0.5
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
- || (
- $(for slot in ${BERKDB_SLOTS[@]} ; do printf '%s\n' "sys-libs/db:${slot}[cxx]" ; done)
- )
- dev-cpp/libmcpp
- python? ( ${PYTHON_DEPS} )
- ruby? ( $(ruby_implementation_depend ruby24) )
- mono? ( dev-lang/mono )
- php? ( dev-lang/php:7.0 )
- !dev-python/IcePy
- !dev-ruby/IceRuby"
-DEPEND="${RDEPEND}
- ncurses? ( sys-libs/ncurses:0= sys-libs/readline:0= )
- test? (
- ${PYTHON_DEPS}
- dev-python/passlib[${PYTHON_USEDEP}]
- )"
-
-# Maintainer notes:
-# TODO: java bindings, multiple ruby versions (supports 2.{1,2,3})
-
-S="${WORKDIR}/${P/I/i}"
-PHP_EXT_S="${S}/php"
-
-PATCHES=(
- "${FILESDIR}/${PN}-3.6.3-no-arch-opts.patch"
- "${FILESDIR}/${PN}-3.6.3-csharp.patch"
- #"${FILESDIR}/${PN}-3.6.3-libressl.patch"
-)
-
-pkg_setup() {
- # prevent ruby-ng.eclass from messing with pkg_setup
- return
-}
-
-src_unpack() {
- # prevent ruby-ng.eclass from messing with src_unpack
- default
-}
-
-src_prepare() {
- default
-
- sed -i \
- -e 's|\(install_configdir[[:space:]]*\):=|\1?=|' \
- -e 's|-L\$\(libdir\)||' \
- cpp/config/Make.rules || die "sed failed"
-
- sed -i \
- -e 's|\(install_phpdir[[:space:]]*\):=|\1?=|' \
- -e 's|\(install_libdir[[:space:]]*\):=|\1?=|' \
- php/config/Make.rules.php || die "sed failed"
-
- sed -i \
- -e 's|\(install_pythondir[[:space:]]*\)=|\1?=|' \
- -e 's|\(install_rubydir[[:space:]]*\)=|\1?=|' \
- -e 's|\(install_libdir[[:space:]]*\):=|\1?=|' \
- {python,ruby}/config/Make.rules || die "sed failed"
-
- sed -i \
- -e 's|-O2 ||g' \
- -e 's|-Werror ||g' \
- cpp/config/Make.rules.Linux || die "sed failed"
-
- sed -i \
- -e 's|install-common||' \
- {cpp,csharp,php,python,ruby}/Makefile || die "sed failed"
-
- sed -i \
- -e 's|-f -root|-f -gacdir $(GAC_DIR) -root|' \
- -e 's|\(install_libdir[[:space:]]*\):=|\1?=|' \
- -e 's|\(install_pkgconfigdir[[:space:]]*\):=|\1?=|' \
- csharp/config/Make.rules.cs || die "sed failed"
-
- # skip mono tests, bug #498484
- sed -i \
- -e '/SUBDIRS/s|\ test||' \
- csharp/Makefile || die "sed failed"
-
- # skip udp test due to multicast
- # skip IceGrid/admin bug #649850
- # skip IceSSL tests due to requirement of internet connection
- # skip IceStorm/single bug #636834
- # IceStorm/stress fails without USE=debug
- # IceUtil/stacktrace fails with USE=debug
- sed -i \
- -e 's|allTests.py|allTests.py --rfilter=IceUtil\/stacktrace --rfilter=udp --rfilter=IceGrid\/admin --rfilter=IceSSL --rfilter=IceStorm\/single --rfilter=IceStorm\/stress|' \
- cpp/Makefile || die "sed failed"
-
- # mainly broken .ice files
- sed -i \
- -e 's|allTests.py|allTests.py --rfilter=operations --rfilter=slicing\/objects|' \
- python/Makefile || die "sed failed"
-
- # fails even on unicode locale
- sed -i \
- -e 's|allTests.py|allTests.py --rfilter=Slice\/unicodePaths|' \
- ruby/Makefile || die "sed failed"
-
- # fix for x86 IceBox test
- sed -i \
- -e 's|"32"|""|' \
- scripts/TestUtil.py || die "sed failed"
-}
-
-src_configure() {
- suitable_db_version() {
- local ver
- for ver in "${BERKDB_SLOTS[@]}"; do
- if [[ -n $(db_findver sys-libs/db:${ver}) ]]; then
- echo "${ver}"
- return 0
- fi
- done
- die "No suitable BerkDB versions found, aborting"
- }
-
- MAKE_RULES=(
- "prefix=\"${ED%/}/usr\""
- "install_docdir=\"${ED%/}/usr/share/doc/${PF}\""
- "install_configdir=\"${ED%/}/usr/share/${P}/config\""
- "install_mandir=\"${ED%/}/usr/share/man/man1\""
- "embedded_runpath_prefix=\"${EPREFIX}/usr\""
- "LP64=yes"
- "new_dtags=yes"
- "NOTEST=$(usex !test)"
- "USE_READLINE=$(usex ncurses)"
- "OPTIMIZE=$(usex !debug)"
- )
-
- local BERKDB_VERSION="$(suitable_db_version)"
- MAKE_RULES+=("DB_FLAGS=-I$(db_includedir ${BERKDB_VERSION})")
- sed -i \
- -e "s|g++|$(tc-getCXX)|" \
- -e "s|\(CFLAGS[[:space:]]*=\)|\1 ${CFLAGS}|" \
- -e "s|\(CXXFLAGS[[:space:]]*=\)|\1 ${CXXFLAGS}|" \
- -e "s|\(LDFLAGS[[:space:]]*=\)|\1 ${LDFLAGS}|" \
- -e "s|\(DB_LIBS[[:space:]]*=\) \-ldb_cxx|\1 -ldb_cxx-$(db_findver sys-libs/db:${BERKDB_VERSION})|" \
- cpp/config/Make.rules{,.Linux} python/config/Make.rules || die "sed failed"
-
- if use python; then
- local S="${S}/python"
- python_copy_sources
- fi
-
- if use ruby; then
- SITERUBY="$(ruby24 -r rbconfig -e 'print RbConfig::CONFIG["sitelibdir"]')"
- MAKE_RULES_RUBY=(
- "install_rubydir=\"${ED%/}/${SITERUBY}\""
- "install_libdir=\"${ED%/}/${SITERUBY}\""
- )
-
- # make it use ruby24 only
- sed -i \
- -e 's|RUBY = ruby|\024|' \
- ruby/config/Make.rules || die "sed failed"
- sed -i \
- -e 's|env ruby|\024|' \
- ruby/config/s2rb.rb || die "sed failed"
- sed -i \
- -e 's|env ruby|\024|' \
- ruby/scripts/slice2rb || die "sed failed"
- sed -i \
- -e 's|output.write("ruby|\024|' \
- scripts/TestUtil.py || die "sed failed"
- fi
-
- MAKE_RULES_MONO=(
- "GACINSTALL=yes"
- "GAC_ROOT=\"${ED%/}/usr/$(get_libdir)\""
- "GAC_DIR=\"${EPREFIX}/usr/$(get_libdir)\""
- "install_libdir=\"${ED%/}/usr/$(get_libdir)\""
- "install_pkgconfigdir=\"${ED%/}/usr/$(get_libdir)/pkgconfig\""
- )
-
- if has_version ">dev-lang/mono-4"; then
- MAKE_RULES_MONO+=("MCS=mcs")
- fi
-
- use test && python_setup
-}
-
-src_compile() {
- # Do not remove this export or build will break!
- tc-export CXX
-
- emake -C cpp "${MAKE_RULES[@]}"
-
- if use php; then
- local i
- for i in $(php_get_slots); do
- mkdir -p "${WORKDIR}/${i}" || die
- cp -r "${PHP_EXT_S}" "${WORKDIR}/${i}/" || die "Failed to copy source ${PHP_EXT_S} to PHP target directory"
-
- pushd "${WORKDIR}/${i}" >/dev/null || die
- ln -s "${S}/cpp" || die
- ln -s "${S}/config" || die
- ln -s "${S}/slice" || die
- ln -s "${S}/Makefile" || die
-
- emake -C php "${MAKE_RULES[@]}" USE_NAMESPACES=yes "PHP_CONFIG=\"${EPREFIX}/usr/$(get_libdir)/${i}/bin/php-config\""
- popd >/dev/null || die
- done
- fi
-
- if use python; then
- building() {
- emake -C "${BUILD_DIR}" "${MAKE_RULES[@]}" PYTHON="${EPYTHON}"
- }
- local S="${S}/python"
- python_foreach_impl building
- fi
-
- if use ruby; then
- emake -C ruby "${MAKE_RULES[@]}" "${MAKE_RULES_RUBY[@]}"
- fi
-
- if use mono; then
- emake -C csharp "${MAKE_RULES[@]}" "${MAKE_RULES_MONO[@]}"
- fi
-}
-
-src_test() {
- local -x LD_LIBRARY_PATH="${S}/cpp/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
- emake -C cpp "${MAKE_RULES[@]}" test
-
- # php tests require the extension loaded and are therefore skipped
-
- if use python; then
- testing() {
- emake -C "${BUILD_DIR}" \
- "${MAKE_RULES[@]}" \
- PYTHON="${EPYTHON}" \
- install_pythondir="\"${D%/}/$(python_get_sitedir)\"" \
- install_libdir="\"${D%/}/$(python_get_sitedir)\"" test
- }
- local S="${S}/python"
- python_foreach_impl testing
- fi
-
- if use ruby; then
- emake -C ruby "${MAKE_RULES[@]}" "${MAKE_RULES_RUBY[@]}" test
- fi
-
- if use mono; then
- # skip mono tests, bug #498484
- ewarn "Tests for C# are currently disabled."
- #emake -C csharp "${MAKE_RULES[@]}" "${MAKE_RULES_MONO[@]}" test
- fi
-}
-
-src_install() {
- local DOCS=( CHANGELOG*.md README.md )
- use doc && DOCS+=( "${DISTDIR}/${P}.pdf" )
- einstalldocs
-
- insinto /usr/share/${P}
- doins -r slice
-
- emake -C cpp "${MAKE_RULES[@]}" install
-
- if use examples; then
- docinto examples-cpp
- dodoc cpp/config/*.cfg
- docompress -x /usr/share/doc/${PF}/examples-cpp
- fi
-
- if use php; then
- insinto "/usr/share/php/${PN}"
-
- local i
- while IFS="" read -d $'\0' -r i; do
- doins "${i}"
- done < <(find "${S}/php/lib/" -name '*.php' -print0)
-
- pushd "${ED%/}/usr/share/${P}/slice" >/dev/null || die
-
- local -x LD_LIBRARY_PATH="${ED%/}/usr/$(get_libdir):${LD_LIBRARY_PATH}"
- for i in *; do
- mkdir -p "${ED%/}/usr/share/php/${i}" || die
- "${ED%/}"/usr/bin/slice2php \
- -I"${ED%/}/usr/share/${P}/slice/" --all \
- --output-dir "${ED%/}/usr/share/php/${i}" \
- --ice "${ED%/}/usr/share/${P}/slice/${i}"/*
- done
-
- for i in $(php_get_slots); do
- php_init_slot_env "${i}"
- insinto "${EXT_DIR}"
- newins "php/lib/${PHP_EXT_NAME}.so" "${PHP_EXT_NAME}.so"
- done
- php-ext-source-r2_createinifiles
-
- popd >/dev/null || die
- fi
-
- if use python; then
- installation() {
- mkdir -p "${D%/}/$(python_get_sitedir)" || die
-
- emake -C "${BUILD_DIR}" \
- "${MAKE_RULES[@]}" \
- install_pythondir="\"${D%/}/$(python_get_sitedir)\"" \
- install_libdir="\"${D%/}/$(python_get_sitedir)\"" \
- install
- }
- local S="${S}/python"
- python_foreach_impl installation
- fi
-
- if use ruby; then
- dodir "${SITERUBY}"
- emake -C ruby "${MAKE_RULES[@]}" "${MAKE_RULES_RUBY[@]}" install
- fi
-
- if use mono; then
- emake -C csharp "${MAKE_RULES[@]}" "${MAKE_RULES_MONO[@]}" install
- fi
-}
diff --git a/dev-libs/Ice/Manifest b/dev-libs/Ice/Manifest
index 262e81687d27..2d82689431a7 100644
--- a/dev-libs/Ice/Manifest
+++ b/dev-libs/Ice/Manifest
@@ -4,5 +4,4 @@ AUX Ice-3.6.3-no-arch-opts.patch 1462 BLAKE2B 0adbbb302a3fde0dab4dba0b5947ee5da3
DIST Ice-3.6.4.pdf 8907736 BLAKE2B 5a631c1e2e147c8ed3b31a84192210c92bbe83e8644ec9d7d164d1b94a20069ce77f6baf54910ac00c7216cbc2979caac6fa78457e9292a84407e93000f9903a SHA512 9bd2d373eb83e08e563cab174a53063a490367dea3e4b910f93f0477c3817282c859f07e46e503006e9bd37678fb6da31a58b88bfabd217b5e371fff685321a0
DIST Ice-3.6.4.tar.gz 5523841 BLAKE2B 4e50dcf0f004f14a38c173f181cabb97fdc201786c338800b9750dc0cf6ce9b1397ea26b4357de1f6e1ac6b4e69abbe2bf464a5f9c2926f6ae45abbf5a69803b SHA512 fdb412ce591bca7aede2ac7d70600184f3b67279e8ffdfee3649f517d5531d2dfee54b37d0cc6de2ef5de8ecd281c39d6c951781b68f9a36316a7607cefb9e57
EBUILD Ice-3.6.4-r1.ebuild 9395 BLAKE2B 603b20d5519a696d33b600476bd788fc4cf4eab43f3cd0ad91aec2f55cf75ed613ced0aa98c87ee95e8d79eef78ea1217ba53a45e2af1912cad0e4a7959f2814 SHA512 0715d673d446b17d1d6385659683e15cd2cc0da5fbcca253581bfffb4acb372baf93a68278eb1a40ae2bf373ccaaa366729daadd608990d835dea53af57ca5eb
-EBUILD Ice-3.6.4.ebuild 9395 BLAKE2B 22ed870699be2ca3ee6d885d7cf91aef3ece292cc05bc50149387b20a226e94907fc39ce43114f6451e0e953acb2884e464719de669b873128e2e3c4dfeb0be8 SHA512 432e4876cea57c3acb2b2933612e8bbc7edd994a7e8a25b9de837f763b3c941205c6d5d1084c8c357a899be4184df965c71c77b9983adbeb1941d8d3b1cb44cd
MISC metadata.xml 561 BLAKE2B 83daa42cf58f641a94bf0b24125dbca8cfd34d86d540cb7daecea4c089309279eb0a423f5f785efff9bafe34347fcfada2be36700a1f94afbdb6308e7d883d9f SHA512 35dcc56cb261e0f98fe6ae2da115ce7c66bd8568e9313eefb2c55d3d03cfda451d7f64738b0e50f64e01c5b7f8e60e1e0d8c6219be6b22dee45cd505a28aaa41
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 18ba663408f7..55eff45faee3 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
Binary files differ
diff --git a/dev-libs/appstream/Manifest b/dev-libs/appstream/Manifest
index 47a03b199d8e..51f332fa80d9 100644
--- a/dev-libs/appstream/Manifest
+++ b/dev-libs/appstream/Manifest
@@ -1,7 +1,5 @@
-DIST AppStream-0.12.10.tar.xz 2045744 BLAKE2B fd8f96bd0b829e73bbbb5ae725feaf8f1275f2ed4a50ad107fddc52cdfd7d7c2e382235fc322513cdfe000789505e7b9998bb4e601e223d673ee65c0fbb55c25 SHA512 5cd7da7adbd035947bde6a6d7655dc2f7c1be25cef102e51ef88e8f684a83b196a41b440edaabdd89da69a9117a26dad30e548b86b50f324f0ba70eef95a6060
DIST AppStream-0.12.11.tar.xz 2120548 BLAKE2B 6053d1d1bbe182c8e57f657ea5dda9c4a777d5a7955f39a57677502fbbe010d5c49a7872329d1ef716c41c7423bfb4d284e71af97f99ca6e466fbf369bf80272 SHA512 6000f4e9f995b2d481374db2409f212da9d48893c4a757cb7287e2731117f50d0ed284dedc0e24e505b3b7c9c9f38dd9a5f855eeb6c7445eb7203e74d4a5f790
DIST AppStream-0.12.7.tar.xz 1958948 BLAKE2B 51a70395e4801ceeb3e97ac081f4c45be242cca14728f8efc5eec0d4b3cfa4cc9fab9ef7429c18e9bbb0dedb693a847258be1b11491155658a6ffa2a28358e35 SHA512 53ca7ebde3fcd345a895527da2ac5d829a09f25d28836a867b500282fba3465bde657cd75a4030cb831022f7a0d9f50aadb36078d62924e4d0edad6bfe3c5561
-EBUILD appstream-0.12.10.ebuild 1695 BLAKE2B 4ebb95eca1abb10ee9ca9f9dbd6ab2c766b1718ffd7f5fa1e08354451493cab0ad9a2a19866582f9c4525dd077c4cd81987c0040990991b41f152ce038877a99 SHA512 e46cf958e89a2f7247f24d36d8baf056b2ce0dc0bba00f0c87d3df7997b3100807c6c82124cff92a8570b17b859486f3e948662941c5ca1cec0720a296954c5a
EBUILD appstream-0.12.11.ebuild 1695 BLAKE2B 4ebb95eca1abb10ee9ca9f9dbd6ab2c766b1718ffd7f5fa1e08354451493cab0ad9a2a19866582f9c4525dd077c4cd81987c0040990991b41f152ce038877a99 SHA512 e46cf958e89a2f7247f24d36d8baf056b2ce0dc0bba00f0c87d3df7997b3100807c6c82124cff92a8570b17b859486f3e948662941c5ca1cec0720a296954c5a
EBUILD appstream-0.12.7.ebuild 1619 BLAKE2B 0355409cb6ed3d49aba5deee05dddb87dd000b45427a472a1ca39a9c887567ef7f26cbf777eb9b9a6ec50e90b5544c1c607636ec22f8227ac5f087e7b2d0bcec SHA512 90a0ab33c5cf51b48c4297da10e26765b18a55bf5d2b18c051d6119ef10bc94d6470cb708d3105af39349ec63de90c1f03883544dcecad6853bce85f09b9b4fb
MISC metadata.xml 399 BLAKE2B 433fcfbb840f3efc4130de1a4b9a18ce3b1762363bfa67d994a063098da0397b6776a6154250ad5a35a4960241234f2ba3dc2464b760cf19cbb680590d559049 SHA512 1f81f3603fc34a3dbeb570fe83ed2ff97e4ea2391cda7d7ceef017624a8498052cda4a21dee1f6b8eb41407998dfcecd765bde556837d00b13caaa41989f934f
diff --git a/dev-libs/appstream/appstream-0.12.10.ebuild b/dev-libs/appstream/appstream-0.12.10.ebuild
deleted file mode 100644
index 4d3a31bbb3b3..000000000000
--- a/dev-libs/appstream/appstream-0.12.10.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson xdg-utils
-
-if [[ ${PV} = *9999* ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/ximion/${PN}"
-else
- SRC_URI="https://www.freedesktop.org/software/appstream/releases/AppStream-${PV}.tar.xz"
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
- S="${WORKDIR}/AppStream-${PV}"
-fi
-
-DESCRIPTION="Cross-distro effort for providing metadata for software in the Linux ecosystem"
-HOMEPAGE="https://www.freedesktop.org/wiki/Distributions/AppStream/"
-
-LICENSE="LGPL-2.1+ GPL-2+"
-# check as_api_level
-SLOT="0/4"
-IUSE="apt doc +introspection qt5 test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
- dev-libs/appstream-glib
- dev-libs/libxslt
- dev-util/itstool
- >=sys-devel/gettext-0.19.8
- doc? ( app-text/docbook-xml-dtd:4.5 )
- test? ( dev-qt/linguist-tools:5 )
-"
-RDEPEND="
- dev-db/lmdb:=
- >=dev-libs/glib-2.58:2
- dev-libs/libxml2:2
- dev-libs/libyaml
- dev-libs/snowball-stemmer
- >=net-libs/libsoup-2.56:2.4
- introspection? ( >=dev-libs/gobject-introspection-1.56:= )
- qt5? ( dev-qt/qtcore:5 )
-"
-DEPEND="${RDEPEND}
- test? ( qt5? ( dev-qt/qttest:5 ) )
-"
-
-src_prepare() {
- default
- sed -e "/^as_doc_target_dir/s/appstream/${PF}/" -i docs/meson.build || die
- if ! use test; then
- sed -e "/^subdir.*tests/s/^/#DONT /" -i {,qt/}meson.build || die # bug 675944
- fi
-}
-
-src_configure() {
- xdg_environment_reset
-
- local emesonargs=(
- -Dapidocs=false
- -Ddocs=false
- -Dmaintainer=false
- -Dstemming=true
- -Dvapi=false
- -Dapt-support=$(usex apt true false)
- -Dinstall-docs=$(usex doc true false)
- -Dgir=$(usex introspection true false)
- -Dqt=$(usex qt5 true false)
- )
-
- meson_src_configure
-}
diff --git a/dev-libs/atk/Manifest b/dev-libs/atk/Manifest
index a9ec7102d26a..a672e06a5bc5 100644
--- a/dev-libs/atk/Manifest
+++ b/dev-libs/atk/Manifest
@@ -1,5 +1,5 @@
DIST atk-2.34.1.tar.xz 293140 BLAKE2B 8ae280583867460734ca001eb01963eefcc519eb09658e2e793cd1a07831e8e5ade20a4d38bb5925a1103da206d9d6283a2b1892c671f12090b3eefac04b34e1 SHA512 a7c8ec7c2166bb8734b065402bf7700cdc69f56c0958663e88596b155a20063e4cfbf1754d8b8ed94a4e509db2e97e2603b0a8037e61028acc85930e631a633e
DIST atk-2.36.0.tar.xz 299100 BLAKE2B 46f0cc10052788643c09e27e36a3f74439864cf5c8fdfcf5850e3e7df596ac8a2a3dd8a01856503d43995ff1cc36ec0ca63884133f2c5f4a3634aad2c5119997 SHA512 d0f18204eaf96511e8448e3dfbc4b6953a7cf8b816151fb7caf5592cf578572b1cdb16836fe2157b11e3ad018ef171f1ca1bfdf255bb31bb455716d7519fd634
-EBUILD atk-2.34.1.ebuild 1163 BLAKE2B 0319d6db1bb6a9170794a2b2e67332284d4575441813cbf0e2b88ae44780562865dc5fbf496358e8169264dc12ec6d20ea5451862abf5c6c270ec2964f507129 SHA512 18df0577de37cf4df8ce11e11f14a037976159c327e31b5df835618473971ac47e35975031096a9f289ef6ab1c6b91c0ffc1e20e947ef4cd1404f4841fc4da84
-EBUILD atk-2.36.0.ebuild 1171 BLAKE2B 09ef391df20e8888a5d549560f80f89757da1683c7d55abb34c09185c754f51dcfaae2b904bf5787f5a3ca45fa5f323706f347bc2b6b66641daf89480bce01b1 SHA512 deabb24be76f47cc4018769efa10780eded48ba75e9d7f678277dc1f361fa1714ee9ca0c74ad60c56f661b45a3f36a4db3817c259337cadb024710ea00f183df
+EBUILD atk-2.34.1.ebuild 1136 BLAKE2B 258da793056c38e69971be60bee19954c9852094b6dc54d0f936df83d40f7eebe62d3e82b0621a34ed1a5e1509d74b27b088ddf4db5665aca7a67065d1be7df6 SHA512 2484f173bfcc79ce6364e47e05b3c631f11e64212bae571b7f533f749f7efbc934d47aef4be6c7287d75002a28d5d9ce5dbd1d472011c1d9c7337cd9e3a64f59
+EBUILD atk-2.36.0.ebuild 1144 BLAKE2B 2dc0e84a03bca7e2672797d1d68f68b7b2493d21ee37e090222396b7dd2df8e7c58632cf40b670aca5b801d28598e62d5e9c33c28279bde326cabe1485c97b2a SHA512 bd042bf5cb08c697e284108bde08f8f7513c0a0d530097ee7c10091ab686dfebc7552c26641fbda543da4a4628d674523b9e61257c1235a033cb5b09a5743f0b
MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/atk/atk-2.34.1.ebuild b/dev-libs/atk/atk-2.34.1.ebuild
index e50315c40880..46521641412a 100644
--- a/dev-libs/atk/atk-2.34.1.ebuild
+++ b/dev-libs/atk/atk-2.34.1.ebuild
@@ -22,7 +22,7 @@ BDEPEND="
gtk-doc? (
>=dev-util/gtk-doc-1.25
app-text/docbook-xml-dtd:4.3 )
- >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+ virtual/pkgconfig
>=sys-devel/gettext-0.19.8
"
diff --git a/dev-libs/atk/atk-2.36.0.ebuild b/dev-libs/atk/atk-2.36.0.ebuild
index 4e54ebb066df..fb26bc563698 100644
--- a/dev-libs/atk/atk-2.36.0.ebuild
+++ b/dev-libs/atk/atk-2.36.0.ebuild
@@ -22,7 +22,7 @@ BDEPEND="
gtk-doc? (
>=dev-util/gtk-doc-1.25
app-text/docbook-xml-dtd:4.3 )
- >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+ virtual/pkgconfig
>=sys-devel/gettext-0.19.8
"
diff --git a/dev-libs/botan/Manifest b/dev-libs/botan/Manifest
index f312591c3bda..6eb32a084b64 100644
--- a/dev-libs/botan/Manifest
+++ b/dev-libs/botan/Manifest
@@ -1,14 +1,7 @@
-AUX botan-1.10.17-build.patch 874 BLAKE2B 94898dc7730c921ea4a545fdad5d5eeb91432ee7af503dd2fc8a59185c5406b659629ee5a0c4f73c2c090dfccf64757baea196fcca4f60379a2b2f04baf81ee6 SHA512 bccb615e832ef31381afd0996a06cfb4c37f29bd8d7691435d592f2ec88f525f3e9e19adf84c78ebd6f24f60e407e29ef99bdff11103ef1344250fe5251fca0a
-AUX botan-1.10.17-libressl.patch 1344 BLAKE2B e465b852e17ce920022663a8ea25684b2340fff699eb4b89d97784ffbec9e395200ffb2b9aa2226448e199f51a176409ed086e909c4ae431ede21c66d3de334b SHA512 dee61a141a10572c4d4c111527bbca3bd77808a2642ddb9cb105785badc10babd0406b1634c62c355e5361b9281c989666851d0fb81b3e000b62570e429fd642
AUX botan-2.14.0-bindist-test-fix.patch 3167 BLAKE2B bb94b4081469c8cfcfff5a187151eacbb5dc1be0bf0ce87ee434da40cefb8e898bae478940c3410c873b1f58c75cf915d7ebe2b90a713a0428db8842fac1be33 SHA512 c60bbe81a007b8f8a5cb197542ae3a2fc1c94c76f10d1ff6ca18576fee84106aca29c158b1c9a967f047c3ca9b527255772bd66ad859f9d49c6e94c86b61b71c
AUX botan-2.9.0-build.patch 1886 BLAKE2B 62f6b5f9c47ded4c460c6c6b3057cbbb95711b5b5db300523f45e25e6bc161277174ea4c461e872f24bfd23839510a7857c44733a333cb6054b7dc183faa3e2e SHA512 90948e75d5bb6f2620a92fe4aea37d05aaf25e98430b112651aa6ad635f19f8659658ae79d16e60e27ca61ec5da92d5dd1c234c4c9e2ae0fab44b92806bcafe0
-DIST Botan-1.10.17.tgz 2706678 BLAKE2B bce65493c702381aaa747c2b935c545f85704b93bb6be4bf225048cc14812999291bbbe86786c2b00865489ec47d63128b12ef1020be8651be57fa1c84006a7c SHA512 a47cab3af113652247c8efc8b0f043eb62175eaa8554833d5fc3016ea94dbdd8aa722ab9b5226cc5f133afbcc088d54362111630eaa4594812c39925cc3c8649
-DIST Botan-2.11.0.tar.xz 5765712 BLAKE2B 5602ef9485363b21f6f622f7370e486d834477730c2fc2f0bb9211db944d2b2a6a03d8ae14845cf871f648c76c77fd3e18804bd598f805a5754e3bfadb114d5d SHA512 a697a7f29788afc561cde35431e65e2f37e40fd45af89a6d060bf9988d28089905c6a1c005f9b23fb377547cd7a96a41f62c8d2f61a7f80d1ca1b9ccf857a2ce
DIST Botan-2.14.0.tar.xz 5958948 BLAKE2B 90e73945b22f6e4e8d6163bfb45eca153eb1495448f8bf35514b780fd12bb1b81c822314e1f598c7625277f1e9cf7a6265387cca80ffd4c2664c681b9d4807fd SHA512 ee15928ecdb0127720b444b0207d46fd68fe3007125b0deb8bdd32f96e9befb684ad54009354da4f6a3c48b9698693b46223710a47fd644da8760dda53d40d34
DIST Botan-2.9.0.tgz 7216373 BLAKE2B 5ad2e15db871ccc3a32b29b7f54a02d69f251f0aca2ce656b557dbbb3814a793053a54905371b3414ad72952a64bece43e2383da91f205f68b0fe31be2f9439c SHA512 b88f3894a4a5b7b2fbff9be6eb0b774bf679a014bd2364811b7e63d4f323e22ca9ef916491afbc2cdf9db68727c1449fbeb6fd417e591560add0955517db3f65
-EBUILD botan-1.10.17-r2.ebuild 4260 BLAKE2B a638b40227d5f8e4f4776407718ab20921930d1e0aebf73322097ea5e106c77c570f4b59890a044f965930cfc3c04900e359027793ea70835e98e6df1d5a0cc3 SHA512 8735649c85d603ceba417a7d2b5d61a3067c4e8493965d54d02c10fbf48e431846dcb3138a313fe00eea1a12fec7d84d8a43e7a7160b6ba54e9e7da1c940c093
-EBUILD botan-2.11.0.ebuild 2458 BLAKE2B 9b222461452f52d637669263c552779697b12b8e843490e8257061148864cdc820f94dd1e3fba4445ecaad8318597a7b792a3d8f45b9525478646779dfd7457d SHA512 af7f1e9d8f65ef7b0fd6b09d1b239a43456382929e490600fb77eb28d5412ab5fac82e92c433017bf666d3e7ad3e4ba68f9a832191bae5d3d2c32e3977d941e1
EBUILD botan-2.14.0-r1.ebuild 2708 BLAKE2B 5ef16c8ccbb43488a9e06641f9aff6d9b7ab6f8265c2c4a007325181a6a01c1ad9553ecc70b646273bcbf7680640013e692ccbfcb80d037d3b52d2a9d2ed8f24 SHA512 0b57b3c3550c02ee0d4c3deb8ef70f68e202c04811235de8a8ab92d55eee2d548d041f0b1971d68e039a2dfab3c49273d545e0a42a7203121b48856d53af6241
-EBUILD botan-2.14.0.ebuild 2459 BLAKE2B ec844c7d54d51204af44e4e55464a71b1c15670326a267d28a0c177314cf49eaab7ee43b7b64a4ef2af00d47f0809d3f1778f87c6a4d1a28a164fe9007320c2c SHA512 4e9df2af74bac749cf9a74a14286962e35a245912e248530221200fa5d07280ff45f71398863055373704eaabde6535dbcd8f61b343a8c522d7fa9856ece5054
EBUILD botan-2.9.0.ebuild 2520 BLAKE2B 05a0f8bdd64a4f1c5cdfbcaf2c25e2c104f6e2f2e530836f1c1b3bca690ab10e68acf6a8dda28bb74ad48f571472cb406c7bb46eddd0f6471b26a7b9376b4cc3 SHA512 fe4b4d40ddf86130ccfd96601f885447805475a0e66f1f2cfc1398b454269567feaa83480935a52398e72a76aea2b8d7b5284caca8092e77d0500eccdab4ff7c
MISC metadata.xml 492 BLAKE2B c8e3a6426a1aeaeb0695e8ea5217d6ff49210ea5d81d842daeaa433535f57a487d04b987d59a548ee44ab45b66c5da2f4d64e35a445848e476d415ffb0e88305 SHA512 80160b6d84260644b66622005766ac2725274109aca7d29814e5e544cbda51ba35ceb3162bed329aeeca2ebe9299af4c77fc3f32fef7b08bbc8e2889a4a6fb56
diff --git a/dev-libs/botan/botan-1.10.17-r2.ebuild b/dev-libs/botan/botan-1.10.17-r2.ebuild
deleted file mode 100644
index 80af870a2c46..000000000000
--- a/dev-libs/botan/botan-1.10.17-r2.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_6 )
-
-inherit multilib python-r1 toolchain-funcs
-
-MY_PN="Botan"
-MY_P="${MY_PN}-${PV}"
-DESCRIPTION="A C++ crypto library"
-HOMEPAGE="https://botan.randombit.net/"
-SRC_URI="https://botan.randombit.net/releases/${MY_P}.tgz"
-
-KEYWORDS="amd64 ~arm hppa ~ia64 ppc ppc64 ~sparc x86 ~ppc-macos"
-SLOT="0"
-LICENSE="BSD"
-IUSE="bindist doc python bzip2 gmp libressl ssl static-libs threads zlib"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-S="${WORKDIR}/${MY_P}"
-
-DEPEND="python? ( ${PYTHON_DEPS} )"
-RDEPEND="${DEPEND}
- bzip2? ( >=app-arch/bzip2-1.0.5 )
- zlib? ( >=sys-libs/zlib-1.2.3 )
- python? ( ${PYTHON_DEPS} >=dev-libs/boost-1.48[python,${PYTHON_USEDEP}] )
- gmp? ( >=dev-libs/gmp-4.2.2:* )
- ssl? (
- !libressl? ( <dev-libs/openssl-1.1:0=[bindist=] )
- libressl? ( dev-libs/libressl:0= )
- )"
-BDEPEND="dev-lang/python:*
- doc? ( dev-python/sphinx )"
-
-PATCHES=(
- "${FILESDIR}/${P}-build.patch"
- "${FILESDIR}/${P}-libressl.patch"
-)
-
-src_prepare() {
- default
-
- sed -e "s/-Wl,-soname,\$@ //" -i src/build-data/makefile/python.in || die "sed failed"
- sed \
- -e "/DOCDIR/d" \
- -e "/^install:/s/ docs//" \
- -i src/build-data/makefile/unix_shr.in || die "sed failed"
-
- # Fix ImportError with Python 3.
- sed -e "s/_botan/.&/" -i src/wrap/python/__init__.py || die "sed failed"
-
- use python && python_copy_sources
-}
-
-src_configure() {
- local disable_modules="proc_walk,unix_procs"
- use threads || disable_modules+=",pthreads"
- use bindist && disable_modules+=",ecdsa"
- elog "Disabling modules: ${disable_modules}"
-
- # Enable v9 instructions for sparc64
- if [[ "${PROFILE_ARCH}" = "sparc64" ]]; then
- CHOSTARCH="sparc32-v9"
- else
- CHOSTARCH="${CHOST%%-*}"
- fi
-
- local myos=
- case ${CHOST} in
- *-darwin*) myos=darwin ;;
- *) myos=linux ;;
- esac
-
- # foobared buildsystem, --prefix translates into DESTDIR, see also make
- # install in src_install, we need the correct live-system prefix here on
- # Darwin for a shared lib with correct install_name
- ./configure.py \
- --prefix="${EPREFIX}/usr" \
- --libdir=$(get_libdir) \
- --docdir=share/doc \
- --cc=gcc \
- --os=${myos} \
- --cpu=${CHOSTARCH} \
- --with-endian="$(tc-endian)" \
- --without-sphinx \
- --with-tr1=system \
- $(use_with bzip2) \
- $(use_with gmp gnump) \
- $(use_with python boost-python) \
- $(use_with ssl openssl) \
- $(use_with zlib) \
- --disable-modules=${disable_modules} \
- || die "configure.py failed"
-}
-
-src_compile() {
- emake CXX="$(tc-getCXX)" AR="$(tc-getAR) crs" LIB_OPT="${CXXFLAGS}" MACH_OPT=""
-
- if use python; then
- building() {
- rm -fr build/python
- ln -s "${BUILD_DIR}" build/python
- cp Makefile.python build/python
- sed -i \
- -e "s/-lboost_python/-lboost_python-$(echo ${EPYTHON} | sed 's/python//')/" \
- build/python/Makefile.python
- emake -f build/python/Makefile.python \
- CXX="$(tc-getCXX)" \
- CFLAGS="${CXXFLAGS}" \
- LDFLAGS="${LDFLAGS}" \
- PYTHON_ROOT="/usr/$(get_libdir)" \
- PYTHON_INC="-I$(python_get_includedir)"
- }
- python_foreach_impl building
- fi
-
- if use doc; then
- einfo "Generation of documentation"
- sphinx-build doc doc_output || die
- fi
-}
-
-src_test() {
- chmod -R ugo+rX "${S}"
- emake CXX="$(tc-getCXX)" CHECK_OPT="${CXXFLAGS}" check
- LD_LIBRARY_PATH="${S}" ./check --validate || die "Validation tests failed"
-}
-
-src_install() {
- emake DESTDIR="${ED}/usr" install
-
- if ! use static-libs; then
- rm "${ED}/usr/$(get_libdir)/libbotan"*.a || die 'remove of static libs failed'
- fi
-
- # Add compatibility symlinks.
- [[ -e "${ED}/usr/bin/botan-config" ]] && die "Compatibility code no longer needed"
- [[ -e "${ED}/usr/$(get_libdir)/pkgconfig/botan.pc" ]] && die "Compatibility code no longer needed"
- dosym botan-config-1.10 /usr/bin/botan-config
- dosym botan-1.10.pc /usr/$(get_libdir)/pkgconfig/botan.pc
-
- if use python; then
- installation() {
- rm -fr build/python
- ln -s "${BUILD_DIR}" build/python
- emake -f Makefile.python \
- PYTHON_SITE_PACKAGE_DIR="${D}$(python_get_sitedir)" \
- install
- }
- python_foreach_impl installation
- fi
-
- if use doc; then
- pushd doc_output > /dev/null
- insinto /usr/share/doc/${PF}/html
- doins -r [a-z]* _static
- popd > /dev/null
- fi
-}
diff --git a/dev-libs/botan/botan-2.11.0.ebuild b/dev-libs/botan/botan-2.11.0.ebuild
deleted file mode 100644
index 2b1b5bb66292..000000000000
--- a/dev-libs/botan/botan-2.11.0.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-MY_P="Botan-${PV}"
-inherit python-r1 toolchain-funcs
-
-DESCRIPTION="C++ crypto library"
-HOMEPAGE="https://botan.randombit.net/"
-SRC_URI="https://botan.randombit.net/releases/${MY_P}.tar.xz"
-
-LICENSE="BSD"
-SLOT="2/$(ver_cut 1-2)" # soname version
-KEYWORDS="amd64 ~arm hppa ~ia64 ppc ppc64 ~sparc x86 ~ppc-macos"
-IUSE="bindist bzip2 boost doc libressl lzma python sqlite ssl static-libs zlib"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-S="${WORKDIR}/${MY_P}"
-
-DEPEND="python? ( ${PYTHON_DEPS} )"
-RDEPEND="${DEPEND}
- boost? ( >=dev-libs/boost-1.48:= )
- bzip2? ( >=app-arch/bzip2-1.0.5:= )
- lzma? ( app-arch/xz-utils:= )
- sqlite? ( dev-db/sqlite:3= )
- ssl? (
- !libressl? ( dev-libs/openssl:0=[bindist=] )
- libressl? ( dev-libs/libressl:0= )
- )
- zlib? ( >=sys-libs/zlib-1.2.3:= )
-"
-BDEPEND="
- dev-lang/python:*
- doc? ( dev-python/sphinx )
-"
-
-src_configure() {
- local disable_modules=()
- use boost || disable_modules+=( "boost" )
- use bindist && disable_modules+=( "ecdsa" )
- elog "Disabling modules: ${disable_modules[@]}"
-
- # Enable v9 instructions for sparc64
- if [[ "${PROFILE_ARCH}" = "sparc64" ]]; then
- CHOSTARCH="sparc32-v9"
- else
- CHOSTARCH="${CHOST%%-*}"
- fi
-
- local myos=
- case ${CHOST} in
- *-darwin*) myos=darwin ;;
- *) myos=linux ;;
- esac
-
- case ${CHOST} in
- hppa*) CHOSTARCH=parisc ;;
- esac
-
- local pythonvers=()
- if use python; then
- append() {
- pythonvers+=( ${EPYTHON/python/} )
- }
- python_foreach_impl append
- fi
-
- CXX="$(tc-getCXX)" AR="$(tc-getAR)" ./configure.py \
- $(use_enable static-libs static-library) \
- $(use_with boost) \
- $(use_with bzip2) \
- $(use_with doc documentation) \
- $(use_with doc sphinx) \
- $(use_with lzma) \
- $(use_with sqlite sqlite3) \
- $(use_with ssl openssl) \
- $(use_with zlib) \
- $(usex hppa --without-stack-protector '') \
- --cc=gcc \
- --cpu=${CHOSTARCH} \
- --disable-modules=$(IFS=","; echo "${disable_modules[*]}" ) \
- --docdir=share/doc \
- --libdir=$(get_libdir) \
- --os=${myos} \
- --prefix="${EPREFIX}/usr" \
- --with-endian="$(tc-endian)" \
- --with-python-version=$(IFS=","; echo "${pythonvers[*]}" ) \
- --without-doxygen \
- || die "configure.py failed"
-}
-
-src_test() {
- LD_LIBRARY_PATH="${S}" ./botan-test || die "Validation tests failed"
-}
-
-src_install() {
- default
- use python && python_foreach_impl python_optimize
-}
diff --git a/dev-libs/botan/botan-2.14.0.ebuild b/dev-libs/botan/botan-2.14.0.ebuild
deleted file mode 100644
index 6d2a94dea777..000000000000
--- a/dev-libs/botan/botan-2.14.0.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-MY_P="Botan-${PV}"
-inherit python-r1 toolchain-funcs
-
-DESCRIPTION="C++ crypto library"
-HOMEPAGE="https://botan.randombit.net/"
-SRC_URI="https://botan.randombit.net/releases/${MY_P}.tar.xz"
-
-LICENSE="BSD"
-SLOT="2/$(ver_cut 1-2)" # soname version
-KEYWORDS="amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc x86 ~ppc-macos"
-IUSE="bindist bzip2 boost doc libressl lzma python sqlite ssl static-libs zlib"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-S="${WORKDIR}/${MY_P}"
-
-DEPEND="python? ( ${PYTHON_DEPS} )"
-RDEPEND="${DEPEND}
- boost? ( >=dev-libs/boost-1.48:= )
- bzip2? ( >=app-arch/bzip2-1.0.5:= )
- lzma? ( app-arch/xz-utils:= )
- sqlite? ( dev-db/sqlite:3= )
- ssl? (
- !libressl? ( dev-libs/openssl:0=[bindist=] )
- libressl? ( dev-libs/libressl:0= )
- )
- zlib? ( >=sys-libs/zlib-1.2.3:= )
-"
-BDEPEND="
- dev-lang/python:*
- doc? ( dev-python/sphinx )
-"
-
-src_configure() {
- local disable_modules=()
- use boost || disable_modules+=( "boost" )
- use bindist && disable_modules+=( "ecdsa" )
- elog "Disabling modules: ${disable_modules[@]}"
-
- # Enable v9 instructions for sparc64
- if [[ "${PROFILE_ARCH}" = "sparc64" ]]; then
- CHOSTARCH="sparc32-v9"
- else
- CHOSTARCH="${CHOST%%-*}"
- fi
-
- local myos=
- case ${CHOST} in
- *-darwin*) myos=darwin ;;
- *) myos=linux ;;
- esac
-
- case ${CHOST} in
- hppa*) CHOSTARCH=parisc ;;
- esac
-
- local pythonvers=()
- if use python; then
- append() {
- pythonvers+=( ${EPYTHON/python/} )
- }
- python_foreach_impl append
- fi
-
- CXX="$(tc-getCXX)" AR="$(tc-getAR)" ./configure.py \
- $(use_enable static-libs static-library) \
- $(use_with boost) \
- $(use_with bzip2) \
- $(use_with doc documentation) \
- $(use_with doc sphinx) \
- $(use_with lzma) \
- $(use_with sqlite sqlite3) \
- $(use_with ssl openssl) \
- $(use_with zlib) \
- $(usex hppa --without-stack-protector '') \
- --cc=gcc \
- --cpu=${CHOSTARCH} \
- --disable-modules=$(IFS=","; echo "${disable_modules[*]}" ) \
- --docdir=share/doc \
- --libdir=$(get_libdir) \
- --os=${myos} \
- --prefix="${EPREFIX}/usr" \
- --with-endian="$(tc-endian)" \
- --with-python-version=$(IFS=","; echo "${pythonvers[*]}" ) \
- --without-doxygen \
- || die "configure.py failed"
-}
-
-src_test() {
- LD_LIBRARY_PATH="${S}" ./botan-test || die "Validation tests failed"
-}
-
-src_install() {
- default
- use python && python_foreach_impl python_optimize
-}
diff --git a/dev-libs/botan/files/botan-1.10.17-build.patch b/dev-libs/botan/files/botan-1.10.17-build.patch
deleted file mode 100644
index 43877972211a..000000000000
--- a/dev-libs/botan/files/botan-1.10.17-build.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From c7963d28d03e5f65f4021a5b764dc4bff9417eda Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev <alon.barlev@gmail.com>
-Date: Wed, 4 Oct 2017 01:50:33 +0300
-Subject: [PATCH] gost_3411: use correct type for build to pass
-
----
- src/hash/gost_3411/gost_3411.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/hash/gost_3411/gost_3411.cpp b/src/hash/gost_3411/gost_3411.cpp
-index 97aa399..7ca22dc 100644
---- a/src/hash/gost_3411/gost_3411.cpp
-+++ b/src/hash/gost_3411/gost_3411.cpp
-@@ -91,7 +91,7 @@ void GOST_34_11::compress_n(const byte input[], size_t blocks)
- // P transformation
- for(size_t k = 0; k != 4; ++k)
- {
-- const uint64_t UVk = U[k] ^ V[k];
-+ const u64bit UVk = U[k] ^ V[k];
- for(size_t l = 0; l != 8; ++l)
- key[4*l+k] = get_byte(l, UVk);
- }
---
-2.13.6
-
diff --git a/dev-libs/botan/files/botan-1.10.17-libressl.patch b/dev-libs/botan/files/botan-1.10.17-libressl.patch
deleted file mode 100644
index 5913bfd30494..000000000000
--- a/dev-libs/botan/files/botan-1.10.17-libressl.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From e61a5f56fb404db3655909be4ce23c3a816cbb60 Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev <alon.barlev@gmail.com>
-Date: Wed, 4 Oct 2017 22:16:31 +0300
-Subject: [PATCH] openssl: support libressl
-
-Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
----
- src/engine/openssl/ossl_bc.cpp | 2 +-
- src/engine/openssl/ossl_md.cpp | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/engine/openssl/ossl_bc.cpp b/src/engine/openssl/ossl_bc.cpp
-index 74660c7b5..cb184c202 100644
---- a/src/engine/openssl/ossl_bc.cpp
-+++ b/src/engine/openssl/ossl_bc.cpp
-@@ -8,7 +8,7 @@
- #include <botan/internal/openssl_engine.h>
- #include <openssl/evp.h>
-
--#if OPENSSL_VERSION_NUMBER >= 0x10100000
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined(LIBRESSL_VERSION_NUMBER)
- #error "OpenSSL 1.1 API not supported in Botan 1.10, upgrade to 2.x"
- #endif
-
-diff --git a/src/engine/openssl/ossl_md.cpp b/src/engine/openssl/ossl_md.cpp
-index 2fcb2b0e5..9c43d616e 100644
---- a/src/engine/openssl/ossl_md.cpp
-+++ b/src/engine/openssl/ossl_md.cpp
-@@ -8,7 +8,7 @@
- #include <botan/internal/openssl_engine.h>
- #include <openssl/evp.h>
-
--#if OPENSSL_VERSION_NUMBER >= 0x10100000
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined(LIBRESSL_VERSION_NUMBER)
- #error "OpenSSL 1.1 API not supported in Botan 1.10, upgrade to 2.x"
- #endif
-
---
-2.13.6
-
diff --git a/dev-libs/clhpp/Manifest b/dev-libs/clhpp/Manifest
index 56aa97692f3b..1256f0329d24 100644
--- a/dev-libs/clhpp/Manifest
+++ b/dev-libs/clhpp/Manifest
@@ -1,3 +1,5 @@
DIST clhpp-2.0.11.tar.gz 172006 BLAKE2B a346e4e9a5e9090a407946cd8dcb321188a9e66ff003ec65c42ceed8a9690d6decd2c47417e149e061e8ffc975a1bfd919134639ca5ed2d91ae94cf669eac81b SHA512 f73dd41ae0e14b6e42ba993f700103f99bb78230c7c8d9248fb32977b7d1694280a8cab1cefbb8d7171dd207b41623d98eb7524667f24a6925e1ee9d47787f7e
+DIST clhpp-2.0.12.tar.gz 96922 BLAKE2B ae4df7e2b65865fbaea8066d508e4058a076aace4598ca97594237541df44e5c2d20978274124cbc5d331c4983df3e0776b8afafb2204f0d96b6830999d72589 SHA512 521f0e6bd32f9bfdf764011d9e83691a574c27a9c27580601529a2665a2785ca5815407381adfa2e247547bdb79c6083d79b5d716d54e2aafa55bdd5751f1e78
EBUILD clhpp-2.0.11-r1.ebuild 582 BLAKE2B 2c96261c0108b69e987cd7919d93d829eb5e26252cb5933debfc39e183cb353efeb22aadc6448ef57fcfb3cfafc8da894f16503696c9f557ee106d7f7f4de978 SHA512 fb82233e5cd9bbe43cdcacdf9be99d9c83fa45f5517cc7d8c9f1c6ce677446bbb22a226a7177859f0f28cb62dc69c4c7c21eb6940f9d44418ae6c06ef153d88b
+EBUILD clhpp-2.0.12.ebuild 584 BLAKE2B 8fc65212f9d2dbcb275beae39abfd01ee689465488d0341ac00c078871c4d0418e6fe1a26936ce02c8a1fd7d58eae83725521b197313c92825969e939eb18a38 SHA512 cb1f230853086c619061118e9cdce0f0fb0c53514ad682f610c935432f860a4ce55bec4b08c8caf10a7127dd46d1d1bd557e4482965cb3900ad3dc59a8876a2b
MISC metadata.xml 332 BLAKE2B f42b8bf0c7184f9cc0d2a0164d0311c2fc75e390430119c602832bd6d791913de4669ed7583a5b1f2b67db401217a3bce9d967062e7f3ba0b27801f4ca5a9056 SHA512 d18a2df576e7732073eb8ebc40aea3e67e64a1872b10cdb2bd4bc9d53c803caf1acd7296cd0d5d4ea60867e14262fef88e87e6ba128eb35a2fe797b224fac0ef
diff --git a/dev-libs/clhpp/clhpp-2.0.12.ebuild b/dev-libs/clhpp/clhpp-2.0.12.ebuild
new file mode 100644
index 000000000000..2325c35bccc7
--- /dev/null
+++ b/dev-libs/clhpp/clhpp-2.0.12.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Khronos OpenCL C++ bindings"
+HOMEPAGE="https://github.com/KhronosGroup/OpenCL-CLHPP/"
+SRC_URI="https://github.com/KhronosGroup/OpenCL-CLHPP/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Khronos-CLHPP"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="virtual/opencl"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"/OpenCL-CLHPP-${PV}
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_DOCS=OFF
+ -DBUILD_EXAMPLES=OFF
+ -DBUILD_TESTS=OFF
+ )
+ cmake_src_configure
+}
diff --git a/dev-libs/crypto++/Manifest b/dev-libs/crypto++/Manifest
index 778ada764ae2..6e9ed6cbc046 100644
--- a/dev-libs/crypto++/Manifest
+++ b/dev-libs/crypto++/Manifest
@@ -5,7 +5,7 @@ DIST cryptopp565.zip 4220843 BLAKE2B 0c42da3564cdd175c2f2c5c4272caf826f21e47d227
DIST cryptopp700.zip 7296665 BLAKE2B 1b1a60e240a9d94b4edfea16beef0ec48ec26c61f7f9a3d89d29bd2e77b13a83ce942f81467bb90d3086253560a3c4acd6b89178dcb416ed4328340ad5222dfd SHA512 8fd8d680e5ceaf10b3c32cb1504bda4b32abc9fcaa2c6e61e3b5e67aca805c792579884bc6a749c29a99105304c421d03d7fe7909fc58f750b3155c7c5cec8ec
DIST cryptopp820.zip 8859815 BLAKE2B 67aa850b887ae7aa869c9485bb18784492f6eec6cb12bf7c7cf84c776731eabf3c31965b47a60287e4e5a79dd3e9f0928dcfb185a0010a76f7cb96d2c3e8c6ae SHA512 753513a4ec8dd0fff2f551853ce6bd265d82219c28b033565b565b5e567fbee17adb419f4cde58a97e62b7d6533f4099aa4996cd0ba4775c6a2e7ae63a879da5
EBUILD crypto++-5.6.5-r1.ebuild 1508 BLAKE2B 414f8076a72da047953f6153e867ba9f3a46aabea6bdb49be0c8581c76c47ca7017f606ba4e83261e6d61ed50986ebe0430d62e8870ec13f6689f64de92b67e4 SHA512 c9d628ced0291647540937d5b8b21a3d8b906c1f735efefe46e9df39c34038129e13ee305fadf21e61a844a2d526432379bcd1a0906f305eee247b5735af4068
-EBUILD crypto++-7.0.0-r3.ebuild 1068 BLAKE2B be11e297caa5669aa868ef6937c13bce00235f40cd7791f4f88b3184af53a7a66d7c2deb72c2115e927d796637996073ceaa8923705de7908a69299e1d29b251 SHA512 d63337b55c6be12e27eb4093e4aa80e94d4f260962c7a9dad32b107bfe17073aedc419f017a1d2c0c3ff7a298030d1c5f120cd6ff55d6d9f9cc150bc15f827b6
-EBUILD crypto++-8.2.0-r2.ebuild 1747 BLAKE2B b1942241db59fd6f8681daa9963d86ae740cce43fd004f57de4432af668b5584d5049db6c6eff804673948b4ee9f85e2a3b2865493db42e6a69a6d063967d9f0 SHA512 b31518efdacbf66c0f5698898ef98a4d8dea36809c3d1f84070cd2014920736209852194df0444794ebe1e9e261b2576e97862a78b77743b680e00b060b789e2
-EBUILD crypto++-8.2.0.ebuild 1113 BLAKE2B 92e3e0646c41ed87ffcafbef605b3e60f704cb383a2721b3f4706dbcdc07aa12b7bd3db76e2e16d69207bbea6e995f9e456873799692cb75dc7f3c05b00cfaa2 SHA512 750c0a79eea9d64a9193881fb70105d29098d0493c315df53f68b023399df5f1e783ccbfa993f1cf128f5b13cdfa8a36e4b5069e838bb7f3817f635f9d1e84bd
+EBUILD crypto++-7.0.0-r3.ebuild 1055 BLAKE2B 227217e396ccaa5da08fc2ab159f0519cc9ec0d9283a480d2f9f8f9fa1861fdd7d99b20c50ed891fb206faadc770d77fb894d6140ab15e088faa2ed57a439c17 SHA512 46579432b7c764ff592ec94a5d744aad6f1a9453dc2a4583dc71872fcf52260052d8e3edf790364b7eb36e30ebdb1459ee6fe9400fb62881fe81c5ecce96924f
+EBUILD crypto++-8.2.0-r2.ebuild 1734 BLAKE2B 75558e27ac641842302bb1204ae483852c71b65741de7f426c415b15907ae1b20515c0e9f2518248884003157b4eabfca8637eba01ac2df7f0c26be77074b454 SHA512 7d75f266de075a6410ef26999697db14c76ff8b38316afa227419c1532b63c62a70a9cdee67684cded93b12aa49e592be1ba7c0f9ef81666fb95c692d2b99587
+EBUILD crypto++-8.2.0.ebuild 1100 BLAKE2B 2f84080a48c493a2c6ecb94c5b59a24ef253ceec47bacf364fb81e3ef9a79254c9171f62199087586a853cc21da3febda660e4c0601974ede860bff18ed5f8b6 SHA512 01afc48b803f776c94836a762f7a6734f0497922636acacab3063d8f4f9903bab0173e87467e3dc3364a51789537c4561761353497b55585382e2cfbb9526622
MISC metadata.xml 428 BLAKE2B 6ca5f3c3550c7f7f20310c7dfeedc7925110a37d7924b2dfe7f34e3e6be5c3f2fa514135490bbe67390a4041bd81b3096dc21993978de631bf45f88f8ebbd3a6 SHA512 3c656067d4fef5353733a2c3ac3ca3798a0c57e8863e4479c304b4c5f4c1f1100f14b1188244b4f5125daf0ba1c9f5dca79e0cd0270cbff0001628511125e18b
diff --git a/dev-libs/crypto++/crypto++-7.0.0-r3.ebuild b/dev-libs/crypto++/crypto++-7.0.0-r3.ebuild
index e53033f3502c..f1d8bcbf44c5 100644
--- a/dev-libs/crypto++/crypto++-7.0.0-r3.ebuild
+++ b/dev-libs/crypto++/crypto++-7.0.0-r3.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-inherit flag-o-matic toolchain-funcs
+inherit toolchain-funcs
DESCRIPTION="C++ class library of cryptographic schemes"
HOMEPAGE="https://cryptopp.com"
diff --git a/dev-libs/crypto++/crypto++-8.2.0-r2.ebuild b/dev-libs/crypto++/crypto++-8.2.0-r2.ebuild
index 0aaec92008f8..b81af078bf30 100644
--- a/dev-libs/crypto++/crypto++-8.2.0-r2.ebuild
+++ b/dev-libs/crypto++/crypto++-8.2.0-r2.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=7
-inherit flag-o-matic toolchain-funcs
+inherit toolchain-funcs
DESCRIPTION="C++ class library of cryptographic schemes"
HOMEPAGE="https://cryptopp.com"
diff --git a/dev-libs/crypto++/crypto++-8.2.0.ebuild b/dev-libs/crypto++/crypto++-8.2.0.ebuild
index e0d60a45e879..ec4e24855984 100644
--- a/dev-libs/crypto++/crypto++-8.2.0.ebuild
+++ b/dev-libs/crypto++/crypto++-8.2.0.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-inherit flag-o-matic toolchain-funcs
+inherit toolchain-funcs
DESCRIPTION="C++ class library of cryptographic schemes"
HOMEPAGE="https://cryptopp.com"
diff --git a/dev-libs/cyberjack/Manifest b/dev-libs/cyberjack/Manifest
index 72aac36feb44..cd62e4bfa882 100644
--- a/dev-libs/cyberjack/Manifest
+++ b/dev-libs/cyberjack/Manifest
@@ -1,5 +1,6 @@
+AUX cyberjack-3.99.5_p14-gcc10.patch 344 BLAKE2B c535dd6c5d034b0ad81dd6ce6364d2c8807e1adfb2391d5b801cf285260c6f55c2bdf9f56e3bf4c0fc06cc8f87128855f34f6e3519a6ebc67a7b6eba10aa8008 SHA512 7ee096fbca22ffccff1ae941c7e16578ee10ab3b7704902dee4643bdf1a3d1592ae5cd19625414245fd4c1ee6f10d8a869e273e47d71c47a3300356a0709995d
DIST pcsc-cyberjack-3.99.5final.SP14.tar.bz2 1090014 BLAKE2B 15c9d0225f03d1fcbc636b6f8ae29f265243af35bc78c48f2e9cca27c7731ebb30069eb5bf377ce66d2c7afb31e1fb5d839001fa21e854a4bdc56237bf780327 SHA512 f39e4f13776d8c4e4bc5ea3cc64e64649d8dea334f50b9bcc9cc6f1fc9e7433ef32b8fcb00b5dad78867029dab0a099c0d7799d7e8f80d0f310b0f53dbd2a7b9
DIST pcsc-cyberjack_3.99.5final.SP13.tar.gz 1617714 BLAKE2B 344f00217fa5dfb18e5318d2b8ccb88a3cc12b86a9c14d41a9800d701d0fc7a0a486a0b3c05188d07d1f7c51c4c514c48a55d987d8d9d2af574f427e550c8654 SHA512 74ac56a0f74a69006c87e2c22e147b65d26582d29753de03d56e4ad76413f4477a031d47f5eb074323b4ffd000b0908a1fb2b12fb7d91e9b3ee67e983e09e968
EBUILD cyberjack-3.99.5_p13.ebuild 2053 BLAKE2B db68e22e63e6baef0a5ef2c0a1bee7a80a7230029baba274da4d4adcb48e71ad9d75c231f8e45372e047658c0f392f1f87639b29ef43e072695f91cc9f5edeba SHA512 7e6e012f1c60baf55b6565144dacef25022336f8895731363f561837330dfd60d5e54b6b4d8b2af502a4a87405ccf32eb9d323f8b92db6b75001a8b7191d38a6
-EBUILD cyberjack-3.99.5_p14.ebuild 2076 BLAKE2B 98a47e796c0cd1fffc15d4130390e3ca2db53722fe5414aad35cf1fe2cb7803dddd91851b8be0f99e760f3e7a1206937a876789168f4899b17f87abe06c749cf SHA512 7d71bb42bfdaccb82bf815b324cf2a69e1aa7166890b7024e8f6fc81119fdb97367b778b2ba80721680ed1af0b0c49bb26ae2299c645e21e52428a9ff7c3c679
+EBUILD cyberjack-3.99.5_p14.ebuild 1951 BLAKE2B f942b44b30284cbd3057c260df7aadb3de3e141c3ff5d16b8a9356e76496e6f5d5056123115245de62e442957ba1cabb2b5ef63ef4dc1aea8aad834f971c2fa6 SHA512 5643599f37a04cf0c9d501c17ea023a1df22157a91c1c3cf17067e89b2ff5a469973c1a6d10b011a85aa944bf541c32e4e12e41251c5feddc4c3c28ea143f73e
MISC metadata.xml 622 BLAKE2B 4238fe4ea370787f4542d53d161afaa0c0df5788d7a2da5ee6b99b788ae6d4456cd43d6ea8df0a174431b4582127fb49712a59ed2acdbeaf4808f57b8fa44930 SHA512 2062ac48ee73a6a58a2663e39f467e8e55f06af48b7a04b5f174e467c3f33d4b92b93b8fff3747447503b3256fc514fc40c8e07f7cbec8e1608d6389d9aed4ba
diff --git a/dev-libs/cyberjack/cyberjack-3.99.5_p14.ebuild b/dev-libs/cyberjack/cyberjack-3.99.5_p14.ebuild
index 53d0aee2a30f..bc4e83876eeb 100644
--- a/dev-libs/cyberjack/cyberjack-3.99.5_p14.ebuild
+++ b/dev-libs/cyberjack/cyberjack-3.99.5_p14.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="REINER SCT cyberJack USB chipcard reader user space driver"
HOMEPAGE="https://www.reiner-sct.de/"
SRC_URI="http://kernelport.com/reiner-sct/SP$(ver_cut 5)/${MY_P}.tar.bz2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
LICENSE="GPL-2+ LGPL-2.1+"
SLOT="0"
IUSE="static-libs threads tools +udev +usb xml"
@@ -31,13 +31,7 @@ BDEPEND="virtual/pkgconfig"
S="${WORKDIR}/${MY_P/_/-}"
CONFIG_CHECK="~USB_SERIAL_CYBERJACK"
-
-pkg_setup() {
- # Add workaround for GCC-10,
- # by defining narrowing as warning like GCC-9 did.
- # Upstream is working on that.
- append-cxxflags -Wno-narrowing
-}
+PATCHES="${FILESDIR}/${P}-gcc10.patch"
src_prepare() {
default
diff --git a/dev-libs/cyberjack/files/cyberjack-3.99.5_p14-gcc10.patch b/dev-libs/cyberjack/files/cyberjack-3.99.5_p14-gcc10.patch
new file mode 100644
index 000000000000..a91ee2e2ba42
--- /dev/null
+++ b/dev-libs/cyberjack/files/cyberjack-3.99.5_p14-gcc10.patch
@@ -0,0 +1,13 @@
+Fixes compilation with GCC10.
+
+--- a/ifd/ifd.cpp
++++ b/ifd/ifd.cpp
+@@ -958,7 +958,7 @@
+ else
+ l_atrLength=0;
+ rj=r->IfdPower(mode, Atr, &l_atrLength);
+- switch (rj) {
++ switch (static_cast<NTSTATUS>(rj)) {
+ case STATUS_SUCCESS:
+ DEBUGLUN(Lun, DEBUG_MASK_IFD, "Success (ATR: %d bytes)\n", (int)l_atrLength);
+ rc=IFD_SUCCESS;
diff --git a/dev-libs/efl/Manifest b/dev-libs/efl/Manifest
index 7a8956067b0c..58ac87632f1e 100644
--- a/dev-libs/efl/Manifest
+++ b/dev-libs/efl/Manifest
@@ -1,5 +1,5 @@
DIST efl-1.23.3.tar.xz 77485032 BLAKE2B e5f65080aec1d11a43f1e1786b8ac4e7be70ddd9614b53db822177c28ee73f9590f63d032df5ddf00db6224730b45b045d9f91da2287a4dec7589e902cbcde28 SHA512 47ad067c43d39b534834195f89a745c4a47d867f33aaa68c28c6dccd147379e9bc2416bd68878cc16585f8cb60e926a7df62102658b205756c01985f37f0d297
-DIST efl-1.24.2.tar.xz 72280100 BLAKE2B 638e39d188ce2e4d22a39913880c023090aa8a49cdbb878efcf38150f70681dbeb0a76b5a71b21e377e10f04ad31d28b36317fe0d3537de0766641149d120c49 SHA512 0fc2ee94a074e33ae3c7142f2bb8ec5d174c843a26d2cb0641af466c3f413a25ee81bba2445fe03d518358f11546ec716a70e785fe1a8b90727e29bcc7d5f706
+DIST efl-1.24.3.tar.xz 72278592 BLAKE2B c5d07e947139087976a0a974c3129ea31211be4c235e94d6fc3c2b9c7ec0be97b78fcf6a18aebd4b4d476224c9e6f5a29ad41d93e6c10065ff7591c2792b8481 SHA512 3791955c588bc1b2ca55caa19dc0fb351c9f6c681791bfe76a435255edd55257c9c5ab2f16d0d91ec2d55113bd9d24d45c0f9026ae72d9f6afbddfd093975089
EBUILD efl-1.23.3.ebuild 7543 BLAKE2B 37c683746d6d01f96e92888328669cab20c8ad0061ace69af670cfc1c47046fd52280e976fd46d75e5f10c7884e46eef6c6db9aa716a6b4f5e2ec41e150915ff SHA512 82fa39d4524400a21d59072cfd87cc8d2eb529af5eebecbd7703951ea9b3105e28629aa038fcf6c643ac486bb725a1b23d9d97e2d165a94a971df92b7ae018a5
-EBUILD efl-1.24.2.ebuild 7067 BLAKE2B 9af874bcf233ab7a6a82ce35633b44a03e6b52b2eeb310c88922375cf6973b8a8e369b02e6d8b1b9c835083f6822ca85aaf40d06df91f83d5ccdd3850c71ba5d SHA512 02191f27f8e167a308a79de31542422c4a4c469f4a9f759ed86e02c960a419d97f78dd39666df5ed0636bbd905e7a40cf6d29abe8f1d540436b89503b33ee9a4
+EBUILD efl-1.24.3.ebuild 7104 BLAKE2B e26fcbf92d70451d377b8c366a244e7a50cf9eba9d6efdbd07b6dab4448959ce2e0302c40f1e1b5fd9b5953b19b95c4f06ec13bd09200f1dd1787b9212f6379d SHA512 e848646fa1712b4ea7893d825947f9cd06c73b0c3d855762af9357b544c0cda1f7b11fb852563d66ca66ded31be5125b7df2364922f9d771a22c2f192124cf65
MISC metadata.xml 1987 BLAKE2B 86cb4cbb5deb978955e4008c3d7ae92430daa8739d75c9515c3c33339b05b545b5af8b8bdce0dc4ca2dffe17097ca8a04104e1ed3fe99a548c625416d467d2f2 SHA512 b543190ca4b753101085f3964608b06ee489f6e0d268e84866162370b029cc8433e2925ef92104a38a57a3c0fb491150f6376cdf996a45cdb0848287b8aaf58f
diff --git a/dev-libs/efl/efl-1.24.2.ebuild b/dev-libs/efl/efl-1.24.3.ebuild
index d7832a453ac8..ecf714f1e635 100644
--- a/dev-libs/efl/efl-1.24.2.ebuild
+++ b/dev-libs/efl/efl-1.24.3.ebuild
@@ -13,22 +13,22 @@ LICENSE="BSD-2 GPL-2 LGPL-2.1 ZLIB"
SLOT="0"
KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
IUSE="+X bmp connman cpu_flags_arm_neon dds debug doc drm +eet elogind examples
- fbcon +fontconfig fribidi gif gles2 gnutls glib +gstreamer harfbuzz hyphen
- ibus ico libressl lua +luajit jpeg2k json nls mono opengl +pdf physics
- pmaps postscript psd pulseaudio raw scim sdl +sound +ssl +svg +system-lz4
- systemd tga tgv tiff tslib unwind v4l vnc wayland webp xcf xim xpm xpresent
- zeroconf"
+ fbcon +fontconfig fribidi gif gles2-only gnutls glib +gstreamer harfbuzz
+ hyphen ibus ico libressl lua +luajit jpeg2k json nls mono opengl +pdf
+ physics pmaps postscript psd pulseaudio raw scim sdl +sound +ssl +svg
+ +system-lz4 systemd tga tgv tiff tslib unwind v4l vnc wayland webp xcf xim
+ xpm xpresent zeroconf"
REQUIRED_USE="
?? ( elogind systemd )
- ?? ( gles2 opengl )
+ ?? ( gles2-only opengl )
^^ ( lua luajit )
ssl
- drm? ( gles2 )
+ drm? ( gles2-only )
examples? ( eet svg )
- gles2? ( || ( wayland X ) )
+ gles2-only? ( || ( wayland X ) )
pulseaudio? ( sound )
- wayland? ( gles2 !opengl )
+ wayland? ( gles2-only !opengl )
xim? ( X )
xpresent? ( X )
"
@@ -75,7 +75,7 @@ RDEPEND="
)
fontconfig? ( media-libs/fontconfig )
fribidi? ( dev-libs/fribidi )
- gles2? (
+ gles2-only? (
media-libs/mesa[egl,gles2]
virtual/opengl
)
@@ -87,7 +87,7 @@ RDEPEND="
hyphen? ( dev-libs/hyphen )
ibus? ( app-i18n/ibus )
jpeg2k? ( media-libs/openjpeg:= )
- json? ( >=media-libs/rlottie-0.0.1_pre20200424 )
+ json? ( >=media-libs/rlottie-0.0.1_pre20200424:= )
lua? ( dev-lang/lua:* )
luajit? ( dev-lang/luajit:* )
mono? ( dev-lang/mono )
@@ -183,7 +183,7 @@ src_configure() {
if use opengl; then
emesonargs+=( -D opengl=full )
- elif use gles2; then
+ elif use gles2-only; then
emesonargs+=( -D opengl=es-egl )
else
emesonargs+=( -D opengl=none )
diff --git a/dev-libs/ell/Manifest b/dev-libs/ell/Manifest
index 1ec6978187dc..70924b0996c5 100644
--- a/dev-libs/ell/Manifest
+++ b/dev-libs/ell/Manifest
@@ -1,6 +1,8 @@
DIST ell-0.28.tar.xz 474880 BLAKE2B 2c571f952056c9f4e3e8c245b2b57645c4baa2935fdbe758170dcfe689f4db2162322f25a80cc5a7d4d5bded6159d1fa0d583be979a2708d32e61e91d1ced585 SHA512 6c3aef4d403878c0c9b8a1e5e8861656f2abbab19dd275b1aecca899ca615c00aee30e18f194435ec6be859adcffbe3703a79b13508e1e76c2192ec51f7c0cd7
DIST ell-0.31.tar.xz 478860 BLAKE2B f8f8d109605bf62396da001bd3d9b48fd6b7a6fc94ab890ab5a56fc8afb07a216b884fdf4b624ac8f39c3196de8149c7b32790da03262400aac6f8cd8b3fb56b SHA512 e304cc3bb1355fc0671412e793530503c83b1a036bfa3dd5b0cc36cfb28684b780293dc3d81a5727e0030743529882f71ac28d3c735860f6d46477e8ccf6a6e8
+DIST ell-0.32.tar.xz 479012 BLAKE2B 909c63f590ba45e5e9aabf0e7c5ce1c44ee5b5235472071ec16c4e160eddfd38dc5383103a684c4d43e325e832965cdade5d8465990ed4c2a2aa44b52d60869b SHA512 13712ac4ff7165b749b8e2dcd5cad4cd8170600c3dca7304eb4068ee916c1187207bc24ffa5d64c9d33253d4a8f56c63b627ad0783d5ca38d78f625211fdc315
EBUILD ell-0.28.ebuild 1054 BLAKE2B bee6d203f5a50ffc797fb3f3f6a673e4d969c9de16e47801acbe88a1d61e1f04f9732ed76d6f0e1ab69cc39750d3e2a6af313a2430c0ae811a7192da282e3963 SHA512 c2660929dd05b053400db9f4fbfc234e6c616a63600a0bd4baccd6ef945cb06f326b1975f20e961bcbd39b5337cb96b1bbc9ab555475826d98f6cbe24e1122a6
EBUILD ell-0.31.ebuild 1251 BLAKE2B d2dc04fd7b6dfaea9e90589b2afe412cbc3606b44b6ab8616a0496b75024238450f913cfc6df03337d72e7bbd082c906b66d464fd15077184ec848b35518320b SHA512 e994f672aef0bcdfa4331fb854378d5e22d6a38b02b9aeadeb92f93eb5b461032f39817ec5d6c21dd356e321d3004436eed81288b92a2804fd3f4071f5737332
+EBUILD ell-0.32.ebuild 1257 BLAKE2B 27e21a66e146c9c55d06dd774124a30c14b5a3c26f571645667ed5660f0bc70e23b1fb27c68a740e6693870b6bbbc62e5eb3d930ae1b7bb5f05464c59d8f8e53 SHA512 cc5ea49eabe2db020d458569fa5cfda3e37602e63706c51772d8af7358a38ab5a8b62e9b5a95ebbc84276f70ceb852c406ff3051d46e32413d9f91e1680ac5e1
EBUILD ell-9999.ebuild 1257 BLAKE2B 27e21a66e146c9c55d06dd774124a30c14b5a3c26f571645667ed5660f0bc70e23b1fb27c68a740e6693870b6bbbc62e5eb3d930ae1b7bb5f05464c59d8f8e53 SHA512 cc5ea49eabe2db020d458569fa5cfda3e37602e63706c51772d8af7358a38ab5a8b62e9b5a95ebbc84276f70ceb852c406ff3051d46e32413d9f91e1680ac5e1
MISC metadata.xml 454 BLAKE2B a0768369a4193ad0aa995290515a1c2e2a99e363d345d33a52933ac274e0c10364801ed20727a78f0d22088bfea0eb833d54f08d4de47790e6e0213a0318ecbe SHA512 583e77bec8ec2bed4e72ae117a7afba7cbe3abd0c3d139227aaebd0f06081faf827356e871494c9fbd16bc16a146f23099729afd80e2583e2bacbda9226bfabf
diff --git a/dev-libs/ell/ell-0.32.ebuild b/dev-libs/ell/ell-0.32.ebuild
new file mode 100644
index 000000000000..6c1b04339772
--- /dev/null
+++ b/dev-libs/ell/ell-0.32.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic linux-info multilib-minimal
+
+DESCRIPTION="Embedded Linux Library provides core, low-level functionality for system daemons"
+HOMEPAGE="https://01.org/ell"
+if [[ "${PV}" == *9999 ]] ; then
+ inherit autotools git-r3
+ EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git"
+else
+ SRC_URI="https://mirrors.edge.kernel.org/pub/linux/libs/${PN}/${P}.tar.xz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+fi
+LICENSE="LGPL-2.1"
+SLOT="0"
+
+IUSE="glib pie test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ glib? ( dev-libs/glib:2[${MULTILIB_USEDEP}] )
+"
+DEPEND="
+ ${RDEPEND}
+ test? ( sys-apps/dbus )
+"
+
+CONFIG_CHECK="
+ ~TIMERFD
+ ~EVENTFD
+ ~CRYPTO_USER_API
+ ~CRYPTO_USER_API_HASH
+ ~CRYPTO_MD5
+ ~CRYPTO_SHA1
+ ~KEY_DH_OPERATIONS
+"
+
+src_prepare() {
+ default
+ [[ "${PV}" == *9999 ]] && eautoreconf
+}
+
+multilib_src_configure() {
+ append-cflags "-fsigned-char" #662694
+ local myeconfargs=(
+ $(use_enable glib)
+ $(use_enable pie)
+ )
+ ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+ local DOCS=( ChangeLog README )
+ einstalldocs
+
+ find "${ED}" -name "*.la" -delete || die
+}
diff --git a/dev-libs/fribidi/Manifest b/dev-libs/fribidi/Manifest
index b1d7fcf96e82..957984f2e092 100644
--- a/dev-libs/fribidi/Manifest
+++ b/dev-libs/fribidi/Manifest
@@ -1,3 +1,3 @@
DIST fribidi-1.0.9.tar.xz 1141684 BLAKE2B 6c9e9866ad900c041968f96ffc93e118715a319fbc47a5fe09b4a68daa5096e8c3cc1f0be1f8754ecf60b265f51fada75ac71f8bf1853f59e891644a97eaf644 SHA512 e66989830941172fa003c8b9376719282fa1039592a1e158e975cab81ce8dcb2755453c64906a8464c047f9e9154e012d9bd37256b1f463e235648a13e4601ed
-EBUILD fribidi-1.0.9.ebuild 1002 BLAKE2B 85e2535979dca5cc272cb277149e14c7797eec84028b7fe998d127061d4188a6727cae00df46bdc7d1702f06f29f469dba74827c8917d93c1d9a922da7df3f67 SHA512 db881167d9652938956b916e9d40448ffa4c30fb2bc8b57ffe83e02b4ef250b5cc965c355dad30983ef2e8e0d456e4d81cbee1fc01fb5b968a9b76fe367253af
+EBUILD fribidi-1.0.9.ebuild 982 BLAKE2B f2e96105d741d5191bcb47ec1e7ca38c1a8297563f3c36392b8bb067b69c5f042b415c33c842eb820686c10ed52c979b30b2da492e4100733ca2e566ae76e8c1 SHA512 e5b5af8ee34e12ee10d029bce3b85bfd366a08b15753164043ae95f9256c7f9809a61204fd7a8f93867faa8a2c9e6395b4bf174dbabe9722d418d1aab74e262b
MISC metadata.xml 341 BLAKE2B 5270be41f2666b559cee776629574ac71d81f82d273992d8377febd5c22418ef3ed933214a02a39a8de6cdbd4730d2abf547f001cf1d86c9c40b1a344880d276 SHA512 70b910d1fc10d8c0750618d8e6c1b2722a377f71042539f2400d6364a61483bd270d58e3a8f4f4f46f1a018d239902157b0a1d4aaf9e32b33346136f093f40a8
diff --git a/dev-libs/fribidi/fribidi-1.0.9.ebuild b/dev-libs/fribidi/fribidi-1.0.9.ebuild
index c694d28efa8e..14742fe11e5a 100644
--- a/dev-libs/fribidi/fribidi-1.0.9.ebuild
+++ b/dev-libs/fribidi/fribidi-1.0.9.ebuild
@@ -17,7 +17,7 @@ IUSE="static-libs"
RDEPEND=""
DEPEND=""
BDEPEND="
- virtual/pkgconfig[${MULTILIB_USEDEP}]
+ virtual/pkgconfig
"
DOCS=( AUTHORS NEWS ChangeLog THANKS ) # README points at README.md which wasn't disted with EAPI-7
diff --git a/dev-libs/fstrm/Manifest b/dev-libs/fstrm/Manifest
index 3d373c83d7b9..0c857495adb8 100644
--- a/dev-libs/fstrm/Manifest
+++ b/dev-libs/fstrm/Manifest
@@ -1,3 +1,3 @@
DIST fstrm-0.3.0.tar.gz 185153 BLAKE2B 1e1e16792288255c1d963f2831b6f362d08a343cb58ae7ae8e24c5d9a70d870b238c399b9f2cb30da939dbfbf5faa49a61609725036113e579f2c7d63a36e599 SHA512 4134da0ed8579cb6784a419bba76b3be7487ec67b6fad65e0e662b40e668389010381176794d15da9c96339292f0faedc143f87b7ef3815b69bbc8b165af5c4d
-EBUILD fstrm-0.3.0.ebuild 823 BLAKE2B 833be8b4e3aa855f140c53f91d61e4f47c82255d23066c1097ea3a3e9064de1d668dd8848ee67bca9ae3220b7b7c0eb3ffb2c00b43ff6c557acc642fedeb6b44 SHA512 07cf4929e70444c37b2fbafb1b5e9098576507d721fd1c8744a76ca230f9a1fcc752d4ef813a79ae8655310798086e20480cc0f342cfbcc2c53da0b2996bf3e5
+EBUILD fstrm-0.3.0.ebuild 803 BLAKE2B 52f8d34804c41344d3414cb9b07e476f49cef9f6e41db960e33fce21d404cc011ad97b92dee7288e868a12e10020a16e328b805c320c4395fc7967411faec988 SHA512 9d81084901f1d029c9e62117e294b1f6985870928db5f8aac00d71449874b67a378d5d3f7d46503ce8eed22ea916eefdf4e60142059b092addc9dd7a0dbdb829
MISC metadata.xml 321 BLAKE2B 4513b4f120d44149f4419f74664e9f345f365c4f6f3938f9c751021ce00a2bee3c1f655b2c47113eded5f743dbc8c8968f7e3fba76ff71189e4026777700724a SHA512 a2bd9cbe2b311f26fa6bb62aa783fa8577f0e07d6e284370c787386e08b6aaf98d4f5bf655f69283d864b0e7a7fe847c75142ac67ff12dd93596f9ddddcbb065
diff --git a/dev-libs/fstrm/fstrm-0.3.0.ebuild b/dev-libs/fstrm/fstrm-0.3.0.ebuild
index 501c9bc33f0d..36ff91aa1a1d 100644
--- a/dev-libs/fstrm/fstrm-0.3.0.ebuild
+++ b/dev-libs/fstrm/fstrm-0.3.0.ebuild
@@ -15,7 +15,7 @@ IUSE="static-libs utils"
RDEPEND="utils? ( dev-libs/libevent[${MULTILIB_USEDEP}] )"
DEPEND="${RDEPEND}
- virtual/pkgconfig[${MULTILIB_USEDEP}]"
+ virtual/pkgconfig"
src_prepare() {
default
diff --git a/dev-libs/gjs/Manifest b/dev-libs/gjs/Manifest
index 6d3000202ce0..0360cf8cd954 100644
--- a/dev-libs/gjs/Manifest
+++ b/dev-libs/gjs/Manifest
@@ -1,11 +1,7 @@
-DIST gjs-1.56.2.tar.xz 701976 BLAKE2B 77057e4a3a8958d6648c92bb56495b505b3ec49bc0eeff0fa5c9e3ae5a694a4b5643dc72d7aa673f9e66d42e9b0def7f9df0043f2690216bfc5c5109ea9eca51 SHA512 687b8e3795565b5c56fceebefb229c07b4c084a4f65c0035e0d185d12082920424632c0f896df8dc1cd5013a97b6e08274efaec4caeb564dc2070d26a5f974c5
DIST gjs-1.58.6.tar.xz 637972 BLAKE2B 553f29808723e48cee39c62e260d9c09f5db160756bf6c2fc45e532bee1d5c8babdd2bd5aee39fdff1300fc10de2c2a4e34d6b850e6e95c83ef217a8955379b6 SHA512 3e8fa8ccaabbbd07e74869fdc6188cffc19565798a6267fd3480d9320a2c9c5906c864e5d0c6e9e57f7bb79cc1706717b76b23c7cd89eb191477eb173b24aa74
-DIST gjs-1.58.7.tar.xz 638804 BLAKE2B eb9bb1ea0cd9b52b58a0c4497d5bb930ccb0c8451a94cf9e5e97a6cf1e7bd4dfa5f7a15c2c68fbba3c36a5d71e71df88f086b528e7c2e86d2a8374bfdeac8aa4 SHA512 0790cffd2f2230717b78266b356e88133b5fb816380bf96fc2bea0a039d96979796ad6455a4270dcde62ff2a023fbd73e2edc98428aa2a8b2fdf2cc6c8f8ecce
DIST gjs-1.58.8.tar.xz 639372 BLAKE2B 53be0d5353213e7fdc6009aeed16db79f61ee5b800d66cd79f87e577b44adbb05ae741d73550237027a902d2e038c8e8247d3269bf058b64622a1a261f5a2501 SHA512 373b400b884096b6746c1ac7f2c2915857aa888dfb8bbf19bb8469fb75e081e4df36dcab06723f03654c34354a5a69a7865727ab9e36d3fb0d2b2652713e5cd6
DIST gjs-1.64.3.tar.xz 422436 BLAKE2B ade874085962f43fe7cd1412966557e4c40daf030b71a04b61f2b811b6056ae3abaff0cca04d9bf852dbb045a5a687dc27f5301c19235138f3d5d50be41f10c6 SHA512 9d92e52a7fef07853f3beb181798f89deb60b97b928d916cd827c99a6ab8f83abf7c352a1aa46be476a50e2efadfaf09befa54ccab0d51b0ac7127f2fe794801
-EBUILD gjs-1.56.2.ebuild 1716 BLAKE2B 2ce098c4264ff6e1da801f8cc2280760ba40fcc81919e3cf8097aa6a3cb51375e5e4b9b3282b8c399d03aeb52c27de23ab567ee3ba3ab294ed01129479e1eb89 SHA512 5fdcb266f181e8c29f33c3360b484a1d99635e336290896188760ef253a08e838ebd553643c02ae4bb348413d7bc19a689f8ae60e943b25dc7b7d20c434d7189
-EBUILD gjs-1.58.6.ebuild 1607 BLAKE2B 2d76a84f4ea98432f35ec6e5efdff117edf29e0b3d101783ced59eb827d552dd721a3ddea11f4fffcb9ddb9a921d1396ee9742b3b5f860af159c3c522c88edab SHA512 25fb7e7721932259b3040f73c360bc729ec301a3244bba1f1f8ce3fb6612a4c9aebaf878edcf697b1065e9fc3f0f2e2631498d560b48da9469e94deaf477dd79
-EBUILD gjs-1.58.7.ebuild 1613 BLAKE2B 3857ae2f6b7f9fc589a9abb4b3dbff4042cd7ee7cd543630d7eeab4ab0b55e18c408bb84ffe1e6ed7de552d2d64580d0b1f966f259f5c465f59ed3042c04ece2 SHA512 eb4ef64e73ca226340352e5e5426cde2b95ec3bf4034b5a43a1c9ec98515aa3148ec25e2259a28d524a290bf9bbeddda55d7e81e8358e61098f4813fa3cb7e23
+EBUILD gjs-1.58.6.ebuild 1606 BLAKE2B 2f10f926af7b704a16765b7cadd0ceee510b0f996ef160338abe019483384b4682a7fb89ec50d8958b0fb504be30574dd04ff7493af23df9bd44d8dbe071ca7b SHA512 e72901d389173016cab161a5126d3fd82a0dfa6a4d7fd6c21a381b73868ac2db891418742c88acdfd8769b8a13f01552173c19c31af39a47178681f870269490
EBUILD gjs-1.58.8.ebuild 1613 BLAKE2B 3857ae2f6b7f9fc589a9abb4b3dbff4042cd7ee7cd543630d7eeab4ab0b55e18c408bb84ffe1e6ed7de552d2d64580d0b1f966f259f5c465f59ed3042c04ece2 SHA512 eb4ef64e73ca226340352e5e5426cde2b95ec3bf4034b5a43a1c9ec98515aa3148ec25e2259a28d524a290bf9bbeddda55d7e81e8358e61098f4813fa3cb7e23
EBUILD gjs-1.64.3.ebuild 1041 BLAKE2B 711d626dacf32d9a896d23d0998103dcb2aac96bc7216b8edbce016233c42f9f26b11809690f9a62938bb0700ae0a3b415be02b676d8dc3c90973970558f81fe SHA512 17bdd21a6489b139c4fe1fd10f580fab3553250e825745e499050aa07ac00b8fa110eee88deb17f1a36c42f0ee109f55f7d3a3da26911aa74f556c72dacc7a3e
MISC metadata.xml 388 BLAKE2B 9b4ab74929619cfb6c4405385667aa00521f59865df8338e9078286f2efa593dc49412153bd5b45e4fc4cbcd4c13a75c4743cd4381f05b07bed92cde09bf28fe SHA512 8aaf5f422cd8b63a71aa7773690607fb2d8ad6e6a7e350686da8e26ff4e6856c7f352ab02a79a7f2917b28758ff523a6aa6ddcfb2a1ad876aac94e6b2bd48072
diff --git a/dev-libs/gjs/gjs-1.56.2.ebuild b/dev-libs/gjs/gjs-1.56.2.ebuild
deleted file mode 100644
index b2cf67dc92ba..000000000000
--- a/dev-libs/gjs/gjs-1.56.2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2 pax-utils virtualx
-
-DESCRIPTION="Javascript bindings for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Projects/Gjs"
-
-LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
-SLOT="0"
-IUSE="+cairo examples gtk readline test"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86"
-
-RDEPEND="
- >=dev-libs/glib-2.54.0
- >=dev-libs/gobject-introspection-1.57.2:=
-
- readline? ( sys-libs/readline:0= )
- dev-lang/spidermonkey:60
- virtual/libffi:=
- cairo? ( x11-libs/cairo[X] )
- gtk? ( >=x11-libs/gtk+-3.20:3 )
-"
-DEPEND="${RDEPEND}
- gnome-base/gnome-common
- sys-devel/gettext
- virtual/pkgconfig
- test? ( sys-apps/dbus )
-"
-
-RESTRICT="!test? ( test )"
-
-src_configure() {
- # FIXME: add systemtap/dtrace support, like in glib:2
- # FIXME: --enable-systemtap installs files in ${D}/${D} for some reason
- # XXX: Do NOT enable coverage, completely useless for portage installs
- gnome2_src_configure \
- --disable-systemtap \
- --disable-dtrace \
- --enable-profiler \
- --disable-code-coverage \
- $(use_with cairo cairo) \
- $(use_with gtk) \
- $(use_enable readline) \
- $(use_with test dbus-tests) \
- --disable-installed-tests \
- --without-xvfb-tests # disables Makefile spawning Xvfb for us, as we do it ourselves:
- # https://gitlab.gnome.org/GNOME/gjs/issues/280
-}
-
-src_install() {
- # installation sometimes fails in parallel, bug #???
- gnome2_src_install -j1
-
- if use examples; then
- insinto /usr/share/doc/"${PF}"/examples
- doins "${S}"/examples/*
- fi
-
- # Required for gjs-console to run correctly on PaX systems
- pax-mark mr "${ED}/usr/bin/gjs-console"
-}
-
-src_test() {
- virtx dbus-run-session emake check
-}
diff --git a/dev-libs/gjs/gjs-1.58.6.ebuild b/dev-libs/gjs/gjs-1.58.6.ebuild
index 131ea45196f6..2f256eb68f48 100644
--- a/dev-libs/gjs/gjs-1.58.6.ebuild
+++ b/dev-libs/gjs/gjs-1.58.6.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Gjs"
LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
SLOT="0"
IUSE="+cairo examples gtk readline +sysprof test"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86"
RDEPEND="
>=dev-libs/glib-2.58.0
diff --git a/dev-libs/gjs/gjs-1.58.7.ebuild b/dev-libs/gjs/gjs-1.58.7.ebuild
deleted file mode 100644
index c0859f6c9be3..000000000000
--- a/dev-libs/gjs/gjs-1.58.7.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2 pax-utils virtualx
-
-DESCRIPTION="Javascript bindings for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Projects/Gjs"
-
-LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
-SLOT="0"
-IUSE="+cairo examples gtk readline +sysprof test"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-RDEPEND="
- >=dev-libs/glib-2.58.0
- >=dev-libs/gobject-introspection-1.61.2:=
-
- readline? ( sys-libs/readline:0= )
- dev-lang/spidermonkey:60
- dev-libs/libffi:=
- cairo? ( x11-libs/cairo[X] )
-"
-DEPEND="${RDEPEND}
- sysprof? ( >=dev-util/sysprof-capture-3.33.2:3 )
- virtual/pkgconfig
- test? ( sys-apps/dbus
- >=x11-libs/gtk+-3.20:3[introspection] )
-"
-
-RESTRICT="!test? ( test )"
-
-src_configure() {
- # FIXME: add systemtap/dtrace support, like in glib:2
- # FIXME: --enable-systemtap installs files in ${D}/${D} for some reason
- # XXX: Do NOT enable coverage, completely useless for portage installs
- gnome2_src_configure \
- --disable-systemtap \
- --disable-dtrace \
- --disable-code-coverage \
- $(use_with cairo cairo) \
- $(use_enable sysprof profiler) \
- $(use_enable readline) \
- $(use_with test dbus-tests) \
- $(use_with test gtk-tests) \
- --disable-installed-tests
-}
-
-src_install() {
- # installation sometimes fails in parallel, bug #???
- gnome2_src_install -j1
-
- if use examples; then
- insinto /usr/share/doc/"${PF}"/examples
- doins "${S}"/examples/*
- fi
-
- # Required for gjs-console to run correctly on PaX systems
- pax-mark mr "${ED}/usr/bin/gjs-console"
-}
-
-src_test() {
- virtx emake check
-}
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index aafc6b1ebb6c..1fe45e9e5d87 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -1,6 +1,6 @@
AUX glib-2.64.1-mark-gdbus-server-auth-test-flaky.patch 842 BLAKE2B 6b2eb57b8923c8bb54ead80d829aeb7a5c8a42c62e960e7305bc3fad69c67fd21e1c9f20b5c9002c0319cf3d77992b9cb71912c9b813b723e0a56aaea38330ad SHA512 ccd92d2f1fd495618ac788ffe6b69acec05a521a0ee8ff2bacb1dce6e283a04bbc2a10e61b37fc29f3893003fa154fa0d30bc37ed266b3f813200cd8ed17c116
DIST glib-2.62.6.tar.xz 4703424 BLAKE2B 0a27245be2575c574dcc730dd051a8c284f421dbc46579aadc5fbbacb8f934af4374b61bb26085e5c9ab78a868c567818f3fb9d67adddce37f5c4fec00e0d276 SHA512 8e3972a371f3c1a50b7d245b30e4f740583ad72ba4ab325e0e15e0732be44dfb69b603fb39dcf4989255a23a181e9ea5dd25982dd94c386cd9f21952243ad6f5
DIST glib-2.64.3.tar.xz 4778964 BLAKE2B 98ec6e15a8ff642fbccd4809d749234d5adae8abcab7a3619caed0aa60370d0409a76a2c64a95998401e8a339dcc264f4f808f3d7be457ff40e38d70b0a8076b SHA512 a3828c37a50e86eb8791be53bd8af848d144e4580841ffab28f3b6eae5144f5cdf4a5d4b43130615b97488e700b274c2468fc7d561b3701a1fc686349501a1db
-EBUILD glib-2.62.6.ebuild 9778 BLAKE2B d0cb29b663e8f98e5f0719b3041e0018847ea578a755676f611ab289e5de78f1290a5686d264d9213595d8496591f5c15f21acbd29392669841ea7f9f5a7a560 SHA512 b162db517085b47e91d95ebfda5207ba1d3ea04895d7ac00229ddba81490cdd140235b12cd9c2a8cca78c8959dec9695319003d4f80dbdee283fc20e299e8f0c
-EBUILD glib-2.64.3.ebuild 10365 BLAKE2B 4702138fc2ac027dd6f694bf07b0cf9e1d147d5171c3f7d22955766e9d243549372570a54c31977e40edf1924b7d22441d91afa9d529278c2f4d5adecb064f18 SHA512 20ff3ca65e3506b8ab40998f5d7154d15c20808458ceffdc85b02801e05feb08f68bd40f9ac440e7796e76152c3cb872c11debaa273565598b1b93e8da75dc6c
+EBUILD glib-2.62.6.ebuild 9758 BLAKE2B ad374e654c1afbe60c8b65e04cf1934791f8c487a3881b82deb0684f0c903e4d7a4e08c954f325a896a42f935634ecc37d764ad6e16a4fcd6b1a04528aaab378 SHA512 bf35ad4fa21d1d9a7e1bd495a800d67fed2aca2f5002cf8df58523ed980abb05b076d19382274556a99a72fa4bf4a796d693534b19ed4e309fb642e4ed7f0feb
+EBUILD glib-2.64.3.ebuild 10345 BLAKE2B 0c3e43db40f5704f446730bf0d95058ece141f40b4ed76ed9fdc1c8089c47e8515df265d7c8293ed042d7b6d33541f1c55628131b7ee154aeeb33f95ec73fbcb SHA512 e06065ef028ebe66e4281c95b118ecfef3a1ae48e441ca99fa4b7e615ad157a1ee5d4d32214b57b8af587b9a0e7aee145adac5ed4bad25b1795dd3792ac04516
MISC metadata.xml 978 BLAKE2B 75f0c12ff1628b7c345b1e85c6baa041973f11555aa520348ca6f347d2241ee0fc9bc26891b25bd34ae512dbaf761b5382d93f094dc0c4ff9a76c3ec852c9583 SHA512 8087f80cbbffb14930b50178559cc4dbde999d4e123475beb04e2d0a25e64b24ee5ab8523f1df1839e82f74272b40cd9a57b78acf34fd64f8b4723bed26573c8
diff --git a/dev-libs/glib/glib-2.62.6.ebuild b/dev-libs/glib/glib-2.62.6.ebuild
index f67ed49b7843..57adaa590548 100644
--- a/dev-libs/glib/glib-2.62.6.ebuild
+++ b/dev-libs/glib/glib-2.62.6.ebuild
@@ -51,7 +51,7 @@ BDEPEND="
systemtap? ( >=dev-util/systemtap-1.3 )
${PYTHON_DEPS}
test? ( >=sys-apps/dbus-1.2.14 )
- virtual/pkgconfig[${MULTILIB_USEDEP}]
+ virtual/pkgconfig
"
# TODO: >=dev-util/gdbus-codegen-${PV} test dep once we modify gio/tests/meson.build to use external gdbus-codegen
diff --git a/dev-libs/glib/glib-2.64.3.ebuild b/dev-libs/glib/glib-2.64.3.ebuild
index 8b05703c3473..481b31a84637 100644
--- a/dev-libs/glib/glib-2.64.3.ebuild
+++ b/dev-libs/glib/glib-2.64.3.ebuild
@@ -54,7 +54,7 @@ BDEPEND="
systemtap? ( >=dev-util/systemtap-1.3 )
${PYTHON_DEPS}
test? ( >=sys-apps/dbus-1.2.14 )
- virtual/pkgconfig[${MULTILIB_USEDEP}]
+ virtual/pkgconfig
"
# TODO: >=dev-util/gdbus-codegen-${PV} test dep once we modify gio/tests/meson.build to use external gdbus-codegen
diff --git a/dev-libs/gobject-introspection/Manifest b/dev-libs/gobject-introspection/Manifest
index a27bea498a05..3c9c4a8ebc94 100644
--- a/dev-libs/gobject-introspection/Manifest
+++ b/dev-libs/gobject-introspection/Manifest
@@ -1,5 +1,5 @@
DIST gobject-introspection-1.62.0.tar.xz 980732 BLAKE2B 96ecc98bea97b7cb24e2c0a0adb8158cfc8915ee8e3b980adf08ec3256d4d0f87bc92d33cce30f5b23c85c4b144d8da755e5313735091b27ff53fea45a80014e SHA512 b460a95fd7a323e9b0c9a45e680ebe98bbae7632abfa53b3e0b0ec050775cab17dde693314d6d4f8e93614c32b5587f8ce0b4a4c9ee9ba46c029ce029014e638
DIST gobject-introspection-1.64.1.tar.xz 1000280 BLAKE2B c0248831648f6f1849516f30facac9ecade4b4fdb9dce70f93f516364c08f93d0622e06376bd7895dd25c3f1fb5b0af533d6c60f1b2590848cc6781b81a584f4 SHA512 7610871f7ed5778ea9813062ed6465d131af58c00bdea1bb51dde7f98f459f44ae453eb6d0c5bdc6f7dcd92d639816f4e0773ccd5673cd065d22dabc6448647c
-EBUILD gobject-introspection-1.62.0.ebuild 1872 BLAKE2B 0fd21ecbd6b20f96a1a26ce1cd17e57ce8095f857c8e168c5219fd660581b9f568c5c019408e16f3bbdf571d4c37cb638f64ca0e5e059bc852b19aecca75bad5 SHA512 b6c01c14265696bd7596911b064dfb86ae41e85006d55d071806b72c4421ac3fec8ba1405d3b283de8e967812d9298c42e5b69b5d89706c07cf8f8375397e054
-EBUILD gobject-introspection-1.64.1.ebuild 1889 BLAKE2B e331a2e6adc124300979f3cbea3fd96afe159c425c0f599b1fd4d8ce715f982787ca2e5edd877a1ee7651114d90af321efc31329ef6a033f376a876e3274da54 SHA512 ee596f425020b613d29b35c9ff431abd6c370089b22f9e3c6d61402b277f20769fc681c2650780d2e227ff88e883f54554a44b2802c9190edc7c120606080f1a
+EBUILD gobject-introspection-1.62.0-r1.ebuild 1872 BLAKE2B 0fd21ecbd6b20f96a1a26ce1cd17e57ce8095f857c8e168c5219fd660581b9f568c5c019408e16f3bbdf571d4c37cb638f64ca0e5e059bc852b19aecca75bad5 SHA512 b6c01c14265696bd7596911b064dfb86ae41e85006d55d071806b72c4421ac3fec8ba1405d3b283de8e967812d9298c42e5b69b5d89706c07cf8f8375397e054
+EBUILD gobject-introspection-1.64.1-r1.ebuild 1889 BLAKE2B e331a2e6adc124300979f3cbea3fd96afe159c425c0f599b1fd4d8ce715f982787ca2e5edd877a1ee7651114d90af321efc31329ef6a033f376a876e3274da54 SHA512 ee596f425020b613d29b35c9ff431abd6c370089b22f9e3c6d61402b277f20769fc681c2650780d2e227ff88e883f54554a44b2802c9190edc7c120606080f1a
MISC metadata.xml 367 BLAKE2B b69aefd2ddda2f8e216d449de9ca13a5a8c473353b291bc5093ec2f6f3ac3346dc9fa25c85a64f15950813d9d6dfafd356a234c748436edb7639f37e95c71151 SHA512 1430924bf7430f4a409d6c3335a52b59567d5972440068e53e637d6c71486ef3e606ed9043184dfc168d731909e11c769042d2846e137312cd0ee0ce6f52e431
diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.62.0.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.62.0-r1.ebuild
index 593d1ab7f1ab..593d1ab7f1ab 100644
--- a/dev-libs/gobject-introspection/gobject-introspection-1.62.0.ebuild
+++ b/dev-libs/gobject-introspection/gobject-introspection-1.62.0-r1.ebuild
diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.64.1.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.64.1-r1.ebuild
index 9cb429ff7fc5..9cb429ff7fc5 100644
--- a/dev-libs/gobject-introspection/gobject-introspection-1.64.1.ebuild
+++ b/dev-libs/gobject-introspection/gobject-introspection-1.64.1-r1.ebuild
diff --git a/dev-libs/hsa-ext-rocr/Manifest b/dev-libs/hsa-ext-rocr/Manifest
index e5066e604a88..630740610103 100644
--- a/dev-libs/hsa-ext-rocr/Manifest
+++ b/dev-libs/hsa-ext-rocr/Manifest
@@ -1,3 +1,3 @@
-DIST hsa-ext-rocr-dev_1.1.30300.0-rocm-rel-3.3-19-23fc088b_amd64.deb 1211350 BLAKE2B 283b6699cd618004bc6086ac2fe991b28093db85bd47e685aaee4e8c38f8069f2fbc7f93618e253ab9ca68872d6ec988350cea5439cf3a9c7b0c1c336984d581 SHA512 550f2fff8f2366c780a0316f656f29d066e23ae37cf588741201ef7c7870e4fc4877722f417856decd716eb925ed145b0b97431472bfe8861bbccf6f7d6fb704
-EBUILD hsa-ext-rocr-1.1.30300.0.ebuild 1211 BLAKE2B 3d012eb2d79e5ac79b05100ec0c1885844de4e4a43b236cb4a7fcc6691cea7da3c0390f2dde84f692d0d615f4132d6518fb387a55f94e0f024ea5680ddc8f186 SHA512 2e2489d0253b8fefe97a41aaf00e7e0c3e908df47adc95c96c68e743de24438bb6b9fac0d6d6e5c41ca0e9adbe9675ce4242f8e00c07b4452159253759c967b5
+DIST hsa-ext-rocr-dev_1.1.30500.0-rocm-rel-3.5-30-def83d8_amd64.deb 336660 BLAKE2B 8c01eb947e55ac5a941852f4d477fb85f15984ae3b8af699b6ba39e29785eeb149e6d95e055d5f0431eee55f56c035cf1b0d695aa65e257ea286d78b3de46d3f SHA512 f1bfdfb4e32f4219f29f19370775ff874201d0c0bfcaea65d680c4b77b49c8a14606fd69cf683be67d9e636484c1c9dd0d7e0650d86598dba270b02875ab072a
+EBUILD hsa-ext-rocr-1.1.30500.0.ebuild 1210 BLAKE2B fd38427f10de92ae80b346b306cc12b3664093fa4876ac40c6880d44ff20cd352c4f491392180aa3baf2d14191a557740c7714d9a87f1c412aeb28812d3c4199 SHA512 f3cc1c6bbe294bf0969f30ae4b29de99c22dd72daacec656e4b4bf3701a1c111ea7faf1168dac19107faabc7c5e833080b2b1da391c9835397cba80ea7ca1740
MISC metadata.xml 804 BLAKE2B 53bf694f8db04562ed3dcde4ed009a447f913d545012b511d0321d230ed9110ab73da69c2b5ac295eea48a705a8defb4409326d4f4001727139ce3ce2b7b699f SHA512 9f1c2af7864205799b5b2f36be15148de6b0d3ebe8fa6f1ca578abcf5fa6c4b08b24082a2a32e93fce71de25756c7644989b51e63b765516ad63f63a5eb880b3
diff --git a/dev-libs/hsa-ext-rocr/hsa-ext-rocr-1.1.30300.0.ebuild b/dev-libs/hsa-ext-rocr/hsa-ext-rocr-1.1.30500.0.ebuild
index 82e3a047c4eb..0fb8e67847e1 100644
--- a/dev-libs/hsa-ext-rocr/hsa-ext-rocr-1.1.30300.0.ebuild
+++ b/dev-libs/hsa-ext-rocr/hsa-ext-rocr-1.1.30500.0.ebuild
@@ -5,8 +5,8 @@ EAPI=7
inherit unpacker
-ROCM_VERSION="3.3.0"
-MY_PV="${PV}-rocm-rel-$(ver_cut 1-2 ${ROCM_VERSION})-19-23fc088b"
+ROCM_VERSION="3.5.0"
+MY_PV="${PV}-rocm-rel-$(ver_cut 1-2 ${ROCM_VERSION})-30-def83d8"
DESCRIPTION="Proprietary image-support library for Radeon Open Compute"
HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm#closed-source-components"
diff --git a/dev-libs/icu-layoutex/Manifest b/dev-libs/icu-layoutex/Manifest
index 245960a65e22..394f875693eb 100644
--- a/dev-libs/icu-layoutex/Manifest
+++ b/dev-libs/icu-layoutex/Manifest
@@ -1,4 +1,4 @@
AUX icu-layoutex-65.1-remove-bashisms.patch 4963 BLAKE2B fb781741a7a908638876729d573a73e42b7b3f0f3e692b54799fed0dac006ecb731583d90d849ea06be47259a0a236933fa7a78a96b3a8107ee85f916dc2000a SHA512 67e60068c356ca8d93b137eadeef2562ff7d8f38153babc97edd92a2c38d7113396d63d4a09364dacefc612b4b3ea28872a4f767c4f38d3e725943b32f98c5bc
DIST icu4c-67_1-src.tgz 24518055 BLAKE2B f8a263b5c3e5e8ffea88a3bb766cb265aac026b5f9b2f45a1f06076f99f9f0dc3a4512487652d774ccfc8dc65f8f4c40a974e0aa2aa4381ee0c9885f6b871779 SHA512 4779f1ce1ca7976f6fad6768853ea8c540da54d11509e3b6cfd864a04b5f2db1c3d4b546387f91ad02fb90804525bc37d2543173f0d705d6ca11dc6f2b7640a8
-EBUILD icu-layoutex-67.1.ebuild 2522 BLAKE2B 3ea868e1cba9328ff4394800d725ab173e4bbf06bb8e0171cbb34da8f0831e7c0b6f76455eb7c16c48f1f39bf6a648c040f742672939b78e3b0827b4a616be7b SHA512 e77f243c190da2c5954725715063d9667071f455d76c84e18798399303895d7da73e3985c8458240859cdd50f232cdeb263f9ea62af0ca936af34bb15ed9f342
+EBUILD icu-layoutex-67.1.ebuild 2502 BLAKE2B e452136b482c356e571acffad2a251bd784425dad08053c0d07f8d844e85e1838600ac60413e4bbd2fc19c654e355dce1609d72b1f89bad9d01f71210e9e80bd SHA512 5ef730853a72505f6d0f36033b128b5de2c3182eff92c3c36607b33d4f6095e96f46419fc9105a32341a2fcfc679ebc1ab5ffe2f1f10542c14b4d13b6a67020b
MISC metadata.xml 379 BLAKE2B 7dd7c9bef21ada3af657ec75d323fa890bb02e04b1760fb5791bdbddf8d5eaa1126ab80058e73977a5bede8c8e655f9fc7045f43d4fadcb0213ea8a122258380 SHA512 45e7eab7e7d954331f7d64582eaef71c18316335fca7cbf6bbdf8e71555301e995ff7ab04e35977be8a82fc8360af00115567aeddd710b253c6a68fd893228aa
diff --git a/dev-libs/icu-layoutex/icu-layoutex-67.1.ebuild b/dev-libs/icu-layoutex/icu-layoutex-67.1.ebuild
index f459281f5e42..39488ffadbc4 100644
--- a/dev-libs/icu-layoutex/icu-layoutex-67.1.ebuild
+++ b/dev-libs/icu-layoutex/icu-layoutex-67.1.ebuild
@@ -15,7 +15,7 @@ KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86"
IUSE="debug static-libs"
BDEPEND="
- virtual/pkgconfig[${MULTILIB_USEDEP}]
+ virtual/pkgconfig
"
DEPEND="
~dev-libs/icu-${PV}[${MULTILIB_USEDEP}]
diff --git a/dev-libs/icu-le-hb/Manifest b/dev-libs/icu-le-hb/Manifest
index 1b085b32bd70..007658c05769 100644
--- a/dev-libs/icu-le-hb/Manifest
+++ b/dev-libs/icu-le-hb/Manifest
@@ -1,3 +1,3 @@
DIST icu-le-hb-1.0.3.tar.gz 39352 BLAKE2B 7cc2e56b6ac334e0f9c259d4f9d0356480c1ae4eb647610ebfb81ee9b1bc0326f1dba68991e2893cc9b029ea53705cc0936cbbf29e74ab4ef336f58f5e8b47ab SHA512 06dff69bc17c39c13bd5bc801dbe09e2dc2f0cdf1acd774fa863e09f4a65820b2f330d4836da6748c077365f685fa74452ec1924785e3191cc2925036803cbb4
-EBUILD icu-le-hb-1.0.3-r1.ebuild 956 BLAKE2B eebef476b3b8355bda7a40712743362efeb2bf313506a7716f8c23dbf474bcdcbdaae8231184386ffbc7c9c7f907125cefef41daa07ae7f0085fa9acb8c4c994 SHA512 c2a45cf4bcf8ba1de7e43e88e9e683b896552c63c545517336fd573f7fbb350bb32f08f19634e1b3c16bbd8f1b0dc3d8070cfa97a9da3bbaa4f0ec4ab89ef841
+EBUILD icu-le-hb-1.0.3-r1.ebuild 936 BLAKE2B 8c7d9f8567d1d40b8e1f48b900ef748ef748c5b9823d12bef22431d217ef175d0642607c9a39581b2f99c743f093f2f47b230c64187ab4ad63cb28aa0fc6dc2f SHA512 3350c4c4b441f56a0d797d810f1cc8c751a6dabc54f376bc4107f36496dd29118cc03915c3b943e22af1adef2beaa900f07976e44485cd0ea1db29fc2cc8bf66
MISC metadata.xml 464 BLAKE2B 326f9087cfc3c08145ed5ef2dd2c109fcf1c81ca3a8a4394504045361243c4e9db69fee1f47d67bb7aa9a91e3d6e62cc61f45a74b611d62c389a70e1a1829058 SHA512 40aeb13c0ee32afb9b58e3412bf26806bbf724deebd6b966477412df1889cfc62c90755820381d3622a535ce83ec7bf4e051f85dea84138b84bf553ecc7b84fb
diff --git a/dev-libs/icu-le-hb/icu-le-hb-1.0.3-r1.ebuild b/dev-libs/icu-le-hb/icu-le-hb-1.0.3-r1.ebuild
index bc67bb2c0d34..29001e5eecca 100644
--- a/dev-libs/icu-le-hb/icu-le-hb-1.0.3-r1.ebuild
+++ b/dev-libs/icu-le-hb/icu-le-hb-1.0.3-r1.ebuild
@@ -24,7 +24,7 @@ RDEPEND="
DEPEND="${RDEPEND}"
BDEPEND="
- virtual/pkgconfig[${MULTILIB_USEDEP}]
+ virtual/pkgconfig
"
src_prepare() {
diff --git a/dev-libs/json-glib/Manifest b/dev-libs/json-glib/Manifest
index 39d1e4f96346..5c87a7246914 100644
--- a/dev-libs/json-glib/Manifest
+++ b/dev-libs/json-glib/Manifest
@@ -1,3 +1,3 @@
DIST json-glib-1.4.4.tar.xz 165584 BLAKE2B 0cdb518cd139b8dbdbf31c9bc00ddedca6385d7132843455a7898f3544fb43b62d6626d49944e83ef10ab9a555cf21c7e4548df7d784bcb4020f4026e0f3045e SHA512 cf56a99dce3938b5c0075810f105719836fac65392da33a49b26ebf33aee1fab89ca9fac58059a2008d688ecc75a3e524de60621a5b027d566963541f38b971f
-EBUILD json-glib-1.4.4.ebuild 1533 BLAKE2B e33c7b82875c797ae045c1c347479b9358e2534ffd51201fe239e1e8fb717d6bd7a0687a084a4620c991ba3b1920818e24833aa467a36ad5756abf9195782ade SHA512 c55384f47986ece0e544c3b7ddd8850e45bf0a811869cc5bb2f955090c6efcde9d9b615475f664ff1795847b304d02276a746e5877a44151470ee780f96499f7
+EBUILD json-glib-1.4.4.ebuild 1513 BLAKE2B 5b25ecdf9e892824564e56605ca5bd0f8c21ff037faa70d39d4167d850996e2ab0f68784279b3b885504d98e344e6c62f10a349e6ed3434574780f5c0422943c SHA512 688bb6e76bdfd6ae49cca7fe04db4f3fa118bcbe6438de8f7142237acde1194b840cf4473a9eed636de5254b0337a1e9326fdf7e312b16754a2d42fca5e3ad67
MISC metadata.xml 1168 BLAKE2B f92f6fe2026abedfcd6f51797df84573b33817b10203e0325aa9790cc9c58ea6c9d69724b122dfe3c9b7b2a34cbf15e5e245c8aa93a1f8802757ac1c2ce61a7d SHA512 9af9dffd8e1d56c9dad5a0c53bdf16f5d54261c8c121cbc9644865340b84101a0bfcafc393bfe0d6b31024b16f1bbe9f9305286bc56a2df20a08984f55cb91e1
diff --git a/dev-libs/json-glib/json-glib-1.4.4.ebuild b/dev-libs/json-glib/json-glib-1.4.4.ebuild
index a351d707086b..b4a5172fae10 100644
--- a/dev-libs/json-glib/json-glib-1.4.4.ebuild
+++ b/dev-libs/json-glib/json-glib-1.4.4.ebuild
@@ -24,7 +24,7 @@ DEPEND="${RDEPEND}
dev-util/glib-utils
gtk-doc? ( >=dev-util/gtk-doc-1.20 )
>=sys-devel/gettext-0.18
- virtual/pkgconfig[${MULTILIB_USEDEP}]
+ virtual/pkgconfig
"
src_prepare() {
diff --git a/dev-libs/keystone/Manifest b/dev-libs/keystone/Manifest
index 0e7052b15ddf..6e4446dbecd3 100644
--- a/dev-libs/keystone/Manifest
+++ b/dev-libs/keystone/Manifest
@@ -1,4 +1,5 @@
DIST keystone-0.9.1.tar.gz 4326151 BLAKE2B 2d41388f4beeff3c424386c77cb75eeca613c66f80e807035f709822f241ef74f64085260678772580cb82bcceda83b4b3c31b92393f8d70f24d54f77f7ba224 SHA512 3bd9c3793d5862a0a8628b52da381625e62445f661dbd5ed715723e7d9db01ce3f9586e5ca0a5cc71e8ceb6c912050f5c28e3ccd540e72c8abcfd2f0d1bbae17
+EBUILD keystone-0.9.1-r1.ebuild 1989 BLAKE2B 8ce13f3d075df104c223f8c54d1e96a2dbf8723c5c830a2e644369dc77d95b05daeb2dade431df45d6c7334b749919ad7cc2df5ddce5d8c243a66cf2d553b2b7 SHA512 08d5158aa067724c075dc495f977e6f140d9ecb48fdf745db8d00e3cdeebf320cabda30b8c5623837f8998415bc3fc8fd3530c537de29290c1982e22078bad69
EBUILD keystone-0.9.1.ebuild 1739 BLAKE2B ceaa4d25089477e82afa431e3f1563ea70b19cb5bc99e1cbe360052323b4ac95468a2fba4dfb5218cd8cbcf24112cd1a79afc8ca38f29289e2995c7a7abbba34 SHA512 84a30e655c0ed51a72ff01c70779c72d5e088d6803c242933c8bc05e6b1e19003f7668b3ec7d58672b85dbd06ac1b360cbd7530cd28aed561cdd511ffc323fdc
-EBUILD keystone-9999.ebuild 1710 BLAKE2B 23d9ac9184c1902d2fcb65333e14ced5fb1e546ea94b05c0d2744f69a672fb20c3da96896d8978cc61d375e50863242dbe1ee5c09ea88b1b4acf9e36c4aa4227 SHA512 8e9a1798073e3f8d3c96736128bab752002d484e6efff19e17af179ec53d2496f63cd0c34c43e98af19aea9494109f0411ade1b339355c78f1a863644a16bde6
+EBUILD keystone-9999.ebuild 1989 BLAKE2B 8ce13f3d075df104c223f8c54d1e96a2dbf8723c5c830a2e644369dc77d95b05daeb2dade431df45d6c7334b749919ad7cc2df5ddce5d8c243a66cf2d553b2b7 SHA512 08d5158aa067724c075dc495f977e6f140d9ecb48fdf745db8d00e3cdeebf320cabda30b8c5623837f8998415bc3fc8fd3530c537de29290c1982e22078bad69
MISC metadata.xml 464 BLAKE2B c4a2f085ab1343377cc2f2579511924578e22d74b1204ed517e8cebfd163455b36bae21cf6454ae5a723b52d50a7fb228db363f38d0de032ab1ee5e84c6ccaf1 SHA512 b1b21373ba08d12d1e6508dc7aea5f65922436cd71eb864f20da08214e93d419a181da6af4a59397e632cdd27d279efaaac3bdf91e28c1b6145f61fdf2ae4490
diff --git a/dev-libs/keystone/keystone-0.9.1-r1.ebuild b/dev-libs/keystone/keystone-0.9.1-r1.ebuild
new file mode 100644
index 000000000000..a4863b0bced5
--- /dev/null
+++ b/dev-libs/keystone/keystone-0.9.1-r1.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit cmake distutils-r1 llvm
+
+DESCRIPTION="assembly/assembler framework + bindings"
+HOMEPAGE="http://www.keystone-engine.org/"
+
+if [[ ${PV} == 9999* ]]; then
+ EGIT_REPO_URI="https://github.com/keystone-engine/keystone.git"
+ inherit git-r3
+ KEYWORDS=""
+else
+ SRC_URI="https://github.com/keystone-engine/keystone/archive/${PV/_rc/-rc}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+
+# Keep in sync with llvm/CMakeLists.txt, subset of sys-devel/llvm
+ALL_LLVM_TARGETS=( AArch64 ARM Hexagon Mips PowerPC Sparc SystemZ X86 )
+ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
+LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?}
+
+IUSE="python ${ALL_LLVM_TARGETS[*]}"
+
+LLVM_MAX_SLOT=10
+
+RDEPEND="
+ <sys-devel/llvm-11:=
+ || (
+ sys-devel/llvm:8[${LLVM_TARGET_USEDEPS// /,}]
+ sys-devel/llvm:9[${LLVM_TARGET_USEDEPS// /,}]
+ sys-devel/llvm:10[${LLVM_TARGET_USEDEPS// /,}]
+ )
+ python? ( ${PYTHON_DEPS} )
+"
+
+DEPEND="${RDEPEND}"
+
+REQUIRED_USE="
+ || ( ${ALL_LLVM_TARGETS[*]} )
+ python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+S=${WORKDIR}/${P/_rc/-rc}
+
+wrap_python() {
+ if use python; then
+ pushd bindings/python >/dev/null || die
+ distutils-r1_${1} "$@"
+ popd >/dev/null || die
+ fi
+}
+
+src_prepare() {
+ default
+ sed -i '/NOT uppercase_CMAKE_BUILD_TYPE MATCHES/ s/DEBUG/GENTOO|DEBUG/' \
+ llvm/CMakeLists.txt || die
+ cmake_src_prepare
+ wrap_python ${FUNCNAME}
+}
+
+src_configure() {
+ local libdir="$(get_libdir)"
+ local mycmakeargs=(
+ -DCMAKE_CONFIGURATION_TYPES="Gentoo"
+ -DLLVM_LIBDIR_SUFFIX=${libdir#lib}
+ -DBUILD_SHARED_LIBS=ON
+ -DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
+ -DLLVM_HOST_TRIPLE="${CHOST}"
+ )
+
+ cmake_src_configure
+ wrap_python ${FUNCNAME}
+}
+
+src_compile() {
+ cmake_src_compile
+ wrap_python ${FUNCNAME}
+}
+
+src_install() {
+ cmake_src_install
+ wrap_python ${FUNCNAME}
+}
diff --git a/dev-libs/keystone/keystone-9999.ebuild b/dev-libs/keystone/keystone-9999.ebuild
index dba275576bed..a4863b0bced5 100644
--- a/dev-libs/keystone/keystone-9999.ebuild
+++ b/dev-libs/keystone/keystone-9999.ebuild
@@ -1,13 +1,12 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
DISTUTILS_OPTIONAL=1
-CMAKE_MIN_VERSION=3.8.7
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6,7,8} )
-inherit cmake-utils distutils-r1
+inherit cmake distutils-r1 llvm
DESCRIPTION="assembly/assembler framework + bindings"
HOMEPAGE="http://www.keystone-engine.org/"
@@ -18,7 +17,7 @@ if [[ ${PV} == 9999* ]]; then
KEYWORDS=""
else
SRC_URI="https://github.com/keystone-engine/keystone/archive/${PV/_rc/-rc}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~x86"
+ KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
fi
LICENSE="GPL-2"
@@ -30,19 +29,28 @@ ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?}
IUSE="python ${ALL_LLVM_TARGETS[*]}"
-RDEPEND="sys-devel/llvm:=[${LLVM_TARGET_USEDEPS// /,}]
- ${PYTHON_DEPS}
+
+LLVM_MAX_SLOT=10
+
+RDEPEND="
+ <sys-devel/llvm-11:=
+ || (
+ sys-devel/llvm:8[${LLVM_TARGET_USEDEPS// /,}]
+ sys-devel/llvm:9[${LLVM_TARGET_USEDEPS// /,}]
+ sys-devel/llvm:10[${LLVM_TARGET_USEDEPS// /,}]
+ )
+ python? ( ${PYTHON_DEPS} )
"
+
DEPEND="${RDEPEND}"
+
REQUIRED_USE="
- ${PYTHON_REQUIRED_USE}
|| ( ${ALL_LLVM_TARGETS[*]} )
+ python? ( ${PYTHON_REQUIRED_USE} )
"
S=${WORKDIR}/${P/_rc/-rc}
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
wrap_python() {
if use python; then
pushd bindings/python >/dev/null || die
@@ -53,29 +61,32 @@ wrap_python() {
src_prepare() {
default
- cmake-utils_src_prepare
+ sed -i '/NOT uppercase_CMAKE_BUILD_TYPE MATCHES/ s/DEBUG/GENTOO|DEBUG/' \
+ llvm/CMakeLists.txt || die
+ cmake_src_prepare
wrap_python ${FUNCNAME}
}
src_configure() {
+ local libdir="$(get_libdir)"
local mycmakeargs=(
+ -DCMAKE_CONFIGURATION_TYPES="Gentoo"
-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
-
-DBUILD_SHARED_LIBS=ON
-DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
-DLLVM_HOST_TRIPLE="${CHOST}"
)
- cmake-utils_src_configure
+ cmake_src_configure
wrap_python ${FUNCNAME}
}
src_compile() {
- cmake-utils_src_compile
+ cmake_src_compile
wrap_python ${FUNCNAME}
}
src_install() {
- cmake-utils_src_install
+ cmake_src_install
wrap_python ${FUNCNAME}
}
diff --git a/dev-libs/libappindicator/Manifest b/dev-libs/libappindicator/Manifest
index 3724d05eae7b..aceb0c8a8c1f 100644
--- a/dev-libs/libappindicator/Manifest
+++ b/dev-libs/libappindicator/Manifest
@@ -1,5 +1,5 @@
AUX libappindicator-12.10.0-conditional-py-bindings.patch 2019 BLAKE2B a57b1b2e3ac115ebc7395967f36b2f648abfba2abc32fb77505a77ddb63d3f7e99c0f5ceeeeabdbe541edc6db1f76fc23e28c0df81c0c4bea600d4a0f72b5f26 SHA512 69d86a3d1e930a0f0c79091dba9691610ecb0fcf13c672fc0ff511bb764b7f74f6c42cab558b6412863a8353fe9a8d72c40419db873fdc4716a93ba3bbbd0aea
AUX libappindicator-12.10.0-vala-inherit.patch 561 BLAKE2B 481ebe7b58af89df6a326b79a65f9ac7110c9d82a61efb993051d691d5cc728075bdd5ac904e9986cb0e41780d3e36e1637e5bd58532781934587b8c1bdf458e SHA512 b021bc0ec7fc1b311add7d6f8a9018fa6f5e807168055c95440e5f5d3d6d5b48375e11542b906058a0786194b1911c8bdcab9632573c1f128772ff6d54aa9173
DIST libappindicator-12.10.0.tar.gz 535562 BLAKE2B a05dc839aaea9fb3fda118d16aac0eb5c35e6c5095a83eb5e8a2af4902bc1da14960fbd57d3cda5d4d5d874023549ce83657a515aa9ee16a54cadfa81062d993 SHA512 317a22a23c8ed84e74207b64b2e9683992d1fb7208176637a051dfe925974f966d1cfa31e650b45eaf839ab61641dee8fbebc8a07882a09b0dd766d88b8d5b9a
-EBUILD libappindicator-12.10.0-r301.ebuild 1941 BLAKE2B 11f7ab0b440e44251f94e06fcdbf36e805b32072bdcfc83a51c934f59efcdb171a81b489ae4501e3c62110c91c37ea5a7adbbdd3f718f3030f79213412570ba8 SHA512 37dc9f7174ad23c439cd4f87a3c01413ee570b1197e99c641e154d87a42bd31fafbd0487cf3e00286bbb57b996f3b2058af9e825b63c04af29bcdaca27668a1a
+EBUILD libappindicator-12.10.0-r301.ebuild 1921 BLAKE2B 83e31df36b0e5b4f4ec9199c8c425118c0c96d05ce79dfc7f6d5367ca64eb3c5966f59fd4768ea64e5aae27ceea3a0a754bad4b51f2f815fb5220f742b9e4b2b SHA512 48b4eb0ffc72c1930eda352c6874a2728a4f45d88d1a0e2c3ebaef4e18394dea014643113119811e0931cde851c59f200e32dafa0ea59246361ee3e0eea6308e
MISC metadata.xml 250 BLAKE2B 8bd202d452582a51ddf3c4bc92840531d0fee0262d112e5fc1173c8fb95a0776efe14ff15613373fd4acab6082ad6f672e278a9b942e072a643b351e8af4d467 SHA512 161da1b732e0f23b06e0732db24f27cb486e7c673e8585d2f6403dc23147b56b5a64dd09978e3dd2db20e9e6a462daf50fe8bc73774d52445d1f6549d82104e0
diff --git a/dev-libs/libappindicator/libappindicator-12.10.0-r301.ebuild b/dev-libs/libappindicator/libappindicator-12.10.0-r301.ebuild
index 62d5da200877..0a3bd6b40731 100644
--- a/dev-libs/libappindicator/libappindicator-12.10.0-r301.ebuild
+++ b/dev-libs/libappindicator/libappindicator-12.10.0-r301.ebuild
@@ -26,7 +26,7 @@ RDEPEND="
DEPEND="${RDEPEND}
introspection? ( $(vala_depend) )
dev-util/gtk-doc-am
- virtual/pkgconfig[${MULTILIB_USEDEP}]
+ virtual/pkgconfig
"
PATCHES=(
diff --git a/dev-libs/libbpf/Manifest b/dev-libs/libbpf/Manifest
index cfab2ab8688c..e30239365dcf 100644
--- a/dev-libs/libbpf/Manifest
+++ b/dev-libs/libbpf/Manifest
@@ -4,8 +4,10 @@ AUX libbpf-9999-paths.patch 1020 BLAKE2B 6a194c3ecf8ec2600e50b02d231a282a489d3d2
DIST libbpf-0.0.6.tar.gz 213791 BLAKE2B 9f0a08cc7bae41f7fa93d5ba2f535f76ce47fe691efb6bac6257b88a5607deb62fa53f59984d83b6070ccd573c902899f7528b376d9acbfd77317659de6ab061 SHA512 1678133d9a2bd1cf13d4d1f9b83bb3f0642de91e3e3c8d785e2993257035573aff39b9a1a457e73d9c4c1c66b6a52544a8ad06ac560766d335428bb3fc421e71
DIST libbpf-0.0.7.tar.gz 262068 BLAKE2B e77ff25449274881ddb9d32f25cd6ad8988e4524102bd109049ee6cfce3e2753fd99ebe2a080f809a4c5422dbf6b17633e4b0cea156f289bf95b92f8375a273c SHA512 c2cbc869b7e11339deab3152a6e2d0b3bba25da513d18d77fb0a698cbe61d6bd48175a58e7dd7a3695fbf27faf48b4f517ac5d3a3c66c086df2e5d1b73a2595d
DIST libbpf-0.0.8.tar.gz 262519 BLAKE2B 2a3620c97834cc23e716476b6966c1c65c1c82064b3ba1ae4ab4906ae362a777d9aa7ae40620f9a259fe969a5a897e97c14d97f627f39c47fa28c89abb1efa9a SHA512 1074fb52b7a158e4e2713c4c7083528ccf2d99b899853078f230234ba112071bfa66e174d8800d36516e26d5bf06da44d100a5b2f866d267f62c9308f431220c
+DIST libbpf-0.0.9.tar.gz 273706 BLAKE2B 54dc77a8e415c24e6394877fc9ad54daca78a4e4f4779607e977708e8b88b6d7bb5854b618a808b1758529b9fdd574fc85f5969791a88b9a124cc42b63f7a161 SHA512 597ac41ab1727c48f2c53c9626b482ae7abd558b4c7d237e33206e3292295d5e5c2f56d31063d30caedccdc3fd289c040f718ff9aaaf210920f1b9c4c772660d
EBUILD libbpf-0.0.6.ebuild 1000 BLAKE2B 160f3b9d575fd2553735b2f26ec0ab8b681a002964ae31eba4e9599f541c867f350d55fe4c6e1dfbe6077790bcf3fe9089166538b02973040b51c7bb37d7ce04 SHA512 95785c36fb8ad5130ba55c1c8b996d5e5c1bafd5eb80879494902f7f1fd3c3760c7604d51f36423e121898955b4879b88bb68bdaade76d0c90a2e0f51d27a269
EBUILD libbpf-0.0.7.ebuild 1005 BLAKE2B b74c9b8a780943160237a87ae3833c996ec5a51685afa4c416ad5ba45f7a932785fd602b51758d2abb9df30e6d5e0b8b44f2ff44c647f473883e696c3eeaadef SHA512 6bf1a72e9bd4e531e35d8914ebac32ce6bac68462dfb5d181b51933108874c65ec50e1de8b31579b5db31d6eb3527159a087bfa730bb2c534dc8bbaed62b9daf
EBUILD libbpf-0.0.8.ebuild 1005 BLAKE2B b74c9b8a780943160237a87ae3833c996ec5a51685afa4c416ad5ba45f7a932785fd602b51758d2abb9df30e6d5e0b8b44f2ff44c647f473883e696c3eeaadef SHA512 6bf1a72e9bd4e531e35d8914ebac32ce6bac68462dfb5d181b51933108874c65ec50e1de8b31579b5db31d6eb3527159a087bfa730bb2c534dc8bbaed62b9daf
+EBUILD libbpf-0.0.9.ebuild 1005 BLAKE2B b74c9b8a780943160237a87ae3833c996ec5a51685afa4c416ad5ba45f7a932785fd602b51758d2abb9df30e6d5e0b8b44f2ff44c647f473883e696c3eeaadef SHA512 6bf1a72e9bd4e531e35d8914ebac32ce6bac68462dfb5d181b51933108874c65ec50e1de8b31579b5db31d6eb3527159a087bfa730bb2c534dc8bbaed62b9daf
EBUILD libbpf-9999.ebuild 1145 BLAKE2B 93059dc3ec391006275503f57b4f5fa2d9813d98cc199d04105eaa2092b507f651b941d3e54c87165d59996bbf7eb3383cf5b4b36d97e7ed73f9fe46e908d683 SHA512 708c2d50c9bbf1cc296bdad90d5e2790ec071684291816bf77267c7f153578bbaaddad494e2c1b9e9f8778692319391339fb24c17dbb935fdd4c98046269d4ca
MISC metadata.xml 305 BLAKE2B d5a605019f99aa1bb75e405bface00e9006038c60d280bdab31ac9a42e3bcf75e2884b3efc8be4e2a88f7e35769b610f0480ccfba291444e8d4ddaecf73a57f9 SHA512 38df62cf50255dcd59c3ab6961643379e549eb568f2c0d010cd8bf73a93fceb0dbdbb32af7b07f21475b4146f99e684aad6928963e56ea8d6777b8f63f8d8a41
diff --git a/dev-libs/libbpf/libbpf-0.0.9.ebuild b/dev-libs/libbpf/libbpf-0.0.9.ebuild
new file mode 100644
index 000000000000..43363c91efae
--- /dev/null
+++ b/dev-libs/libbpf/libbpf-0.0.9.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+HOMEPAGE="https://github.com/libbpf/libbpf"
+DESCRIPTION="Stand-alone build of libbpf from the Linux kernel"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1 BSD-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="+static-libs"
+
+COMMON_DEPEND="virtual/libelf
+ !<=dev-util/bcc-0.7.0"
+DEPEND="${COMMON_DEPEND}
+ sys-kernel/linux-headers"
+RDEPEND="${COMMON_DEPEND}"
+
+S="${WORKDIR}/${P}/src"
+
+PATCHES=(
+ "${FILESDIR}/libbpf-0.0.7-paths.patch"
+)
+
+src_compile() {
+ emake \
+ BUILD_SHARED=y \
+ LIBSUBDIR="$(get_libdir)" \
+ $(usex static-libs 'BUILD_STATIC=y' '' '' '') \
+ CC="$(tc-getCC)"
+}
+
+src_install() {
+ emake \
+ BUILD_SHARED=y \
+ LIBSUBDIR="$(get_libdir)" \
+ DESTDIR="${D}" \
+ $(usex static-libs 'BUILD_STATIC=y' '' '' '') \
+ install install_uapi_headers
+
+ insinto /usr/$(get_libdir)/pkgconfig
+ doins ${PN}.pc
+}
diff --git a/dev-libs/libcroco/Manifest b/dev-libs/libcroco/Manifest
index 7f41930f3ab2..0c2e512f866c 100644
--- a/dev-libs/libcroco/Manifest
+++ b/dev-libs/libcroco/Manifest
@@ -1,3 +1,3 @@
DIST libcroco-0.6.13.tar.xz 487840 BLAKE2B 511212f1849343d55104cc6d17662cacd524bae098bab12d6db58df41710c8dca2c5beb7a37e42feac6d856934a07feb3d11c55dc74ba055e21066f2bdefb260 SHA512 038a3ac9d160a8cf86a8a88c34367e154ef26ede289c93349332b7bc449a5199b51ea3611cebf3a2416ae23b9e45ecf8f9c6b24ea6d16a5519b796d3c7e272d4
-EBUILD libcroco-0.6.13.ebuild 1347 BLAKE2B a55eb98137184e38b4981efff6e491a9d4395866417a03e91990587695285df3d31012882a206e852f33a69cca2b680d74b121c3d121549eb6b6fac056b0af8e SHA512 af1e6a8341b21f090e6deea56f07323555c8ce173505acf395da99be33459c045236dfc2c8926a7bba8ec9d9489c82368ca5ec2deb73c42d7ef44ce239e549d9
+EBUILD libcroco-0.6.13.ebuild 1320 BLAKE2B 12011f5289f50d77cd3e98d4268fa769989a5a55b18a372a02e17be9251b6ec269dcbd59749b2b797765d7576238b239dbd4ffe18a12deedb56b10c18dc38b49 SHA512 997181ea088f09fdeabc4aab4e016fcf2c221aaab8d050fdf67d7b4ad277100c1814f6cf091fdd8937efa31faafe30f0f3d2ba54309ab4fe623e8252bf5adfcb
MISC metadata.xml 677 BLAKE2B 075dc643dd13fa706bb3240a389f715e760c6d06c851c5074d6c58843668bbcbda2167fff34f720e57d48f01aaacf61dc2a5a98c11a5240550b7e2500bfef6a2 SHA512 57849cfa0cf0e61f52db3e7a357957d3eb0ea3e93381475ad1821a5e0d63c7971f31b4f52a9a851d303bac59a83edbb5fbdc76d54ccfdd6332ca5c93a43a0b14
diff --git a/dev-libs/libcroco/libcroco-0.6.13.ebuild b/dev-libs/libcroco/libcroco-0.6.13.ebuild
index 61dff4c399d9..4208a3c7ceba 100644
--- a/dev-libs/libcroco/libcroco-0.6.13.ebuild
+++ b/dev-libs/libcroco/libcroco-0.6.13.ebuild
@@ -21,7 +21,7 @@ RDEPEND="
"
DEPEND="${RDEPEND}
dev-util/gtk-doc-am
- >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+ virtual/pkgconfig
"
src_prepare() {
diff --git a/dev-libs/libcss/Manifest b/dev-libs/libcss/Manifest
index 840a6ea87e96..907336d5530e 100644
--- a/dev-libs/libcss/Manifest
+++ b/dev-libs/libcss/Manifest
@@ -1,5 +1,7 @@
DIST libcss-0.8.0-src.tar.gz 516474 BLAKE2B 937adc65f68fecece189e0f06cfd601ae2d76f0b4dcdbcb8a67f3f058c4355c19c12c088fb50ecf1e6bcd8436c867b1845b3da27bb44b5d1a009bd946bf5e53e SHA512 fb52920ce462f442dfafa7b0061fa465e6c04827d26186e8468855c2a40e8f34e6f0689d5eb58cb0b2ee0759d083fcff5c8c583e1d98693755003c352a22a4be
DIST libcss-0.9.0-src.tar.gz 522267 BLAKE2B c104dd2cf859b908d68ac318d1da0430733b8813fbfbcb1f8f6a3d373e3a2ba1db6685542823fe0bef838619ec358f336f8eb07dc073a55a2f8c1907727295b9 SHA512 435dbca91aa2b91398dddbc1d9d035d104be193bb593907e3fff9320cc4f668f8aae54e0d5d0b7cd2ed9cb36fc02255fbe97bc9038b79fe505b581d6af1ded0d
+DIST libcss-0.9.1-src.tar.gz 522715 BLAKE2B 32206403f77997e6692eed00c9233e6f49f08efc2515901a8bef7590883e44ef320511368fe5a67968102911d849696a4419735c7f6691f0f272fcc3b9a000d8 SHA512 069b30e74ff03fc91666dd16f22a38effbb3e29f066fd0fbc09efdc26dd8678e3f31adeaf918c5596fb962c56335fb2ecdbde1aa6704fcbdec3c2f97d03e5bbe
EBUILD libcss-0.8.0-r1.ebuild 1168 BLAKE2B d99b4f68d2f8d41a4e7bbd6b6f27477aa73f6c169da4233baabb979f9e241d42adb7844a64fb159fa6755b599db031b92321bf4376d766ab00686d73cc9b437b SHA512 ef75a38e7e7ee5b748153d6c293fe21a842c232d27ea5ae94d812f26b538f479d8d5ba79eec5e114b5c480c0a4ecb1f89094f3ccd1356bfb16c4ce143a954aa2
EBUILD libcss-0.9.0.ebuild 1161 BLAKE2B b600f4767b8a0aafa73461cf9055e14e7622748d56dd1252b2e683c2f74908a58f4c89fa0e34be1981540b9eb591c038e90eb2379da8e3eb1966cbb66aaa3781 SHA512 1661619dfd405943e3f3b03fdfff39d96c79e5558e7b9f6d426aca1ac720c2df54654407240c0364610210285e20d7833bd41f47b81ec3717d8c7baf141d7bce
+EBUILD libcss-0.9.1.ebuild 1160 BLAKE2B d304fe46f6708bcf9c14992c8377753c518591f4c07686df81e52da752509e2b5b62dec063fa36ce91d304fbe55d596d8b298cb8f6180423b026b2db3e230bc8 SHA512 99d76d8a1448d53753d6501f5e9fefdb4ae0001de99d8b59776db8536d3456ec39242a6310d00cd62a1d6c3a8c30f8237f78394573c73c997db7d0ad99563ba5
MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-libs/libcss/libcss-0.9.1.ebuild b/dev-libs/libcss/libcss-0.9.1.ebuild
new file mode 100644
index 000000000000..decab3cc274c
--- /dev/null
+++ b/dev-libs/libcss/libcss-0.9.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="CSS parser and selection engine, written in C"
+HOMEPAGE="http://www.netsurf-browser.org/projects/libcss/"
+SRC_URI="https://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~m68k-mint"
+IUSE="test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ dev-libs/libparserutils
+ dev-libs/libwapcaplet"
+DEPEND="${RDEPEND}
+ test? ( dev-lang/perl )"
+BDEPEND="
+ >=dev-util/netsurf-buildsystem-1.7-r1
+ virtual/pkgconfig"
+
+src_prepare() {
+ default
+ sed -e '1i#pragma GCC diagnostic ignored "-Wimplicit-fallthrough"' \
+ -i src/parse/parse.c src/select/arena_hash.h || die
+ sed -e '1i#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"' \
+ -i src/parse/parse.c src/select/computed.c || die
+}
+
+_emake() {
+ source /usr/share/netsurf-buildsystem/gentoo-helpers.sh
+ netsurf_define_makeconf
+ emake "${NETSURF_MAKECONF[@]}" COMPONENT_TYPE=lib-shared $@
+}
+
+src_compile() {
+ _emake
+}
+
+src_test() {
+ _emake test
+}
+
+src_install() {
+ _emake DESTDIR="${D}" install
+}
diff --git a/dev-libs/libdbusmenu/Manifest b/dev-libs/libdbusmenu/Manifest
index 2fb9c433763c..fdc1752cfc18 100644
--- a/dev-libs/libdbusmenu/Manifest
+++ b/dev-libs/libdbusmenu/Manifest
@@ -1,5 +1,5 @@
AUX libdbusmenu-16.04.0-configure-fix.patch 1268 BLAKE2B 9b7c045b46b9b8ad6af069d4d95c0e867e4cdd7c5edba1412483a7b11424d24d757bd04c7f64fdd0ae36107befe26b54e589d658739438f331bf82277a79e391 SHA512 e872017556eb7e6b23a9c80e478b9e25be604bd2500be94879bad6634150265bb7b2979fc3cbe05a06dc9f3ca115ab57457853b37c6db622b5ec4bb23abff2bd
AUX libdbusmenu-16.04.0-werror.patch 1131 BLAKE2B 0f08e797095a8f9358abe1784b64f8f4126f6ba6c271991a4cf95781485e6ddda30cc98db8c50c7f3cae61f398cec6d236fbccc7063073f041337832fa132536 SHA512 ba1144695110cd8ecf89deaea28e0aacc40b00a500a1dc86c28e67754599117e0a2217c4d6066c1061fa009af82e463dd303ba78c479053857ef6e793959068e
DIST libdbusmenu-16.04.0.tar.gz 760376 BLAKE2B 6996ce09bc2b81a8f415a46490ecb3189a064a64f1716919bb1495dccefa220ab058af06f4b3391c954ec76ec38e62db9c092b620cb69cacffb064e590ec1297 SHA512 ee9654ac4ed94bdebc94a6db83b126784273a417a645b2881b2ba676a5f67d7fc95dd2bb37bfb0890aa47299ed73cb21ed7de8b75f3fed6b69bfd39065062241
-EBUILD libdbusmenu-16.04.0-r1.ebuild 3898 BLAKE2B 5f7633ea2a86110eb004be957bd718040114cd98e99f5032b3a70c80b6e5e16179edd98508fd80742d75a6d879b52a520fa1656d2126762d7f214bf528a7ec91 SHA512 044aea67dde2dfd94e2285e39be64ec1c055d1948725ccf3539bb6aa67ae8bc587d7830a93f973d0e104904b4d59f292877966636c5975fcedf5002b4c49baa1
+EBUILD libdbusmenu-16.04.0-r1.ebuild 3878 BLAKE2B 7d380607efde9f649cd568d619ae201590df6dd6c1e7e1c06100bdb6f2c09050923ae2fa53c475e29dfb68f8d898dba1fc2ef65dd8965c5554b41f9bbb3aee72 SHA512 78bb1a095bcd774a72bf08e35be9c63228fadea7bcc0c27954dc2766610c55807a67081724c222234e523d0e5ee6dd1e639bb8258b90f31d59204f3df68316d8
MISC metadata.xml 361 BLAKE2B 93f09713c694acddbfa9011a7a8c688341336d641ac74e49e914e2e099865fa6f7755a645dcee37014f5251b1577b980cb2b62e06d17f3d74ef5f0c02b0e769c SHA512 65033c817aacc6bf81e47970baca8feb6dacfcc74ed788806f65dc49e48178419b300edac867688f1be36d2ffc9291366274832912fa61cee48c328ca8f55efd
diff --git a/dev-libs/libdbusmenu/libdbusmenu-16.04.0-r1.ebuild b/dev-libs/libdbusmenu/libdbusmenu-16.04.0-r1.ebuild
index 95dcd5d6b281..2de4fb108df9 100644
--- a/dev-libs/libdbusmenu/libdbusmenu-16.04.0-r1.ebuild
+++ b/dev-libs/libdbusmenu/libdbusmenu-16.04.0-r1.ebuild
@@ -32,7 +32,7 @@ DEPEND="${RDEPEND}
dev-util/glib-utils
dev-util/intltool
sys-devel/gettext
- virtual/pkgconfig[${MULTILIB_USEDEP}]
+ virtual/pkgconfig
introspection? ( $(vala_depend) )
test? (
>=dev-libs/json-glib-0.13.4[${MULTILIB_USEDEP}]
diff --git a/dev-libs/libevdev/Manifest b/dev-libs/libevdev/Manifest
index 1802b8670081..27a71b0898ec 100644
--- a/dev-libs/libevdev/Manifest
+++ b/dev-libs/libevdev/Manifest
@@ -1,4 +1,4 @@
DIST libevdev-1.9.0.tar.xz 443208 BLAKE2B 858567ec82f20d567f66d0c41bd1519ffd023a0374e346cff270a0bae0b5136a469a4fd56fcbd3d53b2a2ace6166821ec5e75c90e08eb347331e7974865ceda7 SHA512 6e7589b5776437ac23fbf65b3194fb1dd3a68a294696145060cdd97bcdeb9b04f355f2be028dc1a5efe98ef2cafca15e4f61115edf5d62591e3a8944dc95942a
-EBUILD libevdev-1.9.0.ebuild 1218 BLAKE2B 7b46ff4ccc676591b57e2ea1d6d1ffc0e11af7fe0b3e751e7c14148d6a50f3fae86d1fba5777773c0838814ea1450609bad1b40832546debfcd27e1c7bbe43f0 SHA512 8974ce7c1fce1c21957ad8a8ce2c01db6ab413cc19f7c45c67165d8bc431f8a53e4223d8c28a258f2d9af75a1049c4598808d1c8f3f9ba42c5abc433d1191ab4
-EBUILD libevdev-9999.ebuild 1227 BLAKE2B e14b4f64ca8279fa83d6df895cf4cec92cab75bf88115e3ec8572bef16d9d365f3ce4b20161586601050c3a71f52b75858f125e7621c31c3bd3ee8a55aa88a5c SHA512 1088514caf2d2235214998945c8007bd9e57f417cc6a27c8bd33e72b2870ec59a227c2c74b241d51e0d062442fd9d53bbae13cfd7c06655b8b9ef5f7a57badf7
+EBUILD libevdev-1.9.0.ebuild 1198 BLAKE2B cb04493b3395c2936a7d7ae12a83fa2af05d3642c7751440087e978ab483d93feef05a8d1b951ad43a007b6481f8abfcb9f957811918682867e094ff8c51c1fc SHA512 eefca4687835e7d811fc7e4eaa73376989103b80f0aa32aa4c152133aaff001772fdf1de9adff315a25a99d8da7ce29e533de6439595bd4fd7a03beb0ebc777c
+EBUILD libevdev-9999.ebuild 1207 BLAKE2B 6161acc1fc3c4294157fb08607d35d7d1b89760a3677433d4336a353739bdcd3f75ea8ea030c1278257be691c14655e345ba720bb644286a0f9beb5c90016446 SHA512 754e0e774a3b50864ff6142f6f367acb85945fc99e0eabdd7f5957924780ee582f373d5d0bc89d587f9cb9f212998005be522af93f53ce7ce32862b2704f09dd
MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/dev-libs/libevdev/libevdev-1.9.0.ebuild b/dev-libs/libevdev/libevdev-1.9.0.ebuild
index 68bbc0b36445..a89a1b34d155 100644
--- a/dev-libs/libevdev/libevdev-1.9.0.ebuild
+++ b/dev-libs/libevdev/libevdev-1.9.0.ebuild
@@ -26,7 +26,7 @@ DEPEND="test? ( dev-libs/check[${MULTILIB_USEDEP}] )"
BDEPEND="
${PYTHON_DEPS}
doc? ( app-doc/doxygen )
- virtual/pkgconfig[${MULTILIB_USEDEP}]
+ virtual/pkgconfig
"
RESTRICT="!test? ( test )"
diff --git a/dev-libs/libevdev/libevdev-9999.ebuild b/dev-libs/libevdev/libevdev-9999.ebuild
index 7fbea6d971fe..7509db80b34d 100644
--- a/dev-libs/libevdev/libevdev-9999.ebuild
+++ b/dev-libs/libevdev/libevdev-9999.ebuild
@@ -26,7 +26,7 @@ DEPEND="test? ( dev-libs/check[${MULTILIB_USEDEP}] )"
BDEPEND="
${PYTHON_DEPS}
doc? ( app-doc/doxygen )
- virtual/pkgconfig[${MULTILIB_USEDEP}]
+ virtual/pkgconfig
"
RESTRICT="!test? ( test )"
diff --git a/dev-libs/libfido2/Manifest b/dev-libs/libfido2/Manifest
index 56e86778e57d..49fb1d902de0 100644
--- a/dev-libs/libfido2/Manifest
+++ b/dev-libs/libfido2/Manifest
@@ -1,5 +1,4 @@
AUX libfido2-1.3.0-cmakelists.patch 1210 BLAKE2B a7b90def3763bc5c07511103c05917009532219dbd5fc2c2ee90e0a8c68251c938d23977449998ea98afa35900813e38b16b230379e5add15fa4ad18851134b9 SHA512 4559b85525247b1e625a4aba404f85e15802a6f75ada0d1b1a3e1c817d434d6e119fb4549147b0aa9c9af9e176f93d176c3f8ae71e4c8fdf7c0cde66ae18445e
-AUX libfido2-1.3.0-remove-openssh-middleware.patch 1606 BLAKE2B ad02fe91523187bb7107b22bfb8b140f9ff0f3ec78f1047655e06fe29b5c2fb0e5b0a1d5671e7dc1a770499c2baefeac635024d506432a9c7dcef445ed1a3cfc SHA512 35b916fb6cf937389df05396f3491b5f7326305994585e290c9fdc8b9ff01455c1895ab32e4223ae1be60c0df38f16150c9d3e8799d9b84c16d560cc8a04eef7
AUX libfido2-1.3.1-no-werror.patch 736 BLAKE2B 5eecbff49108683d77ee284d67425ff846028067ec757916422aa9c833594fe5207fe398fbf61261d4b0554fce9442d368a83be7e52bbfbabb5ae0cff0906932 SHA512 5532e3ea9be09284582e3217c2567a35bdef8c0f8efa54b172cd21e91adb61770c42632f386b0adc70d75842bc570f6b55c041bd3ef7c538ddb88e51ff20891f
AUX libfido2-1.4.0-cmakelists.patch 1247 BLAKE2B c290dfdb1f25b241b1a51725d568169210890c67d61ea314c84100f4c0810f84cad540361105ddd3c36e1b8130eaa4d1c8c72e11b9bdc1518349eb80356a5eaf SHA512 5272d57fd384b9454c8385362a833d99e78b2f09f5fa30521d8750191800514c6322d1b5edf5bc239ff59d136a4200dbe9450180e8a8738741db0c18457b6709
DIST libfido2-1.3.1.tar.gz 1512676 BLAKE2B f69a04fc69c46b688d83afe9d72b2fb1860ac00a09665d55e25293595520e95d45486ecc5355c479bc8bc06dbe6ed4fd469c511f5bf5f341a0ec86cb099fce28 SHA512 fc56f7bcddd7ae0f950b4e94f08ad726f7de68b975c0bdcbca98c7932c2c3d2e2a51b30eaf41e8dba08e82af3926cbed44264244ae721902af46e47df9fcbe1b
diff --git a/dev-libs/libfido2/files/libfido2-1.3.0-remove-openssh-middleware.patch b/dev-libs/libfido2/files/libfido2-1.3.0-remove-openssh-middleware.patch
deleted file mode 100644
index 7dec27b861f9..000000000000
--- a/dev-libs/libfido2/files/libfido2-1.3.0-remove-openssh-middleware.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff --git a/README.adoc b/README.adoc
-index 8693417..023f2e9 100644
---- a/README.adoc
-+++ b/README.adoc
-@@ -71,18 +71,3 @@ KERNEL=="hidraw*", SUBSYSTEM=="hidraw", \
- On Windows 1903 and newer versions, access to FIDO devices has been restricted
- to applications using the operating system's native API. Use of *libfido2*
- is still possible in privileged applications.
--
--=== OpenSSH Integration
--
--*libfido2* includes middleware allowing https://www.openssh.com[OpenSSH] to
--talk to U2F/FIDO2 devices. Note that server support is required for
--authentication. In a nutshell:
--
--==== Key Generation
--
-- $ ssh-keygen -t [ecdsa-sk|ed25519-sk] -w /path/to/libsk-libfido2.so
--
--==== Authentication
--
-- $ ssh-agent -P /path/to/libsk-libfido2.so
-- $ ssh-add -S /path/to/libsk-libfido2.so
-diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
-index 5f27e88..c44d1df 100644
---- a/tools/CMakeLists.txt
-+++ b/tools/CMakeLists.txt
-@@ -49,17 +49,9 @@ add_executable(fido2-token
- ${COMPAT_SOURCES}
- )
-
--add_library(sk-libfido2 MODULE sk-libfido2.c)
--set_target_properties(sk-libfido2 PROPERTIES
-- COMPILE_FLAGS "-DSK_STANDALONE -DWITH_OPENSSL"
-- OUTPUT_NAME sk-libfido2
--)
--
- target_link_libraries(fido2-cred ${CRYPTO_LIBRARIES} fido2_shared)
- target_link_libraries(fido2-assert ${CRYPTO_LIBRARIES} fido2_shared)
- target_link_libraries(fido2-token ${CRYPTO_LIBRARIES} fido2_shared)
--target_link_libraries(sk-libfido2 ${CRYPTO_LIBRARIES} fido2_shared)
-
- install(TARGETS fido2-cred fido2-assert fido2-token
- DESTINATION ${CMAKE_INSTALL_BINDIR})
--install(TARGETS sk-libfido2 DESTINATION ${CMAKE_INSTALL_LIBDIR})
diff --git a/dev-libs/libgcrypt/Manifest b/dev-libs/libgcrypt/Manifest
index d0f8cb6d13be..2b2fb8bcdff5 100644
--- a/dev-libs/libgcrypt/Manifest
+++ b/dev-libs/libgcrypt/Manifest
@@ -1,10 +1,5 @@
AUX libgcrypt-1.6.1-uscore.patch 843 BLAKE2B a1023bf915e342dd52d07d4c497d3e514c8c4b6c621e4f8704c4841fd95d48773f0af850a456c6f80b80deed878be1334f08f8181f97dce64ed9e61f5cb1bae5 SHA512 971814ac34f17464a96fbc110fe995923d873981949a0126e50c206d39499d6146fd00414e837774e6932e4b491cc68c4147278d6216dda630fb876bc8f61791
AUX libgcrypt-multilib-syspath.patch 588 BLAKE2B 6a8d30246263339571455df3c1cccfc9f38e50117cef34bc92ce37a296c3e31017c0190923ea992f51706c55a63c6f75b1d9fc7d8d40930707486f419e1795c4 SHA512 913c1a474aba50ec3589fb5a991f65204ba2cc28203b92353fdef8fb092350c3be814a57f29a26a2176627509a4f573f6db02ebdbcde3f04a2f1d632879293dc
-DIST libgcrypt-1.8.3.tar.bz2 2989166 BLAKE2B 3443883c3e8d005be6cbdc91589b8b287226f26eb59536e1a32512004af739a64a3817ac38fa1132fdfc3424c21ca49c81db93535a23d590a5dc4f4518f3cce1 SHA512 8c873204303f173dd3f49817a81035c1d504b2fc885965c9bc074a6e3fb108ceb6dca366d85e840a40712a6890fc325018ea9b8c1b7b8804c51c44b296cb96a0
-DIST libgcrypt-1.8.4.tar.bz2 2990108 BLAKE2B 97a1f9382adf23cd4ac491a392882f2e712fddd4f0d95a4fafb9cc70aa41ffa7b7b6a371b8368e9c99e3e1849b9d38078abc55703d4d8b25289f3c662e6ba8a1 SHA512 b831fc337eb14806897e224b0d1e78d1f8e9db91dffa818a015a4aa104144e2d971e5a855904907ee2bb9990a9d526de32d6787e1cae98e28a65c3258b2b1ea1
DIST libgcrypt-1.8.5.tar.bz2 2991291 BLAKE2B 93276b4536f71c07bb103e10607592e02add413f633d96cc95513daa6e6b0e098fe803bb6a0e405a241fddc5ce0cfad61658d57c27bd724eecd32fd862af4c99 SHA512 b55e16e838d1b1208e7673366971ae7c0f9c1c79e042f41c03d14ed74c5e387fa69ea81d5414ffda3d2b4f82ea5467fe13b00115727e257db22808cf351bde89
-EBUILD libgcrypt-1.8.3-r1.ebuild 2256 BLAKE2B c436e0aa9c4ab4f3f5fe77d226196e89a0cfdb70db8aa3a836f52e73310e6aab9c91be6072824492261a6b958f6a86f810dc184b19618011a5797f591fc6f025 SHA512 d9502953f12a937ba6c28cff649722f5e3ec15452b156bd023d90741addbb3233710909b3d7b16fa5dadcc2eddfb38e771a8644929d9735fef3afdd77464e6d9
-EBUILD libgcrypt-1.8.3.ebuild 2129 BLAKE2B 5745e330806e09786f1dcc70cf9b63f9dd6e0698492515ddafcd86948fcec506db4f7f1a46dd93bb132b462e71cdbb1427f7700ef8bf22686e53dbbc65c3a1c2 SHA512 ea5045972cb08b210e588b05b811e7c96dc9a18dea00a102fd1866d9f2f69ad43912204947726fb59429cbc103bd7693331b1596d50e00a609a018def45ba503
-EBUILD libgcrypt-1.8.4.ebuild 2263 BLAKE2B ff8f19cbec3c0f0bd42602b0c61e59e7e89d7fe5858786d5f8bf9e964ca0c8a0a5b64d9fb85710cdf33f27945ded955cf9e15b19618ed7bfd64b76c18b76e232 SHA512 4e07773243112a20c72d7b3a6fc7e1265970f87075d67b41ca402fef40b063dd1496670ccac126e10b38c859b95e98daa6b8a06f67bdc9369262dc301e89ea3d
-EBUILD libgcrypt-1.8.5.ebuild 2254 BLAKE2B d7a90086ec6b433f18fceec0d79c3518e8f7b5bb83690733848aa509c53b9d850f2898b506edeffb25eb1563843e424414ef656d66fb4bf9b0e98c47f9790910 SHA512 10e9f613fd6097850ae4e8daca620e8eac2bd3e5b35c3161d9107d56226a718bd967e820d3cd37448c4ce45301ce720b4361b22d6f58f0f7450d54a305ef57ba
+EBUILD libgcrypt-1.8.5.ebuild 2303 BLAKE2B 6a53021a185faa4382b2e2285fa5c2d11dd22fe58dc96997d57ecc488a147901fdf284980b817832ab74479213140f41403f0ba04f6de8a9091bfd15f502e0fd SHA512 d6a9b8a2fef2dcb37f7ce86247b2147fb3bd35d320c21e2973f73edff7c48fe7a742c6fdf54e4f884767dc5603c5fa470d7da44a6511257f2e1ed2b9327a5eed
MISC metadata.xml 419 BLAKE2B 3f50eead2881e1336ad05c677b0108897d4664cbe228c95b5dfe3f7f0696581472692644e06d5d86b81b4bde0a3b41f0e65e25f4e40a29b830c1d9342b143a70 SHA512 c33fb355262594d13d6f7ea66e35a53379695fe10227d29d800f7fca8ee8cf2856a624ccf81ebe3352be10c4c010bc61131f95f9065eafcff0b5c70f684df4ba
diff --git a/dev-libs/libgcrypt/libgcrypt-1.8.3-r1.ebuild b/dev-libs/libgcrypt/libgcrypt-1.8.3-r1.ebuild
deleted file mode 100644
index 6960c8192bcf..000000000000
--- a/dev-libs/libgcrypt/libgcrypt-1.8.3-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic multilib-minimal
-
-DESCRIPTION="General purpose crypto library based on the code used in GnuPG"
-HOMEPAGE="http://www.gnupg.org/"
-SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1 MIT"
-SLOT="0/20" # subslot = soname major version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc o-flag-munging static-libs"
-
-RDEPEND=">=dev-libs/libgpg-error-1.25[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
-BDEPEND="doc? ( virtual/texi2dvi )"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.6.1-uscore.patch
- "${FILESDIR}"/${PN}-multilib-syspath.patch
-)
-
-MULTILIB_CHOST_TOOLS=(
- /usr/bin/libgcrypt-config
-)
-
-src_prepare() {
- default
- eautoreconf
-}
-
-multilib_src_configure() {
- if [[ ${CHOST} == *86*-solaris* ]] ; then
- # ASM code uses GNU ELF syntax, divide in particular, we need to
- # allow this via ASFLAGS, since we don't have a flag-o-matic
- # function for that, we'll have to abuse cflags for this
- append-cflags -Wa,--divide
- fi
- local myeconfargs=(
- --enable-noexecstack
- $(use_enable o-flag-munging O-flag-munging)
- $(use_enable static-libs static)
-
- # disabled due to various applications requiring privileges
- # after libgcrypt drops them (bug #468616)
- --without-capabilities
-
- # http://trac.videolan.org/vlc/ticket/620
- # causes bus-errors on sparc64-solaris
- $([[ ${CHOST} == *86*-darwin* ]] && echo "--disable-asm")
- $([[ ${CHOST} == sparcv9-*-solaris* ]] && echo "--disable-asm")
-
- GPG_ERROR_CONFIG="${EROOT}/usr/bin/${CHOST}-gpg-error-config"
- )
- ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" \
- $("${S}/configure" --help | grep -- '--without-.*-prefix' | sed -e 's/^ *\([^ ]*\) .*/\1/g')
-}
-
-multilib_src_compile() {
- default
- multilib_is_native_abi && use doc && VARTEXFONTS="${T}/fonts" emake -C doc gcrypt.pdf
-}
-
-multilib_src_install() {
- emake DESTDIR="${D}" install
- multilib_is_native_abi && use doc && dodoc doc/gcrypt.pdf
-}
-
-multilib_src_install_all() {
- default
- find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/libgcrypt/libgcrypt-1.8.3.ebuild b/dev-libs/libgcrypt/libgcrypt-1.8.3.ebuild
deleted file mode 100644
index 3e97c8663b2a..000000000000
--- a/dev-libs/libgcrypt/libgcrypt-1.8.3.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic ltprune multilib-minimal
-
-DESCRIPTION="General purpose crypto library based on the code used in GnuPG"
-HOMEPAGE="http://www.gnupg.org/"
-SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1 MIT"
-SLOT="0/20" # subslot = soname major version
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc o-flag-munging static-libs"
-
-RDEPEND=">=dev-libs/libgpg-error-1.25[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
- doc? ( virtual/texi2dvi )"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.6.1-uscore.patch
- "${FILESDIR}"/${PN}-multilib-syspath.patch
-)
-
-MULTILIB_CHOST_TOOLS=(
- /usr/bin/libgcrypt-config
-)
-
-src_prepare() {
- default
- eautoreconf
-}
-
-multilib_src_configure() {
- if [[ ${CHOST} == *86*-solaris* ]] ; then
- # ASM code uses GNU ELF syntax, divide in particular, we need to
- # allow this via ASFLAGS, since we don't have a flag-o-matic
- # function for that, we'll have to abuse cflags for this
- append-cflags -Wa,--divide
- fi
- local myeconfargs=(
- --enable-noexecstack
- $(use_enable o-flag-munging O-flag-munging)
- $(use_enable static-libs static)
-
- # disabled due to various applications requiring privileges
- # after libgcrypt drops them (bug #468616)
- --without-capabilities
-
- # http://trac.videolan.org/vlc/ticket/620
- # causes bus-errors on sparc64-solaris
- $([[ ${CHOST} == *86*-darwin* ]] && echo "--disable-asm")
- $([[ ${CHOST} == sparcv9-*-solaris* ]] && echo "--disable-asm")
-
- GPG_ERROR_CONFIG="${EROOT}/usr/bin/${CHOST}-gpg-error-config"
- )
- ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
- default
- multilib_is_native_abi && use doc && VARTEXFONTS="${T}/fonts" emake -C doc gcrypt.pdf
-}
-
-multilib_src_install() {
- emake DESTDIR="${D}" install
- multilib_is_native_abi && use doc && dodoc doc/gcrypt.pdf
-}
-
-multilib_src_install_all() {
- default
- prune_libtool_files
-}
diff --git a/dev-libs/libgcrypt/libgcrypt-1.8.4.ebuild b/dev-libs/libgcrypt/libgcrypt-1.8.4.ebuild
deleted file mode 100644
index 9344031d1c80..000000000000
--- a/dev-libs/libgcrypt/libgcrypt-1.8.4.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic multilib-minimal
-
-DESCRIPTION="General purpose crypto library based on the code used in GnuPG"
-HOMEPAGE="http://www.gnupg.org/"
-SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1 MIT"
-SLOT="0/20" # subslot = soname major version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc o-flag-munging static-libs"
-
-RDEPEND=">=dev-libs/libgpg-error-1.25[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
-BDEPEND="doc? ( virtual/texi2dvi )"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.6.1-uscore.patch
- "${FILESDIR}"/${PN}-multilib-syspath.patch
-)
-
-MULTILIB_CHOST_TOOLS=(
- /usr/bin/libgcrypt-config
-)
-
-src_prepare() {
- default
- eautoreconf
-}
-
-multilib_src_configure() {
- if [[ ${CHOST} == *86*-solaris* ]] ; then
- # ASM code uses GNU ELF syntax, divide in particular, we need to
- # allow this via ASFLAGS, since we don't have a flag-o-matic
- # function for that, we'll have to abuse cflags for this
- append-cflags -Wa,--divide
- fi
- local myeconfargs=(
- --enable-noexecstack
- $(use_enable o-flag-munging O-flag-munging)
- $(use_enable static-libs static)
-
- # disabled due to various applications requiring privileges
- # after libgcrypt drops them (bug #468616)
- --without-capabilities
-
- # http://trac.videolan.org/vlc/ticket/620
- # causes bus-errors on sparc64-solaris
- $([[ ${CHOST} == *86*-darwin* ]] && echo "--disable-asm")
- $([[ ${CHOST} == sparcv9-*-solaris* ]] && echo "--disable-asm")
-
- GPG_ERROR_CONFIG="${EROOT}/usr/bin/${CHOST}-gpg-error-config"
- )
- ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" \
- $("${S}/configure" --help | grep -- '--without-.*-prefix' | sed -e 's/^ *\([^ ]*\) .*/\1/g')
-}
-
-multilib_src_compile() {
- default
- multilib_is_native_abi && use doc && VARTEXFONTS="${T}/fonts" emake -C doc gcrypt.pdf
-}
-
-multilib_src_install() {
- emake DESTDIR="${D}" install
- multilib_is_native_abi && use doc && dodoc doc/gcrypt.pdf
-}
-
-multilib_src_install_all() {
- default
- find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/libgcrypt/libgcrypt-1.8.5.ebuild b/dev-libs/libgcrypt/libgcrypt-1.8.5.ebuild
index 025edcfa6b04..5fbc1de87647 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.8.5.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.8.5.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-inherit autotools flag-o-matic multilib-minimal
+inherit autotools flag-o-matic multilib-minimal toolchain-funcs
DESCRIPTION="General purpose crypto library based on the code used in GnuPG"
HOMEPAGE="http://www.gnupg.org/"
@@ -40,6 +40,7 @@ multilib_src_configure() {
append-cflags -Wa,--divide
fi
local myeconfargs=(
+ CC_FOR_BUILD=$(tc-getBUILD_CC)
--enable-noexecstack
$(use_enable o-flag-munging O-flag-munging)
$(use_enable static-libs static)
diff --git a/dev-libs/libgnt/Manifest b/dev-libs/libgnt/Manifest
index f7b3b8c7f952..54548984eb7c 100644
--- a/dev-libs/libgnt/Manifest
+++ b/dev-libs/libgnt/Manifest
@@ -1,5 +1,5 @@
AUX libgnt-2.14.0-optional_docs.patch 369 BLAKE2B 445d0c6a1632c3368f72777919ba2096aa1b16804dd141f87d8c7b8ac3350fc8354bc53423e3ca9a677a8de0c2f8710023561f4e230ce74793fc66ea899829f5 SHA512 83f1640729653bc9cee49f667f79e472727d4ba7c3d6fad3ebccc6fe412fe0a43b868582bbe2de8bcca611661cca8ba135330c1c919ea7622135ed7488b524be
AUX libgnt-2.14.0-tinfo.patch 567 BLAKE2B 7d9b1c0b520a3f2c3d74d6659a503f554c5b7805f3e5f659bb6e0e58475f74633563d44f6667df64048bdb33437e176cf80a547b33e1939565938752e87325ac SHA512 56ce8dab03e74714ecfe0cb7dd274c5fce996d84793fff5e247ee329b1c5bebf2d933b96cc6fe916dafb4f402269d3b1b8cacda07deff4c149869d509ee5c416
DIST libgnt-2.14.0.tar.xz 102444 BLAKE2B 303dc33e60571ba4b5b9cc8ce477807b9b2ed6b4d1ed14e40c43e146a6d3d156741597befdf3e6c0c6816e9d43955f57f9e1b61e3f1f2d2fc451bf53f7236022 SHA512 0d9c5550374696a0e6ede5246cda3c372d7055d21b9ffaf10be88d6a469bdf18c7dd1113ec612acf4889c0e5686ea87bb0e8348ca8985fd5ff8913afc5813b38
-EBUILD libgnt-2.14.0.ebuild 737 BLAKE2B 422a1c30da50236c5c68b49f9fa2186ca6e07dc28a14150eae3fecba634eb3539a73def0a588eddcd4a5ada8c60d29f8c2e5d21102f1deef916f391c9a19c9dd SHA512 ed5347545bec1408ff37325ecc79e912d51b7170c3339c64e8e0cc28cb59fb318ccfc320774e1fb104b62df104c4ab8b215469658f6bb4f977bcd62e0e9d5292
+EBUILD libgnt-2.14.0.ebuild 758 BLAKE2B c14ea282571d147f7d16f03238dc7ceacc008f9a794159782335064bce8b382d5aac95d87baa1a11eb1bebdc9945e7aeb99414f172a7c8ef05051f1e63174a83 SHA512 25d9f4aa357bd220664e82d6d14f6a3adeaef6bca99da990333dd7ca5dc3c98505c48b9f2f5ecc87173313bb043589c7b369c35b763429c52967981f5bf3a264
MISC metadata.xml 257 BLAKE2B 35c1b06807230338ceb9de70f79760d55e93dcdba508da3c663e785ab3966781edc2098abd8df084b2ecabbf40ff8e8e4a0d0a6e131daf648ff58e101cf27587 SHA512 ff078cacb115b8f3624b45d883d8ed72701e3d2fccae06c04c633eb60821b23681cc151e00689d1b6035c94570535e7ac0de51a55dae99f606886164883185ea
diff --git a/dev-libs/libgnt/libgnt-2.14.0.ebuild b/dev-libs/libgnt/libgnt-2.14.0.ebuild
index d3e465f73b51..189468412453 100644
--- a/dev-libs/libgnt/libgnt-2.14.0.ebuild
+++ b/dev-libs/libgnt/libgnt-2.14.0.ebuild
@@ -22,6 +22,7 @@ RDEPEND="
"
DEPEND="${RDEPEND}"
BDEPEND="
+ dev-util/glib-utils
virtual/pkgconfig
"
diff --git a/dev-libs/libgpg-error/Manifest b/dev-libs/libgpg-error/Manifest
index de356f2e816f..265827170d05 100644
--- a/dev-libs/libgpg-error/Manifest
+++ b/dev-libs/libgpg-error/Manifest
@@ -1,9 +1,11 @@
AUX libgpg-error-1.36-gawk5-support.patch 4306 BLAKE2B 60bca612d1ce3b69facd0d27daac6275ad1f33ea1a514c762fdd4ff28c55a5e9725c2cd83429e1c2368b42fa6e9850400ffa668a6ce160cdbbc289e421d53c02 SHA512 69cd5219f47193a4b350661fde2d3dcf639ac38dacb6e076ae1d49bd1989562e034f5a238db3fa8af6fb1b80c22d5a6a7fa3f20a2fed95fe756e1a7840a1d886
AUX libgpg-error-1.37-remove_broken_check.patch 786 BLAKE2B 38c3b7039d17de117ba876c11377fe765e39a4630d2dbda21d07aa6a0e027b5ee0e4f2da225d7d6847b5086c7f4aebe378c82a259ec9d82e7ecaac1f77413959 SHA512 6b9087cfa21d844f2306aca0e5575a03b9409ae8e5ea55158734560abd135af265512bec3de8c943210ade60b6334ea1798aa517ba5738cb9fe6720b3cb3c68f
+AUX libgpg-error-1.38-cross_compile.patch 1415 BLAKE2B 6cd0453ef8bd77bf945600c738aec60e3c271109fcbf85af95eaeec372d3a5295dbaa46a28c9d02bde9a9340885a710baaf52b3c76d60fecd0f4ae79118020fd SHA512 99b9ade767fd02bce4f7388d1a4c615ed1b959fe0416d1d49880ae3708482144de7219fed4aa5ef4f7ef18ec7fa047e05da6da53a13a2cab8a42f8298600b061
+DIST gen-lock-obj-1.38.sh 2643 BLAKE2B 5040b027a95f10bac4a0ba463c8bb8387514ca9136e019fc647183456593df27473eb79af1d79e803984dd2b93166c286809b376968584cc320679de95fcfbba SHA512 d60999a08f70f5bcf1b66099c5d7b5f715dbd881bd0d75dbdde3a8932e9b064166f0524a45ae88b5b182c620aee526e14095ffdee68403b5d3b087b4dc4c0c2c
DIST libgpg-error-1.36.tar.bz2 920542 BLAKE2B 81684f6e47192c50cfa408977d53dc3812befca28733b531d51dffa0a6799a47366a50f64755557a7b3111a179ac4aba9e6a527418461cdbcccea80ae6bed4fa SHA512 6e5f853f77dc04f0091d94b224cab8e669042450f271b78d0ea0219658d059c9cab1ab0eaa020a4227f451520b417fc340b85971a6f5e144fa69be57e15df346
DIST libgpg-error-1.37.tar.bz2 937282 BLAKE2B 70666749aa0156652405ee15e4307f29bdf748f06728da5c672c0208053e0d3a041aaef882b263dd828e2aa7dd8a2f77334447af2c499f81f7602150d84f593f SHA512 fa12977237fcc872e944cda39ca43ee7d2cc9c52e243ede6077f4a31ae135e322dc848b4b55cffdc4ec53f27601ba30ddb368b090a94cd00d9345a55b323f179
DIST libgpg-error-1.38.tar.bz2 957637 BLAKE2B 9532402466748503805366b94c82c9adfe5b448f885c26b33ebf7ba9957161ca046b4057f5ca862224accb9f2af731652a55d20e7a4ab69107190a58c8e11ad6 SHA512 b936a4738c2cee111d855b1ba3ec433da8c77799a87d1f71275f974f871ebfa593c9db06ea53f0490b6cd6b94bef34f6052a587a4d13d839ec0128500c2dd9de
EBUILD libgpg-error-1.36.ebuild 1682 BLAKE2B 060fea2878a9ff65e895978743bdf00435e4c275bbf2769777d52d60108358bcf02b8387671f9ac46bf8d9b2b542dd0a383950734baea3568d69fa10fc05a1e7 SHA512 77a635e5f705bdbacf5bcbb9a9bdeb26aed6ec2f7f06a213a2f1bcf84c5c15cb6072511988c95d1f7832e23aaedd42059a3481c1f55fc1e1e0b66f18343b3d9a
EBUILD libgpg-error-1.37.ebuild 1697 BLAKE2B a788777367e04315c576a22bfb0c8ef7fc5e4c5e7d2aba90ab57079226c57a18a386162d5aac94f66ddbf8f45b65d3b8542642a94f13b49dc7d05ebe8ba17496 SHA512 cf202bc7d89a137245aec1c04dc956483ba93fe1e8ef8896b4aa48a576cb54f9ecb7eb64a7dd8eec58861e9ca3aa42feb988f3e99a87e372e8e8863cbb0e7030
-EBUILD libgpg-error-1.38.ebuild 1697 BLAKE2B a788777367e04315c576a22bfb0c8ef7fc5e4c5e7d2aba90ab57079226c57a18a386162d5aac94f66ddbf8f45b65d3b8542642a94f13b49dc7d05ebe8ba17496 SHA512 cf202bc7d89a137245aec1c04dc956483ba93fe1e8ef8896b4aa48a576cb54f9ecb7eb64a7dd8eec58861e9ca3aa42feb988f3e99a87e372e8e8863cbb0e7030
+EBUILD libgpg-error-1.38.ebuild 2135 BLAKE2B d13e3c4c067f58551902fd02360f299bb881cbddd75c7eba74837be162d9ab8d5dcaed31e0890a174eb8079fce5200e6f480edcfc9b0f8b7db1d64b684edcea2 SHA512 5ee1b7e9e27beec67ed5a56e919fdfc324f26248ad5fa4aa12c332285121d8a73c6cbaa00bf4e1980d414960d64f6e121d02545fb77d5bc7373a839e22a687f4
MISC metadata.xml 525 BLAKE2B b2be127796014b926129f269602f39c5b0fa9ae4022b1d7492c201725c27e614e0dd6a0f8bacd1e6703309130f7e758c0bb7abef9d532c01182eb7b4fdc0a13f SHA512 48841f068de32aefcdafd5b831a90811c8006862a8aea7b9cd48e77dc3f9e1dfda00d952de9f5784a58f730ae2707eda2ca4bfc1509985988042017419a7b8b5
diff --git a/dev-libs/libgpg-error/files/libgpg-error-1.38-cross_compile.patch b/dev-libs/libgpg-error/files/libgpg-error-1.38-cross_compile.patch
new file mode 100644
index 000000000000..7ddd51f9a57b
--- /dev/null
+++ b/dev-libs/libgpg-error/files/libgpg-error-1.38-cross_compile.patch
@@ -0,0 +1,40 @@
+From: David Michael <fedora.dm0@gmail.com>
+Date: Mon, 1 Jun 2020 14:24:53 +0000 (-0400)
+Subject: build: Fix cross-compiling into a separate build dir.
+X-Git-Url: http://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgpg-error.git;a=commitdiff_plain;h=013720333c6ec1d38791689bc49ba039d98e16b3
+
+build: Fix cross-compiling into a separate build dir.
+
+* configure.ac: Create the src directory before writing into it.
+* src/Makefile.am (EXTRA_DIST): Add gen-lock-obj.sh.
+
+--
+
+Signed-off-by: David Michael <fedora.dm0@gmail.com>
+---
+
+diff --git a/configure.ac b/configure.ac
+index 6bd634b..1dd6489 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -598,6 +598,7 @@ if test x$cross_compiling = xyes; then
+ case $host in
+ *-*-linux*)
+ lock_obj_h_generated=yes
++ mkdir src
+ LOCK_ABI_VERSION=1 host=$host host_alias=$host_alias \
+ CC=$CC OBJDUMP=$host_alias-objdump \
+ ac_ext=$ac_ext ac_objext=$ac_objext \
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 7e36d69..b2bffd2 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -102,7 +102,7 @@ EXTRA_DIST = mkstrtable.awk err-sources.h.in err-codes.h.in \
+ gpg-error.vers gpg-error.def.in \
+ versioninfo.rc.in gpg-error.w32-manifest.in \
+ gpg-error-config-test.sh gpg-error.pc.in \
+- $(lock_obj_pub)
++ gen-lock-obj.sh $(lock_obj_pub)
+
+ BUILT_SOURCES = $(srcdir)/err-sources.h $(srcdir)/err-codes.h \
+ code-to-errno.h code-from-errno.h \
diff --git a/dev-libs/libgpg-error/libgpg-error-1.38.ebuild b/dev-libs/libgpg-error/libgpg-error-1.38.ebuild
index f6fa282fbe08..3a45f44afdf9 100644
--- a/dev-libs/libgpg-error/libgpg-error-1.38.ebuild
+++ b/dev-libs/libgpg-error/libgpg-error-1.38.ebuild
@@ -7,7 +7,8 @@ inherit autotools libtool multilib-minimal toolchain-funcs prefix
DESCRIPTION="Contains error handling functions used by GnuPG software"
HOMEPAGE="http://www.gnupg.org/related_software/libgpg-error"
-SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
+SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2
+ https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgpg-error.git;a=blob_plain;f=src/gen-lock-obj.sh;hb=libgpg-error-1.38 -> gen-lock-obj-1.38.sh"
LICENSE="GPL-2 LGPL-2.1"
SLOT="0"
@@ -26,7 +27,17 @@ MULTILIB_WRAPPED_HEADERS=(
/usr/include/gpgrt.h
)
-PATCHES=( "${FILESDIR}/${PN}-1.37-remove_broken_check.patch" )
+PATCHES=(
+ "${FILESDIR}/${PN}-1.37-remove_broken_check.patch"
+ "${FILESDIR}/${P}-cross_compile.patch" #726520
+)
+
+src_unpack() {
+ [[ ${PV} == 1.38 ]] || die "Please remove gen-lock-obj.sh from SRC_URI and drop src_unpack"
+ unpack ${P}.tar.bz2
+ cp "${DISTDIR}"/gen-lock-obj-1.38.sh "${S}"/src/gen-lock-obj.sh || die
+ chmod +x "${S}"/src/gen-lock-obj.sh || die
+}
src_prepare() {
default
diff --git a/dev-libs/libgudev/Manifest b/dev-libs/libgudev/Manifest
index 0dbb706241be..7b7116bfb6aa 100644
--- a/dev-libs/libgudev/Manifest
+++ b/dev-libs/libgudev/Manifest
@@ -1,3 +1,3 @@
DIST libgudev-233.tar.xz 271292 BLAKE2B 02c9a1040e3db21a9478927cce99cc8fdb360db922fc35421fd41ceeaffc786aa9f397f9387ac9d98bdd8ed45a457af2c0d33df731edfa08b63cb64a2c7fa4e6 SHA512 0e7beb35478bba2aed3cf8e750f524c562038b04fd59e4dd31618b0ae7cbd29545e5909c422325e4be84dcab9177a5256bf0f3ce7df7b6c07e4866cbb8ce570b
-EBUILD libgudev-233-r1.ebuild 1118 BLAKE2B e12147916f946fd12cdb8e56981e01aca100fae9bb989af632f06a661b8dae2f3ba52526edc08c31558e5d532dfda414d6202b35e7f8b0f8341b0917e679bd41 SHA512 a69db9f1fe8857c4380f8f158084c35af8ee22b78eded3eea36fa4bedeb5a7aee879fc6a403ab56fdf1a6a642eab41420aef146beca5de4579a3dc68473a2749
+EBUILD libgudev-233-r1.ebuild 1098 BLAKE2B 01e9a601ff8142d174ceed9397f231d9e49540b15b66129059ca0fd6a7843ed44cf7156bd9c885c67e1bc55c68c93ca16b28f987b7da8570bd080b820e5a8b9a SHA512 52f0b728dec487a6316b2a31652280bcc5c456ced107acf3f97f7fdcee3568f5f5555afa3d1bfdd415be3a903e1e55506f18aa2a593dbacec2106bf48e7febc2
MISC metadata.xml 361 BLAKE2B 82ce1db7744cf4c9d543621978add958e480a57053f250d98d756d2d476e2ad84adf8ee41e8c332eaaec255ce9440223579ea072aadb89023c1bfd359acc6d1a SHA512 5306c2af0867c2122471d13cf49ebe04cccd62897c82d73b66b52792d784ca7bfd7d2cafa0821998084e78b43505fc449040bb46c2b406ba2d50b8a92af03f1f
diff --git a/dev-libs/libgudev/libgudev-233-r1.ebuild b/dev-libs/libgudev/libgudev-233-r1.ebuild
index 3aff776cc8be..ff398aff9a35 100644
--- a/dev-libs/libgudev/libgudev-233-r1.ebuild
+++ b/dev-libs/libgudev/libgudev-233-r1.ebuild
@@ -26,7 +26,7 @@ RDEPEND="${COMMON_DEPEND}
DEPEND="${COMMON_DEPEND}
dev-util/glib-utils
>=dev-util/gtk-doc-am-1.18
- virtual/pkgconfig[${MULTILIB_USEDEP}]
+ virtual/pkgconfig
"
# Needs multilib dev-util/umockdev
diff --git a/dev-libs/libgusb/Manifest b/dev-libs/libgusb/Manifest
index 465051fcd3fc..e149319ea270 100644
--- a/dev-libs/libgusb/Manifest
+++ b/dev-libs/libgusb/Manifest
@@ -1,5 +1,5 @@
DIST libgusb-0.3.3.tar.xz 38928 BLAKE2B 711bf59db0d86879961fbba1cd87d5a8557cd4c735f3eaf80bb75f1ac55ededecb4038125428c1297942d014dfd3ea995f7cee8355150f1e90e0fec4aa92cfa9 SHA512 8be37283f2c1719976bbd9bc33eacf5afd4cef107a6629e8f9523b49e66ab2782d9937e4d9fa18760b9083c991c91d6126cfcfa22921b3436a9ebc3a858d855a
DIST libgusb-0.3.4.tar.xz 40636 BLAKE2B 8e43849395a0bce646d9b9493c883fc6db28572a75017e0309b6b2d1924bb6a978190d4b171416053cae424d272a7b43e1536abd92821198e4e7f553bb16d19f SHA512 abbec6b5a5f27b5061ff165db97915d7356b23757de12b640f54741927ac860264af3daed15d4b4b5f3df494acb20695070dcb5ad104df2defdcc7229634c42f
-EBUILD libgusb-0.3.3.ebuild 1496 BLAKE2B 63e922ff5aa7915e9547959c74000a39546cb8fd03434414472fc52aff6c4e538dc085242c1ed5f1d8e1e063f1f279e8aad86dbe037ef8837ecaf4d5c2f807e1 SHA512 04516be2d12549364c048a2fb1ba9395ce9f0f6ada8a048695f9b54a6517cee985c4497bd718f8fe7024d3254032b6f035e0358ef3a7fd69382d3bb31be89fb8
-EBUILD libgusb-0.3.4.ebuild 1721 BLAKE2B a83aaf1d77754e18f57894c4f26eb0ba0f26df6911f3bb5a75125cdc23fe38806c7b6a4841f794079a26350cf367ff37fc76bfb2ce48f5fe96c993e55156d6e6 SHA512 1c7e8179de37f6cce41ba2e16b5974909ff223e1384606eb0e017255c4e4b7b75a909ac88661d8758f5b819d5d9f2787121b0ba7c7cea7ace9be9cd055fb4044
+EBUILD libgusb-0.3.3.ebuild 1476 BLAKE2B 328320f273a1faf71c2fdde39fe741b3ebb4b726fd660f674a6594c2800c61216a584b2a88c678bd24053eba5f3bd3a6b734854b184b4a9835eb1b907ca9aaa9 SHA512 8ac7f62f2179863c310c1b5caba41858bc55d2bab6fdfbe06802f9924a2a6c610ac54269336683adfead3649e691640abfccf1bb05fc899a960de9ee9e724b89
+EBUILD libgusb-0.3.4.ebuild 1701 BLAKE2B 726c75a45d210071e8c88edeb0f1600fbf4b765f25f34053e4454ef0c8a5d56347e5558c6cd4afb55af90162cc331be9b635605736438ade16f56ae8d76100ec SHA512 9755677a7daac0db38658389ee5843a988f5b891ab40770770f4a2f1998b72739953599dd3ea912d6ea11e7fc41035c816d7934ed1002ea3fe6b1d84bb35745b
MISC metadata.xml 343 BLAKE2B 5905d49c021f1b8d8e5167415d0f0c731c0b204fad7aa73f10f6a7dc8b8f417e9591ed26ce655e2d5e5963e84f0ce44d77e59cd79e8d1921899b0a9627d52911 SHA512 096d78e0613e0475d5499f3c30542bd22fc98a2598a7e2e5719747a809a19288a0a36897bc9bc647fceb98f3579f7148c32d16d78c6114d0b925f143daca91bc
diff --git a/dev-libs/libgusb/libgusb-0.3.3.ebuild b/dev-libs/libgusb/libgusb-0.3.3.ebuild
index 3202cd2a1316..364b24314774 100644
--- a/dev-libs/libgusb/libgusb-0.3.3.ebuild
+++ b/dev-libs/libgusb/libgusb-0.3.3.ebuild
@@ -31,7 +31,7 @@ BDEPEND="
dev-util/gtk-doc
)
vala? ( $(vala_depend) )
- virtual/pkgconfig[${MULTILIB_USEDEP}]
+ virtual/pkgconfig
"
RESTRICT="!test? ( test )"
diff --git a/dev-libs/libgusb/libgusb-0.3.4.ebuild b/dev-libs/libgusb/libgusb-0.3.4.ebuild
index c38c2990d9ad..5ec7e1e7ab8e 100644
--- a/dev-libs/libgusb/libgusb-0.3.4.ebuild
+++ b/dev-libs/libgusb/libgusb-0.3.4.ebuild
@@ -35,7 +35,7 @@ BDEPEND="
dev-util/gtk-doc
)
vala? ( $(vala_depend) )
- virtual/pkgconfig[${MULTILIB_USEDEP}]
+ virtual/pkgconfig
"
RESTRICT="!test? ( test )"
diff --git a/dev-libs/libindicator/Manifest b/dev-libs/libindicator/Manifest
index 75287c5d333d..c4dfa545888a 100644
--- a/dev-libs/libindicator/Manifest
+++ b/dev-libs/libindicator/Manifest
@@ -1,5 +1,5 @@
AUX libindicator-ldflags-spacing.patch 298 BLAKE2B 2d0fb361e2980d429beee418d9bf8d2f786de0d2b337b6775f9457158aa30d02b4dcbccdc488fa79236f04bf766aad49df732d25f48f1ecba923c46a4e239280 SHA512 fa283a8d6b88da0e2b6f5d0711ebe8a5cc0d4ab87cb07c3cecae9974dd68be751169b89503ae66751bca6cd73df2b2a262ac55a667c5c8e00e129d51f4452c67
DIST libindicator-12.10.1.tar.gz 427764 BLAKE2B 93cc774df0b55b7ee447c24a0ce49047080ab867c20403724b855153cfc5b93ed0da278532a2fc67bd69e4a9484a31286c2c585cd14d156028f338b5ed2b306a SHA512 d6d77d0309b15cf6b52539323920ab0c1594cb1c1cef8a8d67cd0f76f8ceeeac28eb6db6227563df1932e6f1fadcffac68d82982182b745257dfaf91f1c945af
-EBUILD libindicator-12.10.1-r201.ebuild 1217 BLAKE2B 2ac3b76290c0082cedb779ec6f0b14df429d7c183d220bb2cfa9078d82801fb8ed2e839d41d64e8a8ce996954f6889110fb5eea786528443b5917b42ad022c51 SHA512 199c5d5e60f8dc3bf2a215598640d9267d1f824955f76705f835073d5ad33e55bd4513f522e8a4b2ffd2e2e9119f2622f26020f6760d05323e25b6f59b5c21f8
-EBUILD libindicator-12.10.1-r301.ebuild 1198 BLAKE2B 041dd6acb68958c63f8fc0fab20056154276e4e98657d52a90797c8170844a51ea14330aa5e9c75b78f59ed2a33b4eb267721fd3be53d11cea79a331d6fe812b SHA512 b3d772147ccf73a96906380d3e39498606f778f561ad17ccb019343447db56653bcbceff25618e49226c263a2b6883513e4f979817eae7d3bc0622dcce139b6a
+EBUILD libindicator-12.10.1-r201.ebuild 1197 BLAKE2B 5082a2b7963e66380a13b43323f9fca4492749fbebd89fcfb4f1a092292d8555f40398a1fc120e2bb771c784af12149dc13d95092c0b27146feb728c22f4e787 SHA512 01fa3c26a4a13d4db640e491cc12f19fbe3cdb86eaac3a2d81cdc9a007853ad338e3e0f65cadf6ab800d74bea41292399bdfe2a78b0365cf552370d962761713
+EBUILD libindicator-12.10.1-r301.ebuild 1178 BLAKE2B 8c4a9b86a23fe1cf355abe943fd69accff0baf2a8f38436c3bb15c2f3b99f01ad17187a5f62acaf2a3f752814092062eb71639f34b473ed19ef6ca849992609f SHA512 7a9df8a784836f37d45928e614af2228c303e30d4a5a5a9450468966f6a947b7d153190ab83ffc6afba8c672724fabe26e50507f6e207396e638435198d474f9
MISC metadata.xml 247 BLAKE2B 216107f32a44b828d5bd65432dbdf2f3b71d81e96ee3580fc551392310b9ee554715698dfcba215fa2181a90f361564b6d04546c61848c3a2d176f3590602f69 SHA512 f24203e0188dd8311689fc59007368585764703b92f6fde9b4ea01666d37304193fc728a9f99b7f6c936f5a5a51a58a8402a101dc4eddc0bf2bf09f221bb0054
diff --git a/dev-libs/libindicator/libindicator-12.10.1-r201.ebuild b/dev-libs/libindicator/libindicator-12.10.1-r201.ebuild
index 8e59ad01fd19..24ca42f49f2e 100644
--- a/dev-libs/libindicator/libindicator-12.10.1-r201.ebuild
+++ b/dev-libs/libindicator/libindicator-12.10.1-r201.ebuild
@@ -18,7 +18,7 @@ RDEPEND=">=dev-libs/glib-2.22[${MULTILIB_USEDEP}]
>=x11-libs/gtk+-2.18:2[${MULTILIB_USEDEP}]"
DEPEND="${RDEPEND}
dev-util/glib-utils
- virtual/pkgconfig[${MULTILIB_USEDEP}]
+ virtual/pkgconfig
test? ( dev-util/dbus-test-runner )"
src_prepare() {
diff --git a/dev-libs/libindicator/libindicator-12.10.1-r301.ebuild b/dev-libs/libindicator/libindicator-12.10.1-r301.ebuild
index 7dbbe27af996..068768b22c0f 100644
--- a/dev-libs/libindicator/libindicator-12.10.1-r301.ebuild
+++ b/dev-libs/libindicator/libindicator-12.10.1-r301.ebuild
@@ -18,7 +18,7 @@ RDEPEND=">=dev-libs/glib-2.22[${MULTILIB_USEDEP}]
>=x11-libs/gtk+-3.2:3[${MULTILIB_USEDEP}]"
DEPEND="${RDEPEND}
dev-util/glib-utils
- virtual/pkgconfig[${MULTILIB_USEDEP}]
+ virtual/pkgconfig
test? ( dev-util/dbus-test-runner )"
src_prepare() {
diff --git a/dev-libs/libinput/Manifest b/dev-libs/libinput/Manifest
index afd677632eda..58adb5622435 100644
--- a/dev-libs/libinput/Manifest
+++ b/dev-libs/libinput/Manifest
@@ -1,5 +1,7 @@
DIST libinput-1.15.4.tar.xz 580616 BLAKE2B cac324f08b8dc3c6cc18ca62d528c3a00fbd70a1d434aa171da2e144d8d74f961bcb491f6dc39b365f766ea8e5ed87b29b1dd5aa9f62b12707f8e49e5c63a5d7 SHA512 4659818952dc729cd5bdb78ebe21edbbacbf8a66a592b13ba30f3bb4c4e264208ec94440a253cfa4edc8b2ef904954eecea6be0f8d63cf239e3858d3abb64a80
DIST libinput-1.15.5.tar.xz 582800 BLAKE2B 8575dbe6699230610e05f4c7e9e72aebb1fb765be1d305ba6d9fcf69c6efc990ec78bd0746b29921a2414df99c536c3f267b1dd1d6d98c872e360fc16572e2a4 SHA512 a0a3a325048841fc017e19d3bc5f5490605972ab9e2730dc5678bda7efb7a5b1fa6f531f3c8abd8393899ec383d8d2bcfd586eacee04fc1fbda0e02ba2af956a
+DIST libinput-1.15.6.tar.xz 584184 BLAKE2B 9963e9df41cb32c40454a3dc76975315f74a2e8b2549c037868c651c2ada90f77a605048ba603a4c01d0641fc39154b578a766309f1c376c07d3bdd02dfd387c SHA512 90459e5a1f22fd42ffcbab157b461e4514c30803bcebdaced76c65c05cccfa6f259640a50497055fe7ed0b376a6979f6d1d01227ae447fe60ba88fa81142b969
EBUILD libinput-1.15.4.ebuild 2146 BLAKE2B 546077aa2a928f10745d17235c84b840ae817ed8dfc124ec82e2504620b3bd65066c95ca945743f703acfbbf50d6968f2f7be6ad8d1e964087f8e2eab52380e5 SHA512 cc2a9d8013068f919e5e181e407870930ba2531eb7b0dfb7c1c1319ca62a5b919b0e227b0bb085377d32b5c5bfea5d24106aedb580f7cc3b5b1e15a9df23e42b
-EBUILD libinput-1.15.5.ebuild 2154 BLAKE2B 1db905d4b3cec898ea12d1bae75627c7597603fffb5f034aaeeeb24c97ef94d8bcdde5d97e9dc7293fcd1683ff64f8bd345c47486d4ad196d2aa39a3b395f7ae SHA512 679b56b53bdb4660d788f030987706c493f4033692b5ffa7e48dd5fe7feac48ce173ef18a943370cff6d1043c0b7ded113d1dce35bac8b38477b68472cac3506
+EBUILD libinput-1.15.5.ebuild 2148 BLAKE2B 75cf7c0f05bea05613624287320fd32efad71d6911ada84d0e128e91ee999ef7246e751d01d0254e1a306a31834b605b2a71ba8658e838a1540164294c18396b SHA512 cb2237b750ef58ac2f4731d88767d9c322401b16c9419931de237ea499f084d5dd2a5a51704113f590125e677c9388d13f96b881905e7c6911f220a4fcc70173
+EBUILD libinput-1.15.6.ebuild 2154 BLAKE2B 1db905d4b3cec898ea12d1bae75627c7597603fffb5f034aaeeeb24c97ef94d8bcdde5d97e9dc7293fcd1683ff64f8bd345c47486d4ad196d2aa39a3b395f7ae SHA512 679b56b53bdb4660d788f030987706c493f4033692b5ffa7e48dd5fe7feac48ce173ef18a943370cff6d1043c0b7ded113d1dce35bac8b38477b68472cac3506
MISC metadata.xml 448 BLAKE2B c7a735047f8d22e10d1094dc4bbcbd118c025f318280dafd36029484956465c5e459326fb765f04fbdddc03743760a9008c6ac2494ad113387134fb4e79c4c48 SHA512 945c1005dccddac8085fd8b2be635c08d5b4da1f8264d564d10526d11cf814131d1fa5fd7620f35811a90b43686517519f4e9aba9253f5d5d5b69daa25be52bf
diff --git a/dev-libs/libinput/libinput-1.15.5.ebuild b/dev-libs/libinput/libinput-1.15.5.ebuild
index 7ae9b0b06559..defc7b185b3c 100644
--- a/dev-libs/libinput/libinput-1.15.5.ebuild
+++ b/dev-libs/libinput/libinput-1.15.5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
LICENSE="MIT"
SLOT="0/10"
[[ "$(ver_cut 3)" -gt 900 ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
IUSE="doc input_devices_wacom test"
RESTRICT="!test? ( test )"
diff --git a/dev-libs/libinput/libinput-1.15.6.ebuild b/dev-libs/libinput/libinput-1.15.6.ebuild
new file mode 100644
index 000000000000..7ae9b0b06559
--- /dev/null
+++ b/dev-libs/libinput/libinput-1.15.6.ebuild
@@ -0,0 +1,83 @@
+# Copyright 2014-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit meson python-any-r1 udev
+
+DESCRIPTION="Library to handle input devices in Wayland"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/libinput/ https://gitlab.freedesktop.org/libinput/libinput"
+SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0/10"
+[[ "$(ver_cut 3)" -gt 900 ]] || \
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="doc input_devices_wacom test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+ virtual/pkgconfig
+ doc? (
+ $(python_gen_any_dep '
+ dev-python/commonmark[${PYTHON_USEDEP}]
+ dev-python/recommonmark[${PYTHON_USEDEP}]
+ dev-python/sphinx[${PYTHON_USEDEP}]
+ >=dev-python/sphinx_rtd_theme-0.2.4[${PYTHON_USEDEP}]
+ ')
+ >=app-doc/doxygen-1.8.3
+ >=media-gfx/graphviz-2.38.0
+ )
+"
+# test? ( dev-util/valgrind )
+RDEPEND="
+ input_devices_wacom? ( >=dev-libs/libwacom-0.20 )
+ >=dev-libs/libevdev-1.3
+ >=sys-libs/mtdev-1.1
+ virtual/libudev:=
+ virtual/udev
+"
+DEPEND="${RDEPEND}
+ test? ( >=dev-libs/check-0.9.10 )"
+
+python_check_deps() {
+ has_version "dev-python/commonmark[${PYTHON_USEDEP}]" && \
+ has_version "dev-python/recommonmark[${PYTHON_USEDEP}]" && \
+ has_version "dev-python/sphinx[${PYTHON_USEDEP}]" && \
+ has_version ">=dev-python/sphinx_rtd_theme-0.2.4[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+ use doc && python-any-r1_pkg_setup
+}
+
+src_configure() {
+ # gui can be built but will not be installed
+ local emesonargs=(
+ -Ddebug-gui=false
+ $(meson_use doc documentation)
+ $(meson_use input_devices_wacom libwacom)
+ $(meson_use test tests)
+ -Dudev-dir="${EPREFIX}$(get_udevdir)"
+ )
+ meson_src_configure
+}
+
+src_install() {
+ meson_src_install
+ if use doc ; then
+ docinto html
+ dodoc -r "${BUILD_DIR}"/Documentation/.
+ fi
+}
+
+pkg_postinst() {
+ pkgname="dev-python/python-libevdev"
+ if [[ -z "${REPLACING_VERSIONS}" ]] && ! has_version "${pkgname}"; then
+ einfo "${pkgname} must be installed to use the"
+ einfo "libinput measure and libinput replay tools."
+ fi
+
+ udevadm hwdb --update --root="${ROOT}"
+}
diff --git a/dev-libs/libjcat/Manifest b/dev-libs/libjcat/Manifest
index ebe1c006b9cf..7e14463b5e57 100644
--- a/dev-libs/libjcat/Manifest
+++ b/dev-libs/libjcat/Manifest
@@ -1,6 +1,6 @@
AUX libjcat-0.1.1-disable_installed_tests.patch 1131 BLAKE2B fdefa9b78c1c8fa80ef35d1eb1d1f5bfa9f6d6434dc517e5c84affde5de8fe195d4ad605b59c45acaf73fb5bc75fb6c57bb0a95ccace0b67e3480b9157a6a704 SHA512 171b9c60e4afff59cb25bd6f94ece92e3e80dc1267395415d3d283ab429c3a2de49d43c0a0efce1b9b9f4d217e01a08ce4458c691ad270d427284ed45a88a1cf
-DIST libjcat-0.1.1.tar.gz 62579 BLAKE2B fed33602d2b036605238945d09ede1c524847624f1be6301a7f5ff64d21ba27c7c765b37c522f81dfd49071db6339738ad82b2ad0b25f0494bf4fd806c64b5de SHA512 fd644c003ad3a317a9f8886c2bad6dcfabf953e61bcbf02b30a292e9a85a591f854f71d7ac17692d5d98d976a435cf53beba1394c662fa78836389d66d4a5824
DIST libjcat-0.1.2.tar.gz 62630 BLAKE2B cb333098d984f840a80c4ea4b7feab32ca7d04882f2f4aa788c01dd13c616b85576af5bbcd0ca343a7f5b7221ab69b202c7a8cacb230eeeefab9a3a9a61d7d3f SHA512 9184b761cad5a43ac1f0b0cd4ff54c372ec067785c9b796d813aab6a936fbb522f419e965b70d4d71fbec9f7c25f9d185f957cf1e73cb0e5bdeca9492e11b0fd
-EBUILD libjcat-0.1.1.ebuild 1400 BLAKE2B 6f821af2a998b8e9b3d1d1f079f3974718393a4895b75f3a9996572351157c4d6035c0302fbcf79dc0392834ce9a63774793b9e77ad0ee5d09bf45e80bddd0fb SHA512 87715c486fc5caf8e43c06cf07a60cc3ffe2e56ceeecca1385d28acdefbb0eb18eb449bea697ffff93b4742c907484b73ecdfd78bc441c4ff5e72ceb5799b63b
-EBUILD libjcat-0.1.2.ebuild 1400 BLAKE2B 6f821af2a998b8e9b3d1d1f079f3974718393a4895b75f3a9996572351157c4d6035c0302fbcf79dc0392834ce9a63774793b9e77ad0ee5d09bf45e80bddd0fb SHA512 87715c486fc5caf8e43c06cf07a60cc3ffe2e56ceeecca1385d28acdefbb0eb18eb449bea697ffff93b4742c907484b73ecdfd78bc441c4ff5e72ceb5799b63b
+DIST libjcat-0.1.3.tar.gz 63765 BLAKE2B a9847fe2a93f49773ba6451036d7908b8b615a6334557a68c94db3c402e1f502e2915bb1abc9f58c495fe1453cb5653cae9b548d2f9d7b39dcd5d7824e965bc2 SHA512 f021e10d740ac6d0f0c73cefc9deacdbc74882a5e340b249c28427ece4917358940413914ce19c5aac96c86d8056349ff2ee633c2a9541f4382f109d9e0d9e69
+EBUILD libjcat-0.1.2.ebuild 1405 BLAKE2B 6fce2d734bf40ca38ff11efef56a87b8fb68b987f3b51486a91e09c6175c6e2eaccdbf51a7214b5d63dbd500ba22fbb0be2ea06443771bc54a6b86b5c0878de9 SHA512 3813e816d8cedc1ad807ca59639a6caa607935cf315fb29ccbc685b10d6d92aee8dfc20e7f66f898c893d4170c0afd90493d40db284337316136b2c793c98478
+EBUILD libjcat-0.1.3.ebuild 1404 BLAKE2B 3c38e4f1043861e51a1ae77b4f1b16fc044db4bd5208a8ad1d2751a07133f4627c070042dd78b5af53735f18553f1591e86e8e0ef094e6f47540c4efb58c5222 SHA512 e6a3ac7afb7122b9c6045ab560dcd5a7319351e312dedbb45292237faca6f97ef4e8425c818fe1b1f44105241c62b8c9bc7c3904499dc8134ea0efd0a7296a9d
MISC metadata.xml 993 BLAKE2B 3f186f6514cbea4951c5e2b4c26a305d615cfa52237ba5e21495c7843a82fd551557e53592e7aacbc568b8bd09832fef0054e4f095fdeb07194e9dc8258bbee3 SHA512 fa07148261c97c53718c489a0cd70d60eea42fccc1723a88d9a35b06c7a91b92e2e0d66bed11f719f160f749ea4a0cbb3eab89c6dc68eda5ff75386d4958e3bc
diff --git a/dev-libs/libjcat/libjcat-0.1.2.ebuild b/dev-libs/libjcat/libjcat-0.1.2.ebuild
index 06f0e8d33d08..32fec2f11c2a 100644
--- a/dev-libs/libjcat/libjcat-0.1.2.ebuild
+++ b/dev-libs/libjcat/libjcat-0.1.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/hughsie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="LGPL-2.1+"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
IUSE="gpg gtk-doc +introspection +man pkcs7 test"
RDEPEND="dev-libs/glib:2
diff --git a/dev-libs/libjcat/libjcat-0.1.1.ebuild b/dev-libs/libjcat/libjcat-0.1.3.ebuild
index 06f0e8d33d08..e20c8660675a 100644
--- a/dev-libs/libjcat/libjcat-0.1.1.ebuild
+++ b/dev-libs/libjcat/libjcat-0.1.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/hughsie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="LGPL-2.1+"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 x86"
IUSE="gpg gtk-doc +introspection +man pkcs7 test"
RDEPEND="dev-libs/glib:2
diff --git a/dev-libs/libmoe/Manifest b/dev-libs/libmoe/Manifest
index aa26ca3275f1..b66c8f642557 100644
--- a/dev-libs/libmoe/Manifest
+++ b/dev-libs/libmoe/Manifest
@@ -1,6 +1,5 @@
-AUX libmoe-1.5.8-gcc5.patch 1778 BLAKE2B cda472b2659b12d2225f0064a81ba4aadaf0eeb1ef9c86666d335a6e64120179156dd421ba0e9574c32a706ea710d48033d8627f84cbb184643123265319c6d2 SHA512 f4eff3250af69aa6751ac953047ef23275e7d5f39c4b850f4f7637e17c8cbe85c7146c3aa7412bbdc089ae787b2a49c72b0afc321bef523efd27bbf1784ff447
-AUX libmoe-1.5.8-gentoo.patch 304 BLAKE2B 45da8f6a3bd9d672362b0fb71b7123ea736500ecac9a72596649402a5fb8fa04eeb55c2a9ef95657dd230e34793632570c37873ab179896124fe3cfd1583312f SHA512 59e598ba12f907306a57ab22ddae823b882f9ee5407c5bcf1115ea477c1c98783807de7a35620c38af9defdf14d76a34897bc95d605739de276b3f146ace847d
-AUX libmoe-1.5.8-makefile.patch 625 BLAKE2B 0c2c23b03eaea5c023d9c65d7cee89cc8ac9c61e9776c694d9f387eedc5b9d8869168867c8bb34e428c89935697da54875a06e7f17c990caa4e0e2b156a7d5b4 SHA512 fa3a785363c4993b3b83bd94c624a2e6b8dababbccd6b2e522e0184d8d0563444c94cb1a67a155d45303081c1da234beeeded36382e582ee407eeceb7a3c630b
+AUX libmoe-gcc-5.patch 1778 BLAKE2B cda472b2659b12d2225f0064a81ba4aadaf0eeb1ef9c86666d335a6e64120179156dd421ba0e9574c32a706ea710d48033d8627f84cbb184643123265319c6d2 SHA512 f4eff3250af69aa6751ac953047ef23275e7d5f39c4b850f4f7637e17c8cbe85c7146c3aa7412bbdc089ae787b2a49c72b0afc321bef523efd27bbf1784ff447
+AUX libmoe-gentoo.patch 914 BLAKE2B 9d1c4dd7ef5f0fb6153673187948a0825a98fa2e5b7e38743f4518835775be406561f7263eb18d59ccdced328c6426cc810ed17d1c30be76daba92700e961b8f SHA512 a334503d845c2f3c61b2c8cbff966073dcf2b017f00de550f8c024dfe0d4a92ed85f2d065017fd84dda19970cd42b860ae61ddab72b284459edaf61990df640e
DIST libmoe-1.5.8.tar.gz 1559398 BLAKE2B 14b167d4ee56fd4e448fb7fe006bd0b66c7fbb7709bfe5d124ec7010f1ae087511934e2ce0cd9d3e3360aad6ae096f56b7dc04643edd08fbecfdc2ca2572ca31 SHA512 937e7e0f1d562c5ea1f93ec755d6125f389cffaa2989b4ec4c1c1b42fab927f1884e1dab2c65e1487f4d9fdb0f9ed306a7d32e13e8b24302837a9e7b5634449b
-EBUILD libmoe-1.5.8-r3.ebuild 922 BLAKE2B 25e99bc500178c47942cd0e464f0bb697533de59ec8e32f18f678675d5eb1bed2e2b814f77c7623b3e19ec7f6e25bf49c6e80eef2b4fe3aeb4330f0b15a9ebff SHA512 c3d4bceaeecf18285cd473ff67200a8a7395ec3a4f2c8da984c99c6b86d7df5f8dd9dc5b829cc19a0b3082eab2f383fee01d625c0c42c208f500748046ccf36f
-MISC metadata.xml 230 BLAKE2B 42b2921aa8f0a7ac96ff31ef846311f023469d38da4186c49a365cb7c4a1c63769e54718fb9ab6e8cfd2b532f249b0214cc54929e93d1a9960a6b5be3238b55d SHA512 74065bee639a38ecdef7c32280ed43a8f1627362cd8e97e714a09bcf116ae8bc4c61b2ab13c31bd02a22ae8a5a201263981ee519a0b6ba9df81a4d5f3cd94eb1
+EBUILD libmoe-1.5.8-r3.ebuild 1073 BLAKE2B 6f0a5a0b6af81f0ca02490b22bc15e430993255f05958b8007be95171a60ec8fb63461ce44a1d4712f1f6538903d043fcfd963e1bdd92044eda424630909004b SHA512 b5d1e9f0a56893f1ecb02ae961bb29f7ba8fa4fa49228e42e8d6eccd22397deae31aae9c99569feb4fabd321aa4262a09837acfe006134ab23460e20c1e9120d
+MISC metadata.xml 234 BLAKE2B 8615ff091e2c6b2c5d9d4246dbec2ed0c5161ce154a59f492bc640a1428de7847757b68a8d926cae4bf78905d2aeeda10cb4cb0db9bf6870d38e811556299520 SHA512 16ea852f76297335e7ef70c8019fe09d46c0455922c049ba6e92696232e957955fd671d467ebdd0bf7837d39a26083d5be2a6f8abeba53807f0b8c5b97f2e441
diff --git a/dev-libs/libmoe/files/libmoe-1.5.8-gentoo.patch b/dev-libs/libmoe/files/libmoe-1.5.8-gentoo.patch
deleted file mode 100644
index cf436c11577b..000000000000
--- a/dev-libs/libmoe/files/libmoe-1.5.8-gentoo.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff -Naur libmoe-1.5.8.orig/altmalloc.c libmoe-1.5.8/altmalloc.c
---- libmoe-1.5.8.orig/altmalloc.c 2002-02-01 22:25:10.000000000 +0900
-+++ libmoe-1.5.8/altmalloc.c 2008-11-19 08:44:34.000000000 +0900
-@@ -1,3 +1,5 @@
-+#include <string.h>
-+
- #include "altmalloc.h"
-
- alt_allocater_t alt_malloc = malloc;
diff --git a/dev-libs/libmoe/files/libmoe-1.5.8-gcc5.patch b/dev-libs/libmoe/files/libmoe-gcc-5.patch
index a990a37fe240..a990a37fe240 100644
--- a/dev-libs/libmoe/files/libmoe-1.5.8-gcc5.patch
+++ b/dev-libs/libmoe/files/libmoe-gcc-5.patch
diff --git a/dev-libs/libmoe/files/libmoe-1.5.8-makefile.patch b/dev-libs/libmoe/files/libmoe-gentoo.patch
index 2cdfa1a24c22..c4a754bd2aa8 100644
--- a/dev-libs/libmoe/files/libmoe-1.5.8-makefile.patch
+++ b/dev-libs/libmoe/files/libmoe-gentoo.patch
@@ -1,18 +1,26 @@
-diff --git a/Makefile b/Makefile
-index 1bae380..605d674 100644
--- a/Makefile
+++ b/Makefile
-@@ -72,8 +72,7 @@ AR=ar
+@@ -52,8 +52,8 @@
+ INSTBIN=mbconv${EXT}
+
+ DEBUG=
+-CF=${DEBUG} -O2 -Wall -fpic -I.
+-LF=-shared -Wl,-soname,${DEST}.so.${VER}.${RELEASE}
++CF=${DEBUG} -O2 -Wall -fpic -I. ${CFLAGS}
++LF=-shared -Wl,-soname,${DEST}.so.${VER}.${RELEASE} ${LDFLAGS}
+ CC=gcc
+ CPP=gcc -E
+ LD=gcc
+@@ -72,7 +72,7 @@
all: ${INSTLIBA} mbconv mbconv.man
mbconv: mbconv.c ${ALL}
- ${CC} ${CF} -o $@ $< -L. -lmoe
--
+ ${CC} ${CF} ${LDFLAGS} -o $@ $< -L. -lmoe
+
${DEST}.so: ${DEST}.so.${VER}.${RELEASE}
- ln -sf $< $@
-@@ -116,7 +115,7 @@ ${BTRI_Cs}: %.c: %.mk_btri.c mk_btri
+@@ -116,7 +116,7 @@
./mk_btri <$< >$@-new && mv $@-new $@
mk_btri: btri.c btri.h altmalloc.o
@@ -21,3 +29,11 @@ index 1bae380..605d674 100644
mbconv.man: mbconv.pod
pod2man --section=${MANSECT} --center=' ' $< >$@
+--- a/altmalloc.c
++++ b/altmalloc.c
+@@ -1,3 +1,5 @@
++#include <string.h>
++
+ #include "altmalloc.h"
+
+ alt_allocater_t alt_malloc = malloc;
diff --git a/dev-libs/libmoe/libmoe-1.5.8-r3.ebuild b/dev-libs/libmoe/libmoe-1.5.8-r3.ebuild
index 01e7722e7012..7d1017ce991b 100644
--- a/dev-libs/libmoe/libmoe-1.5.8-r3.ebuild
+++ b/dev-libs/libmoe/libmoe-1.5.8-r3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI="7"
inherit toolchain-funcs
@@ -12,28 +12,34 @@ SRC_URI="http://pub.ks-and-ks.ne.jp/prog/pub/${P}.tar.gz"
LICENSE="public-domain"
SLOT="0"
KEYWORDS="amd64 ppc sparc x86"
-IUSE=""
+IUSE="static-libs"
RDEPEND="dev-lang/perl"
DEPEND="${RDEPEND}"
-HTML_DOCS=( libmoe.shtml )
+HTML_DOCS=( ${PN}.shtml )
PATCHES=(
- "${FILESDIR}/${P}-gentoo.patch"
- "${FILESDIR}/${P}-makefile.patch"
- "${FILESDIR}/${P}-gcc5.patch" # taken from Debian
+ "${FILESDIR}/${PN}-gentoo.patch"
+ "${FILESDIR}/${PN}-gcc-5.patch" # taken from Debian
)
src_prepare() {
default
sed -i \
- -e "/^PREFIX=/s:=.*:=${EPREFIX}/usr:" \
- -e "/^LIBSODIR=/s:=.*:=\$\{PREFIX}/$(get_libdir):" \
- -e "/^MANDIR=/s:=.*:=\$\{PREFIX}/share/man:" \
- -e "/^CF=/s:=:=${CFLAGS} :" \
- -e "/^LF=/s:=:=${LDFLAGS} :" \
- -e "s:=gcc:=$(tc-getCC):" \
- -e "/^AR=/s:=ar:=$(tc-getAR):" \
+ -e "/^PREFIX=/s|=.*|=${EPREFIX}/usr|" \
+ -e "/^LIBSODIR=/s|=.*|=\${PREFIX}/$(get_libdir)|" \
+ -e "/^MANDIR=/s|=.*|=\${PREFIX}/share/man|" \
+ -e "/^MANCOMPR=/s|=.*|=cat|" \
+ -e "/^MANX=/s|=.*|=|" \
+ -e "/^\(CC\|LD\)=/s|=.*|=$(tc-getCC)|" \
+ -e "/^CPP=/s|=.*|=$(tc-getCPP)|" \
+ -e "/^RANLIB=/s|=.*|=$(tc-getRANLIB)|" \
+ -e "/^AR=/s|=.*|=$(tc-getAR)|" \
Makefile || die
}
+
+src_install() {
+ default
+ use static-libs || find "${ED}" -name '*.a' -delete || die
+}
diff --git a/dev-libs/libmoe/metadata.xml b/dev-libs/libmoe/metadata.xml
index c921b96adf6c..6f2ca22da233 100644
--- a/dev-libs/libmoe/metadata.xml
+++ b/dev-libs/libmoe/metadata.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer type="project">
- <email>cjk@gentoo.org</email>
- <name>Cjk</name>
-</maintainer>
+ <maintainer type="project">
+ <email>cjk@gentoo.org</email>
+ <name>Cjk</name>
+ </maintainer>
</pkgmetadata>
diff --git a/dev-libs/libnsfb/Manifest b/dev-libs/libnsfb/Manifest
index 93810d8de060..3f4e91798caf 100644
--- a/dev-libs/libnsfb/Manifest
+++ b/dev-libs/libnsfb/Manifest
@@ -1,6 +1,8 @@
AUX libnsfb-0.1.0-autodetect.patch 734 BLAKE2B bba90c622e559b8238672068792a558ac408954b85cc9798b12163564837e4fb44ec80eca33ca856e5344fafeb862a3eff43bddca27a9ae7603478505982a440 SHA512 72f3af574fadf38a514a6f6d4d24246ad1e76d9c9daa9700f0b37cb465f7afd4e4d7fdde6e53657740db3a6f87f1e8bfaeb1b008c43462d67f224c728af98993
DIST libnsfb-0.2.0-src.tar.gz 82322 BLAKE2B d805478728015663b4bf9c8de018bda33dcd84a7ace7246c450a7c31cc3358f834ade21ac1df9f0ca0e4dcea1138369cc3cd9ac468ebb484cce139d4bc89441e SHA512 b90eca76c8dcb22e554e13b5bea4268e5c9fc6e4711bafa5acbed92cc83513c3a3965208b3956de250fb3013cc3db6a33922ded471fa7a24bde97f748d2212c5
DIST libnsfb-0.2.1-src.tar.gz 82357 BLAKE2B 2904b8890fd1ce3f6eb8d327db09c7b38146d5d16499beecbe56efd762e33d6ee9da3394ed7923ad43a89fa41e45602ea4af2710dbf2f232b42a038ee90abdcc SHA512 f8965aeaab0d8e7c2676bac56ae67bdf6ef651ae84c62e01aeee888807f1edd7d65542cb14027a8f1a207155a1cc54ded9112a42bf9e7a8836956bba38d365ed
+DIST libnsfb-0.2.2-src.tar.gz 82594 BLAKE2B 6deb775e77df71fbcefac6ef8755484bed476b652ae5dc3fe8914b859262ea1f6ee49da9d27a5a1bf34256481c58dd98339f0eb96511dcdc44cff2bef9ef6a7a SHA512 8cd16c0ca974aad8105dc32c8ebd627cf24f6d3bd81360515c2e0159e35328920e91039bb06ab4f52c93264c2112d0e130761e3837ba26fc703caeb52bf27b66
EBUILD libnsfb-0.2.0-r1.ebuild 1194 BLAKE2B c029ba8720e0c26f41a5811ae7bb5fd33b117aa333765470f6ca25af886cf65a92cba3c2ef3e18cd9a39aa9546c556524da02c58ddea83237510d105c964fd14 SHA512 c67bf67cb8e753f25e371bbe00f680748afc6e9fbbf90cb3775c09a0f54a7b64faf39c806110cc9523a66960954a9c8654afa5f8f6154e8ca143cc0f0b0ae687
EBUILD libnsfb-0.2.1.ebuild 1186 BLAKE2B beed57244a64b2a979e988802fb5a83d86b92c9f0faa1943f366a8d27a96b69625ef291ad6fb4e752756e141c7803a8f4522942de18a5b6afe9295ad7ed62737 SHA512 3f3ac474aff38e0a8dfba6737d884ba08dac538e71b4b821fff6ecde3a6b014f01cd54f895062f84bcfb47eb35c75a5d1f4e682d073f7792cb31012b406cdb71
+EBUILD libnsfb-0.2.2.ebuild 1175 BLAKE2B e39c0de671acaf7556879f95af71af44f9d41945d04335087d39ee171b9fff570bbad6e859ffc858b30e8ee9f131879904047e83e6d2e89d41eaf5f7a00f56d7 SHA512 d74c0e4ab954392944cafd9a10302bba6a370f9e9ab1eb44a2f4735ea3713c13baf90210154e367a311b768e9a5178d120a215549e9d3d0d96e31ce76117e664
MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-libs/libnsfb/libnsfb-0.2.2.ebuild b/dev-libs/libnsfb/libnsfb-0.2.2.ebuild
new file mode 100644
index 000000000000..00a4530174dd
--- /dev/null
+++ b/dev-libs/libnsfb/libnsfb-0.2.2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="C library for framebuffer abstraction"
+HOMEPAGE="http://www.netsurf-browser.org/projects/libnsfb/"
+SRC_URI="https://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
+IUSE="sdl test vnc wayland X"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="sdl? ( >=media-libs/libsdl-1.2.15-r4 )
+ vnc? ( >=net-libs/libvncserver-0.9.9-r2 )
+ wayland? ( >=dev-libs/wayland-1.0.6 )
+ X? (
+ >=x11-libs/libxcb-1.9.1
+ >=x11-libs/xcb-util-0.3.9-r1
+ >=x11-libs/xcb-util-image-0.3.9-r1
+ >=x11-libs/xcb-util-keysyms-0.3.9-r1
+ )"
+BDEPEND="dev-util/netsurf-buildsystem"
+
+PATCHES=( "${FILESDIR}/${PN}-0.1.0-autodetect.patch" )
+
+DOCS=( usage )
+
+_emake() {
+ source /usr/share/netsurf-buildsystem/gentoo-helpers.sh
+ netsurf_define_makeconf
+ emake "${NETSURF_MAKECONF[@]}" COMPONENT_TYPE=lib-shared \
+ WITH_VNC=$(usex vnc) \
+ WITH_SDL=$(usex sdl) \
+ WITH_XCB=$(usex X) \
+ WITH_WLD=$(usex wayland) \
+ $@
+}
+
+src_compile() {
+ _emake
+}
+
+src_install() {
+ _emake DESTDIR="${D}" install
+}
diff --git a/dev-libs/libnsutils/Manifest b/dev-libs/libnsutils/Manifest
index 227a376819d7..292947fda712 100644
--- a/dev-libs/libnsutils/Manifest
+++ b/dev-libs/libnsutils/Manifest
@@ -1,3 +1,5 @@
DIST libnsutils-0.0.5-src.tar.gz 7653 BLAKE2B 4f7810f436f5ffd33084bc67095f3cb48a7744ef6f9ab0d632cd7b87467ff8bca54809de5a8ea837a00429c951d4e701909bd5f185e1c600a7323393017596cb SHA512 b9611db39adf11aa4e29387614bf55e241c075a223c687f5520e5b6808cc392c847be1a1d74559928e385a93886c4a67158504342384a1b200cf9ce13c00db50
+DIST libnsutils-0.1.0-src.tar.gz 8840 BLAKE2B 9f25763b945a96d89ba33959caf676b09964da096a9e969396f3b0ba0f6b4bd6bfb52a61bdcc222432463f2bc0f6bc148bc754200fb80a9ab521c5d64638bba7 SHA512 82d75e799b21484120b9711c853075a07990aa4d5ac5bb0574683bd1fd59eef547d9b78333eeb2da9d96c2132b4e7c32510cf690c80cef291cce8ef2eb44198e
EBUILD libnsutils-0.0.5-r1.ebuild 657 BLAKE2B 988d672774084cc4982ca32f1cac5557d9c5f1e5eb19972eb5a48855c311c616d4495c4af75992e91a86448a3fe5664a861afaffce7b5c508ad0f4c71d76f61b SHA512 8a865cb43e07729243e512deec4a47d98f3a9fc722ec4e60ff6a9ced797170c83fffb2edaac2203dbaee04ee92e03319a43f9f6446e70d19ae0498f5ad314ff4
+EBUILD libnsutils-0.1.0.ebuild 649 BLAKE2B 8265f44e4fe75d0aa6f188d4fd362a0e467a23fc13737261af7147d9253a99c71d96d6c7387dd5c534179f673554eaa102bb9d648fe5c04a36b94a28435940c0 SHA512 688c5cd352eff2ecf36bf85f86658c64a2908e0bec40a27d98e75965e223222858017870d0a8228d924943d65d1b64a26424e7cc6365ac241d7132c42336b869
MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-libs/libnsutils/libnsutils-0.1.0.ebuild b/dev-libs/libnsutils/libnsutils-0.1.0.ebuild
new file mode 100644
index 000000000000..6aecbfecab59
--- /dev/null
+++ b/dev-libs/libnsutils/libnsutils-0.1.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="C library for base64 and time"
+HOMEPAGE="http://www.netsurf-browser.org/"
+SRC_URI="https://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
+IUSE=""
+
+BDEPEND="dev-util/netsurf-buildsystem"
+
+_emake() {
+ source /usr/share/netsurf-buildsystem/gentoo-helpers.sh
+ netsurf_define_makeconf
+ emake "${NETSURF_MAKECONF[@]}" COMPONENT_TYPE=lib-shared $@
+}
+
+src_compile() {
+ _emake
+}
+
+src_install() {
+ _emake DESTDIR="${D}" install
+}
diff --git a/dev-libs/libparserutils/Manifest b/dev-libs/libparserutils/Manifest
index 0b69d355ba5b..191ebf8fe478 100644
--- a/dev-libs/libparserutils/Manifest
+++ b/dev-libs/libparserutils/Manifest
@@ -3,4 +3,5 @@ DIST libparserutils-0.2.4-src.tar.gz 74521 BLAKE2B 85e39d64bb8365f95da227e3a52ea
DIST netsurf-buildsystem-1.5.tar.gz 38196 BLAKE2B 298ef39d45b98ae5ef57a22aed9f22bf96dfd6ad5475964c04451eaf28aca7f451b4906002c3e110ffcc951015169f02ffcd85f24e54b46c47b25e048115db1c SHA512 02d85e8f1d2101194a678f7ccf84051390953285a46951d7b327556f8df1a0c416620bd4c7a615e25de438d5d27cfffb69ec5d94eb8379a295dab4c85a96cae4
EBUILD libparserutils-0.2.3.ebuild 594 BLAKE2B de28d631a4441252c99427514903d940386ef97b58dd2c2ab887a99d523c97f18485274e4399d3b0924b4318397fe165699599e2479463403a0479cdcbf1b011 SHA512 da4fe6b526150b45a9bf6d16f412309122564fb1470bf92e5d4f54b425e98ba8ad33aeee0b5ed2f93c9c7383dc4cb320bb3e6ddac1f954ff5e4ec4bc1ea6240b
EBUILD libparserutils-0.2.4-r1.ebuild 941 BLAKE2B 6aa42423fb0351a1d0d2d29ef53a3b5dca9a889290b7129daaae8c1397aaffc106da2cf878f6b9a188d2da7802d33fa4643633cf26c781aae9307710bec39231 SHA512 0673b7a4d2a59a5ccbc1fd55a2897eb1b958271f3f41161c33d9c8b62587f8942c4b164155f920f06eede93b872da97395aaea9e55ab9c006d2136bb1881dfd0
+EBUILD libparserutils-0.2.4-r2.ebuild 928 BLAKE2B 1e6e4b6ece27cb25070da2778a6a183edf887187c4cd5883821adfc6cc7435087b69c9d84aa49fad2d7bb43686195a2e9a5aeaa939699b8abae35df1ee2cff81 SHA512 59d9bbb4411556fd49a12de75026d2737e8315c856e87eb32f7082dedee0757da854d404e5dc215327f6510709506ea2652f28062cd5f1e8851348e9dea5d248
MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-libs/libparserutils/libparserutils-0.2.4-r2.ebuild b/dev-libs/libparserutils/libparserutils-0.2.4-r2.ebuild
new file mode 100644
index 000000000000..da1c2cd28a77
--- /dev/null
+++ b/dev-libs/libparserutils/libparserutils-0.2.4-r2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="C library for building efficient parsers"
+HOMEPAGE="http://www.netsurf-browser.org/projects/libparserutils/"
+SRC_URI="https://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~m68k-mint"
+IUSE="iconv test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+ >=dev-util/netsurf-buildsystem-1.7-r1
+ test? ( dev-lang/perl )"
+
+DOCS=( README docs/Todo )
+
+src_configure() {
+ append-cflags "-D$(usex iconv WITH WITHOUT)_ICONV_FILTER"
+}
+
+_emake() {
+ source /usr/share/netsurf-buildsystem/gentoo-helpers.sh
+ netsurf_define_makeconf
+ emake "${NETSURF_MAKECONF[@]}" COMPONENT_TYPE=lib-shared $@
+}
+
+src_compile() {
+ _emake
+}
+
+src_test() {
+ _emake test
+}
+
+src_install() {
+ _emake DESTDIR="${D}" install
+}
diff --git a/dev-libs/librdkafka/Manifest b/dev-libs/librdkafka/Manifest
index 27bf301fd358..aa603b8849d8 100644
--- a/dev-libs/librdkafka/Manifest
+++ b/dev-libs/librdkafka/Manifest
@@ -1,5 +1,7 @@
DIST librdkafka-1.4.0.tar.gz 2722992 BLAKE2B 590fa90805bc2dc728dd32be333eaf9b2a4e6a840403838406684794ca68f2bcf9fc831e252a637622f9e6cd209d779ed20d503e49dac20bdb28f5d3fbd676bd SHA512 cd343597707d22490dfcd513a6b24ca5487dca5230a5a6775e7d6f10be2dc5481deb3a76968bb244d5f7514db92aceca541823c5841a7b54d8e00aeb9088731c
DIST librdkafka-1.4.2.tar.gz 2732806 BLAKE2B 140160fef4f228d877bcfa9d892fd053d2b74547abdbeb7dc661bd4b2b7d576f1ebeecaccd1ac3c3669e059746f0c63be6468cd4f066a9862b8c60d8f2d014a4 SHA512 3d8e496466c103829f5fe11f1a6e68d1299c847b637c6fad55adbe1ad28bd5c463508f3f3fb8b3316b15a104f74e551cd5e520950d76c0e4f8c876083397ced5
EBUILD librdkafka-1.4.0.ebuild 1471 BLAKE2B 1fd23cd2970dd73085d1a2a584fb6f391568996946e87452e6fd283bfc78119d2c52ecd571a24892c843274744e5aab62266a3a5cba51279109efee4d691e311 SHA512 7e168e876ff25bb9fb83b4ac7401742ce9dbe437939e3c10dbd96c0bffe66270e5816413f7ab7a441897066658c4cd9a7319f6a5b38aaa13a0867f13ee3b4662
+EBUILD librdkafka-1.4.2-r1.ebuild 1651 BLAKE2B 66922dc4ea5f5a8714f94b9c30635cf00699cf1c9d9b0ea98713224cf83459544e4c34a391739fdadb2ede219c9a6b9e497635f5057ab813bb2792f4f97b4331 SHA512 d4a172131e3a07aafa3ea880ab38db623f3b1f63b117ffdf34db62384413d59a6f9d254d064cede12d7d6b5db688a472e0d81887deb5deabe557b103348bdb71
+EBUILD librdkafka-1.4.2-r2.ebuild 1657 BLAKE2B 3c168be95035f152fb212e5f45198398b8b14d869f8dc899530b10e0bccbebad0b4bb57437b1c88c58e7f4684388392f21108453cb5ea89486c9710b0f2e2fcb SHA512 60557ddff24f340cef825a30ee3a96cd928c6a5a3568932f6ae99323a2d6f09f292cb8203e7fc3cec22c0157b16da25154db53c0ad37a05f7f06609e1cf84d8e
EBUILD librdkafka-1.4.2.ebuild 1483 BLAKE2B 4c0400891f9a7f903aa0e118d3bfd1c24570179cd7448240048013f15e5131c18ded63d6f3ac39d9cb4c81a1a7aa52b8a3a3740064fd6c24b40e58b13b1cff6e SHA512 66e5eeb55879174c24ded6b55ebae60db37838fefefdef4b7c7dfa24aca94c2d6048a38830dee7033090e9f72d542d0c72a605b07f2ec20090d9fef7854da989
MISC metadata.xml 533 BLAKE2B 51fa8b199e9126c2942044008614a47915d17ea2e11edbc4254e995ceddf71649018feed0655fa3a5a73d6d7f2c17ab0b4e963bd0b7f4922f1a3fbcd85e04052 SHA512 7f859dce01869e64712cb9042a1ab982255ec524334f2a1fbaf3f0e50fbc08bd3dd21e4bdf2ccef5b539aef94e0bfa2b7af95ef215cfddea4202608005934308
diff --git a/dev-libs/librdkafka/librdkafka-1.4.2-r1.ebuild b/dev-libs/librdkafka/librdkafka-1.4.2-r1.ebuild
new file mode 100644
index 000000000000..58cf22a68315
--- /dev/null
+++ b/dev-libs/librdkafka/librdkafka-1.4.2-r1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit toolchain-funcs
+
+DESCRIPTION="Apache Kafka C/C++ client library"
+HOMEPAGE="https://github.com/edenhill/librdkafka"
+
+if [[ ${PV} == "9999" ]]; then
+ EGIT_REPO_URI="https://github.com/edenhill/${PN}.git"
+
+ inherit git-r3
+else
+ SRC_URI="https://github.com/edenhill/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~sparc x86"
+fi
+
+LICENSE="BSD-2"
+
+# subslot = soname version
+SLOT="0/1"
+
+IUSE="lz4 sasl ssl static-libs zstd"
+
+LIB_DEPEND="
+ lz4? ( app-arch/lz4:=[static-libs(+)] )
+ sasl? ( dev-libs/cyrus-sasl:=[static-libs(+)] )
+ ssl? ( dev-libs/openssl:0=[static-libs(+)] )
+ zstd? ( app-arch/zstd:=[static-libs(+)] )
+ sys-libs/zlib:=[static-libs(+)]
+"
+
+RDEPEND="!static-libs? ( ${LIB_DEPEND//\[static-libs(+)]} )"
+
+DEPEND="
+ ${RDEPEND}
+ virtual/pkgconfig
+ static-libs? ( ${LIB_DEPEND} )
+"
+
+src_prepare() {
+ default
+
+ if [[ ${PV} != "9999" ]]; then
+ sed -i \
+ -e "s/^\(export RDKAFKA_GITVER=\).*/\1\"${PV}@release\"/" \
+ tests/run-test.sh || die
+ fi
+}
+
+src_configure() {
+ tc-export AR CC CXX LD NM OBJDUMP PKG_CONFIG STRIP
+
+ local myeconf=(
+ --no-cache
+ --no-download
+ --disable-debug-symbols
+ $(use_enable lz4)
+ $(use_enable sasl)
+ $(usex static-libs '--enable-static' '')
+ $(use_enable ssl)
+ $(use_enable zstd)
+ )
+
+ econf ${myeconf[@]}
+}
+
+src_test() {
+ emake -C tests run_local
+}
+
+src_install() {
+ emake \
+ DESTDIR="${D}" \
+ docdir="/usr/share/doc/${PF}" \
+ install
+
+ if ! use static-libs; then
+ find "${ED}" -type f \( -name "*.a" -o -name "*.la" \) -delete || die
+ fi
+}
diff --git a/dev-libs/librdkafka/librdkafka-1.4.2-r2.ebuild b/dev-libs/librdkafka/librdkafka-1.4.2-r2.ebuild
new file mode 100644
index 000000000000..b87a68933f65
--- /dev/null
+++ b/dev-libs/librdkafka/librdkafka-1.4.2-r2.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit toolchain-funcs
+
+DESCRIPTION="Apache Kafka C/C++ client library"
+HOMEPAGE="https://github.com/edenhill/librdkafka"
+
+if [[ ${PV} == "9999" ]]; then
+ EGIT_REPO_URI="https://github.com/edenhill/${PN}.git"
+
+ inherit git-r3
+else
+ SRC_URI="https://github.com/edenhill/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+LICENSE="BSD-2"
+
+# subslot = soname version
+SLOT="0/1"
+
+IUSE="lz4 sasl ssl static-libs zstd"
+
+LIB_DEPEND="
+ lz4? ( app-arch/lz4:=[static-libs(+)] )
+ sasl? ( dev-libs/cyrus-sasl:=[static-libs(+)] )
+ ssl? ( dev-libs/openssl:0=[static-libs(+)] )
+ zstd? ( app-arch/zstd:=[static-libs(+)] )
+ sys-libs/zlib:=[static-libs(+)]
+"
+
+RDEPEND="!static-libs? ( ${LIB_DEPEND//\[static-libs(+)]} )"
+
+DEPEND="
+ ${RDEPEND}
+ virtual/pkgconfig
+ static-libs? ( ${LIB_DEPEND} )
+"
+
+src_prepare() {
+ default
+
+ if [[ ${PV} != "9999" ]]; then
+ sed -i \
+ -e "s/^\(export RDKAFKA_GITVER=\).*/\1\"${PV}@release\"/" \
+ tests/run-test.sh || die
+ fi
+}
+
+src_configure() {
+ tc-export AR CC CXX LD NM OBJDUMP PKG_CONFIG STRIP
+
+ local myeconf=(
+ --no-cache
+ --no-download
+ --disable-debug-symbols
+ $(use_enable lz4)
+ $(use_enable sasl)
+ $(usex static-libs '--enable-static' '')
+ $(use_enable ssl)
+ $(use_enable zstd)
+ )
+
+ econf ${myeconf[@]}
+}
+
+src_test() {
+ emake -C tests run_local
+}
+
+src_install() {
+ emake -j1 \
+ DESTDIR="${D}" \
+ docdir="/usr/share/doc/${PF}" \
+ install
+
+ if ! use static-libs; then
+ find "${ED}" -type f \( -name "*.a" -o -name "*.la" \) -delete || die
+ fi
+}
diff --git a/dev-libs/librelp/Manifest b/dev-libs/librelp/Manifest
index 47b9b7093ee3..e27b5a6128b2 100644
--- a/dev-libs/librelp/Manifest
+++ b/dev-libs/librelp/Manifest
@@ -3,5 +3,5 @@ DIST librelp-1.5.0.tar.gz 521793 BLAKE2B f3fa42ab1df5bc7fea340bf87f241666535f61a
DIST librelp-1.6.0.tar.gz 522827 BLAKE2B 04e608a3afe4e6e0109cc9bf753de34e9486595e33bc57387b9428bcf50f8d56177e8f849870611778636be5a58714e4640048758c83a041a354f70442d55cf0 SHA512 1bf96b700fa5ab648ed671b341ae7101fc1db4107f178abd507647afe4f12d59a94c821cc0e06998ac7b344ed41a5e3821843c722c82bf5284c6556995391228
EBUILD librelp-1.4.0.ebuild 1399 BLAKE2B 330788604ea143718e59ab3c88d5248cd93c914c70a8c91d6d5cfbf3cea0a286355cefec2f6b8aa9604b932283b618f7e5615a58ca50dc14089e94eff09311b7 SHA512 9b2a4086e5a56bd13b7741f285753fa834e2f2b8cc7c376e539e5b8507e8d61dce8264ea0e1ebfbdf1ed26dd34b44b490f125d13bf97a106384f81a51ff83847
EBUILD librelp-1.5.0.ebuild 1416 BLAKE2B c1d1c05cd987f44ba5d965d63ef92d554c3c802e1c8376a8b4213da06448d87dbd5b95088592a530bc24722f7ab6f35c2112cc4c6e8211b56828856b731e834e SHA512 23ba67da9b64b8c0ada1ec3659a0010f5556353ba7e4a2a346bd84cad9cde718a418fae8959e37001995122a131a8dd62c8ddab453a16a09d4cd6df7d050162a
-EBUILD librelp-1.6.0.ebuild 1416 BLAKE2B c1d1c05cd987f44ba5d965d63ef92d554c3c802e1c8376a8b4213da06448d87dbd5b95088592a530bc24722f7ab6f35c2112cc4c6e8211b56828856b731e834e SHA512 23ba67da9b64b8c0ada1ec3659a0010f5556353ba7e4a2a346bd84cad9cde718a418fae8959e37001995122a131a8dd62c8ddab453a16a09d4cd6df7d050162a
+EBUILD librelp-1.6.0.ebuild 1414 BLAKE2B 51762b623a0c5ec3f6d1b0b7e9968b4f0c07d6979e52d6d29dced0ee540e8fc438e623f83bb29d5c42d2babe9a1f2d7825f05d82d8ae125132796ff4ee37a8c2 SHA512 48751e180df4d744fd9df39cf252f924dde81d109046219335a0c61e56e810aa437647481e09b2f42405afa136baaff6fba6d9586fce0e131e4c45674dd8e458
MISC metadata.xml 392 BLAKE2B f8320c59b6d3f84ff3e9b782f77d785aa001c5f45dd54afcd0cf726cfc070c076fcebb99313612e58acf6f275900e0641a2fa9bb1151eca0561bae9087e2c5a7 SHA512 d286592d19517966bab79c3bb232ee02a8028b15602fcb6c12edf1523158d07298c33328a808f065de074f701778f9c2fea436d3924a67c2635c911a9e7f15a4
diff --git a/dev-libs/librelp/librelp-1.6.0.ebuild b/dev-libs/librelp/librelp-1.6.0.ebuild
index edacd29ee8ed..a3e031ca3a71 100644
--- a/dev-libs/librelp/librelp-1.6.0.ebuild
+++ b/dev-libs/librelp/librelp-1.6.0.ebuild
@@ -15,7 +15,7 @@ LICENSE="GPL-3+ doc? ( FDL-1.3 )"
# subslot = soname version
SLOT="0/0.5.0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa sparc x86"
IUSE="debug doc +ssl +gnutls libressl openssl static-libs test"
REQUIRED_USE="ssl? ( ^^ ( gnutls openssl ) )"
diff --git a/dev-libs/libressl/Manifest b/dev-libs/libressl/Manifest
index 38e5e1e0a046..cd70a89a3785 100644
--- a/dev-libs/libressl/Manifest
+++ b/dev-libs/libressl/Manifest
@@ -7,6 +7,7 @@ DIST libressl-2.9.2.tar.gz 3607549 BLAKE2B 496e993e4f1c85167e0344afab61259d4e3f0
DIST libressl-3.0.2.tar.gz 3669468 BLAKE2B 84ad2c1fea8d2119f191ec8ab3f999fb0354636d48aabb76fa1786139c669c9d8ca105d79cc8416dd20683818eccc84490cdadc9ca94cb2b0e411644e923a3d6 SHA512 19226da3bc9776e1da40b8e94dfa53564d5e6acc80edee539ba12d7a75c1bb8c0603e7633f26a6ef8b12adc56bb677ccda448575aa6be2ad3df5447465a4b080
DIST libressl-3.1.1.tar.gz 3765769 BLAKE2B 8524a4d83e05b0f2992df8e3797cbf43220a8619431f4737887db2fa35419a925907691ac1aec5b3cc1660179d4ac5e44714540ae591c5aa4957db1f26068a7e SHA512 353a5c95bb0c160b698b95b91d6857ddb63a75b0685a233ed2515f46ad8369d40857aa1ff8407aa9bc78a5c3c29c25376e7a55a3c96fce40840633411944fb1d
DIST libressl-3.1.2.tar.gz 3765944 BLAKE2B b0181a1936af3aad3908668cae14aa87e8dca594ebb1effa354eb57529c21aca2052ce6bc85958dd83645c9026c84410939018d16c8e70a60f336145d45790e6 SHA512 b024c5661777daa73feff7085ce7be76a2e766d2f3cb5ca35c208c471e5651a365252758ca36782e20cdfb2bc8171919a08ad592420878a5c95fbe646f5288c8
+DIST libressl-3.1.3.tar.gz 3766345 BLAKE2B 4956fa0ae6030e9e9969d584db3bc0084c4b155207d1472ebfa40c8e68e925214b66ed1bc7e32d98a9a48de0b61909323a0380a973c724422c92bfe88b9fdfb2 SHA512 f9f497fe5d09b8b762175da038a8e67d9d2567462fefc49e434d306a3071ba3a4d369c89143d9d90e3bbcc7b9ba051c9c923a0dfc41d856edc08ae59fa727ee8
DIST libressl-3.2.0.tar.gz 3775925 BLAKE2B 99d74fad16e272be8e3b23b873c35970ce3693e088baf365670ad8e8cbb846e90f4232bbc6c65b70a35060da99b9b210b3debce1c78d531e810de26e3e2f05cb SHA512 e8bf95af4e4e855b0462eb12df8f802102a3bee5bb40fb1859e7c40d9e3ce89f0d2eb0acdd923e7c592b4aeb7ecc556f753c0a12d0dace05d2ef342bffdd9d07
EBUILD libressl-2.6.5.ebuild 1478 BLAKE2B 44e283811242efc54261ad1ab9a6241e3dba2217093b3226084fd143fa9ae30a127833a774cd725608690c720b97fed3e2c00ae92ac109295b485e6e63fd8564 SHA512 ea00fe358ce009a9e916897ffaf949c3c709455f5f69c5517845f2413a5e7559f2e1c717a941ef43e1776f334123cddcc730537428c63e38c7edf7e4fe3a972d
EBUILD libressl-2.8.3.ebuild 1572 BLAKE2B aaeecb5de2282cc7ed5f925a7930abcbdaaa2528e26a7972e070667edb22ae0415a4fc42d639fda455cc25746653a3954b03688075355082d77a080dadc48513 SHA512 bbf59b1952b1892b56df2199613baea4f4bcf85c7b1bbdd25a6a4ed7ba6f645172b20ebfdad8c1cc63c7669f68fd423581677dede98bb9838a14393b6f9c701b
@@ -14,5 +15,6 @@ EBUILD libressl-2.9.2.ebuild 1742 BLAKE2B 3ba8f8b51b4b89515c6dadfb4b5975b1d683b0
EBUILD libressl-3.0.2.ebuild 1700 BLAKE2B 7e504f9f0cd914d6f6377df8a6ee579bc425645fcb86c679d94747aed2d0d35b88e1409fff4ca07f1bb3c002357e1bc6d591c2fa880ec71961987f9af8691990 SHA512 e562c9f2045fc553999e8afbf226c059ec99f96948559a6438f2d147ecf9452ec1c88bcd2303433e7a6c038301d96413ed916df6db03029717d6e50e65cf2bbe
EBUILD libressl-3.1.1.ebuild 1706 BLAKE2B 5ce07e1a9288f5f08df63198eec6b6e88b96c3648d3d4f6c98772a14f76d62e7add706d950386cf58f3c6439f5453ffa3dd4441efc3b4ff1c9b8fa7792c19aff SHA512 bd7e013012d0cab433ede6dcf10d3ae135b85bbaec33dae33a7ec1ca94e02493f4c31a667285b3160208be30ce92788515537efc690e98dc13332631a4c4a539
EBUILD libressl-3.1.2.ebuild 1704 BLAKE2B 5ac0555b7d9418b31d785ab6af057f9cfaa241b687adaa43b0c01ab0f347f69d46127443fe92e9340909fdc4b7326914de2970610d807b23b44e8a96eace48fe SHA512 0aa0400c9a672ab615675cf4694338f5c82b0b9034c9d3321f1880ccf2dfd02bd28ec08939b09d37d55ebecb980e1ad016ecce25ff5fba989dbafc5a19b8d5ac
+EBUILD libressl-3.1.3.ebuild 1704 BLAKE2B 5ac0555b7d9418b31d785ab6af057f9cfaa241b687adaa43b0c01ab0f347f69d46127443fe92e9340909fdc4b7326914de2970610d807b23b44e8a96eace48fe SHA512 0aa0400c9a672ab615675cf4694338f5c82b0b9034c9d3321f1880ccf2dfd02bd28ec08939b09d37d55ebecb980e1ad016ecce25ff5fba989dbafc5a19b8d5ac
EBUILD libressl-3.2.0.ebuild 1704 BLAKE2B 5ac0555b7d9418b31d785ab6af057f9cfaa241b687adaa43b0c01ab0f347f69d46127443fe92e9340909fdc4b7326914de2970610d807b23b44e8a96eace48fe SHA512 0aa0400c9a672ab615675cf4694338f5c82b0b9034c9d3321f1880ccf2dfd02bd28ec08939b09d37d55ebecb980e1ad016ecce25ff5fba989dbafc5a19b8d5ac
MISC metadata.xml 986 BLAKE2B 1c3f46d2694b17352ec02e1f2c331aae79c677ea638ed6290c51076961ac81f1b472576000fc162115f0ea1f037ac1c6ed0ea80c4603ef6a283e0ac4915fadad SHA512 bd38bf852aebe8dbac58fa324524f2fbbc0da5d22a673f5fa83dafeeee599f4022a46687d10f3d159b0953a0d4b0f1ea88156f7d04c2f1db864569dd29f3e4fe
diff --git a/dev-libs/libressl/libressl-3.1.3.ebuild b/dev-libs/libressl/libressl-3.1.3.ebuild
new file mode 100644
index 000000000000..ab31f2041689
--- /dev/null
+++ b/dev-libs/libressl/libressl-3.1.3.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal libtool
+
+DESCRIPTION="Free version of the SSL/TLS protocol forked from OpenSSL"
+HOMEPAGE="https://www.libressl.org/"
+SRC_URI="https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/${P}.tar.gz"
+
+LICENSE="ISC openssl"
+# Reflects ABI of libcrypto.so and libssl.so. Since these can differ,
+# we'll try to use the max of either. However, if either change between
+# versions, we have to change the subslot to trigger rebuild of consumers.
+SLOT="0/48"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+asm static-libs test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="test? ( static-libs )"
+
+RDEPEND="!dev-libs/openssl:0"
+DEPEND="${RDEPEND}"
+PDEPEND="app-misc/ca-certificates"
+
+src_prepare() {
+ touch crypto/Makefile.in
+
+ sed -i \
+ -e '/^[ \t]*CFLAGS=/s#-g ##' \
+ -e '/^[ \t]*CFLAGS=/s#-g"#"#' \
+ -e '/^[ \t]*CFLAGS=/s#-O2 ##' \
+ -e '/^[ \t]*CFLAGS=/s#-O2"#"#' \
+ -e '/^[ \t]*USER_CFLAGS=/s#-O2 ##' \
+ -e '/^[ \t]*USER_CFLAGS=/s#-O2"#"#' \
+ configure || die "fixing CFLAGS failed"
+
+ if ! use test ; then
+ sed -i \
+ -e '/^[ \t]*SUBDIRS =/s#tests##' \
+ Makefile.in || die "Removing tests failed"
+ fi
+
+ eapply "${FILESDIR}"/${PN}-2.8.3-solaris10.patch
+ eapply_user
+
+ elibtoolize # for Solaris
+}
+
+multilib_src_configure() {
+ ECONF_SOURCE="${S}" econf \
+ $(use_enable asm) \
+ $(use_enable static-libs static)
+}
+
+multilib_src_test() {
+ emake check
+}
+
+multilib_src_install_all() {
+ einstalldocs
+ find "${D}" -name '*.la' -exec rm -f {} + || die
+}
diff --git a/dev-libs/libtasn1/Manifest b/dev-libs/libtasn1/Manifest
index 64ed6268beb2..1022ba9e54a7 100644
--- a/dev-libs/libtasn1/Manifest
+++ b/dev-libs/libtasn1/Manifest
@@ -4,5 +4,5 @@ DIST libtasn1-4.15.0.tar.gz 1800713 BLAKE2B 005a36bfdd89a167d469ef834c00d8b89e0f
DIST libtasn1-4.16.0.tar.gz 1812442 BLAKE2B 1a79494da959808d1b05099409cab70a08bf8be039f32c2e487ec8cee240d92aca9a3ec137721bac3bfe1ecd59334f4f31e0e0c25c6f06ee850af69842c0fefc SHA512 b356249535d5d592f9b59de39d21e26dd0f3f00ea47c9cef292cdd878042ea41ecbb7c8d2f02ac5839f5210092fe92a25acd343260ddf644887b031b167c2e71
EBUILD libtasn1-4.13.ebuild 1173 BLAKE2B 0715dd2dec11dfaea74029ce4f62608a97d4cce9c9d1c4c0b10b625253fb2786218bbd995d98ff5f40f353bf253bb076532942bb0fef88a0fee3ccc387b05b80 SHA512 1440fda2d96e1c32d4b5db6fa51fbdf7ee1eee7c8bd7286d107fc531995579019935b4673a7828a8a91099733da4d729450e6b090a0e9ab61a941803a2f8903f
EBUILD libtasn1-4.15.0-r1.ebuild 1292 BLAKE2B 7f81943f76e268b07fa0b7a67c172ecb189bcac495cce264dfd4d06d95703c7ece32fcb79c44f85f3bc8def69ae6db2ca2542121ad6c80620ea2d8f5c88ea19e SHA512 887889bd3f60a449578ca1b81e4a4ea4059d9ec09b13aa05004c2ef93c8806587619a5b42436992a6db1ed7938d1c0ef9ce77b6e04b0fb2444e68e3622fa5bf1
-EBUILD libtasn1-4.16.0.ebuild 1226 BLAKE2B 55f601d9db3a60051ca2c54682575e836e47c73d1e9f56f85cec60cf16d8f8edeed537c4e56e782e12471d74c3c76cf4eb415799880609654f1fce0513318818 SHA512 e0e1398fba5fb956cf9726c925e227c5b4694c9409b5eded4c0b1dd444b13cb1c94584cbe58607b0a26e1cbbc96b96773a4d01519e8b2b28d82f0eea9d597a23
+EBUILD libtasn1-4.16.0.ebuild 1225 BLAKE2B dbc16ae2dc34ba5601326022f6605b67c003d3108385bf577623b606168c4bc7a8bfbc923e36816fc9acdd76c266032f06566e09782a180882439fcccd621552 SHA512 acf48ece78f2c9a1e00e465253a00de29ab35eeaea3f8a0e3fd8d4f1c187051fb589165e5049a5821f157e2d23a12ac4425301b65facb8a0a8c2a7dab9e69b3b
MISC metadata.xml 445 BLAKE2B 9b3976fd78a81ceda730e46f0c5f74ac3f24744bf5503ffdcc8ad617133b643fd535dc7decd0f5060bbf77e0e3307f501d6355daa4e07d32f98532a0407c5aba SHA512 9eed39ede450d1598c75c1ebc487e5520f6cd8e1819a14b4d448502b380ccd0a7dc1510be8887cedd4b94add0e24700b84a588544bfcc29dea5d55b12c7aa556
diff --git a/dev-libs/libtasn1/libtasn1-4.16.0.ebuild b/dev-libs/libtasn1/libtasn1-4.16.0.ebuild
index 047b616a8cf3..b77d19fe1f2a 100644
--- a/dev-libs/libtasn1/libtasn1-4.16.0.ebuild
+++ b/dev-libs/libtasn1/libtasn1-4.16.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
LICENSE="GPL-3 LGPL-2.1"
SLOT="0/6" # subslot = libtasn1 soname version
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc static-libs test valgrind"
RESTRICT="!test? ( test )"
diff --git a/dev-libs/libucl/Manifest b/dev-libs/libucl/Manifest
index 19fd855c5175..233f44313971 100644
--- a/dev-libs/libucl/Manifest
+++ b/dev-libs/libucl/Manifest
@@ -1,4 +1,4 @@
DIST libucl-0.8.1.tar.gz 2028394 BLAKE2B 18fda317b4b4aed3d6b72c599d191f141bf4722d1c08244deda9c5e77300e2bef7de029889a05d9b4573472928d9d49a797123ac392a4cdd3b690ac277ad673d SHA512 36a059561eadb2dd7253ca22ff56f6a0c6cdd28580e28451c0cf47e1aec321a2e1589fc83ccb2033346f2dbca31a7e6afa9666ea544a0c190b7f80ed0e9f45af
-EBUILD libucl-0.8.1.ebuild 1090 BLAKE2B 2b90c1400c283d42860ee868b4373c7b36bbe79afc187bfb5dd94a4500cf68a2c12485731239e6ff1d75ebb741455a3dcf4a78f09f3de9335a7089e5461f9548 SHA512 167005e215f4ea4335f410cc0ca6c0c60212ad35162e06c8d0fb5cf4e6fdc4aae389458a952e48e04cfd8b3de9ea7cb5944d1639127d16a8e6651b8b0d27906c
-EBUILD libucl-9999.ebuild 1090 BLAKE2B 2b90c1400c283d42860ee868b4373c7b36bbe79afc187bfb5dd94a4500cf68a2c12485731239e6ff1d75ebb741455a3dcf4a78f09f3de9335a7089e5461f9548 SHA512 167005e215f4ea4335f410cc0ca6c0c60212ad35162e06c8d0fb5cf4e6fdc4aae389458a952e48e04cfd8b3de9ea7cb5944d1639127d16a8e6651b8b0d27906c
+EBUILD libucl-0.8.1-r1.ebuild 1185 BLAKE2B 3c2e9a61874b7dfa95764572619e8d6500a71fea3c6b6af7a77dc9eeebf5d4808e0c90e7c54c4197b8ac6fe75c9afc3e75976b188df498d8ba77f3abbf0d672a SHA512 18dc8023dcce33b585b18a8fb1e365fe84e9faa384a66b6a328a0fda493ba433578a013e2bdc81533be47822191b3f394fed5bd6b2a01e7300cb5cb695b4d7f2
+EBUILD libucl-9999.ebuild 1185 BLAKE2B 3c2e9a61874b7dfa95764572619e8d6500a71fea3c6b6af7a77dc9eeebf5d4808e0c90e7c54c4197b8ac6fe75c9afc3e75976b188df498d8ba77f3abbf0d672a SHA512 18dc8023dcce33b585b18a8fb1e365fe84e9faa384a66b6a328a0fda493ba433578a013e2bdc81533be47822191b3f394fed5bd6b2a01e7300cb5cb695b4d7f2
MISC metadata.xml 955 BLAKE2B 9bcc770371005f7b55c644a987e100572fc6c044ca38a862c817c1fd135864f1ffeb38b3a053a66bb1819ef0dd38f3a27432152779349f7b2af9528448ecfada SHA512 7742b29ef3cd909660e795a35859924f449dc18000ebdfc414e7620b9bf900112dde4ea053648b9490f45a56972a357c5a9645afcdc04211cfb4c3354fd1b8df
diff --git a/dev-libs/libucl/libucl-0.8.1.ebuild b/dev-libs/libucl/libucl-0.8.1-r1.ebuild
index a019e11cbc80..3a7e1f46c4f3 100644
--- a/dev-libs/libucl/libucl-0.8.1.ebuild
+++ b/dev-libs/libucl/libucl-0.8.1-r1.ebuild
@@ -19,7 +19,7 @@ fi
LICENSE="BSD-2"
SLOT="0"
-IUSE="lua +regex sign urls +utils static"
+IUSE="lua +regex sign urls +utils static-libs"
DEPEND="!!dev-libs/ucl
lua? ( >=dev-lang/lua-5.1:= )
@@ -53,5 +53,8 @@ src_install() {
default
DOCS+=( $(usex lua "doc/lua_api.md" "") )
einstalldocs
- use static || find "${ED}" -name "*.la" -delete
+ if ! use static-libs; then
+ find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || \
+ die "error while deleting static library"
+ fi
}
diff --git a/dev-libs/libucl/libucl-9999.ebuild b/dev-libs/libucl/libucl-9999.ebuild
index a019e11cbc80..3a7e1f46c4f3 100644
--- a/dev-libs/libucl/libucl-9999.ebuild
+++ b/dev-libs/libucl/libucl-9999.ebuild
@@ -19,7 +19,7 @@ fi
LICENSE="BSD-2"
SLOT="0"
-IUSE="lua +regex sign urls +utils static"
+IUSE="lua +regex sign urls +utils static-libs"
DEPEND="!!dev-libs/ucl
lua? ( >=dev-lang/lua-5.1:= )
@@ -53,5 +53,8 @@ src_install() {
default
DOCS+=( $(usex lua "doc/lua_api.md" "") )
einstalldocs
- use static || find "${ED}" -name "*.la" -delete
+ if ! use static-libs; then
+ find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || \
+ die "error while deleting static library"
+ fi
}
diff --git a/dev-libs/libuv/Manifest b/dev-libs/libuv/Manifest
index a57450485c9a..3adb7b5c6b93 100644
--- a/dev-libs/libuv/Manifest
+++ b/dev-libs/libuv/Manifest
@@ -1,8 +1,8 @@
DIST libuv-1.35.0.tar.gz 1253950 BLAKE2B 81ed766d0ca6fc0f8d2ed0b530b9a43104a2f985f86974a30b2d0abe08327cfeb7dfdd7c5b31619fbfcd8f9ca2e03987e16856d8abfef8b9eb9afa7f8c7b0b27 SHA512 a05bfd7cab6ae74022e7120a48772a6594522fb5bc467c8c05eb4809d7c78b68fa4843d86e2e34a68d439767a27dbc49f3b1dcbc8df85bec64471c1b459989c3
DIST libuv-1.37.0.tar.gz 1249701 BLAKE2B 4c48e2062eaaa259623908db99e3ca4b63f27dcbae097b05af542b32860d79aa5aaf5b388c48902a1927b9c4ad6e88b1c2dc2c052815e1321c3e17932c7f09c6 SHA512 ae0d864f5455696507b3a7680170d26e0e333aaeeb74dc2647fc9774a89912ba8ac2be056dbd5cd2b0224ec36ef7bb223fbc851a77302be82c531f8ea01545e0
DIST libuv-1.38.0.tar.gz 1261216 BLAKE2B 837a98e176878e81a9dbe10ee178fa1f738c406eb765308017cc3507ba8343ffbb0c09a68dd1376c855e5c0eb938196ab477aeef764219b64f1999468cadf72b SHA512 da9af33ec17f46f2390661f84e942115c442e665cb63ba5637eb12d2cb0b034889e0d816f261abe7fff3b4d0b44ab8bb63c81f3ec1917325cf0ca93e01921641
-EBUILD libuv-1.35.0.ebuild 1238 BLAKE2B c87031d7cecb688e0a6d6a2ababb0ae63758f8b3b9be8dbb4e49795a9157c29cd9bd850b8316718ec348672736a84fd51c75c0c0d3be2932aa38676741a3d8de SHA512 ef1451af4f77819ff7afb6f9edbe9d4116a9a3efaaf16ce531efd70ef36a6bb7278ee3be6e44742270169de6a301252985ac4e91ca29deaf53d1a1c2d0785dcb
-EBUILD libuv-1.37.0.ebuild 1238 BLAKE2B c87031d7cecb688e0a6d6a2ababb0ae63758f8b3b9be8dbb4e49795a9157c29cd9bd850b8316718ec348672736a84fd51c75c0c0d3be2932aa38676741a3d8de SHA512 ef1451af4f77819ff7afb6f9edbe9d4116a9a3efaaf16ce531efd70ef36a6bb7278ee3be6e44742270169de6a301252985ac4e91ca29deaf53d1a1c2d0785dcb
-EBUILD libuv-1.38.0-r1.ebuild 1251 BLAKE2B 55d182222a48ba675170c69c76f9487906c34900b4f7c7183e1942498e971c2438a00a96da9afec6c7f9acbe51208a2caf0c2f0d32a1eacb1951b31f4533b9fe SHA512 042316c0a9964960c817a58fe5450aa324e286dacb6187a50b046b8d3c597a72d5cde263de59bff5dc7855a07ba3bb0c48eb683cf55b2e48bfcf2145d91f0e49
-EBUILD libuv-9999.ebuild 1020 BLAKE2B ac28f13aeffef3d784808698662178c705aaf99e5cd9b18ea17082109126719378fcaa61bbec13c71b3d832958d0750ea4476d2933db7ed16ef5130552f7bb39 SHA512 2130b102ea6e192b320b87b2ca5ae3d9eaecf000bd7e7d420c97d60f60fc9cb5809f415246c3e209a4afae4fb4919f371ab34a90dbbc79c0b3b47da00d8ca4bc
+EBUILD libuv-1.35.0.ebuild 1218 BLAKE2B 6ba8895dd19c83b5721e075b13ccca6d46cf9a865238be1371ba2808865636eb5b8b15ba4a095c1ff9f2c3fb40bea59bb9f6b3505125a12f0309ebae15f583f9 SHA512 d655d1ae4865f61998b70de2de05bebed3a25b93a3db410c38423974424e44dfc659c64e3a39170b4a62552f25e4c0a76d67a424dbcdc29b1ae2e4414410b154
+EBUILD libuv-1.37.0.ebuild 1218 BLAKE2B 6ba8895dd19c83b5721e075b13ccca6d46cf9a865238be1371ba2808865636eb5b8b15ba4a095c1ff9f2c3fb40bea59bb9f6b3505125a12f0309ebae15f583f9 SHA512 d655d1ae4865f61998b70de2de05bebed3a25b93a3db410c38423974424e44dfc659c64e3a39170b4a62552f25e4c0a76d67a424dbcdc29b1ae2e4414410b154
+EBUILD libuv-1.38.0-r1.ebuild 1231 BLAKE2B 07bbc6b09e38c9afb4fa929b74b636905c6e4eccaa14a594d68ff189f3523a4c5e1e0bc14c4244e21d95f49e8943a24d88ab9e818ee78ce0b3bff4f8b532ec2f SHA512 ec0b799dd24416c8b70112f745ac2604010f9f809d8dc385341aaf1ef825eecf111bfec1ab68372428a71e85b5973549bd5128ef6d256a8279b36d08a3343c37
+EBUILD libuv-9999.ebuild 1000 BLAKE2B 39cca04aa13e367adbbe3aaab32e0eb2edd1d7966b6f81ea5a8b7772fb6e590aebb06da9ede6782ce9e4806737251d970992f2c4d56726469b11815ed58ee3e4 SHA512 170a10be4f9b177894113114b28f3932836a943a29dfe8c2ea12213421ea96c0d66b65039fa3ad60a208a30786ead3faabeda532433e741bb6d8f7b44f9dc21e
MISC metadata.xml 1392 BLAKE2B e4e8980feed751a6ddc0284d1bc0e56635707adad5ccedea3a78c9a22b0ef700f7554a62d7edc5a2d824dfd66036937e9056bd9db7cd302c5028469bbebbd3e9 SHA512 d2d709b7c1cfa4d83957365d62bf7fb95e1948129f499a907718228c067d871212c9b16f8272f000db92aad8eeb35505dd50a08357b8ae07dbbc9a4fe8534b3b
diff --git a/dev-libs/libuv/libuv-1.35.0.ebuild b/dev-libs/libuv/libuv-1.35.0.ebuild
index 351c2d1a3317..28641ca34383 100644
--- a/dev-libs/libuv/libuv-1.35.0.ebuild
+++ b/dev-libs/libuv/libuv-1.35.0.ebuild
@@ -15,7 +15,7 @@ IUSE="static-libs"
RESTRICT="test"
DEPEND="sys-devel/libtool
- virtual/pkgconfig[${MULTILIB_USEDEP}]"
+ virtual/pkgconfig"
src_prepare() {
default
diff --git a/dev-libs/libuv/libuv-1.37.0.ebuild b/dev-libs/libuv/libuv-1.37.0.ebuild
index 351c2d1a3317..28641ca34383 100644
--- a/dev-libs/libuv/libuv-1.37.0.ebuild
+++ b/dev-libs/libuv/libuv-1.37.0.ebuild
@@ -15,7 +15,7 @@ IUSE="static-libs"
RESTRICT="test"
DEPEND="sys-devel/libtool
- virtual/pkgconfig[${MULTILIB_USEDEP}]"
+ virtual/pkgconfig"
src_prepare() {
default
diff --git a/dev-libs/libuv/libuv-1.38.0-r1.ebuild b/dev-libs/libuv/libuv-1.38.0-r1.ebuild
index a1c26f2a3fdb..a9a8ca340c4c 100644
--- a/dev-libs/libuv/libuv-1.38.0-r1.ebuild
+++ b/dev-libs/libuv/libuv-1.38.0-r1.ebuild
@@ -16,7 +16,7 @@ RESTRICT="test"
BDEPEND="
sys-devel/libtool
- virtual/pkgconfig[${MULTILIB_USEDEP}]
+ virtual/pkgconfig
"
src_prepare() {
diff --git a/dev-libs/libuv/libuv-9999.ebuild b/dev-libs/libuv/libuv-9999.ebuild
index 20c92f0e53d8..6d626d10b334 100644
--- a/dev-libs/libuv/libuv-9999.ebuild
+++ b/dev-libs/libuv/libuv-9999.ebuild
@@ -16,7 +16,7 @@ RESTRICT="test"
BDEPEND="
sys-devel/libtool
- virtual/pkgconfig[${MULTILIB_USEDEP}]
+ virtual/pkgconfig
"
src_prepare() {
diff --git a/dev-libs/libwapcaplet/Manifest b/dev-libs/libwapcaplet/Manifest
index 72611db307e9..f6053ada946e 100644
--- a/dev-libs/libwapcaplet/Manifest
+++ b/dev-libs/libwapcaplet/Manifest
@@ -1,6 +1,8 @@
AUX libwapcaplet-0.4.1-makefile.patch 391 BLAKE2B 0536fdc5fd0e8bca72b0fc33198eba058cefc253d9e6ca112e2d7d0cdfb082a024c739e101eec03470319ce766694507d6d4ed2cd3b1810242c5313e8b3af5ad SHA512 62d0e6b7a5ec8c5e5c695933a886002bf81c5ac73e2f47917d9942932045cf66f5023eac039e21b8cf915a145dba2d3c12da4a85e9ae1a7340e522f36bdc3157
DIST libwapcaplet-0.4.1-src.tar.gz 31448 BLAKE2B a686a357dc84135da902380de17b0f8415a682cdb258ea0a8f7899581d23f6fef3aa1600e2657aa728b5689a8fa31a3fe489a7ce8a339adf958c3c25f6151a04 SHA512 49efb958ee79e932916a956844970780723cc71b4b2e5f442507566b2d632cc17c67d984018b48ae31a9bd7d92797766e39110dec02937b45ead26523e8cc2e1
DIST libwapcaplet-0.4.2-src.tar.gz 31492 BLAKE2B 1c3b74a15fddf895ac63c15302737915fcbff89d83e990d779d2874778d00c3ec453a7bf0e362f942216c68a3e006c6318ace83164c49cafede73af1ae7a2808 SHA512 296a5f4471366b58089632c10943c0a1c1da8bd3b54231f2204b1159052b5bd5f45769fb2e12e438a29bf39aeea9719773d0b38fbf40fce193c2fb4f0f70ab09
+DIST libwapcaplet-0.4.3-src.tar.gz 31766 BLAKE2B 7a51b27911192b0697d6eebe9e98abf720a76daa0e0ce0eb6148186e21e36d3b1853d3b24c8fa325ecaa4ed69d8262a9282ef77ba028d316dd16a225a6766d64 SHA512 b4cc8b0dac86c87b1806acfcf5c4734955eb797cb04ea67f764bae32fdecfd3ee4d8ad0f2f3f0a1813c9684b7120dbb97ecf11f29de0d60a7bd45d96c1a451cb
EBUILD libwapcaplet-0.4.1-r1.ebuild 867 BLAKE2B 98fb4ed30894cf7d52563e632a391d432351e2094dc9b06e8463a5a9205ec7c20caed14c27a2b114f7fb3ce25cb4470154dffe9cc11eb2293994520c2ced9b6e SHA512 15b7ba560f2c305eb77616bf7f16ac6c9d55d5e520e4ba9222723960cdc79b3a51ef8ac0341e782fd56d0289597576e9b885232357dba021dd2db7ab8e536b91
EBUILD libwapcaplet-0.4.2.ebuild 879 BLAKE2B 2ede4e264670db8f439b9670bc818cf7ec45d8c4d67cfe6e63832450c3f9dc618cec5fc1e32445dda8255704697e4d486295d606475634b8b2166f2fef7367b2 SHA512 7da40ed15625bc1de1a1d7fb56ac3cb1bd5759ee629e118d9b769466c9ecf1532a53ef7d8c9a62f908ab3a30051ea1bad8c945f40fb9b4ede5ffd73c9613f6fd
+EBUILD libwapcaplet-0.4.3.ebuild 878 BLAKE2B fe8f1ac79389d38d8447359187bab4f46963fafa629cb2eda5fc5a2f121564d211ad55fb31d1c4882b6395c4cd9c780918fe356be78c1bd68dc3750a09ae0a39 SHA512 72c0a0f0b04efe6aa9279f9d0e79b2ded5ed9101016cc9ab96696df84b2664b9806035c237c93800ecea65c7c05a960df4b9f077b6215b47c64fcb774015b8e6
MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-libs/libwapcaplet/libwapcaplet-0.4.3.ebuild b/dev-libs/libwapcaplet/libwapcaplet-0.4.3.ebuild
new file mode 100644
index 000000000000..8b442d55ff3a
--- /dev/null
+++ b/dev-libs/libwapcaplet/libwapcaplet-0.4.3.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="string internment library, written in C"
+HOMEPAGE="http://www.netsurf-browser.org/projects/libwapcaplet/"
+SRC_URI="https://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~m68k-mint"
+IUSE="test"
+
+RESTRICT="!test? ( test )"
+
+DEPEND="
+ test? ( >=dev-libs/check-0.9.11 )"
+BDEPEND="
+ >=dev-util/netsurf-buildsystem-1.7-r1"
+
+PATCHES=(
+ # bug 664288
+ "${FILESDIR}/${PN}-0.4.1-makefile.patch"
+)
+
+_emake() {
+ source /usr/share/netsurf-buildsystem/gentoo-helpers.sh
+ netsurf_define_makeconf
+ emake "${NETSURF_MAKECONF[@]}" COMPONENT_TYPE=lib-shared $@
+}
+
+src_compile() {
+ _emake
+}
+
+src_test() {
+ _emake test
+}
+
+src_install() {
+ _emake DESTDIR="${D}" install
+}
diff --git a/dev-libs/libxls/Manifest b/dev-libs/libxls/Manifest
index 795b0d9b61db..892a58861050 100644
--- a/dev-libs/libxls/Manifest
+++ b/dev-libs/libxls/Manifest
@@ -1,4 +1,6 @@
AUX libxls-1.4.0-asprintf.patch 190 BLAKE2B 36c39cce45025c5498fefae2de5f9fb78f377463b4a761ef1abe89d8194b90b798e03dfa82561bc7cecd505abbdd5412b75b05194991257c600e4bbb307167b1 SHA512 c5881d63742b50f923c74dcedb5d2149bb55ea19bc611ba51c879f9ae82b8f87d9ab477fae57ef40814bea42f27a27d3be272b1c9fbd5e6c04d69078c8e7c03d
DIST libxls-1.5.2.tar.gz 443227 BLAKE2B 3d12357e3c476b203ce7be76cfb828a0353732135303301f26880ca1607e9cf4a6781fafe7ebf4dae0914678de30168d80230dc0d83d189dca63c98d0cd54384 SHA512 83e443713944648d6bb5db03a03b3addff1d925a1c83c49e6bb9b29245da76ff351e6a76239e62c92400e5d513394a33366fb979d2bc0b0d8ed0cc7f024c5fc1
+DIST libxls-1.5.3.tar.gz 442217 BLAKE2B 4aab9acfaab96cb25e00ada599f607e5f448820d9cb32605ccd51454fd9f819c1426810f300fbf4a1c7523d5409d6f4fcb08e827c95775f3ec95bc65d7f8315a SHA512 75943e7bd3f1dbc28cc50ff7e4f21a9b6a9c97299c7594e0807b06e0bca9cca3d83f3e52086950422d67f175ae0c7c677222a1f716c5297e2f072b8e7b4fc52d
EBUILD libxls-1.5.2-r1.ebuild 678 BLAKE2B 1fc9837da9af845430a516f4e5d16ef9454efd0cfcf3c40ac2f1ec0aa39b462617ff7f30396423fe079361e51e832324601f494ad63164671290a1220e8cc1b7 SHA512 124f7124d89918534327cb2e2c9d245d1614fd7b1d052b315f4d875363c320cb3f0c0e460459dc4fb3a6fd5ee88d2e5c7739e507f9b8d5406b90cbd9b32e73c2
+EBUILD libxls-1.5.3.ebuild 680 BLAKE2B 604d03c136bc5b87f12de539cd7d152a3da05891bb0c2e07b5a4bdf5f514ea2121680735f5f00f43ca724b40b0787ca71c513da633ea2bcb59c46e9281a60663 SHA512 1a0080ca6cab45da31671bd4a9c9a1aa7d2d8cb6610eb5c0512fa28fb67303f3485636cb81cafe7017bbf74922fc8201484d92fc6e450953263c7875802586d6
MISC metadata.xml 392 BLAKE2B 77f7b66d8024437b9a7b2b07bb78f451fccc5636629e284d053be66efa136982d026f28912c0a7b407059f8f5e33618ae15c83113f8bd380a168dcc1032f96bf SHA512 ccf08982c319c4e2c3fa94d1920f012207f35c75c445555312d20976612436d21bfa1cf93cf6014697a0210fd549146ea0f3eb73fbeee45d09d15952286fe3aa
diff --git a/dev-libs/libxls/libxls-1.5.3.ebuild b/dev-libs/libxls/libxls-1.5.3.ebuild
new file mode 100644
index 000000000000..6238aba02e32
--- /dev/null
+++ b/dev-libs/libxls/libxls-1.5.3.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils
+
+DESCRIPTION="A library which can read Excel (xls) files"
+HOMEPAGE="https://github.com/libxls/libxls"
+SRC_URI="https://github.com/libxls/libxls/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0/1" # libxlsreader.so.1
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND=""
+BDEPEND="
+ app-arch/unzip
+ virtual/pkgconfig
+"
+
+RESTRICT=test # test driver is missing
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.4.0-asprintf.patch
+)
+
+src_configure() {
+ econf \
+ --disable-static
+}
+
+src_install() {
+ default
+
+ find "${D}" -name '*.la' -type f -delete || die
+}
diff --git a/dev-libs/libxml2/Manifest b/dev-libs/libxml2/Manifest
index 2e15f2f51463..9e4423b9e084 100644
--- a/dev-libs/libxml2/Manifest
+++ b/dev-libs/libxml2/Manifest
@@ -7,6 +7,5 @@ DIST libxml2-2.9.9.tar.gz 5476717 BLAKE2B 00a67c38084f2effd5d68d7d3e68f0c96cf4f5
DIST xmlts20080827.tar.gz 638940 BLAKE2B c5aab959c6e0698acd5b9be82b48a8ac26f4d01cc03f9acfff20d344f97f4711fc6d4a524ae70457147e8e30c72e27b6726829e1dd21896286aa974ed60774e7 SHA512 7325d0977c4427fc4944b291ccf896a665f654cc24399e5565c12a849c2bc3aef4fa3ee42a09ac115abcb6570c51a8fbd052c38d64d164279ecdecad5a4e884d
DIST xsts-2002-01-16.tar.gz 6894439 BLAKE2B 1e9ec63d2c104655e64249e07440a04d862fcbcd4d4e19745d81b34994319b510a531c9d6df1491fae1e90b5d0764f0f1a827251ca8df5d613178b0eab01ef25 SHA512 43300af6d39c1e2221b0ed7318fe14c7464eeb6eb030ed1e22eb29b4ab17f014e2a4c8887c3a46ae5d243e3072da27f00f4e285498ae6f1288177d38d1108288
DIST xsts-2004-01-14.tar.gz 2761085 BLAKE2B 41545995fb3a65d053257c376c07d45ffd1041a433bfbdb46d4dd87a5afb60c18c8629a3d988323f9e7a1d709775b5a7e5930276a7121c0725a22705c0976e36 SHA512 32854388d7e720ad67156baf50bf2bae7bd878ca3e35fd7e44e57cad3f434f69d56bbbedd61509f8a1faf01c9eae74a078df8fe130780b182c05c05cb1c39ebe
-EBUILD libxml2-2.9.9-r2.ebuild 6824 BLAKE2B 766a7558e17dcc863a1062dfc68e753330e9fbb552c9cab218f74fa11a2b1e948728244526d0046225e25d42d71edab681fded5966dc0c3b4eb3e7a707957ec0 SHA512 5f0b88190d0ce32a02149191ffba52b9f4286a7139305c652861b8e3f4f4306607597bf4f83cdb1941665ed610f8504f026827903670227ab3cfee932207aa21
EBUILD libxml2-2.9.9-r3.ebuild 6943 BLAKE2B cfc351f4626fb77dec2032e57385fe0800d8ea79c5a776efb31549b7d7a1af9822762ae463bf08982988d740e693eeb4139c117e4a8dcb0b71bdb7dd1d8c3574 SHA512 be36f698c42bffd8d153806bef4e2820e5f8f0245abe4c5547986fab64067d3282227dccf16d7d1e475572abb952b1f57f16a4a311e18071a31a1bf4d7fbd7b4
MISC metadata.xml 347 BLAKE2B 0593bb4362c2ed60dbe07c41872832992f9b993a4c155cddf82ce362f1ddd4c8eb9fa00e5b4457e9a24b22b697d92ef55dde231918fa0e6bdac0a736fce37f66 SHA512 6a094316da6ea1fb160b539788923a2dc01d7ef6304f924f628a438714663a51c8d1adaa97800516a64055a8adf6999ae2899b5a976db680967dcc298e22444d
diff --git a/dev-libs/libxml2/libxml2-2.9.9-r2.ebuild b/dev-libs/libxml2/libxml2-2.9.9-r2.ebuild
deleted file mode 100644
index 8897fe18e5b3..000000000000
--- a/dev-libs/libxml2/libxml2-2.9.9-r2.ebuild
+++ /dev/null
@@ -1,224 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
-PYTHON_REQ_USE="xml"
-
-inherit libtool flag-o-matic python-r1 autotools prefix multilib-minimal
-
-DESCRIPTION="XML C parser and toolkit"
-HOMEPAGE="http://www.xmlsoft.org/"
-
-LICENSE="MIT"
-SLOT="2"
-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 ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug examples icu ipv6 lzma +python readline static-libs test"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-RESTRICT="!test? ( test )"
-
-XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite"
-XSTS_NAME_1="xmlschema2002-01-16"
-XSTS_NAME_2="xmlschema2004-01-14"
-XSTS_TARBALL_1="xsts-2002-01-16.tar.gz"
-XSTS_TARBALL_2="xsts-2004-01-14.tar.gz"
-XMLCONF_TARBALL="xmlts20080827.tar.gz"
-
-SRC_URI="ftp://xmlsoft.org/${PN}/${PN}-${PV/_rc/-rc}.tar.gz
- https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz
- test? (
- ${XSTS_HOME}/${XSTS_NAME_1}/${XSTS_TARBALL_1}
- ${XSTS_HOME}/${XSTS_NAME_2}/${XSTS_TARBALL_2}
- http://www.w3.org/XML/Test/${XMLCONF_TARBALL} )"
-
-RDEPEND="
- >=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]
- icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
- lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[${MULTILIB_USEDEP}] )
- python? ( ${PYTHON_DEPS} )
- readline? ( sys-libs/readline:= )
-"
-DEPEND="${RDEPEND}
- dev-util/gtk-doc-am
- virtual/pkgconfig
- hppa? ( >=sys-devel/binutils-2.15.92.0.2 )
-"
-
-S="${WORKDIR}/${PN}-${PV%_rc*}"
-
-MULTILIB_CHOST_TOOLS=(
- /usr/bin/xml2-config
-)
-
-src_unpack() {
- # ${A} isn't used to avoid unpacking of test tarballs into $WORKDIR,
- # as they are needed as tarballs in ${S}/xstc instead and not unpacked
- unpack ${P/_rc/-rc}.tar.gz
- unpack ${P}-patchset.tar.xz
- cd "${S}" || die
-
- if use test; then
- cp "${DISTDIR}/${XSTS_TARBALL_1}" \
- "${DISTDIR}/${XSTS_TARBALL_2}" \
- "${S}"/xstc/ \
- || die "Failed to install test tarballs"
- unpack ${XMLCONF_TARBALL}
- fi
-}
-
-src_prepare() {
- default
-
- DOCS=( AUTHORS ChangeLog NEWS README* TODO* )
-
- # Selective cherry-picks from master up to 2019-02-28 (commit 8161b463f5)
- eapply "${WORKDIR}"/patches
-
- # Patches needed for prefix support
- eapply "${FILESDIR}"/${PN}-2.7.1-catalog_path.patch
-
- eprefixify catalog.c xmlcatalog.c runtest.c xmllint.c
-
- # Fix build for Windows platform
- # https://bugzilla.gnome.org/show_bug.cgi?id=760456
- # eapply "${FILESDIR}"/${PN}-2.8.0_rc1-winnt.patch
-
- # Fix python detection, bug #567066
- # https://bugzilla.gnome.org/show_bug.cgi?id=760458
- eapply "${FILESDIR}"/${PN}-2.9.2-python-ABIFLAG.patch
-
- # Fix python tests when building out of tree #565576
- eapply "${FILESDIR}"/${PN}-2.9.8-out-of-tree-test.patch
-
- if [[ ${CHOST} == *-darwin* ]] ; then
- # Avoid final linking arguments for python modules
- sed -i -e '/PYTHON_LIBS/s/ldflags/libs/' configure.ac || die
- # gcc-apple doesn't grok -Wno-array-bounds
- sed -i -e 's/-Wno-array-bounds//' configure.ac || die
- fi
-
- # Please do not remove, as else we get references to PORTAGE_TMPDIR
- # in /usr/lib/python?.?/site-packages/libxml2mod.la among things.
- # We now need to run eautoreconf at the end to prevent maintainer mode.
-# elibtoolize
-# epunt_cxx # if we don't eautoreconf
-
- eautoreconf
-}
-
-multilib_src_configure() {
- # filter seemingly problematic CFLAGS (#26320)
- filter-flags -fprefetch-loop-arrays -funroll-loops
-
- # USE zlib support breaks gnome2
- # (libgnomeprint for instance fails to compile with
- # fresh install, and existing) - <azarah@gentoo.org> (22 Dec 2002).
-
- # The meaning of the 'debug' USE flag does not apply to the --with-debug
- # switch (enabling the libxml2 debug module). See bug #100898.
-
- # --with-mem-debug causes unusual segmentation faults (bug #105120).
-
- libxml2_configure() {
- ECONF_SOURCE="${S}" econf \
- --with-html-subdir=${PF}/html \
- $(use_with debug run-debug) \
- $(use_with icu) \
- $(use_with lzma) \
- $(use_enable ipv6) \
- $(use_enable static-libs static) \
- $(multilib_native_use_with readline) \
- $(multilib_native_use_with readline history) \
- "$@"
- }
-
- libxml2_py_configure() {
- mkdir -p "${BUILD_DIR}" || die # ensure python build dirs exist
- run_in_build_dir libxml2_configure \
- "--with-python=${EPYTHON}" \
- "--with-python-install-dir=$(python_get_sitedir)"
- # odd build system, also see bug #582130
- }
-
- libxml2_configure --without-python # build python bindings separately
-
- if multilib_is_native_abi && use python; then
- python_foreach_impl libxml2_py_configure
- fi
-}
-
-multilib_src_compile() {
- default
- if multilib_is_native_abi && use python; then
- local native_builddir=${BUILD_DIR}
- python_foreach_impl libxml2_py_emake top_builddir="${native_builddir}" all
- fi
-}
-
-multilib_src_test() {
- ln -s "${S}"/xmlconf || die
- emake check
- multilib_is_native_abi && use python && python_foreach_impl libxml2_py_emake test
-}
-
-multilib_src_install() {
- emake DESTDIR="${D}" \
- EXAMPLES_DIR="${EPREFIX}"/usr/share/doc/${PF}/examples install
-
- if multilib_is_native_abi && use python; then
- python_foreach_impl libxml2_py_emake \
- DESTDIR="${D}" \
- docsdir="${EPREFIX}"/usr/share/doc/${PF}/python \
- exampledir="${EPREFIX}"/usr/share/doc/${PF}/python/examples \
- install
- python_foreach_impl python_optimize
- fi
-}
-
-multilib_src_install_all() {
- # on windows, xmllint is installed by interix libxml2 in parent prefix.
- # this is the version to use. the native winnt version does not support
- # symlinks, which makes repoman fail if the portage tree is linked in
- # from another location (which is my default). -- mduft
- if [[ ${CHOST} == *-winnt* ]]; then
- rm -rf "${ED}"/usr/bin/xmllint
- rm -rf "${ED}"/usr/bin/xmlcatalog
- fi
-
- rm -rf "${ED}"/usr/share/doc/${P}
- einstalldocs
-
- if ! use examples; then
- rm -rf "${ED}"/usr/share/doc/${PF}/examples
- rm -rf "${ED}"/usr/share/doc/${PF}/python/examples
- fi
-
- find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
- # We don't want to do the xmlcatalog during stage1, as xmlcatalog will not
- # be in / and stage1 builds to ROOT=/tmp/stage1root. This fixes bug #208887.
- if [[ "${ROOT}" != "/" ]]; then
- elog "Skipping XML catalog creation for stage building (bug #208887)."
- else
- # need an XML catalog, so no-one writes to a non-existent one
- CATALOG="${EROOT}etc/xml/catalog"
-
- # we dont want to clobber an existing catalog though,
- # only ensure that one is there
- # <obz@gentoo.org>
- if [[ ! -e ${CATALOG} ]]; then
- [[ -d "${EROOT}etc/xml" ]] || mkdir -p "${EROOT}etc/xml"
- "${EPREFIX}"/usr/bin/xmlcatalog --create > "${CATALOG}"
- einfo "Created XML catalog in ${CATALOG}"
- fi
- fi
-}
-
-libxml2_py_emake() {
- pushd "${BUILD_DIR}/python" > /dev/null || die
- emake "$@"
- popd > /dev/null
-}
diff --git a/dev-libs/libxmlb/Manifest b/dev-libs/libxmlb/Manifest
index 91433de67939..b10d6719c8d4 100644
--- a/dev-libs/libxmlb/Manifest
+++ b/dev-libs/libxmlb/Manifest
@@ -3,5 +3,5 @@ DIST libxmlb-0.1.14.tar.gz 92388 BLAKE2B cf3057fadf87c866f456bb2eac773e056adba56
DIST libxmlb-0.1.15.tar.gz 92923 BLAKE2B 97b6af812397dd279e7e3c038627fcf8228cbfa5c3af91ceeb5361e32d37d357eda6a193f627a5f4442426fb08abca1ff11684fe199d9d3a4add72ca4f3f5d08 SHA512 58268b3a690af36c0923afdee3ae58e88bf778eebbc6a439be1bc85ed985efdc20cd7006c976586f7be87310dc091d67dddd370f4bbec58379fc4e7349bfa3d8
EBUILD libxmlb-0.1.12.ebuild 1226 BLAKE2B 2da2eb59aafd834aee0a69f64c1f9401d069b967554341158bd9af540f0c8c216bf2b2c4c0cabec3bb1936b21885d7444fe67509a8035bf313bb5b7efac0e013 SHA512 1507484678dc19da96ec68de1961075d0576b3d4c8d61dc5b913f1bdf0f836bac3185d029c36fa3c7deff9fc5a555a47d66ed95fe72d4bef8ebd2ab2bef4f87e
EBUILD libxmlb-0.1.14.ebuild 1230 BLAKE2B fb853faad52a0fc56df9a1c29b9b7ca927fb2d5e58a4706d0c1828582ae948f6e94b94a9d2258e49828aaed1c1147ab326e90b99373f7b1fee95ea804609ac48 SHA512 61592c1d5a9a6244f83351ff73197ac5860d989abc9472f6eb90661be8083f6a5d4c917bfabf49b98f1fb4686a94227b2da63100ec3f8b34fcd1c381b7e14add
-EBUILD libxmlb-0.1.15.ebuild 1230 BLAKE2B fb853faad52a0fc56df9a1c29b9b7ca927fb2d5e58a4706d0c1828582ae948f6e94b94a9d2258e49828aaed1c1147ab326e90b99373f7b1fee95ea804609ac48 SHA512 61592c1d5a9a6244f83351ff73197ac5860d989abc9472f6eb90661be8083f6a5d4c917bfabf49b98f1fb4686a94227b2da63100ec3f8b34fcd1c381b7e14add
+EBUILD libxmlb-0.1.15.ebuild 1229 BLAKE2B 71097dff1918f904fdd4d1c1b2e14460e2627b336331c0d4feaf9a3c539a29524ca4ebcabd0581a68d979b401cc0a51c7089c667afed73301120eff3c7efb66e SHA512 1a9b673af39bc96c49ba4aa9ebffd5dd4002dce29e95ecfb2b19c14b6deb278f5d45294f12bab264eec55bd53d996fef0dd6be0b9387f5bd34d2788decb118d7
MISC metadata.xml 423 BLAKE2B 4f6fce646b2b255484b20c506f3a192ddfe0748987d76b4010bbc4efb69db159acfd8dff07e851f6c009aa2afac24ed2b252b7ee2a817fb583b11924d9f865a2 SHA512 b1d47209f5bb217313f0a4f6b27d0c54e4968f010c066c95b6f2df889b0914a5eae7ef8758b965f69475a4c8ce955120d6f452db5060b5f1bd93d5ca7d87e8c9
diff --git a/dev-libs/libxmlb/libxmlb-0.1.15.ebuild b/dev-libs/libxmlb/libxmlb-0.1.15.ebuild
index 8ceaed57364c..845e8e45096d 100644
--- a/dev-libs/libxmlb/libxmlb-0.1.15.ebuild
+++ b/dev-libs/libxmlb/libxmlb-0.1.15.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/hughsie/libxmlb/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="LGPL-2.1+"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 x86"
IUSE="doc introspection stemmer test"
RESTRICT="!test? ( test )"
diff --git a/dev-libs/libzip/Manifest b/dev-libs/libzip/Manifest
index 4ed219cd6ebb..dfec52b04e32 100644
--- a/dev-libs/libzip/Manifest
+++ b/dev-libs/libzip/Manifest
@@ -1,5 +1,7 @@
DIST libzip-1.6.1.tar.xz 732932 BLAKE2B 6f63ecb56767b730e5c5639c01e3e050ed64d1c1508b11d4cd1c75e2834988e14140a5e49ba25454d77c40c59b101615a9e00823066a35eaca0519147a75f5e6 SHA512 dcf3790933c95f66bdcbdb276497b36e57776103b0b1064a94479e84eaa0a09df8dd91509cb4ccab3a6724f0650f076ca1e332d73acc94b653e99a3e94a64574
DIST libzip-1.7.0.tar.xz 737184 BLAKE2B 4442925b77ad336793ecc891e2c096c8b98457d193a5ebda239462ef5120b3e041b1882d56dc0c4c94d0f3c00e5117d04964af0a8827230f0dbf937a8b07a5fa SHA512 9c1632b4e0b4cfe22c5670d815bc8893d540226e3e64cf8cce7039a90bdc7048dedadb4804b151291e312c97bb384bd671e43021401c4c3e33a4e597972bc681
+DIST libzip-1.7.1.tar.xz 737496 BLAKE2B bd4c73bf317fa767ff0ea3c10b7f2e96699dc7ed7bd05fdaf3c5d477cd42aa18b40627569498697be1b5360d43471a9b8132909781f8bd32bda6f46534e4a61b SHA512 e924749274e5e45b83ba4bc961bfd299b9dd05829c1f42880a9814f942dbf7afe79aa1ea4e2b33d6db1dba1f7f948c0de40517f2ef90cc8725650b8cb88d9a14
EBUILD libzip-1.6.1-r1.ebuild 2288 BLAKE2B ac0aa25a70174fe99977e49f70beb4876a221e884411bc69fe8a4a570a9a207a2ca578c0064a1c22ea101cb8aab0e86907df5b629f2509230984cacd14aa4814 SHA512 2412dddca1bcbc6d3c5ab7550980f132ceec5d56bdcb3875a27feb539a3c648f522766fd68663d289ebfd41b8d31477751378b0e8c4371c08b437e9036f6fd71
EBUILD libzip-1.7.0.ebuild 2353 BLAKE2B 4a01907cd29bf76e40ee13fa8c6226179cb79f51593c46307f0daba1ef171d7be315d217fe7042c791b1fbf59fcf6115417b980f95d849ef74641d3d64236343 SHA512 6c8784276e8e16b9c0a6c732aaf445cc2be74628f818e5cdf50b8135bdd01f195cf62633aa3fc5259ed8b8b615dac2c457c110ef58c48bd38e1e915cda742cef
+EBUILD libzip-1.7.1.ebuild 2353 BLAKE2B 4a01907cd29bf76e40ee13fa8c6226179cb79f51593c46307f0daba1ef171d7be315d217fe7042c791b1fbf59fcf6115417b980f95d849ef74641d3d64236343 SHA512 6c8784276e8e16b9c0a6c732aaf445cc2be74628f818e5cdf50b8135bdd01f195cf62633aa3fc5259ed8b8b615dac2c457c110ef58c48bd38e1e915cda742cef
MISC metadata.xml 509 BLAKE2B e5012e29cc2157f4cd37b19edbdd2da53377f2671574681aff241dcab50e22d39b8db7bce14b7085cf39e4adbe89c486047f3089a9f91fde3411b02de45c8284 SHA512 bfa09ea8c47388786ec4fa938fbb2df96c4d2bf936f1a2a79765bc178ac34a9d69c19a1be53eef743d49548e32ce110f3e4b9776932248624192d4b92b7525f8
diff --git a/dev-libs/libzip/libzip-1.7.1.ebuild b/dev-libs/libzip/libzip-1.7.1.ebuild
new file mode 100644
index 000000000000..8edc5a80ac6e
--- /dev/null
+++ b/dev-libs/libzip/libzip-1.7.1.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake multibuild
+
+DESCRIPTION="Library for manipulating zip archives"
+HOMEPAGE="https://nih.at/libzip/"
+SRC_URI="https://www.nih.at/libzip/${P}.tar.xz"
+
+LICENSE="BSD"
+SLOT="0/5"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+IUSE="bzip2 gnutls libressl lzma mbedtls ssl static-libs test tools"
+REQUIRED_USE="test? ( tools )"
+
+RESTRICT="!test? ( test )"
+
+DEPEND="
+ sys-libs/zlib
+ bzip2? ( app-arch/bzip2:= )
+ lzma? ( app-arch/xz-utils )
+ ssl? (
+ gnutls? (
+ dev-libs/nettle:0=
+ >=net-libs/gnutls-3.6.5:=
+ )
+ !gnutls? (
+ mbedtls? ( net-libs/mbedtls:= )
+ !mbedtls? (
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )
+ )
+ )
+ )
+"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+ # Upstream doesn't support building dynamic & static
+ # simultaneously: https://github.com/nih-at/libzip/issues/76
+ MULTIBUILD_VARIANTS=( shared $(usev static-libs) )
+}
+
+src_configure() {
+ myconfigure() {
+ local mycmakeargs=(
+ -DBUILD_EXAMPLES=OFF # nothing is installed
+ -DENABLE_COMMONCRYPTO=OFF # not in tree
+ -DENABLE_BZIP2=$(usex bzip2)
+ -DENABLE_LZMA=$(usex lzma)
+ )
+ if [[ ${MULTIBUILD_VARIANT} = static-libs ]]; then
+ mycmakeargs+=(
+ -DBUILD_DOC=OFF
+ -DBUILD_EXAMPLES=OFF
+ -DBUILD_SHARED_LIBS=OFF
+ -DBUILD_TOOLS=OFF
+ )
+ else
+ mycmakeargs+=(
+ -DBUILD_DOC=ON
+ -DBUILD_REGRESS=$(usex test)
+ -DBUILD_TOOLS=$(usex tools)
+ )
+ fi
+
+ if use ssl; then
+ if use gnutls; then
+ mycmakeargs+=(
+ -DENABLE_GNUTLS=$(usex gnutls)
+ -DENABLE_MBEDTLS=OFF
+ -DENABLE_OPENSSL=OFF
+ )
+ elif use mbedtls; then
+ mycmakeargs+=(
+ -DENABLE_GNUTLS=OFF
+ -DENABLE_MBEDTLS=$(usex mbedtls)
+ -DENABLE_OPENSSL=OFF
+ )
+ else
+ mycmakeargs+=(
+ -DENABLE_GNUTLS=OFF
+ -DENABLE_MBEDTLS=OFF
+ -DENABLE_OPENSSL=ON
+ )
+ fi
+ else
+ mycmakeargs+=(
+ -DENABLE_GNUTLS=OFF
+ -DENABLE_MBEDTLS=OFF
+ -DENABLE_OPENSSL=OFF
+ )
+ fi
+ cmake_src_configure
+ }
+
+ multibuild_foreach_variant myconfigure
+}
+
+src_compile() {
+ multibuild_foreach_variant cmake_src_compile
+}
+
+src_test() {
+ [[ ${MULTIBUILD_VARIANT} = shared ]] && cmake_src_test
+}
+
+src_install() {
+ multibuild_foreach_variant cmake_src_install
+}
diff --git a/dev-libs/nettle/Manifest b/dev-libs/nettle/Manifest
index f786e2999f62..0495dc014942 100644
--- a/dev-libs/nettle/Manifest
+++ b/dev-libs/nettle/Manifest
@@ -4,5 +4,5 @@ DIST nettle-3.5.1.tar.gz 1989593 BLAKE2B 40e527a4cc541674acc39072f2ebbab4b6ed1b0
DIST nettle-3.6.tar.gz 2288173 BLAKE2B 45e08832e9c337f10d958956545c77f521b747b8abca56ce40c755adf352bdc2a79584b1e1c0e50f5ede0ac54794aabd6883601c53593b965aada744502789db SHA512 2471af875e51327af61af8bda53cd9c3adc27b6e32592a4b5b10b3ec60999ebf771ab9c54c747b0bade4b3b5a717e77fdbdb53699dd9e8a9ed4eee07f46aed51
EBUILD nettle-3.4.1.ebuild 1790 BLAKE2B 556d39f46ddc010db277004599bc6ac59ee28192b05eb5cc46ca0c1d12349f9255a2548705000e6728a9c9739556665a52800ad5e8f2424c538f28124c0286ff SHA512 b3152d8e5f2569afad23587361ae302846d357f02956b9222642b1f9ae3267b52d6ef0ecf43ae53c0269c0c1cb677d9daf04127be88805417eb9d77eda230bc6
EBUILD nettle-3.5.1-r1.ebuild 1751 BLAKE2B a6bb47e9a8df3e48403a94e801491b833072bdacbcb6ae84ee806854ea947424452ea16dfebabc5023a7ab7ab72678b8c704f4a003e0bcd420109dc2853cc7ba SHA512 b2f8977f00c4bfa283336978c3376b9fd30b2b19524f97d279ef2109bfdd2354610f6c7872f6c85a366cb198b9b05df66b345d5f8bf10399ac8f6d74a4b0e07a
-EBUILD nettle-3.6-r2.ebuild 1775 BLAKE2B cd4d7bbe377f3f58dcb55de91bf8d0540d983a437f6564ea365d4d4e9538ca9592673ee7aa474cddf1572d14a7d66a82d168f2033ed1119bd18320d8dc3a5823 SHA512 06e9d0277d74d771b9b18db755c459878199f219444f83f27d4132aeaed9a254fbcee4fc95f2f356349492d6f98d3e5a967ac021a837b937cbf02e75e8b1eb06
+EBUILD nettle-3.6-r2.ebuild 1812 BLAKE2B 853dd98f357d99d70af30b13262c8da731c9c4d8d656d5361bc7bf811360f36ba380e0058f19f7a9695a74943df0c69ff854094da61a26437dc801e140b4ef34 SHA512 d7334bf15caedd7dcf930683140266536fd75808b63016d92d8d7a6959422db24b2e1f435627134ad6f9feb7742e7fa2836f93133d73bf43c3b9f14a2f01d550
MISC metadata.xml 460 BLAKE2B 66da3978fdcd6fb67c2d345578e78768795254f4bb9a8b1ea8236ce99a0516cb2206f77280b5bfc23b98acbbee92bd96c32be12776fd83faa1a670fd10b3f648 SHA512 6a08cf01475e5b46f05ec3fd7d2186b7210501769d2d06780b5d078e1db39c23fd564a8a1c671362eb359c1a88759fb5479cbe757e832507aff81296fd739972
diff --git a/dev-libs/nettle/nettle-3.6-r2.ebuild b/dev-libs/nettle/nettle-3.6-r2.ebuild
index 8bac0c13512c..7a850ed2560b 100644
--- a/dev-libs/nettle/nettle-3.6-r2.ebuild
+++ b/dev-libs/nettle/nettle-3.6-r2.ebuild
@@ -49,6 +49,7 @@ src_prepare() {
multilib_src_configure() {
# --disable-openssl bug #427526
ECONF_SOURCE="${S}" econf \
+ CC_FOR_BUILD="$(tc-getBUILD_CC)" \
$(tc-is-static-only && echo --disable-shared) \
$(use_enable cpu_flags_x86_aes x86-aesni) \
$(use_enable cpu_flags_x86_sha x86-sha-ni) \
diff --git a/dev-libs/nsgenbind/Manifest b/dev-libs/nsgenbind/Manifest
index ae9fe5fd8916..7a1df5d02355 100644
--- a/dev-libs/nsgenbind/Manifest
+++ b/dev-libs/nsgenbind/Manifest
@@ -1,5 +1,7 @@
DIST nsgenbind-0.6-src.tar.gz 106862 BLAKE2B 9b40ae6298921736f7d876ae664207eb71102adbe44f4072ea46b08b63cb5cf608df4c96f3ade1c8cca964d8d8b32d68aad25431f6fd455eb8392d8313faa9e9 SHA512 3083b48e48fcf8c7f32b09d040998470d5917469e020c4ccbfb8ffdb7d1252fd27dd02f590f5a2485c6984cdbc005ea87adf0db45077aee0a91f68037c542ffb
DIST nsgenbind-0.7-src.tar.gz 117110 BLAKE2B 9695a88f058aaf885853c1de62746d19219ad198508dadf8e6ffa602721c3eb4338a4d8f5a65b2c14434796f9f024e093e5a0975c745eb5462c81594bc70d92f SHA512 b96b10bc39b3db13f44802b0c70f0a8b197d4ee714a98f571ba4019bd9efb6460fb2cd6d22a7fd3c8a5cb25dcd85211122a45b02e17ee0f52bac1db0cf06b482
+DIST nsgenbind-0.8-src.tar.gz 117463 BLAKE2B 63ada11eb9e818bc864b8100d80fda5686d4b1cc2a1b021f6cf76d098f5c6551b2792da6dc8aba02774304d3e87bf9728a85d3c80ccb0c24e4bff5a4fee3f977 SHA512 850769fedc82c103b6d063ba25ec97638178e56f5b331a1e237566b3f3bd858aba270bcd37618c638575f5361ff88a09cdae92f6d2b5dc100491e5cc75c072e5
EBUILD nsgenbind-0.6-r1.ebuild 689 BLAKE2B e2992845a2fe26aa5b2cee030abc4889cf487942153409d5887de62befcfb52478d5eb296e63e2f69a525ce337d4d887ca44a3c08ac769de9b63194433f4a70f SHA512 928673eca4f9fd02c5d75acdd12e783c4a73c0d203af02edd331617c8cf76dd6d676cead44d2d204afffb46e3d2ff53f8d9cc3c50146aac3dad9f2300067f243
EBUILD nsgenbind-0.7.ebuild 689 BLAKE2B e2992845a2fe26aa5b2cee030abc4889cf487942153409d5887de62befcfb52478d5eb296e63e2f69a525ce337d4d887ca44a3c08ac769de9b63194433f4a70f SHA512 928673eca4f9fd02c5d75acdd12e783c4a73c0d203af02edd331617c8cf76dd6d676cead44d2d204afffb46e3d2ff53f8d9cc3c50146aac3dad9f2300067f243
+EBUILD nsgenbind-0.8.ebuild 689 BLAKE2B 10cbd1ad94a7a6edaaf9aa7ec179756c68e78319bb9af02e93f75cc6fb0acdee14c0b87b60398ca76d6c30523d3d5ba406d5108e4697a32202e5c01f52058027 SHA512 b40c6e79872d6513ffbb1ab608898bf3a1c7417c2ed2445698a5158042f272349808dacbda728daf550cf1f5bd916df150686996fce9220c4ed99e54d3f360c5
MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-libs/nsgenbind/nsgenbind-0.8.ebuild b/dev-libs/nsgenbind/nsgenbind-0.8.ebuild
new file mode 100644
index 000000000000..a4c9c0054538
--- /dev/null
+++ b/dev-libs/nsgenbind/nsgenbind-0.8.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Generate Javascript-to-DOM bindings from w3c webidl files"
+HOMEPAGE="http://www.netsurf-browser.org/"
+SRC_URI="https://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
+IUSE=""
+
+BDEPEND="
+ dev-util/netsurf-buildsystem
+ virtual/yacc"
+
+_emake() {
+ source /usr/share/netsurf-buildsystem/gentoo-helpers.sh
+ netsurf_define_makeconf
+ emake "${NETSURF_MAKECONF[@]}" COMPONENT_TYPE=binary $@
+}
+
+src_compile() {
+ _emake
+}
+
+src_install() {
+ _emake DESTDIR="${D}" install
+}
diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index 5db6e3cccaf9..c00b2dfc6edb 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -1,13 +1,16 @@
AUX nss-3.21-gentoo-fixup-warnings.patch 178 BLAKE2B b51f80310db3db416d8aeaf9117ef801389b5b2df47c04aff51bf0759dd5bff41b09d1e9011f99b345d5769a3aab19acb943ee97f8437465518115f6902a0da1 SHA512 7667a020311ca11e8f1836bc146e4a3c94ff2a489882dbe87debcccfeaafeb50e6607574c64254a826b4b6f0bb436b310a3386fff4a58324f0e5e58debaa9d51
AUX nss-3.23-hppa-byte_order.patch 460 BLAKE2B 97358cc8fbea0b0d3beee0697833e48ef01039ceb08fd00792a7f7ef68409eb076022c03764ab079fdaa971a0358130002fa11c0c182ebeb33dcdf660be26408 SHA512 ad0097bb6cf409d61eb28202d7460c87e983d6db977aba38ff9ef2749b3f7bb8fdadce4174f5bf806350ae33733097a1f444792d31cc43574b28341893642e5a
AUX nss-3.47-gentoo-fixups.patch 5260 BLAKE2B 994233aad2a0016676e6aea2bf4331a131561aa2b67bf6bab369b86e3a31e2fe651b0cd3fe77c6b8127fd276a5a2b8fccf3db90e0ecf63cd6d3a43e4dc26849a SHA512 c917ee0a2e4c889613f0d931b2553a6338c60a4ef898ea30bcdb888f94a30994849a3d33cd0b9eb7c5d1baebd2c7d991f2dfef44b50a0b59bf2f6b332ee3ef84
+AUX nss-3.53-gentoo-fixups.patch 6886 BLAKE2B 1c605d8db02ebe0492c41955207368197a79990e43e219a71962cb28ac0cecd9e0acc2b76e16f5b116fdb8bf8790d96046cb4f376df9b8634ac48e54924589f8 SHA512 51031f92519f57d4b57a547cf549f2d5da1c5a7212d4b304fb0d71d6a85a5aefd64724ec9075c14c9b49c1e99c3ffe91cbec501c3504985aa9b16eacf2aa15ed
DIST nss-3.51.1.tar.gz 78310874 BLAKE2B c295b5fdf6e1d24cc79474f2c5a9e91fccf777212fbb072e8a64576ed1b060fea6ecbde1fa59bb07c998b9aa92bb7d450e722a8f34a72eaa35aef6cbd693420a SHA512 1878780886cc330489a14a60ee5cb67b174f3167d020db256eacdce079652ef8af65813914cd0fb5684457053fa27acc9bff72d0713fbea28795613ca45a6d46
DIST nss-3.51.tar.gz 78305125 BLAKE2B 2c7b90d4cc9fe283bf81e21d0dceefff503e5a31f0053828b140b2b927ddab8c8881b23c7d4c003f3e2d0dcd22efbe699baee63443cab6e72d33a552fd430e3c SHA512 9c894b1ea41449b000750a7b3a89fcb43dfc3d0d4d6dcc0dc288bc73996f76f1ee1ede927a8aecae6d4a07f9f3d3e3a042c6a60cf06e27e0cdc004fce2e510fd
DIST nss-3.52.1.tar.gz 81222116 BLAKE2B e7a1a24c0a4765fb13a4c13a93187a26df6df68b3e8d623514928cf505215e67f5f22387b6a6b0680117b1c2af13752cb981c173bb50424784d05b459704d528 SHA512 be8746984e3028e5ed49f2132ca08687f6ac75e50208d8cfd6ffbcfd5db1ab8dcaf1f2a0a6c6c1920573de80490301b21c022759c7e2309a22d29698bb169dd6
DIST nss-3.52.tar.gz 81220587 BLAKE2B 0208c9047c61233ed36f02d57fdc64fa1734ef69d17fa499707f4a3b14a2e880b1dcf4b19b17a38e9b41d2e46b4a9488613d82989be747ad82aebc35b8e491af SHA512 a45baf38717bceda03c292b2c01def680a24a846327e17d36044a85e30ed40c68220c78c0a2c3025c11778ee58f5d5eb0fff1b4cd274b95c408fb59e394e62c6
+DIST nss-3.53.1.tar.gz 81297900 BLAKE2B 7a053aa8322cb55b787730c87f1a6e8a799265574114d63257699348f4921007457d19e5fdc4684a512a91478d1912db45ce066daa8b9d9cde5130ff506aed9e SHA512 5d7572999a007c513df4cbdf74769c1a4eb53eb8680da27a89fea770763d88b6bea80cd9ab20426a905396745129276cffb6dd9e8e1e6377fa98c0a103b522d0
DIST nss-cacert-class1-class3.patch 22950 BLAKE2B 9d5e60df5f161a3c27c41e5a9419440a54f888eda454e3cde5ebe626d4075b65cf9938b5144d0fb022377f4bd415bff5e5c67d104409860aa9391b3eb8872c68 SHA512 a5aa740bf110a3f0262e3f1ef2fc739ac2b44f042e220039d48aee8e97cd764d5c10718220364f4098aba955882bd02cadb5481512388971a8290312f88a7df0
-EBUILD nss-3.51.1.ebuild 9075 BLAKE2B 785cd1575155157ff31324bdbdf9fa04aaa240015daf32a2fd8fd7eff61db3d94447e453776fbf3fcf0f67be1cb3aa07b24d3978c85fc2f1e8b995f5794d4c9a SHA512 83d5380894b6a7f4d740d841e788a1f44034cbcb4e285911534f2645ef5e8563357f93615a76a2c1573a1af2bd20de62b79395cbd231cd311909bae5ad55da38
-EBUILD nss-3.51.ebuild 9000 BLAKE2B 3da318878a972b15b782c1865d0ad5071dbf6a3411e536276b1508ddf4bf416eb14d9423a83b2ab9fa4c474ca6a4d78314d086cc9296a0d68bcc935acd242361 SHA512 792e46aad9198990f87436dcf53367de057eb868210bcea00b4cd1da80585104d97efcaa4c95071d8b897df8b365b4b98bc170a25a275d603e603694ffb03801
-EBUILD nss-3.52.1-r1.ebuild 9115 BLAKE2B c4f48c78fb123f15c7b25193cd6fb26f9a4a505e1fbd25f241a3b04977beb8c76fb3fbd153e8bc063cc209429d02b17652cb1e86273e751c24b212d7da487876 SHA512 4b9352ce8e0e75ded26a30dccc1e63a2a67393c7f9fcc34602b20e12b7fc03c90d5c0076f4bd305917a49cba3c6c0c891de8a49bfcd59a2db8ca289391988e52
-EBUILD nss-3.52.ebuild 9075 BLAKE2B 785cd1575155157ff31324bdbdf9fa04aaa240015daf32a2fd8fd7eff61db3d94447e453776fbf3fcf0f67be1cb3aa07b24d3978c85fc2f1e8b995f5794d4c9a SHA512 83d5380894b6a7f4d740d841e788a1f44034cbcb4e285911534f2645ef5e8563357f93615a76a2c1573a1af2bd20de62b79395cbd231cd311909bae5ad55da38
+EBUILD nss-3.51.1-r1.ebuild 9048 BLAKE2B 01e8547f889fd98894a91687a3951cd45c8d5876eb47535d14787bf9bd640315ecb411caa38223629a02448efbf68575075804de1a7675d25f3ba4eb92e6ad29 SHA512 222a970aaaa15c1f8b936c6f3448f3b7020eb8b27ba620d55fc50643ed489abb1807ebee94412fa2841b3cb55d099de4f134358dbc10dd2c31a9700622d78466
+EBUILD nss-3.51.ebuild 8973 BLAKE2B 38182caddafaa28743e15d70796912f523cdcb34ec6bf3fde4d8f5d147eab19cf3927aaf919a0f9f95ed71b3c4e45c8ae03bd60a9b75596d3428a5a661841e4e SHA512 631181fb368571224d9673fb2dfd70e01fe296c6ff27f5c4ffdb717e7ed2ac8b78ad7a17b29a93426f9e4815370b4c57391568c7ea7b2a141c36de3f3e2fb84f
+EBUILD nss-3.52.1-r1.ebuild 9088 BLAKE2B 86e158b71bb6de2a079ea5e332ffc68b8bc59de3a37720406aa8d406d36b22ec557a70400ebc1743027649aa772c1261bebc85ec065e0a9e19aca1b4370b37bf SHA512 9c3321d6e520a5750ab25936263b05c1074a519f05d7cafd2f1cd58d4c01135cfbd6755d9faf82e7235c01752f870720743af640c3d8a7e091f138085635e6e5
+EBUILD nss-3.52.ebuild 9048 BLAKE2B 01e8547f889fd98894a91687a3951cd45c8d5876eb47535d14787bf9bd640315ecb411caa38223629a02448efbf68575075804de1a7675d25f3ba4eb92e6ad29 SHA512 222a970aaaa15c1f8b936c6f3448f3b7020eb8b27ba620d55fc50643ed489abb1807ebee94412fa2841b3cb55d099de4f134358dbc10dd2c31a9700622d78466
+EBUILD nss-3.53.1.ebuild 8928 BLAKE2B 96404c6a1607af4edc143f212c006d01e50d37b3abd0c37291836ebb4b8603d600f8a6a963752381b472f67f275487fa1948fab6cd088d2dd749c675136f399e SHA512 48f702a67bd438f420283370d68d4293310e7920d9a15b9ed2c089d7de63e4d2289e28133f493f8a5ab6414bd15e28fc26e0d96112cf7db09477e58e0764b0c7
MISC metadata.xml 515 BLAKE2B a63fb05a1a3e1b06f929f963ab0794ec1230e89903fc97a7c7db81a0b3c7b7e8b9277eaa7440f8929738ec0f805d8a8dd51c8262e569fb9be2fa0938b08ad7a2 SHA512 6bec952825416ba0ab8282669483eb75935f6b4a3052e0f78dad911c0246b8d8ce245c86cbd82b292d49338848fa50fb2009fb4a9def1ac8d81bf9a3320cd2b0
diff --git a/dev-libs/nss/files/nss-3.53-gentoo-fixups.patch b/dev-libs/nss/files/nss-3.53-gentoo-fixups.patch
new file mode 100644
index 000000000000..2d8bdb6f5a31
--- /dev/null
+++ b/dev-libs/nss/files/nss-3.53-gentoo-fixups.patch
@@ -0,0 +1,290 @@
+From 1b3c48499abb000d708abe5f05413c1f4155e086 Mon Sep 17 00:00:00 2001
+From: Jory Pratt <anarchy@gentoo.org>
+Date: Mon, 8 Jun 2020 12:22:29 -0500
+Subject: [PATCH] Add pkg-config and nss-config for Gentoo
+
+---
+ Makefile | 15 +----
+ config/Makefile | 40 ++++++++++++
+ config/nss-config.in | 145 +++++++++++++++++++++++++++++++++++++++++++
+ config/nss.pc.in | 12 ++++
+ manifest.mn | 2 +-
+ 5 files changed, 200 insertions(+), 14 deletions(-)
+ create mode 100644 config/Makefile
+ create mode 100644 config/nss-config.in
+ create mode 100644 config/nss.pc.in
+
+diff --git a/Makefile b/Makefile
+index eb4ed1a..f979d90 100644
+--- a/Makefile
++++ b/Makefile
+@@ -4,6 +4,8 @@
+ # License, v. 2.0. If a copy of the MPL was not distributed with this
+ # file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
++default: nss_build_all
++
+ #######################################################################
+ # (1) Include initial platform-independent assignments (MANDATORY). #
+ #######################################################################
+@@ -48,12 +50,9 @@ include $(CORE_DEPTH)/coreconf/rules.mk
+ #######################################################################
+
+ nss_build_all:
+- $(MAKE) build_nspr
+ $(MAKE) all
+- $(MAKE) latest
+
+ nss_clean_all:
+- $(MAKE) clobber_nspr
+ $(MAKE) clobber
+
+ NSPR_CONFIG_STATUS = $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME)/config.status
+@@ -138,16 +137,6 @@ $(NSPR_CONFIG_STATUS): $(NSPR_CONFIGURE)
+ --prefix='$(NSS_GYP_PREFIX)'
+ endif
+
+-build_nspr: $(NSPR_CONFIG_STATUS)
+- $(MAKE) -C $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME)
+- $(MAKE) -C $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME)/pr/tests
+-
+-install_nspr: build_nspr
+- $(MAKE) -C $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME) install
+-
+-clobber_nspr: $(NSPR_CONFIG_STATUS)
+- $(MAKE) -C $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME) clobber
+-
+ build_docs:
+ $(MAKE) -C $(CORE_DEPTH)/doc
+
+diff --git a/config/Makefile b/config/Makefile
+new file mode 100644
+index 0000000..aaf1991
+--- /dev/null
++++ b/config/Makefile
+@@ -0,0 +1,40 @@
++CORE_DEPTH = ..
++DEPTH = ..
++
++include $(CORE_DEPTH)/coreconf/config.mk
++
++NSS_MAJOR_VERSION = $(shell grep -F "NSS_VMAJOR" ../lib/nss/nss.h | awk '{print $$3}')
++NSS_MINOR_VERSION = $(shell grep -F "NSS_VMINOR" ../lib/nss/nss.h | awk '{print $$3}')
++NSS_PATCH_VERSION = $(shell grep -F "NSS_VPATCH" ../lib/nss/nss.h | awk '{print $$3}')
++PREFIX = /usr
++
++all: export libs
++
++export:
++ # Create the nss.pc file
++ mkdir -p $(DIST)/lib/pkgconfig
++ sed -e "s,@prefix@,$(PREFIX)," \
++ -e "s,@exec_prefix@,\$${prefix}," \
++ -e "s,@libdir@,\$${prefix}/lib64," \
++ -e "s,@includedir@,\$${prefix}/include/nss," \
++ -e "s,@NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION),g" \
++ -e "s,@NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \
++ -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \
++ nss.pc.in > nss.pc
++ chmod 0644 nss.pc
++ ln -sf ../../../../config/nss.pc $(DIST)/lib/pkgconfig
++
++ # Create the nss-config script
++ mkdir -p $(DIST)/bin
++ sed -e "s,@prefix@,$(PREFIX)," \
++ -e "s,@NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION)," \
++ -e "s,@NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \
++ -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \
++ nss-config.in > nss-config
++ chmod 0755 nss-config
++ ln -sf ../../../config/nss-config $(DIST)/bin
++
++libs:
++
++dummy: all export libs
++
+diff --git a/config/nss-config.in b/config/nss-config.in
+new file mode 100644
+index 0000000..3a957b8
+--- /dev/null
++++ b/config/nss-config.in
+@@ -0,0 +1,145 @@
++#!/bin/sh
++
++prefix=@prefix@
++
++major_version=@NSS_MAJOR_VERSION@
++minor_version=@NSS_MINOR_VERSION@
++patch_version=@NSS_PATCH_VERSION@
++
++usage()
++{
++ cat <<EOF
++Usage: nss-config [OPTIONS] [LIBRARIES]
++Options:
++ [--prefix[=DIR]]
++ [--exec-prefix[=DIR]]
++ [--includedir[=DIR]]
++ [--libdir[=DIR]]
++ [--version]
++ [--libs]
++ [--cflags]
++Dynamic Libraries:
++ nss
++ ssl
++ smime
++ nssutil
++EOF
++ exit $1
++}
++
++if test $# -eq 0; then
++ usage 1 1>&2
++fi
++
++lib_ssl=yes
++lib_smime=yes
++lib_nss=yes
++lib_nssutil=yes
++
++while test $# -gt 0; do
++ case "$1" in
++ -*=*) optarg=$(echo "$1" | sed 's/[-_a-zA-Z0-9]*=//') ;;
++ *) optarg= ;;
++ esac
++
++ case $1 in
++ --prefix=*)
++ prefix=${optarg}
++ ;;
++ --prefix)
++ echo_prefix=yes
++ ;;
++ --exec-prefix=*)
++ exec_prefix=${optarg}
++ ;;
++ --exec-prefix)
++ echo_exec_prefix=yes
++ ;;
++ --includedir=*)
++ includedir=${optarg}
++ ;;
++ --includedir)
++ echo_includedir=yes
++ ;;
++ --libdir=*)
++ libdir=${optarg}
++ ;;
++ --libdir)
++ echo_libdir=yes
++ ;;
++ --version)
++ echo ${major_version}.${minor_version}.${patch_version}
++ ;;
++ --cflags)
++ echo_cflags=yes
++ ;;
++ --libs)
++ echo_libs=yes
++ ;;
++ ssl)
++ lib_ssl=yes
++ ;;
++ smime)
++ lib_smime=yes
++ ;;
++ nss)
++ lib_nss=yes
++ ;;
++ nssutil)
++ lib_nssutil=yes
++ ;;
++ *)
++ usage 1 1>&2
++ ;;
++ esac
++ shift
++done
++
++# Set variables that may be dependent upon other variables
++if test -z "${exec_prefix}"; then
++ exec_prefix=$(pkg-config --variable=exec_prefix nss)
++fi
++if test -z "${includedir}"; then
++ includedir=$(pkg-config --variable=includedir nss)
++fi
++if test -z "${libdir}"; then
++ libdir=$(pkg-config --variable=libdir nss)
++fi
++
++if test "${echo_prefix}" = "yes"; then
++ echo ${prefix}
++fi
++
++if test "${echo_exec_prefix}" = "yes"; then
++ echo ${exec_prefix}
++fi
++
++if test "${echo_includedir}" = "yes"; then
++ echo ${includedir}
++fi
++
++if test "${echo_libdir}" = "yes"; then
++ echo ${libdir}
++fi
++
++if test "${echo_cflags}" = "yes"; then
++ echo -I${includedir}
++fi
++
++if test "${echo_libs}" = "yes"; then
++ libdirs=""
++ if test -n "${lib_ssl}"; then
++ libdirs="${libdirs} -lssl${major_version}"
++ fi
++ if test -n "${lib_smime}"; then
++ libdirs="${libdirs} -lsmime${major_version}"
++ fi
++ if test -n "${lib_nss}"; then
++ libdirs="${libdirs} -lnss${major_version}"
++ fi
++ if test -n "${lib_nssutil}"; then
++ libdirs="${libdirs} -lnssutil${major_version}"
++ fi
++ echo ${libdirs}
++fi
++
+diff --git a/config/nss.pc.in b/config/nss.pc.in
+new file mode 100644
+index 0000000..03f1e39
+--- /dev/null
++++ b/config/nss.pc.in
+@@ -0,0 +1,12 @@
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++libdir=@libdir@
++includedir=@includedir@
++
++Name: NSS
++Description: Network Security Services
++Version: @NSS_MAJOR_VERSION@.@NSS_MINOR_VERSION@.@NSS_PATCH_VERSION@
++Requires: nspr >= 4.25
++Libs: -lssl3 -lsmime3 -lnss3 -lnssutil3
++Cflags: -I${includedir}
++
+diff --git a/manifest.mn b/manifest.mn
+index dada8ab..72dc9b3 100644
+--- a/manifest.mn
++++ b/manifest.mn
+@@ -10,7 +10,7 @@ IMPORTS = nspr20/v4.8 \
+
+ RELEASE = nss
+
+-DIRS = coreconf lib cmd cpputil gtests
++DIRS = coreconf lib cmd cpputil config
+
+ lib: coreconf
+ cmd: lib
+--
+2.26.2
+
diff --git a/dev-libs/nss/nss-3.51.1.ebuild b/dev-libs/nss/nss-3.51.1-r1.ebuild
index 61acd9960f9b..2c01890c4d30 100644
--- a/dev-libs/nss/nss-3.51.1.ebuild
+++ b/dev-libs/nss/nss-3.51.1-r1.ebuild
@@ -22,7 +22,7 @@ RDEPEND="
>=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}]
>=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}]
>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
- >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+ virtual/pkgconfig
"
DEPEND="${RDEPEND}"
diff --git a/dev-libs/nss/nss-3.51.ebuild b/dev-libs/nss/nss-3.51.ebuild
index f3bc78472679..25170cb99d38 100644
--- a/dev-libs/nss/nss-3.51.ebuild
+++ b/dev-libs/nss/nss-3.51.ebuild
@@ -21,7 +21,7 @@ RDEPEND="
>=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}]
>=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}]
>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
- >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+ virtual/pkgconfig
"
DEPEND="${RDEPEND}"
diff --git a/dev-libs/nss/nss-3.52.1-r1.ebuild b/dev-libs/nss/nss-3.52.1-r1.ebuild
index 0f733991c195..fcd9c6e73a80 100644
--- a/dev-libs/nss/nss-3.52.1-r1.ebuild
+++ b/dev-libs/nss/nss-3.52.1-r1.ebuild
@@ -22,7 +22,7 @@ RDEPEND="
>=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}]
>=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}]
>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
- >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+ virtual/pkgconfig
"
DEPEND="${RDEPEND}"
diff --git a/dev-libs/nss/nss-3.52.ebuild b/dev-libs/nss/nss-3.52.ebuild
index 61acd9960f9b..2c01890c4d30 100644
--- a/dev-libs/nss/nss-3.52.ebuild
+++ b/dev-libs/nss/nss-3.52.ebuild
@@ -22,7 +22,7 @@ RDEPEND="
>=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}]
>=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}]
>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
- >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+ virtual/pkgconfig
"
DEPEND="${RDEPEND}"
diff --git a/dev-libs/nss/nss-3.53.1.ebuild b/dev-libs/nss/nss-3.53.1.ebuild
new file mode 100644
index 000000000000..df2971ed709b
--- /dev/null
+++ b/dev-libs/nss/nss-3.53.1.ebuild
@@ -0,0 +1,350 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils flag-o-matic multilib toolchain-funcs multilib-minimal
+
+NSPR_VER="4.25"
+RTM_NAME="NSS_${PV//./_}_RTM"
+
+DESCRIPTION="Mozilla's Network Security Services library that implements PKI support"
+HOMEPAGE="http://www.mozilla.org/projects/security/pki/nss/"
+SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/${P}.tar.gz
+ cacert? ( https://dev.gentoo.org/~axs/distfiles/${PN}-cacert-class1-class3.patch )"
+
+LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="cacert utils"
+# pkg-config called by nss-config -> virtual/pkgconfig in RDEPEND
+RDEPEND="
+ >=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}]
+ >=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}]
+ >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+ virtual/pkgconfig
+"
+DEPEND="${RDEPEND}"
+
+RESTRICT="test"
+
+S="${WORKDIR}/${P}/${PN}"
+
+MULTILIB_CHOST_TOOLS=(
+ /usr/bin/nss-config
+)
+
+PATCHES=(
+ # Custom changes for gentoo
+ "${FILESDIR}/${PN}-3.53-gentoo-fixups.patch"
+ "${FILESDIR}/${PN}-3.21-gentoo-fixup-warnings.patch"
+ "${FILESDIR}/${PN}-3.23-hppa-byte_order.patch"
+)
+
+src_prepare() {
+ if use cacert ; then #521462
+ PATCHES+=(
+ "${DISTDIR}/${PN}-cacert-class1-class3.patch"
+ )
+ fi
+
+ default
+
+ pushd coreconf >/dev/null || die
+ # hack nspr paths
+ echo 'INCLUDES += -I$(DIST)/include/dbm' \
+ >> headers.mk || die "failed to append include"
+
+ # modify install path
+ sed -e '/CORE_DEPTH/s:SOURCE_PREFIX.*$:SOURCE_PREFIX = $(CORE_DEPTH)/dist:' \
+ -i source.mk || die
+
+ # Respect LDFLAGS
+ sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk
+ popd >/dev/null || die
+
+ # Fix pkgconfig file for Prefix
+ sed -i -e "/^PREFIX =/s:= /usr:= ${EPREFIX}/usr:" \
+ config/Makefile || die
+
+ # use host shlibsign if need be #436216
+ if tc-is-cross-compiler ; then
+ sed -i \
+ -e 's:"${2}"/shlibsign:shlibsign:' \
+ cmd/shlibsign/sign.sh || die
+ fi
+
+ # dirty hack
+ sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../freebl/\$(OBJDIR):" \
+ lib/ssl/config.mk || die
+ sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../../lib/freebl/\$(OBJDIR):" \
+ cmd/platlibs.mk || die
+
+ multilib_copy_sources
+
+ strip-flags
+}
+
+multilib_src_configure() {
+ # Ensure we stay multilib aware
+ sed -i -e "/@libdir@/ s:lib64:$(get_libdir):" config/Makefile || die
+}
+
+nssarch() {
+ # Most of the arches are the same as $ARCH
+ local t=${1:-${CHOST}}
+ case ${t} in
+ aarch64*)echo "aarch64";;
+ hppa*) echo "parisc";;
+ i?86*) echo "i686";;
+ x86_64*) echo "x86_64";;
+ *) tc-arch ${t};;
+ esac
+}
+
+nssbits() {
+ local cc cppflags="${1}CPPFLAGS" cflags="${1}CFLAGS"
+ if [[ ${1} == BUILD_ ]]; then
+ cc=$(tc-getBUILD_CC)
+ else
+ cc=$(tc-getCC)
+ fi
+ echo > "${T}"/test.c || die
+ ${cc} ${!cppflags} ${!cflags} -c "${T}"/test.c -o "${T}/${1}test.o" || die
+ case $(file "${T}/${1}test.o") in
+ *32-bit*x86-64*) echo USE_X32=1;;
+ *64-bit*|*ppc64*|*x86_64*) echo USE_64=1;;
+ *32-bit*|*ppc*|*i386*) ;;
+ *) die "Failed to detect whether ${cc} builds 64bits or 32bits, disable distcc if you're using it, please";;
+ esac
+}
+
+multilib_src_compile() {
+ # use ABI to determine bit'ness, or fallback if unset
+ local buildbits mybits
+ case "${ABI}" in
+ n32) mybits="USE_N32=1";;
+ x32) mybits="USE_X32=1";;
+ s390x|*64) mybits="USE_64=1";;
+ ${DEFAULT_ABI})
+ einfo "Running compilation test to determine bit'ness"
+ mybits=$(nssbits)
+ ;;
+ esac
+ # bitness of host may differ from target
+ if tc-is-cross-compiler; then
+ buildbits=$(nssbits BUILD_)
+ fi
+
+ local makeargs=(
+ CC="$(tc-getCC)"
+ CCC="$(tc-getCXX)"
+ AR="$(tc-getAR) rc \$@"
+ RANLIB="$(tc-getRANLIB)"
+ OPTIMIZER=
+ ${mybits}
+ )
+
+ # Take care of nspr settings #436216
+ local myCPPFLAGS="${CPPFLAGS} $($(tc-getPKG_CONFIG) nspr --cflags)"
+ unset NSPR_INCLUDE_DIR
+
+ export NSS_ALLOW_SSLKEYLOGFILE=1
+ export NSS_ENABLE_WERROR=0 #567158
+ export BUILD_OPT=1
+ export NSS_USE_SYSTEM_SQLITE=1
+ export NSDISTMODE=copy
+ export FREEBL_NO_DEPEND=1
+ export FREEBL_LOWHASH=1
+ export NSS_SEED_ONLY_DEV_URANDOM=1
+ export USE_SYSTEM_ZLIB=1
+ export ZLIB_LIBS=-lz
+ export ASFLAGS=""
+
+ local d
+
+ # Build the host tools first.
+ LDFLAGS="${BUILD_LDFLAGS}" \
+ XCFLAGS="${BUILD_CFLAGS}" \
+ NSPR_LIB_DIR="${T}/fakedir" \
+ emake -j1 -C coreconf \
+ CC="$(tc-getBUILD_CC)" \
+ ${buildbits-${mybits}}
+ makeargs+=( NSINSTALL="${PWD}/$(find -type f -name nsinstall)" )
+
+ # Then build the target tools.
+ for d in . lib/dbm ; do
+ CPPFLAGS="${myCPPFLAGS}" \
+ XCFLAGS="${CFLAGS} ${CPPFLAGS}" \
+ NSPR_LIB_DIR="${T}/fakedir" \
+ emake -j1 "${makeargs[@]}" -C ${d}
+ done
+}
+
+# Altering these 3 libraries breaks the CHK verification.
+# All of the following cause it to break:
+# - stripping
+# - prelink
+# - ELF signing
+# http://www.mozilla.org/projects/security/pki/nss/tech-notes/tn6.html
+# Either we have to NOT strip them, or we have to forcibly resign after
+# stripping.
+#local_libdir="$(get_libdir)"
+#export STRIP_MASK="
+# */${local_libdir}/libfreebl3.so*
+# */${local_libdir}/libnssdbm3.so*
+# */${local_libdir}/libsoftokn3.so*"
+
+export NSS_CHK_SIGN_LIBS="freebl3 nssdbm3 softokn3"
+
+generate_chk() {
+ local shlibsign="$1"
+ local libdir="$2"
+ einfo "Resigning core NSS libraries for FIPS validation"
+ shift 2
+ local i
+ for i in ${NSS_CHK_SIGN_LIBS} ; do
+ local libname=lib${i}.so
+ local chkname=lib${i}.chk
+ "${shlibsign}" \
+ -i "${libdir}"/${libname} \
+ -o "${libdir}"/${chkname}.tmp \
+ && mv -f \
+ "${libdir}"/${chkname}.tmp \
+ "${libdir}"/${chkname} \
+ || die "Failed to sign ${libname}"
+ done
+}
+
+cleanup_chk() {
+ local libdir="$1"
+ shift 1
+ local i
+ for i in ${NSS_CHK_SIGN_LIBS} ; do
+ local libfname="${libdir}/lib${i}.so"
+ # If the major version has changed, then we have old chk files.
+ [ ! -f "${libfname}" -a -f "${libfname}.chk" ] \
+ && rm -f "${libfname}.chk"
+ done
+}
+
+multilib_src_install() {
+ pushd dist >/dev/null || die
+
+ dodir /usr/$(get_libdir)
+ cp -L */lib/*$(get_libname) "${ED}"/usr/$(get_libdir) || die "copying shared libs failed"
+ local i
+ for i in crmf freebl nssb nssckfw ; do
+ cp -L */lib/lib${i}.a "${ED}"/usr/$(get_libdir) || die "copying libs failed"
+ done
+
+ # Install nss-config and pkgconfig file
+ dodir /usr/bin
+ cp -L */bin/nss-config "${ED}"/usr/bin || die
+ dodir /usr/$(get_libdir)/pkgconfig
+ cp -L */lib/pkgconfig/nss.pc "${ED}"/usr/$(get_libdir)/pkgconfig || die
+
+ # create an nss-softokn.pc from nss.pc for libfreebl and some private headers
+ # bug 517266
+ sed -e 's#Libs:#Libs: -lfreebl#' \
+ -e 's#Cflags:#Cflags: -I${includedir}/private#' \
+ */lib/pkgconfig/nss.pc >"${ED}"/usr/$(get_libdir)/pkgconfig/nss-softokn.pc \
+ || die "could not create nss-softokn.pc"
+
+ # all the include files
+ insinto /usr/include/nss
+ doins public/nss/*.{h,api}
+ insinto /usr/include/nss/private
+ doins private/nss/{blapi,alghmac,cmac}.h
+
+ popd >/dev/null || die
+
+ local f nssutils
+ # Always enabled because we need it for chk generation.
+ nssutils=( shlibsign )
+
+ if multilib_is_native_abi ; then
+ if use utils; then
+ # The tests we do not need to install.
+ #nssutils_test="bltest crmftest dbtest dertimetest
+ #fipstest remtest sdrtest"
+ # checkcert utils has been removed in nss-3.22:
+ # https://bugzilla.mozilla.org/show_bug.cgi?id=1187545
+ # https://hg.mozilla.org/projects/nss/rev/df1729d37870
+ # certcgi has been removed in nss-3.36:
+ # https://bugzilla.mozilla.org/show_bug.cgi?id=1426602
+ nssutils+=(
+ addbuiltin
+ atob
+ baddbdir
+ btoa
+ certutil
+ cmsutil
+ conflict
+ crlutil
+ derdump
+ digest
+ makepqg
+ mangle
+ modutil
+ multinit
+ nonspr10
+ ocspclnt
+ oidcalc
+ p7content
+ p7env
+ p7sign
+ p7verify
+ pk11mode
+ pk12util
+ pp
+ rsaperf
+ selfserv
+ signtool
+ signver
+ ssltap
+ strsclnt
+ symkeyutil
+ tstclnt
+ vfychain
+ vfyserv
+ )
+ # install man-pages for utils (bug #516810)
+ doman doc/nroff/*.1
+ fi
+ pushd dist/*/bin >/dev/null || die
+ for f in ${nssutils[@]}; do
+ dobin ${f}
+ done
+ popd >/dev/null || die
+ fi
+
+ # Prelink breaks the CHK files. We don't have any reliable way to run
+ # shlibsign after prelink.
+ dodir /etc/prelink.conf.d
+ printf -- "-b ${EPREFIX}/usr/$(get_libdir)/lib%s.so\n" ${NSS_CHK_SIGN_LIBS} \
+ > "${ED}"/etc/prelink.conf.d/nss.conf
+}
+
+pkg_postinst() {
+ multilib_pkg_postinst() {
+ # We must re-sign the libraries AFTER they are stripped.
+ local shlibsign="${EROOT}/usr/bin/shlibsign"
+ # See if we can execute it (cross-compiling & such). #436216
+ "${shlibsign}" -h >&/dev/null
+ if [[ $? -gt 1 ]] ; then
+ shlibsign="shlibsign"
+ fi
+ generate_chk "${shlibsign}" "${EROOT}"/usr/$(get_libdir)
+ }
+
+ multilib_foreach_abi multilib_pkg_postinst
+}
+
+pkg_postrm() {
+ multilib_pkg_postrm() {
+ cleanup_chk "${EROOT}"/usr/$(get_libdir)
+ }
+
+ multilib_foreach_abi multilib_pkg_postrm
+}
diff --git a/dev-libs/opencl-clang/Manifest b/dev-libs/opencl-clang/Manifest
index e2d356e9bbbb..bc5ec177e1b2 100644
--- a/dev-libs/opencl-clang/Manifest
+++ b/dev-libs/opencl-clang/Manifest
@@ -1,10 +1,8 @@
AUX opencl-clang-8.0.0-clang_library_dir.patch 468 BLAKE2B 09315ce9250920caf8c84853a5cf08506b01d91f7c993273be910b38f9c97f1f31e1042d75a111734eaa86fad771bed5b09c6c9001e253c71f26bd7c1e668dcd SHA512 c5a715c05c7bc7b904a46cac8d6a10f161da6d978401c5c60853a19dfb63c65690994bdc57fe327ee36bb5b6151a0018d6931c38553917f2dc82e9cef44e0b0d
+DIST opencl-clang-10.0.0.1.tar.gz 23549 BLAKE2B 8663da4525507862835ebc14fb4666d9f2f3cca0a2c08aadfc2875bc285e604e81b21ccc7476976eea2e3eb1ce88ae7b187c2d0ce085fc3ede1a2dbfea0789eb SHA512 406e27d90ae26a2f8ade04172bf680f8786011c7e8357a40b15c8bbfd933d0f1c5e0c114e371036318439fcab999ec5f141dab2df4b498eb9d2548bf175f8502
DIST opencl-clang-8.0.1.1.tar.gz 42534 BLAKE2B e0dc6a4cc6f738f0f5cecfa9ef5b2c219dc1f1714cb5ff2dbf0d7a9ff9efe4cdd4ce0b3780f0ca53f9582b0b73b2cbfad28a9ddec76ef8f6978ee31fa3ee111c SHA512 8456a99668f7709d601ab49c6f8219a1de74363f270e606b5832cb13f196d65b6fe6cb961430b3f45875fec49a2f06c178e935cf3d1b118d033583d90611df15
-DIST opencl-clang-8.0.1_p20191001.tar.gz 41402 BLAKE2B 0ab3cc4f84a9e3e599d4e0995f219b94761b882a6290d9c1e399bf820074b72daab935a9d48d09d3e02d1b46659fc8c00613f35e88f0231234e31f93ca6e4d7a SHA512 87f3855bd2cc9a416f317afc98ad7cd1cfcb5bf4b2ebf7401837c1734b1c8d10e07843aab78735bf48888523b231db1911014a6468c0b4c461c43a5434a31ada
-DIST opencl-clang-9.0.0.tar.gz 23345 BLAKE2B adbce64efb2c1e4e96d4aff585c0f18bd06036a60b35164681b9f5b4a6c89933e5428e9959ddd3cec89b93a5c350e6b0f9b15b8be2be42cd520ca55852352df5 SHA512 126974d816e7f2a90ddb2faa4e8e95841d8ae15f24e77013ca8894ce75ad5079ffe942fb40731030363a10e470e66f2ad1794c2fe31aee6f8608304b492b30eb
DIST opencl-clang-9.0.1.tar.gz 24574 BLAKE2B 2e3b69c10b572678f91e92fa0ca885dd9332d172c483c394f4c1b140a5fd926b26eff4d4ab722733e1e164ff99a6eb397b8bc9e30a0b7e289506432fd1291b2b SHA512 01c5011dc1ea66288f3e425f85c921142fd3bc5a3d79eeafe5c14b5741b8281f17727cbffa7ed31869f7704be957d2fed5e5e8a57ab31e7b8c3a9688f048cced
+EBUILD opencl-clang-10.0.0.1.ebuild 925 BLAKE2B f6e350c58f52b4c2a007d83f6471c6b36d7a2a9886ad35c4363b97f7fe6f8e637b82950240f99220b81ee88816c5568e06350598a6cea51f297625370b452a8a SHA512 9113a60cb3f1ee68381d9f3257115f0b285c6c378903c7c16320db38831ed6deaad960ae79f61f80bda6a7be6e9f36f27b23cf0f65edc3fc535cd3159a85b6df
EBUILD opencl-clang-8.0.1.1.ebuild 921 BLAKE2B 8b2cf2b0c8bfe1b61bf1ffa4be24b19a136379e84243123239b2b701da9d3c65790cc331e979e64e8dddaa81b79cd25b701d23f6db6d8d1df9986b176e52df8b SHA512 bbf66ab48750c3f3bc6f4ed3209dd4e11d1fc7f6d45ff5b67a55e5670ea91420e19b02420b86e08a20162c826a2b613613df3311bf95591c438089156adf1f98
-EBUILD opencl-clang-8.0.1_p20191001-r1.ebuild 913 BLAKE2B 812cdfd7ca1d00e2fe0e6456260723ba6a242abc84c3bfc737f56961c94ebdd805091503e21efe05cf00d3e6d3de58744ca2fb52a4205a0e56085423b209b349 SHA512 123e5cafa2491543016f850e941da71c7a0b8e3d75c6371ba4707f7a2f81abd7bdf230613538ba5acc94105d5647a6e44207060230775732ba03bb8f9b78c444
-EBUILD opencl-clang-9.0.0.ebuild 849 BLAKE2B ff47beb350350bae14ebcc1ead16831bed53855064681f3c43ff946cce77cd14117a97637f3bb7c18e9e3b3d6f91f7c9665eb9ea7927befa2cf01bdda3e6f667 SHA512 6176a5dfbd614ac9466b618ca50e4a4385097d2bb8520b85809327cc7caff722509c587532ac969883bb1deee24bdad96b1e07cb17131cd34ce4070eaff6a9ac
EBUILD opencl-clang-9.0.1.ebuild 849 BLAKE2B ff47beb350350bae14ebcc1ead16831bed53855064681f3c43ff946cce77cd14117a97637f3bb7c18e9e3b3d6f91f7c9665eb9ea7927befa2cf01bdda3e6f667 SHA512 6176a5dfbd614ac9466b618ca50e4a4385097d2bb8520b85809327cc7caff722509c587532ac969883bb1deee24bdad96b1e07cb17131cd34ce4070eaff6a9ac
MISC metadata.xml 329 BLAKE2B d50cf1fac225c2240bd4af19962089d9b7446549d9cc7067d860218e76013acfbc65f40abfffded01c098b06dd4c8a5688c94e40710ecdf6e7db71e05816498d SHA512 de4a3177f7091c00cd54f5eb52d8d88ae88d207ca72acd71c824220593d27ebdbf3673459ab48440373af19eb88603a5fcdd5956597d816927c9663be177eccb
diff --git a/dev-libs/opencl-clang/opencl-clang-9.0.0.ebuild b/dev-libs/opencl-clang/opencl-clang-10.0.0.1.ebuild
index 076afad8c68a..d09e936af38b 100644
--- a/dev-libs/opencl-clang/opencl-clang-9.0.0.ebuild
+++ b/dev-libs/opencl-clang/opencl-clang-10.0.0.1.ebuild
@@ -6,21 +6,26 @@ EAPI=7
CMAKE_ECLASS=cmake
inherit cmake-multilib llvm
+MY_PV="$(ver_rs 3 -)"
+MY_P="${PN}-${MY_PV}"
+
DESCRIPTION="OpenCL-oriented thin wrapper library around clang"
HOMEPAGE="https://github.com/intel/opencl-clang"
-SRC_URI="https://github.com/intel/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/intel/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
LICENSE="UoI-NCSA"
-SLOT="9"
+SLOT="10"
KEYWORDS="~amd64"
+S="${WORKDIR}/${MY_P}"
+
BDEPEND="dev-vcs/git"
-COMMON="sys-devel/clang:9=[static-analyzer,${MULTILIB_USEDEP}]"
+COMMON="sys-devel/clang:10=[static-analyzer,${MULTILIB_USEDEP}]"
DEPEND="${COMMON}
- dev-util/spirv-llvm-translator:9=[${MULTILIB_USEDEP}]"
+ dev-util/spirv-llvm-translator:10=[${MULTILIB_USEDEP}]"
RDEPEND="${COMMON}"
-LLVM_MAX_SLOT=9
+LLVM_MAX_SLOT=10
PATCHES=(
"${FILESDIR}"/${PN}-8.0.0-clang_library_dir.patch
diff --git a/dev-libs/opencl-clang/opencl-clang-8.0.1_p20191001-r1.ebuild b/dev-libs/opencl-clang/opencl-clang-8.0.1_p20191001-r1.ebuild
deleted file mode 100644
index 616cb77c650d..000000000000
--- a/dev-libs/opencl-clang/opencl-clang-8.0.1_p20191001-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-multilib llvm vcs-snapshot
-
-EGIT_COMMIT="94af090661d7c953c516c97a25ed053c744a0737"
-
-DESCRIPTION="OpenCL-oriented thin wrapper library around clang"
-HOMEPAGE="https://github.com/intel/opencl-clang"
-SRC_URI="https://github.com/intel/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="UoI-NCSA"
-SLOT="8"
-KEYWORDS="~amd64"
-
-BDEPEND="dev-vcs/git"
-COMMON="sys-devel/clang:8=[static-analyzer,${MULTILIB_USEDEP}]"
-DEPEND="${COMMON}
- dev-util/spirv-llvm-translator:8=[${MULTILIB_USEDEP}]"
-RDEPEND="${COMMON}"
-
-LLVM_MAX_SLOT=8
-
-PATCHES=(
- "${FILESDIR}"/${PN}-8.0.0-clang_library_dir.patch
-)
-
-multilib_src_configure() {
- local mycmakeargs=(
- -DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix ${LLVM_MAX_SLOT})"
- -DCLANG_LIBRARY_DIRS="${EPREFIX}"/usr/lib/clang
- )
- cmake-utils_src_configure
-}
diff --git a/dev-libs/opencl-icd-loader/Manifest b/dev-libs/opencl-icd-loader/Manifest
index c544d9f72708..66e4ea3bbdaa 100644
--- a/dev-libs/opencl-icd-loader/Manifest
+++ b/dev-libs/opencl-icd-loader/Manifest
@@ -1,3 +1,5 @@
DIST opencl-icd-loader-2020.03.13.tar.gz 57833 BLAKE2B 7d74ce808f446554c92fea1e431f2026ed33b6c19a6dd6bf832184f8e4fb34a362464e5b844e99b1866afe55b7a521fa669388f868549882a4fde5c4c3c9313b SHA512 56dadf660d4add8cf779e389be1b4d60742b293c5452d7b114b79fe0d96591e56f338303ea991f1b77a40d321a23d53cb1ad9cc95bec502594ee18335641f060
+DIST opencl-icd-loader-2020.06.16.tar.gz 60478 BLAKE2B e80bb051868842356a22141dc624a93a9e473673dc5b78e01d54b76c309c1deea256ae1fdf1e1777ea8842ffc33d3b92ab8b6fbe64454cbbf2ea0306523f0bfd SHA512 3cba77a0334976e27aeb60f3f29919b7b8e70ed1ea1d53e278a2873149a6b291323b19292e7a51a1decb27b304395ced22d400c1f750088f8a006c21d42fe94c
EBUILD opencl-icd-loader-2020.03.13-r1.ebuild 1068 BLAKE2B 7bacea0b4e36efb729e59bbc42ee7ed011ff4c2c756616de604b3197c333a6da91f79dd9dd1e7e43bbae4d703246f8afa890100a954fb7e51069240480da66c5 SHA512 1e2d7d06bea5fdf73d95553e34e48e00011e605f64fd140981edd9f317449c665569d15830a75671cd2d601c40d796f8051866412977e1ba5c35c3a663e53722
+EBUILD opencl-icd-loader-2020.06.16.ebuild 1070 BLAKE2B b24fac6217b7b8c5f23b1a6cb6d6556fc54736d9d3fd7e966a6cb96266a4b26950c46fc3b384fda608fa1d05d91f07ddd4d60573c1d40a9f12f3d9aaf8d86486 SHA512 ad6267973a1f4f4a8874f71525985f9394e83904e8ee5a66aff07fea0b8e01b04c0b66235b1e04ca65690f3a5c3cf50f92040ad0cec2e3565b312961def01027
MISC metadata.xml 341 BLAKE2B 8247bc53586bf8ddce72fd2cfbf2db0121e2dfe7b39c15fce5c9351f4db01df288ef4ab0e1e39af56a1da1022ab6f7bf68afb50f26165d253b422056899db998 SHA512 4d82edd65e1745e9550a10f02d865c73e0438799ee7f5fb1d4147af4ddc7c5ae8c978542bbdb8c9f99b33c8dfe203a56c891351b6d4aba831d39224e1b26010e
diff --git a/dev-libs/opencl-icd-loader/opencl-icd-loader-2020.06.16.ebuild b/dev-libs/opencl-icd-loader/opencl-icd-loader-2020.06.16.ebuild
new file mode 100644
index 000000000000..47205d26a955
--- /dev/null
+++ b/dev-libs/opencl-icd-loader/opencl-icd-loader-2020.06.16.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib flag-o-matic
+
+MY_PN="OpenCL-ICD-Loader"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Official Khronos OpenCL ICD Loader"
+HOMEPAGE="https://github.com/KhronosGroup/OpenCL-ICD-Loader"
+SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RESTRICT="!test? ( test )"
+
+DEPEND="dev-util/opencl-headers
+ !app-eselect/eselect-opencl
+ !dev-libs/ocl-icd"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+ # Until the next upstream release. Bug #716410
+ if use test; then
+ append-cflags $(test-flags-CC -fcommon)
+ fi
+
+ cmake_src_prepare
+}
+
+multilib_src_configure() {
+ local mycmakeargs=(
+ -DBUILD_TESTING=$(usex test)
+ -DOPENCL_ICD_LOADER_HEADERS_DIR="${EPREFIX}/usr/include"
+ )
+ cmake_src_configure
+}
+
+multilib_src_test() {
+ OCL_ICD_FILENAMES="${BUILD_DIR}/test/driver_stub/libOpenCLDriverStub.so" \
+ cmake_src_test
+}
diff --git a/dev-libs/opensc/Manifest b/dev-libs/opensc/Manifest
index 859089030687..24cffd3fbb4e 100644
--- a/dev-libs/opensc/Manifest
+++ b/dev-libs/opensc/Manifest
@@ -1,3 +1,4 @@
+AUX opensc-0.20.0-gcc10.patch 1132 BLAKE2B 1afde2a2a92c85a1435bf6b2f4cf9d44fec836effb1867c8e28bd4a4b8ec78dbf1d7ea075c77bfa2ff0a585ba62068765a093cfe8925deea4f9c4972bf04930f SHA512 d7cabea0090b6c05ffd5f597261f06afa3ba0f051e1b75f715a6fa50c59cd10663f023f570af8f76532dd5a3bb8a76d5cd6b26872de271e3eadae29c3ba7bd27
DIST opensc-0.20.0.tar.gz 2140645 BLAKE2B 298a6d9c8a9682899cae201ba7edd464a2e3d947f6d97672727bedc47f6b529cb1495a8bc335f83cdb42b0c0077de0fd7ff9f3f8f506b543b1970cb6557b762e SHA512 71f71fa6062410e63c6c60f5b2d10d1d855cc6cc815ef0e42e42a1ddd25bbd52fc396c1e495ef54610f3243996dec84dacc8007b186deb670ed645b04ee6eda5
-EBUILD opensc-0.20.0.ebuild 1644 BLAKE2B 5d9381c45835959f5b58fed17bcb462c65e57e7cfa97e77b824e1310baf57a73bdc6f60a9ce25ab68cfcbc82e546e8c1f7ff855b52cb70073d716c14447e434e SHA512 3b05dd6371fe7898d5cda9dac9f1ad4da67365b81fa0402b0b77b2d97bebc1a3260cd2dab5028a56f3636e274d97a349a6cf9b26bfa46a3f675ba6591310ce4d
+EBUILD opensc-0.20.0.ebuild 1689 BLAKE2B 028e0d4a6c6eb6e627e4f225d264c57eba5e88998912f1eee3474bca5bb24fd7a18cc8a4b5dbca203bda357c82256b402d7c1e23a7aa26a648544f44d8c547d6 SHA512 9b82334aef15c1fb91dd4ca377f2214828b9eb7721f0ec25e0f7e4be5fa1700f55280741e2a79d67ef3c5d5c52d4249f123f1db776ee40775a8dfbee0ae4e533
MISC metadata.xml 1221 BLAKE2B aa9934df0dd5e4e1a6ae184f3570a98bde999d745c5f722f3e7bf922510d11129dd54fc385f64814e17dde1d8d3b427b5632574b128d768ef66d8f4be28778c6 SHA512 5acccb40f140614c9c6f79f13449174fc76ba0028bfd3ed099d1ed633e601a9972cdc2167e9ba2e5aab3827847942a43c98d1b6c404af34375305dd96830b3bd
diff --git a/dev-libs/opensc/files/opensc-0.20.0-gcc10.patch b/dev-libs/opensc/files/opensc-0.20.0-gcc10.patch
new file mode 100644
index 000000000000..f96a1140872e
--- /dev/null
+++ b/dev-libs/opensc/files/opensc-0.20.0-gcc10.patch
@@ -0,0 +1,37 @@
+From 5450f61681d0c46c587dbe789bf19f1cb573e794 Mon Sep 17 00:00:00 2001
+From: Jakub Jelen <jjelen@redhat.com>
+Date: Mon, 10 Feb 2020 15:09:17 +0100
+Subject: [PATCH] Unbreak build with -fno-common (default in gcc10)
+
+---
+ src/tests/p11test/p11test.c | 3 +++
+ src/tests/p11test/p11test_common.h | 2 +-
+ 2 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/src/tests/p11test/p11test.c b/src/tests/p11test/p11test.c
+index feecf6fb42..a16282cba3 100644
+--- a/src/tests/p11test/p11test.c
++++ b/src/tests/p11test/p11test.c
+@@ -34,6 +34,9 @@
+
+ #define DEFAULT_P11LIB "../../pkcs11/.libs/opensc-pkcs11.so"
+
++/* Global variable keeping information about token we are using */
++token_info_t token;
++
+ void display_usage() {
+ fprintf(stdout,
+ " Usage:\n"
+diff --git a/src/tests/p11test/p11test_common.h b/src/tests/p11test/p11test_common.h
+index 2f3b238de0..9eb5cedecb 100644
+--- a/src/tests/p11test/p11test_common.h
++++ b/src/tests/p11test/p11test_common.h
+@@ -84,7 +84,7 @@ typedef struct {
+ size_t num_keygen_mechs;
+ } token_info_t;
+
+-token_info_t token;
++extern token_info_t token;
+
+ #endif /* P11TEST_COMMON_H */
+
diff --git a/dev-libs/opensc/opensc-0.20.0.ebuild b/dev-libs/opensc/opensc-0.20.0.ebuild
index d32490c9e604..fdfd50b8daa8 100644
--- a/dev-libs/opensc/opensc-0.20.0.ebuild
+++ b/dev-libs/opensc/opensc-0.20.0.ebuild
@@ -36,6 +36,10 @@ REQUIRED_USE="
ctapi? ( !pcsc-lite !openct )
|| ( pcsc-lite openct ctapi )"
+PATCHES=(
+ "${FILESDIR}/${P}-gcc10.patch"
+)
+
src_prepare() {
default
elibtoolize
diff --git a/dev-libs/protobuf-c/Manifest b/dev-libs/protobuf-c/Manifest
index e2b106019631..44a3c3069fda 100644
--- a/dev-libs/protobuf-c/Manifest
+++ b/dev-libs/protobuf-c/Manifest
@@ -1,4 +1,4 @@
AUX protobuf-c-1.3.0-no-build-tests.patch 1020 BLAKE2B adda0e4764283d00093709bc97500187521c1d099c6a057513cd4c4ab3b595479f62e7f90bc28ee062f7cae8a760445c78334468f25291320b74d46a5bb454cc SHA512 c6b6f37d8d0fb1ac14e650cc521034267b0af06525249078cc81fc8a3d551dc446bb5285228ca349ce18581979ea88eb9765233154cfbbedd8c4a937987d2684
DIST protobuf-c-1.3.2.tar.gz 500100 BLAKE2B b8bcd4ad6f9ddc05f28526f7cc58778b21a34fc18c7c7aa2a5bb45ae7fdc7c5d8957f989fe1bbfe353214ca87b02afed8cf0ad43c0f0e39f7e13059a5dfd6b7d SHA512 d94d2c6f11b3e482fd3d1b8cef5b2d896ad37a679068f393d29916311deadc5b6b86f946b046d7ee49260b0223e3128e052dc76324b4a8cd6ea184d566ad9aa6
-EBUILD protobuf-c-1.3.2.ebuild 995 BLAKE2B 10fade976f873f05fcee51121b2721ca73d54235739842fa9af74bc483f95fa6d75ae42c766192066edf411410665283cb71a214c837ae6dc219b6f0cc2cd24e SHA512 1cd9dbd58604c8fbb4670e6035f3d10700a6b8b61b032bac4a16f8daa8bda6dca4e958094ca146fcb75bba50ee2573ee9f617b9c7ee6d7e0c3105c49981a95d8
+EBUILD protobuf-c-1.3.2.ebuild 975 BLAKE2B e6692ca39ad4ebae30d6f78fb770e7c0b7c75277d784f3b9c77f3dd9810e11d1be30901241deeef494426ef02d28b52e9364cf09df4f8cc03fcaedce6e0f9d98 SHA512 24aa2f2b915d4fc48a6608ffd61dc666c9d4505ab33ec8256a3d8718549dbfcb1dfe7371475b1cec5686d82ecef22e84084376d6e2673253ae375047c47f8c21
MISC metadata.xml 258 BLAKE2B 4600b6e0e51f9c280726dd71ec122d3c51e0c2b1f8b4ef208a1c9838a01d405bedce2cfd6949bb2dbcc448f76f45c717a630eed98fb9d0ad06c91dafdc2ad288 SHA512 92e3b05f2cf1d2ff09b852d2ad8707f55b4cd3fc78df317fa5234a9c0018405cfad67d90211435963983440228dfb75de28ab7ee62f1a80bb97192768d93ce92
diff --git a/dev-libs/protobuf-c/protobuf-c-1.3.2.ebuild b/dev-libs/protobuf-c/protobuf-c-1.3.2.ebuild
index 3c3dc101011b..b47188055827 100644
--- a/dev-libs/protobuf-c/protobuf-c-1.3.2.ebuild
+++ b/dev-libs/protobuf-c/protobuf-c-1.3.2.ebuild
@@ -20,7 +20,7 @@ IUSE="static-libs test"
RESTRICT="!test? ( test )"
BDEPEND=">=dev-libs/protobuf-3:0
- virtual/pkgconfig[${MULTILIB_USEDEP}]"
+ virtual/pkgconfig"
DEPEND=">=dev-libs/protobuf-3:0=[${MULTILIB_USEDEP}]"
RDEPEND="${DEPEND}"
diff --git a/dev-libs/protobuf/Manifest b/dev-libs/protobuf/Manifest
index 9ac18ac0d5b4..d087a635ec67 100644
--- a/dev-libs/protobuf/Manifest
+++ b/dev-libs/protobuf/Manifest
@@ -7,10 +7,8 @@ AUX protobuf-3.8.0-disable_no-warning-test.patch 965 BLAKE2B 0183ed17104e192fbd9
AUX protobuf-3.8.0-protoc_input_output_files.patch 10351 BLAKE2B 54115688e2fb6a7b8c33cd2efb4dddd777f4d536f4b078badb60d6e458766b69c915fe4091f4ca379eee59d75875bcab9837a96bc461b6a60c15b93000fa7e38 SHA512 2e18b47aa82a035a76c45d6f80de7818449f6358e0e253cb6330158bf9d5b213052b372797189246eaeebea8497b289e8a0de16441f25bcae81ab807733bcf60
AUX protobuf-3.8.0-system_libraries.patch 6352 BLAKE2B fde8a49ac3034320d9ae03479127946b1b50a0fe64d388132a129d8cd0a5cb6eb82565e82089fd1dada83848ef494fa87eac8dec4cd4b90dde580123dbe7f006 SHA512 0264d20c585312345315364a4732905abcca569535460d274528ddb6dcef6cdcb9661804f22c8cb209a7123fb41df7974ac739baa65debe0b676b2b902482d4a
DIST protobuf-3.10.1.tar.gz 4905995 BLAKE2B 1dde3b6260918da8430c2ce69210462f339c492b2a4e53d5d9c1bea3747aead905370507fc4bd703560f6885c0f3f8393a998b875c19744ad94827109ecbb49f SHA512 aba0c4034c0d3b1759904adb6270eee94dd5dc568f433b219e3f1f70c0033993cdfa3bf476ad3f5767c7629edb9fd029c686405abf93731dde808286b336330d
-DIST protobuf-3.11.2.tar.gz 5133897 BLAKE2B 275ea52a072b4e0226e4b6dc476d4bc28e8f4f05bca0709eab51da91c02869e96c3b0ac9ab4cc46290f875d4eac6ac72374c5b45e27fa89ad3d58fd56a2c8b7e SHA512 8319c1e003e5fc64e91b512de016ec1cf10265b294d3b4beea60856beaeb02b4d7682343c74b2c12b0f6d4d6258451af9b9d72bcb4b495293b7637da21030c8f
DIST protobuf-3.11.4.tar.gz 5140799 BLAKE2B 97b450c0623593efe6a42b66582ff183344b8831689e6a5b4d36096dbd57c33da9569bbf26578536aaf73ecd866ac0588b6cb7d55a6a9b9a6e840d4c57099001 SHA512 777bbb0e9e2375eaebe6b8c87abd660bac70ee469c9ad00dd25917b82d7fb5bbe33cf87f0d69c90e19d55c07a7285ec20974ba4768623ce9ccfadf147fd5e261
-EBUILD protobuf-3.10.1.ebuild 2909 BLAKE2B 4b09a1969c93889e20d666641e308ef9c9a40506340427a5702aee4c12d10d94c71524693fc43159c7c9ae2c148999b60749c5d07d63f13ccb9233fab5970f94 SHA512 d37cf60bec4c3fba24f64a330ecb081a6adee3b5c4a717d5530d7e340393cbf02c95b84906e95c61587f68f71719e89d866181f550f946fb9fadbcba2f8bcba1
-EBUILD protobuf-3.11.2.ebuild 2907 BLAKE2B e0d3ef76cbc74c1c8c4f4424d2c8dd40a0ba153d82b4aee0f4ea08858ad9b63636319c04ee07ad78546e4631586696f7ae708a3ad13bb13febd930336b692032 SHA512 51367595a42beeb4fdcd1439cc6ded6a0dcf08e629123db9791cbc6b5e1c13fed54ca2b736971c530c698643aea77680b350186aceddf1459796a9929c4a393f
-EBUILD protobuf-3.11.4.ebuild 2898 BLAKE2B 3ac70b32ce07dcf467450c1d819afa64dd5b19bf231280ac76867b2d12d65d72c92068cbbc5c84545bc72369ebf27b6d31b7565cf2d751b942fbf9d45758d504 SHA512 d327248e60f0f591509d2710d4d6f2c6733663071648c9933027363eb26c9f4a1396bf29b2d62326af7483baab04eddd565720ac13a78b00fd1e9115cc172d38
+EBUILD protobuf-3.10.1.ebuild 3030 BLAKE2B e555296b22b00886ca0557dbb90a8ca544fc650895fda3face5e32e886dea426f7c61334fdafaa6fa71a9e47cf675cc0e0f4145e9c57ede5d68fb3597322732d SHA512 18203bed470210102b6e5301a231af2c792ceb14c124a78516dce7a8af564aacbf48a94b67bd1af8b9e93baf3b04dde87021e7d18ac5da92df856e06a5fa4c7d
+EBUILD protobuf-3.11.4.ebuild 3019 BLAKE2B b8efa8797e32842f1009580492a26fb0557a9555713875012d13aa4de247417c81c451ea0c6eeaf8a784a497591a29afa6516422a48c29c87e1e962d4f945617 SHA512 0955a68f5d0aed9a963c43aaf04f649a019dbf2a93f38f3561f7a276dfa8b3877291448dbb3680b89b4643d3ad6b1d3f621504614171c001ca6373eb9bf03cd3
EBUILD protobuf-9999.ebuild 2679 BLAKE2B 86ff0785f236a285bd2f01a95546791a05528a8e45612a76c149f90a807ba292211bd5950b5f97530f14dffc69a78b17fd7657b9f2dd2c5270bf78a5f0ec71e7 SHA512 8f50fce8cca5c71acfb026c50c561de922c9f4bcdeee6559f1d01ed840c80d4922a777e854871501006cc743928f563b26e8b0c73691318a7a097cd6f615b5a0
MISC metadata.xml 627 BLAKE2B e908d6d2ab7bf7886f09af02f2a2828bcd9d6909ad7b421e0879551c24ab382733c2140def8132c70d7b6a0f8074651773476e9a645c64440ef596a7f62319d0 SHA512 2f60739bbea23091942893776b29257ed556c3d98351e0e9455852e8ea6b275d3ecca613c81ed35c009431c3e5fb378a77259f13c470359526ccbdff4033d86b
diff --git a/dev-libs/protobuf/protobuf-3.10.1.ebuild b/dev-libs/protobuf/protobuf-3.10.1.ebuild
index 207d865f9404..53bd166190bc 100644
--- a/dev-libs/protobuf/protobuf-3.10.1.ebuild
+++ b/dev-libs/protobuf/protobuf-3.10.1.ebuild
@@ -42,6 +42,10 @@ DOCS=(CHANGES.txt CONTRIBUTORS.txt README.md)
src_prepare() {
default
+
+ # https://github.com/protocolbuffers/protobuf/issues/7413
+ sed -e "/^AC_PROG_CXX_FOR_BUILD$/d" -i configure.ac || die
+
eautoreconf
}
diff --git a/dev-libs/protobuf/protobuf-3.11.2.ebuild b/dev-libs/protobuf/protobuf-3.11.2.ebuild
deleted file mode 100644
index 44c26d8d35ef..000000000000
--- a/dev-libs/protobuf/protobuf-3.11.2.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 2008-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit autotools elisp-common flag-o-matic multilib-minimal toolchain-funcs
-
-if [[ "${PV}" == "9999" ]]; then
- inherit git-r3
-
- EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf"
- EGIT_SUBMODULES=()
-fi
-
-DESCRIPTION="Google's Protocol Buffers - Extensible mechanism for serializing structured data"
-HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
-if [[ "${PV}" == "9999" ]]; then
- SRC_URI=""
-else
- SRC_URI="https://github.com/protocolbuffers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-LICENSE="BSD"
-SLOT="0/22"
-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 )"
-
-BDEPEND="emacs? ( app-editors/emacs:* )"
-DEPEND="test? ( >=dev-cpp/gtest-1.9[${MULTILIB_USEDEP}] )
- zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
-RDEPEND="emacs? ( app-editors/emacs:* )
- zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
-
-PATCHES=(
- "${FILESDIR}/${PN}-3.11.0-disable_no-warning-test.patch"
- "${FILESDIR}/${PN}-3.11.0-system_libraries.patch"
- "${FILESDIR}/${PN}-3.11.0-protoc_input_output_files.patch"
-)
-
-DOCS=(CHANGES.txt CONTRIBUTORS.txt README.md)
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- append-cppflags -DGOOGLE_PROTOBUF_NO_RTTI
-
- if tc-ld-is-gold; then
- # https://sourceware.org/bugzilla/show_bug.cgi?id=24527
- tc-ld-disable-gold
- fi
-
- multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
- local options=(
- $(use_enable static-libs static)
- $(use_with zlib)
- )
-
- if tc-is-cross-compiler; then
- # Build system uses protoc when building, so protoc copy runnable on host is needed.
- mkdir -p "${WORKDIR}/build" || die
- pushd "${WORKDIR}/build" > /dev/null || die
- ECONF_SOURCE="${S}" econf_build "${options[@]}"
- options+=(--with-protoc="$(pwd)/src/protoc")
- popd > /dev/null || die
- fi
-
- ECONF_SOURCE="${S}" econf "${options[@]}"
-}
-
-src_compile() {
- multilib-minimal_src_compile
-
- if use emacs; then
- elisp-compile editors/protobuf-mode.el
- fi
-}
-
-multilib_src_compile() {
- if tc-is-cross-compiler; then
- emake -C "${WORKDIR}/build/src" protoc
- fi
-
- default
-}
-
-multilib_src_test() {
- emake check
-}
-
-multilib_src_install_all() {
- find "${D}" -name "*.la" -type f -delete || die
-
- insinto /usr/share/vim/vimfiles/syntax
- doins editors/proto.vim
- insinto /usr/share/vim/vimfiles/ftdetect
- doins "${FILESDIR}/proto.vim"
-
- if use emacs; then
- elisp-install ${PN} editors/protobuf-mode.el*
- elisp-site-file-install "${FILESDIR}/70${PN}-gentoo.el"
- fi
-
- if use examples; then
- DOCS+=(examples)
- docompress -x /usr/share/doc/${PF}/examples
- fi
-
- einstalldocs
-}
-
-pkg_postinst() {
- use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
-}
diff --git a/dev-libs/protobuf/protobuf-3.11.4.ebuild b/dev-libs/protobuf/protobuf-3.11.4.ebuild
index 10dfc3a1a39a..568a3f45c37d 100644
--- a/dev-libs/protobuf/protobuf-3.11.4.ebuild
+++ b/dev-libs/protobuf/protobuf-3.11.4.ebuild
@@ -42,6 +42,10 @@ DOCS=(CHANGES.txt CONTRIBUTORS.txt README.md)
src_prepare() {
default
+
+ # https://github.com/protocolbuffers/protobuf/issues/7413
+ sed -e "/^AC_PROG_CXX_FOR_BUILD$/d" -i configure.ac || die
+
eautoreconf
}
diff --git a/dev-libs/re2/Manifest b/dev-libs/re2/Manifest
index 19669f34f47d..1c2d58343f2b 100644
--- a/dev-libs/re2/Manifest
+++ b/dev-libs/re2/Manifest
@@ -2,7 +2,9 @@ AUX 0.2020.05.01-test-memory-budget.patch 1104 BLAKE2B 0f661f83d0adbe9c0932f01f6
DIST re2-2019-12-01.tar.gz 391450 BLAKE2B 2069b496d494771d09d2ce289cc3cd45ea99fda17ca044f09ebeddae85c6fb2cabcb34403a8364d179591f7f3d8ad4e39191c1034aa70c8a16f5d439357330ba SHA512 cfbce00a8462644177c2792cdcd1115fdd17dae9454f6148764bf22c4f364002c6d561f4f407564f6925b78fa8a252d6a3b02bfa8a63f347e6b3d33034ec2d77
DIST re2-2020-04-01.tar.gz 402511 BLAKE2B ce3f17037a3a09867036e651d62bd9f004b7ed7c6813b4530059659e794a7a7a3ad17d6ee35b5456302d627a0524fc78151b60ed9c546c1baab699231554a0dd SHA512 b3f2ec675fbc2ab18fc4de7b8c077f110010fd4a7502eea3d802d3706681b523db551edd80c2ff188457169471899084a6b21937154ab2288ee9ac123a2b7014
DIST re2-2020-05-01.tar.gz 402569 BLAKE2B da94442ad8fa965ce8e38f19184579a033a65fd2cdd7769e2e2f2fdb590cd79adf275e94a8aa4ca6924c4b7879441ba7632cc492daa67d41cebeead67af6fc65 SHA512 76ab9b63a7de3de1dbde599e9fd35cf94de26f2f3c2a85e3befa0026decc95620fac65c7bcbfa3729efbfe6b1b418d77d733bd27496b54c649ac2918652aaaac
+DIST re2-2020-06-01.tar.gz 403203 BLAKE2B 46270c39fdb9eda127752e97e5dfea24a6cb9ddc32bfc298e123eb29609a003fd1a7a3591e760944ec36721ee1981f9bdbbc0b04d596764922e6bbc3daa9159c SHA512 8592a5409cb087c3188023746a4121bd58972a7a21bae98022af587f6191b3096bbb5d379e622ea853ff3373c76972fb61f331354550715c9a7e77d08fba6f3c
EBUILD re2-0.2019.12.01.ebuild 1352 BLAKE2B 4e8b259399c02b16f7cb0ba21aba52e43c629362846f2dba1cd47cb18006938cd1b1e6943c29b64cc19581f4b0607f2478700939eb0caa0573471b3fe8db1180 SHA512 93e6743627fe5aeb06b6dbfeae132237ffd32a40c1eb1532f21dc500206f49e1620aa7a3cbd887b4e70c4023535639ada9a638d2f6c68656725dacfbeca8d932
EBUILD re2-0.2020.04.01.ebuild 1339 BLAKE2B 5809792c1217f49d50811a794686b0bb74faa93933dfad7a19067595434457e1fed2809414011b8d7039ec1768318a6c43a7f70e9eb1d1c23208f1874f9d0164 SHA512 98ab674b62c8b9a8389d39d9fde1d97de275a5b64b868b33ac0b49023d7351a9b5ca39280fb1b2a318aa01cbbc4aaa8db17f4d760223d7c471bb3b8f36ab9c14
EBUILD re2-0.2020.05.01.ebuild 1409 BLAKE2B 96121133cd77e4281427640ba7f39d920c4fcd9b66b60495ea4c725cd24aed5e9c6f331d2489ef8d6eb5c0b189bc482277837220c672e55f6ca1fcfeb82d3382 SHA512 bbfaed2bae84fe323a111c95015d6a4385a403c185f7b919e078fc1d57d90554f7f6a3325e94f7166a45ebd13a2f9d0dca1864a3ed1aac3bc7be9bb690af8647
+EBUILD re2-0.2020.06.01.ebuild 1349 BLAKE2B d1dd63d4442563924ccc8282deeb7df097e87aaea616477aeab1fe2495666c782240143bf8a52aef1c6c28b18a0321f6e16022d8cd2eee52dbcfff98095d36aa SHA512 e773a3cf3c21acf12f67f59939f7479c8237efba2f34a6791303ba9cb938772bf5ed6f2955570eca3e4a05e65c07b6e1d521762b9524187563e707197e928856
MISC metadata.xml 471 BLAKE2B d5263d5aa06995cb4abacde849d1f7d970a7c365654fc25c4e4fd9c423f9a99f21e86f60abd8bb50bcba08aed799f510353e6baf23b42299c294b77f95d657fd SHA512 7534d637458ea189e20f259c9f039629f9b5fc738750d8d6e1050163aa147ec447d38ed93df98cedc71510be3fc5949c9084f63da86c12bdfd0c109122a001a8
diff --git a/dev-libs/re2/re2-0.2020.06.01.ebuild b/dev-libs/re2/re2-0.2020.06.01.ebuild
new file mode 100644
index 000000000000..f4ed8174619a
--- /dev/null
+++ b/dev-libs/re2/re2-0.2020.06.01.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal toolchain-funcs
+
+# Different date format used upstream.
+RE2_VER=${PV#0.}
+RE2_VER=${RE2_VER//./-}
+
+DESCRIPTION="An efficient, principled regular expression library"
+HOMEPAGE="https://github.com/google/re2"
+SRC_URI="https://github.com/google/re2/archive/${RE2_VER}.tar.gz -> re2-${RE2_VER}.tar.gz"
+
+LICENSE="BSD"
+# NOTE: Always run libre2 through abi-compliance-checker!
+# https://abi-laboratory.pro/tracker/timeline/re2/
+SONAME="7"
+SLOT="0/${SONAME}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="icu"
+
+BDEPEND="icu? ( virtual/pkgconfig )"
+DEPEND="icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/re2-${RE2_VER}"
+
+DOCS=( AUTHORS CONTRIBUTORS README doc/syntax.txt )
+HTML_DOCS=( doc/syntax.html )
+
+src_prepare() {
+ default
+ grep -q "^SONAME=${SONAME}\$" Makefile || die "SONAME mismatch"
+ if use icu; then
+ sed -i -e 's:^# \(\(CC\|LD\)ICU=.*\):\1:' Makefile || die
+ fi
+ multilib_copy_sources
+}
+
+src_configure() {
+ tc-export AR CXX
+}
+
+multilib_src_compile() {
+ emake SONAME="${SONAME}" shared
+}
+
+multilib_src_install() {
+ emake SONAME="${SONAME}" DESTDIR="${D}" prefix="${EPREFIX}/usr" libdir="\$(exec_prefix)/$(get_libdir)" shared-install
+}
diff --git a/dev-libs/redland-bindings/Manifest b/dev-libs/redland-bindings/Manifest
index 2e0a27239d35..39bbbe60a0ad 100644
--- a/dev-libs/redland-bindings/Manifest
+++ b/dev-libs/redland-bindings/Manifest
@@ -5,6 +5,6 @@ AUX redland-bindings-1.0.17.1-php-config.patch 1184 BLAKE2B f22aac3f4753f11c1473
DIST redland-bindings-1.0.14.1.tar.gz 792557 BLAKE2B fac20e9e2fbf9a4ea7299ef0b4a656ea3e5f1cbf436cd31c80e81be40dc95e074e557925b32ecf24091ce3cfe882d681318ae8402e14baf1e0966ec8a0a892ed SHA512 5e037a96f857c95bf4b9277d98c7de1fa41c4ba7e49e199eeb516458343587c796a10e857679c889406b22bca8617828a2bccd07c31b73f2366cdea39cefad15
DIST redland-bindings-1.0.17.1.tar.gz 933290 BLAKE2B f58524c30958200af1fb3ec0f63b8aa9f3fd2120297321299cdd225ff9eb331f385c4418ed25987b955857e5046b5c6f0589210b807aae0dc6abe0b758d48cfc SHA512 c105d1232555d226d98efdc1e4edc1b6c953fdd004804e40926452b8f91d30159319a50af68fc3cfe242cf180d85383ef3ff925cc65ed5d0652096cc51f4d7c0
EBUILD redland-bindings-1.0.14.1-r2.ebuild 1334 BLAKE2B 2a2da7b97e0061fcb33b6ca78a7f1adff1acdb0860b6bdf9787c8fdfc7d1006cd74beebd8bffe2a6d101deebcc21d40523ed5677a1f63cbe640d4bef9ad3e914 SHA512 47bf9ede3040c06353d5e1bef9d53ea06579270ae39e84882fce89e1e5a8ebe4708736a34096f872dda0bb766e687c581402bb9a5d2a0226ea35334d3e732f58
-EBUILD redland-bindings-1.0.17.1-r1.ebuild 2901 BLAKE2B ffc54a48596fda5f8031fafb71eacc492da3398949bb0a2141558be0339b4f9aac66e58316ef40780c3a4b15e37d51be417cc3faf9881ec411b65edf27d7e809 SHA512 ceb459aed72e3df0cb3b514cd0b5e61e75315b4bc41dc8f60df38751d54a8995caf756d47fd565a44841a5d5da2d71c944c97e298a62ebeda4192fcc53cb4007
+EBUILD redland-bindings-1.0.17.1-r1.ebuild 2966 BLAKE2B 5b933955d63719dd5096cac1becaa1e4a5166b52762b6cbe76511d25d4f0d39762562b488962e21d7845a1c141c2b14d41eff595f6c1fff4dbc221e9eb9cf83d SHA512 5b3c6a0f37d7af208129677fe5db3545097c7c923cfd4a4eb4219bc409067dc70f8b11355f45c42a4f5bcf6d78001ae1997d8af9481af7a7e592df54c770cc19
EBUILD redland-bindings-1.0.17.1.ebuild 2644 BLAKE2B 3f30c7fa70567d1d994a39d93a71fc00b57e82600a9b9e32426d3d8fbb8e5d78dcde3ff981114f18c3daa806c97c26f9a4101f84582746722e7b6609a77c5efd SHA512 46654ef0867bc19ba3c3eddb4949aaad265729d7dca643c159568970d4a7d3ad90954d5fb683af37586e3b8b190b766ea7d7c9fa6c717db98a637d8449e4a1f5
MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/dev-libs/redland-bindings/redland-bindings-1.0.17.1-r1.ebuild b/dev-libs/redland-bindings/redland-bindings-1.0.17.1-r1.ebuild
index 6cf96497da4b..e2d64512b6f7 100644
--- a/dev-libs/redland-bindings/redland-bindings-1.0.17.1-r1.ebuild
+++ b/dev-libs/redland-bindings/redland-bindings-1.0.17.1-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_6 python3_7 python3_8 )
+PYTHON_COMPAT=( python3_{6..9} )
USE_PHP="php7-2 php7-3 php7-4"
PHP_EXT_ECONF_ARGS="--with-php=yes --without-lua --without-perl --without-python --without-ruby"
@@ -21,8 +21,9 @@ SRC_URI="http://download.librdf.org/source/${P}.tar.gz"
LICENSE="Apache-2.0 GPL-2 LGPL-2.1"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-linux ~ppc-macos"
-IUSE="lua perl python php ruby"
+IUSE="lua perl python php ruby test"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+RESTRICT="!test? ( test )"
BDEPEND="sys-apps/sed
virtual/pkgconfig"
@@ -39,7 +40,10 @@ RDEPEND=">=dev-libs/redland-1.0.14
)"
DEPEND="${RDEPEND}
- >=dev-lang/swig-2"
+ >=dev-lang/swig-2
+ test? (
+ >=dev-libs/redland-1.0.14[berkdb]
+ )"
PATCHES=(
"${FILESDIR}"/${P}-bool.patch
diff --git a/dev-libs/serd/Manifest b/dev-libs/serd/Manifest
index 7071f5cea04a..ca2034e7141e 100644
--- a/dev-libs/serd/Manifest
+++ b/dev-libs/serd/Manifest
@@ -1,3 +1,5 @@
DIST serd-0.30.2.tar.bz2 590337 BLAKE2B 7b47f4f9940d9d2d37772c034c3f15801fff2bc8a058d30b40891ae900bdee3a631803e25505230a853e4beb083be4c854c627074eb89c0b23781da42fbde2d5 SHA512 b1e18ac883aac2a8146ee0e1de553ac2b512deba5307e5c9fa2733d9011ed0777d67790aa6527e73b3f11c9da0d8c9a98227457bb412897296f4464228cac0f7
+DIST serd-0.30.4.tar.bz2 605441 BLAKE2B 6b9b561db04a612d04726f29b1b56f535b9af57b7cbcf521c2a6afdafaf63b2ff4a205015d2f4c20bf48340348edda586dfed4a7cff24c57363b0f218d185609 SHA512 4cc032f826d891213c6db787b10a41ffb8f4b2a3357ffa536e34013755dc34db7109d1b42f550a0d559d8651f56c3a5dfb3654c3e2047ee6e609ff9a5fe803d6
EBUILD serd-0.30.2.ebuild 1149 BLAKE2B 3c7ff48c692a05f300fa0fc93accc6f93cb1cf2a7328765fa5689ec0b0bc524cea24ef161fb130bb94da8f6a8b0b3950baf1d09d382e82a1044c3f4c684bf16b SHA512 f124f80e396d11ad5e8a3600ecf713a714efb22674bffb77ee8940e44008af7b78475ed1a013a150537906f66eb43774bab526d2a111d882b1cdb9ebf3030c44
+EBUILD serd-0.30.4.ebuild 1155 BLAKE2B a851119894d7b86edf2c0de340a332c1229bb659d19481ff5e44d885632252189f68911e4877ac553aa165ff8c7abf714e5af5d490f873a81716f95e2dd7f17d SHA512 ca344766dabba0552390d57b23ac684175a0f9233c6c62b59568f5b6d19a3dbcaa8daefa5b924e454b784806c39271c808b6028be4c979c32b1df154e9dc8e66
MISC metadata.xml 658 BLAKE2B 5495f0e6022b9cb312b6079c970bbfe0caa8cd865c5109a8dfba32b6937a1e19c928a3c424fd257140e38d19717e686b59d649f07354b7d8e88d3d431472803c SHA512 e0718eccdfc18ca985b902aa0592c733205a74f5c0c0d8d295a12343d0ef61b96cda9955b2a45832273becae62d74b251ce59b8123aa95f6196b1e75897395c1
diff --git a/dev-libs/serd/serd-0.30.4.ebuild b/dev-libs/serd/serd-0.30.4.ebuild
new file mode 100644
index 000000000000..5cc979180ac6
--- /dev/null
+++ b/dev-libs/serd/serd-0.30.4.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE='threads(+)'
+inherit python-any-r1 waf-utils multilib-build multilib-minimal
+
+DESCRIPTION="Library for RDF syntax which supports reading and writing Turtle and NTriples"
+HOMEPAGE="http://drobilla.net/software/serd/"
+SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc static-libs test"
+RESTRICT="!test? ( test )"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+ ${PYTHON_DEPS}
+ doc? ( app-doc/doxygen )"
+
+DOCS=( "AUTHORS" "NEWS" "README.md" )
+
+src_prepare() {
+ sed -i -e 's/^.*run_ldconfig/#\0/' wscript || die
+ default
+ multilib_copy_sources
+}
+
+multilib_src_configure() {
+ waf-utils_src_configure \
+ --docdir=/usr/share/doc/${PF} \
+ $(multilib_native_usex doc --docs "") \
+ $(usex test --test "") \
+ $(usex static-libs --static "")
+}
+
+multilib_src_test() {
+ ./waf test || die
+}
+
+multilib_src_compile() {
+ waf-utils_src_compile
+ default
+}
+
+multilib_src_install() {
+ waf-utils_src_install
+ default
+}
diff --git a/dev-libs/tre/Manifest b/dev-libs/tre/Manifest
index 775dee76b642..a4286763f3e5 100644
--- a/dev-libs/tre/Manifest
+++ b/dev-libs/tre/Manifest
@@ -2,5 +2,5 @@ AUX 0.8.0-CVE-2016-8559.patch 2658 BLAKE2B 12a7d12d35e2d61457fbb9e368cfa738bad74
AUX 0.8.0-pkgcfg.patch 420 BLAKE2B 6b04ff4db2abc5dffdbca50bcbbe20974fdaa24ab25875f2538eca5af42921a729550e7ea5188225d3d73661e9ba05b96ff345fb4d931130ba4255b14c3944d2 SHA512 a6e4713aa0f9619abe256e9e1ea7c5bc8cbeb9ed173dd856972af70612ac435206e2b294ca5947e93223c17de875ba2620bf57949332b19ecff9965e2ee1a9e6
DIST tre-0.8.0.tar.bz2 380714 BLAKE2B b2af6e805e9e19fd69debf2f881ddfb591317f69db4e29a04e1899eb69100b8ac7744f86fa438530509ca2ee8aa1d346d416c6391f13247cd9398f4c59c2ed85 SHA512 db7465993e0d25eee8e52f974427b8a040234cf0f017769eb94ee88bc6261821336aad7f762bfa82db7e2212d8449bc221592586f061c528a59a550773cbc263
EBUILD tre-0.8.0-r1.ebuild 1412 BLAKE2B 5910c54dd847e5ced32abba2c747abcb86c73701332650aa2d937b5470a78bc00be5eaed6cfeb63346b0af0cac702a7baea357ed2dd53aa2c2d600501991fcaa SHA512 ecc2906825000bab1e1286282e445f3da63d36b8896086ba5212646c727300a0c133edfb04a221385b0dc3173156029993aa63f26b43c69d79f78a0ef3aa8d2e
-EBUILD tre-0.8.0-r2.ebuild 1461 BLAKE2B c7ad1e4d468f399e2c3ceb5f40300b4017c4a5ad5489df119ea4bf013264efb22109924ee87466fbd25e2255c39673acc137d0220484c11a67eedc355e8f3ff6 SHA512 4ad4916efd418f0c15427e9571625d2b934cefb2360768b30548787ea29b2df37a414c4599523eccb167203f7fcfafb3e2d3ec75855abd70706e2dfeb0445724
+EBUILD tre-0.8.0-r2.ebuild 1460 BLAKE2B dfd363ff4e1140798d09024b74f93ac78ed498a4552edab0c478164b29954846a536ec46a652ab8fdcc7c02e17edbd4e8aa87d7b4e2ad501dc458fcc1d7dc7cb SHA512 ff58647ecb1f3bf8ce955a5b8d8b1a87fb1447f4355ac1e89de38368cb59bc3df97291b4204b6a5121f2e3f94b0674a3028ce71048efcbf18fa9cdce24e95122
MISC metadata.xml 353 BLAKE2B 0346462595f8f9a38758ce0817e787b87b35b329aef65d2921214d32bd9313023f006ee2ab31084a03a2f8a8ecf1d556dd11f190ac2467ebcd061bc144b977e4 SHA512 907b341e747fb9d7ba7b76f300d373284a21a59e3d649275c4a53ac681177f94e9d0d9f56b15365008262b2aba91236d9ac5623387313c7b74b65b2b70871d3b
diff --git a/dev-libs/tre/tre-0.8.0-r2.ebuild b/dev-libs/tre/tre-0.8.0-r2.ebuild
index 3b7cb484bc4f..145fec0c583f 100644
--- a/dev-libs/tre/tre-0.8.0-r2.ebuild
+++ b/dev-libs/tre/tre-0.8.0-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://laurikari.net/tre/${P}.tar.bz2"
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
IUSE="nls static-libs"
RDEPEND="
diff --git a/dev-libs/xmlsec/Manifest b/dev-libs/xmlsec/Manifest
index 94d03210ee8a..3788ce05995c 100644
--- a/dev-libs/xmlsec/Manifest
+++ b/dev-libs/xmlsec/Manifest
@@ -1,3 +1,5 @@
DIST xmlsec1-1.2.29.tar.gz 1989360 BLAKE2B a0057ddf2d641745933f8d788c5358b4bb17892ed175ef11a9041a34ff1f91d0ffe6cb90316308805b5bc2157b9c2e211b37731ff8cfc7723a85f349543aa7a6 SHA512 07c3012179da4392f0a9d41a51ed51d692ca8b491310488b955d5fef0637f104d3f82374754b0ef175fadc663a8ca8c996178198c5dd77b3a8b34393d1482e4d
+DIST xmlsec1-1.2.30.tar.gz 1989670 BLAKE2B b363d1661ba5fdf968725948598954c7d514ad92c4ad05b490aa3ac9ffb6be861ee81d660be30d37e26ae1cb327cdecd1c76d60055ec5aa900e390a4083099b3 SHA512 07152470a9fe5d077f8a358608ca1d8a79ee0d2777660f61ed5717dc640714a3adfe66843e6a4023898eb0f5ed79771d70c41132571f3a1aeda82c1894b69c98
EBUILD xmlsec-1.2.29.ebuild 1353 BLAKE2B 64427acb8bcf6aba37d11de040607f442f94113cfef9f008af73c6d0a4a03163f859b312bab27a5e865673c348460191878621e74720569bc64c5faa5208d62f SHA512 2349f8d6fa5500a6400d51387d0996730cb7c8efea7877cb087e4cb750cd7e8ea0cd236feb6752bc8cc895f226c8ff21ee85abdd280a73f85c606ca4709cf20c
+EBUILD xmlsec-1.2.30.ebuild 1406 BLAKE2B d645f73bbffbb4235d17dd7dc6d40aecd8af85809a8f1a57f2d43d38c7d22308fb51857ca3b3c6defa7224d6fcf5c706cf0d78bfcb92d419bfd7c83c592b7690 SHA512 a5c85507b42f073a2aafc88b4d673aa7fe1fb871436b410e278169a7bcab91fbe4c0321e27a6ba35305c439aaff46a0c0d219508265dfdafc19d57942fb3526d
MISC metadata.xml 414 BLAKE2B 265c7a10b540266026188b46fbe6f609d83946a5ceadae090bed44b981e9c37599b86c506ea16d06d62bde58d804f042d01eb5e9a96fd9480671ae3e423040d3 SHA512 6192225c849da5ac481f102aa6e7ca91d4222623eb84d42d5313ecd9280a4fec8ac819ed74c0b761986c60532b5ec5061d0998e20c77c5dae0abd058ecb039d7
diff --git a/dev-libs/xmlsec/xmlsec-1.2.30.ebuild b/dev-libs/xmlsec/xmlsec-1.2.30.ebuild
new file mode 100644
index 000000000000..34308fcbca49
--- /dev/null
+++ b/dev-libs/xmlsec/xmlsec-1.2.30.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Command line tool for signing, verifying, encrypting and decrypting XML"
+HOMEPAGE="https://www.aleksey.com/xmlsec"
+SRC_URI="https://www.aleksey.com/xmlsec/download/${PN}1-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc gcrypt gnutls libressl nss +openssl static-libs test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="|| ( gcrypt gnutls nss openssl )
+ gnutls? ( gcrypt )"
+
+RDEPEND=">=dev-libs/libxml2-2.7.4:=
+ >=dev-libs/libxslt-1.0.20:=
+ gcrypt? ( >=dev-libs/libgcrypt-1.4.0:0= )
+ gnutls? ( >=net-libs/gnutls-2.8.0:= )
+ nss? (
+ >=dev-libs/nspr-4.4.1:=
+ >=dev-libs/nss-3.9:=
+ )
+ openssl? (
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )
+ )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
+ test? (
+ nss? (
+ >=dev-libs/nss-3.9[utils]
+ )
+ )"
+
+S="${WORKDIR}/${PN}1-${PV}"
+
+src_configure() {
+ # Bash because of bug #721128
+ CONFIG_SHELL=${BASH} econf \
+ $(use_enable doc docs) \
+ $(use_enable static-libs static) \
+ $(use_with gcrypt) \
+ $(use_with gnutls) \
+ $(use_with nss nspr) \
+ $(use_with nss) \
+ $(use_with openssl) \
+ --enable-mans \
+ --enable-pkgconfig
+}
+
+src_test() {
+ SHELL=${BASH} emake TMPFOLDER="${T}" check
+}
+
+src_install() {
+ default
+ find "${D}" -name '*.la' -delete || die
+}