diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2020-08-25 10:45:55 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2020-08-25 10:45:55 +0100 |
| commit | 3cf7c3ef441822c889356fd1812ebf2944a59851 (patch) | |
| tree | c513fe68548b40365c1c2ebfe35c58ad431cdd77 /dev-libs | |
| parent | 05b8b0e0af1d72e51a3ee61522941bf7605cd01c (diff) | |
gentoo resync : 25.08.2020
Diffstat (limited to 'dev-libs')
606 files changed, 11416 insertions, 4683 deletions
diff --git a/dev-libs/389-adminutil/389-adminutil-1.1.15.ebuild b/dev-libs/389-adminutil/389-adminutil-1.1.15.ebuild deleted file mode 100644 index b4f12bd147aa..000000000000 --- a/dev-libs/389-adminutil/389-adminutil-1.1.15.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit libtool eutils - -MY_PV=${PV/_rc/.rc} -MY_PV=${MY_PV/_a/.a} -MY_P=${P/_rc/.rc} -MY_P=${MY_P/_a/.a} - -DESCRIPTION="389 adminutil" -HOMEPAGE="http://port389.org/" -SRC_URI="http://port389.org/sources/${MY_P}.tar.bz2" - -LICENSE="LGPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="debug" - -COMMON_DEPEND=">=dev-libs/nss-3.11.4 - >=dev-libs/nspr-4.6.4 - >=dev-libs/svrcore-4.0.3 - >=dev-libs/cyrus-sasl-2.1.19 - >=dev-libs/icu-3.4:= - net-nds/openldap" -DEPEND="virtual/pkgconfig ${COMMON_DEPEND}" -RDEPEND="${COMMON_DEPEND}" - -src_prepare() { - elibtoolize -} - -src_configure() { - econf $(use_enable debug) \ - --with-fhs \ - --with-openldap \ - --disable-rpath \ - --disable-tests -} - -src_install() { - emake DESTDIR="${D}" install - dodoc README NEWS -} diff --git a/dev-libs/389-adminutil/Manifest b/dev-libs/389-adminutil/Manifest deleted file mode 100644 index f31f9c80dfe7..000000000000 --- a/dev-libs/389-adminutil/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST 389-adminutil-1.1.15.tar.bz2 283825 BLAKE2B 170797066b25303c6c582c95a935cf1d47b09b28a0c530588322fca2547416eeb5dba48561ccd06b7862dd5066e15abd1dcfeb168a9331e9a7f081bb5a14ae2e SHA512 5ed8d758ee47a2e276bab73696067dd2acd36f15ea5b93b32e3e244530920d74d95a4a4ff96cd325f22ae4ce2cc764fef03c90497c0181cbc1f0291f260d8ddf -EBUILD 389-adminutil-1.1.15.ebuild 844 BLAKE2B 89392af41b1c564fa9f5d92d1121256d6c135098b0601eeafa0d1de8ae8c189ed281e951783cfc2fb336aeb93d26049ff8a3aba901135c9ff6442bc01283c03e SHA512 576637691dfd37501186e096cfc17c7ba5e785f6e0a2fa7cdf0eceacabe93d1a7e889c6cdcb8ae5ca68bc40ba5c524f633d42099d25eb7d83e7ab63d4a86688e -MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 diff --git a/dev-libs/389-adminutil/metadata.xml b/dev-libs/389-adminutil/metadata.xml deleted file mode 100644 index 6f49eba8f496..000000000000 --- a/dev-libs/389-adminutil/metadata.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<!-- maintainer-needed --> -</pkgmetadata> diff --git a/dev-libs/Ice/Ice-3.6.5-r1.ebuild b/dev-libs/Ice/Ice-3.6.5-r1.ebuild new file mode 100644 index 000000000000..dee0d929265d --- /dev/null +++ b/dev-libs/Ice/Ice-3.6.5-r1.ebuild @@ -0,0 +1,336 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6..9} ) + +RUBY_OPTIONAL="yes" +USE_RUBY="ruby26" + +PHP_EXT_NAME="IcePHP" +PHP_EXT_INI="yes" +PHP_EXT_ZENDEXT="no" + +PHP_EXT_OPTIONAL_USE=php + +USE_PHP="php7-4" + +# This variable does not belong to any eclass. It is solely used in this ebuild +BERKDB_SLOTS=( 6.2 6.1 5.3 5.1 4.8 ) + +inherit db-use mono-env php-ext-source-r3 python-r1 ruby-ng toolchain-funcs + +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? ( https://download.zeroc.com/Ice/$(ver_cut 1-2)/${PN}-3.6.4.pdf )" +LICENSE="GPL-2" +SLOT="0/36" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="debug doc examples libressl +readline mono php python ruby test" +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 ruby26) ) + mono? ( dev-lang/mono )" +DEPEND="${RDEPEND} + readline? ( sys-libs/readline:0= ) + test? ( + ${PYTHON_DEPS} + dev-python/passlib[${PYTHON_USEDEP}] + )" + +# Maintainer notes: +# TODO: java bindings + +S="${WORKDIR}/${P,}" +PHP_EXT_S="${S}/php" + +PATCHES=( + "${FILESDIR}/${PN}-3.6.3-no-arch-opts.patch" + "${FILESDIR}/${P}-db6.patch" + "${FILESDIR}/${P}-csharp.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|-L\$\(libdir\)||' \ + cpp/config/Make.rules || die + + sed -i \ + -e 's|-O2 ||g' \ + -e 's|-Werror ||g' \ + cpp/config/Make.rules.Linux || die + + sed -i \ + -e 's|install-common||' \ + {cpp,csharp,php,python,ruby}/Makefile || die + + sed -i \ + -e 's|-f -root|-f -gacdir $(GAC_DIR) -root|' \ + csharp/config/Make.rules.cs || die + + # skip mono tests, bug #498484 + sed -i \ + -e '/SUBDIRS/s|\ test||' \ + csharp/Makefile || die + + # 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 + # IceUtil/stacktrace and IceStorm/stress fail with USE=debug + # Glacier2/staticFiltering requires network access + sed -i \ + -e 's|allTests.py|allTests.py --rfilter=udp --rfilter=IceGrid\/admin --rfilter=IceSSL --rfilter=IceStorm\/single --rfilter=IceStorm\/stress --rfilter=IceUtil\/stacktrace --rfilter=Glacier2\/staticFiltering|' \ + cpp/Makefile || die + + # fails even on unicode locale + sed -i \ + -e 's|allTests.py|allTests.py --rfilter=Slice\/unicodePaths|' \ + ruby/Makefile || die + + # fix for x86 IceBox test + sed -i \ + -e 's|"32"|""|' \ + scripts/TestUtil.py || die +} + +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 readline)" + "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 + + if use python; then + local S="${S}/python" + python_copy_sources + fi + + if use ruby; then + SITERUBY="$(ruby26 -r rbconfig -e 'print RbConfig::CONFIG["sitelibdir"]')" + SITERUBYARCH="$(ruby26 -r rbconfig -e 'print RbConfig::CONFIG["sitearchdir"]')" + MAKE_RULES_RUBY=( + "install_rubydir=\"${ED}/${SITERUBY}\"" + "install_libdir=\"${ED}/${SITERUBYARCH}\"" + ) + + # make it use ruby26 only + sed -i \ + -e 's|RUBY = ruby|\026|' \ + ruby/config/Make.rules || die + sed -i \ + -e 's|env ruby|\026|' \ + ruby/config/s2rb.rb || die + sed -i \ + -e 's|env ruby|\026|' \ + ruby/scripts/slice2rb || die + sed -i \ + -e 's|output.write("ruby|\026|' \ + scripts/TestUtil.py || die + 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() { + PYTHONPATH="${BUILD_DIR}"/python 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}/${PN}-3.6.4.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-r3_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 + python_optimize + } + 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/Ice-3.6.4-r1.ebuild b/dev-libs/Ice/Ice-3.6.5.ebuild index 81c5905a9c1c..95a18a2c8597 100644 --- a/dev-libs/Ice/Ice-3.6.4-r1.ebuild +++ b/dev-libs/Ice/Ice-3.6.5.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -PYTHON_COMPAT=( python3_6 ) +PYTHON_COMPAT=( python3_{6..9} ) RUBY_OPTIONAL="yes" USE_RUBY="ruby25" @@ -14,22 +14,21 @@ PHP_EXT_ZENDEXT="no" PHP_EXT_OPTIONAL_USE=php -USE_PHP="php7-0" +USE_PHP="php7-4" # 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 ) +BERKDB_SLOTS=( 6.2 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 +inherit db-use mono-env php-ext-source-r3 python-r1 ruby-ng toolchain-funcs 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 )" + doc? ( https://download.zeroc.com/Ice/$(ver_cut 1-2)/${PN}-3.6.4.pdf )" LICENSE="GPL-2" SLOT="0/36" KEYWORDS="amd64 ~arm x86" -IUSE="doc examples libressl +ncurses mono php python ruby test debug" +IUSE="debug doc examples libressl +readline mono php python ruby test" RESTRICT="test" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" @@ -43,27 +42,24 @@ RDEPEND=">=dev-libs/expat-2.0.1 dev-cpp/libmcpp python? ( ${PYTHON_DEPS} ) ruby? ( $(ruby_implementation_depend ruby25) ) - mono? ( dev-lang/mono ) - php? ( dev-lang/php:7.0 ) - !dev-python/IcePy - !dev-ruby/IceRuby" + mono? ( dev-lang/mono )" DEPEND="${RDEPEND} - ncurses? ( sys-libs/ncurses:0= sys-libs/readline:0= ) + readline? ( 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}) +# TODO: java bindings -S="${WORKDIR}/${P/I/i}" +S="${WORKDIR}/${P,}" 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" + "${FILESDIR}/${P}-db6.patch" + "${FILESDIR}/${P}-csharp.patch" ) pkg_setup() { @@ -80,65 +76,46 @@ 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" + cpp/config/Make.rules || die sed -i \ -e 's|-O2 ||g' \ -e 's|-Werror ||g' \ - cpp/config/Make.rules.Linux || die "sed failed" + cpp/config/Make.rules.Linux || die sed -i \ -e 's|install-common||' \ - {cpp,csharp,php,python,ruby}/Makefile || die "sed failed" + {cpp,csharp,php,python,ruby}/Makefile || die 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" + csharp/config/Make.rules.cs || die # skip mono tests, bug #498484 sed -i \ -e '/SUBDIRS/s|\ test||' \ - csharp/Makefile || die "sed failed" + csharp/Makefile || die # 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 + # IceUtil/stacktrace and IceStorm/stress fail with USE=debug + # Glacier2/staticFiltering requires network access 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" + -e 's|allTests.py|allTests.py --rfilter=udp --rfilter=IceGrid\/admin --rfilter=IceSSL --rfilter=IceStorm\/single --rfilter=IceStorm\/stress --rfilter=IceUtil\/stacktrace --rfilter=Glacier2\/staticFiltering|' \ + cpp/Makefile || die # fails even on unicode locale sed -i \ -e 's|allTests.py|allTests.py --rfilter=Slice\/unicodePaths|' \ - ruby/Makefile || die "sed failed" + ruby/Makefile || die # fix for x86 IceBox test sed -i \ -e 's|"32"|""|' \ - scripts/TestUtil.py || die "sed failed" + scripts/TestUtil.py || die } src_configure() { @@ -154,15 +131,15 @@ src_configure() { } 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\"" + "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)" + "USE_READLINE=$(usex readline)" "OPTIMIZE=$(usex !debug)" ) @@ -174,7 +151,7 @@ src_configure() { -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" + cpp/config/Make.rules{,.Linux} python/config/Make.rules || die if use python; then local S="${S}/python" @@ -183,32 +160,33 @@ src_configure() { if use ruby; then SITERUBY="$(ruby25 -r rbconfig -e 'print RbConfig::CONFIG["sitelibdir"]')" + SITERUBYARCH="$(ruby25 -r rbconfig -e 'print RbConfig::CONFIG["sitearchdir"]')" MAKE_RULES_RUBY=( - "install_rubydir=\"${ED%/}/${SITERUBY}\"" - "install_libdir=\"${ED%/}/${SITERUBY}\"" + "install_rubydir=\"${ED}/${SITERUBY}\"" + "install_libdir=\"${ED}/${SITERUBYARCH}\"" ) # make it use ruby25 only sed -i \ -e 's|RUBY = ruby|\025|' \ - ruby/config/Make.rules || die "sed failed" + ruby/config/Make.rules || die sed -i \ -e 's|env ruby|\025|' \ - ruby/config/s2rb.rb || die "sed failed" + ruby/config/s2rb.rb || die sed -i \ -e 's|env ruby|\025|' \ - ruby/scripts/slice2rb || die "sed failed" + ruby/scripts/slice2rb || die sed -i \ -e 's|output.write("ruby|\025|' \ - scripts/TestUtil.py || die "sed failed" + scripts/TestUtil.py || die fi MAKE_RULES_MONO=( "GACINSTALL=yes" - "GAC_ROOT=\"${ED%/}/usr/$(get_libdir)\"" + "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\"" + "install_libdir=\"${ED}/usr/$(get_libdir)\"" + "install_pkgconfigdir=\"${ED}/usr/$(get_libdir)/pkgconfig\"" ) if has_version ">dev-lang/mono-4"; then @@ -266,11 +244,11 @@ src_test() { if use python; then testing() { - emake -C "${BUILD_DIR}" \ + PYTHONPATH="${BUILD_DIR}"/python emake -C "${BUILD_DIR}" \ "${MAKE_RULES[@]}" \ PYTHON="${EPYTHON}" \ - install_pythondir="\"${D%/}/$(python_get_sitedir)\"" \ - install_libdir="\"${D%/}/$(python_get_sitedir)\"" test + install_pythondir="\"${D}/$(python_get_sitedir)\"" \ + install_libdir="\"${D}/$(python_get_sitedir)\"" test } local S="${S}/python" python_foreach_impl testing @@ -289,7 +267,7 @@ src_test() { src_install() { local DOCS=( CHANGELOG*.md README.md ) - use doc && DOCS+=( "${DISTDIR}/${P}.pdf" ) + use doc && DOCS+=( "${DISTDIR}/${PN}-3.6.4.pdf" ) einstalldocs insinto /usr/share/${P} @@ -311,15 +289,15 @@ src_install() { doins "${i}" done < <(find "${S}/php/lib/" -name '*.php' -print0) - pushd "${ED%/}/usr/share/${P}/slice" >/dev/null || die + pushd "${ED}/usr/share/${P}/slice" >/dev/null || die - local -x LD_LIBRARY_PATH="${ED%/}/usr/$(get_libdir):${LD_LIBRARY_PATH}" + 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}"/* + 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 @@ -327,20 +305,21 @@ src_install() { insinto "${EXT_DIR}" newins "php/lib/${PHP_EXT_NAME}.so" "${PHP_EXT_NAME}.so" done - php-ext-source-r2_createinifiles + php-ext-source-r3_createinifiles popd >/dev/null || die fi if use python; then installation() { - mkdir -p "${D%/}/$(python_get_sitedir)" || die + 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_pythondir="\"${D}/$(python_get_sitedir)\"" \ + install_libdir="\"${D}/$(python_get_sitedir)\"" \ install + python_optimize } local S="${S}/python" python_foreach_impl installation diff --git a/dev-libs/Ice/Manifest b/dev-libs/Ice/Manifest index 2d82689431a7..259ff8899c1b 100644 --- a/dev-libs/Ice/Manifest +++ b/dev-libs/Ice/Manifest @@ -1,7 +1,8 @@ -AUX Ice-3.6.3-csharp.patch 1573 BLAKE2B 9c1c645a25006ff5e120f7a14933511394315da6e72ebe1f93ff3ad8add69ff1a0b778433f9d70b4982322aed20d99ee37480d316cd3e0534ac84977a952edb5 SHA512 62741327524cea96652179811c0591ed7e75b75a27623cb24fe2e55c47150692d862aa78039ed82a081236273163015d4b7e56817ac13ccd63ca1042e641704f -AUX Ice-3.6.3-libressl.patch 6461 BLAKE2B ab5f4b8812adb7f7b15257bbc5f2745ca3da46c9c4d6b80764475045bedb78f15047eb70a76697e1fd299f913861ca39692ea87ed872761e1bb0884ac93a1550 SHA512 386ed4d666ea76a16255e7e5023be9880ac1f5e26ffec3d19560484eb6ace158f134c1d425586c1f654d7dc58732c17ed4b190eaf26f4aba0cd4bc319abe50cb AUX Ice-3.6.3-no-arch-opts.patch 1462 BLAKE2B 0adbbb302a3fde0dab4dba0b5947ee5da3413a8c3dc02fb8612837f4a2b3ecb56b92628430d8f3c2315f1fb0fa057bf0942dd389941b61d70d12b4078ce45d84 SHA512 236abce89a7bcf64d6a12db5a82d62db1effa2b5a105ae7c83910f02ca1ccd610193097a2c959d2a487f0d641af70ba8013bcfe570e2af40976d9a1017272e6e +AUX Ice-3.6.5-csharp.patch 1573 BLAKE2B 2e69e87179bd938bb34f1ae9826b09b935cb9a13e5f68fc81a6302afb66e4b4f45f1c22975cd3e2bc29e044dd7d47b120a93ea546d56cee93b6ee8f2a4af15f5 SHA512 7930b143b10da6521877c921b7b8dabb97b688ea8219dfb6cd2bbecf609cdcd07dcf4c2f80394a07337939d7ce42cb10bb1aed12885aa533e9ad9dec30ac6b87 +AUX Ice-3.6.5-db6.patch 1664 BLAKE2B 9ef67c83612875c68dd8fb7cea025ce3fca1e4384335108aa423ca63b53c6c723d9f7f9fd8fdc6895f8aedee0826efc225d89e487f5c95c395a8cdb1b893826a SHA512 ba94bddf3f43688ca74e5fd42fbafd7d0b6f02f616dfa4b6aff69ef1089f4404618cf07871d265b0b07037ca02a27fc397767d845a7e0edc60baa37704a064f0 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 +DIST Ice-3.6.5.tar.gz 5505499 BLAKE2B e16e8932f09270ac6bb86984ab47fa229ad873ee343ac4f56bb48b6f9547387ded0392a76302afac2c98b6d31da7c1faf294574cdba52654e7dea0af16b4169d SHA512 3431928e6168d716919aa9b3126d17a8ae14895bb78a369902a2bb350b2e82923f38ee17965ed3696512a016fcd34dc128e9aaca40fb2b032e7f7eb07bcb903b +EBUILD Ice-3.6.5-r1.ebuild 8522 BLAKE2B 68abf58e31b17fbbbe54c16e402097430eed9113d0772afbb7ba80a7fc3ec30716e12b3ceab51ae5bccb303899236f72d7a2c99a7a0252cfe9f64fb6593ed477 SHA512 4c0bc606a102cd41691d5f9208b22ee2f4d362cddbb894c1f85a6a8c4dce14cee560c287986ae31f0d12fe215eb0a9b76f6611b8c71f6fe2321cf280703f36a0 +EBUILD Ice-3.6.5.ebuild 8520 BLAKE2B 67d5abcf4caf00f020346bc43c5974722179b1b7e2540a9c194d2f29bf740f1c3a62e78c8ccf3e25b45c739baacbbe52b979f4b6494a0a53d153e2a5c8ea51d7 SHA512 afdbc69483ef0ae5692378513d2cdeeb1edc870f561f776889c2ec99eecd014b500ca42572e088bc8a6174230e9582d5645cd0b924b4c030819682400e73822c MISC metadata.xml 561 BLAKE2B 83daa42cf58f641a94bf0b24125dbca8cfd34d86d540cb7daecea4c089309279eb0a423f5f785efff9bafe34347fcfada2be36700a1f94afbdb6308e7d883d9f SHA512 35dcc56cb261e0f98fe6ae2da115ce7c66bd8568e9313eefb2c55d3d03cfda451d7f64738b0e50f64e01c5b7f8e60e1e0d8c6219be6b22dee45cd505a28aaa41 diff --git a/dev-libs/Ice/files/Ice-3.6.3-libressl.patch b/dev-libs/Ice/files/Ice-3.6.3-libressl.patch deleted file mode 100644 index e7d42e3f0d0c..000000000000 --- a/dev-libs/Ice/files/Ice-3.6.3-libressl.patch +++ /dev/null @@ -1,164 +0,0 @@ -From cbbac2c31a04e956261489ce75c962be7e2454ae Mon Sep 17 00:00:00 2001 -From: Joe George <joe@zeroc.com> -Date: Mon, 12 Dec 2016 11:51:41 -0500 -Subject: [PATCH] ICE-7445 - Add libressl build support - ---- - cpp/src/IceSSL/OpenSSLEngine.cpp | 20 ++++++++++---------- - cpp/src/IceSSL/OpenSSLTransceiverI.cpp | 6 +++--- - cpp/src/IceSSL/Util.cpp | 8 ++++---- - 3 files changed, 17 insertions(+), 17 deletions(-) - -diff --git a/cpp/src/IceSSL/OpenSSLEngine.cpp b/cpp/src/IceSSL/OpenSSLEngine.cpp -index 8c45950..7360d06 100644 ---- a/cpp/src/IceSSL/OpenSSLEngine.cpp -+++ b/cpp/src/IceSSL/OpenSSLEngine.cpp -@@ -43,7 +43,7 @@ IceUtil::Mutex* staticMutex = 0; - int instanceCount = 0; - bool initOpenSSL = false; - --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - IceUtil::Mutex* locks = 0; - #endif - -@@ -59,10 +59,10 @@ class Init - ~Init() - { - // -- // OpenSSL 1.1.0 introduces a new thread API and removes -+ // OpenSSL 1.1.0 introduces a new thread API and removes - // the need to use a custom thread callback. - // --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - CRYPTO_set_locking_callback(0); - CRYPTO_set_id_callback(0); - -@@ -84,10 +84,10 @@ extern "C" - { - - // --// OpenSSL 1.1.0 introduces a new thread API and removes -+// OpenSSL 1.1.0 introduces a new thread API and removes - // the need to use a custom thread callback. - // --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - // - // OpenSSL mutex callback. - // -@@ -158,7 +158,7 @@ IceSSL_opensslPasswordCallback(char* buf, int size, int flag, void* userData) - DH* - IceSSL_opensslDHCallback(SSL* ssl, int /*isExport*/, int keyLength) - { --# if OPENSSL_VERSION_NUMBER >= 0x10100000L -+# if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) - SSL_CTX* ctx = SSL_get_SSL_CTX(ssl); - # else - SSL_CTX* ctx = ssl->ctx; -@@ -219,7 +219,7 @@ OpenSSLEngine::OpenSSLEngine(const CommunicatorPtr& communicator) : - // - // OpenSSL 1.1.0 remove the need for library initialization and cleanup. - // --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - // - // Create the mutexes and set the callbacks. - // -@@ -326,7 +326,7 @@ OpenSSLEngine::~OpenSSLEngine() - // - // OpenSSL 1.1.0 remove the need for library initialization and cleanup. - // --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - // - // Clean up OpenSSL resources. - // -@@ -399,7 +399,7 @@ OpenSSLEngine::initialize() - "IceSSL: unable to create SSL context:\n" + sslErrors()); - } - --#if OPENSSL_VERSION_NUMBER >= 0x10100000L -+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) - int securityLevel = properties->getPropertyAsIntWithDefault(propPrefix + "SecurityLevel", -1); - if(securityLevel != -1) - { -@@ -954,7 +954,7 @@ OpenSSLEngine::parseProtocols(const StringSeq& protocols) const - SSL_METHOD* - OpenSSLEngine::getMethod(int /*protocols*/) - { --#if OPENSSL_VERSION_NUMBER >= 0x10100000L -+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) - SSL_METHOD* meth = const_cast<SSL_METHOD*>(TLS_method()); - #else - // -diff --git a/cpp/src/IceSSL/OpenSSLTransceiverI.cpp b/cpp/src/IceSSL/OpenSSLTransceiverI.cpp -index d66c5eb..9f07044 100644 ---- a/cpp/src/IceSSL/OpenSSLTransceiverI.cpp -+++ b/cpp/src/IceSSL/OpenSSLTransceiverI.cpp -@@ -36,7 +36,7 @@ using namespace IceSSL; - // - // See: http://cvs.openssl.org/chngview?cn=22569 - // --#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER < 0x100000bfL -+#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER < 0x100000bfL && !defined(LIBRESSL_VERSION_NUMBER) - namespace - { - -@@ -156,13 +156,13 @@ IceSSL::TransceiverI::initialize(IceInternal::Buffer& readBuffer, IceInternal::B - // - // See: http://cvs.openssl.org/chngview?cn=22569 - // --#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER < 0x100000bfL -+#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER < 0x100000bfL && !defined(LIBRESSL_VERSION_NUMBER) - IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(sslMutex); - #endif - - int ret = _incoming ? SSL_accept(_ssl) : SSL_connect(_ssl); - --#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER < 0x100000bfL -+#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER < 0x100000bfL && !defined(LIBRESSL_VERSION_NUMBER) - sync.release(); - #endif - if(ret <= 0) -diff --git a/cpp/src/IceSSL/Util.cpp b/cpp/src/IceSSL/Util.cpp -index a60ee4c..50c47f3 100644 ---- a/cpp/src/IceSSL/Util.cpp -+++ b/cpp/src/IceSSL/Util.cpp -@@ -110,7 +110,7 @@ namespace - { - - # ifndef OPENSSL_NO_DH --# if OPENSSL_VERSION_NUMBER < 0x10100000L -+# if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - - // The following arrays are predefined Diffie Hellman group parameters. - // These are known strong primes, distributed with the OpenSSL library -@@ -228,7 +228,7 @@ unsigned char dh4096_g[] = { 0x02 }; - // - // With OpenSSL 1.1.0 is no longer possible to acess the DH p and g - // data members to set the DH params. We still use the same default --// parameters but they were converted to DER format using -+// parameters but they were converted to DER format using - // i2d_DHparams and can be restored using d2i_DHparams - - unsigned char dh512[] = -@@ -338,7 +338,7 @@ unsigned char dh4096[] = - // - // Convert a predefined parameter set into a DH value. - // --# if OPENSSL_VERSION_NUMBER >= 0x10100000L -+# if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) - static DH* - convertDH(const unsigned char* buf, int len) - { -@@ -428,7 +428,7 @@ IceSSL::DHParams::get(int keyLength) - // No match found. Use one of the predefined parameter sets instead. - // - IceUtil::Mutex::Lock sync(*this); --# if OPENSSL_VERSION_NUMBER >= 0x10100000L -+# if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) - if(keyLength >= 4096) - { - if(!_dh4096) diff --git a/dev-libs/Ice/files/Ice-3.6.3-csharp.patch b/dev-libs/Ice/files/Ice-3.6.5-csharp.patch index e9dce1146baa..cfdc1f6a8d47 100644 --- a/dev-libs/Ice/files/Ice-3.6.3-csharp.patch +++ b/dev-libs/Ice/files/Ice-3.6.5-csharp.patch @@ -1,5 +1,5 @@ ---- ice-3.6.3/csharp/src/Makefile~ 2015-06-23 17:30:20.000000000 +0200 -+++ ice-3.6.3/csharp/src/Makefile 2015-06-27 20:07:04.217188211 +0200 +--- ice-3.6.5/csharp/src/Makefile~ 2015-06-23 17:30:20.000000000 +0200 ++++ ice-3.6.5/csharp/src/Makefile 2015-06-27 20:07:04.217188211 +0200 @@ -11,7 +11,7 @@ include $(top_srcdir)/config/Make.rules.cs @@ -10,9 +10,9 @@ $(EVERYTHING):: @for subdir in $(SUBDIRS); \ --- /dev/null 2015-06-27 16:44:15.733558105 +0200 -+++ ice-3.6.3/csharp/lib/pkgconfig/IceSSL.pc 2015-06-27 20:19:30.731894653 +0200 ++++ ice-3.6.5/csharp/lib/pkgconfig/IceSSL.pc 2015-06-27 20:19:30.731894653 +0200 @@ -0,0 +1,10 @@ -+version = 3.6.3 ++version = 3.6.5 +mono_root = /usr + +name = IceSSL @@ -23,9 +23,9 @@ +Libs: -r:${mono_root}/lib/mono/${name}/${name}.dll +Requires: Ice = ${version} --- /dev/null 2015-06-27 16:44:15.733558105 +0200 -+++ ice-3.6.3/csharp/lib/pkgconfig/IceDiscovery.pc 2015-06-27 20:20:44.312515987 +0200 ++++ ice-3.6.5/csharp/lib/pkgconfig/IceDiscovery.pc 2015-06-27 20:20:44.312515987 +0200 @@ -0,0 +1,10 @@ -+version = 3.6.3 ++version = 3.6.5 +mono_root = /usr + +name = IceDiscovery @@ -36,9 +36,9 @@ +Libs: -r:${mono_root}/lib/mono/${name}/${name}.dll +Requires: Ice = ${version} --- /dev/null 2015-06-27 16:44:15.733558105 +0200 -+++ ice-3.6.3/csharp/lib/pkgconfig/IceLocatorDiscovery.pc 2015-06-27 20:21:22.206185123 +0200 ++++ ice-3.6.5/csharp/lib/pkgconfig/IceLocatorDiscovery.pc 2015-06-27 20:21:22.206185123 +0200 @@ -0,0 +1,10 @@ -+version = 3.6.3 ++version = 3.6.5 +mono_root = /usr + +name = IceLocatorDiscovery diff --git a/dev-libs/Ice/files/Ice-3.6.5-db6.patch b/dev-libs/Ice/files/Ice-3.6.5-db6.patch new file mode 100644 index 000000000000..b78fae76a453 --- /dev/null +++ b/dev-libs/Ice/files/Ice-3.6.5-db6.patch @@ -0,0 +1,48 @@ +Avoid ambiguous ctor call (uint32_t vs DB_ENV*) with db 6.x. + +--- ice-3.6.3/cpp/src/Freeze/SharedDbEnv.cpp.orig 2016-10-05 16:59:08.000000000 +0200 ++++ ice-3.6.3/cpp/src/Freeze/SharedDbEnv.cpp 2017-06-28 18:42:43.411869639 +0200 +@@ -530,7 +530,7 @@ + { + if(_env == 0) + { +- _envHolder.reset(new DbEnv(0)); ++ _envHolder.reset(new DbEnv(0u)); + _env = _envHolder.get(); + + if(_trace >= 1) +--- ice-3.6.3/cpp/src/FreezeScript/transformdb.cpp.orig 2016-10-05 16:59:08.000000000 +0200 ++++ ice-3.6.3/cpp/src/FreezeScript/transformdb.cpp 2017-06-28 19:15:03.928514164 +0200 +@@ -766,8 +766,8 @@ + // + // Transform the database. + // +- DbEnv dbEnv(0); +- DbEnv dbEnvNew(0); ++ DbEnv dbEnv(0u); ++ DbEnv dbEnvNew(0u); + Freeze::TransactionPtr txNew; + Freeze::ConnectionPtr connection; + Freeze::ConnectionPtr connectionNew; +--- ice-3.6.3/cpp/src/FreezeScript/Util.cpp.orig 2016-10-05 16:59:08.000000000 +0200 ++++ ice-3.6.3/cpp/src/FreezeScript/Util.cpp 2017-06-28 19:22:29.318509063 +0200 +@@ -209,7 +209,7 @@ + { + CatalogDataMap result; + +- DbEnv dbEnv(0); ++ DbEnv dbEnv(0u); + try + { + #ifdef _WIN32 +--- ice-3.6.3/cpp/src/FreezeScript/DumpDB.cpp.orig 2016-10-05 16:59:08.000000000 +0200 ++++ ice-3.6.3/cpp/src/FreezeScript/DumpDB.cpp 2017-06-28 19:33:38.555168088 +0200 +@@ -481,7 +481,7 @@ + FreezeScript::ObjectFactoryPtr objectFactory = new FreezeScript::ObjectFactory; + communicator->addObjectFactory(objectFactory, ""); + +- DbEnv dbEnv(0); ++ DbEnv dbEnv(0u); + DbTxn* txn = 0; + Freeze::ConnectionPtr connection; + int status = EXIT_SUCCESS; diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz Binary files differindex 285ab71dec0d..bfa366d0302c 100644 --- a/dev-libs/Manifest.gz +++ b/dev-libs/Manifest.gz diff --git a/dev-libs/appstream/Manifest b/dev-libs/appstream/Manifest index 51f332fa80d9..7234e52dd05c 100644 --- a/dev-libs/appstream/Manifest +++ b/dev-libs/appstream/Manifest @@ -1,5 +1,8 @@ +AUX appstream-0.12.11-disable-Werror-flags.patch 512 BLAKE2B dcf8eece66122356743a3d958d8f86f8165045a4edff60d1c8c3d41eb8b705572843b3931f075c567fd3a6734d60dcf58133a1997ea841aa57414f50f4c2b36a SHA512 457f4cfcb2ab775bb5d64b239384fe2ebfbf99591fe38941c8208accedad1728c3bbabd637161d36dedda39b992ac8277b1d1432f117cf1277de469227e2f391 +AUX appstream-0.12.11-no-highlight.js.patch 3876 BLAKE2B 30176763dd0ec5b9b4e65e748749fee6e68371ba37872c6a2d2556621efd166c1202b4d180d1dd9e980b5e7e12ffebd2579883b370126dda1550873d880dd769 SHA512 4be2760971b7dcc58fd21c8e3cd67242eadd3b1e19067a14e279594a40fc8bffc3fddce0c7a90db01e19129ba7e3d09997615f5ab9cf3dda9a8b76eb4dbd0e0b +AUX appstream-0.12.11-qt-add-missing-provided-kindid-enum.patch 711 BLAKE2B cbca8047059f613dd6b4859b5f7982cfa09e22717982c7404e5375ec976dc03fa421e5b6103b0d399dbca9ce7a7ced02a822754ebe29f5d72a2d5da834219297 SHA512 1e9169aecce1073d851d2a22498586440d1eeb02e84ae362f381799ec244aa755cb58203f3873a566b07462be31fb1b3324c062b15cdadebc4253ab750363c66 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.11.ebuild 1695 BLAKE2B 4ebb95eca1abb10ee9ca9f9dbd6ab2c766b1718ffd7f5fa1e08354451493cab0ad9a2a19866582f9c4525dd077c4cd81987c0040990991b41f152ce038877a99 SHA512 e46cf958e89a2f7247f24d36d8baf056b2ce0dc0bba00f0c87d3df7997b3100807c6c82124cff92a8570b17b859486f3e948662941c5ca1cec0720a296954c5a +EBUILD appstream-0.12.11-r1.ebuild 1987 BLAKE2B d9586bcd07fb457a98238d706fd29e21a7b1727535a17d96f679a98f433f2cb9bfaa36e11279c13f802fbc10b92b86415e2f6d4961fc7642ff4f2f8c1cd9fee2 SHA512 2001fc4e9979eeaeee4883620f1a5630d1d9d18b71e2470656d24aac2350d45e2b93968a2d0b2927f0d3378c89bdd434ec5d7e8230f8dafc3cf4047c21b010e5 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.11.ebuild b/dev-libs/appstream/appstream-0.12.11-r1.ebuild index 4d3a31bbb3b3..c2dca084f140 100644 --- a/dev-libs/appstream/appstream-0.12.11.ebuild +++ b/dev-libs/appstream/appstream-0.12.11-r1.ebuild @@ -45,12 +45,20 @@ DEPEND="${RDEPEND} test? ( qt5? ( dev-qt/qttest:5 ) ) " +PATCHES=( + "${FILESDIR}"/${P}-no-highlight.js.patch + "${FILESDIR}"/${P}-qt-add-missing-provided-kindid-enum.patch + "${FILESDIR}"/${P}-disable-Werror-flags.patch # bug 733774 +) + 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 + rm docs/html/static/js/HighlightJS.LICENSE \ + docs/html/static/js/highlight.min.js || die # incompatible license } src_configure() { diff --git a/dev-libs/appstream/files/appstream-0.12.11-disable-Werror-flags.patch b/dev-libs/appstream/files/appstream-0.12.11-disable-Werror-flags.patch new file mode 100644 index 000000000000..0f887432deb4 --- /dev/null +++ b/dev-libs/appstream/files/appstream-0.12.11-disable-Werror-flags.patch @@ -0,0 +1,12 @@ +--- a/meson.build 2020-07-26 21:29:04.621544863 +0200 ++++ b/meson.build 2020-07-26 21:34:06.682233266 +0200 +@@ -52,9 +52,6 @@ + add_global_arguments(maintainer_c_args, language: 'cpp') + endif + +-# a few compiler warning flags we always want enabled +-add_global_arguments('-Werror=implicit-function-declaration', '-Wno-unused-parameter', language: 'c') +-add_global_arguments('-Wno-unused-parameter', '-Wno-error=deprecated-copy', language: 'cpp') + add_global_arguments('-DAS_COMPILATION', language : 'c') + + # diff --git a/dev-libs/appstream/files/appstream-0.12.11-no-highlight.js.patch b/dev-libs/appstream/files/appstream-0.12.11-no-highlight.js.patch new file mode 100644 index 000000000000..66b388061a45 --- /dev/null +++ b/dev-libs/appstream/files/appstream-0.12.11-no-highlight.js.patch @@ -0,0 +1,86 @@ +From 5ddf424d9b5713bd71c34b5ab6bbd10ad7b74bbc Mon Sep 17 00:00:00 2001 +From: Matthias Klumpp <matthias@tenstral.net> +Date: Tue, 12 May 2020 20:00:19 +0200 +Subject: [PATCH] Never ship with an embedded convenience copy of Highlight.js + +This should make Debian happy. +--- + docs/doc-build-helper.py | 10 +------- + docs/meson.build | 12 ++++++++++ + docs/style/static/js/HighlightJS.LICENSE | 29 ------------------------ + docs/style/static/js/INFO.md | 8 +++++++ + 4 files changed, 21 insertions(+), 38 deletions(-) + delete mode 100644 docs/style/static/js/HighlightJS.LICENSE + create mode 100644 docs/style/static/js/INFO.md + +diff --git a/docs/doc-build-helper.py b/docs/doc-build-helper.py +index ce46303d..c29cce2d 100755 +--- a/docs/doc-build-helper.py ++++ b/docs/doc-build-helper.py +@@ -29,10 +29,6 @@ + from pathlib import Path + + +-# additional JavaScript from system locations, we use it if available +-EXTRA_JS = [['/usr/share/javascript/highlight.js/highlight.min.js', +- 'highlight.min.js']] +- + # additional CSS from system locations, we use it if available + EXTRA_CSS = [['/usr/share/javascript/highlight.js/styles/routeros.css', + 'highlight.css']] +@@ -64,11 +60,7 @@ def daps_build(src_dir, project_name, daps_exe): + shutil.copy(os.path.join(src_dir, 'images', 'src', 'svg', 'appstream-logo.svg'), + os.path.join(html_out_dir, 'images')) + +- # copy extra JS and CSS if it is available +- for js_fname in EXTRA_JS: +- if os.path.exists(js_fname[0]): +- shutil.copy(js_fname[0], os.path.join(html_out_dir, 'static', +- 'js', js_fname[1])) ++ # copy extra CSS if it is available + for css_fname in EXTRA_CSS: + if os.path.exists(css_fname[0]): + shutil.copy(css_fname[0], os.path.join(html_out_dir, 'static', +diff --git a/docs/meson.build b/docs/meson.build +index 1ae5fc46..d4543fdd 100644 +--- a/docs/meson.build ++++ b/docs/meson.build +@@ -101,6 +101,12 @@ if get_option('docs') + + if get_option('install-docs') + install_subdir('html', install_dir: as_doc_target_dir) ++ ++ meson.add_install_script('sh', '-c', ++ 'if [ -f "@0@" ]; then mkdir -p $DESTDIR/@1@ && ln -sf @0@ $DESTDIR/@1@; fi' ++ .format('/usr/share/javascript/highlight.js/highlight.min.js', ++ join_paths(get_option('prefix'), as_doc_target_dir, 'html', 'static', 'js')) ++ ) + endif + + # add an extra testcase for documentation validation +@@ -114,5 +120,11 @@ elif get_option('install-docs') + if run_command('[', '-d', join_paths(meson.current_source_dir(), 'html'), ']').returncode() == 0 + # install documentation, if it exists + install_subdir('html', install_dir: as_doc_target_dir) ++ ++ meson.add_install_script('sh', '-c', ++ 'if [ -f "@0@" ]; then mkdir -p $DESTDIR/@1@ && ln -sf @0@ $DESTDIR/@1@; fi' ++ .format('/usr/share/javascript/highlight.js/highlight.min.js', ++ join_paths(get_option('prefix'), as_doc_target_dir, 'html', 'static', 'js')) ++ ) + endif + endif +diff --git a/docs/style/static/js/INFO.md b/docs/style/static/js/INFO.md +new file mode 100644 +index 00000000..6e95673b +--- /dev/null ++++ b/docs/style/static/js/INFO.md +@@ -0,0 +1,8 @@ ++### AppStream Documentation JS Directory ++ ++You can place a minified copy of [Highlight.js](https://highlightjs.org/) in this ++directory to enable source-code highlighting in the documentation. ++ ++In case a system-wide copy of `highlight.min.js` and its CSS files exists in ++`/usr/share/javascript/highlight.js/`, the buildsystem will automatically detect that ++and create symbolic links to these files when installing the documentation. diff --git a/dev-libs/appstream/files/appstream-0.12.11-qt-add-missing-provided-kindid-enum.patch b/dev-libs/appstream/files/appstream-0.12.11-qt-add-missing-provided-kindid-enum.patch new file mode 100644 index 000000000000..e96b2a3856dd --- /dev/null +++ b/dev-libs/appstream/files/appstream-0.12.11-qt-add-missing-provided-kindid-enum.patch @@ -0,0 +1,24 @@ +From 36f71e78f033fdb5bb880825b878b7dab31c0a73 Mon Sep 17 00:00:00 2001 +From: Aleix Pol <aleixpol@kde.org> +Date: Mon, 1 Jun 2020 13:25:25 +0200 +Subject: [PATCH] qt: add missing Provided::KindId enum + +It was never added to the Qt interface +--- + qt/provided.h | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/qt/provided.h b/qt/provided.h +index 1e3ba317..8e350fb0 100644 +--- a/qt/provided.h ++++ b/qt/provided.h +@@ -59,7 +59,8 @@ class APPSTREAMQT_EXPORT Provided { + KindDBusSystemService, + KindDBusUserService, + KindFirmwareRuntime, +- KindFirmwareFlashed ++ KindFirmwareFlashed, ++ KindId, + }; + Q_ENUM(Kind) + diff --git a/dev-libs/apr-util/Manifest b/dev-libs/apr-util/Manifest index d1cfec7e041c..3b135d8f5c0e 100644 --- a/dev-libs/apr-util/Manifest +++ b/dev-libs/apr-util/Manifest @@ -1,5 +1,8 @@ AUX apr-util-1.5.3-sysroot.patch 1234 BLAKE2B 58e66e338ae936b7c206eda88a97f99785a88d79c32245c4c028f00b98a33d3f29764f66646e486d828d8cc655cbe59813236b7c5ca7060643771e4ab9b915c6 SHA512 44ee2a9cf61587f05d43976d40023f6313b310c3eeb37299840445e3faec7f0352367875f515b21d3b1fcdc8c082d8584a21cf8187deb1f6f69187c14f84f0b7 +AUX apr-util-1.6.1-drop-my_init.patch 355 BLAKE2B c97c7cca701b5d6b0ffd4b4ef9842d3d564302dc949bc3b7dfad8777156006397a5941babc8228ec2faac5fc8e9530725620bc79913cdf0ac98e0cccedbb3300 SHA512 65afe683785958d66c78cf0d57fbe8fdd3170402e6a24cd6293940aef0d6bb7597b67b890a2cce316cd077663071a64dbeaa4b543fde3cdde2e7c734354d08fb AUX apr-util-1.6.1-fix-gdbm-error-handling.patch 2272 BLAKE2B ca68b87d6f19614cfb18e1df4fe0122fbf08167de7781fb58ae0219f766c1795109ee050b2900daf63e597a455c647f5da274e90aa0e4a436e8c87c19f962c45 SHA512 9f246ff853407fe59d135481c9afff6b3ef26c753c41b52134dde44df269e25c1f3249980994a000b24417f30692bf62a044d450a47af259cdfb76fbb6b70b8d +AUX apr-util-1.6.1-mariadb-support.patch 4929 BLAKE2B 9f8a06e657386f5f773642f36f0897bba5e55270e860f2f1edc86ebe44214395a64e70c3f984f324328a8f7a6276c86cb46caca16719ab3ad51aff995868818f SHA512 edd5e1cd7d31e7bfb1b166c162ad8c69c704c8e9a09e85770df3b625ed918ed52918a16728a9b4d69370ccc75ade32dd64ef73b31ce6e8dac7a360fe44ca34e7 +AUX apr-util-1.6.1-my_bool.patch 311 BLAKE2B c0fdf523983dc75ff977c8f602678cdd7d0b3e539fc266891e2266fa3b60e0971e93d77f2e28ed95959d8ca62bca4f9f566fefea525c845d49ce545ee6b5a99a SHA512 ed7d7857be8b5d29cc17a7216c1b06134798eb5129d50389bb0d5484a46e19e3169f8cea80cab7f845548e528a2cd9909b72016a7216b402092ae15879db792c DIST apr-util-1.6.1.tar.bz2 428595 BLAKE2B ab6eaf1594aaa1c7aae151319b630b83bdb8b68ec04f0e2b429b7c7789bdf274873270200ba43701359e2502d2be8624d8e42a56a5f399ec95a841e7c73ce706 SHA512 40eff8a37c0634f7fdddd6ca5e596b38de15fd10767a34c30bbe49c632816e8f3e1e230678034f578dd5816a94f246fb5dfdf48d644829af13bf28de3225205d -EBUILD apr-util-1.6.1-r3.ebuild 3719 BLAKE2B 47a68572eaca1053a479a1e3ea9a833e39c13a004851e529794763cd401c5606fafc1b4ccfb4e31f7de0ffa2dfa2019581ec52f6fd49ba975bb9a898a251f791 SHA512 13355b4428402eebf51e05026b5f96f2d932587447e091adf02b7e0fa358d6a3dcf5791d7945784570bb74a41f6f85c14cce3af04d89a29d0c64456e1ae57e7d +EBUILD apr-util-1.6.1-r6.ebuild 3859 BLAKE2B d0c893a3bfd7bb1b832db459268d592d9bddc9adb4b8987396f60c7f837671f318b0e11c83a9b49bb7dce8723fcd10636a32c79edad8a9601ce5e0abdfef6e50 SHA512 b090e79b0a7a622605d594305f8b34ded08c6538358ccdf5343027508213bd5fd54eabccfd81df276a807e749e73a7d5a6f63c5eb46ab66855ebc6c98debb99d MISC metadata.xml 515 BLAKE2B d300be91135a6a7dcc55a61b484b5dd1785663b9f3b51d621dcacffd9ec5747b69bb227f60dce1bf30a57fe93629de3c82fa7138a5f056e4f349ce6909453020 SHA512 af8e2bbded13ef475d1577eb4faa27e17a045804f1de3e79c4c3d736871db304872fc65db0d606c243292392fb4ac773711ad9e153369714689138249d469158 diff --git a/dev-libs/apr-util/apr-util-1.6.1-r3.ebuild b/dev-libs/apr-util/apr-util-1.6.1-r6.ebuild index 077552fa61f5..a30d4b805b28 100644 --- a/dev-libs/apr-util/apr-util-1.6.1-r3.ebuild +++ b/dev-libs/apr-util/apr-util-1.6.1-r6.ebuild @@ -27,7 +27,7 @@ RDEPEND=" ldap? ( =net-nds/openldap-2* ) mysql? ( || ( dev-db/mariadb-connector-c - dev-db/mysql-connector-c + >=dev-db/mysql-connector-c-8 ) ) nss? ( dev-libs/nss ) odbc? ( dev-db/unixODBC ) @@ -49,6 +49,9 @@ DOCS=(CHANGES NOTICE README) PATCHES=( "${FILESDIR}"/${PN}-1.5.3-sysroot.patch #385775 "${FILESDIR}"/${PN}-1.6.1-fix-gdbm-error-handling.patch + "${FILESDIR}"/${PN}-1.6.1-mariadb-support.patch + "${FILESDIR}"/${PN}-1.6.1-my_bool.patch + "${FILESDIR}"/${PN}-1.6.1-drop-my_init.patch ) src_prepare() { diff --git a/dev-libs/apr-util/files/apr-util-1.6.1-drop-my_init.patch b/dev-libs/apr-util/files/apr-util-1.6.1-drop-my_init.patch new file mode 100644 index 000000000000..741ca65ca325 --- /dev/null +++ b/dev-libs/apr-util/files/apr-util-1.6.1-drop-my_init.patch @@ -0,0 +1,15 @@ +Was finally removed in >=mysql-8.0.2 + +--- a/dbd/apr_dbd_mysql.c ++++ b/dbd/apr_dbd_mysql.c +@@ -1262,9 +1262,6 @@ static apr_status_t thread_end(void *data) + + static void dbd_mysql_init(apr_pool_t *pool) + { +-#if MYSQL_VERSION_ID < 100000 +- my_init(); +-#endif + mysql_thread_init(); + + /* FIXME: this is a guess; find out what it really does */ + diff --git a/dev-libs/apr-util/files/apr-util-1.6.1-mariadb-support.patch b/dev-libs/apr-util/files/apr-util-1.6.1-mariadb-support.patch new file mode 100644 index 000000000000..137e99f97637 --- /dev/null +++ b/dev-libs/apr-util/files/apr-util-1.6.1-mariadb-support.patch @@ -0,0 +1,116 @@ +Backport of http://svn.apache.org/viewvc?rev=1872060&view=rev + +--- a/build/dbd.m4 ++++ b/build/dbd.m4 +@@ -163,10 +163,15 @@ AC_DEFUN([APU_CHECK_DBD_MYSQL], [ + old_cppflags="$CPPFLAGS" + old_ldflags="$LDFLAGS" + ++ my_library="mysqlclient" ++ + AC_ARG_WITH([mysql], APR_HELP_STRING([--with-mysql=DIR], [enable MySQL DBD driver]), + [ + if test "$withval" = "yes"; then + AC_PATH_PROG([MYSQL_CONFIG],[mysql_config]) ++ if test "x$MYSQL_CONFIG" = "x"; then ++ AC_PATH_TOOL([MYSQL_CONFIG],[mariadb_config]) ++ fi + if test "x$MYSQL_CONFIG" != 'x'; then + mysql_CPPFLAGS="`$MYSQL_CONFIG --include`" + mysql_LDFLAGS="`$MYSQL_CONFIG --libs_r | sed -e 's/-l[[^ ]]\+//g'`" +@@ -174,29 +179,37 @@ AC_DEFUN([APU_CHECK_DBD_MYSQL], [ + + APR_ADDTO(CPPFLAGS, [$mysql_CPPFLAGS]) + APR_ADDTO(LIBS, [$mysql_LIBS]) ++ ++ if $MYSQL_CONFIG --libs_r | grep -q mariadb; then ++ my_library="mariadb" ++ fi + fi + +- AC_CHECK_HEADERS([mysql.h my_global.h my_sys.h], +- AC_CHECK_LIB(mysqlclient, mysql_init, [apu_have_mysql=1]), +- [apu_have_mysql=0; break], +- [#include <my_global.h>]) +- if test "$apu_have_mysql" = "0"; then +- AC_CHECK_HEADERS([mysql/mysql.h mysql/my_global.h mysql/my_sys.h], +- AC_CHECK_LIB(mysqlclient, mysql_init, [apu_have_mysql=1]), +- [apu_have_mysql=0; break], +- [#include <mysql/my_global.h>]) ++ AC_CHECK_HEADERS([mysql.h errmsg.h], [apu_have_mysql=1], [apu_have_mysql=0; break]) ++ if test "$apr_have_mysql" = "0"; then ++ AC_CHECK_HEADERS([mysql/mysql.h mysql/errmsg.h], [apu_have_mysql=1], [apu_have_mysql=0; break]) + fi +- if test "$apu_have_mysql" != "0" && test "x$MYSQL_CONFIG" != 'x'; then ++ if test "$apr_have_mysql" = "1"; then ++ AC_CHECK_HEADERS([my_global.h my_sys.h mysql/my_global.h mysql/my_sys.h]) ++ AC_CHECK_LIB($my_library, mysql_init,, [apu_have_mysql=0]) ++ fi ++ if test "$apu_have_mysql" = "1" && test "x$MYSQL_CONFIG" != 'x'; then + APR_ADDTO(APRUTIL_PRIV_INCLUDES, [$mysql_CPPFLAGS]) + fi + elif test "$withval" = "no"; then + : + else + AC_PATH_PROG([MYSQL_CONFIG],[mysql_config],,[$withval/bin]) ++ if test "x$MYSQL_CONFIG" = "x"; then ++ AC_PATH_TOOL([MYSQL_CONFIG],[mariadb_config],,[$withval/bin]) ++ fi + if test "x$MYSQL_CONFIG" != 'x'; then + mysql_CPPFLAGS="`$MYSQL_CONFIG --include`" + mysql_LDFLAGS="`$MYSQL_CONFIG --libs_r | sed -e 's/-l[[^ ]]\+//g'`" + mysql_LIBS="`$MYSQL_CONFIG --libs_r`" ++ if $MYSQL_CONFIG --libs_r | grep -q mariadb; then ++ my_library="mariadb" ++ fi + else + mysql_CPPFLAGS="-I$withval/include" + mysql_LDFLAGS="-L$withval/lib " +@@ -207,18 +220,15 @@ AC_DEFUN([APU_CHECK_DBD_MYSQL], [ + APR_ADDTO(LIBS, [$mysql_LIBS]) + + AC_MSG_NOTICE(checking for mysql in $withval) +- AC_CHECK_HEADERS([mysql.h my_global.h my_sys.h], +- AC_CHECK_LIB(mysqlclient, mysql_init, [apu_have_mysql=1]), +- [apu_have_mysql=0; break], +- [#include <my_global.h>]) +- +- if test "$apu_have_mysql" != "1"; then +- AC_CHECK_HEADERS([mysql/mysql.h mysql/my_global.h mysql/my_sys.h], +- AC_CHECK_LIB(mysqlclient, mysql_init, [apu_have_mysql=1]), +- [apu_have_mysql=0; break], +- [#include <mysql/my_global.h>]) ++ AC_CHECK_HEADERS([mysql.h errmsg.h], [apu_have_mysql=1], [apu_have_mysql=0; break]) ++ if test "$apr_have_mysql" = "0"; then ++ AC_CHECK_HEADERS([mysql/mysql.h mysql/errmsg.h], [apu_have_mysql=1], [apu_have_mysql=0; break]) ++ fi ++ if test "$apr_have_mysql" = "1"; then ++ AC_CHECK_HEADERS([my_global.h my_sys.h mysql/my_global.h mysql/my_sys.h]) ++ AC_CHECK_LIB($my_library, mysql_init,, [apu_have_mysql=0]) + fi +- if test "$apu_have_mysql" != "0"; then ++ if test "$apu_have_mysql" = "1"; then + APR_ADDTO(APRUTIL_PRIV_INCLUDES, [$mysql_CPPFLAGS]) + fi + fi +@@ -229,7 +239,7 @@ AC_DEFUN([APU_CHECK_DBD_MYSQL], [ + dnl Since we have already done the AC_CHECK_LIB tests, if we have it, + dnl we know the library is there. + if test "$apu_have_mysql" = "1"; then +- APR_ADDTO(LDADD_dbd_mysql, [$mysql_LDFLAGS -lmysqlclient $mysql_LIBS]) ++ APR_ADDTO(LDADD_dbd_mysql, [$mysql_LDFLAGS -l$my_library $mysql_LIBS]) + fi + AC_SUBST(LDADD_dbd_mysql) + +--- a/dbd/apr_dbd_mysql.c ++++ b/dbd/apr_dbd_mysql.c +@@ -1262,7 +1262,9 @@ static apr_status_t thread_end(void *data) + + static void dbd_mysql_init(apr_pool_t *pool) + { ++#if MYSQL_VERSION_ID < 100000 + my_init(); ++#endif + mysql_thread_init(); + + /* FIXME: this is a guess; find out what it really does */ diff --git a/dev-libs/apr-util/files/apr-util-1.6.1-my_bool.patch b/dev-libs/apr-util/files/apr-util-1.6.1-my_bool.patch new file mode 100644 index 000000000000..eda0cd041287 --- /dev/null +++ b/dev-libs/apr-util/files/apr-util-1.6.1-my_bool.patch @@ -0,0 +1,15 @@ +--- a/dbd/apr_dbd_mysql.c ++++ b/dbd/apr_dbd_mysql.c +@@ -41,6 +41,12 @@ + #endif + #endif + #include <mysql.h> ++// MariaDB still include definition of my_bool but has a higher version ID ++#ifndef MARIADB_VERSION_ID ++#if MYSQL_VERSION_ID > 80000 ++typedef bool my_bool; ++#endif ++#endif + #include <errmsg.h> + #endif + diff --git a/dev-libs/apr/Manifest b/dev-libs/apr/Manifest index 0e2d16d97760..79e94264a8ff 100644 --- a/dev-libs/apr/Manifest +++ b/dev-libs/apr/Manifest @@ -10,5 +10,5 @@ DIST apr-1.6.5.tar.bz2 855393 BLAKE2B ee01a841aaf5e98175c77e406baebcd82a2148bb82 DIST apr-1.7.0.tar.bz2 872238 BLAKE2B a8750c45ca6495073a7120f3ae9b858905aecb24b6af5966c3900b06ac1f6d6b55346b17a39a9604cf1b595882335adedf8c8cf4db10e322501bfff4ad7adfe7 SHA512 3dc42d5caf17aab16f5c154080f020d5aed761e22db4c5f6506917f6bfd2bf8becfb40af919042bd4ce1077d5de74aa666f5edfba7f275efba78e8893c115148 EBUILD apr-1.6.3-r4.ebuild 4375 BLAKE2B 90b64f9ff2c75943dc1e3af995f20da04d39f5eda30a11af369c29c5abfe7fd81fde013556bf39b9c12977fbaf85b8c4ab48276acb59fe49bbc720d19cc71a91 SHA512 fb52c26e6b03dd7451530d4197b09fa4aa77d423dab40b5e99fca39f31c846e5f938dab13a9388c55041425585acff58cceaec341638ff24e6c223b3177ef6e6 EBUILD apr-1.6.5-r1.ebuild 4323 BLAKE2B 938bf92a460eb858b5a904e35fdaea447c8555ff4f2e8773469ae3dbaa455c1d3bd106db6139d09a95fb832fe6c785ef8d2edcc624a890031370957c43695849 SHA512 92afea5a9bfe44ad89926b62989cd4910c3f53b906cd89f15c9be9ef79e82ec1a825ce24fec0015888f95ff6bdb4f5954dab08eb67257b634f44a05cf8abebdc -EBUILD apr-1.7.0-r1.ebuild 4239 BLAKE2B 319f2556fd91359c276c693b678122bcda342a46f5c3e21133f986ec23dcf917b1f1bd1700877eb5afb2e5d8aa8fd6d218c7cfd985c4e2fc55d5628942775963 SHA512 377de44a51b1f06c1955866b5251034cc592224088370681d19e328ed72a1c1e4caf520909a54cd9aaa3f40dedbe9e796e2ae6886b5327249363cf0e2087a7aa +EBUILD apr-1.7.0-r1.ebuild 4233 BLAKE2B 27a4a761bc3ab2a97de3e5c20d3d5f6fe5dfd5a064634ec9aa774063d47f1a88e5edabe94d8807939547e62aa4b640ff6b68a9ba0bf490034f1a1b194b1de566 SHA512 9156e39489f77847f9a65021219506e18559e7b21d66a799feff24a922bcce0906d4db42a5fa7cbf4de67dd2b4d701e6d734b46632d7e4e72fa0dc73ce3706b2 MISC metadata.xml 433 BLAKE2B 5c4d90e1cdc1424b0be48c81e249e5c3fa6740998cc37c52a164c25238bc7c20ca6a2c4a4924ccd076aaaa74c7655d95d5526a3d110fc0a10b931d9c41de4060 SHA512 7a1b6a73160b108816332f90e4e540f555e748584925ac3c7bb303ce5b6328abf255fc3f1c2b0e13f3c5d763841e847e400e781764083e3e96bc3809871a0df6 diff --git a/dev-libs/apr/apr-1.7.0-r1.ebuild b/dev-libs/apr/apr-1.7.0-r1.ebuild index 078b517bdb35..0e9b63e9061a 100644 --- a/dev-libs/apr/apr-1.7.0-r1.ebuild +++ b/dev-libs/apr/apr-1.7.0-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://apache/apr/${P}.tar.bz2" LICENSE="Apache-2.0" SLOT="1/${PV%.*}" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~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" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 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="doc elibc_FreeBSD older-kernels-compatibility selinux static-libs +urandom" CDEPEND="elibc_glibc? ( >=sys-apps/util-linux-2.16 ) diff --git a/dev-libs/argtable/Manifest b/dev-libs/argtable/Manifest index 2b4844bb1d49..d9da1516835b 100644 --- a/dev-libs/argtable/Manifest +++ b/dev-libs/argtable/Manifest @@ -1,3 +1,3 @@ DIST argtable2-13.tar.gz 3326444 BLAKE2B 8c78d56c2e1a53747cf480808064cb006644db50a2cb38adddd71eff07d4d7f6e5467c54eec4e5cbb729a7f639927b2d3283c6995bde54134d7a85e39788b87c SHA512 3d8303f3ba529e3241d918c0127a16402ece951efb964d14a06a3a7d29a252812ad3c44e96da28798871e9923e73a2cfe7ebc84139c1397817d632cae25c4585 -EBUILD argtable-2.13-r1.ebuild 1010 BLAKE2B 1271a5075e929578acca29a2066f4f12523a2834c26a0c49ca6c109800bfc317a36c55bf813935101d893b1114c915ff6d9bfcc504f679e2e68adae54518e1cd SHA512 402f273fa7287376a2979ac809b7b4e57af4916e9011fc2425b9779e291dd041e62709db0c302691b79532d09bc912d1ea9a5379d6897d7e1d56dd5f0a7512c6 +EBUILD argtable-2.13-r1.ebuild 1017 BLAKE2B 991dcc5301d19d25a47cb73826820a47165dd53c5bce7b3989b5ac5088e8e452a77b316f9c93f87a6513e12c01e2e4fc439b6848b32f8cd9d29a21c86304f06f SHA512 6bcd2a53dc7aec354be1051de42fc6366dac34e1fcaeaedad861e04f08b61cbe4adda065cfabd2189b800fd28b647ce23559e87f70e1f1db9bcc91533efe11b9 MISC metadata.xml 243 BLAKE2B 511d8df17d176cde00906a1632ded7f6c0ec20365b356b94f64c68639c12a17c9c9a8073fc96b1c317b87c7bcfbbf0dd19136207002e810ad8012785f347e1a3 SHA512 16366e8cb41b7dad2327025b380ae289217bfd7dea66e1bf4e37a1c850e566b2485e23b2f06d1d5f5e974fb4910ac6ea5f07767c1dee6bf2621572a7f0639b74 diff --git a/dev-libs/argtable/argtable-2.13-r1.ebuild b/dev-libs/argtable/argtable-2.13-r1.ebuild index c36d3e6638a1..bb91214c70ff 100644 --- a/dev-libs/argtable/argtable-2.13-r1.ebuild +++ b/dev-libs/argtable/argtable-2.13-r1.ebuild @@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz" LICENSE="LGPL-2" SLOT="0" -KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86" IUSE="doc debug examples static-libs" S="${WORKDIR}/${MY_P}" diff --git a/dev-libs/aws-c-common/Manifest b/dev-libs/aws-c-common/Manifest index 16da20e748f4..507afa7f9e56 100644 --- a/dev-libs/aws-c-common/Manifest +++ b/dev-libs/aws-c-common/Manifest @@ -1,3 +1,3 @@ DIST aws-c-common-0.4.11.tar.gz 306933 BLAKE2B 5a2370a3696e4d90b67bc03fbf88f152e1a2d6e4d4a9ff2a9423a2cf18c14a1e3b6d978250c3359f4ebb2cf5e524e416b11604dc09dc45f5c8a5a6f982b344a7 SHA512 1e00f6aa025578978551fc8ca1bc09b448f79ac28bdc969af4312569ffca035d656dc68825da15ad8f4f890bbdb03327c624147dded1ce402e9dab1726290890 EBUILD aws-c-common-0.4.11.ebuild 499 BLAKE2B 651345b7c6e7cb6ae4e285ea5028fcba4431865d13599fb3409783be631a091ac6681cb9a81a1b1e6011dc78ceb32eeb9ac8824dc4e59f1be2c43cfe6d04b7ad SHA512 d06cccb62a6d66f81d45537be0ecc6eeb14c926df935eef5d955e9aa6a12f6e3967e3df1a2af304094146d04261fb6f5f155329bd76fd406b0c05688d7e59562 -MISC metadata.xml 527 BLAKE2B 794ec45e133fb3a39495c56b783b1d7bb5ca7cdd44840a3a305c3137dc5f72cedd7e4acc2e19aae8fc55a43521cc387462337df0ee1a6f0c662fb23b05afd996 SHA512 d859baf8f23805e9f9da7957e88d250f5f34fb24bcfb5c6760c479280d425af641dfc750995b328db197b8b9ee4ea7fee41ceed1a9c06e6b3e4acc7da1cb70e4 +MISC metadata.xml 334 BLAKE2B c8226dcaf19a3265fdc804e29bdc44227eba6e8ad6202bda3e78a1441be5f12204c3fbfbf6de2c17b4ac8aaf12f0ac14b95dd9fc93340f4a52b5236706830a18 SHA512 60907b2d5f02cdf8e10e7bf1fa44bf3a74109f71894933c00f3e9aa688651721342b8fa69a076950ec66dbe667da1ac01074ffdd632858b90c69a72841321265 diff --git a/dev-libs/aws-c-common/metadata.xml b/dev-libs/aws-c-common/metadata.xml index 682226376a67..88030cf0f62e 100644 --- a/dev-libs/aws-c-common/metadata.xml +++ b/dev-libs/aws-c-common/metadata.xml @@ -1,14 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>yamakuzure@gmx.net</email> - <name>Sven Eden</name> - </maintainer> - <maintainer type="project"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> + <!-- maintainer-needed --> <longdescription> Core c99 package for AWS SDK for C. Includes cross-platform primitives, configuration, data structures, and error handling. diff --git a/dev-libs/aws-c-event-stream/Manifest b/dev-libs/aws-c-event-stream/Manifest index 938a3d89f7bd..92a4ae48aa9b 100644 --- a/dev-libs/aws-c-event-stream/Manifest +++ b/dev-libs/aws-c-event-stream/Manifest @@ -1,4 +1,4 @@ AUX 0.1.3-add_missing_cmake_install_prefix.patch 566 BLAKE2B 1e638a3fc81c27addf3fba53173584b379b271a357246f448d5df0dd34dbcea42f698c4e5be87937070d5274940e25c1dc893c2af621b999405925cd57471c70 SHA512 872305633d8f3129280d3252632dbc07d24ee666f236f02e568e27153dd69657a2cdfdb2d594d9a86816f09923fba5b0e9cb2bd3eb0198b2a9077e02082ff54a DIST aws-c-event-stream-0.1.3.tar.gz 27945 BLAKE2B 1e6944006d4da339726a4a4f292af5c0a9a31dcb907ff01cfb63f2efbcda0466fc42b770936704e3c8d49f00b1ba9e180726ed0de9acc38c3fb23553395da1b7 SHA512 d8959b8b30795a62fe5f15d95ccc81a705e9ba8f4e5f6a05e5a965bf705877992df5660d91fde3499fd3087405018e3207e0991fba214c1362d78ee824f4cca9 EBUILD aws-c-event-stream-0.1.3.ebuild 664 BLAKE2B 1ce8ccef25923dcfed76f6ed79458ea2c2570939edd450d83033b543c9e36b1095daa02a79d1f899115f1ade5467b9f1ccde604df55c285ea30cb6b8c1a63f7a SHA512 19e3c1e9a6df30c7b9cfe77951517bc41b5a547e9dbe212dc8472893dd2c96f8f4524934420b47a7b627d5e629431efadfb5d378c1f9535ad8cce6ab56c128e3 -MISC metadata.xml 360 BLAKE2B c3adf10e8868a7699a1c7798e4221cff255e9505062692d7db7b733e9d5cf7b568183a294c9e0e7b125e9a6c0d848d370a43ed6cd32e498eab4adfe1c46e7abb SHA512 571bbdb2968c5b6f49dcf41e7706775f2bab9302eef8795f9ccbd51922436161af01b17857370bc49960cb1f40a670ca759ff76381e92f7cd18ee51b9361f10e +MISC metadata.xml 168 BLAKE2B 95e3160d1d6abb3e5510581fe45ddcd9ad526f89bbc0d3ad226e2782d148a0c71e50426809a87fb45e6fc9356e597a1d271002764caebc79be8846301eb82d5e SHA512 5edd6cda32972ff5e53cf5f883928bd1887b4a45572657f99101284a909ea04ff906b8f4068d247d1b3367bde813dbb37ba11565aaff880d9b500685b0f5a33d diff --git a/dev-libs/aws-c-event-stream/metadata.xml b/dev-libs/aws-c-event-stream/metadata.xml index 7fc93805817f..585b0dc75dda 100644 --- a/dev-libs/aws-c-event-stream/metadata.xml +++ b/dev-libs/aws-c-event-stream/metadata.xml @@ -1,12 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>yamakuzure@gmx.net</email> - <name>Sven Eden</name> - </maintainer> - <maintainer type="project"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> -</pkgmetadata> + <!-- maintainer-needed --> + </pkgmetadata> diff --git a/dev-libs/aws-checksums/Manifest b/dev-libs/aws-checksums/Manifest index ea1f0624c4f2..0f3337293da2 100644 --- a/dev-libs/aws-checksums/Manifest +++ b/dev-libs/aws-checksums/Manifest @@ -1,3 +1,3 @@ DIST aws-checksums-0.1.3.tar.gz 78242 BLAKE2B e78f3bb34e124351ad494e86e579613799afebcfe491fb36b20190121f2bf9de9d96714ad304a7fcd702708f5be417c6dbafe65606b2fe42c340edc796a3ecf3 SHA512 79bf71a6c4c268b27efe8a6a3c4b90281da4ce7f6e4c1c62fce80b11a4756ecfd4dc2b19624ace3f54137113d0cb56a517de0b91dd6338ee8ca069756bca13f4 EBUILD aws-checksums-0.1.3.ebuild 536 BLAKE2B 2078883a7d3521896f5759b4f240693bb31da6cd1ede0841f5ac4c785bf92b15164f30a7df0df649413a15f421dce0ad8b9688cc040cb1b77d1993c63c880d8a SHA512 32a92b41b5bd40dd2ea80e9442315942e7bb7c9e211edd3e4a766afcb948e342cbd1f95d4ae6635fe2459b6f578891036d5baaf7d323e9f5d67ebf93ae349e9f -MISC metadata.xml 555 BLAKE2B 48bbce733b96fcf28e492a782ad5681c554e20a269477851b734a16c9bff126ce545920754491532fc5ac026707290d7c988e162d0815586da19986a6793c4a0 SHA512 4d5a312fb968d62d31279d1e3f998688c54b9f9829a3c839227e10e931422f865fa29450469d0a8cd08c05849d098e05b8c5bcf962039dded80932d1d25e0b42 +MISC metadata.xml 362 BLAKE2B 5547648b863d8a47ca4fdde628bbb7c4cb7316c8edfb0daa2c9dc79cce94325858c3f26f0bd9cd36ba57851e13c27822005cf3563e175877d06a13c43ceadea7 SHA512 e57176253c813d8e6b37f2f64416e9ef478230013fe39bd057f4af1945c7ac4ed9cf415b30b6c375263e87db11e6279a4ae55a7748b9e0cd1fcfb4d7888c40da diff --git a/dev-libs/aws-checksums/metadata.xml b/dev-libs/aws-checksums/metadata.xml index d0278a72a5c1..d128563f8d91 100644 --- a/dev-libs/aws-checksums/metadata.xml +++ b/dev-libs/aws-checksums/metadata.xml @@ -1,14 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>yamakuzure@gmx.net</email> - <name>Sven Eden</name> - </maintainer> - <maintainer type="project"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> + <!-- maintainer-needed --> <longdescription> Cross-Platform HW accelerated CRC32c and CRC32 with fallback to efficient SW implementations. C interface with language diff --git a/dev-libs/aws-sdk-cpp/Manifest b/dev-libs/aws-sdk-cpp/Manifest index fbea24fa2c92..06b9522c997a 100644 --- a/dev-libs/aws-sdk-cpp/Manifest +++ b/dev-libs/aws-sdk-cpp/Manifest @@ -1,3 +1,3 @@ DIST aws-sdk-cpp-1.7.178.tar.gz 22589166 BLAKE2B 40364307fb676a89cf2b363d02dfa95e03c6e0b02e34c3d5376820dd7721f13108bf1f1713ff5f39dfc7d98f5cd368718601a397f55c4e26a37cd62d346cbf70 SHA512 b5c969d8b0b9ca5aa7b6af762bf79647ee407cae2686b90c4acefb6a113cf4e7a582e4e5aebd2e6289685e6ac373f9f994e57cd34bd12543b2b36142e00df478 EBUILD aws-sdk-cpp-1.7.178.ebuild 6285 BLAKE2B 8971ad0a063b5a1113f1e15c80bf609d31d81760285e6c158de066bb242591bb3a59ff8cb51525c8d411b0c1a94ae2780aa7d384a56a187e267bd46beb3e8771 SHA512 23a3d8d16ea8d8ff3791e3fd81a52e92c1035432148a8a92c089c19c90f21423cb1064a6555aeaa9ff67c6c234f62a90989814d6c172a7b91d847f0e87c719f6 -MISC metadata.xml 19286 BLAKE2B 2f347b29348e37e9b80827e6b2a2dd5a70b5d354e9eb226e8fbcd7eea26f57f831e13e57bde15e5ca97ac9403bb6acef68612e2a30c22db8136ac501630e3670 SHA512 5c072bae80814025ffc5eac7d2eb6199360e99e4b806be97a7770c2b6b570d122ac399feb137b65fd02f52bd8c5b1e8e61e75fcd91d7ae24489ef05ee018bb0f +MISC metadata.xml 19182 BLAKE2B 32ba87941d8d92149ecb65a8f37f11f032690e9819bd0098e287c9679fec754539d36de4545c4a63a4059b735e1f0fbcbbce75b99395efa6ef67dbdf2b98a103 SHA512 b87ce25db7e3f4b651e6861dff4582265dce1cb42f3bcbe9457b4f25eba5f79ef5c8037c1379c92bff49e9e363d310acfd8ed9b2799115b8333f7f1b2e3a11e5 diff --git a/dev-libs/aws-sdk-cpp/metadata.xml b/dev-libs/aws-sdk-cpp/metadata.xml index 74a0ef4c8002..3995d6c12b58 100644 --- a/dev-libs/aws-sdk-cpp/metadata.xml +++ b/dev-libs/aws-sdk-cpp/metadata.xml @@ -4,10 +4,6 @@ <maintainer type="person"> <email>amit.prakash.ambasta@gmail.com</email> </maintainer> - <maintainer type="person"> - <email>yamakuzure@gmx.net</email> - <name>Sven Eden</name> - </maintainer> <maintainer type="project"> <email>proxy-maint@gentoo.org</email> <name>Proxy Maintainers</name> diff --git a/dev-libs/bemenu/Manifest b/dev-libs/bemenu/Manifest index 972c3be1e5ac..c8e3f01e5c95 100644 --- a/dev-libs/bemenu/Manifest +++ b/dev-libs/bemenu/Manifest @@ -1,6 +1,6 @@ -DIST bemenu-0.3.0.tar.gz 120059 BLAKE2B 5db3e7bcc4c67e9f7030fc803a5531994746787ebecfba91c7f09128ea9077b3b06e8f542c1a2980811b8364db3a54fefbdb0af1afaca2f58f098473a4fbd5d6 SHA512 7e68d11954517f41c9669055c28b375c4f13ddfee8aae6a8e67c3282fe9118229d9ab072dc5e264e4204803b1a5ab715c6a5c9565ad4b7436cc172b9e455c05b DIST bemenu-0.4.1.tar.gz 110388 BLAKE2B 229f75887b8efc336c7790745b1a3402481a1cb86f92311c0c46ec123777ad051351fede5f7d59bce532a3a906bcab8d956f1e93d5aeac44dd7a49e7210e8e9f SHA512 d86b80b2eccbfca73287975f6f5ff9d86c7541900caec858c9aeff9cb7da2ee563e34e378561822671ba16e0f2af3440e0329f5c77f06ff5adcf332451452bf2 -EBUILD bemenu-0.3.0.ebuild 1184 BLAKE2B 1c153e1e95049365d14a27abd458312155e486dbcb34a27098233eec72f49bfd9d972df42bdce3682d3e4584c109a068a39f03d28073895e36e4292f0992ffba SHA512 088eecd4878df657071fc88fdcf27aaa4c09912b5206e479d7a708976586d3d89c352cc573241bbaf69319ba3d3c7f26a47538a382d1344a55abb8967b7e3097 +DIST bemenu-0.5.0.tar.gz 110749 BLAKE2B dbc6d295262e51c381a9208c6936c0f40e05f3667af6a562716501577861d04c7b28ba836acbce2a6644950a191e56f865efe2f126eccdad67ea68d42f2d30b5 SHA512 5f4397bcb77d3e22340988bfb131feced1782f724ff637e40bf03c36a4377f38127c827f55faccc0dcce2ca482b9353fca7c6bfe700e6cac8e095e0df3b87a31 EBUILD bemenu-0.4.1.ebuild 1147 BLAKE2B aa97ef742fdeca8fc8bb198a936a19fedbb6abd1994a15dc9073a209c241574150cd37fad669fb28b7539b95ce8897a93830b220c70e8dc56a90160d2ce75d88 SHA512 2e1165fc6b3ab5e9203f47e505ad56d9184149862509084490350832f3ff9bb84dab9374753293e82cd0381f653d1d1f30b0940d7044ce9c81ca8f04402478f2 +EBUILD bemenu-0.5.0.ebuild 1147 BLAKE2B aa97ef742fdeca8fc8bb198a936a19fedbb6abd1994a15dc9073a209c241574150cd37fad669fb28b7539b95ce8897a93830b220c70e8dc56a90160d2ce75d88 SHA512 2e1165fc6b3ab5e9203f47e505ad56d9184149862509084490350832f3ff9bb84dab9374753293e82cd0381f653d1d1f30b0940d7044ce9c81ca8f04402478f2 EBUILD bemenu-9999.ebuild 1147 BLAKE2B aa97ef742fdeca8fc8bb198a936a19fedbb6abd1994a15dc9073a209c241574150cd37fad669fb28b7539b95ce8897a93830b220c70e8dc56a90160d2ce75d88 SHA512 2e1165fc6b3ab5e9203f47e505ad56d9184149862509084490350832f3ff9bb84dab9374753293e82cd0381f653d1d1f30b0940d7044ce9c81ca8f04402478f2 MISC metadata.xml 254 BLAKE2B 731c7015b1415180253ab851fc24ad031153050aa0feff41781a5c16ced70787ca132b4fe53adaa8a189de944dda987c65081162895f1f03d68dc77405308fa7 SHA512 49faa8aa0aef31db638fe291aa55ff114f96fd9f9b2c733f88b326b44f3e9dbf627e825de7c41d45f208b2b7e5e6cd5c03e6fee3fa6013625ce7ce158bbc9a31 diff --git a/dev-libs/bemenu/bemenu-0.3.0.ebuild b/dev-libs/bemenu/bemenu-0.5.0.ebuild index cc3b01f2040d..e7510494e8a6 100644 --- a/dev-libs/bemenu/bemenu-0.3.0.ebuild +++ b/dev-libs/bemenu/bemenu-0.5.0.ebuild @@ -3,8 +3,6 @@ EAPI=7 -inherit cmake-utils - DESCRIPTION="dmenu clone for wayland" HOMEPAGE="https://github.com/Cloudef/bemenu" if [[ ${PV} == 9999 ]]; then @@ -36,21 +34,17 @@ DEPEND=" x11-libs/libX11 x11-libs/cairo[X] x11-libs/pango[X] + x11-libs/libXinerama ) " RDEPEND="${DEPEND}" BDEPEND="doc? ( app-doc/doxygen )" -src_configure() { - local mycmakeargs=( - -DCURSES_LIBRARY=/usr/$(get_libdir)/libncursesw.so - -DBEMENU_CURSES_RENDERER=$(usex ncurses ON OFF) - -DBEMENU_WAYLAND_RENDERER=$(usex wayland ON OFF) - -DBEMENU_X11_RENDERER=$(usex X ON OFF) - ) - cmake-utils_src_configure +src_compile() { + emake clients $(usex ncurses curses "") $(usex X x11 "") $(usex wayland wayland "") PREFIX=/usr libdir=/$(get_libdir) + use doc && emake doxygen PREFIX=/usr libdir=/$(get_libdir) } src_install() { - cmake-utils_src_install + emake install PREFIX="${D}"/usr libdir=/$(get_libdir) } diff --git a/dev-libs/boost/Manifest b/dev-libs/boost/Manifest index 807664276141..113c54d3c41f 100644 --- a/dev-libs/boost/Manifest +++ b/dev-libs/boost/Manifest @@ -6,9 +6,12 @@ AUX boost-1.72.0-missing-serialization-split_member-include.patch 992 BLAKE2B 10 AUX boost-1.72.0-revert-cease-dependence-on-range.patch 1687 BLAKE2B 9419cf7b50359c17f6226e0706e64a4637d835172a742807349536fb87731912929148810e5abb33c6005583bf6077283c2e6c453a911ea7922266f616b60ea4 SHA512 9b53d2fe2dddd592e43db03c26fadd6c07d4c45a980ae4c775b7a914346a3914f6e0c3ef42dad5e2ea4568afb86c9967e09444ff609cfba1e1d39f4980b22ad6 AUX boost-1.73-boost-mpi-python-PEP-328.patch 396 BLAKE2B 5f08ce2eab46f2d108166afef086382dc9cd9a5305435cf437fa3ae505736979664357aa23cc51b2a74bee6aae46d94a671056037578562846e900fd2c7e65e8 SHA512 fa55d1da17bd110db2c9a16dce4da267a62ef10c13a6dc3aa6afd3b33e9a18499266b4411d292533b1c691e3bf0309fa1aab8ec19e7775a7835d89275183e6f2 AUX boost-1.73-boost-python-cleanup.patch 3414 BLAKE2B 5167f69bbaf47be548a522638ac4a2dc9bc355d5f237738f9775b2e25a5050b6faacc5f1ce60a484f1664159ca9ba8937db3d9f8e4f0fd76117ff7f61c65cd37 SHA512 b5406e6a31a7feec590f2ee0195fc96e8830b51c270c74162d01b86b748bc11fd353ae97179e0096502b6d7dae69cdc0a478f513e2d7622455bf23a9b0da390b +AUX boost-1.73-geometry-private-inheritance.patch 913 BLAKE2B 390a9e20a1f86f68f05b61478da3df9043de27f4f111d08789b017b16a4dc6026e5b16658742644fedc5d19cc65186d058f83af6c2d028acac9c21577ac6bddb SHA512 3a52baeb9836a6ececf4b6334c845542c73751ef82b3c0ac217e8416d56a94ece6fc5d80c94ab9aae3cba7123c2e1b65f999c81a758375c3da51807d5cbec963 AUX boost-1.73-property-tree-include.patch 1832 BLAKE2B 7488cf768209bde32af608f366ad0d9a392bb36e6b9e4c7ac13a262eedea668fb58667f41cd089c91f43fee4a6a68e442c2e627ffa2341c44274b4f4f7f644db SHA512 a18fa18388b74371aa3d3826621df90e8c8f6d2c6b9cf25bc9f7761e98817cc9252ccd43fa5a374136f257e9a0c1f927eb9912d0715bb1de94b3e92af957d84a DIST boost_1_72_0.tar.bz2 106907358 BLAKE2B ab270a0e3cb24da687d86785e2d2e6d7731b4dbc07bd839eadb642dfa5a428ad584acb1f3529661a8de9a986008ff3427491041059ea2b742348d02e00761cd8 SHA512 63bbd1743e7c904b2e69fdc2eafd1c2a8a30fd70d960dcd366059d0100f000cb605d56cbd9397bb18421631f1c9552a772c434d0f0caddbe56302273f51fd1f6 DIST boost_1_73_0.tar.bz2 109247910 BLAKE2B 5995ff6ca21f45988b187b94bf743795cca97531baa8355f488be0987b9426289dd85d6ce25b7eb03ccd690109f05ba56252a95bca50505ad9cd66f4e0e234e8 SHA512 86c296511c0766145097625a62bf099c3d155284d250ad6e528e788bc90b2945838498dfe473c6c6c78d1694b6fba8e19f7dee0d064a043841e6231603fff668 +DIST boost_1_74_0.tar.bz2 109600630 BLAKE2B 2982f64fccf6fdb3b4b74452e603f459242d7abb42df4162278d9b558b637786a2eb97442126967b19088d591777c64ced8f60a23e71eaa0b7545e80f800de63 SHA512 4ec9c1164ec9b95ce46ba1c073e586c94b3882dce5b7347ea14bbef0c1da230e12aa5328a501ce38cae1b1d7623daa3246325625899179b4cc309242540982a4 EBUILD boost-1.72.0-r1.ebuild 11337 BLAKE2B bb6e82cc6c0dd49627cbd9841a4e02cf80e5e4dc3588a10c93abe587327bf3ad0d2e427bd3eb4944a8c0dee53c48de617e7305ba80091385e1a448c3e86cb544 SHA512 f07607be1571a204f050a9ae7d8c2994b944259301c1c3cb0bb81d7c84c4721b8baba8bd2795abaf01585e6a36749492527b5c8ce56c2d3fe81ba52590d9e2e0 -EBUILD boost-1.73.0.ebuild 11236 BLAKE2B 13312c8b44e2c0ac3633d773e7790d241557342d494887357a6f62d561bcd622715245e4b02259cb6d3ed92d7566453034f463fa4370234146892367e4207c08 SHA512 37deefaf6f5eed06e96774782fca198e508f69c2c26c5337e23c5598d68834c85da0d188a0cd8cca46b479cc54a5d2cf5e09cbbf145b403a1317e6dff573c204 +EBUILD boost-1.73.0.ebuild 11348 BLAKE2B 25c73b12e45920322fecba41e58217771e85b5963dae04cbeb456fa540be68488f6b7321290e65662cbb1cdd035d7577b63be3d80889ae476224646cf60e535d SHA512 d63b8b5a3ef6b1506159c435d618af77ef601507ad7bbb8393d65b0c6aefa2a2fe380553556733c10a8f21f67be1eb6c1131fa07a9f0dfc5d11edd5f7bdfd806 +EBUILD boost-1.74.0.ebuild 11238 BLAKE2B 7eb2f3f696a01e2a44b9c36dde218d009f0fe980061c72888f8c7ae1acfc174a11ea38dc9f3e12b889b6e942887608ad1fc5f788c98c78988764a82999ae7e0f SHA512 a0c72d4e089bf060a34f1739662a674d2d11310f859d937d94888abde18f78a6ca9608ce494f7ef799da1d7074d2624b0bcd4d25ba37c446a94d0e0c7c4f9fad MISC metadata.xml 1398 BLAKE2B ddaab460cad149df5f91c1a37eb7ffaa6a2b90e1062f268925fd3e0db1403d3447963c27fcd72847319e8510723a1a245be398d50a1e317662f59f593991ff0a SHA512 ed8530328af7bef694be2af7d3ba0c83198f769223b35ee5c1a2463cf50c97e964f7a4d8361f5091e9994fe0bff000534b6c5d5e5b517d38d101061026bd01bd diff --git a/dev-libs/boost/boost-1.73.0.ebuild b/dev-libs/boost/boost-1.73.0.ebuild index bcc792402694..e5b91ab30530 100644 --- a/dev-libs/boost/boost-1.73.0.ebuild +++ b/dev-libs/boost/boost-1.73.0.ebuild @@ -60,6 +60,8 @@ PATCHES=( "${FILESDIR}"/${PN}-1.73-boost-mpi-python-PEP-328.patch # Remove annoying #pragma message "${FILESDIR}"/${PN}-1.73-property-tree-include.patch + # https://github.com/boostorg/geometry/issues/721 + "${FILESDIR}"/${PN}-1.73-geometry-private-inheritance.patch ) python_bindings_needed() { diff --git a/dev-libs/boost/boost-1.74.0.ebuild b/dev-libs/boost/boost-1.74.0.ebuild new file mode 100644 index 000000000000..ed0bc9519c89 --- /dev/null +++ b/dev-libs/boost/boost-1.74.0.ebuild @@ -0,0 +1,358 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python{2_7,3_{6,7,8,9}} ) + +inherit flag-o-matic multiprocessing python-r1 toolchain-funcs multilib-minimal + +MY_PV="$(ver_rs 1- _)" +MAJOR_V="$(ver_cut 1-2)" + +DESCRIPTION="Boost Libraries for C++" +HOMEPAGE="https://www.boost.org/" +SRC_URI="https://dl.bintray.com/boostorg/release/${PV}/source/boost_${MY_PV}.tar.bz2" + +LICENSE="Boost-1.0" +SLOT="0/${PV}" # ${PV} instead ${MAJOR_V} due to bug 486122 +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris ~x86-winnt" +IUSE="bzip2 context debug doc icu lzma +nls mpi numpy python static-libs +threads tools zlib zstd" +REQUIRED_USE=" + mpi? ( threads ) + python? ( ${PYTHON_REQUIRED_USE} )" + +# the tests will never fail because these are not intended as sanity +# tests at all. They are more a way for upstream to check their own code +# on new compilers. Since they would either be completely unreliable +# (failing for no good reason) or completely useless (never failing) +# there is no point in having them in the ebuild to begin with. +RESTRICT="test" + +RDEPEND=" + !app-admin/eselect-boost + !dev-libs/boost-numpy + !<dev-libs/leatherman-1.12.0-r1 + bzip2? ( app-arch/bzip2:=[${MULTILIB_USEDEP}] ) + icu? ( >=dev-libs/icu-3.6:=[${MULTILIB_USEDEP}] ) + !icu? ( virtual/libiconv[${MULTILIB_USEDEP}] ) + lzma? ( app-arch/xz-utils:=[${MULTILIB_USEDEP}] ) + mpi? ( >=virtual/mpi-2.0-r4[${MULTILIB_USEDEP},cxx,threads] ) + python? ( + ${PYTHON_DEPS} + numpy? ( $(python_gen_cond_dep 'dev-python/numpy[${PYTHON_USEDEP}]' -3) ) + ) + zlib? ( sys-libs/zlib:=[${MULTILIB_USEDEP}] ) + zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )" +DEPEND="${RDEPEND}" +BDEPEND="=dev-util/boost-build-${MAJOR_V}*" + +S="${WORKDIR}/${PN}_${MY_PV}" + +PATCHES=( + "${FILESDIR}"/${PN}-1.71.0-disable_icu_rpath.patch + "${FILESDIR}"/${PN}-1.71.0-context-x32.patch + "${FILESDIR}"/${PN}-1.71.0-build-auto_index-tool.patch + # upstream unresponsive to pull request + # https://github.com/boostorg/python/pull/286 + "${FILESDIR}"/${PN}-1.73-boost-python-cleanup.patch + # Boost.MPI's __init__.py doesn't work on Py3 + "${FILESDIR}"/${PN}-1.73-boost-mpi-python-PEP-328.patch + # Remove annoying #pragma message + "${FILESDIR}"/${PN}-1.73-property-tree-include.patch +) + +python_bindings_needed() { + multilib_is_native_abi && use python +} + +tools_needed() { + multilib_is_native_abi && use tools +} + +create_user-config.jam() { + local user_config_jam="${BUILD_DIR}"/user-config.jam + if [[ -s ${user_config_jam} ]]; then + einfo "${user_config_jam} already exists, skipping configuration" + return + else + einfo "Creating configuration in ${user_config_jam}" + fi + + local compiler compiler_version compiler_executable="$(tc-getCXX)" + if [[ ${CHOST} == *-darwin* ]]; then + compiler="darwin" + compiler_version="$(gcc-fullversion)" + else + compiler="gcc" + compiler_version="$(gcc-version)" + fi + + if use mpi; then + local mpi_configuration="using mpi ;" + fi + + cat > "${user_config_jam}" <<- __EOF__ || die + using ${compiler} : ${compiler_version} : ${compiler_executable} : <cflags>"${CFLAGS}" <cxxflags>"${CXXFLAGS}" <linkflags>"${LDFLAGS}" ; + ${mpi_configuration} + __EOF__ + + if python_bindings_needed; then + append_to_user_config() { + local py_config + if tc-is-cross-compiler; then + py_config="using python : ${EPYTHON#python} : : ${ESYSROOT}/usr/include/${EPYTHON} : ${ESYSROOT}/usr/$(get_libdir) ;" + else + py_config="using python : ${EPYTHON#python} : ${PYTHON} : $(python_get_includedir) ;" + fi + echo "${py_config}" >> "${user_config_jam}" || die + } + python_foreach_impl append_to_user_config + fi + + if python_bindings_needed && use numpy; then + einfo "Enabling support for NumPy extensions in Boost.Python" + else + einfo "Disabling support for NumPy extensions in Boost.Python" + + # Boost.Build does not allow for disabling of numpy + # extensions, thereby leading to automagic numpy + # https://github.com/boostorg/python/issues/111#issuecomment-280447482 + sed \ + -e 's/\[ unless \[ python\.numpy \] : <build>no \]/<build>no/g' \ + -i "${BUILD_DIR}"/libs/python/build/Jamfile || die + fi +} + +pkg_setup() { + # Bail out on unsupported build configuration, bug #456792 + if [[ -f "${EROOT}"/etc/site-config.jam ]]; then + if ! grep -q 'gentoo\(debug\|release\)' "${EROOT}"/etc/site-config.jam; then + eerror "You are using custom ${EROOT}/etc/site-config.jam without defined gentoorelease/gentoodebug targets." + eerror "Boost can not be built in such configuration." + eerror "Please, either remove this file or add targets from ${EROOT}/usr/share/boost-build/site-config.jam to it." + die "Unsupported target in ${EROOT}/etc/site-config.jam" + fi + fi +} + +src_prepare() { + default + multilib_copy_sources +} + +ejam() { + create_user-config.jam + + local b2_opts=( "--user-config=${BUILD_DIR}/user-config.jam" ) + if python_bindings_needed; then + append_to_b2_opts() { + b2_opts+=( python="${EPYTHON#python}" ) + } + python_foreach_impl append_to_b2_opts + else + b2_opts+=( --without-python ) + fi + b2_opts+=( "$@" ) + + echo b2 "${b2_opts[@]}" >&2 + b2 "${b2_opts[@]}" +} + +src_configure() { + # Workaround for too many parallel processes requested, bug #506064 + [[ "$(makeopts_jobs)" -gt 64 ]] && MAKEOPTS="${MAKEOPTS} -j64" + + OPTIONS=( + $(usex debug gentoodebug gentoorelease) + "-j$(makeopts_jobs)" + -q + -d+2 + pch=off + $(usex icu "-sICU_PATH=${ESYSROOT}/usr" '--disable-icu boost.locale.icu=off') + $(usex mpi '' '--without-mpi') + $(usex nls '' '--without-locale') + $(usex context '' '--without-context --without-coroutine --without-fiber') + $(usex threads '' '--without-thread') + --without-stacktrace + --boost-build="${BROOT}"/usr/share/boost-build + --prefix="${ED}/usr" + --layout=system + # CMake has issues working with multiple python impls, + # disable cmake config generation for the time being + # https://github.com/boostorg/python/issues/262#issuecomment-483069294 + --no-cmake-config + # building with threading=single is currently not possible + # https://svn.boost.org/trac/boost/ticket/7105 + threading=multi + link=$(usex static-libs shared,static shared) + # this seems to be the only way to disable compression algorithms + # https://www.boost.org/doc/libs/1_70_0/libs/iostreams/doc/installation.html#boost-build + -sNO_BZIP2=$(usex bzip2 0 1) + -sNO_LZMA=$(usex lzma 0 1) + -sNO_ZLIB=$(usex zlib 0 1) + -sNO_ZSTD=$(usex zstd 0 1) + ) + + if [[ ${CHOST} == *-darwin* ]]; then + # We need to add the prefix, and in two cases this exceeds, so prepare + # for the largest possible space allocation. + append-ldflags -Wl,-headerpad_max_install_names + fi + + # Use C++14 globally as of 1.62 + append-cxxflags -std=c++14 +} + +multilib_src_compile() { + ejam "${OPTIONS[@]}" || die + + if tools_needed; then + pushd tools >/dev/null || die + ejam \ + "${OPTIONS[@]}" \ + || die "Building of Boost tools failed" + popd >/dev/null || die + fi +} + +multilib_src_install_all() { + if ! use numpy; then + rm -r "${ED}"/usr/include/boost/python/numpy* || die + fi + + if use python; then + if use mpi; then + move_mpi_py_into_sitedir() { + python_moduleinto boost + python_domodule "${S}"/libs/mpi/build/__init__.py + + python_domodule "${ED}"/usr/$(get_libdir)/boost-${EPYTHON}/mpi.so + rm -r "${ED}"/usr/$(get_libdir)/boost-${EPYTHON} || die + + python_optimize + } + python_foreach_impl move_mpi_py_into_sitedir + else + rm -r "${ED}"/usr/include/boost/mpi/python* || die + fi + else + rm -r "${ED}"/usr/include/boost/{python*,mpi/python*,parameter/aux_/python,parameter/python*} || die + fi + + if ! use nls; then + rm -r "${ED}"/usr/include/boost/locale || die + fi + + if ! use context; then + rm -r "${ED}"/usr/include/boost/context || die + rm -r "${ED}"/usr/include/boost/coroutine{,2} || die + rm "${ED}"/usr/include/boost/asio/spawn.hpp || die + fi + + if use doc; then + # find extraneous files that shouldn't be installed + # as part of the documentation and remove them. + find libs/*/* \( -iname 'test' -o -iname 'src' \) -exec rm -rf '{}' + || die + find doc \( -name 'Jamfile.v2' -o -name 'build' -o -name '*.manifest' \) -exec rm -rf '{}' + || die + find tools \( -name 'Jamfile.v2' -o -name 'src' -o -name '*.cpp' -o -name '*.hpp' \) -exec rm -rf '{}' + || die + + docinto html + dodoc *.{htm,html,png,css} + dodoc -r doc libs more tools + + # To avoid broken links + dodoc LICENSE_1_0.txt + + dosym ../../../../include/boost /usr/share/doc/${PF}/html/boost + fi +} + +multilib_src_install() { + ejam \ + "${OPTIONS[@]}" \ + --includedir="${ED}/usr/include" \ + --libdir="${ED}/usr/$(get_libdir)" \ + install || die "Installation of Boost libraries failed" + + pushd "${ED}/usr/$(get_libdir)" >/dev/null || die + + local ext=$(get_libname) + if use threads; then + local f + for f in *${ext}; do + dosym ${f} /usr/$(get_libdir)/${f/${ext}/-mt${ext}} + done + fi + + popd >/dev/null || die + + if tools_needed; then + dobin dist/bin/* + + insinto /usr/share + doins -r dist/share/boostbook + fi + + # boost's build system truely sucks for not having a destdir. Because for + # this reason we are forced to build with a prefix that includes the + # DESTROOT, dynamic libraries on Darwin end messed up, referencing the + # DESTROOT instread of the actual EPREFIX. There is no way out of here + # but to do it the dirty way of manually setting the right install_names. + if [[ ${CHOST} == *-darwin* ]]; then + einfo "Working around completely broken build-system(tm)" + local d + for d in "${ED}"/usr/lib/*.dylib; do + if [[ -f ${d} ]]; then + # fix the "soname" + ebegin " correcting install_name of ${d#${ED}}" + install_name_tool -id "/${d#${D}}" "${d}" + eend $? + # fix references to other libs + refs=$(otool -XL "${d}" | \ + sed -e '1d' -e 's/^\t//' | \ + grep "^libboost_" | \ + cut -f1 -d' ') + local r + for r in ${refs}; do + ebegin " correcting reference to ${r}" + install_name_tool -change \ + "${r}" \ + "${EPREFIX}/usr/lib/${r}" \ + "${d}" + eend $? + done + fi + done + fi +} + +pkg_preinst() { + # Yai for having symlinks that are nigh-impossible to remove without + # resorting to dirty hacks like these. Removes lingering symlinks + # from the slotted versions. + local symlink + for symlink in "${EROOT}"/usr/include/boost "${EROOT}"/usr/share/boostbook; do + if [[ -L ${symlink} ]]; then + rm -f "${symlink}" || die + fi + done + + # some ancient installs still have boost cruft lying around + # for unknown reasons, causing havoc for reverse dependencies + # Bug: 607734 + rm -rf "${EROOT}"/usr/include/boost-1_[3-5]? || die +} + +pkg_postinst() { + elog "Boost.Regex is *extremely* ABI sensitive. If you get errors such as" + elog + elog " undefined reference to \`boost::re_detail_$(ver_cut 1)0$(ver_cut 2)00::cpp_regex_traits_implementation" + elog " <char>::transform_primary[abi:cxx11](char const*, char const*) const'" + elog + elog "Then you need to recompile Boost and all its reverse dependencies" + elog "using the same toolchain. In general, *every* change of the C++ toolchain" + elog "requires a complete rebuild of the boost-dependent ecosystem." + elog + elog "See for instance https://bugs.gentoo.org/638138" +} diff --git a/dev-libs/boost/files/boost-1.73-geometry-private-inheritance.patch b/dev-libs/boost/files/boost-1.73-geometry-private-inheritance.patch new file mode 100644 index 000000000000..fef7bafec8ff --- /dev/null +++ b/dev-libs/boost/files/boost-1.73-geometry-private-inheritance.patch @@ -0,0 +1,23 @@ +From aafbceccc76dccb75963dd4f596fd1f10ee34b03 Mon Sep 17 00:00:00 2001 +From: Jonathan Wakely <boost@kayari.org> +Date: Fri, 5 Jun 2020 19:29:27 +0100 +Subject: [PATCH] Make index::detail::rtree::visitors::insert base class public + +Fixes #721 +--- + boost/geometry/index/detail/rtree/visitors/insert.hpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/boost/geometry/index/detail/rtree/visitors/insert.hpp b/boost/geometry/index/detail/rtree/visitors/insert.hpp +index 2d324cb7f4..5709a930cc 100644 +--- a/boost/geometry/index/detail/rtree/visitors/insert.hpp ++++ b/boost/geometry/index/detail/rtree/visitors/insert.hpp +@@ -265,7 +265,7 @@ struct insert_traverse_data + // Default insert visitor + template <typename Element, typename MembersHolder> + class insert +- : MembersHolder::visitor ++ : public MembersHolder::visitor + { + protected: + typedef typename MembersHolder::box_type box_type; diff --git a/dev-libs/botan/Manifest b/dev-libs/botan/Manifest index 6eb32a084b64..0767bdb874f5 100644 --- a/dev-libs/botan/Manifest +++ b/dev-libs/botan/Manifest @@ -1,7 +1,9 @@ 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-2.14.0.tar.xz 5958948 BLAKE2B 90e73945b22f6e4e8d6163bfb45eca153eb1495448f8bf35514b780fd12bb1b81c822314e1f598c7625277f1e9cf7a6265387cca80ffd4c2664c681b9d4807fd SHA512 ee15928ecdb0127720b444b0207d46fd68fe3007125b0deb8bdd32f96e9befb684ad54009354da4f6a3c48b9698693b46223710a47fd644da8760dda53d40d34 +DIST Botan-2.15.0.tar.xz 5920688 BLAKE2B 1bbb9cadb0f754194851bddf8b14dbcd291285c5f3fbaad35920277a11c3d9e1b1e5cc484c0d37b1c7999b3084a1c90da56631df0b07e788372b95aff5197031 SHA512 0965a0a6141df44e38bd7da038b89dd2b3808ed9a4ebaafbf089abf60718e62cba78d7b64eaf272b5df8c5a489222e4cad4fb511cde38e76cdaed87f35896c18 DIST Botan-2.9.0.tgz 7216373 BLAKE2B 5ad2e15db871ccc3a32b29b7f54a02d69f251f0aca2ce656b557dbbb3814a793053a54905371b3414ad72952a64bece43e2383da91f205f68b0fe31be2f9439c SHA512 b88f3894a4a5b7b2fbff9be6eb0b774bf679a014bd2364811b7e63d4f323e22ca9ef916491afbc2cdf9db68727c1449fbeb6fd417e591560add0955517db3f65 EBUILD botan-2.14.0-r1.ebuild 2708 BLAKE2B 5ef16c8ccbb43488a9e06641f9aff6d9b7ab6f8265c2c4a007325181a6a01c1ad9553ecc70b646273bcbf7680640013e692ccbfcb80d037d3b52d2a9d2ed8f24 SHA512 0b57b3c3550c02ee0d4c3deb8ef70f68e202c04811235de8a8ab92d55eee2d548d041f0b1971d68e039a2dfab3c49273d545e0a42a7203121b48856d53af6241 +EBUILD botan-2.15.0.ebuild 3093 BLAKE2B 4ca321cc64517cdf9a76022660f8804f0f8c6e099e0ce0d7e1c59a2b410c3a5e6ea98ed6204c4ad039f6195581f7009e79691564237320ce882ae65bcc7ceaae SHA512 cd9b3fc8740c5e2479d85f04ab676a19bc9e0d90cce1a5d7d70fff233eeff0d4d9c8fcd2bd9c999a709a785ab25f53584d79ee9f1f0a36b6b0000c3a33fda0eb EBUILD botan-2.9.0.ebuild 2520 BLAKE2B 05a0f8bdd64a4f1c5cdfbcaf2c25e2c104f6e2f2e530836f1c1b3bca690ab10e68acf6a8dda28bb74ad48f571472cb406c7bb46eddd0f6471b26a7b9376b4cc3 SHA512 fe4b4d40ddf86130ccfd96601f885447805475a0e66f1f2cfc1398b454269567feaa83480935a52398e72a76aea2b8d7b5284caca8092e77d0500eccdab4ff7c -MISC metadata.xml 492 BLAKE2B c8e3a6426a1aeaeb0695e8ea5217d6ff49210ea5d81d842daeaa433535f57a487d04b987d59a548ee44ab45b66c5da2f4d64e35a445848e476d415ffb0e88305 SHA512 80160b6d84260644b66622005766ac2725274109aca7d29814e5e544cbda51ba35ceb3162bed329aeeca2ebe9299af4c77fc3f32fef7b08bbc8e2889a4a6fb56 +MISC metadata.xml 518 BLAKE2B e3816e408031bfaa81f090f9c4d47027827a5b89ccde82cde859efb76200ae443f4c71b83d548fbe9329bbae620112ee59d6882a41df7eb60361f6de1085346b SHA512 ec0f64495b54f912e44a0a2cfda063a136452e0fba33268d645fbafedb4fba41713debc0219d2c68eeffde27fd0b74580465e50d160187e417defc36b61033a3 diff --git a/dev-libs/botan/botan-2.15.0.ebuild b/dev-libs/botan/botan-2.15.0.ebuild new file mode 100644 index 000000000000..e0c7d9955b5e --- /dev/null +++ b/dev-libs/botan/botan-2.15.0.ebuild @@ -0,0 +1,132 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7,8} ) + +inherit python-r1 toolchain-funcs + +MY_P="Botan-${PV}" + +DESCRIPTION="C++ crypto library" +HOMEPAGE="https://botan.randombit.net/" +SRC_URI="https://botan.randombit.net/releases/${MY_P}.tar.xz" +LICENSE="BSD-2" + +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} )" + +BDEPEND=" + ${PYTHON_DEPS} + $(python_gen_any_dep ' + doc? ( dev-python/sphinx[${PYTHON_USEDEP}] ) + ') +" + +# NOTE: Boost is needed at runtime too for the CLI tool. +DEPEND=" + boost? ( >=dev-libs/boost-1.48:= ) + bzip2? ( >=app-arch/bzip2-1.0.5:= ) + lzma? ( app-arch/xz-utils:= ) + python? ( ${PYTHON_DEPS} ) + ssl? ( + !libressl? ( dev-libs/openssl:0=[bindist=] ) + libressl? ( dev-libs/libressl:0= ) + ) + sqlite? ( dev-db/sqlite:3= ) + zlib? ( >=sys-libs/zlib-1.2.3:= ) +" + +RDEPEND="${DEPEND}" + +S="${WORKDIR}/${MY_P}" + +# NOTE: Considering patching Botan? +# Please see upstream's guidance: +# https://botan.randombit.net/handbook/packaging.html#minimize-distribution-patches + +python_check_deps() { + if use doc ; then + has_version -b "dev-python/sphinx[${PYTHON_USEDEP}]" || return 1 + fi +} + +src_configure() { + local disable_modules=() + use boost || disable_modules+=( "boost" ) + use bindist && disable_modules+=( "ecdsa" ) + elog "Disabling module(s): ${disable_modules[@]}" + + # Enable v9 instructions for sparc64 + local chostarch="${CHOST%%-*}" + if [[ "${PROFILE_ARCH}" = "sparc64" ]] ; then + chostarch="sparc32-v9" + 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 + + # Don't install Python bindings automatically + # (do it manually later in the right place) + # https://bugs.gentoo.org/723096 + local myargs=( + $(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 '') + --cpu=${chostarch} + --disable-modules=$( IFS=","; echo "${disable_modules[*]}" ) + --docdir=share/doc + --libdir=$(get_libdir) + --os=${myos} + --distribution-info="Gentoo ${PVR}" + --prefix="${EPREFIX}/usr" + --with-endian="$(tc-endian)" + --with-python-version=$( IFS=","; echo "${pythonvers[*]}" ) + --without-doxygen + --no-install-python-module + ) + + tc-export CC CXX AR + + ./configure.py "${myargs[@]}" || die "configure.py failed" +} + +src_test() { + LD_LIBRARY_PATH="${S}" ./botan-test || die "Validation tests failed" +} + +src_install() { + default + + # Manually install the Python bindings (bug #723096) + if use python ; then + python_foreach_impl python_domodule src/python/botan2.py + fi +} diff --git a/dev-libs/botan/metadata.xml b/dev-libs/botan/metadata.xml index 7c277893487f..9ff2d26660b8 100644 --- a/dev-libs/botan/metadata.xml +++ b/dev-libs/botan/metadata.xml @@ -2,17 +2,17 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>sam@cmpct.info</email> + <email>sam@gentoo.org</email> <name>Sam James</name> </maintainer> - <maintainer type="project"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> <use> <flag name="boost">use <pkg>dev-libs/boost</pkg></flag> </use> <slots> <subslots>botan soname version</subslots> </slots> + <upstream> + <remote-id type="cpe">cpe:/a:botan_project:botan</remote-id> + <remote-id type="github">randombit/botan</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-libs/c-blosc/Manifest b/dev-libs/c-blosc/Manifest index 974c9a5077b3..8f74f307cfda 100644 --- a/dev-libs/c-blosc/Manifest +++ b/dev-libs/c-blosc/Manifest @@ -2,6 +2,8 @@ AUX c-blosc-1.11.2-fix-build-system.patch 803 BLAKE2B 1472877db42d6a952b8f91a75b AUX c-blosc-1.19.0-xgetbv.patch 1088 BLAKE2B 45e9d6c0e3a166d7c2cb41381fa9c75ca197cc5fb3d9ff51facbad0e62f2a408af92fcb40959bf2b49d3c406664d0f2c8bc58f4bbc435591e96553b4514307cd SHA512 33e6c674fee03e8c95fb0a90e04af2c29e12489b50c365a899d00ec689e1cf9c803e50234027df89b57820055cef41b487029e65cb16e6996549e2e5a761c627 DIST c-blosc-1.11.2.tar.gz 633280 BLAKE2B 426de12ffa0db784fc26316e5758836517f3b3498111cfea64ebd2bc4582ebc6236f64845d41e75db272d3741ab8a7f22a12e0847fb7c98ba10a3ae2c2906e22 SHA512 c1282f60f4ef9d24844be225587e7f46c43ba8a5071f5ee49a7326bce9e84b65312c4f9606e78fd3d1209a4ca50f1c31312a7c377caf9522c9915177c92a4d7b DIST c-blosc-1.19.0.tar.gz 875356 BLAKE2B 046134e10fec639f1271d9c7cc15dcd239f9f0875f7ad324144338072e6fa006612f7d154ccde11a5dd7ee60471380aab4a60ae332cf1de4a7b773ae354c494a SHA512 15bc009f8880630c531ccd36544869d59b69d21f10c08eebf3c2983d203697429649a1b56b044e28342ec620c6f5850ee9da783005ce83f23e783f091289498c +DIST c-blosc-1.20.0.tar.gz 878891 BLAKE2B 742619a5de9696646f8c434f25e736dc3662b8215c6397d9e23f7f86ae6df78c014c8b23bfa1cada72f31b99d81b6c9d99eeb28189c529fe692b88f95da1d67a SHA512 b3da9970542c389fce4acb6ffb866c066dfbf542fadb21ed3d6a7688f9cccf89425ccdc9253a1f7172eced224ff27b78be0c9ce111b4b69ec303a61fb7c1bc10 EBUILD c-blosc-1.11.2.ebuild 1320 BLAKE2B b1b00873c35709d160a8b4af70c53aa1db292d114e85367840666a54af0b0f09f0e4e2b4c19960f30b1d50278c87909495ff202866b233fc28c8be231ea5048d SHA512 10b361c01cb2dedfc5889d37e4043d9b2aa2f911057a60560014b3823df73d59afee2aadc5c07452e9e0e75426d8c1d8007b9df3e020acdda7a3162ce0c3f43e -EBUILD c-blosc-1.19.0.ebuild 1118 BLAKE2B 859e3bc10a3e41aaae24c541d64fe11a0b6d65351b8111d18914c6ff71179a656c06a31c22d22b553a9a8a7d0731845c4e3e79df46ec35b57ea4e02853a509dd SHA512 697297004aac8f9904258cd5876d3cb3a938c2acc156d1ed8dc03228b5cd59110030b402d0be1701e8bfd19ddfdabf1739e809f010b8808436e69c2722368934 +EBUILD c-blosc-1.19.0.ebuild 1133 BLAKE2B f58035bf0c85812a52ba2ecd64372571021849a72a4efb8ffb6d7cd8a8243757091dfb1b73a7ef58546c23fbe7bfc1ebd5cc697fc1c74cfc775d53eff2ed1669 SHA512 29b1bb97a257994bda228fa6528d5a85c5ecf83495b6d30cc0696c08837dc85071260df6d78e25c92d50752a7d72288b9723e9261cbba139b1353a51c2d2fcc2 +EBUILD c-blosc-1.20.0.ebuild 1111 BLAKE2B 02c95c9a3f3d5be967b2125a890af0038fe2e316150742d073a63db2bfca5ef2ce1521028e7501deb7c5d11d6a12d0eb54e7c59f90e9227806a4a7b44df9b350 SHA512 23dfadf363e3b4c667e5245bcf805d4d2758c21e945f76a353c15239c8edd62cff8554675d6adbf94791530208b62450e0558a31c9e038fcda50bc1ad0406a54 MISC metadata.xml 838 BLAKE2B 3dadd7fc571618d6b398e434354b65a7c59dbe07d2530069ac9ab7f879cc5b16407079a4e1fdbd54110b3be9a0bf25c13512c2030fc9042cbd105d9b294dd279 SHA512 5c1f4bd8e4ef92dbef6d9a6418fbdab91c377c275eeb572a0c0e785a25f342be0dd032ad14106b9139fb7208064f16fb428ebd7b65d50d35b87089244b026654 diff --git a/dev-libs/c-blosc/c-blosc-1.19.0.ebuild b/dev-libs/c-blosc/c-blosc-1.19.0.ebuild index 71488e42738a..671a429da437 100644 --- a/dev-libs/c-blosc/c-blosc-1.19.0.ebuild +++ b/dev-libs/c-blosc/c-blosc-1.19.0.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/Blosc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="MIT" SLOT="0/1" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~arm ~arm64 ~ppc x86 ~amd64-linux ~x86-linux" IUSE="+lz4 +snappy test zlib zstd" RESTRICT="!test? ( test )" diff --git a/dev-libs/c-blosc/c-blosc-1.20.0.ebuild b/dev-libs/c-blosc/c-blosc-1.20.0.ebuild new file mode 100644 index 000000000000..894b71680371 --- /dev/null +++ b/dev-libs/c-blosc/c-blosc-1.20.0.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake + +DESCRIPTION="Blocking, shuffling and lossless compression library" +HOMEPAGE="https://www.blosc.org/" +SRC_URI="https://github.com/Blosc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/1" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux" +IUSE="+lz4 +snappy test zlib zstd" +RESTRICT="!test? ( test )" + +RDEPEND=" + lz4? ( >=app-arch/lz4-1.7.5:= ) + snappy? ( app-arch/snappy ) + zlib? ( sys-libs/zlib ) + zstd? ( app-arch/zstd )" +DEPEND="${RDEPEND}" + +src_prepare() { + cmake_src_prepare + # remove bundled libs + rm -rf internal-complibs || die +} + +src_configure() { + local mycmakeargs=( + -DBUILD_STATIC=OFF + -DBUILD_TESTS=$(usex test) + -DBUILD_BENCHMARKS=OFF + -DBUILD_FUZZERS=OFF + -DDEACTIVATE_LZ4=$(usex !lz4) + -DDEACTIVATE_SNAPPY=$(usex !snappy) + -DDEACTIVATE_ZLIB=$(usex !zlib) + -DDEACTIVATE_ZSTD=$(usex !zstd) + -DPREFER_EXTERNAL_LZ4=ON + # snappy is always external + -DPREFER_EXTERNAL_ZLIB=ON + -DPREFER_EXTERNAL_ZSTD=ON + ) + cmake_src_configure +} diff --git a/dev-libs/capstone/Manifest b/dev-libs/capstone/Manifest index ef93f084bf85..bc1b1a7c48b1 100644 --- a/dev-libs/capstone/Manifest +++ b/dev-libs/capstone/Manifest @@ -1,3 +1,4 @@ +AUX capstone-4.0.2-libsuffix.patch 347 BLAKE2B 5478a08d072cff0873c3410ce99dcf20c7aa12594148102498c7d0ed3216af95712f0daef5e9484d1faf368b93b2b014832ead5466d60d139e9ed7bb2bd1ed02 SHA512 81ffee2dc4a406e980025402dc3f8bee886cba9f305312e03c735d4b47e69887e90240274ae1949ff9900ba2a66413d33e7ef7a9ebb83a3dc9d2769f3d008395 DIST capstone-4.0.2.tar.gz 3439542 BLAKE2B 435729a8fef2dce6495635352101b3befe563c8404efdbb0dccabecbe2bded332221665bacdbcd9043dda72b652b6f29c0e1a548cefb8c64d5b6b9dc174ed3d9 SHA512 7f93534517307b737422a8825b66b2a1f3e1cca2049465d60ab12595940154aaf843ba40ed348fce58de58b990c19a0caef289060eb72898cb008a88c470970e -EBUILD capstone-4.0.2-r1.ebuild 1325 BLAKE2B 09988c2ae5ef6401220570c2ecee7ae39106a30c35489ee9330b078233e3551a05dde3ad82b3eae93007c4f279ad1910eedc1495ed68c58e37ed90079ab00c34 SHA512 02f30417e3de309847bd26ca97f5a3e1df99366f78d533a78e2d551a41e3d24b4ea1b5acf9e6c7cd6bb8025474c3016717432dc67265ab6bca880902d61de25c +EBUILD capstone-4.0.2-r2.ebuild 1374 BLAKE2B 0a2125c08c00d3724dc4460329be6f298a43380c034ba603c05b2dd362e6d692a193034eb16ca35a61bad5be14b43bef1bb226ffd16bbe872bef5ad0b30f4ca3 SHA512 e3378d5580eb5b0a91a44e959f464e0444db06478a86e518afbff10eae8ad6c4b2dfc09efbce3bc238b179bc094adc81257bbdd8c4ded198c3d45e3e045142fb MISC metadata.xml 332 BLAKE2B 944b66779658094b7b1020400c1821dcf1f5138c85531fb83e853fa6d38219606f0f92673f57b3b621ffb3149eb50d60da281acaf469e97fc4c826b90c06b5a3 SHA512 a4952a89d043c4c8aec5a7a307d37d895880d49b381e5b881ffecf74b61c9c22cd854a68a1d1de3926431cdfad4f8ba70812be36bb7cac2df5dee8efe96dc269 diff --git a/dev-libs/capstone/capstone-4.0.2-r1.ebuild b/dev-libs/capstone/capstone-4.0.2-r2.ebuild index 6de5971d2cdc..99f181cb326c 100644 --- a/dev-libs/capstone/capstone-4.0.2-r1.ebuild +++ b/dev-libs/capstone/capstone-4.0.2-r2.ebuild @@ -27,6 +27,10 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" S=${WORKDIR}/${P/_rc/-rc} +PATCHES=( + "${FILESDIR}"/${P}-libsuffix.patch +) + wrap_python() { if use python; then pushd bindings/python >/dev/null || die diff --git a/dev-libs/capstone/files/capstone-4.0.2-libsuffix.patch b/dev-libs/capstone/files/capstone-4.0.2-libsuffix.patch new file mode 100644 index 000000000000..056140be13df --- /dev/null +++ b/dev-libs/capstone/files/capstone-4.0.2-libsuffix.patch @@ -0,0 +1,12 @@ +cmake does not provide 'LIBSUFFIX' variables, but provides 'LIB_SUFFIX'. +https://bugs.gentoo.org/730722 +--- a/capstone.pc.in ++++ b/capstone.pc.in +@@ -1,6 +1,6 @@ + prefix=@CMAKE_INSTALL_PREFIX@ + exec_prefix=${prefix} +-libdir=${prefix}/lib@LIBSUFFIX@ ++libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ + includedir=${prefix}/include/capstone + + Name: capstone diff --git a/dev-libs/cdk/Manifest b/dev-libs/cdk/Manifest index e7f700a4985b..10cb7fa843cc 100644 --- a/dev-libs/cdk/Manifest +++ b/dev-libs/cdk/Manifest @@ -1,4 +1,4 @@ AUX cdk-5.0.20120323-parallel-make.patch 181 BLAKE2B 2e69c15f66e63837dd430d0d22fbbcdc020d38c6faa23622020a69dc9cee0a22577427b5ed8eca2bcb386d635c970d7bde575ec9a44e5675660fa6ba398a267b SHA512 632f272cb5e5e9f927d7cd608ac7a001bfe560a035cde68e0243d80bda5cb1ddce2263fd8823455c96044676ab36067306572e6ed0347b83d4b630956b611c3b DIST cdk-5.0-20160131.tgz 516298 BLAKE2B 5e899afea1f034a48e46fef073303d0069e14310194342094392da517fa47793a1ac3ac33774369842daa1966dc9a4ad7404046874bc9cae24ceaa98a3dd7c47 SHA512 f8f7fc5fec3c040cdbfc2a0d886e9d9d9d231e56ed69adae0b91e03243b5edd550c5435f973a93d4cf7ab723bd27b55712af75162c4bfd3ae28b3c16cd68f755 -EBUILD cdk-5.0.20160131.ebuild 1176 BLAKE2B cc17e09563ab1e84e7949b8f3a97546d70f2a5bd1029654504e759d27d20c88ce804a8a977444994594ad86fad161a0faa30793657b50d4e7c8adab70367d428 SHA512 c604c135c7639e7e9bf28459b8c0728bbf930fa0fdee798a7f88cf28afe908f58ad5a4c8e8503cf9a195a1d4af9a151b742e453bdd59bdea989507af954b92f1 +EBUILD cdk-5.0.20160131.ebuild 1183 BLAKE2B a415b0ca097e808652d5384e0540f9e2a31229e1e0de8fb430430c78acfefaabdd3141a8766c2080789d41c798ad15892b2032cf0801f0f0939efe63eb437867 SHA512 2509488e4e39e7771cba97def1eeb800d7930c301776c495823fd042d09dccfb2a5514a643ea74e8bf6972d5bc56a74407f93d63b340e727304dfa880caa5b3f MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 diff --git a/dev-libs/cdk/cdk-5.0.20160131.ebuild b/dev-libs/cdk/cdk-5.0.20160131.ebuild index 13066606ab74..8fb480622f85 100644 --- a/dev-libs/cdk/cdk-5.0.20160131.ebuild +++ b/dev-libs/cdk/cdk-5.0.20160131.ebuild @@ -12,7 +12,7 @@ SRC_URI="ftp://invisible-island.net/cdk/${MY_P}.tgz" LICENSE="BSD" SLOT="0/6" # subslot = soname version -KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris" +KEYWORDS="~alpha amd64 ~arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris" IUSE="examples static-libs unicode" DEPEND=">=sys-libs/ncurses-5.2:0=[unicode?]" diff --git a/dev-libs/cgreen/Manifest b/dev-libs/cgreen/Manifest new file mode 100644 index 000000000000..0f2d5ccd887f --- /dev/null +++ b/dev-libs/cgreen/Manifest @@ -0,0 +1,4 @@ +AUX cgreen-1.3.0-cmake-git.patch 326 BLAKE2B f58e5c57429311b70285f2605d3f21f8f6545d379909dda17460d855eadb5545a746a6122fee31c41cbd86410db08a460937ee70af6a0e5aaef997632bcae180 SHA512 76e4b2e0fdaafb50006733eb198b5b97ea2874957efed81552a279680d03b59ad20935c6f9e4835f39019f5646be72d7fa00c6825f86e6a502743f3bb466c340 +DIST cgreen-1.3.0.tar.gz 350959 BLAKE2B 467af04aae61745e1a78e872be9c174a0b21db7a470b48a3d96132f4bc97300b0d51fd4617e4588491a2f032b3ba82e665c7bd49be3d360a33dae0e1323716a5 SHA512 3734be08722900b4c6aaa1cd8a7a31ffd876c12742cf81266014158dad0919db46a457fbc742f3d7e9b1fdf75530ee872045962469eeeb6d1fc45fddf2b6d332 +EBUILD cgreen-1.3.0.ebuild 544 BLAKE2B a0c2b449eac53fe0f0116bbe5b925c50b5c530ef4b31c23c3ce29321bc9e5102169d66d95f684fdf5a246faf70285564d532f8956a67da94f1c803603e7bc664 SHA512 bfe132b82435338870f4f418853404ffe2ab1342494f4856e016c50facfc0f32b88c4c2e84a3ae10da7b4900172167f44085fedaedb65186e9f878e9de273a71 +MISC metadata.xml 448 BLAKE2B 40d2658060ee754b9647cd977d40dfad04d3c4c0f5877d58f88ccd3700c7cbb414b5c451a6548daa58b9f567915cb7b78fe635ca5993aed0e4980e1a2f2d2671 SHA512 ea44b83deb6442cee3860f2af55dec6486d1813cb3ef2a875ae338c9ec3607e7d8269c78e3641cd921f9c691864de35c62ca7870c115b2778ccdaf0e5ceecf49 diff --git a/dev-libs/cgreen/cgreen-1.3.0.ebuild b/dev-libs/cgreen/cgreen-1.3.0.ebuild new file mode 100644 index 000000000000..1b1189420def --- /dev/null +++ b/dev-libs/cgreen/cgreen-1.3.0.ebuild @@ -0,0 +1,22 @@ +# Copyright 2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake + +DESCRIPTION="Unit test and mocking framework for C and C++" +HOMEPAGE="https://cgreen-devs.github.io/" +SRC_URI="https://github.com/cgreen-devs/cgreen/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="ISC" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +DEPEND="sys-libs/glibc:=" +RDEPEND="${DEPEND}" + +PATCHES=( + #Patch to fix git directory detection see https://github.com/cgreen-devs/cgreen/issues/234 + "${FILESDIR}/${P}-cmake-git.patch" +) diff --git a/dev-libs/cgreen/files/cgreen-1.3.0-cmake-git.patch b/dev-libs/cgreen/files/cgreen-1.3.0-cmake-git.patch new file mode 100644 index 000000000000..283ada2aa70e --- /dev/null +++ b/dev-libs/cgreen/files/cgreen-1.3.0-cmake-git.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 350bb89..d496f5a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -62,7 +62,6 @@ execute_process( + OUTPUT_VARIABLE GITDIR + OUTPUT_STRIP_TRAILING_WHITESPACE + ) +-get_filename_component(GITDIR "${GITDIR}" ABSOLUTE) + + # config.h checks + include(ConfigureChecks.cmake) + diff --git a/dev-libs/cgreen/metadata.xml b/dev-libs/cgreen/metadata.xml new file mode 100644 index 000000000000..7cd1d64d499c --- /dev/null +++ b/dev-libs/cgreen/metadata.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>jonas.licht@gmail.com</email> + <name>Jonas Licht</name> + </maintainer> + <maintainer type="project"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <upstream> + <remote-id type="github">cgreen-devs/cgreen</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-libs/check/Manifest b/dev-libs/check/Manifest index 2b9b23cfdb79..580c5a336ab4 100644 --- a/dev-libs/check/Manifest +++ b/dev-libs/check/Manifest @@ -1,6 +1,8 @@ AUX check-0.14.0-r2-disable-automagic-dep.patch 769 BLAKE2B 286eeaa0e45e524c400f1967756b2e2912d76826c2fb92d9008afc338f19a4edc55b23e2751ce46f52e2fccc3e091f7143647a42a017c02ee580e138c3a50536 SHA512 4370bb6551c3e2f414b6580f26ed3a7429278139d5835b44c8769f1583363aaf8e25982e6f86bbcf2e7fc06d3c406d9a2af4a47fbb99377c6589f276aa9f29a3 DIST check-0.14.0.tar.gz 303471 BLAKE2B d602bb56d205eccf06e4177e3f6d3f7270c3a0cba0e1d397480f0409a916ec4118c48340ad6f6a8955ea30d9e22252ff8381a687d000c3f8e62828cf656f1245 SHA512 54ad175c00cf0c73b4386cf6b3d6a404a5da4f57897d099e772f148f410108c44767c3266a940113be73a6861b3f3ee1706c558cc71ec51df99687f19f3a3bb4 DIST check-0.15.0.tar.gz 306428 BLAKE2B fea2a169b86248a6657f890469f41cd699dd95efb91e311ccf188548a6c8c28568decf0b5f03b08aed31e14c69d50707b418e1e71c6db7e1b7938ee36aa19cd8 SHA512 efde93977a38520b3b83a9e2f678d07b916fc27e41cf839a663900c4153d645fe4274ec3b7e2dabf475457f909f61734632c97b7257c49f5853fd11d920b0c84 +DIST check-0.15.2.tar.gz 306136 BLAKE2B e93755b58ddfea7ecc013e5449806611baedb91b362e573d4e3b6f716feeb0012cceec80f7109e44b2808deb980300c4f7825919b97878b160a1bf884357bde3 SHA512 cf81ca63142f33779df2e3542e049b9034d30bc502a663a4379bbfe85c7ee8fd80ce382583e781651d99fe830895122dab5b6793f87425b571c3927f0ba3b60e EBUILD check-0.14.0-r2.ebuild 1498 BLAKE2B f9c8ceaf6000ce5c0878bf85a2a88f3098d40f6c77c7f928f81fd91624bd9293fc447f94498e5e475b3f699d115b80b5705169ab99560b15fa779c924be81a14 SHA512 815f57a1c3474e680dbd55b1d514daea2626fea087aef056b5d0547cce11ba9815f6ff4ef5e36d4e9b1b8264191d3ba30b40d29b882446c09ea6e90c1b91b100 -EBUILD check-0.15.0.ebuild 1507 BLAKE2B 8e46aa33a062e1f98734c5e7181e594484d59921e57fce8e3acadaabc5dfc6a8b23fba210a27c85c51e17ec2493659786796b5e3b776ffef5486c449fc793721 SHA512 c3193e289ae1d6ad1d9563f052a5ceb7fd582b30f312b7e6f00e5af2d444e83eb73f6660f2a69358fb626d144e8533d5310f63ec59f939e9daa2f409f38979e4 +EBUILD check-0.15.0.ebuild 1500 BLAKE2B 28fe049b5786c3941f4971668e928557a4316e311eba1f1e10912288a5835d8cceea7f9d1fa5ec0f820a3ac48c6ae3d25b5218cf450ac3271b1e456e789afb71 SHA512 c35153703669b1abc6f9ec8aef1a320fca5c599d8a5ba48a423bf3e225f6a623360730292c29e6fd377e5ddf7740eebd763fcabc72df73281131c918202319f5 +EBUILD check-0.15.2.ebuild 1507 BLAKE2B 8e46aa33a062e1f98734c5e7181e594484d59921e57fce8e3acadaabc5dfc6a8b23fba210a27c85c51e17ec2493659786796b5e3b776ffef5486c449fc793721 SHA512 c3193e289ae1d6ad1d9563f052a5ceb7fd582b30f312b7e6f00e5af2d444e83eb73f6660f2a69358fb626d144e8533d5310f63ec59f939e9daa2f409f38979e4 MISC metadata.xml 488 BLAKE2B 27eb0323a4d7cac50b2f4ee935c75e7a35c34066a0dbc5bf21f8b4fb93abe82aa79a5fa1fafed0e623417ceaa553dc8395f201a24c3e0123df3104be44106bb7 SHA512 4b69b4b1ca91bfe4b04d03935d3d6e9b8ca10ecaa538884834f357708db5380a90e9cf1fdcef7996b7c4d8a23c0cb8e1d9eb9d34faa584637804ebc67657be69 diff --git a/dev-libs/check/check-0.15.0.ebuild b/dev-libs/check/check-0.15.0.ebuild index d882baeb2af9..328072dc9820 100644 --- a/dev-libs/check/check-0.15.0.ebuild +++ b/dev-libs/check/check-0.15.0.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://github.com/libcheck/check/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="LGPL-2.1+" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" IUSE="doc subunit test" RESTRICT="!test? ( test )" diff --git a/dev-libs/check/check-0.15.2.ebuild b/dev-libs/check/check-0.15.2.ebuild new file mode 100644 index 000000000000..d882baeb2af9 --- /dev/null +++ b/dev-libs/check/check-0.15.2.ebuild @@ -0,0 +1,57 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +CMAKE_ECLASS=cmake +inherit cmake-multilib + +DESCRIPTION="A unit test framework for C" +HOMEPAGE="https://libcheck.github.io/check/" +SRC_URI="https://github.com/libcheck/check/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="LGPL-2.1+" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +IUSE="doc subunit test" + +RESTRICT="!test? ( test )" + +RDEPEND="subunit? ( dev-python/subunit[${MULTILIB_USEDEP}] )" +DEPEND="${RDEPEND} + sys-apps/texinfo" +BDEPEND="doc? ( app-doc/doxygen )" + +PATCHES=( "${FILESDIR}/check-0.14.0-r2-disable-automagic-dep.patch" ) + +src_prepare() { + cmake_src_prepare + + # Fix wrong libdir, probably caused by multilib + sed -i "s|\${libdir}|/usr/$(get_libdir)|g" check.pc.in || die "sed .pc failed." +} + +multilib_src_configure() { + local mycmakeargs=( + -DBUILD_TESTING=$(usex test ON OFF) + -DCHECK_ENABLE_SUBUNIT=$(usex subunit ON OFF) + ) + + cmake_src_configure +} + +multilib_src_compile() { + cmake_src_compile + + if use doc && multilib_is_native_abi; then + cd "${S}"/doc/ || die "Failed to switch directories." + doxygen "." || die "Failed to run doxygen to generate docs." + fi +} + +multilib_src_install_all() { + use doc && local HTML_DOCS=( "${S}"/doc/html/. ) + einstalldocs + + find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die +} diff --git a/dev-libs/clhpp/Manifest b/dev-libs/clhpp/Manifest index 1256f0329d24..e0f051023650 100644 --- a/dev-libs/clhpp/Manifest +++ b/dev-libs/clhpp/Manifest @@ -1,5 +1,3 @@ -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 +EBUILD clhpp-2.0.12.ebuild 582 BLAKE2B 2c96261c0108b69e987cd7919d93d829eb5e26252cb5933debfc39e183cb353efeb22aadc6448ef57fcfb3cfafc8da894f16503696c9f557ee106d7f7f4de978 SHA512 fb82233e5cd9bbe43cdcacdf9be99d9c83fa45f5517cc7d8c9f1c6ce677446bbb22a226a7177859f0f28cb62dc69c4c7c21eb6940f9d44418ae6c06ef153d88b MISC metadata.xml 332 BLAKE2B f42b8bf0c7184f9cc0d2a0164d0311c2fc75e390430119c602832bd6d791913de4669ed7583a5b1f2b67db401217a3bce9d967062e7f3ba0b27801f4ca5a9056 SHA512 d18a2df576e7732073eb8ebc40aea3e67e64a1872b10cdb2bd4bc9d53c803caf1acd7296cd0d5d4ea60867e14262fef88e87e6ba128eb35a2fe797b224fac0ef diff --git a/dev-libs/clhpp/clhpp-2.0.11-r1.ebuild b/dev-libs/clhpp/clhpp-2.0.11-r1.ebuild deleted file mode 100644 index d7a61c4044f0..000000000000 --- a/dev-libs/clhpp/clhpp-2.0.11-r1.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# 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/clhpp/clhpp-2.0.12.ebuild b/dev-libs/clhpp/clhpp-2.0.12.ebuild index 2325c35bccc7..d7a61c4044f0 100644 --- a/dev-libs/clhpp/clhpp-2.0.12.ebuild +++ b/dev-libs/clhpp/clhpp-2.0.12.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/KhronosGroup/OpenCL-CLHPP/archive/v${PV}.tar.gz -> $ LICENSE="Khronos-CLHPP" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" DEPEND="virtual/opencl" RDEPEND="${DEPEND}" diff --git a/dev-libs/clipper/Manifest b/dev-libs/clipper/Manifest new file mode 100644 index 000000000000..36b772d9202d --- /dev/null +++ b/dev-libs/clipper/Manifest @@ -0,0 +1,3 @@ +DIST clipper-6.4.2.zip 2535706 BLAKE2B 755dcfd759888bda7114af784d9e684f36ce8f6e43dcadf07f5797e3723d392aab2ea9b80cb212b7eb3177bfb306ca20a797546cb2c382132887e62fa0dffd93 SHA512 ffc88818c44a38aa278d5010db6cfd505796f39664919f1e48c7fa9267563f62135868993e88f7246dcd688241d1172878e4a008a390648acb99738452e3e5dd +EBUILD clipper-6.4.2.ebuild 616 BLAKE2B 54d2d148f1ccbcabfd151fa4d9084a22a577fe4ff5cdc69d6746273aefda22570d5ba919afbb2fc327b3bc668f84b7b5919d2c831eae680cae07d5416fd0c76f SHA512 14538e2a89f67704f82d2e849ddcd918aa14dc16a702cf9272826b40615a2adba636fe61e3a2aea76e64966b87167527e82f3ff4312e0f49417f9dc63dff2e57 +MISC metadata.xml 631 BLAKE2B 2f873cd0220e6fcb0404b0ceeefafa2acf4418bc23a29e2eb249341a4c3b4698d77efdd30deede7a4427fc228213d67c034e43237c60e91679a7c05be5b664a9 SHA512 06e5eb63edca0e93a95de200775f51919583dea253fa4eb59eca5bc0c4a5a96c2eab59b746f43002c71ae992ceafa99ef84fe1f02267bdac40853f2f0c4e1081 diff --git a/dev-libs/clipper/clipper-6.4.2.ebuild b/dev-libs/clipper/clipper-6.4.2.ebuild new file mode 100644 index 000000000000..fd2344e7318f --- /dev/null +++ b/dev-libs/clipper/clipper-6.4.2.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6..9} ) + +inherit cmake + +MY_PV="ver${PV}" +MY_P="${PN}_${MY_PV}" + +DESCRIPTION="Polygon and line clipping and offsetting library (C++, C#, Delphi)" +HOMEPAGE="http://www.angusj.com/delphi/clipper.php" +SRC_URI="mirror://sourceforge/project/polyclipping/${MY_P}.zip -> ${P}.zip" + +LICENSE="Boost-1.0" +SLOT="0" +KEYWORDS="~amd64" + +IUSE="" + +RDEPEND="" +BDEPEND="app-arch/unzip" + +S="${WORKDIR}/cpp" + +src_configure() { + local mycmakeargs=( + -DBUILD_SHARED_LIBS=ON + ) + cmake_src_configure +} diff --git a/dev-libs/clipper/metadata.xml b/dev-libs/clipper/metadata.xml new file mode 100644 index 000000000000..ca62f48d80f9 --- /dev/null +++ b/dev-libs/clipper/metadata.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>3dprint@gentoo.org</email> + <name>Gentoo 3D Printer Project</name> + </maintainer> + <longdescription> + The Clipper library performs line & polygon clipping - intersection, union, difference & exclusive-or, + and line & polygon offsetting. The library is based on Vatti's clipping algorithm. + </longdescription> + <upstream> + <remote-id type="sourceforge">polyclipping</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-libs/cloog/Manifest b/dev-libs/cloog/Manifest index a1d8a996ba29..0a3ed090ad71 100644 --- a/dev-libs/cloog/Manifest +++ b/dev-libs/cloog/Manifest @@ -1,6 +1,4 @@ -DIST cloog-0.18.1.tar.gz 3857324 BLAKE2B 5898cb8d8f36e55dbe38e7866e07c0abaf8ca0b9e619a5ff963ae975148166fc9bb1c77a33aef1ea2014e739e4ea1c37e4bc2ce5e7411d900fb472192e6fed7b SHA512 0b12d9f3c39a2425e28e1d7c0a2b3787287fe3e6e3052f094d2ab6cffeb205ce19044100cbfd805659b3e6b3d21ac2f5a3c92848f476de54edfe6b1cbd2172e9 DIST cloog-0.18.4.tar.gz 4796456 BLAKE2B 9d1f281abe48d40f726c3fc66c58c0d7cb90f6d3ca47af02c8f00b5cc69c6de6b0362b2dc406a8cb6310e07c6b2991f6de3b6b407ad7db0190b9bc69ac82773f SHA512 d35d67b08ffe13c1a010b65bfe4dd02b0ae013d5b489e330dc950bd3514defca8f734bd37781856dcedf0491ff6122c34eecb4b0fe32a22d7e6bdadea98c8c23 -EBUILD cloog-0.18.1.ebuild 964 BLAKE2B d3b77d336499dc6281e96d9fbee7c6d4715ad376a8c986f923ed93bb0a9b7a831b25f75f09b6c52499346e9c0deb07e89d121cc70e71426c4761660f93e3887c SHA512 dd1dbd81df9b7d328d3f16ecbad37f480844f1988472d6f7e355bd4cfdd228edc3b4ee5422af99383d271947bb4a4fd72875aa4505ead08e2ad0bfa53afb6bcd EBUILD cloog-0.18.4.ebuild 1385 BLAKE2B cf3f72b4e6405fab7b1e376466ff9d6f4173c91310342731f6f728ee129fd624d481af98f28c7480559e4d893e2c4448dbfcec30ff97ba877cf02521341af8e7 SHA512 f6bf82c8d1a78e78aab1151f724cb3dbcb2b4a8ae178f27aed12d9df4ffde4e1f4646d0f3313e8f68c60b1d08633a6f6688ffb6bff0d57d45419c62db5a51621 EBUILD cloog-9999.ebuild 1418 BLAKE2B 6669775c81ec4e0f23b7e5208dc29fbabc21b29d467c52a3e66ddd026ca0cfc9ea1bdd65fdde5abb7b0decef0f7863fdd62112ca265e4e9c028636224985385f SHA512 cedf51282c4e46ec1f62b920fe25bef47dc25e75fde881a9e35a9340ce055bd57bc2b7ef785486d8510e3130bf48f45b91d2e263f9b1b1559005f0bb4405e123 -MISC metadata.xml 221 BLAKE2B 79f6de476af31c1da59c7aeebab26fa0db49c902398f6f73beeca03d3077820240bc51a25d2945642d9a07470470f2ca9548c2d8f1c63a8592966f6df9955926 SHA512 edb14bd2dae6ad57f77c07fc601cf2782589165c7e48e1e123eff7e47044febfdb1e19d18cd0b240fd2ca494e3401b5aa1f1243480769e0faf5dbfa377d20a3b +MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33 diff --git a/dev-libs/cloog/cloog-0.18.1.ebuild b/dev-libs/cloog/cloog-0.18.1.ebuild deleted file mode 100644 index 8babf3e9203d..000000000000 --- a/dev-libs/cloog/cloog-0.18.1.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -inherit eutils ltprune multilib-minimal - -DESCRIPTION="A loop generator for scanning polyhedra" -HOMEPAGE="http://www.bastoul.net/cloog/" -SRC_URI="http://www.bastoul.net/cloog/pages/download/${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0/4" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86" -IUSE="static-libs" - -RDEPEND=">=dev-libs/gmp-5.1.3-r1[${MULTILIB_USEDEP}] - >=dev-libs/isl-0.12.2:0/10[${MULTILIB_USEDEP}]" -DEPEND="${DEPEND} - virtual/pkgconfig" - -DOCS=( README ) - -src_prepare() { - # m4/ax_create_pkgconfig_info.m4 includes LDFLAGS - # sed to avoid eautoreconf - sed -i -e '/Libs:/s:@LDFLAGS@ ::' configure || die -} - -multilib_src_configure() { - ECONF_SOURCE="${S}" econf \ - --with-gmp=system \ - --with-isl=system \ - $(use_enable static-libs static) -} - -multilib_src_install_all() { - einstalldocs - prune_libtool_files -} diff --git a/dev-libs/cloog/metadata.xml b/dev-libs/cloog/metadata.xml index fa331094dd33..7a38bb900964 100644 --- a/dev-libs/cloog/metadata.xml +++ b/dev-libs/cloog/metadata.xml @@ -1,7 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>toolchain@gentoo.org</email> - </maintainer> + <!-- maintainer-needed --> </pkgmetadata> diff --git a/dev-libs/console_bridge/Manifest b/dev-libs/console_bridge/Manifest index b92d826ce38d..caec5a5ad05b 100644 --- a/dev-libs/console_bridge/Manifest +++ b/dev-libs/console_bridge/Manifest @@ -1,6 +1,9 @@ -DIST console_bridge-0.4.3.tar.gz 254021 BLAKE2B dc0816c65fb44151c88935058abc1528b1162d5fa8a940956f386031a23eb087e2653954ec60ff08f2f99fc6b3da76b08d8d6db6903955061cc6832d9e2e80ef SHA512 034f69dcfe0c56b93a5bc60095afaaaa275955ff58f0ddee1a0a325eff3981c41703c8b521b43cdca5f6317d6a5775e7caf221cf2d79b5d62045b0f4315cc577 -DIST console_bridge-0.4.4.tar.gz 254030 BLAKE2B ed25742be7eabe4723beb49db33c14eec8653234e86b10aaad49f0138dd610d1901be65306bd5dc1c3e297c2fff591a20dfce7f6e3134144ffc5e3e966c3c206 SHA512 9b8f165e3c2ea4a6c9ee5f551c78229aa57196d19c87a4393e9257bb65aed4dcfa0eb97a0b8c433347c71330659ca80ac6a3952775adb20312c51c31ef905184 -EBUILD console_bridge-0.4.3.ebuild 660 BLAKE2B 0f97c722af6e86c9181b86b22df65ebbe6b6e1886a5bb462bf4538d4bec4d20ca7e1dc84076426dd8a0e01206e9c693b3c011c890c43d5bbb863d65453e68a69 SHA512 8b712f5dce7bc67dbe004d81820e9b213e85246863ddeb1b883631f52d1c3bf186a78049529a147746cb4ec1eefce4cb51e9f5694c491a4fe93346047f8b1256 -EBUILD console_bridge-0.4.4.ebuild 660 BLAKE2B a20604842f209961f17ed06f2328306829722971b642fa7284ae72abc705f0897dc93d44ec1ebacec2613b78b3deee1b953e674e4175d8794679a3ee72e48223 SHA512 6572426be9429d43884b3fc97e89916cade366efc4e64c024093b78cad573bcd4a609221dea0ab994ba546f9d6a6feb762040302d8a1a685aea0cbf708621244 -EBUILD console_bridge-9999.ebuild 660 BLAKE2B a20604842f209961f17ed06f2328306829722971b642fa7284ae72abc705f0897dc93d44ec1ebacec2613b78b3deee1b953e674e4175d8794679a3ee72e48223 SHA512 6572426be9429d43884b3fc97e89916cade366efc4e64c024093b78cad573bcd4a609221dea0ab994ba546f9d6a6feb762040302d8a1a685aea0cbf708621244 +AUX tests.patch 864 BLAKE2B 7561e7fce3da8045b343180303f08a2748eb5aedd99dd297e269434371c63e711be731e4c4c2ccdcb9acee1fb6209f3d0f9323e5eaf6e034ab56bb1b77f43196 SHA512 e8c2fc93efc4af9638e0f8da67686ccddcb9402add5dc65999fe9033b08a95ed62e69b08209633d37885c9bf23d91d446270903d1b973814ea93bb574f64a081 +DIST console_bridge-1.0.1-ament-0.9.5-cppcheck.py 11626 BLAKE2B d4125b72bfd467f14302ef42c68ac0d7d5dcf53b0d8a678b9ec4a7e01cb71d27ef178d125ba659141dcb912a6a6b08a059e4b5babf03981d6da7190c4f626807 SHA512 19e5a854a228d4e98bdad1037089c2b74d88e31ee633bc1c7d580b011b4306f700aff3eb38fb1dcc0624a00a35942f38f71758eb3f0fc07b2b2f2a97e03def4c +DIST console_bridge-1.0.1-ament-0.9.5-cpplint.py 239005 BLAKE2B 9dc409974ada177f4698106fba4ec4f1dae9e49719daba999c19670057b11fa74463d459b3575dc80b589e36d96dfac182ac66a6ef31ef3fd0639aeab256990a SHA512 c01c549e67744f0646a8c29c7d35fff0ba80dfd374f77619c66b6f8e4365b9e4dfaa9419bd87aa00066d99a6af8d89f28438e3f116312303a521a8277fc427ab +DIST console_bridge-1.0.1.tar.gz 259480 BLAKE2B 78df3aeaba2e7589166709e7c43a77ac021d22d0db8d379f320455a9d532b247083ff86c3e03d7f9842943c3c98f78cfb33d7920a2987433f822a05ccaf23866 SHA512 913b7ee1d5401c6324eaaab1f8a54d5ff6df4eedb119a1cd00712f223750d69313047344aec5887920497c7b456cf6cb88e5f756bfbbb5ed8223ec758cdfd021 +DIST console_bridge-9999-ament-0.9.5-cppcheck.py 11626 BLAKE2B d4125b72bfd467f14302ef42c68ac0d7d5dcf53b0d8a678b9ec4a7e01cb71d27ef178d125ba659141dcb912a6a6b08a059e4b5babf03981d6da7190c4f626807 SHA512 19e5a854a228d4e98bdad1037089c2b74d88e31ee633bc1c7d580b011b4306f700aff3eb38fb1dcc0624a00a35942f38f71758eb3f0fc07b2b2f2a97e03def4c +DIST console_bridge-9999-ament-0.9.5-cpplint.py 239005 BLAKE2B 9dc409974ada177f4698106fba4ec4f1dae9e49719daba999c19670057b11fa74463d459b3575dc80b589e36d96dfac182ac66a6ef31ef3fd0639aeab256990a SHA512 c01c549e67744f0646a8c29c7d35fff0ba80dfd374f77619c66b6f8e4365b9e4dfaa9419bd87aa00066d99a6af8d89f28438e3f116312303a521a8277fc427ab +EBUILD console_bridge-1.0.1.ebuild 1703 BLAKE2B 659359edf3b720a1f1b522d7b7c82490f12d3b13e78baf800b980663b6fb14723e3e7583e594c8b4644cbe6b984eb7507b7096862efa4b27788ea077acafdb9d SHA512 6c5396dc581d061536be6a29d27f864ca2d420ade806dbcf7fa1a13316862aec7b03fac1d0fc0de7fa370e25ad087184c90a51c953997dfddf47af0d782dd20d +EBUILD console_bridge-9999.ebuild 1703 BLAKE2B 659359edf3b720a1f1b522d7b7c82490f12d3b13e78baf800b980663b6fb14723e3e7583e594c8b4644cbe6b984eb7507b7096862efa4b27788ea077acafdb9d SHA512 6c5396dc581d061536be6a29d27f864ca2d420ade806dbcf7fa1a13316862aec7b03fac1d0fc0de7fa370e25ad087184c90a51c953997dfddf47af0d782dd20d MISC metadata.xml 342 BLAKE2B 27f453549abc2dbcca6275e79549c765f3802eccc8161d95baf12311844a9a2b4b42ad7f20e84ca07bde29048436dcfb2b9644b88f30f5a2889b50516afb1e10 SHA512 a438639c10d92d4ae5b4b54b7dff6dcdecfe829544dc7480dd830f38803efe0207f142d5b6177aafb1b170979d11dea590d85d75ac7814dead2edce720367aaf diff --git a/dev-libs/console_bridge/console_bridge-0.4.3.ebuild b/dev-libs/console_bridge/console_bridge-0.4.3.ebuild deleted file mode 100644 index 24c3a5e41f0a..000000000000 --- a/dev-libs/console_bridge/console_bridge-0.4.3.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -SCM="" -if [ "${PV#9999}" != "${PV}" ] ; then - SCM="git-r3" - EGIT_REPO_URI="https://github.com/ros/console_bridge" -fi - -inherit ${SCM} cmake-utils multilib - -if [ "${PV#9999}" != "${PV}" ] ; then - KEYWORDS="" - SRC_URI="" -else - KEYWORDS="~amd64 ~arm" - SRC_URI="https://github.com/ros/console_bridge/archive/${PV}.tar.gz -> ${P}.tar.gz" -fi - -DESCRIPTION="A ROS-independent package for logging into rosconsole/rosout" -HOMEPAGE="http://wiki.ros.org/console_bridge" -LICENSE="BSD" -SLOT="0/4" -IUSE="" - -RDEPEND="dev-libs/boost:=[threads]" -DEPEND="${RDEPEND}" diff --git a/dev-libs/console_bridge/console_bridge-0.4.4.ebuild b/dev-libs/console_bridge/console_bridge-0.4.4.ebuild deleted file mode 100644 index 1fac726c6456..000000000000 --- a/dev-libs/console_bridge/console_bridge-0.4.4.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -SCM="" -if [ "${PV#9999}" != "${PV}" ] ; then - SCM="git-r3" - EGIT_REPO_URI="https://github.com/ros/console_bridge" -fi - -inherit ${SCM} cmake-utils multilib - -if [ "${PV#9999}" != "${PV}" ] ; then - KEYWORDS="" - SRC_URI="" -else - KEYWORDS="~amd64 ~arm" - SRC_URI="https://github.com/ros/console_bridge/archive/${PV}.tar.gz -> ${P}.tar.gz" -fi - -DESCRIPTION="A ROS-independent package for logging into rosconsole/rosout" -HOMEPAGE="http://wiki.ros.org/console_bridge" -LICENSE="BSD" -SLOT="0/4" -IUSE="" - -RDEPEND="dev-libs/boost:=[threads]" -DEPEND="${RDEPEND}" diff --git a/dev-libs/console_bridge/console_bridge-1.0.1.ebuild b/dev-libs/console_bridge/console_bridge-1.0.1.ebuild new file mode 100644 index 000000000000..a93aeb6410c5 --- /dev/null +++ b/dev-libs/console_bridge/console_bridge-1.0.1.ebuild @@ -0,0 +1,66 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +SCM="" +if [ "${PV#9999}" != "${PV}" ] ; then + SCM="git-r3" + EGIT_REPO_URI="https://github.com/ros/console_bridge" +fi + +inherit ${SCM} cmake + +AMENT_LINT_VER=0.9.5 +EXTERNAL_PROGS=" + https://raw.githubusercontent.com/ament/ament_lint/${AMENT_LINT_VER}/ament_cppcheck/ament_cppcheck/main.py -> ${P}-ament-${AMENT_LINT_VER}-cppcheck.py + https://raw.githubusercontent.com/ament/ament_lint/${AMENT_LINT_VER}/ament_cpplint/ament_cpplint/cpplint.py -> ${P}-ament-${AMENT_LINT_VER}-cpplint.py +" +if [ "${PV#9999}" != "${PV}" ] ; then + KEYWORDS="" + SRC_URI="${EXTERNAL_PROGS}" +else + KEYWORDS="~amd64 ~arm" + SRC_URI="${EXTERNAL_PROGS} + https://github.com/ros/console_bridge/archive/${PV}.tar.gz -> ${P}.tar.gz" +fi + +DESCRIPTION="A ROS-independent package for logging into rosconsole/rosout" +HOMEPAGE="https://wiki.ros.org/console_bridge" +LICENSE="BSD" +SLOT="0/1" +IUSE="test" +RESTRICT="!test? ( test )" + +RDEPEND="dev-libs/boost:=[threads]" +DEPEND="${RDEPEND}" +BDEPEND=" + test? ( + dev-util/cppcheck + ) +" +PATCHES=( "${FILESDIR}/tests.patch" ) + +src_prepare() { + # Avoid wgeting it. #733704 + sed -e 's/add_dependencies(console_bridge wget_cppchec/#/' -i test/CMakeLists.txt || die + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DBUILD_TESTING=$(usex test ON OFF) + ) + cmake_src_configure + + # For tests + if use test ; then + cp "${DISTDIR}/${P}-ament-${AMENT_LINT_VER}-cppcheck.py" "${BUILD_DIR}/test/cppcheck.py" || die + cp "${DISTDIR}/${P}-ament-${AMENT_LINT_VER}-cpplint.py" "${BUILD_DIR}/test/cpplint.py" || die + fi +} + +src_test() { + export AMENT_CPPCHECK_ALLOW_1_88=yes + cmake_src_test +} diff --git a/dev-libs/console_bridge/console_bridge-9999.ebuild b/dev-libs/console_bridge/console_bridge-9999.ebuild index 1fac726c6456..a93aeb6410c5 100644 --- a/dev-libs/console_bridge/console_bridge-9999.ebuild +++ b/dev-libs/console_bridge/console_bridge-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,21 +9,58 @@ if [ "${PV#9999}" != "${PV}" ] ; then EGIT_REPO_URI="https://github.com/ros/console_bridge" fi -inherit ${SCM} cmake-utils multilib +inherit ${SCM} cmake +AMENT_LINT_VER=0.9.5 +EXTERNAL_PROGS=" + https://raw.githubusercontent.com/ament/ament_lint/${AMENT_LINT_VER}/ament_cppcheck/ament_cppcheck/main.py -> ${P}-ament-${AMENT_LINT_VER}-cppcheck.py + https://raw.githubusercontent.com/ament/ament_lint/${AMENT_LINT_VER}/ament_cpplint/ament_cpplint/cpplint.py -> ${P}-ament-${AMENT_LINT_VER}-cpplint.py +" if [ "${PV#9999}" != "${PV}" ] ; then KEYWORDS="" - SRC_URI="" + SRC_URI="${EXTERNAL_PROGS}" else KEYWORDS="~amd64 ~arm" - SRC_URI="https://github.com/ros/console_bridge/archive/${PV}.tar.gz -> ${P}.tar.gz" + SRC_URI="${EXTERNAL_PROGS} + https://github.com/ros/console_bridge/archive/${PV}.tar.gz -> ${P}.tar.gz" fi DESCRIPTION="A ROS-independent package for logging into rosconsole/rosout" -HOMEPAGE="http://wiki.ros.org/console_bridge" +HOMEPAGE="https://wiki.ros.org/console_bridge" LICENSE="BSD" -SLOT="0/4" -IUSE="" +SLOT="0/1" +IUSE="test" +RESTRICT="!test? ( test )" RDEPEND="dev-libs/boost:=[threads]" DEPEND="${RDEPEND}" +BDEPEND=" + test? ( + dev-util/cppcheck + ) +" +PATCHES=( "${FILESDIR}/tests.patch" ) + +src_prepare() { + # Avoid wgeting it. #733704 + sed -e 's/add_dependencies(console_bridge wget_cppchec/#/' -i test/CMakeLists.txt || die + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DBUILD_TESTING=$(usex test ON OFF) + ) + cmake_src_configure + + # For tests + if use test ; then + cp "${DISTDIR}/${P}-ament-${AMENT_LINT_VER}-cppcheck.py" "${BUILD_DIR}/test/cppcheck.py" || die + cp "${DISTDIR}/${P}-ament-${AMENT_LINT_VER}-cpplint.py" "${BUILD_DIR}/test/cpplint.py" || die + fi +} + +src_test() { + export AMENT_CPPCHECK_ALLOW_1_88=yes + cmake_src_test +} diff --git a/dev-libs/console_bridge/files/tests.patch b/dev-libs/console_bridge/files/tests.patch new file mode 100644 index 000000000000..0f41a8dd3aa7 --- /dev/null +++ b/dev-libs/console_bridge/files/tests.patch @@ -0,0 +1,15 @@ +This test does not make sense since the file is not yet installed. + +Index: console_bridge-1.0.1/test/CMakeLists.txt +=================================================================== +--- console_bridge-1.0.1.orig/test/CMakeLists.txt ++++ console_bridge-1.0.1/test/CMakeLists.txt +@@ -77,7 +77,7 @@ if(WGET_EXE) + "--counting=detailed" + "--extensions=cpp,h" + "--linelength=100" +- "--filter=-build/c++11,-runtime/references,-whitespace/braces,-whitespace/indent,-whitespace/parens,-whitespace/semicolon" ++ "--filter=-build/c++11,-runtime/references,-whitespace/braces,-whitespace/indent,-whitespace/parens,-whitespace/semicolon,-build/header_guard" + "${PROJECT_SOURCE_DIR}/include/console_bridge/console.h" + "${PROJECT_SOURCE_DIR}/src/console.cpp" + ) diff --git a/dev-libs/cudnn/Manifest b/dev-libs/cudnn/Manifest index 3f082438a8ec..214a5cb31c18 100644 --- a/dev-libs/cudnn/Manifest +++ b/dev-libs/cudnn/Manifest @@ -6,10 +6,8 @@ DIST cudnn-10.1-linux-x64-v7.6.1.34.tgz 521806738 BLAKE2B 9804ed394cf58f0c415d45 DIST cudnn-10.1-linux-x64-v7.6.2.24.tgz 522872521 BLAKE2B 6424ade8443521138b36bb528105bc482202ff475dd3eb3aaa7f992e8ad8b67628ac1b464d10056f16bb5766fb8464abe8ae406f8766831d248b90796d146c1e SHA512 3451c113b4dcb8aaa33b2740e0e0b60d121ef02525c4e8ece3d7afd76b3472f704a90eb69d1a06f2bc94a981c2bfa3bea2f3bd057dcbdc6eecdea1056563057d DIST cudnn-10.1-linux-x64-v7.6.5.32.tgz 523418497 BLAKE2B 28febb24382d411faa870cd42e999431d1ee1d083c09903ee4a8f5bee676981c60f6daf6cd256978db69345397db743a7a6f6187376520f5c4f968f6177e0201 SHA512 1073bc42c2c36fce6b710882a04a4035d66d95c410200b9d50953e993d7b801cc3a837e42843ad2447e62ea5dfc8ba22c8a803464716c56ffb811aa278645771 DIST cudnn-10.2-linux-x64-v7.6.5.32.tgz 548210361 BLAKE2B 51fdd14f0bbc5a029bddca94ab7ae56ee77c16fdc525c78b986bb3dc1e0525943e5ab17eb81e356ef92c985ee467bd87a6670c343a96136d932ace86bb649437 SHA512 943c1afc0b7711dec87931770eaa567e25361a31ed5e1edabcc3f81df72880428611308e8032a28dc197e8c5edfebe3f67cc9d22a21eb569d8b254d8eb84eac6 -DIST cudnn-8.0-linux-x64-v6.0.tgz 201134139 BLAKE2B a7e616c671272a3a0f0c51b93646c8c60302c3dec85b71144e011bc3460d0ce80ff75d39869c05c4ef183d2d09aff31bb470a3fd3fd3d79b581a7a2d5a349279 SHA512 ddeeacb5b449920d942a26b98c353d78fd6f7d7fb3b3ce42a078626473efdda25c7ae641232702d62eb5749e39ecfd03e88346119c920c19348ac3ee82d3ff47 DIST cudnn-9.1-linux-x64-v7.tgz 343081241 BLAKE2B 22c2fbef38a05e7929ccc28410dfdbff906b2c3e97e0419cf83988c2fc2340005e4a944d43b1a215b0c3458b2cad03480b7e537ae93861924c28ec1010a530fb SHA512 7eadb64a3d5e49aec2761e6f7dc0295c1d356910b114eed450c47081fc81b6e3b7748f3a4153f6a9d957691e3689cd52823bfa12816b1950dfc8794d6f332749 DIST cudnn-9.2-linux-x64-v7.1.tgz 421083972 BLAKE2B 1a1dd6708132d6ad6f8f541694b1406de4a26b7bb78b6198bc8ec5ddde2172d0cc0dc540c7c446a2f941ad11cfafa562235d17129ab8e6aa641433c35c8d31d6 SHA512 2f67c905976eb041512eb012a7cc98e1f408ec867f6a1d9d440afbcddc622c03c40de10386e44e4ab138c1a4ad040d39b0e9243f68e22975ca27ec297be25c5d -EBUILD cudnn-6.0.ebuild 504 BLAKE2B ed456c8cadcbe6320286e4f668d60a883cccbdf4292b39cc83a50634415022a7e81ff22f49cc42e064f96520508dd91d61dcad620a7cafd3e25afa7f2d59ee12 SHA512 ea1658e2dd8344203f767010b35a0b4a84d313498da7d37075b669f77cd22f80a8d111f7ffb18b9ed216aa4e87727275cf398e87c34790e27f2525dae5c9acd4 EBUILD cudnn-7.0.5-r1.ebuild 565 BLAKE2B 883ccb932c1f725857ed0dbf411455074aee04e2d451e2d9854ac34b4bf96b406fabf4f6c14b886dd290e05c780c8c1bf070f5c12f5b7c2089826e157df8afe8 SHA512 9033ffec0923335865f04c6e4ada3bc4266bf59a458dba2230f583ba900ff13499c26f01ef6d3f41941916b0a4ec5d2321077f3a7382fc116bbe8770cc4c898e EBUILD cudnn-7.1.4.ebuild 554 BLAKE2B 3e7bc00ebb9dd2c01e26148f213cedb9b047bff89084bc63dd631ab70d0bb795a7afd525f155815d83a63441b3ae349bce2c0697d964629d022330d90832fb60 SHA512 c255e5c3fa2aa8f10cb022489e7384a4f80888270214bebb18d695e031cbd4cef3ff11921a0b82d555073a5cccaa9a191aa43f92f4f4674f2db9eaa05dc33785 EBUILD cudnn-7.4.1.5.ebuild 543 BLAKE2B b040a2b17939e30b7c76bdb04dce006e861f5dab16acd048cdc08dc6b7a1fd94b247c0a681a4e263633af7c9d04e5f193e725df37b3b33f305ee94b29ecbf428 SHA512 80126c7fc9f55fadc1fbce58997a1f5daad803af3335fd429c70dd126b4f2a2f6b105b25488613ec3fe20624f1d5758f2b67de0112d8d4930a2b05b24a0e1315 diff --git a/dev-libs/cudnn/cudnn-6.0.ebuild b/dev-libs/cudnn/cudnn-6.0.ebuild deleted file mode 100644 index 233215c6c587..000000000000 --- a/dev-libs/cudnn/cudnn-6.0.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -CUDA_PV=8.0 - -DESCRIPTION="NVIDIA Accelerated Deep Learning on GPU library" -HOMEPAGE="https://developer.nvidia.com/cuDNN" -SRC_URI="cudnn-${CUDA_PV}-linux-x64-v${PV}.tgz" - -SLOT="0/6" -KEYWORDS="~amd64 ~amd64-linux" -RESTRICT="fetch" -LICENSE="NVIDIA-cuDNN" - -S="${WORKDIR}" - -DEPENDS="=dev-util/nvidia-cuda-toolkit-${CUDA_PV}*" -RDEPENDS="${DEPENDS}" - -src_install() { - insinto /opt - doins -r * -} diff --git a/dev-libs/cyberjack/Manifest b/dev-libs/cyberjack/Manifest index 5645c9406ffd..75e00d3d5e04 100644 --- a/dev-libs/cyberjack/Manifest +++ b/dev-libs/cyberjack/Manifest @@ -1,4 +1,5 @@ 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 -EBUILD cyberjack-3.99.5_p14.ebuild 1950 BLAKE2B 92c1ac90af31182ede791bca864e48a1d703ca105b06b804ee8201662efe4a9ab7b3d76d3671b1dfd8b6246ac935295fb80bba5f33da065e61274b3e9a6ef93a SHA512 4a50cd74805265cda12a2a8737f57c403f1fdd204daa405e36d7173b6b0d6eff70ac087904c28737867886148ec85c5a23c7d77292ad7e1190ed92cc41a27258 +AUX libifd-cyberjack6.udev-r1 1435 BLAKE2B 3606ea979cf8bc068eb7ab447af70f5f9c409369554868ba36a43eaa7202813587b2193b0ef16b42a68bb665f4eaee5ac976774ec0f77dbaa93b447a6e6021bd SHA512 bfefad4cd2b509a41d3e8f638364a3f604e80dd5302456ca9d27d592175e30a2c348353d35fda242f2f80651efcd111c7294ecde7a8d80f1c7e1a655240483d2 +DIST pcsc-cyberjack_3.99.5final.SP14.tar.bz2 1682821 BLAKE2B 389b0da28beec42e3e2f1766b76dd77efec24bf7aea906ff14ad206c182162125431ac6c81e9242813c088b4936958b8056f5e7c71424c95de6e8e1ac2357aed SHA512 c83e142d6c071f7f20f9f15b9b76ed819873760bda4b49ec042506b2d7ef9ad8674c953abe67f08a1c4b178ce44767ba6479ea1148d8eeb38797e4775b2a9e82 +EBUILD cyberjack-3.99.5_p14-r2.ebuild 1946 BLAKE2B 4b0cc5fc8fe4311f257ff91855f84fcbd49ddbff7668dd12442f732ba1adaffa1fe75a3399da21dc5bf58ea3c9d5ec7beba91121a85d85fabb285260097f3ca3 SHA512 5bea615f670c3f775d0fea640803c1d0bd8ffc9ede53e1b82781901c21f22523aa7038027b2fc1e5c206d2a9f3f35ab15dffbd4696ce1feaad84855e8887823c 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-r2.ebuild index eb2bb547afb8..5ca837df4452 100644 --- a/dev-libs/cyberjack/cyberjack-3.99.5_p14.ebuild +++ b/dev-libs/cyberjack/cyberjack-3.99.5_p14-r2.ebuild @@ -5,13 +5,13 @@ EAPI=7 MY_PN="pcsc-${PN}" MY_PV="${PV/_p/final.SP}" -MY_P="${MY_PN}-${MY_PV}" +MY_P="${MY_PN}_${MY_PV}" -inherit autotools flag-o-matic linux-info toolchain-funcs udev +inherit autotools flag-o-matic toolchain-funcs udev 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" +SRC_URI="https://support.reiner-sct.de/downloads/LINUX/V${PV/_p/_SP}/${MY_P}.tar.gz -> ${MY_P}.tar.bz2" KEYWORDS="amd64 x86" LICENSE="GPL-2+ LGPL-2.1+" @@ -30,7 +30,6 @@ BDEPEND="virtual/pkgconfig" S="${WORKDIR}/${MY_P/_/-}" -CONFIG_CHECK="~USB_SERIAL_CYBERJACK" PATCHES="${FILESDIR}/${P}-gcc10.patch" src_prepare() { @@ -77,7 +76,7 @@ src_install() { default use tools && dobin tools/cjflash/cjflash tools/cjgeldkarte/cjgeldkarte - use udev && udev_newrules debian/libifd-cyberjack6.udev 99-${PN}.rules + use udev && udev_newrules "${FILESDIR}"/libifd-cyberjack6.udev-r1 99-cyberjack.rules dodoc debian/changelog doc/{LIESMICH,README}.{pdf,txt,xml} diff --git a/dev-libs/cyberjack/files/libifd-cyberjack6.udev-r1 b/dev-libs/cyberjack/files/libifd-cyberjack6.udev-r1 new file mode 100644 index 000000000000..49a447859034 --- /dev/null +++ b/dev-libs/cyberjack/files/libifd-cyberjack6.udev-r1 @@ -0,0 +1,27 @@ +# If not adding the device, go away +ACTION!="add", GOTO="cyberjack_rules_end" +SUBSYSTEM!="usb", GOTO="cyberjack_rules_end" +ENV{DEVTYPE}!="usb_device", GOTO="cyberjack_rules_end" + +ATTR{idVendor}=="0c4b", ATTR{idProduct}=="0100", ENV{PCSCD}="1" +ATTR{idVendor}=="0c4b", ATTR{idProduct}=="0300", ENV{PCSCD}="1" +ATTR{idVendor}=="0c4b", ATTR{idProduct}=="0400", ENV{PCSCD}="1" +ATTR{idVendor}=="0c4b", ATTR{idProduct}=="0401", ENV{PCSCD}="1" +ATTR{idVendor}=="0c4b", ATTR{idProduct}=="0412", ENV{PCSCD}="1" +ATTR{idVendor}=="0c4b", ATTR{idProduct}=="0485", ENV{PCSCD}="1" +ATTR{idVendor}=="0c4b", ATTR{idProduct}=="0500", ENV{PCSCD}="1" +ATTR{idVendor}=="0c4b", ATTR{idProduct}=="0501", ENV{PCSCD}="1" +ATTR{idVendor}=="0c4b", ATTR{idProduct}=="0502", ENV{PCSCD}="1" +ATTR{idVendor}=="0c4b", ATTR{idProduct}=="0503", ENV{PCSCD}="1" +ATTR{idVendor}=="0c4b", ATTR{idProduct}=="0504", ENV{PCSCD}="1" +ATTR{idVendor}=="0c4b", ATTR{idProduct}=="0505", ENV{PCSCD}="1" +ATTR{idVendor}=="0c4b", ATTR{idProduct}=="0506", ENV{PCSCD}="1" +ATTR{idVendor}=="0c4b", ATTR{idProduct}=="0507", ENV{PCSCD}="1" +ATTR{idVendor}=="0c4b", ATTR{idProduct}=="0525", ENV{PCSCD}="1" +ATTR{idVendor}=="0c4b", ATTR{idProduct}=="0580", ENV{PCSCD}="1" +ATTR{idVendor}=="0c4b", ATTR{idProduct}=="2000", ENV{PCSCD}="1" +ATTR{idVendor}=="0c4b", ATTR{idProduct}=="0551", ENV{PCSCD}="1" +ATTR{idVendor}=="0c4b", ATTR{idProduct}=="2002", ENV{PCSCD}="1" + +# All done +LABEL="cyberjack_rules_end" diff --git a/dev-libs/cyrus-sasl/Manifest b/dev-libs/cyrus-sasl/Manifest index 1740143e0159..77169ef4ac53 100644 --- a/dev-libs/cyrus-sasl/Manifest +++ b/dev-libs/cyrus-sasl/Manifest @@ -17,5 +17,5 @@ AUX saslauthd.service 277 BLAKE2B cf80eaa1e3f7ef854978a458e4b026f3f47891620ac63e AUX saslauthd2.rc7 411 BLAKE2B 7cda36ea03aeea5f8e32c2fd0319a483dae78080fa213fb423bd1545e9d29193ebe077ebe5d15ab5940b2d805cb46a25ad2629757f55d2c40c4acc3f0adfa355 SHA512 1d5942a94ffbc15774443d60a88d4c89c7c3c6ea68b041d304f0110f6ec3aa2a812f59021cddc78de6f51a25bb00955e4e56d769e766a9d856f13774dd37ce83 DIST cyrus-sasl-2.1.27.tar.gz 4111249 BLAKE2B 82c9acce8534521ce5c5806f093e927f1854b4bc4b83ea7db1b32ceaa811adc1a5b6fc16d03233d729194cd603836f6e58de67f915abab2cb74561a80d03f5a8 SHA512 d11549a99b3b06af79fc62d5478dba3305d7e7cc0824f4b91f0d2638daafbe940623eab235f85af9be38dcf5d42fc131db531c177040a85187aee5096b8df63b EBUILD cyrus-sasl-2.1.27-r3.ebuild 8182 BLAKE2B 70af8a045087a3b745c0bad450c7a0ed0b43a906791845988306dc6068d0d3fc7646c6d7d9882a2e5aecea28f861d552d4e4ad9c2631eba8e0fdecb2b33a0a63 SHA512 5822cdc9cd037593cade59aec6c47590e25d012aed191377a82d03842412d433ba1d933f47345533d15d9e2c72cd4853dcd6a3a13ad07a2fa88bdc57f4c86a85 -EBUILD cyrus-sasl-2.1.27-r4.ebuild 8207 BLAKE2B c9b5419fe41d3c42380d8e0eaa9f997323cf142a93298217bce08abd2ad2479e654a7290abc6779fe074d5874d2537423a0320f980c6071a82af33962d3836a9 SHA512 156371e71968855262004a75046301813fe528b60a096afd4ce67a605638f3ad834c8f6acdaae96c0fc2d874aceba13a663e9fa386e197fa276562c77a328b3e +EBUILD cyrus-sasl-2.1.27-r4.ebuild 8201 BLAKE2B bd72b81301fc1868ced9ee108a44f16ce968ff4c74f6054ab82a0db41d937659bc98464d8be27799bdeccf7295f6d7c3b93270faa1e5ffeed577657639c0d139 SHA512 69953cd0a1294679a33bf41dec6312d2699bafe48d88c21072ff94249b08324c4c66ef39e328cc68a1740fa15a5e10d1537c64cd9be676f173a4fd3805568510 MISC metadata.xml 630 BLAKE2B b24d644395a824cc17a25bef92679a2dd50656722223ded02b3311cd9b386470f4f2dafe8c8d604fd042a096d8f0f2d532e2bbc261e3c0affe4dc8d7a1db816c SHA512 45178682e8cfab5eda20e3244f42ce37be7f0e16c87405d0a1e198f561a73f8105df384055f6f228864030f4a196dcdd6b2eaf51b65b7e49f84827df9b56fba4 diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r4.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r4.ebuild index fc73d847e18b..5e02c971cab0 100644 --- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r4.ebuild +++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r4.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://github.com/cyrusimap/${PN}/releases/download/${P}/${P}.tar.gz" LICENSE="BSD-with-attribution" SLOT="2" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~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 ~mips ~ppc ~ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="authdaemond berkdb gdbm kerberos ldapdb libressl openldap mysql pam postgres sample selinux sqlite srp ssl static-libs urandom" CDEPEND=" diff --git a/dev-libs/distorm64/Manifest b/dev-libs/distorm64/Manifest index a063633f098a..f7584bce0aa0 100644 --- a/dev-libs/distorm64/Manifest +++ b/dev-libs/distorm64/Manifest @@ -1,5 +1,3 @@ -DIST distorm3-3.4.4.tar.gz 134803 BLAKE2B 4c496db182c874b1f2d3e1433b53f59c51000d18c2e128d642e8088cb3150757a54d16d4f8303a2d46dfa0e83a941f9e75798d03643835938451c4b4903fd1f4 SHA512 ee39054a37436bb2137261d8fcf6da5e4849ef649bfa323c4523c195c1d9ee90708057fd1e1818f676300a410a184006d8db54ec3eef9aa8f5fcd455b25fc7a2 DIST distorm3-3.5.0.tar.gz 137500 BLAKE2B 01d426f0b76a232503ebe4e1edb719bcdd1480a6ab729f3e49eff3e3fee5e9e4af6e6051c1e7675b14aa39a2fc999df2c1535976bb0981a23baef0e78aec8bd3 SHA512 ad9415a0a1a65a7ad3824b19ec83df90459eeb153494efb6623a8f02c60b6d0cf61d7dae4143eb1dd0586f5c7a7115f4a53cea5609296f703e5db612ce925011 -EBUILD distorm64-3.4.4.ebuild 597 BLAKE2B be31f99966ab069f4fb32c75243c71f82ac80ddd2b89ae44ea3651ac06d4b5bb075f8015f05ad2ae2c929eb9cb135abe2a1a90346ca44a3e9b0d83beab507b3b SHA512 2e8a6654c369469cf82c63335d196ec86bb85a72d54c5db9a5ccf5d31b30cd5559183f6da95d90d045a56963707aa02ef51c619719b647d22683491a5733e7a4 EBUILD distorm64-3.5.0.ebuild 597 BLAKE2B be31f99966ab069f4fb32c75243c71f82ac80ddd2b89ae44ea3651ac06d4b5bb075f8015f05ad2ae2c929eb9cb135abe2a1a90346ca44a3e9b0d83beab507b3b SHA512 2e8a6654c369469cf82c63335d196ec86bb85a72d54c5db9a5ccf5d31b30cd5559183f6da95d90d045a56963707aa02ef51c619719b647d22683491a5733e7a4 MISC metadata.xml 541 BLAKE2B 6c2f81faf6c95690ba0ca52f27f9a8dceae7eb3e85690f9f9cb3825ddb9da76e0beddb21c45f7a914f13197857cb4d2701204fbd194a032e102f3703b3bcabae SHA512 264cfb7a150b89d0c84d275466c5dce39631a939523990b728c9c3bd6db7854f0a23ec3403b92c3a8c1fff6c8b436eeb6e1503706008aadde11b7c51834b0b57 diff --git a/dev-libs/distorm64/distorm64-3.4.4.ebuild b/dev-libs/distorm64/distorm64-3.4.4.ebuild deleted file mode 100644 index 33a2f40462cf..000000000000 --- a/dev-libs/distorm64/distorm64-3.4.4.ebuild +++ /dev/null @@ -1,32 +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} ) - -inherit distutils-r1 - -DESCRIPTION="The ultimate disassembler library (X86-32, X86-64)" -HOMEPAGE="http://www.ragestorm.net/distorm/" - -MY_PN=distorm3 -MY_P=${MY_PN}-${PV} - -SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" -S="${WORKDIR}/${MY_P}" - -DEPEND="" -RDEPEND="" - -LICENSE="BSD-4" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -python_install() { - distutils-r1_python_install - - # don't know why it does not happen by default - python_optimize -} diff --git a/dev-libs/dmalloc/Manifest b/dev-libs/dmalloc/Manifest index 9c687882abc9..9d7b0259e87e 100644 --- a/dev-libs/dmalloc/Manifest +++ b/dev-libs/dmalloc/Manifest @@ -3,6 +3,8 @@ AUX dmalloc-5.5.2-ar.patch 390 BLAKE2B d339b90b38b045ef929a661aa2fb0c95e35a89bd8 AUX dmalloc-5.5.2-cxx.patch 546 BLAKE2B 6f85a3024d417c81f3a4dd4f50cf444f09eb3b53eb9faf7ccbd022ea9e596ebcefe0038fa894bf2782e08c53dab3a8d89fc43153e9bef34a2c84771fcf497bd5 SHA512 370ff73c4af16d7b4cb5e15a88f3cafcc16494df7df50c4494b1e34ed687f1385b774431cc94a9ba75ef96f2828f75501ee2d0addc9d3e34d4f718ac94ae5f6d AUX dmalloc-5.5.2-string-macros.patch 367 BLAKE2B 7fd3e6ae9b4564ec519da953c5116b9a8d19fa446c1d3e24ff736ce3725fd7425881dc07272a3f5dbdee1202e1dac8f68f19266296f5c8335976e5287fa90ddc SHA512 61d0015e7997ecad97e722a1b308ec90e996e9d53b9f475c911f1d9eb929d8007881e52699e9f3427c5cecb9f0b2d202d12a7d607d23434913afbef455f08617 AUX dmalloc-5.5.2-threads.patch 165 BLAKE2B fee0be1573996dc7460735a94c645989db6fb9570e1140ec64e87e4bddd6b84227d072454bd64c4e0f261e81da0dd27a6ebf310b60e8a74539a21f83370e291f SHA512 b561c715c19604128c046b36bfe09794922176ce1cd12947da277631a410bbc19c5a1f7e998f0b61d7564e3b7516bee0fb4deddb13e036bb9e667f3502e56d0e +AUX dmalloc-999999-texi2html.patch 355 BLAKE2B 3b599bdfa45f6c781b446d72cab79acb6f6b59e0c648989c1012b625f4e07ed5b0934cd4c21865af154a1745e1ce2b72bf90f738efa40d7c2654e5e2723b389c SHA512 e29aba00d3e5edf0639685858215736f3aed4baa9f7b79577a69bf5e2e51a0072e92befe7ad0e24a68ea35e184271c15312b5acea145ff1a186eb0d35a985c72 DIST dmalloc-5.5.2.tgz 666608 BLAKE2B 9371b35b9a39706215ff2fc4e31510dafa30a86dccb2290563a2c8a0e7211372dca419dd7d549011548853f1e168fe15c55361d763d27230c547c93113de823e SHA512 96bb94aeb2bc3220f652b5294bdf8592b984cb2a53e5f02b2b8d52450c3396d18651f334644cdfff9c85a8c0d0cedc7f6a18b9d70497b2c6b5f85dbd1e827b93 EBUILD dmalloc-5.5.2-r7.ebuild 1856 BLAKE2B 5b53473108b3734739b190bcbb6de70223f995c56eb2970c60711e2fe0381acc64fe63c7077bc827e9c9fab93787887d1cc11eaa45fc0f6c3b5d356c31a67f35 SHA512 2f38656b920367281a179afb298c7fc2a4cbe7f3db56001f9812711c6836ad18e579c7e78427d110b329a528b443bf40852aaae92819b2aa8e13d88dcbd18f57 +EBUILD dmalloc-999999.ebuild 1715 BLAKE2B a531973e0e40ca54c17ae6f9b48b8b6b6cd211d4c1e97a0ee8ee22295433c28542344bcaec213cf7576cb3fdae1b3afb10a21ef4e3c783d57a2df5ac514f653c SHA512 a82821e40cb40fe7a88b6b840138894a1cd7823a716a369115bbae82ea046dbae1cf202cb0c6c789e177954133dcd70120091b6b1c8e29df2ad2aa595873ece2 MISC metadata.xml 244 BLAKE2B 9c6750147c240d7416fad33e04b53730dc89cbb615648a7f3defeed3ec058aeee6dbed55a1f81241417b42ca9f7daec177c725692166a5ba08765b5dcf5a6bc5 SHA512 1da71f4fae0251c97a8fcfa1e13b0a3f8b95a856fa919ebd30bf4f2f1b8fa900841db09ebc2a0ae9fe0d91f786ac40b63290382668412fcb05bca15b0746f1db diff --git a/dev-libs/dmalloc/dmalloc-999999.ebuild b/dev-libs/dmalloc/dmalloc-999999.ebuild new file mode 100644 index 000000000000..d0ea9940859a --- /dev/null +++ b/dev-libs/dmalloc/dmalloc-999999.ebuild @@ -0,0 +1,83 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit autotools git-r3 multilib toolchain-funcs + +DESCRIPTION="A Debug Malloc Library" +HOMEPAGE="https://dmalloc.com" +EGIT_REPO_URI="https://github.com/j256/dmalloc" + +LICENSE="CC-BY-SA-3.0" +SLOT="0" +KEYWORDS="" +IUSE="static-libs threads" + +BDEPEND=" + app-text/texi2html + sys-apps/texinfo +" +DOCS=( + ChangeLog.txt README.md TODO dmalloc.html +) +PATCHES=( + # - Build objects twice, once -fPIC for shared. + # - Use DESTDIR. + # - Fix SONAME and NEEDED. + "${FILESDIR}"/${PN}-5.5.2-Makefile.in.patch + # - Broken test, always returns false. + "${FILESDIR}"/${PN}-5.5.2-cxx.patch + "${FILESDIR}"/${PN}-5.5.2-ar.patch + "${FILESDIR}"/${PN}-999999-texi2html.patch +) + +src_prepare() { + default + + # - Add threads support. + use threads && eapply "${FILESDIR}"/${PN}-5.5.2-threads.patch + + # Respect CFLAGS/LDFLAGS. #337429 + sed -i \ + -e '/libdmalloc/ s:$(CC):& $(CFLAGS) $(LDFLAGS):g' \ + -e 's|ar cr|$(AR) cr|g' \ + Makefile.in || die + + # Run autoconf for -cxx.patch. + eautoconf +} + +src_configure() { + tc-export AR + econf --enable-cxx --enable-shlib $(use_enable threads) +} + +src_compile() { + default + +# makeinfo dmalloc.texi || die +} + +src_test() { + emake heavy +} + +src_install() { + default + + doinfo dmalloc.info + + # add missing symlinks, lazy + dosym lib${PN}.so.5.5.2 /usr/$(get_libdir)/lib${PN}.so + dosym lib${PN}.so.5.5.2 /usr/$(get_libdir)/lib${PN}.so.5 + + for lib in cxx th thcxx; do + dosym lib${PN}${lib}.so.5.5.2 /usr/$(get_libdir)/lib${PN}${lib}.so + dosym lib${PN}${lib}.so.5.5.2 \ + /usr/$(get_libdir)/lib${PN}${lib}.so.5 + done + + if ! use static-libs; then + rm "${ED}"/usr/$(get_libdir)/lib${PN}*.a || die + fi +} diff --git a/dev-libs/dmalloc/files/dmalloc-999999-texi2html.patch b/dev-libs/dmalloc/files/dmalloc-999999-texi2html.patch new file mode 100644 index 000000000000..1e7e4ccd1eb1 --- /dev/null +++ b/dev-libs/dmalloc/files/dmalloc-999999-texi2html.patch @@ -0,0 +1,11 @@ +--- a/Makefile.in ++++ b/Makefile.in +@@ -285,7 +285,7 @@ + + dmalloc.html : $(srcdir)/dmalloc.texi + rm -f $@ $@.t +- texi2html --output=$@.t -number -monolithic $(srcdir)/dmalloc.texi ++ texi2html --output=$@.t --number-footnotes --number-sections -monolithic $(srcdir)/dmalloc.texi + mv $@.t $@ + + settings.h : $(srcdir)/settings.dist $(srcdir)/configure diff --git a/dev-libs/double-conversion/Manifest b/dev-libs/double-conversion/Manifest index df6d428be91e..131d9077543f 100644 --- a/dev-libs/double-conversion/Manifest +++ b/dev-libs/double-conversion/Manifest @@ -1,3 +1,3 @@ DIST double-conversion-3.1.5.tar.gz 7023792 BLAKE2B ed70a554bd52e23aadecbeaa6607dfcdb670450b95e2ff699c784512e6cb0c022f51f6ab775ebc5b3c293f991e5200ff5528d689c74dae92e8e68bedf672c5ac SHA512 0aeabdbfa06c3c4802905ac4bf8c2180840577677b47d45e1c91034fe07746428c9db79260ce6bdbdf8b584746066cea9247ba43a9c38155caf1ef44e214180a -EBUILD double-conversion-3.1.5.ebuild 461 BLAKE2B 8da1f66857c34396535a0e0cfe091f6ccb3ee7e20899e48a2799bbcd428fa86a1b672f30d60e374d14073d599f04605d52f063c8cf4c87bc34db5381da4e8526 SHA512 c927a034b3e1643013e10770f05393aab1506dc1c655b9c54e274f092f9fa3866ce748b4df70fe865ab7757ae25b790ca4295b62e96767f1d6f91996061f9b76 +EBUILD double-conversion-3.1.5.ebuild 467 BLAKE2B 0cc4a111e7fb6437379790e26c7146a42ff8d817145697bd6e9667b4a2bdefb94eb77a95802bcc27d8a285d245e39022fca4b9defec9d00ba67abadf8eec17c1 SHA512 f9d089899be5d30d8b2464b91ca2056a97208fcd508d4709b484a922bb2ee365901129c68c7059cc5666dd9bce5aef29f393207af83f879c8b919664de1141c4 MISC metadata.xml 681 BLAKE2B add558ddf626cde6768c25b9a6c3f004ca0e588e99f247d7c1000ca9e7f572429a2d321af2c39b82b61ad1cf66b87f108a241100f6ef28cf85f8daf172e05489 SHA512 e7eee783d9ed17369d7dabdb78eb1bed547c6d75a527b418fc42815ab161688740633d062d59f6b7b30ca26872b40163a8188eefbb4f2eb19299a8809bd49524 diff --git a/dev-libs/double-conversion/double-conversion-3.1.5.ebuild b/dev-libs/double-conversion/double-conversion-3.1.5.ebuild index a3d7d4366520..a9244ed0e553 100644 --- a/dev-libs/double-conversion/double-conversion-3.1.5.ebuild +++ b/dev-libs/double-conversion/double-conversion-3.1.5.ebuild @@ -11,4 +11,4 @@ SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="BSD" SLOT="0/3" -KEYWORDS="amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux" diff --git a/dev-libs/eekboard/Manifest b/dev-libs/eekboard/Manifest index 382ddafb723f..4a8672008b73 100644 --- a/dev-libs/eekboard/Manifest +++ b/dev-libs/eekboard/Manifest @@ -1,4 +1,5 @@ +AUX eekboard-python-3.patch 1309 BLAKE2B c8161d95ade6f64e800e2937681d82fc40e6be4c0a925f8047b445faaa62692c509ec2f2200c444685454753136a80f1a3bec5d58447b87acf444081648ca821 SHA512 7900b74a1a363409d06595d91772077f8e61557a9f454d7f8d28ec7ef0345d16c5adad0a9e8f3782b4f7ed3c05b9b24feeae21ad025b2af2a5e8af149054478c AUX eekboard-vala.patch 971 BLAKE2B 61e8185b8946593bff928bf51e86e133c2e4b0880265a96a56da0fbb2792fba147a4aff605f9e73080fd0e41845805636b23dc4ba47378b5649aa2d73c4ea45a SHA512 0e33141e6e8bbdee661b12083e5e261b013a1c83603dd06ef93b5b9360d89153ff53225e1c8068ebccd5d92c3dfd1c439f7b0fb27ed5e8f21d9ca201c7db01fc DIST eekboard-1.0.8_p20121001.tar.gz 330923 BLAKE2B 74bc0a9e4d3bea73828020895726e12b986100812ff7260758a881899c7ff92dc706c6b7a57bc4d17a9524d1305658c8c29e441ba4b7b4b8023d8f2ddebc2d10 SHA512 3c6ccbaac55a4680ba4d2bd5d214b1738b7fb17f83b66b11621149b6f8a945eb6b39c47be51dfcf53f84317d860ae28b8f83e3071d5d4474fbcfbdc72f6e4c87 -EBUILD eekboard-1.0.8_p20121001.ebuild 1760 BLAKE2B 5abcc9293a1a60b8847e3329bcdf6a975bd1b288ac0e4f43f10669040e0d179808989a31350bfbbf99d044484a716cd1e910538dd51de8d7bfded9d3f545381b SHA512 0655c670c6c100a0058dd21d0ba6482f06480d5e6cb9d35e2e0160809e795e455ebd27daec501f68efd415d9b448274732ad4d3b391b3bd9742038d472391558 -MISC metadata.xml 678 BLAKE2B 18e1494e9a6761d511dfbb99dea84044838cb13974662f6244014647fc414dc4dca585549a44d534ed7d3a63a2b94c7bc4e5a533a817bb2b77194e1b4988b88e SHA512 6ae8cfdff8c6df95729329152c2d853301b2d795c1aa22fe0a45fe0d37c1e3b60339523e35fb58fcf90ca7ab82aea8061baf816f694f8fde25afa53ddc98f0e5 +EBUILD eekboard-1.0.8_p20121001-r1.ebuild 1760 BLAKE2B c15e4f54c3fe887a19f97ff1974abcedeb4076558a680ec6d458800672f56457d16967b1a847b06f2f2e2d771ed276f803d824bd3d66c07ae6584e5111f76dc3 SHA512 6363945ccf4cd2e6447d53808ef507651a4b091bb5799663be631bb67982e8338f9648363d6499bce57633a80520225a9129a79a70a631184aba9504a5622571 +MISC metadata.xml 656 BLAKE2B b76f609d45f294c0737405e47b3f47407fd03bca7733d504d83316aa0932b77ae4cdcaa8b41a1f1ea37e712278ab9c06015123111a9598e84084100b88b58617 SHA512 6d5d60ade78cbfa6bcd40b42d6bebaa7c9b860cab32ed19338facdbfaf380ab71238be0926af4d2c0948970791845e037ffc15794933240ab5ea771750a3a87a diff --git a/dev-libs/eekboard/eekboard-1.0.8_p20121001.ebuild b/dev-libs/eekboard/eekboard-1.0.8_p20121001-r1.ebuild index b534ae9a443f..9340f77503ae 100644 --- a/dev-libs/eekboard/eekboard-1.0.8_p20121001.ebuild +++ b/dev-libs/eekboard/eekboard-1.0.8_p20121001-r1.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" -PYTHON_COMPAT=( python2_7 ) +EAPI="7" +PYTHON_COMPAT=( python3_{6,7,8} ) VALA_USE_DEPEND="vapigen" -inherit autotools gnome2-utils python-any-r1 vala vcs-snapshot virtualx xdg-utils +inherit autotools gnome2-utils python-any-r1 vala vcs-snapshot virtualx xdg DESCRIPTION="An easy to use virtual keyboard toolkit" HOMEPAGE="https://github.com/ueno/eekboard" @@ -30,8 +30,8 @@ RDEPEND="app-accessibility/at-spi2-core libcanberra? ( media-libs/libcanberra[gtk3(+)] ) vala? ( $(vala_depend) ) xtest? ( x11-libs/libXtst )" -DEPEND="${RDEPEND} - ${PYTHON_DEPS} +DEPEND="${RDEPEND}" +BDEPEND="${PYTHON_DEPS} dev-util/glib-utils dev-util/gtk-doc dev-util/gtk-doc-am @@ -39,13 +39,15 @@ DEPEND="${RDEPEND} sys-devel/gettext virtual/pkgconfig" -PATCHES=( "${FILESDIR}"/${PN}-vala.patch ) +PATCHES=( + "${FILESDIR}"/${PN}-python-3.patch + "${FILESDIR}"/${PN}-vala.patch +) src_prepare() { use vala && vala_src_prepare default eautoreconf - xdg_environment_reset } src_configure() { @@ -68,16 +70,16 @@ src_test() { } pkg_preinst() { - gnome2_icon_savelist + xdg_pkg_preinst gnome2_schemas_savelist } pkg_postinst() { - gnome2_icon_cache_update + xdg_pkg_postinst gnome2_schemas_update } pkg_postrm() { - gnome2_icon_cache_update + xdg_pkg_postrm gnome2_schemas_update } diff --git a/dev-libs/eekboard/files/eekboard-python-3.patch b/dev-libs/eekboard/files/eekboard-python-3.patch new file mode 100644 index 000000000000..1bb75feb76fd --- /dev/null +++ b/dev-libs/eekboard/files/eekboard-python-3.patch @@ -0,0 +1,39 @@ +--- a/eek/gen-keysym-entries.py ++++ b/eek/gen-keysym-entries.py +@@ -18,17 +18,20 @@ + # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + # 02110-1301 USA + ++from __future__ import print_function + import sys + import re + + if len(sys.argv) != 2: +- print >> sys.stderr, "Usage: %s TABLE-NAME" % sys.argv[0] ++ print("Usage: %s TABLE-NAME" % sys.argv[0], file=sys.stderr) + sys.exit(-1) + ++py2 = sys.version_info[0] < 3 + table = dict() + for line in sys.stdin: +- line = line.decode('UTF-8') +- match = re.match(r'\s*(0x[0-9A-F]+)\s+(\S*)\s+(\S*)', line, re.I) ++ if py2: ++ line = line.decode('UTF-8') ++ match = re.match(r'\s*(0x[0-9A-F]+)\s+(\w*)\s+(\w*)', line, re.I) + if match: + table[int(match.group(1), 16)] = (match.group(2), match.group(3)) + +@@ -37,8 +40,10 @@ + + for index, (keysym, (l, c)) in enumerate([(keysym, table[keysym]) + for keysym in sorted(table.keys())]): +- sys.stdout.write(" { 0x%X, %s, %s }" % +- (keysym, l.encode('UTF-8'), c.encode('UTF-8'))) ++ if py2: ++ l = l.encode('UTF-8') ++ c = c.encode('UTF-8') ++ sys.stdout.write(" { 0x%X, %s, %s }" % (keysym, l, c)) + if index < len(table) - 1: + sys.stdout.write(",") + sys.stdout.write("\n") diff --git a/dev-libs/eekboard/metadata.xml b/dev-libs/eekboard/metadata.xml index 8b3df112eeb3..9c2b63ff15dc 100644 --- a/dev-libs/eekboard/metadata.xml +++ b/dev-libs/eekboard/metadata.xml @@ -1,19 +1,19 @@ <?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> - <longdescription lang="en"> - eekboard is a virtual keyboard software package, including a set of tools - to implement desktop virtual keyboards. - </longdescription> - <use> - <flag name="libcanberra">Enable support for <pkg>media-libs/libcanberra</pkg></flag> - <flag name="xtest">Enable support for <pkg>x11-libs/libXtst</pkg></flag> - </use> - <upstream> - <remote-id type="github">ueno/eekboard</remote-id> - </upstream> + <maintainer type="project"> + <email>cjk@gentoo.org</email> + <name>Cjk</name> + </maintainer> + <longdescription lang="en"> + eekboard is a virtual keyboard software package, including a set of tools + to implement desktop virtual keyboards. + </longdescription> + <use> + <flag name="libcanberra">Enable support for <pkg>media-libs/libcanberra</pkg></flag> + <flag name="xtest">Enable support for <pkg>x11-libs/libXtst</pkg></flag> + </use> + <upstream> + <remote-id type="github">ueno/eekboard</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-libs/efl/Manifest b/dev-libs/efl/Manifest index 58ac87632f1e..e5e08562813a 100644 --- a/dev-libs/efl/Manifest +++ b/dev-libs/efl/Manifest @@ -1,5 +1,3 @@ -DIST efl-1.23.3.tar.xz 77485032 BLAKE2B e5f65080aec1d11a43f1e1786b8ac4e7be70ddd9614b53db822177c28ee73f9590f63d032df5ddf00db6224730b45b045d9f91da2287a4dec7589e902cbcde28 SHA512 47ad067c43d39b534834195f89a745c4a47d867f33aaa68c28c6dccd147379e9bc2416bd68878cc16585f8cb60e926a7df62102658b205756c01985f37f0d297 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.3.ebuild 7104 BLAKE2B e26fcbf92d70451d377b8c366a244e7a50cf9eba9d6efdbd07b6dab4448959ce2e0302c40f1e1b5fd9b5953b19b95c4f06ec13bd09200f1dd1787b9212f6379d SHA512 e848646fa1712b4ea7893d825947f9cd06c73b0c3d855762af9357b544c0cda1f7b11fb852563d66ca66ded31be5125b7df2364922f9d771a22c2f192124cf65 -MISC metadata.xml 1987 BLAKE2B 86cb4cbb5deb978955e4008c3d7ae92430daa8739d75c9515c3c33339b05b545b5af8b8bdce0dc4ca2dffe17097ca8a04104e1ed3fe99a548c625416d467d2f2 SHA512 b543190ca4b753101085f3964608b06ee489f6e0d268e84866162370b029cc8433e2925ef92104a38a57a3c0fb491150f6376cdf996a45cdb0848287b8aaf58f +EBUILD efl-1.24.3.ebuild 7102 BLAKE2B 363fdf6553532a47fc4d6b95c8d28a32fbd53e8b8b632567a690e96b59ecbd2fce9e0808c88b6041a3e537a57203c4b964786a708b21b401072c31f592d3c2ba SHA512 f423decb04ef2dd4ac64f127ab9f4ebaed1030aa71803aa2e7579edd8662db51322d0c5239572803713bd1276d56a01b6c2ce3efa1c5a5abaf22e1f39d9b6ef7 +MISC metadata.xml 1848 BLAKE2B cfa648855219a0f184807fd42c45d17952c60fb4821610c78d7eb3bc67b54301f9d6f3c6c28d84cbfa7232858a2c3cbe980f8d96d27394692c9d5dd955fced27 SHA512 a97532e124d899699418ac48cdeadda93f2cd2c0d3bf989ad17fd0acc3ab6050e2fc2b06d9866f97fe85f821bc52918047c230f400f8b8e6acce3fd84e83644d diff --git a/dev-libs/efl/efl-1.23.3.ebuild b/dev-libs/efl/efl-1.23.3.ebuild deleted file mode 100644 index 65c7e876c084..000000000000 --- a/dev-libs/efl/efl-1.23.3.ebuild +++ /dev/null @@ -1,297 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic meson xdg-utils - -DESCRIPTION="Enlightenment Foundation Libraries all-in-one package" -HOMEPAGE="https://www.enlightenment.org" -SRC_URI="https://download.enlightenment.org/rel/libs/${PN}/${P}.tar.xz" - -LICENSE="BSD-2 GPL-2 LGPL-2.1 ZLIB" -SLOT="0" -KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86" -IUSE="+X bmp connman 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 static-libs +svg +system-lz4 systemd - tga tgv tiff tslib unwind v4l vlc vnc wayland webp xcf xim xine xpm - xpresent zeroconf" - -REQUIRED_USE=" - ?? ( elogind systemd ) - ?? ( gles2 opengl ) - ^^ ( lua luajit ) - ssl - drm? ( gles2 ) - examples? ( eet svg ) - gles2? ( || ( wayland X ) ) - pulseaudio? ( sound ) - wayland? ( gles2 !opengl ) - xim? ( X ) - xpresent? ( X ) -" - -# Requires everything to be enabled unconditionally. -RESTRICT="test" - -RDEPEND=" - dev-libs/check - net-misc/curl - media-libs/giflib:= - media-libs/libpng:0= - sys-apps/dbus - sys-libs/zlib - virtual/jpeg:0= - X? ( - media-libs/freetype - x11-libs/libX11 - x11-libs/libXcomposite - x11-libs/libXcursor - x11-libs/libXdamage - x11-libs/libXdmcp - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libXi - x11-libs/libXinerama - x11-libs/libXrandr - x11-libs/libXrender - x11-libs/libXtst - x11-libs/libXScrnSaver - wayland? ( x11-libs/libxkbcommon[X] ) - ) - connman? ( net-misc/connman ) - drm? ( - dev-libs/libinput - dev-libs/wayland - media-libs/mesa[gbm] - x11-libs/libdrm - x11-libs/libxkbcommon - ) - elogind? ( - sys-auth/elogind - virtual/libudev - ) - fontconfig? ( media-libs/fontconfig ) - fribidi? ( dev-libs/fribidi ) - gles2? ( - media-libs/mesa[egl,gles2] - virtual/opengl - ) - glib? ( dev-libs/glib:2 ) - gstreamer? ( - media-libs/gstreamer:1.0 - media-libs/gst-plugins-base:1.0 - ) - hyphen? ( dev-libs/hyphen ) - ibus? ( app-i18n/ibus ) - jpeg2k? ( media-libs/openjpeg:= ) - json? ( >=media-libs/rlottie-0.0.1_pre20191101 ) - lua? ( dev-lang/lua:* ) - luajit? ( dev-lang/luajit:* ) - mono? ( dev-lang/mono ) - opengl? ( virtual/opengl ) - pdf? ( app-text/poppler:=[cxx] ) - physics? ( sci-physics/bullet:= ) - postscript? ( app-text/libspectre ) - pulseaudio? ( media-sound/pulseaudio ) - raw? ( media-libs/libraw:= ) - scim? ( app-i18n/scim ) - sdl? ( media-libs/libsdl2 ) - sound? ( media-libs/libsndfile ) - ssl? ( - gnutls? ( net-libs/gnutls:= ) - !gnutls? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:= ) - ) - ) - svg? ( gnome-base/librsvg ) - system-lz4? ( app-arch/lz4 ) - systemd? ( sys-apps/systemd:= ) - tiff? ( media-libs/tiff:0= ) - tslib? ( x11-libs/tslib:= ) - unwind? ( sys-libs/libunwind ) - v4l? ( media-libs/libv4l ) - vlc? ( media-video/vlc ) - vnc? ( net-libs/libvncserver ) - wayland? ( - dev-libs/wayland - media-libs/mesa[gles2,wayland] - x11-libs/libxkbcommon - ) - webp? ( media-libs/libwebp:= ) - xine? ( media-libs/xine-lib ) - xpm? ( x11-libs/libXpm ) - xpresent? ( x11-libs/libXpresent ) - zeroconf? ( net-dns/avahi ) -" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig - doc? ( app-doc/doxygen ) - nls? ( sys-devel/gettext )" - -src_configure() { - local emesonargs=( - --buildtype=release - - -D buffer=false - -D cocoa=false - -D drm-deprecated=false - -D g-mainloop=false - -D install-eo-files=false - -D mono-beta=false - -D pixman=false - -D wl-deprecated=false - -D xgesture=false - - -D edje-sound-and-video=true - -D eeze=true - -D libmount=true - -D native-arch-optimization=true - -D xinput2=true - -D xinput22=true - - $(meson_use X x11) - $(meson_use debug debug-threads) - $(meson_use drm) - $(meson_use elogind) - $(meson_use examples build-examples) - $(meson_use fbcon fb) - $(meson_use fontconfig) - $(meson_use fribidi) - $(meson_use glib) - $(meson_use gstreamer) - $(meson_use harfbuzz) - $(meson_use hyphen) - $(meson_use luajit elua) - $(meson_use nls) - $(meson_use physics) - $(meson_use pulseaudio) - $(meson_use sdl) - $(meson_use sound audio) - $(meson_use systemd) - $(meson_use tslib) - $(meson_use v4l v4l2) - $(meson_use vnc vnc-server) - $(meson_use wayland wl) - $(meson_use xpresent) - $(meson_use zeroconf avahi) - - $(meson_use !system-lz4 embedded-lz4) - ) - - if use opengl; then - emesonargs+=( -D opengl=full ) - elif use gles2; then - emesonargs+=( -D opengl=es-egl ) - else - emesonargs+=( -D opengl=none ) - fi - - if use gnutls; then - emesonargs+=( -D crypto=gnutls ) - else - emesonargs+=( -D crypto=openssl ) - fi - - if use connman; then - emesonargs+=( -D network-backend=connman ) - else - emesonargs+=( -D network-backend=none ) - fi - - if use static-libs; then - emesonargs+=( -D evas-modules=static ) - else - emesonargs+=( -D evas-modules=shared ) - fi - - local disabledEvasLoaders="" - ! use bmp && disabledEvasLoaders+="bmp,wbmp," - ! use dds && disabledEvasLoaders+="dds," - ! use eet && disabledEvasLoaders+="eet," - ! use gstreamer && disabledEvasLoaders+="gst," - ! use ico && disabledEvasLoaders+="ico," - ! use jpeg2k && disabledEvasLoaders+="jp2k," - ! use json && disabledEvasLoaders+="json," - ! use pdf && disabledEvasLoaders+="pdf," - ! use pmaps && disabledEvasLoaders+="pmaps," - ! use postscript && disabledEvasLoaders+="ps," - ! use psd && disabledEvasLoaders+="psd," - ! use raw && disabledEvasLoaders+="raw," - ! use svg && disabledEvasLoaders+="rsvg,svg," - ! use tga && disabledEvasLoaders+="tga," - ! use tgv && disabledEvasLoaders+="tgv," - ! use tiff && disabledEvasLoaders+="tiff," - ! use webp && disabledEvasLoaders+="webp," - ! use xcf && disabledEvasLoaders+="xcf," - ! use xpm && disabledEvasLoaders+="xpm," - [[ ! -z "$disabledEvasLoaders" ]] && disabledEvasLoaders=${disabledEvasLoaders::-1} - emesonargs+=( -D evas-loaders-disabler="${disabledEvasLoaders}" ) - - local disabledImfLoaders="" - ! use ibus && disabledImfLoaders+="ibus," - ! use scim && disabledImfLoaders+="scim," - ! use xim && disabledImfLoaders+="xim," - [[ ! -z "$disabledImfLoaders" ]] && disabledImfLoaders=${disabledImfLoaders::-1} - emesonargs+=( -D ecore-imf-loaders-disabler="${disabledImfLoaders}" ) - - local disabledEmotionLoaders="gstreamer," - ! use gstreamer && disabledEmotionLoaders+="gstreamer1," - ! use vlc && disabledEmotionLoaders+="libvlc," - ! use xine && disabledEmotionLoaders+="xine," - disabledEmotionLoaders=${disabledEmotionLoaders::-1} - emesonargs+=( -D emotion-loaders-disabler="${disabledEmotionLoaders}" ) - - local disabledGenericEmotionLoaders="" - ! use vlc && disabledGenericEmotionLoaders+="vlc" - emesonargs+=( -D emotion-generic-loaders-disabler="${disabledGenericEmotionLoaders}" ) - - local bindingsList="cxx," - use luajit && bindingsList+="luajit," - use mono && bindingsList+="mono," - [[ ! -z "$bindingsList" ]] && bindingsList=${bindingsList::-1} - emesonargs+=( -D bindings="${bindingsList}" ) - - local luaChoice="" - if use luajit; then - luaChoice+="luajit" - else - luaChoice+="lua" - fi - emesonargs+=( -D lua-interpreter="${luaChoice}" ) - - append-cflags -fcommon - - meson_src_configure -} - -src_compile() { - meson_src_compile - - if use doc; then - cd doc/ || die "Failed to switch into doc/ dir." - doxygen . || die "Doxygen failed to run." - fi -} - -src_install() { - use doc && local HTML_DOCS=( "${S}"/doc/html/. ) - meson_src_install - - if use examples; then - dodoc -r "${BUILD_DIR}"/src/examples/ - fi -} - -pkg_postinst() { - xdg_icon_cache_update - xdg_mimeinfo_database_update -} - -pkg_postrm() { - xdg_icon_cache_update - xdg_mimeinfo_database_update -} diff --git a/dev-libs/efl/efl-1.24.3.ebuild b/dev-libs/efl/efl-1.24.3.ebuild index ecf714f1e635..b07e53a6ee40 100644 --- a/dev-libs/efl/efl-1.24.3.ebuild +++ b/dev-libs/efl/efl-1.24.3.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://download.enlightenment.org/rel/libs/${PN}/${P}.tar.xz" LICENSE="BSD-2 GPL-2 LGPL-2.1 ZLIB" SLOT="0" -KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86" +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-only gnutls glib +gstreamer harfbuzz hyphen ibus ico libressl lua +luajit jpeg2k json nls mono opengl +pdf diff --git a/dev-libs/efl/metadata.xml b/dev-libs/efl/metadata.xml index 4d01748725e9..de7dc1cf76d8 100644 --- a/dev-libs/efl/metadata.xml +++ b/dev-libs/efl/metadata.xml @@ -11,7 +11,6 @@ <flag name="drm">Enable DRM engine</flag> <flag name="eet">Enable Eet image loader</flag> <flag name="fribidi">Enable bidirectional text support</flag> - <flag name="gles2">Enable the OpenGL ES GL implementation</flag> <flag name="glib">Enable <pkg>dev-libs/glib</pkg> support</flag> <flag name="harfbuzz">Enable complex text shaping and layout support</flag> <flag name="hyphen">Enable text hyphenation support</flag> @@ -29,7 +28,6 @@ <flag name="tgv">Enable Tgv image loader</flag> <flag name="tslib">Enable <pkg>x11-libs/tslib</pkg> for touchscreen events</flag> <flag name="unwind">Enable debug support via <pkg>sys-libs/libunwind</pkg></flag> - <flag name="vlc">Enable <pkg>media-video/vlc</pkg> support</flag> <flag name="xcf">Enable XCF image loader</flag> <flag name="xim">Enable X Input Method</flag> <flag name="xpresent">Enable <pkg>x11-libs/libXpresent</pkg> support</flag> diff --git a/dev-libs/elfutils/Manifest b/dev-libs/elfutils/Manifest index 077396917b91..ad4bb3dcdf24 100644 --- a/dev-libs/elfutils/Manifest +++ b/dev-libs/elfutils/Manifest @@ -2,13 +2,10 @@ AUX elfutils-0.118-PaX-support.patch 962 BLAKE2B f631b1dcf20cf257efd83f24cf53b33 AUX elfutils-0.175-disable-biarch-test-PR24158.patch 307 BLAKE2B 9cfcd2c9ef972b16fdf6bc203ed2cde70b0da80d982dc3493c993532492cdb8f597b66fd38ebedf7517403096c1704d77f7541972d875af2b952cad3586751bb SHA512 d3263c42b1638a416e95c2b8e68b15a9723e748490c8eca727da94bf7bb3dd8389222dd01bf69612ba45a20114ee1427d77935c41436d1ca9180fcfd71d3cdfe AUX elfutils-0.177-disable-large.patch 383 BLAKE2B ce5a90495ca0eac5a74d7e3f52b9f55e0611fe83782374d5201b984e85e7c27897d0d056f53af40ebb383e8cbe315a57adce2af378348ee1a573cfeb005e7a43 SHA512 2660ee456b62d6b1ed72ede92d8b00e9d1cd4b0a5778a80bfbdc3139e5527758591cdb05110b39a5c5811f60e2223cc8c83a488ac055a554f5b3c71fc5980acb AUX elfutils-0.179-CC-in-tests.patch 1506 BLAKE2B d2eb6acae1af4d4f370e8653ea65a8ae834bfc531c8cf77d3571e940b29ce08be45e93ff565b69eb43a913ace3e6537bba3358ae32ffa81d727d5b94f9ab371d SHA512 bf1a91219006813a5b8d63cc8735b0956187c097cbdae015a984a6c9fe11343d45315a8df779aad37b7c71c403f13351ebd9a08de06243437cffd8903c5aa7a7 -AUX elfutils-0.179-PaX-support.patch 1071 BLAKE2B 5b47db44011092b6fc9cfef342b87bea02c78ee247a1acfca69e0414a741875ba87a6fba3d370cb20541f9d8950552b31ea6a6e9736c6b5da285d45a2bc81d1d SHA512 9d21b955532fe5261fb314283d723f04ff4a04cdd31598bbc1904f9c7e833b8d62cd19b1560882c66900c9adeb24ec1b6a173de94ac1fcbce25b67c8db8006a2 AUX elfutils-0.180-PaX-support.patch 1058 BLAKE2B 9d7980eedf6250b848923eddb86d918ac983b348f77b3816ba77e1a663cc637ec02670e062b005aa010fa50f45fb953b1f2ef033bca6381773793231eb3cef06 SHA512 1bfb390ff4fb9ba2cbaf677bb4cd0d3ab3a27e465629be0dcc7b37f14dfe6c876069b598e29e9f3aa0c345b08c62895e68ce557237d18239c7505b8ea51c9ebd AUX elfutils-0.180-readelf.patch 1210 BLAKE2B 68003ea8ad853f5c548c2e3f2005f5b258e5bfa52710522afa79fbfec9c45c3d91bc2089b002c3799f92a0ef7748ff2a2cee5c1886c838da89ffabd3b9246b02 SHA512 cac478c4b1e258830fc33b6c9c5cf265bf216026f5cd2d74ba2f331db76f8bdad93aa3b3dba1a0a57263d06c87a839376a59c5519359d781a6de0cc418ef1f0c DIST elfutils-0.177.tar.bz2 8852413 BLAKE2B 03f432342651f7646d73b7847325bd14b722ce34d85df01b1ad072b916af9b9da2d0d119cd24e952073bd584ec76b027ba9b6c7d45fb057372b3e700b1f5741a SHA512 2779987463a22ed220759e25a09c9a1eb84c0f36db37675136e59aa55c7f8f90b7a7d34ffc4e6a4291d7fa73692a1bd1a303a74270b11d1623b4f9868d19498f -DIST elfutils-0.179.tar.bz2 9057637 BLAKE2B b34f5af6d2a6613622f4d5da78b9ae10e60800fc91cb4607115fcaaf90c1c544460fb02e164f87e52951a446d6479909bbf3aa02b7db78b26af7863290de8848 SHA512 ff2d96ad1db08e3a2ddaa60bd5a05e9b61ffa71d646f889cebb6bef51322e874930809c6dd0a257ced8c6e8de4b59ecf13ca6741dc68f9400293208278a0c052 DIST elfutils-0.180.tar.bz2 9079640 BLAKE2B bd7863b82a71d2932a23c9d125d5eb6485977a3256a8a0b25980183d33f7345c3d9fae78277de5c955eb0ceeb955f8fa71d209f4f39bcf6dd49e46a8bbd7efcf SHA512 62e96035ccfe8928baca2285decbe8b8703a2daa956df81ece18fecf643272fb68955806b3e807a514141a7a9bf44520bf09461672aa580bd6807485fb604d25 EBUILD elfutils-0.177.ebuild 2156 BLAKE2B d2455d04f65331456093f5a43b9e1ec06c0ae2ee2ec8073e6db3a1451aa1e6a3ed43834c181fbc7c742d77638ea3746d9f260e8d3ba0924f2f1edc56b05c6b42 SHA512 01011fc1c148a173ad401ecb0d067e9f051d0a37e9c1bc965f7bc6b7d07ca5b69b811ddb7af613e2e95eed768adbca4ff9e16ffaf48bf513017898cb79985fe6 -EBUILD elfutils-0.179.ebuild 2374 BLAKE2B 828ea4eb3f9f1890845e27b2fec330454945b23c012350ff316ff7dc75874a33f487c46c74ac44c0ea0fe627a002f0f84cf1d32782ecb4b6fe6520619c5da2b1 SHA512 18554ca09a02faa2327256586cfec79f293ef766d0a5826ab80b05a4bbf5bf193ded1faf418a6ee923e16de0b32f0132ec8c91d94cdb2e8e2e7c7dc4d59b3ca0 -EBUILD elfutils-0.180.ebuild 2415 BLAKE2B 36ffa0112e7a94ee612414a107de9e762b800679da8ca854f3e44ce209dcb43349de6745fdda643bcc78f6b4ff89a9db5d91f439653fd7cb52621a25cf575f41 SHA512 bdda45f1343a8f0bc5cb382177347796522f45bdd60fe4f3c97d3e2d44eb8d38d6f2fd176c32b503d4175f6e63c37a514b355bc454f51d385bc5f845d0b6fbe3 +EBUILD elfutils-0.180.ebuild 2423 BLAKE2B a08d3dc7956d58df7c6bd10f5ba479063b9121925ec91de1b19c215b84053929627f9d73c796c9525d496f7e2a0875a91d84792b42fcf70938d68c6a34183527 SHA512 cc800030fdadffab722b08485055bdc8973bc9cfad67841fb7020707abfb4a44223354628358da645e2f9f61effa0d2b065e9db9c021eaaf8d6c4afd617e056a MISC metadata.xml 729 BLAKE2B 7fb60c690ef99ef62b4cd4fbed802a48141b90e295f84fdad09cf18d061dd94a63086be119d733249b91fca67a1588bcea9ee442e3dd142921cb9c163d65a726 SHA512 2e5c223aad3d51f6ae770ae7feacd3731821c9de0b68f6ad2d89a4c7c8360ba6decbd6d73416648186f19d19b4aa6516302cba6554c9f4955024a19c082d0f85 diff --git a/dev-libs/elfutils/elfutils-0.179.ebuild b/dev-libs/elfutils/elfutils-0.179.ebuild deleted file mode 100644 index 70c6f757d6a7..000000000000 --- a/dev-libs/elfutils/elfutils-0.179.ebuild +++ /dev/null @@ -1,85 +0,0 @@ -# Copyright 2003-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic multilib-minimal - -DESCRIPTION="Libraries/utilities to handle ELF objects (drop in replacement for libelf)" -HOMEPAGE="http://elfutils.org/" -SRC_URI="https://sourceware.org/elfutils/ftp/${PV}/${P}.tar.bz2" - -LICENSE="|| ( GPL-2+ LGPL-3+ ) utils? ( GPL-3+ )" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" -IUSE="bzip2 lzma nls static-libs test +threads +utils valgrind" - -RDEPEND=">=sys-libs/zlib-1.2.8-r1[static-libs?,${MULTILIB_USEDEP}] - bzip2? ( >=app-arch/bzip2-1.0.6-r4[static-libs?,${MULTILIB_USEDEP}] ) - lzma? ( >=app-arch/xz-utils-5.0.5-r1[static-libs?,${MULTILIB_USEDEP}] ) - !dev-libs/libelf" -DEPEND="${RDEPEND} - valgrind? ( dev-util/valgrind ) -" -BDEPEND="nls? ( sys-devel/gettext ) - >=sys-devel/flex-2.5.4a - sys-devel/m4" - -RESTRICT="!test? ( test )" - -PATCHES=( - "${FILESDIR}"/${PN}-0.175-disable-biarch-test-PR24158.patch - "${FILESDIR}"/${PN}-0.177-disable-large.patch - "${FILESDIR}"/${PN}-0.179-PaX-support.patch - "${FILESDIR}"/${PN}-0.179-CC-in-tests.patch -) - -src_prepare() { - default - - if ! use static-libs; then - sed -i -e '/^lib_LIBRARIES/s:=.*:=:' -e '/^%.os/s:%.o$::' lib{asm,dw,elf}/Makefile.in || die - fi - # https://sourceware.org/PR23914 - sed -i 's:-Werror::' */Makefile.in || die -} - -src_configure() { - use test && append-flags -g #407135 - - # Symbol aliases are implemented as asm statements. - # Will require porting: https://gcc.gnu.org/PR48200 - filter-flags '-flto*' - - multilib-minimal_src_configure -} - -multilib_src_configure() { - ECONF_SOURCE="${S}" econf \ - $(use_enable nls) \ - $(use_enable threads thread-safety) \ - $(use_enable valgrind) \ - --disable-debuginfod \ - --program-prefix="eu-" \ - --with-zlib \ - $(use_with bzip2 bzlib) \ - $(use_with lzma) -} - -multilib_src_test() { - # CC is a workaround for tests using ${CC-gcc} - env LD_LIBRARY_PATH="${BUILD_DIR}/libelf:${BUILD_DIR}/libebl:${BUILD_DIR}/libdw:${BUILD_DIR}/libasm" \ - LC_ALL="C" \ - CC="$(gc-getCC)" \ - emake check VERBOSE=1 -} - -multilib_src_install_all() { - einstalldocs - dodoc NOTES - # These build quick, and are needed for most tests, so don't - # disable their building when the USE flag is disabled. - if ! use utils; then - rm -rf "${ED}"/usr/bin || die - fi -} diff --git a/dev-libs/elfutils/elfutils-0.180.ebuild b/dev-libs/elfutils/elfutils-0.180.ebuild index 086304510f1c..294f12aade26 100644 --- a/dev-libs/elfutils/elfutils-0.180.ebuild +++ b/dev-libs/elfutils/elfutils-0.180.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit flag-o-matic multilib-minimal +inherit flag-o-matic multilib-minimal toolchain-funcs DESCRIPTION="Libraries/utilities to handle ELF objects (drop in replacement for libelf)" HOMEPAGE="http://elfutils.org/" @@ -11,7 +11,7 @@ SRC_URI="https://sourceware.org/elfutils/ftp/${PV}/${P}.tar.bz2" LICENSE="|| ( GPL-2+ LGPL-3+ ) utils? ( GPL-3+ )" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sparc x86 ~amd64-linux ~x86-linux" IUSE="bzip2 lzma nls static-libs test +threads +utils valgrind" RDEPEND=">=sys-libs/zlib-1.2.8-r1[static-libs?,${MULTILIB_USEDEP}] @@ -71,7 +71,7 @@ multilib_src_test() { # CC is a workaround for tests using ${CC-gcc} env LD_LIBRARY_PATH="${BUILD_DIR}/libelf:${BUILD_DIR}/libebl:${BUILD_DIR}/libdw:${BUILD_DIR}/libasm" \ LC_ALL="C" \ - CC="$(gc-getCC)" \ + CC="$(tc-getCC)" \ emake check VERBOSE=1 } diff --git a/dev-libs/elfutils/files/elfutils-0.179-PaX-support.patch b/dev-libs/elfutils/files/elfutils-0.179-PaX-support.patch deleted file mode 100644 index 5246d1ad9fc6..000000000000 --- a/dev-libs/elfutils/files/elfutils-0.179-PaX-support.patch +++ /dev/null @@ -1,26 +0,0 @@ -Add support for PaX ELF markings - -Patch by Kevin F. Quinn <kevquinn@gentoo.org> - -http://bugs.gentoo.org/115100 - ---- a/libelf/elf.h -+++ b/libelf/elf.h -@@ -721,6 +721,7 @@ typedef struct - #define PT_GNU_EH_FRAME 0x6474e550 /* GCC .eh_frame_hdr segment */ - #define PT_GNU_STACK 0x6474e551 /* Indicates stack executability */ - #define PT_GNU_RELRO 0x6474e552 /* Read-only after relocation */ -+#define PT_PAX_FLAGS 0x65041580 /* Indicates PaX flag markings */ - #define PT_LOSUNW 0x6ffffffa - #define PT_SUNWBSS 0x6ffffffa /* Sun Specific segment */ - #define PT_SUNWSTACK 0x6ffffffb /* Stack segment */ ---- a/src/elflint.c -+++ b/src/elflint.c -@@ -4493,6 +4493,7 @@ only executables, shared objects, and core files can have program headers\n")); - - if (phdr->p_type >= PT_NUM && phdr->p_type != PT_GNU_EH_FRAME - && phdr->p_type != PT_GNU_STACK && phdr->p_type != PT_GNU_RELRO -+ && phdr->p_type != PT_PAX_FLAGS - && phdr->p_type != PT_GNU_PROPERTY - /* Check for a known machine-specific type. */ - && ebl_segment_type_name (ebl, phdr->p_type, NULL, 0) == NULL) diff --git a/dev-libs/ell/Manifest b/dev-libs/ell/Manifest index 70924b0996c5..f24ba0f7fbac 100644 --- a/dev-libs/ell/Manifest +++ b/dev-libs/ell/Manifest @@ -3,6 +3,6 @@ DIST ell-0.31.tar.xz 478860 BLAKE2B f8f8d109605bf62396da001bd3d9b48fd6b7a6fc94ab 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-0.32.ebuild 1253 BLAKE2B aff5fe1be8eba5b17f2d9f7b69d415a7a6b7137d6a4ebaad0791652fb3387c6ac4a08790e9bdd8a38b481a04f7645fc23b55af996640910ee4be6e1920b0c0a6 SHA512 a46926a40af6a8e0910c379e69ec7893664acfff13f21a9a9f4e1db141eb6d5dc0ac500e2201735ab464cfaf60a9632fc11ae9a0f8bc7bb4dbf542157d4f1fb0 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 index 6c1b04339772..a347ffb566c2 100644 --- a/dev-libs/ell/ell-0.32.ebuild +++ b/dev-libs/ell/ell-0.32.ebuild @@ -12,7 +12,7 @@ if [[ "${PV}" == *9999 ]] ; then 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" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86" fi LICENSE="LGPL-2.1" SLOT="0" diff --git a/dev-libs/folks/Manifest b/dev-libs/folks/Manifest index ac7d6f1e6f78..971c8f29778f 100644 --- a/dev-libs/folks/Manifest +++ b/dev-libs/folks/Manifest @@ -1,4 +1,7 @@ AUX 0.13.1-meson-0.53-compat.patch 908 BLAKE2B 2fb471f9f500623565491df116099198be990c4ccf9bc308a2fd0fc2676b81c9f1ae5aa9a6168703066a35a0c3d87d480610d81333da97c1363d87265ccbf998 SHA512 2e4ee26a529d2a854027abb9d0a1414d1059f55fb0ac9ed5edde36049819bcc77f1e971b9b8a98e56db6ab18e6704591f9ea906ecd12f9bbff17816d40f3bc5d +AUX 0.14.0-conditional-tests.patch 2279 BLAKE2B 2b04f6cc1741de4d0efdaf2cef756c5879fe2d9ec988b8612658645c2fc46ce1bc5c96d3efb532e98c5e27a705d18d143e62e1a99a6505fa1f87162725f4ebe4 SHA512 b1742262a2b7fbc95b7417170640117578e77ad1498aff93ae6bd464952bd2d8ca773f3f0987378ccb743144a160c8bcac1a312eb796928f609745a567e98c6a DIST folks-0.13.1.tar.xz 515584 BLAKE2B fe4e368e60dd41a72f449f130993eb7b8792b2a38218ff7117a8e5ec192d53d2b8f5ab09a2318267cf2fd7a717048b8715289b2f411c59846c6c98235ec32149 SHA512 b134172077bed1655cd7f24b1402ed347d405b22114c33d6638040a5e475632ea33cde898a08fc143eaefc7057d4b6dccceac7e797e1976fdf88c58764818afe +DIST folks-0.14.0.tar.xz 520924 BLAKE2B 3154e0a7e6fe8c60aa81f4772af2b9d09b88785187c87e93869f668af46549383866cfa2e50d3d29009d0acb77c26cd852c7c9a3c6188ff3e5ef53c06b11b781 SHA512 94dc025668ac34df203ea351430bf82dddb4e275d936e2b959a1b9a4cf0fff0218a4baa7d3a89c152a2cb21a94250d731c8e7470d50ac4b658fbe1448974a69e EBUILD folks-0.13.1.ebuild 2127 BLAKE2B fbd9a7223cb54a3b7131dd65644d4b3232ff6f5746c0dcb9cab470e82180844b45b0b3a8c34f5949863dd7e728b2a1a3f8a75ba23e9f1c66fe480beb900bafd5 SHA512 78ec67564db62ff9c97326a0cb971b7240eb3bc9e1c28e07b10d60acb5a030a595abd093fef877fd68915a780b5a6f4ec9fe45c25eca793122e95f72cdc06ca9 +EBUILD folks-0.14.0.ebuild 2580 BLAKE2B 96d5ef5528f8727adcd8c3416366c89f2ce063ee3dd9b0d486b3daf43a6806700b648b0ba5fbc3341c7bb04f7c1841658f1419c2053dea15d88dcf9da5d4190b SHA512 b3efc52bf62490d9561398274ebdfd760338ce9d3bcc2775baf65154d05986ca478f3592ed4c342b244dc1be6e6e18aa64bb4bd6e28f7db6e52c58f37be30e76 MISC metadata.xml 477 BLAKE2B 59650bcd983e214f924509b128b6bfd45cd015bd3f98417716d366f9a05d932b0feacff410381db14afa18da12fcfaf09c0da2fb2f122e110a6a0858c6f2bd6d SHA512 eb009ee1180b529978596f9a838454f9226906ebd7f0218e29545326222cf04b08efad06e88bd6ab66fc7486022e4f27bb234f4709ac499f1b7df77276709423 diff --git a/dev-libs/folks/files/0.14.0-conditional-tests.patch b/dev-libs/folks/files/0.14.0-conditional-tests.patch new file mode 100644 index 000000000000..2c64ecf6610f --- /dev/null +++ b/dev-libs/folks/files/0.14.0-conditional-tests.patch @@ -0,0 +1,72 @@ +From b9e27e284c481e876370e2eb73f95d0953fb9cda Mon Sep 17 00:00:00 2001 +From: Mart Raudsepp <leio@gentoo.org> +Date: Sun, 23 Aug 2020 11:49:44 +0300 +Subject: [PATCH] meson: Allow disabling build of tests + +Fixes https://gitlab.gnome.org/GNOME/folks/-/issues/121 +--- + meson.build | 21 +++++++++++++-------- + meson_options.txt | 1 + + 2 files changed, 14 insertions(+), 8 deletions(-) + +diff --git a/meson.build b/meson.build +index 53d7dcc6..123edb5c 100644 +--- a/meson.build ++++ b/meson.build +@@ -54,6 +54,7 @@ folks_backend_dir = get_option('libdir') / 'folks' / '@0@'.format(folks_module_v + bluez_backend_enabled = get_option('bluez_backend') + docs_enabled = get_option('docs') + eds_backend_enabled = get_option('eds_backend') ++tests_enabled = get_option('tests') + installed_tests_enabled = get_option('installed_tests') + ofono_backend_enabled = get_option('ofono_backend') + telepathy_backend_enabled = get_option('telepathy_backend') +@@ -130,13 +131,15 @@ endif + + if bluez_backend_enabled + libebook_dep = dependency('libebook-1.2', version: '>=' + min_eds_version) +- # Needed for the BlueZ tests +- pymod = import('python') +- py_installation = pymod.find_installation('python3', +- modules: [ +- 'dbusmock', +- ], +- ) ++ if tests_enabled ++ # Needed for the BlueZ tests ++ pymod = import('python') ++ py_installation = pymod.find_installation('python3', ++ modules: [ ++ 'dbusmock', ++ ], ++ ) ++ endif + endif + + if import_tool_enabled +@@ -233,7 +236,9 @@ subdir('tools') + subdir('po') + + # Tests +-subdir('tests') ++if tests_enabled ++ subdir('tests') ++endif + + if docs_enabled + subdir('docs') +diff --git a/meson_options.txt b/meson_options.txt +index 43cd586a..62a9603c 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -11,6 +11,7 @@ option('inspect_tool', type: 'boolean', value: true, description: 'Enable buildi + # Profiling + option('profiling', type: 'boolean', value: false, description: 'Enable profiling code') + # Test options ++option('tests', type: 'boolean', value: true, description: 'Build tests programs') + option('installed_tests', type: 'boolean', value: false, description: 'Install test programs') + # Docs + option('docs', type: 'boolean', value: false, description: 'Enable documentation generation') +-- +2.20.1 + diff --git a/dev-libs/folks/folks-0.14.0.ebuild b/dev-libs/folks/folks-0.14.0.ebuild new file mode 100644 index 000000000000..3da8c1c10c3f --- /dev/null +++ b/dev-libs/folks/folks-0.14.0.ebuild @@ -0,0 +1,100 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +VALA_USE_DEPEND="vapigen" +VALA_MAX_API_VERSION="0.48" +PYTHON_COMPAT=( python3_{6,7,8} ) + +inherit gnome.org gnome2-utils meson python-any-r1 vala xdg + +DESCRIPTION="Library for aggregating people from multiple sources" +HOMEPAGE="https://wiki.gnome.org/Projects/Folks" + +LICENSE="LGPL-2.1+" +SLOT="0/25" # subslot = libfolks soname version +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-linux" + +IUSE="bluetooth eds +telepathy test tracker utils" +REQUIRED_USE="bluetooth? ( eds )" +RESTRICT="!test? ( test )" + +DEPEND=" + >=dev-libs/glib-2.44:2 + >=dev-libs/libgee-0.10:0.8[introspection] + >=dev-libs/gobject-introspection-1.54:= + telepathy? ( + >=net-libs/telepathy-glib-0.19.9 + dev-libs/dbus-glib + ) + tracker? ( app-misc/tracker:0/2.0 ) + eds? ( >=gnome-extra/evolution-data-server-3.33.2:= ) + dev-libs/libxml2:2 + utils? ( sys-libs/readline:0= ) +" +# telepathy-mission-control needed at runtime; it is used by the telepathy +# backend via telepathy-glib's AccountManager binding. +RDEPEND="${DEPEND} + bluetooth? ( >=net-wireless/bluez-5[obex] ) + telepathy? ( net-im/telepathy-mission-control ) +" +BDEPEND=" + >=dev-util/meson-0.49 + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig + $(vala_depend) + telepathy? ( net-libs/telepathy-glib[vala] ) + eds? ( gnome-extra/evolution-data-server[vala] ) + test? ( sys-apps/dbus + ${PYTHON_DEPS} + bluetooth? ( $(python_gen_any_dep 'dev-python/dbusmock[${PYTHON_USEDEP}]') ) + ) +" + +PATCHES=( + "${FILESDIR}"/${PV}-conditional-tests.patch +) + +python_check_deps() { + if use test && use bluetooth; then + has_version "dev-python/dbusmock[${PYTHON_USEDEP}]" + fi +} + +pkg_setup() { + use test && use bluetooth && python-any-r1_pkg_setup +} + +src_prepare() { + vala_src_prepare + xdg_src_prepare + # TODO: All tracker tests fail with SIGTRAP for some reason - investigate + sed -e '/subdir.*tracker/d' -i tests/meson.build || die +} + +src_configure() { + local emesonargs=( + $(meson_use bluetooth bluez_backend) + $(meson_use eds eds_backend) + $(meson_use eds ofono_backend) + $(meson_use telepathy telepathy_backend) + $(meson_use tracker tracker_backend) + -Dzeitgeist=false # last rited package + -Dimport_tool=true + $(meson_use utils inspect_tool) + $(meson_use test tests) + -Dinstalled_tests=false + -Ddocs=false # Needs find_program sedding to specific version; only dev docs, don't bother + ) + meson_src_configure +} + +pkg_postinst() { + xdg_pkg_postinst + gnome2_schemas_update +} + +pkg_postrm() { + xdg_pkg_postrm + gnome2_schemas_update +} diff --git a/dev-libs/freexl/Manifest b/dev-libs/freexl/Manifest index 100c022069e9..437c8e03a77a 100644 --- a/dev-libs/freexl/Manifest +++ b/dev-libs/freexl/Manifest @@ -1,7 +1,3 @@ -DIST freexl-1.0.1.tar.gz 933371 BLAKE2B ef89bc6779379ee7d8b7251faf1d965001aeaf3d9d1c69c27f4cc0c6c8c2af5e37c9291163c6f1dfee44fade0cec5db105f2f0fe45dd1804ee3a584c7f83f9d8 SHA512 a945d642a7ae9bc7c9dfc48a5bfd61da71290558bbcc73124bc09f08e8eae3bc96ab5e478a5b5205a897ad5d7783269a8232992d5068121436013c51524801c5 -DIST freexl-1.0.2.tar.gz 939064 BLAKE2B 7c1e4f089dfa499aa8966d6e8ddf1a534a8542e1a1f2108d3b13c75e809a3f710bc45a9b01b0eb584dfeba98aa0f416d99a14261c054811208ab46ec415e51f4 SHA512 554ad06905cbac3f88694e798369c1e1c4c64709eb4086b80eb3370dfd3bdc31d1b58441bcbf40b72700f177606ae900f2ab48ead873ac331c82edd718318354 DIST freexl-1.0.5.tar.gz 938994 BLAKE2B a3d2667271f6ab3de61a90f75ba8f7a645c5eddcd7f6d452fbbd59dc211c4676bdef7f7772235f60898de1e0a6d2e4951a3eadf77c4766bf938f5d8465f9de42 SHA512 86d742f58353be1f3ab683899a4d914845250b481acc078c769ef337d0a6ea24d25501a3e7c73b95904c6839ddd35f53e58ad4eee0c3b433caa84db0a8c6462b -EBUILD freexl-1.0.1.ebuild 568 BLAKE2B 368ba6e8f3c26a029bc110b0a37e971d3ecdac0fdd76a5d84d7e5b012ece4f83cdea87a4456cb111575a81bfa68cb2cf302045097b26f21ea6d18975b4f39e9c SHA512 cc20af12c264ddc631d7ff64e2b1f300b42561de263681904b5af97d401afa074b1e0ec9d58b314f957f8439d3e3a64807a20c667d632b76fb0722704dc09279 -EBUILD freexl-1.0.2.ebuild 579 BLAKE2B 6deb6bcdeb8ab8504820d6ba7588a59f298c73b7597d335ccde2e7a74ebf4800b51964f4cfc392ac4017a60e6b44a170683b67ddf0c802f8aba85fe9edb90c8d SHA512 ed90cea0f68d529f904d1fe7a6459bf1029b1eb216836ff858b136e03366418a45f1ce80c11783a5aeb604bbf7adf6f85fcdc0f7c6a7aa599abcede54d187803 -EBUILD freexl-1.0.5.ebuild 538 BLAKE2B 87712c5c29f5dd0fcfcb82d9abe466fe1b48f92d544b7079b853e085f11b11ca2a2ef116e30115b44d33ab9cde95c3bd02ea46e9056ae00375e65d90294abbaa SHA512 54181e4d28004878658f7ae0a0948cc164d0b0c4675b99b1baa347340e30cb7c191cacc2e4c2e3579d7eec82cf0dc38c5f3b54ac1c5a457c3f948be195895a9c +EBUILD freexl-1.0.5.ebuild 533 BLAKE2B 9ae371f5150b06bcb5c7fb1fb03386de20ae859f81d2cc7c0a6e1320a285a420e61bb7c58cd23bc0659dc090ebf2afd72f26b7720ec54a66a21c7b2ee0659bbf SHA512 f4ea7aa381e99476691ebb5385a93f6adf92905f8239e4c1289ff9d0ce1d375185eae8c43317f4086e84f349741c84a136c69f50c02d29a0c41a0ed3b945f3c5 MISC metadata.xml 269 BLAKE2B d4815f943b682786bd83cbc5840e99f36fc2f1bf175394ef9389228bfa8bd22b1bfbbf763eb9c396338b72b7927b431e73598bb67eaadf1d437c4afa5877c189 SHA512 9877d09d42c801d752617b41c7fb790db8e10c033c02ee9fe9a04fa1c6a8ea06d3baeb4f81d041b57e883d5d9dadb429289faae90d0293c62334ba35549e0276 diff --git a/dev-libs/freexl/freexl-1.0.1.ebuild b/dev-libs/freexl/freexl-1.0.1.ebuild deleted file mode 100644 index 89805bc14856..000000000000 --- a/dev-libs/freexl/freexl-1.0.1.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils ltprune - -DESCRIPTION="Simple XLS data extraction library" -HOMEPAGE="https://www.gaia-gis.it/fossil/freexl/index" -SRC_URI="https://www.gaia-gis.it/gaia-sins/${PN}-sources/${P}.tar.gz" - -LICENSE="MPL-1.1" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc ppc64 x86" -IUSE="static-libs" - -DEPEND="virtual/libiconv" -RDEPEND="${DEPEND}" - -src_configure() { - econf \ - $(use_enable static-libs static) -} - -src_install() { - default - - prune_libtool_files --all -} diff --git a/dev-libs/freexl/freexl-1.0.2.ebuild b/dev-libs/freexl/freexl-1.0.2.ebuild deleted file mode 100644 index bb3b445b6e9f..000000000000 --- a/dev-libs/freexl/freexl-1.0.2.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils ltprune - -DESCRIPTION="Simple XLS data extraction library" -HOMEPAGE="https://www.gaia-gis.it/fossil/freexl/index" -SRC_URI="https://www.gaia-gis.it/gaia-sins/${PN}-sources/${P}.tar.gz" - -LICENSE="MPL-1.1" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86" -IUSE="static-libs" - -DEPEND="virtual/libiconv" -RDEPEND="${DEPEND}" - -src_configure() { - econf \ - $(use_enable static-libs static) -} - -src_install() { - default - - prune_libtool_files --all -} diff --git a/dev-libs/freexl/freexl-1.0.5.ebuild b/dev-libs/freexl/freexl-1.0.5.ebuild index 585d307da266..86e702667c81 100644 --- a/dev-libs/freexl/freexl-1.0.5.ebuild +++ b/dev-libs/freexl/freexl-1.0.5.ebuild @@ -9,7 +9,7 @@ SRC_URI="https://www.gaia-gis.it/gaia-sins/${PN}-sources/${P}.tar.gz" LICENSE="MPL-1.1" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86" +KEYWORDS="amd64 ~arm arm64 ~ia64 ppc ppc64 x86" DEPEND="virtual/libiconv" RDEPEND="${DEPEND}" diff --git a/dev-libs/gdl/Manifest b/dev-libs/gdl/Manifest index 1872c3ddedd7..56b480cedf01 100644 --- a/dev-libs/gdl/Manifest +++ b/dev-libs/gdl/Manifest @@ -1,3 +1,5 @@ DIST gdl-3.28.0.tar.xz 541252 BLAKE2B 7254a9e15e9e79229c85b12c02ff5307bf99569428b13629ac8b3a5e79383f14a248d6e74f139e44145cd1a2825a2d10859c922a07a22fe1243edfafdb01514b SHA512 d6a697b8cd098abfcb560d8b6c8a326b05f6f22211a3bc92ea458d643170abc514acd4105e372fb61777d2a5dd09709d7e3d6d3ad75215fffdf2809b3df3c471 -EBUILD gdl-3.28.0.ebuild 723 BLAKE2B 1cfb1a5d4f44ff5541846a42626f5bbebd03d8090533d105d42016c469fc1153371909c884f406963ffdaa8e18ef93d644ef432198bdaa62d40488fa48ef3584 SHA512 000788426e20a62ad9560aa5aa16ad5b7fcf754e882678f84b9870c85b3b2e3f0252b0a6c8e41d8c66c71c92421e38117edb93fac412f1a9b64c208cd0719e14 +DIST gdl-3.34.0.tar.xz 531368 BLAKE2B 5e32c330ab2fda0b9f06de0fd9d7e3f3118b0af36a73f4f0280f069b49002a4d00e5cbfd373d65b0ea7a15bb5b577f8babbdf7ee71ed7db773d2ad65008a452e SHA512 8c43f330556dae67e4f64e92c3ba5c2e9351d3040d6002bda89f20f9494fc93030abe80072f0cf86280f98e290805154e9ca12aaa7013f0a341d8ea94323d3b0 +EBUILD gdl-3.28.0.ebuild 729 BLAKE2B 1b46485f8ac883f64d5c35b46992a7eb3e8a82ecae841eee29f29a9752f794f8d2975b3cdfe4d551a0ec8a1687961db0116ade3936d30804ceaf3e458aa167e5 SHA512 09a66a3105ecd29787f0378e6bea909aa9312e6c211eabbf11d21775d5ef7e504a60d87912f95d5e6f326c1df8c9d4a9ea4ee17c5b8a3cb25ac69f71f52c0260 +EBUILD gdl-3.34.0.ebuild 733 BLAKE2B d89b48abf949e96dae3c31b6378a0220fea61146ce2f0ad26f964afd5e975fc68648fc2d2a26cb5a85b2d4260dbad48c31bcdc1a9ff27536bde34656792fb2cb SHA512 2bb44b67d54e77fae565e2c7fb13ffebd3a2859e653a07ce6d5dcbbd35af192cad544882e45289c115e39667714ae5b562b09596f005e467b88b95c03b427738 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 diff --git a/dev-libs/gdl/gdl-3.28.0.ebuild b/dev-libs/gdl/gdl-3.28.0.ebuild index 8ed87d449931..df1f4b4c6f8a 100644 --- a/dev-libs/gdl/gdl-3.28.0.ebuild +++ b/dev-libs/gdl/gdl-3.28.0.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://git.gnome.org/browse/gdl" LICENSE="LGPL-2.1+" SLOT="3/5" # subslot = libgdl-3 soname version IUSE="+introspection" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86" RDEPEND=" dev-libs/glib:2 diff --git a/dev-libs/gdl/gdl-3.34.0.ebuild b/dev-libs/gdl/gdl-3.34.0.ebuild new file mode 100644 index 000000000000..827c89eccd02 --- /dev/null +++ b/dev-libs/gdl/gdl-3.34.0.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit gnome2 + +DESCRIPTION="GNOME docking library" +HOMEPAGE="https://git.gnome.org/browse/gdl" + +LICENSE="LGPL-2.1+" +SLOT="3/5" # subslot = libgdl-3 soname version +IUSE="+introspection" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" + +RDEPEND=" + dev-libs/glib:2 + >=x11-libs/gtk+-3.0.0:3[introspection?] + >=dev-libs/libxml2-2.4:2 + introspection? ( >=dev-libs/gobject-introspection-0.6.7:= ) +" +DEPEND="${RDEPEND} + >=dev-util/gtk-doc-am-1.4 + >=dev-util/intltool-0.40.4 + virtual/pkgconfig +" + +src_configure() { + gnome2_src_configure \ + $(use_enable introspection) \ + --disable-gtk-doc +} diff --git a/dev-libs/geoip/Manifest b/dev-libs/geoip/Manifest index a169e7117024..db7242acdd5c 100644 --- a/dev-libs/geoip/Manifest +++ b/dev-libs/geoip/Manifest @@ -3,8 +3,8 @@ DIST geoip-1.6.10.tar.gz 161506 BLAKE2B 968ae25afe8345def099b82acf5bca4b7bcba05f DIST geoip-1.6.11.tar.gz 161934 BLAKE2B 628dd37bbcfffe36970d6bc8cd12ff1d504d9dc7bb760860ce59fbeeac631317556077ca5b50ae42c9cc8567ed41194379ed0743a0c2b0b0bef65504b13e62cb SHA512 9c017a95c7903898b9a2bc10c34e51b390326c181c46e6f99daf3bc4d8f84cfcf640c5cc92d527e4c7428e2b5bfa835cc57040507eb836062139a795726349b9 DIST geoip-1.6.12.tar.gz 160826 BLAKE2B a6cb17141e4e9d00c15d19d7adfecb5492b14591911dc85de403afc9f94801fe1ec92b6106478448074d3679d6c9fa6a44f210b9cc751aba0c0425a5fae699c1 SHA512 d1ed2dae091548f555cde4d26e4b51ae1e8fbb12ef1695fd95963229d9a1bf241e6f09e5d77b151d51edd0cef78ddef490c6a3f3a70ff122bdd9c0ac5500fc7d DIST geoip-1.6.9.tar.gz 158576 BLAKE2B 797dce578c0e2b92b02cf125be5448746025e86c6d9a2efd4ec2c99de99b3874c9da0ef20c7c76308121420ea8099a0744c0240640ff9732b961789ce334b8d1 SHA512 a3a34511ba32e6c7d0b46b0e608c5be54411cf5b095c867c3225941b55e5714ec7c68de64e0aefcf4ee2081fbd626480067d6bc9822d775decef1f8e26d7e976 -EBUILD geoip-1.6.10.ebuild 1278 BLAKE2B a410f0db0c86eb3b54afe801bd45cc809cdc04522c8c5bdb1af0bcffad6da353536f3d7251105d542f186b6e75759cbc08599ed857249c9b155d99c003e4579a SHA512 36ef372713425e41545e14f22189de4959d651d3168942d1ee5806c99808ce8de1d7df9bdfbedc1f13986301ce55ad5589100699bea0869298bcb7736f779f12 -EBUILD geoip-1.6.11.ebuild 1286 BLAKE2B d64c3d25ec442f04ea573097deabdafa359dca1a1fcf4e6f210a830e1ac00f7b2ec5190017d5fbf96f14498bc2b71a9022b81a2b533f18256999481287ead61b SHA512 6b517cac7e13a6e24e153d496696af5b87b8a9d1ca76d3e7d44baabc7f21b203db7195db59625b6e04f863c457a329365ef1a55389b77b29d9935041a65fb709 -EBUILD geoip-1.6.12.ebuild 1286 BLAKE2B d64c3d25ec442f04ea573097deabdafa359dca1a1fcf4e6f210a830e1ac00f7b2ec5190017d5fbf96f14498bc2b71a9022b81a2b533f18256999481287ead61b SHA512 6b517cac7e13a6e24e153d496696af5b87b8a9d1ca76d3e7d44baabc7f21b203db7195db59625b6e04f863c457a329365ef1a55389b77b29d9935041a65fb709 -EBUILD geoip-1.6.9-r1.ebuild 1278 BLAKE2B 9b529dc09a0dcddd08cf36631b1b90e22233cf4fb9fafc6a0adf1cdf1b70b35be83e14015e1a3af72d6090cc63e6bab8944f4cfa398fb62ed8cf8fad58f6c166 SHA512 7179315efa5853fcc5445cfc7b41e87497e85ef051d99896d82663c5138c0108a71488753d7b55ead96d03880e7132d552525e7aaf1ad727424175bc33481bcb +EBUILD geoip-1.6.10.ebuild 1261 BLAKE2B 691d7021a1553c2ce3a8238414a61d68ee7156e7644538509106e7e9ce1ab63978b984e7b12748d3c4297befba9682d662cdfe4d236e725e872db236f5aba315 SHA512 454384c622e26031a1d3b787c66e38c96f9a3187ede20cd3bc800847119823fa57533a6b02c1d58235ccc5912e2ccfbe811d2cb4394442456369e55f3934c0e1 +EBUILD geoip-1.6.11.ebuild 1269 BLAKE2B 66d9ae6650806205ce173050052f93835a646090045dba2273192ae66f3070024140d1eccea238743af8e35c8730ec98821e24018f152a7d67d05daac52cbacb SHA512 aabb588e388f6e00358c70739cec7cb330e6093004dbdcfcc2ce209b0ed36f7e77fd97654c3dfd91619471afaf98c1d277eaa778c5426f327fb04f611027c08c +EBUILD geoip-1.6.12.ebuild 1269 BLAKE2B 66d9ae6650806205ce173050052f93835a646090045dba2273192ae66f3070024140d1eccea238743af8e35c8730ec98821e24018f152a7d67d05daac52cbacb SHA512 aabb588e388f6e00358c70739cec7cb330e6093004dbdcfcc2ce209b0ed36f7e77fd97654c3dfd91619471afaf98c1d277eaa778c5426f327fb04f611027c08c +EBUILD geoip-1.6.9-r1.ebuild 1261 BLAKE2B 2d6b4b60bab7390826bba6465adfe71312f26d40e6a6cb4cb0e0fb02ccbe9796041c2b0d30162db782b811be8c07f6dc66b76330d3100b5cbc10b120423bf8b9 SHA512 80b9088f738fa76f50854971e3edc4a4ca7e127d2d8a62713c2469cc77cbcbb0767bd1f40a9132554fbc3657e811db89a9ca49cf1f3e2514af4df4e4cb571f28 MISC metadata.xml 374 BLAKE2B 1dba87e78019d8000de7779503afc32bf7a0dd5626981db35c0fffd608cfc4b0996159b15961a97aa3e8ee8a128a0263bb10b310c1457de2f955ef55c2f93e01 SHA512 1637e770cb8d68a11ec8c9b9e902d026c557efcce48221edc02dd9c0841ce14b8558402283c81b5babf133a5d84c148e7df8a5e864970fdbb0e256b9d8340762 diff --git a/dev-libs/geoip/geoip-1.6.10.ebuild b/dev-libs/geoip/geoip-1.6.10.ebuild index 597f75a27597..361665551bd2 100644 --- a/dev-libs/geoip/geoip-1.6.10.ebuild +++ b/dev-libs/geoip/geoip-1.6.10.ebuild @@ -13,7 +13,7 @@ SRC_URI=" # GPL-2 for md5.c - part of libGeoIPUpdate, MaxMind for GeoLite Country db LICENSE="LGPL-2.1 GPL-2 MaxMind2" SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x86-macos" +KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux" IUSE="static-libs" RESTRICT="test" diff --git a/dev-libs/geoip/geoip-1.6.11.ebuild b/dev-libs/geoip/geoip-1.6.11.ebuild index 71439b1600a8..3c6fe0eb74cc 100644 --- a/dev-libs/geoip/geoip-1.6.11.ebuild +++ b/dev-libs/geoip/geoip-1.6.11.ebuild @@ -13,7 +13,7 @@ SRC_URI=" # GPL-2 for md5.c - part of libGeoIPUpdate, MaxMind for GeoLite Country db LICENSE="LGPL-2.1 GPL-2 MaxMind2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" IUSE="static-libs" RESTRICT="test" diff --git a/dev-libs/geoip/geoip-1.6.12.ebuild b/dev-libs/geoip/geoip-1.6.12.ebuild index 71439b1600a8..3c6fe0eb74cc 100644 --- a/dev-libs/geoip/geoip-1.6.12.ebuild +++ b/dev-libs/geoip/geoip-1.6.12.ebuild @@ -13,7 +13,7 @@ SRC_URI=" # GPL-2 for md5.c - part of libGeoIPUpdate, MaxMind for GeoLite Country db LICENSE="LGPL-2.1 GPL-2 MaxMind2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" IUSE="static-libs" RESTRICT="test" diff --git a/dev-libs/geoip/geoip-1.6.9-r1.ebuild b/dev-libs/geoip/geoip-1.6.9-r1.ebuild index 7ac3d011e395..5765e23fd909 100644 --- a/dev-libs/geoip/geoip-1.6.9-r1.ebuild +++ b/dev-libs/geoip/geoip-1.6.9-r1.ebuild @@ -13,7 +13,7 @@ SRC_URI=" # GPL-2 for md5.c - part of libGeoIPUpdate, MaxMind for GeoLite Country db LICENSE="LGPL-2.1 GPL-2 MaxMind2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-macos" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux" IUSE="static-libs" RESTRICT="test" diff --git a/dev-libs/girara/Manifest b/dev-libs/girara/Manifest index bc0f1697cde8..641d0ab21262 100644 --- a/dev-libs/girara/Manifest +++ b/dev-libs/girara/Manifest @@ -3,4 +3,4 @@ DIST girara-0.3.4.tar.gz 72981 BLAKE2B 690b8de0e906e43e32b7a1009a04d4bb1d5b02992 EBUILD girara-0.3.3.ebuild 1092 BLAKE2B 4799df2f151ed1189ec9595863cf32f753d3855e218d1fa2f4ce4d26538c1397743320f772fa0a9db842b773fb644d7e7654eb8be4c7d8b4e26f1d6b05971cb8 SHA512 91f1a78a23a4685d54d8ece01d4562be77817e3d43b67d0856f32a768c38943399622479cedf39d3791833d6247df8fd144ad94db9a6ce3beaea094270e6656d EBUILD girara-0.3.4.ebuild 1095 BLAKE2B 698754899258090e0656a5509610de9b1157ce838dfabd7c03ae6163b0082a12fac3ec53efc14214a583e81ded8285fea701c3f41031859f2d95f050f912ff4e SHA512 893ae83c2331343b541c832fbdf281af219ca2ca6172ed7efaf4b558ca1e4f4d0553a29f03d3b405165b4174460bf2d1f876d39a4477437a8ae3cfeb5d45d3c7 EBUILD girara-9999.ebuild 1095 BLAKE2B 698754899258090e0656a5509610de9b1157ce838dfabd7c03ae6163b0082a12fac3ec53efc14214a583e81ded8285fea701c3f41031859f2d95f050f912ff4e SHA512 893ae83c2331343b541c832fbdf281af219ca2ca6172ed7efaf4b558ca1e4f4d0553a29f03d3b405165b4174460bf2d1f876d39a4477437a8ae3cfeb5d45d3c7 -MISC metadata.xml 661 BLAKE2B 23e1208a22b54c7301973769a1b00adc8a2bc79cc7c4e5743e4bfd4f8e99933842466aa853510156f14020657954f35d89466888f03e515e9dbb00bd948845a4 SHA512 fb995def4c0b05dcc8bfc77ced8283bbc8e872586f7eed834291510f037215480fa38cdd4a4ff930337ef3e759e65ab55b417e531c8ff0c058c93cd15b630f59 +MISC metadata.xml 581 BLAKE2B 25933546f3727c17b48e8bde4136825202d34300d2a3049ceba68afeb7f2b88ea5430240fdbf118229751229c06d31aef3cf28c7e13182d008e56161eff133f2 SHA512 2b6f1590cc60c44d13394afb5c3815c227aff680f94510e5202d2b41614b6854effe32d4ade6ab4b2d36595d36fa636520e88ea514078c23ca881e00d3d7797f diff --git a/dev-libs/girara/metadata.xml b/dev-libs/girara/metadata.xml index 235fd8541a77..d30ae40ed7f8 100644 --- a/dev-libs/girara/metadata.xml +++ b/dev-libs/girara/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <name>Mikle Kolyada</name> - <email>zlogene@gentoo.org</email> - </maintainer> + <!-- maintainer-needed --> <upstream> <maintainer status="active"> <email>mlq@pwmt.org</email> diff --git a/dev-libs/gjs/Manifest b/dev-libs/gjs/Manifest index 26d6addd8ee9..07514ad1ea61 100644 --- a/dev-libs/gjs/Manifest +++ b/dev-libs/gjs/Manifest @@ -1,7 +1,7 @@ DIST gjs-1.58.6.tar.xz 637972 BLAKE2B 553f29808723e48cee39c62e260d9c09f5db160756bf6c2fc45e532bee1d5c8babdd2bd5aee39fdff1300fc10de2c2a4e34d6b850e6e95c83ef217a8955379b6 SHA512 3e8fa8ccaabbbd07e74869fdc6188cffc19565798a6267fd3480d9320a2c9c5906c864e5d0c6e9e57f7bb79cc1706717b76b23c7cd89eb191477eb173b24aa74 DIST gjs-1.58.8.tar.xz 639372 BLAKE2B 53be0d5353213e7fdc6009aeed16db79f61ee5b800d66cd79f87e577b44adbb05ae741d73550237027a902d2e038c8e8247d3269bf058b64622a1a261f5a2501 SHA512 373b400b884096b6746c1ac7f2c2915857aa888dfb8bbf19bb8469fb75e081e4df36dcab06723f03654c34354a5a69a7865727ab9e36d3fb0d2b2652713e5cd6 -DIST gjs-1.64.3.tar.xz 422436 BLAKE2B ade874085962f43fe7cd1412966557e4c40daf030b71a04b61f2b811b6056ae3abaff0cca04d9bf852dbb045a5a687dc27f5301c19235138f3d5d50be41f10c6 SHA512 9d92e52a7fef07853f3beb181798f89deb60b97b928d916cd827c99a6ab8f83abf7c352a1aa46be476a50e2efadfaf09befa54ccab0d51b0ac7127f2fe794801 +DIST gjs-1.64.4.tar.xz 422496 BLAKE2B a96211f7240336dbb30c6965e405f59ee72e4288842837da8da8c6d3c59b7e04ebb6c7a8b0b02d38601c162ffdf1a1fef9f13e4db720c4c483f4a39dffd5dbb4 SHA512 21a15d7106ad6584fb1f02cb0a0a4cab211a3540adb8f2c03d35c211e3946b81935000a52351fedd95a18a7ff6b7f96e665fcafa3c411ff79f2b6cb332c82b42 EBUILD gjs-1.58.6.ebuild 1606 BLAKE2B 2f10f926af7b704a16765b7cadd0ceee510b0f996ef160338abe019483384b4682a7fb89ec50d8958b0fb504be30574dd04ff7493af23df9bd44d8dbe071ca7b SHA512 e72901d389173016cab161a5126d3fd82a0dfa6a4d7fd6c21a381b73868ac2db891418742c88acdfd8769b8a13f01552173c19c31af39a47178681f870269490 EBUILD gjs-1.58.8.ebuild 1608 BLAKE2B 157415b6171cacd2d7c08c9426227f551ce60441fbec98873149b2d80b082cacf068757fb7dd62e47fa2a2aa098f200b5330ad700e1b716e5e310ef2d92c145c SHA512 9de69d57a9795771dae2c4d828f23ae2a269d80dbe153c0830978b083b39cd4188bf5b37097529dc986b62534c996a1d9ca392cf692f62edcdfd676ccb9c5ddc -EBUILD gjs-1.64.3.ebuild 1041 BLAKE2B 711d626dacf32d9a896d23d0998103dcb2aac96bc7216b8edbce016233c42f9f26b11809690f9a62938bb0700ae0a3b415be02b676d8dc3c90973970558f81fe SHA512 17bdd21a6489b139c4fe1fd10f580fab3553250e825745e499050aa07ac00b8fa110eee88deb17f1a36c42f0ee109f55f7d3a3da26911aa74f556c72dacc7a3e +EBUILD gjs-1.64.4.ebuild 1128 BLAKE2B aae76852c57af70d535d1ebb586d400731f3bffe83ac4fd141872ed73b6c7057131f45d82ffd56f5b98fa3ef1b98c716a1e1763537793d71aa391c68e2af9008 SHA512 9df6933dc65c49a6e74a0106f44b006bcc6c324c0311fd4b9f723c1192dd4831f9a01d12da5f2a737e61712128f58d755f039bf278af8869f9f651ac03f480ff MISC metadata.xml 388 BLAKE2B 9b4ab74929619cfb6c4405385667aa00521f59865df8338e9078286f2efa593dc49412153bd5b45e4fc4cbcd4c13a75c4743cd4381f05b07bed92cde09bf28fe SHA512 8aaf5f422cd8b63a71aa7773690607fb2d8ad6e6a7e350686da8e26ff4e6856c7f352ab02a79a7f2917b28758ff523a6aa6ddcfb2a1ad876aac94e6b2bd48072 diff --git a/dev-libs/gjs/gjs-1.64.3.ebuild b/dev-libs/gjs/gjs-1.64.4.ebuild index 6ef823d0a818..32d72857d4c1 100644 --- a/dev-libs/gjs/gjs-1.64.3.ebuild +++ b/dev-libs/gjs/gjs-1.64.4.ebuild @@ -16,27 +16,28 @@ RESTRICT="!test? ( test )" RDEPEND=" >=dev-libs/glib-2.58.0 + dev-libs/libffi:= >=dev-libs/gobject-introspection-1.61.2:= - - readline? ( sys-libs/readline:0= ) dev-lang/spidermonkey:68 - dev-libs/libffi:= cairo? ( x11-libs/cairo[X] ) + readline? ( sys-libs/readline:0= ) " DEPEND="${RDEPEND} sysprof? ( >=dev-util/sysprof-capture-3.33.2:3 ) virtual/pkgconfig test? ( sys-apps/dbus - >=x11-libs/gtk+-3.20:3 ) + >=x11-libs/gtk+-3.20:3[introspection] ) " src_configure() { # FIXME: add systemtap/dtrace support, like in glib:2 local emesonargs=( $(meson_feature cairo) - $(meson_feature sysprof profiler) $(meson_feature readline) + $(meson_feature sysprof profiler) -Dinstalled_tests=false + $(meson_use !test skip_dbus_tests) + $(meson_use !test skip_gtk_tests) ) meson_src_configure } diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest index 1fe45e9e5d87..9cc5f9b8f8f7 100644 --- a/dev-libs/glib/Manifest +++ b/dev-libs/glib/Manifest @@ -1,6 +1,8 @@ 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 +DIST glib-2.64.4.tar.xz 4779456 BLAKE2B 2ff69c794689c97011103459cb109e6ca7021db20a605cf3942f57e7b73eda9971034b8f65f03191f357169affb278dfa9bff309b4ca44605fd5a0ba0d135d2a SHA512 f21fe33068a5cabdbfef54ef635b3f810b389416c3b4b66ae4975e84841834f7b7640d2518d52cb7341641af5761919eebd5e7b25bd2946f3bdd002c4902b090 +DIST glib-2.64.5.tar.xz 4778456 BLAKE2B 7fdee0e16a7ac820f4c4f7dc66d37add464d3005e89e6013302d3ef103319331811d68e9b42db072b82242c3d7badfbd085b69333e770012def89dc8aae7a2eb SHA512 a87537274619b6de88a0e68555059036ac18c748b5005c8d84728646b0db342fde0b8c5b303b9ad79f64d71ea4ed990d52a4fbd68cda3ca74aed5fe4d497e060 EBUILD glib-2.62.6.ebuild 9758 BLAKE2B ad374e654c1afbe60c8b65e04cf1934791f8c487a3881b82deb0684f0c903e4d7a4e08c954f325a896a42f935634ecc37d764ad6e16a4fcd6b1a04528aaab378 SHA512 bf35ad4fa21d1d9a7e1bd495a800d67fed2aca2f5002cf8df58523ed980abb05b076d19382274556a99a72fa4bf4a796d693534b19ed4e309fb642e4ed7f0feb -EBUILD glib-2.64.3.ebuild 10345 BLAKE2B 0c3e43db40f5704f446730bf0d95058ece141f40b4ed76ed9fdc1c8089c47e8515df265d7c8293ed042d7b6d33541f1c55628131b7ee154aeeb33f95ec73fbcb SHA512 e06065ef028ebe66e4281c95b118ecfef3a1ae48e441ca99fa4b7e615ad157a1ee5d4d32214b57b8af587b9a0e7aee145adac5ed4bad25b1795dd3792ac04516 +EBUILD glib-2.64.4.ebuild 10345 BLAKE2B 9942555a844dc1aa6bc0d5b5eefb7b338f6ee24e98bd654058809acb7bcd392977e7e3d2bdc8bb4f391b35575c6f90c334fef8189216a41ae05ccd00c2e35179 SHA512 696e24dca1fe1209ff0d8783900d5d0ca6fa8ebfd164062fb30271eee0fc95f76407828b3f64b9e4d475858ac1dbff72eafeb203c3be3ba99f6795bd088a3911 +EBUILD glib-2.64.5.ebuild 10348 BLAKE2B 65eb5f35c3a0cd59c1f5d4dfa4e6ec012a17948446e6a2ffd9c533b08ffb491971132db1e5a614163d5f4f96480d2f2aaee4630e80c38502bc978b6cf94b3665 SHA512 8dd59110fa24b8b2fe30ca678230d709e1bc508f7e043f5c987c81209a3851623ce4112888110457f41c18ade7640257333631076c1cffb37af8e419a09ea0ed MISC metadata.xml 978 BLAKE2B 75f0c12ff1628b7c345b1e85c6baa041973f11555aa520348ca6f347d2241ee0fc9bc26891b25bd34ae512dbaf761b5382d93f094dc0c4ff9a76c3ec852c9583 SHA512 8087f80cbbffb14930b50178559cc4dbde999d4e123475beb04e2d0a25e64b24ee5ab8523f1df1839e82f74272b40cd9a57b78acf34fd64f8b4723bed26573c8 diff --git a/dev-libs/glib/glib-2.64.4.ebuild b/dev-libs/glib/glib-2.64.4.ebuild new file mode 100644 index 000000000000..93a5921ec33f --- /dev/null +++ b/dev-libs/glib/glib-2.64.4.ebuild @@ -0,0 +1,288 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_{6,7,8} ) + +inherit flag-o-matic gnome.org gnome2-utils linux-info meson multilib multilib-minimal python-any-r1 toolchain-funcs xdg + +DESCRIPTION="The GLib library of C routines" +HOMEPAGE="https://www.gtk.org/" + +LICENSE="LGPL-2.1+" +SLOT="2" +IUSE="dbus debug elibc_glibc fam gtk-doc kernel_linux +mime selinux static-libs systemtap test utils xattr" +RESTRICT="!test? ( test )" + +KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux" + +# * libelf isn't strictly necessary, but makes gresource tool more useful, and +# the check is automagic in gio/meson.build. gresource is not a multilib tool +# right now, thus it doesn't matter if non-native ABI libelf exists or not +# (non-native binary is overwritten, it doesn't matter if libelf was linked to). +# * elfutils (via libelf) does not build on Windows. gresources are not embedded +# within ELF binaries on that platform anyway and inspecting ELF binaries from +# other platforms is not that useful so exclude the dependency in this case. +# * Technically static-libs is needed on zlib, util-linux and perhaps more, but +# these are used by GIO, which glib[static-libs] consumers don't really seem +# to need at all, thus not imposing the deps for now and once some consumers +# are actually found to static link libgio-2.0.a, we can revisit and either add +# them or just put the (build) deps in that rare consumer instead of recursive +# RDEPEND here (due to lack of recursive DEPEND). +RDEPEND=" + !<dev-util/gdbus-codegen-${PV} + >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] + >=dev-libs/libpcre-8.31:3[${MULTILIB_USEDEP},static-libs?] + >=dev-libs/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}] + >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] + >=virtual/libintl-0-r2[${MULTILIB_USEDEP}] + kernel_linux? ( >=sys-apps/util-linux-2.23[${MULTILIB_USEDEP}] ) + selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] ) + xattr? ( !elibc_glibc? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] ) ) + !kernel_Winnt? ( virtual/libelf:0= ) + fam? ( >=virtual/fam-0-r1[${MULTILIB_USEDEP}] ) +" +DEPEND="${RDEPEND}" +# libxml2 used for optional tests that get automatically skipped +BDEPEND=" + app-text/docbook-xsl-stylesheets + dev-libs/libxslt + >=sys-devel/gettext-0.19.8 + gtk-doc? ( >=dev-util/gtk-doc-1.32-r2 + app-text/docbook-xml-dtd:4.2 + app-text/docbook-xml-dtd:4.5 ) + systemtap? ( >=dev-util/systemtap-1.3 ) + ${PYTHON_DEPS} + test? ( >=sys-apps/dbus-1.2.14 ) + virtual/pkgconfig +" +# TODO: >=dev-util/gdbus-codegen-${PV} test dep once we modify gio/tests/meson.build to use external gdbus-codegen + +PDEPEND=" + dbus? ( gnome-base/dconf ) + mime? ( x11-misc/shared-mime-info ) +" +# shared-mime-info needed for gio/xdgmime, bug #409481 +# dconf is needed to be able to save settings, bug #498436 + +MULTILIB_CHOST_TOOLS=( + /usr/bin/gio-querymodules$(get_exeext) +) + +PATCHES=( + "${FILESDIR}"/${PN}-2.64.1-mark-gdbus-server-auth-test-flaky.patch +) + +pkg_setup() { + if use kernel_linux ; then + CONFIG_CHECK="~INOTIFY_USER" + if use test ; then + CONFIG_CHECK="~IPV6" + WARNING_IPV6="Your kernel needs IPV6 support for running some tests, skipping them." + fi + linux-info_pkg_setup + fi + python-any-r1_pkg_setup +} + +src_prepare() { + if use test; then + # TODO: Review the test exclusions, especially now with meson + # Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629, upstream bug #629163 + if ! has_version dev-util/desktop-file-utils ; then + ewarn "Some tests will be skipped due dev-util/desktop-file-utils not being present on your system," + ewarn "think on installing it to get these tests run." + sed -i -e "/appinfo\/associations/d" gio/tests/appinfo.c || die + sed -i -e "/g_test_add_func/d" gio/tests/desktop-app-info.c || die + fi + + # gdesktopappinfo requires existing terminal (gnome-terminal or any + # other), falling back to xterm if one doesn't exist + #if ! has_version x11-terms/xterm && ! has_version x11-terms/gnome-terminal ; then + # ewarn "Some tests will be skipped due to missing terminal program" + # These tests seem to sometimes fail even with a terminal; skip for now and reevulate with meson + # Also try https://gitlab.gnome.org/GNOME/glib/issues/1601 once ready for backport (or in a bump) and file new issue if still fails + sed -i -e "/appinfo\/launch/d" gio/tests/appinfo.c || die + # desktop-app-info/launch* might fail similarly + sed -i -e "/desktop-app-info\/launch-as-manager/d" gio/tests/desktop-app-info.c || die + #fi + + # https://bugzilla.gnome.org/show_bug.cgi?id=722604 + sed -i -e "/timer\/stop/d" glib/tests/timer.c || die + sed -i -e "/timer\/basic/d" glib/tests/timer.c || die + + ewarn "Tests for search-utils have been skipped" + sed -i -e "/search-utils/d" glib/tests/meson.build || die + + # Play nice with network-sandbox, but this approach would defeat the purpose of the test + #sed -i -e "s/localhost/127.0.0.1/g" gio/tests/gsocketclient-slow.c || die + else + # Don't build tests, also prevents extra deps, bug #512022 + sed -i -e '/subdir.*tests/d' {.,gio,glib}/meson.build || die + fi + + # Don't build fuzzing binaries - not used + sed -i -e '/subdir.*fuzzing/d' meson.build || die + + # gdbus-codegen is a separate package + sed -i -e '/install_dir/d' gio/gdbus-2.0/codegen/meson.build || die + + # Same kind of meson-0.50 issue with some installed-tests files; will likely be fixed upstream soon + sed -i -e '/install_dir/d' gio/tests/meson.build || die + + cat > "${T}/glib-test-ld-wrapper" <<-EOF + #!/usr/bin/env sh + exec \${LD:-ld} "\$@" + EOF + chmod a+x "${T}/glib-test-ld-wrapper" || die + sed -i -e "s|'ld'|'${T}/glib-test-ld-wrapper'|g" gio/tests/meson.build || die + + xdg_src_prepare + gnome2_environment_reset + # TODO: python_name sedding for correct python shebang? Might be relevant mainly for glib-utils only +} + +multilib_src_configure() { + if use debug; then + append-cflags -DG_ENABLE_DEBUG + else + append-cflags -DG_DISABLE_CAST_CHECKS # https://gitlab.gnome.org/GNOME/glib/issues/1833 + fi + + # TODO: figure a way to pass appropriate values for all cross properties that glib uses (search for get_cross_property) + #if tc-is-cross-compiler ; then + # https://bugzilla.gnome.org/show_bug.cgi?id=756473 + # TODO-meson: This should be in meson cross file as 'growing_stack' property; and more, look at get_cross_property + #case ${CHOST} in + #hppa*|metag*) export glib_cv_stack_grows=yes ;; + #*) export glib_cv_stack_grows=no ;; + #esac + #fi + + local emesonargs=( + -Ddefault_library=$(usex static-libs both shared) + $(meson_feature selinux) + $(meson_use xattr) + -Dlibmount=enabled # only used if host_system == 'linux' + -Dinternal_pcre=false + -Dman=true + $(meson_use systemtap dtrace) + $(meson_use systemtap) + -Dgtk_doc=$(multilib_native_usex gtk-doc true false) + $(meson_use fam) + -Dinstalled_tests=false + -Dnls=enabled + -Doss_fuzz=disabled + ) + meson_src_configure +} + +multilib_src_compile() { + meson_src_compile +} + +multilib_src_test() { + export XDG_CONFIG_DIRS=/etc/xdg + export XDG_DATA_DIRS=/usr/local/share:/usr/share + export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp" + export LC_TIME=C # bug #411967 + unset GSETTINGS_BACKEND # bug #596380 + python_setup + + # Related test is a bit nitpicking + mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR" + chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR" + + meson_src_test --timeout-multiplier 2 --no-suite flaky +} + +multilib_src_install() { + meson_src_install + keepdir /usr/$(get_libdir)/gio/modules +} + +multilib_src_install_all() { + einstalldocs + + # These are installed by dev-util/glib-utils + # TODO: With patching we might be able to get rid of the python-any deps and removals, and test depend on glib-utils instead; revisit now with meson + rm "${ED}/usr/bin/glib-genmarshal" || die + rm "${ED}/usr/share/man/man1/glib-genmarshal.1" || die + rm "${ED}/usr/bin/glib-mkenums" || die + rm "${ED}/usr/share/man/man1/glib-mkenums.1" || die + rm "${ED}/usr/bin/gtester-report" || die + rm "${ED}/usr/share/man/man1/gtester-report.1" || die + # gdbus-codegen manpage installed by dev-util/gdbus-codegen + rm "${ED}/usr/share/man/man1/gdbus-codegen.1" || die +} + +pkg_preinst() { + xdg_pkg_preinst + + # Make gschemas.compiled belong to glib alone + local cache="/usr/share/glib-2.0/schemas/gschemas.compiled" + + if [[ -e ${EROOT}${cache} ]]; then + cp "${EROOT}"${cache} "${ED}"/${cache} || die + else + touch "${ED}"${cache} || die + fi + + multilib_pkg_preinst() { + # Make giomodule.cache belong to glib alone + local cache="/usr/$(get_libdir)/gio/modules/giomodule.cache" + + if [[ -e ${EROOT}${cache} ]]; then + cp "${EROOT}"${cache} "${ED}"${cache} || die + else + touch "${ED}"${cache} || die + fi + } + + # Don't run the cache ownership when cross-compiling, as it would end up with an empty cache + # file due to inability to create it and GIO might not look at any of the modules there + if ! tc-is-cross-compiler ; then + multilib_foreach_abi multilib_pkg_preinst + fi +} + +pkg_postinst() { + xdg_pkg_postinst + # glib installs no schemas itself, but we force update for fresh install in case + # something has dropped in a schemas file without direct glib dep; and for upgrades + # in case the compiled schema format could have changed + gnome2_schemas_update + + multilib_pkg_postinst() { + gnome2_giomodule_cache_update \ + || die "Update GIO modules cache failed (for ${ABI})" + } + if ! tc-is-cross-compiler ; then + multilib_foreach_abi multilib_pkg_postinst + else + ewarn "Updating of GIO modules cache skipped due to cross-compilation." + ewarn "You might want to run gio-querymodules manually on the target for" + ewarn "your final image for performance reasons and re-run it when packages" + ewarn "installing GIO modules get upgraded or added to the image." + fi + + for v in ${REPLACING_VERSIONS}; do + if ver_test "$v" "-lt" "2.63.6"; then + ewarn "glib no longer installs the gio-launch-desktop binary. You may need" + ewarn "to restart your session for \"Open With\" dialogs to work." + fi + done +} + +pkg_postrm() { + xdg_pkg_postrm + gnome2_schemas_update + + if [[ -z ${REPLACED_BY_VERSION} ]]; then + multilib_pkg_postrm() { + rm -f "${EROOT}"/usr/$(get_libdir)/gio/modules/giomodule.cache + } + multilib_foreach_abi multilib_pkg_postrm + rm -f "${EROOT}"/usr/share/glib-2.0/schemas/gschemas.compiled + fi +} diff --git a/dev-libs/glib/glib-2.64.3.ebuild b/dev-libs/glib/glib-2.64.5.ebuild index 481b31a84637..00e2eea8a942 100644 --- a/dev-libs/glib/glib-2.64.3.ebuild +++ b/dev-libs/glib/glib-2.64.5.ebuild @@ -48,7 +48,7 @@ BDEPEND=" app-text/docbook-xsl-stylesheets dev-libs/libxslt >=sys-devel/gettext-0.19.8 - gtk-doc? ( >=dev-util/gtk-doc-1.20 + gtk-doc? ( >=dev-util/gtk-doc-1.32-r2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 ) systemtap? ( >=dev-util/systemtap-1.3 ) diff --git a/dev-libs/gobject-introspection-common/Manifest b/dev-libs/gobject-introspection-common/Manifest index cc8bc17f451a..ef9e02ed6b9c 100644 --- a/dev-libs/gobject-introspection-common/Manifest +++ b/dev-libs/gobject-introspection-common/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-common-1.62.0.ebuild 931 BLAKE2B 1bf492f4c5a9d5bd608791bec1be8f923c609e234db9d0301817c192e52f79d4bd7618bb425de2f9b3c8d3954be1155aa330cabb5f90671fcdf502b29ad2efd0 SHA512 07eb34e10d5808c2a09410dc2f46f791a0df1abd1e0842c214a55b85c74bb10e2539ca29989bd8c66dcaf7290b3f715b93bece914ee928807601157b5d866021 -EBUILD gobject-introspection-common-1.64.1.ebuild 940 BLAKE2B 9815ccecda746b9a9d400f61547e05e3ecdc33b9f39666a6585fd2af893411b1dc534f9c4b8761f4e15f0bfe667793ac54d3fee19c2716aa81fb6ac4303f644d SHA512 d0e8823632409df83c905a56bb2cc0d426effd8f2188497171beeaaf5841db2a7f61c877166000085a83dd11a6c379f350649191430f7c26bf5cc2501db868d5 +EBUILD gobject-introspection-common-1.64.1.ebuild 938 BLAKE2B 028043f8f24e9aefd06d12d6cbed25f76aec1611dbacf91363cf2f9dd00433563ad71caa7066642887d00cda2b31258eb112036d0c16e021b53c930a27b21f95 SHA512 f2bbf6d18b92581716fe776020037fde2258279846fe093f8df23959b3195581c8e176c073f811efcdcb701b088bbff2143f6b91a5afe4f946892c0544577a9b MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 diff --git a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.64.1.ebuild b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.64.1.ebuild index 08b6851ff4fb..efe5cc899814 100644 --- a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.64.1.ebuild +++ b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.64.1.ebuild @@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GObjectIntrospection" LICENSE="HPND" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~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 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="" RDEPEND="!<${CATEGORY}/${GNOME_ORG_MODULE}-${PV}" diff --git a/dev-libs/gobject-introspection/Manifest b/dev-libs/gobject-introspection/Manifest index 3c9c4a8ebc94..11fe9450767b 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-r1.ebuild 1872 BLAKE2B 0fd21ecbd6b20f96a1a26ce1cd17e57ce8095f857c8e168c5219fd660581b9f568c5c019408e16f3bbdf571d4c37cb638f64ca0e5e059bc852b19aecca75bad5 SHA512 b6c01c14265696bd7596911b064dfb86ae41e85006d55d071806b72c4421ac3fec8ba1405d3b283de8e967812d9298c42e5b69b5d89706c07cf8f8375397e054 -EBUILD gobject-introspection-1.64.1-r1.ebuild 1889 BLAKE2B e331a2e6adc124300979f3cbea3fd96afe159c425c0f599b1fd4d8ce715f982787ca2e5edd877a1ee7651114d90af321efc31329ef6a033f376a876e3274da54 SHA512 ee596f425020b613d29b35c9ff431abd6c370089b22f9e3c6d61402b277f20769fc681c2650780d2e227ff88e883f54554a44b2802c9190edc7c120606080f1a +EBUILD gobject-introspection-1.64.1-r1.ebuild 2011 BLAKE2B 8eeffd951899248927077dfe5119bfed3355ac5d593078b8ae027263d542d522c881c0abdcf031a050f574a3644068fd8428b102943b701f5c42176ab7cd2c80 SHA512 93b745e1ae2c987d91433fa1e38186e672e0b652cb339fc2b418a4fc528139eed583671cb558c1cc65114f4336ea841bbfc2eff7b300924126565394f5512d32 MISC metadata.xml 367 BLAKE2B b69aefd2ddda2f8e216d449de9ca13a5a8c473353b291bc5093ec2f6f3ac3346dc9fa25c85a64f15950813d9d6dfafd356a234c748436edb7639f37e95c71151 SHA512 1430924bf7430f4a409d6c3335a52b59567d5972440068e53e637d6c71486ef3e606ed9043184dfc168d731909e11c769042d2846e137312cd0ee0ce6f52e431 diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.64.1-r1.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.64.1-r1.ebuild index 9cb429ff7fc5..ff498a735a4e 100644 --- a/dev-libs/gobject-introspection/gobject-introspection-1.64.1-r1.ebuild +++ b/dev-libs/gobject-introspection/gobject-introspection-1.64.1-r1.ebuild @@ -15,7 +15,7 @@ SLOT="0" IUSE="doctool gtk-doc test" RESTRICT="!test? ( test )" REQUIRED_USE="${PYTHON_REQUIRED_USE}" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~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 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" # virtual/pkgconfig needed at runtime, bug #505408 RDEPEND=" @@ -39,7 +39,13 @@ DEPEND="${RDEPEND} ) sys-devel/bison sys-devel/flex - test? ( x11-libs/cairo[glib] ) + test? ( + x11-libs/cairo[glib] + $(python_gen_cond_dep ' + dev-python/mako[${PYTHON_MULTI_USEDEP}] + dev-python/markdown[${PYTHON_MULTI_USEDEP}] + ') + ) " pkg_setup() { diff --git a/dev-libs/hiredis/Manifest b/dev-libs/hiredis/Manifest index f51b6dce4581..f1d8ad847b6a 100644 --- a/dev-libs/hiredis/Manifest +++ b/dev-libs/hiredis/Manifest @@ -1,4 +1,5 @@ AUX hiredis-0.13.3-disable-network-tests.patch 1297 BLAKE2B 49b87fc28763d551c51524941dd8254765569546997dea69d427473799fe4921b96013cff79a9c09af3341bee848274a5b2281c16785fd44592ebbec866c6978 SHA512 bfbf4ee0a6780cbdcac4c8578aacac241d2b00c94dedd4f298ff06d65cab100f446072573ea0b57a513d3f7146070776fa08e949374e43272c2b05e601f250fc +AUX hiredis-0.14.1-honor-AR.patch 441 BLAKE2B efbb4c544b6418f689789c2c4147bf45e6b7385718898c4091b2bdf79f409fb34b1499b3af6ad903f524d6dbe96dcb90e404f6b2c33d03e4a2cd829bea18adb8 SHA512 ac6ddda51071918234cf3b79c4df094ec14c5eeecc35f4cabb2c5b6549089db704f7a69585a9bb21c95b72b203010f75c23252e80663381502663d76538f3820 DIST hiredis-0.14.1.tar.gz 64372 BLAKE2B 9846b05e21bfadb876e26ab45bf5c29a3283b602ef725dfbd877815be690bb5579551f0c452e1d8abf9ae985f6b71408a3b86b343ca5d6dce58dd4897640996a SHA512 a7310f2d65075df0c17636a0220e16487759471a3442b1de2595ab747565f6b6262e37131613b13e396b31050bcbe5529c35d420cd43fd7d500d9d563d469c4f -EBUILD hiredis-0.14.1.ebuild 1869 BLAKE2B baed0625ddf7cf07ffe0bbc4f4d1a033a196ad1896c7d175902e798cf20ae8a933efe502465af5a35ad5268f4716824a39432102c6dd85adaf631d46226c5878 SHA512 29f5812ba5bb3806974b50b83a10bbc7392b64e9a879209b3eae4bb23f0019ba2bfaf6d472ece0fe59c3a88dfb4d83810019395d2191193a10453a1e52f301a6 +EBUILD hiredis-0.14.1.ebuild 1899 BLAKE2B 36cf0eae92dc3cfed0979be6ce3b46d2d582fd944fcb40fa0e34cb855e9dd63acccd0cdb7b5af33147a8984a8d168e821283054ef07babbebaac7973d2040960 SHA512 1db9c4fd111f6763728fd0594e042e9e074c4f28294c0c3b724052b701dab642469c9e6a0480bee2ff56faacb6b5cb0cc0f1d91681842f4ff51937893f1f03a8 MISC metadata.xml 324 BLAKE2B 4b317777c17533d9f574064a410d1431dde5ac68fe50b25140f63cd21829b30cede1a4e3d38996eb50de1cc38257a9e5eabb2c2871c1d5727132a698048de93e SHA512 5c81a7e5c915ae46f6d2849806534ee520d413f8ca2f640c7441a61a478652bdc6f0a2501504843b1f07b557c06c0045e92ee87a949e018f7d95884e38faf78c diff --git a/dev-libs/hiredis/files/hiredis-0.14.1-honor-AR.patch b/dev-libs/hiredis/files/hiredis-0.14.1-honor-AR.patch new file mode 100644 index 000000000000..0bfcf0988e81 --- /dev/null +++ b/dev-libs/hiredis/files/hiredis-0.14.1-honor-AR.patch @@ -0,0 +1,11 @@ +--- a/Makefile ++++ b/Makefile +@@ -51,7 +51,7 @@ DYLIB_MAJOR_NAME=$(LIBNAME).$(DYLIBSUFFIX).$(HIREDIS_MAJOR) + DYLIBNAME=$(LIBNAME).$(DYLIBSUFFIX) + DYLIB_MAKE_CMD=$(CC) -shared -Wl,-soname,$(DYLIB_MINOR_NAME) -o $(DYLIBNAME) $(LDFLAGS) + STLIBNAME=$(LIBNAME).$(STLIBSUFFIX) +-STLIB_MAKE_CMD=ar rcs $(STLIBNAME) ++STLIB_MAKE_CMD=$(AR) rcs $(STLIBNAME) + + # Platform-specific overrides + uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not') diff --git a/dev-libs/hiredis/hiredis-0.14.1.ebuild b/dev-libs/hiredis/hiredis-0.14.1.ebuild index 9028b420d2de..b0bf2fbfaedb 100644 --- a/dev-libs/hiredis/hiredis-0.14.1.ebuild +++ b/dev-libs/hiredis/hiredis-0.14.1.ebuild @@ -18,7 +18,10 @@ RESTRICT="!test? ( test )" DEPEND="test? ( dev-db/redis )" src_prepare() { - local PATCHES=( "${FILESDIR}/${PN}-0.13.3-disable-network-tests.patch" ) + local PATCHES=( + "${FILESDIR}"/${PN}-0.13.3-disable-network-tests.patch + "${FILESDIR}"/${PN}-0.14.1-honor-AR.patch + ) default # use GNU ld syntax on Solaris @@ -31,9 +34,8 @@ _build() { CC="$(tc-getCC)" \ PREFIX="${EPREFIX}/usr" \ LIBRARY_PATH="$(get_libdir)" \ - ARCH= \ - DEBUG= \ - OPTIMIZATION="${CPPFLAGS}" \ + DEBUG_FLAGS= \ + OPTIMIZATION= \ "$@" } diff --git a/dev-libs/igraph/Manifest b/dev-libs/igraph/Manifest index 8e84eeebf13c..3fcb9eb0ff54 100644 --- a/dev-libs/igraph/Manifest +++ b/dev-libs/igraph/Manifest @@ -1,4 +1,4 @@ AUX igraph-0.7.1-unbundle.patch 8525 BLAKE2B 716137c2d7b4ffc3e29b484539867216574162dc3c55ea747c57cf24689ef3de032776f9e7f1d76cdb1c0e39bd6afd5fc3cc2e74de4209d632bdd568a8b884a4 SHA512 8b796f95044a231b2695532d158721cf48dfd266f5acfc2eec8a7f3706208190ee07eccaf83823ba9323edaef15afbca60ff7013cf0d9d7fda0ab5b0ee5e0eff DIST igraph-0.7.1.tar.gz 2967134 BLAKE2B 27f0a2f51e561a3ea2e2e6d31853fe10ffd66f9f67603d77f2c0449a4c2bcd4d45c98516b526fb0f23a871ebe3db1fcf0c691551714d044124778faa147bd30f SHA512 ac7d7e3fbc6d27ae69079224881ca03db2c7e0b50d016706f3e167c614e2c9332c675d2fcd3cde12874e13a8fc402d42222308c6195afadee15152cec93f94dd -EBUILD igraph-0.7.1-r2.ebuild 902 BLAKE2B 6a443171f450d4958c0d6c4e8ad4c8d3b835ddfde10c4b472cfc3e04f8eb40477202fb0b05f4562efb13c08a8d3cd6822ff6140716b9ea304f5ab46579352013 SHA512 1542c66a97c5d070233d609a2ee08e797a8d9f178e4d6a4c34e8b1f9c1ebdbe01413cc5c87cd33c553449712e8472537f295178b2e89c610539d167035f98936 +EBUILD igraph-0.7.1-r2.ebuild 1021 BLAKE2B f57456480c2b191750bda562f88503df46b4c6adaaa0d70bee3dd570d323eb7d26c355328bf40d896238f90c9b485ac35aad3b059141425f57463a7308f7b911 SHA512 6f852704fa6bcd52ae289f78115d4f21df0c1ff720cd7f5673882f17d34d5d174f8657b461a1543f9a8984b6d100cd91584279e3e3b33fde77b05bd527b65688 MISC metadata.xml 603 BLAKE2B 996b695aa3f67e6bfbbed5a505c6aa08dd72c68911d3b881cf8d99c20439eabbf4d87fe714e0fb7363ee9870f389005b19943ff1ecf865dfb0f5a8936021850b SHA512 31eb84c71fc2afb1fb804f2fe94eafa4c0e0a37eb933b6c89c530e32bdcfa684512e4aff9c36a58d363df0ce6321eaa298a5d48778f93e8c8ad8fe7e31b5b152 diff --git a/dev-libs/igraph/igraph-0.7.1-r2.ebuild b/dev-libs/igraph/igraph-0.7.1-r2.ebuild index 83c2185d5b3e..b920276602c3 100644 --- a/dev-libs/igraph/igraph-0.7.1-r2.ebuild +++ b/dev-libs/igraph/igraph-0.7.1-r2.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit autotools toolchain-funcs @@ -22,8 +22,8 @@ RDEPEND=" >=sci-libs/cxsparse-3 sci-mathematics/glpk gmp? ( dev-libs/gmp:0 )" -DEPEND="${RDEPEND} - virtual/pkgconfig" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" PATCHES=( "${FILESDIR}"/${P}-unbundle.patch ) @@ -37,6 +37,7 @@ src_configure() { econf \ $(use_enable gmp) \ $(use_enable debug) \ + --disable-static \ --disable-tls \ --with-external-arpack \ --with-external-blas \ @@ -44,3 +45,10 @@ src_configure() { --with-external-f2c \ --with-external-glpk } + +src_install() { + default + + # no static archives + find "${D}" -name '*.la' -delete || die +} diff --git a/dev-libs/iksemel/Manifest b/dev-libs/iksemel/Manifest index 0bf3ec0b3a99..ed01bd80ffea 100644 --- a/dev-libs/iksemel/Manifest +++ b/dev-libs/iksemel/Manifest @@ -2,5 +2,5 @@ AUX iksemel-1.3-gnutls-2.8.patch 488 BLAKE2B 7834ca7b056b44534cc1c3301c9b58b6603 AUX iksemel-1.4-gnutls-3.4.patch 1656 BLAKE2B 83d8e5f2e5aa7fca4721e35be46ee08cbaf8f6ab66be86e1d01766c567fbf8762ed7e7d13d729afc2b44b460e0fddcc9474e61af3c81fd2696fbe1ed71f57c1f SHA512 305990e760218b1ce59e55aefb31126174f6a8066b9ef20ed3073332ad4e925871709e4c5b52d1e3fcde7b2fc9776dfd3f74a763e897cba4eb45657d3946d518 AUX iksemel-1.4-ikstack.patch 955 BLAKE2B 62223a269c7079fe40a0b835c1a6d2a34d0dd9b3424ae45e0f14712d388547321e66cbce2763bb73065ed53df626a572e6a72d4550e85801e3390a5a61dde7ca SHA512 d97dc724c9b41983e91889e742d604ad9cf752536b012c13a5667c59baa1f5467dc02e7e390e4eba02475e5c994484428c26079351f8e9450b7de14e08eb0cbd DIST iksemel-1.4.tar.gz 515581 BLAKE2B a0e9b8dc6f9dadc04d17d2952034b56c4665c7a9c0549bfb52e3adfbc7fb6af17d1b0de978835081e0d39c8200e41d5528f6b3e1dbf51a4fae160f59d5c474fe SHA512 902e326647b63a5e58b1c396a401bdd136ad01ecabca81b543c0ed76ebd8d2110377015fec1be09551b92651ee093e480fa37aa2186f7791147f29e0933852cc -EBUILD iksemel-1.4-r1.ebuild 883 BLAKE2B f96459bc3115e09e135b52cd143ef7612533351e07db143e071191e4edf4ed28f08ee588ab2e72f7fc65034ff1158398261a2ea1ed6908df6f05240409d0250a SHA512 5107af3aee778cc1fd5a41ba227c5d1ea2eae30a7cfd2643761c3cc70373e9626b3a93d51836496774e3fc2c62ef55774e7abe743ab022d060e3131559aafa9e +EBUILD iksemel-1.4-r1.ebuild 892 BLAKE2B 5295f9a3decdd42a44126a2974a36bc7cdf61a1cdb491cb66770cd724d09cd7a640af2f3fe0b3f61394fe03d8c42c90ff647c8de4f3745ff251c932df6530968 SHA512 bf602eceaa8019efb8f016bb8c3d28e589d03fb732547bd96e9536dc117c6458c6f0f4aee5a92d452d1523af4ef6e884d54317d465c2dc57265504f0c4a3d560 MISC metadata.xml 301 BLAKE2B e3de81d61c491692f64943d6478ab64332cccceac5947b522a6d6b62127217792205e16c2ea9d04de150772b3337a38793a79e950500b43e837f309651cbcd6f SHA512 91ac21f435ad0c2943e17058fec736cb0371690f38427302eb360a284b48017841b807cf5f6f13c6c837af9d1c330dc9a7980ff77a5699e2efe399b01ca840c0 diff --git a/dev-libs/iksemel/iksemel-1.4-r1.ebuild b/dev-libs/iksemel/iksemel-1.4-r1.ebuild index 50766b4d7e71..e74f7323fa59 100644 --- a/dev-libs/iksemel/iksemel-1.4-r1.ebuild +++ b/dev-libs/iksemel/iksemel-1.4-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -11,7 +11,7 @@ SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="amd64 ppc ~ppc64 x86" +KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86" IUSE="ssl static-libs" RDEPEND="ssl? ( net-libs/gnutls:= )" diff --git a/dev-libs/iniparser/Manifest b/dev-libs/iniparser/Manifest index 908f5b44b0e6..70ebef0e4acc 100644 --- a/dev-libs/iniparser/Manifest +++ b/dev-libs/iniparser/Manifest @@ -3,7 +3,6 @@ AUX iniparser-3.0b-cpp.patch 1446 BLAKE2B e538e93d01e8521b9f3726bc4d24fee827f5ae AUX iniparser-4.0-out-of-bounds-read.patch 768 BLAKE2B d1de412aa113ed5e0c7f4f91bc6a18293fa1855b8982bcb1641d3e224c3528c2c0e35398555d12b0db9f08db7c318ce39668b0f6f091db34b063910e0ed31367 SHA512 c7b28f1cf3c853a00c56fbf686adc6ae11d7b6b5d838d6624d92ef6366400ce27a54332e2d17561275db08866bb050d3a4096b8e32ec109477537c839f0808d7 DIST iniparser-3.1.tar.gz 39097 BLAKE2B 4ada36f5bb95476c06deffa7938a750bcdeb0bd5bb817b24274c1e1c588d9abbd23c3a58f3cb3b6f961912f3e12e74aadf224da4cd81863b874e4a84d11c1744 SHA512 8fd8324c5629fdc3e3eff00afb5f0832402ccc760c5b92db82aa29b340ec891419ca2c4fee3a4d4d67cf9bc51c76b095bc0c458e087c2b8e72ac36867c47ae86 DIST iniparser-4.1.tar.gz 44732 BLAKE2B a3480dab512b41eb9635c733b76048ab089a311c2970aae5ce89d103ff6ab1923d5824a5fca3bf445ba213ecd9954018fdef2831fd98c1a43c9ae7d4fb1cb388 SHA512 a8125aaaead1f9dfde380fa1e45bae31ca2312be029f2c53b4072cb3b127d16578a95c7c0aee1e3dda5e7b8db7a865ba6dfe8a1d80eb673061b3babef744e968 -EBUILD iniparser-3.1-r1.ebuild 1124 BLAKE2B 60426fa1400c834afff787171c63412c07fc3f7b091e0b740445b9d8b667e5d58c107c302cd3fe216bf2c500e41f8396bb1552312ae5c5504a83bf78fc118a52 SHA512 367f845f53ee952e7dbb43fcd9716205b0d24c9ac271a5732cc783d5c11c5b85aa2d35dcb7304edf264aeb214aa2db445e761112c87cb3315452562773a33ed9 EBUILD iniparser-3.1-r2.ebuild 1174 BLAKE2B 34cf773316a4448856fccf1f3fab4dfbc14ba847b64dfb71e1da7350b476a1f6a6eec9c082e9d9a953aff544090aaefb623c17e3070a07924db2aec13303af36 SHA512 c472f665c77a614ed87bbd319ddc29c2305e4180388bf34c2355c20d3d2eb3e83e1f29f3ace908f5d0afc65434b26f9dea3e90e029a3fdb0dc70fb0a8ae1819c EBUILD iniparser-4.1.ebuild 1734 BLAKE2B 72bb745a5ef7d4981b1a773d02d4b74d4a6d050f201a63ca9d1dcf64e909d5192b52db804b41bc44150db2e393c56fb6c4205520debf60a0b1b878bba4065173 SHA512 5a7fc67c611460747db3ce304ad9f79b3750f86d757838a7afea3da18e0395dc0d428058090907bcc99d90b5a6e6b174b5105127c94733e5db05c97ac65d716d MISC metadata.xml 435 BLAKE2B 788d24983bfab5491f783ec20479370e6e01686d0f5a379c490a0b93d8379a3062e46b497cb911298df3d0de7f0eaaf1606e11a365e92ca5b93041dc935fc9ad SHA512 452ccec03580def2966c0eb2f50af057776387e01819e1ce5226e628204ea94554658309dfb0c54d413f95ed588f44b84133526b164ae557ad6ac7926aa51a51 diff --git a/dev-libs/iniparser/iniparser-3.1-r1.ebuild b/dev-libs/iniparser/iniparser-3.1-r1.ebuild deleted file mode 100644 index 248075f03d21..000000000000 --- a/dev-libs/iniparser/iniparser-3.1-r1.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=4 - -AUTOTOOLS_AUTORECONF=1 -inherit autotools-utils autotools-multilib - -DESCRIPTION="A free stand-alone ini file parsing library" -HOMEPAGE="http://ndevilla.free.fr/iniparser/" - -SRC_URI="http://ndevilla.free.fr/iniparser/${P}.tar.gz" -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="doc examples static-libs" - -DEPEND="doc? ( app-doc/doxygen ) - sys-devel/libtool" -RDEPEND="" - -# the tests are rather examples than tests, no point in running them -RESTRICT="test" - -S="${WORKDIR}/${PN}" - -DOCS=( AUTHORS README ) - -PATCHES=( - "${FILESDIR}/${PN}-3.0b-cpp.patch" - "${FILESDIR}/${PN}-3.0-autotools.patch" -) - -src_install() { - autotools-multilib_src_install - - if use doc; then - emake -C doc - dohtml -r html/* - fi - - if use examples ; then - insinto /usr/share/doc/${PF}/examples - doins test/*.{c,ini,py} - fi -} diff --git a/dev-libs/input-pad/Manifest b/dev-libs/input-pad/Manifest index 00ce7a43a305..db5419d05ae3 100644 --- a/dev-libs/input-pad/Manifest +++ b/dev-libs/input-pad/Manifest @@ -1,3 +1,5 @@ +AUX input-pad-Wreturn-type.patch 685 BLAKE2B 7b546e11b055214aed8d210033726c6cf37cca82b78e34674b4dab8313b15aff8034598b03cc5ea209beb63fcba410d0dd2b64ec456b288102545edd221108af SHA512 33b5eddfbe7ae0f88202b78d4d82b62e9ea0afa23ee547c32f750bd247621b74b466acfe9d570b0709f167444f9b9d54c43b13f8243356b645e42f3dc7d56307 +AUX input-pad-man.patch 664 BLAKE2B 7e62f50a0c60a0962d6098d7272cc4838c423d8a6b154d8f3b8d8a75d237c63d4171cae445c6ebf0fe97304be829a037d9e32ea46b2e53725282bfebcaacd56c SHA512 8521b2fdbbc36ab6daebc1783f28b3655cb76c5d42d0b05f5daba43be99e670c5471d643a3987906b4707818576923176cfd6d31405ce50027984d6bbc5dc8ec DIST input-pad-1.0.99.20140916.tar.gz 621070 BLAKE2B 93de9327cefc9df883720c1f9aa977c1220580b8b003082c5a84e511c8b83ecd632a45a6b1b86656bf8cc86e818c97cac69d604688eba569dc831488660aabbd SHA512 a7dd7996f69dbb6cc200be3c181e82ef8d701f85f1b27a886a8910afb3e673c1d71878e70b79141570a28a31dd47565868a990a358058ae8b99c29c76a316261 -EBUILD input-pad-1.0.99_pre20140916.ebuild 1098 BLAKE2B fe51f3eb92681985d05e9b012e540887da1c6aad7dbec017a70a70740d454793c92bbd78f597de51dd156aefd38167de38a8524e1264388d323b8d81cbd738a5 SHA512 18a9a03a3f626e2135096ebda56ae3303ab5d1efb2e4b653ff53f95efea421e8be9bcef80997124afd7c4323f58581d627d221b34b0da2efcb30c627edbd0097 +EBUILD input-pad-1.0.99_pre20140916.ebuild 1210 BLAKE2B 9c56990850200dfdbc8026cfd6e8442c94c550b0a9313300b1b4ec72ee59cfa05aa3300858ea506117a6b97f0a900846635a89c277134f23bf3e51ac498d0bb1 SHA512 e49e7634703d5b05e31122c57f6f53ec981042834554c25fbaaecced72eb4ffc38cbbf4fbe0191183273366b730ca9010a50b749714bdebc6a057b5cced26887 MISC metadata.xml 503 BLAKE2B 6cb4521098d6415ede355e21c182363e674fa1407bcf5b4000dfc9f8f182a556c1617fca0b24f6c9ceaa9e2344c999f26c3bf4cafe029c761f2266f7ad4d15a5 SHA512 da6ac24e8d5e575dadabe7e11c128203b8ee16b72297569cf5c3e8071ef85a297bad2b9c1ec634c27909cf88e051bc4f73dc1fb24070ed5789a05bcfd913ce35 diff --git a/dev-libs/input-pad/files/input-pad-Wreturn-type.patch b/dev-libs/input-pad/files/input-pad-Wreturn-type.patch new file mode 100644 index 000000000000..2e50f8bce2b0 --- /dev/null +++ b/dev-libs/input-pad/files/input-pad-Wreturn-type.patch @@ -0,0 +1,23 @@ +--- a/input-pad/window-gtk.c ++++ b/input-pad/window-gtk.c +@@ -5462,7 +5462,7 @@ + + app = INPUT_PAD_GTK_APPLICATION (window_data); + +- g_return_if_fail (app->window != NULL); ++ g_return_val_if_fail (app->window != NULL, 0); + + return gtk_widget_get_visible (GTK_WIDGET (app->window)); + } +@@ -5661,8 +5661,9 @@ + { + InputPadGtkApplication *app; + +- g_return_if_fail (window_data != NULL && +- INPUT_PAD_IS_GTK_APPLICATION (window_data)); ++ g_return_val_if_fail (window_data != NULL && ++ INPUT_PAD_IS_GTK_APPLICATION (window_data), ++ -1); + + app = INPUT_PAD_GTK_APPLICATION (window_data); + diff --git a/dev-libs/input-pad/files/input-pad-man.patch b/dev-libs/input-pad/files/input-pad-man.patch new file mode 100644 index 000000000000..f54580f776ed --- /dev/null +++ b/dev-libs/input-pad/files/input-pad-man.patch @@ -0,0 +1,23 @@ +--- a/input-pad/Makefile.am ++++ b/input-pad/Makefile.am +@@ -226,19 +226,15 @@ + endif + + man_one_in_files = input-pad.1.in +-man_one_files = $(man_one_in_files:.1.in=.1) +-man_one_DATA =$(man_one_files:.1=.1.gz) ++man_one_DATA = $(man_one_in_files:.1.in=.1) + man_onedir = $(mandir)/man1 + %.1: %.1.in + $(AM_V_GEN) sed \ + -e 's|@VERSION[@]|$(VERSION)|g' $< > $@.tmp && \ + mv $@.tmp $@ +-%.1.gz: %.1 +- $(AM_V_GEN) gzip -c $< > $@.tmp && mv $@.tmp $@ + + CLEANFILES += \ + $(BUILT_SOURCES) \ +- $(man_one_files) \ + $(man_one_DATA) \ + $(NULL) + diff --git a/dev-libs/input-pad/input-pad-1.0.99_pre20140916.ebuild b/dev-libs/input-pad/input-pad-1.0.99_pre20140916.ebuild index f884a5d7fb2b..2294addb77a2 100644 --- a/dev-libs/input-pad/input-pad-1.0.99_pre20140916.ebuild +++ b/dev-libs/input-pad/input-pad-1.0.99_pre20140916.ebuild @@ -1,9 +1,9 @@ -# 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 ltprune xdg-utils +inherit autotools MY_P="${P/_pre/.}" MY_PV="${PV/_pre/.}" @@ -27,15 +27,20 @@ RDEPEND="dev-libs/glib:2 eekboard? ( dev-libs/eekboard ) introspection? ( dev-libs/gobject-introspection ) xtest? ( x11-libs/libXtst )" -DEPEND="${RDEPEND} - dev-util/intltool +DEPEND="${RDEPEND}" +BDEPEND="dev-util/intltool sys-devel/gettext virtual/pkgconfig" S="${WORKDIR}/${MY_P}" +PATCHES=( + "${FILESDIR}"/${PN}-Wreturn-type.patch + "${FILESDIR}"/${PN}-man.patch +) + src_prepare() { default - xdg_environment_reset + eautoreconf } src_configure() { @@ -48,5 +53,5 @@ src_configure() { src_install() { default - prune_libtool_files + use static-libs || find "${ED}" -name '*.la' -delete || die } diff --git a/dev-libs/isl/Manifest b/dev-libs/isl/Manifest index 7a28e2e1cf8e..4889b00c8ca7 100644 --- a/dev-libs/isl/Manifest +++ b/dev-libs/isl/Manifest @@ -1,7 +1,4 @@ -AUX isl-0.07-gdb-autoload-dir.patch 871 BLAKE2B c3bbc1db60cbf0c844839f07190e81265e606d7796438be1e7d370f559316f4a0096ce12fc93b583c0663de83592e6f4c50bef838eb42273059ac2cea16e17b5 SHA512 ffe4db1e1bc2199718667d7e3835d5d3fcabfa82402d39ec540fb86641ced3a46d43cd60682188883927c796925679142b4481b231d218bd776cb3c08ef8117e AUX isl-0.19-gdb-autoload-dir.patch 809 BLAKE2B 59dce21b8f0a7226b7b266eebd6226c0821658a548d6b1f896e58f09b03f703162db287df2f2dcaaebe58bcb76ea7e24075802e6df32581cf5e96f3e43ca1e58 SHA512 396c7c00b00c19a269540abf464f6e30d4473c9413d67a436cd4294b3cb53a5c94ab34e8e5c76c863243437d8754edaf924148596e547ef551e6d72c8122ff27 -DIST isl-0.12.2.tar.bz2 1319434 BLAKE2B 53f009dc8093fb3d7d2db40db8f6fd9d7de630777e0308ac3c5918c2c106eda0edd7451df18c954ed6c9fc3ed7d18c73708d7b1f94c8c5c55aa94f8845f5b219 SHA512 b5dea4d6b504fac22f2d8cd9c47d6896994d3966635a514d45010243db44cfbc009574b808f3587f35d91de629110bc11b52941d4075e21f8646c59656e62aea DIST isl-0.22.1.tar.xz 1676948 BLAKE2B cf1661f785344d8132e8f8a339ed8d457677ca1bf943a597d3d0be1e80d8c42e788cdde79fd073d130d681424da7a8e3ca9fa2cd4cd4232220f5c5a1ce99ab99 SHA512 8dc7b0c14e5bfdca8f2161be51d3c9afcd18bc217bb19b7de01dbba0c6f3fdc2b725fb999f8562c77bf2918d3005c9247f7a58474a6da7697390067944d4d4aa -EBUILD isl-0.12.2.ebuild 1031 BLAKE2B 250f4a805da5df7152375487b1266d2f11814078ba9cb26f7eb8f850a78845c083d6126cf65837f3efb119ec7a7f29e4870c0e33ce76f21a53ca89a92efab131 SHA512 03c6813fc31fdb31b307f2440234551bcf72819eac85750b2fbd4d987e431605518568a30a596cd7e372dd779fb9f424ab558c3827bec034891ebff0b7409be9 EBUILD isl-0.22.1.ebuild 1331 BLAKE2B e22315634005c66ad6cb1bc0960d5350233d194044cb7e96bcfdeb97d1228befde5a7f8a699e385e41e09a8420a92d3557f76a1464aa79f8e0235efdeaed244a SHA512 3cb1827059d630d334c22eede743300b0d6b6199525607653b8970bf3b8f4f533ba9c27447f759687643a05975d2a5d7afb8b54354f88c2d3724d50abb898a96 MISC metadata.xml 225 BLAKE2B 901efe1bb7f8f4397683b11d3fbf7ce4ede981f34596ac97d8c1bd77589d4732135b23b9791c2af3cae65ca152a706baaa13a17ea5c777090bab0aae0d64a310 SHA512 2997fa08fd2cfcf45753278a609cf2d75076f97848a83f09ff57b5cb71599495736a3a43f47ad24e1e3940bd937bf37592eff1d917e23f647995daf456e87d73 diff --git a/dev-libs/isl/files/isl-0.07-gdb-autoload-dir.patch b/dev-libs/isl/files/isl-0.07-gdb-autoload-dir.patch deleted file mode 100644 index 58e80b29687e..000000000000 --- a/dev-libs/isl/files/isl-0.07-gdb-autoload-dir.patch +++ /dev/null @@ -1,17 +0,0 @@ -Install python module into gdb auto-load directory. - ---- a/Makefile.in -+++ b/Makefile.in -@@ -2189,9 +2189,9 @@ install-data-local: $(srcdir)/isl.py - case $$libisl in \ - '') echo Cannot find isl library name. GDB bindings not installed.;; \ - *) echo $(INSTALL_DATA) $(srcdir)/isl.py \ -- $(DESTDIR)$(libdir)/$$libisl-gdb.py; \ -- test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"; \ -- $(INSTALL_DATA) $(srcdir)/isl.py $(DESTDIR)$(libdir)/$$libisl-gdb.py; esac -+ $(DESTDIR)$(prefix)/share/gdb/auto-load$(libdir)/$$libisl-gdb.py; \ -+ test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(prefix)/share/gdb/auto-load$(libdir)"; \ -+ $(INSTALL_DATA) $(srcdir)/isl.py $(DESTDIR)$(prefix)/share/gdb/auto-load$(libdir)/$$libisl-gdb.py; esac - - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/dev-libs/isl/isl-0.12.2.ebuild b/dev-libs/isl/isl-0.12.2.ebuild deleted file mode 100644 index 5dceee321adc..000000000000 --- a/dev-libs/isl/isl-0.12.2.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -inherit eutils ltprune multilib-minimal - -DESCRIPTION="A library for manipulating integer points bounded by linear constraints" -HOMEPAGE="http://isl.gforge.inria.fr/" -SRC_URI="http://isl.gforge.inria.fr/${P}.tar.bz2" - -LICENSE="LGPL-2.1" -SLOT="0/10" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86" -IUSE="static-libs" - -RDEPEND=">=dev-libs/gmp-5.1.3-r1[${MULTILIB_USEDEP}]" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -DOCS=( ChangeLog AUTHORS doc/manual.pdf ) - -src_prepare() { - epatch "${FILESDIR}"/${PN}-0.07-gdb-autoload-dir.patch - - # m4/ax_create_pkgconfig_info.m4 is broken but avoid eautoreconf - # https://groups.google.com/group/isl-development/t/37ad876557e50f2c - sed -i -e '/Libs:/s:@LDFLAGS@ ::' configure || die #382737 -} - -multilib_src_configure() { - ECONF_SOURCE="${S}" econf $(use_enable static-libs static) -} - -multilib_src_install_all() { - einstalldocs - prune_libtool_files -} diff --git a/dev-libs/jansson/Manifest b/dev-libs/jansson/Manifest index fbb92f7727b3..d73f262fd467 100644 --- a/dev-libs/jansson/Manifest +++ b/dev-libs/jansson/Manifest @@ -1,7 +1,5 @@ -DIST jansson-2.10.tar.gz 487855 BLAKE2B b1d83ad1a37e66cb7c497284a7958882d5a7e13cec2260d9cc2b5eaef648feea66b70305dec9193f10cf77f37bdda17605277ea41735708ca6a9898b79fef807 SHA512 e331d5c097b4acb0b1df7d90d1d3453c26bd34bfe2e06af0027665bee9efecc2bc61cc7ab5b70dab1262bf80a3315ffb53b4176874fe07e20eee4b9ea7071d44 -DIST jansson-2.11.tar.gz 483686 BLAKE2B 873283a1b41eef1c57fbcb3d4cdb8c33b850d95ee93c800cbcc009e3e9c9e87278beff11800e63894087e51c767dcbd555fbde48163376d53be2bf72b2eac72d SHA512 0ae77cf7ec264536313639458ba20b66e221078cddd209df3ce45c895b897799954abc1ca4b0d5993b974135652804be6bede2825503469d56303470888382f8 DIST jansson-2.12.tar.gz 489154 BLAKE2B cf6bc6d03daba921ec5e033bf57ff0055741cc935adb14d5d4a5f04056fa93c292bf88367db071ef7bb32fbc5d2d6f5f2ce658815a17939bd38ed5c0676ad091 SHA512 e40bdafdfa1fa663f71e00c06d7bfc98cff4ed3581a147894e5272e50fa5f9b9a7af6aaca41ff423a2ddd2554a192b36efcc32f6a3c98c727e9f819b955357cb -EBUILD jansson-2.10.ebuild 842 BLAKE2B af64bdad4ba158adeeadbc300150a217e9f3d20467f23191f1bea15fab3da644fa9e266438fb5678f56667ec60a7dd1b55ffee93d3ddc2986eb0dfdd66fd9fef SHA512 453a1e121cf054b395c209e30632fa0710e023c0b1bfa2452bd14696f87ef9273b46f3a4f7def1cab9f65a7270d7b4929046ebcca3d8294ed8a5511723e2ea44 -EBUILD jansson-2.11.ebuild 817 BLAKE2B 99ccfd23b44723da53c5e82346397d8871eb04cc6ceb831994c65b8133659f57a79db6d7c5c5f8d4994e37e9209777e1c6fc250740e9a82bea7f1123052c9c0b SHA512 62794ce12be688f3e793f3155b7aabd2af7d063ad8e6ca3bf322f15876a0c056eda0276a9ace6c9252e34afa753d5e73dcb05d013324737d64777c757ac35002 -EBUILD jansson-2.12.ebuild 820 BLAKE2B 14b93f916bf78abe59a239b1dce2ab361114f4111fd908caac1927d6ae50963ae73f60ad841adfd58272888679ed0885dcfb31ef27194fbd03eaa823c9ab7a4a SHA512 76322dcd0385251f3bf20af46231aca8bbf607e2989ad0a9f3f263703908c7fb44139c536e2f70ea70584799d8b55fed6cddb52a5dd40a4c907d4370a51f36de +DIST jansson-2.13.1.tar.gz 531924 BLAKE2B e627bd2ba69bf01b053ff13dee903056db86999f774d6863517e67cef7dc9ddcaa747f2edca9de86bd83f37940a394ac9907f7d58069607ee529af08d8514d57 SHA512 e32be6665e41cf1763608c2f1ac4ce0824d4d7ffa5f4a5824cefde279250fdd399d49ba93d8894e16a473731f629b846554654347f027ca9a0a96ed047f10192 +EBUILD jansson-2.12.ebuild 817 BLAKE2B e517e55debf4bd3971c2d93b906a1081baa510222deff3e2c8e09388e28af1891c3d0d43b6800abdbc33b6380bdf5627a8409f6da21d2356c146fb6c2155427f SHA512 500d974d2708280e1ae4a157e39034bab3b73ba56e4aad3ed7ed6e9942165b31500fb92fafcf0b94328fa863ef2c01308069fa1f6f13cb32dcd6287913fc3b2e +EBUILD jansson-2.13.1.ebuild 891 BLAKE2B afd3ae0f565b15b21caf145772d0e18d88233e48bff6e5f108f7a1c9ad48af06c7dc962557bb930b1121976ae19ae3bbfb1c4cfdf8a16c95fffb65815832bb9c SHA512 0119aad5dad85732f2385466f74b4bfb8527cec51e706adea00938e5f63e64acad1317a34d24daf3f736d9be28763b142ea3dfa5f1d1ab0616943cece82303e7 MISC metadata.xml 364 BLAKE2B 98019538f02d8e12711b7e2f72036ad32a2f2b8c2b821a2ba4a0fe113653eb565ac7d447a5d2331d22c13f3bb5bff7484e89438ba82abd9b1d226ea1e8288ecf SHA512 414d6b7630f823690c293214be138c5b6f9748e2d80dda57022404d710b0a9ed78c5c9da4a57e2058368caf7caa8a698eacc9ded1cec5577d0799b21b338de59 diff --git a/dev-libs/jansson/jansson-2.10.ebuild b/dev-libs/jansson/jansson-2.10.ebuild deleted file mode 100644 index bc96765a19c1..000000000000 --- a/dev-libs/jansson/jansson-2.10.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools multilib-minimal - -DESCRIPTION="C library for encoding, decoding and manipulating JSON data" -HOMEPAGE="http://www.digip.org/jansson/" -SRC_URI="http://www.digip.org/jansson/releases/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86" -IUSE="doc static-libs" - -DEPEND="doc? ( >=dev-python/sphinx-1.0.4 )" -RDEPEND="" - -src_prepare() { - default - sed -ie 's/-Werror//' src/Makefile.am || die - eautoreconf -} - -multilib_src_configure() { - ECONF_SOURCE="${S}" \ - econf \ - $(use_enable static-libs static) -} - -multilib_src_compile() { - default - - if multilib_is_native_abi && use doc ; then - emake html - HTML_DOCS=( "${BUILD_DIR}"/doc/_build/html/. ) - fi -} diff --git a/dev-libs/jansson/jansson-2.12.ebuild b/dev-libs/jansson/jansson-2.12.ebuild index 7e824cc73235..68ae0abd38b9 100644 --- a/dev-libs/jansson/jansson-2.12.ebuild +++ b/dev-libs/jansson/jansson-2.12.ebuild @@ -11,10 +11,10 @@ SRC_URI="http://www.digip.org/jansson/releases/${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86" IUSE="doc static-libs" -BDEPEND="doc? ( >=dev-python/sphinx-1.0.4 )" +BDEPEND="doc? ( <dev-python/sphinx-3.0.0 )" RDEPEND="" multilib_src_configure() { diff --git a/dev-libs/jansson/jansson-2.11.ebuild b/dev-libs/jansson/jansson-2.13.1.ebuild index 8fed85e9a635..8b9c7d1b6c5e 100644 --- a/dev-libs/jansson/jansson-2.11.ebuild +++ b/dev-libs/jansson/jansson-2.13.1.ebuild @@ -1,21 +1,21 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit multilib-minimal DESCRIPTION="C library for encoding, decoding and manipulating JSON data" -HOMEPAGE="http://www.digip.org/jansson/" -SRC_URI="http://www.digip.org/jansson/releases/${P}.tar.gz" +HOMEPAGE="https://www.digip.org/jansson/" +SRC_URI="https://www.digip.org/jansson/releases/${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" IUSE="doc static-libs" -DEPEND="doc? ( >=dev-python/sphinx-1.0.4 )" -RDEPEND="" +# dev-libs/jansson-2.13.1[doc]: fails to build with >=sphinx-3.0, #731668 +BDEPEND="doc? ( <dev-python/sphinx-3.0.0 )" multilib_src_configure() { ECONF_SOURCE="${S}" econf $(use_enable static-libs static) diff --git a/dev-libs/json-c/Manifest b/dev-libs/json-c/Manifest index 3497ddb6bdb6..2f7b1fe5e721 100644 --- a/dev-libs/json-c/Manifest +++ b/dev-libs/json-c/Manifest @@ -4,8 +4,10 @@ AUX json-c-0.14-security-fix.patch 4830 BLAKE2B a8df7709bd2924946b038ed724a2e764 DIST json-c-0.12.tar.gz 501419 BLAKE2B 24f035792ff1ba5c39e55bca6ee4ba2509ab71d0374c70b520791f38e1ec4ff2245a282f234fde9f4a02cd9eaaaaa998ce307563a20702c04ee972fdf51f2539 SHA512 c959804362386f6b77e9d04b5fedf6d6aff1fcd0ab50250edb25f759b510b402e7ad4b33d1cbadc3337b63a3145d19f310812a9ee351748348304b384dc2dc35 DIST json-c-0.13.1.tar.gz 639425 BLAKE2B 1da310309f9ce03306a9fd4a161670e460cf0b2222348df7c006902390f74a4cf100aab1ce6ac8a361a278dd917c114a278de5b3445817f3a40ae287478add46 SHA512 e984db2a42b9c95b52c798b2e8dd1b79951a8dcba27370af30c43b9549fbb00008dbcf052a535c528209aaee38e6d1f760168b706905ae72f3e704ed20f8a1a1 DIST json-c-0.14.tar.gz 321677 BLAKE2B 39325988dd58dad589fc0f036c17b2337c81cf7aab8ecb2232f8d59fef9d38df28e096f8d22320e0003799d477debddc4926eaa7a170954263c6b303c1fa056e SHA512 75537c61d0632a01f94d2394d7a4387ef1eca0b68aa56c495d3d96dd29b38ed20eb0cc3f6e5e24dc6660c8939669f8954005d9c3ba20437f3fcc9f9dd896b00d +DIST json-c-0.15.tar.gz 361488 BLAKE2B ae34f6dd45ebee55e6413ecb234e48fa5ae1c17e6fa12462aaaa04e8801457060e176abe90d76d04ad0ee9b903ff467bc3b8ed5816792da175aad8862b9d168e SHA512 dc01298bcc78f0f31a34f5fcfe45c0feebfd88518e97fb4f96f1a652f71ccdd303415a4c7bf5b573bdcbcca80428281f0dfccefc6545ea3a7f18dbb819332f34 EBUILD json-c-0.12.ebuild 916 BLAKE2B 835228c2ad857ff7a698d12400958b8aaa7da2828d92617b36db62e01433a3efbd3704134089b63f3a440489ae03bfcf873c303b35ccca516099d47f7633fb0c SHA512 02b0f07045736394ef18ca98901496c73153043e8825da2039c89607d5d2ca399e70ae371297f0b88ec05caad06a95ba83e589ebc89eea5345ecb12a05b4b3de EBUILD json-c-0.13.1-r1.ebuild 979 BLAKE2B 7df2aca92e501c35826dc6c30e190cbafc2719203bba58bcf525b8d6bb15e3602d4b69c5544032c34e90fd6e9a285cedeab5094e383aa2b0d434660ee8b72b35 SHA512 b7ed1dd4ac4ba08082c244bfe414abc1462491ab03d3ee1756641936323f8c19d6ee45a4681e48f3facd6584c8678e5c200d920950a4533b0b8c345273885056 -EBUILD json-c-0.14-r3.ebuild 1171 BLAKE2B c721f662a31ea9027873323bd09d4e36ea0dd65b532b68a0cb399fb94c6a25a87f90b5607bb9dbef8d76b6bb0b089b7776a037524f4342fac8e44859b2141cb7 SHA512 3b9eafd2027eee5164ad6ff6a952c6ee27490ee62085e5b1dd7803f95acd80e1c36d4bb2a61397355b9efd87ddec0998a8997f0512e314ae234294a513d46aab -EBUILD json-c-9999.ebuild 896 BLAKE2B 50472b5af6d32d7f34260d23cd3104b169950f4d2558e709e4ac1891a5fd3318e3642c24aac053237dddf3164407d028270c7380c211ae7df24679bbc2bccf66 SHA512 e415df947a96271e63acd845b5a61032f7258b9cbfe60771f849c928f0223728f2053b73045163fd5a9601551956567b0f802f893e1077c4a87cfc60020fdd18 -MISC metadata.xml 1000 BLAKE2B 3b29ad6f95a8a66a09a2db159cc3bb6881cca30bf12a6659999c68500b739a5562e67d56380aca518da55f32e4edc117f59200adcb73b51257d34e6e952a460e SHA512 fc23e7b7ab9b16a04e5a1bc85571edb5629d37eb599d76db34ab9d988e54dd4d2ddc98f8e2567a97bc18871c0375cf3353053a67ae7eea47657928f40b363f6f +EBUILD json-c-0.14-r3.ebuild 1239 BLAKE2B 457644ffbce97ecfdfab9a0c5a65ba96c6c8a29c439001af513f4c6a93d4f309a09da08c92597a680a3786b5e25d4fd69d7e1ca8d8935a09dcfec30a4b117fc8 SHA512 84039f735a86db328a40443bf7b06a2b1427e61cd3ea9d25b5bbc9da44d61c74256d698aea4a2a6c7c31787ff1b379b8c5ded801293c54bcfe963a5ea7e3187e +EBUILD json-c-0.15.ebuild 1087 BLAKE2B ab379406d0c4b66ef69440c5871ebe7e26bda599ff605d17f62f774b32e035ab160d012cfe296e7ed40bf95cf3b20fb5918bafc2f1ae537534bf26b935ab2437 SHA512 bc5a606bf685f358fb72471318f70855748597fb48869fd0b944623370c8f1a085593a8022823bd5a2b7233ed8a641bb7343700e59f85bca0defd043b9771a53 +EBUILD json-c-9999.ebuild 1015 BLAKE2B 4d5baa21396b2dba874146c9d8bba5bfbbd69174f7a5fa0a2f2f298c1a7118a72ba3a9f73470b697b20e6fb922dc84933b7aceaf471c2ce6ac20dd0d701b0a15 SHA512 28b3443e3b9bc50d0bb36c6fe1b98d68cc00899f5facbeb421c2e98178255d9d61e105731837ff21cd05f725095b34963121dc09e1147ec08480d30ca8fe4aaa +MISC metadata.xml 984 BLAKE2B 392320cc8a02c2d1cd3190d7f0631771d6be73a131a68602c4f25a22fd6e22e00e491415a36708a739363de526b5497517544f95582f69fbe2dfd8ae89f308f7 SHA512 207f7d87d807b29467e23f7609a2a041eac3a9444d93b23d8950605cc7230212ee44f4e20dffb90d843937876fba63f4b477bc35e5a2cd3118adbc1ce3cc6e05 diff --git a/dev-libs/json-c/json-c-0.14-r3.ebuild b/dev-libs/json-c/json-c-0.14-r3.ebuild index 2b34de77a7fe..0eae66557750 100644 --- a/dev-libs/json-c/json-c-0.14-r3.ebuild +++ b/dev-libs/json-c/json-c-0.14-r3.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://s3.amazonaws.com/json-c_releases/releases/${P}.tar.gz" LICENSE="MIT" SLOT="0/5" KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="doc static-libs threads" +IUSE="cpu_flags_x86_rdrand doc static-libs threads" PATCHES=( "${FILESDIR}/${PN}-0.14-cmake-static-libs.patch" @@ -34,6 +34,7 @@ multilib_src_configure() { -DBUILD_DOCUMENTATION=$(multilib_native_usex doc) -DBUILD_STATIC_LIBS=$(usex static-libs) -DDISABLE_WERROR=ON + -DENABLE_RDRAND=$(usex cpu_flags_x86_rdrand) -DENABLE_THREADING=$(usex threads) ) diff --git a/dev-libs/json-c/json-c-0.15.ebuild b/dev-libs/json-c/json-c-0.15.ebuild new file mode 100644 index 000000000000..06f7928f8f96 --- /dev/null +++ b/dev-libs/json-c/json-c-0.15.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 + +DESCRIPTION="A JSON implementation in C" +HOMEPAGE="https://github.com/json-c/json-c/wiki" +SRC_URI="https://s3.amazonaws.com/json-c_releases/releases/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/5" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +IUSE="cpu_flags_x86_rdrand doc static-libs threads" + +BDEPEND="doc? ( >=app-doc/doxygen-1.8.13 )" + +MULTILIB_WRAPPED_HEADERS=( + /usr/include/json-c/config.h +) + +src_prepare() { + cmake_src_prepare +} + +multilib_src_configure() { + local mycmakeargs=( + -DBUILD_STATIC_LIBS=$(usex static-libs) + -DDISABLE_WERROR=ON + -DENABLE_RDRAND=$(usex cpu_flags_x86_rdrand) + -DENABLE_THREADING=$(usex threads) + ) + + cmake_src_configure +} + +multilib_src_compile() { + cmake_src_compile +} + +multilib_src_test() { + multilib_is_native_abi && cmake_src_test +} + +multilib_src_install_all() { + use doc && HTML_DOCS=( "${S}"/doc/html/. ) + einstalldocs +} diff --git a/dev-libs/json-c/json-c-9999.ebuild b/dev-libs/json-c/json-c-9999.ebuild index eac441be4e78..effac5b4d6ca 100644 --- a/dev-libs/json-c/json-c-9999.ebuild +++ b/dev-libs/json-c/json-c-9999.ebuild @@ -12,7 +12,9 @@ EGIT_REPO_URI="https://github.com/json-c/json-c.git" LICENSE="MIT" SLOT="0/5" -IUSE="doc static-libs threads" +IUSE="cpu_flags_x86_rdrand doc static-libs threads" + +BDEPEND="doc? ( >=app-doc/doxygen-1.8.13 )" MULTILIB_WRAPPED_HEADERS=( /usr/include/json-c/config.h @@ -24,9 +26,9 @@ src_prepare() { multilib_src_configure() { local mycmakeargs=( - -DBUILD_DOCUMENTATION=$(multilib_native_usex doc) -DDISABLE_WERROR=ON -DENABLE_THREADING=$(usex threads) + -DENABLE_RDRAND=$(usex cpu_flags_x86_rdrand) -DBUILD_STATIC_LIBS=$(usex static-libs) ) @@ -35,6 +37,7 @@ multilib_src_configure() { multilib_src_compile() { cmake_src_compile + use doc && doxygen doc/Doxyfile } multilib_src_test() { @@ -42,6 +45,6 @@ multilib_src_test() { } multilib_src_install_all() { - use doc && HTML_DOCS=( "${S}"/doc/html/. ) + use doc && HTML_DOCS=( "${BUILD_DIR}-abi_x86_64.amd64"/doc/html/. ) einstalldocs } diff --git a/dev-libs/json-c/metadata.xml b/dev-libs/json-c/metadata.xml index ca10c6aa7ae5..e822c83364dc 100644 --- a/dev-libs/json-c/metadata.xml +++ b/dev-libs/json-c/metadata.xml @@ -14,11 +14,11 @@ <name>Proxy Maintainers</name> </maintainer> <longdescription lang="en"> -"A JSON implementation in C" is probably the better description, and then -"JSON-C implements a reference counting object model that allows you to -easily construct JSON objects in C, output them as JSON formatted -strings and parse JSON formatted strings back into the C -representation of JSON objects. + JSON-C is a JSON implementation written in C. It implements a + reference counting object model that allows you to easily + construct JSON objects in C, output them as JSON formatted strings + and parse JSON formatted strings back into the C representation of + JSON objects. </longdescription> <upstream> <remote-id type="github">json-c/json-c</remote-id> diff --git a/dev-libs/jsoncpp/Manifest b/dev-libs/jsoncpp/Manifest index 64e61b11daa1..1261a25cde6a 100644 --- a/dev-libs/jsoncpp/Manifest +++ b/dev-libs/jsoncpp/Manifest @@ -1,7 +1,5 @@ DIST jsoncpp-1.9.1.tar.gz 203067 BLAKE2B 654f39b1265b344bb24d3fefb34d4d8b44f69ec819f333f00033ef90acfd5b926fdcc743badf403af797a6f58fe58d195ec0cdf4a1514629f8a1e75c20a6e2f6 SHA512 4a8352e1d32c0ba8a0aea4df1663279cb2256b334643c5b62be37dfb5951e06900ba38c010d1201511fcf7de09137d6a4b886edbb2b99160d2f62b5f4679f766 DIST jsoncpp-1.9.3.tar.gz 212922 BLAKE2B 6f89762e899ffe127705a30c1fe86f458d62fa05b8dbde6c465c73b6855d3945f3d739ff0c26e1a6326a211c946277908684ace9363df72ba0f460f66b3e3fd8 SHA512 f1c035d54ed952d8d4e41acab5c3ecf6aa445f348f98aeac2e7c89555ec2f6421d727b3bc4c2f54176afce137c545b20d886562901953ec091f91890e91e8559 -DIST jsoncpp-1.9.3_pre20200412.tar.gz 212522 BLAKE2B 17b0cc2ef40ae932c6ff26c0fa77e8326099a1b6f088e53697c2a3c286d23ef63dd372f2ba721025b84670957689251c2d15083bdd24565715a78beac556ead2 SHA512 6e58870c5c478fe2bba125c50c4f77654f304051f4091cc5a98f9a3c9aefbb94d1156eb07ce004a7683675fd971ec825a0828803042d9b03783b1debf3a39e2b EBUILD jsoncpp-1.9.1.ebuild 1341 BLAKE2B 5109241c4f6941dc6764593d2f3b9c60dd6e1edba2d98dc980a7645a837fa4821e4cc0ab58b24fbd74532353e411dfad5aa086cece7c7bed7b6f19b4a19a3671 SHA512 c7ee5a71342c57a8c3b44f038812651c1acb6897c308df0946c81b33fc1af684b1ed5dd97e95a9d1532c2c647250b9f91293ec5a0b9e5c4aef3086045472a261 -EBUILD jsoncpp-1.9.3.ebuild 1029 BLAKE2B a64080988f56fae4e45f23c7c672c97732b55f15bad7b40d40de5690cd2511268b247e739e2fcc44bf78b3ff402d8ae29380e1a32e2ae6c63eee014bdc29343d SHA512 f7fa0fcb578b8cb37ab009d3fe752b41321da44e182a1d44857cfd14be0b23cd63090d8adec70013dee2f875b5be71d729e4a2ea796e14f3f61c95d059e9efd7 -EBUILD jsoncpp-1.9.3_pre20200412.ebuild 1118 BLAKE2B 7454688bae7e11a6ee228f0d3235efcd04b74ee73900a1a18dc29fc9b4b25b767a2c7325a9869384b2bdb03202affa7ba3c1ded15cad20d36bc226dfc2aafb78 SHA512 1b63de1ff112e0bb1d7f94161f81227052602ee49be09ae2cce5bdda5819be0ab98246b44880da496b6b927cbd8fa98a3bdc8410e0983f003ab16d7a145416b1 +EBUILD jsoncpp-1.9.3.ebuild 1026 BLAKE2B ba65cafacac63ce802717de8e05e95108371fb7489ff4bd4a29c4fe098ab8fb50fb559b7b284a6c402f42686ba3db2758d62983f4c86d8f8b67c2ced72b15aa6 SHA512 9d6d9e5fd9e45605a5fe24c5f738c7e3bf7b5b2bdcbb67ad4ff4c2abddef1abfd54c2efe4fd2af0b9d431bd51e6379fa778633b64acbc926101f225d4ae4eee4 MISC metadata.xml 403 BLAKE2B 985aad23f9fb2f5353256441788238f78db3c032939ff64bebef834ce57981815ee6a26425d6ccbd60aa55d8c0d2ba6242d7292fa8d8809c217772f0271333aa SHA512 be01555147e932712eeb85ba9ac38bbbf5b5e2647178022cef35c9db82f51171dc6ab25076a32f7eaa6bda93f2a4ec7b836479b81bf33a48a84b622395768088 diff --git a/dev-libs/jsoncpp/jsoncpp-1.9.3.ebuild b/dev-libs/jsoncpp/jsoncpp-1.9.3.ebuild index 36523a5b6ec1..24dcf9487ccc 100644 --- a/dev-libs/jsoncpp/jsoncpp-1.9.3.ebuild +++ b/dev-libs/jsoncpp/jsoncpp-1.9.3.ebuild @@ -10,12 +10,12 @@ inherit meson python-any-r1 DESCRIPTION="C++ JSON reader and writer" HOMEPAGE="https://github.com/open-source-parsers/jsoncpp" SRC_URI=" - https://github.com/open-source-parsers/${PN}/archive/v${PV}.tar.gz + https://github.com/open-source-parsers/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="|| ( public-domain MIT )" SLOT="0/24" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86" IUSE="doc test" RESTRICT="!test? ( test )" diff --git a/dev-libs/jsoncpp/jsoncpp-1.9.3_pre20200412.ebuild b/dev-libs/jsoncpp/jsoncpp-1.9.3_pre20200412.ebuild deleted file mode 100644 index cb7119c28970..000000000000 --- a/dev-libs/jsoncpp/jsoncpp-1.9.3_pre20200412.ebuild +++ /dev/null @@ -1,47 +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} ) - -inherit meson python-any-r1 - -EGIT_COMMIT="90ca694e4697497a8c2bc8c60a9c9f89e7290a10" -DESCRIPTION="C++ JSON reader and writer" -HOMEPAGE="https://github.com/open-source-parsers/jsoncpp" -SRC_URI=" - https://github.com/open-source-parsers/${PN}/archive/${EGIT_COMMIT}.tar.gz - -> ${P}.tar.gz" -S=${WORKDIR}/${PN}-${EGIT_COMMIT} - -LICENSE="|| ( public-domain MIT )" -SLOT="0/23" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86" -IUSE="doc test" -RESTRICT="!test? ( test )" - -BDEPEND=" - ${PYTHON_DEPS} - doc? ( app-doc/doxygen )" -RDEPEND="" - -src_configure() { - local emesonargs=( - # Follow Debian, Ubuntu, Arch convention for headers location - # bug #452234 - --includedir include/jsoncpp - -Dtests=$(usex test true false) - ) - meson_src_configure -} - -src_compile() { - meson_src_compile - - if use doc; then - echo "${PV}" > version || die - "${EPYTHON}" doxybuild.py --doxygen="${EPREFIX}"/usr/bin/doxygen || die - HTML_DOCS=( dist/doxygen/jsoncpp*/. ) - fi -} diff --git a/dev-libs/jsonrpc-glib/Manifest b/dev-libs/jsonrpc-glib/Manifest index bb8d637588cf..b7cd554fb77e 100644 --- a/dev-libs/jsonrpc-glib/Manifest +++ b/dev-libs/jsonrpc-glib/Manifest @@ -1,3 +1,5 @@ DIST jsonrpc-glib-3.32.0.tar.xz 41552 BLAKE2B cea89237cbd622e951b0b4eca02e0aba0f3a9a3dd0db74baa0534ad49671834bf3daab5243d0be6f4e68ed5f441820fb8af1c5f59f7f5a7657280d1c55e5d104 SHA512 c6c52d36d3f8f736bc07c50174ca4a50e3cde6b23928751f260b4482e15cda9726b8279228653e4fde114111592131f344f3c7cf820edcc680fb0b32f9089ea5 +DIST jsonrpc-glib-3.34.0.tar.xz 41792 BLAKE2B 2be0d690e3ead57a7ad71b93d13ad28e23c96d89d36373d93ba608c4ea2aeed3684862938cfb64675cfcba84d9804f6352b877e343ac2af5aed8b2d4b39854f8 SHA512 58908dd11f7848b09e63f7a7ff2185d0742c049ddffb033e768f783bcbcda7e75a658bec923372212694431b25b0fb894e3ea37ce2d7c52c99e49fd230319c10 EBUILD jsonrpc-glib-3.32.0.ebuild 950 BLAKE2B 1a5f899fcd1aa09f924ced35d237fecc2e83178e2df4149cd6973bbe9f5a26e63f56c388bf8e4dfb98f20f3d22a1c14708e3fb628bc46156bb2fad6273f957e6 SHA512 d18ea1e621e48980411ff2aa284acd7f0913b7ba4ca89f4b46fa030331c73a292e7edbacbb5a401e7be7d4d0b6ce34ee6cc9c932cc40dbcaaa919f4f760aa8d1 +EBUILD jsonrpc-glib-3.34.0.ebuild 973 BLAKE2B e4651c021fcb0124577f161deccaf84f12e0fef68c38ae23f0dcccc2f066c152fe0db51ac4dc6cae56144270328d70135d8d61732a7045169592a8d06621af41 SHA512 386ace5ae44be904a324da390b91c5c9300000afa32561d4c6e7f8ff42a8458c1ae1f466508df1d1e45f32e1ce0425db3211b1121e10de8b298748ab2d63e296 MISC metadata.xml 505 BLAKE2B 2319e91326203e3b6173bc52a21d689b6adafff6a08ff2832a28d48e5b537592766b5c7a7ae5c60ea682beaca10e8037a88b05e2f98573441ea611c11e021dc5 SHA512 02f34f7222c80a4568b3c293fa46f45bf64bf1410c529c77271aa9922b22237c8f29ec9724e071cd6485d0e73ec0ea2bee028c6b0763d2c0da736d6aac24b2b3 diff --git a/dev-libs/jsonrpc-glib/jsonrpc-glib-3.34.0.ebuild b/dev-libs/jsonrpc-glib/jsonrpc-glib-3.34.0.ebuild new file mode 100644 index 000000000000..2a4c35ea0539 --- /dev/null +++ b/dev-libs/jsonrpc-glib/jsonrpc-glib-3.34.0.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit gnome.org meson xdg vala + +DESCRIPTION="JSON-RPC library for GLib" +HOMEPAGE="https://gitlab.gnome.org/GNOME/jsonrpc-glib" + +LICENSE="LGPL-2.1+" +SLOT="0/1" +KEYWORDS="~amd64 ~x86" + +IUSE="gtk-doc +introspection test vala" +REQUIRED_USE="vala? ( introspection )" +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-libs/glib:2 + dev-libs/json-glib[introspection?] + introspection? ( dev-libs/gobject-introspection:= ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + vala? ( $(vala_depend) ) + dev-util/glib-utils + virtual/pkgconfig + gtk-doc? ( dev-util/gtk-doc ) +" + +src_prepare() { + use vala && vala_src_prepare + xdg_src_prepare +} + +src_configure() { + local emesonargs=( + -Denable_profiling=false # -pg passing + $(meson_use introspection with_introspection) + $(meson_use vala with_vapi) + $(meson_use gtk-doc enable_gtk_doc) + $(meson_use test enable_tests) + ) + meson_src_configure +} diff --git a/dev-libs/keystone/Manifest b/dev-libs/keystone/Manifest index 4a83047cea23..4a524243c2f7 100644 --- a/dev-libs/keystone/Manifest +++ b/dev-libs/keystone/Manifest @@ -2,4 +2,4 @@ DIST keystone-0.9.1.tar.gz 4326151 BLAKE2B 2d41388f4beeff3c424386c77cb75eeca613c EBUILD keystone-0.9.1-r1.ebuild 1990 BLAKE2B 58a06e5983847c4e0c67ec4b84628eaf62e5fab8acdafd60e7b18a4b03d518c545fe372304bec7ac286d70456a8fce993515eea3520d72b7f4ccf7723e6c6e15 SHA512 08a33874baf524cd32526c684c5f9b66bdfe7054b09def953e952bece51a2bfc3a6dd462a001f4104e510c412dca32627b7d5aea43d6bbfb209e68c90412916b EBUILD keystone-0.9.1.ebuild 1740 BLAKE2B f1266df26be8551da6310d93d6e4972458c0692136ba02d2741dbb7cf75de629c0190f48ce58e8a630e662fc165605e708a4420edddcf3025c0ddd2834d7e421 SHA512 e3941b5166ef543cba6d6247e21aa6a8b0c49aa7faa72a0b28375012160134bcdb2f7029ead47b13e604fc373d3b948729e37b395c5485554c580ada86b5a9fa EBUILD keystone-9999.ebuild 1990 BLAKE2B 58a06e5983847c4e0c67ec4b84628eaf62e5fab8acdafd60e7b18a4b03d518c545fe372304bec7ac286d70456a8fce993515eea3520d72b7f4ccf7723e6c6e15 SHA512 08a33874baf524cd32526c684c5f9b66bdfe7054b09def953e952bece51a2bfc3a6dd462a001f4104e510c412dca32627b7d5aea43d6bbfb209e68c90412916b -MISC metadata.xml 464 BLAKE2B c4a2f085ab1343377cc2f2579511924578e22d74b1204ed517e8cebfd163455b36bae21cf6454ae5a723b52d50a7fb228db363f38d0de032ab1ee5e84c6ccaf1 SHA512 b1b21373ba08d12d1e6508dc7aea5f65922436cd71eb864f20da08214e93d419a181da6af4a59397e632cdd27d279efaaac3bdf91e28c1b6145f61fdf2ae4490 +MISC metadata.xml 256 BLAKE2B 3e4f2745a843bada1b6d70aa80041aa3235d81b928ad329e3e01d8dbfc65c4408e73b7f0a2ed11b838fe25dcd6c20e2ef6461a3a9a08a81176eca079e22e203d SHA512 2d6b8edd67d5030357e85c8262e76ef07bae042f07c1061f4883554436236790086cf77b27d0fd107ebeeb2f4d9f30f47be0d831c907e4cfc84c2e99bda188d5 diff --git a/dev-libs/keystone/metadata.xml b/dev-libs/keystone/metadata.xml index 4283547f970d..0e605aea5762 100644 --- a/dev-libs/keystone/metadata.xml +++ b/dev-libs/keystone/metadata.xml @@ -1,14 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>nemunaire@nemunai.re</email> - <name>Pierre-Olivier Mercier</name> - </maintainer> - <maintainer type="project"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> + <!-- maintainer-needed --> <upstream> <remote-id type="github">keystone-engine/keystone</remote-id> </upstream> diff --git a/dev-libs/kpathsea/Manifest b/dev-libs/kpathsea/Manifest index cebf295c3ecb..b75a8af5f8b6 100644 --- a/dev-libs/kpathsea/Manifest +++ b/dev-libs/kpathsea/Manifest @@ -3,5 +3,5 @@ DIST kpathsea-texmf.d-10.tar.xz 12784 BLAKE2B fcd9b46504c58da90babcbd1e5d4ea655d DIST texlive-20200406-source.tar.xz 55383320 BLAKE2B 3bc024166ebfc269389531c7cf818b062856cd2dcc27cf0a2e790f07cd941d9905c9c6a54566ea627ea1ca334d2b6da8d3e5bd1c686dc9d6f8ac15aac388c1e3 SHA512 65be52cb5e1b52f12feb62c6cf23e56c581b9dccb8d3b9ccc85c12c62b0cb67dd71de8d22d967d2cbf8403502c66bccb238523d13a0d081be104fc9f9c68b477 DIST tl-kpathsea-2020.tar.xz 32324 BLAKE2B bf4365d3ae47ce5344916d6622d40c121a34e722d166c983224f356c75d1b3e10216182ee79a76cf1dc703741e5302d8b427215a72af3060bae05b698ac0c316 SHA512 53887f73784f96528081bf9ce39fdaff3c94b2af1827cc2da7abddf2821c86c45f014ddcb624b24ed6265b7de25132dd106040f736fea180c122c9026f6cd101 DIST tl-kpathsea.doc-2020.tar.xz 1066608 BLAKE2B 02f9fd2e704392c6b82af9317418f4baeead00d02a204db0e7d58ba5eb9da6047a0bfd235123964c78bed5da68e79bd0964f943331f2ceb03ff591fd4efba266 SHA512 fd9d0de2cc576ced6ad5d0ba6dd07d0f8a1e63dc473de849148b5a7890277122f7a37ea6476db20ff3b56546cd467126a881505aa60ef66a86a232e35e3f3303 -EBUILD kpathsea-6.3.2_p20200406.ebuild 3267 BLAKE2B 1cf390c6a3bc554f63a9181423f2f85c5fbe00123063d59b2dd5232a8de3efae234b448ca37823cb61fd52ba47e0b69e46ef6594a04120e62f2c80a5808330ff SHA512 0d274cbe4761e4202cb5c91a011d7940821cd3a846b28c7c544d5b005fdedbcb05996fb82021dcc7f008775b1e83c1dde0d5899b8306ef91b74992d7e45a3985 +EBUILD kpathsea-6.3.2_p20200406.ebuild 3265 BLAKE2B 864d57842e1150697945d4ba154ae74b394ba989ec4c530bbf3f9a9fcc729ddfe1aa42e83dd92db8a83c73921b982ca784effaddc66f5211e0bcdf59266af267 SHA512 9c7a8ac5df1ff86f5258152f154dfab3b8acf2b49e78529a0eaf753c54811d35775d9a08b7f21e04cdf3209f4e28037036aab347b414df8138d7857b6e0d9a6d MISC metadata.xml 358 BLAKE2B b5a2e9424ef1e5bb23c34e089d9204443dd5ad528b56db71d2fc2b3c5d428c14367805ca94a307f8856d21356abe76092c54ba0f0df204b5bce3665f9f3fd657 SHA512 51f6411780af5d7775f8f80d246d5f4e297abb1960a0b0c21c6dc5c03a9a407dad8cbc4977a679590cffb4523f1b72a0f7b15ab100c938391a5abfd3e17e8818 diff --git a/dev-libs/kpathsea/kpathsea-6.3.2_p20200406.ebuild b/dev-libs/kpathsea/kpathsea-6.3.2_p20200406.ebuild index 8a18b3f69af2..b473c1a6adda 100644 --- a/dev-libs/kpathsea/kpathsea-6.3.2_p20200406.ebuild +++ b/dev-libs/kpathsea/kpathsea-6.3.2_p20200406.ebuild @@ -86,8 +86,8 @@ src_install() { # by texmf-update rm -f "${ED}${TEXMF_PATH}/web2c/fmtutil.cnf" - dosym /../../../../etc/texmf/web2c/fmtutil.cnf ${TEXMF_PATH}/web2c/fmtutil.cnf - dosym /../../../../etc/texmf/web2c/texmf.cnf ${TEXMF_PATH}/web2c/texmf.cnf + dosym ../../../../etc/texmf/web2c/fmtutil.cnf ${TEXMF_PATH}/web2c/fmtutil.cnf + dosym ../../../../etc/texmf/web2c/texmf.cnf ${TEXMF_PATH}/web2c/texmf.cnf newsbin "${S}/texmf-update" texmf-update diff --git a/dev-libs/kpeoplevcard/Manifest b/dev-libs/kpeoplevcard/Manifest index ae8d984a023d..aa3a4ea08821 100644 --- a/dev-libs/kpeoplevcard/Manifest +++ b/dev-libs/kpeoplevcard/Manifest @@ -1,3 +1,3 @@ DIST kpeoplevcard-0.1.tar.xz 13424 BLAKE2B 567b5f081283da8af26e03c3e46c50bf67524146171a6f8afa938ac9609d11bfe32ad8de39a29ec0431af135f33825149fb8e98a28141941fd418539a8f03c30 SHA512 9f11ee768d1ddce1f03f41b604180078c0315eb8b9f0118dd99eba65333400b0a0ed12ab1e08ebce3c6c0a2c93563e5c3e832a0cd458d6ea296bd64eeb9413e7 -EBUILD kpeoplevcard-0.1.ebuild 629 BLAKE2B dad8b701fac20b68cfde74f23186d823ae265654d300da6c9c89f93f366f724e33bf28085ae9d62df8c568ecd6bb708eac495c2b1791a2f18552244157706946 SHA512 7fbec934a3790500fe8cdbf222a145595a2558c1c7e545ed2ca4ea8b4e5a264c30e28ede20c0e3cf08af423e5b194f487d4afd88c76e84a739ee5ba8f1dccd3c +EBUILD kpeoplevcard-0.1.ebuild 628 BLAKE2B 72c43b73dbf114dfbe054079c02fadec23ecd2015f49ef8b4b56f3752a62bfde16ea3f10c22e1800df24ce1f916c3e1b97b16ca960dc56d3b99204606c07b8f2 SHA512 2c5824805d20e8155c7f27effa172af7a731c47725f90e05779f6c6bffebfc3784310763a449c40226c7d97fe99e964eaf8533a280cd974b97214ed8ebbafa8d MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 diff --git a/dev-libs/kpeoplevcard/kpeoplevcard-0.1.ebuild b/dev-libs/kpeoplevcard/kpeoplevcard-0.1.ebuild index bfa637c05761..7d21913d4eb4 100644 --- a/dev-libs/kpeoplevcard/kpeoplevcard-0.1.ebuild +++ b/dev-libs/kpeoplevcard/kpeoplevcard-0.1.ebuild @@ -12,7 +12,7 @@ HOMEPAGE="https://invent.kde.org/pim/kpeoplevcard" if [[ ${KDE_BUILD_TYPE} = release ]]; then SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz" - KEYWORDS="amd64 ~arm64 x86" + KEYWORDS="amd64 arm64 x86" fi LICENSE="LGPL-2.1+" diff --git a/dev-libs/leatherman/Manifest b/dev-libs/leatherman/Manifest index 06787a33b371..d0ec8bf4cb52 100644 --- a/dev-libs/leatherman/Manifest +++ b/dev-libs/leatherman/Manifest @@ -1,8 +1,12 @@ AUX portage-sandbox-test-fix.patch 2010 BLAKE2B 8e9e180c180f2059f57c953a9c828164a96b07d6a3054b555c572c6c80e79dbf5092da5fb23e9fb95f3db0bff02788ef4a9ac40483b1673382f4c1d11b0b3833 SHA512 35bfb2d3b1ca98cf7f10e9356e899532516d4a9671b0cebca1780e602ef53f9a5705ee6c4c03d70aecad163faccdce6ec15d7e32f00ebcda946d0cf6638a22a2 +AUX shared_nowide.patch 4627 BLAKE2B c29dae187c0056956498487e0b6c8a88b74253f5d221df3f274da9bea7ae5163b76f3027df99e06fec7999274751c6d173db6ca7ec896a687536d7199c1b4827 SHA512 cc05ed7250728490955cc464d3a32ce4d81cfd7a9518487fc7d0f7a397eb0ac522e474cfadc036f233080e508f148f644c41764e31f99b76ab75403a7ca78486 DIST leatherman-1.11.0.tar.gz 815946 BLAKE2B 73afb7c517ea93d0c3dc1c88adb3e5041c764bbfb223357b14a6a3f864ff614d178e7a71293eb533f09013fe3f64d5afe40c9404882d2fe6836da7322e869d8f SHA512 0cbc558ba6976d4f14947efbc59e2ebc306a8c7e4590a22fa2e2f044b37ffd8804dbabaf96c599c47394fd9379f2de1330ce5282237b5009730d8d3b87349ae5 DIST leatherman-1.12.0.tar.gz 815947 BLAKE2B cc268275f7ef7e9bddca9a2ca25c1a6b0bca64d57f90a485b83103a2477d476a39fe91ccf46798f1885b29c697de6556890131c7aac2a9e61590edab66fd6ea7 SHA512 2ceb16f94bf3d06bfe477a40e15db5a1d3d3999eaa7023245a08ab4e0054179f28308d9bf6ba73a839ca3a68130259894593fc8e77664b672ac5f3d20511a4d2 +DIST leatherman-1.12.1.tar.gz 816002 BLAKE2B 286bbc24971b2769c8fae73a274b05ce34ad5469f8647681869cecf133f2c3d9c9fab75327fd610aa8957c359baed645c221aa0670789a0f75888f624ea473a7 SHA512 d2bb2b9aab2749df61fb29e984a9058165851c0d4dce45efb102673dbb2e7b56d12005db106f967a6e5ad93b37ea7f7ed88337bf41ffb503db8b2152c87151ad DIST leatherman-1.3.0.tar.gz 434229 BLAKE2B e0c19bca2378afc4928554ac0862543504ba725aadc6cffd78220f7f7f1b725cad960fc6d9fdd2d54a43c233b35959ebcb9c71d1191a5535703599fa32e3301e SHA512 5e06be7add652f69b0d4a8d778e33dfb68183c4d598217cc6542d2431f7984f0af989c27bd69e89b77ab03d6dd2adab9d70f68cd87dae20d8e24ae05923fbe9b EBUILD leatherman-1.11.0.ebuild 1147 BLAKE2B c267b48f61cc2aa9f9c20ba4359c6bfe32454992d3604a6f09840eea6f009917ffe189f6571749d1955f0376233a1094f154dc7a329c88ad22ffcced7e7004e9 SHA512 d39ca1b889b5cb42125f52ffdd510712914041e0ad66835ad16a452989acf5636c66154ae29528ceefbb801e72e8c8206e741872403977d5d0865d22a891671f EBUILD leatherman-1.12.0-r1.ebuild 1493 BLAKE2B df12a29ba362646dba648b0208a8d96cb2b7f5766626a32020618fdac4bb903457ab7ab12c5f23ffdfe8cbc2599eee8a29914559f1015a2fcb41ac707e465370 SHA512 60bb18f8c4b580d64e49eb594fa321e06b3167b8bea9edc4d019e639964ff02fe7ab2329518b0c0ef26cfa5e93db1f994ea1da4ccde62cd947e86eb0780e605b +EBUILD leatherman-1.12.1-r2.ebuild 1327 BLAKE2B 005078e2c9134eb470c2bd653ccd34b7131427d0d86b95bae5117df553b19888f218083c48ab7f4a9892e54dcffa3e7a67030b2b449cb9a297041bfe39b938b4 SHA512 35e7561d08c736cdfea0990183888094521541df8c18a88e937fa6f9dbb23ef56cad91ce042e2b0fc83a9e0e98516abcb5f9affa539095559947a461fc42bc72 +EBUILD leatherman-1.12.1.ebuild 1493 BLAKE2B df12a29ba362646dba648b0208a8d96cb2b7f5766626a32020618fdac4bb903457ab7ab12c5f23ffdfe8cbc2599eee8a29914559f1015a2fcb41ac707e465370 SHA512 60bb18f8c4b580d64e49eb594fa321e06b3167b8bea9edc4d019e639964ff02fe7ab2329518b0c0ef26cfa5e93db1f994ea1da4ccde62cd947e86eb0780e605b EBUILD leatherman-1.3.0.ebuild 1061 BLAKE2B 256d795d7d96de0cbdc2da569049d4a9378c25b440b364d79d3e2144b25b565ca729028a63a21e5f9493effb252daf7f38ce693a90e5b06eaf0aea24206cc829 SHA512 a2cde05565eb7eca2410f556d87f999e098f8e17ad51686d0225be193da2e3a367137630461564c51fb1cc0b8b429f912a0defbeec823e89e842187737c14b87 MISC metadata.xml 340 BLAKE2B 01f27cfaa9f6a13507f19e336f6171dd9b7321bd3ab7954b381d8200614a5e5e3706ab40d2472b6aaf2c0b2191c7d49c36fe9f8b218824101f85577fb700470c SHA512 f4b877e9d23996a6fca8d3c72c90bdc4a80e5218dcaea4f4c461473dff3d30db2aacc389bb156db6085ba02766ca69868842514ee6317c58373372cca4c48cf1 diff --git a/dev-libs/leatherman/files/shared_nowide.patch b/dev-libs/leatherman/files/shared_nowide.patch new file mode 100644 index 000000000000..4f5f67045fb6 --- /dev/null +++ b/dev-libs/leatherman/files/shared_nowide.patch @@ -0,0 +1,108 @@ +diff --git a/nowide/CMakeLists.txt b/nowide/CMakeLists.txt +index ff9dba6..5d1b9ce 100644 +--- a/nowide/CMakeLists.txt ++++ b/nowide/CMakeLists.txt +@@ -1,7 +1,5 @@ + find_package(Boost 1.54 REQUIRED) + +-add_leatherman_includes(${Boost_INCLUDE_DIRS} "${CMAKE_CURRENT_SOURCE_DIR}/../vendor/nowide/include") +-add_leatherman_headers(../vendor/nowide/include/boost) + if(WIN32) + add_leatherman_library(../vendor/nowide/src/iostream.cpp) + endif() +--- leatherman-1.10.0/execution/CMakeLists.txt~ 2020-06-03 10:30:05.027479897 +0100 ++++ leatherman-1.10.0/execution/CMakeLists.txt 2020-06-03 10:30:18.871483297 +0100 +@@ -1,4 +1,4 @@ +-find_package(Boost 1.54 REQUIRED COMPONENTS regex filesystem system) ++find_package(Boost 1.73 REQUIRED COMPONENTS regex filesystem system nowide) + + add_leatherman_deps("${Boost_LIBRARIES}") + if ("${CMAKE_SYSTEM_NAME}" MATCHES "SunOS") +@@ -10,7 +10,6 @@ + add_leatherman_includes("${Boost_INCLUDE_DIRS}") + + leatherman_dependency(util) +-leatherman_dependency(nowide) + leatherman_dependency(locale) + leatherman_dependency(logging) + leatherman_dependency(file_util) +--- leatherman-1.10.0/file_util/CMakeLists.txt~ 2020-06-03 10:30:05.031479898 +0100 ++++ leatherman-1.10.0/file_util/CMakeLists.txt 2020-06-03 10:31:04.550494516 +0100 +@@ -1,9 +1,8 @@ +-find_package(Boost 1.54 REQUIRED COMPONENTS regex filesystem system) ++find_package(Boost 1.73 REQUIRED COMPONENTS regex filesystem system nowide) + + add_leatherman_deps("${Boost_LIBRARIES}") + add_leatherman_includes("${Boost_INCLUDE_DIRS}") + +-leatherman_dependency(nowide) + leatherman_dependency(locale) + leatherman_dependency(logging) + leatherman_dependency(util) +--- leatherman-1.10.0/logging/CMakeLists.txt~ 2020-06-03 10:30:05.035479898 +0100 ++++ leatherman-1.10.0/logging/CMakeLists.txt 2020-06-03 10:30:19.092483352 +0100 +@@ -4,7 +4,6 @@ + add_leatherman_deps(${Boost_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}) + add_leatherman_includes("${Boost_INCLUDE_DIRS}") + +-leatherman_dependency(nowide) + leatherman_dependency(locale) + + if (CMAKE_SYSTEM_NAME MATCHES "Linux" OR CMAKE_SYSTEM_NAME MATCHES "SunOS") +--- leatherman-1.10.0/tests/CMakeLists.txt~ 2020-06-02 23:24:17.146002133 +0100 ++++ leatherman-1.10.0/tests/CMakeLists.txt 2020-06-02 23:26:17.780054923 +0100 +@@ -1,8 +1,8 @@ +-set(BOOST_REQUIRED_COMPONENTS system date_time chrono log log_setup thread filesystem regex) ++set(BOOST_REQUIRED_COMPONENTS system date_time chrono log log_setup thread filesystem regex nowide) + if (LEATHERMAN_USE_LOCALES) + set(BOOST_REQUIRED_COMPONENTS ${BOOST_REQUIRED_COMPONENTS} locale) + endif() +-find_package(Boost "1.54" REQUIRED COMPONENTS ${BOOST_REQUIRED_COMPONENTS}) ++find_package(Boost "1.73" REQUIRED COMPONENTS ${BOOST_REQUIRED_COMPONENTS}) + + include_directories(BEFORE ${LEATHERMAN_CATCH_INCLUDE} ${LEATHERMAN_INCLUDE_DIRS}) + add_executable(leatherman_test main.cc ${LEATHERMAN_TEST_SRCS}) +--- leatherman-1.10.0/util/CMakeLists.txt~ 2020-06-03 10:05:44.277172451 +0100 ++++ leatherman-1.10.0/util/CMakeLists.txt 2020-06-03 10:06:52.969185017 +0100 +@@ -1,10 +1,8 @@ +-find_package(Boost 1.54 REQUIRED date_time chrono system) ++find_package(Boost 1.73 REQUIRED date_time chrono system nowide) + + add_leatherman_deps(${Boost_LIBRARIES}) + add_leatherman_includes("${Boost_INCLUDE_DIRS}") + +-leatherman_dependency(nowide) +- + if(WIN32) + set(PLATFORM_SRCS "src/windows/time.cc" "src/windows/environment.cc" "src/windows/scoped_handle.cc") + set(PLATFORM_TESTS "tests/windows/environment.cc") +--- leatherman-1.10.0/file_util/src/file.cc~ 2019-12-14 20:46:29.000000000 +0000 ++++ leatherman-1.10.0/file_util/src/file.cc 2020-06-02 22:42:45.100963441 +0100 +@@ -1,6 +1,6 @@ + #include <leatherman/file_util/file.hpp> + #include <boost/nowide/fstream.hpp> +-#include <boost/nowide/cenv.hpp> ++#include <boost/nowide/cstdlib.hpp> + #include <boost/filesystem.hpp> + #include <sstream> + #include <leatherman/logging/logging.hpp> +--- leatherman-1.10.0/util/src/environment.cc~ 2019-12-14 20:46:29.000000000 +0000 ++++ leatherman-1.10.0/util/src/environment.cc 2020-06-02 22:42:45.101963441 +0100 +@@ -1,5 +1,6 @@ + #include <leatherman/util/environment.hpp> +-#include <boost/nowide/cenv.hpp> ++#include <boost/nowide/cstdlib.hpp> ++#include <boost/system/error_code.hpp> + + using namespace std; + +--- leatherman-1.10.0/util/tests/environment.cc~ 2019-12-14 20:46:29.000000000 +0000 ++++ leatherman-1.10.0/util/tests/environment.cc 2020-06-02 22:42:45.103963442 +0100 +@@ -1,6 +1,6 @@ + #include <catch.hpp> + #include <leatherman/util/environment.hpp> +-#include <boost/nowide/cenv.hpp> ++#include <boost/nowide/cstdlib.hpp> + + using namespace std; + using namespace leatherman::util; diff --git a/dev-libs/leatherman/leatherman-1.12.1-r2.ebuild b/dev-libs/leatherman/leatherman-1.12.1-r2.ebuild new file mode 100644 index 000000000000..c432e0dcd956 --- /dev/null +++ b/dev-libs/leatherman/leatherman-1.12.1-r2.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake-utils multilib + +DESCRIPTION="A C++ toolkit" +HOMEPAGE="https://github.com/puppetlabs/leatherman" +SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +IUSE="debug static-libs test" +#RESTRICT="!test? ( test )" +RESTRICT="test" # restricted til we don't need the shared_nowide patch +KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86" +SLOT="0/${PV}" + +RDEPEND="net-misc/curl" +DEPEND=">=dev-libs/boost-1.73:=[nls] + net-misc/curl + >=sys-devel/gcc-4.8:*" + +PATCHES=( "${FILESDIR}"/portage-sandbox-test-fix.patch ) +PATCHES+=( "${FILESDIR}"/shared_nowide.patch ) + +src_prepare() { + sed -i 's/\-Werror\ //g' "cmake/cflags.cmake" || die + # vendored boost lib conflicts with boost 1.73 and above + cmake-utils_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DCMAKE_VERBOSE_MAKEFILE=ON + -DCMAKE_BUILD_TYPE=None + ) + if ! use static-libs; then + mycmakeargs+=( + -DLEATHERMAN_SHARED=ON + ) + else + mycmakeargs+=( + -DLEATHERMAN_SHARED=OFF + ) + fi + if use debug; then + mycmakeargs+=( + -DCMAKE_BUILD_TYPE=Debug + ) + fi + cmake-utils_src_configure +} + +src_test() { + "${WORKDIR}/${P}"_build/bin/leatherman_test +} + +src_install() { + cmake-utils_src_install +} diff --git a/dev-libs/leatherman/leatherman-1.12.1.ebuild b/dev-libs/leatherman/leatherman-1.12.1.ebuild new file mode 100644 index 000000000000..9a442087026a --- /dev/null +++ b/dev-libs/leatherman/leatherman-1.12.1.ebuild @@ -0,0 +1,65 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake-utils multilib + +DESCRIPTION="A C++ toolkit" +HOMEPAGE="https://github.com/puppetlabs/leatherman" +SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +IUSE="debug static-libs test" +RESTRICT="!test? ( test )" +KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86" +SLOT="0/${PV}" + +RDEPEND="net-misc/curl" +DEPEND=">=dev-libs/boost-1.73:=[nls] + net-misc/curl + >=sys-devel/gcc-4.8:*" + +PATCHES=( "${FILESDIR}"/portage-sandbox-test-fix.patch ) + +src_prepare() { + sed -i 's/\-Werror\ //g' "cmake/cflags.cmake" || die + # vendored boost lib conflicts with boost 1.73 and above + sed -i '/nowide/d' CMakeLists.txt + sed -i '/nowide/d' file_util/CMakeLists.txt || die + sed -i '/nowide/d' windows/CMakeLists.txt || die + sed -i '/nowide/d' execution/CMakeLists.txt || die + sed -i '/nowide/d' logging/CMakeLists.txt || die + sed -i '/nowide/d' util/CMakeLists.txt || die + cmake-utils_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DCMAKE_VERBOSE_MAKEFILE=ON + -DCMAKE_BUILD_TYPE=None + ) + if ! use static-libs; then + mycmakeargs+=( + -DLEATHERMAN_SHARED=ON + ) + else + mycmakeargs+=( + -DLEATHERMAN_SHARED=OFF + ) + fi + if use debug; then + mycmakeargs+=( + -DCMAKE_BUILD_TYPE=Debug + ) + fi + cmake-utils_src_configure +} + +src_test() { + "${WORKDIR}/${P}"_build/bin/leatherman_test +} + +src_install() { + cmake-utils_src_install +} diff --git a/dev-libs/level-zero/Manifest b/dev-libs/level-zero/Manifest index 658116c76b4c..6b12b795fd00 100644 --- a/dev-libs/level-zero/Manifest +++ b/dev-libs/level-zero/Manifest @@ -1,3 +1,5 @@ DIST level-zero-0.91.10.tar.gz 291352 BLAKE2B eaec1aa89b529b84d312f21c91e03c9ae2911193ad25a3884b677108bd3cf18d70b56174f515ac6ec2d61de0a80bb70bdf98834e4f932729e5809855ba42d087 SHA512 d98caa0ec135dc111ba8d34c2102f704e384cf6f6eb8ff147642cb1ce1de2fc96804e4f35e68df41a7e5404ba3702e87ec29f2334b19d39752351af5f5c999cc +DIST level-zero-1.0.0.tar.gz 448583 BLAKE2B 21c3bfe3b960c153e5bfd2f57d84d5297fc0cbcdb2cab954f1e9669e966d02e756c8a5726b2aaead01a834b8b362130d30c12b7590384d629de36c713c0629c1 SHA512 69fd0f8a951dba44be8e41897824261d105ff27ba7924b86bcd97c00d3be41f4ad1ad5eeb08f1c8361c802fd3e76715cfd6c2e21ca83c16a603490b2ce111887 EBUILD level-zero-0.91.10.ebuild 884 BLAKE2B a8ab92c96765be2b7515ff63fa3c1e185ee7ee4a317cda770794caf520fcd33fa77e7becc577f58e7bac040bb5d6215f84672ab5550079ed3013fdc50a4d9d7c SHA512 44ce70eb8c71b9f462f376017d186d1c066d90c780f8200793866ee7ad501797add2d7c3bc97d1329bda39811a266660f556e6177d87524a04432f51e5133a5d +EBUILD level-zero-1.0.0.ebuild 729 BLAKE2B 1a9e381c8eea4036a1243b316db9a3ce50365b4d76d800ffbcda9eb75d43bd5c57848312f1898631b6c1e6eafd257af3c352d61e862e8307a0335daf09978cdd SHA512 176e351e56076881fe20d95438cd1d38a4feaaab5ebe9df9b5438109b2abe04130a926cf4137afcdfca84e1ac64665622619a8c6fe06a1e6d49965a7b634139f MISC metadata.xml 332 BLAKE2B fc1fda0254b44ee3a749ffca43baf6317073bbe9c992f520ebf8a7f2556c8380bad425644f0737d2db4e91316da39cef1e32e5e6ba56d9844cfaa0ca5b8236db SHA512 af6011c8ada6ad21e7e7b8b7f2aab8607ce3b2eb2284848e8168be35416b9f1be516b3b0980a1b6c57d8c8aaa86b31bc45375cc5b2778f1c509df3450c63a43a diff --git a/dev-libs/level-zero/level-zero-1.0.0.ebuild b/dev-libs/level-zero/level-zero-1.0.0.ebuild new file mode 100644 index 000000000000..f2b9ea21cd99 --- /dev/null +++ b/dev-libs/level-zero/level-zero-1.0.0.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake + +MY_PV="$(ver_cut 1-2)" +MY_P="${PN}-${MY_PV}" + +DESCRIPTION="oneAPI Level Zero headers, loader and validation layer" +HOMEPAGE="https://github.com/oneapi-src/level-zero" +SRC_URI="https://github.com/oneapi-src/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64" + +S="${WORKDIR}/${MY_P}" + +src_prepare() { + cmake_src_prepare + # According to upstream, release tarballs should contain this file + # - but at least some of them do not. Fortunately it is trivial + # to make one ourselves. + echo "$(ver_cut 3)" > "${S}"/VERSION_PATCH || die "Failed to seed the version file" +} diff --git a/dev-libs/libaio/Manifest b/dev-libs/libaio/Manifest index 923be4bf7b01..175f2e6a1963 100644 --- a/dev-libs/libaio/Manifest +++ b/dev-libs/libaio/Manifest @@ -11,6 +11,6 @@ DIST libaio-0.3.111.tar.gz 44557 BLAKE2B dc2f44599218de0ca80cfc17f604eb85c9b1241 DIST libaio-0.3.112.tar.gz 46977 BLAKE2B 088f3b195a65bdc97ae2318e47af17c65259ed3208dca7bfef93c81a800602085e5b2078dbd436c740be316d0ebd923a1b3b7c0808257e2e7c7fb0f7ae1e0dba SHA512 5f984529c9f747a6c82f1e4457fc0832bb1fc299ae6e700f2ac5a8ea7b9bfc6ea1e75809728cc115a020cff6685ed1f4e38c6aeacc1ea98dfccce04dd19dafaa EBUILD libaio-0.3.110.ebuild 2250 BLAKE2B a1f396b417bb1b8c2579e3ca589d9e6df24818b13084d09fd480a8f64ab19eef5aa2a543f7e467786ef4177ebce3bf60b8f893b21ddcdc529e0026f14a1f6c74 SHA512 569e5ec134506b4e20f4eeb586dd88e3f2bdefcb737300fb4c6f103876207d1bd60fdb76f2e3b1b4d4ca4984a96efb1ee924d16547e1faf36dbeca28507c12b0 EBUILD libaio-0.3.111.ebuild 2232 BLAKE2B 81065497e191a4e62b17d61df604b073522dbe9ced1ebd162081fca73765fcec638cc2d40ddf70daa11480c75ea51ef3197fc4905791721db96a7cb5721c4a82 SHA512 0f374c61ef9f6567739b5d948749184ef8e60ab5c9bf005f20339ed5199a954a64816998fcc060bd7b953fc17db02bca4654f8d426c2c088f07437e1fcb4797d -EBUILD libaio-0.3.112.ebuild 2133 BLAKE2B fe7d9b4ce5833f1c69d3a8fd96ca96fbed6a6a3c258c11ede1cced85ea0bea6bdcf69fc0465ba34807a40e18a7e2969dabe7b7b40ad68edce4e20c80adb0ee1b SHA512 b66c4a780ba95d16eb7e0c9f8bd7d432c864a22bcfa3d06d6954de02e95c891a1dda29893da944ebd1b817ac83afdbc351ede92f065059c50861c7a17d100232 +EBUILD libaio-0.3.112.ebuild 2129 BLAKE2B 56dc8f7ac296ea12520b676537cd018dca5c46a251776f9f402182e79c0e090ebd4bfbf6ccb1f1bc3aca9c7551b4ae337e6cf9601193f01a63068f6bcc58b8f1 SHA512 bc57b38b63795f6b1be71cbccc2cc72597b9684ed6b855919affd9a0da088d310ab07bbd8d11bddc475ba5cdb719f835e743f4afad6ccc24db99f4a2faa21f92 EBUILD libaio-9999.ebuild 2133 BLAKE2B fe7d9b4ce5833f1c69d3a8fd96ca96fbed6a6a3c258c11ede1cced85ea0bea6bdcf69fc0465ba34807a40e18a7e2969dabe7b7b40ad68edce4e20c80adb0ee1b SHA512 b66c4a780ba95d16eb7e0c9f8bd7d432c864a22bcfa3d06d6954de02e95c891a1dda29893da944ebd1b817ac83afdbc351ede92f065059c50861c7a17d100232 MISC metadata.xml 414 BLAKE2B 291cfb45ed8ed29e916e1873b00685eb32f2cfdca2f225176028fda48335bff8369d1084565acc79d58bcf1c69af752efc0f7d30fa775406be03ce432c56c5df SHA512 31c76d1e4bb0c87402c00bdef098bf930b273cdf6c631a704fb02f925a3cdfebcded9d33d31f10cdd8c9ae2ab9bb71dd2cd0113029df501ad83a5a92b611b7c8 diff --git a/dev-libs/libaio/libaio-0.3.112.ebuild b/dev-libs/libaio/libaio-0.3.112.ebuild index 6ddf6077967e..3cd164570b4f 100644 --- a/dev-libs/libaio/libaio-0.3.112.ebuild +++ b/dev-libs/libaio/libaio-0.3.112.ebuild @@ -12,7 +12,7 @@ if [[ "${PV}" == 9999 ]] ; then EGIT_REPO_URI="https://pagure.io/libaio.git" else SRC_URI="https://releases.pagure.org/${PN}/${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" fi LICENSE="LGPL-2" SLOT="0" diff --git a/dev-libs/libarcus/Manifest b/dev-libs/libarcus/Manifest index 07d8858ff800..e4c0febe392b 100644 --- a/dev-libs/libarcus/Manifest +++ b/dev-libs/libarcus/Manifest @@ -8,4 +8,4 @@ EBUILD libarcus-3.6.0.ebuild 1121 BLAKE2B 060bf6c289603efb42deec75419d01ca4e566f EBUILD libarcus-4.2.0.ebuild 1027 BLAKE2B 029645fa5e8c62b062f4ddbd2dbc0ecabcfc7d2833481024de1a0bd308a126c7529850049fc45f1e051f94a3b82d87869fa8e002b99a2df4794f1092ad9d3e09 SHA512 e3c7c30e082c55851acb1bd08d81f5c20261e09fdf5d88395e393b47ef0bbcc020e64b5183b79d12e62f7e519a19b3a1eb8a89c1ee7d986f94564240fdfcf60a EBUILD libarcus-4.3.0-r1.ebuild 1396 BLAKE2B ace6fed8c7a8b8db4829737c3b1b8d99a0d8ccb53688de4e029b39b7391b8a8771388f818eac032164c2efd74110a6bc987bc3d05dc81758eaabcbf24b5cff7b SHA512 9ec58979bafc8a7d4e5d0e334d0e12d3716fbffd4d2d9060cb52b9f061a06c676a95c0cafa8a344b22b8dcd855e3a41794d7669f4f037290d951acc6bcd0763a EBUILD libarcus-4.6.1.ebuild 1413 BLAKE2B b86d88ae8593f0604b1aed03d4463bec146eeb3ffe7b9387a3e4a40fa4aaaa02dfbfd2fcf75441012aeea630700e606a7f0d2fbb5e164e5100b4792795d94dd3 SHA512 d96d6c1dc57ae1364d6776ab0eadfa05633982fc43e0275cb9b488813b73157849c8b11b64d8eaf479dd26c137680a6873c11726fedd1348bcedab9bdaa8a3da -MISC metadata.xml 860 BLAKE2B 9375bca572d46d985fbbf11b222728cdaba22c2fde64e1b4a057d2920b9845bf442bb35ce0b2b1e78fc949cd687604f9f89d5b5665e3cee7afe5b69f09f5ed2b SHA512 9dbfeff3c641642edfd27fbbd27d2ef5810833e4cb3ae5b949c1a20c27377ac70364010fc9fbc759f456e93f294af62f3c08c59bb0585a3ca01f5cd157b3b33e +MISC metadata.xml 1175 BLAKE2B 61f841d29c806ed268ad8012ec6207ad00e404d31ce17ab6a94a72a5b14bf4f7c4220ad95ba527f4004f04fdfce7fa6aa868297bae1842467c7e8bfd022977c8 SHA512 7d2add76530f8977dc69996c7e627e7ecb7f875b4d048b866f2a61c198b457a672bea2173a3bfdc32a68e6f455d484c3a884683a01d785c1fed3d2741d61ac49 diff --git a/dev-libs/libarcus/metadata.xml b/dev-libs/libarcus/metadata.xml index dce895cd5780..87e4648615f3 100644 --- a/dev-libs/libarcus/metadata.xml +++ b/dev-libs/libarcus/metadata.xml @@ -21,6 +21,11 @@ <email>perlovka@gmail.com</email> <name>Michael Perlov</name> </maintainer> + <longdescription> + This library contains C++ code and Python3 bindings for creating a socket in a thread and using this socket to + send and receive messages based on the Protocol Buffers library. + It is designed to facilitate the communication between Cura and its backend and similar code. + </longdescription> <slots> <subslots>soname major version number</subslots> </slots> diff --git a/dev-libs/libbase58/Manifest b/dev-libs/libbase58/Manifest index 872586ea3052..3e6728fc432d 100644 --- a/dev-libs/libbase58/Manifest +++ b/dev-libs/libbase58/Manifest @@ -1,3 +1,3 @@ DIST libbase58-0.1.4.tar.gz 6718 BLAKE2B d192499920a11f95037a46eb02b19ea5cbedefb14541c22a7c72568a69f4ccc0ed9223883fffd3337f12b718f3e39f11888c95a87b1fec481829989bd73dc741 SHA512 9b36fd7308a1a5486d77cb9baeeac49669a2c823998ff0885fee0757d6fca374f796b743e69af087e20a58b95556faf6c48106e034c09879937d96dae5fc7ac9 EBUILD libbase58-0.1.4.ebuild 559 BLAKE2B 9194cf1bf7f8f6e5b065f5043efaabfee32e6de8f7d743c45189e9149224b677ef6e310649d1c5b17fd53d715882035514426d5b417ae786d8840b4bd91acab2 SHA512 9d7718bf1cb20eb8208adff9bb65e44ef32ca0804ce403a8868c4ad47b333ca50498d84a758bc0f4c06070a2120ed0896b30106911e9cd8c7d8dcd3e511916f0 -MISC metadata.xml 546 BLAKE2B 1413ae2bc127ed7211cf09a60a1d6073b028ca98ce462455c92ca1e6ddd2c28464e8265287a1e756d2bfb9a67e85c11fa527ff8cc66f20d6bd37e5b817a95877 SHA512 766b8355e21921af57a858ae7ecdb43b643022bea1d0a7e88f4636aad70a92e81807a573303d4ca5432b543bb309002bf525ab25f73e0e5d33d3ab0114ccf2c0 +MISC metadata.xml 546 BLAKE2B 82f8c4af155cefd55772b9bb93f62ca3ac7bebe9ce51519066ee9439293933490d279a6f0da794d1b39fc7eb1a8bf04ccd911685a11f262549957fcc2bdca476 SHA512 2944ee72c2a86666eba6ad64046c1d607b816ab8f2a0c1f3cc38805ebd4c95f9169afc4438a523298ac0a0038c2d9ea702571fb407fb7bf87d8e8fcb3b2ea052 diff --git a/dev-libs/libbase58/metadata.xml b/dev-libs/libbase58/metadata.xml index 7beabae51605..a2e814a17c26 100644 --- a/dev-libs/libbase58/metadata.xml +++ b/dev-libs/libbase58/metadata.xml @@ -6,7 +6,7 @@ <name>Anthony G. Basile</name> </maintainer> <maintainer type="person"> - <email>luke_gentoo_bitcoin@dashjr.org</email> + <email>luke-jr+gentoobugs@utopios.org</email> <name>Luke Dashjr</name> </maintainer> <use> diff --git a/dev-libs/libbpf/Manifest b/dev-libs/libbpf/Manifest index 8ac742ce2000..2f273a515ac2 100644 --- a/dev-libs/libbpf/Manifest +++ b/dev-libs/libbpf/Manifest @@ -1,13 +1,16 @@ AUX libbpf-0.0.5-paths.patch 997 BLAKE2B e84f5349131a1ab7f976e60baf74fa030b28214daca198db2a6d6b436bdf536aa89e58f39ab10a2cf9dbbf192a159cd1231b68dc3292396e1164950b1514de3d SHA512 47ccd456abf37cdf7e986633eb5a90c16963e5d99608f0c3dd6b035466a0ffe6769001d2bf448c2da88f6427fdac658f364b960a072949523a964ae01836add0 AUX libbpf-0.0.7-paths.patch 1020 BLAKE2B 6a194c3ecf8ec2600e50b02d231a282a489d3d283ac3e91d6d6cd788fb30881fe245aec073175a801f2f030bca03733a50bc31ed6cf4531ee5c364d19a19f590 SHA512 d8447688a4ea8cb8604882d6534c96309e407701627559c229b372e773c46ed9fe2b879677ebd70d30865b27debb18193173a8adb6e24305ecadcd8b57630e2d +AUX libbpf-0.0.9-fix-hashmap-on-lp32.patch 1681 BLAKE2B 9728e6508da6703576d1bdf78dc17a6a2d8952c99a5b1c1bd2aef8a9712a8e29a127b1d2681837effe4a5f1653e68228b44819596dc49ca4970770208e5bf56b SHA512 6c0226e75612bf48297f2a363b8788931b283390c0a7e155b00fc6383ec943b06e28da29b6a43a1e3a76f4599000150a1b3eb352e44a892d07cf830afc32efab AUX libbpf-9999-paths.patch 1020 BLAKE2B 6a194c3ecf8ec2600e50b02d231a282a489d3d283ac3e91d6d6cd788fb30881fe245aec073175a801f2f030bca03733a50bc31ed6cf4531ee5c364d19a19f590 SHA512 d8447688a4ea8cb8604882d6534c96309e407701627559c229b372e773c46ed9fe2b879677ebd70d30865b27debb18193173a8adb6e24305ecadcd8b57630e2d 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 273726 BLAKE2B 1277ce5b9dab9037e287910c43a71ee33cd6607d7cbe59d40c6930bf49407e04fcdfa6f4795f98202930fd564c1569c2feef0bca73294334f00abd601a288ed0 SHA512 d54bbdee6f7ea83ffef3fd0abe07f71644bcf83e5cf4a307fb4e03d885503617f1af2d324cc869f0f01a92bcb58836780a4802ac4db83b9f037ea196edc1131a +DIST libbpf-0.1.0.tar.gz 666896 BLAKE2B 5923b4c8fb915722f8cc2015ab8f07773a83c4252a59aef784983e46db7cd784e8ff5cc2284d3f5ded6bb92957f8d73b367a35fa1b5693e0cacaaef414a2f410 SHA512 3a5d823e4751408fd9e3bafe0be0a6a78de7dea0114bbd1166d8b3887938eef4e355ba6221b4bded9fc8a8280edede606c8c8078fd40aebdeaebbbb38f4221fe 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 +EBUILD libbpf-0.0.9-r1.ebuild 1059 BLAKE2B 0605fbeaa1da1de10e51ee0bcaa0b355bcff883734ee0a80ab44bea1960d6ea04960d6207e2a27278bba1716333df10684adebf9ea833f471dc07b981a9ecb37 SHA512 420a4b0daf9178266793113ef97aa90c5cf44a233256b65b8e60829873c90343af8606d17a138589aa5ff728cd42b85afe70f4bf9b3851112edb9a7a0c69c672 +EBUILD libbpf-0.1.0-r1.ebuild 1157 BLAKE2B 876830f71d9f39683088881e1d3f37fe314a2b3057c3cfce1677a82e6f4bfddc2244499ed50c247c1e7221536242ccd06de1aa343406a47479c94935bf03a871 SHA512 bd206fb3c86cd3dca235afc909224219bad0bbcf636b6f690d90460443162710577ad4736ccca2e77376b1668271bdb12c7ad98d5e7e73fa30cae48caf79acdd +EBUILD libbpf-9999.ebuild 1156 BLAKE2B bb01f0ee3f26e065c38295a8ab1d9983ab214f5477d0913c9d15bc703718de6fa22e2f8a4d7933d3c4da1c6c02293fefd774040919ef745f171edecd25f60cdd SHA512 d55c4d73534e97e5b0c2e49486ed89097e482450b26ba098d0ee7f640c53a9b2d6e3b17c70958a619a7714311b40fab1de514542adc1e0d60ecfd60bc2d0d497 MISC metadata.xml 305 BLAKE2B d5a605019f99aa1bb75e405bface00e9006038c60d280bdab31ac9a42e3bcf75e2884b3efc8be4e2a88f7e35769b610f0480ccfba291444e8d4ddaecf73a57f9 SHA512 38df62cf50255dcd59c3ab6961643379e549eb568f2c0d010cd8bf73a93fceb0dbdbb32af7b07f21475b4146f99e684aad6928963e56ea8d6777b8f63f8d8a41 diff --git a/dev-libs/libbpf/files/libbpf-0.0.9-fix-hashmap-on-lp32.patch b/dev-libs/libbpf/files/libbpf-0.0.9-fix-hashmap-on-lp32.patch new file mode 100644 index 000000000000..98baf1cd6051 --- /dev/null +++ b/dev-libs/libbpf/files/libbpf-0.0.9-fix-hashmap-on-lp32.patch @@ -0,0 +1,49 @@ +From cd016d93f7bf280fe6f2dfc723257786dd3ffd00 Mon Sep 17 00:00:00 2001 +From: Jakub Bogusz <qboosh@pld-linux.org> +Date: Thu, 9 Jul 2020 15:57:23 -0700 +Subject: [PATCH] libbpf: Fix libbpf hashmap on (I)LP32 architectures + +On ILP32, 64-bit result was shifted by value calculated for 32-bit long type +and returned value was much outside hashmap capacity. +As advised by Andrii Nakryiko, this patch uses different hashing variant for +architectures with size_t shorter than long long. + +Fixes: e3b924224028 ("libbpf: add resizable non-thread safe internal hashmap") +Signed-off-by: Jakub Bogusz <qboosh@pld-linux.org> +Signed-off-by: Andrii Nakryiko <andriin@fb.com> +Signed-off-by: Alexei Starovoitov <ast@kernel.org> +Link: https://lore.kernel.org/bpf/20200709225723.1069937-1-andriin@fb.com +--- + hashmap.h | 12 ++++++++---- + 1 file changed, 8 insertions(+), 4 deletions(-) + +diff --git a/hashmap.h b/hashmap.h +index df59fd4..e0af36b 100644 +--- a/hashmap.h ++++ b/hashmap.h +@@ -11,14 +11,18 @@ + #include <stdbool.h> + #include <stddef.h> + #include <limits.h> +-#ifndef __WORDSIZE +-#define __WORDSIZE (__SIZEOF_LONG__ * 8) +-#endif + + static inline size_t hash_bits(size_t h, int bits) + { + /* shuffle bits and return requested number of upper bits */ +- return (h * 11400714819323198485llu) >> (__WORDSIZE - bits); ++#if (__SIZEOF_SIZE_T__ == __SIZEOF_LONG_LONG__) ++ /* LP64 case */ ++ return (h * 11400714819323198485llu) >> (__SIZEOF_LONG_LONG__ * 8 - bits); ++#elif (__SIZEOF_SIZE_T__ <= __SIZEOF_LONG__) ++ return (h * 2654435769lu) >> (__SIZEOF_LONG__ * 8 - bits); ++#else ++# error "Unsupported size_t size" ++#endif + } + + typedef size_t (*hashmap_hash_fn)(const void *key, void *ctx); +-- +2.26.2 + diff --git a/dev-libs/libbpf/libbpf-0.0.9.ebuild b/dev-libs/libbpf/libbpf-0.0.9-r1.ebuild index 43363c91efae..b01f2de058d8 100644 --- a/dev-libs/libbpf/libbpf-0.0.9.ebuild +++ b/dev-libs/libbpf/libbpf-0.0.9-r1.ebuild @@ -24,6 +24,7 @@ S="${WORKDIR}/${P}/src" PATCHES=( "${FILESDIR}/libbpf-0.0.7-paths.patch" + "${FILESDIR}/libbpf-0.0.9-fix-hashmap-on-lp32.patch" ) src_compile() { diff --git a/dev-libs/libbpf/libbpf-0.1.0-r1.ebuild b/dev-libs/libbpf/libbpf-0.1.0-r1.ebuild new file mode 100644 index 000000000000..1c2508425132 --- /dev/null +++ b/dev-libs/libbpf/libbpf-0.1.0-r1.ebuild @@ -0,0 +1,53 @@ +# Copyright 2019-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit flag-o-matic toolchain-funcs + +if [[ ${PV} =~ [9]{4,} ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/libbpf/libbpf.git" +else + SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm64 ~x86" +fi +S="${WORKDIR}/${P}/src" + +HOMEPAGE="https://github.com/libbpf/libbpf" +DESCRIPTION="Stand-alone build of libbpf from the Linux kernel" + +LICENSE="GPL-2 LGPL-2.1 BSD-2" +SLOT="0/${PV}" +IUSE="+static-libs" + +COMMON_DEPEND="virtual/libelf + !<=dev-util/bcc-0.7.0" +DEPEND="${COMMON_DEPEND} + sys-kernel/linux-headers" +RDEPEND="${COMMON_DEPEND}" + +PATCHES=( + "${FILESDIR}/libbpf-0.0.7-paths.patch" +) + +src_compile() { + append-cflags -fPIC + 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/libbpf/libbpf-9999.ebuild b/dev-libs/libbpf/libbpf-9999.ebuild index 08e5746d4bf0..6697b1c3a061 100644 --- a/dev-libs/libbpf/libbpf-9999.ebuild +++ b/dev-libs/libbpf/libbpf-9999.ebuild @@ -1,9 +1,10 @@ -# Copyright 2019 Gentoo Authors +# Copyright 2019-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit toolchain-funcs +inherit flag-o-matic toolchain-funcs + if [[ ${PV} =~ [9]{4,} ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/libbpf/libbpf.git" @@ -11,8 +12,9 @@ else SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64 ~arm64 ~x86" fi +S="${WORKDIR}/${P}/src" -HOMEPAGE="https://www.kernel.org/doc/html/latest/bpf/bpf_devel_QA.html" +HOMEPAGE="https://github.com/libbpf/libbpf" DESCRIPTION="Stand-alone build of libbpf from the Linux kernel" LICENSE="GPL-2 LGPL-2.1 BSD-2" @@ -25,13 +27,12 @@ DEPEND="${COMMON_DEPEND} sys-kernel/linux-headers" RDEPEND="${COMMON_DEPEND}" -S="${WORKDIR}/${P}/src" - PATCHES=( "${FILESDIR}/libbpf-9999-paths.patch" ) src_compile() { + append-cflags -fPIC emake \ BUILD_SHARED=y \ LIBSUBDIR="$(get_libdir)" \ diff --git a/dev-libs/libbson/Manifest b/dev-libs/libbson/Manifest index fe5db67c7a80..35553af04d31 100644 --- a/dev-libs/libbson/Manifest +++ b/dev-libs/libbson/Manifest @@ -13,6 +13,7 @@ DIST libbson-1.13.1.tar.gz 5740487 BLAKE2B 92184df6f15f951564a7df14d8ec52eb0199a DIST libbson-1.14.0.tar.gz 6573651 BLAKE2B 0b1157473554a5aa49e61cf1c85dc7b1f1917581e661a4295876d4c93e72137b4c7c04e1b7545ba7272706499dbe868a36f1c888d2d07a8176f1c4dc01f9fa5f SHA512 99ca4001341d044a8ffc02a5d7175d40f8a998bdaad15a668a7db0558fa616ec18152faeda6da7f28b34c5d2cf4b649180c9390d2229e1342b6c4f6742816994 DIST libbson-1.15.1.tar.gz 6699867 BLAKE2B afb75b6f50173bbe161a37a5cd3afd7d2ce3d9ab73019e2a27e2b15b0be0a54c5e3b423dda2e6d65b85ff7c1dbbd883f3a0e0ebc244a13c531d2c39297d9a5e9 SHA512 7544900809dd008da110b412acc1e5e42ea908d804fdf3bced8100e48f1695844605407c9733b285b8833b636bcaec8687df25a01c9749612c61df2325214fe5 DIST libbson-1.16.2.tar.gz 6888287 BLAKE2B 40d2b73f495a8c71ca8b3c39c1b3c85b4a01ea088428967ed49f4758ef749e3288b046bde767a83aad022933f30f7307a4be65141f477bb1dcf912b4099129d6 SHA512 0930a80692f08329cad558644c25c46da64a0c8b6a9fc7412db0f547dae63bf59e9d29ee774d329c63af186eea751670bf21ccee8cf255f8bc8d5bd78c0e736a +DIST libbson-1.17.0.tar.gz 7092911 BLAKE2B f93de6f3ded0f22ff8af65113ed207ca6dcc8ecbaedb24b33ddf7ada93b913eae33a802245f386d75fef01bf53c2d9630e68138a5715de001b7acea7dbde05f1 SHA512 49889b9d777dc3cb151b9cbef7bc2dd1785e327ae641569281efcc040d208cb034da3a74ae1115a033cc86e5b70079dab76c3478df8f171cc083d686f7568858 DIST libbson-1.3.5.tar.gz 4547720 BLAKE2B e5e258344aea0969ac74d88d040a464b72d460a13776c5c8c639e569ed3208fabd2641e850bf035c6889b466ddcc33d487da0aeab58f308bee7446b5fd0a31a1 SHA512 b55ae1d424f786aabed6567a77cd09aa26c74ab0a09392e88faef8c156b1650c026f86f245bc8431a0ebcf404c4f80eb1b22e978a24289d32692c84375a66596 DIST libbson-1.3.6.tar.gz 4546329 BLAKE2B fa9102cd02e40e0ddb7518d34502f6ff63109b91af18a2285422530dae8c6cc04041b7589f340f2e6ed7a80e2474fea2684001b7ced5e8c911d4ba51e1a6edcc SHA512 a7da914ed0f03212d4fb01879543f0b2c7629923e33200fe30335a9a90a1082ffa2566c7a556b90a6c7ffbef5665a45ec67f87ffff2a5fcb89830769b1df5130 DIST libbson-1.6.2.tar.gz 4835257 BLAKE2B ebe20a6c9ac8a4fcbd8e838d1a7cd319a6b31956690aa2dfca2be42eaafb646405ea01fe2bf20b2dc21bf933c0eafc330fd45409f7c902a7bf0c0641cfe0891d SHA512 f95f5bb829cff3aac6c1d95a159e38396d8fccef66d3026dac8085ba13ec376274cddeb92277d711ac4d40cafd8b89b73e9a9d1cf29e22f7f79aa9422c69488b @@ -28,7 +29,8 @@ EBUILD libbson-1.13.0.ebuild 949 BLAKE2B 66d9d8d61397c5c09ae66f01fddf9f200a893be EBUILD libbson-1.13.1.ebuild 924 BLAKE2B 7c1d43932fdbb16e0b21f81fe81d5b52adc60341463affe63746f6e014137721f3a300dcbd08e51da092336f5fb19357cbec2e667b09263c0773df21e7b3552b SHA512 78d83659129ef419351106ddc48584a5ba8de957df2f6dfe9dd6dd2bc00e7fa3aaf6023fd74ecffe57470a6324126fa5efed8b4dbfb547bbb588304eb7384f4f EBUILD libbson-1.14.0.ebuild 1011 BLAKE2B 1fd3f9eabb58d7851351e122f0e5f1c83705aedd9fabb60afa4479d4ff54f3e98b83502c526c9b7737c4e00f51ea0153c60dceadcde3e79e3dc829f6b3124a84 SHA512 389b9149d0b3a3e47bac57f9c5435586be324493ee194349225850a84590de921ac189af4f4438ec87164029d74d267c0a12c2ee86941a244e5f9a6ac183b4ab EBUILD libbson-1.15.1.ebuild 1011 BLAKE2B 1fd3f9eabb58d7851351e122f0e5f1c83705aedd9fabb60afa4479d4ff54f3e98b83502c526c9b7737c4e00f51ea0153c60dceadcde3e79e3dc829f6b3124a84 SHA512 389b9149d0b3a3e47bac57f9c5435586be324493ee194349225850a84590de921ac189af4f4438ec87164029d74d267c0a12c2ee86941a244e5f9a6ac183b4ab -EBUILD libbson-1.16.2.ebuild 1099 BLAKE2B 643da07f4d77092e406fbf950417bd859a78711ed37360f2896ebdd85560e4759cb9dd62eb322e0b15e073593433dbce6172b9bc4df371dee0ef5bec47e615db SHA512 5c0dfe65b6269d328a9c578c2c2e8de19f410b81017096b08535d0d587f66e7081cbecafb7b4be944744a9f72020c99d0c529247de47c16c519ea68dcd2276d1 +EBUILD libbson-1.16.2.ebuild 1105 BLAKE2B dbf2c09216d0b1d3cabc583a80f2d7f4f67519eadb8d27709c46aa6dea3eec658f3fb3ee8dd78972ab1cca25ce548d93328d7e4e53ea5597b338ba5405b05a7b SHA512 4e31f2d52cf21dfb17a067fc4928f918433e26b1f535323861d92f7dca6805a8c0a142a5c8b069bcc29146d419fedc0e4632717c0aeea72d634b0c2634f85490 +EBUILD libbson-1.17.0.ebuild 1058 BLAKE2B b45b4ea5065e8e2a4c71353af6d271fe181c966ef7aa4e5f645383109ad96d7a76e7e5908e03f25250c18d8434f28bdb77d1e9ae3b1bdac32d6b791906846283 SHA512 9eef615d32dbd7015355995d9fefd7b5b06adf72320af27b8892f370c0329cbbe86c4022290670482aa096b1d27d5933824b3d9bc25adeb48a5ac39c79bd0ff4 EBUILD libbson-1.3.5.ebuild 1145 BLAKE2B 6467960799504edf6ad9ecd42af2ec474e0884cc63380cf736a0e771a5994f7aac46236965c5345dc4f5576ea4fdc7070c9d4579a1189e96dd9200dcd079cdf5 SHA512 015f73d09a48b70c80943cccfcba82a4978bcbbf72e41d5f44fb3137b81384f78e3811528f5292b4d57d88ebfdeab03f2779552ecd0359b5a460d054eabe83e5 EBUILD libbson-1.3.6.ebuild 1127 BLAKE2B c712b6aa9fc634c293446adeacdd8c7d97056a2c219bbf2bd2954f911778b7001c091e2044c3ab607e576d4a3124121576aaad528d0f1a5c9f2b549c43008117 SHA512 0b814d017de2a19d79dc7502e9b25d924b20d4358c88b5a8180695b2559b9ffde1bd906180614548551c7e5cea2fc528485dd5460989d14cce8ba0f61c6b6ee3 EBUILD libbson-1.6.2.ebuild 1029 BLAKE2B f0a06a4ce9183946888f5ccc420e14c14ea2efa69904816355d5cfba5f69ead47bfbd385f2bd9b905e9af670f9476be3163551c1677694c6ebd55091fed46a0c SHA512 1dfdf5109c4ddc3820fa445c22aa0f8ca49bd141cbd6ef733bcfd689dce291b31073f172e53054f241d6860eff34e76411ab77fb381948ee147ff1d1aa4a6843 diff --git a/dev-libs/libbson/libbson-1.16.2.ebuild b/dev-libs/libbson/libbson-1.16.2.ebuild index d826e85d1342..353708b7c7c7 100644 --- a/dev-libs/libbson/libbson-1.16.2.ebuild +++ b/dev-libs/libbson/libbson-1.16.2.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/mongodb/mongo-c-driver/releases/download/${PV}/mongo LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~hppa ~ppc x86" +KEYWORDS="amd64 ~hppa ~ppc ~sparc x86" IUSE="examples static-libs" DEPEND="dev-python/sphinx" diff --git a/dev-libs/libbson/libbson-1.17.0.ebuild b/dev-libs/libbson/libbson-1.17.0.ebuild new file mode 100644 index 000000000000..d29735c6690e --- /dev/null +++ b/dev-libs/libbson/libbson-1.17.0.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake-utils + +DESCRIPTION="Library routines related to building,parsing and iterating BSON documents" +HOMEPAGE="https://github.com/mongodb/mongo-c-driver/tree/master/src/libbson" +SRC_URI="https://github.com/mongodb/mongo-c-driver/releases/download/${PV}/mongo-c-driver-${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86" +IUSE="examples static-libs" + +DEPEND="dev-python/sphinx" + +PATCHES=( + "${FILESDIR}/${PN}-1.14.0-no-docs.patch" + "${FILESDIR}/${PN}-1.16.2-sphinx.patch" +) + +S="${WORKDIR}/mongo-c-driver-${PV}" + +src_configure() { + local mycmakeargs=( + -DENABLE_BSON=ON + -DENABLE_EXAMPLES=OFF + -DENABLE_MAN_PAGES=ON + -DENABLE_MONGOC=OFF + -DENABLE_TESTS=OFF + -DENABLE_STATIC="$(usex static-libs ON OFF)" + -DENABLE_UNINSTALL=OFF + ) + + cmake-utils_src_configure +} + +src_install() { + if use examples; then + docinto examples + dodoc src/libbson/examples/*.c + fi + + cmake-utils_src_install +} diff --git a/dev-libs/libbulletml/Manifest b/dev-libs/libbulletml/Manifest index aa57a8793f90..f90dbf1fa6c5 100644 --- a/dev-libs/libbulletml/Manifest +++ b/dev-libs/libbulletml/Manifest @@ -1,5 +1,6 @@ +AUX libbulletml-0.0.6-Makefile.patch 3102 BLAKE2B 74c65615b08a8ac5650a837266dea98cdddd08623b33debbbdb4f6ce550f9c84bd363a5813d7cda3237d7e6e56a232ec5960ddea652d98ac0de5f62068d2561f SHA512 d3fb907e8220c23432f1f763e960f08a9e87affebbdd78b6d977710081ceaa33840fd59ca843fc6b615b1b4180440aa154721b6bafe1751f434d02184d367608 AUX libbulletml-0.0.6-gcc43.patch 577 BLAKE2B 14fe2e1087addc3d4230bdeab2ea19a318c721b1fef66de2a090c153b0e3c6e40f015385db724c2f244fbef94c1c80f792e875899137eab622f4fa27b81dc7dc SHA512 ae8e162ed7297302e40f5139557362fb1271ae8278c9efc0ddff73ab10cad6ec59c0aa281f4eed39d56b3ca64d0e42f7a51fabc2ecaee98870dd8f6458251803 AUX libbulletml-0.0.6-gcc46.patch 400 BLAKE2B 55fe3b5b3c8f0b29f9df22976ba1647feb5ec3bbfb366b6057211c3f65c1933f97fd6818a232563f0aa3ae03fb5a981d47412786d66aeaf13405694daa880767 SHA512 4f053c3e7a7fb33317f4ac1bf4801593bf16b9c08a219ef2636ead641c7d1147ce01db59d7b9ae315c674f95d3e2973387368e555fa4883fcbb1867ff5349894 DIST libbulletml-0.0.6.tar.bz2 94529 BLAKE2B 7ec9a69c4385adacc476cacb3f88219a5a7b506a36ece6d430a1a5c470ffddfd20f8f355ac5391c542850b98edf0d40e9dea6061b6ad5da7afcc66b14656311b SHA512 4428d8088eefd2a1336eb963e8c65188b67a82d875cdcb51bad9ca7aa3c864b3453464daf1e6691d52120332fe3a078b9827136d214d9ca87fdd0cb81bb60150 -EBUILD libbulletml-0.0.6.ebuild 904 BLAKE2B 01872e65adae7dd8f898bfde9704b74a10a9bab404ba8744596a85b44515c1ebae6eb7852208825841e4cef5b8c7433bb7a68af3e6d5aae18e179add9ad5af40 SHA512 e92728d15989224258f7fe31970285ba7ac3c2597e5805dc9f87a2eea6a21744d47bd2ccc95e94376ea9e211fe62313b502da375d4661aa15f5e1faa3a8cc2ec +EBUILD libbulletml-0.0.6.ebuild 817 BLAKE2B 89985e7a0c71e2f112bdb364da563fa5ed79473a3f0a63abbe7ea80b063ce1ed12d0246dc2b0d1359115035e9c726aed4825605d8f49e1e569acde1717e5868f SHA512 f445256bb5a20eb667995010c4dde596d152854660aff008974d8f3c4bdc8b396a3a9756708afccabb8d3f4ce17c2e3dddf201d4f2f03e73490f17fe6817289e MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 diff --git a/dev-libs/libbulletml/files/libbulletml-0.0.6-Makefile.patch b/dev-libs/libbulletml/files/libbulletml-0.0.6-Makefile.patch new file mode 100644 index 000000000000..05400d2c506f --- /dev/null +++ b/dev-libs/libbulletml/files/libbulletml-0.0.6-Makefile.patch @@ -0,0 +1,119 @@ +--- a/Makefile ++++ b/Makefile +@@ -1,10 +1,5 @@ +-CC = g++ + INCLUDES = -I. + LIBS = tinyxml/tinyxml.o tinyxml/tinyxmlparser.o tinyxml/tinyxmlerror.o +-#CXXFLAGS = -g -W -Wall -ansi -pedantic +-#CXXFLAGS = -pg -g -W -Wall -ansi -pedantic +-CXXFLAGS = -O2 -W -Wall -ansi -pedantic +-CFLAGS = -O2 + OBJS = bulletmlparser-tinyxml.o bulletmlparser.o bulletmltree.o calc.o formula-variables.o bulletmlrunner.o bulletmlrunnerimpl.o + + all: libbulletml.a +@@ -21,7 +16,7 @@ + bison -y calc.yy && mv y.tab.c calc.cpp + + $(OBJS): %.o: %.cpp +- $(CC) -c $(CXXFLAGS) $(INCLUDES) $< ++ $(CXX) $(CXXFLAGS) $(CPPFLAGS) $(INCLUDES) -c $< -o $@ + + doxy: + doxygen +--- a/tinyxml/Makefile ++++ b/tinyxml/Makefile +@@ -14,41 +14,6 @@ + PROFILE := NO + + #**************************************************************************** +- +-CC := gcc +-CXX := g++ +-LD := g++ +-AR := ar rc +-RANLIB := ranlib +- +-DEBUG_CFLAGS := -Wall -Wno-unknown-pragmas -Wno-format -g -DDEBUG +-RELEASE_CFLAGS := -Wall -Wno-unknown-pragmas -Wno-format -O2 +- +-LIBS := +- +-DEBUG_CXXFLAGS := ${DEBUG_CFLAGS} +-RELEASE_CXXFLAGS := ${RELEASE_CFLAGS} +- +-DEBUG_LDFLAGS := -g +-RELEASE_LDFLAGS := +- +-ifeq (YES, ${DEBUG}) +- CFLAGS += ${DEBUG_CFLAGS} +- CXXFLAGS += ${DEBUG_CXXFLAGS} +- LDFLAGS += ${DEBUG_LDFLAGS} +-else +- CFLAGS += ${RELEASE_CFLAGS} +- CXXFLAGS += ${RELEASE_CXXFLAGS} +- LDFLAGS += ${RELEASE_LDFLAGS} +-endif +- +-ifeq (YES, ${PROFILE}) +- CFLAGS := ${CFLAGS} -pg +- CXXFLAGS := ${CXXFLAGS} -pg +- LDFLAGS := ${LDFLAGS} -pg +-endif +- +-#**************************************************************************** + # Preprocessor directives + #**************************************************************************** + +@@ -70,8 +35,8 @@ + # Makefile code common to all platforms + #**************************************************************************** + +-CFLAGS := ${CFLAGS} ${DEFS} +-CXXFLAGS := ${CXXFLAGS} ${DEFS} ++CFLAGS += ${DEFS} ++CXXFLAGS += ${DEFS} + + #**************************************************************************** + # Targets of the build +@@ -98,7 +63,7 @@ + #**************************************************************************** + + ${OUTPUT}: ${OBJS} +- ${LD} -o $@ ${LDFLAGS} ${OBJS} ${LIBS} ${EXTRA_LIBS} ++ ${CXX} ${LDFLAGS} -o $@ ${OBJS} ${LIBS} ${EXTRA_LIBS} + + #**************************************************************************** + # common rules +@@ -106,10 +71,10 @@ + + # Rules for compiling source files to object files + %.o : %.cpp +- ${CXX} -c ${CXXFLAGS} ${INCS} $< -o $@ ++ ${CXX} ${CXXFLAGS} ${CPPFLAGS} ${INCS} -c $< -o $@ + + %.o : %.c +- ${CC} -c ${CFLAGS} ${INCS} $< -o $@ ++ ${CC} ${CFLAGS} ${CPPFLAGS} ${INCS} -c $< -o $@ + + clean: + -rm -f core ${OBJS} ${OUTPUT} +--- a/ygg/Makefile ++++ b/ygg/Makefile +@@ -2,8 +2,6 @@ + LIBS = + #CXXFLAGS = -g -W -Wall + #CXXFLAGS = -pg -g -W -Wall +-CXXFLAGS = -O2 -W -Wall +-CFLAGS = -O2 + OBJS = ygg.o + + all: $(OBJS) +@@ -12,7 +10,7 @@ + rm -f *.o *.a + + $(OBJS): %.o: %.cpp +- $(CXX) -c $(CXXFLAGS) $(INCLUDES) $< ++ $(CXX) $(CXXFLAGS) $(CPPFLAGS) $(INCLUDES) -c $< -o $@ + + distdir: + diff --git a/dev-libs/libbulletml/libbulletml-0.0.6.ebuild b/dev-libs/libbulletml/libbulletml-0.0.6.ebuild index 045879e2c0f5..5bd9fa9717b4 100644 --- a/dev-libs/libbulletml/libbulletml-0.0.6.ebuild +++ b/dev-libs/libbulletml/libbulletml-0.0.6.ebuild @@ -1,8 +1,10 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 +inherit toolchain-funcs + DESCRIPTION="A Library of Bullet Markup Language" HOMEPAGE="https://shinh.skr.jp/libbulletml/index_en.html" SRC_URI="https://shinh.skr.jp/libbulletml/${P}.tar.bz2" @@ -10,25 +12,24 @@ SRC_URI="https://shinh.skr.jp/libbulletml/${P}.tar.bz2" LICENSE="BSD" SLOT="0" KEYWORDS="amd64 ppc x86" -IUSE="" DEPEND="dev-libs/boost" RDEPEND=${DEPEND} -PATCHES=( "${FILESDIR}"/${P}-gcc4{3,6}.patch ) +PATCHES=( + "${FILESDIR}"/${P}-gcc4{3,6}.patch + "${FILESDIR}"/${P}-Makefile.patch +) S="${WORKDIR}"/${PN#lib}/src src_prepare() { default rm -r boost || die - - # don't override the system-wide flags - sed -i -e '/^CFLAGS =/d;/^CXXFLAGS =/d' Makefile ygg/Makefile || die } -src_compile() { - emake CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" +src_configure() { + tc-export AR CXX } src_install() { diff --git a/dev-libs/libbytesize/Manifest b/dev-libs/libbytesize/Manifest index e01054021772..2dd5cf08e251 100644 --- a/dev-libs/libbytesize/Manifest +++ b/dev-libs/libbytesize/Manifest @@ -1,5 +1,7 @@ DIST libbytesize-2.2.tar.gz 443040 BLAKE2B 04035f99f1da4d2d426106e1f292d71089dae89923d41425fa815a72e375639a7d8b6fc5552a3f08462597ce9c19797c7fce5b79fdad504b9062168093a70a4f SHA512 4538ac3499a24023c21fe07f527e400f99509921e377248970ac2da0eaf1655ddb261f432eed46a59ef69a1275ba7d1e5b0cc488d64eeea936b6cfa54c552ac1 DIST libbytesize-2.3.tar.gz 438198 BLAKE2B 583450b66781bbb16298507292ffe60012ccc296f0822784ead13bcf1ce3f9a9cf7c2341d5f64d3356fb78aefb3e6b0770bce64ebf85aa92d168277d35f9629c SHA512 23720b90f4dbf7880a640ec04e910c4c1f34637dd3621900772187cb2e1d04ec34d4900ce3c9b4083ac462b411d5a409a644f62ed76b2c57ef1f11432c58be8a +DIST libbytesize-2.4.tar.gz 437416 BLAKE2B 4739b6ce5bf852112a5c662e3b5a29428df4a6b0fdd933293a1352e7f81f7ca3c274ed160ade38a705e9858bd2c37131a7409126d28d12ba0d47b64f88c78e31 SHA512 faa546823c95576516a5f4250ea51b381fe5ff6b9d09fc49346e65278e9be42fffd2566dcc24b4e0045cee15dcaead05c1fd1f5f51048c87c382298f7340e1d6 EBUILD libbytesize-2.2.ebuild 1464 BLAKE2B 33d4475e703efef58b8039e29dc5c38fef87b2256a1ed84706ca3169188e67d0dbc4f9a9cb1a75ebd53352c240f6b8fffc98273658629436f2511f7c7599fe3c SHA512 a1f95c286915b32198816aaef5a25ff45356d3337a3b58a807b84d1e8128c3faf1acb1ea64096193e770eb54a6af5772facb91101f8a3f883e77f408ca6674ac -EBUILD libbytesize-2.3.ebuild 1471 BLAKE2B c0842eec1dda3bb554f49f372f6063bf632a0c49ef25e75d347ba84b652ee8f7ff8d583ed5e9b8f5e44a207c7f2e19cfd858fecea832f3206136a15f2d8adfff SHA512 34f5bb741c18768a015b9c2eeb33d534ff62b88ba6cc60dc70fc6924e6693a181f02bfd6c11a2a60e4aff407fc1d4f395a83b34ab417600bf4570ef3d907710e +EBUILD libbytesize-2.3.ebuild 1464 BLAKE2B 33d4475e703efef58b8039e29dc5c38fef87b2256a1ed84706ca3169188e67d0dbc4f9a9cb1a75ebd53352c240f6b8fffc98273658629436f2511f7c7599fe3c SHA512 a1f95c286915b32198816aaef5a25ff45356d3337a3b58a807b84d1e8128c3faf1acb1ea64096193e770eb54a6af5772facb91101f8a3f883e77f408ca6674ac +EBUILD libbytesize-2.4.ebuild 1471 BLAKE2B c0842eec1dda3bb554f49f372f6063bf632a0c49ef25e75d347ba84b652ee8f7ff8d583ed5e9b8f5e44a207c7f2e19cfd858fecea832f3206136a15f2d8adfff SHA512 34f5bb741c18768a015b9c2eeb33d534ff62b88ba6cc60dc70fc6924e6693a181f02bfd6c11a2a60e4aff407fc1d4f395a83b34ab417600bf4570ef3d907710e MISC metadata.xml 425 BLAKE2B 445bf1e0d46e04c766c4c81c90f9acb8e8f3c1c3eeb567c3101400139a7b2ab830efcf737e30332af5dd0e50d46bdf9f583cccbfb2e50186cbb6d3f5a396f0df SHA512 24b8980240c3513229ea2e181c64b7f89597be9cd121459ad62bce935fd52a7bbc0ee4871e15899b69b477fdbaf0850d55821a6fbcf3afc30d0cb81a3eb83b65 diff --git a/dev-libs/libbytesize/libbytesize-2.3.ebuild b/dev-libs/libbytesize/libbytesize-2.3.ebuild index 0d91bc5f9998..bdb2d302c576 100644 --- a/dev-libs/libbytesize/libbytesize-2.3.ebuild +++ b/dev-libs/libbytesize/libbytesize-2.3.ebuild @@ -12,7 +12,7 @@ HOMEPAGE="https://github.com/storaged-project/libbytesize" SRC_URI="https://github.com/storaged-project/libbytesize/releases/download/${PV}/${P}.tar.gz" LICENSE="LGPL-2+" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86" IUSE="doc python test tools" REQUIRED_USE=" diff --git a/dev-libs/libbytesize/libbytesize-2.4.ebuild b/dev-libs/libbytesize/libbytesize-2.4.ebuild new file mode 100644 index 000000000000..0d91bc5f9998 --- /dev/null +++ b/dev-libs/libbytesize/libbytesize-2.4.ebuild @@ -0,0 +1,80 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6,7,8} ) + +inherit python-r1 + +DESCRIPTION="Tiny library providing a C \"class\" for working with arbitrary big sizes in bytes" +HOMEPAGE="https://github.com/storaged-project/libbytesize" +SRC_URI="https://github.com/storaged-project/libbytesize/releases/download/${PV}/${P}.tar.gz" +LICENSE="LGPL-2+" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" +IUSE="doc python test tools" + +REQUIRED_USE=" + python? ( ${PYTHON_REQUIRED_USE} ) + tools? ( python ) +" + +RDEPEND=" + dev-libs/gmp:0= + dev-libs/mpfr:= + dev-libs/libpcre2 + python? ( ${PYTHON_DEPS} ) +" + +DEPEND="${RDEPEND}" + +BDEPEND=" + sys-devel/gettext + doc? ( dev-util/gtk-doc ) + test? ( + dev-python/pocketlint[${PYTHON_USEDEP}] + dev-python/polib[${PYTHON_USEDEP}] + ) +" + +DOCS=( README.md ) + +RESTRICT="test" + +python_do() { + if use python; then + python_foreach_impl run_in_build_dir "$@" + else + "$@" + fi +} + +src_configure() { + local myeconfargs=( + $(use_with doc gtk-doc) + $(use_with python python3) + $(use_with tools) + ) + local ECONF_SOURCE="${S}" + python_do econf "${myeconfargs[@]}" +} + +src_compile() { + python_do emake +} + +src_test() { + python_do emake check +} + +install_helper() { + emake DESTDIR="${D}" install + use python && python_optimize +} + +src_install() { + python_do install_helper + einstalldocs + find "${ED}" -name "*.la" -type f -delete || die +} diff --git a/dev-libs/libcbor/Manifest b/dev-libs/libcbor/Manifest index 6fa9dc3ae07b..c8a520ff3545 100644 --- a/dev-libs/libcbor/Manifest +++ b/dev-libs/libcbor/Manifest @@ -5,5 +5,5 @@ DIST libcbor-0.7.0.tar.gz 266323 BLAKE2B 76f93d3199e703c4167aeed262da7ba78d1df82 EBUILD libcbor-0.5.0.ebuild 1308 BLAKE2B 1024113bdbf7409c9e7e6644ca543edc3bb5835ba16ced60fc44a5fbd74a26c4ddef2ba46f2cdcceb975d0fbebaa31265e6753ee55d5720e1d30e6461d733646 SHA512 25cf8a6eecb5efc065447fc8d56f40fd9112e778a58738993c24a45fc6d819a339ba2fe510d742092a540433ba575b4bdd187ed66038da80afa304d439ffcb31 EBUILD libcbor-0.6.0-r1.ebuild 1303 BLAKE2B d7caa064bea8106579e3da3267cd64f6086d10509a38cf108b0e7faff386208afb72292f9d9847a539478ca64fa1a0328b1807b50194ab409da2a5276fd4a29c SHA512 3922e922e408f6f9adca1f704ee6a0800ee7657d06276b9b17477350850e1d1933638adf7bb534d39da6e1214ea24bab37aae0c793d0cd850aea76483373d1cd EBUILD libcbor-0.6.1.ebuild 1309 BLAKE2B edc2449e15d584345d162d18c21aefc832f8890cc42b2f95cea0891ed69377e16cc3ddc3697e0ecc4e8f38eaffb415d06c4c321f966638b2e87a58947bfbdb99 SHA512 4d8abc7dea8dafe9d6249ccd98578d989078d1bfa46b3932b8ce7b42f51e053134678742814725e435f63d516fe9344ec5c77d843d944809f2f2ba54680211eb -EBUILD libcbor-0.7.0.ebuild 1345 BLAKE2B eba3646152a9346746fdc5d768e64cff019ad07300decf79dae4415438bdf6f0eee3fd9d87972aa200a7b2e9c90b640fcd583c6034b324356c9a5e3940ab057e SHA512 32ada7bbc9167af56801778f4d514ac5f1e3e17777c294bf09e34a7a899aca8d45f824f721ff03797d7d6178427af8f98ce97d9f789d20394330ed1693aef87e +EBUILD libcbor-0.7.0.ebuild 1351 BLAKE2B 7744c2f1ce576b2de409979f5292411163d881e73217f09c9415310e69303aff380b58d97538dd4ba7259c3eeafee23c0efca26d32130d47d4bc12ab111f15ea SHA512 ebc838adb4ec17b9620a8b6011336dacac5af031fcaac37db3c9c7e55d3ae52d7d68700327d196a078a77ad63df31d1ea752779bd17c89b043eccd5ae28d0e4e MISC metadata.xml 353 BLAKE2B ac88c66fa58046797dba48cfe47fc42a3aaf8d8a256fab563def54d126c7ad903bc2d47095ca7221b84f0fd59bcbb6677ffaef9062c9c662ef95b02bf3563b99 SHA512 56f76a4b80d8cf12f854022c2c7353119b11052bf6d454b5d2f6427a02ab64176d2d7ecfadecabafceac6b7aa5ec066145a62831d33f09a829b37cdb8bec64cf diff --git a/dev-libs/libcbor/libcbor-0.7.0.ebuild b/dev-libs/libcbor/libcbor-0.7.0.ebuild index d0c568fb3be0..9d906f79cbf1 100644 --- a/dev-libs/libcbor/libcbor-0.7.0.ebuild +++ b/dev-libs/libcbor/libcbor-0.7.0.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://github.com/PJK/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="MIT" SLOT="0/${PV}" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86" IUSE="+custom-alloc doc test" BDEPEND=" diff --git a/dev-libs/libcdio-paranoia/Manifest b/dev-libs/libcdio-paranoia/Manifest index ef0f5d3b0f01..6f5205e0e764 100644 --- a/dev-libs/libcdio-paranoia/Manifest +++ b/dev-libs/libcdio-paranoia/Manifest @@ -1,4 +1,5 @@ AUX libcdio-paranoia-0.90-oos-tests.patch 1401 BLAKE2B 0b4ba222d667325b2413519e1cc16065c756c17c5739e6edf3ade9dc6e0156b5a769f0f608d75624047ae47ed2187f4c80e182e58cb51bf7433a433e6673a695 SHA512 b8f556f39daa9746a87804d2c35d0458f133a21a026c8e5fb7739826d86972b7ed85255e5c3e6e739da40d56a9b8166f9b096308c844a471d4e152b7d39a7b1a +AUX libcdio-paranoia-2.0.1-pass-NM.patch 3534 BLAKE2B ba200b7245b7a39a43275968d1b8f9f54e2abf22080a069894468da6a0e2911ad5307f12ae99fb6c60c4db3c316d327c466cc32fe002404e2c1f62c4e8505afa SHA512 e0b263699249e7d873b2040373419d395697cabf02d61fdcf576d162bde9b232caf891354c2d560767d5044c14cea48401453cff069c5f3c33322c25f97101d1 DIST libcdio-paranoia-10.2+0.93+1.tar.gz 686055 BLAKE2B 5b4c30687c907cc8dd0917263c20e3d55e425cb7fb2a935a79ec6c5cc82c6165a5504fe71b77e314bd4a828b0c652f948cce62fecf94341d20c920c66450d97a SHA512 2bb418c99ef037aeb90ba3db841ea9182c5bc401e74c6f4b552730e6c8561552f7d3e27be71ef4fbb07b4fcd9db418a4fe330d5278e8f41cdd99c757aa4b8bc6 DIST libcdio-paranoia-10.2+0.94+2.tar.gz 704560 BLAKE2B babb912a7252b25b1d32f7d3cc80d73235383170b16118c4f6fcddd58ded534b2e5a8bb61aa8ca784270fc4631ea3e53cdc88d03b0a7686f74ab1cef7ca35980 SHA512 0e4ed5cc52d0758e945ac7f956c1ca870068f6444df912e2ba5f597947962c471d1c526b5cdab4e092fecb924ecb317667df454497b2e515a4e985693cd86f47 DIST libcdio-paranoia-10.2+2.0.0.tar.bz2 588472 BLAKE2B 5593c967cc91e7db922c30a0e4fd6a71c81625527b3e3cd19494328c545237c64c6332969e6964ae27cce70b0a7ed9678c2dcf0cf675ea6ea81602071b5a9e1b SHA512 0398617f9af63632d74c5a93c4efae1bc69d339fb7ab2e36dbfa6d19c0940f3bf27ea3ed482698d2842838d2034df3e40304774f1648db8c274d441130ef40a2 @@ -6,5 +7,5 @@ DIST libcdio-paranoia-10.2+2.0.1.tar.bz2 589075 BLAKE2B 9d2a2d288ccd13ca4ce38a89 EBUILD libcdio-paranoia-0.93_p1-r1.ebuild 1884 BLAKE2B ebf28c99b2e999ca113090ecc4a6b8f2135820075d81e0899d9ee886f58a61837a8355cb7a7ba53360dbebe98e4858975b4307ea886b1898b914bd0c5ee1895e SHA512 266e753ec533929d71d6a78c226059377c3c3aae8fcb1e5c41ca3bffc79c78b6612fa6ccfe3278cea8447d2b1b85c194ffe95eb336c743fa260c6bce8728e7be EBUILD libcdio-paranoia-0.94_p2-r2.ebuild 2115 BLAKE2B 6eefb74d1e33cc289405e19316256d697cdeea881fc7843f54be872b0b1184f3760fe0cdeef35e64a07a205ae56c2089a526478290e51d72fdd538f550cd622d SHA512 dafa5f8a7554def3d4ddf0c18ab4dc8ccc6d8a6cb59df3a04812627cfcb3cc7a7b286ec795cb53052376b95d525fa201425982d4de6fb44342b10856a5302c90 EBUILD libcdio-paranoia-2.0.0-r1.ebuild 1874 BLAKE2B 68b797f1f18739e97805dec62c3dd8c62863d3a6dd564fe5f2e4dc54eb8a1c2a359c818cc9fee025280cffb43d92472b857894ab41eb903c2f973b9e2926acb2 SHA512 265f9368911ad1420cb00e6fa50937a3eb8585105eb78085920d6d086b1648946cd841721405bd09ea43430d7fe24eabcc39490e3a261633e12499ea676ab4b4 -EBUILD libcdio-paranoia-2.0.1.ebuild 1879 BLAKE2B 2f1fb1194e37d89b6aaae803e5eb412c5188507991e2aab91255db123751427af92870f55fb8bb6e15737c09bdda0a2cb26170066080c5250532ec50571d15ba SHA512 0f22a4b93aabd09d63e201f41be2582b398b9bbd4f15565faaade171f3fe958b6031bea0114b5a6435e1b88555a40871668dfebcffb17bc9edbbcf80211e7b0d +EBUILD libcdio-paranoia-2.0.1.ebuild 1879 BLAKE2B b42d584f9e03c96251446bf80853e8b269d18697d33ed9205e50684568bcbf52fff390424d08ee20b50080ad4f60144e447acbd7eea7cfeb1ad83c3453756119 SHA512 ff2a1587899666bb4b05984b99ad1f1b5126f17102563bad7486a9b39da7d80cb0ccf628a28a64164aeea3746e3961f38fe8daf52b9cae972ebcb221e973627f MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343 diff --git a/dev-libs/libcdio-paranoia/files/libcdio-paranoia-2.0.1-pass-NM.patch b/dev-libs/libcdio-paranoia/files/libcdio-paranoia-2.0.1-pass-NM.patch new file mode 100644 index 000000000000..75cb650fc1bc --- /dev/null +++ b/dev-libs/libcdio-paranoia/files/libcdio-paranoia-2.0.1-pass-NM.patch @@ -0,0 +1,38 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -89,6 +89,9 @@ + AC_PROG_AWK + AC_SUBST(AWK) + ++AC_ARG_VAR([NM], [utility for listing symbols from object files]) ++AC_CHECK_TOOL([NM], [nm]) ++ + if test "x$GCC" != "xyes" + then + AC_MSG_WARN([ +--- a/lib/cdda_interface/Makefile.am ++++ b/lib/cdda_interface/Makefile.am +@@ -129,8 +129,8 @@ + echo 'CDIO_CDDA_$(libcdio_cdda_la_MAJOR) { ' > $@ + objs=`for obj in $(libcdio_cdda_la_OBJECTS); do sed -ne "s/^pic_object='\(.*\)'$$/\1/p" $$obj; done`; \ + if test -n "$$objs" ; then \ +- nm $${objs} | sed -n -e 's/^.*[ ][ABCDGIRSTW][ABCDGIRSTW]*[ ][ ]*\([_A-Za-z][_A-Za-z0-9]*\)$$/\1/p' | sort -u | { first=true; while read symbol; do if grep -q "^$${symbol}\$$" $(srcdir)/libcdio_cdda.sym; then if test $$first = true; then echo " global:"; first=false; fi; echo " $${symbol};"; fi; done; } >> $@; \ +- nm $${objs} | sed -n -e 's/^.*[ ][ABCDGIRSTW][ABCDGIRSTW]*[ ][ ]*\([_A-Za-z][_A-Za-z0-9]*\)$$/\1/p' | sort -u | { first=true; while read symbol; do if grep -q "^$${symbol}\$$" $(srcdir)/libcdio_cdda.sym; then :; else if test $$first = true; then echo " local:"; first=false; fi; echo " $${symbol};"; fi; done; } >> $@; \ ++ ${NM} $${objs} | sed -n -e 's/^.*[ ][ABCDGIRSTW][ABCDGIRSTW]*[ ][ ]*\([_A-Za-z][_A-Za-z0-9]*\)$$/\1/p' | sort -u | { first=true; while read symbol; do if grep -q "^$${symbol}\$$" $(srcdir)/libcdio_cdda.sym; then if test $$first = true; then echo " global:"; first=false; fi; echo " $${symbol};"; fi; done; } >> $@; \ ++ ${NM} $${objs} | sed -n -e 's/^.*[ ][ABCDGIRSTW][ABCDGIRSTW]*[ ][ ]*\([_A-Za-z][_A-Za-z0-9]*\)$$/\1/p' | sort -u | { first=true; while read symbol; do if grep -q "^$${symbol}\$$" $(srcdir)/libcdio_cdda.sym; then :; else if test $$first = true; then echo " local:"; first=false; fi; echo " $${symbol};"; fi; done; } >> $@; \ + fi + echo '};' >> $@ + else !BUILD_VERSIONED_LIBS +--- a/lib/paranoia/Makefile.am ++++ b/lib/paranoia/Makefile.am +@@ -142,8 +142,8 @@ + echo 'CDIO_PARANOIA_$(libcdio_paranoia_la_MAJOR) { ' > $@ + objs=`for obj in $(libcdio_paranoia_la_OBJECTS); do sed -ne "s/^pic_object='\(.*\)'$$/\1/p" $$obj; done`; \ + if test -n "$$objs" ; then \ +- nm $${objs} | sed -n -e 's/^.*[ ][ABCDGIRSTW][ABCDGIRSTW]*[ ][ ]*\([_A-Za-z][_A-Za-z0-9]*\)$$/\1/p' | sort -u | { first=true; while read symbol; do if grep -q "^$${symbol}\$$" $(srcdir)/libcdio_paranoia.sym; then if test $$first = true; then echo " global:"; first=false; fi; echo " $${symbol};"; fi; done; } >> $@; \ +- nm $${objs} | sed -n -e 's/^.*[ ][ABCDGIRSTW][ABCDGIRSTW]*[ ][ ]*\([_A-Za-z][_A-Za-z0-9]*\)$$/\1/p' | sort -u | { first=true; while read symbol; do if grep -q "^$${symbol}\$$" $(srcdir)/libcdio_paranoia.sym; then :; else if test $$first = true; then echo " local:"; first=false; fi; echo " $${symbol};"; fi; done; } >> $@; \ ++ ${NM} $${objs} | sed -n -e 's/^.*[ ][ABCDGIRSTW][ABCDGIRSTW]*[ ][ ]*\([_A-Za-z][_A-Za-z0-9]*\)$$/\1/p' | sort -u | { first=true; while read symbol; do if grep -q "^$${symbol}\$$" $(srcdir)/libcdio_paranoia.sym; then if test $$first = true; then echo " global:"; first=false; fi; echo " $${symbol};"; fi; done; } >> $@; \ ++ ${NM} $${objs} | sed -n -e 's/^.*[ ][ABCDGIRSTW][ABCDGIRSTW]*[ ][ ]*\([_A-Za-z][_A-Za-z0-9]*\)$$/\1/p' | sort -u | { first=true; while read symbol; do if grep -q "^$${symbol}\$$" $(srcdir)/libcdio_paranoia.sym; then :; else if test $$first = true; then echo " local:"; first=false; fi; echo " $${symbol};"; fi; done; } >> $@; \ + fi + echo '};' >> $@ + else diff --git a/dev-libs/libcdio-paranoia/libcdio-paranoia-2.0.1.ebuild b/dev-libs/libcdio-paranoia/libcdio-paranoia-2.0.1.ebuild index 07355295da2b..f7d282ae17b0 100644 --- a/dev-libs/libcdio-paranoia/libcdio-paranoia-2.0.1.ebuild +++ b/dev-libs/libcdio-paranoia/libcdio-paranoia-2.0.1.ebuild @@ -34,14 +34,13 @@ RESTRICT="!test? ( test )" S="${WORKDIR}/${MY_P}" +PATCHES=( "${FILESDIR}"/${PN}-2.0.1-pass-NM.patch ) DOCS=( AUTHORS ChangeLog NEWS.md README.md THANKS ) src_prepare() { default #sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die #466410 eautoreconf - - [[ ${CC} == *clang* ]] && append-flags -std=gnu89 } multilib_src_configure() { diff --git a/dev-libs/libcdio/Manifest b/dev-libs/libcdio/Manifest index d3cf9c137595..a7ae3e18aa50 100644 --- a/dev-libs/libcdio/Manifest +++ b/dev-libs/libcdio/Manifest @@ -1,14 +1,7 @@ AUX libcdio-2.0.0-iso-ioleak.patch 1093 BLAKE2B bd30e99cd35d2cb09dbbc7dd91133f1649a8761e7f23b1544a65477a77466f6b72bb99eb3ac21980b1cca54590fd5852dc1b9f7fde28a50bc5e101320576bdf5 SHA512 851fb3610ab801a5c62075426b9b51d42c60d35aaf4d247a825f8323d41bce692f48632604b7e6bc03ef83974f077ced371812ce50397dc054d16e353074f625 AUX libcdio-2.1.0-ncurses_pkgconfig.patch 923 BLAKE2B 848a76241ca173c452cf7b04142c249ca6c33b7d0514f03353bb7b1f43635d1bec36cf9f3e3ce61ab51d6cb42ab123f620fe6fe1706b71148ec2ab9592c0bc02 SHA512 98c16eebd1cd6bf57e85dd3abafba22a4a1f2f88e0d5f1c9ee98d7409c360c6e3dda43233823de97429a54be66969cec1eb8df4bbb7d0341a54c6a1ae475dd7b -DIST libcdio-0.93.tar.gz 2723371 BLAKE2B 3dc361f48c0ccc22c76ad691f856512a87906ddccdbf05a22d4c8f7f28221d201480e015532be382d576550ecabae40df9e325043fa6cff89b39d77e30b6509b SHA512 a2ea7a1f219e1abdbbb42633003e10ff77b6a879133c96a0c8e7a80fe205c08a48bade1d9941c6493f24d6eb2ed410469b57e19d9740a4400266a6f3f9d3da91 -DIST libcdio-0.94.tar.gz 2355452 BLAKE2B c6a720fb714e6aa0d4425ccf92e4c08172d26d77a94e8a6897ffee197a740de78da8d480ec9af2dcfd59c3f96fb2a823a4e39259389dd82ece4108c6a05a4646 SHA512 e1d3c96c4acc7be923c97109c3f76223adc00b293278daef7d5008b1e5d67f33402f9f224f05120e9e1e8b3a8d1fa1b0bd5069dc6dd309741e3590e2c19e0e66 -DIST libcdio-1.1.0.tar.gz 2348106 BLAKE2B c63959d6cd92288b2d098f19b28a61fc5a7005390186045c6f72392becf9eb5808da7a8b952de166c5b263b9c10e594031a3fb908331eda040c210b984b3e11e SHA512 fe5a0d726974c8678b59de74ce043a5ed464f6ab595bf938e90bc5a348e9e882755e75aa3eecce50ce910b28e2498b5a892402fc0ea8728d382d1af36db71985 DIST libcdio-2.0.0.tar.gz 2354813 BLAKE2B d3ebf9a20004cc8c75d1e6f97a2cea68f490517e34a4cf84f343d717e49cbb9cd612a3c6911894501f16373e3222e7fc6d175fd6d93d1c967cd21502716b22f8 SHA512 8f48cc71d28b427b16f48e50bcaf0aea171055c72a9aeee383ac4374eee1d3d288323814c3a3f308a9ba097aa815319429c1931072897985a3b02b814766fd4f DIST libcdio-2.1.0.tar.bz2 1759040 BLAKE2B 4859fc545cf81246279b7b0434c02916e874681b40d00f8253fd7837941a34c5a717a81b1c3b1714153ad343e03c28668984f6fd5647662ec4e6759752326cb0 SHA512 c290821da55fd9ae366670a58857aa6efcebc9f25b7caea063cf12f9cbda84fe770c5f59f972227fda50517ca58c5f39c0137daa0f93179e3daa45303d8b610f -EBUILD libcdio-0.93.ebuild 1773 BLAKE2B 578074a8780cf374c1216e76e944165d962e5e916f5179fb4e1183b497ba434673191eb8fdba64957b638fe798bf2103487e0c9d3e74bc7db546e9c65470748c SHA512 530b471d188fa9d5996f9c4daebdb8c6d0e0ecfcd01f5bd54c749abaf1f3a204b75e7401111345d0d13834774c3f9f37cd0e35bcbd2dcec06d93b398b3843430 -EBUILD libcdio-0.94-r1.ebuild 1780 BLAKE2B 1e43731ac55500a314261a0570f1a759732eea732eb00dc0b40460ee3788ac01c12ed8eb3a1222177e5a0612add69ad66cf9592cb3977a702326cc4e19e77764 SHA512 dade1e83d6b16bfed85337803781eaa80ac733f22f41b88f19934edce9c1e51f17677a74057ff7272ada5a8e19fc094b69d105fdad17d12c5abe9619e55f820f -EBUILD libcdio-1.1.0.ebuild 1804 BLAKE2B 76edde6d83a21d3e0d611bca0040c7da7e964d6457a9273ecb7af6c1dd8a8d56141c1b8508db037b43343027189d7c7f25b78ea0dd7ed29053d22a93eb13ca4c SHA512 7da74d76f0fb195c8f32de8805a2967c82f4d3cd70e5222560ae8769738b02706519e58ba0b096575041209db3cbb99583b5de2788012b24578b93651955e057 EBUILD libcdio-2.0.0-r1.ebuild 1857 BLAKE2B e475a25ab9ca1e8ff8fcc3d06bc25e01311a620e26db74c5c13986a6a415702dbe92858cbe3c0ef44f9b1671d72b884e944b98c2b04cae5cb4198122521005cc SHA512 4be2d83bf6bd8d0beca5cea123989949fa01cfa69b2043857fcb5f6237f8c94d68c6e56870c4d7b5585f6af399c53564f22a2e7ee22a85eb000e5260c7d7fbb3 -EBUILD libcdio-2.0.0.ebuild 1803 BLAKE2B 97ba2d03a964f53b9359ed810a99d8628d478743a2e44110da01333fd783786e5d32a7e44c30b4dc584c36a547508c9d42a06bb4cbdce8eea46833494544583a SHA512 a71ba4b612cf00aa6117dae7a785733e59de11de32279df29c5b24e87d48eceefce7abd5ec1aad7dbc9265892cf33f082e5ebe47df75ac8c5e6ca3bf125e5eef EBUILD libcdio-2.1.0-r1.ebuild 1807 BLAKE2B 9c7e28974723a3d02261f6689067e8303cc2a0385e259e75905ac662efddc112a1199b6d213d3ea8731e1bf7ef7cd76db33b0f37155e2ac97079992d0e43186d SHA512 9539f402eebc584a3117a0d865022c3dbb17e8d5ed187ba7b35129282ea7e81aa85070ed5a115614a17708ce25285b099e8e95b5736a9a1a34daaf9cb4b50b84 MISC metadata.xml 528 BLAKE2B c36309be516242be4eec641d3f81ed67c0f840154bb8a47983a6fb8340a72bcacb1b2eb4f46610a2e341c5c64494fa620c730a44c306b9334b102edf9884e9ca SHA512 17b0f73a4496400d46b3485909fc6c6b3da85e99b5fc03335e9b6ce50233ac075edbe2fc97eee8bc817e632f53238d1c33c3166d33d0d10d745a31dac3797de9 diff --git a/dev-libs/libcdio/libcdio-0.93.ebuild b/dev-libs/libcdio/libcdio-0.93.ebuild deleted file mode 100644 index 6e192dd5d716..000000000000 --- a/dev-libs/libcdio/libcdio-0.93.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit libtool multilib-minimal toolchain-funcs - -DESCRIPTION="A library to encapsulate CD-ROM reading and control" -HOMEPAGE="https://www.gnu.org/software/libcdio/" -SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0/15" # subslot is based on SONAME -KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" -IUSE="cddb +cxx minimal static-libs test" -RESTRICT="!test? ( test )" - -RDEPEND=" - !minimal? ( - >=sys-libs/ncurses-5.7-r7:0= - cddb? ( >=media-libs/libcddb-1.3.2 ) - ) - >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] -" - -DEPEND="${RDEPEND} - sys-apps/sed - sys-devel/gettext - virtual/pkgconfig - test? ( dev-lang/perl ) -" - -DOCS="AUTHORS ChangeLog NEWS README* THANKS TODO" - -MULTILIB_WRAPPED_HEADERS=( - /usr/include/cdio/cdio_config.h - /usr/include/cdio/version.h -) - -src_prepare() { - default - - sed \ - -e "s:-lncurses:$($(tc-getPKG_CONFIG) --libs ncurses):g" \ - -i configure || die - - elibtoolize # to prevent -L/usr/lib ending up in the linker line wrt 499510 -} - -multilib_src_configure() { - local util_switch - if ! multilib_is_native_abi || use minimal ; then - util_switch="--without" - else - util_switch="--with" - fi - - # Tests fail if ECONF_SOURCE is not relative - ECONF_SOURCE="../${P}" econf \ - --disable-maintainer-mode \ - $(use_enable cxx) \ - --disable-cpp-progs \ - --disable-example-progs \ - $(use_enable static-libs static) \ - $(use_enable cddb) \ - --disable-vcd-info \ - ${util_switch}-{cd-drive,cd-info,cdda-player,cd-read,iso-info,iso-read} -} - -multilib_src_install_all() { - einstalldocs - find "${ED}" -name '*.la' -delete || die -} diff --git a/dev-libs/libcdio/libcdio-0.94-r1.ebuild b/dev-libs/libcdio/libcdio-0.94-r1.ebuild deleted file mode 100644 index 0d6b19f7abab..000000000000 --- a/dev-libs/libcdio/libcdio-0.94-r1.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit libtool multilib-minimal toolchain-funcs - -DESCRIPTION="A library to encapsulate CD-ROM reading and control" -HOMEPAGE="https://www.gnu.org/software/libcdio/" -SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0/16" # subslot is based on SONAME -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" -IUSE="cddb +cxx minimal static-libs test" -RESTRICT="!test? ( test )" - -RDEPEND=" - !minimal? ( - >=sys-libs/ncurses-5.7-r7:0= - cddb? ( >=media-libs/libcddb-1.3.2 ) - ) - >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] -" - -DEPEND="${RDEPEND} - sys-apps/sed - sys-devel/gettext - virtual/pkgconfig - test? ( dev-lang/perl ) -" - -DOCS="AUTHORS ChangeLog NEWS README* THANKS TODO" - -MULTILIB_WRAPPED_HEADERS=( - /usr/include/cdio/cdio_config.h - /usr/include/cdio/version.h -) - -src_prepare() { - default - - sed \ - -e "s:-lncurses:$($(tc-getPKG_CONFIG) --libs ncurses):g" \ - -i configure || die - - elibtoolize # to prevent -L/usr/lib ending up in the linker line wrt 499510 -} - -multilib_src_configure() { - local util_switch - if ! multilib_is_native_abi || use minimal ; then - util_switch="--without" - else - util_switch="--with" - fi - - # Tests fail if ECONF_SOURCE is not relative - ECONF_SOURCE="../${P}" econf \ - --disable-maintainer-mode \ - $(use_enable cxx) \ - --disable-cpp-progs \ - --disable-example-progs \ - $(use_enable static-libs static) \ - $(use_enable cddb) \ - --disable-vcd-info \ - ${util_switch}-{cd-drive,cd-info,cdda-player,cd-read,iso-info,iso-read} -} - -multilib_src_install_all() { - einstalldocs - find "${ED}" -name '*.la' -delete || die -} diff --git a/dev-libs/libcdio/libcdio-1.1.0.ebuild b/dev-libs/libcdio/libcdio-1.1.0.ebuild deleted file mode 100644 index c785aac9ec4d..000000000000 --- a/dev-libs/libcdio/libcdio-1.1.0.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools libtool multilib-minimal toolchain-funcs - -DESCRIPTION="A library to encapsulate CD-ROM reading and control" -HOMEPAGE="https://www.gnu.org/software/libcdio/" -SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0/17" # subslot is based on SONAME -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" -IUSE="cddb +cxx minimal static-libs test" -RESTRICT="!test? ( test )" - -RDEPEND=" - !minimal? ( - >=sys-libs/ncurses-5.7-r7:0= - cddb? ( >=media-libs/libcddb-1.3.2 ) - ) - >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] -" - -DEPEND="${RDEPEND} - sys-apps/sed - sys-devel/gettext - virtual/pkgconfig - test? ( dev-lang/perl ) -" - -DOCS="AUTHORS ChangeLog NEWS README* THANKS TODO" - -MULTILIB_WRAPPED_HEADERS=( - /usr/include/cdio/cdio_config.h - /usr/include/cdio/version.h -) - -src_prepare() { - default - - eautoreconf - - sed \ - -e "s:-lncurses:$($(tc-getPKG_CONFIG) --libs ncurses):g" \ - -i configure || die - - elibtoolize # to prevent -L/usr/lib ending up in the linker line wrt 499510 -} - -multilib_src_configure() { - local util_switch - if ! multilib_is_native_abi || use minimal ; then - util_switch="--without" - else - util_switch="--with" - fi - - # Tests fail if ECONF_SOURCE is not relative - ECONF_SOURCE="../${P}" econf \ - --disable-maintainer-mode \ - $(use_enable cxx) \ - --disable-cpp-progs \ - --disable-example-progs \ - $(use_enable static-libs static) \ - $(use_enable cddb) \ - --disable-vcd-info \ - ${util_switch}-{cd-drive,cd-info,cdda-player,cd-read,iso-info,iso-read} -} - -multilib_src_install_all() { - einstalldocs - find "${ED}" -name '*.la' -delete || die -} diff --git a/dev-libs/libcdio/libcdio-2.0.0.ebuild b/dev-libs/libcdio/libcdio-2.0.0.ebuild deleted file mode 100644 index 7b6709a53379..000000000000 --- a/dev-libs/libcdio/libcdio-2.0.0.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 libtool multilib-minimal toolchain-funcs - -DESCRIPTION="A library to encapsulate CD-ROM reading and control" -HOMEPAGE="https://www.gnu.org/software/libcdio/" -SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0/18" # subslot is based on SONAME -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" -IUSE="cddb +cxx minimal static-libs test" -RESTRICT="!test? ( test )" - -RDEPEND=" - !minimal? ( - >=sys-libs/ncurses-5.7-r7:0= - cddb? ( >=media-libs/libcddb-1.3.2 ) - ) - >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] -" -DEPEND="${RDEPEND} - sys-apps/sed - sys-devel/gettext - virtual/pkgconfig - test? ( dev-lang/perl ) -" - -DOCS="AUTHORS ChangeLog NEWS README* THANKS TODO" - -MULTILIB_WRAPPED_HEADERS=( - /usr/include/cdio/cdio_config.h - /usr/include/cdio/version.h -) - -src_prepare() { - default - - eautoreconf - - sed \ - -e "s:-lncurses:$($(tc-getPKG_CONFIG) --libs ncurses):g" \ - -i configure || die - - elibtoolize # to prevent -L/usr/lib ending up in the linker line wrt 499510 -} - -multilib_src_configure() { - local util_switch - if ! multilib_is_native_abi || use minimal ; then - util_switch="--without" - else - util_switch="--with" - fi - - # Tests fail if ECONF_SOURCE is not relative - ECONF_SOURCE="../${P}" econf \ - --disable-maintainer-mode \ - $(use_enable cxx) \ - --disable-cpp-progs \ - --disable-example-progs \ - $(use_enable static-libs static) \ - $(use_enable cddb) \ - --disable-vcd-info \ - ${util_switch}-{cd-drive,cd-info,cdda-player,cd-read,iso-info,iso-read} -} - -multilib_src_install_all() { - einstalldocs - find "${ED}" -name '*.la' -delete || die -} diff --git a/dev-libs/libcec/Manifest b/dev-libs/libcec/Manifest index f108b94115eb..75c4a0b749c1 100644 --- a/dev-libs/libcec/Manifest +++ b/dev-libs/libcec/Manifest @@ -1,6 +1,9 @@ AUX libcec-4.0.2-no-tinfo.patch 829 BLAKE2B 2051bef2e92fa61f4afa90728c99f7943d1d382bb2e91633fd07f8cff73055eecabcd68f3c95928e83ca1e676f3f07c9a5118b51d7cba42029a3826530c3784f SHA512 7ea5c0334535e8f731c12e1f257ff9a08b303ecf449afc0fdff36b1f06107e47356dff42bbf38c9e838adcd511e059e71179fefecc892c631a453160576b0e8b +AUX libcec-4.0.7-no-override-udev.patch 850 BLAKE2B ce5c795ba3db2d6600b93af6d15d95794435b22c29eb0b65f1d6dbcbb877f076abafd2b2b8d7bd751b981a34a939d61bf7389118a7252d7fc0517c472f583fc2 SHA512 fb23ccc01fee0c61453490e2f8037b1d30124077847e09f8a5e08365bca3253fa883484d412ae1f60cd7beefc6f2075a83bcdd36e160b14ebae23f4be41fb78b DIST libcec-4.0.2.tar.gz 334995 BLAKE2B bdbebeb339ce39f2f740805c4c627cc5190cc0dd57d0d87e3d3aa4ba8feeba103336d035fb8b282358f2e08fa470111be43df4df48870be0e9aa93f35434d0ef SHA512 7bb80965cd1bef713f59bff136dc4a7f1172c4a9bdb8e2f59c6bcc5b74110848c0b2912263280ea68177908a688127e8d7208fc43ce6e65d589343b85395a0bb DIST libcec-4.0.4.tar.gz 344976 BLAKE2B ce88730ee6e9f57a3f874dd47343e8bb12bd9d3644b58703f0b797bfe656fa25461e6847db4023fec92d9e9740f0e58b59a203258d39d8883b8ae9cde147f455 SHA512 8991ba96fe9a87e5e1f63ff87f77fc0fc3b735c537e2ee6cb004fdc264d75cecd043e39b49cf9e64aeadd24bb1fb57911d9c4bd6c494d9ba4035d7320c268116 +DIST libcec-4.0.7.tar.gz 355249 BLAKE2B 5f742364804d0d10cfcd71635645d33c3dfde200e79332470d2b5b2e64966834a0604d4684ad5919a00aaf60f05f4dbbbc9ce13a0dcf0ba4fa11d1f6a0391673 SHA512 424540a45f9cae3d5dcccc615d487c45033f9cdeb665b8176832495597e2cd58ef7681e13b52f6a32f8a40e1146c04a1a383f5785ea1e731c5c517a9a7843a81 EBUILD libcec-4.0.2-r2.ebuild 2146 BLAKE2B df530ef55089bb3f35de91a3dcd0166688c437526d6e6129d730326b8bf20ac1ea0a226417d4ac893fcaba43103fb1106186c74b72de2bc23f4d6cdd83d6a883 SHA512 28e88a43c8dc584161f256b174f6151dbcb5d97b326a1b9da784083e16616dcbb971a11c4894dc65b2c762fef1c870f284da0133ec1e81f631c6b931358f6296 EBUILD libcec-4.0.4-r1.ebuild 2040 BLAKE2B e304595a2b71afee365435d94118a21a3fd14098d2d88be082d96ccbd35d74e3bbf88eff89e880e26480af375505afc1d45ad5adddde687907e1ffa5bc95cc40 SHA512 2033915d614f6155ee1d5bcb287a4218ffa3b116247e33d06ce8979950abd202fcddb5fda32937310a46ad7180e86f78eb9a72f4b4476a52887e82828a65971b -MISC metadata.xml 662 BLAKE2B d87a9b256eb1cec65184415c8172819e8ffd47f38da6ef0aab46c0b8c40ff09b6b365d4051d44d2fee46a4bb0a7c0fbc0a87d92a171e92961b6f6b7a50d5868d SHA512 5abf50f31e2a18c7a5fce12414dd74efab13be9ea00a70b84384de8f95722f327d7446f51369b7feb33616bc0ff182cbbb7dd0be2855f5b54aee4e3c69dbc59e +EBUILD libcec-4.0.7.ebuild 3297 BLAKE2B 50f35a47f4ed68092f94f6e2c9e2a5b5a4de0bc6c4181b28ee212f4ec8ffd0dac9b0c04c662cba3286293c766304f632b75ef800c89d856c2451f38d76505127 SHA512 e77db16d409ec6412f2734a58b501ef6ee7f0289b17519e0af9c3a410cd1cd9ba74236c1875ce5b7fecc6020c1bb0dda14f5aedb9c75b435432423a6fe51eb1d +MISC metadata.xml 911 BLAKE2B a1c97593e181f44ae3c90ba70e8d36344272663b3d7090ca9b2716df532903ec821009321b0183dfa82b6c881349f559216ff040ed1f45e78c214c8601ab67d1 SHA512 7c5dd62ea6d854fdc4e7083487e141c703543d7220ca98fb9431279080ead371a42ee386d1c015dbfc3ea96e183cf4b8f810d8a6a5791d58aca4b3cdb38a7dab diff --git a/dev-libs/libcec/files/libcec-4.0.7-no-override-udev.patch b/dev-libs/libcec/files/libcec-4.0.7-no-override-udev.patch new file mode 100644 index 000000000000..d5b7f8664a30 --- /dev/null +++ b/dev-libs/libcec/files/libcec-4.0.7-no-override-udev.patch @@ -0,0 +1,24 @@ + src/libcec/cmake/CheckPlatformSupport.cmake | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/libcec/cmake/CheckPlatformSupport.cmake b/src/libcec/cmake/CheckPlatformSupport.cmake +index 5d423df..9e77924 100644 +--- a/src/libcec/cmake/CheckPlatformSupport.cmake ++++ b/src/libcec/cmake/CheckPlatformSupport.cmake +@@ -90,6 +90,7 @@ else() + check_function_exists(flock HAVE_FLOCK) + + # udev ++ if (${HAVE_LIBUDEV}) + pkg_check_modules(UDEV udev) + if (UDEV_FOUND) + set(PLATFORM_LIBREQUIRES "${PLATFORM_LIBREQUIRES} ${UDEV_LIBRARIES}") +@@ -106,6 +107,7 @@ else() + list(APPEND CMAKE_REQUIRED_LIBRARIES "${UDEV_LIBRARIES}") + set(HAVE_P8_USB_DETECT ON CACHE BOOL "p8 usb-cec detection supported" FORCE) + endif() ++ endif() + + # xrandr + check_include_files("X11/Xlib.h;X11/Xatom.h;X11/extensions/Xrandr.h" HAVE_RANDR_HEADERS) + diff --git a/dev-libs/libcec/libcec-4.0.7.ebuild b/dev-libs/libcec/libcec-4.0.7.ebuild new file mode 100644 index 000000000000..67a73ca791e6 --- /dev/null +++ b/dev-libs/libcec/libcec-4.0.7.ebuild @@ -0,0 +1,122 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python{3_6,3_7,3_8} ) +MY_PV=${PV/_p/-} +MY_P=${PN}-${MY_PV} + +inherit cmake-utils linux-info python-single-r1 toolchain-funcs + +DESCRIPTION="Library for communicating with the Pulse-Eight USB HDMI-CEC Adaptor" +HOMEPAGE="http://libcec.pulse-eight.com" +SRC_URI="https://github.com/Pulse-Eight/${PN}/archive/${MY_P}.tar.gz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~x86" +IUSE="cubox exynos python raspberry-pi kernel-cec tools +xrandr udev" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +RDEPEND="udev? ( virtual/udev ) + >=dev-libs/libplatform-2.0.0 + tools? ( sys-libs/ncurses:= ) + raspberry-pi? ( >=media-libs/raspberrypi-userland-0_pre20160305-r1 ) + xrandr? ( x11-libs/libXrandr ) + python? ( ${PYTHON_DEPS} )" +DEPEND="${RDEPEND} + python? ( dev-lang/swig )" + +BDEPEND="virtual/pkgconfig" + +CONFIG_CHECK="~USB_ACM" + +S="${WORKDIR}/${PN}-${MY_P}" + +PATCHES=( + "${FILESDIR}/${PN}-4.0.7-no-override-udev.patch" + ) + +pkg_pretend() { + use udev || CONFIG_CHECK+=" ~SYSFS" + ERROR_SYSFS="When using libcec build without udev, kernel config option CONFIG_SYSFS is required to automatically detect P8 USB-CEC adapter port number" + + linux-info_pkg_setup +} + +pkg_setup() { + linux-info_pkg_setup + use python && python-single-r1_pkg_setup +} + +src_prepare() { + cmake-utils_src_prepare + + # Do not hardcode the python libpath #577612 + sed -i \ + -e '/DESTINATION/s:"lib/python${PYTHON_VERSION}/${PYTHON_PKG_DIR}":${PYTHON_SITEDIR}:' \ + src/libcec/cmake/CheckPlatformSupport.cmake || die + + sed -Ee 's|[ ~]?#DIST#;?||g' debian/changelog.in > ChangeLog || die + + (use tools && use python) || cmake_comment_add_subdirectory "src/pyCecClient" + + if ! use tools; then + cmake_comment_add_subdirectory "src/cec-client" + cmake_comment_add_subdirectory "src/cecc-client" + sed -i -Ee 's|add_dependencies\(cecc?-client cec\)|#DO NOT BUILD \0|' \ + CMakeLists.txt || die + fi +} + +src_configure() { + local mycmakeargs=( + -DHAVE_LINUX_API=$(usex kernel-cec ON OFF) + -DHAVE_LIBUDEV=$(usex udev ON OFF) + -DSKIP_PYTHON_WRAPPER=$(usex python OFF ON) + -DHAVE_EXYNOS_API=$(usex exynos ON OFF) + -DHAVE_TDA995X_API=$(usex cubox ON OFF) + -DHAVE_RPI_API=$(usex raspberry-pi ON OFF) + ) + + if linux_config_exists && linux_chkconfig_present SYSFS; then + mycmakeargs+=( -DHAVE_P8_USB_DETECT=ON ) + fi + + # raspberrypi-userland itself does not provide .pc file so using + # bcm_host.pc instead + use raspberry-pi && mycmakeargs+=( + -DRPI_INCLUDE_DIR=$( $(tc-getPKG_CONFIG) --variable=includedir bcm_host) \ + -DRPI_LIB_DIR=$( $(tc-getPKG_CONFIG) --variable=libdir bcm_host) + ) + + cmake-utils_src_configure +} + +src_compile() { + cmake-utils_src_compile + + use udev && \ + cp "${S}/debian/pulse-eight-usb-cec.udev" \ + "${BUILD_DIR}/65-pulse-eight-usb-cec.udev" || die +} + +src_install() { + cmake-utils_src_install + + use python && python_optimize "${D}$(python_get_sitedir)" + + use tools && doman debian/cec-client.1 + + if use udev; then + insinto /lib/udev/rules.d + doins "${BUILD_DIR}/65-pulse-eight-usb-cec.udev" + fi +} + +pkg_postinst() { + elog "You will need to ensure the user running your CEC client has" + elog "read/write access to the device. You can ensure this by adding" + elog "them to the uucp group" +} diff --git a/dev-libs/libcec/metadata.xml b/dev-libs/libcec/metadata.xml index 29b2c8ce0c4b..078ed9ec4a2c 100644 --- a/dev-libs/libcec/metadata.xml +++ b/dev-libs/libcec/metadata.xml @@ -10,6 +10,9 @@ <flag name="exynos">Enable support for Exynos chipsets</flag> <flag name="raspberry-pi">Enable support for the Raspberry Pi</flag> <flag name="xrandr">Enable detection of active HDMI using xrandr extensions</flag> + <flag name="kernel-cec">Enable support for Linux kernel CEC framework</flag> + <flag name="tools">Enable build of cec-client and other test and demo executable tools</flag> + <flag name="udev">Enable detection of USB-CEC port by udev</flag> </use> <upstream> <remote-id type="github">Pulse-Eight/libcec</remote-id> diff --git a/dev-libs/libclangformat-ide/Manifest b/dev-libs/libclangformat-ide/Manifest index c61aef07544d..98d21e9700d4 100644 --- a/dev-libs/libclangformat-ide/Manifest +++ b/dev-libs/libclangformat-ide/Manifest @@ -1,6 +1,6 @@ AUX clang-qtcreator-compat.patch 7480 BLAKE2B aabe085093786be2733f50259be355596b8f35ddcf524aa9437f67462e48c22532e51b113a1e839e6f1bb22548229ee111c0587e58b62e3a145a6bdf43b9b347 SHA512 6e8d761dcd7bcdda476326fa8b2e3d5966f15959aefc500c04a57b6396a035fc822ad1a57184519de3ac7340c680a5f49f5fc9841d24210e20e949d6b28a57b4 DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff219888706d2b79d5296590934714e42ac79f6a6547941ac2b1d2c4e6313dd18b6c7068e748aa6ac033e49fccbf5d355aa8191 SHA512 baa182d62fef1851836013ae8a1a00861ea89769778d67fb97b407a9de664e6c85da2af9c5b3f75d2bf34ff6b00004e531ca7e4b3115a26c0e61c575cf2303a0 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59 -EBUILD libclangformat-ide-10.0.0.ebuild 1719 BLAKE2B af595842b8e1928f435a93bdc04935bbfac86c90ec40a87344b1023e1bcb855dbcf3517e63f1c0d9093e652aa12aa8ceef8cc0e48a831831f445185e6687125d SHA512 c345fed4ed94521ec51ae5b998db71f29efc5b927bd3471c754649c787373939a396f0dcd16bfa3a2516eb415cbc2457cd7616b17a404b70712c94f8b99335d7 +EBUILD libclangformat-ide-10.0.0.ebuild 1724 BLAKE2B 4b7fc4a91fff065ef5b9687dbbab5e905d39a9ec6b7903b90c27e14e232522ba79ad928873a658c46c60eb5e7e596c798fccc9189844b5e002313fe02b95a9c0 SHA512 21d3e5d1960548bb04a5a57ccc40b3aaf4f1df69ed9ad650253b6f01b655a9fd7232e035c27a3b037b93f5e83930ce10ff995560429aa62e27cba99c238a539c EBUILD libclangformat-ide-9.0.1.ebuild 1719 BLAKE2B af595842b8e1928f435a93bdc04935bbfac86c90ec40a87344b1023e1bcb855dbcf3517e63f1c0d9093e652aa12aa8ceef8cc0e48a831831f445185e6687125d SHA512 c345fed4ed94521ec51ae5b998db71f29efc5b927bd3471c754649c787373939a396f0dcd16bfa3a2516eb415cbc2457cd7616b17a404b70712c94f8b99335d7 MISC metadata.xml 247 BLAKE2B ab9618e71ad95ebd451d7b51076eb19801293790b027d4e390b35c1f2cc31ac20f8f41f91b8e167f700a3a42e7f366e2292e944fde98502016a4b0587c66d833 SHA512 be8285f713dca05e18b9ee5c5c45b4938cbc5ef707b0224a0aec98934633f7fcf526b6322e91a67b33804ca99a0997e1698bd2c772fa709256006517c89b7f51 diff --git a/dev-libs/libclangformat-ide/libclangformat-ide-10.0.0.ebuild b/dev-libs/libclangformat-ide/libclangformat-ide-10.0.0.ebuild index 5c04b67cf27c..768bfe1f0f4a 100644 --- a/dev-libs/libclangformat-ide/libclangformat-ide-10.0.0.ebuild +++ b/dev-libs/libclangformat-ide/libclangformat-ide-10.0.0.ebuild @@ -13,7 +13,7 @@ llvm.org_set_globals LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT" SLOT="$(ver_cut 1)" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~arm ~x86" IUSE="debug" DEPEND="~sys-devel/llvm-${PV}:${SLOT}=[debug=]" diff --git a/dev-libs/libclc/Manifest b/dev-libs/libclc/Manifest index eb1aebecb94e..4a6f39b14232 100644 --- a/dev-libs/libclc/Manifest +++ b/dev-libs/libclc/Manifest @@ -1,3 +1,3 @@ DIST libclc-0.2.0_pre20191024.tar.xz 128628 BLAKE2B dc750725ee48456e3678cb4f730cc889045ff7401c4b40ac3ae9b656da9fe429aa2094c2042a18eda4f7e87c786ff8ae121fbf726a18de03884f30dad48b3fa1 SHA512 b4c2ca980fb28b5662055bea951de844284fcf122695234d7618439234f0203baf82b5cc5cf8acddfe387f19d32be3a958e53511bb1e33e9469f6be5951dbcdb -EBUILD libclc-0.2.0_pre20191024.ebuild 1535 BLAKE2B 441d8fad75eb9811e92601e7f237fb11a7d73ae4ce178e80c64789db6caf2a89523a3d11256fb80a3def6e4c272cd82f5c387dda91455978bec3a99f514ce182 SHA512 c083757137ac0b0767816ff93f6f1e6c0e84bb588c0c403410212bf4cf4666db4da47433fdc09dbbe885469da934db37870852afcbd2ecbb6dfe10e9b6b9a0e7 +EBUILD libclc-0.2.0_pre20191024.ebuild 1576 BLAKE2B eb9ab28009e52164890c3e99bba1c644b06c536df84f96d950ddc3171a2a6157c0a081b6a0038254176ed7964320dcc4dae0a66552e98b59e24ea5d5ff32cead SHA512 1ce5f96ecfb430f93f90e06b3ffae33e3db9e98923237649501e35376acdf7556560c7879e748da30b8b7b04ca072a274e729b7a3d0ce5be5677b6b961c78c0a MISC metadata.xml 394 BLAKE2B 13254b650b3c915b7eccc5e646d7ed6065c514d8f5619f276be3526be68bde4ad2310491f18a6a92ae621022a009ab7248eb788e500c96012f3d27236da16cba SHA512 ed84a49ef1e6da5f133895d82632d81c5333ae0fa21eb222e993c2e3136c802350193555fd8f98ee23d7b4d55695ca186a8e4d5dc04c3d7aa072dc229905011d diff --git a/dev-libs/libclc/libclc-0.2.0_pre20191024.ebuild b/dev-libs/libclc/libclc-0.2.0_pre20191024.ebuild index cf5cf7c3624f..c2d93937f054 100644 --- a/dev-libs/libclc/libclc-0.2.0_pre20191024.ebuild +++ b/dev-libs/libclc/libclc-0.2.0_pre20191024.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{6,7,8} ) +PYTHON_COMPAT=( python3_{6..9} ) inherit llvm prefix python-any-r1 toolchain-funcs @@ -20,6 +20,8 @@ REQUIRED_USE="|| ( ${IUSE_VIDEO_CARDS} )" BDEPEND=" || ( + sys-devel/clang:12 + sys-devel/clang:11 sys-devel/clang:10 sys-devel/clang:9 sys-devel/clang:8 diff --git a/dev-libs/libcss/Manifest b/dev-libs/libcss/Manifest index 907336d5530e..3e93d0b2e227 100644 --- a/dev-libs/libcss/Manifest +++ b/dev-libs/libcss/Manifest @@ -1,7 +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 +EBUILD libcss-0.8.0-r2.ebuild 1102 BLAKE2B d398d721d8b6fa481fe95e15afecbd1718c801356dc264b1dac4ce1ac2d2f20e47bf8def4f4537ffc3c30f0337975f3ea78b980d2fcb3b879e9c19d8f5b118a4 SHA512 ccb62c75f37dbf5d278ca4cf9f46375c4969831f7a3a0c133d66b7a3ace2475f8d4597c38845a991c0e71239f25c5cf162bad62d45a4b2bc1ab3d8b8f709a96f +EBUILD libcss-0.9.0-r1.ebuild 1095 BLAKE2B 43432199078b9f7b5fca793ec25ff79c3b24800823d7b8d450bb08bb873a84744381f967bbc71db034bdcf859a425367c83c5be5c866ba8d2306e3a35d57aede SHA512 88ea117382adf65e1bab9b23f2a25caae2c96364ac576027233789cfcb77cd559b7fe6dd358e89aea490e8ba6c5b63cec0bb48a34c687258f129cc8a8252d1ca +EBUILD libcss-0.9.1-r1.ebuild 1095 BLAKE2B 43432199078b9f7b5fca793ec25ff79c3b24800823d7b8d450bb08bb873a84744381f967bbc71db034bdcf859a425367c83c5be5c866ba8d2306e3a35d57aede SHA512 88ea117382adf65e1bab9b23f2a25caae2c96364ac576027233789cfcb77cd559b7fe6dd358e89aea490e8ba6c5b63cec0bb48a34c687258f129cc8a8252d1ca MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33 diff --git a/dev-libs/libcss/libcss-0.8.0-r1.ebuild b/dev-libs/libcss/libcss-0.8.0-r2.ebuild index c90a2458ef4a..b388f262e7d5 100644 --- a/dev-libs/libcss/libcss-0.8.0-r1.ebuild +++ b/dev-libs/libcss/libcss-0.8.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 toolchain-funcs +inherit netsurf DESCRIPTION="CSS parser and selection engine, written in C" HOMEPAGE="http://www.netsurf-browser.org/projects/libcss/" @@ -32,7 +32,6 @@ src_prepare() { } _emake() { - source /usr/share/netsurf-buildsystem/gentoo-helpers.sh netsurf_define_makeconf emake "${NETSURF_MAKECONF[@]}" COMPONENT_TYPE=lib-shared $@ } @@ -46,5 +45,5 @@ src_test() { } src_install() { - _emake DESTDIR="${ED}" install + _emake DESTDIR="${D}" install } diff --git a/dev-libs/libcss/libcss-0.9.1.ebuild b/dev-libs/libcss/libcss-0.9.0-r1.ebuild index decab3cc274c..03d454f91075 100644 --- a/dev-libs/libcss/libcss-0.9.1.ebuild +++ b/dev-libs/libcss/libcss-0.9.0-r1.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit toolchain-funcs +inherit netsurf DESCRIPTION="CSS parser and selection engine, written in C" HOMEPAGE="http://www.netsurf-browser.org/projects/libcss/" @@ -34,7 +34,6 @@ src_prepare() { } _emake() { - source /usr/share/netsurf-buildsystem/gentoo-helpers.sh netsurf_define_makeconf emake "${NETSURF_MAKECONF[@]}" COMPONENT_TYPE=lib-shared $@ } diff --git a/dev-libs/libcss/libcss-0.9.0.ebuild b/dev-libs/libcss/libcss-0.9.1-r1.ebuild index 5712c44a7e2f..03d454f91075 100644 --- a/dev-libs/libcss/libcss-0.9.0.ebuild +++ b/dev-libs/libcss/libcss-0.9.1-r1.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 toolchain-funcs +inherit netsurf DESCRIPTION="CSS parser and selection engine, written in C" HOMEPAGE="http://www.netsurf-browser.org/projects/libcss/" @@ -34,7 +34,6 @@ src_prepare() { } _emake() { - source /usr/share/netsurf-buildsystem/gentoo-helpers.sh netsurf_define_makeconf emake "${NETSURF_MAKECONF[@]}" COMPONENT_TYPE=lib-shared $@ } @@ -48,5 +47,5 @@ src_test() { } src_install() { - _emake DESTDIR="${ED}" install + _emake DESTDIR="${D}" install } diff --git a/dev-libs/libdazzle/Manifest b/dev-libs/libdazzle/Manifest index 40c1ea6eb137..d86bd5ca0e90 100644 --- a/dev-libs/libdazzle/Manifest +++ b/dev-libs/libdazzle/Manifest @@ -1,3 +1,5 @@ DIST libdazzle-3.34.1.tar.xz 440496 BLAKE2B 88321e82f1961ffffc46c2e484b39a80e201498c1f5aaf3beabe59f9d24c21b446485aeb1e70821868d207d222e9a4c9c06353f3add28a1c12ba84f90f79e640 SHA512 bb55c21c8d15406e4f09514c36e3e633d13c0cdb6b30b40a7da7e1cb5e307f371c905dbd8ee5e56d04e225df4c1c8eb9cd273df76814a4cec6ea1328b998d95e +DIST libdazzle-3.36.0.tar.xz 446400 BLAKE2B 027d5e5b733fdf10b5797f9e17460ea50f26827c9f23f6ba9cf76b21c1ee63cc5b724f80b75af5ee7ccbdf1b04c28b776d4d542538db3039ca2d9cb2da6994b5 SHA512 d020161a1c744192657a551f53c4a7bb61bf8e9df93401085168c75aaf1305d548bf56a39b7a9e202656f453451a6615f1950992f78e3a23cba4324999f1e37f EBUILD libdazzle-3.34.1.ebuild 1667 BLAKE2B 649f65fb8b4f68889b27894d94aa858e0eb6fdd9f8b8e13c50acc0f377931952611b139a13e617bffeabb6695288c34d2a2c15ed17de36eae82063e93de27f93 SHA512 ac46eb71815d8a15dbb19c759dd02227aa70109af192aaf4d5f4959501780a966d82592fb4f745607790eeb47169cd2cc5b924889f896c1bfaa8b45570aa60c8 +EBUILD libdazzle-3.36.0.ebuild 1697 BLAKE2B c7b766b4d16df7cef291b6ec5273f8ec9bf309d10de5b5880ef2c6d61dbcf9f0bc677e37ff8b9559d1ddf088fe523a9df58434f378b7bad24d4af28f485db2e5 SHA512 4689e16152cf2494b9c9a41d6b360489e00c545f8bc4e2cc0974263bd1e24627969927b3e5494946ae8f5da07bc9ccdc2464127627e984839ca9532980ed2f0b MISC metadata.xml 561 BLAKE2B b496a84878e088cf09b2a5a071d3617b0d934fd92ab916c32a18dbad6015168431c30ba50125ccf21a5fea813fbc951b233c5353d30274525d5defc4d401583e SHA512 8ab426f8a2683c2bfc4a42d4d32893f5913fa1f5b2551b5be496594995916f9e17d285f2537d890fdd25be172c833b038a1942130e3fc546285c3f56a7a93652 diff --git a/dev-libs/libdazzle/libdazzle-3.36.0.ebuild b/dev-libs/libdazzle/libdazzle-3.36.0.ebuild new file mode 100644 index 000000000000..bb1360473dc1 --- /dev/null +++ b/dev-libs/libdazzle/libdazzle-3.36.0.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit gnome.org meson xdg vala virtualx + +DESCRIPTION="Experimental new features for GTK+ and GLib" +HOMEPAGE="https://gitlab.gnome.org/GNOME/libdazzle" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86" + +IUSE="gtk-doc +introspection test +vala" +REQUIRED_USE="vala? ( introspection )" +RESTRICT="!test? ( test )" + +# We keep newer glib/gtk+ deps to avoid GtkEventControllerMotion backports gettings used +RDEPEND=" + >=dev-libs/glib-2.56.0:2 + >=x11-libs/gtk+-3.24.0:3[introspection?] + introspection? ( dev-libs/gobject-introspection:= ) +" +DEPEND="${RDEPEND}" +# libxml2 required for glib-compile-resources; glib-utils for glib-mkenums +BDEPEND=" + >=dev-util/meson-0.49.0 + vala? ( $(vala_depend) ) + dev-libs/libxml2:2 + dev-util/glib-utils + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig + gtk-doc? ( dev-util/gtk-doc ) +" + +src_prepare() { + use vala && vala_src_prepare + xdg_src_prepare +} + +src_configure() { + local emesonargs=( + -Denable_tracing=false # extra trace debugging that would make things slower + -Denable_profiling=false # -pg passing + # On linux it'll always use a vdso based implementation that is even faster + # than rdtscp insn, thus never build with rdtscp until we don't support non-linux + # as the rdtscp using function will never get called anyways. + -Denable_rdtscp=false + -Denable_tools=true # /usr/bin/dazzle-list-counters + $(meson_use introspection with_introspection) + $(meson_use vala with_vapi) + $(meson_use gtk-doc enable_gtk_doc) + $(meson_use test enable_tests) + ) + meson_src_configure +} + +src_test() { + virtx meson_src_test +} diff --git a/dev-libs/libdnet/Manifest b/dev-libs/libdnet/Manifest index 47f1c260961c..06bb001a4699 100644 --- a/dev-libs/libdnet/Manifest +++ b/dev-libs/libdnet/Manifest @@ -1,6 +1,9 @@ DIST libdnet-1.12.ipv6-1.patch.gz 5124 BLAKE2B 674866a441a5907df97942772b1e4b95aee004ddb110204df0580cec6b6bb3ba4074831d83e675e1914f1a29281b02227e95016db6ce6a0e8b99417d1aa6aaab SHA512 fa2380e41548ecdd978722930ecf90dffabd15cf06cbae0e113285072fe98a066f1e686b6d79e2d8b9f8adcf29783f313d61933b9e1e74e71da8dc7d741f815a DIST libdnet-1.12.tar.gz 959945 BLAKE2B a19f8c83425861d02f832330cf0eb5bc317eec157737e0eacd48a7827d423c626b24ce833f66429c9f2a0018502cae5426d5cfc1019aed307d63e4fa6b3845c8 SHA512 a2410a98b76d4bccecf7bcb82ff0b6e9fb809b389f7fea938cc42d94e18622cc5f353d2de737121a1990d9e16e9db8cc2f82677c94f78cd03c9227e815eab9e0 DIST libdnet-1.12.tgz 970125 BLAKE2B 74be00b6fe1c7848010a7044628a6ad8f4b2f2c4f9676066c15e02c7a8b613e26a5e7743df524869fee2eb7d93438bf346f772b8df199b8ec337279dd50d5d77 SHA512 b763d2caa77b8d16b531142a5bce3b862ed20198406a00e1fe7f3b45ce308b97d638b0c7f03bd8593fdd206cc1645952839bc340b77537298a3df88599835bf3 +DIST libdnet-1.14_pre20200717.tar.xz 276684 BLAKE2B 829e1293ae4b5c3eb4e13aef36d0ecd7abfdf53169b25e1cc435e59d2cad1019fd94f7b0a3bc9d0d382aff051855d06c014677de92a7af01ababf748093f9c18 SHA512 75d8e25b00dfa59b9354f7e67a7685ac213af79b594584b056457181c6f98ef00ed1243a2eb47f63261007130e6eae8e91b8c1b2f353c62dea666b3eb6a3940c EBUILD libdnet-1.12-r1.ebuild 1552 BLAKE2B 76c2f623188831fc9cbd7273ce90bb58eb2e35b19f9602a9ada16b533db237401f21bf2fc569a5a785f7d2e13057a78811a3a03d86ff1268237d3f9cc01cc38b SHA512 b8648b062ef377e0431210776add07d00dfd9647b801ad3b4a4d0a32cbdfa3a065706a66be71d137445887ba97d3588790b15b027a96e22596924bf7f01a8de5 EBUILD libdnet-1.12.ebuild 1520 BLAKE2B ce48aaf6543ede9d1db165aee357c37447b1a75e48b23439ad2fb8b848edd003b6a1457b1407cbe6962759fc2ab20a1bf3f3ed9b70fa711b1ad28dad851f91b7 SHA512 7c7392c123fa430c97015eaf6d926a525791f0bcc51bda4c95cadc17267f52f99fd22d747b42060b9307324a601ec1d83b91399233991e87597f5bbc59038afd +EBUILD libdnet-1.14_pre20200717.ebuild 1358 BLAKE2B fb82b3978e9ccdabb011483e80967a9124cb3e526c226d6e61cef5507879822ee5a96dafdf3b4b3097a09bf70f15315ab9e0b03e0575a52cf1596a9a00fca24b SHA512 067d9e12140cf6eea5f41a4c50799310729ae1b27139a23669b91caf402342d1fa2b5e59b17ed35a9dfb6a53e3ab7188a1f6663510e338abdd352629cd9d9039 +EBUILD libdnet-9999.ebuild 1304 BLAKE2B 42da11f210ae69feadac13950baa8194a817784c0c0e8bb31befc07f20bd842d81348b623137a4b8ca6b857cd45246e23d75db6a807e5710f70574cd4c61484a SHA512 9e432bb2bcee9baef6fbe8428da44455fb02e8e4b14fe3575194f2e1c1f9e5a38f8c57280350c1fc570f03753c5fe121a2e37580812d6e92af1a2e98cbf3513f MISC metadata.xml 412 BLAKE2B 31f4ab6e16ecdf55347cc83250bc3ce8afc9305f27b1925fe231cc66945725fd33d8239265e6219caf822ef23501014a85219d2a222f5085881b7ca06dffdafc SHA512 ba32dc96871e434caec3a21dea3c5f005c4aacf122312dcd44a228ae92c02c90c02339761ea091fbcad618b02cd5e4d672914c5b6263ef386d49242e19e1febe diff --git a/dev-libs/libdnet/libdnet-1.14_pre20200717.ebuild b/dev-libs/libdnet/libdnet-1.14_pre20200717.ebuild new file mode 100644 index 000000000000..3975fee66788 --- /dev/null +++ b/dev-libs/libdnet/libdnet-1.14_pre20200717.ebuild @@ -0,0 +1,73 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +AT_M4DIR="config" +PYTHON_COMPAT=( python3_{6,7,8} ) +DISTUTILS_OPTIONAL=1 +inherit autotools distutils-r1 + +DESCRIPTION="simplified, portable interface to several low-level networking routines" +HOMEPAGE="https://github.com/ofalk/libdnet" +SRC_URI="https://dev.gentoo.org/~jer/${P}.tar.xz" +LICENSE="LGPL-2" + +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" +IUSE="python static-libs test" + +DEPEND=" + python? ( ${PYTHON_DEPS} ) +" +RDEPEND=" + ${DEPEND} +" +RESTRICT="test" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" +DOCS=( README.md THANKS TODO ) + +src_prepare() { + default + + sed -i \ + -e 's/libcheck.a/libcheck.so/g' \ + -e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' \ + configure.ac || die + sed -i \ + -e 's|-L$libdir ||g' \ + dnet-config.in || die + sed -i \ + -e '/^SUBDIRS/s|python||g' \ + Makefile.am || die + + eautoreconf + + if use python; then + cd python + distutils-r1_src_prepare + fi +} + +src_configure() { + econf \ + $(use_with python) \ + $(use_enable static-libs static) +} + +src_compile() { + default + if use python; then + cd python + distutils-r1_src_compile + fi +} + +src_install() { + default + if use python; then + cd python + unset DOCS + distutils-r1_src_install + fi + find "${D}" -name '*.la' -delete || die +} diff --git a/dev-libs/libdnet/libdnet-9999.ebuild b/dev-libs/libdnet/libdnet-9999.ebuild new file mode 100644 index 000000000000..3878f74646eb --- /dev/null +++ b/dev-libs/libdnet/libdnet-9999.ebuild @@ -0,0 +1,73 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +AT_M4DIR="config" +PYTHON_COMPAT=( python3_{6,7,8} ) +DISTUTILS_OPTIONAL=1 +inherit autotools distutils-r1 git-r3 + +DESCRIPTION="simplified, portable interface to several low-level networking routines" +HOMEPAGE="https://github.com/ofalk/libdnet" +EGIT_REPO_URI="https://github.com/ofalk/libdnet" +LICENSE="LGPL-2" + +SLOT="0" +KEYWORDS="" +IUSE="python static-libs test" + +DEPEND=" + python? ( ${PYTHON_DEPS} ) +" +RDEPEND=" + ${DEPEND} +" +RESTRICT="test" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" +DOCS=( README.md THANKS TODO ) + +src_prepare() { + default + + sed -i \ + -e 's/libcheck.a/libcheck.so/g' \ + -e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' \ + configure.ac || die + sed -i \ + -e 's|-L$libdir ||g' \ + dnet-config.in || die + sed -i \ + -e '/^SUBDIRS/s|python||g' \ + Makefile.am || die + + eautoreconf + + if use python; then + cd python + distutils-r1_src_prepare + fi +} + +src_configure() { + econf \ + $(use_with python) \ + $(use_enable static-libs static) +} + +src_compile() { + default + if use python; then + cd python + distutils-r1_src_compile + fi +} + +src_install() { + default + if use python; then + cd python + unset DOCS + distutils-r1_src_install + fi + find "${D}" -name '*.la' -delete || die +} diff --git a/dev-libs/libebml/Manifest b/dev-libs/libebml/Manifest index d6b98e0db4a6..bcbffd0cea0f 100644 --- a/dev-libs/libebml/Manifest +++ b/dev-libs/libebml/Manifest @@ -3,5 +3,5 @@ DIST libebml-1.3.9.tar.xz 69836 BLAKE2B d37bf9d74cb21a0c4cea3550bbd25f081e48085b DIST libebml-1.4.0.tar.xz 69944 BLAKE2B 240c18d53ec73cc42b4cbed507e95ecc5ada0bd65e826b3f2e930bf6d4055097606b920c433ee5786112894ea6ad0eac229e784501ba14563274b7605dab01f5 SHA512 db78ee560a44b90b4df12ba23a00f8ccb0d3626f44296af6b79a492a00126690582764c6be6c9e9851302a0d0d70edfbe000cc217c5532abe862a821624af230 EBUILD libebml-1.3.10.ebuild 601 BLAKE2B b86e87e70d8802cb2f3c7d1a5670f25f9f2d7167d8ba16b830300ea9e3979d7f0a1b6bf9c1e26055effa4b52f27e326168d885a47933f1a5e094c4ddb742e32c SHA512 5f777da9fe58cc72eb8e354a3d2d59cb7cab7cf411a85805cf368cafd0849ef5ea3a064ae13243670c5de8819f9185c94e6c3088acd15d589a2d2ece33e103ae EBUILD libebml-1.3.9.ebuild 594 BLAKE2B f6d165e999ba2127e529b26077f532c64d110d0fb481408f6be06733f573ce401f4e622d2fcd13fdda75343b84f5cde6cd962fa131f6b3bc73d930c9a0714395 SHA512 7a8f357385c3169cf83e4364f31067e6bbdd827303042412a792a921ff8be8fd8b758847202b47aaa0f611721301ebffc9eca8ad3c2bb80dd37ba9d8edc251dc -EBUILD libebml-1.4.0.ebuild 601 BLAKE2B 9cc832ab032a6e5b240e5bb18e9397eead7693fe61eaa8e1b6d097814669e3720febe013cd7f38734938b840ed3051021365ae148a55d544e072a854dd27422f SHA512 c3d17086423277d4a75653eddcafdd9e951feaed1078752f17e9e5c6514d81f0f9a177d0f9a374e434a1604815ebb4e663eabd86dc814ea603f0ade5ba9de252 +EBUILD libebml-1.4.0.ebuild 596 BLAKE2B 7da09a0013d0d3430eb2683698abd99773869a37bd0ef2d06c124628345e3b8892ad5c4ac41e514ef9b1a70353b1c23298fc410fb6a8e422b7859272f4eec03c SHA512 2f734e59277b0a835ebb6680ee50d73f68097a695faaf23df6960b7db4fa40a82e8fd22f4dd5e021f59e9af8dbd5c26b37bc37f8343b85916c101cd52052f82e MISC metadata.xml 316 BLAKE2B d9c2545fc8f21819157e2c492aaf9d0af904896735cfc7899efceb4f14d56aa205a946a28cad171dd2d5e19c9e6dd7fb380d29a788d7c231e3b7120de4f8ec65 SHA512 e134cb7e80fb4da27ef695d9ac26d13850df19cd37116fd069ab33cb91a380c322c8087d50c8040ea2a776903e9bc59fd825eb65593b0c3215c316a819f0fb22 diff --git a/dev-libs/libebml/libebml-1.4.0.ebuild b/dev-libs/libebml/libebml-1.4.0.ebuild index 922d0dd6de85..e2f9532f0f19 100644 --- a/dev-libs/libebml/libebml-1.4.0.ebuild +++ b/dev-libs/libebml/libebml-1.4.0.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://dl.matroska.org/downloads/${PN}/${P}.tar.xz" LICENSE="LGPL-2.1" SLOT="0/5" # subslot = soname major version -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="" src_configure() { diff --git a/dev-libs/libevdev/Manifest b/dev-libs/libevdev/Manifest index 27a71b0898ec..ff447affac42 100644 --- a/dev-libs/libevdev/Manifest +++ b/dev-libs/libevdev/Manifest @@ -1,4 +1,6 @@ DIST libevdev-1.9.0.tar.xz 443208 BLAKE2B 858567ec82f20d567f66d0c41bd1519ffd023a0374e346cff270a0bae0b5136a469a4fd56fcbd3d53b2a2ace6166821ec5e75c90e08eb347331e7974865ceda7 SHA512 6e7589b5776437ac23fbf65b3194fb1dd3a68a294696145060cdd97bcdeb9b04f355f2be028dc1a5efe98ef2cafca15e4f61115edf5d62591e3a8944dc95942a +DIST libevdev-1.9.1.tar.xz 442740 BLAKE2B 8a0e6c555ffa09890556c33e346e03b878eb0dac8585164d7561b6e20e5795c39299508f761a1fa15737d0802e362ba5c9d17de89d96fb79f1bfa1afa28423ab SHA512 7d845ce2279d2e2ef12437f6218550265ea0c85e5b6c0d116aff09787b73626b338fe3084baff060085d393688b5ae3d33772689e0581684eff257af01c4c645 EBUILD libevdev-1.9.0.ebuild 1198 BLAKE2B cb04493b3395c2936a7d7ae12a83fa2af05d3642c7751440087e978ab483d93feef05a8d1b951ad43a007b6481f8abfcb9f957811918682867e094ff8c51c1fc SHA512 eefca4687835e7d811fc7e4eaa73376989103b80f0aa32aa4c152133aaff001772fdf1de9adff315a25a99d8da7ce29e533de6439595bd4fd7a03beb0ebc777c -EBUILD libevdev-9999.ebuild 1207 BLAKE2B 6161acc1fc3c4294157fb08607d35d7d1b89760a3677433d4336a353739bdcd3f75ea8ea030c1278257be691c14655e345ba720bb644286a0f9beb5c90016446 SHA512 754e0e774a3b50864ff6142f6f367acb85945fc99e0eabdd7f5957924780ee582f373d5d0bc89d587f9cb9f212998005be522af93f53ce7ce32862b2704f09dd +EBUILD libevdev-1.9.1.ebuild 1209 BLAKE2B 07dbb14d5f73ef70b6d919c3c6ec4e4022b1f89ff3c7c0260eea80129c581e0c785648b4050dba02b3961c50e677c3d149883e3c301627f1fe5be33519a93d64 SHA512 0fa7f48f6d8cd9d14354aa630626d4a5fbafe038aaefac78c2f031891fceea8448e89a78f35045ffabd324788b12960e620f85ee62d7461f51c1eba2cf13e28d +EBUILD libevdev-9999.ebuild 1209 BLAKE2B 07dbb14d5f73ef70b6d919c3c6ec4e4022b1f89ff3c7c0260eea80129c581e0c785648b4050dba02b3961c50e677c3d149883e3c301627f1fe5be33519a93d64 SHA512 0fa7f48f6d8cd9d14354aa630626d4a5fbafe038aaefac78c2f031891fceea8448e89a78f35045ffabd324788b12960e620f85ee62d7461f51c1eba2cf13e28d MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 diff --git a/dev-libs/libevdev/libevdev-1.9.1.ebuild b/dev-libs/libevdev/libevdev-1.9.1.ebuild new file mode 100644 index 000000000000..8f8dd07ac544 --- /dev/null +++ b/dev-libs/libevdev/libevdev-1.9.1.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6,7,8,9} ) + +inherit meson multilib-minimal python-any-r1 + +DESCRIPTION="Handler library for evdev events" +HOMEPAGE="https://www.freedesktop.org/wiki/Software/libevdev/ https://gitlab.freedesktop.org/libevdev/libevdev" + +if [[ ${PV} == 9999* ]] ; then + EGIT_REPO_URI="https://gitlab.freedesktop.org/libevdev/libevdev.git" + inherit git-r3 +else + SRC_URI="https://www.freedesktop.org/software/libevdev/${P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" +fi + +LICENSE="MIT" +SLOT="0" +IUSE="doc test" + +DEPEND="test? ( dev-libs/check[${MULTILIB_USEDEP}] )" +BDEPEND=" + ${PYTHON_DEPS} + doc? ( app-doc/doxygen ) + virtual/pkgconfig +" +RESTRICT="!test? ( test )" + +multilib_src_configure() { + local emesonargs=( + $(meson_feature doc documentation) + $(meson_feature test tests) + ) + meson_src_configure +} + +multilib_src_compile() { + meson_src_compile +} + +multilib_src_test() { + meson_src_test +} + +multilib_src_install() { + meson_src_install +} + +multilib_src_install_all() { + if use doc; then + local HTML_DOCS=( doc/html/. ) + einstalldocs + fi +} diff --git a/dev-libs/libevdev/libevdev-9999.ebuild b/dev-libs/libevdev/libevdev-9999.ebuild index 7509db80b34d..8f8dd07ac544 100644 --- a/dev-libs/libevdev/libevdev-9999.ebuild +++ b/dev-libs/libevdev/libevdev-9999.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{6,7,8} ) +PYTHON_COMPAT=( python3_{6,7,8,9} ) inherit meson multilib-minimal python-any-r1 diff --git a/dev-libs/libevent/Manifest b/dev-libs/libevent/Manifest index 07dcbbf0747c..940243639c6c 100644 --- a/dev-libs/libevent/Manifest +++ b/dev-libs/libevent/Manifest @@ -1,7 +1,7 @@ DIST libevent-2.1.11.tar.gz 1082234 BLAKE2B c6721589834bff027a8149ee0076e1877fba000d1712a405e20030192d9c81b892d0930bc1a4774650bef4cb08c60ac81b5928dc17346492ae7e4ded2125579a SHA512 9d0517b117f128f4f196b19a810524814bab75fa967d533063aaa619d3cf2dca97b443edd5805b764da2993d8e37caa536dce39f68ffcc2a88d32a89204c2de3 -DIST libevent-2.1.8.tar.gz 1026485 BLAKE2B f1ceb740aa776a7c26f52916d771af7f4bb351cadf858ef991ab015e5897e34579c6af1f4ed3b516d5be2ac7cb3a7c27ac9d3020dbb04ac7670118616a264561 SHA512 a2fd3dd111e73634e4aeb1b29d06e420b15c024d7b47778883b5f8a4ff320b5057a8164c6d50b53bd196c79d572ce2639fe6265e03a93304b09c22b41e4c2a17 +DIST libevent-2.1.12.tar.gz 1100847 BLAKE2B bc1ace15f639ecef2e6b3f95976b8830c1d86f1d06606dd949e2978611fdf9859ed4eb9292d13e6e90e3835063edb94aae64a15c518d5dabe680f37d5a7f5290 SHA512 88d8944cd75cbe78bc4e56a6741ca67c017a3686d5349100f1c74f8a68ac0b6410ce64dff160be4a4ba0696ee29540dfed59aaf3c9a02f0c164b00307fcfe84f EBUILD libevent-2.1.11.ebuild 1676 BLAKE2B f49807e0141e8dce19fbc298fa83c06bada4ea7be36abd0456bae012b0d7582adede6b0674dcf9235c0dcf8fb237e8b8b9b09a10373eaa78ea077120bf5d6e0a SHA512 7390987df1199e264c25a364cd323f8c14e409059461bae0eb16493f5e118720b25d2e245bee43da8677a55388e7e03704d9d2bdf68d18c3c4aeb9f0e7742b40 -EBUILD libevent-2.1.8.ebuild 1669 BLAKE2B 54aa18351c31a916764cfa58ab80162aea085b2e47a79c580a15f98e88bfd24524dff4494b89c4d6de8447161672dc2ed0a20095e77093cea1f84f4fb8015990 SHA512 a1eeb850d53b60c071240591387d01377216a8272c83e6b507196ce4b2fdea80d7e123a52dbbaa35a36b4c09e2183a490df8ddfd4293c92f334b28bb94d8e2b5 -EBUILD libevent-2.1.9999.ebuild 1325 BLAKE2B 00950c513155950753eb2a59d53b082101f883581318f74f17b8ac19b8f01c032e3705e015ce9d389785b588e17ecb7b8b54601f1c150ac5c87689afd5b25ab2 SHA512 be226220566535a11b0372307b80c6505574bafdf644ad5242d374ea5e27a04c05181aaebfe61529b45805fb13d6bb5ac01da852f49417afb41891f038be6dc8 -EBUILD libevent-9999.ebuild 1262 BLAKE2B 22ce0e6670997f58d38256d01c014db1d0c1b3375c9c33e410cf9afa177b774695276fbcaea5e2729e5dbbf55290fc0c55556a94b0ca299cea06ae4451502b0e SHA512 f95954c09907a4983bdaac89f230d6f35382f52bd2a3cfaf78323406f2152a524860a59187e9766d65977cf33cc72777ed1c70cfbf924192d0690f62cbb34fc0 -MISC metadata.xml 547 BLAKE2B feca63a3b25db4aa0a078b6135188aa7e4250fa9afb207e14c9b02cad83709abe5dace68f5a34cccc0a2a745424c4c044696d0e6021c4c83bcc2666700a8528d SHA512 556eebbb7d05a8234e9705126549520a8b8d553cf6331f353bf7a5bad343b0ad56292dbdda5bccec827772faf07bf17f0163e4b479530eea0832e31d9f17f73a +EBUILD libevent-2.1.12.ebuild 1814 BLAKE2B 327abda5ded9d4f501caec1b34a9e0c2b026034e8dbde231a605273948d69aa74e91a7930d4ce1fa841b2b69df489c1a33f5b0cf8196dc7dfcbea401f0122ac1 SHA512 4db5a373ca47fbdc9511335cc457e0ab909cfc082ee7dcb6410bb7016509a32771ec6b4f5d3ffdbe750f85c28e319204783447fe05a29707864dd0a874b39389 +EBUILD libevent-2.1.9999.ebuild 1454 BLAKE2B ea626beb07c670f44b0d66f534933baa9a56c1db12e330022eb79388ce86518b9394187008c0107cae83abfab219bd179a9f0f79b7cbb79d1f5d78fbd0602a43 SHA512 68daa118fe9171bf7e5818628cff1b41aa21f67ea965b95aa2d3c0f544f57f2f42905ff9847b27ea4ec516b007ad3273a3e0ea98b7063c38ab3904cc2e6e98c6 +EBUILD libevent-9999.ebuild 1456 BLAKE2B ef35cb0e687a4e96c43112c6fcca73e9596ebc51f07beb1f28f19babdfb064c462b38c6c791f20e0efa64c4ca4b446b91df68051f9eb0a5f378021008c22e3fc SHA512 a41daeef937820670ab644e658e15399b5eb2dfca6cea10b149dc3aa281d2dbbc7ec2a391bcca71fa4b105feebc880bfaa8d0246b7c90daaaba883f56d404159 +MISC metadata.xml 903 BLAKE2B 821ef22428235e3fa2821a7c7b41210966f75144a7c6ec16f25a333e0548e4fef339060d7e199e58c2860792baf6f78297696216b3ab2ad79a1c541840217195 SHA512 29d47bfbb688221bd9d7759893328eb03b59c4b4b07d135b6fb3aa1968ee97abb44a2196da27ba01abade5fc8d754e4ce80b05f712b2f267b83a9fc71bde8f3e diff --git a/dev-libs/libevent/libevent-2.1.8.ebuild b/dev-libs/libevent/libevent-2.1.12.ebuild index 5af707d91492..89f9d1095ebe 100644 --- a/dev-libs/libevent/libevent-2.1.8.ebuild +++ b/dev-libs/libevent/libevent-2.1.12.ebuild @@ -1,39 +1,41 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -inherit eutils ltprune multilib-minimal +EAPI=7 +inherit multilib-minimal DESCRIPTION="Library to execute a function when a specific event occurs on a file descriptor" HOMEPAGE=" https://libevent.org/ https://github.com/libevent/libevent/ " -SRC_URI="https://github.com/${PN}/${PN}/releases/download/release-${PV}-stable/${P}-stable.tar.gz -> ${P}.tar.gz" - +SRC_URI=" + https://github.com/${PN}/${PN}/releases/download/release-${PV/_/-}-stable/${P/_/-}-stable.tar.gz -> ${P}.tar.gz +" LICENSE="BSD" -# libevent-2.1.so.6 -SLOT="0/2.1-6" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="debug libressl +ssl static-libs test +threads" + +SLOT="0/2.1-7" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +IUSE=" + +clock-gettime debug libressl malloc-replacement +ssl static-libs test + +threads verbose-debug +" RESTRICT="!test? ( test )" DEPEND=" ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] ) - libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] ) + libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] ) ) " RDEPEND=" ${DEPEND} !<=dev-libs/9libs-1.0 " - MULTILIB_WRAPPED_HEADERS=( /usr/include/event2/event-config.h ) - -S=${WORKDIR}/${P}-stable +S=${WORKDIR}/${P/_/-}-stable multilib_src_configure() { # fix out-of-source builds @@ -41,13 +43,15 @@ multilib_src_configure() { ECONF_SOURCE="${S}" \ econf \ - --disable-samples \ + $(use_enable clock-gettime) \ $(use_enable debug debug-mode) \ - $(use_enable debug malloc-replacement) \ + $(use_enable malloc-replacement malloc-replacement) \ $(use_enable ssl openssl) \ $(use_enable static-libs static) \ $(use_enable test libevent-regress) \ - $(use_enable threads thread-support) + $(use_enable threads thread-support) \ + $(use_enable verbose-debug) \ + --disable-samples } src_test() { @@ -61,5 +65,5 @@ DOCS=( ChangeLog{,-1.4,-2.0} ) multilib_src_install_all() { einstalldocs - prune_libtool_files + find "${ED}" -name '*.la' -delete || die } diff --git a/dev-libs/libevent/libevent-2.1.9999.ebuild b/dev-libs/libevent/libevent-2.1.9999.ebuild index c9ecb810481e..5bc82f314e7a 100644 --- a/dev-libs/libevent/libevent-2.1.9999.ebuild +++ b/dev-libs/libevent/libevent-2.1.9999.ebuild @@ -16,7 +16,10 @@ LICENSE="BSD" # libevent-2.1.so.6 SLOT="0/2.1-7" KEYWORDS="" -IUSE="debug libressl +ssl static-libs test +threads" +IUSE=" + +clock-gettime debug libressl malloc-replacement +ssl static-libs test + +threads verbose-debug +" RESTRICT="test" DEPEND=" @@ -48,13 +51,15 @@ multilib_src_configure() { ECONF_SOURCE="${S}" \ econf \ - --disable-samples \ + $(use_enable clock-gettime) \ $(use_enable debug debug-mode) \ - $(use_enable debug malloc-replacement) \ + $(use_enable malloc-replacement malloc-replacement) \ $(use_enable ssl openssl) \ $(use_enable static-libs static) \ $(use_enable test libevent-regress) \ - $(use_enable threads thread-support) + $(use_enable threads thread-support) \ + $(use_enable verbose-debug) \ + --disable-samples } multilib_src_install_all() { diff --git a/dev-libs/libevent/libevent-9999.ebuild b/dev-libs/libevent/libevent-9999.ebuild index 4a9b798d3529..ed19f34dab5f 100644 --- a/dev-libs/libevent/libevent-9999.ebuild +++ b/dev-libs/libevent/libevent-9999.ebuild @@ -14,10 +14,14 @@ HOMEPAGE=" LICENSE="BSD" SLOT="0" KEYWORDS="" -IUSE="debug libressl +ssl static-libs test +threads" +IUSE=" + +clock-gettime debug libressl malloc-replacement mbedtls +ssl static-libs + test +threads verbose-debug +" RESTRICT="test" DEPEND=" + mbedtls? ( net-libs/mbedtls ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] ) libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] ) @@ -46,13 +50,16 @@ multilib_src_configure() { ECONF_SOURCE="${S}" \ econf \ - --disable-samples \ + $(use_enable clock-gettime) \ $(use_enable debug debug-mode) \ - $(use_enable debug malloc-replacement) \ + $(use_enable malloc-replacement malloc-replacement) \ + $(use_enable mbedtls) \ $(use_enable ssl openssl) \ $(use_enable static-libs static) \ $(use_enable test libevent-regress) \ - $(use_enable threads thread-support) + $(use_enable threads thread-support) \ + $(use_enable verbose-debug) \ + --disable-samples } multilib_src_install_all() { diff --git a/dev-libs/libevent/metadata.xml b/dev-libs/libevent/metadata.xml index 6036c10bd580..78451ccf1300 100644 --- a/dev-libs/libevent/metadata.xml +++ b/dev-libs/libevent/metadata.xml @@ -1,16 +1,21 @@ <?xml version='1.0' encoding='UTF-8'?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>jer@gentoo.org</email> - <name>Jeroen Roovers</name> - </maintainer> - <upstream> - <remote-id type="cpe">cpe:/a:niels_provos:libevent</remote-id> - <remote-id type="sourceforge">levent</remote-id> - <remote-id type="github">libevent/libevent</remote-id> - </upstream> - <use> - <flag name="debug">Support runtime debug mode and malloc hooks (for programmers)</flag> - </use> +<maintainer type="person"> +<email>jer@gentoo.org</email> +<name>Jeroen Roovers</name> +</maintainer> +<upstream> +<remote-id type="cpe">cpe:/a:niels_provos:libevent</remote-id> +<remote-id type="github">libevent/libevent</remote-id> +<remote-id type="sourceforge">levent</remote-id> +</upstream> +<use> +<flag name="clock-gettime">Disable use of clock_gettime even if it is available</flag> +<flag name="debug">Support for running in debug mode</flag> +<flag name="malloc-replacement">Support for replacing the memory management functions</flag> +<flag name="mbedtls">Support for <pkg>net-libs/mbedtls</pkg> encryption</flag> +<flag name="ssl">Support for <pkg>dev-libs/openssl</pkg> encryption</flag> +<flag name="verbose-debug">Support for verbose debug logging</flag> +</use> </pkgmetadata> diff --git a/dev-libs/libffi/Manifest b/dev-libs/libffi/Manifest index b5c60b780a29..855550d5ee99 100644 --- a/dev-libs/libffi/Manifest +++ b/dev-libs/libffi/Manifest @@ -2,7 +2,10 @@ AUX libffi-3.2.1-o-tmpfile-eacces.patch 660 BLAKE2B 651067a56e0bd0980a696ad12c8f AUX libffi-3.3-power7-memcpy-2.patch 1086 BLAKE2B 954504aca37f2dd16913c3fb3d61e8fb5e8db017d897405905366f4701bf2357871dd41e86e59050733f04321e0155b03683577f132504aec5c476cc78323be6 SHA512 5a0d8590c2e53e20e4384dad704060a2c781b91487a0e14d2f1521f69b722ccc60e25b84c38f9ded65b01bef49250e07c6935be577d100aea18496abfbe374f5 AUX libffi-3.3-power7-memcpy.patch 1681 BLAKE2B 6e3df741b07718f13c347ae54fe82bbf0f433790d14dff4114ffa77f2c3700460801af3fc5a649589ab2d1d0122db0729cd1aaa5321ea3f7822b1cd4d7f64b05 SHA512 13eb09d8080cadedb959c8d62d37f80bf3c32fbe488fdb59955ff6c8649f1086baaedb015e47ee52de65836f57bc172dbce2d2b3bc1aee6aca07eb9da451cf70 AUX libffi-3.3-power7.patch 1172 BLAKE2B 42408c0774553fde9c086ea3c2b0d0152d15a9dce63860e8884c683ce92553c3db38d6fdddcdee644f7819f56a28a12e639ee05a0956cf0fa3fed521157754f7 SHA512 17062f152ce2aa8d46e4e01c3c0b8e52c67d30c3405b9b2f40656dfe731c774fd67ff3ad397f426d9e56ca4fe4ec4908f5c8f6082d52975cf19171ca4e39c534 +AUX libffi-3.3-ppc-int128.patch 2309 BLAKE2B 5b0c89e8f9f63329d2cb796d23b3a22c48b7761956e18fd383636efdc75e2558cb5d6615dd1ec965034d93061314711ee2ad533f49522a365049d5451bcebf19 SHA512 3b47dde00428ebc536f0f73fc7295d4c554f65a35502e855e808893eb3940d68f903a96cd6f24f0eb5f83a405d10bb83feef19538e490ceeeba99a22a0b96bcd +AUX libffi-3.3-ppc-vector-offset.patch 1425 BLAKE2B 334ed26ea082c603cfbf43d37e9cf64ac34a7054857743a9fbf5d05c7226402dfec4fd955cc3dc5652f57712bbaadcd0551ff727cfd8f8305edf38daa9814be2 SHA512 742ef73d95e39eefcbcfb423c4729966a31bf88ff00d20eab6c4db1db04e97f53784bf29111c57c577d1f6264735ee4ed797b4537a74d0ae1753de2990cd3ce9 AUX libffi-3.3_rc0-ppc-macos-go.patch 2100 BLAKE2B 7ae1309b08be9293acee042d141bb632b0763af9e14200ef7206db763b01e289a68ce544709c8abc5a86adca5f1c0c895c6bf24f667429b118bf660ffa95bb39 SHA512 4684b87f1d36a0098ebde7996e4417718b3535eb66ec7c619be74fa30e4446849c246b491cad3aea1ac44bdf9e9fbf6e952000cb85299faf5b1d8598136b184b DIST libffi-3.3.tar.gz 1305466 BLAKE2B cddc40729a30a9bd34d675809f51f8d1b4ccaffa54bc6dd6f7e965f4e260edd34754719f9f6247c8957aeb7cf154d56ce1fe16a54c3f1ad39afbebdf41d23caa SHA512 61513801a156f11420f541d325de697131846487122d6bdcf5491b18b4da788589f5c0bb07e88e396495d3be5830d74e9135595e2b8ddbfe95c448d8597fbd6f -EBUILD libffi-3.3-r1.ebuild 2792 BLAKE2B cb9ff2ba67aaa92522f8e7a4d808db29c006bad4bd2eee00f1ddab0939c8a6bbb2ac05cd98d09a990787f12cf284523264daec11c50acd79c383f9af96c0094c SHA512 90c1e7e9f7d186f6100dc0d5a4c4bbc45c14cc6dfc4bc803bc1853c6b18a3ac5ce17ed30a84967ddee59881c3e2c8764efb4092a844ed81eec01ad7d20d7c6e0 -MISC metadata.xml 2034 BLAKE2B f63969afac51937e2c761f164de6a40addd97871037f20e4c6fa0da80bc67d6e7580d3a1eb51b943e0195bb7f480abbf461d00da6e2317eade55d2ceeb1cb3fa SHA512 c1c48a13ac9818b7e409180b27751f172800c217d1a37db954490478abb0a3e8b585631a25507b1ac85b11f41da95b15ecf139b6880801b6a8ea805749efc1bd +EBUILD libffi-3.3-r1.ebuild 2609 BLAKE2B 36fbde1f703bc2e49882a24f91f5d039972f0825bc2ea864c5a110ff033b897051fa9d675f2fd61624d8f523d3532f0028b2f5b6144d2779ba9f992a2a706a35 SHA512 966a1a6d4b98de9a0eb7b54fb2e54eb7fb7caf9f574806740304cdf002fae5694a0e519c96bc77e6feda9eb90bc9489e51f29acfa6afb771cb35ab41652d2c8b +EBUILD libffi-3.3-r2.ebuild 2702 BLAKE2B e83880bae34bc6dfe8fae53807df7a4dd2f12fedfb15f79ec7650b8f7c132956811131e6a3369e0e37ce1626a1d4876a817720cbd09289a00bb0db31820626ba SHA512 6c5e125e77c0f37848266d7c2e628a085caca15cec1e67d0db235359d59aed004f35b0999011d6b22d70854de0768505a47abd618025c477a28721004c00f668 +MISC metadata.xml 1956 BLAKE2B fa40a1a4cfe54a77a1a7d8e4d5ae8a1f80c4497c38a2e700e242ddab26090ccbaf4738e67c288e5f337c393aab085b161f23138f50fb8b1bfdac2de1eb440428 SHA512 87638bd9030782e1e8e917fc1fb9e28744b7dfd927d42e36a249cec835f734db3c6430c2ebc807b7541fd9ba8d805b57ced30486e8bd046dde2edb56a4af7906 diff --git a/dev-libs/libffi/files/libffi-3.3-ppc-int128.patch b/dev-libs/libffi/files/libffi-3.3-ppc-int128.patch new file mode 100644 index 000000000000..ed53ae99902f --- /dev/null +++ b/dev-libs/libffi/files/libffi-3.3-ppc-int128.patch @@ -0,0 +1,63 @@ +From 4f9e20ac51ce13d46fed3c869e1deb6d9bb89444 Mon Sep 17 00:00:00 2001 +From: Andrew Geissler <geissonator@users.noreply.github.com> +Date: Fri, 1 May 2020 06:58:30 -0500 +Subject: [PATCH] ffi_powerpc.h: fix build failure with powerpc7 (#561) + +This is a patch pulled down from the following: +https://github.com/buildroot/buildroot/blob/78926f610b1411b03464152472fd430012deb9ac/package/libffi/0004-ffi_powerpc.h-fix-build-failure-with-powerpc7.patch + +This issue is being hit on OpenBMC code when pulling the latest +libffi tag and building on a P8 ppc64le machine. I verified this +patch fixes the issue we are seeing. + +Below is the original commit message: + +Sicne commit 73dd43afc8a447ba98ea02e9aad4c6898dc77fb0, build on powerpc7 +fails on: + +In file included from ../src/powerpc/ffi.c:33:0: +../src/powerpc/ffi_powerpc.h:61:9: error: '_Float128' is not supported on this target + typedef _Float128 float128; + ^~~~~~~~~ + +Fix this build failure by checking for __HAVE_FLOAT128 before using +_Float128, as _Float128 is enabled only on specific conditions, see +output/host/powerpc64-buildroot-linux-gnu/sysroot/usr/include/bits/floatn.h: + + /* Defined to 1 if the current compiler invocation provides a + floating-point type with the IEEE 754 binary128 format, and this glibc + includes corresponding *f128 interfaces for it. */ + #if defined _ARCH_PWR8 && defined __LITTLE_ENDIAN__ && (_CALL_ELF == 2) \ + && defined __FLOAT128__ && !defined __NO_LONG_DOUBLE_MATH + # define __HAVE_FLOAT128 1 + #else + # define __HAVE_FLOAT128 0 + #endif + +Fixes: + - http://autobuild.buildroot.org/results/5c9dd8fb3b6a128882b6250f197c80232d8a3b53 + +Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> +Signed-off-by: Andrew Geissler <geissonator@yahoo.com> + +Co-authored-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> +--- + src/powerpc/ffi_powerpc.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/powerpc/ffi_powerpc.h b/src/powerpc/ffi_powerpc.h +index 8e2f2f0..960a5c4 100644 +--- a/src/powerpc/ffi_powerpc.h ++++ b/src/powerpc/ffi_powerpc.h +@@ -57,7 +57,7 @@ typedef union + double d; + } ffi_dblfl; + +-#if defined(__FLOAT128_TYPE__) ++#if defined(__FLOAT128_TYPE__) && defined(__HAVE_FLOAT128) + typedef _Float128 float128; + #elif defined(__FLOAT128__) + typedef __float128 float128; +-- +2.27.0 + diff --git a/dev-libs/libffi/files/libffi-3.3-ppc-vector-offset.patch b/dev-libs/libffi/files/libffi-3.3-ppc-vector-offset.patch new file mode 100644 index 000000000000..4bcd27e4f152 --- /dev/null +++ b/dev-libs/libffi/files/libffi-3.3-ppc-vector-offset.patch @@ -0,0 +1,53 @@ +From 4d6d2866ae43e55325e8ee96561221804602cd7a Mon Sep 17 00:00:00 2001 +From: Samuel Holland <samuel@sholland.org> +Date: Fri, 21 Feb 2020 21:06:15 -0600 +Subject: [PATCH] Update powerpc sysv assembly for ffi_powerpc.h changes (#541) + +Some of the flag bits were moved when adding powerpc64 vector support. + +Fixes #536 +--- + src/powerpc/sysv.S | 12 +++++------- + 1 file changed, 5 insertions(+), 7 deletions(-) + +diff --git a/src/powerpc/sysv.S b/src/powerpc/sysv.S +index 1474ce7..df97734 100644 +--- a/src/powerpc/sysv.S ++++ b/src/powerpc/sysv.S +@@ -104,17 +104,16 @@ ENTRY(ffi_call_SYSV) + bctrl + + /* Now, deal with the return value. */ +- mtcrf 0x01,%r31 /* cr7 */ ++ mtcrf 0x03,%r31 /* cr6-cr7 */ + bt- 31,L(small_struct_return_value) + bt- 30,L(done_return_value) + #ifndef __NO_FPRS__ + bt- 29,L(fp_return_value) + #endif + stw %r3,0(%r30) +- bf+ 28,L(done_return_value) ++ bf+ 27,L(done_return_value) + stw %r4,4(%r30) +- mtcrf 0x02,%r31 /* cr6 */ +- bf 27,L(done_return_value) ++ bf 26,L(done_return_value) + stw %r5,8(%r30) + stw %r6,12(%r30) + /* Fall through... */ +@@ -145,10 +144,9 @@ L(done_return_value): + #ifndef __NO_FPRS__ + L(fp_return_value): + .cfi_restore_state +- bf 28,L(float_return_value) ++ bf 27,L(float_return_value) + stfd %f1,0(%r30) +- mtcrf 0x02,%r31 /* cr6 */ +- bf 27,L(done_return_value) ++ bf 26,L(done_return_value) + stfd %f2,8(%r30) + b L(done_return_value) + L(float_return_value): +-- +2.27.0 + diff --git a/dev-libs/libffi/libffi-3.3-r1.ebuild b/dev-libs/libffi/libffi-3.3-r1.ebuild index f5c93c381235..996855591ae6 100644 --- a/dev-libs/libffi/libffi-3.3-r1.ebuild +++ b/dev-libs/libffi/libffi-3.3-r1.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://github.com/libffi/libffi/releases/download/v${MY_PV}/${MY_P}.ta LICENSE="MIT" SLOT="0/7" # SONAME=libffi.so.7 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 pax_kernel static-libs test test-bhaible" +IUSE="debug pax_kernel static-libs test" RESTRICT="!test? ( test )" @@ -50,15 +50,6 @@ pkg_setup() { fi } -src_prepare() { - default - - if ! use test-bhaible; then - # These tests are very heavyweight (hours of runtime) - rm -v testsuite/libffi.bhaible/bhaible.exp || die - fi -} - multilib_src_configure() { use userland_BSD && export HOST="${CHOST}" # --includedir= path maintains a few properties: diff --git a/dev-libs/libffi/libffi-3.3-r2.ebuild b/dev-libs/libffi/libffi-3.3-r2.ebuild new file mode 100644 index 000000000000..4cec983bd172 --- /dev/null +++ b/dev-libs/libffi/libffi-3.3-r2.ebuild @@ -0,0 +1,79 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit multilib multilib-minimal toolchain-funcs + +MY_PV=${PV/_rc/-rc} +MY_P=${PN}-${MY_PV} + +DESCRIPTION="a portable, high level programming interface to various calling conventions" +HOMEPAGE="https://sourceware.org/libffi/" +SRC_URI="https://github.com/libffi/libffi/releases/download/v${MY_PV}/${MY_P}.tar.gz" + +LICENSE="MIT" +SLOT="0/7" # SONAME=libffi.so.7 +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 pax_kernel static-libs test" + +RESTRICT="!test? ( test )" + +RDEPEND="" +DEPEND="" +BDEPEND="test? ( dev-util/dejagnu )" + +DOCS="ChangeLog* README.md" + +PATCHES=( + "${FILESDIR}"/${PN}-3.2.1-o-tmpfile-eacces.patch #529044 + "${FILESDIR}"/${PN}-3.3_rc0-ppc-macos-go.patch + "${FILESDIR}"/${PN}-3.3-power7.patch + "${FILESDIR}"/${PN}-3.3-power7-memcpy.patch + "${FILESDIR}"/${PN}-3.3-power7-memcpy-2.patch + "${FILESDIR}"/${PN}-3.3-ppc-int128.patch + "${FILESDIR}"/${PN}-3.3-ppc-vector-offset.patch +) + +S=${WORKDIR}/${MY_P} + +ECONF_SOURCE=${S} + +pkg_setup() { + # Check for orphaned libffi, see https://bugs.gentoo.org/354903 for example + if [[ ${ROOT} == "/" && ${EPREFIX} == "" ]] && ! has_version ${CATEGORY}/${PN}; then + local base="${T}"/conftest + echo 'int main() { }' > "${base}".c + $(tc-getCC) -o "${base}" "${base}".c -lffi >&/dev/null + if [ $? -eq 0 ]; then + eerror "The linker reported linking against -lffi to be working while it shouldn't have." + eerror "This is wrong and you should find and delete the old copy of libffi before continuing." + die "The system is in inconsistent state with unknown libffi installed." + fi + fi +} + +multilib_src_configure() { + use userland_BSD && export HOST="${CHOST}" + # --includedir= path maintains a few properties: + # 1. have stable name across libffi versions: some packages like + # dev-lang/ghc or kde-frameworks/networkmanager-qt embed + # ${includedir} at build-time. Don't require those to be + # rebuilt unless SONAME changes. bug #695788 + # + # We use /usr/.../${PN} (instead of former /usr/.../${P}). + # + # 2. have ${ABI}-specific location as ffi.h is target-dependent. + # + # We use /usr/$(get_libdir)/... to have ABI identifier. + econf \ + --includedir="${EPREFIX}"/usr/$(get_libdir)/${PN}/include \ + --disable-multi-os-directory \ + $(use_enable static-libs static) \ + $(use_enable pax_kernel pax_emutramp) \ + $(use_enable debug) +} + +multilib_src_install_all() { + find "${ED}" -name "*.la" -delete || die + einstalldocs +} diff --git a/dev-libs/libffi/metadata.xml b/dev-libs/libffi/metadata.xml index ee959783eead..6e9a28c5ac88 100644 --- a/dev-libs/libffi/metadata.xml +++ b/dev-libs/libffi/metadata.xml @@ -35,7 +35,6 @@ </longdescription> <use> <flag name="pax_kernel">Use PaX emulated trampolines, for we can't use PROT_EXEC</flag> - <flag name="test-bhaible">Run extended regression tests (very slow).</flag> </use> <upstream> <remote-id type="cpe">cpe:/a:libffi_project:libffi</remote-id> diff --git a/dev-libs/libfido2/Manifest b/dev-libs/libfido2/Manifest index 49fb1d902de0..bfb4205cb050 100644 --- a/dev-libs/libfido2/Manifest +++ b/dev-libs/libfido2/Manifest @@ -4,5 +4,5 @@ AUX libfido2-1.4.0-cmakelists.patch 1247 BLAKE2B c290dfdb1f25b241b1a51725d568169 DIST libfido2-1.3.1.tar.gz 1512676 BLAKE2B f69a04fc69c46b688d83afe9d72b2fb1860ac00a09665d55e25293595520e95d45486ecc5355c479bc8bc06dbe6ed4fd469c511f5bf5f341a0ec86cb099fce28 SHA512 fc56f7bcddd7ae0f950b4e94f08ad726f7de68b975c0bdcbca98c7932c2c3d2e2a51b30eaf41e8dba08e82af3926cbed44264244ae721902af46e47df9fcbe1b DIST libfido2-1.4.0.tar.gz 391439 BLAKE2B d45ff3e1a5605c5ea4c5bddbe423bb69e6237e7a359fcc58469a86c503c934ce4491b98fdd673130d419cabe09acab7e201592f923ffe3908568b2b0888ae32a SHA512 5cf2f2d70bdba893fd33bf3ca91940c7eded5ed1728b517ff3fc46cbde58bf64f16da4104138b20dcea1d9a1cec730e532bc4938cdcba4ad86343e51a1c3c513 EBUILD libfido2-1.3.1.ebuild 926 BLAKE2B c5f312bba979b24d41a7c62efb6404974e1fffdce9f83dee419ced2afdc98c8039b477eba994c6205d4b25826eb7b048d2f6489bacae158d5261d20485eca663 SHA512 0d108575faaf6af6adb53812b72dc2479068f7be72bded5564dd2f54a6545e7ceed12bbe7fae70530e49c8fd7c5e4f346e6cc3eee1e2406cc580a49eff23e4c4 -EBUILD libfido2-1.4.0.ebuild 907 BLAKE2B fb1922ffe1459cd0282854d73072a4b71c735f10209ff823e580d013d4f6b4f45744f4c0f06d05bcf2be06ff72028a2cd84c70f84b469ab5005eb1a543a6664c SHA512 90cfbe8f4c13d06738cd3499121bbd4a65f9f025675c2f15d5a89b337cc40dd7116fb50036dae2b588191fad9cfbe8079d6c057e94cf28a71d349630c60124ae +EBUILD libfido2-1.4.0.ebuild 913 BLAKE2B 98fc338e47d6eec425b9a0dc28e66d811bf6502f831170a179a2a0d69067fde8af24b9906e4906c2421f72f5bee1429e6932573ff2c59febb84dd72ca323e256 SHA512 987c094d3bdaf4d88728f083c4485c47e2fb5e4162f27fa21503f44c224b72ca42b45ff6236130cca64e78c3161e64e81c16ad479be4142c7863046ec3fc664a MISC metadata.xml 257 BLAKE2B f8a00f23163e58c310fa0e4ab94b2e6b5638ec569a5e93ea2efec8c7bdd97c1629e9bc0e9bf04917f5ca4fea4085855b281c30ced2f09548e96b12e6bb1d5a40 SHA512 9c7759d33e1bbc8be0da5b4f59fc720266e40f4116d7db0c17c5ad800a7bb638f33a1308e1554092af781f06df6f6cb55db41fc22207cd3edc2e159840e3a3b1 diff --git a/dev-libs/libfido2/libfido2-1.4.0.ebuild b/dev-libs/libfido2/libfido2-1.4.0.ebuild index 2c2ce50189df..8fe49a3ff5f1 100644 --- a/dev-libs/libfido2/libfido2-1.4.0.ebuild +++ b/dev-libs/libfido2/libfido2-1.4.0.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/Yubico/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="BSD-2" SLOT="0/1" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86" IUSE="libressl +static-libs" DEPEND=" diff --git a/dev-libs/libfilezilla/Manifest b/dev-libs/libfilezilla/Manifest index e1b736e49ee3..0c750a6da84e 100644 --- a/dev-libs/libfilezilla/Manifest +++ b/dev-libs/libfilezilla/Manifest @@ -1,7 +1,11 @@ DIST libfilezilla-0.20.2.tar.bz2 549679 BLAKE2B 929c535ed7ad65fb35bc7f3a21c827ff51d01e387f383bf677f86b78aa79deafa81781eee87afe3c9c8a4d48c60ea02f7fff45b4e469f3755511c9b11001dc88 SHA512 242df38b335558c83fde91800787992adaa617292d119a15d8036adc1622b207127d0e8e6fb935b4300e1e0d63e196636589ba513e410c751dea052164a773d7 DIST libfilezilla-0.21.0.tar.bz2 552491 BLAKE2B fb2729c1c2616b4dbdc292651fd5afe85fdcd77dd70d179605f737539dd4db54c95aeff9053131076241ca57317b2361a201f6fae381c374e81ca4bc250cf1ea SHA512 a4986f8da4ac6980e7b1e564d3b033853b0e5442e4bbdee337238ad5e896b80c74e7176f973055593bd45789c41725a6315c6d510ad44354588188a1cc9f29f9 DIST libfilezilla-0.22.0.tar.bz2 557320 BLAKE2B 864f286844a3693ae1aa9f0176dbcf32a6a483174aa4b29e23ebccd309f88e97cb84368b3b5d22f07f94d396885b992e2e2e4b2f64bfec490bbcb898c88e0dc5 SHA512 6ec53a4d82dc4c6650c560633c1f1cd50866fd954d5153be7e9ebea3ee0fa38d287e16dfdccb9ad22a7e7a325eec5d659bc51dd963b2deb540e8206e0f45513e +DIST libfilezilla-0.23.0.tar.bz2 560028 BLAKE2B f5ef9001babc1cdf5f36ecaa88aacdbab99d2f65fb6554296c54ed63c6131cc03f16b92635b7c71375b94394d02b0596500c6c796c4efa6fc2c74f561c640d1b SHA512 a69040b7767e4568ba155adce67a5755b2947a73626bad89c89c88c773cb99147349ec5c3b8cc746715c9270b54ac6bc70fd57c77fe125b2dc6753669dfe93d7 +DIST libfilezilla-0.24.0.tar.bz2 560451 BLAKE2B 2806820e3aca63e1a018b01b990e7580c53d32d6e0e519a316a172a516c4b24aa38e5e1847fb40db7d21c22b68caffdafd3701273ac96561305661b9b8a86716 SHA512 f5fd2ca426235e03e26209b975e2eda4763ef1bef16a1b424ce4a248245163038d4e56089d523d77b8370f52a2947873d8439f4fc9478ba57fcef453c2f54861 EBUILD libfilezilla-0.20.2.ebuild 1084 BLAKE2B 86e8f9e37f842925b7d681ed00924c72d8555553dec8a84fce045e92320c25bcc299ace08e52879bdd67d2f57eccd95ba6db5937e92b214d29414654095bbb16 SHA512 1c79733f899c6703df637720591b5b84b17fcee1acc224b224fe25c440d77dde0fbd54d272b715436d2fa69560de76406a2856500e979864ca5caaf42620d4e2 EBUILD libfilezilla-0.21.0.ebuild 1087 BLAKE2B 60d3c3e36532022c5d100508ba220a5a128b461324201cf1a1cae0b5599fa90399dcfd85eac8f57c2851610067ce237fa31bef608204a27e3b484e735fc084d4 SHA512 e16ea6e70a9f805bdc5556df9801242f2a37724f2532b008bea7f30361d39b2531118a8d615e0691e64540d1fe79869b126e438d15284e00b35d0e52c2111598 EBUILD libfilezilla-0.22.0.ebuild 1087 BLAKE2B bb93cb261fb3d9e2e7779fa26c0a954f27b9c5ad2de4b462b3d97af617369a51b2627fab61144f115e5e517340ff6286ea9f72ec0e90ed96be9527a1e4f16261 SHA512 a996968500007e666db75fd884490950a3aa45e6f9fe3e447ba6a1357ee9f6b72b81ca24048ff5769d10cbe757dc93968afdbd12d57d1cf341f5607be2f80244 +EBUILD libfilezilla-0.23.0.ebuild 1087 BLAKE2B 78ae435cdbe136082a59fc3674647105b294fe40d9cd0e3f06415973693a532620501c9230020dac061305180ddc54295503a5dcdc67962b55cdbbe41673f4b2 SHA512 f409e8d2ee4b4ae85dcda7ff515444d8fc8602f2aab9bde827dfad5a7af331b119ff6c3629d1e3dce14cdaed06c01516c28ef745df0ae88ac90f64b954db56b5 +EBUILD libfilezilla-0.24.0.ebuild 1200 BLAKE2B b8d2c893287e66eaccae594600ffa32e213acda9ea9e0497bde9f66565ed8345808f1150bc41bc53742f50864b71a2d59cf99c59185cfbc66f4c328946a51fbc SHA512 ea02ad677ac756401955b22045a527d4285120fcb50304f0b886110f0b4f1a80fe8c3660df667a70262449f31f028404986ced7e776b05e34c845bb741ab7ee7 MISC metadata.xml 1135 BLAKE2B df349738b526f415335acdb239b0d567b2e86c835fc8faba17513a9cad40427b50d1822ee7f2d5931571cb02a26dc4a26831c44563ae3d9a6f999c8a63a23404 SHA512 f0a35af200bbaca778c066720f1c4bb8680418196ac996cf09158c2ff881612132c85a926d4881437c332bb7e1698c5f02c44be9e9cc9b976e5170813ecd8151 diff --git a/dev-libs/libfilezilla/libfilezilla-0.23.0.ebuild b/dev-libs/libfilezilla/libfilezilla-0.23.0.ebuild new file mode 100644 index 000000000000..098195366965 --- /dev/null +++ b/dev-libs/libfilezilla/libfilezilla-0.23.0.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit flag-o-matic + +DESCRIPTION="C++ library offering some basic functionality for platform-independent programs" +HOMEPAGE="https://lib.filezilla-project.org/" +SRC_URI="https://download.filezilla-project.org/${PN}/${P}.tar.bz2" + +LICENSE="GPL-2+" +SLOT="0/8" # libfilezilla .so version +KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86" +IUSE="test" + +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-libs/nettle:0= + >=net-libs/gnutls-3.5.7:= +" +DEPEND="${RDEPEND} + test? ( dev-util/cppunit )" + +pkg_pretend() { + if [[ ${MERGE_TYPE} != binary ]]; then + if ! test-flag-CXX -std=c++14; then + eerror "${P} requires C++14-capable C++ compiler. Your current compiler" + eerror "does not seem to support -std=c++14 option. Please upgrade your compiler" + eerror "to gcc-4.9 or an equivalent version supporting C++14." + die "Currently active compiler does not support -std=c++14" + fi + fi +} + +src_install() { + default + find "${ED}" -type f \( -name "*.a" -o -name "*.la" \) -delete || die +} diff --git a/dev-libs/libfilezilla/libfilezilla-0.24.0.ebuild b/dev-libs/libfilezilla/libfilezilla-0.24.0.ebuild new file mode 100644 index 000000000000..06fb1f38b744 --- /dev/null +++ b/dev-libs/libfilezilla/libfilezilla-0.24.0.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit flag-o-matic + +DESCRIPTION="C++ library offering some basic functionality for platform-independent programs" +HOMEPAGE="https://lib.filezilla-project.org/" +SRC_URI="https://download.filezilla-project.org/${PN}/${P}.tar.bz2" + +LICENSE="GPL-2+" +SLOT="0/9" # libfilezilla.so version +KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86" +IUSE="test" + +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-libs/nettle:0= + >=net-libs/gnutls-3.5.7:= +" +DEPEND="${RDEPEND} + test? ( dev-util/cppunit )" + +pkg_pretend() { + if [[ ${MERGE_TYPE} != binary ]]; then + if ! test-flag-CXX -std=c++14; then + eerror "${P} requires C++14-capable C++ compiler. Your current compiler" + eerror "does not seem to support -std=c++14 option. Please upgrade your compiler" + eerror "to gcc-4.9 or an equivalent version supporting C++14." + die "Currently active compiler does not support -std=c++14" + fi + fi +} + +src_configure() { + if use ppc || use arm || use hppa; then + # bug 727652 + append-libs -latomic + fi + + default +} + +src_install() { + default + find "${ED}" -type f \( -name "*.a" -o -name "*.la" \) -delete || die +} diff --git a/dev-libs/libfmt/Manifest b/dev-libs/libfmt/Manifest index b5be62eb0d5b..9e89eb9ca838 100644 --- a/dev-libs/libfmt/Manifest +++ b/dev-libs/libfmt/Manifest @@ -1,9 +1,6 @@ -AUX libfmt-6.2.0-unsigned-char-strings-in-printf.patch 1478 BLAKE2B e5ffa271437d944d634c9296e5fd2c23e7de05e68e1e65acd660e2389378f0adfda0cc491bfadb5c6bd22166a4888f5d06d57300a71f4aad13b76dc277ba6e44 SHA512 2a8c25cff102236ccad7809a943f3bde823f2bd20277994aaf5325b4af1c9a35f3c4437703fcdbd728598a0d4a83988919b5b0706570ce85d90dc13f617260a2 DIST libfmt-6.1.2.tar.gz 723160 BLAKE2B 36e7451a8732c62dcbf47e6d287ea582827b6196a468b8648803ea1bc9a37a5f681d87488f748d749183d97783ac7fb47a3f2aeed64fc6a684f9ee85b67ae28d SHA512 8770bf4bd2bb6d938e75e0cf1e665c41930dbd9d2a6825274a5a43cd1d85b9c9ca621bb040ed099429f0e16bddbc3399361c453eb1bf3fc01376e6ad9dd875b7 -DIST libfmt-6.2.0.tar.gz 733403 BLAKE2B c7ff69a56b90ec8df7d1af5c9934592449f2052046192aa498a6440d2aab76f10c17fa2833a41475b777dca2e3a1ae671021530bf0ef8be12443541f0f5212b3 SHA512 0003543f437bae416600a2b982eb133f65588bd36d7506fa7d883ae3133fcaf7ad825904af9b588ea22e5d91e56560aaf4243a6afa11ff6d8aace2e4bb1b0cee -DIST libfmt-6.2.1.tar.gz 733646 BLAKE2B 74394efc67065bf7a2259f5c16521b1cc4fb08bd599fe99be86b97b712c60d8790f39d65257ab18fe95bcde3d115d97e91c41d23309596f279cf51ebd4d2957d SHA512 520ef3addfecd9796253c347e0ecf4c18ef2f86d3b1b6b714f7834741f4737f1b7ed8365d3be46c9186617898911b23680cad2ae3cb7aadaf641ab32e327b0dc +DIST libfmt-7.0.3.tar.gz 740047 BLAKE2B d12d6f59bcea5b4385c4d9ff5c563860cb9275d34d5747d9f8b95664aaa499661500b630d1f621698a7a3f8431326ac5a5273e6883d070aab7cb9aa84b0bcd41 SHA512 26afe55255414e27d58c2389fcc8643b64adc04ecc3604f87024e6421706833cbad8ee4caf514dfb7e88da4162ab3e5ff8ff81b83b5f2fb66e9959e4d1bf0f9a EBUILD libfmt-6.1.2.ebuild 779 BLAKE2B 2683bb7f04d4d9280df07b28d745afa01f734bc3fd8d1d52def8b37e1188dd54fe381dc846b877e5978374fad89c0db31d06bac1bac37b533b76403c085fd87f SHA512 abb2693b00595db88f3906bb782213b53b9655de994832eb4a189f89f301506113bf9743eb9b64fd7f835f0707866bc170a20ad52ddb8c08248799d5fe19e797 -EBUILD libfmt-6.2.0-r1.ebuild 843 BLAKE2B bb2d750324db52df30d3f21c3141ae9d871527871d37a4ce26f7bf6364ad5152f59e100f4fc880ad588aa81cfd141378365a5537c619037f19b22a51317b7cba SHA512 d1cfbd8023705dc6e8456ea7c2412b3885ff0434803ceb1665477fff9b1c44d565bc4cc024036a9cf4be4801e5ab10db5b7fdfe182373e97f8b8b2847e58af44 -EBUILD libfmt-6.2.1.ebuild 784 BLAKE2B f8eb45e3e7e08ae2dbf3fb8adfe7d78c10f41e71eea97c9b3d7d6134c0150feeeaf55ba8cf2e52dc81fef4c5508668760dfd0c550fdcd206ce67a5e338854bfe SHA512 3bc0f2bafa17a2065cfbb9299fa816dce488ee036fab35bbbe5c9a3c4b30c56c3988c8add25d3f101a167d4897eb4e2aebb5c6f9c3407bc68233b65e537a1fcc -EBUILD libfmt-9999.ebuild 772 BLAKE2B 53eaf21c8e01d31c44adc443812fa21ca3e48db4914131ce3a56e52cfa04bedc44e44fc1a7bdf11865336bbb0fee4d364b6521d60945aa5b87c153c5e8019b14 SHA512 0dfb8292beaa1a0f9cc942b303fe5bbfe391d6f6b59cd2399ba5c47d6549eb2077101af54f034a2bfcdcd99c39aad4b5fd3acc545e8a4a2b873fe0f598ebd755 +EBUILD libfmt-7.0.3.ebuild 780 BLAKE2B 3bcc14f9290cdb163611bf2e53d6d96e978585524b15f4dce7af430cf56337bf0c204069071c422551aecf0b0ca76626e90838caffe3aa02ddbc24e49610bffa SHA512 95917a9ab5ca32dc955a8483bed7d1bee84aaad68c1e990f7a4e4927aa1928df477e6e9696046607563019ffdad856845760996ad549173adf0d0eb72fa8f2bb +EBUILD libfmt-9999.ebuild 784 BLAKE2B f8eb45e3e7e08ae2dbf3fb8adfe7d78c10f41e71eea97c9b3d7d6134c0150feeeaf55ba8cf2e52dc81fef4c5508668760dfd0c550fdcd206ce67a5e338854bfe SHA512 3bc0f2bafa17a2065cfbb9299fa816dce488ee036fab35bbbe5c9a3c4b30c56c3988c8add25d3f101a167d4897eb4e2aebb5c6f9c3407bc68233b65e537a1fcc MISC metadata.xml 381 BLAKE2B f38f6a7691ef81c18b1170b7ca29264dac3c621f8de446d065d65b6e022e21fbb2475c4e2d3210e00254339d09681030c7e7b8fc41cec5549663b4086bb0c983 SHA512 200bb79fc448f40acf8a1be9a907a51461d82db3b5e6e92df1cef4b96418fa6217ebe1e5c8d4228d34bd9bc633022a34f399521a875c92232fb2254350a7605c diff --git a/dev-libs/libfmt/files/libfmt-6.2.0-unsigned-char-strings-in-printf.patch b/dev-libs/libfmt/files/libfmt-6.2.0-unsigned-char-strings-in-printf.patch deleted file mode 100644 index 2ce27c83e622..000000000000 --- a/dev-libs/libfmt/files/libfmt-6.2.0-unsigned-char-strings-in-printf.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 7d01859ef16e6b65bc023ad8bebfedecb088bf81 Mon Sep 17 00:00:00 2001 -From: Victor Zverovich <viz@fb.com> -Date: Wed, 8 Apr 2020 12:32:34 -0700 -Subject: [PATCH] Fix handling of unsigned char strings in printf - ---- - include/fmt/core.h | 8 ++++++++ - test/printf-test.cc | 6 ++++++ - 2 files changed, 14 insertions(+) - -diff --git a/include/fmt/core.h b/include/fmt/core.h -index 6df2875ac..dc10722bf 100644 ---- a/include/fmt/core.h -+++ b/include/fmt/core.h -@@ -972,6 +972,14 @@ template <typename Context> struct arg_mapper { - static_assert(std::is_same<char_type, char>::value, "invalid string type"); - return reinterpret_cast<const char*>(val); - } -+ FMT_CONSTEXPR const char* map(signed char* val) { -+ const auto* const_val = val; -+ return map(const_val); -+ } -+ FMT_CONSTEXPR const char* map(unsigned char* val) { -+ const auto* const_val = val; -+ return map(const_val); -+ } - - FMT_CONSTEXPR const void* map(void* val) { return val; } - FMT_CONSTEXPR const void* map(const void* val) { return val; } -diff --git a/test/printf-test.cc b/test/printf-test.cc -index 5aaa27b13..545e02aab 100644 ---- a/test/printf-test.cc -+++ b/test/printf-test.cc -@@ -447,6 +447,12 @@ TEST(PrintfTest, String) { - EXPECT_PRINTF(L" (null)", L"%10s", null_wstr); - } - -+TEST(PrintfTest, UCharString) { -+ unsigned char str[] = "test"; -+ unsigned char* pstr = str; -+ EXPECT_EQ("test", fmt::sprintf("%s", pstr)); -+} -+ - TEST(PrintfTest, Pointer) { - int n; - void* p = &n; diff --git a/dev-libs/libfmt/libfmt-6.2.0-r1.ebuild b/dev-libs/libfmt/libfmt-6.2.0-r1.ebuild deleted file mode 100644 index f5dcf196261c..000000000000 --- a/dev-libs/libfmt/libfmt-6.2.0-r1.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -CMAKE_ECLASS=cmake -inherit cmake-multilib - -DESCRIPTION="Small, safe and fast formatting library" -HOMEPAGE="https://github.com/fmtlib/fmt" - -LICENSE="MIT" -IUSE="test" -SLOT="0/$(ver_cut 1)" - -if [[ ${PV} == *9999 ]] ; then - EGIT_REPO_URI="https://github.com/fmtlib/fmt.git" - inherit git-r3 -else - SRC_URI="https://github.com/fmtlib/fmt/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" - S="${WORKDIR}/fmt-${PV}" -fi - -DEPEND="" -RDEPEND="" -RESTRICT="!test? ( test )" - -PATCHES=( - "${FILESDIR}/${P}-unsigned-char-strings-in-printf.patch" -) - -multilib_src_configure() { - local mycmakeargs=( - -DFMT_CMAKE_DIR="$(get_libdir)/cmake/fmt" - -DFMT_LIB_DIR="$(get_libdir)" - -DFMT_TEST=$(usex test) - ) - cmake_src_configure -} diff --git a/dev-libs/libfmt/libfmt-6.2.1.ebuild b/dev-libs/libfmt/libfmt-7.0.3.ebuild index 376757b05ade..28a20d754457 100644 --- a/dev-libs/libfmt/libfmt-6.2.1.ebuild +++ b/dev-libs/libfmt/libfmt-7.0.3.ebuild @@ -18,7 +18,7 @@ if [[ ${PV} == *9999 ]] ; then inherit git-r3 else SRC_URI="https://github.com/fmtlib/fmt/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" + KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86" S="${WORKDIR}/fmt-${PV}" fi diff --git a/dev-libs/libfmt/libfmt-9999.ebuild b/dev-libs/libfmt/libfmt-9999.ebuild index 78c2d74959bb..376757b05ade 100644 --- a/dev-libs/libfmt/libfmt-9999.ebuild +++ b/dev-libs/libfmt/libfmt-9999.ebuild @@ -18,7 +18,7 @@ if [[ ${PV} == *9999 ]] ; then inherit git-r3 else SRC_URI="https://github.com/fmtlib/fmt/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" S="${WORKDIR}/fmt-${PV}" fi diff --git a/dev-libs/libfstrcmp/Manifest b/dev-libs/libfstrcmp/Manifest index d96023f7bbcc..c7849cc07060 100644 --- a/dev-libs/libfstrcmp/Manifest +++ b/dev-libs/libfstrcmp/Manifest @@ -1,4 +1,4 @@ DIST libfstrcmp-0.7.tar.gz 394845 BLAKE2B a8b68fcb8613f0d30e5ff7b862b37408472162585ca71cdff328e3299ff50476fd265467bbd77b352b22bb88c590969044f74d91c5468475504568fd269fa69e SHA512 aaeb0227afd5ada5955cbe6a565254ff88d2028d677d199c00e03b7cb5de1f2c69b18e6e8b032e452350a8eda7081807b01765adbeb8476eaf803d9de6e5509c -EBUILD libfstrcmp-0.7-r1.ebuild 934 BLAKE2B cab55908b1ac579f63e2e9294d1171baa6b29a871b0f5896f544c8aa5c80495917889fb1cdd2708a4a73418d01b167a3a55870deff1dea5f057cc0bdbc993e54 SHA512 d196ae5b238eeb7e0c103f41c86e8b4e3be55d83405d46754331902f8ce68ad5399feb235a922d8dd791c8a73ba7a8b48bd656f66d00b6c361e8952fd229a3b1 +EBUILD libfstrcmp-0.7-r1.ebuild 939 BLAKE2B cda956ae139031427fe6346602bd3fa28c1938012c8ff1850c830dee33fe003bcce333fed87eb669cefe6c669e01d58fdab3e94f6cb1a7d68031bbef177b2e0f SHA512 6763478ff05745eb98ca41fe8bae6ac83e21c6cd2eb3d928616d6492757b10b26705fe90100a9c7816050db4eccc4a12bd549b51fba84427e03def975b440b03 EBUILD libfstrcmp-0.7.ebuild 798 BLAKE2B 6b0fa888e5ecbad92001c73cc21a2371719b044e1054d79160b7f0ace9fd3706b60b623240555c99f60c6c139e91a8c97017df5c6350895e769786302fb32a14 SHA512 b2ba229672a48f925bf39d0d6246cb5e958f7290b8eecd226084875e9d8dbc0c71d656dd034da0e31b39531fbf7e0d4f836b7f41e2789c14eab2575f55172683 MISC metadata.xml 325 BLAKE2B cc27381f0071006c05af2fe95a2dbbc481fbb8457976c4c4eec7c3321df75ca4957b7a626ebc1d20aa524bedae4730ca05bf0fb36f8e2b0177429993d73d5237 SHA512 f9baf25481af2a997d7f05610c68b7a3fb376d4bdf1526e59b172d2e3c4e4a2008b1fce9c66247bf01b488db4932872dc58eb0e1fffb9e6a2cc769023f7c75d6 diff --git a/dev-libs/libfstrcmp/libfstrcmp-0.7-r1.ebuild b/dev-libs/libfstrcmp/libfstrcmp-0.7-r1.ebuild index cc653cb5ad7c..f2b397cece4e 100644 --- a/dev-libs/libfstrcmp/libfstrcmp-0.7-r1.ebuild +++ b/dev-libs/libfstrcmp/libfstrcmp-0.7-r1.ebuild @@ -14,7 +14,7 @@ SLOT="0" SRC_URI="http://fstrcmp.sourceforge.net/fstrcmp-0.7.D001.tar.gz -> ${P}.tar.gz" S="${WORKDIR}/fstrcmp-0.7.D001" -KEYWORDS="~amd64 ~arm64 ~x86" +KEYWORDS="~amd64 ~arm ~arm64 ~x86" DEPEND=" sys-apps/groff diff --git a/dev-libs/libgamin/Manifest b/dev-libs/libgamin/Manifest index 39cec99e71ca..0af8b9c4382b 100644 --- a/dev-libs/libgamin/Manifest +++ b/dev-libs/libgamin/Manifest @@ -10,4 +10,5 @@ DIST gamin-0.1.9-freebsd.patch.bz2 4635 BLAKE2B ea27afc7b978e15e9e957cbc1129b5bc DIST libgamin-0.1.10-opensolaris.patch.bz2 16955 BLAKE2B a7c8466fbe9f6613108a6a1b450c47c69018f9f252c17647b07591cf9fba2ba3a08cc344ca54f4647a9c809cecaa18b42bf9f2eff9e253749518b68565024b48 SHA512 fd1cfc5a6b5ba429622f8d426cfba0e3c1c05c3677fb58c53af39b4030ae56f3f71caf63eb5ecb16169c2f7e8c79a32d7d440857c2c7fd3a259cf8312a9b2004 DIST pkg-config-0.28.tar.gz 1931203 BLAKE2B bafdd4e838623965c6bd454421ddd9051fc43fc29948e1615b49fef463c3c3a18807aabe6416f96cfdf58d6b1c9e114d77f97bd985facee7c14284a8a64a768b SHA512 6eafa5ca77c5d44cd15f48457a5e96fcea2555b66d8e35ada5ab59864a0aa03d441e15f54ab9c6343693867b3b490f392c75b7d9312f024c9b7ec6a0194d8320 EBUILD libgamin-0.1.10-r5.ebuild 4022 BLAKE2B 36678416d616fbe2ce5b435bc6005705437aa247f3590b02ccc2b115cb1d8a2a8ce0b658942fb2f3e19aa0640ff1f488e5fdf131b668ee5bfa254b12c6fa0ddc SHA512 98499bc04eeaf8d7e184f9a1714e6174fdc9604e5873faccad3f031daff803c853e1504cbf1f05151ed0be24324e15cce5e5162bd7ba1767e5cfaa8b2b76360c +EBUILD libgamin-0.1.10-r6.ebuild 2982 BLAKE2B 20eac44aaa85e06289ec620b7d92ffed62086e8e0432242cc44826ab488e374368479079f37657532f8762c104a77de2cdd25c7881493a6df6866547798439d3 SHA512 5104a2886cfd30eb79af6bc271c287afe03cebed09e7fea023cce2fcaf9cca6ec7868f1831db85c631b3c56e3b8a7d7ff2d670402aabfe76b5b7a28472a70070 MISC metadata.xml 224 BLAKE2B 50a08713f8b792454787823dd56f1dcc1a1970ded78fa6ddffc6fb7301e0de75018e1e7a8c7ed890b4910f2716d2588ad21c7ae88ad8013b51cab7ba401c46c9 SHA512 12da46d8052565f62c482e6bcc714d8c00cac256f85dc1602579c8d61e0b61af95da149d1a446e56b2eba918ab9d78b556f77c6fe034a2e578f57a9dbe62fc44 diff --git a/dev-libs/libgamin/libgamin-0.1.10-r6.ebuild b/dev-libs/libgamin/libgamin-0.1.10-r6.ebuild new file mode 100644 index 000000000000..6e6090b368c0 --- /dev/null +++ b/dev-libs/libgamin/libgamin-0.1.10-r6.ebuild @@ -0,0 +1,97 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" + +GNOME_ORG_MODULE="gamin" +GNOME_TARBALL_SUFFIX="bz2" + +inherit autotools epatch flag-o-matic libtool ltprune gnome.org multilib-minimal + +DESCRIPTION="Library providing the FAM File Alteration Monitor API" +HOMEPAGE="https://www.gnome.org/~veillard/gamin/" +SRC_URI="${SRC_URI} + mirror://gentoo/gamin-0.1.9-freebsd.patch.bz2 + https://dev.gentoo.org/~grobian/patches/libgamin-0.1.10-opensolaris.patch.bz2 + https://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz" # pkg.m4 for eautoreconf + +LICENSE="LGPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris" +IUSE="debug kernel_linux static-libs" + +RESTRICT="test" # needs gam-server + +RDEPEND=" + !app-admin/fam + !<app-admin/gamin-0.1.10" +DEPEND="${RDEPEND}" + +src_prepare() { + default + mv "${WORKDIR}"/pkg-config-*/pkg.m4 "${WORKDIR}"/ || die + + # Fix QA warnings, bug #257281, upstream #466791 + epatch "${FILESDIR}"/${PN}-0.1.10-compilewarnings.patch + + if [[ ${CHOST} != *-solaris* ]] ; then + # Fix compile warnings; bug #188923 + epatch "${DISTDIR}"/gamin-0.1.9-freebsd.patch.bz2 + else + # (Open)Solaris necessary patches (changes configure.in), unfortunately + # conflicts with freebsd patch and breaks some linux installs so it must + # only be applied if on solaris. + epatch "${DISTDIR}"/${P}-opensolaris.patch.bz2 + fi + + # Fix collision problem due to intermediate library, upstream bug #530635 + epatch "${FILESDIR}"/${PN}-0.1.10-noinst-lib.patch + + # Fix compilation with latest glib, bug #382783 + epatch "${FILESDIR}/${PN}-0.1.10-G_CONST_RETURN-removal.patch" + + # Fix crosscompilation issues, bug #267604 + epatch "${FILESDIR}/${PN}-0.1.10-crosscompile-fix.patch" + + # Enable linux specific features on armel, upstream bug #588338 + epatch "${FILESDIR}/${P}-armel-features.patch" + + # Fix possible server deadlock in ih_sub_cancel, upstream bug #667230 + epatch "${FILESDIR}/${PN}-0.1.10-deadlock.patch" + + # Drop DEPRECATED flags + sed -i -e 's:-DG_DISABLE_DEPRECATED:$(NULL):g' server/Makefile.am || die + + sed -i \ + -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' \ + -e 's:AM_PROG_CC_STDC:AC_PROG_CC:' \ + configure.in || die #466962 + + mv configure.in configure.ac || die + # autoconf is required as the user-cflags patch modifies configure.in + # however, elibtoolize is also required, so when the above patch is + # removed, replace the following call with a call to elibtoolize + AT_M4DIR="${WORKDIR}" eautoreconf +} + +multilib_src_configure() { + local myconf=( + $(use_enable static-libs static) + --disable-debug + --disable-server + $(use_enable kernel_linux inotify) + $(use_enable debug debug-api) + --without-python + ) + local ECONF_SOURCE=${S} + + econf "${myconf[@]}" +} + +multilib_src_install_all() { + DOCS=( AUTHORS ChangeLog README TODO NEWS doc/*txt ) + HTML_DOCS=( doc/*.{html,gif} ) + einstalldocs + + prune_libtool_files --all +} diff --git a/dev-libs/libgcrypt/Manifest b/dev-libs/libgcrypt/Manifest index 2b2fb8bcdff5..f8b73797da21 100644 --- a/dev-libs/libgcrypt/Manifest +++ b/dev-libs/libgcrypt/Manifest @@ -1,5 +1,7 @@ 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.5.tar.bz2 2991291 BLAKE2B 93276b4536f71c07bb103e10607592e02add413f633d96cc95513daa6e6b0e098fe803bb6a0e405a241fddc5ce0cfad61658d57c27bd724eecd32fd862af4c99 SHA512 b55e16e838d1b1208e7673366971ae7c0f9c1c79e042f41c03d14ed74c5e387fa69ea81d5414ffda3d2b4f82ea5467fe13b00115727e257db22808cf351bde89 +DIST libgcrypt-1.8.6.tar.bz2 2997781 BLAKE2B 90ecacae75633dfff248b9c07a72126aaa4a5c285141f89c42237326ae3bfb99c937eef05d87b466c3d8f5cf022725ccee5c0dbc74d4eb57523a8a2892864b65 SHA512 28a26f665b7e327b79815849ee6e84ab384ee9105d81d4d06e4feeea07d986f940cbbb9faaae8712068cace45b4110a62965a93201da0e1ad008b65808b2b29b EBUILD libgcrypt-1.8.5.ebuild 2303 BLAKE2B 6a53021a185faa4382b2e2285fa5c2d11dd22fe58dc96997d57ecc488a147901fdf284980b817832ab74479213140f41403f0ba04f6de8a9091bfd15f502e0fd SHA512 d6a9b8a2fef2dcb37f7ce86247b2147fb3bd35d320c21e2973f73edff7c48fe7a742c6fdf54e4f884767dc5603c5fa470d7da44a6511257f2e1ed2b9327a5eed +EBUILD libgcrypt-1.8.6.ebuild 2282 BLAKE2B 6666c6525d99407c00f33a663963d9ea3d143a9997fb96b2b7ef43f7cf1c14e636f8cce13cc42f988af289b255fcfadad95713431a8ada797a9a166dab19cfe7 SHA512 7173d56961fb30557b5641e4b4107eaa0e1c10375ce65aaa7c9ff3e8fb1ad805948205f86632c0ec314a44d57e0afbda2ba42f8cf0a8c2c67dac7cdf4f94df3c MISC metadata.xml 419 BLAKE2B 3f50eead2881e1336ad05c677b0108897d4664cbe228c95b5dfe3f7f0696581472692644e06d5d86b81b4bde0a3b41f0e65e25f4e40a29b830c1d9342b143a70 SHA512 c33fb355262594d13d6f7ea66e35a53379695fe10227d29d800f7fca8ee8cf2856a624ccf81ebe3352be10c4c010bc61131f95f9065eafcff0b5c70f684df4ba diff --git a/dev-libs/libgcrypt/libgcrypt-1.8.6.ebuild b/dev-libs/libgcrypt/libgcrypt-1.8.6.ebuild new file mode 100644 index 000000000000..96660a05c6ab --- /dev/null +++ b/dev-libs/libgcrypt/libgcrypt-1.8.6.ebuild @@ -0,0 +1,76 @@ +# 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 toolchain-funcs + +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=( + CC_FOR_BUILD=$(tc-getBUILD_CC) + --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 -o -- '--without-.*-prefix') +} + +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}" -type f -name '*.la' -delete || die +} diff --git a/dev-libs/libgdata/Manifest b/dev-libs/libgdata/Manifest index f9c4931e81cd..db99a1f27642 100644 --- a/dev-libs/libgdata/Manifest +++ b/dev-libs/libgdata/Manifest @@ -1,5 +1,3 @@ -DIST libgdata-0.17.11.tar.xz 843948 BLAKE2B 8be79ea5840a585c5bdd5b51aa99401aedce0562ceaa98c7e323cdb2354384db635288d05c740993da49fa9c60c2cafab4e7c43ab82de4295afc0ca6b690d4dd SHA512 5abb00e6ebee1010fb6d9eab675e03d94883cac88e42b403a7d750bff73d65d0b35aae5c9e8f17a182819193b4a049ac7e9fc644ad9fa79872924ed5704c8982 DIST libgdata-0.17.12.tar.xz 845420 BLAKE2B 636ff5ba7df48f671cdb5da09c011f620619051e30470bb3ebb400f8c093e89885e0c3c7ac54e569cff2c350bd08f7e346f1529c07c41f570b7255002fc69c44 SHA512 22571c9b0cecbaf617fc8fa43a312bba4eaf36267264546f55c9c9067514cc6ae1db755536c7413427ebf6121115512dcab4201549c128fb1a25afe75a3daa2b -EBUILD libgdata-0.17.11.ebuild 1771 BLAKE2B 600a33b3c16b44bc332111dcd62bfcca0ec169f311babfabc53e69bbc6bf2baf79f9aed4ad5fe2b5295bfb9e57fe96b2bfed247bf1556b8cac3919b406543d2c SHA512 6c6ec2a346451b4fc26a5751e5d064d6b3e0c3c0c0c61a9c35a47ae5b22fc76bdd49c739458848572d7851b0c98bf20cd96fb7f1fa51a0c9f9d129deeee36c4a -EBUILD libgdata-0.17.12.ebuild 1765 BLAKE2B e111cb3791e0ee32d9d280e1553ec348e5e9d0275a5e7321fe2f65c602cec64d9be8673f6b4c908d68b353cd2d1a4d35bae3c62a29f8f37f0140ad761f7fd22b SHA512 322c79753d714ad983483a254b587c95b6e44eed46d9bf5e1a5a08be910471c871aa826cd07795e75673d65c1e42d94a5d90ea55fdb41e171b38733108a339c7 +EBUILD libgdata-0.17.12.ebuild 1764 BLAKE2B cb791f3610253c6d818650a8f22da2845f54b23d7eed8d78e51a5e7705482369709d088390618dd6b2b81db6248925e0f8e38a98ca984c2853b02a5cee160b53 SHA512 afd6a51628c772a174763460eb627bfbe07bb15543c0005a6e00052e7214896d4f38ccb87f273bae4943d4c28e2e89370ebe559fe50e2170f89fb521a21e34bb MISC metadata.xml 496 BLAKE2B c1ea319b0bfe89f579895ad4422216a26b3b8709d75bf9680278c22e3fa4e3e771f4573b89eb3db2704a33196149883f0c7028b7e39cdde833df510e350f560b SHA512 e12832d53a97dcaba6d2f669ece3ff9dbd504951a7539f00cce52e88e28d4c28034b203b9f1def27c812f39e5ad21532789b62cd0ab2814facf90b7b789e82dd diff --git a/dev-libs/libgdata/libgdata-0.17.11.ebuild b/dev-libs/libgdata/libgdata-0.17.11.ebuild deleted file mode 100644 index 9b5da6f320a9..000000000000 --- a/dev-libs/libgdata/libgdata-0.17.11.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -VALA_USE_DEPEND="vapigen" - -inherit gnome.org meson vala xdg - -DESCRIPTION="GLib-based library for accessing online service APIs using the GData protocol" -HOMEPAGE="https://wiki.gnome.org/Projects/libgdata" - -LICENSE="LGPL-2.1+" -SLOT="0/22" # subslot = libgdata soname version - -IUSE="+crypt gnome-online-accounts gtk-doc +introspection test vala" -REQUIRED_USE="vala? ( introspection )" -RESTRICT="!test? ( test )" - -KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86" - -RDEPEND=" - >=dev-libs/glib-2.44.0:2 - >=dev-libs/json-glib-0.15[introspection?] - >=dev-libs/libxml2-2:2 - >=net-libs/liboauth-0.9.4 - >=net-libs/libsoup-2.55.90:2.4[introspection?,vala?] - crypt? ( app-crypt/gcr:= ) - gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8:=[introspection?,vala?] ) - introspection? ( >=dev-libs/gobject-introspection-1.54:= ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - >=dev-util/meson-0.50.0 - dev-util/glib-utils - gtk-doc? ( >=dev-util/gtk-doc-1.25 - app-text/docbook-xml-dtd:4.3 ) - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig - test? ( >=net-libs/uhttpmock-0.5.0 - >=x11-libs/gdk-pixbuf-2.14:2 - ) - vala? ( $(vala_depend) ) -" - -src_prepare() { - use vala && vala_src_prepare - xdg_src_prepare - # Don't waste time building a couple small demos that aren't installed - sed -i -e '/subdir.*demos/d' meson.build || die -} - -src_configure() { - local emesonargs=( - -Dgtk=disabled # only for demos - $(meson_feature crypt gnome) - $(meson_feature gnome-online-accounts goa) - $(meson_use test always_build_tests) - -Dinstalled_tests=false - -Dman=true - $(meson_use gtk-doc gtk_doc) - $(meson_use introspection) - $(meson_use vala vapi) - ) - meson_src_configure -} diff --git a/dev-libs/libgdata/libgdata-0.17.12.ebuild b/dev-libs/libgdata/libgdata-0.17.12.ebuild index 92e85a0773b1..9fc1b081eef2 100644 --- a/dev-libs/libgdata/libgdata-0.17.12.ebuild +++ b/dev-libs/libgdata/libgdata-0.17.12.ebuild @@ -16,7 +16,7 @@ IUSE="+crypt gnome-online-accounts gtk-doc +introspection test vala" REQUIRED_USE="vala? ( introspection )" RESTRICT="!test? ( test )" -KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86" RDEPEND=" >=dev-libs/glib-2.44.0:2 diff --git a/dev-libs/libgit2/Manifest b/dev-libs/libgit2/Manifest index 4e674bcdeda2..8fee5219dcb9 100644 --- a/dev-libs/libgit2/Manifest +++ b/dev-libs/libgit2/Manifest @@ -1,9 +1,5 @@ -DIST libgit2-0.28.4.tar.gz 4991720 BLAKE2B 7dc94dce69c27f6de3736b94b4d80b727e3e2a7db255a9eab7422cebd93a3ea1a6f47d1de6c3fbe4ba5bcb28ade9b23a989c5b54c06eafeaf30e382f3b859cdf SHA512 b81160608003b25d9b922d259ebbbbf941b6bd5100fa1875497c8cd29de320e292fff568c757a7a85b2b3044ddc1cb92c74dbcb13d630d62ecf9a8559b619d15 DIST libgit2-0.28.5.tar.gz 4998481 BLAKE2B 71a3502af125a3d1c91700539d5e235a62922b32ca5e62288581b496f4cb680c01bfe70ae092ab730fc45df1dd96c2c9167f51d551a50acd57c857b4ea07634d SHA512 abfea885f46444b0304ae57c32c06f4252afb0093c924da5e1ba10aaed952824d1b84036adb79b5b8ad8bea56a6331a51c62f3b9839aead16c7b26cb4554b53a -DIST libgit2-1.0.0.tar.gz 5312324 BLAKE2B 4106b934d32233e9df8a405570a83c3b7ab097e3301dc973230df511f992733e237e1fdc48924522b16a6d202dc4e81461f522e0f5fd867c9f3ad261921af3ba SHA512 7e3b6582dd1567fd5ebfc829a98e22acfd5566ba08f2fb9b7a6783fa87f5e8952ac67f1a2c13adb543e56753d858e73a03204bac17a096c72f5daf4ba376d904 DIST libgit2-1.0.1.tar.gz 5312878 BLAKE2B 7eb97bb97d66240ce135e21d348f6dea0c5626992b608f8944b75f9bae5de933fffa07edd536c0353841f8d02c950feec1451008003e35f53554f3c59b069a7f SHA512 7c307822b22e3771e5e908b115600310f7901b3250287532c498003b25a5b1e007bfa23592f16ec4d83c1567a9213710526f78cab7c120316e9a8fc74c5e57a9 -EBUILD libgit2-0.28.4.ebuild 1648 BLAKE2B 3f281a4dc503b2692a451fa10786aff3a8dff090fc311d38ec0cba20fedd13018683e78674df806b4f7370e6a8ac5c09943b9e3fe7b30691c82056deaa286ae9 SHA512 87dbeaafba6af0bca7cc509dcdae5ef8ac5848aa2af048b555424be1be60a0da2329750fd4a9b2858b37ba8bb2c109b4b99d6a31ae15cb5187bb79a507fe5bfc -EBUILD libgit2-0.28.5.ebuild 1656 BLAKE2B 33741203200169f36f1bc5d1d1d02343c64c1b83073b6b20ca356a822b80859bd0d7d645ccaf12549b8ef8739be17e03184d9c873f50f6f2f12ab6fe8bed9570 SHA512 cb24af6bf368eec37269693ee9a05f247d6d306863d6ffd8aa61a895ab6f72e5696059dceb447af122e973efd2cfad93bf10e3ad7d784f2f0af46c266b8bed8c -EBUILD libgit2-1.0.0-r1.ebuild 1701 BLAKE2B df293ea3fae126e98feaa885df36fa4cfc249d1645e77672bd23b425302a62515abad2a1a48f7f7ce3c01d357c76bb8bf5dc6e7d3312e5fa6d890227adbfb22d SHA512 0fd2c229b1a21be488e7d9786cc59492257ef8e1f51156aeb7ce78e5e3a8f99bbff1c61145becd5c5b4c0c28fb2bf6a31ffd44059fa1201397afd996bf4c9b5b -EBUILD libgit2-1.0.1.ebuild 1707 BLAKE2B c92ce64bff80f7732b336ee8fee1be4fdd35e785d6c0b1d2b596fbbdb20a4d4c5b89c89be7fa78f6f9557574b2b97a7bc9bd657fd45e1cb58166a29d3ad5a98e SHA512 25469f44f82e9a25562c5fa1cb5a9c86fe5531aff961a4f6cdebc7b09fbdfe60266a7dad7bd2251dd1d59881f922cca0f84c394e115ecbc09ab1efad9444d5ac +EBUILD libgit2-0.28.5.ebuild 1650 BLAKE2B 859432292f7c913953d0c23454dd1c463e44e2696308b29292a4e9b26876c261150d8cc36da549769b1384e8d39eadb1ba11f8abebf20876dd190e72282abcab SHA512 64648a55fe4c25d46fcc99dce81012b3ee586202ae1925a0704b052d73985cd14ceaa0b06988ae2a320fd32c971667caec06013cb03cf25c7ff34b47c7fa235a +EBUILD libgit2-1.0.1.ebuild 1701 BLAKE2B df293ea3fae126e98feaa885df36fa4cfc249d1645e77672bd23b425302a62515abad2a1a48f7f7ce3c01d357c76bb8bf5dc6e7d3312e5fa6d890227adbfb22d SHA512 0fd2c229b1a21be488e7d9786cc59492257ef8e1f51156aeb7ce78e5e3a8f99bbff1c61145becd5c5b4c0c28fb2bf6a31ffd44059fa1201397afd996bf4c9b5b MISC metadata.xml 915 BLAKE2B 1882bdcfaee50de784b4aebeaaad4f04ff3f2385721b354ed685f3353ea92b83344559905cff5a9adc2a316b684079b64d9930f14081c257c8066dd7d4c89a33 SHA512 5b6f2239f656f490b0961788f8047662fc00ee10bc5ad9ee3a326313285cd29514c1eda54d17b878abef3d73034f997aa814a64ff496dcbe9f05ef4708825c35 diff --git a/dev-libs/libgit2/libgit2-0.28.4.ebuild b/dev-libs/libgit2/libgit2-0.28.4.ebuild deleted file mode 100644 index a1fcb8f72357..000000000000 --- a/dev-libs/libgit2/libgit2-0.28.4.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 - -PYTHON_COMPAT=( python3_{6,7} ) -inherit cmake python-any-r1 - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://github.com/${PN}/${PN}.git" - inherit git-r3 -else - SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 arm arm64 ppc ppc64 x86 ~ppc-macos" -fi - -DESCRIPTION="A linkable library for Git" -HOMEPAGE="https://libgit2.org" - -LICENSE="GPL-2-with-linking-exception" -SLOT="0/28" -IUSE="examples gssapi libressl +ssh test +threads trace" -RESTRICT="!test? ( test )" - -RDEPEND=" - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - sys-libs/zlib - net-libs/http-parser:= - gssapi? ( virtual/krb5 ) - ssh? ( net-libs/libssh2 ) -" -DEPEND="${RDEPEND} - ${PYTHON_DEPS} - virtual/pkgconfig -" - -S=${WORKDIR}/${P/_/-} - -src_configure() { - local mycmakeargs=( - -DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)" - -DBUILD_CLAR=$(usex test) - -DENABLE_TRACE=$(usex trace) - -DUSE_GSSAPI=$(usex gssapi) - -DUSE_SSH=$(usex ssh) - -DTHREADSAFE=$(usex threads) - ) - cmake_src_configure -} - -src_test() { - if [[ ${EUID} -eq 0 ]] ; then - # repo::iterator::fs_preserves_error fails if run as root - # since root can still access dirs with 0000 perms - ewarn "Skipping tests: non-root privileges are required for all tests to pass" - else - local TEST_VERBOSE=1 - cmake_src_test -R offline - fi -} - -src_install() { - cmake_src_install - dodoc docs/*.{md,txt} - - if use examples ; then - find examples -name '.gitignore' -delete || die - dodoc -r examples - docompress -x /usr/share/doc/${PF}/examples - fi -} diff --git a/dev-libs/libgit2/libgit2-0.28.5.ebuild b/dev-libs/libgit2/libgit2-0.28.5.ebuild index 11c6f5ee1b85..567e2678a2d7 100644 --- a/dev-libs/libgit2/libgit2-0.28.5.ebuild +++ b/dev-libs/libgit2/libgit2-0.28.5.ebuild @@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then inherit git-r3 else SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~ppc-macos" + KEYWORDS="amd64 arm arm64 ppc ppc64 x86 ~ppc-macos" fi DESCRIPTION="A linkable library for Git" diff --git a/dev-libs/libgit2/libgit2-1.0.0-r1.ebuild b/dev-libs/libgit2/libgit2-1.0.0-r1.ebuild deleted file mode 100644 index b9b87e7ffc99..000000000000 --- a/dev-libs/libgit2/libgit2-1.0.0-r1.ebuild +++ /dev/null @@ -1,71 +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} ) -inherit cmake python-any-r1 - -DESCRIPTION="A linkable library for Git" -HOMEPAGE="https://libgit2.org" -SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" -S=${WORKDIR}/${P/_/-} - -LICENSE="GPL-2-with-linking-exception" -SLOT="0/1.0" -KEYWORDS="amd64 arm arm64 ppc ppc64 x86 ~ppc-macos" -IUSE="examples gssapi libressl +ssh test +threads trace" -RESTRICT="!test? ( test )" - -RDEPEND=" - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - sys-libs/zlib - net-libs/http-parser:= - gssapi? ( virtual/krb5 ) - ssh? ( net-libs/libssh2 ) -" -DEPEND="${RDEPEND} - ${PYTHON_DEPS} - virtual/pkgconfig -" - -src_prepare() { - cmake_src_prepare - # relying on forked http-parser to support some obscure URI form - sed -i -e '/empty_port/s:test:_&:' tests/network/urlparse.c || die -} - -src_configure() { - local mycmakeargs=( - -DBUILD_CLAR=$(usex test) - -DENABLE_TRACE=$(usex trace ON OFF) - -DUSE_GSSAPI=$(usex gssapi ON OFF) - -DUSE_SSH=$(usex ssh) - -DTHREADSAFE=$(usex threads) - -DUSE_HTTP_PARSER=system - ) - cmake_src_configure -} - -src_test() { - if [[ ${EUID} -eq 0 ]] ; then - # repo::iterator::fs_preserves_error fails if run as root - # since root can still access dirs with 0000 perms - ewarn "Skipping tests: non-root privileges are required for all tests to pass" - else - local TEST_VERBOSE=1 - cmake_src_test -R offline - fi -} - -src_install() { - cmake_src_install - dodoc docs/*.{md,txt} - - if use examples ; then - find examples -name '.gitignore' -delete || die - dodoc -r examples - docompress -x /usr/share/doc/${PF}/examples - fi -} diff --git a/dev-libs/libgit2/libgit2-1.0.1.ebuild b/dev-libs/libgit2/libgit2-1.0.1.ebuild index ddff4eedcb5e..b9b87e7ffc99 100644 --- a/dev-libs/libgit2/libgit2-1.0.1.ebuild +++ b/dev-libs/libgit2/libgit2-1.0.1.ebuild @@ -13,7 +13,7 @@ S=${WORKDIR}/${P/_/-} LICENSE="GPL-2-with-linking-exception" SLOT="0/1.0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~ppc-macos" +KEYWORDS="amd64 arm arm64 ppc ppc64 x86 ~ppc-macos" IUSE="examples gssapi libressl +ssh test +threads trace" RESTRICT="!test? ( test )" diff --git a/dev-libs/libgnome-games-support/Manifest b/dev-libs/libgnome-games-support/Manifest index 563bc03c1318..01e3d5fe3271 100644 --- a/dev-libs/libgnome-games-support/Manifest +++ b/dev-libs/libgnome-games-support/Manifest @@ -1,3 +1,5 @@ DIST libgnome-games-support-1.4.4.tar.xz 336708 BLAKE2B ecd21376ce8d83a0a8c0f65992ba4d39d54b3b97d90df8adab0d5c5714d0c9841711a21dc611c94a8141313ff991c3a8787f7e27492c149a7f76e25d8a2fa8d6 SHA512 2b2c77210103610cb91554f870d634bc8d06f0886eef5166bf9909c1975a87d960005640d48e3e917f74c7553e3ae07d473ba06c6c5d6582313c50a390ec6168 -EBUILD libgnome-games-support-1.4.4.ebuild 538 BLAKE2B 3d227c60115ad90693b2c4439d6f15c53a63f73c05197c9225ff797a16407db3bbbe998da6aa514fc35097d6c7fbcf1ce1dd7c29c48146536e5b7391cd7b8384 SHA512 a167e19e3b9a8d112a258a6f0db7b44bb9084c265694bc995aa96551c9d5909524b9d0247830b895e14093018bd1b876d7cb4931df7b170853ebd2e25a59165a +DIST libgnome-games-support-1.6.1.tar.xz 44012 BLAKE2B a7ef470f955d400a07d62452a7e2b0846e9ea6d01729bc6175963c474ea8a278a4903fd8bb1e0cdf9a19006f7306cb457901d20757573ba4fc35cf8d0397aa1c SHA512 a2f0c6faea4e10fcc06487a37147a3bbee9d41daeff2a323cf078bef45664166184f63e11fdba4afe6d2d1f8f2c0dba59274707d978c84b17b70305cb206b3a8 +EBUILD libgnome-games-support-1.4.4.ebuild 539 BLAKE2B c8ada946bb8232de5d729d8600ccdf585febfcfccfd06ed559dccd7de49c57d947433427a179de41778e37b14845baf4fbc2752c52060794037e8ac9a525b670 SHA512 bfa18199d67b31f345cb5d27aadafb5c9fa722b95d5de426bc4cc1f4f049bced42769e62ce66a47a2d89e64ccc39d8069dba69ddfcf8de975b0ed6c26b3a0cfa +EBUILD libgnome-games-support-1.6.1.ebuild 668 BLAKE2B 8639e5dc58a6de38cf5196dd587fd17b764fff05b6e9249221135412bb182a2b345b4925482ddc1d8c84d2d11f7c916d8d45bc9e860865fd1974705451531a43 SHA512 44b99893d924955b7da4e1ea499f701549f7ae4300dfd0a198c86c34ee2c05cecb8717e930d5484de564df63d763daabed4dae4d696a8883aed3fd1d618e8659 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 diff --git a/dev-libs/libgnome-games-support/libgnome-games-support-1.4.4.ebuild b/dev-libs/libgnome-games-support/libgnome-games-support-1.4.4.ebuild index 0c5f1183b668..3309b9a2a735 100644 --- a/dev-libs/libgnome-games-support/libgnome-games-support-1.4.4.ebuild +++ b/dev-libs/libgnome-games-support/libgnome-games-support-1.4.4.ebuild @@ -18,7 +18,7 @@ RDEPEND=" >=dev-libs/glib-2.40:2 >=x11-libs/gtk+-3.19.2:3 " -DEPEND="${DEPEND} +DEPEND="${RDEPEND} >=sys-devel/gettext-0.19.8 virtual/pkgconfig " diff --git a/dev-libs/libgnome-games-support/libgnome-games-support-1.6.1.ebuild b/dev-libs/libgnome-games-support/libgnome-games-support-1.6.1.ebuild new file mode 100644 index 000000000000..f47d5cd46c86 --- /dev/null +++ b/dev-libs/libgnome-games-support/libgnome-games-support-1.6.1.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +VALA_MIN_API_VERSION="0.40" + +inherit gnome.org meson vala xdg + +DESCRIPTION="Library for code common to Gnome games" +HOMEPAGE="https://git.gnome.org/browse/libgnome-games-support/" + +LICENSE="LGPL-3+" +SLOT="1/3" +KEYWORDS="~amd64 ~arm ~arm64 ~x86" +IUSE="" + +# glib dep in meson is 2.40, but vala is passed 2.44 target +RDEPEND=" + >=dev-libs/libgee-0.14.0:0.8= + >=dev-libs/glib-2.44:2 + >=x11-libs/gtk+-3.19.2:3 +" +DEPEND="${RDEPEND}" +BDEPEND=" + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig + $(vala_depend) +" + +src_prepare() { + vala_src_prepare + xdg_src_prepare +} diff --git a/dev-libs/libgnt/Manifest b/dev-libs/libgnt/Manifest index 54548984eb7c..f069275900b4 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 758 BLAKE2B c14ea282571d147f7d16f03238dc7ceacc008f9a794159782335064bce8b382d5aac95d87baa1a11eb1bebdc9945e7aeb99414f172a7c8ef05051f1e63174a83 SHA512 25d9f4aa357bd220664e82d6d14f6a3adeaef6bca99da990333dd7ca5dc3c98505c48b9f2f5ecc87173313bb043589c7b369c35b763429c52967981f5bf3a264 +EBUILD libgnt-2.14.0.ebuild 785 BLAKE2B c908717480640776270c41b126a3df9bb4cd6fae4263f8bf5f2851e067b08565f78170db40e4457087e5b33186d1fb48c19b584abf8e0c9bd4b5128c8bb92dba SHA512 1e2f074653fbb0babe25fcdf81514dc94655b00861792a010e7ff35f11055c9fff858a0c54f2851086d8aa5a00a46dadfa458c2df51ad76392d787b2f4a0dd2c 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 189468412453..0e1c9facea81 100644 --- a/dev-libs/libgnt/libgnt-2.14.0.ebuild +++ b/dev-libs/libgnt/libgnt-2.14.0.ebuild @@ -6,12 +6,12 @@ EAPI=7 inherit meson DESCRIPTION="Pidgin's GLib Ncurses Toolkit" -HOMEPAGE="https://bitbucket.org/pidgin/libgnt" +HOMEPAGE="https://keep.imfreedom.org/libgnt/libgnt" SRC_URI="mirror://sourceforge/pidgin/${P}.tar.xz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos" +KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos" IUSE="doc" RDEPEND=" @@ -24,6 +24,7 @@ DEPEND="${RDEPEND}" BDEPEND=" dev-util/glib-utils virtual/pkgconfig + doc? ( dev-util/gtk-doc ) " PATCHES=( diff --git a/dev-libs/libgpg-error/Manifest b/dev-libs/libgpg-error/Manifest index 265827170d05..8d6ebd9a1413 100644 --- a/dev-libs/libgpg-error/Manifest +++ b/dev-libs/libgpg-error/Manifest @@ -5,7 +5,9 @@ DIST gen-lock-obj-1.38.sh 2643 BLAKE2B 5040b027a95f10bac4a0ba463c8bb8387514ca913 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 +DIST libgpg-error-1.39.tar.bz2 961676 BLAKE2B 8753a9295ca57ba79142ffbc7fa01a986addcdd6a8860cf80c9e1bf9f6f9dfce874f804205a5cdd956e026eb006f2662110c63e7ed52c7a42ee0c45923ae52be SHA512 b28be183ac3d3920363558c4b5b2c24f9074a302799915cc076674bb349dcfb6f09160bec1d3fb62e04047c3ce432d345f36b0905100a88cc730b53d4eb78e42 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 2135 BLAKE2B d13e3c4c067f58551902fd02360f299bb881cbddd75c7eba74837be162d9ab8d5dcaed31e0890a174eb8079fce5200e6f480edcfc9b0f8b7db1d64b684edcea2 SHA512 5ee1b7e9e27beec67ed5a56e919fdfc324f26248ad5fa4aa12c332285121d8a73c6cbaa00bf4e1980d414960d64f6e121d02545fb77d5bc7373a839e22a687f4 +EBUILD libgpg-error-1.38.ebuild 2128 BLAKE2B 9c3fcef9f21a608eb68b7680d87aa1c86e2adbebddb9f47ed724068b99cc93ffc8e0ff014544b3e25a9d4f1266b071a4e798ba239a56ca9f1a07837564efa61f SHA512 ff96d0fb95195891165272a4f549e5d12c0ef96421d6e2236a9d0b6189d2fa92690c3fd093b3ce4c891d186a0ddae3e1dc95d6b2e9bca2bebf59e2296ad78e14 +EBUILD libgpg-error-1.39.ebuild 1698 BLAKE2B 8350db5f7f474cdc2720f9dcca24526f46b84adeacf00d5efbc4d8ebf7aca1ef9a9d5949920c3705a19d4e34b39f73aaaabdfa84854982345b12168d3c7e6192 SHA512 9ee2c9b4bf5cb08c08238d3a6e2cd54431efe85dfabfc8b78dbbb1c504900eb29e9a0db15e098660ff4382dcb39d80a6fee1e5e94ff6acc5b8eb906ac0b8e853 MISC metadata.xml 525 BLAKE2B b2be127796014b926129f269602f39c5b0fa9ae4022b1d7492c201725c27e614e0dd6a0f8bacd1e6703309130f7e758c0bb7abef9d532c01182eb7b4fdc0a13f SHA512 48841f068de32aefcdafd5b831a90811c8006862a8aea7b9cd48e77dc3f9e1dfda00d952de9f5784a58f730ae2707eda2ca4bfc1509985988042017419a7b8b5 diff --git a/dev-libs/libgpg-error/libgpg-error-1.38.ebuild b/dev-libs/libgpg-error/libgpg-error-1.38.ebuild index 3a45f44afdf9..d1b8761f0266 100644 --- a/dev-libs/libgpg-error/libgpg-error-1.38.ebuild +++ b/dev-libs/libgpg-error/libgpg-error-1.38.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2 LICENSE="GPL-2 LGPL-2.1" SLOT="0" -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" +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="common-lisp nls static-libs" RDEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )" diff --git a/dev-libs/libgpg-error/libgpg-error-1.39.ebuild b/dev-libs/libgpg-error/libgpg-error-1.39.ebuild new file mode 100644 index 000000000000..76085d0b7920 --- /dev/null +++ b/dev-libs/libgpg-error/libgpg-error-1.39.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +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" + +LICENSE="GPL-2 LGPL-2.1" +SLOT="0" +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="common-lisp nls static-libs" + +RDEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )" +DEPEND="${RDEPEND}" +BDEPEND="nls? ( sys-devel/gettext )" + +MULTILIB_CHOST_TOOLS=( + /usr/bin/gpg-error-config +) +MULTILIB_WRAPPED_HEADERS=( + /usr/include/gpg-error.h + /usr/include/gpgrt.h +) + +PATCHES=( + "${FILESDIR}/${PN}-1.37-remove_broken_check.patch" +) + +src_prepare() { + default + # only necessary for as long as we run eautoreconf, configure.ac + # uses ./autogen.sh to generate PACKAGE_VERSION, but autogen.sh is + # not a pure /bin/sh script, so it fails on some hosts + hprefixify -w 1 autogen.sh + eautoreconf +} + +multilib_src_configure() { + local myeconfargs=( + $(multilib_is_native_abi || echo --disable-languages) + $(use_enable common-lisp languages) + $(use_enable nls) + $(use_enable static-libs static) + --enable-threads + CC_FOR_BUILD="$(tc-getBUILD_CC)" + $("${S}/configure" --help | grep -o -- '--without-.*-prefix') + ) + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" +} + +multilib_src_install_all() { + einstalldocs + find "${ED}" -type f -name '*.la' -delete || die +} diff --git a/dev-libs/libgusb/Manifest b/dev-libs/libgusb/Manifest index e598623e51b5..0bda87b0123e 100644 --- a/dev-libs/libgusb/Manifest +++ b/dev-libs/libgusb/Manifest @@ -1,5 +1,7 @@ DIST libgusb-0.3.3.tar.xz 38928 BLAKE2B 711bf59db0d86879961fbba1cd87d5a8557cd4c735f3eaf80bb75f1ac55ededecb4038125428c1297942d014dfd3ea995f7cee8355150f1e90e0fec4aa92cfa9 SHA512 8be37283f2c1719976bbd9bc33eacf5afd4cef107a6629e8f9523b49e66ab2782d9937e4d9fa18760b9083c991c91d6126cfcfa22921b3436a9ebc3a858d855a DIST libgusb-0.3.4.tar.xz 40636 BLAKE2B 8e43849395a0bce646d9b9493c883fc6db28572a75017e0309b6b2d1924bb6a978190d4b171416053cae424d272a7b43e1536abd92821198e4e7f553bb16d19f SHA512 abbec6b5a5f27b5061ff165db97915d7356b23757de12b640f54741927ac860264af3daed15d4b4b5f3df494acb20695070dcb5ad104df2defdcc7229634c42f +DIST libgusb-0.3.5.tar.xz 41340 BLAKE2B 76a99e6877bddbc7000f13f9099456101b8fd125866b841823dd543b58196e10be80fe4472153c9ff42ad2a4faf53d13d22bdecd9f5c2bd4fd21578abbc38cad SHA512 4c709a3c5215342b12b42f393aea6945e2048d4a7b137ec5b6e11b54c1ea9b8a59ba31b9110bfaf10e8924a7b41eaf5b82c417252340d012db400e8eb4c9dc1c EBUILD libgusb-0.3.3.ebuild 1476 BLAKE2B 328320f273a1faf71c2fdde39fe741b3ebb4b726fd660f674a6594c2800c61216a584b2a88c678bd24053eba5f3bd3a6b734854b184b4a9835eb1b907ca9aaa9 SHA512 8ac7f62f2179863c310c1b5caba41858bc55d2bab6fdfbe06802f9924a2a6c610ac54269336683adfead3649e691640abfccf1bb05fc899a960de9ee9e724b89 EBUILD libgusb-0.3.4.ebuild 1698 BLAKE2B 02d9da0f09ea400a6516e26b10246bfae5646f64ba75c17bb60ca019dc51b63738519c4249bdb82bb373a4743190fa4bc9ee623c4ff17ea66e519c940c118daa SHA512 83005576562412286f7e50f41af90176500450ec0c8f8c8d1b2a4f092d3cf229556c8d852d96e11151e34a9437eb83ca045fab1ca7463a7aa0ee39bf599dfd24 +EBUILD libgusb-0.3.5.ebuild 1701 BLAKE2B 726c75a45d210071e8c88edeb0f1600fbf4b765f25f34053e4454ef0c8a5d56347e5558c6cd4afb55af90162cc331be9b635605736438ade16f56ae8d76100ec SHA512 9755677a7daac0db38658389ee5843a988f5b891ab40770770f4a2f1998b72739953599dd3ea912d6ea11e7fc41035c816d7934ed1002ea3fe6b1d84bb35745b MISC metadata.xml 343 BLAKE2B 5905d49c021f1b8d8e5167415d0f0c731c0b204fad7aa73f10f6a7dc8b8f417e9591ed26ce655e2d5e5963e84f0ce44d77e59cd79e8d1921899b0a9627d52911 SHA512 096d78e0613e0475d5499f3c30542bd22fc98a2598a7e2e5719747a809a19288a0a36897bc9bc647fceb98f3579f7148c32d16d78c6114d0b925f143daca91bc diff --git a/dev-libs/libgusb/libgusb-0.3.5.ebuild b/dev-libs/libgusb/libgusb-0.3.5.ebuild new file mode 100644 index 000000000000..5ec7e1e7ab8e --- /dev/null +++ b/dev-libs/libgusb/libgusb-0.3.5.ebuild @@ -0,0 +1,74 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +VALA_USE_DEPEND="vapigen" + +PYTHON_COMPAT=( python3_{6,7,8} ) +PYTHON_REQ_USE="xml(+)" + +inherit meson multilib-minimal python-any-r1 vala + +DESCRIPTION="GObject wrapper for libusb" +HOMEPAGE="https://github.com/hughsie/libgusb" +SRC_URI="https://people.freedesktop.org/~hughsient/releases/${P}.tar.xz" + +LICENSE="LGPL-2.1+" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" + +IUSE="gtk-doc +introspection static-libs test +vala" +REQUIRED_USE="vala? ( introspection )" + +RDEPEND=" + >=dev-libs/glib-2.44.0:2[${MULTILIB_USEDEP}] + virtual/libusb:1[udev,${MULTILIB_USEDEP}] + introspection? ( >=dev-libs/gobject-introspection-1.54:= ) + sys-apps/hwids +" +DEPEND="${RDEPEND}" +BDEPEND=" + $(python_gen_any_dep 'dev-python/setuptools[${PYTHON_USEDEP}]') + gtk-doc? ( + app-text/docbook-xml-dtd:4.1.2 + app-text/docbook-xml-dtd:4.4 + dev-util/gtk-doc + ) + vala? ( $(vala_depend) ) + virtual/pkgconfig +" + +RESTRICT="!test? ( test )" + +python_check_deps() { + has_version -b "dev-python/setuptools[${PYTHON_USEDEP}]" +} + +src_prepare() { + use vala && vala_src_prepare + default +} + +multilib_src_configure() { + local emesonargs=( + -Ddefault_library=$(usex static-libs both shared) + $(meson_use test tests) + -Dvapi=$(multilib_native_usex vala true false) + -Dusb_ids="${EPREFIX}"/usr/share/misc/usb.ids + -Ddocs=$(multilib_native_usex gtk-doc true false) + -Dintrospection=$(multilib_native_usex introspection true false) + ) + meson_src_configure +} + +multilib_src_compile() { + meson_src_compile +} + +multilib_src_test() { + meson_src_test +} + +multilib_src_install() { + meson_src_install +} diff --git a/dev-libs/libgweather/Manifest b/dev-libs/libgweather/Manifest index fa81558d74ff..2151c10facde 100644 --- a/dev-libs/libgweather/Manifest +++ b/dev-libs/libgweather/Manifest @@ -1,5 +1,7 @@ AUX 3.32.1-meson-tweaks.patch 3169 BLAKE2B 4bfc87153b5f63626ca21a17706e1c510915929fccb691ba9ccc4b3d2f5869927a49cd82a638e7a9b265ebf31f4320c226090a9bcc94f8d438583dd709272695 SHA512 570beb2093ee4f39920cddc95f464aa0cac09ebe299418c8924713e1db060906ddcb8aef7db617079a50dba4ab2b3923aed99f3adf3377e52c7562719072b885 AUX 3.34.0-tests-Add-another-duplicate.patch 981 BLAKE2B c1f3a196fac3da61a03b081eb82c6726cde11af9d18fb193794339f639953653f937442bb78a9561cde9a0860d0d4841ec50943d218f87ea4507bf05a7b45337 SHA512 529fe41ded3a199795d39490804f6ab8bfb108e0c9b8ca4cafd7b4a27d695d0a32aaa0954b0a89650d160cba3b7ddb2efad4170f2fbdad806e611aaf918b83cb DIST libgweather-3.34.0.tar.xz 2725096 BLAKE2B af1034b905354aed433e3a5249305718b850f84dabcf3e96b9f9bcdda7dd78258ede0a9e82cab9b9d7f1b63d8e1a61bc3c83c1c18ec38790bc43c29fe98bb89d SHA512 44451837039965251d86f6f538c943a771ab1944d9190ddb2c6bdb34b3ed0e33756c537e84f24487fd5f28b107e8d3af05a6c20a68f83734ac26ff69a8bd0aba +DIST libgweather-3.36.1.tar.xz 2702144 BLAKE2B bd867461b64ef81607695ae1a3796d2b096129a9a60721c5fcb20d8c35859c0b76a985e9393c23b311f7c0fdec3e691618eab83a826b483c427287906d575251 SHA512 6c7090b0b6dfac61e73a398d34329cd706080a007694ceb3d47700b4f444982f8ca989dd6dfaefe85b79ffd5af9c423be4bf1bd8491ac0ba6bd15c150d97b26d EBUILD libgweather-3.34.0.ebuild 1716 BLAKE2B 9d3eba6e7f1e3b200dceda12ebf7525403b9805c7e6eec14429f9490b5f9414fa5145e1b600b6af943a2fda342a4bf8ce705e94ed4b5a88540a552b9dadb338a SHA512 a47c9c7a28fbc6533398ac6e47350f54ce9dbc50f6bab4e9d87fb97ec427dba7f000101cc0aa75a434288d1bec66e77117b4d0de1e70bb163f9b268222593680 +EBUILD libgweather-3.36.1.ebuild 1663 BLAKE2B 80bd819b24f5fb636604867c9921211d7b5a08eb9eb00d3ddc3974ff18c8717ba865f26d764ce05c4e24b3585c485de9319dcf312ee35c7bb9858e8565b4428b SHA512 1ae58ec977f644e581d41d15482fb2aefdb433af33de3ae8c7f3dfed7ffe267130ca152f869afd73d561f193466ab2971a7443218aa74771f77b98fd1aadd3a7 MISC metadata.xml 349 BLAKE2B 5467cd4402c0ec93c36f4cde26afe4ff2cf88d31227d8fbd22cabf50b4521c4634dba856a531da5f0054ad208daa8b178c9fad63b72dea6bbdeac13fa2f67bff SHA512 56d547e8cc66f19d606374f64c25546a687f3d199b083e406b871231a53362c0fdbcdf0a1c4f41810a2eb719e1bbab1c1589d7abeeb5630e1e04c20748b0df5f diff --git a/dev-libs/libgweather/libgweather-3.36.1.ebuild b/dev-libs/libgweather/libgweather-3.36.1.ebuild new file mode 100644 index 000000000000..f3d82c03f4cb --- /dev/null +++ b/dev-libs/libgweather/libgweather-3.36.1.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +VALA_USE_DEPEND="vapigen" + +inherit gnome.org gnome2-utils meson vala xdg + +DESCRIPTION="Location and timezone database and weather-lookup library" +HOMEPAGE="https://wiki.gnome.org/Projects/LibGWeather" + +LICENSE="GPL-2+" +SLOT="2/3-16-2" # subslot = 3-(libgweather-3 soname suffix) w/ temporary -2 suffix for silent ABI break after 3.28 without soname bump as per distro-list + +IUSE="glade gtk-doc +introspection +vala" +REQUIRED_USE="vala? ( introspection )" + +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris" + +RDEPEND=" + >=dev-libs/glib-2.44.0:2 + >=x11-libs/gtk+-3.13.5:3[introspection?] + >=net-libs/libsoup-2.44:2.4 + >=dev-libs/libxml2-2.6.0:2 + sci-geosciences/geocode-glib + >=sys-libs/timezone-data-2010k + + glade? ( >=dev-util/glade-3.16:3.10 ) + introspection? ( >=dev-libs/gobject-introspection-1.54:= ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-util/glib-utils + gtk-doc? ( >=dev-util/gtk-doc-1.11 + app-text/docbook-xml-dtd:4.3 ) + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig + $(vala_depend) +" + +PATCHES=( + "${FILESDIR}"/3.32.1-meson-tweaks.patch # Provide introspection optionality and don't build tests that aren't ran automatically +) + +src_prepare() { + xdg_src_prepare + vala_src_prepare +} + +src_configure() { + local emesonargs=( + $(meson_use glade glade_catalog) + $(meson_use vala enable_vala) + $(meson_use gtk-doc gtk_doc) + $(meson_use introspection) + ) + meson_src_configure +} + +pkg_postinst() { + xdg_pkg_postinst + gnome2_schemas_update +} + +pkg_postrm() { + xdg_pkg_postrm + gnome2_schemas_update +} diff --git a/dev-libs/libhid/Manifest b/dev-libs/libhid/Manifest index c53b19519d73..e5ac65cee21f 100644 --- a/dev-libs/libhid/Manifest +++ b/dev-libs/libhid/Manifest @@ -1,6 +1,10 @@ AUX libhid-0.2.16-gentoo.patch 628 BLAKE2B 6c2a25cb230a50c5eceff0229d9d6bf3860c5ff4c4c5075d6dd062cdb600dd2dda70979303ef62422fb65e3a441fa4e1487ee173c78343d4bcca4b061f5bd0b0 SHA512 a756d99b115e1903ff633e511c8b9c2de1743b9d8c5050ba422281aea6c4d330b70632e45f688177d8d06ba4077574193e7e378f0e0a79924d2463f5e1584d40 AUX libhid-0.2.16-libusb.patch 421 BLAKE2B 8b3283ddf9ca120bb77af75fb5aae88ca6d45904a425fdc90f4ca7fda8bd111f37deea5454d692499156337f473bdbd3731d7bf45ea7b80af5c359478cb96c69 SHA512 0fa3be119d1ab3efa428c81b96709a0cee4fd40fa4515d255a64be095a4e26f68a2c8175beda6615c720aaa593edc5aaaa2909bfc5ab9e7f9b818d8c507b9fde AUX libhid-0.2.16-swig.patch 1424 BLAKE2B afc3bbaedcd83c87b3186742872681a7a74780873d7aea8fe5fb1df9c69aa66e8265af58200476a2c85f7c0f7abc8036cd569e8827cfb239cb60262758618784 SHA512 62ff58921aa99947f8b33b0d1c02cf30f19fd3f75393cbb681846266b67af49bf6a2e70a995c9a7252b27c67e573e2c198b366830c15ca3c5e87a93325a849cb +AUX libhid-0.2.17-configure.patch 651 BLAKE2B 734aec3525837a5179fe75057628fa5c9276603b62d5075a95f49c1813f2bbff94dde8a538fe82a25c07a0b101a6ace518e5f496b261c8b9d8063bedea001766 SHA512 da06305f3846c24e5faac1bd3f69f2527801a0e2bff127414fecd78ff658a6c25221441a61c24a97d465523b44bd8c8d7e3396fe20b11ad6ff3a5b96902740fb +AUX libhid-0.2.17-man.patch 500 BLAKE2B 404b7163651258a28369458a76cdcc591ebc8285b53b60e84c41f899d3449e6493b191ff6411668ad168a9ea91b024b5c6d738ca86c91a49f115ba58bf7b01c0 SHA512 de3364eeff10e5e0dc287b4c04bc680ab44c487cd539d3642ef72ebc11384713021bff750f6bf1a46819e59842ad51c37e2eec0d0d9e20afb8a194b5844fe1ce DIST libhid-0.2.16.tar.gz 435245 BLAKE2B 9bd06b226e42ed0dbbf4395824636dbfaa796ce9c0170ad7af561741ec3f494b92ec09c548f3bc7c698a32aa78d82d4da4094231fbb810de5a67d3066947fd97 SHA512 3c9348f9d63e0e1577e983c65ff8e6acbaee0d5f43ecb29b7004654a7e9d14a94176aa029f259e0b8576fc30e8a9af6d1df34912dd582bfadc2b29f9b87eb52b +DIST libhid-0.2.17.tar.gz 218501 BLAKE2B d7110dc1854829023531f1fd58fd6668f5d15dc3b98f9a6c799b3bc4725ded907de645921d17161a37cde8d9759ec371f96caf4fbb8d6f7bd480dfe2a352b399 SHA512 d82ef95871460e22e26f4fddb88edb83c262a8d0cd70beb7e65cacb443bfc21e12f868d50b8b4ea0ee00acce7c2d0f5bd06437b69cf89ef39dd118c21c73b977 EBUILD libhid-0.2.16-r4.ebuild 1254 BLAKE2B 169b8bad85fac93966d558c789456389e8451f409a216fd953f081fccbe30c2fe1d35e8cd990ede83ff8f0fd9ee43e686bcb549fe8a330f5e030374ede5c86e2 SHA512 12547eb12fc9ef71b81d0733386cf1ef9aaea9d685c6971c69a7653dc0bdf92e96f78ce4aabc8d553f0d9f7c026fd736a4210224506787310491d1ef092d88b9 -MISC metadata.xml 495 BLAKE2B 1cf63c758e96eaeb6195814d8f568f80016982d94561737c3077637165c4fe5f791ca88d45374f95e0208aaca523f77e887e5c99b5839c8c8ce34573febe5987 SHA512 e465b7596e61565aa21ce9c32d7d76b099ee21c471c341677604f5816f2b7547c57f8a065f2bb9df2356c3e6d5fd26efb303884117096e8178127490a14ca268 +EBUILD libhid-0.2.17.ebuild 1028 BLAKE2B d4e5688269959fe25bbe241338b5188e4302e6dd4d9b0bff961697a26192e24df0290d66f03c277c111eb071cf138a4b0ea3586709a4b1fc855a1268ce73e3db SHA512 6eda25820eae4709e80675d35d8ea8110b897c196604d6b74edfb39680ee2d1471a200c6ef1806175c1b3248666046f61da9d251cd8e14feb07f3ad3f97d69be +MISC metadata.xml 579 BLAKE2B c06739bd7822f74c3721fb2848c6b91e2904a2731478bbdda4b7500dff9882d2d885983ad017191bf9ac3217ce1e200db82663c3dec29777f995358dc6bcab28 SHA512 5ee3274cd0351f5d4a7853a1392bc538c85b9539b1964cf420b00c7e9dcbcb20534b74b641e7c4ed7ccb2218ffea9ef42b06d6ffebf1c1402337c66a8c9c7bce diff --git a/dev-libs/libhid/files/libhid-0.2.17-configure.patch b/dev-libs/libhid/files/libhid-0.2.17-configure.patch new file mode 100644 index 000000000000..5318aa2d89fe --- /dev/null +++ b/dev-libs/libhid/files/libhid-0.2.17-configure.patch @@ -0,0 +1,36 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -59,9 +59,10 @@ + MD_CHECK_OS + + MD_CHECK_LIBUSB018B ++LIBS="$LIBS $LIBUSB_LIBS" ++INCLUDES="$INCLUDES $LIBUSB_CFLAGS" + + AC_PROG_CC +-MD_CHECK_GCC3 + + dnl MD_CONF_DISTCC + dnl MD_CONF_CCACHE +@@ -78,7 +79,6 @@ + AC_C_BIGENDIAN + AC_C_STRINGIZE + +-MD_CONF_DEBUGGING + MD_CONF_COMPILER + AM_CONDITIONAL(OS_LINUX, test "$MD_OS" = "linux") + AM_CONDITIONAL(OS_BSD, test "$MD_OS" = "bsd") +@@ -98,13 +98,6 @@ + + MD_CHECK_DOXYGEN + +-MD_CONF_FLAGS( +- [], +- [$OS_CFLAGS $LIBUSB_CFLAGS], +- [], +- [$OS_LDFLAGS $LIBUSB_LIBS] +-) +- + MD_CONF_DB2MAN + + ##### OUTPUT ################################################################# diff --git a/dev-libs/libhid/files/libhid-0.2.17-man.patch b/dev-libs/libhid/files/libhid-0.2.17-man.patch new file mode 100644 index 000000000000..4fe5677c107a --- /dev/null +++ b/dev-libs/libhid/files/libhid-0.2.17-man.patch @@ -0,0 +1,11 @@ +--- a/m4/md_conf_db2man.m4 ++++ b/m4/md_conf_db2man.m4 +@@ -3,7 +3,7 @@ + for file in \ + /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl \ + /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/*/manpages/docbook.xsl \ +- /usr/share/{x,sg}ml/docbook/xsl-stylesheets-*/manpages/docbook.xsl \ ++ /usr/share/{x,sg}ml/docbook/xsl-stylesheets*/manpages/docbook.xsl \ + /sw/share/xml/xsl/docbook-xsl/manpages/docbook.xsl; do + + test -r $file && db2man_file=$file diff --git a/dev-libs/libhid/libhid-0.2.17.ebuild b/dev-libs/libhid/libhid-0.2.17.ebuild new file mode 100644 index 000000000000..bfc00287f463 --- /dev/null +++ b/dev-libs/libhid/libhid-0.2.17.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools + +DESCRIPTION="Provides a generic and flexible way to access and interact with USB HID devices" +HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage" +SRC_URI="https://dev.gentoo.org/~conikost/files/${P}.tar.gz" + +LICENSE="GPL-2 GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +IUSE="doc" + +RDEPEND="virtual/libusb:0=" + +DEPEND="${RDEPEND}" + +BDEPEND=" + app-text/docbook-xsl-stylesheets + dev-libs/libxslt + doc? ( app-doc/doxygen ) +" + +PATCHES=( + "${FILESDIR}"/${P}-configure.patch + "${FILESDIR}"/${P}-man.patch +) + +src_prepare() { + default + + eautoreconf +} + +src_configure() { + export OS_LDFLAGS="${LDFLAGS}" + + myeconfargs=( + "--disable-static" + "--disable-swig" + "--disable-warnings" + "--disable-werror" + "$(use_with doc doxygen)" + ) + + econf ${myeconfargs[@]} +} + +src_install() { + default + + if use doc; then + docinto html + dodoc -r doc/html/. + fi + + find "${D}" -name '*.la' -type f -delete || die +} diff --git a/dev-libs/libhid/metadata.xml b/dev-libs/libhid/metadata.xml index 8ab798976991..8e5545cdf11e 100644 --- a/dev-libs/libhid/metadata.xml +++ b/dev-libs/libhid/metadata.xml @@ -1,11 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<!-- maintainer-needed --> -<longdescription lang="en"> -libhid provides a generic and flexible way to access and interact with USB -HID devices, much like libusb does for plain USB devices. It is based on -libusb, thus it requires no HID support in the kernel and provides means to -take control over a device even if the kernel governs it. -</longdescription> + <maintainer type="person"> + <email>conikost@gentoo.org</email> + <name>Conrad Kostecki</name> + </maintainer> + <longdescription> + Libhid provides a generic and flexible way to access and interact with + USB HID devices, much like libusb does for plain USB devices. + It is based on libusb, thus it requires no HID support in the kernel + and provides means to take control over a device even if the kernel governs it. + </longdescription> </pkgmetadata> diff --git a/dev-libs/libinput/Manifest b/dev-libs/libinput/Manifest index a5a0580a3f61..eca25283a3fe 100644 --- a/dev-libs/libinput/Manifest +++ b/dev-libs/libinput/Manifest @@ -1,5 +1,7 @@ -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.5.ebuild 2146 BLAKE2B 546077aa2a928f10745d17235c84b840ae817ed8dfc124ec82e2504620b3bd65066c95ca945743f703acfbbf50d6968f2f7be6ad8d1e964087f8e2eab52380e5 SHA512 cc2a9d8013068f919e5e181e407870930ba2531eb7b0dfb7c1c1319ca62a5b919b0e227b0bb085377d32b5c5bfea5d24106aedb580f7cc3b5b1e15a9df23e42b -EBUILD libinput-1.15.6.ebuild 2154 BLAKE2B 1db905d4b3cec898ea12d1bae75627c7597603fffb5f034aaeeeb24c97ef94d8bcdde5d97e9dc7293fcd1683ff64f8bd345c47486d4ad196d2aa39a3b395f7ae SHA512 679b56b53bdb4660d788f030987706c493f4033692b5ffa7e48dd5fe7feac48ce173ef18a943370cff6d1043c0b7ded113d1dce35bac8b38477b68472cac3506 +DIST libinput-1.16.0.tar.xz 593304 BLAKE2B 959b9e5720b1aa196eb45cf772e8edc800032ee0cd2db1c06537ed979cbf83eaef8c50d2f6aa194e8cf668fcfd1bcb46767a897f99679867b7d816e2567c16a8 SHA512 0c932a88f2a1d23ebef0d58c0cdbfb558e9e3d990fca15b21f5b9011bdd1bc2da81aad374fcdb8f4590f6ee2fc45e668e0583371ceb354437e585240e687aac6 +DIST libinput-1.16.1.tar.xz 595548 BLAKE2B 497089248c2104ff7784b7d46d8e846047e054f01c6ea192f1c41171b39213fa1f19be8c8253c32f988bfc6f025d2519697256ffaf62884182c511bcd5c5d335 SHA512 86b2d563c2cff2b3d3cae3acdd399030cc785cc9859a06357a99565ef51f95122a8427c8c0883121fb0760613460a29c8cd8c7a7e3ac68115c10330b3b75cbe0 +EBUILD libinput-1.15.6.ebuild 2146 BLAKE2B 546077aa2a928f10745d17235c84b840ae817ed8dfc124ec82e2504620b3bd65066c95ca945743f703acfbbf50d6968f2f7be6ad8d1e964087f8e2eab52380e5 SHA512 cc2a9d8013068f919e5e181e407870930ba2531eb7b0dfb7c1c1319ca62a5b919b0e227b0bb085377d32b5c5bfea5d24106aedb580f7cc3b5b1e15a9df23e42b +EBUILD libinput-1.16.0.ebuild 2157 BLAKE2B a85519433dd08ad44c6dde55780b2d3f3f8a1559533120b7a18ccd3920e3ec969dfef9c37a92b71773d2a46563ef0382755ef3d12b97bb6bf188711782faad69 SHA512 e3c62cc6e5a626116801a017852c5b13342e8b5850171f3698e465a84dd3743cad941790d315f5e87f2cd318c0815972d06860efa301baf60b4c8963d6f83a67 +EBUILD libinput-1.16.1.ebuild 2157 BLAKE2B a85519433dd08ad44c6dde55780b2d3f3f8a1559533120b7a18ccd3920e3ec969dfef9c37a92b71773d2a46563ef0382755ef3d12b97bb6bf188711782faad69 SHA512 e3c62cc6e5a626116801a017852c5b13342e8b5850171f3698e465a84dd3743cad941790d315f5e87f2cd318c0815972d06860efa301baf60b4c8963d6f83a67 MISC metadata.xml 448 BLAKE2B c7a735047f8d22e10d1094dc4bbcbd118c025f318280dafd36029484956465c5e459326fb765f04fbdddc03743760a9008c6ac2494ad113387134fb4e79c4c48 SHA512 945c1005dccddac8085fd8b2be635c08d5b4da1f8264d564d10526d11cf814131d1fa5fd7620f35811a90b43686517519f4e9aba9253f5d5d5b69daa25be52bf diff --git a/dev-libs/libinput/libinput-1.15.6.ebuild b/dev-libs/libinput/libinput-1.15.6.ebuild index 7ae9b0b06559..931b05cb869e 100644 --- a/dev-libs/libinput/libinput-1.15.6.ebuild +++ b/dev-libs/libinput/libinput-1.15.6.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.5.ebuild b/dev-libs/libinput/libinput-1.16.0.ebuild index 931b05cb869e..cfbdf1816876 100644 --- a/dev-libs/libinput/libinput-1.15.5.ebuild +++ b/dev-libs/libinput/libinput-1.16.0.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{6,7} ) +PYTHON_COMPAT=( python3_{6,7,8} ) inherit meson python-any-r1 udev @@ -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 )" @@ -74,7 +74,7 @@ src_install() { pkg_postinst() { pkgname="dev-python/python-libevdev" - if [[ -z "${REPLACING_VERSIONS}" ]] && ! has_version "${pkgname}"; then + if [[ -z "${REPLACING_VERSIONS}" ]] && ! has_version "${pkgname}" ; then einfo "${pkgname} must be installed to use the" einfo "libinput measure and libinput replay tools." fi diff --git a/dev-libs/libinput/libinput-1.16.1.ebuild b/dev-libs/libinput/libinput-1.16.1.ebuild new file mode 100644 index 000000000000..cfbdf1816876 --- /dev/null +++ b/dev-libs/libinput/libinput-1.16.1.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,8} ) + +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/libintl/Manifest b/dev-libs/libintl/Manifest index f395b59e1283..0afe931d19d0 100644 --- a/dev-libs/libintl/Manifest +++ b/dev-libs/libintl/Manifest @@ -1,7 +1,11 @@ DIST gettext-0.19.7.tar.gz 19235781 BLAKE2B 4c2cfcb0b21a66a9f8d2d57de7420e624a1235f97180ad5ac194a5eb629760a9cacc7f3966cdf893d7af86c1740d8bb2266c639ebe2664ea44f2c47a962a841a SHA512 7ba89074d3eddd0b4a5e2980e1ec74b53c49b7a04a1fa91c70c4bc11ce9c30415e4df9d79698148eaaed325fb4feb25a340a2e8e01fbe86b1a66b1376a4c9e3d DIST gettext-0.19.8.1.tar.gz 19704011 BLAKE2B 17dc7aad338a26d71b818fea51e46a47dccf14744ee575ce86b591becaea402e36d64dc018e1a84113c356122ffef367cf2fa424e51ebc9720350040b4960091 SHA512 073042fa2dc48804c58e76f036130a669e19612c25427b0ab14d0b366b549a63751bf3af03bfd0745d7c4f72497a4b2aab26a3cc6de83189ce111679073878e1 DIST gettext-0.20.1.tar.gz 23267473 BLAKE2B 34e776b985c7db105f8029e0f3400aa645ff6843cd35f778d48450368a31218ddcf590fbc7fd2d10f716b63094d6a15bf40b358e8a6f498d450d2420e7e7a5f2 SHA512 af6d74986da285df0bdd59524bdf01bb12db448e5ea659dda3b60b660c4a9063c80e8c74cc8751334e065e98348ee0db0079e43c67d485a15e86ae236115fe06 +DIST gettext-0.20.2.tar.gz 23717789 BLAKE2B f0db5eacc93501020f31d80e4b11df708d5ce1ae76f9c35587c830c064a4b712284df4645cedf054a41e66ab08d14d080c4fe1d316a108b997207b78148ed579 SHA512 50b0520230dba5da6e04e51b2317e073cacf1536d73ea88e4b5dc6cc5bd97cf2c9a279c3c3ada1067f39c8b3bb0b1ce8e0823cc1dd4c33f4f10860bdf787009d +DIST gettext-0.21.tar.gz 24181849 BLAKE2B 2eae99d0916b00b2af6fbc6bf7e309076519a10fea16cd49e7aa29fe8aec1ee7c784c6277281b764dc4abacf400cd3fe461129586303c8cd337db15c76cb4b87 SHA512 bbe590c5dd3580c75bf30ff768da99a88eb8d466ec1ac9eea20be4cab4357ecf72448e6b81b47425e39d50fa6320ba426632914d7898dfebb4f159abc39c31d1 EBUILD libintl-0.19.7.ebuild 2096 BLAKE2B f1d13ca94e12dda5357c4bc11a87c88ad7409f6cae563c15ced09bd0d99dcedd0e6ae060fdda2791fc6cb08aa591d4c78e448a1f7537405e9f3026d64b4e4a99 SHA512 08610710f1b663df011eece6851d5271fdb7244083aac56df054ad979c98bb618e9d48b650cecbcf47de5c33b68dc511c414496cc11559c9a2c851ec0400eb22 -EBUILD libintl-0.19.8.1.ebuild 2098 BLAKE2B 543d6c8dc4ae22824c09ff3d1b6e1cf0fdf76bfc730526bbf37537c3aab291aea2778123e66e855cae60a28fe7ceb6c34fff628757d1d846a54013f05e2ebd13 SHA512 bfd5afee77904d16a1a7385d4726bf24f699a8b23fffcf092ac6e9e6577454f595076e66c4104df150933e5518009c5fd36c500d8903dafb86bbcd53aa09f659 -EBUILD libintl-0.20.1.ebuild 2109 BLAKE2B 4692a8a6d707bff990209ca6735abe61d8d23b8a61c171762d3317b200f23099c8af19c7692ec94c921543effe2e8995c95159cfcb653ab61f46a84f1bc66b6d SHA512 997f9e19526577f26cd8026733625f0fb4ef29058a3d5cef2a44afe0e73d0419cffd786b31783e248c207e20d80c2716015918b715a3b9b86a71a49a50bef626 +EBUILD libintl-0.19.8.1.ebuild 2097 BLAKE2B e19a88ee249a2d6f9f9a02a2711b04e7d4eb18c4e466b1303350fd75396cdd82dfbb202c38fa3a9730cc20c77896d03d309681850e88244f65674c96ed05cfe8 SHA512 384fb3a380f4dadd57313b512827494ab2faf408d284f1184fe75f645d3f9f03614e98197df45466bbec03ce1c5e3a5bf0d4c7c3434e7dfb9a8fbe8a98363ea0 +EBUILD libintl-0.20.1.ebuild 2108 BLAKE2B a98ff4f17bd5509b9b5b50b2adfb7e6238ce3e9a3a6d3f3e6e87797b18620316194bfd38db3e2591b2b5343ee0efbca323df78dd38712202a8e72684697efafd SHA512 364817bd96753382c5308e157d1cfcc3897a17d0d0b55fde1d28163f331f5c1dbdae4ecb2355a80614f6ba0e40276824149569320db9197b7fe71c5a225250b9 +EBUILD libintl-0.20.2.ebuild 2109 BLAKE2B 4692a8a6d707bff990209ca6735abe61d8d23b8a61c171762d3317b200f23099c8af19c7692ec94c921543effe2e8995c95159cfcb653ab61f46a84f1bc66b6d SHA512 997f9e19526577f26cd8026733625f0fb4ef29058a3d5cef2a44afe0e73d0419cffd786b31783e248c207e20d80c2716015918b715a3b9b86a71a49a50bef626 +EBUILD libintl-0.21.ebuild 2109 BLAKE2B 4692a8a6d707bff990209ca6735abe61d8d23b8a61c171762d3317b200f23099c8af19c7692ec94c921543effe2e8995c95159cfcb653ab61f46a84f1bc66b6d SHA512 997f9e19526577f26cd8026733625f0fb4ef29058a3d5cef2a44afe0e73d0419cffd786b31783e248c207e20d80c2716015918b715a3b9b86a71a49a50bef626 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 diff --git a/dev-libs/libintl/libintl-0.19.8.1.ebuild b/dev-libs/libintl/libintl-0.19.8.1.ebuild index ddced03cb3f6..7e3ab8673925 100644 --- a/dev-libs/libintl/libintl-0.19.8.1.ebuild +++ b/dev-libs/libintl/libintl-0.19.8.1.ebuild @@ -15,7 +15,7 @@ SRC_URI="mirror://gnu/gettext/${MY_P}.tar.gz" LICENSE="LGPL-2.1+" SLOT="0" -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 ~x86-winnt" +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 ~x86-winnt" IUSE="static-libs +threads" DEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]" diff --git a/dev-libs/libintl/libintl-0.20.1.ebuild b/dev-libs/libintl/libintl-0.20.1.ebuild index 381e47de63d1..72fd36833be6 100644 --- a/dev-libs/libintl/libintl-0.20.1.ebuild +++ b/dev-libs/libintl/libintl-0.20.1.ebuild @@ -15,7 +15,7 @@ SRC_URI="mirror://gnu/gettext/${MY_P}.tar.gz" LICENSE="LGPL-2.1+" SLOT="0" -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 ~x86-winnt" +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 ~x86-winnt" IUSE="static-libs +threads" DEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]" diff --git a/dev-libs/libintl/libintl-0.20.2.ebuild b/dev-libs/libintl/libintl-0.20.2.ebuild new file mode 100644 index 000000000000..381e47de63d1 --- /dev/null +++ b/dev-libs/libintl/libintl-0.20.2.ebuild @@ -0,0 +1,80 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# Note: Keep version bumps in sync with sys-devel/gettext. + +EAPI=7 + +MY_P="gettext-${PV}" + +inherit multilib-minimal toolchain-funcs libtool usr-ldscript + +DESCRIPTION="the GNU international library (split out of gettext)" +HOMEPAGE="https://www.gnu.org/software/gettext/" +SRC_URI="mirror://gnu/gettext/${MY_P}.tar.gz" + +LICENSE="LGPL-2.1+" +SLOT="0" +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 ~x86-winnt" +IUSE="static-libs +threads" + +DEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]" +# Block C libraries known to provide libintl. +RDEPEND="${DEPEND} + !sys-libs/glibc + !sys-libs/musl + !<sys-devel/gettext-0.19.6-r1" + +S="${WORKDIR}/${MY_P}/gettext-runtime" + +src_prepare() { + default + + # The libtool files are stored higher up, so make sure we run in the + # whole tree and not just the subdir we build. + elibtoolize "${WORKDIR}" +} + +multilib_src_configure() { + local myconf=( + # Emacs support is now in a separate package. + --without-emacs + --without-lispdir + # Normally this controls nls behavior in general, but the libintl + # subdir is skipped unless this is explicitly set. ugh. + --enable-nls + # This magic flag enables libintl. + --with-included-gettext + # The gettext package provides this library. + --disable-c++ + --disable-libasprintf + # No java until someone cares. + --disable-java + + $(use_enable static-libs static) + $(use_enable threads) + ) + ECONF_SOURCE="${S}" econf "${myconf[@]}" +} + +multilib_src_compile() { + # We only need things in the intl/ subdir. + emake -C intl +} + +multilib_src_install() { + # We only need things in the intl/ subdir. + emake DESTDIR="${D}" install -C intl + + gen_usr_ldscript -a intl +} + +multilib_src_install_all() { + if ! use static-libs ; then + find "${ED}" -type f -name "*.la" -delete || die + fi + + rm -r "${ED}"/usr/share/locale || die + + dodoc AUTHORS ChangeLog NEWS README +} diff --git a/dev-libs/libintl/libintl-0.21.ebuild b/dev-libs/libintl/libintl-0.21.ebuild new file mode 100644 index 000000000000..381e47de63d1 --- /dev/null +++ b/dev-libs/libintl/libintl-0.21.ebuild @@ -0,0 +1,80 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# Note: Keep version bumps in sync with sys-devel/gettext. + +EAPI=7 + +MY_P="gettext-${PV}" + +inherit multilib-minimal toolchain-funcs libtool usr-ldscript + +DESCRIPTION="the GNU international library (split out of gettext)" +HOMEPAGE="https://www.gnu.org/software/gettext/" +SRC_URI="mirror://gnu/gettext/${MY_P}.tar.gz" + +LICENSE="LGPL-2.1+" +SLOT="0" +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 ~x86-winnt" +IUSE="static-libs +threads" + +DEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]" +# Block C libraries known to provide libintl. +RDEPEND="${DEPEND} + !sys-libs/glibc + !sys-libs/musl + !<sys-devel/gettext-0.19.6-r1" + +S="${WORKDIR}/${MY_P}/gettext-runtime" + +src_prepare() { + default + + # The libtool files are stored higher up, so make sure we run in the + # whole tree and not just the subdir we build. + elibtoolize "${WORKDIR}" +} + +multilib_src_configure() { + local myconf=( + # Emacs support is now in a separate package. + --without-emacs + --without-lispdir + # Normally this controls nls behavior in general, but the libintl + # subdir is skipped unless this is explicitly set. ugh. + --enable-nls + # This magic flag enables libintl. + --with-included-gettext + # The gettext package provides this library. + --disable-c++ + --disable-libasprintf + # No java until someone cares. + --disable-java + + $(use_enable static-libs static) + $(use_enable threads) + ) + ECONF_SOURCE="${S}" econf "${myconf[@]}" +} + +multilib_src_compile() { + # We only need things in the intl/ subdir. + emake -C intl +} + +multilib_src_install() { + # We only need things in the intl/ subdir. + emake DESTDIR="${D}" install -C intl + + gen_usr_ldscript -a intl +} + +multilib_src_install_all() { + if ! use static-libs ; then + find "${ED}" -type f -name "*.la" -delete || die + fi + + rm -r "${ED}"/usr/share/locale || die + + dodoc AUTHORS ChangeLog NEWS README +} diff --git a/dev-libs/libjcat/Manifest b/dev-libs/libjcat/Manifest index 8067be96317f..6d01d58e915d 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 AUX libjcat-0.1.3-optional_vala.patch 944 BLAKE2B 4a764d59a429f7d0d78e5cffa6f63d6cc88db92a41a46a5e3ed47fde2b358209aa4e61302d071e4e15366232992961c0837eb708f840f36c8468aee48f3fc3a2 SHA512 0b9879099933b4f5eb31af48994597a17e5e0331c55df7711271a4e65e375a85c7301801038d62ff3c7704ae4e4a0baa01ff160d92fd7522c2d81b050154dea0 DIST libjcat-0.1.3.tar.gz 63765 BLAKE2B a9847fe2a93f49773ba6451036d7908b8b615a6334557a68c94db3c402e1f502e2915bb1abc9f58c495fe1453cb5653cae9b548d2f9d7b39dcd5d7824e965bc2 SHA512 f021e10d740ac6d0f0c73cefc9deacdbc74882a5e340b249c28427ece4917358940413914ce19c5aac96c86d8056349ff2ee633c2a9541f4382f109d9e0d9e69 -EBUILD libjcat-0.1.3-r1.ebuild 1485 BLAKE2B d12e00334a25c4b44c77a35214953808897db2391ceff642b68b4d4bc8cffb6a40ea753dc3b8113ba130bfd8387fe59e56c15145adceb6da204d0f431f4d4ed3 SHA512 6f5c7d87680e48dc7a1c40e4f85c6b4265bb0e1d1283964879bdbc4c5178baa4ff249bf4bd24e62e7978eabaf76f4ad163839d97e15bc96f5cf6f88c498f881e +EBUILD libjcat-0.1.3-r1.ebuild 1490 BLAKE2B 8e6d9e24040d80aa12aefdde4a4797195b33b6dc8c9231d72936eca56069dae966e02d0c14989848a862b65053b840a14f22ce892992eced17e62f0162fb7313 SHA512 e74e0c6753de3d507704e9b799bdd6a81554b12dc7747559e5fc2e03288ffff1de26acf77aa909fbc4410696e657fa86b85b39bf929336879d77543c7c466990 EBUILD libjcat-0.1.3.ebuild 1403 BLAKE2B 95f1152cdf7bde258b549d08646f2de4f85c97af540f70b79e381143ecba366765fcc2971c9f5f983d435ffc47e6084a39bb9e13a75e0104f45f0af43c394904 SHA512 e4c17f8feab615a290f4495d03f24ca7a6a2371643476634165fc7db69abaa57185487f8477ddece2f60ec8e54cd2e000166e170320590dd1a3ce75b2bb0c73f MISC metadata.xml 993 BLAKE2B 3f186f6514cbea4951c5e2b4c26a305d615cfa52237ba5e21495c7843a82fd551557e53592e7aacbc568b8bd09832fef0054e4f095fdeb07194e9dc8258bbee3 SHA512 fa07148261c97c53718c489a0cd70d60eea42fccc1723a88d9a35b06c7a91b92e2e0d66bed11f719f160f749ea4a0cbb3eab89c6dc68eda5ff75386d4958e3bc diff --git a/dev-libs/libjcat/libjcat-0.1.3-r1.ebuild b/dev-libs/libjcat/libjcat-0.1.3-r1.ebuild index ccbbdf6c2393..141c38f2a5fd 100644 --- a/dev-libs/libjcat/libjcat-0.1.3-r1.ebuild +++ b/dev-libs/libjcat/libjcat-0.1.3-r1.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 ~x86" +KEYWORDS="~amd64 ~arm ~x86" IUSE="gpg gtk-doc +introspection +man pkcs7 test vala" RDEPEND="dev-libs/glib:2 diff --git a/dev-libs/liblinear/Manifest b/dev-libs/liblinear/Manifest index 62b3a55dcb29..c1dacd7758a2 100644 --- a/dev-libs/liblinear/Manifest +++ b/dev-libs/liblinear/Manifest @@ -1,7 +1,11 @@ DIST liblinear-210.tar.gz 381662 BLAKE2B d64d217f7ba67605821062f66d4e9f130f4f2396dde14cd35532bad11f4af4f34bc231a1e3796ba2d0e14f84830ec05c6358d40018e048f4ae3fa62db2b1d0d7 SHA512 4e4558467f2ebb3dbd640c172b1129c8e5981c231a043abb0398a803252559795604a34992baee50ae6689646050733d3a908d7d76f8b1c94309b859eae7f8c8 DIST liblinear-221.tar.gz 520288 BLAKE2B b28c837488f5827ae76f32dc14a1b92027eb5ff123a15c07e9974197eea842c8247420632d259defdba3968383749538c1ed16f6b5c982fad87b3bc52572b485 SHA512 abf21f9030e67886d88a95ad1699e566f8b67bb3bd23253f1f656460911f92a5c3c184fe127390d6100bbf9970cf7a246ef3611b0788907c35a33286228f1753 DIST liblinear-230.tar.gz 524693 BLAKE2B 02e52f6dc26f6ae19dfe52691e4a86c64ea92c40a50d0fbe8a7bddcf06e1216b8f28462fb2105539dedf15ddb07f39ef7e7f78fa7cfd74eac955246e9ed050e7 SHA512 c8acdd9f5cfcf7ef1ff9b9fac658ff51ac4677801fdb9ce6a210ccca7fb136a7957d0edaf45e83269c1928de1926de0200d669cd94e09371c06821d42ba539bc +DIST liblinear-240.tar.gz 558915 BLAKE2B 50aba25c0cb6f9be505b6f9f2b84c67c772b1c8c56cb4b3580b4615c22d30b97a510b28e3d180af29e6c29c4ad77d011319298d6301cb4b2708ad6caf0e1dfc2 SHA512 70e392700cf278d1b62ee7a0b5862dd2a8ea0de28e9660c6d7bc4cac7f098608eba2d20d8f28b5ce0132af09a4446a2cf8aac2ed5f62d35fe304d7a8709ef1d5 +DIST liblinear-241.tar.gz 559122 BLAKE2B 793ef45fc652d6f35908465e754e0aed6568125e74e68ca72466c4d71cc0e30746a999e978521c09a3ada079698f59f2bf65a430679538b7bebc133a258f2588 SHA512 a9ca47b051e28046829a3f355a552b2f5b270dd706170e1d21db1509ef09eca55e2d8ff29695d9e8192baad8bcf50aa76e75a3683948c726f2c9b915a3e4bf27 EBUILD liblinear-210-r1.ebuild 1165 BLAKE2B 56bba8adbcc2b11f32f39494755eaf76f805145bdb685cc3752394ee97601883194b84a24880e2f23735a82734ba0b55470ee6ef0ea40959a26ae53b1723df3d SHA512 3d680e769f50672a5efb141fa2a0cf69ebf5180aaa190a7da80046b340e2666f84295023b9b06a260f4c0ed252e5daad21e558d4c3b3e83f0735ce2170b972f0 EBUILD liblinear-221.ebuild 1197 BLAKE2B 64ad293b87d993029ab7348cfcf70d10d110f65bd91fd3eb1cb98d9f5dc533a88f33af75d9eb599f29b1f5168a34694a5defee5b1ddeb536fb33efe6d4914b35 SHA512 5734a47d1ed7565a5ebed78d2c1e200c9d2efa9a725e532e05af6af543ce078746b1ad0a33ae0c6dafdacd1e51dda15aee22ad0b7fd7b4ad01ab5b98980d5912 EBUILD liblinear-230.ebuild 1197 BLAKE2B 64ad293b87d993029ab7348cfcf70d10d110f65bd91fd3eb1cb98d9f5dc533a88f33af75d9eb599f29b1f5168a34694a5defee5b1ddeb536fb33efe6d4914b35 SHA512 5734a47d1ed7565a5ebed78d2c1e200c9d2efa9a725e532e05af6af543ce078746b1ad0a33ae0c6dafdacd1e51dda15aee22ad0b7fd7b4ad01ab5b98980d5912 +EBUILD liblinear-240-r1.ebuild 1197 BLAKE2B b5fe1724ad652ab0edbde72c15403c4ffd261c046a51636529eec347291a3e835a31a0e6b17cca09a4699057d1432e3966d40fd2d253a7e2a8cfc429adcf2e33 SHA512 1a3cc696d0c8b6783be860522ed931057bd334f73ed4033f763d74a564db453d6141e6423a3a633013469359801e379797c448bf8faecf1340b28f92413aecc5 +EBUILD liblinear-241.ebuild 1197 BLAKE2B b5fe1724ad652ab0edbde72c15403c4ffd261c046a51636529eec347291a3e835a31a0e6b17cca09a4699057d1432e3966d40fd2d253a7e2a8cfc429adcf2e33 SHA512 1a3cc696d0c8b6783be860522ed931057bd334f73ed4033f763d74a564db453d6141e6423a3a633013469359801e379797c448bf8faecf1340b28f92413aecc5 MISC metadata.xml 335 BLAKE2B 2a905547b4dbf1ea8870dc8816a63252e142edcba93710b5d2cb57c2b6603c165ea06a3b459f442e1d08653cb9c6530a56bbaa8685c8147a280d917b4cd1f342 SHA512 efd0a36cca5d21c4a5e94388d125870af42ae9091234a44ae53b8ac6ea7e6ad0b637a5629d3c9ceabfebddce71fde8fa94285e5b1c7edefddebb8bab9e99f0bd diff --git a/dev-libs/liblinear/liblinear-240-r1.ebuild b/dev-libs/liblinear/liblinear-240-r1.ebuild new file mode 100644 index 000000000000..ede9a159d953 --- /dev/null +++ b/dev-libs/liblinear/liblinear-240-r1.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 toolchain-funcs + +DESCRIPTION="A Library for Large Linear Classification" +HOMEPAGE="https://www.csie.ntu.edu.tw/~cjlin/liblinear/ https://github.com/cjlin1/liblinear" +SRC_URI="https://github.com/cjlin1/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0/4" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos" + +src_prepare() { + default + + sed -i \ + -e '/^AR/s|=|?=|g' \ + -e '/^RANLIB/s|=|?=|g' \ + -e '/^CFLAGS/d;/^CXXFLAGS/d' \ + blas/Makefile || die + sed -i \ + -e 's|make|$(MAKE)|g' \ + -e '/$(LIBS)/s|$(CFLAGS)|& $(LDFLAGS)|g' \ + -e '/^CFLAGS/d;/^CXXFLAGS/d' \ + -e 's|$${SHARED_LIB_FLAG}|& $(LDFLAGS)|g' \ + Makefile || die +} + +src_compile() { + emake \ + CC="$(tc-getCC)" \ + CXX="$(tc-getCXX)" \ + CFLAGS="${CFLAGS} -fPIC" \ + CXXFLAGS="${CXXFLAGS} -fPIC" \ + AR="$(tc-getAR) rcv" \ + RANLIB="$(tc-getRANLIB)" \ + lib all +} + +src_install() { + dolib.so ${PN}.so.4 + dosym ${PN}.so.4 /usr/$(get_libdir)/${PN}.so + + newbin predict ${PN}-predict + newbin train ${PN}-train + + doheader linear.h + + dodoc README +} diff --git a/dev-libs/liblinear/liblinear-241.ebuild b/dev-libs/liblinear/liblinear-241.ebuild new file mode 100644 index 000000000000..ede9a159d953 --- /dev/null +++ b/dev-libs/liblinear/liblinear-241.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 toolchain-funcs + +DESCRIPTION="A Library for Large Linear Classification" +HOMEPAGE="https://www.csie.ntu.edu.tw/~cjlin/liblinear/ https://github.com/cjlin1/liblinear" +SRC_URI="https://github.com/cjlin1/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0/4" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos" + +src_prepare() { + default + + sed -i \ + -e '/^AR/s|=|?=|g' \ + -e '/^RANLIB/s|=|?=|g' \ + -e '/^CFLAGS/d;/^CXXFLAGS/d' \ + blas/Makefile || die + sed -i \ + -e 's|make|$(MAKE)|g' \ + -e '/$(LIBS)/s|$(CFLAGS)|& $(LDFLAGS)|g' \ + -e '/^CFLAGS/d;/^CXXFLAGS/d' \ + -e 's|$${SHARED_LIB_FLAG}|& $(LDFLAGS)|g' \ + Makefile || die +} + +src_compile() { + emake \ + CC="$(tc-getCC)" \ + CXX="$(tc-getCXX)" \ + CFLAGS="${CFLAGS} -fPIC" \ + CXXFLAGS="${CXXFLAGS} -fPIC" \ + AR="$(tc-getAR) rcv" \ + RANLIB="$(tc-getRANLIB)" \ + lib all +} + +src_install() { + dolib.so ${PN}.so.4 + dosym ${PN}.so.4 /usr/$(get_libdir)/${PN}.so + + newbin predict ${PN}-predict + newbin train ${PN}-train + + doheader linear.h + + dodoc README +} diff --git a/dev-libs/liblouis/Manifest b/dev-libs/liblouis/Manifest index 4c7ab22d071d..6214b79e3005 100644 --- a/dev-libs/liblouis/Manifest +++ b/dev-libs/liblouis/Manifest @@ -1,5 +1,5 @@ DIST liblouis-3.10.0.tar.gz 13335626 BLAKE2B a4c7f81f15c202c0e1030119f805e218dd51852af57065c441241f4e182828036372750231726802adbb835a7af05ccbf029316da376f3f89dd62ae9d833f838 SHA512 e05d42ba352b1336b10ecd3d320c2bed33250cd636767ecd77837530577c537de4f4e806ddaf1ed7e8b9ec766c84adf6ab045595235c1020f2bb31ba791f3833 DIST liblouis-3.13.0.tar.gz 14683684 BLAKE2B 9596fac30ee8512498826ea11c3fe4d9dfba6706166938852242533f1fadde9ca8e363ea1364ebb4266b366ee49863d84ad757f8634d90e48dd8c562c31e9e8d SHA512 68f0205dc55a106c5707f959c1c0d3c121dfe62f263a664e6bec0780bee65cce2fb5d7033ae1c8312d1d79f7ccaf650af71906e8651b60f11219758e41051b61 EBUILD liblouis-3.10.0.ebuild 1514 BLAKE2B 5fdb331c3cd0cffc293d4eb49d12686aa913757f22533a29d8f8ad9a498556d3128d2ef44275a40ead84b5ca169b14882131d39f67651b197a9d1441e90be4f9 SHA512 3e8be1ca7bdf9cdaf0ebc30daa19b06354a71ef18979cc8151d9b1dfd9bb54980b5afc69c429d983c059b3e4694916c1ec2ad6b2e92520fa350d58854a7a3b4a -EBUILD liblouis-3.13.0.ebuild 1678 BLAKE2B 29bf1c309688d84a8cd85a256285baf98d4371e33108b1d9f38e34d90ce4e4189a729b9fa01044b8deae5585035c38a8f31dab3b05758883bb7e4ecc977c8751 SHA512 cecd049ba3f60fe75f361246404f023038b897cc16c5b74e45dc42e3283a91335829344e0ae71abbf603403f034079c47bf6924f6a7264351d56e293afe1cd88 +EBUILD liblouis-3.13.0.ebuild 1677 BLAKE2B b5d6052c4181a39a18d4ae588ad176838116ba069a2862c9bbf9b3abbbd2188face6cb3d2a1393c871424a3851f1878adc63fe8d047603f22dbe347eb51782cc SHA512 17d780709ed26ed7c7b794be0c0269829a655eacfcb39ba1d3b570bcbfa6a07a71b33d8eee89ef5ca1bd89b00aec141f8a2e3bb3aaed8afe3d0a05d0ea43c43a MISC metadata.xml 351 BLAKE2B 0fa7c957682fe363ddd29442ae153152469cc64ebf9005361c4b82f180c380485adf0b04467b147a441c6656ddcc9e44967fd692ed9f835d70653dbae9b9be1a SHA512 377a2d9ea4bc6007a60fcaf0284bd47af78b6fe2c901916f9cd7d6ab0f7a5225baf7314b47b0c3b00cd162278f910206bd99469bdef0165cd6e19c1eff73714d diff --git a/dev-libs/liblouis/liblouis-3.13.0.ebuild b/dev-libs/liblouis/liblouis-3.13.0.ebuild index af35f5e11b20..59d9912bc1d7 100644 --- a/dev-libs/liblouis/liblouis-3.13.0.ebuild +++ b/dev-libs/liblouis/liblouis-3.13.0.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://github.com/liblouis/liblouis/releases/download/v${PV}/${P}.tar. LICENSE="LGPL-2.1+" SLOT="0/20" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 ~sparc x86" IUSE="python test" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" RESTRICT="!test? ( test )" diff --git a/dev-libs/libmacaroons/Manifest b/dev-libs/libmacaroons/Manifest deleted file mode 100644 index 4b774f493079..000000000000 --- a/dev-libs/libmacaroons/Manifest +++ /dev/null @@ -1,5 +0,0 @@ -DIST libmacaroons-0.2.0.tar.gz 423629 BLAKE2B 8f3b58cbc31ad63e5e474dc76810cd921f6ee57d9836cceafcc2881518c87d185fddb48de13adb7f85fff5b831ce7abd53969ba8b0c96722909f855bb12d303f SHA512 4bc5f83b57c6a8080e646141a3c8b90c0025a894449dea4cb0ab15d1423a067b9833e70014468437d9edfe875e12ea90cae6f715893ded1eefa34f2f6506ecbe -DIST libmacaroons-0.3.0.tar.gz 422086 BLAKE2B 16f398c93230ce745b302d212b58df1e154c8539f76437bbb49d07015c7445484fb5c187294c9a7a1fe6f33ab626a8d9a2fb4784b6bd9b652479072aaf2f0016 SHA512 57a5ffa1a8397228e29ab3f3f7d1440cd70b163b1b28904a046d7b3b1f70dbb0693ea983409f57cc63a02097a1af57209c70ecf8e3be5b8635a7ab6e498b1bcb -EBUILD libmacaroons-0.2.0-r1.ebuild 771 BLAKE2B 50ee3c521e6e240be843426208b318630c080af3dcdab51d51cd8e39c9cfda71c60e020aa851f07d4f6d9e449c1d420e064c5ffae4f4e9ebd45cdde4980b6e47 SHA512 de59324dc7c61dcdbb68bbd1de7e09b219c8d7c113acad59dfd4d9601b0ef9298ed2041c081697a1a511d4a66794a648ae8e3fcda9fe7e9edd407696495da106 -EBUILD libmacaroons-0.3.0.ebuild 771 BLAKE2B 50ee3c521e6e240be843426208b318630c080af3dcdab51d51cd8e39c9cfda71c60e020aa851f07d4f6d9e449c1d420e064c5ffae4f4e9ebd45cdde4980b6e47 SHA512 de59324dc7c61dcdbb68bbd1de7e09b219c8d7c113acad59dfd4d9601b0ef9298ed2041c081697a1a511d4a66794a648ae8e3fcda9fe7e9edd407696495da106 -MISC metadata.xml 247 BLAKE2B 5a20af3c9732ef7dba68131a08988652f5c93a6d186a82c4deb1bb9c06dc3ae73152a0d241cc346637f7b11caf4676da43301ba596c67b66669535e71db0b03e SHA512 29cf52c16b0cce69899d9c2da8acd9144b7d760442aa323b854dceadb42459e009545193b1df7911ac2241b59f4819b4a6bb1d206d6f57953f770031433bb6b7 diff --git a/dev-libs/libmacaroons/libmacaroons-0.2.0-r1.ebuild b/dev-libs/libmacaroons/libmacaroons-0.2.0-r1.ebuild deleted file mode 100644 index 2e904c76228f..000000000000 --- a/dev-libs/libmacaroons/libmacaroons-0.2.0-r1.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python2_7 ) - -inherit eutils python-single-r1 - -DESCRIPTION="Hyperdex macaroons support library" -HOMEPAGE="http://hyperdex.org" -SRC_URI="http://hyperdex.org/src/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64" -IUSE="test +python" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) test? ( python )" - -# Tests can't function after 2014-12-31 ... -RESTRICT="test" - -RDEPEND=" - dev-libs/libsodium - dev-libs/json-c:= - python? ( ${PYTHON_DEPS} )" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -src_prepare() { - use python && python-single-r1_pkg_setup -} - -src_configure() { - econf $(use_enable python python-bindings) -} - -src_test() { - emake -j1 check -} diff --git a/dev-libs/libmacaroons/libmacaroons-0.3.0.ebuild b/dev-libs/libmacaroons/libmacaroons-0.3.0.ebuild deleted file mode 100644 index 2e904c76228f..000000000000 --- a/dev-libs/libmacaroons/libmacaroons-0.3.0.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python2_7 ) - -inherit eutils python-single-r1 - -DESCRIPTION="Hyperdex macaroons support library" -HOMEPAGE="http://hyperdex.org" -SRC_URI="http://hyperdex.org/src/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64" -IUSE="test +python" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) test? ( python )" - -# Tests can't function after 2014-12-31 ... -RESTRICT="test" - -RDEPEND=" - dev-libs/libsodium - dev-libs/json-c:= - python? ( ${PYTHON_DEPS} )" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -src_prepare() { - use python && python-single-r1_pkg_setup -} - -src_configure() { - econf $(use_enable python python-bindings) -} - -src_test() { - emake -j1 check -} diff --git a/dev-libs/libmacaroons/metadata.xml b/dev-libs/libmacaroons/metadata.xml deleted file mode 100644 index 40aa45df2b01..000000000000 --- a/dev-libs/libmacaroons/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>patrick@gentoo.org</email> - <name>Patrick Lauer</name> - </maintainer> -</pkgmetadata> diff --git a/dev-libs/libmanette/Manifest b/dev-libs/libmanette/Manifest index ccfce9e03b5a..d43bf1ba6692 100644 --- a/dev-libs/libmanette/Manifest +++ b/dev-libs/libmanette/Manifest @@ -1,6 +1,3 @@ -AUX 0.2.3-optional-introspection-vapi.patch 2854 BLAKE2B 3e5499fc4cc28a926489c1a7b23f3dc5538c379982774328fa3168f0c49911e082502fded751e6f14b13f66c6003385ae4f79d7806a6f3f3355bc3d52fb61f3a SHA512 91c39c5ccfc87bfd484e93125112c12ec00aa191d748e2915ee06de19800d67e5d414650abb631a22e6ae3437a4dd3108aae9fc626fd8879d534ee3e790cd311 -DIST libmanette-0.2.3.tar.xz 33620 BLAKE2B ec811e0a939713e99eb931a2aa0c1b67a2de1fad4c4e399e47975b795da7672ab56a217cda94f4642f749aed1ff4379c67b58da349f8ac8434c95a80c7909980 SHA512 23d3feae3b0ba81deb75b0ff911eb37f3d0d767a0ae65815d34cadf69f78ca7f081177a2161105ea3979ba9222b3641e6b776bf4fcf3e46a9de716bdce475df6 DIST libmanette-0.2.4.tar.xz 38196 BLAKE2B d9bd8817ec03c9414eb249ce50d3468e2eb2dee78ba36b7a1ac9b04d87e1888d086766594109ee8d89fc4f48fea8d6e7949c7fe44646cacae00145b14f416697 SHA512 713686e3fd515a09846def3283a9e687571dfe47357af00f95739b6e888a454ab14c526a11b38c4ad19bdf928fc3b13b8be32612557dd0ecc743efd2cb6e0792 -EBUILD libmanette-0.2.3.ebuild 977 BLAKE2B a0ee112e80695c4e1d08df111bd9d9005abb17f5b8df9528c36c6ca5a184d2c2282811ebbd21fd879106dddacd8c95432e988d137ba82243cf3c104a0850cf75 SHA512 7af56fce47f39cf1cb73432aa2c59cb7553818ddd93cd0fce881d262d2931ab20e8f567dd7c10821b4af9397dba37ead0f38e7c550226373a4ce6628aaf4ad7a EBUILD libmanette-0.2.4.ebuild 844 BLAKE2B 5e0fdd708d8a18dbb33c2e784efe54b07488b3b363b7e0ceb0f22c4eec7c2506f1df83fee8c5cfdc42735ee7e1213a23e56df794fd93ae3c771bfbc0abc72e4f SHA512 5fa75f9e723d5f0db2cb3ed0daedb80f608749983d0bb88be4eed9b0d097cbf2bfd4cdaeb96caf15def079a04b782efb96a2c2930bd1aa5d4789a432fb9d9e53 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 diff --git a/dev-libs/libmanette/files/0.2.3-optional-introspection-vapi.patch b/dev-libs/libmanette/files/0.2.3-optional-introspection-vapi.patch deleted file mode 100644 index 15558b47be3d..000000000000 --- a/dev-libs/libmanette/files/0.2.3-optional-introspection-vapi.patch +++ /dev/null @@ -1,114 +0,0 @@ -From b561bd29d8797ae2e72d45df8fc122164fc88b6c Mon Sep 17 00:00:00 2001 -From: Mart Raudsepp <leio@gentoo.org> -Date: Sun, 20 Oct 2019 14:57:43 +0300 -Subject: [PATCH] build: Support disabling introspection and vapi generation - ---- - meson_options.txt | 14 +++++++++++ - src/meson.build | 64 ++++++++++++++++++++++++++--------------------- - 2 files changed, 49 insertions(+), 29 deletions(-) - -diff --git a/meson_options.txt b/meson_options.txt -index a7ce738..c794d4b 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -4,3 +4,17 @@ option ( - description: 'Find devices via udev', - value: 'auto' - ) -+ -+option ( -+ 'introspection', -+ type: 'boolean', -+ description: 'Generate introspection data (requires gobject-introspection)', -+ value: true -+) -+ -+option ( -+ 'vapi', -+ type: 'boolean', -+ description: 'Generate vapi data (requires vapigen and introspection option)', -+ value: true -+) -diff --git a/src/meson.build b/src/meson.build -index 7ac916b..50cad92 100644 ---- a/src/meson.build -+++ b/src/meson.build -@@ -90,39 +90,45 @@ if gudev.found() - libmanette_gir_includes += [ 'GUdev-1.0' ] - endif - --libmanette_gir = gnome.generate_gir( -- libmanette_lib, -- extra_args: libmanette_gir_args, -- export_packages: libmanette_module, -- sources: libmanette_headers + libmanette_sources, -- nsversion: api_version, -- namespace: 'Manette', -- identifier_prefix: 'Manette', -- includes: libmanette_gir_includes, -- header: libmanette_main_header, -- install: true, -- symbol_prefix: 'manette', --) -- --libmanette_vapi_packages = [ -- 'gobject-2.0', -- 'gio-2.0', --] -- --if gudev.found() -- libmanette_vapi_packages += [ 'gudev-1.0' ] -+built_girs = [] -+if get_option('introspection') -+ libmanette_gir = gnome.generate_gir( -+ libmanette_lib, -+ extra_args: libmanette_gir_args, -+ export_packages: libmanette_module, -+ sources: libmanette_headers + libmanette_sources, -+ nsversion: api_version, -+ namespace: 'Manette', -+ identifier_prefix: 'Manette', -+ includes: libmanette_gir_includes, -+ header: libmanette_main_header, -+ install: true, -+ symbol_prefix: 'manette', -+ ) -+ built_girs += [ libmanette_gir ] -+ -+ if get_option('vapi') -+ libmanette_vapi_packages = [ -+ 'gobject-2.0', -+ 'gio-2.0', -+ ] -+ -+ if gudev.found() -+ libmanette_vapi_packages += [ 'gudev-1.0' ] -+ endif -+ -+ gnome.generate_vapi( -+ libmanette_module, -+ install: true, -+ packages: libmanette_vapi_packages, -+ sources: libmanette_gir[0], -+ ) -+ endif - endif - --gnome.generate_vapi( -- libmanette_module, -- install: true, -- packages: libmanette_vapi_packages, -- sources: libmanette_gir[0], --) -- - libmanette_dep = declare_dependency( - link_with: libmanette_lib, -- sources: libmanette_gir, -+ sources: built_girs, - include_directories: confinc, - dependencies: libmanette_deps, - ) --- -2.20.1 - diff --git a/dev-libs/libmanette/libmanette-0.2.3.ebuild b/dev-libs/libmanette/libmanette-0.2.3.ebuild deleted file mode 100644 index e936a0a38c13..000000000000 --- a/dev-libs/libmanette/libmanette-0.2.3.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit gnome.org gnome2-utils meson vala xdg - -DESCRIPTION="Simple GObject game controller library" -HOMEPAGE="https://gitlab.gnome.org/aplazas/libmanette" - -LICENSE="LGPL-2.1+" -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 x86" -IUSE="+introspection +udev +vala" -REQUIRED_USE="vala? ( introspection )" - -RDEPEND=" - >=dev-libs/glib-2.50:2 - udev? ( dev-libs/libgudev[introspection?] ) - dev-libs/libevdev - introspection? ( >=dev-libs/gobject-introspection-1.56:= ) -" -DEPEND="${DEPEND} - vala? ( $(vala_depend) ) - virtual/pkgconfig -" - -PATCHES=( - # https://gitlab.gnome.org/aplazas/libmanette/merge_requests/18 - "${FILESDIR}"/${PV}-optional-introspection-vapi.patch -) - -src_prepare() { - xdg_src_prepare - use vala && vala_src_prepare -} - -src_configure() { - local emesonargs=( - $(meson_feature udev gudev) - $(meson_use introspection) - $(meson_use vala vapi) - ) - meson_src_configure -} diff --git a/dev-libs/libmateweather/Manifest b/dev-libs/libmateweather/Manifest index bcdf5ceb79f2..c4dda6b9c7b6 100644 --- a/dev-libs/libmateweather/Manifest +++ b/dev-libs/libmateweather/Manifest @@ -1,7 +1,9 @@ +AUX libmateweather-1.24.0-fix-tzdata-hints.patch 1101 BLAKE2B 484b389062d7f3d61085c3d937862dac48ca26c338fa21f72e0a189349834efe0bf5583fc6a54fc80d8514786d20a4130ca1b91331367d8762ffb3a241f31237 SHA512 97afd9cf53e35370b86b09d2414ca0b784d3b7e571d39873045f47b67f851a22be4181f8160007cc16f3037f8838868a4fd8f4dc4a06cb4ccdb403206f6e94d2 DIST libmateweather-1.22.0.tar.xz 3386920 BLAKE2B 312bd8cd12a1d51216b9509b2badaccb23779f1c7c314ecf02c9789837fa619d6029e97bf06f9fd320ba590936888d51fe178cffbb7dca87eb167ed4fbf3eabb SHA512 43371fc615dda2b9042633a63ac4c1fb0b1ea43b20c783e443b0f57e10ad8fddedbd593f03bd6c942729f0a9c80484266fe1ef900d128fa4b02f80d6a80ae9bd DIST libmateweather-1.22.1.tar.xz 3437496 BLAKE2B 74d9d0b18ad33fd15c7b3411fd5811a43d56e7a99e78c1d6ac846d71285701414f0b6c5f54c9d445af6a2e6c1405fc4d0547e023aa4114f7419f507d8739fc29 SHA512 c7f5214c14fa3bf6bbb55442ea450c0f3c0a2849e29f72821c22db88baf3763c72dd6d2a27795c23d8ecc69d190a55313f6cfd18dc2a41c233a7e1e5653a0868 DIST libmateweather-1.24.0.tar.xz 2233116 BLAKE2B 2b642af39e850d38d16f6a458568e43262007f2a1150db87371fca46f6db3f1b977a6cbad601ed182b8c0fdc9c5015e493ab60bc2c0e3485091e71992951cd72 SHA512 077a7cbcc75df0a64d9fab23d46154e58cf2455c8a2a17ecc04a8c691ead18b5027e177278a1d8e051ffb76e98bfd8e26ed5ca10ad974546e5446116a4f71300 EBUILD libmateweather-1.22.0-r1.ebuild 876 BLAKE2B a9e43a17d4617ed0f9875102286cbe629386d1257650676711dec025d983f549cb0b451d04899bf62a063a7607d51c79718f4b533efb4e1bd4bacb384701634c SHA512 92ee410a60d8576034b53d0f530944a2606c33bfb61c2cc94f4831058f66e220f4106b117727f2baa0648645435cae95aef4e25588b46e24cb15712fbe376dc4 EBUILD libmateweather-1.22.1.ebuild 878 BLAKE2B f77d35198b224eb4b8c26036f21f8b8bc9796b20f1d14c6b1fa5fc17f62b3cfdc443c0fe3e0ae13ce69ba6cadb2b2c422f33c70e6426bb1b2406443cf30033b8 SHA512 14f7b8ad59da3fa34b2715affcca77ea046bcd86570a44cbd4091f10e5c873a00c88aa0fbcf9a310859eea86c244601f0a66426cde371384e0e7ad2bfc42b297 -EBUILD libmateweather-1.24.0.ebuild 856 BLAKE2B 048c34d0ed19dfca93493c9427def25db6eeed0c65524558aefd39fb3fb2399cfe91af70bf34af4e6044310527a82e73e5380178c4e22f5c4e90bf41bcea71db SHA512 d2f76057ecef3461bfae4b54bf05fc9f4c1c3505f47621676f1a5a4744c942497c6b47c5d73dd888a9e6a4841ebcf6f18a3bba79d8a7ea6683e707589de99c75 +EBUILD libmateweather-1.24.0-r1.ebuild 1119 BLAKE2B 58647265c3768c597987806bc3576603398564afb9f6a48c2d9ee991f7a3eaea56182e6a51b4d1cb1c1df6f9383e902670dd1b8c7ff3d8195530943ea7170869 SHA512 7d92ba209a08f429334b3448130ffe7e1105b7b039f6ff8ec5cb9615dbdb8bc4f038e443b43431f82bf9fe87d89ba96e2cabbba1c4cc70888e73c8b6c2229827 +EBUILD libmateweather-1.24.0.ebuild 854 BLAKE2B f51dcaa5f5303761f47efd4025f04f5fdc03091811d70ba84fe9d73c49b3b1e35cbbd65925b4250364e901524f687db8e01df9700ef749cfad1624623ec986e2 SHA512 750a6ea93069def2dd8bd2e1cf6c198cf484cd6a2873c3caf67f6ebedef32c60c62b699114e066b653850f7f86a05a939e30d057d19e5d7c1be80bf287d9c9cb MISC metadata.xml 343 BLAKE2B 2c44370234b1e71de86ca5e1fc09ab633185cd1401071d3487b8d4c582115f92e30ace26aca5d3dfb89b8c4aefade6ae4bf6b93776fa123206e638b83e0df9d7 SHA512 1bc3a926850df9eabb80136639bc47809b0c49bcefc37c990cb7941a3629c7a0b2b4e6b538c5af7dcb2187239792b500185349a1ba6befe5b85f191b73467a2a diff --git a/dev-libs/libmateweather/files/libmateweather-1.24.0-fix-tzdata-hints.patch b/dev-libs/libmateweather/files/libmateweather-1.24.0-fix-tzdata-hints.patch new file mode 100644 index 000000000000..d1c3cab11651 --- /dev/null +++ b/dev-libs/libmateweather/files/libmateweather-1.24.0-fix-tzdata-hints.patch @@ -0,0 +1,31 @@ +From 354086a51ea676b6575dbb3ec62d749ec0a7c607 Mon Sep 17 00:00:00 2001 +From: rbuj <robert.buj@gmail.com> +Date: Fri, 22 May 2020 20:19:57 +0200 +Subject: [PATCH] Locations: America/Godthab was renamed to America/Nuuk + +--- + data/Locations.xml.in | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/data/Locations.xml.in b/data/Locations.xml.in +index 5488867..62529b9 100644 +--- a/data/Locations.xml.in ++++ b/data/Locations.xml.in +@@ -6482,7 +6482,7 @@ + --> + <name>Danmarkshavn</name> + </timezone> +- <timezone id="America/Godthab"> ++ <timezone id="America/Nuuk"> + <!-- The primary timezone for Greenland, although sources + seem to point towards calling the area "Western + Greenland" rathern than just "Greenland". +@@ -6502,7 +6502,7 @@ + <name>Thule AFB</name> + </timezone> + </timezones> +- <tz-hint>America/Godthab</tz-hint> ++ <tz-hint>America/Nuuk</tz-hint> + <city> + <!-- A city in Greenland. + The local name in Kalaallisut is "Uummannaq". diff --git a/dev-libs/libmateweather/libmateweather-1.24.0-r1.ebuild b/dev-libs/libmateweather/libmateweather-1.24.0-r1.ebuild new file mode 100644 index 000000000000..c487fea2d969 --- /dev/null +++ b/dev-libs/libmateweather/libmateweather-1.24.0-r1.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +MATE_LA_PUNT="yes" + +inherit eapi7-ver mate + +if [[ ${PV} != 9999 ]]; then + KEYWORDS="~amd64 ~arm ~arm64 ~x86" +fi + +DESCRIPTION="MATE library to access weather information from online services" +LICENSE="LGPL-2.1+ GPL-2+" +SLOT="0" + +IUSE="debug" + +COMMON_DEPEND=">=dev-libs/glib-2.50:2 + >=dev-libs/libxml2-2.6:2 + >=net-libs/libsoup-2.54:2.4 + >=sys-libs/timezone-data-2010k:0 + x11-libs/gdk-pixbuf:2 + >=x11-libs/gtk+-3.22:3" + +RDEPEND="${COMMON_DEPEND} + virtual/libintl +" + +DEPEND="${COMMON_DEPEND} + dev-util/gtk-doc + dev-util/gtk-doc-am + >=sys-devel/gettext-0.19.8:* + >=sys-devel/libtool-2.2.6:2 + virtual/pkgconfig:* +" + +PATCHES=() + +src_prepare() { + local tz_ver=$(best_version sys-libs/timezone-data) + tz_ver=${tz_ver#sys-libs/timezone-data-} + if $(ver_test "${tz_ver}" -ge "2020a" ); then + PATCHES+=( "${FILESDIR}/${P}-fix-tzdata-hints.patch" ) + fi + mate_src_prepare +} + +src_configure() { + mate_src_configure \ + --enable-locations-compression \ + --disable-all-translations-in-one-xml \ + --disable-icon-update +} diff --git a/dev-libs/libmateweather/libmateweather-1.24.0.ebuild b/dev-libs/libmateweather/libmateweather-1.24.0.ebuild index 13fda05338e9..bc645287670f 100644 --- a/dev-libs/libmateweather/libmateweather-1.24.0.ebuild +++ b/dev-libs/libmateweather/libmateweather-1.24.0.ebuild @@ -8,7 +8,7 @@ MATE_LA_PUNT="yes" inherit mate if [[ ${PV} != 9999 ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~x86" + KEYWORDS="amd64 ~arm ~arm64 x86" fi DESCRIPTION="MATE library to access weather information from online services" diff --git a/dev-libs/libmaxminddb/Manifest b/dev-libs/libmaxminddb/Manifest index 5a3e61a8f505..28cc7bdb1bd9 100644 --- a/dev-libs/libmaxminddb/Manifest +++ b/dev-libs/libmaxminddb/Manifest @@ -1,6 +1,8 @@ DIST libmaxminddb-1.3.2.tar.gz 619009 BLAKE2B 1fa2d528d47e14a75e5096072e6ba8136eb5060ab95cb472ef70907dd519540790f6bbc518371e0d276d6977bb3444dbfd179d526877ca740e56ebf6eb459244 SHA512 906e80531a901091fd9f88075ece5189b0885400216ea994889d9250dd37ead14e00dc14ca2a38eb2100e4814d0eb3a205ba1618606f1375ab0dcc3981097115 DIST libmaxminddb-1.4.2.tar.gz 600664 BLAKE2B df78522d2d764f813ca708fdaefeef47f3a97afbb010c108ca4e47ef2d711c445b5ad7d3d059b31ef0e72b08be569050b31f461fc6acf2c17ee4ce43225acbd6 SHA512 bc18d2f19a74639888a466483afde1bccfc3a83787011a6f38808b76e5a513c9912ff369ccbf584091d4def657e0574b16b35dc69ab12ae4c439aaaf3669c4c1 +DIST libmaxminddb-1.4.3.tar.gz 602272 BLAKE2B 2974d7268201a906c1c478ee36d4ef61e5f7483fd4f91bfcc5bf92f5bc698e8dd9eef256cceeb8c3217054481827d6fbf075f479e76c6506cc1f31d707a7d9dd SHA512 7fd97678ea6ca41cc4530864276b0233acbb16208571dc4694902943b3aa7e97c683c5676ea3f2de948c67aebd083f5d073b9ae36b7e89059c17f797ffddf65e EBUILD libmaxminddb-1.3.2.ebuild 585 BLAKE2B 0781072137ac3a9af9dec68ab64aa5ceb28ad3b1044f1a5bebe08055f2cf65ca3321d3f4409e397ebe3fd57b4d5f395ef23fc4d0cff1917bdc5f82a631307606 SHA512 129705297149f3955fdb8509c0587fa0aa81c43be7b3e4282949671fbaf58763f3abd702e1eac6b4a550d5352b98f8e7e7dcbe55d4263b7900fdda5b2aecfb7e EBUILD libmaxminddb-1.4.2.ebuild 591 BLAKE2B 8d648d824fc80c5169a8a4d3ed636d6fd5728bb8f6e8d28e170d707ffa1636906947c0c693d32c09e82ebb76c2b6517d7082348154cde2810b98acf6becf344f SHA512 cf5de4880c80be800f22a1010f87ee6c1f93a6175b3181217c0272f469726a74322afdab9aff3aac1ba0349d5ff97b3f7404d24da92619efb04655ef1f5d619b +EBUILD libmaxminddb-1.4.3.ebuild 593 BLAKE2B fb5c4074e1c077f62f5c8707cb8b2b82b6eb45663cfa6d75b4f35a473ccefaf861bec3103ca9d994ec3285cd759f7c4085763eeb8dfd9380cfd30d8460644c0e SHA512 2cf468e0007df84f612b4dfcd512ccd147cca0cea7a25c8bb5eef44ae5515d92054e31778958c40e36e6dae2ae0b23a06a2d1929c05084d755065a0b7a439fec EBUILD libmaxminddb-99999.ebuild 566 BLAKE2B 0b79eac4fdb7a49d85faa10074a3fa541521413f83891b3d40a32ad3b3c90f45b240f156f23b2d9bcb0eb709bdb6b2dcc17d975a9ffff94e590f0b3b266efd02 SHA512 4f45005dd929c7646724693227c05652de0b28fd491710ed2b95078738d5cef6f2813676b3886f3bc605d23ebf81db76e2668832d0fd7edf06b2427859f334ba MISC metadata.xml 365 BLAKE2B 3acd92dfb25bcbae837f784572887ffc5542121a91d6f2077f3410d03ddc3290d8b3485c4aa8d1c97af8f4f85a3dc8a621fc9eb5affacc1e27d41d4760ed53a4 SHA512 4e7a17cbf391683173f573d79f273e92184695e37bc68070c03ef4969e8b0e8a35a34b8b87d6582f365b93683b143f216a5a2365c9fe63a6f36ddd78e2ff8730 diff --git a/dev-libs/libmaxminddb/libmaxminddb-1.4.3.ebuild b/dev-libs/libmaxminddb/libmaxminddb-1.4.3.ebuild new file mode 100644 index 000000000000..386556e699be --- /dev/null +++ b/dev-libs/libmaxminddb/libmaxminddb-1.4.3.ebuild @@ -0,0 +1,25 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="C library for the MaxMind DB file format" +HOMEPAGE="https://github.com/maxmind/libmaxminddb" +SRC_URI="https://github.com/maxmind/libmaxminddb/releases/download/${PV}/${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0/0.0.7" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86" +IUSE="static-libs" + +DOCS=( Changes.md ) + +src_configure() { + econf $(use_enable static-libs static) +} + +src_install() { + default + + find "${ED}" -name '*.la' -delete || die +} diff --git a/dev-libs/libmirage/Manifest b/dev-libs/libmirage/Manifest index e523858f8145..16ce18b2228a 100644 --- a/dev-libs/libmirage/Manifest +++ b/dev-libs/libmirage/Manifest @@ -1,3 +1,4 @@ +AUX libmirage-3.2.4-gcc-10.patch 1207 BLAKE2B 60104bdd6feebe1d654fe69ce7218c0134c3f28dc3b2a39cd64987ea6459c12041f23f4eb253d98ea4a15454f9ad9ea263056b2fafba794c3bd7df0055dfbade SHA512 b4aab3ea20ed4d73669d6cb911191eda0f6f509a84af803154b397809a4ba5719cb2270c32b71686a236b8362fe5dfe88fa745a00313215c06bda35d38fc38e0 DIST libmirage-3.2.4.tar.bz2 234530 BLAKE2B 72329350a9e2a197ff52d396a011d3cf0178731909066ee1dab75f0d870fd751d50e2cacb69c849aa8045e94fa492732c21d201bdd4cbe3a9048f5c3f90ea881 SHA512 6fe718ad7beaf457ef0a7cc037b3bcf268574606ea9cbc1ba9abb5088c734fe9a100a35320d393a47625bbdde5515cded02e767618f2fc0801cf755af1414091 -EBUILD libmirage-3.2.4.ebuild 1167 BLAKE2B df4a784fe45c9eef6c9d9984153d2979e6a39d87529a32d261b8d6611621f63b8e0dd77000c65f047038770553c01c7e9b0991b28b58b633bfaa7b9156a3de67 SHA512 036f3aea8994ee46c5b708dd4b7fda46d9ff3c65c77fa64e9a205b524aa5f9687e753efea3f5b8497b41b1503666199f24cd6c7e2e71cd8c8428f9dc74ed06dd +EBUILD libmirage-3.2.4.ebuild 1213 BLAKE2B d43481df1f7e1150c4163b292eb9586d0df99c78aca6fa545df6ef02445413b8a728a31ba013a825fffb458434e64305dd4d4c0b43b7336e66087433cdecf584 SHA512 1f262c22797a3df1f813eb1716d568fe192b869dcb1e7ccf7c63539d0ee8686ee1e972da6f597296842fdc8278395fc8bc731b2a941b2c6ef305ef22b2dc297d MISC metadata.xml 332 BLAKE2B 0be8fdf09b872003fbd913a72966a059ad2d0870b281e6b86b19cf52f8c32b113d392dd71c85281f2f1abcb0933b592fb2112c18fe70359af7c7aacc9ff3a011 SHA512 d8bf249636b4dfda07c67e935bdd4b7392543fe31e2bf8c153954f4d680db45b0090f9bd89399f0241554a311b604185737c2bb7e64df43ea25adda9ee7468a0 diff --git a/dev-libs/libmirage/files/libmirage-3.2.4-gcc-10.patch b/dev-libs/libmirage/files/libmirage-3.2.4-gcc-10.patch new file mode 100644 index 000000000000..7834e39eed7c --- /dev/null +++ b/dev-libs/libmirage/files/libmirage-3.2.4-gcc-10.patch @@ -0,0 +1,34 @@ +From 7288d06f79d935798b917f707b86a33f5b69125a Mon Sep 17 00:00:00 2001 +From: Rok Mandeljc <rok.mandeljc@gmail.com> +Date: Sat, 2 May 2020 17:37:34 +0200 +Subject: [PATCH] libMirage: utils.h: added missing extern specifiers + +The lack thereof seems to be causing errors with gcc 10 on Fedora 32. +--- + libmirage/mirage/utils.h | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/libmirage/mirage/utils.h b/libmirage/mirage/utils.h +index 64611810..fc431d2f 100644 +--- a/mirage/utils.h ++++ b/mirage/utils.h +@@ -83,8 +83,8 @@ gchar mirage_helper_isrc2ascii (guint8 c); + gboolean mirage_helper_validate_isrc (const gchar *isrc); + + /* CRC utility functions */ +-guint16 *crc16_1021_lut; +-guint32 *crc32_d8018001_lut; ++extern guint16 *crc16_1021_lut; ++extern guint32 *crc32_d8018001_lut; + + guint16 *mirage_helper_init_crc16_lut (guint16 genpoly); + guint32 *mirage_helper_init_crc32_lut (guint32 genpoly, guint slices); +@@ -139,7 +139,7 @@ const gchar *mirage_helper_encoding_from_bom (const guint8 *buffer); + + + /* ECMA-130 Annex B sector data scrambler */ +-guint8 *ecma_130_scrambler_lut; ++extern guint8 *ecma_130_scrambler_lut; + + guint8 *mirage_helper_init_ecma_130b_scrambler_lut (void); + diff --git a/dev-libs/libmirage/libmirage-3.2.4.ebuild b/dev-libs/libmirage/libmirage-3.2.4.ebuild index ba836ebd3393..4aad2870f2df 100644 --- a/dev-libs/libmirage/libmirage-3.2.4.ebuild +++ b/dev-libs/libmirage/libmirage-3.2.4.ebuild @@ -30,6 +30,10 @@ BDEPEND=" doc? ( dev-util/gtk-doc ) introspection? ( >=dev-libs/gobject-introspection-1.30 )" +PATCHES=( + "${FILESDIR}"/${P}-gcc-10.patch +) + DOCS=( AUTHORS README ) src_configure() { diff --git a/dev-libs/libmspack/Manifest b/dev-libs/libmspack/Manifest index ceb4066e473d..83149792bd1b 100644 --- a/dev-libs/libmspack/Manifest +++ b/dev-libs/libmspack/Manifest @@ -1,5 +1,7 @@ AUX libmspack-0.9.1_alpha-fix-bigendian.patch 444 BLAKE2B bc62193205d7d96b8e2b535236463d0695dfb1a3cc4b2290d172873c11f9d3184550426e10bd1457282531f27a22585365e5b1537f1b9f85eeed4fd31afa5748 SHA512 c2e138e19c7e8b8f90e1dcc35d32f655ccd7a1930eab7a0b49686e9d2be26cefba48bc895ef1ebcb1959c0422e824779f7e31940bbde0c8bfd8a2828c2ad6c3c +DIST libmspack-0.10.1alpha.tar.gz 963274 BLAKE2B 39bcb3b7ea419d6d00850b70c217c802a2095dd4398038e594ae7c01ca12e71508218c1cfca5ae8b102636ab9517b13d55c1e411b31e87d28aa46331cd0127e6 SHA512 a7b5f7caa49190c5021f3e768b92f2e51cc0ce685c9ab6ed6fb36de885c73231b58d47a8a3b5c5aa5c9ac56c25c500eb683d84dbf11f09f97f6cb4fff5adc245 DIST libmspack-0.9.1alpha.tar.gz 494651 BLAKE2B 4543215efbcac9cd2703cd56f2297645463831cc2dfa6b38d87c5f48f39676347bb20739e0e389e021983d910b9be99bfd369fb30d36090f3f72f09532d6bd1d SHA512 4e39c2be8768c5c0b0d0798c9322ff022173f5e05af1636c18541bbc9f58c1ae1af59252d5631340fca601495c5b1e5abed0ad83481387421d2df5efb75cd49a +EBUILD libmspack-0.10.1_alpha.ebuild 1629 BLAKE2B 4096b24255453f75318667ae26f4898a832b9715712f55fd0cd73e76027ea5206f0ef541e80b6f110cb155c39b225e201a46938444bf1d34e21a6f024f6da14c SHA512 74e0ca7f051d7f622383e42e1331b66ca7b3379382f84534a875e0d741340ee047e9c8e23271a0d88b30717bdef71d10cc378a379eafc422467182252f3c0ae6 EBUILD libmspack-0.9.1_alpha-r1.ebuild 1680 BLAKE2B 38c7a31937f88a905232b0c4eb28a115ee9bf464ea4cb7dbd5302d1720d3fd44674953e75eca05d94ff15727647d63d11cd7649889cbd0ef27f1a24e7e60e449 SHA512 6ea352513bddea74aa92dbe9f95972413d82e9add64755743be29a9b6695b41ed2cad0c523c164c1949b52924a46763424207aab1d45c6bdddb97fa67c426e52 EBUILD libmspack-9999.ebuild 1604 BLAKE2B 4ccbda9a8108a4b6381a908229c87e5111faf33e67d507f7cf079012842cd135aca9c3fe968e363d213cb6819ff6af01927b745994a6b75248ad6963196fb48b SHA512 2025a1a6422a0703bd3d95611e3917e25ac8797fd88255e839684c5ba5efb4418b493219c278fed94c94b686d4b3995a99b140de4d262d5dfc0ff4dd0c9655e2 MISC metadata.xml 251 BLAKE2B f8ea69eed31c6ee4eca7ce37a9ee2b99d4139e42e53a0c93441863f1c2eb1148149038cbef9ec91a4c92971077fd6ba8e6ea995a138f8863c06d8ee57bc4f74c SHA512 14f3538a99bd8d32654ef4630d0cc667d55b36b44701791eb42d98f8e958641188915d86c306d68c7c20a4587e53477a3f9e32aeba2e0ba51c63c903391c4277 diff --git a/dev-libs/libmspack/libmspack-0.10.1_alpha.ebuild b/dev-libs/libmspack/libmspack-0.10.1_alpha.ebuild new file mode 100644 index 000000000000..d59f609305d9 --- /dev/null +++ b/dev-libs/libmspack/libmspack-0.10.1_alpha.ebuild @@ -0,0 +1,73 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools multilib-minimal + +if [[ ${PV} == "9999" ]] ; then + EGIT_REPO_URI="https://github.com/kyz/libmspack.git" + inherit git-r3 + MY_P="${PN}-9999" +else + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 s390 sparc x86 ~x64-solaris" + MY_PV="${PV/_alpha/alpha}" + MY_P="${PN}-${MY_PV}" + SRC_URI="https://www.cabextract.org.uk/libmspack/libmspack-${MY_PV}.tar.gz" +fi + +DESCRIPTION="A library for Microsoft compression formats" +HOMEPAGE="https://www.cabextract.org.uk/libmspack/" + +LICENSE="LGPL-2.1" +SLOT="0" +IUSE="debug doc static-libs" + +DEPEND="" +RDEPEND="" + +S="${WORKDIR}/${MY_P}" + +src_prepare() { + if [[ ${PV} == "9999" ]] ; then + # Re-create file layout from release tarball + pushd "${WORKDIR}" &>/dev/null || die + cp -aL "${S}"/${PN} "${WORKDIR}"/${PN}-source || die + rm -r "${S}" || die + mv "${WORKDIR}"/${PN}-source "${S}" || die + popd &>/dev/null || die + fi + + default + + eautoreconf + + multilib_copy_sources +} + +multilib_src_configure() { + ECONF_SOURCE="${S}" econf \ + $(use_enable debug) \ + $(use_enable static-libs static) +} + +multilib_src_test() { + if multilib_is_native_abi; then + default + cd "${S}"/test && "${BUILD_DIR}"/test/cabd_test || die + fi +} + +multilib_src_install_all() { + DOCS=(AUTHORS ChangeLog NEWS README TODO) + use doc && HTML_DOCS=(doc/*) + default_src_install + if use doc; then + rm "${ED}"/usr/share/doc/"${PF}"/html/{Makefile*,Doxyfile*} || die + fi + + find "${ED}" -name '*.la' -delete || die + if ! use static-libs ; then + find "${ED}" -name "*.a" -delete || die + fi +} diff --git a/dev-libs/libnatspec/Manifest b/dev-libs/libnatspec/Manifest index e52a4769d72a..039378d0128b 100644 --- a/dev-libs/libnatspec/Manifest +++ b/dev-libs/libnatspec/Manifest @@ -1,6 +1,4 @@ AUX libnatspec-0.2.6-iconv.patch 323 BLAKE2B 26cfb0f9faad0e375a2f2ed7766c3adc66d98d8bf5253e20b18148b29627b26addde0a0c1dbdc33e72182c346e477030318968553f4de1136c29a40d37759ded SHA512 8773c212b8ac7dd8b35f4fc4b0a266599374d0ec7da85c10b9ebd313c68bac5643a8301c1039152f2dfaa8ab03f2e17a5ee05a92d8e91bf314f99e30177943fd -DIST libnatspec-0.2.6.tar.bz2 500525 BLAKE2B 30cf13f89a60c86c9ff56c2c2890d1fe169b2d503a87effec805fec49674b439f7311b358f2dad06b335e27b45e775f204092d3ae0b9933f516af3292ff351b2 SHA512 6bed3c8b2937ee27666a7deedcdebd7b24a8f495be63008fd70c467de4ab532e6448e6b682ed3be04a3a60ed64acaa0074d87231a421f6c73d6a7ee1d17bc66b DIST libnatspec-0.3.0.tar.bz2 127265 BLAKE2B 3f0ffdaa57f232c5245de72bc67b3b6bdfa88aaf965156c50483278f51d54c1da1600c19bd49aac5a1a9317a9b53d5202e6610b1ef6c2335b824e183de1fba75 SHA512 5c04358d20be5b6ffc7038bddd4514c4b5b4e9940fb6247070b832da9d059b31fd1306cf29f54e4a1b8be1d909176bd72e6ffa98e4b750840764f9b2c250d31c -EBUILD libnatspec-0.2.6-r1.ebuild 1048 BLAKE2B 7374d90655b70a6568a89e63c641ca454f10f8663ea1a7070bcfb61e7ada6e3eb3d1bcbc21c38a1fdf9e017d21f3aa81fd4f1fcaf4eb8e19601b12db723009de SHA512 88c8505ef9ee11f5df3ffb59fc9b19ca4d86e6e6c18de1339c5f2dc82382a7b7bca866948bba624430c8db7dac6330a03d491e23408857ec57576f202957fcce -EBUILD libnatspec-0.3.0.ebuild 1063 BLAKE2B 3ba0e5b3f679b02ecf61cbed46ba0a3653cba9a321d66acaefa6ea5ea88a0ea9df9b90d6ee2890c5c9b69ec15b0209aaecb72d5fbcd5ee7e483e224822de9fd2 SHA512 26bd63ed4e76c24d5a302cad94ce157e1b0cf96f5156aada6df38f076d8300510bad701b35dda950fb02530bedf5b0145174af4f7404145b03b85e90d3344880 +EBUILD libnatspec-0.3.0.ebuild 810 BLAKE2B 9ace7528a660f8928bfdcb659d6b5009f32997122965fa787ae6c524226af5bbb771c19b76287e451856bdcc55507969b2d15e35d3e010978d47853f16b105c3 SHA512 3f3ed3adb6353cdf3434298d82c24a6c6f0a44b84b09afa90f94b2ffeddf927ccb57faa7b378ebdf1c95e1ba1309bc8371e7787dcfab582325a8d06e8fb6b694 MISC metadata.xml 311 BLAKE2B 6af7771eaba07f3b1a635f316f198655ee598392f99fadc0f56bcb110c3b630bc9d86ff450622d9e27fdc17aeb62140efc6fec1d228a0de157b7058f1101d9a0 SHA512 f854676930193772765a53284b645b40e9a3a5fe7b6a6646173034593039ef6be112a1163760f59080ae89870d0af48c0308c31cd6eebd4d6fd5b45122d55272 diff --git a/dev-libs/libnatspec/libnatspec-0.2.6-r1.ebuild b/dev-libs/libnatspec/libnatspec-0.2.6-r1.ebuild deleted file mode 100644 index 3f61a7d4e60b..000000000000 --- a/dev-libs/libnatspec/libnatspec-0.2.6-r1.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python2_7 ) - -inherit autotools eutils python-single-r1 - -DESCRIPTION="library to smooth charset/localization issues" -HOMEPAGE="http://natspec.sourceforge.net/" -SRC_URI="mirror://sourceforge/natspec/${P}.tar.bz2" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86" -IUSE="doc python" - -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -RDEPEND=" - dev-libs/popt - python? ( ${PYTHON_DEPS} ) -" -DEPEND="${RDEPEND} - doc? ( app-doc/doxygen ) - python? ( dev-lang/tcl:0= )" - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_prepare() { - epatch "${FILESDIR}"/${P}-iconv.patch - # regenerate to fix imcompatible readlink usage - rm -f "${S}"/ltmain.sh "${S}"/libtool || die - eautoreconf -} - -src_configure() { - use doc || export ac_cv_prog_DOX=no - # braindead configure script does not disable python on --without-python - econf $(use python && use_with python) -} diff --git a/dev-libs/libnatspec/libnatspec-0.3.0.ebuild b/dev-libs/libnatspec/libnatspec-0.3.0.ebuild index 750d3276c9d9..90bb1fab67c6 100644 --- a/dev-libs/libnatspec/libnatspec-0.3.0.ebuild +++ b/dev-libs/libnatspec/libnatspec-0.3.0.ebuild @@ -3,9 +3,7 @@ EAPI=6 -PYTHON_COMPAT=( python2_7 ) - -inherit autotools python-single-r1 +inherit autotools DESCRIPTION="library to smooth charset/localization issues" HOMEPAGE="http://natspec.sourceforge.net/" @@ -14,26 +12,18 @@ SRC_URI="mirror://sourceforge/natspec/${P}.tar.bz2" LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86" -IUSE="doc python" - -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" +IUSE="doc" RDEPEND=" dev-libs/popt - python? ( ${PYTHON_DEPS} ) " DEPEND="${RDEPEND} - doc? ( app-doc/doxygen ) - python? ( dev-lang/tcl:0= )" + doc? ( app-doc/doxygen )" PATCHES=( "${FILESDIR}"/${PN}-0.2.6-iconv.patch ) -pkg_setup() { - use python && python-single-r1_pkg_setup -} - src_prepare() { default # regenerate to fix imcompatible readlink usage @@ -44,5 +34,5 @@ src_prepare() { src_configure() { use doc || export ac_cv_prog_DOX=no # braindead configure script does not disable python on --without-python - econf $(use python && use_with python) + econf } diff --git a/dev-libs/libnfc/Manifest b/dev-libs/libnfc/Manifest index 446ab5d69aa7..5c2a4fc8a775 100644 --- a/dev-libs/libnfc/Manifest +++ b/dev-libs/libnfc/Manifest @@ -1,7 +1,5 @@ -DIST libnfc-1.7.1.tar.bz2 484309 BLAKE2B 7a86394e8902421410d54de2b2710cee7ea34a6f950f6d76ec59d24d6e46798cd10a9725f405c729df44da84b810b5853a5eef0ec5f2a10ccbcf7585d33f34ef SHA512 6a03d197c450c0ab8f2d16ae8c1f80e206fa909ece84a32dbb962acd0f7ef693a419608cdaa4c2207a1d2593599e44479520d7413eace7fca19d3230442e506c DIST libnfc-1.7.2.tar.bz2 534821 BLAKE2B 015634a696aeda77abdb53ab658504d0183b8d8d5899f368b122660d6527cf4d3ec988147082620d87d007ea33320acfde6cc013c9257b9c62fa4fb99528eeeb SHA512 c93ab10667998b6c6bf948082253715762ae91699d3e035f1149cebf6d3881cbc2ab570976c70cd12f886f76a18a82ac048fad0664512d1cd553c0fd1fdf7674 DIST libnfc-1.8.0.tar.bz2 553511 BLAKE2B 060ef4f24b3387393faf43f37a3a245177cb9697d42df1a8e8e5155af8b6e7b818b4bd710ff73929bde39274eda0235d111627cfd3931bd3fe9addde10af0fad SHA512 aa8762ecb5b94167d20346f2c81491bb5b634bcedbf2aae3e2efdb301bca89ceb7c2e15148d0934fdc1cce6d77ee0225e28e84893232999fdc09d8a90ae2a7c5 -EBUILD libnfc-1.7.1.ebuild 1028 BLAKE2B bee89d075ef440e75098aaa3b17562b24d3c2c9a1e57b8eb4241491123b6afc98ac7459024d692b17f93b386bf1dcd24a4ce62fcca712d9a26c05dfe34023b05 SHA512 d022f3e1de007df189e8c72fe57e07531f8462c45a535dad9ce87324edce108a140facc80985a898499052e166a8fb87537292af3e3e86d8787d0507939865c0 -EBUILD libnfc-1.7.2.ebuild 1025 BLAKE2B ae078e376e5f9184c5b7331f5da8ff38cf6720933f35c01ea06ac85eff3add00228ee58abb7e19a4911d2fa5863fa0db08694f2060656461859a45df126a5710 SHA512 a2437f94ba444cafaef9d97ed30a6916009d25ee24233c2e375113268e08c1f7f764c88b450e50420a941d8a8468a6217680fda0252488ddf6dd2913e9dd2d8c -EBUILD libnfc-1.8.0.ebuild 1025 BLAKE2B ae078e376e5f9184c5b7331f5da8ff38cf6720933f35c01ea06ac85eff3add00228ee58abb7e19a4911d2fa5863fa0db08694f2060656461859a45df126a5710 SHA512 a2437f94ba444cafaef9d97ed30a6916009d25ee24233c2e375113268e08c1f7f764c88b450e50420a941d8a8468a6217680fda0252488ddf6dd2913e9dd2d8c +EBUILD libnfc-1.7.2.ebuild 1046 BLAKE2B 4c94880d6a30d0c995bb6a1609b71eae9975a3d19341622ba37e4f4e96377f8fe0fbe9dc3b6dc072ebef27ecfd05976784faaa1672a270614dd86e6b05598c37 SHA512 75b7dc3bb476ce50c6731c6ccf71ca4e788cb01778a042168be4b5e802956d8ef858b4d8270cda2af0c5089e43a41638e8b5822f96200dc2629dca7cab2fef30 +EBUILD libnfc-1.8.0.ebuild 1046 BLAKE2B 4c94880d6a30d0c995bb6a1609b71eae9975a3d19341622ba37e4f4e96377f8fe0fbe9dc3b6dc072ebef27ecfd05976784faaa1672a270614dd86e6b05598c37 SHA512 75b7dc3bb476ce50c6731c6ccf71ca4e788cb01778a042168be4b5e802956d8ef858b4d8270cda2af0c5089e43a41638e8b5822f96200dc2629dca7cab2fef30 MISC metadata.xml 463 BLAKE2B ef027bb940311ecc6a1c0095114924a3daefc3b85b1bcdddd83d0c1b87e6a2b210c3b5411fcc7a9fdd9940cd709758e743c6e3a462c100fcc31904cc88af9e8c SHA512 20f4b81da686998f0e779615d995433aab1cdc89f30bb79bf5426b2dad480da5ec90d65d371f6fad11ad94773bd758c9650a157067dc73547c180c8ce4c54dc6 diff --git a/dev-libs/libnfc/libnfc-1.7.1.ebuild b/dev-libs/libnfc/libnfc-1.7.1.ebuild deleted file mode 100644 index 9c11a2bbcaa5..000000000000 --- a/dev-libs/libnfc/libnfc-1.7.1.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit toolchain-funcs - -DESCRIPTION="Near Field Communications (NFC) library" -HOMEPAGE="http://www.libnfc.org/" -SRC_URI="https://github.com/nfc-tools/${PN}/releases/download/${P}/${P}.tar.bz2" - -LICENSE="LGPL-3" -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="doc pcsc-lite readline static-libs usb" - -RDEPEND="pcsc-lite? ( sys-apps/pcsc-lite ) - readline? ( sys-libs/readline:0 ) - usb? ( virtual/libusb:0 )" -DEPEND="${RDEPEND} - doc? ( app-doc/doxygen )" - -src_configure() { - local drivers="arygon,pn532_uart,pn532_spi,pn532_i2c,acr122s" - use pcsc-lite && drivers+=",acr122_pcsc" - use usb && drivers+=",pn53x_usb,acr122_usb" - econf \ - --with-drivers="${drivers}" \ - $(use_enable doc) \ - $(use_with readline) \ - $(use_enable static-libs static) -} - -src_compile() { - default - use doc && doxygen -} - -src_install() { - default - use static-libs || find "${ED}" -name 'lib*.la' -delete - use doc && dohtml "${S}"/doc/html/* -} diff --git a/dev-libs/libnfc/libnfc-1.7.2.ebuild b/dev-libs/libnfc/libnfc-1.7.2.ebuild index cb49692161fb..102f2a1983e3 100644 --- a/dev-libs/libnfc/libnfc-1.7.2.ebuild +++ b/dev-libs/libnfc/libnfc-1.7.2.ebuild @@ -39,5 +39,6 @@ src_compile() { src_install() { default use static-libs || find "${ED}" -name 'lib*.la' -delete - use doc && dohtml "${S}"/doc/html/* + use doc && HTML_DOCS=( "${S}"/doc/html/* ) + einstalldocs } diff --git a/dev-libs/libnfc/libnfc-1.8.0.ebuild b/dev-libs/libnfc/libnfc-1.8.0.ebuild index cb49692161fb..102f2a1983e3 100644 --- a/dev-libs/libnfc/libnfc-1.8.0.ebuild +++ b/dev-libs/libnfc/libnfc-1.8.0.ebuild @@ -39,5 +39,6 @@ src_compile() { src_install() { default use static-libs || find "${ED}" -name 'lib*.la' -delete - use doc && dohtml "${S}"/doc/html/* + use doc && HTML_DOCS=( "${S}"/doc/html/* ) + einstalldocs } diff --git a/dev-libs/libnsfb/Manifest b/dev-libs/libnsfb/Manifest index 3f4e91798caf..59a5cf93cbcf 100644 --- a/dev-libs/libnsfb/Manifest +++ b/dev-libs/libnsfb/Manifest @@ -2,7 +2,7 @@ AUX libnsfb-0.1.0-autodetect.patch 734 BLAKE2B bba90c622e559b8238672068792a558ac 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 +EBUILD libnsfb-0.2.0-r2.ebuild 1128 BLAKE2B e8364b9aa888d20185079dbef844be6b8196dee07a928ba80e0388e58589ffb5a6030b2085aae69e34795620c6c18513284f8ec1e64b845c3f18382bfdee4d2a SHA512 33c9af0ff5143f498c625ba6180465fd426d10747068abfec5c1e1f9ad42b766069a2e2d2f3cd2d513697a545d5dd251c9ed5897ec807cf9b8cf6553f63181ee +EBUILD libnsfb-0.2.1-r1.ebuild 1120 BLAKE2B f2f49986e3e9c72e4866b1cd890fa675c001e7b7ec7d3a4d6c97ba6bc921d209c0d211ec0fbaf4dd546c6c2f069c1ab4c3f6659eec3ebd0dcc5a437a89494b74 SHA512 679892dff6d23b1ea978fd7f189465ccf6eb0441801be5720027e6aa5bdca471029635f96541699910250e073b857d18b48ec806db4a064e3c7debc58f78cabd +EBUILD libnsfb-0.2.2-r1.ebuild 1110 BLAKE2B 26f4d07d3c83dd2d0bd4779a7d841279302ea22c739cdd84bcd4e0114421c0479891edf644d62a5126e774464681dfdc597ec5c8acca925c45b4fec32ec6c30c SHA512 326073cf13c49446c82cb8674542484ebf8025a97e042b0ac297efd62001aa874cb0b56aadb351ca6c28c1367ce5436ef9cc70b36d73bf3d61b8d948fa78a223 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33 diff --git a/dev-libs/libnsfb/libnsfb-0.2.0-r1.ebuild b/dev-libs/libnsfb/libnsfb-0.2.0-r2.ebuild index f29059c8e616..ce5964414d8a 100644 --- a/dev-libs/libnsfb/libnsfb-0.2.0-r1.ebuild +++ b/dev-libs/libnsfb/libnsfb-0.2.0-r2.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit toolchain-funcs +inherit netsurf DESCRIPTION="framebuffer abstraction library, written in C" HOMEPAGE="http://www.netsurf-browser.org/projects/libnsfb/" @@ -32,7 +32,6 @@ 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) \ @@ -47,5 +46,5 @@ src_compile() { } src_install() { - _emake DESTDIR="${ED}" install + _emake DESTDIR="${D}" install } diff --git a/dev-libs/libnsfb/libnsfb-0.2.1.ebuild b/dev-libs/libnsfb/libnsfb-0.2.1-r1.ebuild index 02ef1e96ed26..354ba28b0bb9 100644 --- a/dev-libs/libnsfb/libnsfb-0.2.1.ebuild +++ b/dev-libs/libnsfb/libnsfb-0.2.1-r1.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit toolchain-funcs +inherit netsurf DESCRIPTION="framebuffer abstraction library, written in C" HOMEPAGE="http://www.netsurf-browser.org/projects/libnsfb/" @@ -33,7 +33,6 @@ 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) \ @@ -48,5 +47,5 @@ src_compile() { } src_install() { - _emake DESTDIR="${ED}" install + _emake DESTDIR="${D}" install } diff --git a/dev-libs/libnsfb/libnsfb-0.2.2.ebuild b/dev-libs/libnsfb/libnsfb-0.2.2-r1.ebuild index 00a4530174dd..0e4bb3ed2549 100644 --- a/dev-libs/libnsfb/libnsfb-0.2.2.ebuild +++ b/dev-libs/libnsfb/libnsfb-0.2.2-r1.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit toolchain-funcs +inherit netsurf DESCRIPTION="C library for framebuffer abstraction" HOMEPAGE="http://www.netsurf-browser.org/projects/libnsfb/" @@ -32,7 +32,6 @@ 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) \ diff --git a/dev-libs/libnsutils/Manifest b/dev-libs/libnsutils/Manifest index 292947fda712..9a28fb085344 100644 --- a/dev-libs/libnsutils/Manifest +++ b/dev-libs/libnsutils/Manifest @@ -1,5 +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 +EBUILD libnsutils-0.0.5-r2.ebuild 591 BLAKE2B 7f1cb95cb1613aac7df971e706d5aa2d5014a85f720caf64737d700ffaf4d6daca3a797a5ed825ca245e22169b285ba268fef74d4c94396a8b0ea6c7fe177907 SHA512 116b19957b6fe55b75ce3aac7ea9def79b4f9dbf56a133942a1ea0a75ee924844e6c4ca10e5d33ac28545c3153e74015b840863554862839af165b226ec2136f +EBUILD libnsutils-0.1.0-r1.ebuild 584 BLAKE2B 5ced7bb5432b56ca1ebee8a32aa8b6e72b9e798d531f2b1e8b4fd32e12f53cf711d3d00209598867516c26af621544d39858adfcbc029f3b3afa4a5a7ef30d10 SHA512 290d2f21f0514430d41b3f833975d8b09b78c804ce2c0883c7b35848190fefcd3a0a7f9d0cd77fb11b835e64e6b9e08920b0eb20bb49ad46bc50559481ea75bd MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33 diff --git a/dev-libs/libnsutils/libnsutils-0.0.5-r1.ebuild b/dev-libs/libnsutils/libnsutils-0.0.5-r2.ebuild index 26f14cd3fa16..13f403c3edb4 100644 --- a/dev-libs/libnsutils/libnsutils-0.0.5-r1.ebuild +++ b/dev-libs/libnsutils/libnsutils-0.0.5-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 toolchain-funcs +inherit netsurf DESCRIPTION="base64 and time library, written in C" HOMEPAGE="http://www.netsurf-browser.org/" @@ -17,7 +17,6 @@ IUSE="" DEPEND="dev-util/netsurf-buildsystem" _emake() { - source /usr/share/netsurf-buildsystem/gentoo-helpers.sh netsurf_define_makeconf emake "${NETSURF_MAKECONF[@]}" COMPONENT_TYPE=lib-shared $@ } @@ -27,5 +26,5 @@ src_compile() { } src_install() { - _emake DESTDIR="${ED}" install + _emake DESTDIR="${D}" install } diff --git a/dev-libs/libnsutils/libnsutils-0.1.0.ebuild b/dev-libs/libnsutils/libnsutils-0.1.0-r1.ebuild index 6aecbfecab59..84b713406a96 100644 --- a/dev-libs/libnsutils/libnsutils-0.1.0.ebuild +++ b/dev-libs/libnsutils/libnsutils-0.1.0-r1.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit toolchain-funcs +inherit netsurf DESCRIPTION="C library for base64 and time" HOMEPAGE="http://www.netsurf-browser.org/" @@ -17,7 +17,6 @@ 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 $@ } diff --git a/dev-libs/libparserutils/Manifest b/dev-libs/libparserutils/Manifest index ff14f600f6de..a69781443359 100644 --- a/dev-libs/libparserutils/Manifest +++ b/dev-libs/libparserutils/Manifest @@ -1,4 +1,4 @@ DIST libparserutils-0.2.4-src.tar.gz 74521 BLAKE2B 85e39d64bb8365f95da227e3a52ea2a2a85b0f913f861117b496bdff1556b8ca880189325995cf02eeb51f2db76c917a63f59ee1a1fed8fec6ce43dc16f9b66f SHA512 e6a7b618e00e2bc69a0de63c29cc809f250fbd1c10544523c563f4bb9ac3281e02ba36c096518fc0a9074dad49a05346b04cc85b7d972f88f2645af0f869cbc2 EBUILD libparserutils-0.2.4-r1.ebuild 938 BLAKE2B 7dc85b3341b087fc97ee1eb6b34d1b067f7fbcaecfc080fef9741f64593dcfae4fd6186ab6805e6080ce9513b2691eb36f37a2851a0231b60290e3fc8a6821e4 SHA512 fa6ba1dd5c1114c073d8aec20ca766c85dc75c97e3e46c4846e23b763b93366f0f743cc0b8eceb7fb60b67fd18f937663c6670adb1d7e0964f41cd72a1eb71bb -EBUILD libparserutils-0.2.4-r2.ebuild 928 BLAKE2B 1e6e4b6ece27cb25070da2778a6a183edf887187c4cd5883821adfc6cc7435087b69c9d84aa49fad2d7bb43686195a2e9a5aeaa939699b8abae35df1ee2cff81 SHA512 59d9bbb4411556fd49a12de75026d2737e8315c856e87eb32f7082dedee0757da854d404e5dc215327f6510709506ea2652f28062cd5f1e8851348e9dea5d248 +EBUILD libparserutils-0.2.4-r3.ebuild 863 BLAKE2B b4a23d57d3849a22d2bc818917273bbedbfb1ece5b66944d51b52626e2510256c435eb8a4f9ef6eda082b91dfc99a3236168cb8e5a1ac719977b758a7fc1843f SHA512 85a8db18d2ab98b3f083c69de61145611424f27724da5215901f1ca192af94605853fcead36da06a721738fad7e322d9e6df6cbca9a89a956e20d5a61ae1c617 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-r3.ebuild index da1c2cd28a77..ea49dbb1c05c 100644 --- a/dev-libs/libparserutils/libparserutils-0.2.4-r2.ebuild +++ b/dev-libs/libparserutils/libparserutils-0.2.4-r3.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit flag-o-matic toolchain-funcs +inherit flag-o-matic netsurf DESCRIPTION="C library for building efficient parsers" HOMEPAGE="http://www.netsurf-browser.org/projects/libparserutils/" @@ -26,7 +26,6 @@ src_configure() { } _emake() { - source /usr/share/netsurf-buildsystem/gentoo-helpers.sh netsurf_define_makeconf emake "${NETSURF_MAKECONF[@]}" COMPONENT_TYPE=lib-shared $@ } diff --git a/dev-libs/libpcre/Manifest b/dev-libs/libpcre/Manifest index 45ad48e3beaf..da1d5b1f7bd2 100644 --- a/dev-libs/libpcre/Manifest +++ b/dev-libs/libpcre/Manifest @@ -4,5 +4,5 @@ DIST pcre-8.43.tar.bz2 1576584 BLAKE2B 12c2117fc5d242ada44884df279f7f8b4c680fa16 DIST pcre-8.44.tar.bz2 1577611 BLAKE2B ef8d5737ca1f4c72f12c8726956ce5d3bad13aa8303b7c3b5d25499e3027ddc2edcdb937d9ad2bdd437a8885f1af8757ba194aa0b2f236b6e6a3a18d2ec8f138 SHA512 f26d850aab5228799e58ac8c2306fb313889332c39e29b118ef1de57677c5c90f970d68d3f475cabc64f8b982a77f04eca990ff1057f3ccf5e19bd137997c4ac EBUILD libpcre-8.42.ebuild 2569 BLAKE2B f0dfd202675e5f247d830162967a57692b10a85370e77303bab3f7e0f4a18912a4ae35a0fc017447d2b264d093ebd72477a62b50a9084a251f595c1ee2be5e37 SHA512 a843f1750600b74cc6760dbe9de5acd43161cba91aa17b11ebb99df9f6a6e5f6d025e4987b4f982b1b6200bc226e5746f87332196bedde01e58d8fb7144d95a1 EBUILD libpcre-8.43.ebuild 2587 BLAKE2B 8b46e88fb2df8c2baca19db226d61d7dfb50ff13a5184e8f077e7c92de1840f6f559907fb1de0e08d52e4e00c9fc10ae405577fd5ce9314465cf174d3106c5ce SHA512 c8862ad1f85b3d0a4e5a36050987554efcc0c5011c22e0fe19ed9de98bcaf928968a82bd55bbea2d5a177ed133074e377f8e6099e888a4a39167003b2ff1c69e -EBUILD libpcre-8.44.ebuild 2613 BLAKE2B 836f84d1151765f8617b8fd06c366cec6e128d870f4008af3e77c0c6df5305129cb859961ea0071d8ca14ef42e880f71992650cf1ce36701769b3429d2a27659 SHA512 aa7b36ed3f79843c649e5478477b887243130a4e7d0aec8f970b91a5090a46761e31b353d0fa855b382fb104dc8e1c06905d521f2554d63f0b6aa2cb551d9103 +EBUILD libpcre-8.44.ebuild 2609 BLAKE2B cab6c1e535c80c2b3a0488b8e1d391f9a50509d4fc807fd63226d4f62106da80733c5b864e4a1bc1afe53a09e350d51e991c5085328c179b13a3250e9d47b405 SHA512 a3417378bd13d8eff34dc7c0456d42e43a0273a9ee8d25235ce5a397232a708842f8b8f0dffed632c79616f0cc713504b936a40965914f14bae4e5f358d31466 MISC metadata.xml 1112 BLAKE2B 640e6cc2fe53eaa86b6e6cdd72d45398c880a27d027441447b6162c70fa30fafe818cae8c08614333b866cfb1176feae365996386a72200232a738d99b592b83 SHA512 eb7e2db9932c108442e69bd3ddf04d8d753dede44f7453b1fa33730ec9cda89e618f4444a0adf3f9e7d09baf8c97ff19831906ad7148a26674269f1efd427e6b diff --git a/dev-libs/libpcre/libpcre-8.44.ebuild b/dev-libs/libpcre/libpcre-8.44.ebuild index 05f4f351f39e..eaf2be21f9ab 100644 --- a/dev-libs/libpcre/libpcre-8.44.ebuild +++ b/dev-libs/libpcre/libpcre-8.44.ebuild @@ -18,7 +18,7 @@ fi LICENSE="BSD" SLOT="3" -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 ~x86-winnt" +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 ~x86-winnt" IUSE="bzip2 +cxx +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib" REQUIRED_USE="readline? ( !libedit ) libedit? ( !readline )" diff --git a/dev-libs/libpcre2/Manifest b/dev-libs/libpcre2/Manifest index 6647d6e3e1d3..a41cbcf34ef4 100644 --- a/dev-libs/libpcre2/Manifest +++ b/dev-libs/libpcre2/Manifest @@ -2,5 +2,5 @@ DIST libpcre2-10.34-patchset-01.tar.xz 1208 BLAKE2B 615b7eff085bd52bb3aed30c90ec DIST pcre2-10.34.tar.bz2 1714731 BLAKE2B f731339b3acdb084ddb1462cf4638edefbfc4a95e63e44c8c75ded55fd9b98334336dbda5f31bd8e9410e63ccd83dc7e707cc20f03df4d801f182ff4939b6cc6 SHA512 77ad75f8b0b8bbfc2f57932596151bca25b06bd621e0f047e476f38cd127f43e2052460b95c281a7e874aad2b7fd86c8f3413f4a323abb74b9440a42d0ee9524 DIST pcre2-10.35.tar.bz2 1725214 BLAKE2B f97412258f0d2c09dc18c5973156e616730ae301713a0172fb2f467e5d2857bf64c6d02ac247e797ce4c96e2fb9b122888f71aede3f5eb3540731f6c3c254ed4 SHA512 ecfb8d48e219daff02874783b7b436fe7d70d8471e44eb66e1e29abb7b0aa67547e6b5fba7058b074ac90eef265ece7d12728f80afdda45b6b8124435f4561fd EBUILD libpcre2-10.34.ebuild 2533 BLAKE2B d37125e2860a9477770133820eee44d04d686771c72ace1a0089dec3d06b06ebcc6d2ad71a43f67a4b64c71d6836c7a5134a6ef2a33ab121d8bd4f938f10d9e1 SHA512 f6c09ed783695ad41e6564d1606a3444b6c2fbfd9ba643ab5287a93779fef6b0ce4407ce872ff54bca866897f58114048e938b4ffdd7b31af0fac49ed252105b -EBUILD libpcre2-10.35.ebuild 2549 BLAKE2B 69af16a0f2fe4eeabf3ec257065dd3779399fc1eedefb7da8f7e6073a0d59fb7b2878983630aa0b706de88b058064eccbbec4901154e36ef7225bf0b7f071a91 SHA512 73c60c002f9514380964c0a98f5604376e4ccb7abc64fdfbade3fa3bdaee37b9b12a99cd704810b414a2a5bc1150cbfaa9dc5835f2a5e168219b4748b53e8767 +EBUILD libpcre2-10.35.ebuild 2543 BLAKE2B 4dd02f8169a282ff209bb06d5273e30927d0bed7a54f2ffc78fb5c1d6569bf6c713fc0015021c20d166921ed4f70f15ab0a45e73839a1c7a762444071ea1cb14 SHA512 31e94993d36f320a8e50321131b097b06e43e88df7bbe26807056c0f4d0bc3592ebd1a5f183cf01e48dd6b58c5bf46c75e7e8bfc81b0f077299f59ade4407810 MISC metadata.xml 1140 BLAKE2B 19f0ea04c9613f0c804c76ca74012fa2313ba69b57fe95f31720809a12d5244f78e4ce9c957723b848f0d8c3514ef27fd875f7814d2434c7e50dbcc7325c0a95 SHA512 9b54ed8cdf78e1d3fe737460117cb840280b63c196cca0bfc7b89975ea8102f9729cf5f29628f5cb7b7c1eefd8fd5c67f3c7f5fab64f9d168d6fcdedbd926b51 diff --git a/dev-libs/libpcre2/libpcre2-10.35.ebuild b/dev-libs/libpcre2/libpcre2-10.35.ebuild index 89944f501ccb..af20214e780c 100644 --- a/dev-libs/libpcre2/libpcre2-10.35.ebuild +++ b/dev-libs/libpcre2/libpcre2-10.35.ebuild @@ -25,7 +25,7 @@ fi LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +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="bzip2 +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib" REQUIRED_USE="?? ( libedit readline )" diff --git a/dev-libs/libpipeline/Manifest b/dev-libs/libpipeline/Manifest index 307dd2207a75..e6396e09135a 100644 --- a/dev-libs/libpipeline/Manifest +++ b/dev-libs/libpipeline/Manifest @@ -1,3 +1,5 @@ DIST libpipeline-1.5.2.tar.gz 994071 BLAKE2B 997c13bdf632f2be161576e1b21d1be26ea29dc770ab74e4b105f21c926b8ae5e07a605b72ec56f55a55db3a3c1d487cfe64d571363e040612ea52b445f0bc3e SHA512 721024cea4e8dd85ba31af23e6f65b6ab2323e4006a769674d18101744a5a990aa9ee9fcd9b35360fa1442a6d4a72bfed0227665d4eacba541808b1c48bc9a53 +DIST libpipeline-1.5.3.tar.gz 994663 BLAKE2B 57365ac07d1b61462eaea3be0ae1136f8511ea54484b1fcbe734796da760ced062a43cfb13b69eb24b521448253e603c248c59306f3fb3d871641a17530dcf82 SHA512 db0796bffbcdd8e875902385c7cdc140e3e0e045b3d0eba1017e55b4c66027c20cc2cd0fccaf52f59fa941d0925134011317b9c27986765a1ec2a73132ebaec6 EBUILD libpipeline-1.5.2.ebuild 670 BLAKE2B b1059dfc0555227bfc9a26fd4c45c2a3fabd89dd75db054946f6b5f6a4532b334e7bded0192d56d0a054061913d9a9197510846accf9a14ca1ababb6825d97c9 SHA512 2a946a55cfc00674e4f350a3260738ab32296fb2cbac6f45cb46f508de58727e0f5b8ac5074b8fd11d84b8563381b170c05370b96f6dedb8e7c27bb9874c6f2b +EBUILD libpipeline-1.5.3.ebuild 679 BLAKE2B 9128932a7d785ebfb2110eb5dc46fd8bcbe0774f4f0cdca9456b06180dacafcf82f836063d640d3161eefe5469d1a32e8e25a8051a3e84c81b76e5457983f041 SHA512 77ac386a5134a145a587d45af254900f9cefce7aba61e659bc86d42209919f755231bf382fe178652cf96b91b028169a1f8d341f64e07a52a14be04500535ced MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 diff --git a/dev-libs/libpipeline/libpipeline-1.5.3.ebuild b/dev-libs/libpipeline/libpipeline-1.5.3.ebuild new file mode 100644 index 000000000000..f3cacf173e23 --- /dev/null +++ b/dev-libs/libpipeline/libpipeline-1.5.3.ebuild @@ -0,0 +1,26 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="a pipeline manipulation library" +HOMEPAGE="http://libpipeline.nongnu.org/" +SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +IUSE="static-libs test" +RESTRICT="!test? ( test )" + +BDEPEND="virtual/pkgconfig" +DEPEND="test? ( dev-libs/check )" + +src_configure() { + econf $(use_enable static-libs static) +} + +src_install() { + default + find "${ED}" -type f -name "*.la" -delete || die +} diff --git a/dev-libs/libpqxx/Manifest b/dev-libs/libpqxx/Manifest index d061cac5edc3..4f0b47d2b7d3 100644 --- a/dev-libs/libpqxx/Manifest +++ b/dev-libs/libpqxx/Manifest @@ -1,3 +1,5 @@ DIST libpqxx-6.4.5.tar.gz 715081 BLAKE2B 4f1356dc5fc9baddd8fdea6095541f4d90657ef0211edec7796ddd3693933b8d37d5bb14e19249a2e4627b85aef11c582b0ffac0226c8e99a70af1d2b0396e5c SHA512 b6f79c4af93876eaf859626c2deae3b23bd4fa1a438390bc01513ccc48b90565d59588f6977e7475bb7b8dbeb8b1c8ef2a4737d8eb4d15682531fbf78590ed5e +DIST libpqxx-7.1.2.tar.gz 693152 BLAKE2B da28d0041fc345eb7774eadf0a886e2a89692ac47d870120991aa97328a6be7d10e8cb2d6deb9e056dc7e05b04fd317d9d0fe4dcf8eab901114b27cd64bf4ff6 SHA512 a4a76c62f6115f5898e4c4bb1c6f095284bdb7ae6a1efa45add9efd422d2a8280d1698caa2469acbb087168208ae0fd8efa36c8735a8ce30e58853e27acd4161 EBUILD libpqxx-6.4.5.ebuild 2160 BLAKE2B 33eead22f70496238c3a6f8b090545558ce421d3d1fb4bf64ffbf7baa316f1788c41d54e59144531d7fd018c45c0ece349086601319105c0d8e422a003a2eba1 SHA512 e9c95b7fa3251f5806c402ae61893bb35f8269f14b1f02f3a89d3da408fddd0825d8ed1166ae1780c3fa5031a2e99743cf554ee81869abf2214c977314e1a08f -MISC metadata.xml 597 BLAKE2B 2371e4c701506d5e8b4eb0938325a6cd909ad874badbc000a7ea831d2e7ff55cf1b6f4fbb3ae09f9392850319f9cbbbde083492a20cf1209e94139f7b1ceb927 SHA512 c732dc922e3ac9e63a373dbe8b53ef8fb93d87c7cd91a1db1b94e89fe33f3109b818cf0730df36b00f2abf1dc554e1bf261f39db807cf61775b8177db231d37f +EBUILD libpqxx-7.1.2.ebuild 2029 BLAKE2B ae7b19a14ee982b723075335d4508a67bc2897c4d85445b28669874b555775a866d7666cebf04f01be97978846c387b0450b6e83fddb9635e7a30bd29e130b64 SHA512 aa731379a97c82083a93d22e3b9887544ebd902c0ee9d18df214150040694e72d749ae927a8ce7df821735a078163e29d041a90928281eb5ea88d3de35690351 +MISC metadata.xml 611 BLAKE2B 1960af3cc6dc4e15de110c38b2ca41ca94355054539cf28169de54c952726e96327ce21c82dcc0e439d997fd52a8deb825a9f6bc921e727636a9edb9a3ce176b SHA512 2cc8f173d0f1e390e212741307420722c6a8fa8b5afe60ff6a706d4cec17086c88e84ce5f3ed265a0d8d8699de8fffa83c10fb7e1e700370f1eef1d6c3ba4bd3 diff --git a/dev-libs/libpqxx/libpqxx-7.1.2.ebuild b/dev-libs/libpqxx/libpqxx-7.1.2.ebuild new file mode 100644 index 000000000000..1ce7f1510f3c --- /dev/null +++ b/dev-libs/libpqxx/libpqxx-7.1.2.ebuild @@ -0,0 +1,78 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6..9} ) +inherit python-any-r1 + +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" + +DESCRIPTION="Standard front-end for writing C++ programs that use PostgreSQL" +SRC_URI="https://github.com/jtv/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" +HOMEPAGE="http://pqxx.org/development/libpqxx/" +LICENSE="BSD" +SLOT="0" +IUSE="doc static-libs" + +RDEPEND="dev-db/postgresql:=" +DEPEND="${RDEPEND} + ${PYTHON_DEPS} + doc? ( + app-doc/doxygen + app-text/xmlto + ) +" + +DOCS=( AUTHORS NEWS README{.md,-UPGRADE} ) + +src_configure() { + econf \ + --enable-shared \ + $(use_enable doc documentation) \ + $(use_enable static-libs static) +} + +src_test() { + einfo "The tests need a running PostgreSQL server and an existing database." + einfo "Test requires PGDATABASE and PGUSER to be set at a minimum. Optionally," + einfo "set PGPORT and PGHOST. Define them at the command line or in:" + einfo " ${EROOT}/etc/libpqxx_test_env" + + if [[ -z $PGDATABASE || -z $PGUSER ]] ; then + if [[ -f ${EROOT}/etc/libpqxx_test_env ]] ; then + source "${EROOT}/etc/libpqxx_test_env" + [[ -n $PGDATABASE ]] && export PGDATABASE + [[ -n $PGHOST ]] && export PGHOST + [[ -n $PGPORT ]] && export PGPORT + [[ -n $PGUSER ]] && export PGUSER + fi + fi + + if [[ -n $PGDATABASE && -n $PGUSER ]] ; then + local server_version + server_version=$(psql -Aqtc 'SELECT version();' 2> /dev/null) + if [[ $? = 0 ]] ; then + cd "${S}/test" || die + emake check + else + eerror "Is the server running?" + eerror "Verify role and database exist, and are permitted in pg_hba.conf for:" + eerror " Role: ${PGUSER}" + eerror " Database: ${PGDATABASE}" + die "Couldn't connect to server." + fi + else + eerror "PGDATABASE and PGUSER must be set to perform tests." + eerror "Skipping tests." + fi +} + +src_install () { + use doc && HTML_DOCS=( doc/html/. ) + default + + if ! use static-libs; then + find "${D}" -name '*.la' -delete || die + fi +} diff --git a/dev-libs/libpqxx/metadata.xml b/dev-libs/libpqxx/metadata.xml index 7a7404b989eb..488d8965cfec 100644 --- a/dev-libs/libpqxx/metadata.xml +++ b/dev-libs/libpqxx/metadata.xml @@ -1,15 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>pgsql-bugs@gentoo.org</email> - <name>PostgreSQL and Related Package Development</name> - </maintainer> - <longdescription> - libpqxx is the official C++ client API for PostgreSQL. If you are - writing software in C++ that needs to access databases managed by - Postgres — on just about any platform — then libpqxx is the - library you use. Supersedes the now defunct libpq++ (AKA, libpqpp) - API. - </longdescription> + <maintainer type="project"> + <email>pgsql-bugs@gentoo.org</email> + <name>PostgreSQL and Related Package Development</name> + </maintainer> + <longdescription> + libpqxx is the official C++ client API for PostgreSQL. If you are writing + software in C++ that needs to access databases managed by Postgres — on just + about any platform — then libpqxx is the library you use. Supersedes the now + defunct libpq++ (AKA, libpqpp) API. + </longdescription> </pkgmetadata> diff --git a/dev-libs/libprelude/Manifest b/dev-libs/libprelude/Manifest index d6f634112238..9fae1463c092 100644 --- a/dev-libs/libprelude/Manifest +++ b/dev-libs/libprelude/Manifest @@ -5,7 +5,7 @@ AUX libprelude-5.1.0-fix_py38.patch 322 BLAKE2B 0dd047f4a6c634b4f4f7c01aad619634 DIST libprelude-4.0.0.tar.gz 2864402 BLAKE2B 2e51eb1af74b63140bc66a358b112a753c1a0fd86d6bb8bb43ccddca4cd396e34566168edca55a626a0b43ba56e676301f3792247c25f64c7a31430af3708311 SHA512 5d88e8f211b09cc3e43dbe299e935d8f11575ae3f1894059793966cd14a8e47177ef8963d45305e1a24f9efc4048520329b31681301a21815909bd38606c2ce7 DIST libprelude-4.1.0.tar.gz 2852916 BLAKE2B a18babb24795d17d72eb1c0755f4b0330125c8b289af0b52753f6f69b5e820f0f972019b57eaded3abfc45c69bd75c0d120fe29982887e55d75f2c4c8b6486f7 SHA512 073307ca070794b47643e2ef2db4788fa92374735558b466441f0663f420cab45aecc7a1d99bb487ad23ebe602d5668369ffa6ab29fa3b0504356420ab3a7878 DIST libprelude-5.1.1.tar.gz 2898350 BLAKE2B accc8610e8551f1c62156ea87748fa1dba2bd7d8bc0813782b2a91fde1cda5d64b404003846cd17af030486654cf48889dec5cf27c64874ac07c9cd905eb13ec SHA512 eddd6e1cf4fc4b2fa79a5132316576cc7205915fa19bf3a2a68cbc4eaf5abf50e5c594384aa1742d620304916da634e113a7c33e4ebca2bcee96e35c9796ed5f -EBUILD libprelude-4.0.0.ebuild 1835 BLAKE2B 83d3cd68ca3195bf92b0c6b5a589bfd43ceb7c762321f80ca82db00dc24cc698e269e78f49b30bdacc0c0c685ab39dcf13ab7e0a26500f09a433cbef2c072d36 SHA512 3d4d09fa86ac5eaf42344bd51a40aaaf78314d9d618a7265a6dff66a77b327abc3cd394bf2a3b91589157c044fa9836a72c27ebbc05f90345613ef1ea74334cd -EBUILD libprelude-4.1.0.ebuild 1836 BLAKE2B 1e7cc7940ac30766b722cc656330a62d275c40992a736aa9ec273a420fd4a807ce6e6fff5671ef99f90034484bec8893ba2c06b7c0a9a93bb6964e4d06508b19 SHA512 169f3d549f8c20eab7c30917d027732dea1783cded9fe04166efdb35fd7b317b7275830cf4f3ea842754b0fb9da2848c2a5cf8c76ec62881706c57826f5d3eac -EBUILD libprelude-5.1.1.ebuild 2119 BLAKE2B 5959c8c75ae9d629e90cc239bd71ea78795328f356f120212ecacfc1aab70b64f62966c9cc8127e7a0f65199f6f0ca5666e6573d4d051d03ec94cdbf7a0a8bca SHA512 fd0277c0d0750e27adb2c314b44ce709b90837b23a1e625ad064e10ca7dfb7472f67b0586117d25f7982b7f56feffa7910f8d9377b2cdad62bdbe5508f77bbda +EBUILD libprelude-4.0.0.ebuild 1722 BLAKE2B 2b36c1e22214a06f031d3a98a97d189cb73a366cb8e96e897a1cc89a32908f4dd6fba4229112128571062ce09f4d730c0449a86067ecc2a5312edc388cb81ef1 SHA512 2f5d8c16260d0315e1f351943621b9021836596202f54397e6864e532ddc037a4374351399636c1450711d700e0d8e99524a43e4ba1d28873f981ad8ad8b33f4 +EBUILD libprelude-4.1.0.ebuild 1723 BLAKE2B a77bd79df9b56432009a6d94903891bc2bc1f207a2d3d5c088d58ac61ff1ecde897a184301aef80d9da7b10c202246ac18dea144a1d29ffeb10d2beafeff74a4 SHA512 44ceb27532b2bd81fc2d50c8258969a559be61249fb05080c350413c628e40e7d17e8e02d32c9c159f44ac0eb81c4b59d3236d39b8eaa999345cf632886f6f02 +EBUILD libprelude-5.1.1.ebuild 2006 BLAKE2B 82bffd675533d7ae41c4f660d0bfe4053b5dd820ae83337b582a17a030b807a1578be95bff26502c3e07bf0aa8048b352d79dd1a331921d45d3baee35057f594 SHA512 21deba252e8d04e8dfcf9815d54a77dadd731dc94e5bd246ea4483eb686feb93db02cd48aacf425e3cd589a3a4157e623982a83e445d4f0d9ecf360dd4aa462e MISC metadata.xml 871 BLAKE2B bf71e839f29918c8b71d3bd9e45c6afa99391f476ff8c94eb43d9378e754ddafb9cf4aeef69dce4fc2210819b08f62898d7ec4717a9d7f13d04ee3df24e0a734 SHA512 bf4e35e6d51f1797b24c262a6cfd38ef1ce06e80b504afabb2f3f0aa7f069335e96562f3716b819abaa1bcb1f8f88bcb1a72a11047cd87fd4d62d7903b200cec diff --git a/dev-libs/libprelude/libprelude-4.0.0.ebuild b/dev-libs/libprelude/libprelude-4.0.0.ebuild index fd2139e4e0fe..f8d9794f1d45 100644 --- a/dev-libs/libprelude/libprelude-4.0.0.ebuild +++ b/dev-libs/libprelude/libprelude-4.0.0.ebuild @@ -54,6 +54,7 @@ src_configure() { local myconf=( --enable-easy-bindings --with-swig + --without-python2 $(use_with lua) $(use_with perl) $(usex perl '--with-perl-installdirs=vendor' '') @@ -62,13 +63,9 @@ src_configure() { if use python; then python_setup - if python_is_python3; then - myconf+=(--without-python2 --with-python3="${EPYTHON}") - else - myconf+=(--without-python3 --with-python2="${EPYTHON}") - fi + myconf+=( --with-python3="${EPYTHON}" ) else - myconf+=(--without-python2 --without-python3) + myconf+=( --without-python3 ) fi econf "${myconf[@]}" diff --git a/dev-libs/libprelude/libprelude-4.1.0.ebuild b/dev-libs/libprelude/libprelude-4.1.0.ebuild index 4bc3cf9bdb99..4c32375c5be5 100644 --- a/dev-libs/libprelude/libprelude-4.1.0.ebuild +++ b/dev-libs/libprelude/libprelude-4.1.0.ebuild @@ -54,6 +54,7 @@ src_configure() { local myconf=( --enable-easy-bindings --with-swig + --without-python2 $(use_with lua) $(use_with perl) $(usex perl '--with-perl-installdirs=vendor' '') @@ -62,13 +63,9 @@ src_configure() { if use python; then python_setup - if python_is_python3; then - myconf+=(--without-python2 --with-python3="${EPYTHON}") - else - myconf+=(--without-python3 --with-python2="${EPYTHON}") - fi + myconf+=( --with-python3="${EPYTHON}" ) else - myconf+=(--without-python2 --without-python3) + myconf+=( --without-python3 ) fi econf "${myconf[@]}" diff --git a/dev-libs/libprelude/libprelude-5.1.1.ebuild b/dev-libs/libprelude/libprelude-5.1.1.ebuild index 72e4580f9527..dbcd337b3b76 100644 --- a/dev-libs/libprelude/libprelude-5.1.1.ebuild +++ b/dev-libs/libprelude/libprelude-5.1.1.ebuild @@ -63,6 +63,7 @@ src_configure() { local myconf=( --enable-easy-bindings --with-swig + --without-python2 $(use_with lua) $(use_with perl) $(usex perl '--with-perl-installdirs=vendor' '') @@ -71,13 +72,9 @@ src_configure() { if use python; then python_setup - if python_is_python3; then - myconf+=(--without-python2 --with-python3="${EPYTHON}") - else - myconf+=(--without-python3 --with-python2="${EPYTHON}") - fi + myconf+=( --with-python3="${EPYTHON}" ) else - myconf+=(--without-python2 --without-python3) + myconf+=( --without-python3 ) fi econf "${myconf[@]}" diff --git a/dev-libs/libpreludedb/Manifest b/dev-libs/libpreludedb/Manifest index eb669b146d84..c5a64fe51ed7 100644 --- a/dev-libs/libpreludedb/Manifest +++ b/dev-libs/libpreludedb/Manifest @@ -5,7 +5,7 @@ AUX libpreludedb-5.1.0-update_m4_postgresql.patch 20562 BLAKE2B 5db9a213c47296b3 DIST libpreludedb-4.0.0.tar.gz 1325812 BLAKE2B 7a506f7cd7b51898e26201f2cc640b1f34227f9cf7c5c6e2385480f1fc0ad854b6d747293ab502b641cc65f1ee9ae4a8f225e6a1d4489bcaa59901c6342f1279 SHA512 13f5dbcfa6af965f2075d60c645ebb19cbd6b18807b26f4f13a7a05f1cf552996f9846e856728a4e1dc621efda693016e82623d4a3cbf74849b3e7114f19faca DIST libpreludedb-4.1.0.tar.gz 1333638 BLAKE2B 380a6d4ef8836555510f9f9882b6100417f2567520c421355fb7eec8d2cd7e2f3942c4cb90ea21fa1557327026edd5c1e35e338a79e06a21cfb2bd6813a289c2 SHA512 de1fa5106d7f34edb5a23e726c968de84bb8b10257587b6ee36276ed75ddc54f4f9539aecb7836e114eb3bfa90104dd3b5e097be0c3d12347dcbded94f293dc4 DIST libpreludedb-5.1.0.tar.gz 1374511 BLAKE2B 569324a5ae484b1d13ac729f25a2f7f8924a8dced923859cdc393289acf0c0cf098ae6e0f9f572a707c85aa9af4a27bbaa0927e20d610b423e2aae86718d232b SHA512 9e45e0f7a945eef254f8e59c0c7212c6afca897584ea8f2c88e16478fde448abdeeb991828cc2482373d2c735e1229f1a11fe9780e40da1a8aed867fe158f481 -EBUILD libpreludedb-4.0.0-r1.ebuild 1730 BLAKE2B 97cb526e26579a0d37991d8a7a70ab6fd8968701f4fe799764d1f6dfd35dde1cd1c47de7f8a5e00643445d92feab0f761087011f209afb64e20df12cbe5ed607 SHA512 e0f720d5f5a459fb581784bbce914a53b6e370bb8de591baf8ccde0dcba547b97b8c8cddd551ea70f0980bbc260c4736ec913fc33edc409427ffa5b4661bb8fb -EBUILD libpreludedb-4.1.0-r1.ebuild 1738 BLAKE2B 84a8ddedda3831c5ca3085ccf41dce4acd6528281ceb22b0ae83238bc6e047172937adf2093adfa3891ec05a7000d5ef9f61a4df0ecfff1bce252e5f75a00efb SHA512 56243e81b02a32c3a671b6974308d39f6850073c707539575de392cfe675d3b90ead6c4b4b9d93454e6daf5d4949642056114559724799e98c675f50137292f6 -EBUILD libpreludedb-5.1.0.ebuild 1900 BLAKE2B 170d1cb68ab1306895badc7938d714c58fbcd8cbe0777d2de66f6a9e537e3d4c3a7d719f481e6bd489a105896658f7578467ae3741f647cb88555ba9c0d93e7c SHA512 ff9bf092b649467f5aa033a35cd72df8d5e9f9a7b190fea1426e9aa79d5f3c72e7b6e2efa3ad991868a3f8ecc04c1470bdc5dd3194f0cfe3a99efb03fe4741da +EBUILD libpreludedb-4.0.0-r1.ebuild 1617 BLAKE2B c628a418f913705392514b549157ffb7b26e3386d7344ff60b1f6118f3d12126b771de65fbac3a77fda0eaef465a63bc2efd83975ff68e5fff6c34353e4b8904 SHA512 fa971d8b86862e3f584cff7aac1a421896fc49723b2289b0610bdffadc04a372a7d61a9dd2c2424c386a821eaa884d6941c13028f0a5d5c172aa62146419745d +EBUILD libpreludedb-4.1.0-r1.ebuild 1625 BLAKE2B c56a5c27a6eed2be65c14d9c634679efe5b9d171cb1e89b814ff1edb7e1ae88113a1ec81424c7cc747b6367d9e4cd3821f017a42c25dad26503574f1b00283f6 SHA512 b5631bc895aec95f79e54c1cee2c90f0be8cf346e0c54b2ee2b41f0f18373c1779a8b29890d110da6274b36ac8d721dd619e84500df0815da5d3a81715dc90c3 +EBUILD libpreludedb-5.1.0.ebuild 1787 BLAKE2B 2826d2ecb615e9b67578fa9db9af92f25dafc3fe1751d5f0dbf8836c47ff808ec2c04c99fcdc11a5bb0038fc70ed116e813fb4f2c36e3682f8a2f2e0faa78573 SHA512 59757bb18600aa48cca3743632c86a542eb2200076b0a5487313d6b4ba9437907e876deac64537551652ffbaab37cad37bedb60e8c281567650bfec84e413449 MISC metadata.xml 740 BLAKE2B 4378279b071469fe4b56d29d93bbfa596c007ed9be028c028c0b3cea7b4a4d206b8dfada84f8dbefdc56ec1d355c0a81f8a5f719a3819761ef532a85fbdc2490 SHA512 336a155dddb152697e44246184aaf0cfa928f1a3acd226c3f048aaeca81e96e1c5c7bceaee2bcc5e6ff731b59de1eadb02698e01c3e9443e6d9a37859da8e973 diff --git a/dev-libs/libpreludedb/libpreludedb-4.0.0-r1.ebuild b/dev-libs/libpreludedb/libpreludedb-4.0.0-r1.ebuild index 97583d45ddbd..bf8921fc1f25 100644 --- a/dev-libs/libpreludedb/libpreludedb-4.0.0-r1.ebuild +++ b/dev-libs/libpreludedb/libpreludedb-4.0.0-r1.ebuild @@ -52,6 +52,7 @@ src_configure() { local myconf=( --enable-easy-bindings --with-swig + --without-python2 $(use_with mysql) $(use_with postgres postgresql) $(use_with sqlite sqlite3) @@ -59,13 +60,9 @@ src_configure() { if use python; then python_setup - if python_is_python3; then - myconf+=(--without-python2 --with-python3="${EPYTHON}") - else - myconf+=(--without-python3 --with-python2="${EPYTHON}") - fi + myconf+=( --with-python3="${EPYTHON}" ) else - myconf+=(--without-python2 --without-python3) + myconf+=( --without-python3 ) fi econf "${myconf[@]}" diff --git a/dev-libs/libpreludedb/libpreludedb-4.1.0-r1.ebuild b/dev-libs/libpreludedb/libpreludedb-4.1.0-r1.ebuild index c406020aba17..2cc2fe00385c 100644 --- a/dev-libs/libpreludedb/libpreludedb-4.1.0-r1.ebuild +++ b/dev-libs/libpreludedb/libpreludedb-4.1.0-r1.ebuild @@ -52,6 +52,7 @@ src_configure() { local myconf=( --enable-easy-bindings --with-swig + --without-python2 $(use_with mysql) $(use_with postgres postgresql) $(use_with sqlite sqlite3) @@ -59,13 +60,9 @@ src_configure() { if use python; then python_setup - if python_is_python3; then - myconf+=(--without-python2 --with-python3="${EPYTHON}") - else - myconf+=(--without-python3 --with-python2="${EPYTHON}") - fi + myconf+=( --with-python3="${EPYTHON}" ) else - myconf+=(--without-python2 --without-python3) + myconf+=( --without-python3 ) fi econf "${myconf[@]}" diff --git a/dev-libs/libpreludedb/libpreludedb-5.1.0.ebuild b/dev-libs/libpreludedb/libpreludedb-5.1.0.ebuild index dd429b891a4f..9e2c81a16649 100644 --- a/dev-libs/libpreludedb/libpreludedb-5.1.0.ebuild +++ b/dev-libs/libpreludedb/libpreludedb-5.1.0.ebuild @@ -58,6 +58,7 @@ src_configure() { local myconf=( --enable-easy-bindings --with-swig + --without-python2 $(use_with mysql) $(use_with postgres postgresql) $(use_with sqlite sqlite3) @@ -65,13 +66,9 @@ src_configure() { if use python; then python_setup - if python_is_python3; then - myconf+=(--without-python2 --with-python3="${EPYTHON}") - else - myconf+=(--without-python3 --with-python2="${EPYTHON}") - fi + myconf+=( --with-python3="${EPYTHON}" ) else - myconf+=(--without-python2 --without-python3) + myconf+=( --without-python3 ) fi econf "${myconf[@]}" diff --git a/dev-libs/libqtxdg/Manifest b/dev-libs/libqtxdg/Manifest index afa91b5fb2d6..f27e5bb5cd2a 100644 --- a/dev-libs/libqtxdg/Manifest +++ b/dev-libs/libqtxdg/Manifest @@ -1,7 +1,3 @@ -DIST libqtxdg-3.3.1.tar.xz 66004 BLAKE2B a676f22144ddbf67e02686fc25b381a911e5d0391e2f735c6d85914362433aad20ad0a3740ea7101d26b5b5692d0504c3798489333b1bf9585c3be88f6636beb SHA512 f0fdb95f20ee49becf770455a513178bb3ce63ee460e8bbaac8d40f50ae47a139ff518021c8fc19254bbd777b67bc7f2754302de7e2bb6cdf929bc559a1b51f3 -DIST libqtxdg-3.4.0.tar.xz 73060 BLAKE2B db23fe8bfb6e8b73a76b710f121464e3a8f5b60f1019705bb6a234eb4c0a9a5ad9469ab95eeac8f392ca10a86343f9d0b3040eae4131d1d421800b8054247d6d SHA512 9bd52ae3aa32f8c7de48e562ada1ff2413892c7ac58d5f7a06c0c512a4a6c03e9c5c44930f7781930c9c701894ea38a450a61a3c26afc047c76313ada0a890e6 DIST libqtxdg-3.5.0.tar.xz 73248 BLAKE2B 0e587e640abda9cdf55cbeac270382386be2bc26b291bb9f655d845acb381b7f65048d213039a6e7ae9cc5d03fa29911bc2277140524d73f0e005745759a39b6 SHA512 014407a3dc869dd324c3840d54c0aa4565a2f69f147b172548458dee69d33474d9c2ebf50112d1ef7e36ed0aea0fb055f8e03901314230a6c55a84808bd52653 -EBUILD libqtxdg-3.3.1.ebuild 967 BLAKE2B 6e1d908b08da2edb6bd01966e3055b36a796ffe18b538935c6b4c291afdbcee417c823b273d980f5c02265544f524015f72cbba082713c803352d175752f7ba8 SHA512 e8a17c51d87c715cdafd1b381b8dfdf8638028ac679fb6d198d89caeeb5b498d33ea392d91e01036903778903b42f3bd4991e77c9e9331a1da30f8c740ecdecb -EBUILD libqtxdg-3.4.0.ebuild 968 BLAKE2B fd988d0b1b55d110ce23135255ecf40d06895186508852a8fd9665d8e06a344a1608900d113b6a1f0bd5da299b3675fdc88104141ecf7edac62cffcbcd5557cb SHA512 ded8649801c95ed493a7b1ef5f839a9107837e0b1415bc7ef402b849f63b9e7a1bad8d0fe576df39ade21a8ac6ef5cbfe6929dc8997b96a73b8466f48004de33 -EBUILD libqtxdg-3.5.0.ebuild 973 BLAKE2B e9885b7f5f0ce2d36b6cbd6c7bcd7246807d8f1bad8949d1f510189b25f77beb8cfe1fd5f9e9aea7ec235f1d61e0f95cdf33bf86e0a4598f07faeddeb9395025 SHA512 ab8acd4eb8d46f30853df4187c8f160608df4e8af31d7f4edeed0f14824c2f19e64edc077c81c5ce9467a9ca66432c6bc85ca246c55df0c4cfe34215de2ea734 +EBUILD libqtxdg-3.5.0.ebuild 971 BLAKE2B ba8dcbe7eb4f8441654230ebe921ceb6e22a23fa70e825746eb32a4dd4b9326d4f4e37bfa65f1648377118d5aeac767fa73fb1d814d326a9955110e77b41ca86 SHA512 f28619a05a2a9dd692e5bb9cac66ffd7bc91807c54f7fab2e70ae49f9f64adf7e11b6823ba3b5b89f593d91905fcc48381b298e55ee7390964ab48468ce9b8b2 MISC metadata.xml 422 BLAKE2B 4ca2bdd5f3838e970ebc585ece3d8e922613fdd97713a24f441683ebe54feda53707db50ed90edc1d5475fe468510e4427b95567aaecd0c2a3371d9c6884c640 SHA512 49878c043d764fba09b368154c08959be049afdd30301da7c864c549ef1df53a81d9f0999c2c00663130a5348c26bc072d377ef3cf704774aa30d3bbbcc0918b diff --git a/dev-libs/libqtxdg/libqtxdg-3.3.1.ebuild b/dev-libs/libqtxdg/libqtxdg-3.3.1.ebuild deleted file mode 100644 index a1620ba0ecf4..000000000000 --- a/dev-libs/libqtxdg/libqtxdg-3.3.1.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake virtualx - -DESCRIPTION="A Qt implementation of XDG standards" -HOMEPAGE="https://lxqt.github.io/" - -if [[ ${PV} == *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/lxqt/${PN}.git" -else - SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz" - KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86" -fi - -LICENSE="LGPL-2.1+ Nokia-Qt-LGPL-Exception-1.1" -SLOT="0" -IUSE="test" -RESTRICT="!test? ( test )" - -BDEPEND=" - >=dev-util/lxqt-build-tools-0.6.0 - virtual/pkgconfig -" -RDEPEND=" - dev-qt/qtcore:5 - dev-qt/qtdbus:5 - dev-qt/qtgui:5= - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - x11-misc/xdg-utils -" -DEPEND="${RDEPEND} - test? ( dev-qt/qttest:5 ) -" - -src_configure() { - local mycmakeargs=( - -DBUILD_TESTS=$(usex test) - ) - cmake_src_configure -} - -src_test() { - # Tests don't work with C - LC_ALL=en_US.utf8 virtx cmake_src_test -} diff --git a/dev-libs/libqtxdg/libqtxdg-3.4.0.ebuild b/dev-libs/libqtxdg/libqtxdg-3.4.0.ebuild deleted file mode 100644 index 089177d5fd38..000000000000 --- a/dev-libs/libqtxdg/libqtxdg-3.4.0.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake virtualx - -DESCRIPTION="A Qt implementation of XDG standards" -HOMEPAGE="https://lxqt.github.io/" - -if [[ ${PV} == *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/lxqt/${PN}.git" -else - SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz" - KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86" -fi - -LICENSE="LGPL-2.1+ Nokia-Qt-LGPL-Exception-1.1" -SLOT="0" -IUSE="test" - -RESTRICT="!test? ( test )" - -BDEPEND=" - >=dev-util/lxqt-build-tools-0.6.0 - virtual/pkgconfig -" -RDEPEND=" - dev-qt/qtcore:5 - dev-qt/qtdbus:5 - dev-qt/qtgui:5= - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - x11-misc/xdg-utils -" -DEPEND="${RDEPEND} - test? ( dev-qt/qttest:5 ) -" - -src_configure() { - local mycmakeargs=( - -DBUILD_TESTS=$(usex test) - ) - cmake_src_configure -} - -src_test() { - # Tests don't work with C - LC_ALL=en_US.utf8 virtx cmake_src_test -} diff --git a/dev-libs/libqtxdg/libqtxdg-3.5.0.ebuild b/dev-libs/libqtxdg/libqtxdg-3.5.0.ebuild index 5c925fa5ebda..b09cc5dd8cce 100644 --- a/dev-libs/libqtxdg/libqtxdg-3.5.0.ebuild +++ b/dev-libs/libqtxdg/libqtxdg-3.5.0.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then EGIT_REPO_URI="https://github.com/lxqt/${PN}.git" else SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz" - KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" + KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86" fi LICENSE="LGPL-2.1+ Nokia-Qt-LGPL-Exception-1.1" diff --git a/dev-libs/librdkafka/Manifest b/dev-libs/librdkafka/Manifest index 2f2397f3f01e..3e1b163e864f 100644 --- a/dev-libs/librdkafka/Manifest +++ b/dev-libs/librdkafka/Manifest @@ -1,9 +1,5 @@ -DIST librdkafka-1.4.0.tar.gz 2722992 BLAKE2B 590fa90805bc2dc728dd32be333eaf9b2a4e6a840403838406684794ca68f2bcf9fc831e252a637622f9e6cd209d779ed20d503e49dac20bdb28f5d3fbd676bd SHA512 cd343597707d22490dfcd513a6b24ca5487dca5230a5a6775e7d6f10be2dc5481deb3a76968bb244d5f7514db92aceca541823c5841a7b54d8e00aeb9088731c -DIST librdkafka-1.4.2.tar.gz 2732806 BLAKE2B 140160fef4f228d877bcfa9d892fd053d2b74547abdbeb7dc661bd4b2b7d576f1ebeecaccd1ac3c3669e059746f0c63be6468cd4f066a9862b8c60d8f2d014a4 SHA512 3d8e496466c103829f5fe11f1a6e68d1299c847b637c6fad55adbe1ad28bd5c463508f3f3fb8b3316b15a104f74e551cd5e520950d76c0e4f8c876083397ced5 DIST librdkafka-1.4.4.tar.gz 2734332 BLAKE2B 47c22f00d88d58eb6366e17a8f0ddaee4984bc65f01a627c5d3b8eee019519a2de9a7ae6e2ab2053354a5d72337107b7f515ad65ff205b6838e154b95d9f2331 SHA512 478d17f56efd39b312ea774695bc31d22a83aae3a94913fb0dd07e7f04f3f2a6e3f3610dc7501864dbacbcf4a3207603c6e1d5eebac4e5246ee868cde398021d -EBUILD librdkafka-1.4.0.ebuild 1471 BLAKE2B 1fd23cd2970dd73085d1a2a584fb6f391568996946e87452e6fd283bfc78119d2c52ecd571a24892c843274744e5aab62266a3a5cba51279109efee4d691e311 SHA512 7e168e876ff25bb9fb83b4ac7401742ce9dbe437939e3c10dbd96c0bffe66270e5816413f7ab7a441897066658c4cd9a7319f6a5b38aaa13a0867f13ee3b4662 -EBUILD librdkafka-1.4.2-r1.ebuild 1648 BLAKE2B 46030bbfd9a9edaf4dc6d0ac8dc35277f6fd8fe294c1d3c6ddc00e54eeda34eafa56834d369e205113317e758e194538fb575271259b03ae31dd0c0bba2e35d4 SHA512 9433138c12b04947e44575e28c35f23c96e5e3406acf1bb6ee3ca9e2730c1892661b2ec59c9cb1409d53d5802fb402916dbc0e1a0dc3810b7a042d174fd02160 -EBUILD librdkafka-1.4.2-r2.ebuild 1657 BLAKE2B 3c168be95035f152fb212e5f45198398b8b14d869f8dc899530b10e0bccbebad0b4bb57437b1c88c58e7f4684388392f21108453cb5ea89486c9710b0f2e2fcb SHA512 60557ddff24f340cef825a30ee3a96cd928c6a5a3568932f6ae99323a2d6f09f292cb8203e7fc3cec22c0157b16da25154db53c0ad37a05f7f06609e1cf84d8e -EBUILD librdkafka-1.4.2.ebuild 1483 BLAKE2B 4c0400891f9a7f903aa0e118d3bfd1c24570179cd7448240048013f15e5131c18ded63d6f3ac39d9cb4c81a1a7aa52b8a3a3740064fd6c24b40e58b13b1cff6e SHA512 66e5eeb55879174c24ded6b55ebae60db37838fefefdef4b7c7dfa24aca94c2d6048a38830dee7033090e9f72d542d0c72a605b07f2ec20090d9fef7854da989 -EBUILD librdkafka-1.4.4.ebuild 1657 BLAKE2B 3c168be95035f152fb212e5f45198398b8b14d869f8dc899530b10e0bccbebad0b4bb57437b1c88c58e7f4684388392f21108453cb5ea89486c9710b0f2e2fcb SHA512 60557ddff24f340cef825a30ee3a96cd928c6a5a3568932f6ae99323a2d6f09f292cb8203e7fc3cec22c0157b16da25154db53c0ad37a05f7f06609e1cf84d8e +DIST librdkafka-1.5.0.tar.gz 2757553 BLAKE2B a9bbcdaa011944e43f9c70e2062199c5f12d1b92e40ba55707520002ed3a909ff13308336703924388625570d88a94d58b24cd19b5d6e9f79acd31dd92d0d7ed SHA512 ccd8dd3e90c9315833610745c28e0ffa60786324c938c7cbbb2ff847d7493d1b72d97adf5e5210bbc87970047cfd7e58a85141534d227187f2f17c492bef4262 +EBUILD librdkafka-1.4.4.ebuild 1652 BLAKE2B d6b1f200c1beb20fafd794334ec4412dd962c818cc4d1ff340324ee804ab4edcf6654aecb95849555221d1795ac273ec90d3b10e9a48b37bda19f050a5f1c2f8 SHA512 5bdec28dbb294c2f5ea1f1b44de3ada493d3a1ef688362f9c0de377bfbae1db7b34e0357baf416f6585e2e50cd6c29b2efdaf39c3d400ec9d93cd5b9d5c38559 +EBUILD librdkafka-1.5.0.ebuild 1776 BLAKE2B c4188c4cd760471cabfaa70b3a5366738429517fbce05e9932b7e2addfc9ec82f474514a396659bf71a82e6759543606ba3d65e5f11bc6422488774b6fa99481 SHA512 e677b13c10904c70a261efe4f189b4b244ef6c3ac6a18dac760638be29a3ee932bb8a90fd77c7bf6b8fb0183354d78d3eeec7636e2165f19ccc94b8a123ac870 MISC metadata.xml 533 BLAKE2B 51fa8b199e9126c2942044008614a47915d17ea2e11edbc4254e995ceddf71649018feed0655fa3a5a73d6d7f2c17ab0b4e963bd0b7f4922f1a3fbcd85e04052 SHA512 7f859dce01869e64712cb9042a1ab982255ec524334f2a1fbaf3f0e50fbc08bd3dd21e4bdf2ccef5b539aef94e0bfa2b7af95ef215cfddea4202608005934308 diff --git a/dev-libs/librdkafka/librdkafka-1.4.0.ebuild b/dev-libs/librdkafka/librdkafka-1.4.0.ebuild deleted file mode 100644 index ebc30a9d77d4..000000000000 --- a/dev-libs/librdkafka/librdkafka-1.4.0.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# 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 ~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_configure() { - tc-export 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-r1.ebuild b/dev-libs/librdkafka/librdkafka-1.4.2-r1.ebuild deleted file mode 100644 index 70a131cef92a..000000000000 --- a/dev-libs/librdkafka/librdkafka-1.4.2-r1.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# 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.ebuild b/dev-libs/librdkafka/librdkafka-1.4.2.ebuild deleted file mode 100644 index 296fa0afea2a..000000000000 --- a/dev-libs/librdkafka/librdkafka-1.4.2.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# 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_configure() { - tc-export 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.4.ebuild b/dev-libs/librdkafka/librdkafka-1.4.4.ebuild index b87a68933f65..719b22ab5511 100644 --- a/dev-libs/librdkafka/librdkafka-1.4.4.ebuild +++ b/dev-libs/librdkafka/librdkafka-1.4.4.ebuild @@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]]; then 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" + KEYWORDS="amd64 arm arm64 hppa ~ppc ~ppc64 ~sparc x86" fi LICENSE="BSD-2" diff --git a/dev-libs/librdkafka/librdkafka-1.4.2-r2.ebuild b/dev-libs/librdkafka/librdkafka-1.5.0.ebuild index b87a68933f65..86b1ca559964 100644 --- a/dev-libs/librdkafka/librdkafka-1.4.2-r2.ebuild +++ b/dev-libs/librdkafka/librdkafka-1.5.0.ebuild @@ -3,7 +3,9 @@ EAPI="7" -inherit toolchain-funcs +PYTHON_COMPAT=( python3_{6..9} ) + +inherit python-any-r1 toolchain-funcs DESCRIPTION="Apache Kafka C/C++ client library" HOMEPAGE="https://github.com/edenhill/librdkafka" @@ -32,14 +34,22 @@ LIB_DEPEND=" sys-libs/zlib:=[static-libs(+)] " +BDEPEND=" + virtual/pkgconfig + ${PYTHON_DEPS} +" + RDEPEND="!static-libs? ( ${LIB_DEPEND//\[static-libs(+)]} )" DEPEND=" ${RDEPEND} - virtual/pkgconfig static-libs? ( ${LIB_DEPEND} ) " +pkg_setup() { + python-any-r1_pkg_setup +} + src_prepare() { default diff --git a/dev-libs/librelp/Manifest b/dev-libs/librelp/Manifest index 449c76b7b37f..844e83571021 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 1413 BLAKE2B b2f225f299f213b13161da26270427284b0dee2844ca8549b7f054fa207f0c88bbb66909c3ac30a204c02fe66834db1205f2f74cdd4c5e0ffe14eecf30fdbb0d SHA512 4fde4b18c498ba19a608892820ab546897823051ff1a0e2d026e242bdab7e0711cbdb14eb4b39a09e1ab06fed78bba6f5c2276876f62bb52dc817bcfb431f95e +EBUILD librelp-1.6.0.ebuild 1411 BLAKE2B 5922b8be561df56c0b687cb6ffc62a43fb907034174341ac6f0fbf60edaf802d4a540ea96472444ef6cbcf7750d2cd40a89be76735a1b5e7eaa5f625ef138909 SHA512 a353bd623a5eeb17a25ff4e45296526c03e92ba8879afeb9548d9431a27c40b04b61814b8fad61d25809a08a8517a388d75602516da75cd9057e10b44eb09334 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 2a4d1adab6d8..8b0b988de2ca 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/libreport/Manifest b/dev-libs/libreport/Manifest index 9c8ab951f240..4bdc8ed532f9 100644 --- a/dev-libs/libreport/Manifest +++ b/dev-libs/libreport/Manifest @@ -1,7 +1,9 @@ DIST libreport-2.10.0.tar.gz 2278084 BLAKE2B 95ac1fbf32e6e021e9553b35b10f9e46b7ea2e9cc6f21e53eb39a32a5261f7a6e49b2172381fdea30341fcc4311928691e68749a8bb5c41a4bf709151935687a SHA512 978ea442d82b75abf80b2075f540cb05c5577387a9221f2070c9695c4546d36169738d223f5e903d0b774b7e1566a6111c55a6bb51a0822ad1676095f067c45b DIST libreport-2.12.0.tar.gz 1842875 BLAKE2B 930666ec0c675a8ff457412a80511652dfa3bd3d771115506370432a7b74f3d1d9f6264dc3696c582b4a0939b2493137a18e1379eca268f25bc787a03a7d6c39 SHA512 d85c1beea330e4b21ce66b6f4acadaa132010738496a6701d161ee75b2254e629c496270145a6167e8eb81cf2204b0488aa0eb15c1e898f49aa3aec1331bff0c DIST libreport-2.13.0.tar.gz 1840841 BLAKE2B 822bbbfb1e03a6e486f12263fe60231045c9b2153dc743168b93c976b2db76f2bbff3c98da0107e660d713a0d9bac25bf36ee55064a15e0c72ae66fa7fdf0aaa SHA512 f650ba83bfa48d3c897ec4415d4942ed3412a55240d950d78e15b935ea71c3665cdfe1c155f3eee202911e7bb4c09a0a50fbfdc2b54f4d32d00da1a98c1fe7e2 +DIST libreport-2.13.1.tar.gz 1841698 BLAKE2B e0fbebbb557fb9fb320dea0a8face6a2eabdb0ad80b5de092e5e4dfe2a0439a4804d4ec99c1286aaafa31064496a94fabce5e26f851001eb9c3bb9989a46e4bb SHA512 6c2ea47e6efa36f23030fbe08946d1e524690e5f6279cbfdaf7c463ef71b23ae82a5e4471ddce89b35d4024f58197cef9f58a07dfcf5bbc1a9b310e39966f81a EBUILD libreport-2.10.0.ebuild 1940 BLAKE2B 93d61e530d0160f88733545e2283c7af8e421311a6c8665b572739acc7635aa90ba69d8b3aaf45fa59dc3d76543203dcdd1b9edccd334ea1b6fd67d9b4951c29 SHA512 cbaac321369f9a593ee2be582d0d7cd6e71b2326a825e7ef7b9afcecb73523172a77007b1e24b96e5293299cb770f99381373b16b22a2399d818687b7c1a4a34 EBUILD libreport-2.12.0.ebuild 1916 BLAKE2B 8ec2dc277b78ab3a2c172751b43725ff81fcb2d715c6cad62431658b8f37d7ff3d0958c04e3710c12e6e5331f16398a4d8f70c29c341d5619b910556155a00a9 SHA512 ce5d6044877d9f86244152577dbc604802f1cc68378e9dc47748e9e34456d66a31cbbe0b5492fb5c4542352e277e0484d6a9aa24110285067f02f72d9fb1a331 EBUILD libreport-2.13.0.ebuild 1931 BLAKE2B a2d753b2b0b1520b096059908128f58e26f1736cb500762161680b4052c9428b0e3a82e4d7fecebb8a388966327ba11f23c1a72272eb1faa25c64a1c5de16a2b SHA512 dc6cd714f7cc7b2a42022b3d041c5596fb5e6f19d5729e4bea60f7537d277c0ce338a00fd8896137b7da5e4338ded609feeaa674f39304ac9c8c39f262b75b74 +EBUILD libreport-2.13.1.ebuild 1932 BLAKE2B b1b0ac62d7a18a8574de59aefabc42b709e0383f709ffc3a0d237c55c7b85fbede70845062a4e5e3597de5a6628a5167765eed6df8086d87c49067b8fdfdba28 SHA512 df3cc87bb015cad4a3e806d6aa91b2c6894fa40006c6122c973e97467e00c689e8d7dfdd5d9aff152fdb46af6beafd83ef555d656c2eb0c7a6793b0ce87054da MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 diff --git a/dev-libs/libreport/libreport-2.13.1.ebuild b/dev-libs/libreport/libreport-2.13.1.ebuild new file mode 100644 index 000000000000..991965f07e05 --- /dev/null +++ b/dev-libs/libreport/libreport-2.13.1.ebuild @@ -0,0 +1,100 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_{7..9} ) + +inherit autotools python-r1 + +DESCRIPTION="Generic library for reporting software bugs" +HOMEPAGE="https://github.com/abrt/libreport" +SRC_URI="https://github.com/abrt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +IUSE="gtk +python" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +DEPEND="${PYTHON_DEPS} + app-admin/augeas + >=dev-libs/glib-2.43.4:2 + dev-libs/satyr:0= + dev-libs/json-c:= + dev-libs/libtar + dev-libs/libxml2:2 + dev-libs/nettle:= + dev-libs/newt:= + dev-libs/xmlrpc-c:= + net-libs/libproxy:= + net-misc/curl:=[ssl] + sys-apps/dbus + sys-apps/systemd + gtk? ( >=x11-libs/gtk+-3.3.12:3 ) + python? ( ${PYTHON_DEPS} ) + x11-misc/xdg-utils +" +RDEPEND="${DEPEND} + acct-user/abrt + acct-group/abrt +" +BDEPEND=" + app-text/asciidoc + app-text/xmlto + >=dev-util/intltool-0.3.50 + >=sys-devel/gettext-0.17 + virtual/pkgconfig +" + +# Tests require python-meh, which is highly redhat-specific. +RESTRICT="test" + +src_prepare() { + default + ./gen-version || die # Needed to be run before autoreconf + eautoreconf + use python && python_copy_sources +} + +src_configure() { + use python && python_setup + + local myargs=( + --localstatedir="${EPREFIX}/var" + --without-bugzilla + $(use_with gtk) + $(use_with python python3) + ) + if use python; then + python_foreach_impl run_in_build_dir econf "${myargs[@]}" + else + econf "${myargs[@]}" + fi +} + +src_compile() { + if use python; then + python_foreach_impl run_in_build_dir default + else + default + fi +} + +src_install() { + if use python; then + python_install() { + default + python_optimize + } + python_foreach_impl run_in_build_dir python_install + else + default + fi + + # Need to set correct ownership for use by app-admin/abrt + diropts -o abrt -g abrt + keepdir /var/spool/abrt + + find "${D}" -name '*.la' -exec rm -f {} + || die +} diff --git a/dev-libs/libressl/Manifest b/dev-libs/libressl/Manifest index c58dcdb5c131..e4b707df197c 100644 --- a/dev-libs/libressl/Manifest +++ b/dev-libs/libressl/Manifest @@ -1,20 +1,13 @@ -AUX libressl-2.6.4-hppa-asm.patch 2236 BLAKE2B 508555aa87f763c7cc39cf1cbd2ae5692d7c33315b08e4527db61a878cb5373e6856669e8185b7c49ab82e3f7c01034c1496c639d3a46d605c39170f3f1ce32d SHA512 b49da63109f4b0d471402c07df927b1aba60f94e263376919206fac9a4dddb9a10c4c0004836b2c00a560eb59dcde71bd6b4aba45d966a3e0b2fba79f7277a3e AUX libressl-2.8.3-solaris10.patch 1928 BLAKE2B e12372c1fba9c586e5d8c4ccd7af0c3d888dd42f4456e28091424f8c1f0ec0362f9558957752a30fabb7b06e35929cad8fd582deea58d48da4759ee0aec12b08 SHA512 39ab3dea9af735f2485108aa88e7d951563ffbdeb8a002eb76560617583df58c84d5af83a1e51d0a6f71e9709d1f1f83265b030740f6024e5d45aaf0d98290b5 AUX libressl-2.9.2-non-glibc.patch 981 BLAKE2B c9d208dac68fbe7205617ca667d111d00ab9d2324ba0c91c36f05efba9372a97ca76d844144d886814798e5be29c8e6a1bc0ac0341ee420660282d6d5267970f SHA512 5672b69a6c4ad68eb02e7e2b43dca6b2c557e0b74c29fcd249f46e65b284c740d9979e43fb36a7784ad41e7bbfee79ce18242990e62ecdb80d1a44cf1540dc8c -DIST libressl-2.6.5.tar.gz 3225481 BLAKE2B fcdf0d8b4b68fdb6c17299f4b9897c84f51ec3407abc6c1bf8d474c4424161c563667ca1fb26c45dd20a0e895457e9210b7bd0539581472b94d594cc32a68191 SHA512 0601c73bb5c3d149df7eca3566831f1b35713aa16a15788a291922fce0bffa1ba0bc6ea9cac1fcecfd980009f2292b08b2a57d66b517fc1bc8c7364a24dbbd9d -DIST libressl-2.8.3.tar.gz 3366196 BLAKE2B e32c097b31998d68a31266fbbf3624d5ab8ca716f8c53e423bcf09b3a8ab3542c92a99e259ded7b86f99b45cc199cd44791520a609f18c35d150365de5768eec SHA512 3967e08b3dc2277bf77057ea1f11148df7f96a2203cd21cf841902f2a1ec11320384a001d01fa58154d35612f7981bf89d5b1a60a2387713d5657677f76cc682 DIST libressl-2.9.2.tar.gz 3607549 BLAKE2B 496e993e4f1c85167e0344afab61259d4e3f094a7e5dfac85878191070e2c196753162532efb921fab582481aeda3705fca9a2b48921cba82465192f2c1eef95 SHA512 b43e73e47c1f14da3c702ab42f29f1d67645a4fa425441337bd6c125b481ef78a40fd13e6b34dadb2af337e1c0c190cfb616186d4db9c9a743a37e594b9b8033 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.1.4.tar.gz 3767238 BLAKE2B e639349e50f985360f2cef01b16b5c8f3c725d4a9bbee1117787174e4de6eb9b14cc8ad5f1704971057dd0f5000eea01f3b172178c534c70d38921418034d94c SHA512 77a53c4294fc332006502dc3af069346e2c9efc9240de7f91eb48e89043525900b5b23652cfd159221c3a482cc01e263611adb752e23b707f965156e3a7cd895 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 EBUILD libressl-2.9.2.ebuild 1742 BLAKE2B 3ba8f8b51b4b89515c6dadfb4b5975b1d683b04aea39fee7a509953f900d35f62d365896d3a2c7e5a53af943c184c362629c214147a5f4c3115833ba62473b85 SHA512 745a0e3f946ed03e90a876e78cab5e36c59b1c5ffe121499c0c149ad510cc47e62078bf62c0b43d7a0d2aa75c6103c1650193df8ec87ed4354f76080660f7cdb 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 1703 BLAKE2B 11108f1b25dd38796ea7691f9050156d886e19dd3f456385cb254a4abb12f2a01cfa411032da454a6c731b6a91b8f6f5184e578c0bbdaffd84e82935892fd933 SHA512 3697c878f6cccf88b373311d1878b54ec1e6533db34fa20eeab8078b84960c0a7663a2bf5a4d2aadc2da288604d0c23a5a29edd71196404098276dc8f90e00f6 -EBUILD libressl-3.1.3.ebuild 1702 BLAKE2B 4a85f990640a51fdf6d85153547c812811f410349f9b2c9c294bf3d20457eea2ba72846ddf670f3260377ec364de248bc8081d8358d5feddafdff442b7879668 SHA512 86b5a4fccdfd3c0240c8e22b565ea07e36d62bea3b8f485938a6af2f8c85d543b3648e6a355e1b6cbef2a0965ec4ebcd5e5e5a6b60f2f6acc8a6a25492b80d39 +EBUILD libressl-3.1.3.ebuild 1697 BLAKE2B 3ba25c3976cd351c7551745d6713c484898930d3618a3530d649d39684eb2ef7713239cdd58c8ea1361a7d4e203fdfed71acab7d2ace5fd29723ada307d912cd SHA512 9a492cef92e90941c334522f494504018139fc88bfec721cda493cce9900a87b30bb50206c754535083927172d3038c63cf15199c044f8def76c94de6aa8eb2d +EBUILD libressl-3.1.4.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/files/libressl-2.6.4-hppa-asm.patch b/dev-libs/libressl/files/libressl-2.6.4-hppa-asm.patch deleted file mode 100644 index a0922af09612..000000000000 --- a/dev-libs/libressl/files/libressl-2.6.4-hppa-asm.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 787d8d240bbeaa812bcf37deeedb3c467be468a3 Mon Sep 17 00:00:00 2001 -From: Sergei Trofimovich <slyfox@gentoo.org> -Date: Sat, 19 May 2018 17:31:42 +0100 -Subject: [PATCH] __warn_references: tweak assembly for "gnu.warning" section - -On some targets ';' (like hppa) is treated as a comment -in assembly files. This occasionally causes the following -assembly failures: - -``` -Error: can't resolve `.gnu.warning.EVP_DecryptFinal' -{.gnu.warning.EVP_DecryptFinal section} - `.Ltext0' {.text section} -``` - -Note how branch (or other reference) attempts to cross the -boundary across two section types: '.text' and '.gnu.warning'. - -Tobias Ulmer notes that openbsd already uses newlines -for similar macro: - -https://github.com/openbsd/src/blob/master/sys/arch/hppa/include/cdefs.h - -This change switches from ';' to newline as well. -Tested on hppa2.0 and x86_64. - -Reported-by: Jeroen Roovers -Bug: https://bugs.gentoo.org/656104 -Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org> ---- - configure.ac | 2 +- - include/compat/sys/types.h | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index b74b8a1..16ed825 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -91,7 +91,7 @@ AM_CONDITIONAL([HOST_CPU_IS_INTEL], [test "x$HOSTARCH" = "xintel"]) - AC_MSG_CHECKING([if .gnu.warning accepts long strings]) - AC_LINK_IFELSE([AC_LANG_SOURCE([[ - extern void SSLv3_method(); --__asm__(".section .gnu.warning.SSLv3_method; .ascii \"SSLv3_method is insecure\" ; .text"); -+__asm__(".section .gnu.warning.SSLv3_method\n\t.ascii \"SSLv3_method is insecure\"\n\t.text"); - int main() {return 0;} - ]])], [ - AC_DEFINE(HAS_GNU_WARNING_LONG, 1, [Define if .gnu.warning accepts long strings.]) -diff --git a/include/compat/sys/types.h b/include/compat/sys/types.h -index 2107119..dec09e3 100644 ---- a/include/compat/sys/types.h -+++ b/include/compat/sys/types.h -@@ -62,7 +62,7 @@ typedef SSIZE_T ssize_t; - #if defined(__GNUC__) && defined (HAS_GNU_WARNING_LONG) - #define __warn_references(sym,msg) \ - __asm__(".section .gnu.warning." __STRING(sym) \ -- " ; .ascii \"" msg "\" ; .text"); -+ "\n\t.ascii \"" msg "\"\n\t.text"); - #else - #define __warn_references(sym,msg) - #endif --- -2.17.0 - diff --git a/dev-libs/libressl/libressl-2.6.5.ebuild b/dev-libs/libressl/libressl-2.6.5.ebuild deleted file mode 100644 index 6ec84c36c7ec..000000000000 --- a/dev-libs/libressl/libressl-2.6.5.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools multilib-minimal - -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/44" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86" -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" - -PATCHES=( "${FILESDIR}/libressl-2.6.4-hppa-asm.patch" ) - -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" - - default - eautoreconf -} - -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/libressl/libressl-2.8.3.ebuild b/dev-libs/libressl/libressl-2.8.3.ebuild deleted file mode 100644 index 03ba04935f9a..000000000000 --- a/dev-libs/libressl/libressl-2.8.3.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -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/46" -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" - - eapply "${FILESDIR}"/${P}-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/libressl/libressl-3.1.1.ebuild b/dev-libs/libressl/libressl-3.1.1.ebuild deleted file mode 100644 index 48642f97b49f..000000000000 --- a/dev-libs/libressl/libressl-3.1.1.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# 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/libressl/libressl-3.1.3.ebuild b/dev-libs/libressl/libressl-3.1.3.ebuild index abb7086fb0d5..968f9b8418ad 100644 --- a/dev-libs/libressl/libressl-3.1.3.ebuild +++ b/dev-libs/libressl/libressl-3.1.3.ebuild @@ -14,7 +14,7 @@ LICENSE="ISC openssl" # 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" +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 )" diff --git a/dev-libs/libressl/libressl-3.1.2.ebuild b/dev-libs/libressl/libressl-3.1.4.ebuild index 1df45e25a730..ab31f2041689 100644 --- a/dev-libs/libressl/libressl-3.1.2.ebuild +++ b/dev-libs/libressl/libressl-3.1.4.ebuild @@ -14,7 +14,7 @@ LICENSE="ISC openssl" # 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" +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 )" diff --git a/dev-libs/libspt/Manifest b/dev-libs/libspt/Manifest index 19d3f5350dba..ea744d3ad8d8 100644 --- a/dev-libs/libspt/Manifest +++ b/dev-libs/libspt/Manifest @@ -2,6 +2,6 @@ AUX libspt-gentoo.patch 727 BLAKE2B a98df11f3789d5e8c2aabfd538210db025a59567286d AUX libspt-glibc-2.30.patch 233 BLAKE2B 4cc03c14f2d879566987f56e91c3f467120a7e49648c0814535c02b129e49f4d7185edac370f17e58428e180056dce31844a1accfa6503f0ebfde32c53571f0c SHA512 8f064315215fb99d7302b544b7a3da1c239bba21e8ffdc21b0bd05e496bb0ddd54ae5ed55c36b9fc0386026d007f19082d1eee95264edda1a124e9629c5093c9 AUX libspt-rpc.patch 848 BLAKE2B 982a1b8d88e2a28cb6529dd4a6c2e15c42aa7f0b0bbe34d40d91a6bb45ee2667253cabb06f31bdb757dcec7d4daf066f1271aa33edebeadfda2ba341bdd39dde SHA512 ad703547047949aa338bea0bd211a7daa3448ce728cf754be6ba4c0a058e0ab631beceb044bcce0eba9fe606b741f530fb88909891b0e86ff8898cfcf04d6cd1 DIST libspt-1.1.tar.bz2 165168 BLAKE2B a21778ba8b3c22d7fa655460ede0d04efc98635b1be74575cbb996b33bdb27ed75479ae6a2d7bc38c1052ac23547483e9d93c03531cbfe236e1e07944bad1673 SHA512 5b2ec289ce51f1f2040b68c559ef6e1ea1e59f50c3d639a93176fa8a5f3f75481651c4d0acd393eac8d2193f2aae19f882897323caf344cbfde52e32cc3a02b9 -EBUILD libspt-1.1-r2.ebuild 723 BLAKE2B 2a0eb46adc4034b2bac0c541695f1ac02da276f684b8e9729feac5cfc84fbb88e6a80b9ef50d3d2a7725a3416db6d737f38d467f5fbf6b1a7cd15928da2312c5 SHA512 2a9175f95665484741a7ddb45651f80c57d45d95b4ac660dafc8afee78ebfb34a614188c480be790f52a0be5fe0356d59286841bd6c401558b3c99805f594af7 -EBUILD libspt-1.1-r4.ebuild 772 BLAKE2B 26baacbe890186df7441fa3b74f7a2a54c1038358ed2c9a7dbc65c76509354fe27e31d9e029e2315a4b7c7421ccf5ec038eea3c49d3fb2af7f57be5f9acd5aa5 SHA512 97eb80fb1a122982cf83233c463d68ec5c5c1990d6ffddc7d65701686b10ad5e1e7bf3e6a7746301c5e7589af92c0ea60b27f1ed2f8f5bb95a7f9bb5e541964b +EBUILD libspt-1.1-r2.ebuild 848 BLAKE2B 6b0e10ca243709ac309bd7797c1413fa2a29d7a4677300540e45dd563f83385ef54cb1ab529caf237ab87afc68bf8f1841ba4c36c22d909f42f8f2746dc4d341 SHA512 4587ee745bd24b4efaa852b5070ea4fb79c9b4440dbb7d8233c95e212ea05211c8d2624493775a5c0de5d303447e6e18d6ca15ae6419763e059193d437bff6c9 +EBUILD libspt-1.1-r4.ebuild 867 BLAKE2B c326b190c3da12fd213c28a7452ec783cb99ba5ceba6c3d56a313352fb5fd7485918d2a70a3117e754ee8718b6604546319a2e5dccea27f8918cc34c5a7b0e04 SHA512 53bec70e7a3814c7ba90d74b1b11a43563d5142c4fbbbf091e76986a2bf5704abdb9ccb6f417776427099145df5ca65a09b5e25ac7b7e7afa293f64737ea8347 MISC metadata.xml 338 BLAKE2B b0d2cf2b1009aaab90ed70d7804808dc0da5b868905de880bf120a6b6b00ea79c0256f483dad6f3e3610bec57156e4fde3b54790dcc01c77848e62ad43a4e451 SHA512 4432f92e77ea7bd20aed61d72505de530920cc8f0d06e4e5e4e9a25a11494ca809c6662b073f05c4726a942371b678d32ece0d4e665c2bf0c66f12f57b3044e9 diff --git a/dev-libs/libspt/libspt-1.1-r2.ebuild b/dev-libs/libspt/libspt-1.1-r2.ebuild index c2411df796bd..6954c394f08c 100644 --- a/dev-libs/libspt/libspt-1.1-r2.ebuild +++ b/dev-libs/libspt/libspt-1.1-r2.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI=7 inherit autotools @@ -17,8 +17,8 @@ RESTRICT="test" RDEPEND="!libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) ) libtirpc? ( net-libs/libtirpc )" -DEPEND="${RDEPEND} - virtual/pkgconfig" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" PATCHES=( "${FILESDIR}/${PN}-gentoo.patch" @@ -34,5 +34,14 @@ src_prepare() { } src_configure() { - econf $(use_with libtirpc) + econf \ + --disable-static \ + $(use_with libtirpc) +} + +src_install() { + default + + # no static archives + find "${ED}" -name '*.la' -delete || die } diff --git a/dev-libs/libspt/libspt-1.1-r4.ebuild b/dev-libs/libspt/libspt-1.1-r4.ebuild index 4679b16bc3ff..038dc8d2ac53 100644 --- a/dev-libs/libspt/libspt-1.1-r4.ebuild +++ b/dev-libs/libspt/libspt-1.1-r4.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI=7 inherit autotools @@ -11,13 +11,13 @@ SRC_URI="http://www.j10n.org/${PN}/${P}.tar.bz2" LICENSE="BSD-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86" IUSE="suid" RESTRICT="test" RDEPEND="net-libs/libtirpc" -DEPEND="${RDEPEND} - virtual/pkgconfig" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" PATCHES=( "${FILESDIR}/${PN}-gentoo.patch" @@ -33,12 +33,17 @@ src_prepare() { } src_configure() { - econf --with-libtirpc + econf \ + --disable-static \ + --with-libtirpc } src_install() { default + # no static archives + find "${ED}" -name '*.la' -delete || die + if use suid; then fperms 4755 /usr/libexec/sptagent fi diff --git a/dev-libs/libtermkey/Manifest b/dev-libs/libtermkey/Manifest index 659320e67fd8..5fc21507d963 100644 --- a/dev-libs/libtermkey/Manifest +++ b/dev-libs/libtermkey/Manifest @@ -1,5 +1,5 @@ DIST libtermkey-0.20.tar.gz 45167 BLAKE2B e51a0c91efce056824ee56918aa6a794096e1f19e02d04278c0f3e82382055f16b0413c9f3832492677fbb68bcc1803303cb4c8ee8dc7363276dfeda3e5a6e4f SHA512 81a4bc5917c60ca692ec3065ac0252ae5dc1adccc2832be1c83c82318c97473d883900ab88a8a0ee08ab3f831ff07f3a4827ee3d8e936a3a42c4708ee58f6301 DIST libtermkey-0.22.tar.gz 46147 BLAKE2B fddc00a1ae525e5ed8c9c6eaee46fe30a99dbbc76ca988f9f5301b3c5c13a6de4462d6cc612119409a21737176f67ac196109b11fb58f414b25db5b6a49f4982 SHA512 2e8242cd1e6acb8900125dcee9fd47f7554c359363f760b88858c82667e1f3871bdd87358b14c8a133ef3cd2699947a5045477e64cdf7f96d4ead1723e73a219 EBUILD libtermkey-0.20.ebuild 965 BLAKE2B 1e16f410da62765d9818cd526aa1e2cb5e88f96940d17bbd21c9d90ca7d50787825f0115a633dc4803be5e37d2cf39945c84d559a21dc22ca0ae62f1ff6fcae6 SHA512 a738569e408342f8605d32dbe96fda1f4843a39efe49f998b981b5d4f3d78cacf2e2be5832603704aac66c6a9fe84fc052aaea925196298721d4f69380bf641e -EBUILD libtermkey-0.22.ebuild 966 BLAKE2B 5545cf0fb8ac0e99a13af1f2b84ef60f61258bdf15711c979828ef8cacdcbad31569216d7a1f1fd9f2b21244218374d63d37c5e736bcdc6a439c4bd88673be1a SHA512 c0afd54d9c3b9200c5a00a5e251a9f12833d0071345e97e09f7d949b65219855879f62e9f3ec7084dc9f06fcb6b85431a64bc11c1362d6ed1c7fb3ae2daa7a08 +EBUILD libtermkey-0.22.ebuild 973 BLAKE2B e8ec065e838e7e7f2ba28affee2ea1329693bd82d5dbe46f4a7d3042664c88eb25ba075a85662ff0bda8d25c3c07676b4b3c2ef060aaf2666915b263b10857a6 SHA512 419f39f02fd8c5927160d55b52685643e173a07d193649f4e9cd9092947ae9b0a900d84d41b9b1275a8b9afda312800dbd6b0b119667707510b3bee628490e85 MISC metadata.xml 357 BLAKE2B b658c2de2a5bcbf02faff436d83266b842ab4217adb954f71f0543e5be5f791e48c97f4299e6c97e1338b0a2ee3937136062d0b80c1c8cb09deb3cec8d7add13 SHA512 0b48ba4931f32eda8d9c162693389fc65a0e0eac83b8f2f0dda2e58cabcd93a2bbf301c86c12cc0b2d89ed2c19afd82bbc3a54da9ab3e3f8c615aca24290dfbd diff --git a/dev-libs/libtermkey/libtermkey-0.22.ebuild b/dev-libs/libtermkey/libtermkey-0.22.ebuild index 6e849e353aec..4df93edfc85e 100644 --- a/dev-libs/libtermkey/libtermkey-0.22.ebuild +++ b/dev-libs/libtermkey/libtermkey-0.22.ebuild @@ -10,7 +10,7 @@ SRC_URI="http://www.leonerd.org.uk/code/${PN}/${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="amd64 arm x86" +KEYWORDS="amd64 arm ~arm64 x86" IUSE="demos static-libs" RDEPEND="dev-libs/unibilium:=" diff --git a/dev-libs/libtommath/Manifest b/dev-libs/libtommath/Manifest index 5ce648c6dae7..ee3a164798c0 100644 --- a/dev-libs/libtommath/Manifest +++ b/dev-libs/libtommath/Manifest @@ -1,3 +1,5 @@ DIST ltm-1.1.0.tar.xz 2125456 BLAKE2B 3aca7993704341f6a81e7fbef35389ac8ecd957dd78b5d576f0305d37493c3ddc32462cd787de2fb67d8e165417b18fcfde70accf991cd9433ff87591d8265ac SHA512 6d1b8b09d5b975a2b84ef6ab9cb1cc63db2f0503a906e499cb9d7eaba3f487be6e7f69bf692b188f888418c61ea563aa7e2411638d8979eac426b3d603ad1b91 +DIST ltm-1.2.0.tar.xz 622120 BLAKE2B 1537dad7da5c14264f03280e9d49fa0b7e6c1c4924c805f202d31c60569b9e3bee40674301d67b0f5b049c1c2dc5ec71b6c566ff5c9b8168d16840b031acc400 SHA512 6f9ccd0691831f07f86ddc81cb6145504b3d5da66dd3e92312c64cce0ea986fa4e08ba65ca8991aaebe56702c2d7c15f309696785b813dffb4c112a4ad04b203 EBUILD libtommath-1.1.0.ebuild 1513 BLAKE2B bf645873cb4e262f6244f1958369efe699b86480ea651942abe527018f846f1dc6748da60c42b1055ec41f86b25029efe5531a723aff7f24a5f77b6f257c6dc6 SHA512 8cee336bd78ba5392f3e595e76492144b59f241205aabffbb8bd790710333999e3a8fd191759aa99d5dc5f0f22f1f7f5d342a5b585d04b67667201799425f226 -MISC metadata.xml 2967 BLAKE2B 8adab466c3bf4d4e4b2368e56c7cf35c6a0e03f0dc9a237070e56bc224333876accb0c229d520f863041c0ee48b380225121d47554bb5aa511ff5689dd0e4e9b SHA512 73ce667c4bd2943f848274ee3952961d8b09c2c1faa4920cb74f9d8630470119c7e55a112b3c7dc2243c3746f75fa15db5c143e05e6739d2c9c19536f09a937f +EBUILD libtommath-1.2.0.ebuild 1586 BLAKE2B 8072e71caabee283462113e4dba929b09ac928f7b945cd29988861d8a1d7b23e9f4ad439a6f9fb004ab7f76fac15559191ac2ff7c79b17d3b44990cca20189aa SHA512 581e2d5fb87b484dd655d455bbc84a61a571379983bcb82c35528d75e9fc8ad49935c7c03976f77ab67c61cda478fc0cf78fc413581c2708a5e2b8a2b88393c4 +MISC metadata.xml 3301 BLAKE2B c9999812b8504393673c8890cfcca6436eead1a2ce16d67000f2f0d2ebed6c993e654c720205ffc205ec248a9df1ef38c3a6c7389157fcef28eb407de94239ce SHA512 8f4beb6e7745581094557241bf74a7fd90d32e0091a6da59647887127daf99ec3dab6987811fac2863914504989549dd8d3bc79d88af7f1008c18e3eb9a5e03f diff --git a/dev-libs/libtommath/libtommath-1.2.0.ebuild b/dev-libs/libtommath/libtommath-1.2.0.ebuild new file mode 100644 index 000000000000..886477028fb7 --- /dev/null +++ b/dev-libs/libtommath/libtommath-1.2.0.ebuild @@ -0,0 +1,80 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools toolchain-funcs + +DESCRIPTION="Optimized and portable routines for integer theoretic applications" +HOMEPAGE="https://www.libtom.net/" +SRC_URI="https://github.com/libtom/libtommath/releases/download/v${PV}/ltm-${PV}.tar.xz" + +LICENSE="Unlicense" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" +IUSE="doc examples static-libs" + +src_prepare() { + default + + # need libtool for cross compilation. Bug #376643 + cat <<-EOF > configure.ac + AC_INIT(libtommath, 0) + AM_INIT_AUTOMAKE + LT_INIT + AC_CONFIG_FILES(Makefile) + AC_OUTPUT + EOF + + touch NEWS README AUTHORS ChangeLog Makefile.am + + eautoreconf + export LIBTOOL="${S}"/libtool +} + +src_configure() { + econf $(use_enable static-libs static) +} + +_emake() { + emake \ + CC="$(tc-getCC)" \ + AR="$(tc-getAR)" \ + RANLIB="$(tc-getRANLIB)" \ + IGNORE_SPEED=1 \ + DESTDIR="${ED}" \ + LIBPATH="/usr/$(get_libdir)" \ + INCPATH="/usr/include" \ + "$@" +} + +src_compile() { + _emake -f makefile.shared +} + +src_test() { + # Tests must be built statically + # (i.e. without -f makefile.shared) + _emake test + + ./test || die +} + +src_install() { + _emake -f makefile.shared install + + # We only link against -lc, so drop the .la file. + find "${ED}" -name '*.la' -delete || die + if ! use static-libs ; then + find "${ED}" -name "*.a" -delete || die + fi + + dodoc changes.txt + + use doc && dodoc doc/*.pdf + + if use examples ; then + docinto demo + dodoc demo/*.c + fi +} diff --git a/dev-libs/libtommath/metadata.xml b/dev-libs/libtommath/metadata.xml index ff7228943422..1abe0f30209b 100644 --- a/dev-libs/libtommath/metadata.xml +++ b/dev-libs/libtommath/metadata.xml @@ -5,60 +5,64 @@ <email>patrick@gentoo.org</email> <name>Patrick Lauer</name> </maintainer> - <longdescription> - LibTomMath is a free open source portable number theoretic multiple-precision - integer library written entirely in C. (phew!). The library is designed to - provide a simple to work with API that provides fairly efficient routines that - build out of the box without configuration. + <maintainer type="person"> + <email>sam@gentoo.org</email> + <name>Sam James</name> + </maintainer> + <longdescription> + LibTomMath is a free open source portable number theoretic multiple-precision + integer library written entirely in C. (phew!). The library is designed to + provide a simple to work with API that provides fairly efficient routines that + build out of the box without configuration. - The library builds out of the box with GCC 2.95 [and up] as well as Visual C++ - v6.00 [with SP5] without configuration. The source code is arranged to make it - easy to dive into a particular area very quickly. The code is also littered with - comments [This is one of the on going goals] that help explain the algorithms and - their implementations. Ideally the code will serve as an educational tool in the - future for CS students studying number theory. + The library builds out of the box with GCC 2.95 [and up] as well as Visual C++ + v6.00 [with SP5] without configuration. The source code is arranged to make it + easy to dive into a particular area very quickly. The code is also littered with + comments [This is one of the on going goals] that help explain the algorithms and + their implementations. Ideally the code will serve as an educational tool in the + future for CS students studying number theory. - The library provides a vast array of highly optimized routines from various - branches of number theory. + The library provides a vast array of highly optimized routines from various + branches of number theory. - * Simple Algebraic - o Addition - o Subtraction - o Multiplication - o Squaring - o Division - * Digit Manipulation - o Shift left/right whole digits (mult by 2b by moving digits) - o Fast multiplication/division by 2 and 2k for k>1 - o Binary AND, OR and XOR gates - * Modular Reductions - o Barrett Reduction (fast for any p) - o Montgomery Reduction (faster for any odd p) - o DR Reduction (faster for any restricted p see manual) - o 2k Reduction (fast reduction modulo 2p - k) - o The exptmod logic can use any of the four reduction algorithms when - appropriate with a single function call. - * Number Theoretic - o Greatest Common Divisor - o Least Common Multiple - o Jacobi Symbol Computation (falls back to Legendre for prime moduli) - o Multiplicative Inverse - o Extended Euclidean Algorithm - o Modular Exponentiation - o Fermat and Miller-Rabin Primality Tests, utility function such as - is_prime and next_prime - * Miscellaneous - o Root finding over Z - o Pseudo-random integers - o Signed and Unsigned comparisons - * Optimizations - o Fast Comba based Multiplier, Squaring and Montgomery routines. - o Montgomery, Diminished Radix and Barrett based modular - exponentiation. - o Karatsuba and Toom-Cook multiplication algorithms. - o Many pointer aliasing optimiztions throughout the entire library. - </longdescription> - <upstream> - <remote-id type="github">libtom/libtommath</remote-id> - </upstream> + * Simple Algebraic + o Addition + o Subtraction + o Multiplication + o Squaring + o Division + * Digit Manipulation + o Shift left/right whole digits (mult by 2b by moving digits) + o Fast multiplication/division by 2 and 2k for k>1 + o Binary AND, OR and XOR gates + * Modular Reductions + o Barrett Reduction (fast for any p) + o Montgomery Reduction (faster for any odd p) + o DR Reduction (faster for any restricted p see manual) + o 2k Reduction (fast reduction modulo 2p - k) + o The exptmod logic can use any of the four reduction algorithms when + appropriate with a single function call. + * Number Theoretic + o Greatest Common Divisor + o Least Common Multiple + o Jacobi Symbol Computation (falls back to Legendre for prime moduli) + o Multiplicative Inverse + o Extended Euclidean Algorithm + o Modular Exponentiation + o Fermat and Miller-Rabin Primality Tests, utility function such as + is_prime and next_prime + * Miscellaneous + o Root finding over Z + o Pseudo-random integers + o Signed and Unsigned comparisons + * Optimizations + o Fast Comba based Multiplier, Squaring and Montgomery routines. + o Montgomery, Diminished Radix and Barrett based modular + exponentiation. + o Karatsuba and Toom-Cook multiplication algorithms. + o Many pointer aliasing optimiztions throughout the entire library. + </longdescription> + <upstream> + <remote-id type="github">libtom/libtommath</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-libs/libtpms/Manifest b/dev-libs/libtpms/Manifest index 18b75de7d335..5da2d92b2b18 100644 --- a/dev-libs/libtpms/Manifest +++ b/dev-libs/libtpms/Manifest @@ -1,3 +1,3 @@ -DIST libtpms-0.7.2.tar.gz 1205662 BLAKE2B e549d94b6915b3a126aac76bc65c743acf9295fa4b4b836cfc34fb4cbe52e6da000d11d2995de377ccf5d0e2366d763dd1a881c4f4ab87631c52ad62b3792b7a SHA512 ddc1e00e01fe91977ac78e069a0005b7b6a4e34f41c2d53bfb24f3fdaea73945a83ae5aa344d01b6636fdd2f3dd30c4ec54b1ef58d0964700ba4cf688d436739 -EBUILD libtpms-0.7.2.ebuild 685 BLAKE2B 68f92d960b69dcf47f7857c5dcffb1779ca0590f55376dfd02fcc8aa2d0d59b12e378c575d4cdf43be97693a88f48c4cd306c0eb612d63e475a28381f4ba7221 SHA512 59ab00ed93f3fbcede655b7329ed028cc8cb25dc0f28234bc11b083916db6deaf821a82413f416b8811c4a67f4173d204a2a0efc0e68238cc9b83cc8ab970dbc +DIST libtpms-0.7.3.tar.gz 1206014 BLAKE2B 32636be3e15e27a53de1c935144d2363a80689456bd70493b4eef38214ef1b9ef84ae43d1da253c9dd3e362d385b6e1638eace7a1f105736ca54f581a5f474f0 SHA512 bfd573f909965991e266434391de5f1e52c724e679e5580b7839032a1ee57f8d36cdec6d892b1d22fb7285335801a6fe17ea8559ea7ba43704fbf57c6a06dd05 +EBUILD libtpms-0.7.3.ebuild 685 BLAKE2B 68f92d960b69dcf47f7857c5dcffb1779ca0590f55376dfd02fcc8aa2d0d59b12e378c575d4cdf43be97693a88f48c4cd306c0eb612d63e475a28381f4ba7221 SHA512 59ab00ed93f3fbcede655b7329ed028cc8cb25dc0f28234bc11b083916db6deaf821a82413f416b8811c4a67f4173d204a2a0efc0e68238cc9b83cc8ab970dbc MISC metadata.xml 370 BLAKE2B eb4d1a4a8e56cbdcb5b7f86029feb6e2151967f7b4801fbb3a8c2de35840969a4987ca2aada95792cb35ab03702715b1f66fe966c176969de743c64775bed0cb SHA512 5a2f5a0089bb0c54dd36821005a65cbe8c4fd05f1d7e0367eaff02031a39c749e005e5432da334081304af8c55b330b549821819455f1f0919d4525a254ca5c6 diff --git a/dev-libs/libtpms/libtpms-0.7.2.ebuild b/dev-libs/libtpms/libtpms-0.7.3.ebuild index 1daf31882dc5..1daf31882dc5 100644 --- a/dev-libs/libtpms/libtpms-0.7.2.ebuild +++ b/dev-libs/libtpms/libtpms-0.7.3.ebuild diff --git a/dev-libs/libudfread/Manifest b/dev-libs/libudfread/Manifest index 910a5c2a2d0d..0a185e2216c3 100644 --- a/dev-libs/libudfread/Manifest +++ b/dev-libs/libudfread/Manifest @@ -1,6 +1,6 @@ DIST libudfread-1.0.0.tar.gz 31420 BLAKE2B bf68560d283fb88af54ee1a939166e68df94d60f1e8d3fc0d0e6e1d0faa0b9ef35825ff8a2dbbcdbfb0412dbe6e1639a34b844c10cf7424a659f974a53b59b2c SHA512 8b48d809197f3e9e4271755acffe74849aa3a01c6b23eab3acad6c2bb0c9045491f43657953300e5f84b27e99715ea2a2c4926f1120b3f5129042703c2804606 DIST libudfread-1.1.0.tar.gz 33506 BLAKE2B e7fab72ebecb372c54af77b4907e53f77a5503af66e129bd2083ef7f4209ebfbed163ffd552e32b7181829664fff6ab82a1cdf00c81dc6f3cc6bfc8fa7242f6e SHA512 340a03fe90d26a8a5c78e1e4f558a0b448a14332a661494f44af7de3e6c98cd219125e19f69d2a611ecb4870648a5d5b55d794e665eb8ec4192c0b499a0701ed EBUILD libudfread-1.0.0-r1.ebuild 799 BLAKE2B 60f4e16c234c661cf757969496ec1bb26977eba3dd008578f6677d1a6f7f5b27f36099f74f2b59fcc1fa253d8b63063a4207b28480fd535e5cc67ab3198b7eca SHA512 aa1a1522ab37223814ea09563ecc22947f049752701372cfa9b93a134a5f195144cd89ee0c56acb1ac88f8f2281956833bebea8bc1854135b7b26f3cfb597837 -EBUILD libudfread-1.1.0.ebuild 799 BLAKE2B 60f4e16c234c661cf757969496ec1bb26977eba3dd008578f6677d1a6f7f5b27f36099f74f2b59fcc1fa253d8b63063a4207b28480fd535e5cc67ab3198b7eca SHA512 aa1a1522ab37223814ea09563ecc22947f049752701372cfa9b93a134a5f195144cd89ee0c56acb1ac88f8f2281956833bebea8bc1854135b7b26f3cfb597837 +EBUILD libudfread-1.1.0.ebuild 806 BLAKE2B 96b131caa9da63f3bf55e36dc4057c17d744ce92e2d631e5670cc52a1504a74bdf0b81f435d8e3aa6864e850eacf8ec5bd27d205ae581ecb81e580a4db24dbb4 SHA512 0c8172358d8a8040fca4af9ccd372cf1aa901c8d76ff676b4b7c01b5a75b57ac791f2dca4735bc4e1643c69762476cce27dcf8072a1e72d6f8f16dc524619f44 EBUILD libudfread-9999.ebuild 799 BLAKE2B 60f4e16c234c661cf757969496ec1bb26977eba3dd008578f6677d1a6f7f5b27f36099f74f2b59fcc1fa253d8b63063a4207b28480fd535e5cc67ab3198b7eca SHA512 aa1a1522ab37223814ea09563ecc22947f049752701372cfa9b93a134a5f195144cd89ee0c56acb1ac88f8f2281956833bebea8bc1854135b7b26f3cfb597837 MISC metadata.xml 254 BLAKE2B 28a36c4387e6a38145f39cc2a77ecabf1754b29efa32b7a3400b699432011196162823ee23a043d857a182fa32959a83c04fec021a151168d951687a65e91997 SHA512 953a590c431a9ac1ef877b81a589da36d36c396f06dc689bb5d62bd12e9a4e89175eb0a3142981df00ced8a50e08e6d122a734e31937a334176b782f17368d50 diff --git a/dev-libs/libudfread/libudfread-1.1.0.ebuild b/dev-libs/libudfread/libudfread-1.1.0.ebuild index 6dd66e41c5cd..6297184ebd35 100644 --- a/dev-libs/libudfread/libudfread-1.1.0.ebuild +++ b/dev-libs/libudfread/libudfread-1.1.0.ebuild @@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then inherit git-r3 else SRC_URI="https://code.videolan.org/videolan/libudfread/-/archive/${PV}/${P}.tar.gz" - KEYWORDS="~amd64 ~x86" + KEYWORDS="~amd64 ~arm64 ~x86" fi DESCRIPTION="Library for reading UDF from raw devices and image files" diff --git a/dev-libs/libugpio/Manifest b/dev-libs/libugpio/Manifest index 7d28c5caf1ca..83a60b6cf32d 100644 --- a/dev-libs/libugpio/Manifest +++ b/dev-libs/libugpio/Manifest @@ -1,3 +1,5 @@ DIST libugpio-0.0.6.tar.bz2 252283 BLAKE2B ebdfae8ef400b3deb95e4313fd0ca2ad7b195945c850ce5c84904373bca2f2c9d446aec45b0500f549ab5319a294fbc2f0c37a6734fab69d8571389a0cb5fb63 SHA512 f40517d34509f9f3b5b26a5cb5523863034d48887ef3f26bd38a38e9aeac73e09ecf71099cd5a036e23fe3db5c8c2ead588c49022a398f2a426bc7148cc64ecd +DIST libugpio-0.0.7.tar.bz2 300015 BLAKE2B 430a17651f3c443424694d50817e562ab3c682ae2006c14d2ca46ee3078993e85214a0ca0b9323d148ca3aedaa758985cf5e2e45527e1d1278d3a36c3648ecf9 SHA512 27f8b00b13b4865635fa26e9b14c7fe217ee005c316500f0f344268d82f8d2858def524bd5cee11e9cca9c2a534a50546d5fc3504ecd1f88bd96c6fbefe1586e EBUILD libugpio-0.0.6.ebuild 605 BLAKE2B 48b6c2faca3a050d2624321f70507e56926b428d2bc11445a21d9b5a076e2b5059945c02e9bcaa22814291010504c0eb1878026a1efc1d6590dc9c655916d9c4 SHA512 346a2fad0ef0f6c1db939989520a7e8c290aa2399fd1a68f100c4826298147068ed4a8de249a7e17aa6438420efcb3151ea9a1165c235aff578493e5e7f27640 +EBUILD libugpio-0.0.7.ebuild 609 BLAKE2B d9cb106ec206dce0efbdcd273eeb68fa16dcf1ce94154fe39981f58deb26eb2d96dd9d16c02e0482f0b3abf12217fe3b372dcdb24379b078e9c4da0793676cee SHA512 8aaf3a20064cf74d4c53a023e276c470f2e85d51d65f117fffd7e10184ab2ef85f76edff3130eb177c57d91bcb54343f701d160a249827aac118779bc6792566 MISC metadata.xml 634 BLAKE2B 08bf2fa023595f3444926c7fca72af2d2a649ff2ac5b8372447f58113f4667ba4d85b46c0a872cef9ce76f4bd437b6c28a03e5c602c640de465a08ffe3718720 SHA512 946cb753670d9a2bb3c2cb4a35feb3e633e4d3d9a44584ff2e896544e11621aeb31630938d7e64d7d830e1e9fcf7edb4755dbda6fa502d624472e23227dd6d14 diff --git a/dev-libs/libugpio/libugpio-0.0.7.ebuild b/dev-libs/libugpio/libugpio-0.0.7.ebuild new file mode 100644 index 000000000000..9ce29b2cceda --- /dev/null +++ b/dev-libs/libugpio/libugpio-0.0.7.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit linux-info + +DESCRIPTION="Lib for the use of linux kernel's sysfs gpio interface from C programs" +HOMEPAGE="https://github.com/mhei/libugpio" +SRC_URI="https://github.com/mhei/${PN}/releases/download/v${PV}/${P}.tar.bz2" + +LICENSE="GPL-3+ LGPL-2.1+" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" + +CONFIG_CHECK="~CONFIG_GPIO_SYSFS" + +src_configure() { + local myeconfargs=( + --disable-static + ) + + econf "${myeconfargs[@]}" +} + +src_install() { + default + + find "${D}" -name '*.la' -delete || die +} diff --git a/dev-libs/libuv/Manifest b/dev-libs/libuv/Manifest index 1cca2c4bd8ec..51e1cdaef509 100644 --- a/dev-libs/libuv/Manifest +++ b/dev-libs/libuv/Manifest @@ -2,9 +2,11 @@ DIST libuv-1.35.0.tar.gz 1253950 BLAKE2B 81ed766d0ca6fc0f8d2ed0b530b9a43104a2f98 DIST libuv-1.37.0.tar.gz 1249701 BLAKE2B 4c48e2062eaaa259623908db99e3ca4b63f27dcbae097b05af542b32860d79aa5aaf5b388c48902a1927b9c4ad6e88b1c2dc2c052815e1321c3e17932c7f09c6 SHA512 ae0d864f5455696507b3a7680170d26e0e333aaeeb74dc2647fc9774a89912ba8ac2be056dbd5cd2b0224ec36ef7bb223fbc851a77302be82c531f8ea01545e0 DIST libuv-1.38.0.tar.gz 1261216 BLAKE2B 837a98e176878e81a9dbe10ee178fa1f738c406eb765308017cc3507ba8343ffbb0c09a68dd1376c855e5c0eb938196ab477aeef764219b64f1999468cadf72b SHA512 da9af33ec17f46f2390661f84e942115c442e665cb63ba5637eb12d2cb0b034889e0d816f261abe7fff3b4d0b44ab8bb63c81f3ec1917325cf0ca93e01921641 DIST libuv-1.38.1.tar.gz 1262516 BLAKE2B 1c9f04c717a5d814575b86f7b222c18f08a2cea46bfcb48796776c569539363c4a55a2b3c6a8803b89a3964ea4cbacee75d4bccf653250b0823629a4150c972f SHA512 96a52399828b13623bebaa017f401322a5552f596443301d1159ec310112132abe47da0cd39ad3eeae3e8b14d575f2b6bf3d900c2032aac49c0b0260b30f3952 +DIST libuv-1.39.0.tar.gz 1272565 BLAKE2B a5ca826f99f2b7fc1736463df3c455caf2b63c8915fba61edd7b418639040910dfab6e170a089da0c18cd928d3b80c586cd10be4c5331a924a37105328960ca5 SHA512 b6aca197cbfc96125321ff071f6b2f3e56e99f85db8db6e20601019eae08056b42330ea7a73aa8c9960d142a1c8209910bc33050527f6fe0afaa8f7ed9f54066 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-1.38.1.ebuild 1231 BLAKE2B 07bbc6b09e38c9afb4fa929b74b636905c6e4eccaa14a594d68ff189f3523a4c5e1e0bc14c4244e21d95f49e8943a24d88ab9e818ee78ce0b3bff4f8b532ec2f SHA512 ec0b799dd24416c8b70112f745ac2604010f9f809d8dc385341aaf1ef825eecf111bfec1ab68372428a71e85b5973549bd5128ef6d256a8279b36d08a3343c37 +EBUILD libuv-1.39.0.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.39.0.ebuild b/dev-libs/libuv/libuv-1.39.0.ebuild new file mode 100644 index 000000000000..a9a8ca340c4c --- /dev/null +++ b/dev-libs/libuv/libuv-1.39.0.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit autotools multilib-minimal + +DESCRIPTION="Cross-platform asychronous I/O" +HOMEPAGE="https://github.com/libuv/libuv" +SRC_URI="https://github.com/libuv/libuv/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD BSD-2 ISC MIT" +SLOT="0/1" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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="static-libs" +RESTRICT="test" + +BDEPEND=" + sys-devel/libtool + virtual/pkgconfig +" + +src_prepare() { + default + + echo "m4_define([UV_EXTRA_AUTOMAKE_FLAGS], [serial-tests])" \ + > m4/libuv-extra-automake-flags.m4 || die + + # upstream fails to ship a configure script + eautoreconf +} + +multilib_src_configure() { + local myeconfargs=( + cc_cv_cflags__g=no + $(use_enable static-libs static) + ) + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" +} + +multilib_src_test() { + mkdir "${BUILD_DIR}"/test || die + cp -pPR "${S}"/test/fixtures "${BUILD_DIR}"/test/fixtures || die + default +} + +multilib_src_install_all() { + einstalldocs + find "${D}" -name '*.la' -delete || die +} diff --git a/dev-libs/libwapcaplet/Manifest b/dev-libs/libwapcaplet/Manifest index f6053ada946e..3d78ffcca306 100644 --- a/dev-libs/libwapcaplet/Manifest +++ b/dev-libs/libwapcaplet/Manifest @@ -2,7 +2,7 @@ AUX libwapcaplet-0.4.1-makefile.patch 391 BLAKE2B 0536fdc5fd0e8bca72b0fc33198eba 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 +EBUILD libwapcaplet-0.4.1-r2.ebuild 801 BLAKE2B 1ef469d0b68d673ac0da023f6a5a70cc61aff43d17c7c7817ca51439ddb1c72ebd8ffae447352060626c2ef7df9405b8873331306bdf8390ffee17cddc2f5aa3 SHA512 04340ae18d8a0aeca656d17450614d52b867be13d1a07d0e3a2c96ea0ed3421fbdd7d3bc9c217d6ba76517a3a069102264fd2a041f5a1e156faa3ef5a2d76863 +EBUILD libwapcaplet-0.4.2-r1.ebuild 813 BLAKE2B 2a01407f8f0e41f694b78d286a0d4781c39c4651661dc2747f764fc8d92613878610f45031374ffe8f3c27658d3e892cf571e480de0f442ef573dc824f79d213 SHA512 68b123666f50cf309fe00ba5fdff3577868dba72413c71d63ad93f8ee9b087cc3c140ce1502e9d00529ebb5fea79574138afbaba849119dd38d44f77e2fbd571 +EBUILD libwapcaplet-0.4.3-r1.ebuild 813 BLAKE2B 2a01407f8f0e41f694b78d286a0d4781c39c4651661dc2747f764fc8d92613878610f45031374ffe8f3c27658d3e892cf571e480de0f442ef573dc824f79d213 SHA512 68b123666f50cf309fe00ba5fdff3577868dba72413c71d63ad93f8ee9b087cc3c140ce1502e9d00529ebb5fea79574138afbaba849119dd38d44f77e2fbd571 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33 diff --git a/dev-libs/libwapcaplet/libwapcaplet-0.4.1-r1.ebuild b/dev-libs/libwapcaplet/libwapcaplet-0.4.1-r2.ebuild index fbad93ecf82d..d553e7e2201b 100644 --- a/dev-libs/libwapcaplet/libwapcaplet-0.4.1-r1.ebuild +++ b/dev-libs/libwapcaplet/libwapcaplet-0.4.1-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 toolchain-funcs +inherit netsurf DESCRIPTION="string internment library, written in C" HOMEPAGE="http://www.netsurf-browser.org/projects/libwapcaplet/" @@ -25,7 +25,6 @@ PATCHES=( ) _emake() { - source /usr/share/netsurf-buildsystem/gentoo-helpers.sh netsurf_define_makeconf emake "${NETSURF_MAKECONF[@]}" COMPONENT_TYPE=lib-shared $@ } @@ -39,5 +38,5 @@ src_test() { } src_install() { - _emake DESTDIR="${ED}" install + _emake DESTDIR="${D}" install } diff --git a/dev-libs/libwapcaplet/libwapcaplet-0.4.3.ebuild b/dev-libs/libwapcaplet/libwapcaplet-0.4.2-r1.ebuild index 8b442d55ff3a..cb74894bb4bd 100644 --- a/dev-libs/libwapcaplet/libwapcaplet-0.4.3.ebuild +++ b/dev-libs/libwapcaplet/libwapcaplet-0.4.2-r1.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit toolchain-funcs +inherit netsurf DESCRIPTION="string internment library, written in C" HOMEPAGE="http://www.netsurf-browser.org/projects/libwapcaplet/" @@ -27,7 +27,6 @@ PATCHES=( ) _emake() { - source /usr/share/netsurf-buildsystem/gentoo-helpers.sh netsurf_define_makeconf emake "${NETSURF_MAKECONF[@]}" COMPONENT_TYPE=lib-shared $@ } diff --git a/dev-libs/libwapcaplet/libwapcaplet-0.4.2.ebuild b/dev-libs/libwapcaplet/libwapcaplet-0.4.3-r1.ebuild index 439cde67cbfc..cb74894bb4bd 100644 --- a/dev-libs/libwapcaplet/libwapcaplet-0.4.2.ebuild +++ b/dev-libs/libwapcaplet/libwapcaplet-0.4.3-r1.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 toolchain-funcs +inherit netsurf DESCRIPTION="string internment library, written in C" HOMEPAGE="http://www.netsurf-browser.org/projects/libwapcaplet/" @@ -27,7 +27,6 @@ PATCHES=( ) _emake() { - source /usr/share/netsurf-buildsystem/gentoo-helpers.sh netsurf_define_makeconf emake "${NETSURF_MAKECONF[@]}" COMPONENT_TYPE=lib-shared $@ } @@ -41,5 +40,5 @@ src_test() { } src_install() { - _emake DESTDIR="${ED}" install + _emake DESTDIR="${D}" install } diff --git a/dev-libs/libxls/Manifest b/dev-libs/libxls/Manifest index 892a58861050..d446bd9e5f38 100644 --- a/dev-libs/libxls/Manifest +++ b/dev-libs/libxls/Manifest @@ -1,6 +1,4 @@ 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 +EBUILD libxls-1.5.3.ebuild 678 BLAKE2B 1fc9837da9af845430a516f4e5d16ef9454efd0cfcf3c40ac2f1ec0aa39b462617ff7f30396423fe079361e51e832324601f494ad63164671290a1220e8cc1b7 SHA512 124f7124d89918534327cb2e2c9d245d1614fd7b1d052b315f4d875363c320cb3f0c0e460459dc4fb3a6fd5ee88d2e5c7739e507f9b8d5406b90cbd9b32e73c2 MISC metadata.xml 392 BLAKE2B 77f7b66d8024437b9a7b2b07bb78f451fccc5636629e284d053be66efa136982d026f28912c0a7b407059f8f5e33618ae15c83113f8bd380a168dcc1032f96bf SHA512 ccf08982c319c4e2c3fa94d1920f012207f35c75c445555312d20976612436d21bfa1cf93cf6014697a0210fd549146ea0f3eb73fbeee45d09d15952286fe3aa diff --git a/dev-libs/libxls/libxls-1.5.2-r1.ebuild b/dev-libs/libxls/libxls-1.5.2-r1.ebuild deleted file mode 100644 index 4d19444a5b7a..000000000000 --- a/dev-libs/libxls/libxls-1.5.2-r1.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# 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/libxls/libxls-1.5.3.ebuild b/dev-libs/libxls/libxls-1.5.3.ebuild index 6238aba02e32..4d19444a5b7a 100644 --- a/dev-libs/libxls/libxls-1.5.3.ebuild +++ b/dev-libs/libxls/libxls-1.5.3.ebuild @@ -11,7 +11,7 @@ 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" +KEYWORDS="amd64 x86" IUSE="" RDEPEND="" diff --git a/dev-libs/libxml2/Manifest b/dev-libs/libxml2/Manifest index 9e4423b9e084..8c8d602ed772 100644 --- a/dev-libs/libxml2/Manifest +++ b/dev-libs/libxml2/Manifest @@ -2,10 +2,15 @@ AUX 2.9.9-python3-unicode-errors.patch 1259 BLAKE2B 4425728c1e7a16c3b7faafba0246 AUX libxml2-2.7.1-catalog_path.patch 2225 BLAKE2B 9a9c5836e5227e51de05d1e19c27b828c3c082c671d9b9bfb30afbe971fca580fb87cd86560e2ed431b4dc1495585c62f01da0f36e401d4dbdc4d8be2269cca5 SHA512 bcad080ee84c926c75df8baa47937bdfcfa207235263249f4025e64cbb5ac9be883e1ac4dc1ee55944116da2f84ced27b7cae781aa855579796f3f53a54aacb1 AUX libxml2-2.9.2-python-ABIFLAG.patch 728 BLAKE2B d81b042b5000717d5aa88ac4cebf78749f5a4ef661c227537171c5695d97a16ca75c790c8b540e3481a54dc2d935112b46e0a23509c887e16e3f2886c08f1d69 SHA512 2f801329ad4e13dc70450d41f7659a510fe429b3aa9b66859fed25c4e3d95381d6f253f3a60a54002a16999296d3bd2adaca5e4cca92186492bfc7de3ac84426 AUX libxml2-2.9.8-out-of-tree-test.patch 1311 BLAKE2B 7b3e7abf273c1ab2cbc42b1fcd4ff7bef365503d8c04b315b0857574054409ac76c367f7ef0c944d448ef3ca84268082f59424758894cffa31a93925a81972c8 SHA512 4b665c7c4bea2d938f7b2021a38f274b9e40dd38c5e2085716cae02c60cd3ff9aa109185e7bfdd38d2724d76500c99da0db0968f634b56f7ef418a7a72ef144a +DIST libxml2-2.9.10-patchset.tar.xz 71584 BLAKE2B 4925a28570ed4f84da0407c3ce5b257d0959661855792160e4c534125fe0bbfa3749e7fc43b6c91a17206ac08a85922f4158bf40164c8a17ec940bf12b7dde1c SHA512 cd5a6aa86b6cf9ff852922ecfa23f34edeecab10a0e6d1bcd4dca56a6e17713b10af9387c7a6276bfec612f1d44fc06c16a7bdcab01ef9080f4dd10fab253b93 +DIST libxml2-2.9.10-r1-patchset.tar.xz 72088 BLAKE2B 4d5f8aed35d6c0232089e09f22a77cbd25cbd2007c1330538e1c7acc4398ec3ef9023289129677cf5499dbacde4c2f28850ae81acab351d02625d3452aedaede SHA512 a63032d1e85128f637c2b54356aab06a17e31eb1f5facd8fdf88463eb21df6a1d9fd8cc751fa94b8d322fa4f796be4e1d9aa071cbd0826ab31fae46525fde952 +DIST libxml2-2.9.10.tar.gz 5624761 BLAKE2B a9958bd7db17fbfb8259b64d66548eb19d28f1aecf40cf66752fcec5720855d31cea9941d52963badd8c18ea1770485f1c11da6213149458336ce0273418f421 SHA512 0adfd12bfde89cbd6296ba6e66b6bed4edb814a74b4265bda34d95c41d9d92c696ee7adb0c737aaf9cc6e10426a31a35079b2a23d26c074e299858da12c072ed DIST libxml2-2.9.9-patchset.tar.xz 16792 BLAKE2B f761b5cda41d57543dadf2cdd8915b69727a818f31badc1092903a9e4341b807852fed0887e9ec7a06a0c19c4a49f9afc2f3c048947f21a09006bb51ef8399ef SHA512 c8c0ee6d0a2833e5664aa7549999f8ba63b9f0bbfda4651050eeee7d3a958c33ef55daba8cfb1ca73ebffeb44d411b5f4259fe6e11ef0204ad2deebd1708ebfb DIST libxml2-2.9.9.tar.gz 5476717 BLAKE2B 00a67c38084f2effd5d68d7d3e68f0c96cf4f52eab6d8d9b96dc91f03a84baa132abeaf303a836ff9bbf04f832432a036077316c464398e433c9779d8519074b SHA512 cb7784ba4e72e942614e12e4f83f4ceb275f3d738b30e3b5c1f25edf8e9fa6789e854685974eed95b362049dbf6c8e7357e0327d64c681ed390534ac154e6810 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.10-r1.ebuild 6817 BLAKE2B fb3c82c45702da0b683fe167d07bc241196c69835b0daee4cb9f94f9f611197bde3ed1f2dfba1f6bbba581e698d2e1cb148c3a02499797f88123748f7a08933b SHA512 427c7ef39e8f6f20f3525f5a1c726a4c866ff1ad3e5229ad03d3e52ce30b1f416fd2c88604a012f0b18ea73eabbda316472d5c56fd0dec74ab75ad43c85c7046 +EBUILD libxml2-2.9.10.ebuild 6816 BLAKE2B 7d1574df705961e96f314c4e64a05fff9930c01164ef006e28466ea57327558db7ab1bf698798a0182d0bd3c45e15314ad78515c1651b3dd53d14209162be6e5 SHA512 517edfdc130d70de52b825c37d3ca36ecc0a4b04ceca5e7bde251d823dcf53b43ce08fced4bf06a940395fcdefe2f9ff93d6c67ad813c9ad9a6228232df316cb 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.10-r1.ebuild b/dev-libs/libxml2/libxml2-2.9.10-r1.ebuild new file mode 100644 index 000000000000..07a922640fd6 --- /dev/null +++ b/dev-libs/libxml2/libxml2-2.9.10-r1.ebuild @@ -0,0 +1,224 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} ) +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/~sam/distfiles/${CATEGORY}/${PN}/${PF}-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}" +BDEPEND=" + dev-util/gtk-doc-am + virtual/pkgconfig +" + +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 ${PF}-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/libxml2/libxml2-2.9.10.ebuild b/dev-libs/libxml2/libxml2-2.9.10.ebuild new file mode 100644 index 000000000000..d0bf6aa7bf9d --- /dev/null +++ b/dev-libs/libxml2/libxml2-2.9.10.ebuild @@ -0,0 +1,224 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} ) +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/~sam/distfiles/${CATEGORY}/${PN}/${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}" +BDEPEND=" + dev-util/gtk-doc-am + virtual/pkgconfig +" + +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 9a744a3f949d..3aaded6d1f35 100644 --- a/dev-libs/libxmlb/Manifest +++ b/dev-libs/libxmlb/Manifest @@ -1,7 +1,5 @@ -DIST libxmlb-0.1.12.tar.gz 91256 BLAKE2B b063bed9d7794b300ec40622c7fd0caac974b7f1be57b08ccb1864587b7bf47f892a39d1f4f0df226d3fe7ca03ffcec471a4f28afb8e64ae841d6898a337b60f SHA512 aebd9f41421bb0d78954038b3221bed879d296ec2d3061e7e7747980974e01081e51ea36d4e94545af5006b3dc4714d535aeea1943e42a7f1661ba1177979b31 -DIST libxmlb-0.1.14.tar.gz 92388 BLAKE2B cf3057fadf87c866f456bb2eac773e056adba56e0912c249cd89acff2e9a722414876717c6b2065d836fee66032a3d55d9fd2a824ef1fe480604c36887b47c44 SHA512 906340212ce4a515bec81a1b7a5f04539712a48322d7fcff0992f82e5676cdf15c38b0340c28c9eed65a58321e3e17bac641f05bd403504c87599327ba6d4e49 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 +DIST libxmlb-0.2.0.tar.gz 97521 BLAKE2B 7a47164503b5b682e2bb9d877622a7dcad06d40bf87d6a7cf9e21898d8444e610ba3985d6be8cf65068f0637ee44ef8678610315be2795476b2f5ccaacb098ea SHA512 cff4245a47a942dd37675921ba753858a3ee0572500a1cd7291d2a063fa7fa9d9157c167bf33694e4e0204504d7e88fbfd2873c4b9851247d6cdb338c2d587a8 EBUILD libxmlb-0.1.15.ebuild 1228 BLAKE2B 8cfdb11b371d1c9b710147e5963003e47d48006b137b183ce8995a85d565df9fe681555000c366b4e944979400eb3306c903eacbf460b2615c52a4731b3a4611 SHA512 ae8f7237ca068cea6e17feb6aa0182a593d6d49a61cfd5a5b4a90aa013d4cb64109f983a728867450c4798aefce2dd1eaf0873c25bda356e431f770ead431a08 +EBUILD libxmlb-0.2.0.ebuild 1253 BLAKE2B 13704d38962eec15866858cc6de0044b5a2fafea7a8779b4944b7aff23b01ac092cb481bb1d84376fefeb984320c01ef023bb441afc97697422cec2eed7f6257 SHA512 d51b93170189a70b6de957a23241d2a58966a23845c7d02e76de26550e2ffd8c1ae9fe0cb8ef68a976dacdaa0fa8279a0863daaeafacac9232a93693d5c982ee MISC metadata.xml 423 BLAKE2B 4f6fce646b2b255484b20c506f3a192ddfe0748987d76b4010bbc4efb69db159acfd8dff07e851f6c009aa2afac24ed2b252b7ee2a817fb583b11924d9f865a2 SHA512 b1d47209f5bb217313f0a4f6b27d0c54e4968f010c066c95b6f2df889b0914a5eae7ef8758b965f69475a4c8ce955120d6f452db5060b5f1bd93d5ca7d87e8c9 diff --git a/dev-libs/libxmlb/libxmlb-0.1.12.ebuild b/dev-libs/libxmlb/libxmlb-0.1.12.ebuild deleted file mode 100644 index 39773118f0a0..000000000000 --- a/dev-libs/libxmlb/libxmlb-0.1.12.ebuild +++ /dev/null @@ -1,58 +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} ) - -inherit meson python-any-r1 - -DESCRIPTION="Library to help create and query binary XML blobs" -HOMEPAGE="https://github.com/hughsie/libxmlb" -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" -IUSE="doc introspection stemmer test" - -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-libs/glib:2 - sys-apps/util-linux - stemmer? ( dev-libs/snowball-stemmer ) -" - -DEPEND=" - ${RDEPEND} - doc? ( dev-util/gtk-doc ) - introspection? ( dev-libs/gobject-introspection ) -" - -BDEPEND=" - >=dev-util/meson-0.47.0 - virtual/pkgconfig - introspection? ( - $(python_gen_any_dep 'dev-python/setuptools[${PYTHON_USEDEP}]') - ${PYTHON_DEPS} - ) -" - -python_check_deps() { - has_version -b "dev-python/setuptools[${PYTHON_USEDEP}]" -} - -pkg_setup() { - use introspection && python-any-r1_pkg_setup -} - -src_configure() { - local emesonargs=( - -Dgtkdoc="$(usex doc true false)" - -Dintrospection="$(usex introspection true false)" - -Dstemmer="$(usex stemmer true false)" - -Dtests="$(usex test true false)" - ) - meson_src_configure -} diff --git a/dev-libs/libxmlb/libxmlb-0.1.14.ebuild b/dev-libs/libxmlb/libxmlb-0.2.0.ebuild index 8ceaed57364c..eef8b51f8641 100644 --- a/dev-libs/libxmlb/libxmlb-0.1.14.ebuild +++ b/dev-libs/libxmlb/libxmlb-0.2.0.ebuild @@ -11,7 +11,7 @@ DESCRIPTION="Library to help create and query binary XML blobs" HOMEPAGE="https://github.com/hughsie/libxmlb" SRC_URI="https://github.com/hughsie/libxmlb/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="LGPL-2.1+" -SLOT="0" +SLOT="0/2" # libxmlb.so version KEYWORDS="~amd64 ~arm ~arm64 ~x86" IUSE="doc introspection stemmer test" diff --git a/dev-libs/libxslt/Manifest b/dev-libs/libxslt/Manifest index 2574573ffd3c..36e3a960c7e7 100644 --- a/dev-libs/libxslt/Manifest +++ b/dev-libs/libxslt/Manifest @@ -1,6 +1,10 @@ -AUX 1.1.32-simplify-python.patch 7487 BLAKE2B 401c691c12cd7aaae4eeef26bbd34ba17346a9bd5801d89989504fff34de65a0afe706d4ff7f4ecd29894ffdfd54958d0c3e9da97946ced540b797ff7c9ddd25 SHA512 7aec9780cd092bea6cf4e443e79da44de22abab18a4c2ff9dbfa3ee44beb193029d9f2474a379812efad452412efdfcef1af5658d0843fb946247f2bbbf8cee8 AUX libxslt-1.1.28-disable-static-modules.patch 1109 BLAKE2B fc4c8c1dc932ff9bdce27064bf68b7bb7c8de94902e26250ba280d771464e9c92bc069f36910ed96269bd1c4270e1f881921d8f7f9101941a4fcdbe9f77380e9 SHA512 d7a091d2b303450d46e94ca53df630ec6cdee8707ffd7d7d2920a56a624f1f8f53d2c1753768b49786c0ce17b6512f8de7740b54bf1c3cdbc5e8a5f3d052b1d1 +AUX libxslt-1.1.32-simplify-python.patch 7487 BLAKE2B 401c691c12cd7aaae4eeef26bbd34ba17346a9bd5801d89989504fff34de65a0afe706d4ff7f4ecd29894ffdfd54958d0c3e9da97946ced540b797ff7c9ddd25 SHA512 7aec9780cd092bea6cf4e443e79da44de22abab18a4c2ff9dbfa3ee44beb193029d9f2474a379812efad452412efdfcef1af5658d0843fb946247f2bbbf8cee8 +AUX libxslt-1.1.34-simplify-python.patch 7174 BLAKE2B dfccd03cd286b1cedcce23234a7e5e1edceee7d41f86235c9ca55d9f9110a8a5f9314c169a26b8cf65b95e26d03e01d21ea7fd437f8aca70356897c048b76710 SHA512 55028c59048eb218dcff6e719dbd8a4af5874ef8562ca2cb6ebafbe72a123785cd5a08d3ae2c7fd8e49030612d1f7cddb5d525b4e3b07d141aebd775a8a19068 DIST libxslt-1.1.33-CVE-2019-11068.patch 3965 BLAKE2B eb3a0741ac9f464e31e8edd276fec4d837c63676a56a446ad42a0e251508bacb0129cbe18783de305336eaa32b189ffc23e95e03cfd5f940d4dee376f1fa0f8c SHA512 9a97c5038809aaf64cb4eb7d67b95acc4b62236d7613a5f753e2a0f4c9e707c22cd07bda2e518d3f36a40b9ed5aa93496b743998c7adadb84ca147e045e35948 DIST libxslt-1.1.33.tar.gz 3444093 BLAKE2B 3457e5b62328ccbc48fbc5f71bf8a54c195c0059dd18afa38e6916e74c57e72601970446210c7584d5410b956e3bbb8cd4b852ec71e0a13c4441e6de095d86d1 SHA512 ebbe438a38bf6355950167d3b580edc22baa46a77068c18c42445c1c9c716d42bed3b30c5cd5bec359ab32d03843224dae458e9e32dc61693e7cf4bab23536e0 -EBUILD libxslt-1.1.33-r1.ebuild 3445 BLAKE2B 190be63217e3bc52386bfedfd6696a037edb644b37a3afdc77044034db2b4ae164a634ec9e1799669df0a61d2437deac792c7030a1ad05b05a399d895bd44537 SHA512 bfc75fa72d0f2ca0be73f20444b3f686006df081a8a61c0b6b5e30ee5ea8b3073daa9a532cc0b52e3de8ab03153005e8404384409257cae2be4120f63a5a8c71 +DIST libxslt-1.1.34.tar.gz 3552258 BLAKE2B f043a0357e0705ab68041adf4031a6b3e0b5c3d396691c988a34963a0ee0ebe3bede2d1d7a0c5f0c42c046183653c94f4b51e10e35980a039c8cad446e84ad86 SHA512 1516a11ad608b04740674060d2c5d733b88889de5e413b9a4e8bf8d1a90d712149df6d2b1345b615f529d7c7d3fa6dae12e544da828b39c7d415e54c0ee0776b +EBUILD libxslt-1.1.33-r1.ebuild 3476 BLAKE2B 8c01bf27c646b31949d5c7ae74ad40df43ddc227f885757a331901c5d055f5d3d9fa09593556dca3a8f49a73f48981e8988d2756252feb7255a23dbe905e83f0 SHA512 4656d28fdd1b1ef9f6145a7bafe01e44a6c77480bd966958e48ddd4911ae43663a56e7365f5e48639a28f4e58e966616ff5bc7bc81fe2e0a3c5e02d646ac44db +EBUILD libxslt-1.1.34-r1.ebuild 1574 BLAKE2B 6c4e3d5ff4cee55ba520d58a4c58e24e142fab2051a2984ed86b23e14152a65aaec71ed913bf6becd47fca9d21ea4239a487e00e14c8a9836e9f5c823ab76e57 SHA512 eab27d5651620074ab52c414ecc9728525bdeeedcb6ef36921a83f71578335b27888dd3bb03154a73e19ef62e45d346b6d34fc172e88dbca101b2a7fff231e2d +EBUILD libxslt-1.1.34.ebuild 3299 BLAKE2B 73cef3a1e3928be709e0020f0c5b95a6e36d78f25117f72b22ccdd34c38a4595da5644d2e6689a85f007abf2a5913cf2f9d066b67f5a509e9807cdcf5b1c6ced SHA512 e4aabbbb2b3eb2aed96e84370ca9e1a4379a592fd92fed338ac3409f8d6ce2502347a11f7697235656489eaebc2ddc105d04ce02a47d727c2e902170a6c1906d MISC metadata.xml 347 BLAKE2B d45671e9d4d34c0f4583b4f3e83a8d780327d3d15286c9bb007a7061a4dbf2259ac860cd038adc6c0637265fa0c31430a1ebdec12f8dc133822b7f6067e9479f SHA512 f1679d429313fbd932a45bbd07178f82100e5e79c871327b3b510829137476a06a252351d1e58384db1e0c0d97ffecf1f4e37ef771e9e5f92219ee86d67b596b diff --git a/dev-libs/libxslt/files/1.1.32-simplify-python.patch b/dev-libs/libxslt/files/libxslt-1.1.32-simplify-python.patch index d5a4401afd61..d5a4401afd61 100644 --- a/dev-libs/libxslt/files/1.1.32-simplify-python.patch +++ b/dev-libs/libxslt/files/libxslt-1.1.32-simplify-python.patch diff --git a/dev-libs/libxslt/files/libxslt-1.1.34-simplify-python.patch b/dev-libs/libxslt/files/libxslt-1.1.34-simplify-python.patch new file mode 100644 index 000000000000..ff7e263aca43 --- /dev/null +++ b/dev-libs/libxslt/files/libxslt-1.1.34-simplify-python.patch @@ -0,0 +1,239 @@ +From aa0f7a8d59a9bbd646203d3f14e39e217961f725 Mon Sep 17 00:00:00 2001 +From: Gilles Dartiguelongue <eva@gentoo.org> +Date: Wed, 11 Nov 2015 17:49:07 +0100 +Subject: [PATCH] Simplify python setup in autoconf + +AM_PATH_PYTHON does most of the job without using pkg-config as expected +from the rest of the autoconf script. +diff --git a/Makefile.am b/Makefile.am +index 2c417d0..a65a2b7 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -2,9 +2,14 @@ SUBDIRS = \ + libxslt \ + libexslt \ + xsltproc \ +- doc \ +- $(PYTHON_SUBDIR) \ +- tests ++ doc ++ ++ ++if WITH_PYTHON ++ SUBDIRS += python ++endif ++ ++SUBDIRS += tests + + DIST_SUBDIRS = libxslt libexslt xsltproc python doc tests + +@@ -52,7 +57,9 @@ tests: dummy + @echo '## Running the regression test suite' + @(cd tests ; $(MAKE) -s tests) + @(cd xsltproc ; $(MAKE) -s tests) +- @(if [ "$(PYTHON_SUBDIR)" != "" ] ; then cd python ; $(MAKE) -s tests ; fi) ++if WITH_PYTHON ++ @(cd python ; $(MAKE) -s tests) ++endif + + valgrind: + @echo '## Running the regression tests under Valgrind' +diff --git a/configure.ac b/configure.ac +index 325a7be..ee1eabd 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -227,90 +227,37 @@ dnl + dnl check for python + dnl + +-PYTHON_VERSION= +-PYTHON_INCLUDES= +-PYTHON_SITE_PACKAGES= +-pythondir= +-AC_ARG_WITH(python, [ --with-python[=DIR] Build Python bindings if found]) +-if test "$with_python" != "no" ; then +- if test -x "$with_python/bin/python" +- then +- echo Found python in $with_python/bin/python +- PYTHON="$with_python/bin/python" +- else +- if test -x "$with_python" +- then +- echo Found python in $with_python +- PYTHON="$with_python" +- else +- if test -x "$PYTHON" +- then +- echo Found python in environment PYTHON=$PYTHON +- with_python=`$PYTHON -c "import sys; print sys.exec_prefix"` +- else +- AC_PATH_PROG(PYTHON, python python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5) +- fi +- fi +- fi +- if test "$PYTHON" != "" +- then +- echo "PYTHON is pointing at $PYTHON" +- PYTHON_VERSION=`$PYTHON -c "import sys; print sys.version[[0:3]]"` +- echo Found Python version $PYTHON_VERSION +- LIBXML2_PYTHON=`$PYTHON -c "try : import libxml2 ; print 1 +-except: print 0"` +- if test "$LIBXML2_PYTHON" = "1" +- then +- echo Found libxml2-python module +- else +- echo Warning: Missing libxml2-python +- fi +- fi +- if test "$PYTHON_VERSION" != "" +- then +- if test -r $with_python/include/python$PYTHON_VERSION/Python.h -a \ +- -d $with_python/lib/python$PYTHON_VERSION/site-packages +- then +- PYTHON_INCLUDES=$with_python/include/python$PYTHON_VERSION +- PYTHON_SITE_PACKAGES='$(libdir)/python$(PYTHON_VERSION)/site-packages' +- else +- if test -r $prefix/include/python$PYTHON_VERSION/Python.h +- then +- PYTHON_INCLUDES=$prefix/include/python$PYTHON_VERSION +- PYTHON_SITE_PACKAGES='$(libdir)/python$(PYTHON_VERSION)/site-packages' +- else +- if test -r /usr/include/python$PYTHON_VERSION/Python.h +- then +- PYTHON_INCLUDES=/usr/include/python$PYTHON_VERSION +- PYTHON_SITE_PACKAGES='$(libdir)/python$(PYTHON_VERSION)/site-packages' +- else +- echo could not find python$PYTHON_VERSION/Python.h +- fi +- fi +- if test ! -d "$PYTHON_SITE_PACKAGES" +- then +- PYTHON_SITE_PACKAGES=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib()"` +- fi +- fi +- PYTHON_LIBS=`python$PYTHON_VERSION-config --libs` +- fi +- if test "$with_python" != "" +- then +- pythondir='$(PYTHON_SITE_PACKAGES)' +- else +- pythondir='$(libdir)/python$(PYTHON_VERSION)/site-packages' +- fi +-fi +-AM_CONDITIONAL(WITH_PYTHON, test "$PYTHON_INCLUDES" != "") +-if test "$PYTHON_INCLUDES" != "" +-then +- PYTHON_SUBDIR=python +-else +- PYTHON_SUBDIR= +-fi +-AC_SUBST(pythondir) +-AC_SUBST(PYTHON_SUBDIR) +-AC_SUBST(PYTHON_LIBS) ++AC_ARG_WITH([python], ++ AS_HELP_STRING([--with-python], [Build Python bindings if found]) ++) ++ ++AS_IF([test "$with_python" = "yes"], ++ [AM_PATH_PYTHON ++ AC_PATH_TOOL([PYTHON_CONFIG], [python$PYTHON_VERSION-config], [no]) ++ AS_IF([test "$PYTHON_CONFIG" = "no"], ++ [AC_PATH_TOOL([PYTHON_CONFIG], [python-config], [no])]) ++ AS_IF([test "$PYTHON_CONFIG" != "no"], ++ [PYTHON_CFLAGS=`$PYTHON_CONFIG --cflags` ++ PYTHON_LDFLAGS=`$PYTHON_CONFIG --ldflags` ++ PYTHON_LIBS=`$PYTHON_CONFIG --libs`], ++ [AC_MSG_ERROR([Missing python development files.])]) ++ AC_MSG_CHECKING([libxml2 module in $PYTHON]) ++ LIBXML2_PYTHON=`$PYTHON -c "import sys; ++try: ++ import libxml2 ++ sys.stdout.write('1') ++except: ++ sys.stdout.write('0')"` ++ AS_IF([test "$LIBXML2_PYTHON" = "1"], ++ [AC_MSG_RESULT([yes])], ++ [AC_MSG_RESULT([no]) ++ AC_MSG_WARN([libxml2 python module not found, expect runtime errors])]) ++ ]) ++ ++AM_CONDITIONAL([WITH_PYTHON], [test "$with_python" = "yes"]) ++AC_SUBST([PYTHON_CFLAGS]) ++AC_SUBST([PYTHON_LDFLAGS]) ++AC_SUBST([PYTHON_LIBS]) + + AC_ARG_WITH(crypto, [ --with-crypto Add crypto support to exslt (on)]) + WITH_CRYPTO=0 +@@ -634,10 +581,6 @@ AC_SUBST(PYTHONSODV) + AC_SUBST(XML_CONFIG) + AC_SUBST(LIBXML_LIBS) + AC_SUBST(LIBXML_CFLAGS) +-AC_SUBST(PYTHON) +-AC_SUBST(PYTHON_VERSION) +-AC_SUBST(PYTHON_INCLUDES) +-AC_SUBST(PYTHON_SITE_PACKAGES) + + XSLT_LIBDIR='-L${libdir}' + XSLT_INCLUDEDIR='-I${includedir}' +diff --git a/python/Makefile.am b/python/Makefile.am +index 17a0d17..1c57a63 100644 +--- a/python/Makefile.am ++++ b/python/Makefile.am +@@ -5,7 +5,7 @@ SUBDIRS= . tests + + AM_CFLAGS = $(LIBXML_CFLAGS) + +-DOCS_DIR = $(datadir)/doc/libxslt-python-$(LIBXSLT_VERSION) ++docsdir = $(datadir)/doc/libxslt-python-$(LIBXSLT_VERSION) + # libxsltclass.txt is generated + DOCS= + +@@ -16,10 +16,7 @@ EXTRA_DIST = \ + libxml_wrap.h \ + libxslt_wrap.h \ + libxsl.py \ +- libxslt-python-api.xml \ +- $(DOCS) +- +-libxsltmod_la_LDFLAGS = -module -avoid-version ++ libxslt-python-api.xml + + if WITH_PYTHON + mylibs = \ +@@ -28,31 +25,22 @@ mylibs = \ + + all-local: libxslt.py + +-python_LTLIBRARIES = libxsltmod.la ++python_PYTHON = libxslt.py ++pyexec_LTLIBRARIES = libxsltmod.la + + libxsltmod_la_CPPFLAGS = \ +- -I$(PYTHON_INCLUDES) \ + -I$(top_srcdir)/libxslt \ + -I$(top_srcdir) \ +- -I../libexslt ++ -I$(top_srcdir)/libexslt \ ++ $(PYTHON_CFLAGS) + libxsltmod_la_SOURCES = libxslt.c types.c + nodist_libxsltmod_la_SOURCES = libxslt-py.c + libxsltmod_la_LIBADD = $(mylibs) $(PYTHON_LIBS) ++libxsltmod_la_LDFLAGS = $(WIN32_EXTRA_LDFLAGS) $(PYTHON_LDFLAGS) -module -avoid-version + + libxslt.py: $(srcdir)/libxsl.py libxsltclass.py + cat $(srcdir)/libxsl.py libxsltclass.py > $@ + +-install-data-local: +- $(MKDIR_P) $(DESTDIR)$(pythondir) +- $(INSTALL) -m 0644 libxslt.py $(DESTDIR)$(pythondir) +- $(MKDIR_P) $(DESTDIR)$(DOCS_DIR) +- @(for doc in $(DOCS) ; \ +- do $(INSTALL) -m 0644 $(srcdir)/$$doc $(DESTDIR)$(DOCS_DIR) ; done) +- +-uninstall-local: +- rm -f $(DESTDIR)$(pythondir)/libxslt.py +- rm -rf $(DESTDIR)$(DOCS_DIR) +- + GENERATE = generator.py + API_DESC = $(top_srcdir)/doc/libxslt-api.xml $(srcdir)/libxslt-python-api.xml + GENERATED= libxsltclass.py \ diff --git a/dev-libs/libxslt/libxslt-1.1.33-r1.ebuild b/dev-libs/libxslt/libxslt-1.1.33-r1.ebuild index 66a2d1b8dbd3..86ee69d5cf80 100644 --- a/dev-libs/libxslt/libxslt-1.1.33-r1.ebuild +++ b/dev-libs/libxslt/libxslt-1.1.33-r1.ebuild @@ -24,9 +24,13 @@ RDEPEND=" crypt? ( >=dev-libs/libgcrypt-1.5.3:0=[${MULTILIB_USEDEP}] ) python? ( ${PYTHON_DEPS} - dev-libs/libxml2:2[python,${PYTHON_USEDEP}] ) + dev-libs/libxml2:2[python,${PYTHON_USEDEP}] + ) +" +DEPEND=" + ${RDEPEND} + >=virtual/pkgconfig-1 " -DEPEND="${RDEPEND}" MULTILIB_CHOST_TOOLS=( /usr/bin/xslt-config @@ -43,9 +47,9 @@ src_prepare() { # Simplify python setup # https://bugzilla.gnome.org/show_bug.cgi?id=758095 - eapply "${FILESDIR}"/1.1.32-simplify-python.patch + eapply "${FILESDIR}"/${PN}-1.1.32-simplify-python.patch eapply "${FILESDIR}"/${PN}-1.1.28-disable-static-modules.patch - eapply "${DISTDIR}"/libxslt-1.1.33-CVE-2019-11068.patch + eapply "${DISTDIR}"/${PN}-1.1.33-CVE-2019-11068.patch eautoreconf # If eautoreconf'd with new autoconf, then epunt_cxx is not necessary diff --git a/dev-libs/libxslt/libxslt-1.1.34-r1.ebuild b/dev-libs/libxslt/libxslt-1.1.34-r1.ebuild new file mode 100644 index 000000000000..8bc2516fb94d --- /dev/null +++ b/dev-libs/libxslt/libxslt-1.1.34-r1.ebuild @@ -0,0 +1,63 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit libtool multilib-minimal toolchain-funcs + +DESCRIPTION="XSLT libraries and tools" +HOMEPAGE="http://www.xmlsoft.org/" +SRC_URI="ftp://xmlsoft.org/${PN}/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + +IUSE="crypt debug examples static-libs elibc_Darwin" + +BDEPEND=">=virtual/pkgconfig-1" +RDEPEND=" + >=dev-libs/libxml2-2.9.10:2[${MULTILIB_USEDEP}] + crypt? ( >=dev-libs/libgcrypt-1.5.3:0=[${MULTILIB_USEDEP}] ) +" +DEPEND="${RDEPEND}" + +MULTILIB_CHOST_TOOLS=( + /usr/bin/xslt-config +) + +MULTILIB_WRAPPED_HEADERS=( + /usr/include/libxslt/xsltconfig.h +) + +src_prepare() { + default + + DOCS=( AUTHORS ChangeLog FEATURES NEWS README TODO ) + + # Prefix always needs elibtoolize if not eautoreconf'd. + elibtoolize +} + +multilib_src_configure() { + ECONF_SOURCE="${S}" econf \ + --with-html-dir="${EPREFIX}"/usr/share/doc/${PF} \ + --with-html-subdir=html \ + --without-python \ + $(use_with crypt crypto) \ + $(use_with debug) \ + $(use_with debug mem-debug) \ + $(use_enable static-libs static) \ + "$@" +} + +multilib_src_install() { + # "default" does not work here - docs are installed by multilib_src_install_all + emake DESTDIR="${D}" install +} + +multilib_src_install_all() { + einstalldocs + + find "${ED}" -type f -name "*.la" -delete || die +} diff --git a/dev-libs/libxslt/libxslt-1.1.34.ebuild b/dev-libs/libxslt/libxslt-1.1.34.ebuild new file mode 100644 index 000000000000..230ccacc3bfc --- /dev/null +++ b/dev-libs/libxslt/libxslt-1.1.34.ebuild @@ -0,0 +1,128 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python2_7 ) +PYTHON_REQ_USE="xml" + +inherit autotools multilib-minimal python-r1 toolchain-funcs + +DESCRIPTION="XSLT libraries and tools" +HOMEPAGE="http://www.xmlsoft.org/" +SRC_URI="ftp://xmlsoft.org/${PN}/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + +IUSE="crypt debug examples python static-libs elibc_Darwin" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +RDEPEND=" + >=dev-libs/libxml2-2.9.10:2[${MULTILIB_USEDEP}] + crypt? ( >=dev-libs/libgcrypt-1.5.3:0=[${MULTILIB_USEDEP}] ) + python? ( + ${PYTHON_DEPS} + dev-libs/libxml2:2[python,${PYTHON_USEDEP}] + ) +" +DEPEND=" + ${RDEPEND} + >=virtual/pkgconfig-1 +" + +MULTILIB_CHOST_TOOLS=( + /usr/bin/xslt-config +) + +MULTILIB_WRAPPED_HEADERS=( + /usr/include/libxslt/xsltconfig.h +) + +src_prepare() { + default + + DOCS=( AUTHORS ChangeLog FEATURES NEWS README TODO ) + + # Simplify python setup + # https://bugzilla.gnome.org/show_bug.cgi?id=758095 + eapply "${FILESDIR}"/${PN}-1.1.34-simplify-python.patch + eapply "${FILESDIR}"/${PN}-1.1.28-disable-static-modules.patch + + eautoreconf + # If eautoreconf'd with new autoconf, then epunt_cxx is not necessary + # and it is propably otherwise too if upstream generated with new + # autoconf +# epunt_cxx + # But Prefix always needs elibtoolize if not eautoreconf'd. +# elibtoolize +} + +multilib_src_configure() { + libxslt_configure() { + ECONF_SOURCE="${S}" econf \ + --with-html-dir="${EPREFIX}"/usr/share/doc/${PF} \ + --with-html-subdir=html \ + $(use_with crypt crypto) \ + $(use_with debug) \ + $(use_with debug mem-debug) \ + $(use_enable static-libs static) \ + "$@" + } + + libxslt_py_configure() { + mkdir -p "${BUILD_DIR}" || die # ensure python build dirs exist + run_in_build_dir libxslt_configure --with-python + } + + libxslt_configure --without-python # build python bindings separately + + if multilib_is_native_abi && use python; then + python_foreach_impl libxslt_py_configure + fi +} + +multilib_src_compile() { + default + multilib_is_native_abi && use python && libxslt_foreach_py_emake all +} + +multilib_src_test() { + default + multilib_is_native_abi && use python && libxslt_foreach_py_emake test +} + +multilib_src_install() { + # "default" does not work here - docs are installed by multilib_src_install_all + emake DESTDIR="${D}" install + + if multilib_is_native_abi && use python; then + libxslt_foreach_py_emake \ + DESTDIR="${D}" \ + docsdir="${EPREFIX}"/usr/share/doc/${PF}/python \ + EXAMPLE_DIR="${EPREFIX}"/usr/share/doc/${PF}/python/examples \ + install + python_foreach_impl python_optimize + fi +} + +multilib_src_install_all() { + einstalldocs + + if ! use examples && use python; then + rm -r "${ED}"/usr/share/doc/${PF}/python/examples || die + fi + + find "${ED}" -type f -name "*.la" -delete || die +} + +libxslt_foreach_py_emake() { + libxslt_py_emake() { + pushd "${BUILD_DIR}/python" > /dev/null || die + emake "$@" + popd > /dev/null + } + local native_builddir=${BUILD_DIR} + python_foreach_impl libxslt_py_emake top_builddir="${native_builddir}" "$@" +} diff --git a/dev-libs/libzia/Manifest b/dev-libs/libzia/Manifest index f9b0f98b750a..862aae9a5503 100644 --- a/dev-libs/libzia/Manifest +++ b/dev-libs/libzia/Manifest @@ -1,5 +1,3 @@ -DIST libzia-4.20.tar.gz 624009 BLAKE2B f0342c144c3e0b9dd7720466b24d79632de6dc8597786ba22acccd4eee20cdfb4f941da5717fde27a7ee0097f4f57b20a93455c123fd518916c1552cab801bc2 SHA512 0780eb791fdd85778a074eddab933650d4fbb09a9b441432cf6e63fe97978d47c75155caa251820f283badb16ffa5ac2d323b1f98ab5864caaa020511ff856d5 DIST libzia-4.21.tar.gz 631871 BLAKE2B 8c54ae86e38569914c05da6c11b8ffe2c349884fb4e8ea00b05b88da12f6ee4e80ddac82f1790b67586c24d9df5b0ab71053fc80479cfdde22250a034db6dbef SHA512 e4277dfc3c004a0a1d1ccd8a11431e46344763ff5df68403b451e2be4b6bd00862fe2af0e15ce9017c3d6144d301e792f9279632687697e0dd4a238c805b04a8 -EBUILD libzia-4.20.ebuild 719 BLAKE2B 3d6ccf2b62b7ff127dab3bffa2c5b0d52ba374f389998d7b60662874ca34ded6eaf6f58851a0a7ade1ec7d9e1cbd9e6fde4d95a0fd774845c92a3e9af74827f9 SHA512 d69a02f5bc0f92b8fdc50afad08c06a8d32999aed136edb99ca7bdd74fa15f1f242fb21e34cd48fc28bd40303740a2528dcfd5a22151b486eb069049c234d037 -EBUILD libzia-4.21.ebuild 721 BLAKE2B 6f33ec501f2f24c9d27a0f2ee655c526bc4e758f4febec914f8f12809b687748bbb1238490e3fc3e0ab596d8a8ddd06010fb5e98c18e3ea7abc6a38e9442689a SHA512 6c4dfdfae0bf2dc34d8d237bf25767a22739ccc6350e25bf88a4ce82c48b96fcbd0b8b5d0f668d41319ba6d029fbf5c192db8a3c82a37a35249d120ada340ea3 -MISC metadata.xml 451 BLAKE2B 539464597b5fcacdf3701b1400a6ea8725e46164b768c129d98a0ca37e1edba4c90c619ff7138988cbcf0136201f723327d1fe561179181a30709e2977730255 SHA512 4551ac2be822a0d0bcc9952d3c62f995b705f68b15c8fa86dc263b68d93619705aa70a9518bf78c8a509a246ffdd7301f7b64f924781ae285a081c86fe0b4773 +EBUILD libzia-4.21.ebuild 838 BLAKE2B ff1f384a87ddb0b798b03c8f04b83f86168b4e45755f12d979825d4ffcc234784cfcd52773ca37eefc6cd04885946d25bab069b542faf6ccbeca3dfbc3c512f9 SHA512 edc8c49c7186755c8dd25cc0d2958c27c26d9f607804fccdb3a85debb8bba4edc3f124ba044712273411909781a06072f301db8e121d2df08a5389df3d5ed6d5 +MISC metadata.xml 325 BLAKE2B 749bbcd37b8ec3f3b537e5cca5abba07f042c3f0f56e07786633d5a68eec8242e5f9269c1cdc2b6d2862766cbb9c0bf5ebf971a7a35537c368fb033a52c1be12 SHA512 a406f9e74ba2f99af089909a9a0aef44da9ae1261a61d76cc4689e3d80e610f8610fe54ec3da3441e53c9e1f8c18487eb5662bbbc488a50b48844814cd235f2c diff --git a/dev-libs/libzia/libzia-4.20.ebuild b/dev-libs/libzia/libzia-4.20.ebuild deleted file mode 100644 index de56605304a1..000000000000 --- a/dev-libs/libzia/libzia-4.20.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools - -DESCRIPTION="platform abstraction code for tucnak package" -HOMEPAGE="http://tucnak.nagano.cz" -SRC_URI="http://tucnak.nagano.cz/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="ftdi" - -RDEPEND="dev-libs/glib:2 - x11-libs/gtk+:2 - media-libs/libsdl - media-libs/libpng:0 - ftdi? ( dev-embedded/libftdi:0 )" - -DEPEND="${RDEPEND} - virtual/pkgconfig" - -MAKEOPTS+=" -j1" - -src_prepare() { - eapply_user - sed -i -e "s/docsdir/#docsdir/g" \ - -e "s/docs_/#docs_/g" Makefile.am || die - eautoreconf -} - -src_configure() { - econf \ - $(use_with ftdi) --with-sdl \ - --with-png --without-bfd -} diff --git a/dev-libs/libzia/libzia-4.21.ebuild b/dev-libs/libzia/libzia-4.21.ebuild index 63b54d9c6b89..9feeb18eddf3 100644 --- a/dev-libs/libzia/libzia-4.21.ebuild +++ b/dev-libs/libzia/libzia-4.21.ebuild @@ -10,7 +10,7 @@ SRC_URI="http://tucnak.nagano.cz/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="ftdi" RDEPEND="dev-libs/glib:2 @@ -34,5 +34,11 @@ src_prepare() { src_configure() { econf \ $(use_with ftdi) --with-sdl \ - --with-png --without-bfd + --with-png --without-bfd \ + --disable-static +} + +src_install() { + emake DESTDIR="${D}" install + find "${D}" -name '*.la' -type f -delete || die } diff --git a/dev-libs/libzia/metadata.xml b/dev-libs/libzia/metadata.xml index b845e64532d2..ad26392d055c 100644 --- a/dev-libs/libzia/metadata.xml +++ b/dev-libs/libzia/metadata.xml @@ -8,8 +8,4 @@ <use> <flag name="ftdi">Enable support for FTDI USB chips</flag> </use> - <longdescription> - libzia contains the platform abstraction layer for - the media-radio/tucnak package - </longdescription> </pkgmetadata> diff --git a/dev-libs/libzip/Manifest b/dev-libs/libzip/Manifest index d2d55888c06b..72a1893fea36 100644 --- a/dev-libs/libzip/Manifest +++ b/dev-libs/libzip/Manifest @@ -1,5 +1,6 @@ +AUX libzip-1.7.3-missing-header.patch 1273 BLAKE2B d3ac8bb5f4af6a0f9b80bd93b72122f018f73b2884e97a3ebe770d84e91cd95a2815db541bc3c5fdfec7fe1a368e784f1b47e7a875d7533196b5306f61b585fd SHA512 0c8f8438d2dfc692be78c487f7b48781158611378df6c143509dce6afd7b3b44f3a568acfeefeaf2cab508bc0a4a3dabf50f496c200dbbcb429e12e99dfb0955 DIST libzip-1.6.1.tar.xz 732932 BLAKE2B 6f63ecb56767b730e5c5639c01e3e050ed64d1c1508b11d4cd1c75e2834988e14140a5e49ba25454d77c40c59b101615a9e00823066a35eaca0519147a75f5e6 SHA512 dcf3790933c95f66bdcbdb276497b36e57776103b0b1064a94479e84eaa0a09df8dd91509cb4ccab3a6724f0650f076ca1e332d73acc94b653e99a3e94a64574 -DIST libzip-1.7.1.tar.xz 737496 BLAKE2B bd4c73bf317fa767ff0ea3c10b7f2e96699dc7ed7bd05fdaf3c5d477cd42aa18b40627569498697be1b5360d43471a9b8132909781f8bd32bda6f46534e4a61b SHA512 e924749274e5e45b83ba4bc961bfd299b9dd05829c1f42880a9814f942dbf7afe79aa1ea4e2b33d6db1dba1f7f948c0de40517f2ef90cc8725650b8cb88d9a14 +DIST libzip-1.7.3.tar.xz 747372 BLAKE2B c0fbdcd5f5592b0aa828c47b6d90c4c84addfb037cd3280195ab83ebc9d586a6de32d833774175a24e0c6fed55b7d9e47931867721e6e7be7e61d8e5bec2dc9d SHA512 488866348a0c859f6f995c50e956bd51b4105278f07b63fe019cb44ab36c09ef958cc0684fd5444c474d83874b999e8ed1aa9b2da51b74caa37bbe7934b9c870 EBUILD libzip-1.6.1-r1.ebuild 2288 BLAKE2B ac0aa25a70174fe99977e49f70beb4876a221e884411bc69fe8a4a570a9a207a2ca578c0064a1c22ea101cb8aab0e86907df5b629f2509230984cacd14aa4814 SHA512 2412dddca1bcbc6d3c5ab7550980f132ceec5d56bdcb3875a27feb539a3c648f522766fd68663d289ebfd41b8d31477751378b0e8c4371c08b437e9036f6fd71 -EBUILD libzip-1.7.1.ebuild 2353 BLAKE2B 4a01907cd29bf76e40ee13fa8c6226179cb79f51593c46307f0daba1ef171d7be315d217fe7042c791b1fbf59fcf6115417b980f95d849ef74641d3d64236343 SHA512 6c8784276e8e16b9c0a6c732aaf445cc2be74628f818e5cdf50b8135bdd01f195cf62633aa3fc5259ed8b8b615dac2c457c110ef58c48bd38e1e915cda742cef +EBUILD libzip-1.7.3.ebuild 2416 BLAKE2B d23bf31c4cf1d48359ead5eba5f833a275fbb44ab147064358cb6f02863781dd8e934496bdd13f8634aeff5e6238026937a526f90468e92dba949ab58271cdfb SHA512 4caf6478051589a1f7ec50b592a75f51a82b264719c1f1b0dfb0051e6dcdf6be1f4913bb67ffa9ece28411e9235eb79e488421524fbedc88449d7584500987a3 MISC metadata.xml 509 BLAKE2B e5012e29cc2157f4cd37b19edbdd2da53377f2671574681aff241dcab50e22d39b8db7bce14b7085cf39e4adbe89c486047f3089a9f91fde3411b02de45c8284 SHA512 bfa09ea8c47388786ec4fa938fbb2df96c4d2bf936f1a2a79765bc178ac34a9d69c19a1be53eef743d49548e32ce110f3e4b9776932248624192d4b92b7525f8 diff --git a/dev-libs/libzip/files/libzip-1.7.3-missing-header.patch b/dev-libs/libzip/files/libzip-1.7.3-missing-header.patch new file mode 100644 index 000000000000..bebe38028414 --- /dev/null +++ b/dev-libs/libzip/files/libzip-1.7.3-missing-header.patch @@ -0,0 +1,43 @@ +From fd89e242d16128dedef08f47d99ae56aa19b0591 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?=C3=98rjan=20Malde?= <red@foxi.me> +Date: Wed, 15 Jul 2020 12:16:16 +0200 +Subject: [PATCH] Include limits.h for INT_MAX + +--- + lib/zip_crypto_openssl.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/lib/zip_crypto_openssl.c b/lib/zip_crypto_openssl.c +index 1cb00479..60f92758 100644 +--- a/lib/zip_crypto_openssl.c ++++ b/lib/zip_crypto_openssl.c +@@ -38,6 +38,7 @@ + #include "zip_crypto.h" + + #include <openssl/rand.h> ++#include <limits.h> + + #if OPENSSL_VERSION_NUMBER < 0x1010000fL || defined(LIBRESSL_VERSION_NUMBER) + #define USE_OPENSSL_1_0_API + +From b4a4f778806fe2c3ca9ec57c0411a8dcf462e655 Mon Sep 17 00:00:00 2001 +From: Thomas Klausner <tk@giga.or.at> +Date: Wed, 15 Jul 2020 12:38:07 +0200 +Subject: [PATCH] Include limits.h for INT_MAX. + +--- + lib/zip_crypto_mbedtls.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/lib/zip_crypto_mbedtls.c b/lib/zip_crypto_mbedtls.c +index c348ad2a..7063c6b6 100644 +--- a/lib/zip_crypto_mbedtls.c ++++ b/lib/zip_crypto_mbedtls.c +@@ -41,6 +41,7 @@ + #include <mbedtls/entropy.h> + #include <mbedtls/pkcs5.h> + ++#include <limits.h> + + _zip_crypto_aes_t * + _zip_crypto_aes_new(const zip_uint8_t *key, zip_uint16_t key_size, zip_error_t *error) { diff --git a/dev-libs/libzip/libzip-1.7.1.ebuild b/dev-libs/libzip/libzip-1.7.3.ebuild index 8edc5a80ac6e..2953f97bb222 100644 --- a/dev-libs/libzip/libzip-1.7.1.ebuild +++ b/dev-libs/libzip/libzip-1.7.3.ebuild @@ -11,7 +11,7 @@ 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" +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 )" @@ -37,6 +37,8 @@ DEPEND=" " RDEPEND="${DEPEND}" +PATCHES=( "${FILESDIR}"/${P}-missing-header.patch ) # bug 733326 + pkg_setup() { # Upstream doesn't support building dynamic & static # simultaneously: https://github.com/nih-at/libzip/issues/76 diff --git a/dev-libs/link-grammar/Manifest b/dev-libs/link-grammar/Manifest index da7f62b99876..0ba081fb8eff 100644 --- a/dev-libs/link-grammar/Manifest +++ b/dev-libs/link-grammar/Manifest @@ -1,4 +1,8 @@ AUX link-grammar-5.3.9-out-of-source-build.patch 2541 BLAKE2B 6b60a65bb39e628f8c555dce20410872a4dd56d27402e7bc939d49483053cf84199f3f5bab495c16f734b4b6662b467b0369cda4dc852a39568f27b68c0f14da SHA512 340a03c31ed94f53b00622bf7f925d8f47c658ec81843f0139deb5b38074f346ad4d65dc49653cccf1b7b49966c77029ab64e993d113e709e75ebb930448b8f6 +AUX link-grammar-5.8.0-dont-inject-O3.patch 621 BLAKE2B becccc08314e45416ee96ec52a5b03b3cf5b1fc141a427a774c7d2b816cff985abba54a99b8bc308e9e75759045b335380a186031d647cc8df00582669615ebd SHA512 71e05d722d24a4647af9f879c14d74d2875ee5435f1b70acb8f962f9e7e602e044e8ed98e118e3ad9ebf725a9701a302ca1e5ea75aa8662326f29251c1317138 +AUX link-grammar-5.8.0-out-of-source-build.patch 1189 BLAKE2B ba89966a0744b39f0f24fa3359a031041cae61f3ec26aaad42eb6e05cbc5c33e54f927c460b33f8d1d37b3987e149f1c88da1ebaab408d322954eefa755b38cb SHA512 e2f094f341bf943a57ce04f10f49a1aac8345ced88a63c54fdfceda946ab575ff088c597d61847d9a9bbebf10af9ad1c284239f29004fc7917deddcd79ddce69 DIST link-grammar-5.3.11.tar.gz 3632617 BLAKE2B 07fe951743096a0d6b906c9b7174b58fcc54b0e2c54805d15731de783888327799fd77f64a2ae7f4e09327feb08d91cb95471e9c0c3c2fe00fca3553f40b1905 SHA512 09671d187deac3b9530dd63eb4497de9c2c9db32d79da06c677bdbccac015adef06813819692a92d15499c7cb347071c58b73c52505af154bdc8a8fcd409ddd2 -EBUILD link-grammar-5.3.11.ebuild 4011 BLAKE2B 78ca14fd13e3f30627309be911e679444ed1dc2201bbbba5cbe27dadc9971acbbab6b1201bc69376d9fc5d6b3421b34a1d53719ff123daf3c90f4e0cc8cabcbb SHA512 11b31114abb46d145c5aedd304bfc81180ac72aea11c45bdf2ef695ce148780c6a83d367f7f0fdff41639b78a422c387316f44766948b9976c205b9bd9ad73e5 +DIST link-grammar-5.8.0.tar.gz 3782125 BLAKE2B 8027e91212d3269b8e3ceaa5c837ad961cd2dfd92849d3989094ab771d97d30f4b228cfc1e32e9e843676aa439d790fb444823f7db69004538ad068c7bf28a45 SHA512 1262e2faf1de6f05a62f9d622f43c02253b4c241342df9b443a70ae04bd328d1fc49cd2f91c881e694f67215005833fec8b1fa9d395b1e547985b376c7415d2e +EBUILD link-grammar-5.3.11.ebuild 3632 BLAKE2B d0e14eb500342a137661236b1c4ed9ab67623a854b994cabe70ed3c3cf6e15e6aa0035380461c99ae4cc665f0921e92bcb995c264dc4d2547a1bd37c5ffdeec6 SHA512 b0e9264782da3b7bfc6aea75870fc7c789591eca23c442f29051dec5f28e0b8d5100f971e6eba143be14dfb27d06042952b469af5f6337d3c89020eea3112d76 +EBUILD link-grammar-5.8.0.ebuild 3183 BLAKE2B 7b2e16795d6f2b2258ae36a6e150fd87ca7891f2f2a5c467889f8322ab6307e34fe8cd9753d592d685238a13ece7faaaf98b99528a6f79cf194a6db2bb6e3f30 SHA512 e268634bb5e09bcfbeff498f161d47ab7e7d40390609d5da9844f7b4afb1145ed134820c0e267822707ae0ba444a27f6e3f96750c0b38b3476866c0b37f3b6d7 MISC metadata.xml 963 BLAKE2B ebe0a68ad3a8fee0aa3d112f152e306d691b73e6969bf1fb7026edbdfb814fa1476c2e7d9e8ff9051e5920f9279acea871fab85da58ff8642ec819b5a4fbb57f SHA512 d53e9c7867629e8caf488cef531e258bb2cad3fcbe458e80024b0292fe90148656a77069c45f42e782ba473daafec5cf1fa93e9be00571ceefd21bf59b0ea5a2 diff --git a/dev-libs/link-grammar/files/link-grammar-5.8.0-dont-inject-O3.patch b/dev-libs/link-grammar/files/link-grammar-5.8.0-dont-inject-O3.patch new file mode 100644 index 000000000000..2d97b7cc7627 --- /dev/null +++ b/dev-libs/link-grammar/files/link-grammar-5.8.0-dont-inject-O3.patch @@ -0,0 +1,23 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -137,8 +137,7 @@ + AC_SUBST(HOST_OS) + # ==================================================================== + +-CFLAGS="${CFLAGS} -O3" +-CXXFLAGS="${CXXFLAGS} -O3 -Wall" ++CXXFLAGS="${CXXFLAGS} -Wall" + + # The std=c11 flag provides the proper float-pt math decls working, + # e.g. fmax However, it also undefined _BSD_SOURCE, etc. which is +@@ -908,10 +907,6 @@ + + AC_FUNC_STRERROR_R + +-AC_SUBST(CFLAGS) +-AC_SUBST(CPPFLAGS) +-AC_SUBST(CXXFLAGS) +- + dnl Save the compilation definitions for an extended version printout + AC_OUTPUT_MAKE_DEFS() + LG_DEFS=`$ECHO "$DEFS" | $SED 's/\\\\//g'` diff --git a/dev-libs/link-grammar/files/link-grammar-5.8.0-out-of-source-build.patch b/dev-libs/link-grammar/files/link-grammar-5.8.0-out-of-source-build.patch new file mode 100644 index 000000000000..1616e933664e --- /dev/null +++ b/dev-libs/link-grammar/files/link-grammar-5.8.0-out-of-source-build.patch @@ -0,0 +1,33 @@ +--- a/bindings/python/Makefile.am ++++ b/bindings/python/Makefile.am +@@ -4,8 +4,8 @@ + # Created by Linas Vepstas February 2014 + # + # +-SWIG_SOURCES = ../swig/link_grammar.i +-SWIG_INCLUDES = ../../link-grammar/link-includes.h ++SWIG_SOURCES = $(top_srcdir)/bindings/swig/link_grammar.i ++SWIG_INCLUDES = $(top_srcdir)/link-grammar/link-includes.h + built_c_sources = lg_python_wrap.cc + built_py_sources = $(top_builddir)/bindings/python/clinkgrammar.py + +@@ -18,16 +18,16 @@ + + # Files that get installed in $pkgpythondir + pkgpython_PYTHON = \ +- linkgrammar.py \ ++ $(srcdir)/linkgrammar.py \ + $(top_builddir)/bindings/python/__init__.py \ +- $(top_builddir)/bindings/python/clinkgrammar.py ++ $(built_py_sources) + + # Apparently, anaconda does not work without this!? + # This seems wrong and lame to me, but see issue #298 + # https://github.com/opencog/link-grammar/issues/298 + pkgpypathdir=$(pythondir) + pkgpypath_PYTHON = \ +- linkgrammar.pth ++ $(srcdir)/linkgrammar.pth + + # The make uninstall target should remove directories we created. + uninstall-hook: diff --git a/dev-libs/link-grammar/link-grammar-5.3.11.ebuild b/dev-libs/link-grammar/link-grammar-5.3.11.ebuild index d8cf07fb2078..ddab5316ca13 100644 --- a/dev-libs/link-grammar/link-grammar-5.3.11.ebuild +++ b/dev-libs/link-grammar/link-grammar-5.3.11.ebuild @@ -90,17 +90,10 @@ src_configure() { if use python ; then prepare_python() { - if python_is_python3; then - ECONF_SOURCE="${S}" gnome2_src_configure \ - --disable-python-bindings \ - --enable-python3-bindings \ - ${myconf[@]} - else - ECONF_SOURCE="${S}" gnome2_src_configure \ - --enable-python-bindings \ - --disable-python3-bindings \ - ${myconf[@]} - fi + ECONF_SOURCE="${S}" gnome2_src_configure \ + --disable-python-bindings \ + --enable-python3-bindings \ + ${myconf[@]} } python_foreach_impl run_in_build_dir prepare_python fi @@ -112,14 +105,7 @@ src_compile() { if use python ; then compile_binding() { - local pysuffix - if python_is_python3; then - pysuffix=3 - else - pysuffix= - fi - - emake -C bindings/python$pysuffix \ + emake -C bindings/python3 \ VPATH="${S}:${NORMAL_BUILD_DIR}" \ _clinkgrammar_la_DEPENDENCIES="${NORMAL_BUILD_DIR}"/link-grammar/liblink-grammar.la \ _clinkgrammar_la_LIBADD="${NORMAL_BUILD_DIR}"/link-grammar/liblink-grammar.la @@ -140,14 +126,7 @@ src_install() { if use python ; then install_binding() { - local pysuffix - if python_is_python3; then - pysuffix=3 - else - pysuffix= - fi - - emake -C bindings/python$pysuffix \ + emake -C bindings/python3 \ VPATH="${S}:${NORMAL_BUILD_DIR}" \ _clinkgrammar_la_DEPENDENCIES="${NORMAL_BUILD_DIR}"/link-grammar/liblink-grammar.la \ _clinkgrammar_la_LIBADD="${NORMAL_BUILD_DIR}"/link-grammar/liblink-grammar.la \ diff --git a/dev-libs/link-grammar/link-grammar-5.8.0.ebuild b/dev-libs/link-grammar/link-grammar-5.8.0.ebuild new file mode 100644 index 000000000000..6434d2d8be23 --- /dev/null +++ b/dev-libs/link-grammar/link-grammar-5.8.0.ebuild @@ -0,0 +1,125 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6..9} ) + +inherit autotools java-pkg-opt-2 python-r1 out-of-source + +DESCRIPTION="A Syntactic English parser" +HOMEPAGE="https://www.abisource.com/projects/link-grammar/ https://www.link.cs.cmu.edu/link/" +SRC_URI="https://www.abisource.com/downloads/${PN}/${PV}/${P}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="aspell +hunspell java python" # pcre +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +# XXX: sqlite is automagic +# Does not build with >=sci-mathematics/minisat-2, bug #593662 +# add pcre support: pcre? ( dev-libs/libpcre ) +RDEPEND=" + dev-db/sqlite:3 + aspell? ( app-text/aspell ) + hunspell? ( app-text/hunspell ) + java? ( + >=virtual/jdk-1.6:* + dev-java/ant-core + ) + python? ( ${PYTHON_DEPS} ) + !sci-mathematics/minisat" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-lang/swig:0 + sys-devel/autoconf-archive + virtual/pkgconfig" + +pkg_setup() { + if use aspell && use hunspell; then + ewarn "You have enabled 'aspell' and 'hunspell' support, but both cannot coexist," + ewarn "only hunspell will be built. Press Ctrl+C and set only 'aspell' USE flag if" + ewarn "you want aspell support." + fi + use java && java-pkg-opt-2_pkg_setup +} + +src_prepare() { + use java && java-pkg-opt-2_src_prepare + + # http://bugzilla.abisource.com/show_bug.cgi?id=13806 + eapply "${FILESDIR}"/${PN}-5.8.0-out-of-source-build.patch + eapply "${FILESDIR}"/${PN}-5.8.0-dont-inject-O3.patch + eapply_user + + eautoreconf +} + +my_src_configure() { + local myconf=( + --disable-maintainer-mode + --disable-editline + --disable-perl-bindings + --disable-static + --enable-sat-solver=bundled + $(use_enable aspell) + $(use_enable hunspell) + $(usex hunspell --with-hunspell-dictdir="${EPREFIX}"/usr/share/myspell '') + $(use_enable java java-bindings) + # $(use_enable pcre regex-tokenizer) + # $(use_with pcre) + ) + + econf \ + --disable-python-bindings \ + "${myconf[@]}" + + if use python; then + python_configure() { + econf \ + --enable-python-bindings \ + "${myconf[@]}" + } + python_foreach_impl run_in_build_dir python_configure + fi +} + +my_src_compile() { + local -x MAIN_BUILD_DIR="${BUILD_DIR}" + default + + if use python; then + python_compile() { + emake -C bindings/python \ + VPATH="${S}:${MAIN_BUILD_DIR}" \ + _clinkgrammar_la_DEPENDENCIES="${MAIN_BUILD_DIR}"/link-grammar/liblink-grammar.la \ + _clinkgrammar_la_LIBADD="${MAIN_BUILD_DIR}"/link-grammar/liblink-grammar.la + } + python_foreach_impl run_in_build_dir python_compile + fi +} + +my_src_install() { + local -x MAIN_BUILD_DIR="${BUILD_DIR}" + default + + if use python; then + python_install() { + emake -C bindings/python \ + VPATH="${S}:${MAIN_BUILD_DIR}" \ + _clinkgrammar_la_DEPENDENCIES="${MAIN_BUILD_DIR}"/link-grammar/liblink-grammar.la \ + _clinkgrammar_la_LIBADD="${MAIN_BUILD_DIR}"/link-grammar/liblink-grammar.la \ + DESTDIR="${D}" \ + install + } + python_foreach_impl run_in_build_dir python_install + fi + + # no static archives + find "${ED}" -name '*.la' -delete || die +} + +pkg_preinst() { + use java && java-pkg-opt-2_pkg_preinst +} diff --git a/dev-libs/log4cpp/Manifest b/dev-libs/log4cpp/Manifest index 1b69f3cda639..338a76b1a331 100644 --- a/dev-libs/log4cpp/Manifest +++ b/dev-libs/log4cpp/Manifest @@ -3,8 +3,9 @@ AUX 1.0-doc_install_path.patch 1010 BLAKE2B 1f8f1b488e2ee87ad29738d175e2a2cb205c AUX 1.0-gcc43.patch 1166 BLAKE2B 2669ceaed022d24e5090a6b96e856ab9612c5818b216949c78732d887e0749818da1d94ae7f9e85d53ec2631e73b3baff2c2cab98ef926d38e0fa6bb0b2c083d SHA512 61ffeddb968a4cc138db1ec854460ad86d864cabc48e4801da8e6e886783d34b112115441090039307d2f7305caee1c0275ad988176adf339170f981fba41262 AUX log4cpp-1.1-automake-1.13.patch 242 BLAKE2B 17ac8a6529025edf8f46109906ec2bb2087f56ced626f4f3ddf47c000714b85ba558af1680ae3ab29f5aca8799185e25bed7a7c563d6950f1f3159e58f60eba8 SHA512 22abe490efd1a6b500265744abb2f58345fd9f6df881f1d932d7a95e6076397009c0bbd190eb803c0a4800035c0e435493164393674d19c611825235cb59fcc5 AUX log4cpp-1.1-cmath-fix.patch 206 BLAKE2B 7caa58dcb66cc184b1f88a99ea6c6c0d21233c9bbd9b7da6727f735f73c98849c0cc95a3e90913847805ecbc1bd84ee56436d3fed6736259251e1c94363f436f SHA512 926e10166d162863c6c1774ce3a6e523a27ae999df68f9423c2ee94042152078d931eda77b07c323890850918832396a3603c3a9226310af90cd3946a7de7ffe +AUX log4cpp-1.1-glibc-2.31.patch 647 BLAKE2B 80d59c50d322531258f79a8a90385e1565ac0c5658071682dd13ee22b0fba22f1f4b799c4c08a59f07a57eeea2cafa7ffa76902951870854a1dafbf7805abdf2 SHA512 b27fe0c8218dd48c5b72ffc0ba0eb103c610b665777e643929b18b52e23ddf9f6e87bb4c9798f077aaedfcbe1d9ca44342499b15b4c209e5097e7b07269f0fcf DIST log4cpp-1.1.3.tar.gz 595639 BLAKE2B fc7d643aa70d739e38ec5aba127b4e760a47a064f4032690586c4698ec83a2b7f219d8476650d3bfc5e25563de0852869429ec45171233c6bd5c08b69476b169 SHA512 88e5e10bce8d7d6421c3dcf14aa25385159c4ae52becdc1f3666ab86e1ad3f633786d82afe398c517d4faaa57b3e7b7c0b524361d81c6b9040dbded5cecc19de DIST log4cpp-1.1.tar.gz 547676 BLAKE2B 3fee8e575b404215d308a0d6c72feef612dcfb9c881c97500937d1a94d1c435108a24ae1ad20f19cedb1613735c22a37354226699fe6cafbf6d23dcd12668271 SHA512 e1a723641c75a0b7f9ad2338134b327cd9a0a1bd67ff76bca726389ad76e8ba0ee5a95abe6f29e05a77980255dc08b0aa5c906395b0a0ad094994c9e450e3ecb -EBUILD log4cpp-1.1.3.ebuild 1218 BLAKE2B 2e30665d7e6065a89527aa25f9043b24b7b88a4c7842ca457f8cd47f2e43747ece4b1be75dda9c9fbad12df4fbd00f016c79fef0c3cad00bf67ac7a0a5ac90f1 SHA512 3a8714bd9559fc42c8f27ce9b9160244e9717ce936d30925d370eabea36908bfa8d656a8b5321fc1850e09f4365f172ca134ba8a917a42ea513ff3880150f23f +EBUILD log4cpp-1.1.3.ebuild 1260 BLAKE2B 560f16a733613bfda221da956ed28c1801bcdd8c45e63b01bed25b29d82855f0072a0e9f8ebc12865a19e543dcaff635e4e71febd3b815466566604eb1488cfd SHA512 9b3553438e752699f2c876f969641290519ee50cbfed6da9d3d66e9163ab9a4d067e2cf621f2401ed45d773647d2e56cf0ed7bc97aaf83c727e519d0cd1e6b2f EBUILD log4cpp-1.1.ebuild 1204 BLAKE2B dd6c9be9cb70665b4a8bbc6bc1bee4b51792c97738b2cfff8cd5ada7d77b6e6013b4ce839699cff71a8ea2402d395c6c7a6cde0b404ad8b88e9a8766e5b57de8 SHA512 87712a5daa9dc26a6305be0ebc6145925659f1736d1cbe5ea208b72d8f1989838a42f579fecb78a3fd617b36b39b3ce0311306d29b745ace15a0f14fade531d4 MISC metadata.xml 244 BLAKE2B c211d7844d07df7225f7396d520699eb92a3d36a24a42153a7e736aa91ec766fef9ba07b120f90fe0ac295a982123259d294cc7a4cda1375c52e5d55a938e41c SHA512 0adb9b66d52e83eef31fe24ba677684835d998f9cf88054128834a3bff80878aabb6b2b8209f1d34f3e91b4d9c615d632d58c86bcb6fba38c85dc33c05d950e1 diff --git a/dev-libs/log4cpp/files/log4cpp-1.1-glibc-2.31.patch b/dev-libs/log4cpp/files/log4cpp-1.1-glibc-2.31.patch new file mode 100644 index 000000000000..5b927dfe20fa --- /dev/null +++ b/dev-libs/log4cpp/files/log4cpp-1.1-glibc-2.31.patch @@ -0,0 +1,22 @@ +diff --git a/tests/testDailyRollingFileAppender.cpp b/tests/testDailyRollingFileAppender.cpp +index 9958f41..158c08b 100644 +--- a/tests/testDailyRollingFileAppender.cpp ++++ b/tests/testDailyRollingFileAppender.cpp +@@ -22,6 +22,7 @@ + + #ifndef WIN32 // only available on Win32 + #include <dirent.h> ++#include <sys/time.h> + #else + #include <direct.h> + #endif +@@ -232,7 +233,8 @@ namespace OnlyManualTesting { + + now += seconds; + +- if (stime(&now) == -1) { ++ struct timeval tv = {.tv_sec = now, .tv_usec = 0}; ++ if (settimeofday(&tv, NULL) < 0) { + std::cerr << "Can not set date. Need admin privileges?" << std::endl; + return -1; + } diff --git a/dev-libs/log4cpp/log4cpp-1.1.3.ebuild b/dev-libs/log4cpp/log4cpp-1.1.3.ebuild index 2f4e7a389b17..b293ed92d241 100644 --- a/dev-libs/log4cpp/log4cpp-1.1.3.ebuild +++ b/dev-libs/log4cpp/log4cpp-1.1.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -24,6 +24,7 @@ PATCHES=( "${FILESDIR}"/1.0-asneeded.patch "${FILESDIR}"/${PN}-1.1-cmath-fix.patch "${FILESDIR}"/${PN}-1.1-automake-1.13.patch + "${FILESDIR}"/${PN}-1.1-glibc-2.31.patch ) S="${WORKDIR}/${PN}" diff --git a/dev-libs/luise-bin/Manifest b/dev-libs/luise/Manifest index 2a430108d523..5e76b7c7174c 100644 --- a/dev-libs/luise-bin/Manifest +++ b/dev-libs/luise/Manifest @@ -1,3 +1,3 @@ DIST LUIse_0.1.1.tar.gz 393815 BLAKE2B be7e35e1f4d5f6227f92bfeb5ed414593215c194e8d7ab67036ac7316cf6faeada839bbef15d8569b6fc276f3bddf41bdaf66e7315f6e8ff1341f8d697327895 SHA512 821b62ed476088c3818cb478a3c525e1d92e9879ef4059da0eb534852a294f802550ad7169066fe439f0cb3645e98656f405594db633061029ae9d7eff86f31d -EBUILD luise-bin-0.1.1-r1.ebuild 1009 BLAKE2B 67ab63888084b09ba353115f99dcfc314575b785519ae52ef9731ca78796d8884f265a3b279bb2d3532a931d2e7c4ccb62b47f1ca607e10327313f4211ba3e31 SHA512 d93ef8312c348de0f0a4303af18a93d9413f3d729ca7ac07d70aa1737bebe368fae31c324d79cf2b69d5bf238f97c6603a8c2b076940c268347756552cb1bd3e +EBUILD luise-0.1.1-r1.ebuild 1009 BLAKE2B 1c81be489b57c112edd0e3f79be2ea1c3abc622f2cfd3f5b91f16ebcdb3d4d0dad3b94bdce042ef376cef69c6cfa2835d06b01c9f7ec9a1e70ed0d3bc5b8a28c SHA512 306d1290a780dfa5f79a95e4f28ad0ff9c2323f555d451a880173b21ff42b00ef3c26a8382ac32d0478dfcc1b53d4e2d284dca9615838989a96215b879da285f MISC metadata.xml 1194 BLAKE2B 9205382d50d4a6c64f752dfcf4d7c22b8f581dacb7724ecd4255949a843e0fe07b9550f16e75ba8b8305faa3df6942fb532887a62715999d9b151e8c660a1961 SHA512 ad7ed0c143e0efb40eefdcec9d83bb0851f16a4815b2cb2acf1aaf8595a39727d375d4f34c3c9f772df1d31e47a779e91a2f9297c42bbd7bcf540afbb087704e diff --git a/dev-libs/luise-bin/luise-bin-0.1.1-r1.ebuild b/dev-libs/luise/luise-0.1.1-r1.ebuild index 5671c69e0cab..2653ebe53508 100644 --- a/dev-libs/luise-bin/luise-bin-0.1.1-r1.ebuild +++ b/dev-libs/luise/luise-0.1.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 diff --git a/dev-libs/luise-bin/metadata.xml b/dev-libs/luise/metadata.xml index 2b9a35f1422c..2b9a35f1422c 100644 --- a/dev-libs/luise-bin/metadata.xml +++ b/dev-libs/luise/metadata.xml diff --git a/dev-libs/mongo-c-driver/Manifest b/dev-libs/mongo-c-driver/Manifest index 98f225dd13cd..8af4c6b726e7 100644 --- a/dev-libs/mongo-c-driver/Manifest +++ b/dev-libs/mongo-c-driver/Manifest @@ -23,6 +23,7 @@ DIST mongo-c-driver-1.13.1.tar.gz 5740487 BLAKE2B 92184df6f15f951564a7df14d8ec52 DIST mongo-c-driver-1.14.0.tar.gz 6573651 BLAKE2B 0b1157473554a5aa49e61cf1c85dc7b1f1917581e661a4295876d4c93e72137b4c7c04e1b7545ba7272706499dbe868a36f1c888d2d07a8176f1c4dc01f9fa5f SHA512 99ca4001341d044a8ffc02a5d7175d40f8a998bdaad15a668a7db0558fa616ec18152faeda6da7f28b34c5d2cf4b649180c9390d2229e1342b6c4f6742816994 DIST mongo-c-driver-1.15.1.tar.gz 6699867 BLAKE2B afb75b6f50173bbe161a37a5cd3afd7d2ce3d9ab73019e2a27e2b15b0be0a54c5e3b423dda2e6d65b85ff7c1dbbd883f3a0e0ebc244a13c531d2c39297d9a5e9 SHA512 7544900809dd008da110b412acc1e5e42ea908d804fdf3bced8100e48f1695844605407c9733b285b8833b636bcaec8687df25a01c9749612c61df2325214fe5 DIST mongo-c-driver-1.16.2.tar.gz 6888287 BLAKE2B 40d2b73f495a8c71ca8b3c39c1b3c85b4a01ea088428967ed49f4758ef749e3288b046bde767a83aad022933f30f7307a4be65141f477bb1dcf912b4099129d6 SHA512 0930a80692f08329cad558644c25c46da64a0c8b6a9fc7412db0f547dae63bf59e9d29ee774d329c63af186eea751670bf21ccee8cf255f8bc8d5bd78c0e736a +DIST mongo-c-driver-1.17.0.tar.gz 7092911 BLAKE2B f93de6f3ded0f22ff8af65113ed207ca6dcc8ecbaedb24b33ddf7ada93b913eae33a802245f386d75fef01bf53c2d9630e68138a5715de001b7acea7dbde05f1 SHA512 49889b9d777dc3cb151b9cbef7bc2dd1785e327ae641569281efcc040d208cb034da3a74ae1115a033cc86e5b70079dab76c3478df8f171cc083d686f7568858 DIST mongo-c-driver-1.3.5.tar.gz 5860804 BLAKE2B a55de56d285638f21caff06446e3c0c19a5b8722a2ed69fdf046c35973c9bedcc1686065e4355db28afc83c1415872eee2972a6fb3f21647d2cafce12706adc0 SHA512 23844ffe20580998308aa9c8409afcb87dccde874077eefc6806b705e5de5743846ba0513f3a3fe83147fc47842ab8c7438ad1de5f3f55b81586b9e19046aabf DIST mongo-c-driver-1.6.2.tar.gz 6907818 BLAKE2B 7922a50ba58d92d2954eb5c2ccb02fd3b70861bd26516fd12fe6bdf79a926799fbc3a367e1c24a57932870726aa5abc1d264215ea964a56bc318ab0f413afc60 SHA512 b3fe08a31bc83707a4d94f8ea2742fc9b17d024d6c2f92b49cfc4fe012e58cd441c9f0fa4bae9f4205fca44b2a0d8c6d5bc32a05fc9ede9bab0011839a1394af DIST mongo-c-driver-1.8.2.tar.gz 7308675 BLAKE2B ca82c2824486cee78b164d1fdfcf1de062804f0f8637a36ec197efe434ae23a387ec0e6b2e4aa3e9c8bb2434a3cef48fecd17fc4b159a92ad86b8b940b17598a SHA512 af23601ba33694d80acdb890c1b85a354fda966491c4bbfb341a884bcd6314886e405efa3a09e47398adf8dbfdeb1b05ae8b022a72f04a66265bfaeddb661f76 @@ -39,7 +40,8 @@ EBUILD mongo-c-driver-1.13.0-r1.ebuild 2447 BLAKE2B 9d78225d7dfad62360686f37b607 EBUILD mongo-c-driver-1.13.1.ebuild 2482 BLAKE2B a023ec4ab0d023c30e6f664eb1209136429c19321f07fbdf7def6b2fcb7d66f873fd394d48db98f08f2466c4c46a9fbba8f8a48e57a355b09c2d9e4582d1ebda SHA512 f587c3e03233039d8869b5d75b8fd1cee617da4a1b4fd6acd97a043c78a7604320c42e78e5e21df0783da98092252e4301011804384988df548449a350e89a47 EBUILD mongo-c-driver-1.14.0.ebuild 2551 BLAKE2B 63c599838498a5893429ff5def20a62f50205e9c6eb8cbc09fd32bcdacd8b70531cc46041023999a634f990c4982a3b94a027cef2314e1b6d5e0a8edb8d9768a SHA512 3ad5c4651b4c3d00c9c01159648750f46cc52e8c9c910ca5534518c7ee7255bba6069ef5a26f5734d52b7a978cdf089ffac52af10fcc15c41a573e6cd6f7fcb6 EBUILD mongo-c-driver-1.15.1.ebuild 2536 BLAKE2B b4d2263f92d32b3605188b6ea91d8dd1a3100ad13e73c300b6efe5a684483a9669c389d591c6681c5f6a2a1501bbc1d2fc4c1db88533c868ca1b4fe30348203c SHA512 393ffad442d3db5ad0661459f3ef9cbe9d37a5087079436ac6c534dee378d207c802f928b6dbef13626d6c77026971215c52413e8ea7bf21167f74526b9b6560 -EBUILD mongo-c-driver-1.16.2.ebuild 2541 BLAKE2B 5fc7fc60e1667bbf7d169036435634466b35c26bb5f4036c790fe6d58b21ece802c51aa40cf2aa5ff808b24bfd490c918ac00f169d354a74c42098ca845907f9 SHA512 4842863de11b4cf4fcdba090ebf4705307b7fab39144b84d4af9e6cd2a2d6a94db510522c4a6d4dbd5b7d6fbb5bc1d837c6d86185587e85169c94de187ff6be5 +EBUILD mongo-c-driver-1.16.2.ebuild 2540 BLAKE2B bb6de7ee9d45012925342455a1b5510769009620a85046c7aaa5edf6ad8b1be21463559528976118ed6628cfd911ab76fc5e7261a9e0a71911ef484af573002d SHA512 199881586c7b65d760667630d6b6fcca3f284ad5165fde7031a59885ae2a036578d1da6cf2f1c4400e88e91f70f3107846728f97f737fc3072efbb7334a8b8fd +EBUILD mongo-c-driver-1.17.0.ebuild 2493 BLAKE2B 7b32636dba41d0baefd313d353f2ec5edeeddb7a233eab73fc2ce9d120b0554276a9bda73c39d5e25977655c97d9c3157caa6276d709e307d38e3b1af60937ba SHA512 3b2fcd5f061d97d0bf3c9b31823b703d201bffab759ab9da93ffb68d96cdbb8fe82f0ce5c92516bf83283bf380543ef4df5ff8e582a4f4672bdd1a9c6bc8199a EBUILD mongo-c-driver-1.3.5.ebuild 2171 BLAKE2B 62807837e21c6ce5c098fb5160aae99b01d6dd01550d3bd837ca727616036ec453a9e37f0b4ae71979bdce01344a265d0ccc23d324d9827084bfc302b980a6d1 SHA512 1b22d611b3c235883d4115fbf82d800fae0fd81453d2b4dff8abe8dbeab065b04e2abd506ad6050c10862a7bb7f28cc7ad41b08bf16a53598c20eabcaaec4cd8 EBUILD mongo-c-driver-1.6.2.ebuild 2070 BLAKE2B b2a25755c6a37247c42f41134684387b2e584a241a411fce98c96f057ef18c050bc4e8ec3aadc4de716fa7369ca797ca75cf9ac2fb39d3dba0827190d9cad2be SHA512 22a44789068ec7277d10feb6d41b82526b09aad1213ae8b9827131e63df1d78ce07704f295178cfa085a6c6c645f7d456150caca51265b00dd8bf6cca2c6f42c EBUILD mongo-c-driver-1.8.2.ebuild 2128 BLAKE2B ef502986fe7b125c8abd168119797b89706209b0f6c7a2f99dbf4a0e9de93687babc79d504e366ba4bdad52215e2f5c4c72f259f81ea3bd70c627591389cf9dc SHA512 87607915dab15ffbe9f2dea28a243d14ec5c20d7290fd9018a57a7e31cbe4bc62b731f236da06d246823b070ea2230b588159a8001e792ce7273f492452811fb diff --git a/dev-libs/mongo-c-driver/mongo-c-driver-1.16.2.ebuild b/dev-libs/mongo-c-driver/mongo-c-driver-1.16.2.ebuild index e82f70860420..8e3e76187349 100644 --- a/dev-libs/mongo-c-driver/mongo-c-driver-1.16.2.ebuild +++ b/dev-libs/mongo-c-driver/mongo-c-driver-1.16.2.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/mongodb/mongo-c-driver/releases/download/${PV}/${P}. LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~hppa ~s390 x86" +KEYWORDS="amd64 ~hppa ~s390 x86" IUSE="debug examples icu libressl sasl ssl static-libs test" REQUIRED_USE="test? ( static-libs )" diff --git a/dev-libs/mongo-c-driver/mongo-c-driver-1.17.0.ebuild b/dev-libs/mongo-c-driver/mongo-c-driver-1.17.0.ebuild new file mode 100644 index 000000000000..72b58f751ba6 --- /dev/null +++ b/dev-libs/mongo-c-driver/mongo-c-driver-1.17.0.ebuild @@ -0,0 +1,94 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake-utils + +DESCRIPTION="Client library written in C for MongoDB" +HOMEPAGE="https://github.com/mongodb/mongo-c-driver" +SRC_URI="https://github.com/mongodb/mongo-c-driver/releases/download/${PV}/${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~hppa ~s390 ~x86" +IUSE="debug examples icu libressl sasl ssl static-libs test" +REQUIRED_USE="test? ( static-libs )" + +RDEPEND="app-arch/snappy:= + app-arch/zstd:= + >=dev-libs/libbson-${PV}[static-libs?] + dev-python/sphinx + sys-libs/zlib:= + icu? ( dev-libs/icu:= ) + sasl? ( dev-libs/cyrus-sasl:= ) + ssl? ( + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) + )" +DEPEND="${RDEPEND} + test? ( + dev-db/mongodb + dev-libs/libbson[static-libs] + )" + +# No tests on x86 because tests require dev-db/mongodb which don't support +# x86 anymore (bug #645994) +RESTRICT="x86? ( test ) + !test? ( test )" + +PATCHES=( + "${FILESDIR}/${PN}-1.14.0-no-docs.patch" + "${FILESDIR}/${PN}-1.16.2-enable-tests.patch" # enable tests with system libbson + "${FILESDIR}/${PN}-1.16.2-sphinx.patch" +) + +src_prepare() { + cmake-utils_src_prepare + + # copy private headers for tests since we don't build libbson + if use test; then + mkdir -p src/libbson/tests/bson || die + cp src/libbson/src/bson/bson-*.h src/libbson/tests/bson/ || die + fi +} + +src_configure() { + local mycmakeargs=( + -DCMAKE_SKIP_RPATH=ON # mongoc-stat insecure runpath + -DENABLE_BSON=SYSTEM + -DENABLE_EXAMPLES=OFF + -DENABLE_ICU="$(usex icu ON OFF)" + -DENABLE_MAN_PAGES=ON + -DENABLE_MONGOC=ON + -DENABLE_SNAPPY=SYSTEM + -DENABLE_ZLIB=SYSTEM + -DENABLE_SASL="$(usex sasl CYRUS OFF)" + -DENABLE_SSL="$(usex ssl $(usex libressl LIBRESSL OPENSSL) OFF)" + -DENABLE_STATIC="$(usex static-libs ON OFF)" + -DENABLE_TESTS="$(usex test ON OFF)" + -DENABLE_TRACING="$(usex debug ON OFF)" + -DENABLE_UNINSTALL=OFF + -DENABLE_ZSTD=ON + ) + + cmake-utils_src_configure +} + +# FEATURES="test -network-sandbox" USE="static-libs" emerge dev-libs/mongo-c-driver +src_test() { + local PORT=27099 + mongod --port ${PORT} --bind_ip 127.0.0.1 --nounixsocket --fork \ + --dbpath="${T}" --logpath="${T}/mongod.log" || die + MONGOC_TEST_URI="mongodb://[127.0.0.1]:${PORT}" ../mongo-c-driver-${PV}_build/src/libmongoc/test-libmongoc || die + kill $(<"${T}/mongod.lock") +} + +src_install() { + if use examples; then + docinto examples + dodoc src/libmongoc/examples/*.c + fi + + cmake-utils_src_install +} diff --git a/dev-libs/mpc/Manifest b/dev-libs/mpc/Manifest index a46a8407d740..19d6a5fa01a4 100644 --- a/dev-libs/mpc/Manifest +++ b/dev-libs/mpc/Manifest @@ -1,3 +1,5 @@ DIST mpc-1.1.0.tar.gz 701263 BLAKE2B afd9fefe687b7cd3c3a483e183f366348e34f58f5d713e2f6b38da16e2e382248b446d9da01ea89fe7202b795b08929b7c42c89c2c1e9a57482faf01ee697beb SHA512 72d657958b07c7812dc9c7cbae093118ce0e454c68a585bfb0e2fa559f1bf7c5f49b93906f580ab3f1073e5b595d23c6494d4d76b765d16dde857a18dd239628 +DIST mpc-1.2.0.tar.gz 840711 BLAKE2B 3609d299623a722ca90d4b04ff64becaaa399a5fa40fbc43a1d027692d8fbe6f4ebd24a3c8ea963963977952d130cd3993887da7b0b0c1613a27a24dd37e5831 SHA512 84fa3338f51d369111456a63ad040256a1beb70699e21e2a932c779aa1c3bd08b201412c1659ecbb58403ea0548faacc35996d94f88f0639549269b7563c61b7 EBUILD mpc-1.1.0-r1.ebuild 911 BLAKE2B a4f737a415faf743345c5f01a63e97ee130b0bc01f4773c60688b64111886e365f61807b173fa5090474cc6d522c918655793e63668a05827ccad3f0f7ec6900 SHA512 9be5809d00f2c567c2ce0c422479825685aec708bd3bc1a12656bb0872de11e1695872fca17d0949a4b48e4e16cd6179371e682cf2564a98c9208e486f610f0d +EBUILD mpc-1.2.0.ebuild 934 BLAKE2B e4765161a8e158fa072d76805adc7ad49d142265ebfde65b2c8616c7ddf2fa90d34dea798f549bd4266b7f91067f0f60760d2536f9d647179a8587170d4b8ef9 SHA512 45cb962e1ec46d559fa368688da6100b299ef6afec4684c6e5a4e4aebcfee8d9e53a00e83a51cfeb7560b09f57c164d08bc2ae832d8e9238a8a1d882151eb7b0 MISC metadata.xml 261 BLAKE2B 0f1375874fe7e8b88a61f27f69fb353b86a45aa39838c0f7a3137b5d5a5e6c9cdfca1cd43913e15545c14466603066eed331d012b1073a72a5634aebff15b9ce SHA512 31c9514d1798d2ab9ad46006c8e85222798c200a7466568170da1587d99144d2fabb8e5056b723710d19cdb1d5482d93eff479a8caa77f00e93aa46861ceb05c diff --git a/dev-libs/mpc/mpc-1.2.0.ebuild b/dev-libs/mpc/mpc-1.2.0.ebuild new file mode 100644 index 000000000000..1bdc785c2c6a --- /dev/null +++ b/dev-libs/mpc/mpc-1.2.0.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit multilib-minimal + +DESCRIPTION="A library for multiprecision complex arithmetic with exact rounding" +HOMEPAGE="http://mpc.multiprecision.org/" +SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0/3" # libmpc.so.3 +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="static-libs" + +DEPEND=">=dev-libs/gmp-5.0.0:0=[${MULTILIB_USEDEP},static-libs?] + >=dev-libs/mpfr-4.1.0:0=[${MULTILIB_USEDEP},static-libs?]" +RDEPEND="${DEPEND}" + +multilib_src_configure() { + ECONF_SOURCE=${S} econf $(use_enable static-libs static) +} + +multilib_src_install_all() { + einstalldocs + find "${D}" -name '*.la' -delete || die +} diff --git a/dev-libs/mpfr/Manifest b/dev-libs/mpfr/Manifest index 1092d8a3cf03..1c171764397c 100644 --- a/dev-libs/mpfr/Manifest +++ b/dev-libs/mpfr/Manifest @@ -1,3 +1,5 @@ DIST mpfr-4.0.2.tar.xz 1441996 BLAKE2B 4c1a15208c2dc3dcc1424974de506198e9cc479c70255149876c7f541133499ada5c89f07393b120b7079e6bbaf8ea03e5e496e1350b295e687392a6e0341c1c SHA512 d583555d08863bf36c89b289ae26bae353d9a31f08ee3894520992d2c26e5683c4c9c193d7ad139632f71c0a476d85ea76182702a98bf08dde7b6f65a54f8b88 +DIST mpfr-4.1.0.tar.xz 1525476 BLAKE2B 41d1be0c4b557760f12a4525ad3a84b6e2cd6f0927c935fcfba577ac0490e582d1ae4b581dce58e21e705cf9d7c88373054d7fb7a94bb32c69b339f99a25dc68 SHA512 1bd1c349741a6529dfa53af4f0da8d49254b164ece8a46928cdb13a99460285622d57fe6f68cef19c6727b3f9daa25ddb3d7d65c201c8f387e421c7f7bee6273 EBUILD mpfr-4.0.2.ebuild 1644 BLAKE2B 0e93bbe9c14f289fad63c5055eaee18299d4daa1297581f2bf8241e75ef711814de09a6ce6154bb1979b6e452c674d6a5a59289deb8b134752c4bf9fdc35c7d9 SHA512 7ef27262e6172f59c952e61f5b2433225066778a3b7a7d3114542dc8356de625e4a59361c0606d302250c28c23ea565990b70eb139a9d0633475d9d8071de328 +EBUILD mpfr-4.1.0.ebuild 1062 BLAKE2B 7f987a8cfddc96a4f8308a23044f22ea587c48139fa85a8cac2646098f5f302a7de14f5e23398702b18ed93aa170dbc365eb2bc62d91ff7976ec6437557956e9 SHA512 3a57ccd9abd0527be30986c5114ed9fba34ae19c0387508541d3a7daee8ee65706003b3cc623f8f8a4fa9ed3136f433ca9fba00068d99dc36ec39b378910b797 MISC metadata.xml 257 BLAKE2B 468bd91200194cf2104205cb18f54d629954ed0d86d85a5d3e90af1942eb199d777a0ebc17d1f610f69326d3e0caa686255709f165466f5e0a675380373b30f9 SHA512 fd85d9cf15f6b7db96e4d184e32ae6f1503a5b70cb4cb1ce930ba13a1d5d4c4b24971781e95b7f3f9ead58b31760f84c368bc6fa2a793b4b5baf78259b047ff1 diff --git a/dev-libs/mpfr/mpfr-4.1.0.ebuild b/dev-libs/mpfr/mpfr-4.1.0.ebuild new file mode 100644 index 000000000000..8ae3c247d9c2 --- /dev/null +++ b/dev-libs/mpfr/mpfr-4.1.0.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit multilib-minimal + +DESCRIPTION="library for multiple-precision floating-point computations with exact rounding" +HOMEPAGE="https://www.mpfr.org/" +SRC_URI="https://www.mpfr.org/mpfr-${PV}/${P}.tar.xz" + +LICENSE="LGPL-2.1" +SLOT="0/6" # libmpfr.so version +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="static-libs" + +RDEPEND=">=dev-libs/gmp-5.0.0[${MULTILIB_USEDEP},static-libs?]" +DEPEND="${RDEPEND}" + +HTML_DOCS=( doc/FAQ.html ) + +multilib_src_configure() { + # Make sure mpfr doesn't go probing toolchains it shouldn't #476336#19 + ECONF_SOURCE=${S} \ + user_redefine_cc=yes \ + econf $(use_enable static-libs static) +} + +multilib_src_install_all() { + rm "${ED}"/usr/share/doc/"${P}"/COPYING* + use static-libs || find "${ED}"/usr -name '*.la' -delete +} diff --git a/dev-libs/msgpack/Manifest b/dev-libs/msgpack/Manifest index a1da54aaa647..08c38a7f544e 100644 --- a/dev-libs/msgpack/Manifest +++ b/dev-libs/msgpack/Manifest @@ -8,5 +8,5 @@ DIST msgpack-3.2.1.tar.gz 1234733 BLAKE2B 97fb6cab5125463f10e7ad2c55ee478b2bf3da EBUILD msgpack-1.1.0.ebuild 1055 BLAKE2B f50c69aa071803feb8fe923a4013555713f275c0efe59d6fb72664275a590b45f5b6c95e3514d8afb170c85f68ea9e3f5d9cebc6baa12b7ee3b02a09c80c3994 SHA512 39c31dd96a67f9c8e36b68c6c4f7392eb90305934696b47464eb2677323e0a59cbe1100d06d2e23455e75b8fb671f90d4a6347abb13b8c43f35608f185cd69ef EBUILD msgpack-3.1.1.ebuild 1717 BLAKE2B bf44d36d1b0c747d054699dfbc13b4d51badbc80575ec44769ea1f27459ec50fdcabc6b1b3c76273ee686fc843561ce6e02ba883c159ffcf48fecf21bfc24e32 SHA512 a1bab4c161c0493441413584d0eb8957b5d074809c5008d1084bb2da9c1bc9741bdd5562dacd461cc96f873a2181abdb5f209a0a8ee716752089e33cf2bb47cb EBUILD msgpack-3.2.0.ebuild 1715 BLAKE2B 48a074fdc4f7e465d1339914853469eb240edecef610d6f4d81018bfd945601ad3891ac4e32e9fb9e36b4aa53052301546808519c5b54ca6ef65a72e66cc7f10 SHA512 7c1f10c53ab2f13a259bc43fc8e485f6d523b1bf9a9e21c36e367967d3f5e1fbc530cca28267e56ecff89fec41f3f3b918a6934da80da568f8182f3c644b21c8 -EBUILD msgpack-3.2.1.ebuild 1717 BLAKE2B 14d3ca227d4ecb9b903b9c251a0b5895475c50f2fb03af2bba5ed4d9fb29db022acd981acfbecfb08b88315211a99aa957270a54743589f9bdcc69b10b4266b1 SHA512 e86438ec6993a983eff96bb8c0c553a57269d928d2a0536b2a7e30cc690e851d43e9b8cb9e3907d17bdfdf3721db9b76d9293bf5c44f748e178029380ab92c4e +EBUILD msgpack-3.2.1.ebuild 1724 BLAKE2B 55a6691b776143a253cf727b382042c2ef67f9ecc1484981cffeab77ab85ccd7ee64e4e75bb397dd9ef150acde0b21c909630547d67728ffe9f897bfa493413e SHA512 e4e4e26d30aa7138ccdfcdb99cba3a281f12cb0db358eb79f5b30a967fe51290bbe80f8c254d12b15e5bd977d70838ceb34b7052713d1ee190287d131c935db0 MISC metadata.xml 409 BLAKE2B 7656515e9cbf76555dd77ba3350bfc3720d685f061aa2a4c9ef793c7d0eb0dcf327bd707f00a01b0d2be706ec79d62778cf7266998457a62f4291ccb1a5de194 SHA512 f56436ccd3ab6d2d5cf453e4eaeb8e3b79cd8d89a73c1c0ff17c2a47b1802641b20e41d75a12ea161f0a47e0236c84425a02cf8bb16e4b9d5b406fba4d2f1ec1 diff --git a/dev-libs/msgpack/msgpack-3.2.1.ebuild b/dev-libs/msgpack/msgpack-3.2.1.ebuild index 9e7faeb02180..a1129dcdc409 100644 --- a/dev-libs/msgpack/msgpack-3.2.1.ebuild +++ b/dev-libs/msgpack/msgpack-3.2.1.ebuild @@ -9,7 +9,7 @@ if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="https://github.com/${PN}/${PN}-c.git" else SRC_URI="https://github.com/${PN}/${PN}-c/releases/download/cpp-${PV}/${P}.tar.gz" - KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" + KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux" fi DESCRIPTION="MessagePack is a binary-based efficient data interchange format" diff --git a/dev-libs/nettle/Manifest b/dev-libs/nettle/Manifest index 0495dc014942..da7cf57064c6 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 1812 BLAKE2B 853dd98f357d99d70af30b13262c8da731c9c4d8d656d5361bc7bf811360f36ba380e0058f19f7a9695a74943df0c69ff854094da61a26437dc801e140b4ef34 SHA512 d7334bf15caedd7dcf930683140266536fd75808b63016d92d8d7a6959422db24b2e1f435627134ad6f9feb7742e7fa2836f93133d73bf43c3b9f14a2f01d550 +EBUILD nettle-3.6-r2.ebuild 1804 BLAKE2B 57cb20e6bf266faf4a3bdbb1dfc9526737fa866f86c54b95a9d35d16b1f3871173e6e3bda3b27cf53bd4253cb66d8fe413e16e2c790f8e844107b12b24d8868e SHA512 eb4cedbd9bd966100beb1fd0c8757729c8f7f14aa50b9b739b947630f4a0e86313e1553da639149d572c11b200d053d586bca83f4a213d68a3b53a87b744a5cc 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 7a850ed2560b..d813e7d1c276 100644 --- a/dev-libs/nettle/nettle-3.6-r2.ebuild +++ b/dev-libs/nettle/nettle-3.6-r2.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" LICENSE="|| ( LGPL-3 LGPL-2.1 )" SLOT="0/8-6" # subslot = libnettle - libhogweed soname version -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="+asm doc +gmp static-libs test cpu_flags_x86_aes cpu_flags_arm_neon cpu_flags_x86_sha" RESTRICT="!test? ( test )" diff --git a/dev-libs/newt/Manifest b/dev-libs/newt/Manifest index 411b93a643d0..1b86e6c805de 100644 --- a/dev-libs/newt/Manifest +++ b/dev-libs/newt/Manifest @@ -2,5 +2,5 @@ AUX newt-0.52.13-gold.patch 362 BLAKE2B 2f40cfe7e4b2b01b755c787d22d2006c2c55ca05 AUX newt-0.52.14-tcl.patch 3269 BLAKE2B dc542330cf49a43d63ca6e3edea141ae62664a701038c1086715b7de899f4b987c87069be8fd3a57f1f4c3fe8292d298876cf01f34e9d1f66f59ab7c08134d50 SHA512 6074f53b4070f4d8c7e1f4dfc4de7c549ac63a4af4bae70a3ebc3ebb03bd588923e8a952ffd93139041f5454318958a50a8ca8b0ecd98fb5d2ebde74b42aa313 AUX newt-0.52.21-python-sitedir.patch 954 BLAKE2B ed2a504cc2e2c06200e209fdf55e9b3ce01c502bd1a6898c6c56e5ecedfcc5672ab619f52d3ad3828569996d11302bdc24cc484f3d65a85d27b5e8c564e12311 SHA512 3583b352d2e46e12f03a1d3b0fcaab606018765b1ae8855a7160bced34b36235a4ed0cd2b4cda1202e40680d6d8a7ad7a93aec0b46d2ee17a091509cf079c9b4 DIST newt-0.52.21.tar.gz 174895 BLAKE2B a0d6a15f87fe04dc535e65fcd28606cd666142d006a53b6ee0c8387a6295215e44f1815ac56ceb56b561ca9b5bc8f3cab2d04b5decd62642f46b744333dc7e34 SHA512 d53d927996d17223e688bf54dccfabb2a3dc02bfe38ffc455964e86feaca3cd9f9ab5b19774433be430fa4d761cd9b6680b558f297acb86f80daeb6942f7d23c -EBUILD newt-0.52.21-r1.ebuild 2245 BLAKE2B 9a0d5fb29521c38714710175ad18a4c5de5b1b0a1988d255d809497dfdb272489b876420a1622b45299e8e7c452c5c12cb2b67a40813590ad53a349d6cf9a5db SHA512 e647f52683d7df3ca43e8ba31dd5de4add226f9ada32fc7e257a2bf17c71fb08acd035d97a2ce3d6cf7d530f08e5d1946eb40bcb641f90494c9a2c443ed57aae +EBUILD newt-0.52.21-r1.ebuild 2258 BLAKE2B 1ce1f0487b95b79d5cd10d6d59122e1c9a7b6610016eb1b671f751de56f6f1827d6c7b9e650394a1b939e84cd06e1e71df803ba8057a4e33426a138de092374c SHA512 0e983781b1d73e15c83a9f47de10b46e05e00d8b2be23f676b230b6f771eb0069c52288d7d1d7db4f169ca97ed60d0bfa851f7348c30bfc756a1d3fe06a6ae6d MISC metadata.xml 250 BLAKE2B b9f4109bece0ad2b6afb8c0b16fe12f39bf1851a9b1201e3a26cfd1eb86d9a9999ebbae97a6fdf8bbfc18cb213c9cfd8eba72c3731742429c44659795f33d87a SHA512 4ebf7bc5513be89eaf0f32aa1b41c095085cd95486e7ecc7cdc61e3f3a16119318f821a954cb2ba16e8408f6d00f1bee3923d7b4ae35aab54c0e21c6f33e56cd diff --git a/dev-libs/newt/newt-0.52.21-r1.ebuild b/dev-libs/newt/newt-0.52.21-r1.ebuild index 0e660b1c0512..9a198423fc11 100644 --- a/dev-libs/newt/newt-0.52.21-r1.ebuild +++ b/dev-libs/newt/newt-0.52.21-r1.ebuild @@ -85,9 +85,9 @@ src_compile() { src_install() { installit() { - python_export PYTHON_SITEDIR emake \ DESTDIR="${D}" \ + PYTHON_SITEDIR="$(python_get_sitedir)" \ PYTHONVERS="${EPYTHON}" \ install python_optimize diff --git a/dev-libs/nmeap/Manifest b/dev-libs/nmeap/Manifest index 02d7cce12878..cc3e3d7fb7bb 100644 --- a/dev-libs/nmeap/Manifest +++ b/dev-libs/nmeap/Manifest @@ -1,4 +1,4 @@ AUX nmeap-0.3-fix-unitialized-variable.patch 275 BLAKE2B ad143d8be7c773eceb10413d2ac7c06474ac4a565da9afa09c6b2e3d2c16de8b9ac905a996420dfd5239a5eb3d060bfb2306241fff13805a05a1af5691f65e06 SHA512 cc8626e1b6e71c45550f9bb1de83c1f3aba41dbd05da904d29825179107bb79df88a19eb96955aa9f9a811cea25d46f58a0f6a94c534f8ed872b84ce01b01e59 DIST nmeap-0.3.tar.gz 29380 BLAKE2B d4828a1a3d8a66ae529e40c034bf180da9657c2a3dec1ab09f32a9062430952a568612d2071acb887c6f1afdb19de82cb4b6d1788c6e9c2e1e859d9914209b3a SHA512 064a7fe27a192b4abe1393f8f343c8956bd9dd1d0de1441ca96597ab1f155001905b9b0b35d47b61e1f68891b820c602c024e4c74fb809719108711c5b1df815 -EBUILD nmeap-0.3-r1.ebuild 1217 BLAKE2B 52d29e1606fe38f1813d5fc0259e37c694767ba5f51754c2100e7a9c9fd2e7ca2c60a09a127af73e92d84c4e42abc3fb1527bafae972d7755331f40acabda739 SHA512 56a9bd6d0acf9d191678175af27b444e7b7872f03f815617723bfda649104c9c781c3b6f729d87971c3bdb8ec060d24f93d712bee4eedd7afc399ff8c7ccb735 +EBUILD nmeap-0.3-r1.ebuild 1215 BLAKE2B baf3062bd535bbe03c9e1ca12d0a31be57cea8cb6c3fc632fbb0772d43e744de21c0b98b4ff908fae5ae0664e158091bc77f2567ae10d7a949c31cfd59bc1e5e SHA512 d9334116884dc8a31d8d0fd056d65bccd372cb8117467981e9005c4cb54bf6ab470971167cc6cdbd7ed437df319948278560887921789bf091d45dc4a13b5a73 MISC metadata.xml 594 BLAKE2B e3a1979b0f92e21be1221c01098c1ff25462ce244ece52e675632cb812dd34ce02ef8f7241da70e1427fccaa920b212b47a03c4cbb99fc679f73795233152a07 SHA512 4f104de142ef75158b7bdd371aab0fd19c318c7d34d51cbaa030ace243cb609788f88d6e548f1659ba891d3d6827c2fe24611bc9a78a67d32315a245eac50f75 diff --git a/dev-libs/nmeap/nmeap-0.3-r1.ebuild b/dev-libs/nmeap/nmeap-0.3-r1.ebuild index 65da3ee31eb4..6684bde5b236 100644 --- a/dev-libs/nmeap/nmeap-0.3-r1.ebuild +++ b/dev-libs/nmeap/nmeap-0.3-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" +EAPI=7 inherit toolchain-funcs diff --git a/dev-libs/npth/Manifest b/dev-libs/npth/Manifest index 8260d5a27a86..3290c841e8fa 100644 --- a/dev-libs/npth/Manifest +++ b/dev-libs/npth/Manifest @@ -5,6 +5,6 @@ DIST npth-1.6.tar.bz2 300486 BLAKE2B 665fdb2f4cbe59750b6b4b7c2701ee80a23a122df10 EBUILD npth-1.3.ebuild 670 BLAKE2B 5987fb8075ac5efd02a1980ff28666e38326ca43064628cd8af7ee04bad1bd0e90768ddbadfce11f812618d2e8ee0fdbec375d978a89ef80e9d8cbb1bdb24e33 SHA512 25e0f26a55c970b4d2974668cc8452468e95775f17d6456310be19aefae343539f8cb2ac7d619481d2179ad9acfe3a2859c39ac28a084c1701dbe10ff928d3bd EBUILD npth-1.4.ebuild 683 BLAKE2B 046f4e47d204fc077757524f5892a6cce5b7c2cc6663b87ca87500d21b1669b3c86cb463aaab5888c69ff98856a7fd060b5e7242193757b5617b385bbad1b8de SHA512 37c5dd04b5c51de81c8ff8c50f9ac1ce260b77ec45869c18cb98251dc2f7b1862a9f0d7ddbe6b386d3d825a1f309e66ea9824839ed8011710af071be6d350d2f EBUILD npth-1.5.ebuild 740 BLAKE2B b7f39e56382f5ec10b21a1e65d89a7d8d9ee74e456b11ed54d8744cd40b2ee023c7dbc4aca842d3079364ff0112c636260733c50d16a714c8c538ce15f4cde00 SHA512 602fc9d468a8b382f22c703855ccb36053e1964c98af0d437ce47e2ab8bb82569f56b0077a0a9e08226c1f486fc10a4af91b5e405a1f88792037676ca6431462 -EBUILD npth-1.6-r1.ebuild 763 BLAKE2B e4c85ddae9b40a37121714b7020dcc26ffce437bc2dc454f6eaced5d3b728528e09f92c8289e82d12351dabcae9c8fd2edb3606f44deaef2d632f71927bfefa9 SHA512 79099992f7e894f7e65e5e5622b8591b9df08c4fef0304d19cceba390460c0c32e24a7068166d2571f4ff01b4655c3fabc1facbf701aa660dfb3a0ac767475fd +EBUILD npth-1.6-r1.ebuild 757 BLAKE2B b1c01ae0d1fc4abc3eca53ce2dd434582341fe84ac3073976c2654cf540d3a74de388d4d2f5d9c384f74e4c2be4a58844c1d27d817dbc550fadbe26aadfbc804 SHA512 2c2657d60decf03db7a592c128967b44a9b92eca9d89f7b9be3dd8384a172b64cae1f16d522031470730bb81adf4363e86098d650270deda44431272be7655b2 EBUILD npth-1.6.ebuild 752 BLAKE2B 41971a4ca71f49bd3386c90c1423ccdc1a9d28208868adfe0a4dffc8dcc48f140150e3591036ae427b91a3e5801203df0cb963398de46579c012d79d707b0d33 SHA512 45030582cbeeb0611d97a7934205e4cc421c341c38c02df4fb13d18ae2b3d67231705ee793ad079aad40704311ee77f012bcd5bf9ac29e0f61b71f335756e762 MISC metadata.xml 251 BLAKE2B 958e5ce6ef310471d4c88ef4cfd054eb9476b56abe4e8b82b003632bae4d56a800530601a7fd4b0129fdf22fe5124e8642f60835c6792cdfe38e09afb2d701ec SHA512 10bbd614739518c3b33fc05f34caa511ad71c599e2df0cb58514f05186b9c4ef73e00e3c78018c38581376a90a7968a01c35620fca32fdc5a91a762233a8c5fd diff --git a/dev-libs/npth/npth-1.6-r1.ebuild b/dev-libs/npth/npth-1.6-r1.ebuild index 1c585d54845f..8a95ed7685ef 100644 --- a/dev-libs/npth/npth-1.6-r1.ebuild +++ b/dev-libs/npth/npth-1.6-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2" LICENSE="LGPL-2.1+" SLOT="0" -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="static-libs" src_prepare() { diff --git a/dev-libs/nsgenbind/Manifest b/dev-libs/nsgenbind/Manifest index 7a1df5d02355..f82dc716fcba 100644 --- a/dev-libs/nsgenbind/Manifest +++ b/dev-libs/nsgenbind/Manifest @@ -1,7 +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 +EBUILD nsgenbind-0.6-r2.ebuild 623 BLAKE2B 23831455b338f7e61f68f9ef0440b96aa278cd2d1dfa1e4e5eb4f0df2e8db7f5fd6314e0b206ef7d846c75f0a2efeb521178b3e2e1fc7ea43240384b05d39397 SHA512 7efe9bf98769b9f35baf13e768cd5fb96a78b62f8af870dd723bc748d7fd3a169ab3d24a9ba5adc184e46092d3c458c6cc0fbdf1a8322adcf566892fbb0e5086 +EBUILD nsgenbind-0.7-r1.ebuild 623 BLAKE2B 23831455b338f7e61f68f9ef0440b96aa278cd2d1dfa1e4e5eb4f0df2e8db7f5fd6314e0b206ef7d846c75f0a2efeb521178b3e2e1fc7ea43240384b05d39397 SHA512 7efe9bf98769b9f35baf13e768cd5fb96a78b62f8af870dd723bc748d7fd3a169ab3d24a9ba5adc184e46092d3c458c6cc0fbdf1a8322adcf566892fbb0e5086 +EBUILD nsgenbind-0.8-r1.ebuild 624 BLAKE2B 494d4b6c14783c67a9df4c8e22ac8ff9e309dfcc430c7fa65ae204ba39a825603a0cb48106af65d2c16a897a9fc4251e03065787d2079d09ac01912f599eb2a7 SHA512 a5d73dbcf290f0094c3dfbf0332599301dfbd9a53f5af06e53810005267c1e9c85ce84757915e3d4c5e61fe58ae831665882da6ce112886264ce61b7935ae1bc MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33 diff --git a/dev-libs/nsgenbind/nsgenbind-0.6-r1.ebuild b/dev-libs/nsgenbind/nsgenbind-0.6-r2.ebuild index e85a58a5c920..fd95f03f94fd 100644 --- a/dev-libs/nsgenbind/nsgenbind-0.6-r1.ebuild +++ b/dev-libs/nsgenbind/nsgenbind-0.6-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 toolchain-funcs +inherit netsurf DESCRIPTION="generate javascript to dom bindings from w3c webidl files" HOMEPAGE="http://www.netsurf-browser.org/" @@ -19,7 +19,6 @@ DEPEND=" virtual/yacc" _emake() { - source /usr/share/netsurf-buildsystem/gentoo-helpers.sh netsurf_define_makeconf emake "${NETSURF_MAKECONF[@]}" COMPONENT_TYPE=binary $@ } @@ -29,5 +28,5 @@ src_compile() { } src_install() { - _emake DESTDIR="${ED}" install + _emake DESTDIR="${D}" install } diff --git a/dev-libs/nsgenbind/nsgenbind-0.7.ebuild b/dev-libs/nsgenbind/nsgenbind-0.7-r1.ebuild index e85a58a5c920..fd95f03f94fd 100644 --- a/dev-libs/nsgenbind/nsgenbind-0.7.ebuild +++ b/dev-libs/nsgenbind/nsgenbind-0.7-r1.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 toolchain-funcs +inherit netsurf DESCRIPTION="generate javascript to dom bindings from w3c webidl files" HOMEPAGE="http://www.netsurf-browser.org/" @@ -19,7 +19,6 @@ DEPEND=" virtual/yacc" _emake() { - source /usr/share/netsurf-buildsystem/gentoo-helpers.sh netsurf_define_makeconf emake "${NETSURF_MAKECONF[@]}" COMPONENT_TYPE=binary $@ } @@ -29,5 +28,5 @@ src_compile() { } src_install() { - _emake DESTDIR="${ED}" install + _emake DESTDIR="${D}" install } diff --git a/dev-libs/nsgenbind/nsgenbind-0.8.ebuild b/dev-libs/nsgenbind/nsgenbind-0.8-r1.ebuild index a4c9c0054538..353b0a1d9722 100644 --- a/dev-libs/nsgenbind/nsgenbind-0.8.ebuild +++ b/dev-libs/nsgenbind/nsgenbind-0.8-r1.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit toolchain-funcs +inherit netsurf DESCRIPTION="Generate Javascript-to-DOM bindings from w3c webidl files" HOMEPAGE="http://www.netsurf-browser.org/" @@ -19,7 +19,6 @@ BDEPEND=" virtual/yacc" _emake() { - source /usr/share/netsurf-buildsystem/gentoo-helpers.sh netsurf_define_makeconf emake "${NETSURF_MAKECONF[@]}" COMPONENT_TYPE=binary $@ } diff --git a/dev-libs/nspr/Manifest b/dev-libs/nspr/Manifest index b124ed2d3b08..14f654861682 100644 --- a/dev-libs/nspr/Manifest +++ b/dev-libs/nspr/Manifest @@ -7,6 +7,10 @@ AUX nspr-4.8.9-link-flags.patch 931 BLAKE2B 6aa6aa1cf3b856a95b7baa20f58e9ed83b8b AUX nspr-4.9.5_nspr_config.patch 251 BLAKE2B 65ae8b981e758e2955b7a3358f24b7b17dc1ef59f0e78f9fd9ddee740a4da3825bafea34f3900200b3f6edefed7d0797c194cb0339d4e36551615d599156108d SHA512 3f118b7142a19dcc7e26b348cec6029c78d585a57cc2bfc2ab7ca13d2ef953e576dab0ac044316e3165d0201bf27253afa732109f914da6f7a39f19facff8310 DIST nspr-4.25.tar.gz 1079633 BLAKE2B 377e5ec0e60cca13f1ee988adb10870bbb6cb9e4eb61e4434152418d4f8d446741a192d7019298ec2669b8e190cacb6a1ca9c4b2838e9b14dd3590ed40facdd2 SHA512 b9aa576e0da37e8729088fe559d94030cf18f277c1f7a30104d3088a804913343ed884645c0adb62144da475e20934b359f897bf3ae9a6ebb5f9daf283d5a562 DIST nspr-4.26.tar.gz 1079778 BLAKE2B db83afa5e3ab2e0ef92aa236db6d9f25e963b77df7c71400e691dc3e882ec6d63cbf13996eb1ae1a03a294def419e1669e38fe42990c66efedce03f121087e6c SHA512 d6632cde3570ee386ee1459257eba99f91dd62fa905fd82679222c83d63c185b76d8dca0422d4349de2dfce603472ae52bc0dcced0f142acb733374c74155d3c +DIST nspr-4.27.tar.gz 1080036 BLAKE2B 2d7a24259ff6b04e7a71e705d54612f27957824969b94eab251d6a53d91c7630d59cd107a6b9f5c6c0a308bac1db1ebc286602d672d4828d2322288456a5ce78 SHA512 2be539e6fd5ed8987874147a2bacc3f0b7177cdfddbb1a4f9e5f93575de871584b05fb56ca4e1ba5f7e53074cd4069310658f1559de0f38def208b087b6e6dca +DIST nspr-4.28.tar.gz 1080086 BLAKE2B 7b4bfd8e05f6303d9d41c3c2686447cd1f16b029d8219b9fc2c83f4a16a8ccf214ad6374e0caf9816aaced1e14650cb43acb92b89d7e9d0886acc59292b53d1e SHA512 5badee7bc4b43270b384e2f6ee0654be88b2fb4a5db1dfc46e441520bf66496105db80bced2234b73c18150eb6a6fe00f93cea1e2cfe809404bfd3e02de109c4 EBUILD nspr-4.25.ebuild 3930 BLAKE2B 93e41000e906be98a34555fa1970189139db9d4b0c23dafac29ec4e5db93965981d614e15886333665db3d255ef3545a48efe7819755e973497d22367681d292 SHA512 b6edf7eb6685ec60f549c4ca542146fc02673c59369d6c691dbfe98106e319b7c0bc2817629296a447bfce720467f64c290106356b5eb26348227169d0841919 -EBUILD nspr-4.26.ebuild 3939 BLAKE2B 6ca8360a5ed7711cef58d81c9db313ecfd57dc76ce48485f3427e84ecccb21069da57547385ef3c7a25085c1caed77f9bbb86f7b9b6b2ebdd7452893f0287b91 SHA512 0ad73faf242f7b8813d1add48629132d4276b618f63860a134576b757dbf14b253bf642f404a57d87bf8978ea896e75602dddb9b14a44241469b1e0466e09150 +EBUILD nspr-4.26.ebuild 3931 BLAKE2B 6952a7e9909aad55717ed0113e89c9b71f39b38f421160d4c90bcea04b1a3870e01dc37c376b1879241b4bff02630c90cda5027e62b50c6229f5c4c4a9593750 SHA512 a1486044ebfb544a6349e09bb9245d1faec6d97cdfdeb379a39ce1581e6ce51219bcc0a23aec56ab68d7f17362e186229aa5c64b7874401ddf487939031a5653 +EBUILD nspr-4.27.ebuild 3939 BLAKE2B 6ca8360a5ed7711cef58d81c9db313ecfd57dc76ce48485f3427e84ecccb21069da57547385ef3c7a25085c1caed77f9bbb86f7b9b6b2ebdd7452893f0287b91 SHA512 0ad73faf242f7b8813d1add48629132d4276b618f63860a134576b757dbf14b253bf642f404a57d87bf8978ea896e75602dddb9b14a44241469b1e0466e09150 +EBUILD nspr-4.28.ebuild 3939 BLAKE2B 6ca8360a5ed7711cef58d81c9db313ecfd57dc76ce48485f3427e84ecccb21069da57547385ef3c7a25085c1caed77f9bbb86f7b9b6b2ebdd7452893f0287b91 SHA512 0ad73faf242f7b8813d1add48629132d4276b618f63860a134576b757dbf14b253bf642f404a57d87bf8978ea896e75602dddb9b14a44241469b1e0466e09150 MISC metadata.xml 349 BLAKE2B 06dabb7ec8263989dcff436449a820af581cc04ce9de05d7c4553751c8d9c6dc43a2af221c69107fca9ae046a1b3ec807cd3f3122195cffd23de9c6ce8b1c258 SHA512 5185204ed18d7e0e4a48f918dfd871a18c62572968767566b6e0c028075e1054ec8028aac412de0c598936a79e3f70486ef889f96b720e2b15d862cf91b12b23 diff --git a/dev-libs/nspr/nspr-4.26.ebuild b/dev-libs/nspr/nspr-4.26.ebuild index 0c02c60c9fbd..a73504395616 100644 --- a/dev-libs/nspr/nspr-4.26.ebuild +++ b/dev-libs/nspr/nspr-4.26.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://archive.mozilla.org/pub/nspr/releases/v${PV}/src/${P}.tar.gz" LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" IUSE="debug elibc_musl" MULTILIB_CHOST_TOOLS=( diff --git a/dev-libs/nspr/nspr-4.27.ebuild b/dev-libs/nspr/nspr-4.27.ebuild new file mode 100644 index 000000000000..0c02c60c9fbd --- /dev/null +++ b/dev-libs/nspr/nspr-4.27.ebuild @@ -0,0 +1,122 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools toolchain-funcs multilib-minimal + +MIN_PV="$(ver_cut 2)" + +DESCRIPTION="Netscape Portable Runtime" +HOMEPAGE="http://www.mozilla.org/projects/nspr/" +SRC_URI="https://archive.mozilla.org/pub/nspr/releases/v${PV}/src/${P}.tar.gz" + +LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +IUSE="debug elibc_musl" + +MULTILIB_CHOST_TOOLS=( + /usr/bin/nspr-config +) + +PATCHES=( + "${FILESDIR}"/${PN}-4.23-prtime.patch + "${FILESDIR}"/${PN}-4.7.1-solaris.patch + "${FILESDIR}"/${PN}-4.10.6-solaris.patch + "${FILESDIR}"/${PN}-4.8.4-darwin-install_name.patch + "${FILESDIR}"/${PN}-4.8.9-link-flags.patch + # We do not need to pass -L$libdir via nspr-config --libs + "${FILESDIR}"/${PN}-4.9.5_nspr_config.patch +) + +src_prepare() { + cd "${S}"/nspr || die + + default + + use elibc_musl && eapply "${FILESDIR}"/${PN}-4.21-ipv6-musl-support.patch + + # rename configure.in to configure.ac for new autotools compatibility + if [[ -e "${S}"/nspr/configure.in ]] ; then + einfo "Renaming configure.in to configure.ac" + mv "${S}"/nspr/configure.{in,ac} || die + else + elog "configure.in rename logic can be removed from ebuild." + fi + + # We must run eautoconf to regenerate configure + eautoconf + + # make sure it won't find Perl out of Prefix + sed -i -e "s/perl5//g" "${S}"/nspr/configure || die + + # Respect LDFLAGS + sed -i -e 's/\$(MKSHLIB) \$(OBJS)/\$(MKSHLIB) \$(LDFLAGS) \$(OBJS)/g' \ + "${S}"/nspr/config/rules.mk || die +} + +multilib_src_configure() { + # We use the standard BUILD_xxx but nspr uses HOST_xxx + tc-export_build_env BUILD_CC + export HOST_CC=${BUILD_CC} HOST_CFLAGS=${BUILD_CFLAGS} HOST_LDFLAGS=${BUILD_LDFLAGS} + tc-export AR CC CXX RANLIB + [[ ${CBUILD} != ${CHOST} ]] \ + && export CROSS_COMPILE=1 \ + || unset CROSS_COMPILE + + local myconf=( + --libdir="${EPREFIX}/usr/$(get_libdir)" + $(use_enable debug) + $(use_enable !debug optimize) + ) + + # The configure has some fancy --enable-{{n,x}32,64bit} switches + # that trigger some code conditional to platform & arch. This really + # matters for the few common arches (x86, ppc) but we pass a little + # more of them to be future-proof. + + # use ABI first, this will work for most cases + case "${ABI}" in + alpha|arm|hppa|m68k|o32|ppc|s390|sh|sparc|x86) ;; + n32) myconf+=( --enable-n32 );; + x32) myconf+=( --enable-x32 );; + s390x|*64) myconf+=( --enable-64bit );; + default) # no abi actually set, fall back to old check + einfo "Running a short build test to determine 64bit'ness" + echo > "${T}"/test.c || die + ${CC} ${CFLAGS} ${CPPFLAGS} -c "${T}"/test.c -o "${T}"/test.o || die + case $(file "${T}"/test.o) in + *32-bit*x86-64*) myconf+=( --enable-x32 );; + *64-bit*|*ppc64*|*x86_64*) myconf+=( --enable-64bit );; + *32-bit*|*ppc*|*i386*) ;; + *) die "Failed to detect whether your arch is 64bits or 32bits, disable distcc if you're using it, please";; + esac ;; + *) ;; + esac + + # Ancient autoconf needs help finding the right tools. + LC_ALL="C" ECONF_SOURCE="${S}/nspr" \ + ac_cv_path_AR="${AR}" \ + econf "${myconf[@]}" +} + +multilib_src_install() { + # Their build system is royally confusing, as usual + MINOR_VERSION=${MIN_PV} # Used for .so version + emake DESTDIR="${D}" install + + einfo "removing static libraries as upstream has requested!" + rm "${ED}"/usr/$(get_libdir)/*.a || die "failed to remove static libraries." + + # install nspr-config + dobin config/nspr-config + + # Remove stupid files in /usr/bin + rm "${ED}"/usr/bin/prerr.properties || die + + # This is used only to generate prerr.c and prerr.h at build time. + # No other projects use it, and we don't want to depend on perl. + # Talked to upstream and they agreed w/punting. + rm "${ED}"/usr/bin/compile-et.pl || die +} diff --git a/dev-libs/nspr/nspr-4.28.ebuild b/dev-libs/nspr/nspr-4.28.ebuild new file mode 100644 index 000000000000..0c02c60c9fbd --- /dev/null +++ b/dev-libs/nspr/nspr-4.28.ebuild @@ -0,0 +1,122 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools toolchain-funcs multilib-minimal + +MIN_PV="$(ver_cut 2)" + +DESCRIPTION="Netscape Portable Runtime" +HOMEPAGE="http://www.mozilla.org/projects/nspr/" +SRC_URI="https://archive.mozilla.org/pub/nspr/releases/v${PV}/src/${P}.tar.gz" + +LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +IUSE="debug elibc_musl" + +MULTILIB_CHOST_TOOLS=( + /usr/bin/nspr-config +) + +PATCHES=( + "${FILESDIR}"/${PN}-4.23-prtime.patch + "${FILESDIR}"/${PN}-4.7.1-solaris.patch + "${FILESDIR}"/${PN}-4.10.6-solaris.patch + "${FILESDIR}"/${PN}-4.8.4-darwin-install_name.patch + "${FILESDIR}"/${PN}-4.8.9-link-flags.patch + # We do not need to pass -L$libdir via nspr-config --libs + "${FILESDIR}"/${PN}-4.9.5_nspr_config.patch +) + +src_prepare() { + cd "${S}"/nspr || die + + default + + use elibc_musl && eapply "${FILESDIR}"/${PN}-4.21-ipv6-musl-support.patch + + # rename configure.in to configure.ac for new autotools compatibility + if [[ -e "${S}"/nspr/configure.in ]] ; then + einfo "Renaming configure.in to configure.ac" + mv "${S}"/nspr/configure.{in,ac} || die + else + elog "configure.in rename logic can be removed from ebuild." + fi + + # We must run eautoconf to regenerate configure + eautoconf + + # make sure it won't find Perl out of Prefix + sed -i -e "s/perl5//g" "${S}"/nspr/configure || die + + # Respect LDFLAGS + sed -i -e 's/\$(MKSHLIB) \$(OBJS)/\$(MKSHLIB) \$(LDFLAGS) \$(OBJS)/g' \ + "${S}"/nspr/config/rules.mk || die +} + +multilib_src_configure() { + # We use the standard BUILD_xxx but nspr uses HOST_xxx + tc-export_build_env BUILD_CC + export HOST_CC=${BUILD_CC} HOST_CFLAGS=${BUILD_CFLAGS} HOST_LDFLAGS=${BUILD_LDFLAGS} + tc-export AR CC CXX RANLIB + [[ ${CBUILD} != ${CHOST} ]] \ + && export CROSS_COMPILE=1 \ + || unset CROSS_COMPILE + + local myconf=( + --libdir="${EPREFIX}/usr/$(get_libdir)" + $(use_enable debug) + $(use_enable !debug optimize) + ) + + # The configure has some fancy --enable-{{n,x}32,64bit} switches + # that trigger some code conditional to platform & arch. This really + # matters for the few common arches (x86, ppc) but we pass a little + # more of them to be future-proof. + + # use ABI first, this will work for most cases + case "${ABI}" in + alpha|arm|hppa|m68k|o32|ppc|s390|sh|sparc|x86) ;; + n32) myconf+=( --enable-n32 );; + x32) myconf+=( --enable-x32 );; + s390x|*64) myconf+=( --enable-64bit );; + default) # no abi actually set, fall back to old check + einfo "Running a short build test to determine 64bit'ness" + echo > "${T}"/test.c || die + ${CC} ${CFLAGS} ${CPPFLAGS} -c "${T}"/test.c -o "${T}"/test.o || die + case $(file "${T}"/test.o) in + *32-bit*x86-64*) myconf+=( --enable-x32 );; + *64-bit*|*ppc64*|*x86_64*) myconf+=( --enable-64bit );; + *32-bit*|*ppc*|*i386*) ;; + *) die "Failed to detect whether your arch is 64bits or 32bits, disable distcc if you're using it, please";; + esac ;; + *) ;; + esac + + # Ancient autoconf needs help finding the right tools. + LC_ALL="C" ECONF_SOURCE="${S}/nspr" \ + ac_cv_path_AR="${AR}" \ + econf "${myconf[@]}" +} + +multilib_src_install() { + # Their build system is royally confusing, as usual + MINOR_VERSION=${MIN_PV} # Used for .so version + emake DESTDIR="${D}" install + + einfo "removing static libraries as upstream has requested!" + rm "${ED}"/usr/$(get_libdir)/*.a || die "failed to remove static libraries." + + # install nspr-config + dobin config/nspr-config + + # Remove stupid files in /usr/bin + rm "${ED}"/usr/bin/prerr.properties || die + + # This is used only to generate prerr.c and prerr.h at build time. + # No other projects use it, and we don't want to depend on perl. + # Talked to upstream and they agreed w/punting. + rm "${ED}"/usr/bin/compile-et.pl || die +} diff --git a/dev-libs/nss-pem/Manifest b/dev-libs/nss-pem/Manifest index 8abb3383a897..2f050e1281f5 100644 --- a/dev-libs/nss-pem/Manifest +++ b/dev-libs/nss-pem/Manifest @@ -1,3 +1,6 @@ +AUX nss-pem-1.0.5-nss-3.53.1-support.patch 5005 BLAKE2B 4cacfbc965c5c5add442e8a37a1c4ad5c567763aeec7ab567c7558fd4b343cfeeec952a5d4c5131f279d3a7794b753ba424c27398263d4b03751a7308eda118c SHA512 8a19a7831d92e45f101ca44e278b319bfd3884d4eb17ec268ca08ed08542ecf51f81be23079e30d5b87aaa467f4104c88d739043aa3c36989540a69a23f4ae13 DIST nss-pem-1.0.5.tar.xz 36320 BLAKE2B c2294595d95a2de2bf6d9e68dc10955297fb6ef27c9e85dbabc7854b900942070f70a8e4c1abef618e7265daa75f5bd2a2fca3fe923973345f9c1b64a3da8ff5 SHA512 8dabebf114ac94441caf6d279f810de4124a3ffc05ae66777496b3e66f8b8148d535cb438a165d84f53111c468d595f3b16651cd7a990eeedca9d413aad65b2b +DIST nss-pem-1.0.6.tar.xz 36304 BLAKE2B ea804bb7b45c6d23c82ac823e36244b13d9b8ef8355cf30e82cc09850e623317ddffdbf4f8fd0ffa9253cd64d47dd12aa1738a8f720b3ac0e9091dff3421fa02 SHA512 2640c30aa8b0721e479f77781da7b4984553a01bff481084ad6e028cb6c99e2441f89b7758b5fc10f7c586e41dfcab2083a7c47bd1e0ce19712d0c61ac237540 EBUILD nss-pem-1.0.5.ebuild 644 BLAKE2B 6c953bf5e89b2f2fe668af5204a463f9aba5103e20bab64378d3b41eb1fbc66e53ec16b284ea3593ea05674f897d7659b8b8c25f8a3d3320c2209274eb495aa0 SHA512 7e6c8698937df6330d566736391717e4030fa026216a7d5f3f015e27708ac60402f551987c729ce536c0203202b4377673062f7ad4f7e5d6f3e05b213fc5f452 +EBUILD nss-pem-1.0.6.ebuild 711 BLAKE2B 74a349ad6bf0deef84d57e099c7473518c187743657e700625dc7aa18412c62efbb63c907185087a01f6edbcbf9eb575d05a30a93d3ea3453205a442c29aa451 SHA512 0105fc1eab10de04e0b256e13c199740a8c13d6f921062112e0e6124cdd7b6640ffdb3fae16ef7170bef49e41074cb209d69af84530a83c38090c18dbedb58ee MISC metadata.xml 332 BLAKE2B d0c820a1adbfacc8057f9110c542b17a456425ff7db013dbcef98a325a2f2c04950b15589cad36eb9bc9fb113a9fad35dd913821b41865282160878136783749 SHA512 20a26118c4e465049f6ee61e855ccd9b19a2c52caca91c0c73dd8e30a381c653f97603e7f2a6d8d64bd7aa6eff32f40044096a3257c5587ddbe6570d258e94bb diff --git a/dev-libs/nss-pem/files/nss-pem-1.0.5-nss-3.53.1-support.patch b/dev-libs/nss-pem/files/nss-pem-1.0.5-nss-3.53.1-support.patch new file mode 100644 index 000000000000..10cfd2cd0228 --- /dev/null +++ b/dev-libs/nss-pem/files/nss-pem-1.0.5-nss-3.53.1-support.patch @@ -0,0 +1,128 @@ +From e14d5b53ad588e45b2bcffb778563daf2fead5df Mon Sep 17 00:00:00 2001 +From: Ian Kumlien <ian.kumlien@gmail.com> +Date: Fri, 7 Aug 2020 15:57:17 +0200 +Subject: [PATCH] replace deprecated CK?_NETSCAPE_? constants + +... with the corresponding CK?_NSS_? constants + +Fixes: https://github.com/kdudka/nss-pem/issues/6 +Closes: https://github.com/kdudka/nss-pem/pull/7 +--- + pfind.c | 16 ++++++++-------- + pinst.c | 8 ++++---- + pobject.c | 10 +++++----- + 3 files changed, 17 insertions(+), 17 deletions(-) + +diff --git a/pfind.c b/pfind.c +index 83d5b89..fa5dd4d 100644 +--- a/pfind.c ++++ b/pfind.c +@@ -276,18 +276,18 @@ collect_objects(CK_ATTRIBUTE_PTR pTemplate, + type = pemBareKey; + plog("CKO_PRIVATE_KEY\n"); + break; +- case CKO_NETSCAPE_TRUST: ++ case CKO_NSS_TRUST: + type = pemTrust; +- plog("CKO_NETSCAPE_TRUST\n"); ++ plog("CKO_NSS_TRUST\n"); + break; +- case CKO_NETSCAPE_CRL: +- plog("CKO_NETSCAPE_CRL\n"); ++ case CKO_NSS_CRL: ++ plog("CKO_NSS_CRL\n"); + goto done; +- case CKO_NETSCAPE_SMIME: +- plog("CKO_NETSCAPE_SMIME\n"); ++ case CKO_NSS_SMIME: ++ plog("CKO_NSS_SMIME\n"); + goto done; +- case CKO_NETSCAPE_BUILTIN_ROOT_LIST: +- plog("CKO_NETSCAPE_BUILTIN_ROOT_LIST\n"); ++ case CKO_NSS_BUILTIN_ROOT_LIST: ++ plog("CKO_NSS_BUILTIN_ROOT_LIST\n"); + goto done; + case CK_INVALID_HANDLE: + type = pemAll; /* look through all objectclasses - ignore the type field */ +diff --git a/pinst.c b/pinst.c +index ef2d955..564458e 100644 +--- a/pinst.c ++++ b/pinst.c +@@ -236,7 +236,7 @@ CreateObject(CK_OBJECT_CLASS objClass, + /* more unique nicknames - https://bugzilla.redhat.com/689031#c66 */ + nickname = filename; + break; +- case CKO_NETSCAPE_TRUST: ++ case CKO_NSS_TRUST: + plog("Creating trust nick %s id %ld in slot %ld\n", nickname, objid, slotID); + memset(&o->u.trust, 0, sizeof(o->u.trust)); + break; +@@ -265,7 +265,7 @@ CreateObject(CK_OBJECT_CLASS objClass, + + switch (objClass) { + case CKO_CERTIFICATE: +- case CKO_NETSCAPE_TRUST: ++ case CKO_NSS_TRUST: + if (SECSuccess != GetCertFields(o->derCert->data, o->derCert->len, + &issuer, &serial, &derSN, &subject, + &valid, &subjkey)) +@@ -344,7 +344,7 @@ derEncodingsMatch(CK_OBJECT_CLASS objClass, pemInternalObject * obj, + + switch (objClass) { + case CKO_CERTIFICATE: +- case CKO_NETSCAPE_TRUST: ++ case CKO_NSS_TRUST: + result = SECITEM_CompareItem(obj->derCert, certDER); + break; + +@@ -497,7 +497,7 @@ AddCertificate(char *certfile, char *keyfile, PRBool cacert, + nickname, 0, slotID, NULL); + if (o != NULL) { + /* Add the CA trust object */ +- o = AddObjectIfNeeded(CKO_NETSCAPE_TRUST, pemTrust, objs[i], NULL, ++ o = AddObjectIfNeeded(CKO_NSS_TRUST, pemTrust, objs[i], NULL, + nickname, 0, slotID, NULL); + } + if (o == NULL) { +diff --git a/pobject.c b/pobject.c +index f613678..a97f3e2 100644 +--- a/pobject.c ++++ b/pobject.c +@@ -149,8 +149,8 @@ static const CK_KEY_TYPE ckk_rsa = CKK_RSA; + static const CK_OBJECT_CLASS cko_certificate = CKO_CERTIFICATE; + static const CK_OBJECT_CLASS cko_private_key = CKO_PRIVATE_KEY; + static const CK_OBJECT_CLASS cko_public_key = CKO_PUBLIC_KEY; +-static const CK_OBJECT_CLASS cko_trust = CKO_NETSCAPE_TRUST; +-static const CK_TRUST ckt_netscape_trusted = CKT_NETSCAPE_TRUSTED_DELEGATOR; ++static const CK_OBJECT_CLASS cko_trust = CKO_NSS_TRUST; ++static const CK_TRUST ckt_netscape_trusted = CKT_NSS_TRUSTED_DELEGATOR; + static const NSSItem pem_trueItem = { + (void *) &ck_true, (PRUint32) sizeof(CK_BBOOL) + }; +@@ -578,7 +578,7 @@ pem_FetchAttribute + return pem_FetchCertAttribute(io, type); + case CKO_PRIVATE_KEY: + return pem_FetchPrivKeyAttribute(io, type, pError); +- case CKO_NETSCAPE_TRUST: ++ case CKO_NSS_TRUST: + return pem_FetchTrustAttribute(io, type); + case CKO_PUBLIC_KEY: + return pem_FetchPubKeyAttribute(io, type); +@@ -775,7 +775,7 @@ pem_mdObject_GetAttributeCount + return pubKeyAttrsCount; + case CKO_PRIVATE_KEY: + return privKeyAttrsCount; +- case CKO_NETSCAPE_TRUST: ++ case CKO_NSS_TRUST: + return trustAttrsCount; + default: + break; +@@ -1168,7 +1168,7 @@ pem_CreateObject + if (listItem->io != NULL) { + /* Add the trust object */ + APPEND_LIST_ITEM(listItem); +- listItem->io = AddObjectIfNeeded(CKO_NETSCAPE_TRUST, pemTrust, ++ listItem->io = AddObjectIfNeeded(CKO_NSS_TRUST, pemTrust, + derlist[c], NULL, nickname, 0, + slotID, NULL); + } diff --git a/dev-libs/nss-pem/nss-pem-1.0.6.ebuild b/dev-libs/nss-pem/nss-pem-1.0.6.ebuild new file mode 100644 index 000000000000..fc81aed71ccc --- /dev/null +++ b/dev-libs/nss-pem/nss-pem-1.0.6.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +CMAKE_ECLASS="cmake" + +inherit cmake-multilib + +DESCRIPTION="PEM file reader for Network Security Services (NSS)" +HOMEPAGE="https://github.com/kdudka/nss-pem" +SRC_URI="https://github.com/kdudka/${PN}/releases/download/${P}/${P}.tar.xz" + +LICENSE="MPL-1.1" +SLOT="0" +KEYWORDS="~amd64 ~arm64" +IUSE="" + +BDEPEND=" >=dev-libs/nss-3.50-r1 " +RDEPEND="${BDEPEND}" + +DEPEND="!<=dev-libs/nss-3.50 + ${RDEPEND}" + +PATCHES=( + "${FILESDIR}/nss-pem-1.0.5-nss-3.53.1-support.patch" +) + +S="${WORKDIR}/${P}/src" + +multilib_src_configure() { + local mycmakeargs=( + -DLIB_INSTALL_DIR="$(get_libdir)" + ) + cmake_src_configure +} diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest index eb7beec6c054..c6742fe4f7d6 100644 --- a/dev-libs/nss/Manifest +++ b/dev-libs/nss/Manifest @@ -7,9 +7,13 @@ DIST nss-3.51.tar.gz 78305125 BLAKE2B 2c7b90d4cc9fe283bf81e21d0dceefff503e5a31f0 DIST nss-3.52.1.tar.gz 81222116 BLAKE2B e7a1a24c0a4765fb13a4c13a93187a26df6df68b3e8d623514928cf505215e67f5f22387b6a6b0680117b1c2af13752cb981c173bb50424784d05b459704d528 SHA512 be8746984e3028e5ed49f2132ca08687f6ac75e50208d8cfd6ffbcfd5db1ab8dcaf1f2a0a6c6c1920573de80490301b21c022759c7e2309a22d29698bb169dd6 DIST nss-3.53.1.tar.gz 81297900 BLAKE2B 7a053aa8322cb55b787730c87f1a6e8a799265574114d63257699348f4921007457d19e5fdc4684a512a91478d1912db45ce066daa8b9d9cde5130ff506aed9e SHA512 5d7572999a007c513df4cbdf74769c1a4eb53eb8680da27a89fea770763d88b6bea80cd9ab20426a905396745129276cffb6dd9e8e1e6377fa98c0a103b522d0 DIST nss-3.54.tar.gz 81190188 BLAKE2B bf91aa3e2081f0d123d3adfbfc2e3cadfeccf6b15ce03f429fede73bd57ebf96ba7317b890762b01820d75020bb99383c022e2e6558aa1a6d44e8c92cd533bd2 SHA512 9b9253469514c085730ae580f6544e882a8264e253687950627a4fa1eeb956287c9da46caf7d8988cd6363f6dee26cb8db755203375751fe53795697d7ae9b7b +DIST nss-3.55.tar.gz 81759883 BLAKE2B 5b663d2b1861eb74cf070f2711b4db1afbfbc40b08e1f117e6b4a62e9f997de06889de3afc654cf6547c371ab2a1183904a1a014d1dc4b3e94f734107c81e1cf SHA512 acae7b803a3219cd4b78216cb8a6352805741e42eca6a42a5e6289ebbabc6189c7c6bc138cbd8a93d8631d06175c4d34e72957d49fe726adada6aaa2566e399e +DIST nss-3.56.tar.gz 81706176 BLAKE2B 84c3b9fd649ce38ad843725b180982692dcac34e851734813b959734054f2e9ebfad66496de320f46e861381f6d5f52db0cc4c0953f7504b79f6b529b871f173 SHA512 f2eed8252c13b38a4d80a11203136d22a521205f814b6d954cc119ccf8921fcb8f689d919944bea4739d1575e9bda7e13cf2ad054ac91d51e049abe246efc845 DIST nss-cacert-class1-class3.patch 22950 BLAKE2B 9d5e60df5f161a3c27c41e5a9419440a54f888eda454e3cde5ebe626d4075b65cf9938b5144d0fb022377f4bd415bff5e5c67d104409860aa9391b3eb8872c68 SHA512 a5aa740bf110a3f0262e3f1ef2fc739ac2b44f042e220039d48aee8e97cd764d5c10718220364f4098aba955882bd02cadb5481512388971a8290312f88a7df0 EBUILD nss-3.51.ebuild 8973 BLAKE2B 38182caddafaa28743e15d70796912f523cdcb34ec6bf3fde4d8f5d147eab19cf3927aaf919a0f9f95ed71b3c4e45c8ae03bd60a9b75596d3428a5a661841e4e SHA512 631181fb368571224d9673fb2dfd70e01fe296c6ff27f5c4ffdb717e7ed2ac8b78ad7a17b29a93426f9e4815370b4c57391568c7ea7b2a141c36de3f3e2fb84f EBUILD nss-3.52.1-r1.ebuild 9139 BLAKE2B 512de8c0a96884adba78a42af3d6017096ec17b54ddab2ba7ffe934a65e6c09bb2f874e0c1e630b4fef514716e003771e3024192dff5054f0693a0934bec6132 SHA512 a308d2a036b9edb7d3b14a687384fa292d2b4fc3fdb9f86cde27f5419d56c1c50061eeee2bcb0a4170692a429600f491e31218053aa085d865edffd7ef224837 EBUILD nss-3.53.1.ebuild 8980 BLAKE2B cbe93301acc7fa612b3557911e9b2607e643667e11fefefc8b6bd50f2f8e50766378f001a67231788febf0a429677a13b007cb04e390cbe309cbc9d26316df9d SHA512 99e517111617fef4186bc0fb691cc092567f4f3385ecb30e866835da5e2b7418d45aaa8fa51c728fc88b4c411a1e0b6ca7b34f93d8192f4c70f32873024266d6 EBUILD nss-3.54-r1.ebuild 8980 BLAKE2B a044e5016d4ce38953e4cfead12f7232d93176bd99598624400f861271c7c882158283e0c30f77cfc6e2afc3656deec5882ba37f87f7f49bac05bc2d6ce00bb8 SHA512 617f5470be6279ddbce1a3f998fda3e19971ce8b6f53140d751b56c96427bb3573c64d2d6e4daa5a84dfb6cc70df3d25ecc7bc35bb389869950a64dde99ab9e7 +EBUILD nss-3.55.ebuild 8993 BLAKE2B 48fb1e98f11dcea199cc055a08a1d634230a6e91ea0ec63cf36f1a2978d5bddf092c856d66df4faade767262eab99fef53df2a7523b25227e9d97b818f7e09f3 SHA512 08114bb14b0a7ac3ae7cdb295d2f8c5730e652fcd6b1c3f5567412633ff8557c2a617252af73bf6f5c5351fc1e5b542542a3152c1aec81a201da7a1152c79eda +EBUILD nss-3.56.ebuild 9001 BLAKE2B 929685fc2b5c2ec8b60bbb11b13912f245093c4ecdd8afdd9d4e7e6fbc5c8b8ef8d1fbe4aed224b9baabe191e660c8e87170ac057d1b7be322e2ef0ecefaa6f8 SHA512 dd5638594ea50cb389b6c3336781c5c92c1d9ae5f083cd4188efcc8756908ba7616abb6b4730ac3fbabfd87e3dee2afe2a15b3be2ecdcb5bfb4360eac21be546 MISC metadata.xml 515 BLAKE2B a63fb05a1a3e1b06f929f963ab0794ec1230e89903fc97a7c7db81a0b3c7b7e8b9277eaa7440f8929738ec0f805d8a8dd51c8262e569fb9be2fa0938b08ad7a2 SHA512 6bec952825416ba0ab8282669483eb75935f6b4a3052e0f78dad911c0246b8d8ce245c86cbd82b292d49338848fa50fb2009fb4a9def1ac8d81bf9a3320cd2b0 diff --git a/dev-libs/nss/nss-3.55.ebuild b/dev-libs/nss/nss-3.55.ebuild new file mode 100644 index 000000000000..a3fb150caaa9 --- /dev/null +++ b/dev-libs/nss/nss-3.55.ebuild @@ -0,0 +1,351 @@ +# 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.26" +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" + "${FILESDIR}/${PN}-3.53-fix-building-on-ppc.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} OS_TEST="$(nssarch)" + 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/nss/nss-3.56.ebuild b/dev-libs/nss/nss-3.56.ebuild new file mode 100644 index 000000000000..1be5f0e7ebe1 --- /dev/null +++ b/dev-libs/nss/nss-3.56.ebuild @@ -0,0 +1,351 @@ +# 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.28" +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" + "${FILESDIR}/${PN}-3.53-fix-building-on-ppc.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} OS_TEST="$(nssarch)" + 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/ocl-icd/Manifest b/dev-libs/ocl-icd/Manifest index 0b091c38b5f6..aea796789180 100644 --- a/dev-libs/ocl-icd/Manifest +++ b/dev-libs/ocl-icd/Manifest @@ -1,6 +1,4 @@ AUX ocl-icd-2.2.12-gcc-10.patch 1551 BLAKE2B 0a2b6c66e83e67db9ba08af5311da65fc8795e36c9de1b25e53db8c593796c3f5903452bc3cc5c9e36c8fc32e286a588b942d9687c38d95133f125054cfbba48 SHA512 4d0a9168d31efe845c20623802aadc91bdf87524700708ba6ffcacd563344f4eb952eed99326ccd7d44b6ffbed145edae7d453b32a70362531d416c1b521bd4a DIST ocl-icd-2.2.12.tar.gz 80718 BLAKE2B 524f9eea9782323eafa2f41858c4970333c029898c651bbf15624331e184d1b439d2259532b02defd67c9ab434a35b1b9a64a28e1515b3f42f09b3a270975df7 SHA512 f1668c3a39ecfbc089ee5a5f61f44ceb86ab80e504e58064dec306ce907daf77936c5403b4af15ed8714068891d68346c86725f285cfbc90c4fcb35d18db4048 -EBUILD ocl-icd-2.2.12-r2.ebuild 1289 BLAKE2B 65b27579e5479f321cd239a96f0bcd6ed28370c7500b5adbf25c45c4989e7cf1f653409727eecd14726ee6de007777d6776cab463c736760bb648a09bd3d1991 SHA512 6a9b659fc0b7d28183c377ffe9bd78894d42d4f927e5933646ea14ec8ff99ebb245106b251e32c1d98fa5a40c238f8b178f3d225494e84994478920a891d9caa EBUILD ocl-icd-2.2.12-r3.ebuild 1200 BLAKE2B 30cdb8257c4ec6c10f47edaf53c6f3ef055cfc1107cdea5512be426a21983d9dc4352b5ff518feff23383560c565b9246781274bba8c1239d6f0af79d16d1e0a SHA512 aa0cd0135aa63dcc4521b043dcf1e00dc07bcae6deb6ed49c6802fa3979bdf433e7aaadefcf9638dc95a3a477604f2540b7f3c993ab2947444dd18e1d41838e4 -EBUILD ocl-icd-2.2.12.ebuild 1207 BLAKE2B 05ddc8149f9a60bd1de2862be075fbd9d815352e68bc1c35315d72c2d32a7a54de4da2786adca0e919f46a2e1686e06112d6f666c97a898a971fb04c8cde4136 SHA512 9852a177d53bcdaabc0f36b6bcbcfcef587e34e97131cd4e97d5494efa58abb34595e57defc0916596f9a7035b1d4bf84daa964462458fc6a6b025deb2e624a4 MISC metadata.xml 396 BLAKE2B e87119ee4f6793c9fa1229c9c2430f8eba749df95522f5f658a6bc26fa22265bdcaa185e8338eef057320342beea263b64f162b2a8ad3c6aa4db73307b949244 SHA512 69effb7af79439eae9702055f6f1e20318f30ef76827e5be6d69ae63ff39a6bafbb177c681f76ac9bdf861a9921d7c897cecaea320d796e6d104dbcab9a24b79 diff --git a/dev-libs/ocl-icd/ocl-icd-2.2.12-r2.ebuild b/dev-libs/ocl-icd/ocl-icd-2.2.12-r2.ebuild deleted file mode 100644 index 192d49e15487..000000000000 --- a/dev-libs/ocl-icd/ocl-icd-2.2.12-r2.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -USE_RUBY="ruby24 ruby25 ruby26 ruby27" -inherit autotools flag-o-matic multilib-minimal ruby-single - -DESCRIPTION="Alternative to vendor specific OpenCL ICD loaders" -HOMEPAGE="https://github.com/OCL-dev/ocl-icd" -SRC_URI="https://github.com/OCL-dev/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" -LICENSE="BSD-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -IUSE="+khronos-headers" - -BDEPEND="${RUBY_DEPS}" -RDEPEND="app-eselect/eselect-opencl - !dev-libs/opencl-icd-loader" - -PATCHES=("${FILESDIR}"/${P}-gcc-10.patch) - -src_prepare() { - replace-flags -Os -O2 # bug 646122 - - default - eautoreconf -} - -multilib_src_configure() { - ECONF_SOURCE="${S}" econf --enable-pthread-once -} - -multilib_src_install() { - default - - # Drop .la files - find "${ED}" -name '*.la' -delete || die - - OCL_DIR="/usr/$(get_libdir)/OpenCL/vendors/ocl-icd" - dodir ${OCL_DIR}/{,include} - - # Install vendor library - mv -f "${ED}/usr/$(get_libdir)"/libOpenCL* "${ED}${OCL_DIR}" || die "Can't install vendor library" - - # Install vendor headers - if use khronos-headers; then - cp -r "${S}/khronos-headers/CL" "${ED}${OCL_DIR}/include" || die "Can't install vendor headers" - fi -} - -pkg_postinst() { - eselect opencl set --use-old ${PN} -} diff --git a/dev-libs/ocl-icd/ocl-icd-2.2.12.ebuild b/dev-libs/ocl-icd/ocl-icd-2.2.12.ebuild deleted file mode 100644 index 04777289f858..000000000000 --- a/dev-libs/ocl-icd/ocl-icd-2.2.12.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -USE_RUBY="ruby23 ruby24 ruby25" -inherit autotools flag-o-matic multilib-minimal ruby-single - -DESCRIPTION="Alternative to vendor specific OpenCL ICD loaders" -HOMEPAGE="https://github.com/OCL-dev/ocl-icd" -SRC_URI="https://github.com/OCL-dev/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" -LICENSE="BSD-2" -SLOT="0" -KEYWORDS="amd64 x86" - -IUSE="+khronos-headers" - -DEPEND="${RUBY_DEPS}" -RDEPEND="app-eselect/eselect-opencl" - -src_prepare() { - replace-flags -Os -O2 # bug 646122 - - default - eautoreconf -} - -multilib_src_configure() { - ECONF_SOURCE="${S}" econf --enable-pthread-once -} - -multilib_src_install() { - default - - # Drop .la files - find "${ED}" -name '*.la' -delete || die - - OCL_DIR="/usr/$(get_libdir)/OpenCL/vendors/ocl-icd" - dodir ${OCL_DIR}/{,include} - - # Install vendor library - mv -f "${ED}/usr/$(get_libdir)"/libOpenCL* "${ED}${OCL_DIR}" || die "Can't install vendor library" - - # Install vendor headers - if use khronos-headers; then - cp -r "${S}/khronos-headers/CL" "${ED}${OCL_DIR}/include" || die "Can't install vendor headers" - fi -} - -pkg_postinst() { - eselect opencl set --use-old ${PN} -} diff --git a/dev-libs/opencl-clang/Manifest b/dev-libs/opencl-clang/Manifest index 5795b500d4ef..a7759aeedbdd 100644 --- a/dev-libs/opencl-clang/Manifest +++ b/dev-libs/opencl-clang/Manifest @@ -1,9 +1,7 @@ AUX opencl-clang-10.0.0.1_find-llvm-tblgen.patch 379 BLAKE2B 23587b8500ad6215603326572a10aef71ce66fcec322834b7e6a7648bfee5a92ce698fa706ebd9cfc0fe3048005919b1d9ec1ebb1d4123412f2fd06593b64841 SHA512 b2e9ae0ceec231b33e2b70664c3cb7c56f5d30f62e2444c6a505c7ab300a463d32ad1a650e8afe1b1bd4b568b3a31c02c280ead3caa8a66548d96df16dc8f131 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-9.0.1.tar.gz 24574 BLAKE2B 2e3b69c10b572678f91e92fa0ca885dd9332d172c483c394f4c1b140a5fd926b26eff4d4ab722733e1e164ff99a6eb397b8bc9e30a0b7e289506432fd1291b2b SHA512 01c5011dc1ea66288f3e425f85c921142fd3bc5a3d79eeafe5c14b5741b8281f17727cbffa7ed31869f7704be957d2fed5e5e8a57ab31e7b8c3a9688f048cced EBUILD opencl-clang-10.0.0.1.ebuild 956 BLAKE2B 832324fffa6d9cec20fe2a6ecc6313aa56d03378de7b5e74b4b3909caa1038834eaca5952694809b526bb900c93c0c58795201089924376942fd4f8d6361883f SHA512 d60bb6c2ffb172aa551dc94fbabe372b8ba2ada94eedea313767cda68be5cc0903f66b1768b32017ec2cab0125f430e74584e50a169ee37e6cf843280ad08c03 -EBUILD opencl-clang-8.0.1.1.ebuild 921 BLAKE2B 8b2cf2b0c8bfe1b61bf1ffa4be24b19a136379e84243123239b2b701da9d3c65790cc331e979e64e8dddaa81b79cd25b701d23f6db6d8d1df9986b176e52df8b SHA512 bbf66ab48750c3f3bc6f4ed3209dd4e11d1fc7f6d45ff5b67a55e5670ea91420e19b02420b86e08a20162c826a2b613613df3311bf95591c438089156adf1f98 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-8.0.1.1.ebuild b/dev-libs/opencl-clang/opencl-clang-8.0.1.1.ebuild deleted file mode 100644 index e4a1ae005027..000000000000 --- a/dev-libs/opencl-clang/opencl-clang-8.0.1.1.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -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${MY_PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="UoI-NCSA" -SLOT="8" -KEYWORDS="~amd64" - -S="${WORKDIR}/${MY_P}" - -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_src_configure -} diff --git a/dev-libs/opensc/Manifest b/dev-libs/opensc/Manifest index 24cffd3fbb4e..5f591cc3134a 100644 --- a/dev-libs/opensc/Manifest +++ b/dev-libs/opensc/Manifest @@ -1,4 +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 1689 BLAKE2B 028e0d4a6c6eb6e627e4f225d264c57eba5e88998912f1eee3474bca5bb24fd7a18cc8a4b5dbca203bda357c82256b402d7c1e23a7aa26a648544f44d8c547d6 SHA512 9b82334aef15c1fb91dd4ca377f2214828b9eb7721f0ec25e0f7e4be5fa1700f55280741e2a79d67ef3c5d5c52d4249f123f1db776ee40775a8dfbee0ae4e533 +EBUILD opensc-0.20.0.ebuild 1689 BLAKE2B 30c0f97f196c780a3097a43ad1f6dc1a57d36fb13ef09a8e409d0798e90399cd1aeb35362f59930e9276983f8329e4d9fc0d3edecb962b003fb545aef1a4b4a1 SHA512 af135d3d845694ccf8e09f460312919f502c321b9bac1adcaf90d3aa9edf8ccea94612413dced2b224465eb8b90c617b5a8a3306081176ef0fe1f3043c3c060b MISC metadata.xml 1221 BLAKE2B aa9934df0dd5e4e1a6ae184f3570a98bde999d745c5f722f3e7bf922510d11129dd54fc385f64814e17dde1d8d3b427b5632574b128d768ef66d8f4be28778c6 SHA512 5acccb40f140614c9c6f79f13449174fc76ba0028bfd3ed099d1ed633e601a9972cdc2167e9ba2e5aab3827847942a43c98d1b6c404af34375305dd96830b3bd diff --git a/dev-libs/opensc/opensc-0.20.0.ebuild b/dev-libs/opensc/opensc-0.20.0.ebuild index fdfd50b8daa8..51a8742645f5 100644 --- a/dev-libs/opensc/opensc-0.20.0.ebuild +++ b/dev-libs/opensc/opensc-0.20.0.ebuild @@ -19,7 +19,7 @@ RDEPEND="zlib? ( sys-libs/zlib ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) - libressl? ( >=dev-libs/libressl-2.7.0:0= ) + libressl? ( >=dev-libs/libressl-3.1.0:0= ) ) openct? ( >=dev-libs/openct-0.5.0 ) pcsc-lite? ( >=sys-apps/pcsc-lite-1.3.0 ) diff --git a/dev-libs/pegtl/Manifest b/dev-libs/pegtl/Manifest index 3329c22c8cc8..7b5975871a8f 100644 --- a/dev-libs/pegtl/Manifest +++ b/dev-libs/pegtl/Manifest @@ -1,11 +1,3 @@ -DIST pegtl-1.3.1.tar.gz 67183 BLAKE2B 1aef425e5777c44e30068d7b0f5bac813ef9af8e61fb91ddcc66116365d36258998bb26ae038fc40864b9716a13c39b82cb53637654fa2a3614e391c0d35f6b1 SHA512 6655be7806112878e2da00916b348c28939bc96e2a317eb00089be341fd5306ce5a1388ca5dbba21bcd7be2d6c24e3964b6a730031a16a7dd8ef6ec6acd6899e -DIST pegtl-2.0.0.tar.gz 154718 BLAKE2B 775eccb11a44eca30ebf72cfa4dcb27e0f46c741efc8071d77232104cb7f6841da847b37b8dab19efcc07aac175558eca949d4c2d4d5d66fcf89793ae3cf7db2 SHA512 30d48bd4a02b7d089c09a6265cd52442d5d9812cf24ae992ea3f264ef8ea27b605771675558f5510e96aec425577beebeb150361001bbce58bd06217ee587f58 -DIST pegtl-2.0_pre1.tar.gz 146966 BLAKE2B e6894dce0df7d41126619523aae866b1335afaac70d0cce2852674e691c93d7f16b550fbc7bf626602a46e044a33f41e9d2e2aa24361088ba99111f23c8bf617 SHA512 180bd8b44ccfe406c818af6b3f5f22eb4cfc7bea6043af5141c6c5ed9b2770624326e67d6dfc47a22aaee3697e5cf1d2744d0a3d3d01a4ce47457189f2b19839 -DIST pegtl-2.1.4.tar.gz 157890 BLAKE2B 5d999b2d5471ff115a0ba38b0b874a031f875ae24b54c25d985bd8bdfd815f6b35b825a0ac5a183e3f87f90445fb98a4b8d7dbc4e8a79e2f6332daf57b6f89d9 SHA512 b4c227e795ab29221bce91b520c5965d48fec85ba53bb070b93e966dc20792189682850b106585ad8bd3e4f34ce8bdb72b576f5f329b2f160f9034b412c93768 DIST pegtl-2.8.3.tar.gz 201531 BLAKE2B 093d1b5f7d1f95fa00abdae9c24d24ba9ffd8510d6512c3460374f19b12d50403c19301645c5f6fc4d697cc687079c5b0d23c32b5775b30fbf05a154aeec2c19 SHA512 9f7644b86741dfe61716bbc43b2ea0a02cfc21eaf229c47cc71a49e2f08bf2c1ff37d2b2242a1bcf518b1893be6b82c27b0e9010a1b47ef8df87ffd90d280f71 -EBUILD pegtl-1.3.1-r1.ebuild 675 BLAKE2B 69583b72d391da0b2337331adc1e8d2fa587f988e80cea0dcb86161e179a36ef1d4012c48c710707d2689e3b09969999832c1c4c21ad00adae9aa195f67125fa SHA512 d7d2540f41091a9b46a2aec232219f0ec9520442a16ea6f67ca949793790f70639826006d648e1cd0a362b2da736bba63c7c91da38c11c482f1343d5a6054968 -EBUILD pegtl-2.0.0.ebuild 495 BLAKE2B 9df421fa5a48a7f9d640ede7d566ad490c6c03e3988d3a30789e164359ddc0923efca350a26f1020abdaa48635c0ceccbddc088ad5210cb6bca488d55bbb45c3 SHA512 cce717fe838bec3afaa91beb13b252d1e8b92a261d6c4f77f9c351b1be510fafa873755f2e16c2121cc827357a8f653dff779243fc7ce1fc897c577d5c5de5d1 -EBUILD pegtl-2.0_pre1.ebuild 534 BLAKE2B 2f4e04e2d46212f8b8bbdd454db77ec7c25e74c1be3c4b268ebc78b9cfd15789c54dbf1755ebb60f0347a1c90af8df7198026e1c9aaa12e8c611b2bb21f06821 SHA512 96a77caa6b1379a6d636df5160974c7e687889175cf6a595150a33721c314440f7219e864a93a8750a1e2d69ffa348720d359147c64b982febe10e7047b0879e -EBUILD pegtl-2.1.4.ebuild 495 BLAKE2B 9df421fa5a48a7f9d640ede7d566ad490c6c03e3988d3a30789e164359ddc0923efca350a26f1020abdaa48635c0ceccbddc088ad5210cb6bca488d55bbb45c3 SHA512 cce717fe838bec3afaa91beb13b252d1e8b92a261d6c4f77f9c351b1be510fafa873755f2e16c2121cc827357a8f653dff779243fc7ce1fc897c577d5c5de5d1 -EBUILD pegtl-2.8.3.ebuild 495 BLAKE2B 95602860882de0698218b3e5bb49a30bd9d4b9e9fe5d35956d355b0889e94084106dd09fefaf23419f25f112ea2afd93bc15a77758ef7e8400b376ae32562c96 SHA512 dbb57411673d554be4e2b415aac6510cdc878ed8e10e28a13e96414a996b0df69519c002d38556de539058d724047f6f58dcc0c515944958142db74d78bc484e +EBUILD pegtl-2.8.3.ebuild 459 BLAKE2B 759adfc2254e76720502caaea090d943e176eb7d910e939d58b94c4b6ae489dd02498d5a85501045d40c5e89dab7e11c3c806e47de85ca881fd2a68955c66ad4 SHA512 09f6ea0d459982f3d135b19e4488d6adf8541f0fc39095d358b43ee0e94d0f6c98e3e9d62138404aa0fa27fbd0181d3b6c9734670969a5f92b6a3ba23f9d64f9 MISC metadata.xml 330 BLAKE2B 4b09139ea492f1fefc4b58c0afde7354d8f9f966932f5b0908c43c6fab7ae9e822ee8fe02905763d8fe69a128bb7159d4a8b3cea7b1ab087a8a30a57ab297f83 SHA512 721c1b987d580024e7c937f54c512c1e55351db3011675080fd8b1a36c42916eb216b30707f270655db76dea8bc9ee4548197270ffc51b570bbbc0fde33503bf diff --git a/dev-libs/pegtl/pegtl-1.3.1-r1.ebuild b/dev-libs/pegtl/pegtl-1.3.1-r1.ebuild deleted file mode 100644 index 58993e2d6456..000000000000 --- a/dev-libs/pegtl/pegtl-1.3.1-r1.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit toolchain-funcs - -DESCRIPTION="header-only library for creating parsers according to Parsing Expression Grammar" -HOMEPAGE="https://github.com/ColinH/PEGTL" -SRC_URI="https://github.com/ColinH/PEGTL/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="test" -RESTRICT="!test? ( test )" - -DEPEND="" -RDEPEND="${DEPEND}" - -S="${WORKDIR}/PEGTL-${PV}" - -src_compile() { - : -} - -src_test() { - emake CXX="$(tc-getCXX)" PEGTL_CXXFLAGS="${CXXFLAGS}" -} - -src_install() { - dodoc README.md - insinto /usr/include - doins -r pegtl pegtl.hh -} diff --git a/dev-libs/pegtl/pegtl-2.0.0.ebuild b/dev-libs/pegtl/pegtl-2.0.0.ebuild deleted file mode 100644 index ff16fd8ab455..000000000000 --- a/dev-libs/pegtl/pegtl-2.0.0.ebuild +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils - -DESCRIPTION="header-only library for creating parsers according to Parsing Expression Grammar" -HOMEPAGE="https://github.com/taocpp/PEGTL" -SRC_URI="https://github.com/taocpp/PEGTL/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="test" -RESTRICT="!test? ( test )" - -DEPEND="" -RDEPEND="${DEPEND}" - -S="${WORKDIR}/PEGTL-${PV}" diff --git a/dev-libs/pegtl/pegtl-2.0_pre1.ebuild b/dev-libs/pegtl/pegtl-2.0_pre1.ebuild deleted file mode 100644 index 1a4c7a75eb9c..000000000000 --- a/dev-libs/pegtl/pegtl-2.0_pre1.ebuild +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils vcs-snapshot - -COMMIT="bce83a6c7928c4cc8f9a5e18efbca40d18394d32" -DESCRIPTION="header-only library for creating parsers according to Parsing Expression Grammar" -HOMEPAGE="https://github.com/taocpp/PEGTL" -SRC_URI="https://github.com/taocpp/PEGTL/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="test" -RESTRICT="!test? ( test )" - -DEPEND="" -RDEPEND="${DEPEND}" diff --git a/dev-libs/pegtl/pegtl-2.1.4.ebuild b/dev-libs/pegtl/pegtl-2.1.4.ebuild deleted file mode 100644 index ff16fd8ab455..000000000000 --- a/dev-libs/pegtl/pegtl-2.1.4.ebuild +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils - -DESCRIPTION="header-only library for creating parsers according to Parsing Expression Grammar" -HOMEPAGE="https://github.com/taocpp/PEGTL" -SRC_URI="https://github.com/taocpp/PEGTL/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="test" -RESTRICT="!test? ( test )" - -DEPEND="" -RDEPEND="${DEPEND}" - -S="${WORKDIR}/PEGTL-${PV}" diff --git a/dev-libs/pegtl/pegtl-2.8.3.ebuild b/dev-libs/pegtl/pegtl-2.8.3.ebuild index 51b7872a603d..a2ead2df29fe 100644 --- a/dev-libs/pegtl/pegtl-2.8.3.ebuild +++ b/dev-libs/pegtl/pegtl-2.8.3.ebuild @@ -3,9 +3,9 @@ EAPI=7 -inherit cmake-utils +inherit cmake -DESCRIPTION="header-only library for creating parsers according to Parsing Expression Grammar" +DESCRIPTION="Header-only library for creating parsers according to Parsing Expression Grammar" HOMEPAGE="https://github.com/taocpp/PEGTL" SRC_URI="https://github.com/taocpp/PEGTL/archive/${PV}.tar.gz -> ${P}.tar.gz" @@ -13,9 +13,7 @@ LICENSE="MIT" SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="test" -RESTRICT="!test? ( test )" -DEPEND="" -RDEPEND="${DEPEND}" +RESTRICT="!test? ( test )" S="${WORKDIR}/PEGTL-${PV}" diff --git a/dev-libs/pigpio/Manifest b/dev-libs/pigpio/Manifest index d806a90d1f3a..d794531df2e2 100644 --- a/dev-libs/pigpio/Manifest +++ b/dev-libs/pigpio/Manifest @@ -2,5 +2,7 @@ AUX pigpio-70-makefile.patch 4856 BLAKE2B ec3010a687ae8104ca09f3df6313e74aecf2d9 AUX pigpiod.confd 201 BLAKE2B 6707d0f0f8772110b6e1167abcfcdcdfdb22936024f3c1234f05c198853cde3b55c5474922fdb64dcdf49440e9ad163216c0b11ffb80ebea2fd413cc17fdc685 SHA512 96431969640fef1b5ce317f0f9ce93fae081f186dfa89c00b4f469e3657a7792c5d157ccff7d019ea4bb4848a6657c8bb8f111f5a208440cc8a0723772e7c708 AUX pigpiod.initd 215 BLAKE2B d7797cc0d1d388fd21831e33cbadd031e2cb974e26367596dd4c9ba054fbdd4b04200d0ff61dfe797520d2e0745420a5d973b44a41e15713800a7828f097cec1 SHA512 e1db38677a248c3dbc33aae6809eb8df1dd6253f60ca852d98d8d6d428d23d7a8a31a031da3b786b7105d90f0cc52687bfbfe320e5c6cbf0fbf02b5ad5c6e606 DIST pigpio-76.tar.gz 2905839 BLAKE2B 7828a94fad9f110392dc114534a3b242f1f135d352885f3c4332a1d4a16f49d2fa58b57e9e3d64c2bf9b5f3bdd7e84a74775b518fc409daf75a55a87c5f3af57 SHA512 8cc1dc64ae32a07f4b6e200638065ba5fb26a94c1a730d81b64fa5f2bb9356b2b9910decb41def6932fc76f7ebd1df99a7966516ba3df9a09108de0afcd119d3 +DIST pigpio-77.tar.gz 2902866 BLAKE2B d03a97a596d5f408d29e61e8c5f727d7bca4caf8aeec63e9914b8d52bdc0d03d3d5b9ef1fdb408a6fcd72cd0b899f30eb79d02426cc83b271d71b543bf346928 SHA512 0533d18bc244d4cf487ffebdd68b9f341139e70df3a3862dc4705afefa2e3e4e2f51792a6c4a440b8ee1f111c9ae3141770b9578601bfa44e166bb438f45b80c EBUILD pigpio-76.ebuild 1089 BLAKE2B 6e30c9538c8447e9cd1d4d1970d9c996c644b404f74ea60a0260461f3b97a044deb9557852b313c4c87f13dd2a3c5209193e8470a1b2e5b85d55b80fda13b8af SHA512 2c49811aa1665c0dedeea6fde7f1c3878e9dade693fc246d9817d1af13d8f8e545b523bb2a2b152c849c7f216f7d1030257b9347589772df893fdd4bebbd863f +EBUILD pigpio-77.ebuild 1089 BLAKE2B 6e30c9538c8447e9cd1d4d1970d9c996c644b404f74ea60a0260461f3b97a044deb9557852b313c4c87f13dd2a3c5209193e8470a1b2e5b85d55b80fda13b8af SHA512 2c49811aa1665c0dedeea6fde7f1c3878e9dade693fc246d9817d1af13d8f8e545b523bb2a2b152c849c7f216f7d1030257b9347589772df893fdd4bebbd863f MISC metadata.xml 378 BLAKE2B f2b1adfb373a67d901affeca1c30b1f9fea6adb9d73a5d8b51fb6234964dd04e9dfada31a3afdf5f9a76e47a50cfd65033f86142701291e0797822f3a0daef41 SHA512 70ee7283d595db52d0a82896b29825d4e671fc8f1723f98c4a64dbbfc4bc1198343e155d4c624c8436d99201101d71a917205e89c6372911cdb700ba9e8ee508 diff --git a/dev-libs/pigpio/pigpio-77.ebuild b/dev-libs/pigpio/pigpio-77.ebuild new file mode 100644 index 000000000000..a47a53d9b909 --- /dev/null +++ b/dev-libs/pigpio/pigpio-77.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6,7,8} ) + +inherit distutils-r1 systemd toolchain-funcs + +DESCRIPTION="A library for the Raspberry which allows control of the GPIOs" +HOMEPAGE="http://abyz.me.uk/rpi/pigpio/ https://github.com/joan2937/pigpio" +SRC_URI="https://github.com/joan2937/pigpio/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Unlicense" +SLOT="0" +KEYWORDS="~arm" +IUSE="python" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +PATCHES=( "${FILESDIR}/${PN}-70-makefile.patch" ) + +src_compile() { + emake CC="$(tc-getCC)" STRIP=: STRIPLIB=: SIZE=: + use python && distutils-r1_src_compile +} + +src_install() { + emake DESTDIR="${D}" LDCONFIG=: PYTHON2=: PYTHON3=: \ + libdir="${EPREFIX}/usr/$(get_libdir)" prefix="${EPREFIX}/usr" \ + mandir="${EPREFIX}/usr/share/man" install + einstalldocs + newinitd "${FILESDIR}"/pigpiod.initd pigpiod + newconfd "${FILESDIR}"/pigpiod.confd pigpiod + systemd_newunit "${S}"/util/pigpiod.service pigpiod.service + use python && distutils-r1_src_install +} diff --git a/dev-libs/plasma-wayland-protocols/Manifest b/dev-libs/plasma-wayland-protocols/Manifest index 6e8971fe8d4d..c917ef0a93f7 100644 --- a/dev-libs/plasma-wayland-protocols/Manifest +++ b/dev-libs/plasma-wayland-protocols/Manifest @@ -1,3 +1,5 @@ DIST plasma-wayland-protocols-1.0.tar.xz 38020 BLAKE2B 8064a526d3e3e4b36f7c612744285181ba96bdf4c0992ba7d164ea98e629b3456c7efedd2e3dbbf76a3cbd42664d91eea3e485bd67303e1db02964c7fc6158db SHA512 30ecbf9fbf9de7ee1d323fb43b0f4a05586e0f7d2c4d510e2300828e7a6a16e8907d8d2a835d4ecbb2d4d532641ea722ff6572403f767e0ac878b7fdb0897b08 +DIST plasma-wayland-protocols-1.1.1.tar.xz 38380 BLAKE2B 0dfeb13455932d0853084d87c8b385c7d4d51bf7de05325c0c26221dbb9c8966287146cbff6c4fe1ae45ce7bcb86bbb572852e53ca10c1aa8d00dcc012224f66 SHA512 82244fd9a6c25d8faa8aa64f57cb64ac8e589908cc3b0665ca9c8ce98bd42a8e9cae0f40484bacf3a05107c9e14613d1c9be80b363ba690d36c676ca62da8b9c EBUILD plasma-wayland-protocols-1.0.ebuild 458 BLAKE2B fdaa37a70504a26aca77a38f81ab46428facd4bda3f1eb4250905cbb61a91fb039c4fb711575b60031d5287aa0848d71e17af85b8f37a13413ea3d44cd6b8c2c SHA512 45c8578c39c5f68af0b809e4be7b5a6aa21bb93226e0d0375c92e47dd0bfb137332614204f41cdcdb22a484cc22817f854d69ceaa86892f387fb1c9445f1de1c +EBUILD plasma-wayland-protocols-1.1.1.ebuild 458 BLAKE2B fdaa37a70504a26aca77a38f81ab46428facd4bda3f1eb4250905cbb61a91fb039c4fb711575b60031d5287aa0848d71e17af85b8f37a13413ea3d44cd6b8c2c SHA512 45c8578c39c5f68af0b809e4be7b5a6aa21bb93226e0d0375c92e47dd0bfb137332614204f41cdcdb22a484cc22817f854d69ceaa86892f387fb1c9445f1de1c MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 diff --git a/dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.1.1.ebuild b/dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.1.1.ebuild new file mode 100644 index 000000000000..d5505ca30efe --- /dev/null +++ b/dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.1.1.ebuild @@ -0,0 +1,19 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +ECM_NONGUI=true +KFMIN=5.69.0 +inherit ecm kde.org + +DESCRIPTION="Plasma Specific Protocols for Wayland" +HOMEPAGE="https://invent.kde.org/libraries/plasma-wayland-protocols" + +if [[ ${KDE_BUILD_TYPE} = release ]]; then + SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +fi + +LICENSE="LGPL-2.1" +SLOT="0" diff --git a/dev-libs/protobuf-c/Manifest b/dev-libs/protobuf-c/Manifest index 44a3c3069fda..c6ce943bc5d8 100644 --- a/dev-libs/protobuf-c/Manifest +++ b/dev-libs/protobuf-c/Manifest @@ -1,4 +1,6 @@ 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 +DIST protobuf-c-1.3.3.tar.gz 500505 BLAKE2B 6f00eac847f5287cdea5afaea5be05d660eda10b30a14bbab89331ef134f93b8a77d3f6546cab246447494b0283b32218f794c56a7d081906c49668631b14505 SHA512 85308348929487e3a89158c6078dab39cee0b39a0611a4d5ba73d20520e41d96915e42a0d6060ebd3eb7d922c82444f5ca000ea4f8791b37734485cbb7e283b1 EBUILD protobuf-c-1.3.2.ebuild 975 BLAKE2B e6692ca39ad4ebae30d6f78fb770e7c0b7c75277d784f3b9c77f3dd9810e11d1be30901241deeef494426ef02d28b52e9364cf09df4f8cc03fcaedce6e0f9d98 SHA512 24aa2f2b915d4fc48a6608ffd61dc666c9d4505ab33ec8256a3d8718549dbfcb1dfe7371475b1cec5686d82ecef22e84084376d6e2673253ae375047c47f8c21 +EBUILD protobuf-c-1.3.3.ebuild 984 BLAKE2B b9e765514ce03a780f547c9d71067f496a833c856f1b1bf96a0f7b8c30863d34567b1d030d336d68cb057b5d531024a3b50d74eaaa3bedbcb6622f0288eecfd4 SHA512 770d882fdbef310e8fcfcf897721afe56600bccffae982b0b7ab243526a2fd61ab25d3200947066116d753692a050d8f2af8ebc884d9146dc1f950bff04b0aaf MISC metadata.xml 258 BLAKE2B 4600b6e0e51f9c280726dd71ec122d3c51e0c2b1f8b4ef208a1c9838a01d405bedce2cfd6949bb2dbcc448f76f45c717a630eed98fb9d0ad06c91dafdc2ad288 SHA512 92e3b05f2cf1d2ff09b852d2ad8707f55b4cd3fc78df317fa5234a9c0018405cfad67d90211435963983440228dfb75de28ab7ee62f1a80bb97192768d93ce92 diff --git a/dev-libs/protobuf-c/protobuf-c-1.3.3.ebuild b/dev-libs/protobuf-c/protobuf-c-1.3.3.ebuild new file mode 100644 index 000000000000..bc1e64a91cf2 --- /dev/null +++ b/dev-libs/protobuf-c/protobuf-c-1.3.3.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools multilib-minimal + +MY_PV="${PV/_/-}" +MY_P="${PN}-${MY_PV}" + +DESCRIPTION="Protocol Buffers implementation in C" +HOMEPAGE="https://github.com/protobuf-c/protobuf-c" +SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${MY_PV}/${MY_P}.tar.gz" + +LICENSE="BSD-2" +# Subslot == SONAME version +SLOT="0/1.0.0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" +IUSE="static-libs test" +RESTRICT="!test? ( test )" + +BDEPEND=">=dev-libs/protobuf-3:0 + virtual/pkgconfig" +DEPEND=">=dev-libs/protobuf-3:0=[${MULTILIB_USEDEP}]" +RDEPEND="${DEPEND}" + +S="${WORKDIR}/${MY_P}" + +src_prepare() { + default + if ! use test; then + eapply "${FILESDIR}"/${PN}-1.3.0-no-build-tests.patch + fi + + eautoreconf +} + +multilib_src_configure() { + local myeconfargs=( + $(use_enable static-libs static) + ) + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" +} diff --git a/dev-libs/protobuf/Manifest b/dev-libs/protobuf/Manifest index d087a635ec67..3cff56052e18 100644 --- a/dev-libs/protobuf/Manifest +++ b/dev-libs/protobuf/Manifest @@ -3,12 +3,17 @@ AUX proto.vim 49 BLAKE2B 9b6d31105811a8f8cbcf76328172fda5b66b33351bb16573ed1ed08 AUX protobuf-3.11.0-disable_no-warning-test.patch 965 BLAKE2B 81f55d1dcfeb8035e3af2a5d818c4d252953bf6845209ee7a6811c91a528731e01e94f0783934c5b079edffbfa5c08af9e6dff17dea13a0ad0e74b30efc670fe SHA512 49dda9e67f8ba8bab932278b265970c3ddb1aabef6ddc9d690908fe7068e72ba9092d97efe4d72c22f7fbaeb51ae3b23b9bb52acb2f2e4bd6fb4a0bfc7c7dfd4 AUX protobuf-3.11.0-protoc_input_output_files.patch 10318 BLAKE2B 4abd17ab2d2da06b57b14ef8d120195370032c4c3906fff97a6dcedd7dfd67b15e4350576e496da180fb15244d62b4288872c15f9df04d406130bac972e1b33a SHA512 496e7b200ede27b761c7c4ffb740174c7f0271acc19ba39ca1962d981d1177536d8934f9d726124c90bc3bc437d00499458d845ffb88dc449466116e53065fec AUX protobuf-3.11.0-system_libraries.patch 6352 BLAKE2B dd224c42e13c08b3bec554b23548e515b33dc411bccb61cf8ed7835808fe6632daadbfbf136661f805aea8409a6cfee3c38f375bcb05385d015abdac70e597a9 SHA512 a0c2873930ffdeb219b7679edef49e903516ebf0e00708e71d14eccded4c2d2fcc2284c7a67813d6a2d5b5914ca17f5065ec3b72e4649ca2acf8c60b8ab871ae +AUX protobuf-3.12.0-disable_no-warning-test.patch 965 BLAKE2B 77ed571f16f9fb2d333d656f56c28e512f4e78984a47740644c7d7b8fec8b26d29d2c1138e0c73fda027ff916871f80447683d959e0fef9bd55471b89ee7bf19 SHA512 6fb45b1425428054795d3a0898b993d9ef2f6b0b4da048b411cd62e3a3fb3114abb0c382c7fdf8f7eee1a02fafc89c0f452dcbfaaa8bc283f0fb6a3861c88ff6 +AUX protobuf-3.12.0-protoc_input_output_files.patch 10321 BLAKE2B f248067eb23303ee5eee4ff3f312cc882c804dc4c2233f4a4cd84377ce7f8bfb35df1e4e794c7d1bac1b84a2723b6cac4a49b3af52f402964ea388ea3458b35a SHA512 137209ef76dc6d3517f4e50845572aa0b79d7b5c0931134b4017f783f13bebd37ee5a6b34f26d70bfa8f601563adb42ea7efdc75506754ef8ce08f86f536d601 +AUX protobuf-3.12.0-system_libraries.patch 6352 BLAKE2B 17f24c6cdcc845dada12424fe987e214d3be19b90c82abbb12829287811bd9e46757df3ae65db49b30b47aeefdd8ded79e15e01483f2222b1fa3e8f3ef1d319d SHA512 76c41f48c9661a30aac0cd9e71f52101e3068725bd8e1b0f46bea113115233739849978750f063241fd45b2982d41a8da7b0e972afc3d4cd517943d533fffa91 AUX protobuf-3.8.0-disable_no-warning-test.patch 965 BLAKE2B 0183ed17104e192fbd9efb4739a41ec2d6f39e31cf6aacb141f4e5015335096321491d68748613ef18eacdc57437b111a15b5b4762b0b339c716b98dc1b7041d SHA512 37846745f1e88fda8dc84a829e266e8f8d2c98a075750b2e548fa2b8f34a97d37b6b5200e880fc29a9682fb95a8c75567b53bca532859068a7b379540940067a 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.4.tar.gz 5140799 BLAKE2B 97b450c0623593efe6a42b66582ff183344b8831689e6a5b4d36096dbd57c33da9569bbf26578536aaf73ecd866ac0588b6cb7d55a6a9b9a6e840d4c57099001 SHA512 777bbb0e9e2375eaebe6b8c87abd660bac70ee469c9ad00dd25917b82d7fb5bbe33cf87f0d69c90e19d55c07a7285ec20974ba4768623ce9ccfadf147fd5e261 +DIST protobuf-3.12.2.tar.gz 5309688 BLAKE2B 6f04ab75a165d8135b4c1de210f8698f56f309f73d664192209de10580e0ef850bf56f6f394b860f21912e341141f7bbb1f63198eaee55fd7ad74d86b00c3b1f SHA512 84a349a1dcb5bce6a6a892cf11264390b557ed1e7b05883b71fa9cfb7460d9f73119da1f2861066869e33c752246ea438d5ce2c2b3ff7a4b07696d9450b7916b 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 +EBUILD protobuf-3.12.2.ebuild 3028 BLAKE2B 2d35522c78efd3143ad106cd97ca661c421fdd6d6c4fdf78ec8d87837cd42aafba7e320c8d0aa81277db671171342d57cdddcd85658b9b09b26becc27a2ab3ea SHA512 923b5a6fd632b47bc8c5ad30fd555fe4ca3a8e0f8244bd24e6520bc02607f624dfa8018dc6813385020251b4b2621679b02bc99f567c7b492a733644184aeea3 +EBUILD protobuf-9999.ebuild 2679 BLAKE2B 9340cd24544bdb247737010b0df7828d8556a6ef691b3ecf998776367d5a03709b6943c602ae979ca32fd8f1098fc3f499a1e4fd5abe3381f3b2d5fbf5c81c8e SHA512 85c5f443349dbc55288d8d86757affb32db57790fcfe9f6209639f123034b287072349284ac34c9bb8dacb4383d2926e90a1e555cec531145d5420021ea1ecb8 MISC metadata.xml 627 BLAKE2B e908d6d2ab7bf7886f09af02f2a2828bcd9d6909ad7b421e0879551c24ab382733c2140def8132c70d7b6a0f8074651773476e9a645c64440ef596a7f62319d0 SHA512 2f60739bbea23091942893776b29257ed556c3d98351e0e9455852e8ea6b275d3ecca613c81ed35c009431c3e5fb378a77259f13c470359526ccbdff4033d86b diff --git a/dev-libs/protobuf/files/protobuf-3.12.0-disable_no-warning-test.patch b/dev-libs/protobuf/files/protobuf-3.12.0-disable_no-warning-test.patch new file mode 100644 index 000000000000..d7dd5b5b1bb9 --- /dev/null +++ b/dev-libs/protobuf/files/protobuf-3.12.0-disable_no-warning-test.patch @@ -0,0 +1,19 @@ +Disable no-warning-test which is compiled with -Werror option and whose only purpose is checking if compilation results in any warnings. + +--- /src/Makefile.am ++++ /src/Makefile.am +@@ -717,7 +717,7 @@ + GOOGLEMOCK_SRC_DIR=$(srcdir)/../third_party/googletest/googlemock + check_PROGRAMS = protoc protobuf-test protobuf-lazy-descriptor-test \ + protobuf-lite-test test_plugin protobuf-lite-arena-test \ +- no-warning-test $(GZCHECKPROGRAMS) ++ $(GZCHECKPROGRAMS) + protobuf_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la \ + $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la \ + $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la \ +@@ -904,4 +904,4 @@ + + TESTS = protobuf-test protobuf-lazy-descriptor-test protobuf-lite-test \ + google/protobuf/compiler/zip_output_unittest.sh $(GZTESTS) \ +- protobuf-lite-arena-test no-warning-test ++ protobuf-lite-arena-test diff --git a/dev-libs/protobuf/files/protobuf-3.12.0-protoc_input_output_files.patch b/dev-libs/protobuf/files/protobuf-3.12.0-protoc_input_output_files.patch new file mode 100644 index 000000000000..3123ae5b27b5 --- /dev/null +++ b/dev-libs/protobuf/files/protobuf-3.12.0-protoc_input_output_files.patch @@ -0,0 +1,262 @@ +https://github.com/protocolbuffers/protobuf/pull/235 + +--- /src/google/protobuf/compiler/command_line_interface.cc ++++ /src/google/protobuf/compiler/command_line_interface.cc +@@ -997,6 +997,28 @@ + } + + if (mode_ == MODE_ENCODE || mode_ == MODE_DECODE) { ++ bool success = false; ++ int in_fd = STDIN_FILENO; ++ int out_fd = STDOUT_FILENO; ++ ++ if (!protobuf_in_path_.empty()) { ++ in_fd = open(protobuf_in_path_.c_str(), O_RDONLY); ++ if (in_fd == -1) { ++ std::cerr << protobuf_in_path_ << ": error: failed to open file." << std::endl; ++ return 1; ++ } ++ } ++ if (!protobuf_out_path_.empty()) { ++ out_fd = open(protobuf_out_path_.c_str(), ++ O_WRONLY | O_CREAT | O_TRUNC, ++ 0644); ++ if (out_fd == -1) { ++ std::cerr << protobuf_out_path_ << ": error: failed to open file." << std::endl; ++ close(in_fd); ++ return 1; ++ } ++ } ++ + if (codec_type_.empty()) { + // HACK: Define an EmptyMessage type to use for decoding. + DescriptorPool pool; +@@ -1005,13 +1027,20 @@ + file.add_message_type()->set_name("EmptyMessage"); + GOOGLE_CHECK(pool.BuildFile(file) != NULL); + codec_type_ = "EmptyMessage"; +- if (!EncodeOrDecode(&pool)) { +- return 1; +- } ++ success = EncodeOrDecode(&pool, in_fd, out_fd); + } else { +- if (!EncodeOrDecode(descriptor_pool.get())) { +- return 1; +- } ++ success = EncodeOrDecode(descriptor_pool.get(), in_fd, out_fd); ++ } ++ ++ if (in_fd != STDIN_FILENO) { ++ close(in_fd); ++ } ++ if (out_fd != STDOUT_FILENO) { ++ close(out_fd); ++ } ++ ++ if (!success) { ++ return 1; + } + } + +@@ -1049,6 +1078,11 @@ + for (int i = 0; i < proto_path_.size(); i++) { + source_tree->MapPath(proto_path_[i].first, proto_path_[i].second); + } ++ if (mode_ == MODE_COMPILE && ++ (!protobuf_in_path_.empty() || !protobuf_out_path_.empty())) { ++ std::cerr << "--protobuf_in and --protobuf_out are only valid with " ++ << "decode operations. Ignoring."; ++ } + + // Map input files to virtual paths if possible. + if (!MakeInputsBeProtoPathRelative(source_tree, fallback_database)) { +@@ -1750,6 +1784,12 @@ + + codec_type_ = value; + ++ } else if (name == "--protobuf_in") { ++ protobuf_in_path_ = value; ++ ++ } else if (name == "--protobuf_out") { ++ protobuf_out_path_ = value; ++ + } else if (name == "--error_format") { + if (value == "gcc") { + error_format_ = ERROR_FORMAT_GCC; +@@ -1886,29 +1926,50 @@ + " -h, --help Show this text and exit.\n" + " --encode=MESSAGE_TYPE Read a text-format message of the " + "given type\n" +- " from standard input and write it in " +- "binary\n" +- " to standard output. The message type " +- "must\n" ++ " and write it in binary. The message " ++ "type must\n" + " be defined in PROTO_FILES or their " + "imports.\n" ++ " The input/output protobuf files are " ++ "specified\n" ++ " using the --protobuf_in and " ++ "--protobuf_out\n" ++ " command line flags.\n" + " --decode=MESSAGE_TYPE Read a binary message of the given " +- "type from\n" +- " standard input and write it in text " +- "format\n" +- " to standard output. The message type " +- "must\n" +- " be defined in PROTO_FILES or their " +- "imports.\n" ++ "type and\n" ++ " write it in text format. The message " ++ "type\n" ++ " must be defined in PROTO_FILES or " ++ "their imports.\n" ++ " The input/output protobuf files are " ++ "specified\n" ++ " using the --protobuf_in and " ++ "--protobuf_out\n" ++ " command line flags.\n" + " --decode_raw Read an arbitrary protocol message " +- "from\n" +- " standard input and write the raw " +- "tag/value\n" +- " pairs in text format to standard " +- "output. No\n" ++ "and write\n" ++ " the raw tag/value pairs in text format." ++ " No\n" + " PROTO_FILES should be given when using " + "this\n" +- " flag.\n" ++ " flag. The input/output protobuf files " ++ "are\n" ++ " specified using the --protobuf_in and\n" ++ " --protobuf_out command line flags.\n" ++ " --protobuf_in=FILE Absolute path to the protobuf file " ++ "from which\n" ++ " input of encoding/decoding operation " ++ "will be\n" ++ " read. If omitted, input will be read " ++ "from\n" ++ " standard input.\n" ++ " --protobuf_out=FILE Absolute path to the protobuf file " ++ "to which\n" ++ " output of encoding/decoding operation " ++ "will be\n" ++ " written. If omitted, output will be " ++ "written to\n" ++ " standard output.\n" + " --descriptor_set_in=FILES Specifies a delimited list of FILES\n" + " each containing a FileDescriptorSet " + "(a\n" +@@ -2254,7 +2315,9 @@ + return true; + } + +-bool CommandLineInterface::EncodeOrDecode(const DescriptorPool* pool) { ++bool CommandLineInterface::EncodeOrDecode(const DescriptorPool* pool, ++ int in_fd, ++ int out_fd) { + // Look up the type. + const Descriptor* type = pool->FindMessageTypeByName(codec_type_); + if (type == NULL) { +@@ -2266,15 +2329,15 @@ + std::unique_ptr<Message> message(dynamic_factory.GetPrototype(type)->New()); + + if (mode_ == MODE_ENCODE) { +- SetFdToTextMode(STDIN_FILENO); +- SetFdToBinaryMode(STDOUT_FILENO); ++ SetFdToTextMode(in_fd); ++ SetFdToBinaryMode(out_fd); + } else { +- SetFdToBinaryMode(STDIN_FILENO); +- SetFdToTextMode(STDOUT_FILENO); ++ SetFdToBinaryMode(in_fd); ++ SetFdToTextMode(out_fd); + } + +- io::FileInputStream in(STDIN_FILENO); +- io::FileOutputStream out(STDOUT_FILENO); ++ io::FileInputStream in(in_fd); ++ io::FileOutputStream out(out_fd); + + if (mode_ == MODE_ENCODE) { + // Input is text. +--- /src/google/protobuf/compiler/command_line_interface.h ++++ /src/google/protobuf/compiler/command_line_interface.h +@@ -296,7 +296,9 @@ + GeneratorContext* generator_context, std::string* error); + + // Implements --encode and --decode. +- bool EncodeOrDecode(const DescriptorPool* pool); ++ bool EncodeOrDecode(const DescriptorPool* pool, ++ int in_fd, ++ int out_fd); + + // Implements the --descriptor_set_out option. + bool WriteDescriptorSet( +@@ -428,6 +430,13 @@ + // parsed FileDescriptorSets to be used for loading protos. Otherwise, empty. + std::vector<std::string> descriptor_set_in_names_; + ++ // When using --encode / --decode / --decode_raw absolute path to the output ++ // file. (Empty string indicates write to STDOUT). ++ std::string protobuf_out_path_; ++ // When using --encode / --decode / --decode_raw, absolute path to the input ++ // file. (Empty string indicates read from STDIN). ++ std::string protobuf_in_path_; ++ + // If --descriptor_set_out was given, this is the filename to which the + // FileDescriptorSet should be written. Otherwise, empty. + std::string descriptor_set_out_name_; +--- /src/google/protobuf/compiler/command_line_interface_unittest.cc ++++ /src/google/protobuf/compiler/command_line_interface_unittest.cc +@@ -95,7 +95,7 @@ + virtual void SetUp(); + virtual void TearDown(); + +- // Runs the CommandLineInterface with the given command line. The ++ // Run the CommandLineInterface with the given command line. The + // command is automatically split on spaces, and the string "$tmpdir" + // is replaced with TestTempDir(). + void Run(const std::string& command); +@@ -2625,6 +2625,17 @@ + std::string::npos); + } + ++ void ExpectBinaryFilesMatch(const string &expected_file, ++ const string &actual_file) { ++ string expected_output, actual_output; ++ ASSERT_TRUE(File::ReadFileToString(expected_file, &expected_output)); ++ ASSERT_TRUE(File::ReadFileToString(actual_file, &actual_output)); ++ ++ // Don't use EXPECT_EQ because we don't want to print raw binary data to ++ // stdout on failure. ++ EXPECT_TRUE(expected_output == actual_output); ++ } ++ + private: + void WriteUnittestProtoDescriptorSet() { + unittest_proto_descriptor_set_filename_ = +@@ -2719,6 +2730,19 @@ + "net/proto2/internal/no_such_file.proto: No such file or directory\n"); + } + ++TEST_P(EncodeDecodeTest, RedirectInputOutput) { ++ string out_file = TestTempDir() + "/golden_message_out.pbf"; ++ EXPECT_TRUE( ++ Run(TestUtil::MaybeTranslatePath("net/proto2/internal/unittest.proto") + ++ " --encode=protobuf_unittest.TestAllTypes" + ++ " --protobuf_in=" + TestUtil::GetTestDataPath( ++ "net/proto2/internal/" ++ "testdata/text_format_unittest_data_oneof_implemented.txt") + ++ " --protobuf_out=" + out_file)); ++ ExpectBinaryFilesMatch(out_file, TestUtil::GetTestDataPath( ++ "net/proto2/internal/testdata/golden_message_oneof_implemented")); ++} ++ + INSTANTIATE_TEST_SUITE_P(FileDescriptorSetSource, EncodeDecodeTest, + testing::Values(PROTO_PATH, DESCRIPTOR_SET_IN)); + } // anonymous namespace diff --git a/dev-libs/protobuf/files/protobuf-3.12.0-system_libraries.patch b/dev-libs/protobuf/files/protobuf-3.12.0-system_libraries.patch new file mode 100644 index 000000000000..cd7c3493da86 --- /dev/null +++ b/dev-libs/protobuf/files/protobuf-3.12.0-system_libraries.patch @@ -0,0 +1,121 @@ +--- /Makefile.am ++++ /Makefile.am +@@ -11,28 +11,10 @@ + # Always include third_party directories in distributions. + DIST_SUBDIRS = src conformance benchmarks third_party/googletest + +-# Build gmock before we build protobuf tests. We don't add gmock to SUBDIRS +-# because then "make check" would also build and run all of gmock's own tests, +-# which takes a lot of time and is generally not useful to us. Also, we don't +-# want "make install" to recurse into gmock since we don't want to overwrite +-# the installed version of gmock if there is one. + check-local: +- @echo "Making lib/libgmock.a lib/libgmock_main.a in gmock" +- @cd third_party/googletest/googletest && $(MAKE) $(AM_MAKEFLAGS) lib/libgtest.la lib/libgtest_main.la +- @cd third_party/googletest/googlemock && $(MAKE) $(AM_MAKEFLAGS) lib/libgmock.la lib/libgmock_main.la + +-# We would like to clean gmock when "make clean" is invoked. But we have to +-# be careful because clean-local is also invoked during "make distclean", but +-# "make distclean" already recurses into gmock because it's listed among the +-# DIST_SUBDIRS. distclean will delete gmock/Makefile, so if we then try to +-# cd to the directory again and "make clean" it will fail. So, check that the +-# Makefile exists before recursing. + clean-local: +- @if test -e third_party/googletest/Makefile; then \ +- echo "Making clean in googletest"; \ +- cd third_party/googletest && $(MAKE) $(AM_MAKEFLAGS) clean; \ +- fi; \ +- if test -e conformance/Makefile; then \ ++ @if test -e conformance/Makefile; then \ + echo "Making clean in conformance"; \ + cd conformance && $(MAKE) $(AM_MAKEFLAGS) clean; \ + fi; \ +--- /configure.ac ++++ /configure.ac +@@ -223,12 +223,5 @@ + esac + AM_CONDITIONAL([OBJC_CONFORMANCE_TEST], [test $OBJC_CONFORMANCE_TEST = 1]) + +-# HACK: Make gmock's configure script pick up our copy of CFLAGS and CXXFLAGS, +-# since the flags added by ACX_CHECK_SUNCC must be used when compiling gmock +-# too. +-export CFLAGS +-export CXXFLAGS +-AC_CONFIG_SUBDIRS([third_party/googletest]) +- + AC_CONFIG_FILES([Makefile src/Makefile benchmarks/Makefile conformance/Makefile protobuf.pc protobuf-lite.pc]) + AC_OUTPUT +--- /src/Makefile.am ++++ /src/Makefile.am +@@ -711,19 +711,11 @@ + google/protobuf/testing/file.cc \ + google/protobuf/testing/file.h + +-GOOGLETEST_BUILD_DIR=../third_party/googletest/googletest +-GOOGLEMOCK_BUILD_DIR=../third_party/googletest/googlemock +-GOOGLETEST_SRC_DIR=$(srcdir)/../third_party/googletest/googletest +-GOOGLEMOCK_SRC_DIR=$(srcdir)/../third_party/googletest/googlemock + check_PROGRAMS = protoc protobuf-test protobuf-lazy-descriptor-test \ + protobuf-lite-test test_plugin protobuf-lite-arena-test \ + $(GZCHECKPROGRAMS) + protobuf_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la \ +- $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la \ +- $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la \ +- $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock_main.la +-protobuf_test_CPPFLAGS = -I$(GOOGLETEST_SRC_DIR)/include \ +- -I$(GOOGLEMOCK_SRC_DIR)/include ++ -lgtest -lgmock -lgmock_main + # Disable optimization for tests unless the user explicitly asked for it, + # since test_util.cc takes forever to compile with optimization (with GCC). + # See configure.ac for more info. +@@ -815,12 +807,8 @@ + # Run cpp_unittest again with PROTOBUF_TEST_NO_DESCRIPTORS defined. + protobuf_lazy_descriptor_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la \ + libprotoc.la \ +- $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la \ +- $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la \ +- $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock_main.la +-protobuf_lazy_descriptor_test_CPPFLAGS = -I$(GOOGLEMOCK_SRC_DIR)/include \ +- -I$(GOOGLETEST_SRC_DIR)/include \ +- -DPROTOBUF_TEST_NO_DESCRIPTORS ++ -lgtest -lgmock -lgmock_main ++protobuf_lazy_descriptor_test_CPPFLAGS = -DPROTOBUF_TEST_NO_DESCRIPTORS + protobuf_lazy_descriptor_test_CXXFLAGS = $(NO_OPT_CXXFLAGS) + protobuf_lazy_descriptor_test_SOURCES = \ + google/protobuf/compiler/cpp/cpp_unittest.cc \ +@@ -841,11 +829,7 @@ + # full runtime and we want to make sure this test builds without full + # runtime. + protobuf_lite_test_LDADD = $(PTHREAD_LIBS) libprotobuf-lite.la \ +- $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la \ +- $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la \ +- $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock_main.la +-protobuf_lite_test_CPPFLAGS= -I$(GOOGLEMOCK_SRC_DIR)/include \ +- -I$(GOOGLETEST_SRC_DIR)/include ++ -lgtest -lgmock -lgmock_main + protobuf_lite_test_CXXFLAGS = $(NO_OPT_CXXFLAGS) + protobuf_lite_test_SOURCES = \ + google/protobuf/lite_unittest.cc \ +@@ -857,11 +841,7 @@ + # gtest when building the test internally our memory sanitizer doesn't detect + # memory leaks (don't know why). + protobuf_lite_arena_test_LDADD = $(PTHREAD_LIBS) libprotobuf-lite.la \ +- $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la \ +- $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la \ +- $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock_main.la +-protobuf_lite_arena_test_CPPFLAGS = -I$(GOOGLEMOCK_SRC_DIR)/include \ +- -I$(GOOGLETEST_SRC_DIR)/include ++ -lgtest -lgmock -lgmock_main + protobuf_lite_arena_test_CXXFLAGS = $(NO_OPT_CXXFLAGS) + protobuf_lite_arena_test_SOURCES = \ + google/protobuf/lite_arena_unittest.cc \ +@@ -871,8 +851,7 @@ + + # Test plugin binary. + test_plugin_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la \ +- $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la +-test_plugin_CPPFLAGS = -I$(GOOGLETEST_SRC_DIR)/include ++ -lgtest + test_plugin_SOURCES = \ + google/protobuf/compiler/mock_code_generator.cc \ + google/protobuf/testing/file.cc \ diff --git a/dev-libs/protobuf/protobuf-3.12.2.ebuild b/dev-libs/protobuf/protobuf-3.12.2.ebuild new file mode 100644 index 000000000000..16f0b7ed8c10 --- /dev/null +++ b/dev-libs/protobuf/protobuf-3.12.2.ebuild @@ -0,0 +1,128 @@ +# 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/23" +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.12.0-disable_no-warning-test.patch" + "${FILESDIR}/${PN}-3.12.0-system_libraries.patch" + "${FILESDIR}/${PN}-3.12.0-protoc_input_output_files.patch" +) + +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 +} + +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-9999.ebuild b/dev-libs/protobuf/protobuf-9999.ebuild index eebedecd5f12..4b1a78fbac4b 100644 --- a/dev-libs/protobuf/protobuf-9999.ebuild +++ b/dev-libs/protobuf/protobuf-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 2008-2019 Gentoo Authors +# Copyright 2008-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -21,7 +21,7 @@ else fi LICENSE="BSD" -SLOT="0/22" +SLOT="0/23" KEYWORDS="" IUSE="emacs examples static-libs test zlib" RESTRICT="!test? ( test )" @@ -33,9 +33,9 @@ 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" + "${FILESDIR}/${PN}-3.12.0-disable_no-warning-test.patch" + "${FILESDIR}/${PN}-3.12.0-system_libraries.patch" + "${FILESDIR}/${PN}-3.12.0-protoc_input_output_files.patch" ) DOCS=(CHANGES.txt CONTRIBUTORS.txt README.md) diff --git a/dev-libs/qtkeychain/Manifest b/dev-libs/qtkeychain/Manifest index 027fb4b017ac..2a2d3becd320 100644 --- a/dev-libs/qtkeychain/Manifest +++ b/dev-libs/qtkeychain/Manifest @@ -1,3 +1,3 @@ DIST qtkeychain-0.10.0.tar.gz 38488 BLAKE2B 229270158f08a17e391a68bb6eaf6a1924fd1e5caa9ba026e15619dd159d1514894000a74301a2f2dda706f0629b5bc06afeb38191700e834d412c9cff505263 SHA512 de35d1a39c717db5c8c3b8a59571e96ed8925836a7043dd9f236c284bf92de4875c4b53686ba73244bbc84b55a88d44316a16da3012e50cbc7594fbf0b1140b6 -EBUILD qtkeychain-0.10.0.ebuild 913 BLAKE2B 9d403250226be563ef1b5e36251fc50eb448f86686181c895b27a6046b81dd5dcb5851c61c66b3b2bcb8dc321a67cc5e34d2d31f578f1e99c09f3fb42af9e4ea SHA512 ea34eedbc80df41d6cb2f717a45c6616cc41f2cc43cecdca3a0bd09733d45eb381c6073fb66f8257fcc6f3b2d4932e636a7cbaef9187a9eb771887da24944828 +EBUILD qtkeychain-0.10.0.ebuild 912 BLAKE2B 341affb568d1a6d996ff9406b5b05ceff59a5d88b25c8e036836ea322dbd2f69877ab0dd86f4e14a7ce9263ca583825823ef2f7d62c1753cc61b7c04497b722e SHA512 63996a4ee7e2bed0f7a9f47db4f7815874dd4e85dbdc2c171794795e72afa57674db12132e94ade8a12d2ca84eaf30f77b1dc4ccaccba1e3235eacc84dc9d778 MISC metadata.xml 335 BLAKE2B 676879e385fb11722b2c2d90478178b06223e401992e5c55b88081e513fc11904e4766f4525eba3349a0e9f2fdc81b08cbeb2d973f9b77cf70e9985afd63e40a SHA512 72e060f41c90aa2a177af6c32b35109f0489fd277f5864cae4f6be7e2577f0920ba75f811081b058a210d54415dfc7e8aed35ca233748e35dcd1233b59d47342 diff --git a/dev-libs/qtkeychain/qtkeychain-0.10.0.ebuild b/dev-libs/qtkeychain/qtkeychain-0.10.0.ebuild index 99f881d84cba..4c6ec3117e35 100644 --- a/dev-libs/qtkeychain/qtkeychain-0.10.0.ebuild +++ b/dev-libs/qtkeychain/qtkeychain-0.10.0.ebuild @@ -10,7 +10,7 @@ DESCRIPTION="Qt API for storing passwords securely" if [[ ${PV} != *9999* ]]; then SRC_URI="https://github.com/frankosterfeld/qtkeychain/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 ~arm64 ~ppc64 x86" + KEYWORDS="amd64 arm64 ~ppc64 x86" else inherit git-r3 EGIT_REPO_URI="${HOMEPAGE}.git" diff --git a/dev-libs/quazip/Manifest b/dev-libs/quazip/Manifest index 737b9037d7de..e4d5daf9c5a1 100644 --- a/dev-libs/quazip/Manifest +++ b/dev-libs/quazip/Manifest @@ -1,3 +1,7 @@ +AUX quazip-0.9.1-gnuinstalldirs.patch 3853 BLAKE2B cf20bde0e7231a64756d1a05b09f7683c4b4b3e8ff0699b8bfb284cd37b05574244f7d4ec18b6b8df0eae1550fc10f6d99891e8241dfaddeac18080ce8ea11a6 SHA512 b84fdf3d79d47bb18fdafc7652df6f8f705a8bfc63628eb748ee0c94e7ad955074cfdf03c6321d58cd3ef0f04238958cfe24264e785b38f583085cf49042b321 +AUX quazip-0.9.1-no-static-lib.patch 2228 BLAKE2B 7cee7fefbca5696d3862ec475ef34bbd7ae3fca2b3463933b9750081090d0608e1eac095bba53a33a40458fbea6487fb6bde06d652a8417325b2adeb6bed6d76 SHA512 cf9c09b016c3a37158eeb840ef58e1cf65fbc7f98d083489e3dc47b09f22221822c0546341e7410a77428f07ff8d98c168d8ee09d07b8b37c47df6790beeb119 DIST quazip-0.8.1.tar.gz 150584 BLAKE2B 4a1d61b65b01eee06e1292ee88b543675c77ac922d0fb1726ac0afd447d74e8c8154db82da0ce95c2f2c303c036f2795e8938a412dc22e921ee09a0ef99278f6 SHA512 d65dab16c2cbc4d8bb23dae5b2fdff5ef787aaff2653b8e75c3fc8ba1701f5568a52bdde39009f83c5069a9fe3331cd1a49cf965822c4180e88bbc341faa2bfb +DIST quazip-0.9.1.tar.gz 155775 BLAKE2B 76710f94d055e86e1885f74b85f3e6b25f053eedbb73b4b11163e243d003ea3bad50cf1568fd2dbd37bc5db05fd0a6f8d49f48bd5df22d30b1aad3747e8ab780 SHA512 db31f3c7e3d7e95c25090ceb8379643e0b49ed69ece009dd015bee120b2b60f42e73408f580caed3138fa19ca64dcd23a05f16435abb54e2b8df21105c7b42c0 EBUILD quazip-0.8.1.ebuild 1106 BLAKE2B 7ae5b0f37f840aede6f0d3310d176d5bf45d82ef1821602b3a010cecf21c77e483318a959ba9901f45e2b326c5e4481615d6115a95ceaec0a8067c0492193ac2 SHA512 d9ce0a05b55da4c1317cc380c2d19bb8107ed02cd4aab26149f07c518ed07f8a98e51de7ebb272d789b2e4432cf185f9fb19fab009e06d8208bb508645933560 +EBUILD quazip-0.9.1.ebuild 834 BLAKE2B 4c4489f2259dee61a6c45894e2f2c7be54dc0850824a1cf4d9aacff84d2dc1c7c90056105ba4fb10b1e8e040240dd0c78aa0bd40454162784ec2fe18d05d4c46 SHA512 5051d9411c278c3bdbe20c1bcf51aa6776a841048f9e3533801fe15acd7ea88f884d554d6a7a4056a7a4b746bcb3af1dcf908663871cc1861437d662e026dec8 MISC metadata.xml 291 BLAKE2B c82030a8bb517384360ea44225c9c472868d2460ddc9f95f267ef58f8275d7386a87fc7f074995636bf88e056cdf516a3a89500d6d0da09ea97d0d70507eca73 SHA512 4bbb5644633f8430cf5aa8e2e0108154b9480129ebdfcdcd2e3138c550d03d4d4b2d5554ec2a2fcf592375cda4ce4825f59db8921256c491a3216500f8df0a98 diff --git a/dev-libs/quazip/files/quazip-0.9.1-gnuinstalldirs.patch b/dev-libs/quazip/files/quazip-0.9.1-gnuinstalldirs.patch new file mode 100644 index 000000000000..c8dc5b6e3ad8 --- /dev/null +++ b/dev-libs/quazip/files/quazip-0.9.1-gnuinstalldirs.patch @@ -0,0 +1,90 @@ +From 3b1bf010e6f19908c90fdd51f01797dedb62fd53 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <asturm@gentoo.org> +Date: Thu, 9 Jul 2020 23:08:22 +0200 +Subject: [PATCH] Use GNUInstallDirs, fix pkgconfig libdir/includedir + +Dropping LIB_SUFFIX. +--- + CMakeLists.txt | 16 ++++++++-------- + quazip.pc.cmakein | 6 +++--- + quazip/CMakeLists.txt | 4 ++-- + 3 files changed, 13 insertions(+), 13 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index ed96b33..c3cce42 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 2.6) ++cmake_minimum_required(VERSION 2.8.5) + project(QuaZip) + + # CMP0042: Explicitly acknowledge MACOSX_RPATH +@@ -11,6 +11,8 @@ set(QUAZIP_LIB_SOVERSION 1) + + option(BUILD_WITH_QT4 "Build QuaZip with Qt4 no matter if Qt5 was found" OFF) + ++include(GNUInstallDirs) ++ + if(NOT BUILD_WITH_QT4) + # try Qt5 first, and prefer that if found + find_package(Qt5Core QUIET) +@@ -48,18 +50,16 @@ find_package(ZLIB REQUIRED) + # All build libraries are moved to this directory + set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}) + +-set(LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)") +-set(LIB_DESTINATION "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}" CACHE STRING "Library directory name" FORCE) +-set(INSTALL_PKGCONFIG_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/pkgconfig" CACHE STRING "Installation directory for pkgconfig (.pc) files" FORCE) + set(QUAZIP_LIB_TARGET_NAME quazip${QUAZIP_LIB_VERSION_SUFFIX} CACHE + INTERNAL "Target name of libquazip" FORCE) + + add_subdirectory(quazip) + + if(UNIX AND NOT APPLE) +- configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/quazip.pc.cmakein +- ${CMAKE_CURRENT_BINARY_DIR}/quazip.pc @ONLY) +- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/quazip.pc DESTINATION "${INSTALL_PKGCONFIG_DIR}") ++ configure_file(quazip.pc.cmakein quazip.pc @ONLY) ++ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/quazip.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) + endif() + +-install(FILES QuaZipConfig.cmake DESTINATION ${LIB_DESTINATION}/cmake/QuaZip${QUAZIP_LIB_VERSION_SUFFIX} RENAME QuaZip${QUAZIP_LIB_VERSION_SUFFIX}Config.cmake) ++install(FILES QuaZipConfig.cmake ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/QuaZip${QUAZIP_LIB_VERSION_SUFFIX} ++ RENAME QuaZip${QUAZIP_LIB_VERSION_SUFFIX}Config.cmake) +diff --git a/quazip.pc.cmakein b/quazip.pc.cmakein +index e46d4c6..50d280e 100644 +--- a/quazip.pc.cmakein ++++ b/quazip.pc.cmakein +@@ -1,12 +1,12 @@ + prefix=@CMAKE_INSTALL_PREFIX@ + exec_prefix=${prefix} +-libdir=${prefix}/lib@LIB_SUFFIX@ +-includedir=${prefix}/include ++libdir=@CMAKE_INSTALL_FULL_LIBDIR@ ++includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@/quazip@QUAZIP_LIB_VERSION_SUFFIX@ + + + Name: Quazip + Description: Quazip Library + Version: @QUAZIP_LIB_VERSION@ + Libs: -lquazip@QUAZIP_LIB_VERSION_SUFFIX@ +-Cflags: ++Cflags: -I${includedir} + Requires: Qt5Core +diff --git a/quazip/CMakeLists.txt b/quazip/CMakeLists.txt +index 84607f6..74e02fe 100644 +--- a/quazip/CMakeLists.txt ++++ b/quazip/CMakeLists.txt +@@ -18,5 +18,5 @@ set_target_properties(${QUAZIP_LIB_TARGET_NAME} PROPERTIES VERSION ${QUAZIP_LIB_ + # Link against ZLIB_LIBRARIES if needed (on Windows this variable is empty) + target_link_libraries(${QUAZIP_LIB_TARGET_NAME} ${QT_QTMAIN_LIBRARY} ${QTCORE_LIBRARIES} ${ZLIB_LIBRARIES}) + +-install(FILES ${PUBLIC_HEADERS} DESTINATION include/quazip${QUAZIP_LIB_VERSION_SUFFIX}) +-install(TARGETS ${QUAZIP_LIB_TARGET_NAME} LIBRARY DESTINATION ${LIB_DESTINATION} ARCHIVE DESTINATION ${LIB_DESTINATION} RUNTIME DESTINATION ${LIB_DESTINATION}) ++install(FILES ${PUBLIC_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/quazip${QUAZIP_LIB_VERSION_SUFFIX}) ++install(TARGETS ${QUAZIP_LIB_TARGET_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR}) +-- +2.27.0 + diff --git a/dev-libs/quazip/files/quazip-0.9.1-no-static-lib.patch b/dev-libs/quazip/files/quazip-0.9.1-no-static-lib.patch new file mode 100644 index 000000000000..f0ce3e6e392f --- /dev/null +++ b/dev-libs/quazip/files/quazip-0.9.1-no-static-lib.patch @@ -0,0 +1,40 @@ +From c061634452fe259dc5eb62395fbdb9159d4c9e09 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <asturm@gentoo.org> +Date: Thu, 9 Jul 2020 22:54:59 +0200 +Subject: [PATCH] Disable static lib + +--- + quazip/CMakeLists.txt | 13 ++----------- + 1 file changed, 2 insertions(+), 11 deletions(-) + +diff --git a/quazip/CMakeLists.txt b/quazip/CMakeLists.txt +index 1efb5e2..84607f6 100644 +--- a/quazip/CMakeLists.txt ++++ b/quazip/CMakeLists.txt +@@ -11,21 +11,12 @@ qt_wrap_cpp(MOC_SRCS ${PUBLIC_HEADERS}) + set(SRCS ${SRCS} ${MOC_SRCS}) + + add_library(${QUAZIP_LIB_TARGET_NAME} SHARED ${SRCS}) +-add_library(quazip_static STATIC ${SRCS}) +- +-# Windows uses .lib extension for both static and shared library +-# *nix systems use different extensions for SHARED and STATIC library and by convention both libraries have the same name +-if (NOT WIN32) +- set_target_properties(quazip_static PROPERTIES OUTPUT_NAME quazip${QUAZIP_LIB_VERSION_SUFFIX}) +-endif () + + target_include_directories(${QUAZIP_LIB_TARGET_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${ZLIB_INCLUDE_DIRS}) +-target_include_directories(quazip_static PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${ZLIB_INCLUDE_DIRS}) +-set_target_properties(${QUAZIP_LIB_TARGET_NAME} quazip_static PROPERTIES VERSION ${QUAZIP_LIB_VERSION} SOVERSION ${QUAZIP_LIB_SOVERSION} DEBUG_POSTFIX d) ++set_target_properties(${QUAZIP_LIB_TARGET_NAME} PROPERTIES VERSION ${QUAZIP_LIB_VERSION} SOVERSION ${QUAZIP_LIB_SOVERSION} DEBUG_POSTFIX d) + + # Link against ZLIB_LIBRARIES if needed (on Windows this variable is empty) + target_link_libraries(${QUAZIP_LIB_TARGET_NAME} ${QT_QTMAIN_LIBRARY} ${QTCORE_LIBRARIES} ${ZLIB_LIBRARIES}) +-target_link_libraries(quazip_static ${QT_QTMAIN_LIBRARY} ${QTCORE_LIBRARIES} ${ZLIB_LIBRARIES}) + + install(FILES ${PUBLIC_HEADERS} DESTINATION include/quazip${QUAZIP_LIB_VERSION_SUFFIX}) +-install(TARGETS ${QUAZIP_LIB_TARGET_NAME} quazip_static LIBRARY DESTINATION ${LIB_DESTINATION} ARCHIVE DESTINATION ${LIB_DESTINATION} RUNTIME DESTINATION ${LIB_DESTINATION}) ++install(TARGETS ${QUAZIP_LIB_TARGET_NAME} LIBRARY DESTINATION ${LIB_DESTINATION} ARCHIVE DESTINATION ${LIB_DESTINATION} RUNTIME DESTINATION ${LIB_DESTINATION}) +-- +2.27.0 + diff --git a/dev-libs/quazip/quazip-0.9.1.ebuild b/dev-libs/quazip/quazip-0.9.1.ebuild new file mode 100644 index 000000000000..2a480a28d814 --- /dev/null +++ b/dev-libs/quazip/quazip-0.9.1.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake flag-o-matic qmake-utils + +DESCRIPTION="Simple C++ wrapper over Gilles Vollant's ZIP/UNZIP package" +HOMEPAGE="https://stachenov.github.io/quazip/" +SRC_URI="https://github.com/stachenov/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="LGPL-2.1-with-linking-exception" +SLOT="0" +KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" +IUSE="" + +RDEPEND=" + dev-qt/qtcore:5 + dev-qt/qtnetwork:5 + sys-libs/zlib[minizip] +" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}/${P}-no-static-lib.patch" + "${FILESDIR}/${P}-gnuinstalldirs.patch" +) + +src_install() { + cmake_src_install + + # compatibility with not yet fixed rdeps (Gentoo bug #598136) + dosym libquazip5.so /usr/$(get_libdir)/libquazip.so +} diff --git a/dev-libs/rapidjson/Manifest b/dev-libs/rapidjson/Manifest index d2a8fdbe6ff0..06743dad1a61 100644 --- a/dev-libs/rapidjson/Manifest +++ b/dev-libs/rapidjson/Manifest @@ -1,7 +1,7 @@ AUX rapidjson-1.1.0-gcc-7.patch 1393 BLAKE2B 71affc72ebbf714788e243b75f9157e9423dcc34eb43efb3479125e2e269c6fcdcfc4d9e9334979b3f5463d97e241dfa3f335d893729282109ce6c768023ec92 SHA512 4f24f37a3c106698b871438675f2b06f2389d724ab8484a616586b5810aec5d8bd11eed759772affa627493314d3f47757af3a54519f3659df1d218cd12c3cd9 DIST rapidjson-1.1.0.tar.gz 1019402 BLAKE2B e1564b3cfa020f76437b0a35048a42ff2cd98b5ce285e63f228e158885182e5cecda13407cdf30c03fa39b47cbc579ff0065f6c2682d04b806e8f9ea8d36fc4e SHA512 2e82a4bddcd6c4669541f5945c2d240fb1b4fdd6e239200246d3dd50ce98733f0a4f6d3daa56f865d8c88779c036099c52a9ae85d47ad263686b68a88d832dff EBUILD rapidjson-1.1.0-r1.ebuild 1099 BLAKE2B 355d7cc8a583a2fe0ba2d033376f81d4f8cd6879461afdc03b6caf2ed947fedfd5eeb389cd546c0a978c66bdfa4be120e815140b1e0e9d9910fe4909af318430 SHA512 373409249dd5530a5619e1c5d7c29edea6246c1d238b820d98d058a0a1afdaa62311d8ea61ea99c02c971866fbdb626a8d9e68ceb78e18e1a5e1aa3d046e8f71 -EBUILD rapidjson-1.1.0-r2.ebuild 1195 BLAKE2B 95592d08090df1654d8f6823c679a5abf9e45c39033500b7399bcc38d1abf4af70dbb722fd4bac764b177503713ea4d17c07748edb0aa2f36c75e8c6b8f72caa SHA512 9a1b0c4de4c4702ae6b2419a491d303c3968d6b49f8e1bef8bea8c1aad31dffd308027b9f3c3364c0bc211e4930ae615cf1a5e8412b4c5e4e14d8f65d195db17 +EBUILD rapidjson-1.1.0-r2.ebuild 1196 BLAKE2B e1f709ff94d5cf7cb1c581cce49415cc76e221f8a2134e5b7c3f2ececd39aa7ac86e945653e331523675c02ace4e1e2256221d700141815a83b61b8fc94ca01f SHA512 e4fab2177decc21c90598409eda202ca59ed4b2c8e99e920ec8ecab72c2a5f6aa30cbd3064af6ddd6f7e388f8523a61cb38d3ecfd63a6af02d59b3aeb02f1189 EBUILD rapidjson-1.1.0.ebuild 907 BLAKE2B 6d3d531856301c37083b50f0d9a2454b305df7f02e5fee3ba22b3063943afc726f976820fc8a081d77cca87b0f1081e37165962cb272d585dad73eae855c129b SHA512 d049d8687b714f5d12142da93ab170a2a9081f7a50181347c5b6ff1f5096eac40fd231fa65072f30db705b008130990d10f51d68ff7f9c2ac943c5829a2efbee EBUILD rapidjson-9999.ebuild 1163 BLAKE2B 40c820e4a248819e0c9452d691d36900223da3ae76f86c83a90985e7f6ce923f07f7d8550d7fef1be1a280ddd9613e68ec53c80635fa9e0415ba74ce47c69659 SHA512 a4fade593c5943b556380f9c41f0d9a4ce0bb8b2c2ca1bf9f779af6de599c49e479ee7e6d04dc7c501be45c6257e24553b7206bf7fdff634283430b924f031c2 MISC metadata.xml 395 BLAKE2B acf0adcc9af1a50757d72f4b52d73c2481fda7bb48ebf2b71e7440c81788e1633b45a4af9ee0adbc1984b0667207706d162e1bdb7177ce8f4e85b819f789b708 SHA512 678196ecc89abed8aa3c1699844573b78103f1ee77dd193b68ad1ae1d5518cd46469b0a5850b00a201c41be381c730ced2aec79f8d4230cf61419b3a20a88935 diff --git a/dev-libs/rapidjson/rapidjson-1.1.0-r2.ebuild b/dev-libs/rapidjson/rapidjson-1.1.0-r2.ebuild index 2ffe57848cc2..f4bf74949e0a 100644 --- a/dev-libs/rapidjson/rapidjson-1.1.0-r2.ebuild +++ b/dev-libs/rapidjson/rapidjson-1.1.0-r2.ebuild @@ -18,7 +18,7 @@ if [[ ${PV} == *9999 ]] ; then inherit git-r3 else SRC_URI="https://github.com/miloyip/rapidjson/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm64 ~x86" + KEYWORDS="amd64 arm arm64 x86" S="${WORKDIR}/rapidjson-${PV}" fi diff --git a/dev-libs/rasqal/Manifest b/dev-libs/rasqal/Manifest index e367e41433be..82cb3a7d40ee 100644 --- a/dev-libs/rasqal/Manifest +++ b/dev-libs/rasqal/Manifest @@ -1,3 +1,3 @@ DIST rasqal-0.9.33.tar.gz 1595647 BLAKE2B 87bca86b2f0dceb0801f5a34dae9ae1f87d8a7d0dc1e03fdf04998a0d4885ed76be2719d3e01489a5510a26715bb093a75ce194cc42f3cedff88f64161d6a2fb SHA512 05728682797470db9e51d156012e8fde9dec1554d107372faa11cbe6cdc3356e92386f4f8de6d7c41e3100b76f9b1c6809102a913829cddbd2ff29043c04d522 -EBUILD rasqal-0.9.33.ebuild 1716 BLAKE2B 2778941c150bac33bbf9b1dfef0fd242ccc7b25204b868309d93ffd9246d84f21b3dd6773ee5a66b8c0cdcfd359305fb58c5a8fe667c2b4f711510c8dc3e0523 SHA512 3da97f6c964c4c77e9b61ea141c47aac8585c619fed3624add1104f639a8601e8f1ba6432d6275c2508875a7f41520e9df21f7868e0edb8bdbb855b10d0de858 +EBUILD rasqal-0.9.33.ebuild 1705 BLAKE2B 9304dfaaea72b6c08e2365af95010f2e58638431ab0d32961c8fa44c03bd25eebf4adfd3003f5962f181aaa7bee410eb8435bbfd253b8a69b10e47f36a54961b SHA512 b30147de82552af1c2dd84f33c1b8998d764d04dafb725b8f756b5349e1c6265d5475583802944063cb9c9337af5de678df566ba9419d43932fb93eaa2fb26cb MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343 diff --git a/dev-libs/rasqal/rasqal-0.9.33.ebuild b/dev-libs/rasqal/rasqal-0.9.33.ebuild index e8886dd14d6b..c56a9255e3ff 100644 --- a/dev-libs/rasqal/rasqal-0.9.33.ebuild +++ b/dev-libs/rasqal/rasqal-0.9.33.ebuild @@ -11,7 +11,7 @@ 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 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux" IUSE="+crypt gmp kernel_linux +mhash pcre static-libs test xml" RESTRICT="!test? ( test )" diff --git a/dev-libs/re2/Manifest b/dev-libs/re2/Manifest index 1c2d58343f2b..d7338bd05926 100644 --- a/dev-libs/re2/Manifest +++ b/dev-libs/re2/Manifest @@ -3,8 +3,10 @@ DIST re2-2019-12-01.tar.gz 391450 BLAKE2B 2069b496d494771d09d2ce289cc3cd45ea99fd 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 +DIST re2-2020-07-06.tar.gz 404055 BLAKE2B 1dca93ec928ef508aa30c44889d3f451acdf1f4430dc62b05c256790cb755e30ec5fac6aca23d44ad57eb61b0971437529bf63fb89b4bd7bf1937748046e61a9 SHA512 5ff5b0fa80d28a5c1cd56e42de4392899347e083c8eedb79282763b8967d301e0d287223e2b1a140cc30f7420a4a1aed5d7be0b68e8f5d2e8813ab4bfa64c103 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 +EBUILD re2-0.2020.06.01.ebuild 1345 BLAKE2B ac8742ad050636bcf8ed1cf04f08dedd105db7f28366da9e55976d2935d63544ecf3077f093794670caee6784ed082446f9b032f4a2ae836c92265f9d7fbbff1 SHA512 422480e4547f33c0827f43a248f9ed331f5ad8e7bd7ec60c96f1f396609bf4f6fb4ed8fe4be3eb3b0e687fdb2fdbb3c8d45b13a5400cb91fe79563372533c375 +EBUILD re2-0.2020.07.06.ebuild 1349 BLAKE2B fe65773026c5209e22cd94c9a1c2153ea5cccb39b1343c45471b01d4aac88cb39673a63a99ca1abf9fb9e1bc3859d9815f81a11e583cf64096e754cf1e63bede SHA512 9e646e078f73598a321893431ca6b1c1cb4652ae6d42ffa6da693b964740a0502e0a9d357f1ea1b06d70aa2fbcbb2140a8019253fe9af4bd1b407079d030033d 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 index f4ed8174619a..b1b73d54da92 100644 --- a/dev-libs/re2/re2-0.2020.06.01.ebuild +++ b/dev-libs/re2/re2-0.2020.06.01.ebuild @@ -18,7 +18,7 @@ LICENSE="BSD" # https://abi-laboratory.pro/tracker/timeline/re2/ SONAME="7" SLOT="0/${SONAME}" -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="icu" BDEPEND="icu? ( virtual/pkgconfig )" diff --git a/dev-libs/re2/re2-0.2020.07.06.ebuild b/dev-libs/re2/re2-0.2020.07.06.ebuild new file mode 100644 index 000000000000..adf595f07b8b --- /dev/null +++ b/dev-libs/re2/re2-0.2020.07.06.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="8" +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 39bbbe60a0ad..9d09b7ab096d 100644 --- a/dev-libs/redland-bindings/Manifest +++ b/dev-libs/redland-bindings/Manifest @@ -4,7 +4,7 @@ AUX redland-bindings-1.0.17.1-php-config-r1.patch 2249 BLAKE2B 83d9a65d6db941153 AUX redland-bindings-1.0.17.1-php-config.patch 1184 BLAKE2B f22aac3f4753f11c1473c2aef3291a311aa4313679e076a185b21e19735438ef9a3dd8cf4ddc4dab0cd691a17502a7a4d907935889755c2626720111246e532c SHA512 e9c9bdf5ed61b24afcb6bcf912be545525d5bdb0c77c304bc146c5fb645ddae2e7e90c6f71ae79d9624eaa2b0d498fddf149fd710524969b66c0f5c3ddabda65 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 2966 BLAKE2B 5b933955d63719dd5096cac1becaa1e4a5166b52762b6cbe76511d25d4f0d39762562b488962e21d7845a1c141c2b14d41eff595f6c1fff4dbc221e9eb9cf83d SHA512 5b3c6a0f37d7af208129677fe5db3545097c7c923cfd4a4eb4219bc409067dc70f8b11355f45c42a4f5bcf6d78001ae1997d8af9481af7a7e592df54c770cc19 -EBUILD redland-bindings-1.0.17.1.ebuild 2644 BLAKE2B 3f30c7fa70567d1d994a39d93a71fc00b57e82600a9b9e32426d3d8fbb8e5d78dcde3ff981114f18c3daa806c97c26f9a4101f84582746722e7b6609a77c5efd SHA512 46654ef0867bc19ba3c3eddb4949aaad265729d7dca643c159568970d4a7d3ad90954d5fb683af37586e3b8b190b766ea7d7c9fa6c717db98a637d8449e4a1f5 +EBUILD redland-bindings-1.0.14.1-r2.ebuild 1323 BLAKE2B 0cc330b0b39002f67957957eb57da192b7d4703d073f7f4f47b35c5d872f165c0a0bfff43922d984d32efd32a00c19481347271a116668c5b0863a6a1b46f8f8 SHA512 9d4b1c658bb9e5a967674107a405038a1c52d4721008b21ceeb989233ddd83ff23b4b457cb4293a9dfc7c1d639cd364cbda21ce72164fb777ca27a6d9eaa57f9 +EBUILD redland-bindings-1.0.17.1-r1.ebuild 2950 BLAKE2B 87cb0edbe71c77e1453af89c76552024a9605482b3acb7a2509ca0de019e0b1263f63f5ba8548742d6e5f47817a016ca0a3c4348b643d2fbcbbb8b383d52a2dd SHA512 5130a69d049ef57799d1ad732e96d0d7ce8829a2a6cbff1dd8cb9d0b5ce9281f1481cbfb74a00515064ce92446d0538a401d23d63c257829d4be3f27cb50cf63 +EBUILD redland-bindings-1.0.17.1.ebuild 2633 BLAKE2B b190723972f27a4eaa1aa5a9895622d2964aae7f5098db9b3e06e75955312831aa897163640cf195e1759d19688fea0b43bdc8259548b68d2f7073ee8f3d3dd3 SHA512 363f514f23eaebb5333bf48bfe136bf28db77bd37176d98b1978e2a8a3cdfcbf707e08acd0023deb2e5d463b35d4b7fd16eed3ffe4716cbdf4a5f5246e247853 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343 diff --git a/dev-libs/redland-bindings/redland-bindings-1.0.14.1-r2.ebuild b/dev-libs/redland-bindings/redland-bindings-1.0.14.1-r2.ebuild index 16af4f5f980b..c2af4022c104 100644 --- a/dev-libs/redland-bindings/redland-bindings-1.0.14.1-r2.ebuild +++ b/dev-libs/redland-bindings/redland-bindings-1.0.14.1-r2.ebuild @@ -13,7 +13,7 @@ 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" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~x86-linux" IUSE="lua perl python php ruby" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" 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 e2d64512b6f7..885cf10e208c 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 @@ -20,7 +20,7 @@ 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" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86 ~x86-linux" IUSE="lua perl python php ruby test" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" RESTRICT="!test? ( test )" diff --git a/dev-libs/redland-bindings/redland-bindings-1.0.17.1.ebuild b/dev-libs/redland-bindings/redland-bindings-1.0.17.1.ebuild index e4bdad7d4b7d..c37e8cb527ad 100644 --- a/dev-libs/redland-bindings/redland-bindings-1.0.17.1.ebuild +++ b/dev-libs/redland-bindings/redland-bindings-1.0.17.1.ebuild @@ -18,7 +18,7 @@ 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" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-linux" IUSE="lua perl python php ruby" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" diff --git a/dev-libs/redland/Manifest b/dev-libs/redland/Manifest index 93411e5e961c..e0116b513a1f 100644 --- a/dev-libs/redland/Manifest +++ b/dev-libs/redland/Manifest @@ -1,4 +1,4 @@ AUX redland-1.0.17-mysql-8-my_bool.patch 462 BLAKE2B f1a34d640698149b45a6a23c961690c79c02760b16c1087a79c27e8443cb956e953b02f9d435176c890500e4942cd37fe2c0105295490a3f4a629a651146fe33 SHA512 c796f5b6a3231a150310a889890137a7dd510cc75c8b80fead9db3c8fa4de27a132c58ad261188a6c6359f1debcd9b5ba273b7af4af3242035d4f6bc12364643 DIST redland-1.0.17.tar.gz 1621566 BLAKE2B ec94cd456a771b97ab16fab63cf6beffe1ce3371c06213faa49162fe452b31a21dffe6c2cc631c10b137f44dc71c2c40c1d7fac0552bbe0169728427b1f47a36 SHA512 363323ffc9e75d4f0e3a3b40952f6241fd0d8b9f46bfd4dd86cf0a5162de35257a8b70ce408a6083c03ba7c388982231a3774e5e9024b262ebb02968f778b850 -EBUILD redland-1.0.17-r2.ebuild 2540 BLAKE2B a7517723755abc71ea18282f0863073b9e263a237fae0c2cd7f467c2cf413111064d3c35ba7d71397897367dd6f3ea84b9574051de1979b958749416441b24e0 SHA512 5321768f71e9fbcf2ea7731063cebcf2a81a8937313069610339a77327fc6470958dea5cfd2e667d6b07c374449d25bc959df5a4e8c92ac41689610f073b6880 +EBUILD redland-1.0.17-r2.ebuild 2529 BLAKE2B 3983034e689daf393e1b8b0ed8e9033156502af1a36d9f2eac90dbe9b787b4798b7451492a63c57cd1488464ceb25f2700d6e8d980db8ba7c1abc0831f2c4908 SHA512 9c8fdca31f8b5a704fbe31bf24bb3cee63296afc525bea857d27e47829262b12d8c5ef9a399081e7c6585a70cb9d454eca1c5d03852af998f87fa58a086918c7 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343 diff --git a/dev-libs/redland/redland-1.0.17-r2.ebuild b/dev-libs/redland/redland-1.0.17-r2.ebuild index aa29fc1a6f4c..0e970fb8f4d6 100644 --- a/dev-libs/redland/redland-1.0.17-r2.ebuild +++ b/dev-libs/redland/redland-1.0.17-r2.ebuild @@ -10,7 +10,7 @@ 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 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux" IUSE="berkdb iodbc mysql odbc postgres sqlite static-libs" RDEPEND="dev-libs/libltdl:0 diff --git a/dev-libs/rinutils/Manifest b/dev-libs/rinutils/Manifest index d81b985a320e..b59483cc65c2 100644 --- a/dev-libs/rinutils/Manifest +++ b/dev-libs/rinutils/Manifest @@ -1,3 +1,5 @@ DIST rinutils-0.4.0.tar.xz 17072 BLAKE2B 90cd40fca0f682b730457da04bb392eada83ee2ab2ae3287ffdfd2235776038d6597143ca60c51b9c8d13b366511a5cd084b90811c5cfc7663125952fa009105 SHA512 96c0fc1e8164df8703910a8e14215e1a3fa52d5cc2fdf90af2f21dd064236e2b2b5f44485689553cd0df7cb99aa01f71241983166683934175d907e9f583edb5 +DIST rinutils-0.4.1.tar.xz 17136 BLAKE2B 890b7201845609026577ab49b952db193480bd252c2798d3084610d29b1d62ddd9afb791150ad0ac951e6e1518c5711de11f8f7253c1c4ce115dd220cc27f5b0 SHA512 e175e5ce6e32e85d4102ba788c5dec40bd09ecd4002e6de10e726843b7ac562a63b305898061cab623eb85d46983ae777ac6b57c46194a29d78f0fe498fa63e7 EBUILD rinutils-0.4.0.ebuild 567 BLAKE2B 8d8d59bf7764a81d1264384956314f662884c1da009ba871fcac827f1f4b1384250848c28003903fdbbe6f8b61a801bd91f5827e728b54bb000e9c946ca609eb SHA512 318b02ed7f1330ee8d71654bad78debfd3ca2ed5a2357b92b29031808113bf6057664d50b2962162daaee1b48ef9884b57ab085ca9374057911472fe289b23dc +EBUILD rinutils-0.4.1.ebuild 570 BLAKE2B 30d2366fd0a960f501b31ddbe691698a3579fa325912d2c653ca962cb976029c0cb69201328f9b399bb4c2f5a8acc2f26b1f66eddfa1faea500c8604ad713d94 SHA512 596126c33be635552308d28f22b47721ddb44e193a5ca3fe75493aedfc97f7c9ba77857c2f053ab84b2684accb23e6a4ecdd81e79e0d25959ac6bbcae4147c90 MISC metadata.xml 330 BLAKE2B cfc9f4f9873b63df5ed997fa0fb659fd5c15205a53b727a963c125cc31cb071ccd7fcdd524939ed10b8dd6fadf4c4cc304ed3c4be852fc1e29feb0918efb698e SHA512 aa5bbe760f05a3c67365ddfa2f0c9d52636bd645075ac0ca2a96124e1127557b20d12162fe2c44b4cd77cf6106c5803da3d25b36a4dc9bb21bc1842e0da71b24 diff --git a/dev-libs/rinutils/rinutils-0.4.1.ebuild b/dev-libs/rinutils/rinutils-0.4.1.ebuild new file mode 100644 index 000000000000..fa04b75970b8 --- /dev/null +++ b/dev-libs/rinutils/rinutils-0.4.1.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake + +DESCRIPTION="Set of C headers containing macros and static functions" +HOMEPAGE="https://www.shlomifish.org/open-source/projects/ https://github.com/shlomif/rinutils" +SRC_URI="https://github.com/shlomif/${PN}/releases/download/${PV}/${P}.tar.xz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~x86" + +src_configure() { + local mycmakeargs=( + -DDISABLE_APPLYING_RPATH=OFF + -DWITH_TEST_SUITE=OFF # tests require perl + ) + + cmake_src_configure +} diff --git a/dev-libs/rocclr/Manifest b/dev-libs/rocclr/Manifest index b60bd644654b..0e3251178d53 100644 --- a/dev-libs/rocclr/Manifest +++ b/dev-libs/rocclr/Manifest @@ -1,5 +1,10 @@ AUX rocclr-3.5.0-cmake-install-destination.patch 1743 BLAKE2B cacc53fe9ca31a90e294fc75d611d3dec70a196cbd8456f3c7d21639cd8d1a30e2bbfc336756936995b7bc1e23b4ce486410aff10e3f39a1d6da627d74a4ac81 SHA512 2675850ee6f1cf3b8ea66a9f54cfb35573f2d6ff1fe56b69630fe1323bdf916357eefb5927692bba58ec7007be24f2d1b2734ee13a81afe72c36fa59c4de5f28 +AUX rocclr-3.5.0-find-opencl.patch 1538 BLAKE2B cde3a6af047a3d2aef58e54930398787927d45683f210cd558a5afe55fc22d0ef426080c2b099dfad9baa6bf9a9269b42bc28bfb7f51b069acf3fbc45c1bc3d7 SHA512 0b264d77d30519d174a3724fe3d55f4875e1d6ff2747595ffc9d585eec2c91e69da93e75865d7899054026c7db4350dc8264429e642c77471af1379936ccc65d +AUX rocclr-3.7.0-cmake-install-destination.patch 1487 BLAKE2B bba1dbe3a029db770c66ec6cb11e2d79e165e98a9a8db1c1aec4abd4b627eb2c6af57d838977e558291c7339d36399d43307a1806604b1c1c87d448433e03eba SHA512 7ba64b84526342c20d9f750c2298d6839c608f83f2b10e63bf5dff610ce8127247b41572c0b14fba84ddf02947ec3f2a7e954e75844105de60329c144ef16ef2 DIST rocclr-3.5.0.tar.gz 874139 BLAKE2B 027403d51c86aa492c0951f8d75bd90493fc0fbe99987e9f443a9fa0b86fc69335a4a6625b5af67231b99c9e0b0adbd914e11369fb2a2b1acb3b5254e475b09f SHA512 732c439f900896c0e065b64054a789edbc0258a0e53723077e578b99bd59925517b201c31a428389cc0dbd100051df8344378aee4a0c2c294110ad9bcf1a3098 +DIST rocclr-3.7.0.tar.gz 881814 BLAKE2B 5d7c70d52d8c06e421bdf2a02dba35ed70509c9154fbe3b8c3193969b37970d5f52d1a67eff46abe95b8af1932f2c6931b18380d046f633a3870fe95c4bfc651 SHA512 8684cc9b4f9f63ef65bcc286b74c51e3f7d334f0245b5a1fca6d3dfa0bb552fccb6b82419b538aebe1d316aa2c41a28a9a21df459b734aa44923d66d725834e1 DIST rocm-opencl-runtime-3.5.0.tar.gz 734076 BLAKE2B cc6992999188968c628b378f637c8073c99381fab42e05d7d9d89d75fe9f2bd3d573f61f00a18c078542f7fc4a3a856385d0f34fa9bb599dd63de8be18594bdf SHA512 658649c3f13d32308f8f031f26b62c20bda4841059b5ea0db5c6a827af26b07aa0bdee07a461cc4b3c37108b3f25ae59b1658fab30125f84c0729fb57c2fa014 -EBUILD rocclr-3.5.0.ebuild 1272 BLAKE2B 90c6bf25ff0812121ff24d19d93cd81ee039602891b41ee86ee23c2e789e686733d28e8aa5448aca6b383f56c7901039b7c9f5cad3123b0e0e90934922e4d0fc SHA512 736fbd3cfbe6746c366d41cb4b71ceec1ddf975ecc0a6c8c88a443b294fab02226e6bec0b13b9810f4b548f6da7c1a7e59c0661b25ae78d883fde265c91a9b8a +DIST rocm-opencl-runtime-3.7.0.tar.gz 1004361 BLAKE2B 7fa9481c77884dda15a3b0335449b2879fbac000f644fc56bbd8d06c5fd77d8355f159b9b7e8920f06351e388d0df41379b7e1fcff51cf81714a28f902218e42 SHA512 6ea509dde0290f13e66497eaad587099ed6a98df967adce207afc857ecd961b65801332ca74e36173719488639480cfcffc625a007345d0e48c10c8a0efdfa3f +EBUILD rocclr-3.5.0-r1.ebuild 1301 BLAKE2B 1d67bf666b69871767060f7742a575b6326e8007c1783c23597a30a8396c17e8323e09a31bfc5d12eb2837e5abf5a7711a0f359adb83d64b0d01a9c30eba0e40 SHA512 9cb182fada78acbe442e65c2f3674087a332f87972524246d0916c267b3bef465fc8adda0ce1b045f57d8c1942fe15304cb7d94257799801c6576ad17e9e45a6 +EBUILD rocclr-3.7.0-r1.ebuild 1125 BLAKE2B 5835e53e68b6cb6300ad505a23963989291740ebb872175c873a66f8d37f618dad954cefb0b29efcd82571b4017dbf92fd808b5b533a5b91844a9797d19ca15b SHA512 27e2425539f6dd0822c747f57ebbb158ca77994ee6b7ba351b771d2ee255a4ef49f9f7d9b3839a9919d1eec9d4271edef6db9260aad15e127b6ed336bed9f286 MISC metadata.xml 497 BLAKE2B f21bb8a043e512036294e7af578c86aec248b4d8fd76bbb2c86026d7c1c8cc4e0bdd1725685ea3ff861dc2a63708b740fa45c7e19b95589de0fd6fac4391b3e8 SHA512 5275f1799db5d847e09eae59d624ecf40134513a3c9c370a6ad05ea0808b7f456eae32a37c1501e156d26d155a8f692d4f661757c0a2f0b436cc46666930850d diff --git a/dev-libs/rocclr/files/rocclr-3.5.0-find-opencl.patch b/dev-libs/rocclr/files/rocclr-3.5.0-find-opencl.patch new file mode 100644 index 000000000000..fc9bacee5020 --- /dev/null +++ b/dev-libs/rocclr/files/rocclr-3.5.0-find-opencl.patch @@ -0,0 +1,49 @@ +From 98df37fc36b6276c26532e86e89be7e389745f4e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Torsten=20Ke=C3=9Fler?= <t.kessler@posteo.de> +Date: Sun, 19 Jul 2020 11:58:24 +0200 +Subject: [PATCH] Fix search for OpenCL include dirs + +--- + CMakeLists.txt | 26 +++++++++----------------- + 1 file changed, 9 insertions(+), 17 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 122277ee..02ca4644 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -53,26 +53,18 @@ find_package(amd_comgr REQUIRED CONFIG + ) + message(STATUS "Code Object Manager found at ${amd_comgr_DIR}.") + +-# FIXME: Use find_package(OpenCL) +-find_library( OpenCL REQUIRED CONFIG +- PATHS +- /opt/rocm ++find_path(OPENCL_INCLUDE_DIR ++ NAMES OpenCL/cl.h CL/cl.h ++ PATH_SUFFIXES include opencl/include inc include/x86_64 include/x64 ++ PATHS ${OPENCL_DIR} ++ DOC "OpenCL include header OpenCL/cl.h or CL/cl.h" + ) + +-if( NOT OPENCL_DIR ) +- find_path(OPENCL_INCLUDE_DIR +- NAMES OpenCL/cl.h CL/cl.h +- PATH_SUFFIXES include opencl/include inc include/x86_64 include/x64 +- PATHS /opt/rocm +- DOC "OpenCL include header OpenCL/cl.h or CL/cl.h" +- ) +- +- if( NOT OPENCL_INCLUDE_DIR ) +- unset(OPENCL_INCLUDE_DIR CACHE) +- set(OPENCL_INCLUDE_DIR "" CACHE PATH "" FORCE ) +- endif() +- message(STATUS "Opencl found at ${OPENCL_INCLUDE_DIR}.") ++if( NOT OPENCL_INCLUDE_DIR ) ++ unset(OPENCL_INCLUDE_DIR CACHE) ++ set(OPENCL_INCLUDE_DIR "" CACHE PATH "" FORCE ) + endif() ++message(STATUS "Opencl found at ${OPENCL_INCLUDE_DIR}.") + + + diff --git a/dev-libs/rocclr/files/rocclr-3.7.0-cmake-install-destination.patch b/dev-libs/rocclr/files/rocclr-3.7.0-cmake-install-destination.patch new file mode 100644 index 000000000000..3629fc71b3b3 --- /dev/null +++ b/dev-libs/rocclr/files/rocclr-3.7.0-cmake-install-destination.patch @@ -0,0 +1,52 @@ +--- a/CMakeLists.txt 2020-08-22 23:59:26.674785914 +0200 ++++ b/CMakeLists.txt 2020-08-23 00:01:18.491783097 +0200 +@@ -253,8 +253,8 @@ + + install( TARGETS amdrocclr_static + EXPORT rocclr +- ARCHIVE DESTINATION lib +- LIBRARY DESTINATION lib ++ ARCHIVE DESTINATION lib64 ++ LIBRARY DESTINATION lib64 + COMPONENT applications) + + install ( +@@ -262,31 +262,31 @@ + DESTINATION include) + install ( + DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/elf" +- DESTINATION include ++ DESTINATION include/rocclr + FILES_MATCHING PATTERN "*.h*") + install ( + DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/compiler" +- DESTINATION include ++ DESTINATION include/rocclr + FILES_MATCHING PATTERN "*.h*") + install ( + DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/utils" +- DESTINATION include ++ DESTINATION include/rocclr + FILES_MATCHING PATTERN "*.h*") + install ( + DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/platform" +- DESTINATION include ++ DESTINATION include/rocclr + FILES_MATCHING PATTERN "*.h*") + install ( + DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/thread" +- DESTINATION include ++ DESTINATION include/rocclr + FILES_MATCHING PATTERN "*.h*") + install ( + DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/os" +- DESTINATION include ++ DESTINATION include/rocclr + FILES_MATCHING PATTERN "*.h*") + install ( + DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/device" +- DESTINATION include ++ DESTINATION include/rocclr + FILES_MATCHING PATTERN "*.h*") + + # Generate the install-tree package. diff --git a/dev-libs/rocclr/rocclr-3.5.0.ebuild b/dev-libs/rocclr/rocclr-3.5.0-r1.ebuild index a82c2461e653..2601b431de18 100644 --- a/dev-libs/rocclr/rocclr-3.5.0.ebuild +++ b/dev-libs/rocclr/rocclr-3.5.0-r1.ebuild @@ -22,6 +22,7 @@ DEPEND="${RDEPEND} PATCHES=( "${FILESDIR}/rocclr-3.5.0-cmake-install-destination.patch" + "${FILESDIR}/rocclr-3.5.0-find-opencl.patch" ) S="${WORKDIR}/ROCclr-roc-${PV}" @@ -37,8 +38,8 @@ src_configure() { src_install() { # This should be fixed in the CMakeLists.txt to get this installed automatically - sed -e "s:/var/tmp/portage/dev-libs/${PF}/work/rocclr-${PV}_build:/usr/lib64:" -i "${BUILD_DIR}/amdrocclr_staticTargets.cmake" - insinto /usr/lib64/cmake/rocclr + sed -e "s:${BUILD_DIR}:${EPREFIX}/usr/$(get_libdir):" -i "${BUILD_DIR}/amdrocclr_staticTargets.cmake" + insinto /usr/$(get_libdir)/cmake/rocclr doins "${BUILD_DIR}/amdrocclr_staticTargets.cmake" cmake_src_install diff --git a/dev-libs/rocclr/rocclr-3.7.0-r1.ebuild b/dev-libs/rocclr/rocclr-3.7.0-r1.ebuild new file mode 100644 index 000000000000..04b209388e32 --- /dev/null +++ b/dev-libs/rocclr/rocclr-3.7.0-r1.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake + +DESCRIPTION="Radeon Open Compute Common Language Runtime" +HOMEPAGE="https://github.com/ROCm-Developer-Tools/ROCclr" +SRC_URI="https://github.com/ROCm-Developer-Tools/ROCclr/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz + https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/rocm-${PV}.tar.gz -> rocm-opencl-runtime-${PV}.tar.gz" + +LICENSE="MIT" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64" + +RDEPEND=">=dev-libs/rocm-comgr-${PV}" +DEPEND="${RDEPEND} + >=dev-libs/rocm-comgr-${PV} + virtual/opengl + >=dev-util/rocm-cmake-${PV}" + +PATCHES=( + "${FILESDIR}/rocclr-3.7.0-cmake-install-destination.patch" +) + +S="${WORKDIR}/ROCclr-rocm-${PV}" + +src_configure() { + local mycmakeargs=( + -DUSE_COMGR_LIBRARY=YES + -DOPENCL_DIR="${WORKDIR}/ROCm-OpenCL-Runtime-rocm-${PV}" + -DCMAKE_INSTALL_PREFIX="/usr" + ) + cmake_src_configure +} + +src_install() { + cmake_src_install + + # This should be fixed in the CMakeLists.txt + sed -e "s:${BUILD_DIR}:${EPREFIX}/usr:" -i "${D}/usr/lib/cmake/rocclr/ROCclrConfig.cmake" || die +} diff --git a/dev-libs/rocm-comgr/Manifest b/dev-libs/rocm-comgr/Manifest index 2e479c3d4bb2..9413c99b2b52 100644 --- a/dev-libs/rocm-comgr/Manifest +++ b/dev-libs/rocm-comgr/Manifest @@ -6,8 +6,10 @@ DIST rocm-comgr-3.0.0.tar.gz 88594 BLAKE2B d3fb356962ba6a9ffc7aa295f1582f6587d55 DIST rocm-comgr-3.1.0.tar.gz 88654 BLAKE2B 2b74fcde11a9fdd815526cb6fae81c1844aed5d73e961c437c9d3585b8cbd538983a9b06a5130eb75e5ac272d0a833f459053436f48116eb430c742de532ce65 SHA512 be148e92c84aacfc11724b0bfb54fab0e8cec2474eb943b1df4841517d47a3995b179afafcaa0730ddb9fadf891ca4797ce6613afac1f6f018dcc5b030a32e98 DIST rocm-comgr-3.3.0.tar.gz 88792 BLAKE2B e84d63c0462bd64a7f10a6092d736811e834c6541aea2ee6363b60e7ab5652dc3efee16ae353dbc7ddeca343f7ce2d41b381cdd722dc98d7c9e9f2c43d4ff25f SHA512 681656f87639c1a1893e073738c253d5a0a63c23d8555e59950828c0a3d7ed997b0a70d827aae6e0af6a465a433acd0e82dd921bd12b9df31628f53ea83754a9 DIST rocm-comgr-3.5.0.tar.gz 89330 BLAKE2B 463b5a7fed9588a87308ef7b8ad52a25000baf53556022b68c666dfd41d9d89877bb392aaf58de947b35bfae74b13ca06ae6f3770ef689c612e31318ebb9d981 SHA512 8f4b702976f31e2221ed0a545ffe028fecb268b3939b8e13b8f321786dc63398e5715ecb1910c0ca671454702dcc3671d518cc458c5a02e8cc63a90d029ca569 +DIST rocm-comgr-3.7.0.tar.gz 94875 BLAKE2B 0d6b01360cbdb4a40aab9dadcc56389a3edc11380fe1c39a29a9f3c0356708ae95ce8918bf9d4d4fa46c1a077a2daf99c5bad65906d24ea4948de93e1d4d0280 SHA512 62a08b286313234c4c3226872a410afe9818c829fb3424f4c2a464f759d8d3c6a701de4a89ea21fe6ac2b9620cec0a44c04dd5a793ba30a0537ed3ddf86fff46 EBUILD rocm-comgr-3.0.0.ebuild 1033 BLAKE2B 91db829efe411ed98bc3dce4818e5579ee182b1823e731fbb2ecfc6db2eddbfec300bf30d9fab292d36cadd6aa90307f94bbbc55dae6116246d945f3cf7e2d6a SHA512 0edd588bb23e8c66892c5e437ce1d866f0b895d05c1c9182ae37586359b33353527eb2d2417ff2bc87d351822c0ab0daec81f44ab62c61a3f1e47845cfa1c557 EBUILD rocm-comgr-3.1.0.ebuild 1033 BLAKE2B 56a3fcceff12f501e9e5129d1b50c3b736da78e5553b5cb99daa66e7dc7256c730c6755208b1dfd95938d4ba67298f8f2796d0a82b4d3305fee0311baf51fe8b SHA512 d0d0ff389dbf7ac8f7f88fc1cb3d0ad8ef918c97b44b3660c55ebe340a4b630239ecb1e318ca249b1bffaea19276212c532b1aa06c0b0cd6bc9b0ca8b81ecade EBUILD rocm-comgr-3.3.0.ebuild 1035 BLAKE2B 88fd6f76f9d5906f9ffea88bfd36aa43e02b85972bbb53b9b4e52d5ad42f179f5dda1d65d9c0a09fcb3979ed60c21a349a98d171f2963371835e6a6a7d939ad2 SHA512 8bad55ba2a67ed3a32f8ae2f036953cc9341caf482074609ea14b985d54c7565431e86127788f2a30dca734a2e6e68cd53f74437a8f528065ccf9e02a3fcaf04 EBUILD rocm-comgr-3.5.0.ebuild 1015 BLAKE2B 6ba2221c6d3e8d2e908b22862c31fd278be6a965e473cc48d8b323d409011bc5f0507fbd0356a8f245ca9345a8e87da0b3bd0ad41ad8f0aadda866a170802ee7 SHA512 336c592a1dfccafef1867420d2809d90b20963819052391d3f48157c4900d238b7a7526cb58c9aa0c7aae6e9563f67a147d555a0626e9bf81832ee597695f988 +EBUILD rocm-comgr-3.7.0.ebuild 1015 BLAKE2B 6ba2221c6d3e8d2e908b22862c31fd278be6a965e473cc48d8b323d409011bc5f0507fbd0356a8f245ca9345a8e87da0b3bd0ad41ad8f0aadda866a170802ee7 SHA512 336c592a1dfccafef1867420d2809d90b20963819052391d3f48157c4900d238b7a7526cb58c9aa0c7aae6e9563f67a147d555a0626e9bf81832ee597695f988 MISC metadata.xml 484 BLAKE2B 5afcf22d4b70b094748570fc3f2c756c85b1f192aabc8df86d64e3bad535702444111151282dead984de46a5de2ab04748e0a2b0252f3a3af6e32e1e60416a3b SHA512 da6dbb545060ba024ce5df3439db80210c15e9191953703c9c50b2fed11a4140303a87cc89ee0336ad81f495da0d434fedd85e6c32a1ddede525a1bc5420ca94 diff --git a/dev-libs/rocm-comgr/rocm-comgr-3.7.0.ebuild b/dev-libs/rocm-comgr/rocm-comgr-3.7.0.ebuild new file mode 100644 index 000000000000..097011983ea2 --- /dev/null +++ b/dev-libs/rocm-comgr/rocm-comgr-3.7.0.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake + +if [[ ${PV} == *9999 ]] ; then + EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/" + inherit git-r3 + S="${WORKDIR}/${P}/lib/comgr" +else + SRC_URI="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/ROCm-CompilerSupport-rocm-${PV}/lib/comgr" + KEYWORDS="~amd64" +fi + +PATCHES=( + "${FILESDIR}/${PN}-3.1.0-dependencies.patch" +) + +DESCRIPTION="Radeon Open Compute Code Object Manager" +HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport" +LICENSE="MIT" +SLOT="0/$(ver_cut 1-2)" + +RDEPEND=">=dev-libs/rocm-device-libs-${PV} + >=sys-devel/llvm-roc-${PV}:=" +DEPEND="${RDEPEND}" + +src_prepare() { + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/lib/cmake/llvm" + -DClang_DIR="${EPREFIX}/usr/lib/llvm/roc/lib/cmake/clang" + ) + cmake_src_configure +} diff --git a/dev-libs/rocm-device-libs/Manifest b/dev-libs/rocm-device-libs/Manifest index 899462757133..1677ee4691f9 100644 --- a/dev-libs/rocm-device-libs/Manifest +++ b/dev-libs/rocm-device-libs/Manifest @@ -3,10 +3,12 @@ DIST rocm-device-libs-3.1.0.tar.gz 227951 BLAKE2B 06918195f4b7073089dbe3475fb124 DIST rocm-device-libs-3.3.0.tar.gz 227986 BLAKE2B 4d62002e06b4f69641d6733120dc6222aa9bf4a4f6af2709218f42e8d92cb1943fdc967ef6a88f62e19d46828472b91fa9b17a35dab1cda90ef2a0278398d6b7 SHA512 920d7bd6ccd423bab98c97fadb183d4d667a967e6843c41b4c5c6c0c14ceabf57ba10e7c8787cb86b0b8ddf14efa96b7422e6f4a12079e37c5da7053e8bf0a99 DIST rocm-device-libs-3.5.0.tar.gz 228247 BLAKE2B 05b8e850e5ad4ae80bac92b6392dbc6d7bf78a63f5718e7ce5ed94fb85df356c2d1640a862ebd4587000df6c728c694535e5345a6a702e769c506fd8ebe5c606 SHA512 d8af9e93b0223ea18d96b80c3d9e0c97ef69448e3af823a802cf485ac8ed88c54dd0ac98cf5d6d2c9f66c3b197cd6991822310c7cde53b8c437083c0d6f984ac DIST rocm-device-libs-3.5.1.tar.gz 228311 BLAKE2B fcf6eb566a375015b521e3885c16868f6133a9ffbfb5f7ff766482a1f901811c86c5c8baaf8ece9bab4ad4655e907da6ab37ed8b25fba6637803e403267f9587 SHA512 182c901b837d57331f6d05280f17e2ee62339887dc61b6ddca66a8a7f58eecb9366a0abb3d483a86c227d5ed5cc2c7ca1c98a20b7db8214b27d1ceae0e68d2e0 +DIST rocm-device-libs-3.7.0.tar.gz 228752 BLAKE2B e7406fd74b9bdfba5c32259c12761b46dee454e73cf1d6cbb0886c4da7bff7bcd13689e91e2715188fa2fe9d61d9dd9c6c481714cd67bdee11b1825a91c47546 SHA512 94b027aa27866257cf239b6951cbff928122fb7dfb23c81edc5957b30ee5aa64e2a25412a13ea33c249b8bd2d026274dcc276ea0908359b5ed14c75b0e59ff1f EBUILD rocm-device-libs-3.0.0.ebuild 812 BLAKE2B 830cff0de7f8ea43e929f86d5595a2842793372cc17d1463614127987651ce188b51ad46e2b7e1c0549cd7098800d6cb844b33adf74a14f1db884298a3051024 SHA512 4b123a3c24bb5d57720f8f8fd33d3105168d0fe7bbd750b7aba9410b155024d8b1632b95625a20cb8f4ed3c78058b13eb3ffef37485036a87ef2369611b790dc EBUILD rocm-device-libs-3.1.0.ebuild 812 BLAKE2B 830cff0de7f8ea43e929f86d5595a2842793372cc17d1463614127987651ce188b51ad46e2b7e1c0549cd7098800d6cb844b33adf74a14f1db884298a3051024 SHA512 4b123a3c24bb5d57720f8f8fd33d3105168d0fe7bbd750b7aba9410b155024d8b1632b95625a20cb8f4ed3c78058b13eb3ffef37485036a87ef2369611b790dc EBUILD rocm-device-libs-3.3.0.ebuild 814 BLAKE2B a86efd3afe14bbb6356226b215951c419cf764e7202b991b291e3e1cad4e7e68bfd100ab9e441866c9ae056876e094e7c9ee5a0b241e533401044426fed27dd7 SHA512 1c8f592d37e1865c5f55b1fe93aa4f1c25e9a0000baf1181a450b27b99c0748eb320756be50fb42e4c21aa18e7acc6bdfc897fd7fb296d13b2a0a0e37a551b30 EBUILD rocm-device-libs-3.5.0.ebuild 820 BLAKE2B cdc41b86105554d1c1cab13cb4a832f90415ebb4f89a2631388db20030a6623b3db2472334113339dff8a4aeec26cd1b50dc8d33507bd14d907c49efd780973a SHA512 1e6499561fe0d0b6caccc77ac0d4d097366c59930ece799996d1cfcc53119ca285a9ea3a496d8f39fc03b8fe5f14135280f5f2c3272ab093c57d4f88efddbd36 EBUILD rocm-device-libs-3.5.1.ebuild 829 BLAKE2B 34d2a6a8227d2a869ab6eca5d1bb53b19c95f2156d8ab55e7dcbf801a56d7fdd8858455038d19d86b5705a0de4c994749d6e8fddb1d62c6ea728b4683aa673bb SHA512 96dfc6a00940edf0ecf4a52b0eef9b76b83f883684716dac66fa349d9b6a7c8523862927d7db8000275c26920c0a3b7d2a3c4c58eed7f69d170207cb5d39c5da +EBUILD rocm-device-libs-3.7.0.ebuild 789 BLAKE2B 780c18e28c86fd1cda12a03d890eacc4e2410fab59cd19b80339a38726e8c62d97474ac8d8a145860e85b89ffbfbdbe316cf880a547ed44d912f633d92317122 SHA512 f0759b90c775788da7bb53be3ebc2bafbfe1d7d50b0a8737d3f7b58eb03cff879c325ae25ce9e91c64d182acd209d6c6ea0e57d301b739a5625e851966dcdef7 EBUILD rocm-device-libs-9999.ebuild 804 BLAKE2B 89a47136834feb8bebd6487d0fdc7ba0ca921764f01938812959bd6a006df704524acc14ccdb67a7d08bd032403837bfad358c5837bf4e6e8957293c3b159d72 SHA512 e76d6647cf9ecf6beebb15541503955cd469c50f39c462e1c45be51d87072cbff603fddc9979ad795ad5ec746d625485e24eb751d41610522fbefd8aad64496a MISC metadata.xml 477 BLAKE2B 75910bca37a606f3ca0b41122d64b786776930f7cf00e8125496b4722d887f31506f1abec272123b66e81ce5e5ff9ffad5e3176c29e64c314e46f71c8baefb4a SHA512 ea01d8303b071b1338e53361ec9b21e73447d42e4d96598f4b723496fa48dab4f811d743f1dd188da28c7240fdf4b132775181c177fc35702d8b99ef40ef7b01 diff --git a/dev-libs/rocm-device-libs/rocm-device-libs-3.7.0.ebuild b/dev-libs/rocm-device-libs/rocm-device-libs-3.7.0.ebuild new file mode 100644 index 000000000000..23acf7bb488f --- /dev/null +++ b/dev-libs/rocm-device-libs/rocm-device-libs-3.7.0.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake + +if [[ ${PV} == *9999 ]] ; then + EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-Device-Libs/" + inherit git-r3 + S="${WORKDIR}/${P}/src" +else + SRC_URI="https://github.com/RadeonOpenCompute/ROCm-Device-Libs/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/ROCm-Device-Libs-rocm-${PV}" + KEYWORDS="~amd64" +fi + +DESCRIPTION="Radeon Open Compute Device Libraries" +HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-Device-Libs" + +LICENSE="MIT" +SLOT="0/$(ver_cut 1-2)" + +RDEPEND=">=sys-devel/llvm-roc-${PV}:=" +DEPEND="${RDEPEND}" + +src_configure() { + local mycmakeargs=( + -DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/lib/cmake/llvm" + ) + cmake_src_configure +} diff --git a/dev-libs/rocm-opencl-runtime/Manifest b/dev-libs/rocm-opencl-runtime/Manifest index fc8854a2616a..eb862759787e 100644 --- a/dev-libs/rocm-opencl-runtime/Manifest +++ b/dev-libs/rocm-opencl-runtime/Manifest @@ -6,13 +6,18 @@ AUX rocm-opencl-runtime-3.0.0-change-install-location.patch 5316 BLAKE2B 3c87706 AUX rocm-opencl-runtime-3.5.0-amdocl64icd.patch 469 BLAKE2B a52e51631a1ed03df156f2fe360539cdc144f11945e947014f1d3dac3ab17f56512f6e37ae99c8bcfa1d43558b977988ab9281a92e31a41ca11fda498c1be302 SHA512 d90c2cdad51b841026ff1d0d4a1466b49280b6513667b16f666a9261cd7dd7d0a72e27f99383f7bffacbf661b6d1be8f9531d2a12dfe19ad5c85d661f35205af AUX rocm-opencl-runtime-3.5.0-change-install-location.patch 2513 BLAKE2B e8e1e79b5bf962d490f2c72ee1e8e74cb200917e4db0744029ce227863d6733c6c16005b9116e599bc52ab79f0b130a81c9cfe1dee88db9a9af22846c616ebae SHA512 d80e7d0c74620011205a0bf5c0bad8935ee950d6774ff46fa88cddf35f259c366558a0f5d40992f7b178ad2bcecb23d6a160cd6158b102d62f345f1b099ddca4 AUX rocm-opencl-runtime-3.5.0-do-not-install-libopencl.patch 548 BLAKE2B ae4234422acdc1fdf0bd82a0469f63239e709c0626e3918d34e6a023b70452eed98aea1725a3638ee8f46d54d08ca885bf114ad3a7689baaa18794a6d5c983b9 SHA512 27682bb65e281744556c2a99c38ae7b3e22e3306ff10ceb98d8c3204950982b17521309dd11d36e1a07ca33b8448dae1270fa31004db9841025ff9a9e9af3d4c +AUX rocm-opencl-runtime-3.7.0-add-rocclr-include-directories.patch 529 BLAKE2B c5902c6582d4ab23196829dd5953bd74469951d41ac393e92b9858d6a6336dd68c73cf57d917a13fb3869c84b1e6930e7a0de71936091011039bcd3bfc3b102e SHA512 2ac5248e05b479b9e84322cd9afb1bb783e03440648fe91e0f92e77bb2f673f9752412a2a689aba152663b5235df176a6ab54b5ecea3a20e720b831bdf6292f9 +AUX rocm-opencl-runtime-3.7.0-amdocl64icd.patch 503 BLAKE2B 33154b45dd539c068cb86d29bfbfe07b189c1bd7ec36bb5ecba7e7b6a8de416c8c6794f9aed5f18f8aab33c50718f25882a46b86e4c0678440e24586eee9d967 SHA512 8f22ba90782290d0b89b3d48dbf24d5ff1418bf2d82effe5f362456ebbd65f4e3ffe044072d9023e585ec38eb3ac501ce598fef297099753818a93948bc06ccd +AUX rocm-opencl-runtime-3.7.0-change-install-location.patch 2523 BLAKE2B f31cd13f8b50ea75c3ababe89905881ef92ec0319057a98978ff49514f213e5aad0f72d2eda75d300836ee4e90d1ac8b6b897442c968b30ad4c8af6c31f61fca SHA512 945d37ef36adec5ff6915bc4f3cc30801776370bce8097b53bc4e72568d4801fb7f092ebc0103ec0f625a0297d8ab5a43dcaa84d59f7145ea87610a7bc855f79 DIST OpenCL-ICD-Loader-6c03f8b58fafd9dd693eaac826749a5cfad515f8.tar.gz 63248 BLAKE2B 7c311d98e5a209d01f1f1dbad7471ceb3de66e10f7cee48686ed176efcde1e7ba48ea12bdbf2af61d5f72e5b8eda69b2fae6829d265a8b88ad46c4ec4995d8d4 SHA512 5033d6fb0ef2515e56b0d9c31baf6fe02e90613989c417fbde20efd79e0ac2841df1a98ff799e60cc469b79244cdc756d15950df6c9baead7d31febe7cad0418 DIST rocm-opencl-runtime-3.0.0.tar.gz 974702 BLAKE2B 2cc1eaf1aa8d8cc80de698b587bf38cfebd51b31959b9d0150e4f01ea1b41240b0311cad156c48cf531207f1a120d2151f38679a8bc4cef1e73c9c8e56dcaf45 SHA512 2a47deda34544832421fd8110dd437eaeab3a1fca498a9ac14e825402d48e81fb9fe065d078bc8bf112e0534a750fdf81a29bf5979b42f9925b1561f7bcbf6e7 DIST rocm-opencl-runtime-3.1.0.tar.gz 969782 BLAKE2B efe3cba6122273900fec80f577c45b5a93816cfd3cadbffaa36df258ea163ecc9d47530da0aa012fd7797c431506deb96fd3642c160470e2b78af75bc9fd56f6 SHA512 1665c30349547e6404563b1b1dd4258af5ab8106a66d65d6f94e7eb3ef51b2da9bc71878330c0c7ec21842e17a97e910a36be9b06fbdeab3de84bebe3a65c9db DIST rocm-opencl-runtime-3.3.0.tar.gz 969871 BLAKE2B 5dae88abc5861752b45f2b7e72a4d774786d0363a6da633d2ca1386a002374243a0655e8c5bc4aaa7a7db528f3c9bd5e6e1298561d3b06ce935865b6f0106172 SHA512 10c892cebca3db031b69ef3e1521fa11e49f40b18b621983f4f0902c9f563ff178d543fd1a05f6217f817838499436adaac883f7b474b64a54ce9eeb482382e5 DIST rocm-opencl-runtime-3.5.0.tar.gz 734076 BLAKE2B cc6992999188968c628b378f637c8073c99381fab42e05d7d9d89d75fe9f2bd3d573f61f00a18c078542f7fc4a3a856385d0f34fa9bb599dd63de8be18594bdf SHA512 658649c3f13d32308f8f031f26b62c20bda4841059b5ea0db5c6a827af26b07aa0bdee07a461cc4b3c37108b3f25ae59b1658fab30125f84c0729fb57c2fa014 +DIST rocm-opencl-runtime-3.7.0.tar.gz 1004361 BLAKE2B 7fa9481c77884dda15a3b0335449b2879fbac000f644fc56bbd8d06c5fd77d8355f159b9b7e8920f06351e388d0df41379b7e1fcff51cf81714a28f902218e42 SHA512 6ea509dde0290f13e66497eaad587099ed6a98df967adce207afc857ecd961b65801332ca74e36173719488639480cfcffc625a007345d0e48c10c8a0efdfa3f EBUILD rocm-opencl-runtime-3.0.0.ebuild 1735 BLAKE2B ea3ec1080283cf20b89858d6c2fd3332ffdb243794160422b16e61baf27d42b53c69aecc078844715629851d6f98247034996aac74f2f9ac2b66382b5a039359 SHA512 e1c6bdcdd37b6417d9acb4757f035fb682c5bdd7a6430caa91bed29e9ebfef2294a3695abb07a9d5a991feea38f924d059078ea445ee9d48df517a4299b04d20 EBUILD rocm-opencl-runtime-3.1.0.ebuild 1682 BLAKE2B 87674f8450ca486e7e4a920e2a7d203e3bbacc9011dc156bd81bdce4f46bba49457d4a986abef9225c6377034a7b389dabc0aedd130f4c1a350d6671f4dbd88d SHA512 af7fccf88b355e01e3cde7e4a44e33a220475c0bb36ecc96c15a7599fe7a3140db0a1b781ea8df719a8e4ed36e3a3e9573b2b09f17a3023d509ff9f2175cf63a EBUILD rocm-opencl-runtime-3.3.0.ebuild 1682 BLAKE2B 87674f8450ca486e7e4a920e2a7d203e3bbacc9011dc156bd81bdce4f46bba49457d4a986abef9225c6377034a7b389dabc0aedd130f4c1a350d6671f4dbd88d SHA512 af7fccf88b355e01e3cde7e4a44e33a220475c0bb36ecc96c15a7599fe7a3140db0a1b781ea8df719a8e4ed36e3a3e9573b2b09f17a3023d509ff9f2175cf63a -EBUILD rocm-opencl-runtime-3.5.0.ebuild 1750 BLAKE2B d9065faa253dd5545bb6cf6769b4af2ff033ca40be8519bb11b583d9ba9fddc7f0fd4c442de176fe7cc760cb0e2cd42d1acdba6d35bc3d3cd1f96c793158add2 SHA512 08a7d605f0b8513159f4bab48f6459a4ecd17f6813efa5fa5a44296f7882fa40659f27cdcbed83d3f774aa15bb3088e322fdfbe22aab9aa0534949a1e187c958 +EBUILD rocm-opencl-runtime-3.5.0-r1.ebuild 1914 BLAKE2B 85002f6a55491553e26e9f711447b48aa84d35aebd94c1ca89ec47b85bd24eaa143742b52da69f40e1ff5d446b8c1178d944e07c193a1717b277159235d475b8 SHA512 5fc5a2100e72b0210efe0d7336992fe8619fa46789dcc7c34489986e9c11b1343880c83b0f0a986021264102f3cb52f4a68e84d2aecaf8fa977d556d51a23237 +EBUILD rocm-opencl-runtime-3.7.0.ebuild 1977 BLAKE2B 7e1d8e62cc3c8c89fbdbe253d0393e1a567d924d41ab184d4c7cdafc0320e88e0cf33a88af67725c30d49fee579546faf1b78f75698165ff28933d38b58bc368 SHA512 427ea0cbbecb7195ca79b250216b5649b5e9431b9369e40876b9c49631d85b8f050c78524f4a16a53005671c07058392c5a583ac7f16dc57d7f4f3e41cf82efe MISC metadata.xml 489 BLAKE2B d989103f6ed0e6a7406558565a5d0453046f640fbef964eb84e51fc911dac4bcc57bc3f1c5222bb5f6d2fb6d10a7f83b4172161070029b0d537b475ef8473f04 SHA512 3bfb9c1ed4cd559aefaf7a74567daf0952359a9fa3e703f1dfaac48d9bb7a25d134afe16e7509c28dff8a5cdabe09870d8f541898756c028b5c5996577956f0a diff --git a/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-3.7.0-add-rocclr-include-directories.patch b/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-3.7.0-add-rocclr-include-directories.patch new file mode 100644 index 000000000000..357b97c7f49e --- /dev/null +++ b/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-3.7.0-add-rocclr-include-directories.patch @@ -0,0 +1,11 @@ +--- a/amdocl/CMakeLists.txt 2020-08-23 10:11:28.227839351 +0200 ++++ b/amdocl/CMakeLists.txt 2020-08-23 10:44:34.929831772 +0200 +@@ -23,6 +23,8 @@ + include_directories(${CMAKE_SOURCE_DIR}/khronos) + include_directories(${CMAKE_SOURCE_DIR}/khronos/headers) + include_directories(${CMAKE_SOURCE_DIR}/khronos/headers/opencl2.2) ++include_directories(/usr/include/rocclr) ++include_directories(/usr/include/rocclr/compiler/lib/include/) + + if((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") OR + (CMAKE_${COMPILER}_COMPILER_ID MATCHES "Clang")) diff --git a/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-3.7.0-amdocl64icd.patch b/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-3.7.0-amdocl64icd.patch new file mode 100644 index 000000000000..6541c69bd48a --- /dev/null +++ b/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-3.7.0-amdocl64icd.patch @@ -0,0 +1,10 @@ +--- a/amdocl/CMakeLists.txt 2020-08-23 10:11:28.227839351 +0200 ++++ b/amdocl/CMakeLists.txt 2020-08-23 10:12:03.697839216 +0200 +@@ -76,3 +76,7 @@ + add_library(amdocl64 SHARED ${amdocl64_src}) + + target_link_libraries(amdocl64 amdrocclr_static Threads::Threads dl ${ADDITIONAL_LIBRARIES}) ++ ++file(GENERATE OUTPUT "${CMAKE_BINARY_DIR}/amdocl64.icd" CONTENT "$<TARGET_FILE_NAME:amdocl64>") ++install(FILES "${CMAKE_BINARY_DIR}/amdocl64.icd" DESTINATION "${CMAKE_INSTALL_FULL_SYSCONFDIR}/OpenCL/vendors/") ++ diff --git a/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-3.7.0-change-install-location.patch b/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-3.7.0-change-install-location.patch new file mode 100644 index 000000000000..77ce5e9bd332 --- /dev/null +++ b/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-3.7.0-change-install-location.patch @@ -0,0 +1,79 @@ +--- a/CMakeLists.txt 2020-08-23 10:14:54.337838565 +0200 ++++ b/CMakeLists.txt 2020-08-23 10:18:26.993837753 +0200 +@@ -14,6 +14,8 @@ + #example command: + # cmake -DCMAKE_PREFIX_PATH=/path/to/ROCclr/build/or/install .. + ++include (GNUInstallDirs) ++ + set(OPENCL_ICD_LOADER_HEADERS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/khronos/headers/opencl2.2" CACHE PATH "") + option(BUILD_SHARED_LIBS "Build shared libs" ON) + +@@ -60,7 +62,7 @@ + + add_subdirectory(khronos/icd) + add_subdirectory(amdocl) +-add_subdirectory(tools/clinfo) ++#add_subdirectory(tools/clinfo) + add_subdirectory(tools/cltrace) + if(BUILD_TESTS) + add_subdirectory(tests/ocltst) +@@ -96,34 +98,34 @@ + ###--- Packaging ------------------------------------------------------------### + + # MAIN package +-install(PROGRAMS $<TARGET_FILE:clinfo> +- DESTINATION bin +- COMPONENT MAIN) +-install(PROGRAMS $<TARGET_FILE:cltrace> +- DESTINATION lib +- COMPONENT MAIN) ++#install(PROGRAMS $<TARGET_FILE:clinfo> ++# DESTINATION bin ++# COMPONENT MAIN) ++#install(PROGRAMS $<TARGET_FILE:cltrace> ++# DESTINATION lib ++# COMPONENT MAIN) + install(PROGRAMS $<TARGET_FILE:amdocl64> +- DESTINATION lib +- COMPONENT MAIN) +-install(PROGRAMS $<TARGET_FILE:OpenCL> +- DESTINATION lib +- COMPONENT MAIN) +-install(PROGRAMS $<TARGET_SONAME_FILE:OpenCL> +- DESTINATION lib ++ DESTINATION lib64 + COMPONENT MAIN) ++#install(PROGRAMS $<TARGET_FILE:OpenCL> ++# DESTINATION lib ++# COMPONENT MAIN) ++#install(PROGRAMS $<TARGET_SONAME_FILE:OpenCL> ++# DESTINATION lib ++# COMPONENT MAIN) + + # DEV package +-install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/khronos/headers/opencl2.2/CL" +- DESTINATION include +- COMPONENT DEV +- USE_SOURCE_PERMISSIONS +- PATTERN cl_d3d10.h EXCLUDE +- PATTERN cl_d3d11.h EXCLUDE +- PATTERN cl_dx9_media_sharing.h EXCLUDE +- PATTERN cl_egl.h EXCLUDE) +-install(PROGRAMS $<TARGET_LINKER_FILE:OpenCL> +- DESTINATION lib +- COMPONENT DEV) ++#install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/khronos/headers/opencl2.2/CL" ++# DESTINATION include ++# COMPONENT DEV ++# USE_SOURCE_PERMISSIONS ++# PATTERN cl_d3d10.h EXCLUDE ++# PATTERN cl_d3d11.h EXCLUDE ++# PATTERN cl_dx9_media_sharing.h EXCLUDE ++# PATTERN cl_egl.h EXCLUDE) ++#install(PROGRAMS $<TARGET_LINKER_FILE:OpenCL> ++# DESTINATION lib ++# COMPONENT DEV) + + ############################# + # Packaging steps diff --git a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.5.0.ebuild b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.5.0-r1.ebuild index 40557c217c17..28188cb2bb61 100644 --- a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.5.0.ebuild +++ b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.5.0-r1.ebuild @@ -53,8 +53,16 @@ src_configure() { local mycmakeargs=( -DUSE_COMGR_LIBRARY=yes - -DROCclr_DIR=/usr/include/rocclr - -DLIBROCclr_STATIC_DIR=/usr/lib64/cmake/rocclr + -DROCclr_DIR="${EPREFIX}/usr/include/rocclr" + -DLIBROCclr_STATIC_DIR="${EPREFIX}/usr/lib64/cmake/rocclr" ) cmake_src_configure } + +src_install() { + cd "${BUILD_DIR}" || die + insinto /etc/OpenCL/vendors + doins amdocl64.icd + insinto /usr/lib64 + doins lib/libamdocl64.so +} diff --git a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.7.0.ebuild b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.7.0.ebuild new file mode 100644 index 000000000000..5a1a4386433c --- /dev/null +++ b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.7.0.ebuild @@ -0,0 +1,69 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake + +if [[ ${PV} == *9999 ]] ; then + EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/" + inherit git-r3 +else + SRC_URI="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/roc-${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64" + S="${WORKDIR}/ROCm-OpenCL-Runtime-rocm-${PV}" +fi + +DESCRIPTION="Radeon Open Compute OpenCL Compatible Runtime" +HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime" + +LICENSE="Apache-2.0 MIT" +SLOT="0/$(ver_cut 1-2)" + +RDEPEND=">=dev-libs/rocr-runtime-${PV} + >=dev-libs/rocclr-${PV} + >=dev-libs/rocm-comgr-${PV} + >=dev-libs/rocm-device-libs-${PV} + >=virtual/opencl-3 + media-libs/mesa" +DEPEND="${RDEPEND} + dev-lang/ocaml + dev-ml/findlib" +BDEPEND=">=dev-util/rocm-cmake-${PV}" + +PATCHES=( + "${FILESDIR}/${PN}-3.7.0-change-install-location.patch" + "${FILESDIR}/${PN}-3.5.0-do-not-install-libopencl.patch" + "${FILESDIR}/${PN}-3.7.0-add-rocclr-include-directories.patch" + "${FILESDIR}/${PN}-3.7.0-amdocl64icd.patch" +) + +src_prepare() { + # Remove "clinfo" - use "dev-util/clinfo" instead + [ -d tools/clinfo ] && rm -rf tools/clinfo || die + + # Wrong position of a '"' results in a list of strings instead of a single string and the build fails... + sed -e "s:set(CMAKE_SHARED_LINKER_FLAGS \${CMAKE_SHARED_LINKER_FLAGS} \":set(CMAKE_SHARED_LINKER_FLAGS \"\${CMAKE_SHARED_LINKER_FLAGS} :" -i "${S}/amdocl/CMakeLists.txt" + + cmake_src_prepare +} + +src_configure() { + # Reported upstream: https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/issues/120 + append-cflags -fcommon + + local mycmakeargs=( + -DUSE_COMGR_LIBRARY=yes + -DROCclr_DIR="${EPREFIX}/usr/include/rocclr" + -DLIBROCclr_STATIC_DIR="${EPREFIX}/usr/lib/cmake/rocclr" + ) + cmake_src_configure +} + +src_install() { + cd "${BUILD_DIR}" || die + insinto /etc/OpenCL/vendors + doins amdocl64.icd + insinto /usr/lib64 + doins lib/libamdocl64.so +} diff --git a/dev-libs/rocr-runtime/Manifest b/dev-libs/rocr-runtime/Manifest index 7cab6f495878..14e67f181a7d 100644 --- a/dev-libs/rocr-runtime/Manifest +++ b/dev-libs/rocr-runtime/Manifest @@ -1,12 +1,15 @@ AUX rocr-runtime-3.0.0-cmake-install-paths.patch 2719 BLAKE2B 66e262fed83f839d87e3d31658ac7373bba7d6985d0dceecdc9d34a4734a5aa877007aa6f26d1ee9bbe8c3d232eb22b5dd98379d67c89e3e94a95c1d2e29c3be SHA512 d5ad7aa6d6531616448c131817cfc41044dcab0bb71baf5a49819996370ad8d9bf239132b54bbab1650634a953e05ff3aa5f6ee300f2aba14a70e74d3c44bcfe AUX rocr-runtime-3.5.0-cmake-install-paths.patch 2262 BLAKE2B 2ff7e223081ffecf86198c9b227a34952cbcc76fe9d4cf6f76684857381e12f70a64b9c37e83eaf8767bde03ac72240a66f38f476039421f6f2a79cfc414de7e SHA512 ceef7ee2df759a51d3228d6301f72375e06fee4d11e7d09a6bd151456b9fe37f9731459482186dfd93387cc130b5c0a6376e63344dd6378e0c1cf923a7bc0294 +AUX rocr-runtime-3.7.0-cmake-install-paths.patch 4032 BLAKE2B a4252fc7a6740c64a5695ccecc6392f31acf9a341b9886fab37686916c6d0298da8ccd8d723710aaa944f6e2c26afba9b3f0bae84d5a755bf87dc8700c3dd598 SHA512 d29bf929a136dc4f6b0ddc6f2821a3ad73ab31e1c7a265e73344d69712cbe18a0a2a200d23b094fcfdddbcd37275a75d7d6313d163a6994d323a7b7f611a0d75 DIST rocr-runtime-3.0.0.tar.gz 327908 BLAKE2B 0d95ecc22d27e470dd46f02aca012c59e8d0b0bd76de21133a1198d2daa75547600d95ea6c3a3771da36ce3fdf5e197b40ff68543b71adf36d33079a9d9496ab SHA512 e1a1eeec67bca02defc6f502e94dab71e48833737cc0f45552781c5b0cc36bff9147b2c477d6c2c3c9bd25654569ad1d91cd06aa81fcf412657a489cb56c5674 DIST rocr-runtime-3.1.0.tar.gz 329176 BLAKE2B 845dcfc5a00e6d571bfef6330b370f588496de95ee7e04caf9c29f81e389f3e82dcdace11d48c86b01119cc0e73bf0a50949da9c4f5383044360f59176670d95 SHA512 a9b540341c649786aa0b53755fc51f540425d67c5a567834abbef9bb55c9b0120b1f14c082bfbc97f3c2a586aa846853f293093116aa8625dc34cae6fe50683a DIST rocr-runtime-3.3.0.tar.gz 329386 BLAKE2B 59eb0838d377bb8b10887d7fb432e634190196516fff30a9401b591f2bb7846938c5486bac921fb4fce905a3acfbf4dd064ed9b53122da847fd5fb3d3d2f701c SHA512 ec7950aacd84c318978b9abbad0aafcae1e2d7d7c77806432bde0ce861372e6db92d74ba6445d3ac92c835aa0137b1929d27ddee77b9dae92ca2465a70c4878d DIST rocr-runtime-3.5.0.tar.gz 336269 BLAKE2B afde0f9fcfad389a56f31352036174b8b2a5e9960f5bbcff8a7ca9dc54e4b68d92b70afa70af5aa43d040749bccd2df957df89fea1036890abdaf7e6a5c3b620 SHA512 20d95b13dccf2fe5b8da5859661a21279f18d1c45899782c55477265500057708360ce2049a8e9b3aadbcb33f8e4274459edb17a8455dc3db69ccf31b86a581e +DIST rocr-runtime-3.7.0.tar.gz 691234 BLAKE2B b0f3b1ff6c13c132d00bbf30d405746e793aae377aca2279117c7b9dd6fdc1d466ef2076947061c848913378a20ee0dc7e32847c62a7416e4088ab0705d17dfd SHA512 f7fa77524d7f63980194e93a8e3124f1471dcdfec6ede5eb993699083e5d8fba28737fcc63dbd61949e3ce60e9fbd1455ec055a0aa5c7eee724ae6bb61d3b24f EBUILD rocr-runtime-3.0.0.ebuild 957 BLAKE2B 45bc4d6779474edae379f8bfcf0f042eb98d928ae306371c485fbae6b641ea3f2be1a7748cb5837c3e8c8af7f9420ac9ca8bfa10f175362cbd9ec6231bd55821 SHA512 75335a26cc5a5e0de8218f2408bd19668480bff0a609b9af536e7a23423bc28fe14ff8885a27928891b6d259d5eea73ebc7f2e0a798e69380af0f3cc4f785acc EBUILD rocr-runtime-3.1.0.ebuild 957 BLAKE2B 45bc4d6779474edae379f8bfcf0f042eb98d928ae306371c485fbae6b641ea3f2be1a7748cb5837c3e8c8af7f9420ac9ca8bfa10f175362cbd9ec6231bd55821 SHA512 75335a26cc5a5e0de8218f2408bd19668480bff0a609b9af536e7a23423bc28fe14ff8885a27928891b6d259d5eea73ebc7f2e0a798e69380af0f3cc4f785acc EBUILD rocr-runtime-3.3.0.ebuild 959 BLAKE2B a853aeb83d557601e0db52e7e147543c57d3e18151e3324517464796c372ce8a3142df55b9bc17c660c77acf1db690e078b2652f83eba97eddbfbae48c10bd1d SHA512 ac8f6b61432c6ff3cb934d77e36b77f8b7e679273601f0843c93f994bbdac3c26fbbfce846779f4580be0ae856e8a6838956debea166ea5f436e4faa8140060f EBUILD rocr-runtime-3.5.0.ebuild 959 BLAKE2B 9e5fd024a20457bf65ed495a8281ce484d7ccb223c00e07ab8424614a70260e2ea7316e7a02de81e7661c8cda13244795d79c169e05f58c34685e9918e27e3ed SHA512 2265a22322478821e398d5483ea3d1275a346907176ece986865571915539d766b85021793fa43cc84a77e4af8e05052bac6c4559c441b2d2e02d3b78dc68fc3 +EBUILD rocr-runtime-3.7.0.ebuild 1490 BLAKE2B 6d6de26038d2f4d66af347f09306d2a9f1825b5d148416d4d76094354c6a59b51ea768293889430fc9e0f5b5c19bf046065574a9860b0e91fc4fb6cdeb4a8af4 SHA512 535d45c9fbd47491f96bd412a38b709e51636ec8fc2b0db5c26f332d0e70155b555e33c45c1929f1d9165a7044f9c9105a42ac7cb882af0fa50aaabb0c787361 EBUILD rocr-runtime-9999.ebuild 894 BLAKE2B 9d1066fda6f310e917b7be2adaf1a887d4b75446d4155cce3a21a7bb38191f92d75cfaabb8720259ce3f6acfb16e924ac3eaab43015b1bf55685d9643952a8c4 SHA512 5e1567906914368531ad574890dd4f513e3bc2c7c78f414ba1d7a3bba39dcc50bde60b7091783ec8bb3122c4738a6fbd97abce794f48f2ecad28d75c0a086fd8 MISC metadata.xml 721 BLAKE2B 6a608a5a2063e626a9a39bf775ad840442cb797d07ff933b00ca763c11b024cd07a552dd0620b46bec7f4e8b7c608e898047822bd6e4b8e8716c2159a4e4eebb SHA512 71cd9916573d9b575cc42db8c878a27922e005fb31096902c1fb59537ffc9f84f23be8d8b4f53f3855e815d86d81e9012f4128fe4bb7d71490a8aa36bc9a444b diff --git a/dev-libs/rocr-runtime/files/rocr-runtime-3.7.0-cmake-install-paths.patch b/dev-libs/rocr-runtime/files/rocr-runtime-3.7.0-cmake-install-paths.patch new file mode 100644 index 000000000000..ccf397d8092a --- /dev/null +++ b/dev-libs/rocr-runtime/files/rocr-runtime-3.7.0-cmake-install-paths.patch @@ -0,0 +1,53 @@ +--- a/CMakeLists.txt 2020-08-22 18:24:27.991014917 +0200 ++++ b/CMakeLists.txt 2020-08-22 18:48:03.209009518 +0200 +@@ -296,34 +296,36 @@ + endif() + + ## Create symlinks for legacy packaging and install +-add_custom_target ( hsa_include_link ALL WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${CMAKE_COMMAND} -E create_symlink ../../include/hsa hsa_include_link ) +-if ( ${BUILD_SHARED_LIBS} ) +- add_custom_target ( hsa_lib_link ALL WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${CMAKE_COMMAND} -E create_symlink ../../lib/${CORE_RUNTIME_LIBRARY}.so ${CORE_RUNTIME_LIBRARY}-link.so ) +- add_custom_target ( hsa_lib_link2 ALL WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${CMAKE_COMMAND} -E create_symlink ../../lib/${CORE_RUNTIME_LIBRARY}.so.${VERSION_MAJOR} ${CORE_RUNTIME_LIBRARY}-link.so.${VERSION_MAJOR} ) +-endif() ++#add_custom_target ( hsa_include_link ALL WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${CMAKE_COMMAND} -E create_symlink ../../include/hsa hsa_include_link ) ++#if ( ${BUILD_SHARED_LIBS} ) ++# add_custom_target ( hsa_lib_link ALL WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${CMAKE_COMMAND} -E create_symlink ../../lib/${CORE_RUNTIME_LIBRARY}.so ${CORE_RUNTIME_LIBRARY}-link.so ) ++# add_custom_target ( hsa_lib_link2 ALL WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${CMAKE_COMMAND} -E create_symlink ../../lib/${CORE_RUNTIME_LIBRARY}.so.${VERSION_MAJOR} ${CORE_RUNTIME_LIBRARY}-link.so.${VERSION_MAJOR} ) ++#endif() + + ## Set install information + # Installs binaries and exports the library usage data to ${HSAKMT_TARGET}Targets + # TODO: Fix me for flat directory layout. Should be ${CMAKE_INSTALL_LIBDIR} +-install ( TARGETS ${CORE_RUNTIME_TARGET} EXPORT ${CORE_RUNTIME_NAME}Targets +- ARCHIVE DESTINATION lib COMPONENT binary +- LIBRARY DESTINATION lib COMPONENT binary ) ++#install ( TARGETS ${CORE_RUNTIME_TARGET} EXPORT ${CORE_RUNTIME_NAME}Targets ++# ARCHIVE DESTINATION lib COMPONENT binary ++# LIBRARY DESTINATION lib COMPONENT binary ) ++install ( TARGETS ${CORE_RUNTIME_TARGET} EXPORT ${CORE_RUNTIME_NAME}Targets LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ) + + # Install license + #install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.md DESTINATION ${CMAKE_INSTALL_DOCDIR} COMPONENT binary ) + + # Install public headers + # TODO: Fix me for flat directory layout. Should be ${CMAKE_INSTALL_INCLUDEDIR} +-install ( DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/inc/ DESTINATION include/hsa COMPONENT dev ) ++#install ( DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/inc/ DESTINATION include/hsa COMPONENT dev ) ++install ( DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/inc/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/hsa ) + + # Legacy symlink. +-install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/hsa_include_link DESTINATION hsa/include PERMISSIONS OWNER_WRITE OWNER_READ RENAME hsa COMPONENT dirlink) ++#install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/hsa_include_link DESTINATION hsa/include PERMISSIONS OWNER_WRITE OWNER_READ RENAME hsa COMPONENT dirlink) + + # Legacy symlinks. +-if ( ${BUILD_SHARED_LIBS} ) +- install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/${CORE_RUNTIME_LIBRARY}-link.so DESTINATION hsa/lib PERMISSIONS OWNER_WRITE OWNER_READ RENAME ${CORE_RUNTIME_LIBRARY}.so COMPONENT binary) +- install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/${CORE_RUNTIME_LIBRARY}-link.so.${VERSION_MAJOR} DESTINATION hsa/lib PERMISSIONS OWNER_WRITE OWNER_READ RENAME ${CORE_RUNTIME_LIBRARY}.so.${VERSION_MAJOR} COMPONENT binary) +-endif () ++#if ( ${BUILD_SHARED_LIBS} ) ++# install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/${CORE_RUNTIME_LIBRARY}-link.so DESTINATION hsa/lib PERMISSIONS OWNER_WRITE OWNER_READ RENAME ${CORE_RUNTIME_LIBRARY}.so COMPONENT binary) ++# install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/${CORE_RUNTIME_LIBRARY}-link.so.${VERSION_MAJOR} DESTINATION hsa/lib PERMISSIONS OWNER_WRITE OWNER_READ RENAME ${CORE_RUNTIME_LIBRARY}.so.${VERSION_MAJOR} COMPONENT binary) ++#endif () + + ## Configure and install package config file + # Record our usage data for clients find_package calls. diff --git a/dev-libs/rocr-runtime/rocr-runtime-3.7.0.ebuild b/dev-libs/rocr-runtime/rocr-runtime-3.7.0.ebuild new file mode 100644 index 000000000000..064969d47e2f --- /dev/null +++ b/dev-libs/rocr-runtime/rocr-runtime-3.7.0.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake + +if [[ ${PV} == *9999 ]] ; then + EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCR-Runtime/" + inherit git-r3 + S="${WORKDIR}/${P}/src" +else + SRC_URI="https://github.com/RadeonOpenCompute/ROCR-Runtime/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/ROCR-Runtime-rocm-${PV}/src" + KEYWORDS="~amd64" +fi + +DESCRIPTION="Radeon Open Compute Runtime" +HOMEPAGE="https://github.com/RadeonOpenCompute/ROCR-Runtime" +PATCHES=( + "${FILESDIR}/${PN}-3.7.0-cmake-install-paths.patch" +) + +LICENSE="MIT" +SLOT="0/$(ver_cut 1-2)" +IUSE="non-free" + +COMMON_DEPEND="sys-process/numactl" +RDEPEND="${COMMON_DEPEND} + non-free? ( dev-libs/hsa-ext-rocr )" +DEPEND="${COMMON_DEPEND} + >=dev-libs/roct-thunk-interface-${PV} + >=dev-libs/rocm-device-libs-${PV} + app-editors/vim-core" + # vim-core is needed for "xxd" + +src_prepare() { + sed -e "s:get_version ( \"1.0.0\" ):get_version ( \"${PV}\" ):" -i CMakeLists.txt || die + + # ... otherwise system llvm/clang is used ... + sed -e "s:find_package(Clang REQUIRED HINTS \${CMAKE_INSTALL_PREFIX}/llvm \${CMAKE_PREFIX_PATH}/llvm PATHS /opt/rocm/llvm ):find_package(Clang REQUIRED HINTS /usr/lib/llvm/roc ):" -i image/blit_src/CMakeLists.txt || die + + # Gentoo installs "*.bc" to "/usr/lib" instead of a "[path]/bitcode" directory ... + sed -e "s:/opt/rocm/amdgcn/bitcode:/usr/lib:" -i image/blit_src/CMakeLists.txt || die + + cmake_src_prepare +} diff --git a/dev-libs/roct-thunk-interface/Manifest b/dev-libs/roct-thunk-interface/Manifest index cde1f03447a4..b9133cc52a62 100644 --- a/dev-libs/roct-thunk-interface/Manifest +++ b/dev-libs/roct-thunk-interface/Manifest @@ -2,9 +2,13 @@ DIST roct-thunk-interface-3.0.0.tar.gz 2685769 BLAKE2B d8ecf26113357a2a400bc1f2d DIST roct-thunk-interface-3.1.0.tar.gz 2688973 BLAKE2B b372e12ba5795a0f1e85f7c904059fbe71e147051f287939aacb165c6ca3068e59694c891e3ebdec945e494df4134ca6e4595e7b00893479387d2326b9af5b13 SHA512 dd63d097a42c8751846a1c5649a9c35c0d5e5dc68b1e8080cb6e333f787851ebc649c36d952aefbefbf9558c914d55c612800e85620b24676d7d2d7454bb3490 DIST roct-thunk-interface-3.3.0.tar.gz 2689906 BLAKE2B 0eee8be65b0be8136dc0091cbc5534b89d630b9ffc1af1d6bdbf98671e141f524b3789153da673ed27dc3810d73e6ea8afb2fed776aa8df83e3c613b3776f81c SHA512 6ee02e5a9ef04ff9f873f762a78dcab93e45a98793545a882839fc2c890ea13030038130b1de266422eea58681e9fffa119e54b8d2f980c3a09c92b692d5cf3e DIST roct-thunk-interface-3.5.0.tar.gz 2694261 BLAKE2B 57beccb18bfcea9f99704e21610d62e922feee772d912a8e3e4b0618e309a0fd0983bc62f7476511d1c94dc1f7fbb95d2a7da8205ba735833bcc0846dca13e3a SHA512 aeeb066924d0b20aadf1e2ea6f752d4de1e579fcf245b8866d2856a8d0ca12c907234d97e986512c7c6fa58460937aa5fb574485fbc7975baae4c2fcef519d6c +DIST roct-thunk-interface-3.6.0.tar.gz 2692784 BLAKE2B 13b5834b733037828a532485a4e5a44e31eee17d42ebdcadec1a67b4d157a7a7ee3e92e8f0f03c6a5f17dba55931fd7734d7021d204ba7567d322ff023d05fcf SHA512 f4578833a17b0a4e6be504403dbdc69cdb8702f5255ac018463026f79df9df56c602abe362c39e566df22cd73ef12c1ff648ff16ce3830d0ec03283a978ca318 +DIST roct-thunk-interface-3.7.0.tar.gz 2692297 BLAKE2B 5a060becb1b35e4eb499de5c177b5747789f02036d6e1bbf241a4054430e819bab4c188aa83f1cec0d35c80a3c0af47298fdd1c34d272f693dac9da191d8d111 SHA512 307e88808d3c852837f81c8745181edaa46e0f205fa36b9af531661c9a6a2dee5f360eb14e9f607376f27969e438f075dd44336606803ae2f7ce597f7fe46135 EBUILD roct-thunk-interface-3.0.0.ebuild 1095 BLAKE2B 71b41207796c16c954b661751fbfbca92e7a6f9321856bf31c396b36b6d8f0dfe7fa01e62d925745dd9af97c2237e8edf4c5c1c694f2b4a44b1498d127b43af9 SHA512 7c85eced9cfd69756f78e31f8a30aa1dd61cda6486bcf3d7d12e2bead090f0f33ffa78004cfda56fb804154e160e066c8c18ebd14ec9a3fbfe6b3081d9436224 EBUILD roct-thunk-interface-3.1.0.ebuild 1095 BLAKE2B 71b41207796c16c954b661751fbfbca92e7a6f9321856bf31c396b36b6d8f0dfe7fa01e62d925745dd9af97c2237e8edf4c5c1c694f2b4a44b1498d127b43af9 SHA512 7c85eced9cfd69756f78e31f8a30aa1dd61cda6486bcf3d7d12e2bead090f0f33ffa78004cfda56fb804154e160e066c8c18ebd14ec9a3fbfe6b3081d9436224 EBUILD roct-thunk-interface-3.3.0.ebuild 1095 BLAKE2B 71b41207796c16c954b661751fbfbca92e7a6f9321856bf31c396b36b6d8f0dfe7fa01e62d925745dd9af97c2237e8edf4c5c1c694f2b4a44b1498d127b43af9 SHA512 7c85eced9cfd69756f78e31f8a30aa1dd61cda6486bcf3d7d12e2bead090f0f33ffa78004cfda56fb804154e160e066c8c18ebd14ec9a3fbfe6b3081d9436224 EBUILD roct-thunk-interface-3.5.0.ebuild 1097 BLAKE2B 7b5d1733e8464d3a242e59e517edbe17da86de3ea5815f4b8403b462ee999d6c42b7f37adf2eb7f5173d62f9f087659b39c2bdb0dc6728f770bd84138bf176e3 SHA512 5f7922ae5a9d86faaf621a8efa74108b33fffe5a73bc9b169ecc2016c2b5a948f583ddcfcf008c44e3ed1bff040dda395089ba1e68a87d27c14967b145fd8a4a -EBUILD roct-thunk-interface-9999.ebuild 1097 BLAKE2B 7b5d1733e8464d3a242e59e517edbe17da86de3ea5815f4b8403b462ee999d6c42b7f37adf2eb7f5173d62f9f087659b39c2bdb0dc6728f770bd84138bf176e3 SHA512 5f7922ae5a9d86faaf621a8efa74108b33fffe5a73bc9b169ecc2016c2b5a948f583ddcfcf008c44e3ed1bff040dda395089ba1e68a87d27c14967b145fd8a4a +EBUILD roct-thunk-interface-3.6.0.ebuild 1097 BLAKE2B 7b5d1733e8464d3a242e59e517edbe17da86de3ea5815f4b8403b462ee999d6c42b7f37adf2eb7f5173d62f9f087659b39c2bdb0dc6728f770bd84138bf176e3 SHA512 5f7922ae5a9d86faaf621a8efa74108b33fffe5a73bc9b169ecc2016c2b5a948f583ddcfcf008c44e3ed1bff040dda395089ba1e68a87d27c14967b145fd8a4a +EBUILD roct-thunk-interface-3.7.0.ebuild 982 BLAKE2B 8ca246d82bdbb96edb311725b18cee167f10d46bc2ab2c46e444fc6d8d53586f0cfcde743c3e2b7e36fe5b1aa5be22fa3c9494f578b65c30fe8d8cd0772fdb4a SHA512 d9596f1f3718845c5d579e976174497be0b0bf32388dde26e9ced316ccb0cb0d57dd13c528ff6bd9c648237edad9d59a234151118073b411d25d6ca4cb23a1fa +EBUILD roct-thunk-interface-9999.ebuild 982 BLAKE2B 8ca246d82bdbb96edb311725b18cee167f10d46bc2ab2c46e444fc6d8d53586f0cfcde743c3e2b7e36fe5b1aa5be22fa3c9494f578b65c30fe8d8cd0772fdb4a SHA512 d9596f1f3718845c5d579e976174497be0b0bf32388dde26e9ced316ccb0cb0d57dd13c528ff6bd9c648237edad9d59a234151118073b411d25d6ca4cb23a1fa MISC metadata.xml 742 BLAKE2B e4bf5b17c7add51f1fce354e5b68d874808e680e3dce8e514da738a0fdfb8a26076f76cfc5c8091bd11f7ef4576e2d45334590f20f899865b8c984406892b1a0 SHA512 7d0b104b201778561f5e0566c28f593abd8a9c05ea1154a7d58bebb135f15e86cf6dd7f98f9fd5059b054ffac1d64a86404743f7c9bb1a619431f5e911a233cf diff --git a/dev-libs/roct-thunk-interface/roct-thunk-interface-3.6.0.ebuild b/dev-libs/roct-thunk-interface/roct-thunk-interface-3.6.0.ebuild new file mode 100644 index 000000000000..973e79e665c8 --- /dev/null +++ b/dev-libs/roct-thunk-interface/roct-thunk-interface-3.6.0.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake linux-info + +if [[ ${PV} == *9999 ]] ; then + EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/" + inherit git-r3 +else + SRC_URI="https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/ROCT-Thunk-Interface-rocm-${PV}" + KEYWORDS="~amd64" +fi + +DESCRIPTION="Radeon Open Compute Thunk Interface" +HOMEPAGE="https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface" +CONFIG_CHECK="~HSA_AMD ~HMM_MIRROR ~ZONE_DEVICE ~DRM_AMDGPU ~DRM_AMDGPU_USERPTR" +LICENSE="MIT" +SLOT="0/$(ver_cut 1-2)" + +RDEPEND="sys-process/numactl + sys-apps/pciutils" +DEPEND="${RDEPEND}" + +src_prepare() { + sed -e "s:get_version ( \"1.0.0\" ):get_version ( \"${PV}\" ):" -i CMakeLists.txt || die + cmake_src_prepare +} +src_configure() { + local mycmakeargs=( + -DCPACK_PACKAGING_INSTALL_PREFIX="${EPREFIX}/usr" + ) + cmake_src_configure +} +src_compile() { + cmake_src_compile build-dev +} +src_install() { + cmake_src_install install-dev +} diff --git a/dev-libs/roct-thunk-interface/roct-thunk-interface-3.7.0.ebuild b/dev-libs/roct-thunk-interface/roct-thunk-interface-3.7.0.ebuild new file mode 100644 index 000000000000..ee5be506ed83 --- /dev/null +++ b/dev-libs/roct-thunk-interface/roct-thunk-interface-3.7.0.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake linux-info + +if [[ ${PV} == *9999 ]] ; then + EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/" + inherit git-r3 +else + SRC_URI="https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/ROCT-Thunk-Interface-rocm-${PV}" + KEYWORDS="~amd64" +fi + +DESCRIPTION="Radeon Open Compute Thunk Interface" +HOMEPAGE="https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface" +CONFIG_CHECK="~HSA_AMD ~HMM_MIRROR ~ZONE_DEVICE ~DRM_AMDGPU ~DRM_AMDGPU_USERPTR" +LICENSE="MIT" +SLOT="0/$(ver_cut 1-2)" + +RDEPEND="sys-process/numactl" +DEPEND="${RDEPEND}" + +src_prepare() { + sed -e "s:get_version ( \"1.0.0\" ):get_version ( \"${PV}\" ):" -i CMakeLists.txt || die + cmake_src_prepare +} +src_configure() { + local mycmakeargs=( + -DCPACK_PACKAGING_INSTALL_PREFIX="${EPREFIX}/usr" + ) + cmake_src_configure +} diff --git a/dev-libs/roct-thunk-interface/roct-thunk-interface-9999.ebuild b/dev-libs/roct-thunk-interface/roct-thunk-interface-9999.ebuild index 973e79e665c8..ee5be506ed83 100644 --- a/dev-libs/roct-thunk-interface/roct-thunk-interface-9999.ebuild +++ b/dev-libs/roct-thunk-interface/roct-thunk-interface-9999.ebuild @@ -20,8 +20,7 @@ CONFIG_CHECK="~HSA_AMD ~HMM_MIRROR ~ZONE_DEVICE ~DRM_AMDGPU ~DRM_AMDGPU_USERPTR" LICENSE="MIT" SLOT="0/$(ver_cut 1-2)" -RDEPEND="sys-process/numactl - sys-apps/pciutils" +RDEPEND="sys-process/numactl" DEPEND="${RDEPEND}" src_prepare() { @@ -34,9 +33,3 @@ src_configure() { ) cmake_src_configure } -src_compile() { - cmake_src_compile build-dev -} -src_install() { - cmake_src_install install-dev -} diff --git a/dev-libs/satyr/Manifest b/dev-libs/satyr/Manifest index 56a2cfd98433..55090435d0d3 100644 --- a/dev-libs/satyr/Manifest +++ b/dev-libs/satyr/Manifest @@ -1,5 +1,7 @@ DIST satyr-0.27.tar.gz 435341 BLAKE2B ade40bc6a1c48e6fc0af7913ff94ed044c63fdb63b8d86ba010bebcfd2098831bc6c7361d116851aee88f49c640d1457dd8953becad60b6ff6dc32deec6c7942 SHA512 7b01cf16489644fbfbe2150477279a94c6fa9b3310edebc84b83bab58d1058df0be478ab6bf4c6910b4168122721dde10d573711abb983b0eb5ccda09cb80710 DIST satyr-0.30.tar.gz 427940 BLAKE2B 97fedef59cc77b2ae81857c491532552c352a272658d02564d2661d06a4ccc99c18bcd57e5e68e5a612e9e65c5878f19b2f18bbe74066874a7295e2f65d64149 SHA512 ebc6e9c0fd8cd130cf1701573c8ecdadf73fe54efa563759a47f990a91b217cf1dec01045be624d15cfa96b1370ddf2412b0537e57ed628dc27e860be46e21cf +DIST satyr-0.31.tar.gz 428719 BLAKE2B 23c6ea53db261fee366566101c2b0f1e23cf530728332fe752897ee982ffac057b98de3d9a52dbfc64932cdb73aaff7e35c976e7a55e30b4417f3880782f9125 SHA512 a5aafa1ca5f85a0a817c6fa9a3b428672c9f4f529fb7d73a3e819cc836b78c01a0ca44b47317fcdd4a40dc6386688a450bd78564b6e466091cdc9a2c730c3fda EBUILD satyr-0.27.ebuild 998 BLAKE2B 08132e235be3f21deab7abccc2ddb5021851839f4012d985144bd89a7078a09bcf0e854e6e6c4626f9817c20a2aded73303892451e26001792b812b1e007dfaf SHA512 4c8108312645f67c1da4aafdf5693295d4706c7ca1c2f63fe7933c2283488411c30e485d188b64eb9ccffd3caf5c0927608218de5075429309cd82e06d11388b EBUILD satyr-0.30.ebuild 1886 BLAKE2B e6e8fb8a9421368aa02a1531af1410c19779fac99b65dff38371e419bdf84de8a0ebb188f085634c41a2bcd05c9e59f25fc88978c686bf8f158a7043a770a388 SHA512 dcc30c7bb7722cdeaade213272bb457a9e3559178c5b81d10b98730acbe42f2619d38064eb69638672c953c97609255b25b818eaf2204a367076bc97f9930b60 +EBUILD satyr-0.31.ebuild 1887 BLAKE2B 43959691fae55eb28d620682361b6c641f6e0bce919475a8a4626b98479a744edf7e69edb28e7f47757740ee0212de8e64ca74dcf286148d73f6ad59c75d3db7 SHA512 69804e6a6df63996dd804c120ba94d7320491d497466db5b696a0eae25ce933ad91a82f126b6435372f9a49a5d1bd2c7dcd01cc8b895790aa2e02d06362b1865 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 diff --git a/dev-libs/satyr/satyr-0.31.ebuild b/dev-libs/satyr/satyr-0.31.ebuild new file mode 100644 index 000000000000..362a8ca2186b --- /dev/null +++ b/dev-libs/satyr/satyr-0.31.ebuild @@ -0,0 +1,99 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_{7..9} ) + +inherit autotools multiprocessing python-r1 + +DESCRIPTION="Satyr is a collection of low-level algorithms for program failure processing" +HOMEPAGE="https://github.com/abrt/satyr" +SRC_URI="https://github.com/abrt/${PN}/archive/${PV}/${P}.tar.gz" + +LICENSE="GPL-2+" +SLOT="0/4" + +IUSE="python" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +KEYWORDS="~amd64 ~x86" + +RDEPEND="python? ( ${PYTHON_DEPS} ) + >=dev-libs/elfutils-0.158 + dev-libs/json-c:= + dev-libs/nettle:= +" +DEPEND="${RDEPEND}" +BDEPEND=" + virtual/pkgconfig + dev-util/gperf +" + +src_prepare() { + default + ./gen-version || die # Needs to be run before full autoreconf + eautoreconf + use python && python_copy_sources +} + +src_configure() { + use python && python_setup + + local myargs=( + --localstatedir="${EPREFIX}/var" + --without-rpm + $(usex python "--with-python3" "--without-python3") + ) + + if use python; then + python_configure() { + econf "${myargs[@]}" + } + python_foreach_impl run_in_build_dir python_configure + else + econf "${myargs[@]}" + fi +} + +src_compile() { + if use python; then + python_foreach_impl run_in_build_dir default + else + default + fi + +} + +src_test() { + local extra_args + + # In order to pass --jobs to the test runner + run_tests() { + cd tests || die + emake testsuite + ./testsuite --jobs=$(makeopts_jobs) ${extra_args[@]} $@ + + # Only run the python bindings tests for other python impls + extra_args=('-k' 'python3_bindings.*') + } + + if use python; then + python_foreach_impl run_in_build_dir run_tests + else + run_tests SKIP_PYTHON3=yes + fi +} + +src_install() { + if use python; then + python_install() { + default + python_optimize + } + python_foreach_impl run_in_build_dir python_install + else + default + fi + + find "${D}" -name '*.la' -type f -delete || die +} diff --git a/dev-libs/serdisplib/Manifest b/dev-libs/serdisplib/Manifest index 8d91940f1ecc..f9fcc1fcd431 100644 --- a/dev-libs/serdisplib/Manifest +++ b/dev-libs/serdisplib/Manifest @@ -1,7 +1,5 @@ AUX disable-static-build.patch 3327 BLAKE2B 677d3dcc121cbc42345e987055aa202ea8118c74bbb5edd0f5d50dc7408ec77e6f439e38d1277fcba87e31932be4794021c45fe55115d7e1325cafe506abc750 SHA512 ca19a3f05fbc70693892d201efb938c9fd1c298d9e4551a51e802d99999b91568607fa73696c4be991a833432969ae0981fe3daa1e2cd5d18bbc0406bd925faa AUX use-destdir.patch 3400 BLAKE2B 77d9adc8c9a44586cbe352c6273677704d7335fc75c82d50a681c361a10a45484ae0dfb3241bf9d99ba242f6548df9cb036992b46e157f9c4ec3ca098397be7e SHA512 370ace46b39ba5e67d7f728a3cb3980b75a2c7e6e5fb25273f9c3bfbe10f33479bfcff92e3074a2cb80985c114d161b78115410dd88330810f654875e57d7575 -DIST serdisplib-2.01.tar.gz 472998 BLAKE2B 7ee78703d1d2cb4172e44db443825dd0fb3080284e832c60a102b853a1df6e0812a30a40504b8eb3e5ecda83f57138d78b43c3c40b8e4efabb7071eff7ad1b3e SHA512 0474cce4353edb3640d8432272905859e90efe6140e6791c84e1cb51df7f533734a9c78447d8d8448a70e62dda6d65061bbcc515ee346354825029874ae5e9a9 DIST serdisplib-2.02.tar.gz 497028 BLAKE2B f35b6df60303a288b2a279d821a510089802019f33b7ee36b9c2fd1d1d6bef0b3118793e6d965076c1665e1e2555a553186ef1a9210712ef9d2bc1e090ec0a98 SHA512 d9936c25dc14e24eb02876f203476752340e621d8ee5c87ee99862575e45199bf46ff8487dfdd80b16a89543958fdf5a16a2aaf78d5cade06811cfb1592c45eb -EBUILD serdisplib-2.01-r1.ebuild 2557 BLAKE2B f9975f1674dc9eb783c27c8abd4afbf264bf0458f08fb542af48d12b1a48688e86f39a775e8c467286a39ba6fa73a4c4829bb7fca529c6628e48db2ce0e2e1c2 SHA512 696eed79e76bd9aac399ce29d123966c325f6313c15b941080192e41fc9ea8579d817059afaad1bb2a1a59b1ff3b9701e82f04b91e9c808ea09537067730b576 -EBUILD serdisplib-2.02.ebuild 2559 BLAKE2B 9d19520bb7762b794b49c6c0e110f680f1340b8b1cbfe8bf9e914a58f025f99b62950f95b1a56dc05e382e571bd903067df58d29d85b10ebbcc1edcce9482a6a SHA512 e0eb83121bd6e33b01c67f286733bd46aa48dd7fc3c5352b11be786e7f15bb7d72393dec569b15a791c18097dd3729e72846f41975a67acc7e45b1365c93ab96 +EBUILD serdisplib-2.02.ebuild 2556 BLAKE2B abbbf9c3e17ce00f2208664e62427d4fb91361ae16a7bc9b76e7f0917c7bd17518d95bf8eff374f5548276eaa5d49c0f152b16b877b16528920b356997499713 SHA512 80627f7f272a80678374611457131de45e6e80ed48b4e5cd0851b4aee3f41627ece004686dc939eb6ece718724f505b2e8423c42e6307886fddf62dabcd8d0df MISC metadata.xml 662 BLAKE2B 08a9e0f6642a8e77f31b102b1874b32e43728451e92ad3db770c06b93a3653c575844fdb1b92d4969640327b94ea56aec3caffe3afd48540709fde7c541644ac SHA512 5f67e02b44a93b45ac7f08be8e569d2974a761f54c4ddc90cc541459adc3e41b5702405d971f29c094e4b7755975d9f5cd4ba4ad0f6d9ee116e5fd6f4a2c2b91 diff --git a/dev-libs/serdisplib/serdisplib-2.01-r1.ebuild b/dev-libs/serdisplib/serdisplib-2.01-r1.ebuild deleted file mode 100644 index 04801dd9ca7f..000000000000 --- a/dev-libs/serdisplib/serdisplib-2.01-r1.ebuild +++ /dev/null @@ -1,100 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit udev - -DESCRIPTION="Library to drive several displays with built-in controllers or display modules" -HOMEPAGE="http://serdisplib.sourceforge.net" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc ~ppc64 x86" -IUSE="threads tools" - -# Define the list of valid lcd devices. -IUSE_LCD_DEVICES=( - acoolsdcm ddusbt directgfx displaylink framebuffer glcd2usb - goldelox i2c ks0108 l4m lc7981 lh155 nokcol pcd8544 - remote rs232 sed133x sed153x sed156x ssdoled stv8105 t6963 -) - -# Add supported drivers from 'IUSE_LCD_DEVICES' to 'IUSE' and 'REQUIRED_USE' -IUSE+=" $(printf 'lcd_devices_%s ' ${IUSE_LCD_DEVICES[@]}) " -REQUIRED_USE+=" - || ( $(printf 'lcd_devices_%s ' ${IUSE_LCD_DEVICES[@]}) ) - lcd_devices_framebuffer? ( threads ) -" - -# Specific drivers will need some features to be enabled -RDEPEND=" - media-libs/gd[jpeg,png,tiff] - lcd_devices_acoolsdcm? ( virtual/libusb:1= ) - lcd_devices_directgfx? ( media-libs/libsdl ) - lcd_devices_displaylink? ( x11-libs/libdlo ) - lcd_devices_glcd2usb? ( virtual/libusb:1= ) -" - -DEPEND="${RDEPEND}" - -DOCS=( "AUTHORS" "BUGS" "DOCS" "HISTORY" "PINOUTS" "README" "TODO" ) - -PATCHES=( "${FILESDIR}/use-destdir.patch" "${FILESDIR}/disable-static-build.patch" ) - -src_prepare() { - default - - # Fix Makefile, as it will fail, when USE="tools" is not set - if ! use tools; then - sed -i -e '/$(INSTALL_PROGRAM) $(PROGRAMS)/d' src/Makefile.in || die - fi - - # Fix QA-Warning "QA Notice: pkg-config files with wrong LDFLAGS detected" - sed -i -e '/@LDFLAGS@/d' serdisplib.pc.in || die -} - -src_configure() { - # Enable all users enabled lcd devices - local myeconfargs_lcd_devices - for lcd_device in ${IUSE_LCD_DEVICES[@]}; do - if use lcd_devices_${lcd_device}; then - myeconfargs_lcd_devices+=",${lcd_device}" - fi - done - - local use_usb="--disable-libusb" - if use lcd_devices_acoolsdcm || use lcd_devices_glcd2usb; then - use_usb="--enable-libusb" - fi - - local myeconfargs=( - $(use_enable lcd_devices_directgfx libSDL) - $(use_enable lcd_devices_displaylink deprecated) - $(use_enable lcd_devices_displaylink libdlo) - $(use_enable lcd_devices_remote experimental) - $(use_enable threads pthread) - $(use_enable tools) - ${use_usb} - --disable-dynloading - --disable-statictools - --with-drivers="${myeconfargs_lcd_devices#,}" - ) - - econf "${myeconfargs[@]}" -} - -src_install() { - default - - udev_dorules 90-libserdisp.rules -} - -pkg_postinst() { - udev_reload -} - -pkg_postrm() { - udev_reload -} diff --git a/dev-libs/serdisplib/serdisplib-2.02.ebuild b/dev-libs/serdisplib/serdisplib-2.02.ebuild index 3014edbec361..9fb47346044d 100644 --- a/dev-libs/serdisplib/serdisplib-2.02.ebuild +++ b/dev-libs/serdisplib/serdisplib-2.02.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +KEYWORDS="amd64 ppc ~ppc64 x86" IUSE="threads tools" # Define the list of valid lcd devices. diff --git a/dev-libs/softhsm/Manifest b/dev-libs/softhsm/Manifest index dc14d7944343..a6230eea1182 100644 --- a/dev-libs/softhsm/Manifest +++ b/dev-libs/softhsm/Manifest @@ -1,4 +1,6 @@ AUX softhsm-2.5.0-libressl.patch 1046 BLAKE2B e647878998493606d9941f1b4683be8f072f5c5779fb6aa6606857a12af7aa0228d349b722813449ed33a026ea5e8bec9b0e6235ac6c271f34c61fca7eafb4b4 SHA512 23c8048ef08417422194eb84d4581b4a1c443de6917608f953cdcb5b2433446272d937e05eabc6bae17d88061a0b3aa997355b7b47e71702dc52d69223972809 DIST softhsm-2.5.0.tar.gz 1078439 BLAKE2B f96f9e08f3ea568daccb64a5de94ac91b5efcee3dea09f460e98491e7fcdca1277ed52c339a2ec10dac2f78c9e7e44fe5c4a7d36c58e97afba6e749979d4d7e0 SHA512 a1e686729196dc25591eb3da57c2c8ea8494ed274ba711842b2dcae696f477a202acda13a975b8fb1eb68e8e44a79e839dbbc6ba500cab02ad13072c660752d9 +DIST softhsm-2.6.1.tar.gz 1066766 BLAKE2B 0295c5f40235c8abd8879a8c6f7fbe8e8d686ee03355006e9c90c0f2f7135eaf6794a3d39febda1b1ed6e5d48dcacb1e14dae85fb0efb884d0d719bfc6624b92 SHA512 e77137096ff2ac2f5396971efbaa2007188855a8f723cb511182c6c5e5a353b3f98297442758e77a18c3a378c0ca3fce8abe090977f0f4f8d526de204fd523fb EBUILD softhsm-2.5.0.ebuild 1112 BLAKE2B bec60391d1bd029ad7904113fb97acd9a1407cf355463f0a958ca6faeecda12e59cfde0ac4fc727d63d607936cb7b13e8beb7493eaeada5f179ded9490bb115f SHA512 56c3ddfadaeb674d1f9e56473729f8d99667933357a8fbc366384d5efa264f7edc8a1faafed0066848c52c9956e8cae92ff14bda340ea14bdc24ded7adc345e5 +EBUILD softhsm-2.6.1.ebuild 1064 BLAKE2B 9593218c5058cf0e159fea27287492bb335ff728f1f012bbce29314678879d6414a8d0ca20f7f14b7ff76322e3efd6b3586d1ba0b33143aaefa849b3487bf9bd SHA512 784945f1962fcbd19ded377344c3aefa69f21032780902507b32fad09fc17dcfe9f541a837c4c600852d98cb71b49d5d9bc66858ce5d68da8933ab6bc4e1804a MISC metadata.xml 292 BLAKE2B 273da0cfca0f98179144303c91b631ff47844748840f99b6bf1ece28ec442191e950756308242c25f4f27ab907674cdbd6efc88a4af1887676eb878d01b73f7c SHA512 7b3d1e2e5adc04c50256ea1f98490787cc0d2ff33af13462501cb5e08f482de3ce6da60d3026d5aacd1f46075915d1cc5c37206d398c61176ca7a023adae693d diff --git a/dev-libs/softhsm/softhsm-2.6.1.ebuild b/dev-libs/softhsm/softhsm-2.6.1.ebuild new file mode 100644 index 000000000000..41a1b769e854 --- /dev/null +++ b/dev-libs/softhsm/softhsm-2.6.1.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="A software PKCS#11 implementation" +HOMEPAGE="https://www.opendnssec.org/" +SRC_URI="https://www.opendnssec.org/files/source/${P}.tar.gz" + +KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" +IUSE="bindist gost libressl migration-tool test" +RESTRICT="!test? ( test )" +SLOT="2" +LICENSE="BSD" + +RDEPEND="migration-tool? ( dev-db/sqlite:3= ) + !libressl? ( dev-libs/openssl:0=[bindist=] ) + libressl? ( dev-libs/libressl:= ) + !~dev-libs/softhsm-2.0.0:0" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig + sys-devel/gcc:=[cxx] + test? ( dev-util/cppunit )" + +DOCS=( + NEWS + README.md +) + +src_configure() { + econf \ + --disable-static \ + --with-crypto-backend=openssl \ + --disable-p11-kit \ + --localstatedir="${EROOT}/var" \ + $(use_enable !bindist ecc) \ + $(use_enable gost) \ + $(use_with migration-tool migrate) +} + +src_install() { + default + find "${D}" -name '*.la' -delete || die + + keepdir "${EROOT}/var/lib/softhsm/tokens" +} diff --git a/dev-libs/spdlog/Manifest b/dev-libs/spdlog/Manifest index eade5cbba736..4953f7791eb0 100644 --- a/dev-libs/spdlog/Manifest +++ b/dev-libs/spdlog/Manifest @@ -1,6 +1,11 @@ +AUX spdlog-1.6.1-libfmt-7.0.0.patch 1218 BLAKE2B 2d3dce85374db1489c5a94eab92b24e947334b7e56345eac17d0e71a0fcce9c99d886f36695023d3af872bf76d5e325b50f5b82cbe979ef539e4db52eb8db1ee SHA512 bc3beb83654ca6c69d6732ccc62c33df202e14e53e0ac5a762d163efb933ba6ebb0d169c53067ba724216886f4036ebfdea1a86a21c3ff3f06a26049e85fac32 +AUX spdlog-1.6.1-tests-fix.patch 486 BLAKE2B 07ba02aa06ce18ffa0cba7f6c7b1a981733161e118c2a19dae0a6efaaa59f449036d43e87fefbf3ae1e51ba13f164987b82f87fa2409d68035d88f4e0b98bfb5 SHA512 798529555072bca9f720678cd4b7a9da8c83802aadc5e88c183a4a1278759ae23b4759ae94f3008b90cf11bbc6df371fac03f4f12967e013165a06ad13647fe8 DIST spdlog-1.5.0.tar.gz 270416 BLAKE2B bac6c6650f8347458dd2dd66f318b43a769b0896d68f6a6f1310754527a69feaa52b2f6f48d67c7e811c2dafa5d3863a9a07c738df8c12abed2718fb06254b28 SHA512 78991c943dd95af563c4b29545b9b5d635caf1af5031262dde734ecf70c0b4ae866d954ee77b050f9f0cc089a3bc57ee9583895e51cb00dd1cc6c10ff905ca34 DIST spdlog-1.6.1.tar.gz 285531 BLAKE2B 525f29098fd0f771e14cc7c4bd8bf5d4054a0f68255aea29ef5158ce61516d9e5f0ae0fb72a2f54303d18194a54acb5c1731f53ee6edcd74ff487227bc332236 SHA512 1e15e7710744212240d79897af8c3bde14fe3b745a1377643d18dc0038f18fc7582236ff21836d3eae2c75cf1f4820ca4c642c5c3f63f9ae138289aa4d00e22e +DIST spdlog-1.7.0.tar.gz 285615 BLAKE2B f1a20f8ec8e9746e360106f284544b20e48664a91d17b014abec26fd0f2ce3d25dd33cfb925f4468fa32da394f6efaca033290bdcf66abe8b067444999b87b63 SHA512 e15d461ac7a6d3d3186fe4283e4fbaf56b2ce3011babf892e3b2d3dbdd7e999a861f1f6f67a9d88a5cf488a440add087ea78e96131f49b52ed6c7815a972799a EBUILD spdlog-1.5.0-r1.ebuild 940 BLAKE2B 5bd3e51e37049d4f99d1e8b286a27942393788897cd5363a03d4a29aec2d19867c46cbbcbd90da1a55d8991dba17b87aa8380b04ad1c3d451dcd9b80e9fb9525 SHA512 4e8f4ba9a45110108c77a6f06e1fef14bc9240db69cf10b66aa86934f650a887f6ed3677aaa662f51eaf2c782b435fc2478f3b03719904dc314335c875652261 +EBUILD spdlog-1.6.1-r1.ebuild 1031 BLAKE2B 8f524b4048ea904c75af6305fddbdadfc7db39bad605b43f4991df718955d1ca3a753e6c116c4c9e7566c08e3da5c2be1260901a504e6af963b70cbc5a65bbc7 SHA512 c51dea37423c49256ca17d12d3882b6babe2a3653a82122e03f9bdaeb7c3fe2e11535769a410c7fb6fd89472187d40cd111e18a15e79df2ebaffd379b1ee21ae EBUILD spdlog-1.6.1.ebuild 943 BLAKE2B a6081b7bca5944e6c2c62536e9e76e234179a2a7962d9b7dc721c77f146854adecd2232e115ef98ce22e5963d57b38fd2c1c16263e1d8c2e5a4c31845638fd42 SHA512 a15d952219c91851c7a89f25b1e9693cda0dd09cb4693ff8aa73bb4b5c700d80124ae91a3a026018df78142267823e96e9207929dc79ac42b884ea16ad19b0fd -EBUILD spdlog-9999.ebuild 914 BLAKE2B a5362a8845f61d921f2d136dd6a55beb3931539e07b4fd8950730c32975e160f5162e27862bae3d6ffddd3ae77c210128dd33cdfa22a509125f628e0869775ea SHA512 15f272868287039f55fbc82018bd5dd49074534d0efc50aeb022abb1442c9a9fdb90496528d2f2d8905cef3df311b1fc428451f605aac572a78e908ccb0f797a +EBUILD spdlog-1.7.0.ebuild 939 BLAKE2B 0c35c5831ee9567ea95f76e2f552fb695a8e30f141f10fb64d06f82be199257c65b24236226d90f8e0fba0447538eda2ca77b7ea09d441c697cf692854f2f3c0 SHA512 3f22ac7f314e3e3efa94ef74a91620d87da244b2cbc0edc1da8e979da912e41fcef358b4a74d8c2358332503aa80422b7357405692297669184d2bf273308c96 +EBUILD spdlog-9999.ebuild 943 BLAKE2B a6081b7bca5944e6c2c62536e9e76e234179a2a7962d9b7dc721c77f146854adecd2232e115ef98ce22e5963d57b38fd2c1c16263e1d8c2e5a4c31845638fd42 SHA512 a15d952219c91851c7a89f25b1e9693cda0dd09cb4693ff8aa73bb4b5c700d80124ae91a3a026018df78142267823e96e9207929dc79ac42b884ea16ad19b0fd MISC metadata.xml 444 BLAKE2B 43dc7df0be06296bad03bcd8c479773dab68c409644907e7fc02f0467e1ff8bc291e090b1c9831acb1c66ee046326b6597edc7267be09498566a3f4abc2dd722 SHA512 3da6d49c08f56e11b065b4cd2cf3536fff75512ab729a958db07151c3bce234deeab22a95e7cc7f569edf5e42f7edc099a68c1572be936f2430144532e95b62c diff --git a/dev-libs/spdlog/files/spdlog-1.6.1-libfmt-7.0.0.patch b/dev-libs/spdlog/files/spdlog-1.6.1-libfmt-7.0.0.patch new file mode 100644 index 000000000000..422a507a6d86 --- /dev/null +++ b/dev-libs/spdlog/files/spdlog-1.6.1-libfmt-7.0.0.patch @@ -0,0 +1,33 @@ +https://github.com/gabime/spdlog/pull/1606 + +From 22bee8128a4150ce37cf761ed9a609ad891848a6 Mon Sep 17 00:00:00 2001 +From: Craig Andrews <candrews@integralblue.com> +Date: Mon, 6 Jul 2020 13:01:52 -0400 +Subject: [PATCH] fmt 7.0.0 renamed the internal namespace to detail. + +See: https://github.com/fmtlib/fmt/issues/1538 +--- + include/spdlog/details/fmt_helper.h | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +diff --git a/include/spdlog/details/fmt_helper.h b/include/spdlog/details/fmt_helper.h +index cbc0bdf3..4f363858 100644 +--- a/include/spdlog/details/fmt_helper.h ++++ b/include/spdlog/details/fmt_helper.h +@@ -34,7 +34,15 @@ template<typename T> + inline unsigned int count_digits(T n) + { + using count_type = typename std::conditional<(sizeof(T) > sizeof(uint32_t)), uint64_t, uint32_t>::type; +- return static_cast<unsigned int>(fmt::internal::count_digits(static_cast<count_type>(n))); ++ return static_cast<unsigned int>(fmt:: ++// fmt 7.0.0 renamed the internal namespace to detail. ++// See: https://github.com/fmtlib/fmt/issues/1538 ++#if FMT_VERSION < 70000 ++internal ++#else ++detail ++#endif ++::count_digits(static_cast<count_type>(n))); + } + + inline void pad2(int n, memory_buf_t &dest) diff --git a/dev-libs/spdlog/files/spdlog-1.6.1-tests-fix.patch b/dev-libs/spdlog/files/spdlog-1.6.1-tests-fix.patch new file mode 100644 index 000000000000..8a6aa8020f7d --- /dev/null +++ b/dev-libs/spdlog/files/spdlog-1.6.1-tests-fix.patch @@ -0,0 +1,13 @@ +diff --git a/include/spdlog/fmt/bin_to_hex.h b/include/spdlog/fmt/bin_to_hex.h +index e974cf51..5393dcac 100644 +--- a/include/spdlog/fmt/bin_to_hex.h ++++ b/include/spdlog/fmt/bin_to_hex.h +@@ -92,7 +92,7 @@ struct formatter<spdlog::details::dump_info<T>> + auto parse(ParseContext &ctx) -> decltype(ctx.begin()) + { + auto it = ctx.begin(); +- while (*it && *it != '}') ++ while (it != ctx.end() && *it != '}') + { + switch (*it) + { diff --git a/dev-libs/spdlog/spdlog-1.6.1-r1.ebuild b/dev-libs/spdlog/spdlog-1.6.1-r1.ebuild new file mode 100644 index 000000000000..6d996c6f8eae --- /dev/null +++ b/dev-libs/spdlog/spdlog-1.6.1-r1.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake + +DESCRIPTION="Very fast, header only, C++ logging library" +HOMEPAGE="https://github.com/gabime/spdlog" + +if [[ ${PV} == *9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/gabime/${PN}" +else + SRC_URI="https://github.com/gabime/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" +fi + +LICENSE="MIT" +SLOT="0/1" +IUSE="test" +RESTRICT="!test? ( test )" + +BDEPEND=" + virtual/pkgconfig +" +DEPEND=" + >=dev-libs/libfmt-5.3.0:= +" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}/${P}-libfmt-7.0.0.patch" + "${FILESDIR}/${P}-tests-fix.patch" +) + +src_prepare() { + cmake_src_prepare + rm -r include/spdlog/fmt/bundled || die "Failed to delete bundled libfmt" +} + +src_configure() { + local mycmakeargs=( + -DSPDLOG_BUILD_BENCH=no + -DSPDLOG_BUILD_EXAMPLE=no + -DSPDLOG_FMT_EXTERNAL=yes + -DSPDLOG_BUILD_SHARED=yes + -DSPDLOG_BUILD_TESTS=$(usex test) + ) + + cmake_src_configure +} diff --git a/dev-libs/spdlog/spdlog-1.7.0.ebuild b/dev-libs/spdlog/spdlog-1.7.0.ebuild new file mode 100644 index 000000000000..302ff616a0aa --- /dev/null +++ b/dev-libs/spdlog/spdlog-1.7.0.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake + +DESCRIPTION="Very fast, header only, C++ logging library" +HOMEPAGE="https://github.com/gabime/spdlog" + +if [[ ${PV} == *9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/gabime/${PN}" +else + SRC_URI="https://github.com/gabime/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86" +fi + +LICENSE="MIT" +SLOT="0/1" +IUSE="test" +RESTRICT="!test? ( test )" + +BDEPEND=" + virtual/pkgconfig +" +DEPEND=" + >=dev-libs/libfmt-6.1.2:= +" +RDEPEND="${DEPEND}" + +src_prepare() { + cmake_src_prepare + rm -r include/spdlog/fmt/bundled || die "Failed to delete bundled libfmt" +} + +src_configure() { + local mycmakeargs=( + -DSPDLOG_BUILD_BENCH=no + -DSPDLOG_BUILD_EXAMPLE=no + -DSPDLOG_FMT_EXTERNAL=yes + -DSPDLOG_BUILD_SHARED=yes + -DSPDLOG_BUILD_TESTS=$(usex test) + ) + + cmake_src_configure +} diff --git a/dev-libs/spdlog/spdlog-9999.ebuild b/dev-libs/spdlog/spdlog-9999.ebuild index 24491a214dcb..6da33cbbf3c6 100644 --- a/dev-libs/spdlog/spdlog-9999.ebuild +++ b/dev-libs/spdlog/spdlog-9999.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then EGIT_REPO_URI="https://github.com/gabime/${PN}" else SRC_URI="https://github.com/gabime/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" fi LICENSE="MIT" diff --git a/dev-libs/spsdeclib/Manifest b/dev-libs/spsdeclib/Manifest index 5654790a14ce..a3d3e5aafd63 100644 --- a/dev-libs/spsdeclib/Manifest +++ b/dev-libs/spsdeclib/Manifest @@ -1,4 +1,4 @@ AUX add_symlink.patch 804 BLAKE2B 2b0eec3a3a9008b887cd4af8f2900631fa347890cd37ced2930fbbe21b05cf213e6b088d2798173ae6c89a75467db0e6111e3e3e738d37eca7fbc884725b66ee SHA512 ca370e101057851e214009ef6880afa4a96711407d28e3ce34592317200c7da623996c7fcf7c31aefe55ffd6b649ab5ff970fc0134435114234f4436919b93ad DIST spsdeclib_5.1_source.zip 282236 BLAKE2B 6f37a3f0791baf9ca7a6bb3532be4cd7bcf90cdc2fc51def4d5daf4419c6b8c08aef87275555f359394e37e5ab6cf34d1e4903bea542ff99f7dc317238dd52b7 SHA512 26db037096c7c98c1af800577ce298c6b572541f665b512e80c6268818075d3c46d296b282268bd27a73a34f4063607ae8dd9d6d7a9301c441eb9cfce780f439 -EBUILD spsdeclib-5.1-r1.ebuild 1187 BLAKE2B 6ed2973600e1ae4fbc54911938d6f36f84c0acb4aa749b7bb4ffa1717b657ac3349a7b9e109b0e40aac5513c97a7b2c2ebbc72296d059f3ba618c68ccc4a4719 SHA512 1d4c1d231511f1bee310149da3fa5df9f06e9171d5b1238a6f47a32491f913df48995ac684ee47baf586ca48204ccbbdb7cbc02805d7bdefa576e0a14e4e8190 +EBUILD spsdeclib-5.1-r1.ebuild 1185 BLAKE2B d43e14686331ab5c2872a32a4b49676d544d553345d8b828c82263aab6ac6ce77fc5eca3128dfb60efde3ac432a0766b24b9cc48eaa20a9f7e52377c5e66d9b2 SHA512 2006813181849c1dd2a332a10e77ba99530971bfea662181265c25ce837a13eb0c03c4798c0eb47e35c821f9dbfa965b7cc9fdde18be2078f8d0e9a8cf8f45fe MISC metadata.xml 445 BLAKE2B cd513b1151b9d2811bc031b7772ac4ebd3d8fe69a08e2e7f1445db48cbca0556611440e82a42b1e01c8533fb00f62a33da18e535f180edb0bd04843b97db7d3a SHA512 212dc445119943fc6968ce83b0e5e29177f72dd14358e10d7925ce80515ca70093bd23dae7ac4a64890fcc74f8f095f599643113477a2cebd126fe68f93cd047 diff --git a/dev-libs/spsdeclib/spsdeclib-5.1-r1.ebuild b/dev-libs/spsdeclib/spsdeclib-5.1-r1.ebuild index 3aab0f92fab0..2829d62b2f35 100644 --- a/dev-libs/spsdeclib/spsdeclib-5.1-r1.ebuild +++ b/dev-libs/spsdeclib/spsdeclib-5.1-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" +EAPI=7 inherit autotools diff --git a/dev-libs/svrcore/Manifest b/dev-libs/svrcore/Manifest deleted file mode 100644 index 2606e2e0a2cf..000000000000 --- a/dev-libs/svrcore/Manifest +++ /dev/null @@ -1,7 +0,0 @@ -AUX svrcore-4.0.4-gentoo.patch 3063 BLAKE2B 1ab4e7eb0dab6990ca7d2c85ab1b05d1868c5b37daa41ed900a19fc474d36311520cc3041a25576b837b7ab93f80182378b745e93d7ab8e8c3de7c0224dc80f3 SHA512 b27e02f31d17cbb3fbf7972da2147831070068ab4981cb439dff00c1d80888193c4a39376ab77cb8f202b09100f514e5e536d65e08e54253be93cadae00a2321 -AUX svrcore-4.1-gentoo.patch 3066 BLAKE2B 0acdeac026704f78470289025500a4a8da17d871eb820961aa991f3c230dff0b72f87bc1b769e58c44c72a694e393b16e57b0926b4b63c966c406519f9104ac9 SHA512 f5a16cadbef104c5658176e3684cd0de03245b6ded86d14965d7f98e2d2c65e4eba43d0630199c8c6f18f922302027ab856d1c96f592cbe79207cc327db786ab -DIST svrcore-4.0.4.tar.bz2 217076 BLAKE2B 1d5b1c6d397552f299554a19c21a81d1df8f449480095102d46bd2c9db8e4b667302f06fd199579dffb854f47fcb6f6ba54d505e3e6d3ccdfcf54dca07363f81 SHA512 4a63e2618ef8f508e71adf212eefae56e3c9d9898b924f405399bb99793de57bd178a3417f9e837c474e7960b6eb8a3cbe775b420c8fecbd974e89b4196b78fc -DIST svrcore-4.1.2.tar.bz2 263891 BLAKE2B 4d546406e18099857c1d77d479123332bdc721b51f5ad6bae74812b77704d3d6f8fa2ab67848355be7050fc3ee161c534fc7ee1692811fe9829da513f7cba29e SHA512 9d148ec9c568f1183e44006fec83b4e43b0cef56d5a04fce122fab1e9a0c0bfe39919de81c5a4d7adb2258fb7f16b4d327da20cdb4d948810e968c422d62ad40 -EBUILD svrcore-4.0.4-r1.ebuild 806 BLAKE2B 34d2e7ac6d7993ad4f63a13b1e13f031983302174db2115470a920641d2bc0440c70756164ec615c5a593523d0b22ea1b040f8f8a726fae2301c7c74cd305cf1 SHA512 674455d227bf2b97e87586c1b64883a8896c7af7ff41b4c61fec9524fd7067b03cd19264a43aa79536d6ef3ec544529ca4adc86e3d6236f62d6f1c6000ff7bf6 -EBUILD svrcore-4.1.2.ebuild 692 BLAKE2B d4a2ef8b78ffedc502a6a666dc16fa555d5d012aedf7362da87f6b4092f7274a00d3c06d643919ac6532e3700265ee244c0424a000c73fd41394f50c5041ae33 SHA512 105c0e603d9acace34ad5ab9705eec19822cedfacc85fca1940409d652a2bb3eb1621309f690efdca8705ace076ae0e45d63f232da4e6e98d31c3bd21dda103e -MISC metadata.xml 168 BLAKE2B 95e3160d1d6abb3e5510581fe45ddcd9ad526f89bbc0d3ad226e2782d148a0c71e50426809a87fb45e6fc9356e597a1d271002764caebc79be8846301eb82d5e SHA512 5edd6cda32972ff5e53cf5f883928bd1887b4a45572657f99101284a909ea04ff906b8f4068d247d1b3367bde813dbb37ba11565aaff880d9b500685b0f5a33d diff --git a/dev-libs/svrcore/files/svrcore-4.0.4-gentoo.patch b/dev-libs/svrcore/files/svrcore-4.0.4-gentoo.patch deleted file mode 100644 index 83e9f7fca359..000000000000 --- a/dev-libs/svrcore/files/svrcore-4.0.4-gentoo.patch +++ /dev/null @@ -1,100 +0,0 @@ -diff -uNr src/Makefile.am svrcore-4.0.4src/Makefile.am ---- src/Makefile.am 2006-12-14 18:07:32.000000000 +0100 -+++ src/Makefile.am 2007-08-06 17:37:17.000000000 +0200 -@@ -4,8 +4,8 @@ - Makefile.win \ - ntgetpin.rc - --lib_LTLIBRARIES = libsvrcore.la --include_HEADERS = svrcore.h -+pkglib_LTLIBRARIES = libsvrcore.la -+pkginclude_HEADERS = svrcore.h - libsvrcore_la_SOURCES = alt.c \ - cache.c \ - errors.c \ -diff -uNr svrcore.pc.in svrcore.pc.in ---- svrcore.pc.in 2006-12-14 18:07:32.000000000 +0100 -+++ svrcore.pc.in 2007-08-06 17:38:12.000000000 +0200 -@@ -1,11 +1,11 @@ - prefix=@prefix@ - exec_prefix=@exec_prefix@ --libdir=@libdir@ --includedir=@includedir@ -+libdir=@libdir@/@PACKAGE@ -+includedir=@includedir@/@PACKAGE@ - - Name: svrcore - Description: Svrcore - Secure PIN handling using NSS crypto - Version: @VERSION@ - Requires: @NSPR_NAME@ >= @NSPR_MIN_VER@ , @NSS_NAME@ >= @NSS_MIN_VER@ --Libs: -lsvrcore -+Libs: -L${libdir} -lsvrcore - Cflags: -I${includedir} -diff -ur m4.orig/nspr.m4 m4/nspr.m4 ---- m4.orig/nspr.m4 2009-10-06 01:40:18.979484804 +0300 -+++ m4/nspr.m4 2009-10-06 01:41:21.539982482 +0300 -@@ -52,28 +52,6 @@ - ], - AC_MSG_RESULT(no)) - --# see if we are doing an "in-tree" build with the other --# mozilla components --if test -z "$nspr_inc" -o -z "$nspr_lib" ; then -- for nsprpath in "../../dist" "../../dist/*.OBJ" ; do -- savedir=`pwd` -- cd $nsprpath -- abs_nsprpath=`pwd` -- cd $savedir -- if test -f "$abs_nsprpath/include/nspr/nspr.h" ; then -- nspr_inc="-I$abs_nsprpath/include/nspr" -- elif test -f "$abs_nsprpath/include/nspr.h" ; then -- nspr_inc="-I$abs_nsprpath/include" -- fi -- if test -d "$abs_nsprpath/lib" ; then -- nspr_lib="-L$abs_nsprpath/lib" -- fi -- if test -n "$nspr_inc" -a -n "$nspr_lib" ; then -- break -- fi -- done --fi -- - # if NSPR is not found yet, try pkg-config - # last resort - if test -z "$nspr_inc" -o -z "$nspr_lib" ; then -diff -ur m4.orig/nss.m4 m4/nss.m4 ---- m4.orig/nss.m4 2009-10-06 01:40:18.979484804 +0300 -+++ m4/nss.m4 2009-10-06 01:41:31.291485717 +0300 -@@ -52,32 +52,6 @@ - ], - AC_MSG_RESULT(no)) - --# see if we are building "in tree" with the --# other mozilla components --if test -z "$nss_inc" -o -z "$nss_lib"; then -- nsslibpath=`echo ../../dist/*.OBJ/lib | cut -f1 -d' '` -- savedir=`pwd` -- cd $nsslibpath -- abs_nsslibpath=`pwd` -- cd $savedir -- nssincpath=../../dist/public/nss -- savedir=`pwd` -- cd $nssincpath -- abs_nssincpath=`pwd` -- cd $savedir -- if test -f "$abs_nssincpath/nss.h" ; then -- nss_inc="-I$abs_nssincpath" -- fi -- if test -d "$abs_nsslibpath" ; then -- nss_lib="-L$abs_nsslibpath" -- fi -- if test -n "$nss_inc" -a -n "$nss_lib" ; then -- AC_MSG_CHECKING(using in-tree NSS from $nssincpath $nsslibpath) -- else -- AC_MSG_CHECKING(could not find in-tree NSS in ../../dist) -- fi --fi -- - # if NSS is not found yet, try pkg-config - # last resort - if test -z "$nss_inc" -o -z "$nss_lib"; then diff --git a/dev-libs/svrcore/files/svrcore-4.1-gentoo.patch b/dev-libs/svrcore/files/svrcore-4.1-gentoo.patch deleted file mode 100644 index 346407e124e3..000000000000 --- a/dev-libs/svrcore/files/svrcore-4.1-gentoo.patch +++ /dev/null @@ -1,100 +0,0 @@ -diff -uNr a/m4/nspr.m4 b/m4/nspr.m4 ---- a/m4/nspr.m4 2016-04-22 06:30:23.000000000 +1000 -+++ b/m4/nspr.m4 2016-06-08 15:06:49.923333338 +1000 -@@ -52,28 +52,6 @@ - ], - AC_MSG_RESULT(no)) - --# see if we are doing an "in-tree" build with the other --# mozilla components --if test -z "$nspr_inc" -o -z "$nspr_lib" ; then -- for nsprpath in "../../dist" "../../dist/*.OBJ" ; do -- savedir=`pwd` -- cd $nsprpath -- abs_nsprpath=`pwd` -- cd $savedir -- if test -f "$abs_nsprpath/include/nspr/nspr.h" ; then -- nspr_inc="-I$abs_nsprpath/include/nspr" -- elif test -f "$abs_nsprpath/include/nspr.h" ; then -- nspr_inc="-I$abs_nsprpath/include" -- fi -- if test -d "$abs_nsprpath/lib" ; then -- nspr_lib="-L$abs_nsprpath/lib" -- fi -- if test -n "$nspr_inc" -a -n "$nspr_lib" ; then -- break -- fi -- done --fi -- - # if NSPR is not found yet, try pkg-config - # last resort - if test -z "$nspr_inc" -o -z "$nspr_lib" ; then -diff -uNr a/m4/nss.m4 b/m4/nss.m4 ---- a/m4/nss.m4 2016-04-22 06:30:23.000000000 +1000 -+++ b/m4/nss.m4 2016-06-08 15:06:49.923333338 +1000 -@@ -52,32 +52,6 @@ - ], - AC_MSG_RESULT(no)) - --# see if we are building "in tree" with the --# other mozilla components --if test -z "$nss_inc" -o -z "$nss_lib"; then -- nsslibpath=`echo ../../dist/*.OBJ/lib | cut -f1 -d' '` -- savedir=`pwd` -- cd $nsslibpath -- abs_nsslibpath=`pwd` -- cd $savedir -- nssincpath=../../dist/public/nss -- savedir=`pwd` -- cd $nssincpath -- abs_nssincpath=`pwd` -- cd $savedir -- if test -f "$abs_nssincpath/nss.h" ; then -- nss_inc="-I$abs_nssincpath" -- fi -- if test -d "$abs_nsslibpath" ; then -- nss_lib="-L$abs_nsslibpath" -- fi -- if test -n "$nss_inc" -a -n "$nss_lib" ; then -- AC_MSG_CHECKING(using in-tree NSS from $nssincpath $nsslibpath) -- else -- AC_MSG_CHECKING(could not find in-tree NSS in ../../dist) -- fi --fi -- - # if NSS is not found yet, try pkg-config - # last resort - if test -z "$nss_inc" -o -z "$nss_lib"; then -diff -uNr a/src/Makefile.am b/src/Makefile.am ---- a/src/Makefile.am 2016-04-22 06:30:23.000000000 +1000 -+++ b/src/Makefile.am 2016-06-08 15:06:49.923333338 +1000 -@@ -10,8 +10,8 @@ - Makefile.win \ - ntgetpin.rc - --lib_LTLIBRARIES = libsvrcore.la --include_HEADERS = svrcore.h -+pkglib_LTLIBRARIES = libsvrcore.la -+pkginclude_HEADERS = svrcore.h - libsvrcore_la_SOURCES = alt.c \ - cache.c \ - errors.c \ -diff -uNr a/svrcore.pc.in b/svrcore.pc.in ---- a/svrcore.pc.in 2016-04-22 06:30:23.000000000 +1000 -+++ b/svrcore.pc.in 2016-06-08 15:06:49.923333338 +1000 -@@ -1,11 +1,11 @@ - prefix=@prefix@ - exec_prefix=@exec_prefix@ --libdir=@libdir@ --includedir=@includedir@ -+libdir=@libdir@/@PACKAGE@ -+includedir=@includedir@/@PACKAGE@ - - Name: svrcore - Description: Svrcore - Secure PIN handling using NSS crypto - Version: @VERSION@ - Requires: @NSPR_NAME@ >= @NSPR_MIN_VER@ , @NSS_NAME@ >= @NSS_MIN_VER@ --Libs: -lsvrcore -+Libs: -L${libdir} -lsvrcore - Cflags: -I${includedir} diff --git a/dev-libs/svrcore/metadata.xml b/dev-libs/svrcore/metadata.xml deleted file mode 100644 index 585b0dc75dda..000000000000 --- a/dev-libs/svrcore/metadata.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <!-- maintainer-needed --> - </pkgmetadata> diff --git a/dev-libs/svrcore/svrcore-4.0.4-r1.ebuild b/dev-libs/svrcore/svrcore-4.0.4-r1.ebuild deleted file mode 100644 index 9b17ea88d8b9..000000000000 --- a/dev-libs/svrcore/svrcore-4.0.4-r1.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit multilib autotools eutils - -DESCRIPTION="Mozilla LDAP C SDK" -HOMEPAGE="http://wiki.mozilla.org/LDAP_C_SDK" -SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/directory/svrcore/releases/"${PV}"/src/"${P}".tar.bz2" - -LICENSE="MPL-1.1 GPL-2 LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -DEPEND=">=dev-libs/nss-3.11 - >=dev-libs/nspr-4.6" - -RDEPEND="${DEPEND}" - -src_prepare() { - epatch "${FILESDIR}"/"${P}"-gentoo.patch - eautoreconf -} - -src_configure() { - econf --with-pic -} - -src_install() { - default - - # cope with libraries being in /usr/lib/svrcore - echo "LDPATH=/usr/$(get_libdir)/svrcore" > 08svrcore - dodir /etc/env.d - doenvd 08svrcore - - dodoc ChangeLog INSTALL NEWS TODO README AUTHORS -} diff --git a/dev-libs/svrcore/svrcore-4.1.2.ebuild b/dev-libs/svrcore/svrcore-4.1.2.ebuild deleted file mode 100644 index 9de0cc2dfa35..000000000000 --- a/dev-libs/svrcore/svrcore-4.1.2.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools - -DESCRIPTION="Mozilla LDAP C SDK" -HOMEPAGE="http://www.port389.org/" -SRC_URI="http://www.port389.org/binaries/${P}.tar.bz2" - -LICENSE="MPL-2.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -RDEPEND=" - >=dev-libs/nss-3.11 - >=dev-libs/nspr-4.6" - -DEPEND="${RDEPEND} - virtual/pkgconfig" - -PATCHES=( "${FILESDIR}/${PN}-4.1-gentoo.patch" ) - -src_prepare() { - default - eautoreconf -} - -src_install() { - default - # cope with libraries being in /usr/lib/svrcore - echo "LDPATH='/usr/$(get_libdir)/${PN}'" > "${T}/08svrcore" || die "Unable to create env file" - doenvd "${T}/08svrcore" -} diff --git a/dev-libs/template-glib/Manifest b/dev-libs/template-glib/Manifest index 1afebfecbdb4..229e9b080f68 100644 --- a/dev-libs/template-glib/Manifest +++ b/dev-libs/template-glib/Manifest @@ -1,3 +1,5 @@ DIST template-glib-3.32.0.tar.xz 55152 BLAKE2B 53c5eda95f49d3358b1a52a8c821252efc28c823e92c03d387336aaff8540bab9f4762d9fb3f9694d0402dafb1cf09d56188bdcaca29343513b0b74d3c8d1684 SHA512 00e275c15e7daac4c3cf3cd85d8e0700e8ec504a02b68f46754a8f177c6a2cecbbc9b2b5701c85c94d0c06dfa9b51425b37decfa1f619ccb2c7351c0ce1643e7 +DIST template-glib-3.34.0.tar.xz 55348 BLAKE2B f5aa2b2032dce87a3091a7314012779f789ca6e4b1a8c7406ae92deb8283c9024ef33cf8d657741dbb175816371dd8082b7f0a2fff47b58842573248c12dfd6a SHA512 b89cc9890fd80a6858b34139ce1cd2394a43f598629e59f224f4db798a17457be9a2aa8307828af3591108ed6e9a953936a74df15ed1c8c8af2100306db5a497 EBUILD template-glib-3.32.0.ebuild 1092 BLAKE2B 6882cec4ef4cf524b09a62bf1f5c03830d4c1bd2b736ae38523b98eec43999763357d573d93fb613ff0c17ae6fbbd8577738ae4a9a00063afa47ecfe50e1ecd3 SHA512 b9e508b5ad5d59f41f4c6176bdd7caa3e868395870a40f771f96fcecc92b0e6270d8014352e65ad96fc424ce1dec33aa6385043bd91e55264ee0514c4f03832b +EBUILD template-glib-3.34.0.ebuild 1094 BLAKE2B 14652e2b699f844360e8db8051dc5ec35ae21abc300c1cb7bf25f6b58bc7f643df33fa9719d6a1c56ac65931a526cc586ad9bda839752410b302ecdad52839f2 SHA512 29b87583fc38a0422632cdf450e0ac12226a82e065555c46a669366c6aef19d3200209c658ccea33d1d80d4567f5ea48673de46a59691f2a2986608bedf68656 MISC metadata.xml 644 BLAKE2B 76c8a25f64948739ac646ea100b365426db6b9f674502d2db83a93ad7203bcf2c6a49396daf959b4f3b3b89777e5f2a02c8a5a168041f6f93168f95c46fd7987 SHA512 272335daa1c3844c85dde4fe91b5020112c0652547d644fdb04126219ea39a3c0cfc16bb3d054cc362393507844e9a63d4c24e5e0f323d2bb3fc8b43e65810a6 diff --git a/dev-libs/template-glib/template-glib-3.34.0.ebuild b/dev-libs/template-glib/template-glib-3.34.0.ebuild new file mode 100644 index 000000000000..c008b025235a --- /dev/null +++ b/dev-libs/template-glib/template-glib-3.34.0.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit gnome.org meson xdg vala + +DESCRIPTION="Templating library for GLib" +HOMEPAGE="https://gitlab.gnome.org/GNOME/template-glib" + +LICENSE="LGPL-2.1+" +SLOT="0/1" +KEYWORDS="~amd64 ~x86" + +IUSE="gtk-doc +introspection vala" +REQUIRED_USE="vala? ( introspection )" + +RDEPEND=" + dev-libs/glib:2 + dev-libs/gobject-introspection:= +" # depends on go-i unconditionally for own functionality, USE flag controls GIR/typelib generation +DEPEND="${RDEPEND}" +BDEPEND=" + vala? ( $(vala_depend) ) + dev-util/glib-utils + sys-devel/bison + sys-devel/flex + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig + gtk-doc? ( dev-util/gtk-doc ) +" + +src_prepare() { + use vala && vala_src_prepare + xdg_src_prepare +} + +src_configure() { + local emesonargs=( + -Denable_tracing=false # extra trace debugging that would make things slower + -Denable_profiling=false # -pg passing + $(meson_use introspection with_introspection) + $(meson_use vala with_vapi) + $(meson_use gtk-doc enable_gtk_doc) + ) + meson_src_configure +} diff --git a/dev-libs/tomsfastmath/Manifest b/dev-libs/tomsfastmath/Manifest index e49e7841eaf1..7ffb487eea57 100644 --- a/dev-libs/tomsfastmath/Manifest +++ b/dev-libs/tomsfastmath/Manifest @@ -1,4 +1,4 @@ AUX tomsfastmath-0.13.1-makefile-fix.patch 1703 BLAKE2B 2182f88b8569fac105eb179fdc7c10a7c9b7b17619a725c30d8374a2589f048e0ca0fe71ffb2431e058a264b104bc091deb800215a490399e722055b39adee0e SHA512 f5e5df821ecc7beb8684116294322dae8bf166bfbc7cf3d5262534e036f1d486854e58ad2c2da382b8f08aa6b9db71d91607289587c4247837bdfc3313ad5cff DIST tfm-0.13.1.tar.xz 322684 BLAKE2B 393c0e0e018b199c9fc975ab3013466399ea337f520f4634649a9e61b2218b9a6b218d11212b535fc8bbd2bf40d8722fc413dc60756f1b8ff7c78da049765083 SHA512 84225fe81bbcd1df7e40ed0b8c8077d60612246a76f3149b672dfd1066eb0179262fa4f5a42ffd2034e60cb74cfd86e0b49139371971ebbb4f41a4ecebca2111 -EBUILD tomsfastmath-0.13.1.ebuild 1649 BLAKE2B 740e06df89c6e2a7fa009158ed8f32f6c3f4769bb0a11f9d1239e7248c546e2e9865a7d7f1bb591f4e703d7f585f5237d2bb807f6170d1efa871b5a64178fe5a SHA512 e2004cc6fbd4ad3adaf1a19762169a6e8cceab083b0af07eb0d165351b4a31657f4ff1abc140cf2148f5e8e028d1a6c75c621f3f978a8acd45b81f590817a04b -MISC metadata.xml 481 BLAKE2B a61b20b9947cf71dcc385a04643a32c161c3314a65210f3d18d0743611890a066b9f9e7ddebb02c9ba39e6c6e82058dd78c796903357c432813f4e4323c06038 SHA512 1235eb2954bd7b7ea6e0ce326e50003255a49f558c7e2c08f40f2f7db71532643f1abd3ef28aaf3fa0c2f3e32d57ae07af7f9d49338bbe35bf9d690a023c5655 +EBUILD tomsfastmath-0.13.1.ebuild 1643 BLAKE2B 15e096a6fee99486b8bab90053a461a1282aa70fa484c325f30c0ea7da3e24c883faf57c7c8d2597fe7e4231cb422a37b8b53d220a8689cc5db380f366b95922 SHA512 ecad188a7f91f5d376fa6786f4418c6c02d9e9b8a014eaee26535adebef20a26301b8cd2bfa39d56ad1dbf64d7fad275694f4780507c2457e261ea7722cb05d7 +MISC metadata.xml 358 BLAKE2B 8dc827f40c0b51ca769622a56b5282b3265428fccc2330cb1732faa1ab03a6962057eccda6c0c0b58bfed3fa190e64c77fad4e6480cf65fe7ee251eb087422e8 SHA512 1473c76d0d4a743815de12895599cb3f9f97201f0eca1231af0f16600b5b795dcd8c4cba4847e3166004dc0b3319011bba2945dda510bd789d7b0ee066d96f88 diff --git a/dev-libs/tomsfastmath/metadata.xml b/dev-libs/tomsfastmath/metadata.xml index dfaf4142e2c6..15dd85b520a9 100644 --- a/dev-libs/tomsfastmath/metadata.xml +++ b/dev-libs/tomsfastmath/metadata.xml @@ -2,13 +2,9 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>sam@cmpct.info</email> + <email>sam@gentoo.org</email> <name>Sam James</name> </maintainer> - <maintainer type="project"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> <maintainer type="person"> <email>mjo@gentoo.org</email> <name>Michael Orlitzky</name> diff --git a/dev-libs/tomsfastmath/tomsfastmath-0.13.1.ebuild b/dev-libs/tomsfastmath/tomsfastmath-0.13.1.ebuild index 8ddde1737502..84470bb7f274 100644 --- a/dev-libs/tomsfastmath/tomsfastmath-0.13.1.ebuild +++ b/dev-libs/tomsfastmath/tomsfastmath-0.13.1.ebuild @@ -17,7 +17,7 @@ LICENSE="Unlicense" # https://abi-laboratory.pro/index.php?view=timeline&l=tomsfastmath SLOT="0/1" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86" PATCHES=( "${FILESDIR}/${P}-makefile-fix.patch" diff --git a/dev-libs/tre/Manifest b/dev-libs/tre/Manifest index 639dd72dc066..e6bafcbb2ec7 100644 --- a/dev-libs/tre/Manifest +++ b/dev-libs/tre/Manifest @@ -1,6 +1,5 @@ AUX 0.8.0-CVE-2016-8559.patch 2658 BLAKE2B 12a7d12d35e2d61457fbb9e368cfa738bad74ac490ce4ffa59d1494d879d9db481b89b0e3ef3a2a4601b8280ff8f1c54f4ccdc00716a904bff291923c4aaa02c SHA512 9f45299ccd21cc4e78946ad22963d4505e9cd430f49f275fbb742696029530e7e6eb848b0ae4bf55bb5e2a2ee77d3cf272b02e2a6a2ba7c3bd69f68816e300b2 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 1455 BLAKE2B 681ff4583cc680620528c77556aba91a077e2502bb9f0c02fec1c95b1f90d2a6e855d1a86f8c7884bc0cf51143dee91acaba418599aca7e16489c321305c5085 SHA512 51afcd8965a0d723b3d8a52539e190ceab59db5ce2b98c47ad932c549fc98545b8f926990b9ed7db6e7f64eeac013d80693c898bd4e61300c4f2da175f5ac945 +EBUILD tre-0.8.0-r2.ebuild 1454 BLAKE2B 95bd25dbcb07107500ef0de52c942e08e8c0031f8d40327508fcc24cad81108363e8311dc0cad66a07f0d54b53a073eaffdae928445aceac9ae88ea804ae8ae6 SHA512 9f2f38f70562649863608633b0d96ec4c21968eb8e20ccfc9404a57f5f0520e165bf00aa1343270531277a30171606d4c7648e231e4c6f28342908bfeaef30f3 MISC metadata.xml 353 BLAKE2B 0346462595f8f9a38758ce0817e787b87b35b329aef65d2921214d32bd9313023f006ee2ab31084a03a2f8a8ecf1d556dd11f190ac2467ebcd061bc144b977e4 SHA512 907b341e747fb9d7ba7b76f300d373284a21a59e3d649275c4a53ac681177f94e9d0d9f56b15365008262b2aba91236d9ac5623387313c7b74b65b2b70871d3b diff --git a/dev-libs/tre/tre-0.8.0-r1.ebuild b/dev-libs/tre/tre-0.8.0-r1.ebuild deleted file mode 100644 index 63e4a0a6414f..000000000000 --- a/dev-libs/tre/tre-0.8.0-r1.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 multilib - -DESCRIPTION="Lightweight, robust, and efficient POSIX compliant regexp matching library" -HOMEPAGE="https://laurikari.net/tre/ https://github.com/laurikari/tre/" -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" -IUSE="nls static-libs" - -RDEPEND=" - !app-text/agrep - !dev-ruby/amatch - !app-misc/glimpse" - -DEPEND=" - ${RDEPEND} - virtual/pkgconfig - nls? ( sys-devel/gettext )" - -PATCHES=( "${FILESDIR}/${PV}-pkgcfg.patch" ) - -src_prepare() { - default -} - -src_configure() { - econf \ - --enable-agrep \ - --enable-system-abi \ - $(use_enable nls) \ - $(use_enable static-libs static) -} - -src_test() { - if locale -a | grep -iq en_US.iso88591; then - emake -j1 check - else - ewarn "If you like to run the test," - ewarn "please make sure en_US.ISO-8859-1 is installed." - die "en_US.ISO-8859-1 locale is missing" - fi -} - -src_install() { - local HTML_DOCS=( doc/*.{css,html} ) - - default - - # 626480 - mv "${ED%/}"/usr/bin/agrep{,-tre}$(get_exeext) || die -} - -pkg_postinst() { - ewarn "app-misc/glimpse, app-text/agrep and this package all provide agrep." - ewarn "If this causes any unforeseen incompatibilities please file a bug" - ewarn "on https://bugs.gentoo.org." -} diff --git a/dev-libs/tre/tre-0.8.0-r2.ebuild b/dev-libs/tre/tre-0.8.0-r2.ebuild index aad4e57c4865..734f35f78699 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/tut/Manifest b/dev-libs/tut/Manifest deleted file mode 100644 index be42cde42fce..000000000000 --- a/dev-libs/tut/Manifest +++ /dev/null @@ -1,5 +0,0 @@ -DIST tut-2013.12.18.tar.gz 248575 BLAKE2B 24fe433e38ac9c7aecdf9bc32b1a799eac39e700a9275d46e125616e4fcdbcb60ac6db8bbde9e11cd2fa7b70bc3a0bd0aafef7a2ebab53a3955b188b2ec11eb0 SHA512 daf232df8d27a5600209ee44dc72f83b9574b68c14cf9566aa826091767e2fc3c00a9e03e83386f46d7f2030bb6d6af5db6af326424a4c0bc41063e227ab8004 -DIST tut-2016.12.19.tar.gz 261753 BLAKE2B e0c053de5c50b7dd1dee44f64296e4d1050aa175f34ff0b2818817366774544cc19261171dc2a68ba76660866368fd3ad22ca8743c0a954d4d87bea987beb5c8 SHA512 296846dcaf9ed357232f69ce21927eea6a79173b66c5f16d41d7cbdb4dd5a18cc8b15217af56ef7a0a5fca0e55d148431bd872d4b815c239d21e5e4dfb4f312d -EBUILD tut-2013.12.18.ebuild 552 BLAKE2B d94eb0db3dc238b3239c1c3fa60df11dc16fb37885652d85b77676b18917ad0babba0035c84d56c5e50b09c00f67ba107c9b51d175b840db8dd355936eff26c1 SHA512 b2342e53beed84169c961ed43fc8fbdcf6d66512d82865ef207be96c9f7f69e8a4839be3b24b7191e618ec5991149c60f1c2e8b143ac1a4f0fee2157289933a2 -EBUILD tut-2016.12.19.ebuild 552 BLAKE2B d94eb0db3dc238b3239c1c3fa60df11dc16fb37885652d85b77676b18917ad0babba0035c84d56c5e50b09c00f67ba107c9b51d175b840db8dd355936eff26c1 SHA512 b2342e53beed84169c961ed43fc8fbdcf6d66512d82865ef207be96c9f7f69e8a4839be3b24b7191e618ec5991149c60f1c2e8b143ac1a4f0fee2157289933a2 -MISC metadata.xml 456 BLAKE2B 1f3ece9e40ae65ee9639cd1e55c25117c2d509589d5bd3b38414abaf91900bd3ab44f456190430a1d070ffe07d4cfe7a194c4bb816f55055fc84db8c4ed54e1e SHA512 570bd90f8839d98d67d41c3e9d2a9cf5fa7a8cc4f7624765e712727cae26038eb7b8b7e9ff29aa2647ccd60ebbb9eb24e522ba8e54a4e3cb962e09f397c373b7 diff --git a/dev-libs/tut/metadata.xml b/dev-libs/tut/metadata.xml deleted file mode 100644 index b5a95aa9bfb3..000000000000 --- a/dev-libs/tut/metadata.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>junghans@gentoo.org</email> - <name>Christoph Junghans</name> - </maintainer> - <maintainer type="project"> - <email>sci@gentoo.org</email> - <name>Gentoo Science Project</name> - </maintainer> - <upstream> - <remote-id type="github">mrzechonek/tut-framework</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-libs/tut/tut-2013.12.18.ebuild b/dev-libs/tut/tut-2013.12.18.ebuild deleted file mode 100644 index 2d40e8998857..000000000000 --- a/dev-libs/tut/tut-2013.12.18.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE='threads(+)' -NO_WAF_LIBDIR=yes - -inherit python-any-r1 waf-utils - -DESCRIPTION="C++ Template Unit Test Framework" -HOMEPAGE="http://mrzechonek.github.io/tut-framework/" -SRC_URI="https://github.com/mrzechonek/tut-framework/archive/${PV//./-}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND=${PYTHON_DEPS} -RDEPEND="" - -S="${WORKDIR}/tut-framework-${PV//./-}" diff --git a/dev-libs/tut/tut-2016.12.19.ebuild b/dev-libs/tut/tut-2016.12.19.ebuild deleted file mode 100644 index 2d40e8998857..000000000000 --- a/dev-libs/tut/tut-2016.12.19.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE='threads(+)' -NO_WAF_LIBDIR=yes - -inherit python-any-r1 waf-utils - -DESCRIPTION="C++ Template Unit Test Framework" -HOMEPAGE="http://mrzechonek.github.io/tut-framework/" -SRC_URI="https://github.com/mrzechonek/tut-framework/archive/${PV//./-}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND=${PYTHON_DEPS} -RDEPEND="" - -S="${WORKDIR}/tut-framework-${PV//./-}" diff --git a/dev-libs/ucl/Manifest b/dev-libs/ucl/Manifest index 86d2d33fa4f2..f17e99698afd 100644 --- a/dev-libs/ucl/Manifest +++ b/dev-libs/ucl/Manifest @@ -1,5 +1,5 @@ AUX ucl-1.03-CFLAGS.patch 4187 BLAKE2B 1f59a598cd58d53b25ecb57cf35720a56de022d19c0b57d749ec7cd35b88d8549db712affecbd5902bf98b9b55d375c6b16107d23c3ca126c57ae5ed4d3dbc6c SHA512 4d9b608b2b19cecc6693beb73c5f775b6f1ffbe1e1138dfe77a1318891705a10319e4e728f193f68555bff55a3a24871ec58c2823c487442559987dcb392a890 AUX ucl-1.03-x32.patch 6437 BLAKE2B 285d7efd85f631752e208f95dc9be4ed8904da63d0e0a20b3bed1f62bc08b6ba0f155f33d1ab9ef3a9f883f4068fa49de4bb286fb73a7aee5638005b18b31348 SHA512 e6a481c12255c7756d424eded3de923a971c8ebb440776556d467ab950ed0944f3468b1f875f1ae835edfe47b44a6f738d5cb16bd8c49c085f6239685528a6ef DIST ucl-1.03.tar.gz 534881 BLAKE2B 98df000bcf445963b901acf88b5d1a1065fd6f3eafd1b8adbda5bfe7ac1527b979252ff9d1e8474785f6f23a1a7452e39bf47ebac9216fcfff862625769cabd6 SHA512 7dd1824d01b4bb41ee03bbceddc634a9f7f910d235e5cca163d783680d6743f0f3cc309bbbcc1e094d897d549d3805a555f9093b4d77805443d896dd1862aa34 -EBUILD ucl-1.03-r1.ebuild 1144 BLAKE2B 050834d448a60ce146e3c3a113a1da0dcebc0c602b6062b7dde59e9974dd6157a86050a3c2b7e963ff36845b5f28d9384f7d6f7f23720c3661e65efcce532f30 SHA512 7eb908b112a79558660ef68b6bb9512457ca0627af4af25ae8aac52bfafc15403aa65a2e9afdf106df4dbac05a86668607cee8cde0d6653a9ad956e569e8b339 +EBUILD ucl-1.03-r1.ebuild 1156 BLAKE2B d26b7cca67f63112f5abc4896c8849135e8d8fe3c47c19763233ef71035e4f6b070f8be3ee7b076a3380e8556bb8b1262e660028edf74a31b81c2b094ba51362 SHA512 a2e4e0f66f91dc49c62238b41a483404f16812476d1f414d903bc06f4d4bd6603e3db1db21c521a67253123eff65f77c44b99afd38a2917ad6ffd74d75290913 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 diff --git a/dev-libs/ucl/ucl-1.03-r1.ebuild b/dev-libs/ucl/ucl-1.03-r1.ebuild index 7c4f7a2e0dcc..9828287020db 100644 --- a/dev-libs/ucl/ucl-1.03-r1.ebuild +++ b/dev-libs/ucl/ucl-1.03-r1.ebuild @@ -10,7 +10,7 @@ SRC_URI="http://www.oberhumer.com/opensource/ucl/download/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86" +KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86" IUSE="static-libs" DEPEND="!!dev-libs/libucl" diff --git a/dev-libs/unibilium/Manifest b/dev-libs/unibilium/Manifest index 2fe0bbc5e2bf..821711525d9f 100644 --- a/dev-libs/unibilium/Manifest +++ b/dev-libs/unibilium/Manifest @@ -1,3 +1,3 @@ DIST unibilium-2.0.0.tar.gz 112570 BLAKE2B 95c24c53e11590faabf3d4b8484c344be0b2a0988f05bde785d03dac338d9f18fc65324f5ccc402723c9fabe2990083ce260d8fa57129591a1b2a1f8405eff9d SHA512 e93f319b7a85a4441c7f4e30d12d906805f066b14bff03331e48b6257da893f6447e257c8ba731077ad4b54d82d3ebf1ccf1fcf2d864273e0d4321a26ef7c172 -EBUILD unibilium-2.0.0.ebuild 777 BLAKE2B 0d7cce3b04cc44f4a3127a33801e05431a6464293b3984f97f2c6e5611bdda8cd3891d7f47091fff5398542f5636b673e1cfd997e26b02dc1f598ec59b1e3517 SHA512 c5205a97c26e17b6f65694d5edca78364831bc19738258880e735f1638f40632833f5202ea7e513f64ca7aec4d4522ebfca0ef0da36eb99028244f31ed9b3ac7 +EBUILD unibilium-2.0.0.ebuild 784 BLAKE2B f8decdab42671f3f9891ae9f019692f0c658c527c902ee2499395c1b0ec34b49f0056deec87396ed439ea1cb0a25d12b50d7727da739d4db5f4d9d11add57d43 SHA512 2c1f1edc2b1e0ace8f7dc54840636558873004f44d68ce0f434cfc403437d9fe5873ca1a66841febcaf4923bff2c82ac9d0c7937c180f11cddc721783d6eef66 MISC metadata.xml 339 BLAKE2B 36a1748f4030bc835201a0001ddf70b7ee4f1a73703c40a98650df0ef8b7e48e8acf3bb2272232ce528e2794310908214f1f9d9ac3ed75cf5bfadac1bd1cf19f SHA512 27c4da145b68654f559c956b5414a877ff9ca54a794390e690e1c11596dfda61d4d2ebfc3f891593f40c42f4070dd802ae7c73a9ece69e4c9ce0c1f76873644a diff --git a/dev-libs/unibilium/unibilium-2.0.0.ebuild b/dev-libs/unibilium/unibilium-2.0.0.ebuild index 9df40a41a5da..22b6e120a8d1 100644 --- a/dev-libs/unibilium/unibilium-2.0.0.ebuild +++ b/dev-libs/unibilium/unibilium-2.0.0.ebuild @@ -10,7 +10,7 @@ SRC_URI="https://github.com/mauke/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="LGPL-3+ MIT" SLOT="0/4" -KEYWORDS="amd64 arm x86" +KEYWORDS="amd64 arm ~arm64 x86" IUSE="static-libs" DEPEND=" diff --git a/dev-libs/unittest++/Manifest b/dev-libs/unittest++/Manifest index d651b7fdf517..8045824d4422 100644 --- a/dev-libs/unittest++/Manifest +++ b/dev-libs/unittest++/Manifest @@ -1,5 +1,5 @@ -DIST unittest++-1.6.1.tar.gz 52536 BLAKE2B 0a5e7cbe1131565631c0537a1a262b6053b5010497eeaf76690f465cdbca45157feb6686faaf37a37f4554e37b54051161c3183651315509ada143975d7211f4 SHA512 2bb03def8b6ac84dbb6e5e440e5be8648199096fdc93d6666b704386e2c2279b329be6bda47c81bd8a8c485334059fb2a53fdd90358005a95b8add6f057c25ce +AUX unittest++-2.0.0-fix-tests-with-clang.patch 1018 BLAKE2B 5913b010ceae5975b8cdcfe7656c137cfe47845ae92815d3b7fa66f429a712e686cb7accb400c43149458b6716020c7ff48f0a673a7c2b7bcc36f5cf0fcd40ae SHA512 dd77794e8c22e168235f14c3c00381bf7439bfe60a700ae038290c93e2f6faa276d4f45de17a159d7a1edbb182a40b078b7751a25e1dcf646e7d311fd33e31cf DIST unittest++-2.0.0.tar.gz 54100 BLAKE2B 5aceda6e76f4536054c8de0fb4a4a17027d0707101fb323883734d420f038aeb094fb6567e41145804f012c952a5807bdd6fe1bae1e4a09a6e36c5f1bbc5717e SHA512 39318f4ed31534c116679a3257bf1438a6c4b3bef1894dfd40aea934950c6c8197af6a7f61539b8e9ddc67327c9388d7e8a6f8a3e0e966ad26c07554e2429cab -EBUILD unittest++-1.6.1.ebuild 808 BLAKE2B ef668c0aac98729d9f5aab1e1784c8003b33bc6de8d673115e1f327fea61a5ad99f897284919342b9ab6afdf976a7e84d089c95ec1cba2ce7f15412b51bf6ce1 SHA512 70c02578ddf917f2ad2b5614405b5cb23a0ed5d9d3ef67638dfaef1e192edbe9350e9dbd2a152fffb08981dd053ada940a36a2b25ccd82fe59f9e2b440e609ef -EBUILD unittest++-2.0.0.ebuild 854 BLAKE2B 664366a4e93f8808b9ef366c45a00a741beb2e1b61be1547755d6eff93e20a9d9536caacdbc96982c192f8539cfd392751668d520d5b471cac9f17c46693eb4c SHA512 4d34c047f476ff0464602cb86da6a97f54da7b64e01c6d1f5675788b1b6c0201ac5b433886615df2876480e1f7a763b79e877a1a311fa6cc53dd2e05a7a042fe +EBUILD unittest++-2.0.0-r1.ebuild 991 BLAKE2B e2534d3950b1398a4aef2985159eb52f80f7e5f4bc253e972044fbd4ba9d3c9ec8486715712a27937069553e394b6510953a596bc41ee788061b3d203ea5e039 SHA512 d05fd6971bcd8f7816eee1d6b44b07a35dd392322c2d2ac0a2d439688b8cf7c0be13d50ab3d4b4bc354628ea959862fe99b2bd62c11ab79716bc1967f727ec46 +EBUILD unittest++-2.0.0.ebuild 1007 BLAKE2B fe8d05aa14bbf52caba06854a459eeba25ca8db8c081adb0abf468ec8585370543286fd58424078c9b92a9a8b2b8a604c76bf2f11b5fdf389af6d50e2dd4aa29 SHA512 8abb78978aa9283e9901e909d46fd31d6f74d97cee1d8dbd0926f4c7ade5c2c2948acdc9fa334f26b7801fe681ec54f7751fea0e86647f1ce90e20afe48fbe35 MISC metadata.xml 408 BLAKE2B 79c6d8551125de4ae8c262513a3c8a7fa46d1518418312aed741eebc9f60ca5be8032ad4df6ca08b67d5fe65a46b11eb99533817556248df44dd04da741bee88 SHA512 6fec64fc5f6ecc1971d0cf79caac9d3529b4e9a7cc32b0b1a39254761de8c487df692b9730221866276f44a79ab7bae0e4fc8cccdacbf7bfec8e4c372fdada25 diff --git a/dev-libs/unittest++/files/unittest++-2.0.0-fix-tests-with-clang.patch b/dev-libs/unittest++/files/unittest++-2.0.0-fix-tests-with-clang.patch new file mode 100644 index 000000000000..201ff10de5a3 --- /dev/null +++ b/dev-libs/unittest++/files/unittest++-2.0.0-fix-tests-with-clang.patch @@ -0,0 +1,27 @@ +commit 2423fcac7668aa9c331a2dcf024c3ca06742942d +Author: Dan Huantes <daniel.f.huantes@saic.com> +Date: Thu Aug 15 08:26:41 2019 -0500 + + CrasingTestsAreReportedAsFailures no longer core dumps on Clang Release + + Found that Crashing tests at some point in Clang + history were actually caught but testing on + Clang 6.0 and Clang 7.0 this is not the case. + So added Clang to the list of compilers that + don't run this tests. Noted that several + other Pull Requests were failing for the same + reason. + +diff --git a/tests/TestTest.cpp b/tests/TestTest.cpp +index 5a4e1ca..0db0650 100644 +--- a/tests/TestTest.cpp ++++ b/tests/TestTest.cpp +@@ -72,7 +72,7 @@ namespace { + CHECK_EQUAL(1, results.GetFailureCount()); + } + +-#if !defined(UNITTEST_MINGW) && !defined(UNITTEST_WIN32) ++#if !defined(UNITTEST_MINGW) && !defined(UNITTEST_WIN32) && !defined(__clang__) + // Skip this test in debug because some debuggers don't like it. + #if defined(NDEBUG) + TEST(CrashingTestsAreReportedAsFailures) diff --git a/dev-libs/unittest++/unittest++-1.6.1.ebuild b/dev-libs/unittest++/unittest++-2.0.0-r1.ebuild index 5bba0de8b8cc..0da36ef58d5e 100644 --- a/dev-libs/unittest++/unittest++-1.6.1.ebuild +++ b/dev-libs/unittest++/unittest++-2.0.0-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit cmake-utils +inherit cmake MY_PN="unittest-cpp" MY_P="${MY_PN}-${PV}" @@ -11,6 +11,7 @@ MY_P="${MY_PN}-${PV}" DESCRIPTION="A lightweight unit testing framework for C++" HOMEPAGE="https://unittest-cpp.github.io/" SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${MY_P}" LICENSE="MIT" SLOT="0" @@ -18,15 +19,22 @@ KEYWORDS="~amd64 ~x86" IUSE="test" RESTRICT="!test? ( test )" -S="${WORKDIR}/${MY_P}" +# https://github.com/unittest-cpp/unittest-cpp/commit/2423fcac7668aa9c331a2dcf024c3ca06742942d +PATCHES=( "${FILESDIR}/${P}-fix-tests-with-clang.patch" ) src_prepare() { + cmake_src_prepare + + # https://github.com/unittest-cpp/unittest-cpp/pull/163 sed -i '/run unit tests as post build step/,/Running unit tests/d' \ CMakeLists.txt || die - use test || sed -i \ - '/build the test runner/,/target_link_libraries(TestUnitTest++ UnitTest++/d' \ - CMakeLists.txt || die - cmake-utils_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DUTPP_INCLUDE_TESTS_IN_BUILD=$(usex test) + ) + cmake_src_configure } src_test() { diff --git a/dev-libs/unittest++/unittest++-2.0.0.ebuild b/dev-libs/unittest++/unittest++-2.0.0.ebuild index af6ca1612495..88339de12284 100644 --- a/dev-libs/unittest++/unittest++-2.0.0.ebuild +++ b/dev-libs/unittest++/unittest++-2.0.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -11,6 +11,7 @@ MY_P="${MY_PN}-${PV}" DESCRIPTION="A lightweight unit testing framework for C++" HOMEPAGE="https://unittest-cpp.github.io/" SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${MY_P}" LICENSE="MIT" SLOT="0" @@ -18,7 +19,8 @@ KEYWORDS="amd64 x86" IUSE="test" RESTRICT="!test? ( test )" -S="${WORKDIR}/${MY_P}" +# https://github.com/unittest-cpp/unittest-cpp/commit/2423fcac7668aa9c331a2dcf024c3ca06742942d +PATCHES=( "${FILESDIR}/${P}-fix-tests-with-clang.patch" ) src_prepare() { cmake-utils_src_prepare diff --git a/dev-libs/univalue/Manifest b/dev-libs/univalue/Manifest index a81a9bd5b3b1..1173f1a31a06 100644 --- a/dev-libs/univalue/Manifest +++ b/dev-libs/univalue/Manifest @@ -1,10 +1,4 @@ -DIST univalue-1.0.2.tgz 14201 BLAKE2B 47a72a629bc3a0ff193c33d89c3a97e19abca833180473b0a37a6f5a4ba15b7886d1a605a905f7a94af2512e4d1e9f2a7879cae4c5a0af78ac9dfb23a0a581c7 SHA512 727096735dbad082741fb863c9066936a80d7337b1d7c4c289107d240b7f695756a8720f5db320f0c7521b523e299829bd49833b6a31969d8aa43267653a4f2f -DIST univalue-1.0.3.tar.gz 16820 BLAKE2B 40dd6c4e08e8f4a27731aa0fd6931162f8427a709cc3fc16c049a093d17a08f002a6eb08cf3c4fa9870805f3eed7627c8c9baa7cdc6d6fc8970a085488a955b0 SHA512 1c8358baca82b44d7a762c0cb3b7bef6f36d2f3d0ab29045224c1c39b69fbcbb66573dfb9ee4705f71aadff542cc9f02e98921b1c013748e2c0cd63c386bc1df -DIST univalue-1.0.4.tar.gz 19677 BLAKE2B 1565a8aabe9b4dfddb2a8b577077bfe50a66aca62e63cfafaaadf1429ad08c0d8aa9f69469b063b2f3c51885addd0a6ab820e06f1ae1b9850de163dd2d1065fd SHA512 cd503ad2f59ea47afbce4acd352ba2baa06b8237f9cfec669353556cff85761e85717ba16c2dc76094b9a9554e5cb27e73e726f2c2d1e6dc5c76e4a5c4cd8edc DIST univalue-1.0.5.tgz 20114 BLAKE2B 21f1432bf62325547db7a1ce0c84d80f47b160dc19de3567eea4678a0f242fb2c814daa6955f7a2b45c5b75e859b6d2ecdfcd68abe58f573752c0f037a099d10 SHA512 9c2273d82267aaecd2b017d00ae8bc40f7f40fff10ce6176bbea0df93d7c9478fc76a38101f0b55ded0a3c4fc49f00c868aad33deca4d936b85342ec6a394eab -EBUILD univalue-1.0.2.ebuild 600 BLAKE2B 2fceb5490a188a82f12d3144e7a2c708803de0882e814ad29f67d736133996e5ca64d6e8ef6b6d2b95a1e0293980f324d602435d745aa74495452ae3357289d6 SHA512 feff1fa04de126a4e9217846c9ed115a8647dfeff365f52cf8309cb6e6c0d9ad3e728146c8232b8661ccdda786b304c3b15554f6a8469dcd55a80a888961f128 -EBUILD univalue-1.0.3.ebuild 611 BLAKE2B 5b04edd36949349c453c46ee2305307e131db0e0c99e112965c186da6ddf3fc92c6fbb66572eacf2cec431afeb2ff967b3802e4cf48fa5f857506e7aed8429e9 SHA512 df499ad6fe120c9facaa1c7b3493e923a8c9bbb683a3e4846093ebbf9c7f702c571b3bb0755a9604caf03fa70c016362ed4b871b556973e4f7873beb418359d3 -EBUILD univalue-1.0.4.ebuild 724 BLAKE2B fbfb620290be3fa105633bad5c9d2855b9a6fc4eda41487bb9ad22b7ddc2e88aa49bae8ded734a4b46138ea27dfcdbf0013d8310469dd61a2fdfa71225f54287 SHA512 8365ca1146a8d8a7e0f6eaddb8e4450f394569d44af1a3cc9d56226d520508bff8d089ce94a4c46ea9997bc55efb9cfc4a95797bcd559c3a187297a0745ee272 -EBUILD univalue-1.0.5.ebuild 579 BLAKE2B 9afbba833ffbbd36a60630d9c8d8a0e66f0ddd9302bfe5250bf52d08219e926ebca42e3d8fbe59d9d75b953939e29af1db32dbf000a4eb790da8ebd8706a0c90 SHA512 64ce87a1a28e6043cc552a87d2d9a33bff9a264edb06cfe9f28d8cb64d22a6b9eef5a247b1726f7761d6300e9bf45225dd5973f949cae79aadc615667b97c565 +EBUILD univalue-1.0.5.ebuild 576 BLAKE2B cf6789b8dbf97d2693885ab9e9ecc2be2284daea820bce6bddafac27f63dce3cbaf81423bed41d4b6bbb49b7e829297fd4a3a535873244253ef3dd7f77e55100 SHA512 597ec9ce7a151758e715af7a41169dafa133c3f93f49d999dd9f08aa37f547d53f2371a6c663166606cfe95ca93ac3116a1b67e5519c386d72e1a9456d2364f4 EBUILD univalue-9999.ebuild 720 BLAKE2B 625f17f804ae73f4698e5d46c0b20e213a66097e781abd5043ee634895d785dc6a961ce5119a12dfc298eaf55ea124627e5a5dfebc8cecf2ae9a6b83fa90ec97 SHA512 6f0170b7368a12f6ac1acb83c53626d9c151c7d81ec2460d21c5f060803c28c63b93be9a38a94bab03ecf82d194decd566905ea1402a2240c4d06f55fd951d13 MISC metadata.xml 471 BLAKE2B df69918c0c8a76f7801782856f7f95fd5108153da22239012d4f333be6e099c70ddd560055eb8a1d806a72d9e37465816171e60771c1c94c3c67f0e1a55238dc SHA512 d64632af71d51e5aa814bd58fa773fbc877abe1e59774e18fefcfab2949f08d8cf4e0482fe5acefb2dea3e0873e7d269d950c09ae4b65cb474bdd8a3407b2e39 diff --git a/dev-libs/univalue/univalue-1.0.2.ebuild b/dev-libs/univalue/univalue-1.0.2.ebuild deleted file mode 100644 index 956bf8c76b31..000000000000 --- a/dev-libs/univalue/univalue-1.0.2.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils ltprune - -DESCRIPTION="C++ universal value object and JSON library" -HOMEPAGE="https://github.com/jgarzik/univalue" -LICENSE="MIT" - -SRC_URI="https://codeload.github.com/jgarzik/${PN}/tar.gz/v${PV} -> ${P}.tgz" -SLOT="0/0" - -KEYWORDS="amd64 arm ~arm64 ~mips ~ppc x86 ~amd64-linux ~x86-linux" - -IUSE="" - -DEPEND="" -RDEPEND="${DEPEND}" - -src_prepare() { - ./autogen.sh || die -} - -src_configure() { - econf --disable-static -} - -src_install() { - default_src_install - prune_libtool_files -} diff --git a/dev-libs/univalue/univalue-1.0.3.ebuild b/dev-libs/univalue/univalue-1.0.3.ebuild deleted file mode 100644 index 8e6fe5bdaf55..000000000000 --- a/dev-libs/univalue/univalue-1.0.3.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools - -DESCRIPTION="C++ universal value object and JSON library" -HOMEPAGE="https://github.com/jgarzik/univalue" -SRC_URI="https://codeload.github.com/jgarzik/${PN}/tar.gz/v${PV} -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0/0" -KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~x86 ~amd64-linux ~x86-linux" -IUSE="" - -DEPEND="" -RDEPEND="${DEPEND}" - -src_prepare() { - default - eautoreconf -} - -src_configure() { - econf --disable-static -} - -src_install() { - default - find "${D}" -name '*.la' -delete || die -} diff --git a/dev-libs/univalue/univalue-1.0.4.ebuild b/dev-libs/univalue/univalue-1.0.4.ebuild deleted file mode 100644 index f4acb09a1f96..000000000000 --- a/dev-libs/univalue/univalue-1.0.4.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools - -DESCRIPTION="C++ universal value object and JSON library" -HOMEPAGE="https://github.com/jgarzik/univalue" - -if [[ ${PV} == *9999 ]] ; then - EGIT_REPO_URI="https://github.com/jgarzik/${PN}.git" - inherit git-r3 -else - SRC_URI="https://codeload.github.com/jgarzik/${PN}/tar.gz/v${PV} -> ${P}.tar.gz" - KEYWORDS="amd64 arm ~arm64 ~mips ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux" -fi - -LICENSE="MIT" -SLOT="0/0" -IUSE="" - -DEPEND="" -RDEPEND="${DEPEND}" - -src_prepare() { - default - eautoreconf -} - -src_configure() { - econf --disable-static -} - -src_install() { - default - find "${D}" -name '*.la' -delete || die -} diff --git a/dev-libs/univalue/univalue-1.0.5.ebuild b/dev-libs/univalue/univalue-1.0.5.ebuild index 5c07a1e07b00..e760de84d571 100644 --- a/dev-libs/univalue/univalue-1.0.5.ebuild +++ b/dev-libs/univalue/univalue-1.0.5.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://codeload.github.com/jgarzik/${PN}/tar.gz/v${PV} -> ${P}.tgz" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 arm ~arm64 ~mips ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux" IUSE="" src_prepare() { diff --git a/dev-libs/urdfdom/Manifest b/dev-libs/urdfdom/Manifest index 0f70a8a7791a..2284d2bc6bdc 100644 --- a/dev-libs/urdfdom/Manifest +++ b/dev-libs/urdfdom/Manifest @@ -1,6 +1,5 @@ -DIST urdfdom-1.0.0.tar.gz 250016 BLAKE2B 525616785b4fa38c8900add42349aa3a2103c75b213c77e3d682084e674b5fae31e9f56331910c19e6e5c49f6f72e1e7240c588df0dc67d862e0eac911667381 SHA512 50a218e596bcc0cecff904db2fa626bebc3902c4fe1f5ff8e08195e462b4d9a8c416a41f4773cabbcc71490060d3feff7e8528a76b824569dc7fdb0bda01ec3f -DIST urdfdom-1.0.3.tar.gz 275339 BLAKE2B aa14dbd5f55489e0bde97042afb03d47cd023e3003a4ff66808e9be1a03c4de0bdab1c56a6fb5f6aea83324cbb38d286def66553a8ef813fc1f70b0bd9e24268 SHA512 240181d9c61dd7544f16a79a400d9a2c4dc0a682bef165b46529efcb4b31e2a34e27896933b60b9ddbaa5c4a8d575ebda42752599ff3b0a98d1eeef8f9b0b7a7 -EBUILD urdfdom-1.0.0-r1.ebuild 805 BLAKE2B cdbb0b4f38e03b69a05746bca56b3244ef705ef5a71522cdcb676a8f446c4e8ee2ef30526a2be1dbb7d6719e891ffc9d914939e6c1e35a37e54ce4b0e01e7e77 SHA512 0e1364c218cfbf9d99dad4ac40a707de0997ae088095737f63f977f5bd19ac3d599ecc931a0a1de85ca5d5dddeb89b512d6de020ada69236abdd6cab78c076a5 -EBUILD urdfdom-1.0.3.ebuild 802 BLAKE2B e16dde4316702066aa8172f885a0d3a53d7c88e4964028c53d72687fa00d3be7fb6f9a65236f696b8f2d808fa3f150945631f48d16c96da09f3e015734fa571e SHA512 7db3be38dfd4448edbb5c2db1e814479604059c5d7154737b9128d86b1afdcf32846f579cb2f207e742fcf8078c5132ddfc5b5011b9e55fdf35e6eb3c194352a -EBUILD urdfdom-9999.ebuild 805 BLAKE2B cdbb0b4f38e03b69a05746bca56b3244ef705ef5a71522cdcb676a8f446c4e8ee2ef30526a2be1dbb7d6719e891ffc9d914939e6c1e35a37e54ce4b0e01e7e77 SHA512 0e1364c218cfbf9d99dad4ac40a707de0997ae088095737f63f977f5bd19ac3d599ecc931a0a1de85ca5d5dddeb89b512d6de020ada69236abdd6cab78c076a5 +AUX cb.patch 768 BLAKE2B d777c9c55e81019c496c4dffbe2b113d4e0586b713fd2f6c630616a5d9e3f5c83bc23f6dcfd9bc034c78a635a92a085afc9a3f51079805c30fd2d31f8f3c59b9 SHA512 fed91e83af1c3f5c3de9e51ce7134e6c9f94a262817cf14034b390c6527cece0b867e4742a0754debfdf358c0816c9443fc0b84d9cffa531094f33861bb1155a +DIST urdfdom-1.0.4.tar.gz 276958 BLAKE2B 19353c38d8fa8f1d6d752302bc8b7b84b13cc6c6f83af31dba677184fa09fd42d7de0c00e6927f085c3d013d2bde664dd7ea69d3c69de4c14130c08d256e6f87 SHA512 2a7a0ec61445132b3e8f6ba8b2268b9fd7c035a72b3e4d61b5ed665d07e902a02b87d2c60c53fc9b0c385a871cd8d87f278bd4833f1f904635ec46755a544003 +EBUILD urdfdom-1.0.4.ebuild 830 BLAKE2B 32faa951a18610e5fb79205e9136ab6037bb7e6adbafbff892eb49ce71e82998515fe0b36086fc551b83c8ed25ca19e506f96a96950d25f0de0d48529b85a651 SHA512 7d5ac91d6f432b08350ebbc621679e0149aa0c8a0fcdcc06ce98ed4e0fde6046987c5ce3eef0dd6446df02eb2a278daf97aa1da264a9cd5766defe9d57c5f701 +EBUILD urdfdom-9999.ebuild 795 BLAKE2B e53a7cfe21b87fd426dee0d4b12cf5bcf313666da5793b864b31047b7e5930115f825753e838376d84d8c475e850856df3acfd84a02f6ebf0f3c05c0b249bcec SHA512 8728695c1470358941d919765221f6a939f7c095e300ac54c8a387b940012b022fa247635dbfcc484f2b988d3a72ccc50fda7b87487c196d5ef196c056305af6 MISC metadata.xml 335 BLAKE2B e19eb242410b151b76ffa335373a754a074cc060f57c4441a4da4364d8b7f1cd0c71246e48140c6ba6a80a17bf8d721d09c3b61547f83714d0d9d49ab55182da SHA512 ec4d58e41be7a83c80a5e0a77edcf8c231d783e0b4b5f8bb7c42d54da4dba495575b9ee1c32e334a11a424449cc3eba44f89d147d465ec490e4507443211450f diff --git a/dev-libs/urdfdom/files/cb.patch b/dev-libs/urdfdom/files/cb.patch new file mode 100644 index 000000000000..3d3e150580ee --- /dev/null +++ b/dev-libs/urdfdom/files/cb.patch @@ -0,0 +1,23 @@ +From 6faba176d41cf39114785a3e029013f941ed5a0e Mon Sep 17 00:00:00 2001 +From: Steven Peters <scpeters@openrobotics.org> +Date: Thu, 28 May 2020 09:22:29 -0700 +Subject: [PATCH] Find console_bridge without explicit version (#141) + +Signed-off-by: Steve Peters <scpeters@openrobotics.org> +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 92762f1..f0d115d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -41,7 +41,7 @@ if (NOT MSVC) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") + endif() + +-find_package(console_bridge 0.3 REQUIRED) ++find_package(console_bridge REQUIRED) + include_directories(SYSTEM ${console_bridge_INCLUDE_DIRS}) + link_directories(${console_bridge_LIBRARY_DIRS}) + diff --git a/dev-libs/urdfdom/urdfdom-1.0.0-r1.ebuild b/dev-libs/urdfdom/urdfdom-1.0.0-r1.ebuild deleted file mode 100644 index a92586497867..000000000000 --- a/dev-libs/urdfdom/urdfdom-1.0.0-r1.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -SCM="" -if [ "${PV#9999}" != "${PV}" ] ; then - SCM="git-r3" - EGIT_REPO_URI="https://github.com/ros/urdfdom" -fi - -inherit ${SCM} cmake-utils - -if [ "${PV#9999}" != "${PV}" ] ; then - KEYWORDS="" - SRC_URI="" -else - KEYWORDS="~amd64 ~arm" - SRC_URI="https://github.com/ros/urdfdom/archive/${PV}.tar.gz -> ${P}.tar.gz" -fi - -DESCRIPTION="URDF (U-Robot Description Format) library" -HOMEPAGE="http://ros.org/wiki/urdf" -LICENSE="BSD" -SLOT="0/1" -IUSE="" - -RDEPEND=">=dev-libs/urdfdom_headers-1.0.0 - >=dev-libs/console_bridge-0.3:= - dev-libs/tinyxml - dev-libs/boost:=[threads]" -DEPEND="${RDEPEND}" - -src_prepare() { - sed -i -e 's/set(CMAKE_INSTALL_LIBDIR/#/' CMakeLists.txt || die - cmake-utils_src_prepare -} diff --git a/dev-libs/urdfdom/urdfdom-1.0.3.ebuild b/dev-libs/urdfdom/urdfdom-1.0.4.ebuild index b48a465442cd..ff59cc0e6461 100644 --- a/dev-libs/urdfdom/urdfdom-1.0.3.ebuild +++ b/dev-libs/urdfdom/urdfdom-1.0.4.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 SCM="" if [ "${PV#9999}" != "${PV}" ] ; then @@ -9,7 +9,7 @@ if [ "${PV#9999}" != "${PV}" ] ; then EGIT_REPO_URI="https://github.com/ros/urdfdom" fi -inherit ${SCM} cmake-utils +inherit ${SCM} cmake if [ "${PV#9999}" != "${PV}" ] ; then KEYWORDS="" @@ -27,11 +27,12 @@ IUSE="" RDEPEND=">=dev-libs/urdfdom_headers-1.0.0 >=dev-libs/console_bridge-0.3:= - dev-libs/tinyxml + dev-libs/tinyxml[stl] dev-libs/boost:=[threads]" DEPEND="${RDEPEND}" +PATCHES=( "${FILESDIR}/cb.patch" ) src_prepare() { sed -i -e 's/set(CMAKE_INSTALL_LIBDIR/#/' CMakeLists.txt || die - cmake-utils_src_prepare + cmake_src_prepare } diff --git a/dev-libs/urdfdom/urdfdom-9999.ebuild b/dev-libs/urdfdom/urdfdom-9999.ebuild index a92586497867..6c0a7505b197 100644 --- a/dev-libs/urdfdom/urdfdom-9999.ebuild +++ b/dev-libs/urdfdom/urdfdom-9999.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=5 +EAPI=7 SCM="" if [ "${PV#9999}" != "${PV}" ] ; then @@ -9,7 +9,7 @@ if [ "${PV#9999}" != "${PV}" ] ; then EGIT_REPO_URI="https://github.com/ros/urdfdom" fi -inherit ${SCM} cmake-utils +inherit ${SCM} cmake if [ "${PV#9999}" != "${PV}" ] ; then KEYWORDS="" @@ -27,11 +27,11 @@ IUSE="" RDEPEND=">=dev-libs/urdfdom_headers-1.0.0 >=dev-libs/console_bridge-0.3:= - dev-libs/tinyxml + dev-libs/tinyxml[stl] dev-libs/boost:=[threads]" DEPEND="${RDEPEND}" src_prepare() { sed -i -e 's/set(CMAKE_INSTALL_LIBDIR/#/' CMakeLists.txt || die - cmake-utils_src_prepare + cmake_src_prepare } diff --git a/dev-libs/urdfdom_headers/Manifest b/dev-libs/urdfdom_headers/Manifest index f1b91731e9f7..7b28c921fd5d 100644 --- a/dev-libs/urdfdom_headers/Manifest +++ b/dev-libs/urdfdom_headers/Manifest @@ -1,8 +1,4 @@ -DIST urdfdom_headers-1.0.2.tar.gz 12474 BLAKE2B 191ed19b362f1ef4bc3e99613a99107d3f3038b10df6d0836548f3bfd8454334fc832f5686873d4add4f56585d76f3f827806d1fc12ac080c5e819cfcceda91d SHA512 902cf18b3ccc62dd5d732707e9ca2b8698f3307b8005d3858fcdd0e9585d580bbe5d2ec77c8c8bfa7b8776b870844368a8ec93b0f8a8d71420cf5015a99b8867 -DIST urdfdom_headers-1.0.3.tar.gz 12474 BLAKE2B 6c64d876161eaa380797f86ca58fa6287d9f3e9fcdc1a08dc011a56c9208993eb16c9b7f9ac6971000c1e9d5b942667d073121f69c110720ece88362ad5a0cb1 SHA512 44b1ca9724a9ccd5d2ad51f61d36de19b9a893955ad5c3ecfa2356f6468a0ac140b8cd6fa2aa18c163b0fa8ba87e834358369d2470cd3dee474408113a30b7a0 -DIST urdfdom_headers-1.0.4.tar.gz 12470 BLAKE2B 086df6ffa09b927b3353ab2830e9b5db740f32a4ddf67fa7c5b934a780169eea507309417f557d0b816ed660bc84a6719473b524a9fac54dea2e4b29c98d5e37 SHA512 68b54d75b3b6cb240c4394c452f35d41b7b2a0c3161ed1708f748f756dbf2fd6c296a91f1a0346c4d7c1d1cd01eaa13f5cd952683fa54f09b3894fbee4ab7eba -EBUILD urdfdom_headers-1.0.2.ebuild 596 BLAKE2B ae8ae16812aeb4de4650a80220c9ef4e4a911d30f34d448223ea4cf472d9f5719e3b628ef11d332a7f75954933a05b6946d9f98662bc8d57c697144bfc31b5af SHA512 7800ea728feadda8f5718b0c4fa13907dae911801ed17911ebe5fdbcef00275f5a64fed407a7ae2404d73ee566cfe44a7372a91050b31a56d697e412e217be7b -EBUILD urdfdom_headers-1.0.3.ebuild 596 BLAKE2B c61832537f400c84dac3e97a501976e7b22819f22e8405b215a4080db02166300a89aaa68c57d39cb4890cdd6ce094bbfc747ac12aa2de6363725800bf01e67b SHA512 558405ffc019398a88c174e34ca8076737dc4dfc0d59dbfc4f9b31d7ac069ae2c79de47f9ff4ca0a446095392d592a89ddc3c324b45ce5dc73f55293e92ef083 -EBUILD urdfdom_headers-1.0.4.ebuild 596 BLAKE2B c61832537f400c84dac3e97a501976e7b22819f22e8405b215a4080db02166300a89aaa68c57d39cb4890cdd6ce094bbfc747ac12aa2de6363725800bf01e67b SHA512 558405ffc019398a88c174e34ca8076737dc4dfc0d59dbfc4f9b31d7ac069ae2c79de47f9ff4ca0a446095392d592a89ddc3c324b45ce5dc73f55293e92ef083 -EBUILD urdfdom_headers-9999.ebuild 599 BLAKE2B 2e27f12ee18f3960580414f5dd430b6935cb21673abba85093dc65cb242ca3a661a67e9e268df061b230e0aff1fe8cb55bc04d21501e528264a839ca7f41df0d SHA512 a1617b7b51673aa6b8982c2aec93e32739f71808d9619fe90ed5a1fccd65443da99ea7133e4a38a06732242ef2f1bf2605e277ca4e17d34b716225119cc2310d +DIST urdfdom_headers-1.0.5.tar.gz 12639 BLAKE2B fdd3fd0eb26027a920bfd89432ff2f50d8c8377630ff8e385b9691da46cf40a454f5e0651aa5d107ef9e96499ba6439b14aeb346b94b4c33fde699d09097a927 SHA512 c16d83282c189d7720326ed0628c4b3359a859f45157e08f78ffa10a5607d01e6f64b2caa3b721ab9fcf2d83ee1240bc6f43ab484946e7a381122b27bd057b58 +EBUILD urdfdom_headers-1.0.5.ebuild 590 BLAKE2B f95b14f76efaeeaef40226032db3c12dac958c798051ef901115668e43fa25f0674a9c27f48ab955304711a97a3fbaf97235706767d45ca71ba4bacba9c196cc SHA512 5f5a6564e12e6b73a11ba3427a52bfdfbe97cdf5f157767a4d1645b3af118a6ee29d8664423224e17caadd7096643a5963067afd1a812a2938c500ce1dfdba2e +EBUILD urdfdom_headers-9999.ebuild 590 BLAKE2B f95b14f76efaeeaef40226032db3c12dac958c798051ef901115668e43fa25f0674a9c27f48ab955304711a97a3fbaf97235706767d45ca71ba4bacba9c196cc SHA512 5f5a6564e12e6b73a11ba3427a52bfdfbe97cdf5f157767a4d1645b3af118a6ee29d8664423224e17caadd7096643a5963067afd1a812a2938c500ce1dfdba2e MISC metadata.xml 343 BLAKE2B dff4acf9fbc6c2734ac356a3a83da2557b8899e8c58dade74215241f4b563055c55e7b175dc32750f140ed6e2b217f850a79b3a401f09c28eb45f873902a115b SHA512 c12551c09865f8d8f4a833ac0ae8f694e44f507c4e89f39fdb188f5d7159aa0aa6d67c05acae217f5bd8a02d0af3a08599b18f5118a1fc59a3b4105ab6612262 diff --git a/dev-libs/urdfdom_headers/urdfdom_headers-1.0.3.ebuild b/dev-libs/urdfdom_headers/urdfdom_headers-1.0.3.ebuild deleted file mode 100644 index e6ff989498ec..000000000000 --- a/dev-libs/urdfdom_headers/urdfdom_headers-1.0.3.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -SCM="" -if [ "${PV#9999}" != "${PV}" ] ; then - SCM="git-r3" - EGIT_REPO_URI="https://github.com/ros/urdfdom_headers" -fi - -inherit ${SCM} cmake-utils - -if [ "${PV#9999}" != "${PV}" ] ; then - KEYWORDS="" - SRC_URI="" -else - KEYWORDS="~amd64 ~arm" - SRC_URI="https://github.com/ros/urdfdom_headers/archive/${PV}.tar.gz -> ${P}.tar.gz" -fi - -DESCRIPTION="URDF (U-Robot Description Format) headers" -HOMEPAGE="http://ros.org/wiki/urdf" -LICENSE="BSD" -SLOT="0" -IUSE="" - -DEPEND="" -RDEPEND="${DEPEND}" diff --git a/dev-libs/urdfdom_headers/urdfdom_headers-1.0.4.ebuild b/dev-libs/urdfdom_headers/urdfdom_headers-1.0.4.ebuild deleted file mode 100644 index e6ff989498ec..000000000000 --- a/dev-libs/urdfdom_headers/urdfdom_headers-1.0.4.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -SCM="" -if [ "${PV#9999}" != "${PV}" ] ; then - SCM="git-r3" - EGIT_REPO_URI="https://github.com/ros/urdfdom_headers" -fi - -inherit ${SCM} cmake-utils - -if [ "${PV#9999}" != "${PV}" ] ; then - KEYWORDS="" - SRC_URI="" -else - KEYWORDS="~amd64 ~arm" - SRC_URI="https://github.com/ros/urdfdom_headers/archive/${PV}.tar.gz -> ${P}.tar.gz" -fi - -DESCRIPTION="URDF (U-Robot Description Format) headers" -HOMEPAGE="http://ros.org/wiki/urdf" -LICENSE="BSD" -SLOT="0" -IUSE="" - -DEPEND="" -RDEPEND="${DEPEND}" diff --git a/dev-libs/urdfdom_headers/urdfdom_headers-1.0.2.ebuild b/dev-libs/urdfdom_headers/urdfdom_headers-1.0.5.ebuild index 17422ddd7c2b..ee7031ffd523 100644 --- a/dev-libs/urdfdom_headers/urdfdom_headers-1.0.2.ebuild +++ b/dev-libs/urdfdom_headers/urdfdom_headers-1.0.5.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 SCM="" if [ "${PV#9999}" != "${PV}" ] ; then @@ -9,7 +9,7 @@ if [ "${PV#9999}" != "${PV}" ] ; then EGIT_REPO_URI="https://github.com/ros/urdfdom_headers" fi -inherit ${SCM} cmake-utils +inherit ${SCM} cmake if [ "${PV#9999}" != "${PV}" ] ; then KEYWORDS="" diff --git a/dev-libs/urdfdom_headers/urdfdom_headers-9999.ebuild b/dev-libs/urdfdom_headers/urdfdom_headers-9999.ebuild index 2caff6b4dbc2..ee7031ffd523 100644 --- a/dev-libs/urdfdom_headers/urdfdom_headers-9999.ebuild +++ b/dev-libs/urdfdom_headers/urdfdom_headers-9999.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 SCM="" if [ "${PV#9999}" != "${PV}" ] ; then @@ -9,7 +9,7 @@ if [ "${PV#9999}" != "${PV}" ] ; then EGIT_REPO_URI="https://github.com/ros/urdfdom_headers" fi -inherit ${SCM} cmake-utils +inherit ${SCM} cmake if [ "${PV#9999}" != "${PV}" ] ; then KEYWORDS="" diff --git a/dev-libs/uriparser/Manifest b/dev-libs/uriparser/Manifest index 82ba3320379c..2d07732d5c24 100644 --- a/dev-libs/uriparser/Manifest +++ b/dev-libs/uriparser/Manifest @@ -4,5 +4,5 @@ DIST uriparser-0.9.3.tar.bz2 173073 BLAKE2B daf4d4ef2801850b8b4b3622ec195c7bfdc1 DIST uriparser-0.9.4.tar.bz2 174551 BLAKE2B b95f270685757052fca02fae0a029f08de8bc14bea733bd56e62f0bcdc6592f015453ed38c87171cea9054618328dc94a512ff816519f70594653451f751c4f8 SHA512 c5e671ce2589aacd2c562e66facbee9e1cad3101e840f40b7ebdb917fa669e0c3ae7ed75623692f601655c0b82c10bcfe3086ad628beac8f965e613228e67ecd EBUILD uriparser-0.9.1.ebuild 940 BLAKE2B 0c3b4d638419248d19cea2a00f20391019d62761a04feaba8aa644afa7578d555de3ca7f849ed5e8c1732714f8610c0647e824a02772e197f53f3b39092823cd SHA512 277cd3aa28ace11ee9963ef809c364e8faa5680a438d8fea5d13b9288d9b65fd4a879e6bf96cd91be71d91ae789f81101f21bae7eaee4e2a26424770db285398 EBUILD uriparser-0.9.3.ebuild 1210 BLAKE2B e5de6e838c817756985b67c567328f90bf3bd9a79151db76bd57d4ab09bff0bf620437040c3eeb1b91946e0b34f9b230a22535b4b6bf029ad52c1803aaa884bb SHA512 7b1f78fdd8d432972f5e1b52ffdcc2629b437bf7d826d940f065ba91d8c2a0b65b567af4ae0995a2022e003dfce5ff2e6a976f12a79b4d0d10b8dfb847c01196 -EBUILD uriparser-0.9.4.ebuild 1172 BLAKE2B 8c11815b6e08ddec0f48ee332542efb31bc5a85523690b18a410ac8c469fdb4c8ba33c8383fa4681e4f2ddc1cf3d801eb2edee96acab07dd124f9addac620edd SHA512 cfb4b4d50a803e786c337f51c9108f036fb15d543a1889ea5da2099fb275c4953352d3f363ddb7fa00f6ae092e28dc2dfe52019b74b70dfbbd0dbefdab788aa1 +EBUILD uriparser-0.9.4.ebuild 1170 BLAKE2B 2fb15b00f50cc31b1e162b7f4b2b1222bb77d0a55a2da0fedac110640b8b384abc491f1aff94a5ae463c8cdacae1aea8c03bc70da84422ada035508d9cfa98b5 SHA512 e39b9a667ba1189662d13897b08ba3f89c5127b1384fdf052c7a699c53768f0cf9032ae7968669de5b5c81a0eda208052cd88c315be6ab9ec803c04aa1fd08df MISC metadata.xml 542 BLAKE2B ea02a2f11456940eeab83ac904b7b8893c0c41428161f0391eeb9aecbeb51f7d22ec215455837932f0a2b193e937ce41290d5e795ab0cc434b23e13b37dc7146 SHA512 6798e6f833cbbb1ebd80cf04bc5950e5bafd8b689d79211a0a778467b9785b18720918b1822106dadcb96044df2ec8f681c3cda049b1bf3ca1fa072f409dfc45 diff --git a/dev-libs/uriparser/uriparser-0.9.4.ebuild b/dev-libs/uriparser/uriparser-0.9.4.ebuild index 819ef85e3a7b..acf3d54e99d5 100644 --- a/dev-libs/uriparser/uriparser-0.9.4.ebuild +++ b/dev-libs/uriparser/uriparser-0.9.4.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.bz2" LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris" +KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris" IUSE="doc qt5 test unicode" RDEPEND="" diff --git a/dev-libs/ustr/Manifest b/dev-libs/ustr/Manifest index 94666685a250..4facc13f4667 100644 --- a/dev-libs/ustr/Manifest +++ b/dev-libs/ustr/Manifest @@ -4,4 +4,4 @@ DIST ustr-1.0.4.tar.bz2 233723 BLAKE2B 47fd489cadda1487eb131b9a21148d4b21ad46320 EBUILD ustr-1.0.4-r5.ebuild 1255 BLAKE2B 8920416abdc8636b05b95573dba65bc88f7fc22d30c6deac8b3916a7f2fc59be42e0d437a8c81ba8af393a645d3ea6a01d7f060f1025a1aeede3c64fd60f1aaf SHA512 5275fb21937faafd1c03a4fddb9c568ba44d8db15ff6faa56293f0a38df42ba9412c444bef4da57700a76c6992592addb4ec1e87a8bbfa71476bc5bd9202faeb EBUILD ustr-1.0.4-r7.ebuild 1780 BLAKE2B 1ca34aca9a83d64f43729eb1c1eb5f85e640dd861d71c0b83e771067cfea7c39e2885fdb802b67a31618c00e7835baa6cb3ec21c8820b3909591a55b239f15d1 SHA512 68ae97b187d6a67e4ac54f0493f1e957d26a4fda38214c4ad34b1111b8936d09a953911d03ce058e8877133a1206195a4506c92bcb89d61ce7c7f3097d764ec6 EBUILD ustr-1.0.4-r8.ebuild 2058 BLAKE2B 9e59a44c3468d4ca5da7bcf1bfc7dfaf8c4e4ddadd71a4a2a1fb527a2ab24b4d1e74cab0ecf8c08404c417ea66d86e7b345553150797063eea0748a7b1169eae SHA512 42d520b0307873fb899eb237a66c8f04a126cd067b501ac948b22743b80808272e84b7a9c6d04c0979d0032b02efb0326a999c85609e971e41a052392992dfe6 -MISC metadata.xml 466 BLAKE2B 3c10f26ba9da9a631117b49d33763b8b4a4c137e25a388e49a0bfb3d4c4f53a69dc2fd230a76c9d82065f9b5990628789ff8433ac604a8d9e8dd50b3dd0b77a9 SHA512 cc4ceffec16d6ab3a009059bfa704477860f34e0124c2ec9edbcf306edd28aad431f0eaa67d74f57d2a5654db345beb5150116863d80037c96360a3414c505e2 +MISC metadata.xml 280 BLAKE2B c3bf7b208a56dbbb5d3b3ed817937c68bad2240cf61761e138b678efbc019278b31f04d88b5950aa52847801ab1329bc0e81ece1bf25436dda6ba642f5f287cb SHA512 805e06bcd26f04facdcf6275f33d38b5981f25f0120fcb117a5c0e98e50a756bca0e258046bfbe76da17e5ec3f6d29fad0dade7d07b729a1874544a45a3a7406 diff --git a/dev-libs/ustr/metadata.xml b/dev-libs/ustr/metadata.xml index 36a48162dc54..0fb02e2df52a 100644 --- a/dev-libs/ustr/metadata.xml +++ b/dev-libs/ustr/metadata.xml @@ -1,14 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="person"> - <email>yamakuzure@gmx.net</email> - <name>Sven Eden</name> -</maintainer> -<maintainer type="project"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> -</maintainer> +<!-- maintainer-needed --> <use> <flag name="ustr-import">Install ustr-import developer program and source code for bundling.</flag> </use> diff --git a/dev-libs/vala-common/Manifest b/dev-libs/vala-common/Manifest index f2acdec63310..d43730d959a4 100644 --- a/dev-libs/vala-common/Manifest +++ b/dev-libs/vala-common/Manifest @@ -1,7 +1,15 @@ DIST vala-0.46.10.tar.xz 3417400 BLAKE2B 2f78de3e198f994a148e7ed4c82ef2417b70c19af3ce1874ee80aa7d0160691a50db24ad4898a04520e91d67a41bb508d3854ac2f4d90d2507a5a6558854716c SHA512 ae3734036f6a1b7088bac45083b75a49eee76947219f530493f81aa4ee60807cfa5424cf1b982d8d8f28f56119d66f06a9150b67884d80dd4b6724e152e32e62 DIST vala-0.46.7.tar.xz 3402828 BLAKE2B c028875e2c6036a6657244bff62d3a2eec2104c06ec3c993f4d59371f2ec7947cfd36f577d41a2c4ba52f6dd7fb03251cad989e3b2787e2817bd988cc16030ca SHA512 609694c2b773abdd8f47d0e9dd8e1dabac2053f7e0321eac7232b3931b15df30e095541dbb02965fc74f3a29b7562b7a326c56ce7c570e6528f8cfa480363c76 DIST vala-0.48.6.tar.xz 3451004 BLAKE2B 9c880cff885b934e1d82d21285839e040addecb0b3ce81936d5be118a951bd219eea2b8381ea42f13e6e858a1937a3789a3dee6d067735e5ee21eaced38b4646 SHA512 220a916d42cbae3853afdd7c35a72afb446a92fca039d8c660a478fd793686a0c82cbaf90a7c94ae182c1f41eec6df1aedb804013ab38e6e4bcc6d26e40e5375 +DIST vala-0.48.7.tar.xz 3460968 BLAKE2B d2630c3695d3e3915751d74581ed85f493cb1f63c49ef8a2a36c396a86fefee4f9b608d5161f680eff9c4ebee0563fc158b3e1102dbe4ac56e2ab1c2bb938f2e SHA512 93ed6f98ff3be35d327794c5d81f30239c84838d49991b70dced1672f070e4675576da43b7555748d66ecae70102cd422e6af9b562f22bb34b40c07c73bac882 +DIST vala-0.48.8.tar.xz 3470240 BLAKE2B 753c1f4bd1619bb4671f74f3a82ed1919efd5bdfcbc7d2a0797303627214de1b9d22bb9bf4e5d8097773986bf95b27126061cf1ab862837d0ced49e0c860bb90 SHA512 a2a71313161154c3de73fa186728704b2d04ec27eb8cd95954dcfab6287e29c2ee21ecea17bc3e404fcef89c69d6440abca5ae3a526a43c05d3cbafef7ec6e99 +DIST vala-0.48.9.tar.xz 3472540 BLAKE2B 1c85b5d9a1f3819d5b26b521c7da423adee313b2acacb354e324abd9ccf24707dcfcd1a455bab867043f674c4daa5f1a62210847ac271dfce09a288651220f53 SHA512 076fcbea34dde1a84c15e4e2b6acd009c2fea578d48eb28a99a604eb4edc8bb53ac6883ca93ec906968d43d4b341707abc730d6ac8a7b3682a2fa5f0030d5256 +DIST vala-0.49.91.tar.xz 3506404 BLAKE2B 77a4e88d6718112747d6ceb0d70712db818fc175c2c4ef5755bc2c091469e32028d73467a7fda84748b3d29f87fc2f5af9601df8f59d96bcc55ce1bf01b25c7c SHA512 15817b032cce95a360b28a51509259b88e070a7ec6fd7a82452717ef98cd14b1fb60307a5bdd7f4b0627e59575a64c44fb41dad25327cecf8d9a56dbde01a820 EBUILD vala-common-0.46.10.ebuild 654 BLAKE2B 9655a0cc53404cbbe4a7239781515de3ac2832b1466976cbc9bdc4034b432d3cfe5d355a4c707c60eaee7de44ac14b9a8d158b9cbfc03b39c2e9f8f5c7d983fc SHA512 858a0d13a2f352081c0ca2ee1a190867bc1f066e5c33502b04ac7d812a2bc03b6908b43b21ea6915bfd92abc361df21b583ac2c380dee9c6206eb2d81455cf13 EBUILD vala-common-0.46.7.ebuild 645 BLAKE2B 5a40dd45432a9ba163abe1b2749d1ec4dd46b2dec2f8c343d548a13cffe1a9364f0fc5675944540cd3b5b0dfa03e7660a7c572a81462366416a7227c9b2da18d SHA512 2dd63a63255cb20f3fc7fab488f9ea2a15dcfd20723bfdbe190dac19b2d706cdd388343d39045aaaca06f7b5d148050cf3860eac74a658227ed6191f00304d33 EBUILD vala-common-0.48.6.ebuild 648 BLAKE2B bd688604d8e7bf65b8a902423acbe2e469a81e57fe78171c9f77905190eca95b02b16c52f7ca8b3062e2aca8c94b4e5454e82bc6fa04dbba8484f9d38d526e4d SHA512 00fd28246c4cdebdfb455d08030eed513d649ba2bc0adf48f3bf27f1de140e3d9d2413c45a49dca55baf399d5a9c501d2d110c95f4c3fc8e8bf81bcbd75ea22f +EBUILD vala-common-0.48.7.ebuild 654 BLAKE2B 9655a0cc53404cbbe4a7239781515de3ac2832b1466976cbc9bdc4034b432d3cfe5d355a4c707c60eaee7de44ac14b9a8d158b9cbfc03b39c2e9f8f5c7d983fc SHA512 858a0d13a2f352081c0ca2ee1a190867bc1f066e5c33502b04ac7d812a2bc03b6908b43b21ea6915bfd92abc361df21b583ac2c380dee9c6206eb2d81455cf13 +EBUILD vala-common-0.48.8.ebuild 654 BLAKE2B 9655a0cc53404cbbe4a7239781515de3ac2832b1466976cbc9bdc4034b432d3cfe5d355a4c707c60eaee7de44ac14b9a8d158b9cbfc03b39c2e9f8f5c7d983fc SHA512 858a0d13a2f352081c0ca2ee1a190867bc1f066e5c33502b04ac7d812a2bc03b6908b43b21ea6915bfd92abc361df21b583ac2c380dee9c6206eb2d81455cf13 +EBUILD vala-common-0.48.9.ebuild 654 BLAKE2B 9655a0cc53404cbbe4a7239781515de3ac2832b1466976cbc9bdc4034b432d3cfe5d355a4c707c60eaee7de44ac14b9a8d158b9cbfc03b39c2e9f8f5c7d983fc SHA512 858a0d13a2f352081c0ca2ee1a190867bc1f066e5c33502b04ac7d812a2bc03b6908b43b21ea6915bfd92abc361df21b583ac2c380dee9c6206eb2d81455cf13 +EBUILD vala-common-0.49.91.ebuild 654 BLAKE2B 9655a0cc53404cbbe4a7239781515de3ac2832b1466976cbc9bdc4034b432d3cfe5d355a4c707c60eaee7de44ac14b9a8d158b9cbfc03b39c2e9f8f5c7d983fc SHA512 858a0d13a2f352081c0ca2ee1a190867bc1f066e5c33502b04ac7d812a2bc03b6908b43b21ea6915bfd92abc361df21b583ac2c380dee9c6206eb2d81455cf13 MISC metadata.xml 325 BLAKE2B f1a8eb879889fa0b33809e44ee815a95f07c1d65d1e4fcb3af8797e27f258f76e7774b4a8eba9677a9e6c8a1051fbbe70a0f3675a12f9d52531d361f70826087 SHA512 3be77f30dff008c941c9513d9b8a4c689aba5f2f1005ecdb98f6cf9bc1000f562bad638cddd373f223a5570b40ea83e44656dbf848544a96ce0d166cc46805e2 diff --git a/dev-libs/vala-common/vala-common-0.48.7.ebuild b/dev-libs/vala-common/vala-common-0.48.7.ebuild new file mode 100644 index 000000000000..ee55cfcad100 --- /dev/null +++ b/dev-libs/vala-common/vala-common-0.48.7.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +GNOME_ORG_MODULE="vala" + +inherit gnome.org + +DESCRIPTION="Build infrastructure for packages that use Vala" +HOMEPAGE="https://wiki.gnome.org/Projects/Vala" + +LICENSE="LGPL-2.1+" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" +IUSE="" + +RDEPEND="" +DEPEND="" +BDEPEND="" + +src_configure() { :; } + +src_compile() { :; } + +src_install() { + insinto /usr/share/aclocal + doins vala.m4 vapigen/vapigen.m4 + insinto /usr/share/vala + doins vapigen/Makefile.vapigen +} diff --git a/dev-libs/vala-common/vala-common-0.48.8.ebuild b/dev-libs/vala-common/vala-common-0.48.8.ebuild new file mode 100644 index 000000000000..ee55cfcad100 --- /dev/null +++ b/dev-libs/vala-common/vala-common-0.48.8.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +GNOME_ORG_MODULE="vala" + +inherit gnome.org + +DESCRIPTION="Build infrastructure for packages that use Vala" +HOMEPAGE="https://wiki.gnome.org/Projects/Vala" + +LICENSE="LGPL-2.1+" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" +IUSE="" + +RDEPEND="" +DEPEND="" +BDEPEND="" + +src_configure() { :; } + +src_compile() { :; } + +src_install() { + insinto /usr/share/aclocal + doins vala.m4 vapigen/vapigen.m4 + insinto /usr/share/vala + doins vapigen/Makefile.vapigen +} diff --git a/dev-libs/vala-common/vala-common-0.48.9.ebuild b/dev-libs/vala-common/vala-common-0.48.9.ebuild new file mode 100644 index 000000000000..ee55cfcad100 --- /dev/null +++ b/dev-libs/vala-common/vala-common-0.48.9.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +GNOME_ORG_MODULE="vala" + +inherit gnome.org + +DESCRIPTION="Build infrastructure for packages that use Vala" +HOMEPAGE="https://wiki.gnome.org/Projects/Vala" + +LICENSE="LGPL-2.1+" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" +IUSE="" + +RDEPEND="" +DEPEND="" +BDEPEND="" + +src_configure() { :; } + +src_compile() { :; } + +src_install() { + insinto /usr/share/aclocal + doins vala.m4 vapigen/vapigen.m4 + insinto /usr/share/vala + doins vapigen/Makefile.vapigen +} diff --git a/dev-libs/vala-common/vala-common-0.49.91.ebuild b/dev-libs/vala-common/vala-common-0.49.91.ebuild new file mode 100644 index 000000000000..ee55cfcad100 --- /dev/null +++ b/dev-libs/vala-common/vala-common-0.49.91.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +GNOME_ORG_MODULE="vala" + +inherit gnome.org + +DESCRIPTION="Build infrastructure for packages that use Vala" +HOMEPAGE="https://wiki.gnome.org/Projects/Vala" + +LICENSE="LGPL-2.1+" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" +IUSE="" + +RDEPEND="" +DEPEND="" +BDEPEND="" + +src_configure() { :; } + +src_compile() { :; } + +src_install() { + insinto /usr/share/aclocal + doins vala.m4 vapigen/vapigen.m4 + insinto /usr/share/vala + doins vapigen/Makefile.vapigen +} diff --git a/dev-libs/weston/Manifest b/dev-libs/weston/Manifest index addafffcbaa7..52218b8a959e 100644 --- a/dev-libs/weston/Manifest +++ b/dev-libs/weston/Manifest @@ -1,5 +1,5 @@ AUX README.gentoo 383 BLAKE2B a0d8fef2d1f0deebe46ed85065a09057a620aa7af4e7aa901f1fef7b75d15e2ca9d2be1b9367a651a2edf3b4265441ce47af832f423cf9725c78e61836a4f982 SHA512 e4d8f8e0edeb6773dd7ef6329074d1e40b694b9e7e10b6a429d8c5dd4fe1170594f447a42eb41446ec2355829a1da1606bf6c544434551c5c931b0794422e786 DIST weston-8.0.0.tar.xz 1094904 BLAKE2B 858f892027f2f41687deb699770843bf962b8fab06bded4f9018ded01d87e2dc3388e371921229887d45f6c9c9e981ae5b28ad473660b9acce9107c7a63a14d5 SHA512 74853b0c9cabbabe942a2d057b65e4e97b48dc5f4df6d7b9ffc10ec52bc787009b12b900be6b426551902b920b7308baa967b7489761641dc9c31cf90440950c -EBUILD weston-8.0.0.ebuild 3658 BLAKE2B dcc8a38659c697bc4d11f03b7869f216c376b89eae5430e65a53405455d3ea18ac403744c0fddcb83228acfb121136a2be749725f1580dd81755cbfd5a56afa9 SHA512 17432cb183c3b75ea8630ba8453ea72f81d23329e1dd1c2cba524b5773b318307c43631fc42f74616737b3c3c366934f8ed0695d691bd607c79721dceea763ea -EBUILD weston-9999.ebuild 3675 BLAKE2B 150f27a450bef64d0659dab7fa00fcb8c0dde881a6973cd0b6124da75a4d96b3a167c65fb0a7cd616804f9aecde556991eef856d7955ed30695c4eb4ec044bac SHA512 99ed6f9b3bfa1c06cf627bc2c1b11ae817c3f4e715d44497ecb45bd6ff212257f223570f813451d2412be2a05dcf03919cec9c9b44cac83d2aaed8c40094e785 +EBUILD weston-8.0.0.ebuild 3660 BLAKE2B 3a0d81693f81fc132b4ffde6d5b13f77c2e7c61b0d9518523fd2106559708dc23f5b4be8158fd1417e68d76837f21b835818b01bedf6ac757f5fb064339f0347 SHA512 c17c246ec8b0a1159bf45747b58d8e063c939223c37b23a92242ad6649f97b1e16f8c6ff3a15bb50ef7b5679a907daa266c7f794bf63c7ce2c2a0b60e816c3a0 +EBUILD weston-9999.ebuild 3677 BLAKE2B c32f558f61f94edaf234a92a25c69edb789439168f195fb680f680e0f856952b53e92fe758c1e24c224f7abcae538b7108bbc0f18a0b9dd2c82fd0b216f028c3 SHA512 8381f188bff1ddab99279d7dd7ef33e87d279df95f17a9cc146c14c626f3646e444a67b3951091e22fd7e78bae519a749554331e2c05ef970f999567508e60a2 MISC metadata.xml 1440 BLAKE2B 146131404d49bd8011186bced3225a8f12b03e53cc7311baba9f9e412861e7260c50868f169d5dac079319b572cc3996d5565420fdc9972c698df2e5d17ad0ae SHA512 491e0cff4f9e3dc8b794a6711b5ad781c98e72bf5ec851814557b41c2026f8d6cbf39a0342f1564293c093ba87ce23ba7456530213995882098c2bc0f2736217 diff --git a/dev-libs/weston/weston-8.0.0.ebuild b/dev-libs/weston/weston-8.0.0.ebuild index bc3761e35cfe..494278ed2041 100644 --- a/dev-libs/weston/weston-8.0.0.ebuild +++ b/dev-libs/weston/weston-8.0.0.ebuild @@ -65,7 +65,7 @@ RDEPEND=" gles2? ( media-libs/mesa[gles2,wayland] ) - pipewire? ( >=media-video/pipewire-0.2 ) + pipewire? ( =media-video/pipewire-0.2*:= ) rdp? ( >=net-misc/freerdp-2.0.0_rc2:= ) remoting? ( media-libs/gstreamer:1.0 diff --git a/dev-libs/weston/weston-9999.ebuild b/dev-libs/weston/weston-9999.ebuild index 245281887fcc..0b8f285ce20f 100644 --- a/dev-libs/weston/weston-9999.ebuild +++ b/dev-libs/weston/weston-9999.ebuild @@ -65,7 +65,7 @@ RDEPEND=" gles2? ( media-libs/mesa[gles2,wayland] ) - pipewire? ( >=media-video/pipewire-0.2 ) + pipewire? ( =media-video/pipewire-0.2*:= ) rdp? ( >=net-misc/freerdp-2.0.0_rc2:= ) remoting? ( media-libs/gstreamer:1.0 diff --git a/dev-libs/xapian-bindings/Manifest b/dev-libs/xapian-bindings/Manifest index 9c6ec90ce549..99e865a863b6 100644 --- a/dev-libs/xapian-bindings/Manifest +++ b/dev-libs/xapian-bindings/Manifest @@ -2,8 +2,10 @@ DIST xapian-bindings-1.2.25.tar.xz 1711860 BLAKE2B 66367dbc503333c4f59da8bb5bd48 DIST xapian-bindings-1.4.14.tar.xz 1132008 BLAKE2B 3057f8f98cfd11e82555df4b554ad1ffed793ea92bf0f077ef4a495d09250da47116d76ded0deb07621f3b14ddd7f653aa0bb19add01d88fe077e637bee21ec4 SHA512 6d35c6c011c6d841254934f4dd59f4a2b842fe826af108e526cde9acbccec67b43517974331b21cbee5e828d0743aa5b9b973a96e1940065fbcfc342b8f23ead DIST xapian-bindings-1.4.15.tar.xz 1132248 BLAKE2B ba9f60263881ca558f9d3deab09bd07271e6f54e06a13d09bcb59bfaf9a637e959b3a62a9e9db0724ae2262e605fc3fd2160559d53702b2af5012f47177ea66a SHA512 dec8a0431c9070fc70d79b67bddc2e0adb10ef5366c4b9d7a135365ea6c6680d2e7682dbfd60c29eca51da48eaa0715509e30b13d5482d5a38bfd0d0156c43f9 DIST xapian-bindings-1.4.16.tar.xz 1133900 BLAKE2B cea310cea777f665feac3b0cac7189da66e596d245af0a3a6cc40d01e6b9862bae2b61d5b21e7d742c1e0eb1424603a47c44a4fab9d17125820ab793360a85f9 SHA512 afdc4379c8dc8381813eefcaf761ea560a23ba6718a54c61874c0d29786b9f49dd548ed3854fee38689c273acebb4637833b8cf5c75d0c2ed05df83384e59113 +DIST xapian-bindings-1.4.17.tar.xz 1135100 BLAKE2B 8c45322725c341f6e6484e0aa8716798aa5b31e5bbc795d0f5c631022c69e96f472b3fd76609116a196431e5b069a710c3ebbfc989de8fb57d5e2d081008b89c SHA512 9cfd9809b8b13d47a7b50950c19b821d4ae902611eed3972d93cccda82d07d5858e37989bb9de31ede082c2574487e0bcd8c1e5f30f1479d47f4c28200ff76e7 EBUILD xapian-bindings-1.2.25.ebuild 5545 BLAKE2B 971788479ed9732f0cd64fbba81c1b30db4cc1ab606dcd7ff3389dc30d88c9f46d40fb0446f8eab106194e0b718140bb2dead274988f2ba33eae4fdd449b727b SHA512 6f6dc696c2af464df8c2d675fc3ac28c81b77ef209239e2d91d24b23ef902611bcd61214d1536a8655612f01c20ff7bcd20e8f09b11614517aa7067ae57c674f -EBUILD xapian-bindings-1.4.14.ebuild 6532 BLAKE2B ba28125b7667873cd31f1b4ceff8d347f0e18ff70a4cb48316bd96bdb6aa095200ab0c1cd29ceb9aab8737ebfffe38dc3ed4bbd2f95bdc522e53b74c6a7a5797 SHA512 d474d108a6f4e6c74c6f1e16a071408a44502a5066c434611fc88b160cd6e5f5ba74d04458df1fadb90858df01f6694417146318c61821af880fdf8f38a8fda4 -EBUILD xapian-bindings-1.4.15.ebuild 6533 BLAKE2B cbf1c7fb223a7dbd1e2a14869a3ad4e79a375f4ac0f4689ca2867ff293dbab58ab2d980a52ba7a415b8b9bbc057f818c12cce2d1a3389e3749295eb3b088f2a4 SHA512 458607550dbc8d0e874b61c22e8f03f6ad569b9fd2064489ff83b36ab5a15e66ce3f764d53cf8e35f2712be9fe7fadbbc4aacec4e2aae609c9e5fdf995666066 -EBUILD xapian-bindings-1.4.16.ebuild 6533 BLAKE2B cbf1c7fb223a7dbd1e2a14869a3ad4e79a375f4ac0f4689ca2867ff293dbab58ab2d980a52ba7a415b8b9bbc057f818c12cce2d1a3389e3749295eb3b088f2a4 SHA512 458607550dbc8d0e874b61c22e8f03f6ad569b9fd2064489ff83b36ab5a15e66ce3f764d53cf8e35f2712be9fe7fadbbc4aacec4e2aae609c9e5fdf995666066 +EBUILD xapian-bindings-1.4.14.ebuild 6446 BLAKE2B 2b98e0f1095d527c021792c20b7c5d6977025d16001ec1a82bbff83164adc9af27a8aa04f7b80ae7571bac2fe43bb248ad063e9ca4c28109408e5a562e35e3dd SHA512 ecf37332ea6f17c243447d81425389549a9549afc62e79602aaf9a51a96a2441d92848d85a7e63907af143b871b14f4f77470a7f0760f2a37a0752bdb10f07db +EBUILD xapian-bindings-1.4.15.ebuild 6447 BLAKE2B 8cc17f4428e0c6376321a1d7fc0c79a1e9f9c0fa9c94d207587942a9909183d3b23f0a6189f3e79730c96082744b2f3d6d38e273c2be80bf9b63b6e5620a013d SHA512 dd19b3ddca4556c13023d6e749eeac696f87162410c192b3c15bff8636eade45ee9b110e0ad857f4f56e36ec620c3eeffd264331ad1c3dd564d15afa7902d8dd +EBUILD xapian-bindings-1.4.16.ebuild 6447 BLAKE2B 8cc17f4428e0c6376321a1d7fc0c79a1e9f9c0fa9c94d207587942a9909183d3b23f0a6189f3e79730c96082744b2f3d6d38e273c2be80bf9b63b6e5620a013d SHA512 dd19b3ddca4556c13023d6e749eeac696f87162410c192b3c15bff8636eade45ee9b110e0ad857f4f56e36ec620c3eeffd264331ad1c3dd564d15afa7902d8dd +EBUILD xapian-bindings-1.4.17.ebuild 6447 BLAKE2B 8cc17f4428e0c6376321a1d7fc0c79a1e9f9c0fa9c94d207587942a9909183d3b23f0a6189f3e79730c96082744b2f3d6d38e273c2be80bf9b63b6e5620a013d SHA512 dd19b3ddca4556c13023d6e749eeac696f87162410c192b3c15bff8636eade45ee9b110e0ad857f4f56e36ec620c3eeffd264331ad1c3dd564d15afa7902d8dd MISC metadata.xml 252 BLAKE2B f6282e2a99df668246ea8570c72345463f06d282b6adc6d9de2a08ef0827cf4572332c580caa594aad5ba8e200870d8d25494549ee4413798025f0d885b61a68 SHA512 cbda7bf9832872764ae776ce16b2966c37a2ba3a1982d9817006fd6b82d7b17146434cde428bf114062a483e9053d2acdcdd004695e6ebf428d19cdc09937c65 diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.4.14.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.4.14.ebuild index a535205d56fb..347f3ff01145 100644 --- a/dev-libs/xapian-bindings/xapian-bindings-1.4.14.ebuild +++ b/dev-libs/xapian-bindings/xapian-bindings-1.4.14.ebuild @@ -3,7 +3,7 @@ EAPI="7" -PYTHON_COMPAT=( python{2_7,3_6,3_7,3_8} ) +PYTHON_COMPAT=( python{3_6,3_7,3_8} ) PYTHON_REQ_USE="threads(+)" USE_PHP="php7-2 php7-3 php7-4" @@ -192,12 +192,8 @@ src_configure() { --without-php7 --without-ruby --without-tcl + --with-python3 ) - if python_is_python3; then - myconf+=( --with-python3 ) - else - myconf+=( --with-python ) - fi # Avoid sandbox failures when compiling modules addpredict "$(python_get_sitedir)" diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.4.15.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.4.15.ebuild index c0685ebf0462..f1522bf0ac05 100644 --- a/dev-libs/xapian-bindings/xapian-bindings-1.4.15.ebuild +++ b/dev-libs/xapian-bindings/xapian-bindings-1.4.15.ebuild @@ -3,7 +3,7 @@ EAPI="7" -PYTHON_COMPAT=( python{2_7,3_6,3_7,3_8} ) +PYTHON_COMPAT=( python{3_6,3_7,3_8} ) PYTHON_REQ_USE="threads(+)" USE_PHP="php7-2 php7-3 php7-4" @@ -192,12 +192,8 @@ src_configure() { --without-php7 --without-ruby --without-tcl + --with-python3 ) - if python_is_python3; then - myconf+=( --with-python3 ) - else - myconf+=( --with-python ) - fi # Avoid sandbox failures when compiling modules addpredict "$(python_get_sitedir)" diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.4.16.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.4.16.ebuild index c0685ebf0462..f1522bf0ac05 100644 --- a/dev-libs/xapian-bindings/xapian-bindings-1.4.16.ebuild +++ b/dev-libs/xapian-bindings/xapian-bindings-1.4.16.ebuild @@ -3,7 +3,7 @@ EAPI="7" -PYTHON_COMPAT=( python{2_7,3_6,3_7,3_8} ) +PYTHON_COMPAT=( python{3_6,3_7,3_8} ) PYTHON_REQ_USE="threads(+)" USE_PHP="php7-2 php7-3 php7-4" @@ -192,12 +192,8 @@ src_configure() { --without-php7 --without-ruby --without-tcl + --with-python3 ) - if python_is_python3; then - myconf+=( --with-python3 ) - else - myconf+=( --with-python ) - fi # Avoid sandbox failures when compiling modules addpredict "$(python_get_sitedir)" diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.4.17.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.4.17.ebuild new file mode 100644 index 000000000000..f1522bf0ac05 --- /dev/null +++ b/dev-libs/xapian-bindings/xapian-bindings-1.4.17.ebuild @@ -0,0 +1,302 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +PYTHON_COMPAT=( python{3_6,3_7,3_8} ) +PYTHON_REQ_USE="threads(+)" + +USE_PHP="php7-2 php7-3 php7-4" + +PHP_EXT_NAME="xapian" +PHP_EXT_INI="yes" +PHP_EXT_OPTIONAL_USE="php" + +USE_RUBY="ruby24 ruby25 ruby26" +RUBY_OPTIONAL="yes" + +inherit java-pkg-opt-2 mono-env multibuild php-ext-source-r3 python-r1 ruby-ng toolchain-funcs + +DESCRIPTION="SWIG and JNI bindings for Xapian" +HOMEPAGE="https://www.xapian.org/" +SRC_URI="https://oligarchy.co.uk/xapian/${PV}/${P}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" +IUSE="java lua mono perl php python ruby tcl" +REQUIRED_USE="|| ( java lua mono perl php python ruby tcl ) + python? ( ${PYTHON_REQUIRED_USE} ) + ruby? ( || ( $(ruby_get_use_targets) ) )" + +COMMONDEPEND=">=dev-libs/xapian-1.4.15 + lua? ( dev-lang/lua:= ) + perl? ( dev-lang/perl:= ) + php? ( dev-lang/php:=[-threads] ) + python? ( + dev-python/sphinx[${PYTHON_USEDEP}] + ${PYTHON_DEPS} + ) + ruby? ( $(ruby_implementations_depend) ) + tcl? ( dev-lang/tcl:= ) + mono? ( dev-lang/mono )" +DEPEND="${COMMONDEPEND} + virtual/pkgconfig + java? ( >=virtual/jdk-1.6 )" +RDEPEND="${COMMONDEPEND} + java? ( >=virtual/jre-1.6 )" + +S="${WORKDIR}/${P}" + +has_basic_bindings() { + # Update this list if new bindings are added that are not built + # multiple times for multiple versions like php, python and ruby are + return $(use mono || use java || use lua || use perl || use tcl) +} + +php_copy_sources() { + local MULTIBUILD_VARIANTS=($(php_get_slots)) + multibuild_copy_sources +} + +php_foreach_impl() { + local MULTIBUILD_VARIANTS=($(php_get_slots)) + multibuild_foreach_variant "$@" +} + +ruby_copy_sources() { + local MULTIBUILD_VARIANTS=($(ruby_get_use_implementations)) + multibuild_copy_sources +} + +ruby_foreach_impl() { + local MULTIBUILD_VARIANTS=($(ruby_get_use_implementations)) + multibuild_foreach_variant "$@" +} + +pkg_setup() { + use mono && mono-env_pkg_setup + use java && java-pkg-opt-2_pkg_setup +} + +src_unpack() { + default + + if use php; then + local php_slot + for php_slot in $(php_get_slots); do + # Unfortunately required for php-ext-source-r3_createinifiles(). + mkdir "${WORKDIR}/${php_slot}" + done + fi +} + +src_prepare() { + use java && java-pkg-opt-2_src_prepare + + # https://trac.xapian.org/ticket/702 + export XAPIAN_CONFIG="/usr/bin/xapian-config" + + if use php; then + php_copy_sources + fi + + if use python; then + python_copy_sources + fi + + if use ruby; then + ruby_copy_sources + fi + + eapply_user +} + +src_configure() { + if has_basic_bindings ; then + local conf=( + --disable-documentation + $(use_with mono csharp) + $(use_with java) + $(use_with lua) + $(use_with perl) + $(use_with tcl) + --without-php + --without-php7 + --without-python + --without-python3 + --without-ruby + ) + + if use java; then + local -x CXXFLAGS="${CXXFLAGS} $(java-pkg_get-jni-cflags)" + fi + + if use perl; then + local -x PERL_ARCH="$(perl -MConfig -e 'print $Config{installvendorarch}')" + local -x PERL_LIB="$(perl -MConfig -e 'print $Config{installvendorlib}')" + fi + + if use lua; then + local -x LUA_INC="$("$(tc-getPKG_CONFIG)" --variable=INSTALL_INC lua)" + local -x LUA_LIB="$("$(tc-getPKG_CONFIG)" --variable=INSTALL_CMOD lua)" + fi + + econf "${conf[@]}" + fi + + php_configure() { + local myconf=( + --disable-documentation + --without-java + --without-lua + --without-csharp + --without-perl + --without-python + --without-python3 + --without-ruby + --without-tcl + ) + if [[ ${MULTIBUILD_VARIANT} == php5.* ]]; then + myconf+=( + --with-php + --without-php7 + ) + local -x PHP_CONFIG="${EPREFIX}/usr/$(get_libdir)/${MULTIBUILD_VARIANT/-/.}/bin/php-config" + elif [[ ${MULTIBUILD_VARIANT} == php7.* ]]; then + myconf+=( + --without-php + --with-php7 + ) + local -x PHP_CONFIG7="${EPREFIX}/usr/$(get_libdir)/${MULTIBUILD_VARIANT/-/.}/bin/php-config" + fi + + econf "${myconf[@]}" + } + + if use php; then + addpredict /usr/share/snmp/mibs/.index + addpredict /var/lib/net-snmp/mib_indexes + + php_foreach_impl run_in_build_dir php_configure + fi + + python_configure() { + local myconf=( + --disable-documentation + --without-java + --without-lua + --without-csharp + --without-perl + --without-php + --without-php7 + --without-ruby + --without-tcl + --with-python3 + ) + + # Avoid sandbox failures when compiling modules + addpredict "$(python_get_sitedir)" + + econf "${myconf[@]}" + } + + if use python; then + python_foreach_impl run_in_build_dir python_configure + fi + + ruby_configure() { + local myconf=( + --disable-documentation + --without-java + --without-lua + --without-csharp + --without-perl + --without-php + --without-php7 + --without-python + --without-python3 + --with-ruby + --without-tcl + ) + local -x RUBY="${EPREFIX}/usr/bin/${MULTIBUILD_VARIANT}" + + econf "${myconf[@]}" + } + + if use ruby; then + ruby_foreach_impl run_in_build_dir ruby_configure + fi +} + +src_compile() { + if has_basic_bindings ; then + default + fi + + if use php; then + php_foreach_impl run_in_build_dir emake + fi + + if use python; then + unset PYTHONDONTWRITEBYTECODE + python_foreach_impl run_in_build_dir emake + fi + + if use ruby; then + ruby_foreach_impl run_in_build_dir emake + fi +} + +src_test() { + if has_basic_bindings ; then + default + fi + + if use php; then + php_foreach_impl run_in_build_dir emake check + fi + + if use python; then + python_foreach_impl run_in_build_dir emake check + fi + + if use ruby; then + ruby_foreach_impl run_in_build_dir emake check + fi +} + +src_install() { + if has_basic_bindings ; then + emake DESTDIR="${D}" install + fi + + if use java; then + java-pkg_dojar java/built/xapian.jar + # TODO: make the build system not install this... + java-pkg_doso java/.libs/libxapian_jni.so + rm -rf "${D}var" || die "could not remove java cruft!" + fi + + if use php; then + php_foreach_impl run_in_build_dir emake DESTDIR="${D}" install + php-ext-source-r3_createinifiles + # php-ext-source-r3_createinifiles() changes current directory. + cd "${S}" + fi + + if use python; then + python_foreach_impl run_in_build_dir emake DESTDIR="${D}" install + fi + + if use ruby; then + ruby_foreach_impl run_in_build_dir emake DESTDIR="${D}" install + fi + + # For some USE combinations this directory is not created + if [[ -d "${D}/usr/share/doc/xapian-bindings" ]]; then + mv "${D}/usr/share/doc/xapian-bindings" "${D}/usr/share/doc/${PF}" || die + fi + + dodoc AUTHORS HACKING NEWS TODO README +} diff --git a/dev-libs/xapian/Manifest b/dev-libs/xapian/Manifest index a2ae84eff363..1b8b31eb58f6 100644 --- a/dev-libs/xapian/Manifest +++ b/dev-libs/xapian/Manifest @@ -2,8 +2,10 @@ DIST xapian-core-1.2.25.tar.xz 3253292 BLAKE2B a130e26188c949d0433d017e8d13e7ecf DIST xapian-core-1.4.14.tar.xz 2970624 BLAKE2B 5bfa5ab36ad4626fcc9a214427f88bdf55e60166939db3a65d3118b426b0ec6754efc10dbcf32456e033292eba3b29f7500679f69a49df15d40c4111322249ed SHA512 c08c9abe87e08491566b7cfa8cda9e2a80e4959a647428b6d82bce7af1c967b4cb463607ffb8976372a980c163923ced36117a66e0b5a1f35659393def3d371b DIST xapian-core-1.4.15.tar.xz 2988752 BLAKE2B d68d69cdc55c1b62a746620fc90f028819813bb98c0ad0cc130c399a4dd62231b920d24363b61e58d002f65a79a117598455779028de1b26b7a808367f5f2de4 SHA512 f28209acae12a42a345382668f7f7da7a2ce5a08362d0e2af63c9f94cb2adca95366499a7afa0bd9008fbfcca4fd1f2c9221e594fc2a2c740f5899e9f03ecad3 DIST xapian-core-1.4.16.tar.xz 3041132 BLAKE2B 2c009bcdec05542ceae9354e47e8ff9b971ec87d04caf8058711fd6952135620c353f2feabcd869313f55194409944bc7374ce69d626f948461963a7790c3953 SHA512 3d319ab672485e840019ee28b54b1c59bbd535c1802874f58593fb999681c19bff3e776dc19ab5d5bd97734bf01f1408f36ae49e21ca9706ca187db49f8a18a6 +DIST xapian-core-1.4.17.tar.xz 2997700 BLAKE2B 882bc28c9a55731212a5c3ac6da3ad2082e3345cb473eb2c09b80fdd05e700bb31cff6c9a0524b27da015b14655c30548e92a457b48af43279bfd3564cf3c3fa SHA512 3eaf45d31eb9318e292fa052b32b1d9e1035651bdd3c366a0134f4b39d03d987083c19426a3d4b10f60078190fc3388f05b332cba958263bab1abf236c7a3ca7 EBUILD xapian-1.2.25.ebuild 1849 BLAKE2B 976319adb17d73cfb5aff1c29c7febd4c50b9a399cd2a554ac463396b20890913f1c86cbca6ab5d0c7c1185e0b38ca41949102fc7ba704090647dd78f2522805 SHA512 bf3a8c9ad433c52b6ef74479220b693044483dd5aa8d8b09ddfd244cf6f4cf6e0b80c30f1f67901a725cd783baa5dc623080c15a8c07dfdebf13269af37820d5 EBUILD xapian-1.4.14.ebuild 1797 BLAKE2B ce7eaab77ce89e4e1ca4c5bcdfaafdb88525dc4cc1dcaa830d63ae7ab378ad1ae8eed60fa35760c74a48ceb282fc024c601fc6230bea8f94373313ee6f97409f SHA512 0f7b6d5b74f3ecb5f7a5a3dc9f7ed3e32e32254ce0c940e7de70259322191fe030cb9b1ba043ac4ce7a62dcc62f4d204cebf3bff71edfed15cce6c42cd121a7f EBUILD xapian-1.4.15.ebuild 1805 BLAKE2B 5cd7b053f147e4813c5465c556f02f4c790f99ce032a1cd9a436967a43d7336da8134fef307632e6e24a8fc7582a7af8dbd197039889f6e348a2a4a250de89ac SHA512 4dda1f50d9d5908be95344dfdb2049381befdde663e17cefe0209a628fb830bea5183fb637013188f938be74fd3c70f6d33bf5c072669cf357a2028ea63172aa EBUILD xapian-1.4.16.ebuild 1805 BLAKE2B 5cd7b053f147e4813c5465c556f02f4c790f99ce032a1cd9a436967a43d7336da8134fef307632e6e24a8fc7582a7af8dbd197039889f6e348a2a4a250de89ac SHA512 4dda1f50d9d5908be95344dfdb2049381befdde663e17cefe0209a628fb830bea5183fb637013188f938be74fd3c70f6d33bf5c072669cf357a2028ea63172aa +EBUILD xapian-1.4.17.ebuild 1805 BLAKE2B 5cd7b053f147e4813c5465c556f02f4c790f99ce032a1cd9a436967a43d7336da8134fef307632e6e24a8fc7582a7af8dbd197039889f6e348a2a4a250de89ac SHA512 4dda1f50d9d5908be95344dfdb2049381befdde663e17cefe0209a628fb830bea5183fb637013188f938be74fd3c70f6d33bf5c072669cf357a2028ea63172aa MISC metadata.xml 934 BLAKE2B 2117e395836430d6d356b226e9b4f487141974aa36c36be8505a9e077cbaed2af0c77097be9f2426940b717f2d56200cac6715da50e95c6d6aa1c9db84c0cee7 SHA512 dd16bbd4e60c8ba983524471d0933d3578e932d982777ce04bebfda0a1cebe67be9de76b11b85240f719b24299453c1051bcc6149ec8e2476337249c309cf585 diff --git a/dev-libs/xapian/xapian-1.4.17.ebuild b/dev-libs/xapian/xapian-1.4.17.ebuild new file mode 100644 index 000000000000..669d3eb246de --- /dev/null +++ b/dev-libs/xapian/xapian-1.4.17.ebuild @@ -0,0 +1,74 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +inherit eutils multilib-minimal + +MY_P="${PN}-core-${PV}" + +DESCRIPTION="Xapian Probabilistic Information Retrieval library" +HOMEPAGE="https://www.xapian.org/" +SRC_URI="https://oligarchy.co.uk/xapian/${PV}/${MY_P}.tar.xz" + +LICENSE="GPL-2" +SLOT="0/30" # ABI version of libxapian.so +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-solaris" +IUSE="doc static-libs -cpu_flags_x86_sse +cpu_flags_x86_sse2 +inmemory +remote" + +DEPEND="sys-libs/zlib" +RDEPEND="${DEPEND}" + +S="${WORKDIR}/${MY_P}" + +multilib_src_configure() { + local myconf="" + + if use cpu_flags_x86_sse2; then + myconf="${myconf} --enable-sse=sse2" + else + if use cpu_flags_x86_sse; then + myconf="${myconf} --enable-sse=sse" + else + myconf="${myconf} --disable-sse" + fi + fi + + myconf="${myconf} $(use_enable static-libs static)" + + use inmemory || myconf="${myconf} --disable-backend-inmemory" + use remote || myconf="${myconf} --disable-backend-remote" + + myconf="${myconf} --enable-backend-glass --enable-backend-chert --program-suffix=" + + ECONF_SOURCE=${S} econf $myconf +} + +MULTILIB_WRAPPED_HEADERS=( + /usr/include/xapian/postingsource.h + /usr/include/xapian/attributes.h + /usr/include/xapian/valuesetmatchdecider.h + /usr/include/xapian/version.h + /usr/include/xapian/version.h + /usr/include/xapian/types.h + /usr/include/xapian/positioniterator.h + /usr/include/xapian/registry.h +) + +multilib_src_test() { + emake check VALGRIND= +} + +multilib_src_install() { + emake DESTDIR="${D}" install +} + +multilib_src_install_all() { + if use doc; then + rm -rf "${D}/usr/share/doc/xapian-core-${PV}" || die + fi + + dodoc AUTHORS HACKING PLATFORMS README NEWS + + find "${D}" -name "*.la" -type f -delete || die +} diff --git a/dev-libs/xerces-c/Manifest b/dev-libs/xerces-c/Manifest index d148a372fb71..84923a3f2e2a 100644 --- a/dev-libs/xerces-c/Manifest +++ b/dev-libs/xerces-c/Manifest @@ -2,6 +2,8 @@ AUX 50xerces-c 43 BLAKE2B 8ebb0cf0aa79e028271751f981c9b0818af24bf3640a5109ecca19 AUX xerces-c-3.2.2-fix-XERCESC-2161.patch 42804 BLAKE2B c55aa5ff9d0ca8b716aaffb25435b0a1fbfc8684dc601dc009e3e44f3608c9c21ca3190a25d4813f7e34d75f070ca5de5554e35a2408d65f168b6a8715a156e1 SHA512 04d8cf6e220b7a7dc09a8dba4ff763dd8ccb133a81a5338d64a5cdf2c039f2d51958ec7eeea8ca04eeed8433c3239df8d74e6c697ac8c2c3476e8917d02507a5 AUX xerces-c-3.2.2-fix-XERCESC-2163.patch 715 BLAKE2B 39ae9de0166675c2269da164aaf6c637ba04761c12c5d8b227d466575b056d64846bced57651c70926a78403da16fd0e86ba4b267dfe70a144bcf3cced3d1536 SHA512 c5c0e753d22b61fa5047cef3748cf3baaf30f4c6ba4d89152d856f2f65fe311841ea590ec0c9291347b5b7f96047f3e9c7b524798ac2ac96bcfbc8b40d634596 DIST xerces-c-3.2.2.tar.gz 7100953 BLAKE2B d167299797189ef181c384ac49095e8bc4cf4e0c7d646e72840a19f56c6eea060168d2c2d29c29ce6cc76dd44e403bea4c3dcde67f964b87f3abc807ad0b14ad SHA512 13709b47b61d957d736f34b774dbc7fbd85171eedebd0cada41fd1d17929e6c42904c882b1e1d4f9b4fd464938b62e5ebb127187b4974dfade6a593e31471e80 +DIST xerces-c-3.2.3.tar.gz 7120270 BLAKE2B d622621657f33ada75a9ef330e77772b8f9cff717d8efc06f2a1fffea77360596e5192b48a6a015403a1045aa2492c626ba05f1de15eb5b997a80ca19b032db8 SHA512 206c5c31510224b8f6963b051f27968e4fe70374a0adb2c2990ac1f865b3bac41f63e6bfb7279faa21477f8878a3b9671ba70726fc75a84e51f037ef158639ad EBUILD xerces-c-3.2.2-r1.ebuild 2974 BLAKE2B 086f8a100869f89bc9bbf294c2c699f624a4fb55c028239b0978676ee0c84808c85de9f9cd8eaecb5858f9d14dc8bdd9bd11fe5c431e71cdfc986449d28d9c9a SHA512 1dddd35573dbd3687de506cdf2970779d05a13ee15cdf80e80e2bf046d591719b4835f1465c0da37ddd93a5997179bd47a02156deabdbcdc6afdcc9131777f9a -EBUILD xerces-c-9999.ebuild 2884 BLAKE2B a69a9d474232d4dce30c5e86f225e96c57b07aa18263d0de9e3afc1d56518da9c64876412f84b10c0825fe2c85abe1be54b2ed551c168cb7281b0e374468a553 SHA512 fbf54973cfd79e1b3f8a5b7a342a4b3ccdf4aa3e1e9485d5a1c9dc880fc716ef6a0e832be09ddbbedacf630c3dd72c69baefea2315595eb05f41411751f9d2bb +EBUILD xerces-c-3.2.3.ebuild 2936 BLAKE2B c11fb739c9e6b8ff5e7ad789c9b9c0651dd569afc53d6a97334e5c5ef12b19f65e9cc63f478ad76606293297bf9c77347f448676bf76c415d42f0e0871ec9a53 SHA512 e119476f8a6fc10b4a4f043e530253f2035ebc264823b383090985b216a70815b95a8488fce42f0ac13a1196475d75403f160b0259933dc77450d4f82f1dbb86 +EBUILD xerces-c-9999.ebuild 2942 BLAKE2B c4fbaebdc301f12035ecca49b3b25308f647652cf84cb24e6b8eeb8e69db205ac53ba20d7460af12f9c44a571a86351526f2785c0cf6489665560d9b96f811ec SHA512 89c5ca69e61d4ac7e5984e5ae502a3265dbbab9d098501adfaecf6d21c1c24df7deabd419e3b2a8fb772c6d4f5aeae5416f9cbfd03f3daaa5ed9248e2a1e27eb MISC metadata.xml 768 BLAKE2B fabc57ee82dc82444461b1ec25ebda2af68a8eb00c6f44cc24de70daf96fd245acafc04d1bb75ffbb780e1b0877d7862a119264b81402df2e9c2f20ff252a166 SHA512 e447b67df2d7e7c3fb7cddc1dfeaf7c4da734ba71b1b0138abf63f8d0c5c42d0f2dd8cf6a281d4a88da32f4c073d81fab91f3fbca92d50d6bc9855a64814784f diff --git a/dev-libs/xerces-c/xerces-c-3.2.3.ebuild b/dev-libs/xerces-c/xerces-c-3.2.3.ebuild new file mode 100644 index 000000000000..c40bb0f65621 --- /dev/null +++ b/dev-libs/xerces-c/xerces-c-3.2.3.ebuild @@ -0,0 +1,116 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +: ${CMAKE_MAKEFILE_GENERATOR:=ninja} + +inherit cmake-utils prefix + +DESCRIPTION="A validating XML parser written in a portable subset of C++" +HOMEPAGE="https://xerces.apache.org/xerces-c/" + +if [[ ${PV} == *9999 ]] ; then + ESVN_REPO_URI="https://svn.apache.org/repos/asf/xerces/c/trunk" + inherit subversion +else + SRC_URI="mirror://apache/xerces/c/3/sources/${P}.tar.gz" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos" +fi + +LICENSE="Apache-2.0" +SLOT="0" + +IUSE="cpu_flags_x86_sse2 curl doc elibc_Darwin elibc_FreeBSD examples iconv icu static-libs test threads" +RESTRICT="!test? ( test )" + +RDEPEND="icu? ( dev-libs/icu:0= ) + curl? ( net-misc/curl ) + virtual/libiconv" +DEPEND="${RDEPEND} + doc? ( app-doc/doxygen ) + test? ( dev-lang/perl )" + +DOCS=( CREDITS KEYS NOTICE README ) + +pkg_setup() { + export ICUROOT="${EPREFIX}/usr" + + if use iconv && use icu; then + ewarn "This package can use iconv or icu for loading messages" + ewarn "and transcoding, but not both. ICU takes precedence." + fi +} + +src_configure() { + # 'cfurl' is only available on OSX and 'socket' isn't supposed to work. + # But the docs aren't clear about it, so we would need some testing... + local netaccessor + if use curl; then + netaccessor="curl" + elif use elibc_Darwin; then + netaccessor="cfurl" + else + netaccessor="socket" + fi + + local msgloader + if use icu; then + msgloader="icu" + elif use iconv; then + msgloader="iconv" + else + msgloader="inmemory" + fi + + local transcoder + if use icu; then + transcoder="icu" + elif use elibc_Darwin; then + transcoder="macosunicodeconverter" + elif use elibc_FreeBSD; then + transcoder="iconv" + else + transcoder="gnuiconv" + fi + # for interix maybe: transcoder="windows" + + local mycmakeargs=( + -DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PF}" + -Dnetwork-accessor="${netaccessor}" + -Dmessage-loader="${msgloader}" + -Dtranscoder="${transcoder}" + -Dthreads:BOOL="$(usex threads)" + -Dsse2:BOOL="$(usex cpu_flags_x86_sse2)" + ) + + cmake-utils_src_configure +} + +src_compile() { + cmake-utils_src_compile + + use doc && cmake-utils_src_compile doc-style createapidocs doc-xml +} + +src_install() { + cmake-utils_src_install + + # package provides .pc files + find "${D}" -name '*.la' -delete || die + + if use examples; then + # clean out object files, executables, Makefiles + # and the like before installing examples + find samples/ \( -type f -executable -o -iname 'runConfigure' -o -iname '*.o' \ + -o -iname '.libs' -o -iname 'Makefile*' \) -exec rm -rf '{}' + || die + docinto examples + dodoc -r samples/. + docompress -x /usr/share/doc/${PF}/examples + fi + + # To make sure an appropriate NLS msg file is around when using + # the iconv msgloader ICU has the messages compiled in. + if use iconv && ! use icu; then + doenvd "$(prefixify_ro "${FILESDIR}/50xerces-c")" + fi +} diff --git a/dev-libs/xerces-c/xerces-c-9999.ebuild b/dev-libs/xerces-c/xerces-c-9999.ebuild index aaa442c31bfc..627bdbc2f2f9 100644 --- a/dev-libs/xerces-c/xerces-c-9999.ebuild +++ b/dev-libs/xerces-c/xerces-c-9999.ebuild @@ -75,6 +75,7 @@ src_configure() { # for interix maybe: transcoder="windows" local mycmakeargs=( + -DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PF}" -Dnetwork-accessor="${netaccessor}" -Dmessage-loader="${msgloader}" -Dtranscoder="${transcoder}" diff --git a/dev-libs/xmlrpc-c/Manifest b/dev-libs/xmlrpc-c/Manifest index efae275e0a15..eb80dcbbb42a 100644 --- a/dev-libs/xmlrpc-c/Manifest +++ b/dev-libs/xmlrpc-c/Manifest @@ -1,5 +1,5 @@ AUX xmlrpc-c-1.32.05-Wimplicit.patch 593 BLAKE2B d26e051b264d2db4c52e192a5a904c410d761e563f9d102249d0127652fc19764d7ab71c1d1ad2ac6a8dc45681bfd769855a56941e15cc247b172ab853981d9f SHA512 e39c694f8fed9f2b55592043cdc6776260980e0e6751362c15026f82c2a777e37183f6a7d42e7e2ed36b4fada5124f3fd3c7d6104dc447ef494f4bf82e5dfe04 AUX xmlrpc-c-1.39.11-cplusplus.patch 374 BLAKE2B cacbc4fc8737d5e3f675a9579281fb44367fab1082340162e9d9929f6b829c612071b8535b36fa41a4f22488e0717febaaef64e4c51e7abf4fc46772aead1278 SHA512 b5182181f7c0ffa150c977b6e206c2fbfdcd979369dbf55b2c4197378edb7136629df02bb7cc5f89df522451fef3c04a7b901dc3f34bc895f55020f8d5e03ef6 DIST xmlrpc-c-1.39.11.tgz 815463 BLAKE2B 7d169d51835e64e5ac822c48b1a6d7622293c1ce1e7379985ebf6c10f3ab331c55eeff9f655cf914c4cf7e3c107fbdbd741d664489f4ad7aadb5e576ceb383c2 SHA512 13e7ddf5264436671437c0bcd698380baca35c4469f592edf79cb4cafda254fe8207ecb992ee728ed20ec70457a20bd0cf8e180ce5cf0561a38a21f1e588f584 -EBUILD xmlrpc-c-1.39.11-r1.ebuild 1918 BLAKE2B 6c6ead6b76fcb43d816c99675b3e3109a0ce77d7c68c2b8fe366e1208eee0b5b5c5bb344278d0b91399dfae0f63e9343c9d271b5f025758470191827637e14e1 SHA512 d0ddba48500c04e871ec94564ff37238b9a8af8c1d3813266313d7d66c4e5db79e77bb8354009320c2040e98324a2939b9ea6c4362aaf807c2324057ac04a1c3 +EBUILD xmlrpc-c-1.39.11-r1.ebuild 1925 BLAKE2B 2c6eb5d35f5e29c3713c11e84cd801779cfe64bbcb63009e2a08bf402e4d9927887997d600589dcd1183178c06778911a5bf89f189a342bd18e6576aaa495d8c SHA512 3ae94668dcfb4358c2c4ca4b118260f628fa291b0eb46898d8f77ee19a4aeab78beed3ecf2c05b12d7146384db0cd3fe8297663f28373f96d13fd35e998cf362 MISC metadata.xml 669 BLAKE2B 04f88706453ca3f6c7960b6a8d9fa0201cc620386d00f5e709070095e58f689ad7492d3b2a0effc9de985f642f55a347f3678f734170d36e141f1eca231612de SHA512 6009e48c681fd9a98054a37eb9ee78d87eff527d617094b55d6f3af6fe59f81328a03ccec47ab7fc1b4e54bdec50629b76b522e8943e2be43c1adf57e74caecb diff --git a/dev-libs/xmlrpc-c/xmlrpc-c-1.39.11-r1.ebuild b/dev-libs/xmlrpc-c/xmlrpc-c-1.39.11-r1.ebuild index 489792ece393..df34a37daf78 100644 --- a/dev-libs/xmlrpc-c/xmlrpc-c-1.39.11-r1.ebuild +++ b/dev-libs/xmlrpc-c/xmlrpc-c-1.39.11-r1.ebuild @@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tgz" LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" IUSE="abyss +cgi +curl +cxx +libxml2 threads test tools" RESTRICT="!test? ( test )" diff --git a/dev-libs/xmlsec/Manifest b/dev-libs/xmlsec/Manifest index 3788ce05995c..c3b698cb31ea 100644 --- a/dev-libs/xmlsec/Manifest +++ b/dev-libs/xmlsec/Manifest @@ -1,5 +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 +EBUILD xmlsec-1.2.30.ebuild 1402 BLAKE2B 3a4c8aa1b82018b5a93a08b59e53f986a5bdeea1f3e9d750cfa7f4ff851d3b8b1336159e98f8182a60cf25dc42b9d859cfe693929e65285d845fed9a6a24188e SHA512 933eee97696dd2321ad66de74ae689d0252f1a254baef40e0e4bbd708fb71d67f7303c53c2b07ffaf64af9dc70cc9ab5cd9c704985e6931dd0be01148f2ca5bf 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 index 34308fcbca49..7e6e08c03122 100644 --- a/dev-libs/xmlsec/xmlsec-1.2.30.ebuild +++ b/dev-libs/xmlsec/xmlsec-1.2.30.ebuild @@ -9,7 +9,7 @@ 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" +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 ) diff --git a/dev-libs/xxhash/Manifest b/dev-libs/xxhash/Manifest index 229b91114178..a5706d644399 100644 --- a/dev-libs/xxhash/Manifest +++ b/dev-libs/xxhash/Manifest @@ -1,7 +1,5 @@ -DIST xxhash-0.6.5.tar.gz 37521 BLAKE2B cfd4268bdb9079108c436c057f37c1c23a13a89f8a3d6c936ab27d3b339dbca3fa88e8ddc4fc9878501d6875622edd2ba50f465b4c361f1eb42d8f7a8f8a6fbd SHA512 085643b52e091ac0eedd54c4459220b3643d825ca71a11e952d00ea2041c570ff57d8553d0378f34e038ca9ee3b40d2048ed02d44d5aff1fbfcbf5e642487ba0 -DIST xxhash-0.7.1.tar.gz 76328 BLAKE2B 8ef64a1a44763417441dbec396d54b5d57ee225058f6c1bfb6baa8983bae49d84ab55a59743f7edf8580be52acc1bfb622c590f43450891af4d17cbd2ac48972 SHA512 03aa89c35fffafa8fc81b249ff4fa0dd3f7985466106815a9f36b00314ce82e3e2586e7abec5b56dd94d9b785768ac9562b03973817390b716cad8cd53e9ebc1 DIST xxhash-0.7.3.tar.gz 126405 BLAKE2B 1304251c36a839f5d1b935c0633016222d6b517932d05b84d10ae8a3ee3fccd6cfd31d8e3768f033ca8adcbf2bb9728ffd6c4ccd7a9878ef59d289b49a497656 SHA512 72949010a267f063768241b182464c386005b4078f56902fee2f7804bd01f6c27878a6a4ec2a266cd59162934a7e471264ac5757dba570a97a2b5dad7703c664 -EBUILD xxhash-0.6.5.ebuild 847 BLAKE2B 4b206a9c96a4ea24487de943816c5667bd214fd0d857b6ae462d717b5d7543ab659168a61e1462c05b8d183a9277deaa9fa87c09857c07bae5a8c58e445323d9 SHA512 e8ad2fdc3669a693fd28fb3bfb0b5819bde5999e93daf34c8f0bf7eed0b375aec5f0224701d76fd4a7e0618e6c3e912f758d3beba9b702d71cd532100fe54d09 -EBUILD xxhash-0.7.1.ebuild 910 BLAKE2B 118856484115ecbd1b58396eb002359d7432528e53e22101a28d9f5c0b6873236eb30bbed6a6c30cb906fb2afd75539b23a0a0938c9d0722326d7d7bd4aca21d SHA512 220a7992f183bf059dc2346a9afc5b28ca2424086f59ecf76b58c8b725d4dd4df9752c0859de299ba4bf4479d96fd6fd1590636833e4169607b30f92dc4769eb -EBUILD xxhash-0.7.3.ebuild 917 BLAKE2B 21a173f201fe946d152b2b9dc3b7f8cd0c8e1c73be3814919bc936ebed692ac37f106da8c4bcb245df9dbb6e603b1ae44bc86e12d37c4a0761c705709430714f SHA512 f0dd7cca98528af60bd36b5cad069f19321458fa694f99c266604fc787dea10a1f6a7fa4b549fc028ae553452559bafda88ce574dac48783537065bb4b47a8fc +DIST xxhash-0.8.0.tar.gz 145909 BLAKE2B 3e4e715d20ad09da2fe706a69e89a305d9f4d19588a28361f519d424c002345ba76b48d5adc0b600e34e595fed20a1ce8b8c5f22457cb05c4233810e9af9b823 SHA512 c3973b3c98bad44e1d8687ab4f9461aecd1c071bb3d320537a4c50fb7301edd13e990bab48cc6e5ca30536a814c8fa8cac24ceb1803a7e8eca30ef73d449373e +EBUILD xxhash-0.7.3.ebuild 908 BLAKE2B afb6ab7cdf944fe2360ac959d9cd56444aa655d022e8bbc96418597baba42ae59a4b0aa5f46dff013c3de9b519d41159796493be302f0e525d10c73290d765a9 SHA512 e735864d13fc0ccd3d087f28fb5254d38c764377cb4c490068e986f1f4e79cff8249d97edd086995e8484e1a6c3dcbf150db0661838fc32535a4e83c3728b702 +EBUILD xxhash-0.8.0.ebuild 917 BLAKE2B 21a173f201fe946d152b2b9dc3b7f8cd0c8e1c73be3814919bc936ebed692ac37f106da8c4bcb245df9dbb6e603b1ae44bc86e12d37c4a0761c705709430714f SHA512 f0dd7cca98528af60bd36b5cad069f19321458fa694f99c266604fc787dea10a1f6a7fa4b549fc028ae553452559bafda88ce574dac48783537065bb4b47a8fc MISC metadata.xml 392 BLAKE2B 6a06ef26d04abe71ca14dda2435abf49b8f1adffbca5b0af6947b73e48bb6696b216bc6da4b5cdcf9eb61ead18154af6e51679b1be350d063eaccad5a5c86303 SHA512 96be044c0faa5d67ebe60b1d1c11ce876ad3e031d605846d6623a51cf0f57615db3855dda4ff129190bc12b137c9c05395464efb150ad57da4804b852ee6802e diff --git a/dev-libs/xxhash/xxhash-0.6.5.ebuild b/dev-libs/xxhash/xxhash-0.6.5.ebuild deleted file mode 100644 index 6151842342bc..000000000000 --- a/dev-libs/xxhash/xxhash-0.6.5.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit toolchain-funcs - -DESCRIPTION="Extremely fast non-cryptographic hash algorithm" -HOMEPAGE="http://www.xxhash.net" -SRC_URI="https://github.com/Cyan4973/xxHash/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD-2 GPL-2+" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~x64-macos" -IUSE="static-libs" - -S="${WORKDIR}/xxHash-${PV}" - -src_compile() { - PREFIX="${EPREFIX}/usr" \ - LIBDIR="${EPREFIX}/usr/$(get_libdir)" \ - emake AR="$(tc-getAR)" CC="$(tc-getCC)" -} - -src_install() { - PREFIX="${EPREFIX}/usr" \ - LIBDIR="${EPREFIX}/usr/$(get_libdir)" \ - MANDIR="${EPREFIX}/usr/share/man/man1" \ - emake DESTDIR="${D}" install - - if ! use static-libs ; then - rm "${ED}"/usr/$(get_libdir)/libxxhash.a || die - fi -} diff --git a/dev-libs/xxhash/xxhash-0.7.3.ebuild b/dev-libs/xxhash/xxhash-0.7.3.ebuild index baba81c88143..4c309bb8f6d2 100644 --- a/dev-libs/xxhash/xxhash-0.7.3.ebuild +++ b/dev-libs/xxhash/xxhash-0.7.3.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://github.com/Cyan4973/xxHash/archive/v${PV}.tar.gz -> ${P}.tar.gz LICENSE="BSD-2 GPL-2+" # https://abi-laboratory.pro/tracker/timeline/xxhash SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv s390 sparc x86 ~x64-macos" IUSE="static-libs" S="${WORKDIR}/xxHash-${PV}" diff --git a/dev-libs/xxhash/xxhash-0.7.1.ebuild b/dev-libs/xxhash/xxhash-0.8.0.ebuild index 8973996851d3..baba81c88143 100644 --- a/dev-libs/xxhash/xxhash-0.7.1.ebuild +++ b/dev-libs/xxhash/xxhash-0.8.0.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://github.com/Cyan4973/xxHash/archive/v${PV}.tar.gz -> ${P}.tar.gz LICENSE="BSD-2 GPL-2+" # https://abi-laboratory.pro/tracker/timeline/xxhash SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos" IUSE="static-libs" S="${WORKDIR}/xxHash-${PV}" diff --git a/dev-libs/zziplib/Manifest b/dev-libs/zziplib/Manifest index 5d0831014faa..ef27d9335ecd 100644 --- a/dev-libs/zziplib/Manifest +++ b/dev-libs/zziplib/Manifest @@ -1,6 +1,14 @@ +AUX zziplib-0.13.69-009-perror.patch 499 BLAKE2B ffbf0a74204a575068843c55a538dd858a76bd3e7592fbc0860f7201877c9aebfcbf14ca2cb42274b71843acceceb9b3240d34423639f7f4835641ad5a95a86c SHA512 10720e172c1482e7d2f1241dffaef2f4f41ae94724cd3617c9b39e2ada558a173eb4e262121f49661e9101d260f429aad6c94c9e7c1eb6dfe56aa807e87d6510 +AUX zziplib-0.13.71-find-bash.patch 1747 BLAKE2B 48735330538b5ad72e8e962e09626dcb28d7bf28ad5f3877ae064f8f0113b42799674eeb53b95b248d20e6dce2b8d913bc540f98dc377ad66e82f95dde1378d5 SHA512 16ba20dc1eeaddbfc3eeb04db0fd93e719d8d4b0781d6821696f6911b30cc96a3e668b4e8ceb1751b34906a9a096da868b0e882a9b1e8f0daca0650ba59b60b7 +AUX zziplib-0.13.71-join-paths-pc-zzipsdldir.patch 1250 BLAKE2B 77ba09afa144ac5aaf1393d1bd612590e664d0885eb34354f2fa8cfd28005d225d1960f25d4b56d32956c13e99315e3e067a83b8f7f2c84703dff1e718f8dff1 SHA512 b81b34885aa1017b0f0d834565818b2464e0c827b2c428c14442b4d741bfa91c90e5915af98cf4fcbeababf29bb89a13f76efa98b4de1a88ac3659f666069110 +AUX zziplib-0.13.71-shell-DESTDIR.patch 3206 BLAKE2B 4f542e0f26ce332e75f341dfdd84b9907cf1e1c67f259d3626e34284991421e1931ee2f896d36dc444b37d7873269a21e780992e25b689f8ca57e5def9ae27fe SHA512 427a633de7b5928fe6150d8e5a711bc48c3d68978344ae840da512919c8151215bcc2b29f025cabd5204db9561d71d1925394f7695ddfbd9b4137c53d52b32da +AUX zziplib-0.13.71-testbuilds-opensuse15-ninja-sdl2.patch 5840 BLAKE2B fac60aa6271dd189198ea7b9640567378def938a09d2362acf60a4aeb2a3787121f644685fb4f1310459eb665b509951c02ad7a40a78a216b9778e7599dd764f SHA512 ed6d3101587d6d0088bffb1bb1483cffe1629d2ff5301e88cdab8e654bac79f84534012e129d7c17ff23beb19ca46a96598894cd383040d41993732ff62ab05d DIST zziplib-0.13.69-html.tar.xz 152536 BLAKE2B 05f14b2e6d2e3af4488096eabc1614222cb9607e832618e7534cb55a022f2ba3d2c6f8c6337f4bf9e80a350e43eb05a4c1708b63efa5e0ed10297a5f19ec7adb SHA512 211a83594d4043a29472f9c556d72ad486e40f28d55426b970b8b0617aca76f9dcbd4a3ca5991df943dfac1a1cab623b19aa04fb6ef7807a7740730e01926205 DIST zziplib-0.13.69-man.tar.xz 10988 BLAKE2B 2c3c5cfd17b3d3e17a3e72031b2246e32c9fe471b9578a4717c128725493054ceafc34763a763d31cf5532f082a596a6bceb8e417ef70476a59f4daa0a14b587 SHA512 5a804896a2d06b1d32d6b8715ffdb374ff7179145d033e919acecd46426dad3e44d4889adabce33e7f6bbc18e2b70b50a8a059498bf4f1f3d6844dda90c33c7e DIST zziplib-0.13.69-patches.tar.xz 5000 BLAKE2B 4612052bb8a312831daec9283cad8593b2161e2acd76122a982339154cd76d58b5398c61f605e3e29e0f63399c9a176710f95a1e6632ff4e1249ac596978006b SHA512 16190e20b8c722f3aee8e77ef7cc24026976b067402430c833d21761a13e32ed5f2eff543a2c13469e442d01c2ed5ae373badd6b8851c962852d6c09620a0d91 DIST zziplib-0.13.69.tar.gz 1132204 BLAKE2B 92e9f5e95665c7a47d1e472f570402e3c174d404abf461bed644ea8a37ff7661ee98b8fa241728aae375e32c470f2f48a817f72410eeda81a6a3be6e6bdb2635 SHA512 ade026289737f43ca92a8746818d87dd7618d473dbce159546ce9071c9e4cbe164a6b1c9efff16efb7aa0327b2ec6b34f3256c6bda19cd6e325703fffc810ef0 +DIST zziplib-0.13.71.tar.gz 1150654 BLAKE2B 00394de5da8b3c5b95ef0aea060e523354845261b846e3c876b13d2d05c6569496475a279d6b211c3215a6f17e6bfe53958baabcebb13cd72d30a9f0c40d9449 SHA512 e035d0ac26dca78335ae3defc652543ff7b353a1a95d76ed1beeb21a08e16f287a62d488f528cfbb77d5b558581b68d439aa0823577524e9aa61a3cf5f208cb5 EBUILD zziplib-0.13.69-r1.ebuild 2412 BLAKE2B 60415e9912525a046630ecca9f466801a3bfe29a5f48e48c937508f9ba6cda2f55974e218d3dbf9e41196798f049851e6e4c68871a09ee7dacd05afe892012bb SHA512 e7ff6954f36159d88e74fe0789d7a38b1ac22516f189170533e2b05a8bf9455c8cb459af7794be0bf81ae3af4c58a6b0abcddce8282357c5f4daf727134bd912 -MISC metadata.xml 244 BLAKE2B fc7489e331f708001ddc94cbb6b4e2c22d80c32883cb48c8044da1c8326143eed049e7f867342bb5b389f9252949f89dcb3084369729d52e49a8924d842d4693 SHA512 73f6d031dd2239ef69ea83120b253dbd61d8db15603514a673da83c3cbe9f7f881613e5fa3387917428b994bab1bd466e49ebe2c7a68829f0f2551e0124620a0 +EBUILD zziplib-0.13.71-r1.ebuild 1699 BLAKE2B 6d8ed4deb0f5424896c27c3ab1e22e176ced07f4897cf3b213898dcd0132b6afb8b62c6371b14c695ab5eb0e71139e73dbbe6075e0d292907af49fcb87711e40 SHA512 8a59e3fab9150eef670fe101e10572964b5bb4a8f18b06309234a85cacd52826e0e578fd7e1b13f0cd2dbb466a17a1592498dcaad239e3eb4137b4bed974513a +EBUILD zziplib-0.13.71-r2.ebuild 1670 BLAKE2B a6d5f2e5370b21d32310e526a06242b246d2ec1a8c177c8520d7de1afc654f70b63c07b1d7e82632fe6ff50affb9475174177ff972b2534abd4057bddae6afb3 SHA512 4825888c0c76e9518ccb331f2ae7d9012cd4c21c164ca78361163418f1d11123567b180b052b023358d0271a9a4558c4db72c9d22a5633f023844dfbd635d52e +MISC metadata.xml 448 BLAKE2B b3c0c50b50155b120d35504fd0237bbdd681f7b98c8b9bb5df38a07102a987211861ef66c692152b625274f3957f8e3d03e1b4cb1c95410b4fc64bc9f9b04cf4 SHA512 f128ee3580c81af1a61388285aadb8481adccd9f113a734c853bc4b1ae5f9924ee12dbfa2086a28eb3972348084d5c86c81747f0deb04094322af70836c1f58d diff --git a/dev-libs/zziplib/files/zziplib-0.13.69-009-perror.patch b/dev-libs/zziplib/files/zziplib-0.13.69-009-perror.patch new file mode 100644 index 000000000000..678ff3670df4 --- /dev/null +++ b/dev-libs/zziplib/files/zziplib-0.13.69-009-perror.patch @@ -0,0 +1,13 @@ +Index: zziplib-0.13.69/bins/unzip-mem.c +=================================================================== +--- zziplib-0.13.69.orig/bins/unzip-mem.c ++++ zziplib-0.13.69/bins/unzip-mem.c +@@ -93,7 +93,7 @@ static void zzip_mem_entry_make(ZZIP_MEM + { + FILE* file = fopen (entry->zz_name, "wb"); + if (file) { zzip_mem_entry_pipe (disk, entry, file); fclose (file); } +- perror (entry->zz_name); ++ else perror (entry->zz_name); + if (status < EXIT_WARNINGS) status = EXIT_WARNINGS; + } + diff --git a/dev-libs/zziplib/files/zziplib-0.13.71-find-bash.patch b/dev-libs/zziplib/files/zziplib-0.13.71-find-bash.patch new file mode 100644 index 000000000000..e29599c1b2d1 --- /dev/null +++ b/dev-libs/zziplib/files/zziplib-0.13.71-find-bash.patch @@ -0,0 +1,44 @@ +diff --git a/SDL/CMakeLists.txt b/SDL/CMakeLists.txt +index 7ceba4a..c1b8172 100644 +--- a/SDL/CMakeLists.txt ++++ b/SDL/CMakeLists.txt +@@ -47,6 +47,7 @@ endif() + + if(SDL_FOUND) + if(UNIX) ++find_package ( UnixCommands REQUIRED ) # bash + join_paths(libdir "\${prefix}" "${CMAKE_INSTALL_LIBDIR}") + join_paths(includedir "\${prefix}" "${CMAKE_INSTALL_INCLUDEDIR}") + add_custom_command(OUTPUT SDL_rwops_zzip.pc +diff --git a/zzip/CMakeLists.txt b/zzip/CMakeLists.txt +index a9f6e3a..2cdd275 100644 +--- a/zzip/CMakeLists.txt ++++ b/zzip/CMakeLists.txt +@@ -194,6 +194,7 @@ SET_TARGET_PROPERTIES(libzzipmmapped PROPERTIES VERSION ${VERNUM}.${FIXNUM} SOVE + endif() + + if(ZZIPCOMPAT) ++find_package ( UnixCommands REQUIRED ) # bash + add_custom_command(OUTPUT compat/zzip.h + COMMAND ${BASH} -c "rm -rf compat; mkdir compat" + COMMAND ${BASH} -c "echo '#ifndef ZZIP_WARNING' > compat/zzip.h" +@@ -215,6 +216,7 @@ add_custom_target(compat ALL DEPENDS compat/zzip.h) + endif() + + if(UNIX) ++find_package ( UnixCommands REQUIRED ) # bash + join_paths(libdir "\${prefix}" "${CMAKE_INSTALL_LIBDIR}") + join_paths(includedir "\${prefix}" "${CMAKE_INSTALL_INCLUDEDIR}") + add_custom_command(OUTPUT zziplib.pc +diff --git a/zzipwrap/CMakeLists.txt b/zzipwrap/CMakeLists.txt +index 220d93b..d0bf1ae 100644 +--- a/zzipwrap/CMakeLists.txt ++++ b/zzipwrap/CMakeLists.txt +@@ -49,6 +49,7 @@ target_link_libraries(zzipwrap libzzipwrap ) + target_include_directories(zzipwrap PRIVATE "${CMAKE_SOURCE_DIR}" "${CMAKE_BINARY_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}") + + if(UNIX) ++find_package ( UnixCommands REQUIRED ) # bash + join_paths(libdir "\${prefix}" "${CMAKE_INSTALL_LIBDIR}") + join_paths(includedir "\${prefix}" "${CMAKE_INSTALL_INCLUDEDIR}") + add_custom_command(OUTPUT zzipwrap.pc diff --git a/dev-libs/zziplib/files/zziplib-0.13.71-join-paths-pc-zzipsdldir.patch b/dev-libs/zziplib/files/zziplib-0.13.71-join-paths-pc-zzipsdldir.patch new file mode 100644 index 000000000000..7597f989dcc7 --- /dev/null +++ b/dev-libs/zziplib/files/zziplib-0.13.71-join-paths-pc-zzipsdldir.patch @@ -0,0 +1,26 @@ +commit 497c1598cea9dcb13d210de59b1dc65425ca5fdb +Author: Jan Tojnar <jtojnar@gmail.com> +Date: Thu Apr 16 20:09:11 2020 +0200 + + build: Produce more correct pc file with zzipsdldir + + Just like described in commit 892dea3b82208654cc9f57ffc4ef555d0d934cf5, + the CMAKE_INSTALL_INCLUDEDIR variable can be absolute path so simply + appending it to \${prefix} might not work. + +diff --git a/SDL/CMakeLists.txt b/SDL/CMakeLists.txt +index 7ceba4a..6a4f860 100644 +--- a/SDL/CMakeLists.txt ++++ b/SDL/CMakeLists.txt +@@ -49,9 +49,10 @@ if(SDL_FOUND) + if(UNIX) + join_paths(libdir "\${prefix}" "${CMAKE_INSTALL_LIBDIR}") + join_paths(includedir "\${prefix}" "${CMAKE_INSTALL_INCLUDEDIR}") ++join_paths(pc_zzipsdldir "\${prefix}" "${zzipsdldir}") + add_custom_command(OUTPUT SDL_rwops_zzip.pc + COMMAND ${BASH} -c "echo 'prefix=${CMAKE_INSTALL_PREFIX}' > SDL_rwops_zzip.pc" +- COMMAND ${BASH} -c "echo 'zzipsdldir=\${prefix}/${zzipsdldir}' >> SDL_rwops_zzip.pc" ++ COMMAND ${BASH} -c "echo 'zzipsdldir=${pc_zzipsdldir}' >> SDL_rwops_zzip.pc" + COMMAND ${BASH} -c "echo '' >> SDL_rwops_zzip.pc" + COMMAND ${BASH} -c "echo 'Name: SDL_rwops_zzip' >> SDL_rwops_zzip.pc" + COMMAND ${BASH} -c "echo 'Version: ${PROJECT_VERSION}' >> SDL_rwops_zzip.pc" diff --git a/dev-libs/zziplib/files/zziplib-0.13.71-shell-DESTDIR.patch b/dev-libs/zziplib/files/zziplib-0.13.71-shell-DESTDIR.patch new file mode 100644 index 000000000000..582a1504ee03 --- /dev/null +++ b/dev-libs/zziplib/files/zziplib-0.13.71-shell-DESTDIR.patch @@ -0,0 +1,51 @@ +commit 75e22f3c365b62acbad8d8645d5404242800dfba +Author: Guido Draheim <guidod@gmx.de> +Date: Fri Apr 17 20:47:59 2020 +0200 + + #88 use shell $DESTDIR instead of make $(DESTDIR) + +diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt +index 442e877..d1284e6 100644 +--- a/docs/CMakeLists.txt ++++ b/docs/CMakeLists.txt +@@ -145,27 +145,27 @@ string(REPLACE ";" " " all_bins_FILES "${bins_FILES}") + string(REPLACE ";" " " all_SDLs_FILES "${SDLs_FILES}") + add_custom_target(install-site + COMMAND ${BASH} -c "ls -l ${CMAKE_CURRENT_BINARY_DIR}/site.html" +- COMMAND ${BASH} -c "mkdir -vp $(DESTDIR)${docdir} >&2 || ls -ld $(DESTDIR)${docdir} >&2" +- COMMAND ${BASH} -c "cd ${outdir} && cp zziplib.html zzipmmapped.html zzipfseeko.html $(DESTDIR)${docdir}/" +- COMMAND ${BASH} -c "cd ${srcdir} && cp README.* COPYING.* $(DESTDIR)${docdir}/" +- COMMAND ${BASH} -c "cd ${topdir} && cp ChangeLog $(DESTDIR)${docdir}/" +- COMMAND ${BASH} -c "cd ${topdir} && cp ${all_bins_FILES} $(DESTDIR)${docdir}/" +- COMMAND ${BASH} -c "cd ${topdir} && cp ${all_SDLs_FILES} $(DESTDIR)${docdir}/" +- COMMAND ${BASH} -c "cd $(DESTDIR)${docdir} && cp ${outdir}/*.html ." +- COMMAND ${BASH} -c "cd $(DESTDIR)${docdir} && ln -s zzip-index.html index.html" ++ COMMAND ${BASH} -c "mkdir -vp $DESTDIR${docdir} >&2 || ls -ld $DESTDIR${docdir} >&2" ++ COMMAND ${BASH} -c "cd ${outdir} && cp zziplib.html zzipmmapped.html zzipfseeko.html $DESTDIR${docdir}/" ++ COMMAND ${BASH} -c "cd ${srcdir} && cp README.* COPYING.* $DESTDIR${docdir}/" ++ COMMAND ${BASH} -c "cd ${topdir} && cp ChangeLog $DESTDIR${docdir}/" ++ COMMAND ${BASH} -c "cd ${topdir} && cp ${all_bins_FILES} $DESTDIR${docdir}/" ++ COMMAND ${BASH} -c "cd ${topdir} && cp ${all_SDLs_FILES} $DESTDIR${docdir}/" ++ COMMAND ${BASH} -c "cd $DESTDIR${docdir} && cp ${outdir}/*.html ." ++ COMMAND ${BASH} -c "cd $DESTDIR${docdir} && ln -s zzip-index.html index.html" + DEPENDS site.html zziplib.html zzipmmapped.html zzipfseeko.html + VERBATIM) + add_custom_target(install-htmpages + COMMAND ${BASH} -c "ls -l ${CMAKE_CURRENT_BINARY_DIR}/*pages.tar" +- COMMAND ${BASH} -c "mkdir -vp $(DESTDIR)${docdir} >&2 || ls -ld $(DESTDIR)${docdir} >&2" +- COMMAND ${BASH} -c "cd $(DESTDIR)${docdir} && tar x -f ${outdir}/htmpages.tar" +- COMMAND ${BASH} -c "cd $(DESTDIR)${docdir} && mv html man" ++ COMMAND ${BASH} -c "mkdir -vp $DESTDIR${docdir} >&2 || ls -ld $DESTDIR${docdir} >&2" ++ COMMAND ${BASH} -c "cd $DESTDIR${docdir} && tar x -f ${outdir}/htmpages.tar" ++ COMMAND ${BASH} -c "cd $DESTDIR${docdir} && mv html man" + DEPENDS htmpages.tar + VERBATIM) + add_custom_target(install-manpages + COMMAND ${BASH} -c "ls -l ${CMAKE_CURRENT_BINARY_DIR}/*pages.tar" +- COMMAND ${BASH} -c "mkdir -vp $(DESTDIR)${mandir} >&2 || ls -ld $(DESTDIR)${mandir} >&2" +- COMMAND ${BASH} -c "cd $(DESTDIR)${mandir} && tar xf ${outdir}/manpages.tar" ++ COMMAND ${BASH} -c "mkdir -vp $DESTDIR${mandir} >&2 || ls -ld $DESTDIR${mandir} >&2" ++ COMMAND ${BASH} -c "cd $DESTDIR${mandir} && tar xf ${outdir}/manpages.tar" + DEPENDS manpages.tar + VERBATIM) + add_custom_target(install-docs DEPENDS install-manpages install-htmpages install-site) diff --git a/dev-libs/zziplib/files/zziplib-0.13.71-testbuilds-opensuse15-ninja-sdl2.patch b/dev-libs/zziplib/files/zziplib-0.13.71-testbuilds-opensuse15-ninja-sdl2.patch new file mode 100644 index 000000000000..d2436ae90120 --- /dev/null +++ b/dev-libs/zziplib/files/zziplib-0.13.71-testbuilds-opensuse15-ninja-sdl2.patch @@ -0,0 +1,137 @@ +commit ddaa538e8cfa46413b0e92613b54123e4b759616 +Author: Guido Draheim <guidod@gmx.de> +Date: Fri Apr 17 20:46:30 2020 +0200 + + #88 adding testbuilds/opensuse15-ninja-sdl2.dockerfile + +diff --git a/testbuilds.py b/testbuilds.py +index 756e77e..35ac70c 100755 +--- a/testbuilds.py ++++ b/testbuilds.py +@@ -1080,6 +1080,42 @@ class ZZiplibBuildTest(unittest.TestCase): + cmd = "docker rmi {images}:{testname}" + sx____(cmd.format(**locals())) + self.rm_testdir() ++ def test_431_opensuse15_ninja_sdl2_dockerfile(self): ++ if not os.path.exists(DOCKER_SOCKET): self.skipTest("docker-based test") ++ testname=self.testname() ++ testdir = self.testdir() ++ dockerfile="testbuilds/opensuse15-ninja-sdl2.dockerfile" ++ addhosts = self.local_addhosts(dockerfile) ++ savename = docname(dockerfile) ++ saveto = SAVETO ++ images = IMAGES ++ build = "build --build-arg=no_check=true" ++ cmd = "docker {build} . -f {dockerfile} {addhosts} --tag {images}:{testname}" ++ sh____(cmd.format(**locals())) ++ cmd = "docker rm --force {testname}" ++ sx____(cmd.format(**locals())) ++ cmd = "docker run -d --name {testname} {images}:{testname} sleep 60" ++ sh____(cmd.format(**locals())) ++ #:# container = self.ip_container(testname) ++ cmd = "docker exec {testname} ls -l /usr/local/bin" ++ sh____(cmd.format(**locals())) ++ cmd = "docker exec {testname} find /usr/local/include -type f" ++ sh____(cmd.format(**locals())) ++ cmd = "docker exec {testname} bash -c 'ls -l /usr/local/lib64/libzz*'" ++ sh____(cmd.format(**locals())) ++ # ++ cmd = "docker exec {testname} bash -c 'test -d /usr/local/include/SDL_rwops_zzip'" ++ sh____(cmd.format(**locals())) ++ # ++ cmd = "docker rm --force {testname}" ++ sx____(cmd.format(**locals())) ++ cmd = "docker rmi {saveto}/{savename}:latest" ++ sx____(cmd.format(**locals())) ++ cmd = "docker tag {images}:{testname} {saveto}/{savename}:latest" ++ sh____(cmd.format(**locals())) ++ cmd = "docker rmi {images}:{testname}" ++ sx____(cmd.format(**locals())) ++ self.rm_testdir() + def test_701_centos7_am_docs_dockerfile(self): + if not os.path.exists(DOCKER_SOCKET): self.skipTest("docker-based test") + testname=self.testname() +@@ -1520,6 +1556,53 @@ class ZZiplibBuildTest(unittest.TestCase): + cmd = "docker rm --force {testname2}" + sx____(cmd.format(**locals())) + self.rm_testdir() ++ def test_9431_opensuse_ninja_sdl2_dockerfile(self): ++ if not os.path.exists(DOCKER_SOCKET): self.skipTest("docker-based test") ++ testname1=self.testname() + "_1" ++ testname2=self.testname() + "_2" ++ testdir = self.testdir() ++ dockerfile1="testbuilds/opensuse15-sdl2.dockerfile" ++ dockerfile2="testbuilds/opensuse15-ninja-sdl2.dockerfile" ++ addhosts = self.local_addhosts(dockerfile1) ++ savename1 = docname(dockerfile1) ++ savename2 = docname(dockerfile2) ++ saveto = SAVETO ++ images = IMAGES ++ cmd = "docker rm --force {testname1}" ++ sx____(cmd.format(**locals())) ++ cmd = "docker rm --force {testname2}" ++ sx____(cmd.format(**locals())) ++ cmd = "docker run -d --name {testname1} {addhosts} {saveto}/{savename1} sleep 600" ++ sh____(cmd.format(**locals())) ++ cmd = "docker run -d --name {testname2} {addhosts} {saveto}/{savename2} sleep 600" ++ # ++ sh____(cmd.format(**locals())) ++ cmd = "docker exec {testname2} bash -c 'cd /usr/local && tar czvf /local.tgz .'" ++ sh____(cmd.format(**locals())) ++ cmd = "docker cp {testname2}:/local.tgz tmp.local.tgz" ++ sh____(cmd.format(**locals())) ++ cmd = "docker cp tmp.local.tgz {testname1}:/local.tgz" ++ sh____(cmd.format(**locals())) ++ cmd = "rm tmp.local.tgz" ++ sh____(cmd.format(**locals())) ++ cmd = "docker exec {testname1} mkdir -p /new/local" ++ sh____(cmd.format(**locals())) ++ cmd = "docker exec {testname1} bash -c 'cd /new/local && tar xzvf /local.tgz'" ++ sh____(cmd.format(**locals())) ++ # ++ item="{}" ++ end="\\;" ++ cmd = "docker exec {testname1} diff -urw --no-dereference /usr/local /new/local" ++ sx____(cmd.format(**locals())) ++ out = output(cmd.format(**locals())) ++ self.assertFalse(greps(out, "---")) ++ self.assertFalse(greps(out, "Only")) ++ # ++ cmd = "docker rm --force {testname1}" ++ sx____(cmd.format(**locals())) ++ cmd = "docker rm --force {testname2}" ++ sx____(cmd.format(**locals())) ++ self.rm_testdir() + def test_9711_centos7_docs_dockerfile(self): + if not os.path.exists(DOCKER_SOCKET): self.skipTest("docker-based test") + testname1=self.testname() + "_1" +diff --git a/testbuilds/opensuse15-ninja-sdl2.dockerfile b/testbuilds/opensuse15-ninja-sdl2.dockerfile +new file mode 100644 +index 0000000..8a46dd4 +--- /dev/null ++++ b/testbuilds/opensuse15-ninja-sdl2.dockerfile +@@ -0,0 +1,24 @@ ++FROM opensuse/leap:15.1 ++ARG no_check=false ++ARG no_install=false ++# -DMAKE_INSTALL_PREFIX:PATH=/usr ++ ++RUN zypper refresh repo-oss ++RUN zypper install -r repo-oss -y gcc zlib-devel python3 cmake unzip zip gzip tar libSDL2-devel ninja ++ ++RUN mkdir src ++COPY CMakeLists.txt README COPYING.LIB ChangeLog src/ ++COPY CMakeScripts src/CMakeScripts ++COPY bins src/bins ++COPY docs src/docs ++COPY test src/test ++COPY SDL src/SDL ++COPY zzipwrap src/zzipwrap ++COPY zzip src/zzip ++ ++RUN mkdir src/build ++RUN cd src/build && cmake .. -GNinja ++RUN cd src/build && ninja ++RUN $no_check || (cd src/build && ninja check VERBOSE=1) ++RUN $no_install || (cd src/build && ninja install) ++ diff --git a/dev-libs/zziplib/metadata.xml b/dev-libs/zziplib/metadata.xml index e127af637176..c47cd2c82f84 100644 --- a/dev-libs/zziplib/metadata.xml +++ b/dev-libs/zziplib/metadata.xml @@ -1,7 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> + <maintainer type="person"> + <email>gentoo@pogatzki.net</email> + <name>Volkmar W. Pogatzki</name> + </maintainer> + <maintainer type="project"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> <upstream> <remote-id type="sourceforge">zziplib</remote-id> </upstream> diff --git a/dev-libs/zziplib/zziplib-0.13.71-r1.ebuild b/dev-libs/zziplib/zziplib-0.13.71-r1.ebuild new file mode 100644 index 000000000000..b69f71534dcc --- /dev/null +++ b/dev-libs/zziplib/zziplib-0.13.71-r1.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7,8,9} ) +inherit cmake flag-o-matic python-any-r1 + +DESCRIPTION="Lightweight library for extracting data from files archived in a single zip file" +HOMEPAGE="http://zziplib.sourceforge.net/" +SRC_URI="https://github.com/gdraheim/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="|| ( LGPL-2.1 MPL-1.1 )" +SLOT="0/13" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="doc sdl static-libs test" + +RESTRICT="!test? ( test )" + +BDEPEND=" + doc? ( + ${PYTHON_DEPS} + ) + test? ( + ${PYTHON_DEPS} + app-arch/zip + ) +" +DEPEND=" + sys-libs/zlib + sdl? ( >=media-libs/libsdl-1.2.6 ) +" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}"/${PN}-0.13.69-009-perror.patch + "${FILESDIR}"/${PN}-0.13.71-join-paths-pc-zzipsdldir.patch + "${FILESDIR}"/${PN}-0.13.71-find-bash.patch + "${FILESDIR}"/${PN}-0.13.71-testbuilds-opensuse15-ninja-sdl2.patch + "${FILESDIR}"/${PN}-0.13.71-shell-DESTDIR.patch +) + +pkg_setup() { + (use test || use doc) && python-any-r1_pkg_setup +} + +src_prepare() { + cmake_src_prepare + + (use test || use doc) && python_fix_shebang . +} + +src_configure() { + append-flags -fno-strict-aliasing # bug reported upstream + + append-cppflags -D_ZZIP_LARGEFILE + local mycmakeargs=( + -DZZIPCOMPAT=OFF + -DZZIPSDL="$(usex sdl ON OFF)" + -DBUILD_STATIC_LIBS="$(usex static-libs ON OFF)" + -DBUILD_TESTS="$(usex test ON OFF)" + -DZZIPTEST="$(usex test ON OFF)" + -DZZIPDOCS="$(usex doc ON OFF)" + -DZZIPWRAP=OFF + ) + + cmake_src_configure +} diff --git a/dev-libs/zziplib/zziplib-0.13.71-r2.ebuild b/dev-libs/zziplib/zziplib-0.13.71-r2.ebuild new file mode 100644 index 000000000000..5b35a0f72f4b --- /dev/null +++ b/dev-libs/zziplib/zziplib-0.13.71-r2.ebuild @@ -0,0 +1,67 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7,8,9} ) +inherit cmake flag-o-matic python-any-r1 + +DESCRIPTION="Lightweight library for extracting data from files archived in a single zip file" +HOMEPAGE="http://zziplib.sourceforge.net/" +SRC_URI="https://github.com/gdraheim/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="|| ( LGPL-2.1 MPL-1.1 )" +SLOT="0/13" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="doc sdl static-libs test" + +RESTRICT="!test? ( test )" + +BDEPEND=" + doc? ( + ${PYTHON_DEPS} + ) + test? ( + ${PYTHON_DEPS} + app-arch/zip + ) +" +DEPEND=" + sys-libs/zlib + sdl? ( >=media-libs/libsdl-1.2.6 ) +" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}"/${PN}-0.13.69-009-perror.patch + "${FILESDIR}"/${PN}-0.13.71-join-paths-pc-zzipsdldir.patch + "${FILESDIR}"/${PN}-0.13.71-find-bash.patch + "${FILESDIR}"/${PN}-0.13.71-testbuilds-opensuse15-ninja-sdl2.patch + "${FILESDIR}"/${PN}-0.13.71-shell-DESTDIR.patch +) + +pkg_setup() { + (use test || use doc) && python-any-r1_pkg_setup +} + +src_prepare() { + cmake_src_prepare + + (use test || use doc) && python_fix_shebang . +} + +src_configure() { + append-flags -fno-strict-aliasing # bug reported upstream + + local mycmakeargs=( + -DZZIPCOMPAT=OFF + -DZZIPSDL="$(usex sdl ON OFF)" + -DBUILD_STATIC_LIBS="$(usex static-libs ON OFF)" + -DBUILD_TESTS="$(usex test ON OFF)" + -DZZIPTEST="$(usex test ON OFF)" + -DZZIPDOCS="$(usex doc ON OFF)" + -DZZIPWRAP=OFF + ) + + cmake_src_configure +} |