diff options
Diffstat (limited to 'dev-libs')
646 files changed, 5863 insertions, 8630 deletions
diff --git a/dev-libs/9libs/9libs-1.0-r4.ebuild b/dev-libs/9libs/9libs-1.0-r4.ebuild index cc510097ffa9..b8a794c0c29b 100644 --- a/dev-libs/9libs/9libs-1.0-r4.ebuild +++ b/dev-libs/9libs/9libs-1.0-r4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,11 +11,10 @@ SRC_URI="https://www.netlib.org/research/9libs/${P}.tar.bz2" LICENSE="PLAN9" SLOT="0" KEYWORDS="amd64 x86" -IUSE="static-libs" DEPEND=" - >=x11-libs/libX11-1.0.0[static-libs?] - >=x11-libs/libXt-1.0.0[static-libs?] + >=x11-libs/libX11-1.0.0 + >=x11-libs/libXt-1.0.0 " RDEPEND=" ${DEPEND} @@ -36,8 +35,8 @@ src_configure() { tc-export CC econf \ - $(use_enable static-libs static) \ --enable-shared \ + --disable-static \ --includedir=/usr/include/9libs \ --with-x } @@ -51,7 +50,5 @@ src_install() { mv "${D}"/usr/share/man/man3/${f}.{3,3g} || die done - if ! use static-libs; then - find "${ED}" -name '*.la' -delete || die - fi + find "${ED}" -name '*.la' -delete || die } diff --git a/dev-libs/angelscript/Manifest b/dev-libs/angelscript/Manifest index 841c95c9864f..2a538b82ef4f 100644 --- a/dev-libs/angelscript/Manifest +++ b/dev-libs/angelscript/Manifest @@ -1 +1,2 @@ DIST angelscript_2.34.0.zip 2020026 BLAKE2B f002c67d812cc6453d1e93ffba4aaa4c300926996b74f8d596642625e251ccd14b97473f8f0ff595e3233a3ebc7654c94420ae761eaa0b67439e18472f8df977 SHA512 c26dba452ab52c300da9c95fde8398acf4840cbc0e653ededf978d4a3e942cfe5b77292c74c49dc0279250a27cfd324c696c49d139a97c844b2a1eead9aae2f4 +DIST angelscript_2.35.0.zip 1971850 BLAKE2B 2253583f46181b420514e3f5a4609a33a019e47ac4ef183d1ddbca52610ce421da28a0e67f16f04b873bd18d9c56673bfac5aba152e6fadff84f8fe4718308a4 SHA512 e54b58e78b21c2ff6aa34d5f55b18fcf8737d057c86aef8901ac0c11f14739fe7f1494f9bcfdbca6a8e54b6d0b36a04dd098780bcd02dea5764fd6d22984b6b0 diff --git a/dev-libs/angelscript/angelscript-2.35.0.ebuild b/dev-libs/angelscript/angelscript-2.35.0.ebuild new file mode 100644 index 000000000000..70751f63e558 --- /dev/null +++ b/dev-libs/angelscript/angelscript-2.35.0.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit toolchain-funcs multilib-minimal + +DESCRIPTION="A flexible, cross-platform scripting library" +HOMEPAGE="https://www.angelcode.com/angelscript/" +SRC_URI="http://www.angelcode.com/angelscript/sdk/files/angelscript_${PV}.zip" +LICENSE="ZLIB" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~x86" +IUSE="doc static-libs" + +BDEPEND="app-arch/unzip" + +S="${WORKDIR}/sdk" + +pkg_setup() { + tc-export CXX AR RANLIB +} + +src_prepare() { + default + multilib_copy_sources +} + +multilib_src_compile() { + emake -C ${PN}/projects/gnuc shared \ + $(use static-libs && echo static) +} + +multilib_src_install() { + emake -C ${PN}/projects/gnuc \ + DESTDIR="${D}" \ + PREFIX="${EPREFIX}"/usr \ + LIBDIR_DEST='$(PREFIX)'/$(get_libdir) \ + install_header install_shared \ + $(use static-libs && echo install_static) +} + +multilib_src_install_all() { + if use doc; then + docinto html + dodoc -r docs/* + fi +} diff --git a/dev-libs/appstream-glib/appstream-glib-0.7.16.ebuild b/dev-libs/appstream-glib/appstream-glib-0.7.16.ebuild index b237b2c02bac..f7bb3107cfd5 100644 --- a/dev-libs/appstream-glib/appstream-glib-0.7.16.ebuild +++ b/dev-libs/appstream-glib/appstream-glib-0.7.16.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -11,7 +11,7 @@ SRC_URI="https://people.freedesktop.org/~hughsient/${PN}/releases/${P}.tar.xz" LICENSE="LGPL-2.1+" SLOT="0/8" # soname version -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 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 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="gtk-doc fonts +introspection stemmer" RDEPEND=" diff --git a/dev-libs/appstream-glib/appstream-glib-0.7.17.ebuild b/dev-libs/appstream-glib/appstream-glib-0.7.17.ebuild index 6710f44c42ce..f0dacd30fe6e 100644 --- a/dev-libs/appstream-glib/appstream-glib-0.7.17.ebuild +++ b/dev-libs/appstream-glib/appstream-glib-0.7.17.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -11,7 +11,7 @@ SRC_URI="https://people.freedesktop.org/~hughsient/${PN}/releases/${P}.tar.xz" LICENSE="LGPL-2.1+" SLOT="0/8" # soname version -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 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 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="gtk-doc fonts +introspection stemmer" RDEPEND=" diff --git a/dev-libs/appstream-glib/appstream-glib-0.7.18.ebuild b/dev-libs/appstream-glib/appstream-glib-0.7.18.ebuild index e78820c51e2d..ce43e426a912 100644 --- a/dev-libs/appstream-glib/appstream-glib-0.7.18.ebuild +++ b/dev-libs/appstream-glib/appstream-glib-0.7.18.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="https://people.freedesktop.org/~hughsient/${PN}/releases/${P}.tar.xz" LICENSE="LGPL-2.1+" SLOT="0/8" # soname version -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="gtk-doc fonts +introspection stemmer" RDEPEND=" diff --git a/dev-libs/appstream/Manifest b/dev-libs/appstream/Manifest index 5eb2b535aaea..406bf02a125a 100644 --- a/dev-libs/appstream/Manifest +++ b/dev-libs/appstream/Manifest @@ -1,2 +1 @@ DIST AppStream-0.12.11.tar.xz 2120548 BLAKE2B 6053d1d1bbe182c8e57f657ea5dda9c4a777d5a7955f39a57677502fbbe010d5c49a7872329d1ef716c41c7423bfb4d284e71af97f99ca6e466fbf369bf80272 SHA512 6000f4e9f995b2d481374db2409f212da9d48893c4a757cb7287e2731117f50d0ed284dedc0e24e505b3b7c9c9f38dd9a5f855eeb6c7445eb7203e74d4a5f790 -DIST AppStream-0.12.7.tar.xz 1958948 BLAKE2B 51a70395e4801ceeb3e97ac081f4c45be242cca14728f8efc5eec0d4b3cfa4cc9fab9ef7429c18e9bbb0dedb693a847258be1b11491155658a6ffa2a28358e35 SHA512 53ca7ebde3fcd345a895527da2ac5d829a09f25d28836a867b500282fba3465bde657cd75a4030cb831022f7a0d9f50aadb36078d62924e4d0edad6bfe3c5561 diff --git a/dev-libs/appstream/appstream-0.12.11-r1.ebuild b/dev-libs/appstream/appstream-0.12.11-r1.ebuild index 622c2fe9a914..c6f2bbb71f20 100644 --- a/dev-libs/appstream/appstream-0.12.11-r1.ebuild +++ b/dev-libs/appstream/appstream-0.12.11-r1.ebuild @@ -10,7 +10,7 @@ if [[ ${PV} = *9999* ]]; then EGIT_REPO_URI="https://github.com/ximion/${PN}" else SRC_URI="https://www.freedesktop.org/software/appstream/releases/AppStream-${PV}.tar.xz" - KEYWORDS="~amd64 ~arm arm64 ~ppc64 x86" + KEYWORDS="amd64 ~arm arm64 ~ppc64 x86" S="${WORKDIR}/AppStream-${PV}" fi diff --git a/dev-libs/appstream/appstream-0.12.7.ebuild b/dev-libs/appstream/appstream-0.12.7.ebuild deleted file mode 100644 index 592863c75581..000000000000 --- a/dev-libs/appstream/appstream-0.12.7.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit meson xdg-utils - -if [[ ${PV} = *9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/ximion/${PN}" -else - MY_PN="AppStream" - SRC_URI="https://www.freedesktop.org/software/appstream/releases/${MY_PN}-${PV}.tar.xz" - KEYWORDS="amd64 ~arm arm64 x86" - S="${WORKDIR}/${MY_PN}-${PV}" -fi - -DESCRIPTION="Cross-distro effort for providing metadata for software in the Linux ecosystem" -HOMEPAGE="https://www.freedesktop.org/wiki/Distributions/AppStream/" - -LICENSE="LGPL-2.1+ GPL-2+" -# check as_api_level -SLOT="0/4" -IUSE="apt +introspection qt5 test" -RESTRICT="!test? ( test )" - -BDEPEND=" - app-text/docbook-xml-dtd:4.5 - dev-libs/appstream-glib - dev-util/itstool - >=dev-util/meson-0.42.0 - >=sys-devel/gettext-0.19.8 - test? ( - dev-qt/linguist-tools:5 - qt5? ( dev-qt/qttest:5 ) - ) -" -DEPEND=" - dev-db/lmdb:= - >=dev-libs/glib-2.54:2 - dev-libs/libxml2:2 - dev-libs/libyaml - dev-libs/snowball-stemmer - introspection? ( >=dev-libs/gobject-introspection-1.56:= ) - qt5? ( dev-qt/qtcore:5 ) -" -RDEPEND="${DEPEND}" - -src_prepare() { - default - sed -e "/^as_doc_target_dir/s/appstream/${PF}/" -i docs/meson.build || die - if ! use test; then - sed -e "/^subdir.*tests/s/^/#DONT /" -i {,qt/}meson.build || die # bug 675944 - fi -} - -src_configure() { - xdg_environment_reset - - local emesonargs=( - -Dapidocs=false - -Ddocs=false - -Dmaintainer=false - -Dstemming=true - -Dvapi=false - -Dapt-support=$(usex apt true false) - -Dgir=$(usex introspection true false) - -Dqt=$(usex qt5 true false) - ) - - meson_src_configure -} diff --git a/dev-libs/apr-util/apr-util-1.6.1-r6.ebuild b/dev-libs/apr-util/apr-util-1.6.1-r6.ebuild index a30d4b805b28..e3c1c3823157 100644 --- a/dev-libs/apr-util/apr-util-1.6.1-r6.ebuild +++ b/dev-libs/apr-util/apr-util-1.6.1-r6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -15,7 +15,7 @@ SRC_URI="mirror://apache/apr/${P}.tar.bz2" LICENSE="Apache-2.0" SLOT="1" -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 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="berkdb doc gdbm ldap libressl mysql nss odbc openssl postgres sqlite static-libs" #RESTRICT="test" diff --git a/dev-libs/apr/apr-1.6.3-r4.ebuild b/dev-libs/apr/apr-1.6.3-r4.ebuild index 4aae28015124..b3c7995ee263 100644 --- a/dev-libs/apr/apr-1.6.3-r4.ebuild +++ b/dev-libs/apr/apr-1.6.3-r4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -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 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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/apr/apr-1.6.5-r1.ebuild b/dev-libs/apr/apr-1.6.5-r1.ebuild index 5ecccc4f584c..23248704ea90 100644 --- a/dev-libs/apr/apr-1.6.5-r1.ebuild +++ b/dev-libs/apr/apr-1.6.5-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -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 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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/apr/apr-1.7.0-r1.ebuild b/dev-libs/apr/apr-1.7.0-r1.ebuild index 3eb682d0fc11..f4a3aa30f6b1 100644 --- a/dev-libs/apr/apr-1.7.0-r1.ebuild +++ b/dev-libs/apr/apr-1.7.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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 ) @@ -30,6 +30,7 @@ PATCHES=( "${FILESDIR}"/${PN}-1.5.0-cross-types.patch "${FILESDIR}"/${PN}-1.5.0-sysroot.patch #385775 "${FILESDIR}"/${PN}-1.6.3-skip-known-failing-tests.patch + "${FILESDIR}"/${PN}-1.7.0-autoconf-2.70.patch #750353 ) src_prepare() { diff --git a/dev-libs/apr/files/apr-1.7.0-autoconf-2.70.patch b/dev-libs/apr/files/apr-1.7.0-autoconf-2.70.patch new file mode 100644 index 000000000000..488c3c59321d --- /dev/null +++ b/dev-libs/apr/files/apr-1.7.0-autoconf-2.70.patch @@ -0,0 +1,64 @@ +From 5593f23e8e062da108ed585535e7281b87346ee1 Mon Sep 17 00:00:00 2001 +From: Sergei Trofimovich <slyfox@gentoo.org> +Date: Wed, 25 Nov 2020 09:36:25 +0000 +Subject: [PATCH] build/apr_common.m4: avoid explicit inclusion of + '"confdefs.h"' + +The failure is observed on `autoconf-2.69d` (soon to be released +as `autoconf-2.70`). There `int64_t` detection fails as: + +``` +$ autoreconf && ./configure +... +checking whether int64_t and int use fmt %d... no +checking whether int64_t and long use fmt %ld... no +checking whether int64_t and long long use fmt %lld... no +configure: error: could not determine the string function for int64_t +``` + +This happens because `./configure` always stumbles on warning: + +``` +configure:3350: gcc -c -g -O2 -Werror conftest.c >&5 +In file included from conftest.c:31: +confdefs.h:22: error: "__STDC_WANT_IEC_60559_ATTRIBS_EXT__" redefined [-Werror] + 22 | #define __STDC_WANT_IEC_60559_ATTRIBS_EXT__ 1 + | +``` + +It's triggered by double inclusion of `"confdefs.h"` contents: +explicitly in `APR_TRY_COMPILE_NO_WARNING` macro and implicitly +via `AC_LANG_SOURCE` use. + +To fix it and avoid having to define `main()` declaration the change +uses `AC_LANG_PROGRAM` instead. + +Tested on both `autoconf-2.69` and `autoconf-2.69d`. + +Bug: https://bugs.gentoo.org/738156 +Bug: https://bugs.gentoo.org/750353 +Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org> +--- + build/apr_common.m4 | 8 ++------ + 1 file changed, 2 insertions(+), 6 deletions(-) + +diff --git a/build/apr_common.m4 b/build/apr_common.m4 +index f4e2dfd0a7..6f5782e674 100644 +--- a/build/apr_common.m4 ++++ b/build/apr_common.m4 +@@ -504,13 +504,9 @@ AC_DEFUN([APR_TRY_COMPILE_NO_WARNING], + CFLAGS="$CFLAGS -Werror" + fi + AC_COMPILE_IFELSE( +- [AC_LANG_SOURCE( +- [#include "confdefs.h" +- ] +- [[$1]] +- [int main(int argc, const char *const *argv) {] ++ [AC_LANG_PROGRAM( ++ [[$1]], + [[$2]] +- [ return 0; }] + )], [CFLAGS=$apr_save_CFLAGS + $3], [CFLAGS=$apr_save_CFLAGS + $4]) diff --git a/dev-libs/argtable/argtable-2.13-r1.ebuild b/dev-libs/argtable/argtable-2.13-r1.ebuild index 2567be6d677f..019f9c57eb3e 100644 --- a/dev-libs/argtable/argtable-2.13-r1.ebuild +++ b/dev-libs/argtable/argtable-2.13-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz" LICENSE="LGPL-2" SLOT="0" -KEYWORDS="~alpha amd64 ~arm64 ~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/atf/atf-0.21-r2.ebuild b/dev-libs/atf/atf-0.21-r2.ebuild index 3847db34f9a2..8d9f4fa2bb97 100644 --- a/dev-libs/atf/atf-0.21-r2.ebuild +++ b/dev-libs/atf/atf-0.21-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -9,7 +9,7 @@ SRC_URI="https://github.com/jmmv/atf/releases/download/${P}/${P}.tar.gz" LICENSE="BSD BSD-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~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 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="" DEPEND="virtual/pkgconfig" diff --git a/dev-libs/atk/atk-2.34.1.ebuild b/dev-libs/atk/atk-2.34.1.ebuild index 46521641412a..85ea16e0c695 100644 --- a/dev-libs/atk/atk-2.34.1.ebuild +++ b/dev-libs/atk/atk-2.34.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Accessibility" LICENSE="LGPL-2+" 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 ~x86-winnt" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" IUSE="gtk-doc +introspection" RDEPEND=" diff --git a/dev-libs/atk/atk-2.36.0.ebuild b/dev-libs/atk/atk-2.36.0.ebuild index 46521641412a..85ea16e0c695 100644 --- a/dev-libs/atk/atk-2.36.0.ebuild +++ b/dev-libs/atk/atk-2.36.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Accessibility" LICENSE="LGPL-2+" 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 ~x86-winnt" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" IUSE="gtk-doc +introspection" RDEPEND=" diff --git a/dev-libs/avro-c/avro-c-1.9.1.ebuild b/dev-libs/avro-c/avro-c-1.9.1.ebuild index 52a09b83a88b..d5f0603a0ff0 100644 --- a/dev-libs/avro-c/avro-c-1.9.1.ebuild +++ b/dev-libs/avro-c/avro-c-1.9.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 2020 Gentoo Authors +# Copyright 2020-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -10,7 +10,7 @@ SRC_URI="https://archive.apache.org/dist/avro/avro-${PV}/c/avro-c-${PV}.tar.gz" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="amd64" DEPEND=" app-arch/snappy diff --git a/dev-libs/aws-c-event-stream/aws-c-event-stream-0.2.5.ebuild b/dev-libs/aws-c-event-stream/aws-c-event-stream-0.2.5-r1.ebuild index 57f763c252a6..229b574ddd78 100644 --- a/dev-libs/aws-c-event-stream/aws-c-event-stream-0.2.5.ebuild +++ b/dev-libs/aws-c-event-stream/aws-c-event-stream-0.2.5-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -25,6 +25,7 @@ BDEPEND=" DEPEND=" >=dev-libs/aws-c-common-0.4.62:=[static-libs=] + >=dev-libs/aws-c-io-0.7.0:=[static-libs=] >=dev-libs/aws-checksums-0.1.10:=[static-libs=] " @@ -37,5 +38,15 @@ src_configure() { -DBUILD_SHARED_LIBS=$(usex !static-libs) -DBUILD_TESTING=$(usex test) ) + + if use test; then + # (#760585) Due to network sandboxing of portage, internet connectivity + # tests will always fail. If you need a USE flag, because you want/need + # to perform these tests manually, please open a bug report for it. + mycmakeargs+=( + -DENABLE_NET_TESTS=OFF + ) + fi + cmake_src_configure } diff --git a/dev-libs/aws-c-io/aws-c-io-0.7.0.ebuild b/dev-libs/aws-c-io/aws-c-io-0.7.0-r1.ebuild index e3fbefde1310..3bae4a9f0357 100644 --- a/dev-libs/aws-c-io/aws-c-io-0.7.0.ebuild +++ b/dev-libs/aws-c-io/aws-c-io-0.7.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -38,5 +38,15 @@ src_configure() { -DBUILD_SHARED_LIBS=$(usex !static-libs) -DBUILD_TESTING=$(usex test) ) + + if use test; then + # (#759802) Due to network sandboxing of portage, internet connectivity + # tests will always fail. If you need a USE flag, because you want/need + # to perform these tests manually, please open a bug report for it. + mycmakeargs+=( + -DENABLE_NET_TESTS=OFF + ) + fi + cmake_src_configure } diff --git a/dev-libs/bemenu/Manifest b/dev-libs/bemenu/Manifest index 1b2f35bd70de..45bbf3141273 100644 --- a/dev-libs/bemenu/Manifest +++ b/dev-libs/bemenu/Manifest @@ -1,2 +1 @@ -DIST bemenu-0.4.1.tar.gz 110388 BLAKE2B 229f75887b8efc336c7790745b1a3402481a1cb86f92311c0c46ec123777ad051351fede5f7d59bce532a3a906bcab8d956f1e93d5aeac44dd7a49e7210e8e9f SHA512 d86b80b2eccbfca73287975f6f5ff9d86c7541900caec858c9aeff9cb7da2ee563e34e378561822671ba16e0f2af3440e0329f5c77f06ff5adcf332451452bf2 DIST bemenu-0.5.0.tar.gz 110749 BLAKE2B dbc6d295262e51c381a9208c6936c0f40e05f3667af6a562716501577861d04c7b28ba836acbce2a6644950a191e56f865efe2f126eccdad67ea68d42f2d30b5 SHA512 5f4397bcb77d3e22340988bfb131feced1782f724ff637e40bf03c36a4377f38127c827f55faccc0dcce2ca482b9353fca7c6bfe700e6cac8e095e0df3b87a31 diff --git a/dev-libs/bemenu/bemenu-0.4.1.ebuild b/dev-libs/bemenu/bemenu-0.4.1.ebuild deleted file mode 100644 index e7510494e8a6..000000000000 --- a/dev-libs/bemenu/bemenu-0.4.1.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 2019-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="dmenu clone for wayland" -HOMEPAGE="https://github.com/Cloudef/bemenu" -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/Cloudef/bemenu.git" -else - SRC_URI="https://github.com/Cloudef/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm64 ~x86" -fi - -LICENSE="GPL-3" -SLOT="0" -IUSE="doc ncurses wayland X" - -# Require at least one backend be built -REQUIRED_USE="|| ( ncurses wayland X )" - -DEPEND=" - ncurses? ( sys-libs/ncurses:0 ) - wayland? ( - dev-libs/wayland - dev-libs/wayland-protocols - x11-libs/cairo - x11-libs/pango - ) - X? ( - x11-libs/libxcb - x11-libs/libXext - x11-libs/libX11 - x11-libs/cairo[X] - x11-libs/pango[X] - x11-libs/libXinerama - ) -" -RDEPEND="${DEPEND}" -BDEPEND="doc? ( app-doc/doxygen )" - -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() { - emake install PREFIX="${D}"/usr libdir=/$(get_libdir) -} diff --git a/dev-libs/boehm-gc/boehm-gc-8.0.4.ebuild b/dev-libs/boehm-gc/boehm-gc-8.0.4.ebuild index ed145c67fc9c..0731963bc186 100644 --- a/dev-libs/boehm-gc/boehm-gc-8.0.4.ebuild +++ b/dev-libs/boehm-gc/boehm-gc-8.0.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -15,7 +15,7 @@ LICENSE="boehm-gc" # SONAME: libgc.so.1 libgccpp.so.1 # We've been using subslot 0 for these instead of "1.1". SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv 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 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="cxx static-libs +threads" RDEPEND=">=dev-libs/libatomic_ops-7.4[${MULTILIB_USEDEP}]" diff --git a/dev-libs/boost/Manifest b/dev-libs/boost/Manifest index c833789b4102..98c80b335c33 100644 --- a/dev-libs/boost/Manifest +++ b/dev-libs/boost/Manifest @@ -1,2 +1,2 @@ -DIST boost_1_72_0.tar.bz2 106907358 BLAKE2B ab270a0e3cb24da687d86785e2d2e6d7731b4dbc07bd839eadb642dfa5a428ad584acb1f3529661a8de9a986008ff3427491041059ea2b742348d02e00761cd8 SHA512 63bbd1743e7c904b2e69fdc2eafd1c2a8a30fd70d960dcd366059d0100f000cb605d56cbd9397bb18421631f1c9552a772c434d0f0caddbe56302273f51fd1f6 DIST boost_1_74_0.tar.bz2 109600630 BLAKE2B 2982f64fccf6fdb3b4b74452e603f459242d7abb42df4162278d9b558b637786a2eb97442126967b19088d591777c64ced8f60a23e71eaa0b7545e80f800de63 SHA512 4ec9c1164ec9b95ce46ba1c073e586c94b3882dce5b7347ea14bbef0c1da230e12aa5328a501ce38cae1b1d7623daa3246325625899179b4cc309242540982a4 +DIST boost_1_75_0.tar.bz2 121849575 BLAKE2B ce7ecd8bcee518ce54f7e5302f202acbea60cedd6ae9248708c0bb5bbc2713607b2e1967a9e6f77cc20a4c008c1ee4db651def55937efc80407487a7a44fa8d6 SHA512 d86f060245e98dca5c7f3f831c98ea9ccbfa8310f20830dd913d9d4c939fbe7cb94accd35f1128e7c4faf6c27adb6f4bb54e5477a6bde983dfc7aa33c4eed03a diff --git a/dev-libs/boost/boost-1.74.0-r1.ebuild b/dev-libs/boost/boost-1.74.0-r1.ebuild index 1e685cc9b6fb..a4a8c62d1c61 100644 --- a/dev-libs/boost/boost-1.74.0-r1.ebuild +++ b/dev-libs/boost/boost-1.74.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -16,7 +16,7 @@ SRC_URI="https://dl.bintray.com/boostorg/release/${PV}/source/boost_${MY_PV}.tar 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" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-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 ) diff --git a/dev-libs/boost/boost-1.72.0-r2.ebuild b/dev-libs/boost/boost-1.74.0-r2.ebuild index 422793eb9980..569e79d1a467 100644 --- a/dev-libs/boost/boost-1.72.0-r2.ebuild +++ b/dev-libs/boost/boost-1.74.0-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -16,7 +16,7 @@ SRC_URI="https://dl.bintray.com/boostorg/release/${PV}/source/boost_${MY_PV}.tar 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" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-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 ) @@ -32,6 +32,7 @@ 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}] ) @@ -52,12 +53,14 @@ 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 - # Bug 703294, incomplete Boost.Serialization refactoring - "${FILESDIR}"/${PN}-1.72.0-missing-serialization-split_member-include.patch - # Bug 703036, per python-impl Boost.MPI - "${FILESDIR}"/${PN}-1.72.0-boost-mpi-python.patch - # Bug 704128, missing include on Boost.Ranges - "${FILESDIR}"/${PN}-1.72.0-revert-cease-dependence-on-range.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 + "${FILESDIR}"/${PN}-1.74-CVE-2012-2677.patch ) python_bindings_needed() { @@ -222,14 +225,12 @@ multilib_src_install_all() { if use python; then if use mpi; then move_mpi_py_into_sitedir() { - local pyver="${EPYTHON#python}" python_moduleinto boost - python_domodule "${ED}"/usr/$(get_libdir)/mpi${pyver/./}.so - rm "${ED}"/usr/$(get_libdir)/mpi${pyver/./}* || die - dosym mpi${pyver/./}.so $(python_get_sitedir)/boost/mpi.so + 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 - # create a proper python package - touch "${D}"/$(python_get_sitedir)/boost/__init__.py || die python_optimize } python_foreach_impl move_mpi_py_into_sitedir diff --git a/dev-libs/boost/boost-1.75.0.ebuild b/dev-libs/boost/boost-1.75.0.ebuild new file mode 100644 index 000000000000..29b542819d00 --- /dev/null +++ b/dev-libs/boost/boost-1.75.0.ebuild @@ -0,0 +1,356 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6,7,8,9,10} ) + +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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-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? ( dev-python/numpy[${PYTHON_USEDEP}] ) + ) + 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 + # 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 + "${FILESDIR}"/${PN}-1.74-CVE-2012-2677.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.72.0-boost-mpi-python.patch b/dev-libs/boost/files/boost-1.72.0-boost-mpi-python.patch deleted file mode 100644 index 8fb164a6278b..000000000000 --- a/dev-libs/boost/files/boost-1.72.0-boost-mpi-python.patch +++ /dev/null @@ -1,50 +0,0 @@ -Tag Boost.MPI python impls properly to avoid name clash -https://github.com/boostorg/mpi/issues/112 - ---- a/boostcpp.jam -+++ b/boostcpp.jam -@@ -185,7 +185,7 @@ - - rule tag ( name : type ? : property-set ) - { -- if $(type) in STATIC_LIB SHARED_LIB IMPORT_LIB -+ if $(type) in STATIC_LIB SHARED_LIB IMPORT_LIB PYTHON_EXTENSION - { - local args = $(.format-name-args) ; - if $(layout) = versioned -@@ -223,7 +223,7 @@ - { - local result = $(name) ; - -- if $(type) in STATIC_LIB SHARED_LIB IMPORT_LIB -+ if $(type) in STATIC_LIB SHARED_LIB IMPORT_LIB PYTHON_EXTENSION - { - # Add Python version suffix - ---- a/libs/mpi/build/Jamfile.v2 -+++ b/libs/mpi/build/Jamfile.v2 -@@ -58,13 +58,13 @@ - rule python-tag ( name : type ? : property-set ) - { - local result = $(name) ; -- if $(type) in STATIC_LIB SHARED_LIB IMPORT_LIB -+ if $(type) in STATIC_LIB SHARED_LIB IMPORT_LIB PYTHON_EXTENSION - { - local version = [ $(property-set).get <python> ] ; - local lib-suffix = [ version-suffix $(version) ] ; - result = $(result)$(lib-suffix) ; - } -- if $(type) in STATIC_LIB SHARED_LIB IMPORT_LIB && $(PYTHON_ID) -+ if $(type) in STATIC_LIB SHARED_LIB IMPORT_LIB PYTHON_EXTENSION && $(PYTHON_ID) - { - result = $(result)-$(PYTHON_ID) ; - } -@@ -168,6 +168,8 @@ - <link>shared:<define>BOOST_PYTHON_DYN_LINK=1 - <link>shared <runtime-link>shared - <python-debugging>on:<define>BOOST_DEBUG_PYTHON -+ -<tag>@$(BOOST_JAMROOT_MODULE)%$(BOOST_JAMROOT_MODULE).tag -+ <tag>@$(__name__).python-tag - ; - - mpi_python_libs = boost_mpi_python mpi ; diff --git a/dev-libs/boost/files/boost-1.72.0-missing-serialization-split_member-include.patch b/dev-libs/boost/files/boost-1.72.0-missing-serialization-split_member-include.patch deleted file mode 100644 index 0c9f72583efd..000000000000 --- a/dev-libs/boost/files/boost-1.72.0-missing-serialization-split_member-include.patch +++ /dev/null @@ -1,29 +0,0 @@ -Missing #include, as the split_member.hpp include is not -part of the nvp.hpp interface, and hence cannot be relied -upon to be included transitively. - -Confirmed on -https://github.com/boostorg/serialization/commit/c32a663c9963385430abc563f9c85f94d8da43a9#r36528430 - -Bug: https://bugs.gentoo.org/703294 - ---- a/boost/bimap/detail/map_view_iterator.hpp -+++ b/boost/bimap/detail/map_view_iterator.hpp -@@ -22,6 +22,7 @@ - - #ifndef BOOST_BIMAP_DISABLE_SERIALIZATION - #include <boost/serialization/nvp.hpp> -+ #include <boost/serialization/split_member.hpp> - #endif // BOOST_BIMAP_DISABLE_SERIALIZATION - - #include <boost/iterator/detail/enable_if.hpp> ---- a/boost/bimap/detail/set_view_iterator.hpp -+++ b/boost/bimap/detail/set_view_iterator.hpp -@@ -22,6 +22,7 @@ - - #ifndef BOOST_BIMAP_DISABLE_SERIALIZATION - #include <boost/serialization/nvp.hpp> -+ #include <boost/serialization/split_member.hpp> - #endif // BOOST_BIMAP_DISABLE_SERIALIZATION - - #include <boost/iterator/detail/enable_if.hpp> diff --git a/dev-libs/boost/files/boost-1.72.0-revert-cease-dependence-on-range.patch b/dev-libs/boost/files/boost-1.72.0-revert-cease-dependence-on-range.patch deleted file mode 100644 index a6002074ab93..000000000000 --- a/dev-libs/boost/files/boost-1.72.0-revert-cease-dependence-on-range.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 436e1dbe6fcd31523d261d18ad011392f1d6fbbc Mon Sep 17 00:00:00 2001 -From: Oliver Kowalke <oliver.kowalke@gmail.com> -Date: Sun, 1 Dec 2019 20:40:28 +0100 -Subject: [PATCH] Revert "Cease dependence on Range" - -This reverts commit 0c556bb59241e682bbcd3f572815149c5a9b17db. - -see #44 (One test fails to compile after boostorg/coroutine submodule updated) ---- - boost/coroutine/asymmetric_coroutine.hpp | 12 +++--------- - 1 file changed, 3 insertions(+), 9 deletions(-) - -diff --git a/boost/coroutine/asymmetric_coroutine.hpp b/boost/coroutine/asymmetric_coroutine.hpp -index ea96981..640896f 100644 ---- a/boost/coroutine/asymmetric_coroutine.hpp -+++ b/boost/coroutine/asymmetric_coroutine.hpp -@@ -14,6 +14,7 @@ - #include <boost/assert.hpp> - #include <boost/config.hpp> - #include <boost/move/move.hpp> -+#include <boost/range.hpp> - #include <boost/throw_exception.hpp> - #include <boost/utility/explicit_operator_bool.hpp> - -@@ -2354,19 +2355,12 @@ end( push_coroutine< R > & c) - - } - --// forward declaration of Boost.Range traits to break dependency on it --template<typename C, typename Enabler> --struct range_mutable_iterator; -- --template<typename C, typename Enabler> --struct range_const_iterator; -- - template< typename Arg > --struct range_mutable_iterator< coroutines::push_coroutine< Arg >, void > -+struct range_mutable_iterator< coroutines::push_coroutine< Arg > > - { typedef typename coroutines::push_coroutine< Arg >::iterator type; }; - - template< typename R > --struct range_mutable_iterator< coroutines::pull_coroutine< R >, void > -+struct range_mutable_iterator< coroutines::pull_coroutine< R > > - { typedef typename coroutines::pull_coroutine< R >::iterator type; }; - - } --- -2.24.1 - diff --git a/dev-libs/boost/files/boost-1.74-CVE-2012-2677.patch b/dev-libs/boost/files/boost-1.74-CVE-2012-2677.patch new file mode 100644 index 000000000000..ff947f74f1c4 --- /dev/null +++ b/dev-libs/boost/files/boost-1.74-CVE-2012-2677.patch @@ -0,0 +1,125 @@ +https://src.fedoraproject.org/rpms/boost/raw/master/f/boost-1.58.0-pool.patch +https://bugzilla.redhat.com/show_bug.cgi?id=828856 +https://bugs.gentoo.org/620468 +https://svn.boost.org/trac10/ticket/6701 + +Index: boost/pool/pool.hpp +=================================================================== +--- a/boost/pool/pool.hpp (revision 78317) ++++ b/boost/pool/pool.hpp (revision 78326) +@@ -27,4 +27,6 @@ + #include <boost/pool/poolfwd.hpp> + ++// std::numeric_limits ++#include <boost/limits.hpp> + // boost::integer::static_lcm + #include <boost/integer/common_factor_ct.hpp> +@@ -358,4 +360,11 @@ + } + ++ size_type max_chunks() const ++ { //! Calculated maximum number of memory chunks that can be allocated in a single call by this Pool. ++ size_type partition_size = alloc_size(); ++ size_type POD_size = integer::static_lcm<sizeof(size_type), sizeof(void *)>::value + sizeof(size_type); ++ return (std::numeric_limits<size_type>::max() - POD_size) / alloc_size(); ++ } ++ + static void * & nextof(void * const ptr) + { //! \returns Pointer dereferenced. +@@ -377,5 +388,7 @@ + //! the first time that object needs to allocate system memory. + //! The default is 32. This parameter may not be 0. +- //! \param nmax_size is the maximum number of chunks to allocate in one block. ++ //! \param nmax_size is the maximum number of chunks to allocate in one block. ++ set_next_size(nnext_size); ++ set_max_size(nmax_size); + } + +@@ -400,7 +413,7 @@ + } + void set_next_size(const size_type nnext_size) +- { //! Set number of chunks to request from the system the next time that object needs to allocate system memory. This value should never be set to 0. +- //! \returns nnext_size. +- next_size = start_size = nnext_size; ++ { //! Set number of chunks to request from the system the next time that object needs to allocate system memory. This value should never be set to 0. ++ BOOST_USING_STD_MIN(); ++ next_size = start_size = min BOOST_PREVENT_MACRO_SUBSTITUTION(nnext_size, max_chunks()); + } + size_type get_max_size() const +@@ -410,5 +423,6 @@ + void set_max_size(const size_type nmax_size) + { //! Set max_size. +- max_size = nmax_size; ++ BOOST_USING_STD_MIN(); ++ max_size = min BOOST_PREVENT_MACRO_SUBSTITUTION(nmax_size, max_chunks()); + } + size_type get_requested_size() const +@@ -713,7 +727,7 @@ + BOOST_USING_STD_MIN(); + if(!max_size) +- next_size <<= 1; ++ set_next_size(next_size << 1); + else if( next_size*partition_size/requested_size < max_size) +- next_size = min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size*requested_size/ partition_size); ++ set_next_size(min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size * requested_size / partition_size)); + + // initialize it, +@@ -753,7 +767,7 @@ + BOOST_USING_STD_MIN(); + if(!max_size) +- next_size <<= 1; ++ set_next_size(next_size << 1); + else if( next_size*partition_size/requested_size < max_size) +- next_size = min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size*requested_size/ partition_size); ++ set_next_size(min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size * requested_size / partition_size)); + + // initialize it, +@@ -797,4 +811,6 @@ + //! \returns Address of chunk n if allocated ok. + //! \returns 0 if not enough memory for n chunks. ++ if (n > max_chunks()) ++ return 0; + + const size_type partition_size = alloc_size(); +@@ -845,7 +861,7 @@ + BOOST_USING_STD_MIN(); + if(!max_size) +- next_size <<= 1; ++ set_next_size(next_size << 1); + else if( next_size*partition_size/requested_size < max_size) +- next_size = min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size*requested_size/ partition_size); ++ set_next_size(min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size * requested_size / partition_size)); + + // insert it into the list, +Index: libs/pool/test/test_bug_6701.cpp +=================================================================== +--- a/libs/pool/test/test_bug_6701.cpp (revision 78326) ++++ b/libs/pool/test/test_bug_6701.cpp (revision 78326) +@@ -0,0 +1,27 @@ ++/* Copyright (C) 2012 Étienne Dupuis ++* ++* Use, modification and distribution is subject to the ++* Boost Software License, Version 1.0. (See accompanying ++* file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) ++*/ ++ ++// Test of bug #6701 (https://svn.boost.org/trac/boost/ticket/6701) ++ ++#include <boost/pool/object_pool.hpp> ++#include <boost/limits.hpp> ++ ++int main() ++{ ++ boost::pool<> p(1024, std::numeric_limits<size_t>::max() / 768); ++ ++ void *x = p.malloc(); ++ BOOST_ASSERT(!x); ++ ++ BOOST_ASSERT(std::numeric_limits<size_t>::max() / 1024 >= p.get_next_size()); ++ BOOST_ASSERT(std::numeric_limits<size_t>::max() / 1024 >= p.get_max_size()); ++ ++ void *y = p.ordered_malloc(std::numeric_limits<size_t>::max() / 768); ++ BOOST_ASSERT(!y); ++ ++ return 0; ++} diff --git a/dev-libs/botan/Manifest b/dev-libs/botan/Manifest index f01a64f7cf5c..541d3f352269 100644 --- a/dev-libs/botan/Manifest +++ b/dev-libs/botan/Manifest @@ -1,3 +1,2 @@ -DIST Botan-2.15.0.tar.xz 5920688 BLAKE2B 1bbb9cadb0f754194851bddf8b14dbcd291285c5f3fbaad35920277a11c3d9e1b1e5cc484c0d37b1c7999b3084a1c90da56631df0b07e788372b95aff5197031 SHA512 0965a0a6141df44e38bd7da038b89dd2b3808ed9a4ebaafbf089abf60718e62cba78d7b64eaf272b5df8c5a489222e4cad4fb511cde38e76cdaed87f35896c18 DIST Botan-2.16.0.tar.xz 5938644 BLAKE2B a4b7bb48aee0dbf0f8b81a407b6a39707c3e6040a2bb93f9c34208ab87ea64879b2e56af66f090a73d66b64156e333c89e490d206e666e665a5eb4fbcd98d13e SHA512 12550425c695119d7f448a47b7956565de373e1bc86b8fdfa0a2a5b9fed1ef93a36101b6480e7a2f78e9262c988904c353fa021b681543691d09bf5b00495bd4 -DIST Botan-2.17.2.tar.xz 5940964 BLAKE2B 009df11c9d4379a15a48697554a82df3baffad0fff98af995f9a5b9b3223e4db42837650d41b7081170b07fb70d62ab347c5577ef2480a8f7011b40e1cf1764d SHA512 fa9bd30d02540c4544646971c7b82d3873f32362668d2496b4bc1a92f47d52f75ec9533d5848a7d8e9b9077c7ae2866b55d70d39101c705eec0edf9dbf01d6cf +DIST Botan-2.17.3.tar.xz 5937596 BLAKE2B 605e71c959889b459bc26f17d310a33f26c9a51fe00db91db407ac5b96c9ff57bef67a401f71826e83e0d4eda2289c22685957289e6bb357f3693a1bce60f44d SHA512 ead0f144dfb9eca66d0e81e376d0d49f4b0b6bc1599f8cf52299e1753645b5b20100efa004ef5f9571f7bea88958f35db38367fc26f2603890f8f199cc890dbc diff --git a/dev-libs/botan/botan-2.15.0.ebuild b/dev-libs/botan/botan-2.15.0.ebuild deleted file mode 100644 index a23225156ea9..000000000000 --- a/dev-libs/botan/botan-2.15.0.ebuild +++ /dev/null @@ -1,132 +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,9,10} ) - -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/botan-2.16.0.ebuild b/dev-libs/botan/botan-2.16.0.ebuild index 79f2f5509847..a848b03a02ae 100644 --- a/dev-libs/botan/botan-2.16.0.ebuild +++ b/dev-libs/botan/botan-2.16.0.ebuild @@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}" LICENSE="BSD-2" SLOT="2/$(ver_cut 1-2)" # soname version -KEYWORDS="amd64 ~arm hppa ~ia64 ppc ppc64 ~sparc x86 ~ppc-macos" +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} )" diff --git a/dev-libs/botan/botan-2.17.2.ebuild b/dev-libs/botan/botan-2.17.3.ebuild index d3f7da0aa334..d3f7da0aa334 100644 --- a/dev-libs/botan/botan-2.17.2.ebuild +++ b/dev-libs/botan/botan-2.17.3.ebuild diff --git a/dev-libs/c-blosc/Manifest b/dev-libs/c-blosc/Manifest index e58e0f214857..2d634e7a75c0 100644 --- a/dev-libs/c-blosc/Manifest +++ b/dev-libs/c-blosc/Manifest @@ -1 +1,2 @@ DIST c-blosc-1.20.1.tar.gz 878895 BLAKE2B 54f91ffc0b270f8bc8ace8893c01ab6847096397f76b31c5adf0516903cee29d867973317de5d016807837ac098b170542c0b8e702d386bf9166de31863f6eab SHA512 59f83dfb3f0db6530daeae699f0915d6c8a7186cea1fe2face7110f5c94c2e8ccc12eb0078de968552b6ac32163b2ec6fb19b79966d2c85574a2676b454f5475 +DIST c-blosc-1.21.0.tar.gz 907199 BLAKE2B 08c52ce5f0d285798aef8720378d1cc3f2d2b0a99cf47f0a49dc82757a0edb4a37c5c0d226a80bae5f9be74b5c2a070906387b9677df71ea6b825662997168a1 SHA512 76758176f91979794dc3b8d46c21294d81e33fda4f2e299b031f2dc059d77e351e3f5f1c984b0263713d6e04c48534984d580244573dd96f0198dd3838b9f376 diff --git a/dev-libs/c-blosc/c-blosc-1.21.0.ebuild b/dev-libs/c-blosc/c-blosc-1.21.0.ebuild new file mode 100644 index 000000000000..3890df40b0be --- /dev/null +++ b/dev-libs/c-blosc/c-blosc-1.21.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 ~ppc64 ~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/cdk/cdk-5.0.20160131.ebuild b/dev-libs/cdk/cdk-5.0.20160131.ebuild index 8fb480622f85..fb5cd7e68fd6 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 ~arm64 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/cgilib/cgilib-0.7-r1.ebuild b/dev-libs/cgilib/cgilib-0.7-r1.ebuild index 4f873fcb0b7a..265ae95244fd 100644 --- a/dev-libs/cgilib/cgilib-0.7-r1.ebuild +++ b/dev-libs/cgilib/cgilib-0.7-r1.ebuild @@ -10,7 +10,7 @@ SRC_URI="https://www.infodrom.org/projects/cgilib/download/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86" IUSE="static-libs" DOCS=( AUTHORS ChangeLog README cookies.txt ) diff --git a/dev-libs/check/check-0.15.2.ebuild b/dev-libs/check/check-0.15.2.ebuild index 27078d8eed4a..884e1dffe112 100644 --- a/dev-libs/check/check-0.15.2.ebuild +++ b/dev-libs/check/check-0.15.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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 ~riscv 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 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" IUSE="doc subunit test" # Tests seem to timeout on ppc* systems, #736661 diff --git a/dev-libs/chmlib/chmlib-0.40-r1.ebuild b/dev-libs/chmlib/chmlib-0.40-r1.ebuild index e32c859b3366..600428a8ebc9 100644 --- a/dev-libs/chmlib/chmlib-0.40-r1.ebuild +++ b/dev-libs/chmlib/chmlib-0.40-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="http://www.jedrea.com/${PN}/${P}.tar.bz2" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ppc ppc64 x86" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 x86" IUSE="+examples static-libs" PATCHES=( diff --git a/dev-libs/concurrencykit/concurrencykit-0.7.0-r1.ebuild b/dev-libs/concurrencykit/concurrencykit-0.7.0-r1.ebuild index 54cdda9b08c1..70ecf4c22d8a 100644 --- a/dev-libs/concurrencykit/concurrencykit-0.7.0-r1.ebuild +++ b/dev-libs/concurrencykit/concurrencykit-0.7.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_P}" LICENSE="Apache-2.0 BSD-2" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="amd64 ~arm ~arm64 x86" # The 'libck.so' has a name collision. # See #616762 for more information. diff --git a/dev-libs/confuse/Manifest b/dev-libs/confuse/Manifest index 43edbcbb05bc..63d9544c7df2 100644 --- a/dev-libs/confuse/Manifest +++ b/dev-libs/confuse/Manifest @@ -1,3 +1 @@ -DIST confuse-3.0.tar.xz 449144 BLAKE2B c8e913aa8b074d55535c35ddce7de1a0f21dade78839f66723272780345d4b5c5f265c2040a4abc9b473a09e221b50450382dff60103198f72384d28d1ab068e SHA512 12279045b772e94d2e29201ab1d7aef1ef8e698780a22d6a282d12f51ccd9a437e7817a4dd5e39bdfc8dae79700b72aa0783b4b983a935d751403d2cffd1161e -DIST confuse-3.2.2.tar.xz 473912 BLAKE2B d8df03f4543291afa6d46a36c48f78d25aee7cdcd0fab7a37a639a73cd0562b52a70057075f83f7e4e56bb542a27561a65e3217c458d757345c46a29203e6187 SHA512 c6baea65e064fe7f2d1bde187c6dcbb7f03c31f5d777cb04576f9cc2d94e9c96b7ee202e030e9a2c7eb619deb240d9e76fb12b3528ae5aa0d3abe231354d12c9 DIST confuse-3.3.tar.xz 485140 BLAKE2B 41f426544341966e4a4148c40951dd7f6771b70b182e9ab9f19ce9be781c3ca42c86615f48e91f3997c8e0654111de2360a09c070afc21047b6edb4a8187755f SHA512 93cc62d98166199315f65a2f6f540a9c0d33592b69a2c6a57fd17f132aecc6ece39b9813b96c9a49ae2b66a99b7eba1188a9ce9e360e1c5fb4b973619e7088a0 diff --git a/dev-libs/confuse/confuse-3.0.ebuild b/dev-libs/confuse/confuse-3.0.ebuild deleted file mode 100644 index 395e25819ef4..000000000000 --- a/dev-libs/confuse/confuse-3.0.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils ltprune multilib-minimal - -DESCRIPTION="a configuration file parser library" -HOMEPAGE="https://www.nongnu.org/confuse/" -SRC_URI="https://github.com/martinh/libconfuse/releases/download/v${PV}/${P}.tar.xz" - -LICENSE="ISC" -SLOT="0/1.0.0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris" - -IUSE="nls static-libs" - -DEPEND="sys-devel/flex - sys-devel/libtool - virtual/pkgconfig - nls? ( sys-devel/gettext )" -RDEPEND="nls? ( virtual/libintl[${MULTILIB_USEDEP}] )" - -DOCS=( AUTHORS ) - -src_prepare() { - eapply_user - multilib_copy_sources -} - -multilib_src_configure() { - # examples are normally compiled but not installed. They - # fail during a mingw crosscompile. - local ECONF_SOURCE=${BUILD_DIR} - econf \ - --enable-shared \ - --disable-examples \ - $(use_enable nls) \ - $(use_enable static-libs static) -} - -multilib_src_install_all() { - prune_libtool_files - - doman doc/man/man3/*.3 - dodoc -r doc/html - - docinto examples - dodoc examples/*.{c,conf} -} diff --git a/dev-libs/confuse/confuse-3.2.2.ebuild b/dev-libs/confuse/confuse-3.2.2.ebuild deleted file mode 100644 index 5efbbf361833..000000000000 --- a/dev-libs/confuse/confuse-3.2.2.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit multilib-minimal - -DESCRIPTION="a configuration file parser library" -HOMEPAGE="https://github.com/martinh/libconfuse" -SRC_URI="https://github.com/martinh/libconfuse/releases/download/v${PV}/${P}.tar.xz" - -LICENSE="ISC" -SLOT="0/2.0.0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris" - -IUSE="nls static-libs" - -BDEPEND=" - sys-devel/flex - sys-devel/libtool - virtual/pkgconfig - nls? ( sys-devel/gettext ) -" -RDEPEND=" - nls? ( virtual/libintl[${MULTILIB_USEDEP}] ) -" - -DOCS=( AUTHORS ) - -src_prepare() { - default - multilib_copy_sources -} - -multilib_src_configure() { - # examples are normally compiled but not installed. They - # fail during a mingw crosscompile. - local ECONF_SOURCE=${BUILD_DIR} - econf \ - --enable-shared \ - --disable-examples \ - $(use_enable nls) \ - $(use_enable static-libs static) -} - -multilib_src_install_all() { - doman doc/man/man3/*.3 - dodoc -r doc/html - - docinto examples - dodoc examples/*.{c,conf} - - find "${D}" -name '*.la' -delete || die -} diff --git a/dev-libs/confuse/confuse-3.3.ebuild b/dev-libs/confuse/confuse-3.3.ebuild index b1d52d810168..9d2e44cd6075 100644 --- a/dev-libs/confuse/confuse-3.3.ebuild +++ b/dev-libs/confuse/confuse-3.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -10,7 +10,7 @@ SRC_URI="https://github.com/martinh/libconfuse/releases/download/v${PV}/${P}.tar LICENSE="ISC" SLOT="0/2.1.0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris" IUSE="nls static-libs" diff --git a/dev-libs/crypto++/Manifest b/dev-libs/crypto++/Manifest index cc7d5a7d796c..c387c3742726 100644 --- a/dev-libs/crypto++/Manifest +++ b/dev-libs/crypto++/Manifest @@ -1,3 +1,2 @@ -DIST cryptopp565.zip 4220843 BLAKE2B 0c42da3564cdd175c2f2c5c4272caf826f21e47d2271c7f54acab86f5f79dcdad8d6cb946bc88f55fde6189bb2d24ad8fb03dda6b3b8c6f105434b55b8b217d0 SHA512 f13718d02ca69b0129aaf9e767c9d2e0333aa7538355f9c63d9eaf1ff369062084a18dc01489439ebf37797b3ea81b01beb072057d47ec962bfb824ddc72abc7 -DIST cryptopp700.zip 7296665 BLAKE2B 1b1a60e240a9d94b4edfea16beef0ec48ec26c61f7f9a3d89d29bd2e77b13a83ce942f81467bb90d3086253560a3c4acd6b89178dcb416ed4328340ad5222dfd SHA512 8fd8d680e5ceaf10b3c32cb1504bda4b32abc9fcaa2c6e61e3b5e67aca805c792579884bc6a749c29a99105304c421d03d7fe7909fc58f750b3155c7c5cec8ec DIST cryptopp820.zip 8859815 BLAKE2B 67aa850b887ae7aa869c9485bb18784492f6eec6cb12bf7c7cf84c776731eabf3c31965b47a60287e4e5a79dd3e9f0928dcfb185a0010a76f7cb96d2c3e8c6ae SHA512 753513a4ec8dd0fff2f551853ce6bd265d82219c28b033565b565b5e567fbee17adb419f4cde58a97e62b7d6533f4099aa4996cd0ba4775c6a2e7ae63a879da5 +DIST cryptopp840.zip 9124180 BLAKE2B de57ece8644aef68e40527e2dfe1892f924f1939617ce11d8d27253f15f2dd11cba6e594dd32f75ce799392c12ef22472fcb2f3e44b9c66bb2ae093d4c7e781e SHA512 4c32b6a9ce8a6925286185f65f7413fa1a430471f09624219656b1d088674c56f95fcc3b64f611632f12cb56dfecdcd41c9d1468942b8c391425a548245dde09 diff --git a/dev-libs/crypto++/crypto++-5.6.5-r1.ebuild b/dev-libs/crypto++/crypto++-5.6.5-r1.ebuild deleted file mode 100644 index 0d60a1066e54..000000000000 --- a/dev-libs/crypto++/crypto++-5.6.5-r1.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic toolchain-funcs - -DESCRIPTION="C++ class library of cryptographic schemes" -HOMEPAGE="https://cryptopp.com" -SRC_URI="https://www.cryptopp.com/cryptopp${PV//.}.zip" - -LICENSE="Boost-1.0" -SLOT="0/5.6" # subslot is so version -KEYWORDS="~alpha amd64 ~arm arm64 hppa ppc ppc64 sparc x86 ~x64-macos" -IUSE="static-libs" - -BDEPEND="app-arch/unzip" - -S="${WORKDIR}" - -PATCHES=( - "${FILESDIR}/${PN}-5.6.4-nonative.patch" - "${FILESDIR}/${P}-CVE-2017-9434.patch" -) - -pkg_setup() { - export CXX="$(tc-getCXX)" - export LIBDIR="${EPREFIX}/usr/$(get_libdir)" - export PREFIX="${EPREFIX}/usr" -} - -src_compile() { - # higher optimizations cause problems - replace-flags -O3 -O2 - # ASM isn't Darwin/Mach-O ready, #479554, buildsys doesn't grok CPPFLAGS - [[ ${CHOST} == *-darwin* ]] && append-cxxflags -DCRYPTOPP_DISABLE_ASM - - emake -f GNUmakefile all shared -} - -src_install() { - default - - # remove leftovers as build system sucks - rm -fr "${ED}"/usr/bin "${ED}"/usr/share/cryptopp - use static-libs || rm -f "${ED}"/usr/$(get_libdir)/*.a - - # compatibility - dosym cryptopp "${EPREFIX}"/usr/include/crypto++ - for f in "${ED}"/usr/$(get_libdir)/*; do - ln -s "$(basename "${f}")" "$(echo "${f}" | sed 's/cryptopp/crypto++/')" || die - done -} - -pkg_preinst() { - # we switched directory to symlink - # make sure portage digests that - rm -fr "${EROOT}/usr/include/crypto++" - rm -fr "${EROOT}/usr/include/cryptopp" -} diff --git a/dev-libs/crypto++/crypto++-7.0.0-r3.ebuild b/dev-libs/crypto++/crypto++-7.0.0-r3.ebuild deleted file mode 100644 index f1d8bcbf44c5..000000000000 --- a/dev-libs/crypto++/crypto++-7.0.0-r3.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs - -DESCRIPTION="C++ class library of cryptographic schemes" -HOMEPAGE="https://cryptopp.com" -SRC_URI="https://www.cryptopp.com/cryptopp${PV//.}.zip" - -LICENSE="Boost-1.0" -SLOT="0/7" # subslot is so version -KEYWORDS="~alpha amd64 ~arm arm64 hppa ppc ppc64 sparc x86 ~x64-macos" -IUSE="+asm static-libs" - -BDEPEND="app-arch/unzip" - -S="${WORKDIR}" - -config_uncomment() { - sed -i -e "s://\s*\(#define\s*$1\):\1:" config.h || die -} - -pkg_setup() { - export CXX="$(tc-getCXX)" - export LIBDIR="${EPREFIX}/usr/$(get_libdir)" - export PREFIX="${EPREFIX}/usr" -} - -src_prepare() { - default - - use asm || config_uncomment CRYPTOPP_DISABLE_ASM - - # ASM isn't Darwin/Mach-O ready, #479554, buildsys doesn't grok CPPFLAGS - [[ ${CHOST} == *-darwin* ]] && config_uncomment CRYPTOPP_DISABLE_ASM -} - -src_compile() { - emake -f GNUmakefile all shared libcryptopp.pc -} - -src_install() { - default - - use static-libs || rm -f "${ED}"/usr/$(get_libdir)/*.a -} diff --git a/dev-libs/crypto++/crypto++-8.2.0-r2.ebuild b/dev-libs/crypto++/crypto++-8.2.0-r2.ebuild index b81af078bf30..1ffe175e83b9 100644 --- a/dev-libs/crypto++/crypto++-8.2.0-r2.ebuild +++ b/dev-libs/crypto++/crypto++-8.2.0-r2.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://www.cryptopp.com/cryptopp${PV//.}.zip" LICENSE="Boost-1.0" SLOT="0/8" # subslot is so version -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x64-macos" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ppc ppc64 sparc x86 ~x64-macos" IUSE="+asm cpu_flags_x86_aes cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_pclmul cpu_flags_x86_sha cpu_flags_x86_sse2 cpu_flags_x86_sse4_2 cpu_flags_x86_ssse3 static-libs" BDEPEND="app-arch/unzip" diff --git a/dev-libs/crypto++/crypto++-8.2.0.ebuild b/dev-libs/crypto++/crypto++-8.4.0.ebuild index ec4e24855984..c28c2e43f1c1 100644 --- a/dev-libs/crypto++/crypto++-8.2.0.ebuild +++ b/dev-libs/crypto++/crypto++-8.4.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -8,30 +8,19 @@ inherit toolchain-funcs DESCRIPTION="C++ class library of cryptographic schemes" HOMEPAGE="https://cryptopp.com" SRC_URI="https://www.cryptopp.com/cryptopp${PV//.}.zip" +S="${WORKDIR}" LICENSE="Boost-1.0" -SLOT="0/8" # subslot is so version -KEYWORDS="~alpha amd64 ~arm arm64 hppa ppc ppc64 sparc x86 ~x64-macos" +SLOT="0/8.4" # subslot is so version (was broken in 8.3.0, check on bumps!) +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x64-macos" IUSE="+asm static-libs" BDEPEND="app-arch/unzip" -S="${WORKDIR}" - -PATCHES=( - "${FILESDIR}/${P}-build.patch" -) - config_uncomment() { sed -i -e "s://\s*\(#define\s*$1\):\1:" config.h || die } -pkg_setup() { - export CXX="$(tc-getCXX)" - export LIBDIR="${EPREFIX}/usr/$(get_libdir)" - export PREFIX="${EPREFIX}/usr" -} - src_prepare() { default @@ -41,6 +30,14 @@ src_prepare() { [[ ${CHOST} == *-darwin* ]] && config_uncomment CRYPTOPP_DISABLE_ASM } +src_configure() { + export CXX="$(tc-getCXX)" + export LIBDIR="${EPREFIX}/usr/$(get_libdir)" + export PREFIX="${EPREFIX}/usr" + tc-export AR RANLIB + default +} + src_compile() { emake -f GNUmakefile all shared libcryptopp.pc } diff --git a/dev-libs/crypto++/files/crypto++-5.6.4-nonative.patch b/dev-libs/crypto++/files/crypto++-5.6.4-nonative.patch deleted file mode 100644 index 77d74ee729e9..000000000000 --- a/dev-libs/crypto++/files/crypto++-5.6.4-nonative.patch +++ /dev/null @@ -1,28 +0,0 @@ -Index: work/GNUmakefile -=================================================================== ---- work.orig/GNUmakefile -+++ work/GNUmakefile -@@ -125,23 +125,6 @@ ifeq ($(IS_X86)$(IS_X32)$(IS_CYGWIN)$(IS - endif - endif - --# Guard use of -march=native --ifeq ($(GCC42_OR_LATER)$(IS_NETBSD),10) -- CXXFLAGS += -march=native --else ifneq ($(CLANG_COMPILER)$(INTEL_COMPILER),00) -- CXXFLAGS += -march=native --else -- # GCC 3.3 and "unknown option -march=" -- # Ubuntu GCC 4.1 compiler crash with -march=native -- # NetBSD GCC 4.8 compiler and "bad value (native) for -march= switch" -- # Sun compiler is handled below -- ifeq ($(SUN_COMPILER)$(IS_X64),01) -- CXXFLAGS += -m64 -- else ifeq ($(SUN_COMPILER)$(IS_X86),01) -- CXXFLAGS += -m32 -- endif # X86/X32/X64 --endif -- - # Aligned access required for -O3 and above due to vectorization - UNALIGNED_ACCESS := $(shell $(EGREP) -c "^[[:space:]]*//[[:space:]]*\#[[:space:]]*define[[:space:]]*CRYPTOPP_NO_UNALIGNED_DATA_ACCESS" config.h) - ifneq ($(UNALIGNED_ACCESS),0) diff --git a/dev-libs/crypto++/files/crypto++-5.6.5-CVE-2017-9434.patch b/dev-libs/crypto++/files/crypto++-5.6.5-CVE-2017-9434.patch deleted file mode 100644 index 428f48901a31..000000000000 --- a/dev-libs/crypto++/files/crypto++-5.6.5-CVE-2017-9434.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 07dbcc3d9644b18e05c1776db2a57fe04d780965 Mon Sep 17 00:00:00 2001 -From: Jeffrey Walton <noloader@gmail.com> -Date: Wed, 10 May 2017 18:17:12 -0400 -Subject: [PATCH] Add Inflator::BadDistanceErr exception (Issue 414) The - improved validation and excpetion clears the Address Sanitizer and Undefined - Behavior Sanitizer findings - ---- - zinflate.cpp | 8 +++++++- - zinflate.h | 4 ++++ - 3 files changed, 14 insertions(+), 4 deletions(-) - -diff --git a/zinflate.cpp b/zinflate.cpp -index 664efe6..fbd7505 100644 ---- a/zinflate.cpp -+++ b/zinflate.cpp -@@ -550,12 +550,16 @@ bool Inflator::DecodeBody() - break;
- }
- case DISTANCE_BITS:
-+ if (m_distance >= COUNTOF(distanceExtraBits))
-+ throw BadDistanceErr();
- bits = distanceExtraBits[m_distance];
- if (!m_reader.FillBuffer(bits))
- {
- m_nextDecode = DISTANCE_BITS;
- break;
- }
-+ if (m_distance >= COUNTOF(distanceStarts))
-+ throw BadDistanceErr();
- m_distance = m_reader.GetBits(bits) + distanceStarts[m_distance];
- OutputPast(m_literal, m_distance);
- }
-diff --git a/zinflate.h b/zinflate.h -index e2fd237..c47d2f6 100644 ---- a/zinflate.h -+++ b/zinflate.h -@@ -96,6 +96,7 @@ public: - };
- class UnexpectedEndErr : public Err {public: UnexpectedEndErr() : Err(INVALID_DATA_FORMAT, "Inflator: unexpected end of compressed block") {}};
- class BadBlockErr : public Err {public: BadBlockErr() : Err(INVALID_DATA_FORMAT, "Inflator: error in compressed block") {}};
-+ class BadDistanceErr : public Err {public: BadDistanceErr() : Err(INVALID_DATA_FORMAT, "Inflator: error in bit distance") {}};
-
- //! \brief RFC 1951 Decompressor
- //! \param attachment the filter's attached transformation
diff --git a/dev-libs/crypto++/metadata.xml b/dev-libs/crypto++/metadata.xml index bcfee1e5aa96..9a35204498c1 100644 --- a/dev-libs/crypto++/metadata.xml +++ b/dev-libs/crypto++/metadata.xml @@ -1,7 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> + <maintainer type="person"> + <email>sam@gentoo.org</email> + <name>Sam James</name> + </maintainer> <use> <flag name="asm">Support assembly hand optimized crypto functions (i.e. faster run time)</flag> </use> diff --git a/dev-libs/cudnn/Manifest b/dev-libs/cudnn/Manifest index fe4f0ef0f49d..958a5c1901ce 100644 --- a/dev-libs/cudnn/Manifest +++ b/dev-libs/cudnn/Manifest @@ -1,14 +1,2 @@ -DIST cudnn-10.0-linux-x64-v7.4.1.5.tgz 422699128 BLAKE2B e13b22428f011a4ad6532bfa35d836f23ea6298ad220eaea6c3a6fac7694f1c6b6920255690fac10d84388fb2bec7cc60a0319bd1816b20eac134c7b112822b9 SHA512 fd065c23b27416e2ace5f0eee854ea4a5e04f6ab4cf3a38cf806bb37a45d29756c3f138dfa01b991e96410de3668e0bb9d3cfc19cb7da7113c1f10d4147fcf67 -DIST cudnn-10.0-linux-x64-v7.4.2.24.tgz 424488399 BLAKE2B 9883cccf146e3ca3a05b8e7ebb2d265da3b7e05949ebb76369a865aa1c2c55c217b21a7847417264712882cc882b25380e5978e58c74279eb208ec593d85e919 SHA512 1e1533a62355bbebc3df62b4c0f306195c7301334390511fae2e0f071d58451edda69b72c3a257fd16470fe3ac5d3ec00aaf208dee2e30d7db0c1f9300a9c663 -DIST cudnn-10.1-linux-x64-v7.5.0.56.tgz 471291852 BLAKE2B 966a84e983631c827d7852e1dee0a87d80b61521a3c7c836c746f6ce5b60afb1da955a692dce5f0166600707c1f060231d7062d78acdf6085deb37c023301b8d SHA512 875e50669f7ab0b8f52e793285041c0a33dfc951a562869258dd22f85c94cc924c87325253f39fa64c4386768eafd3b0fe181188ef6dd5707f57fc88a6495e36 -DIST cudnn-10.1-linux-x64-v7.6.0.64.tgz 500810447 BLAKE2B cfe884dd3b2a5ca4641844a0b5df22420148bcd9092b9ad81a45560f901d36e3ab228e7b5fed85519094f4b68be46cbb631368d67166cbef2546b94185a9058d SHA512 c8d2c6efdb79940f5d475057b1e11246038b894990f58a620635e03d561ec3987806c0bccee8c12d0d3d8c4b5bf5211e46faa2c12918520af61f36bd36eb1738 -DIST cudnn-10.1-linux-x64-v7.6.1.34.tgz 521806738 BLAKE2B 9804ed394cf58f0c415d454ce83503db3faff74181e3746eabbae648cf85718ccfdcc1b64877e30e367a285294665975169fe1f992c27ac12b65d340784079a8 SHA512 81dc9a3d07885996b3b7141ea9785768dd6e266d138a671b934139b38ac1dcab0ffdb97617b308a9f492b5b163cb4dd65972e24de98499a2ecbed2bd261c1244 -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.1-linux-x64-v8.0.4.30.tgz 678710754 BLAKE2B 5ad59925a500968eef8306c7e207c12ea2f55deecd2d044d7f1f158b76264aeb954f3029d1eaa5ef2aa6939c56e39177af28fc00cc04e2fdf26f9091ef46f3ca SHA512 419f2875a0b362107ede5d238250496c1011cb8e1fdaada1ebdca8737e9df4eaddd1d3a25feeb0ef9baa0100c9f84507e527ed922b676f7883e0594b017ed9d9 -DIST cudnn-10.2-linux-x64-v7.6.5.32.tgz 548210361 BLAKE2B 51fdd14f0bbc5a029bddca94ab7ae56ee77c16fdc525c78b986bb3dc1e0525943e5ab17eb81e356ef92c985ee467bd87a6670c343a96136d932ace86bb649437 SHA512 943c1afc0b7711dec87931770eaa567e25361a31ed5e1edabcc3f81df72880428611308e8032a28dc197e8c5edfebe3f67cc9d22a21eb569d8b254d8eb84eac6 -DIST cudnn-10.2-linux-x64-v8.0.4.30.tgz 700128057 BLAKE2B 9883cb5993850b9dc0fe703925be4980b7768a6b1be940058f727e69e5d606f25b54ec3368fd22dddcc39092ac488ded4a9078c4ebb743e12c59688413c056cd SHA512 ab41425bc5fad91e9a4270059d8125efc93407956b64c2ecc926506d4c826f33fb7561b143b159e92b286937e940f05fb2f4059747ee80c28b1e7a4d8b53c000 -DIST cudnn-11.0-linux-x64-v8.0.4.30.tgz 1048904376 BLAKE2B cb9ee44998ca17f670430e2e0641d3f804ff468e1b9fedc88ae6827b340917a89a8dafce88318f30f70333b06dea87c6f7b76851b3fbad6902b020b79e1cb085 SHA512 3364625e24bf5e57ceb4e38cf4eca81341245d9ba354816247537c943c70f9981719cf94873b19aa23b45c64d16a0374c0b9f60328e76f8e5b38f6c88610bff4 -DIST cudnn-11.1-linux-x64-v8.0.4.30.tgz 1510998061 BLAKE2B 1829886516d75ef6015cdbfe26ab8508d9e99d9a3c39b2fedc236663e509f4bfe9adaa54814906a2bb5b885379d4e2349e46d3580f815acdb16e9f73d51574d9 SHA512 57615fef93f0897ede6d65da255a61f2e84d25ef46cd85c5f65558ba4bd8fee6f1ff06a4b0ecf20d0ff92bfd019a3068c719cdcd0de0eb2d16b18caee4aae610 -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 +DIST cudnn-10.2-linux-x64-v8.0.5.39.tgz 706337907 BLAKE2B 1dda021f7c313b53fe6024bd7c0eccf3746a55b7399a63cf3160f2a474fd36e33273d8714dc099fed901b6be3dfac51d14033cdb0fe85c2019222127b695c9ef SHA512 867fc7ff9336656431069f01d5f59bb5da09d51dc38ba723d066a1b338646b704969a5c7595551b357b98e7d2204863d4d2b7a84708480e16dc3dbb604f26339 +DIST cudnn-11.1-linux-x64-v8.0.5.39.tgz 1548325637 BLAKE2B 6c846156b3d6b2c286ea2ec639dcaf887ca172b23d98bed5227c312a4cf79381d5b81c763e6237cb57f3ad47500042cef6d454d43755110defcb6f98b6e7a28a SHA512 f704df22336376a9053a7c1f22e650beab61c6829325e0c221416f38a867180a65f9aca7a6f14f5a61c0b450d24a1dff27df47d996d3d26ff1c300b9bedaacc6 diff --git a/dev-libs/cudnn/cudnn-7.0.5-r1.ebuild b/dev-libs/cudnn/cudnn-7.0.5-r1.ebuild deleted file mode 100644 index 219fb86f697f..000000000000 --- a/dev-libs/cudnn/cudnn-7.0.5-r1.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -CUDA_PV=9.1 - -inherit versionator - -DESCRIPTION="NVIDIA Accelerated Deep Learning on GPU library" -HOMEPAGE="https://developer.nvidia.com/cuDNN" - -MY_PV_MAJOR=$(get_major_version) -SRC_URI="cudnn-${CUDA_PV}-linux-x64-v${MY_PV_MAJOR}.tgz" - -SLOT="0/7" -KEYWORDS="~amd64 ~amd64-linux" -RESTRICT="fetch" -LICENSE="NVIDIA-cuDNN" - -S="${WORKDIR}" - -DEPEND="=dev-util/nvidia-cuda-toolkit-${CUDA_PV}*" -RDEPEND="${DEPEND}" - -src_install() { - insinto /opt - doins -r * -} diff --git a/dev-libs/cudnn/cudnn-7.1.4.ebuild b/dev-libs/cudnn/cudnn-7.1.4.ebuild deleted file mode 100644 index af229d78d73f..000000000000 --- a/dev-libs/cudnn/cudnn-7.1.4.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -CUDA_PV=9.2 - -DESCRIPTION="NVIDIA Accelerated Deep Learning on GPU library" -HOMEPAGE="https://developer.nvidia.com/cuDNN" - -MY_PV_MAJOR=$(ver_cut 1-2) -SRC_URI="cudnn-${CUDA_PV}-linux-x64-v${MY_PV_MAJOR}.tgz" - -SLOT="0/7" -KEYWORDS="~amd64 ~amd64-linux" -RESTRICT="fetch" -LICENSE="NVIDIA-cuDNN" -QA_PREBUILT="*" - -S="${WORKDIR}" - -DEPEND="=dev-util/nvidia-cuda-toolkit-${CUDA_PV}*" -RDEPEND="${DEPEND}" - -src_install() { - insinto /opt - doins -r * -} diff --git a/dev-libs/cudnn/cudnn-7.4.1.5.ebuild b/dev-libs/cudnn/cudnn-7.4.1.5.ebuild deleted file mode 100644 index 12b9a675c0be..000000000000 --- a/dev-libs/cudnn/cudnn-7.4.1.5.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -CUDA_PV=10.0 - -DESCRIPTION="NVIDIA Accelerated Deep Learning on GPU library" -HOMEPAGE="https://developer.nvidia.com/cuDNN" - -MY_PV_MAJOR=$(ver_cut 1-2) -SRC_URI="cudnn-${CUDA_PV}-linux-x64-v${PV}.tgz" - -SLOT="0/7" -KEYWORDS="~amd64 ~amd64-linux" -RESTRICT="fetch" -LICENSE="NVIDIA-cuDNN" -QA_PREBUILT="*" - -S="${WORKDIR}" - -DEPEND="=dev-util/nvidia-cuda-toolkit-${CUDA_PV}*" -RDEPEND="${DEPEND}" - -src_install() { - insinto /opt - doins -r * -} diff --git a/dev-libs/cudnn/cudnn-7.4.2.24.ebuild b/dev-libs/cudnn/cudnn-7.4.2.24.ebuild deleted file mode 100644 index 12b9a675c0be..000000000000 --- a/dev-libs/cudnn/cudnn-7.4.2.24.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -CUDA_PV=10.0 - -DESCRIPTION="NVIDIA Accelerated Deep Learning on GPU library" -HOMEPAGE="https://developer.nvidia.com/cuDNN" - -MY_PV_MAJOR=$(ver_cut 1-2) -SRC_URI="cudnn-${CUDA_PV}-linux-x64-v${PV}.tgz" - -SLOT="0/7" -KEYWORDS="~amd64 ~amd64-linux" -RESTRICT="fetch" -LICENSE="NVIDIA-cuDNN" -QA_PREBUILT="*" - -S="${WORKDIR}" - -DEPEND="=dev-util/nvidia-cuda-toolkit-${CUDA_PV}*" -RDEPEND="${DEPEND}" - -src_install() { - insinto /opt - doins -r * -} diff --git a/dev-libs/cudnn/cudnn-7.5.0.56.ebuild b/dev-libs/cudnn/cudnn-7.5.0.56.ebuild deleted file mode 100644 index 2f134235f5ae..000000000000 --- a/dev-libs/cudnn/cudnn-7.5.0.56.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -CUDA_PV=10.1 - -DESCRIPTION="NVIDIA Accelerated Deep Learning on GPU library" -HOMEPAGE="https://developer.nvidia.com/cuDNN" - -MY_PV_MAJOR=$(ver_cut 1-2) -SRC_URI="cudnn-${CUDA_PV}-linux-x64-v${PV}.tgz" - -SLOT="0/7" -KEYWORDS="~amd64 ~amd64-linux" -RESTRICT="fetch" -LICENSE="NVIDIA-cuDNN" -QA_PREBUILT="*" - -S="${WORKDIR}" - -DEPEND="=dev-util/nvidia-cuda-toolkit-${CUDA_PV}*" -RDEPEND="${DEPEND}" - -src_install() { - insinto /opt/cuda - doins cuda/NVIDIA_SLA_cuDNN_Support.txt - - insinto /opt/cuda/targets/x86_64-linux/include - doins -r cuda/include/* - - insinto /opt/cuda/targets/x86_64-linux/lib - doins -r cuda/lib*/* -} diff --git a/dev-libs/cudnn/cudnn-7.6.0.64.ebuild b/dev-libs/cudnn/cudnn-7.6.0.64.ebuild deleted file mode 100644 index 2f134235f5ae..000000000000 --- a/dev-libs/cudnn/cudnn-7.6.0.64.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -CUDA_PV=10.1 - -DESCRIPTION="NVIDIA Accelerated Deep Learning on GPU library" -HOMEPAGE="https://developer.nvidia.com/cuDNN" - -MY_PV_MAJOR=$(ver_cut 1-2) -SRC_URI="cudnn-${CUDA_PV}-linux-x64-v${PV}.tgz" - -SLOT="0/7" -KEYWORDS="~amd64 ~amd64-linux" -RESTRICT="fetch" -LICENSE="NVIDIA-cuDNN" -QA_PREBUILT="*" - -S="${WORKDIR}" - -DEPEND="=dev-util/nvidia-cuda-toolkit-${CUDA_PV}*" -RDEPEND="${DEPEND}" - -src_install() { - insinto /opt/cuda - doins cuda/NVIDIA_SLA_cuDNN_Support.txt - - insinto /opt/cuda/targets/x86_64-linux/include - doins -r cuda/include/* - - insinto /opt/cuda/targets/x86_64-linux/lib - doins -r cuda/lib*/* -} diff --git a/dev-libs/cudnn/cudnn-7.6.1.34.ebuild b/dev-libs/cudnn/cudnn-7.6.1.34.ebuild deleted file mode 100644 index 2f134235f5ae..000000000000 --- a/dev-libs/cudnn/cudnn-7.6.1.34.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -CUDA_PV=10.1 - -DESCRIPTION="NVIDIA Accelerated Deep Learning on GPU library" -HOMEPAGE="https://developer.nvidia.com/cuDNN" - -MY_PV_MAJOR=$(ver_cut 1-2) -SRC_URI="cudnn-${CUDA_PV}-linux-x64-v${PV}.tgz" - -SLOT="0/7" -KEYWORDS="~amd64 ~amd64-linux" -RESTRICT="fetch" -LICENSE="NVIDIA-cuDNN" -QA_PREBUILT="*" - -S="${WORKDIR}" - -DEPEND="=dev-util/nvidia-cuda-toolkit-${CUDA_PV}*" -RDEPEND="${DEPEND}" - -src_install() { - insinto /opt/cuda - doins cuda/NVIDIA_SLA_cuDNN_Support.txt - - insinto /opt/cuda/targets/x86_64-linux/include - doins -r cuda/include/* - - insinto /opt/cuda/targets/x86_64-linux/lib - doins -r cuda/lib*/* -} diff --git a/dev-libs/cudnn/cudnn-7.6.2.24.ebuild b/dev-libs/cudnn/cudnn-7.6.2.24.ebuild deleted file mode 100644 index 2f134235f5ae..000000000000 --- a/dev-libs/cudnn/cudnn-7.6.2.24.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -CUDA_PV=10.1 - -DESCRIPTION="NVIDIA Accelerated Deep Learning on GPU library" -HOMEPAGE="https://developer.nvidia.com/cuDNN" - -MY_PV_MAJOR=$(ver_cut 1-2) -SRC_URI="cudnn-${CUDA_PV}-linux-x64-v${PV}.tgz" - -SLOT="0/7" -KEYWORDS="~amd64 ~amd64-linux" -RESTRICT="fetch" -LICENSE="NVIDIA-cuDNN" -QA_PREBUILT="*" - -S="${WORKDIR}" - -DEPEND="=dev-util/nvidia-cuda-toolkit-${CUDA_PV}*" -RDEPEND="${DEPEND}" - -src_install() { - insinto /opt/cuda - doins cuda/NVIDIA_SLA_cuDNN_Support.txt - - insinto /opt/cuda/targets/x86_64-linux/include - doins -r cuda/include/* - - insinto /opt/cuda/targets/x86_64-linux/lib - doins -r cuda/lib*/* -} diff --git a/dev-libs/cudnn/cudnn-7.6.5.32.ebuild b/dev-libs/cudnn/cudnn-7.6.5.32.ebuild deleted file mode 100644 index 9efaf0b7e601..000000000000 --- a/dev-libs/cudnn/cudnn-7.6.5.32.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -CUDA_PV=10.2 - -DESCRIPTION="NVIDIA Accelerated Deep Learning on GPU library" -HOMEPAGE="https://developer.nvidia.com/cuDNN" - -MY_PV_MAJOR=$(ver_cut 1-2) -SRC_URI="cudnn-${CUDA_PV}-linux-x64-v${PV}.tgz" - -SLOT="0/7" -KEYWORDS="~amd64 ~amd64-linux" -RESTRICT="fetch" -LICENSE="NVIDIA-cuDNN" -QA_PREBUILT="*" - -S="${WORKDIR}" - -DEPEND="=dev-util/nvidia-cuda-toolkit-${CUDA_PV}*" -RDEPEND="${DEPEND}" - -src_install() { - insinto /opt/cuda - doins cuda/NVIDIA_SLA_cuDNN_Support.txt - - insinto /opt/cuda/targets/x86_64-linux/include - doins -r cuda/include/* - - insinto /opt/cuda/targets/x86_64-linux/lib - doins -r cuda/lib*/* -} diff --git a/dev-libs/cudnn/cudnn-8.0.4.30.ebuild b/dev-libs/cudnn/cudnn-8.0.4.30.ebuild deleted file mode 100644 index 43f665fadede..000000000000 --- a/dev-libs/cudnn/cudnn-8.0.4.30.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 - -DESCRIPTION="NVIDIA Accelerated Deep Learning on GPU library" -HOMEPAGE="https://developer.nvidia.com/cuDNN" - -SRC_URI="cuda11-1? ( cudnn-11.1-linux-x64-v${PV}.tgz ) - cuda11-0? ( cudnn-11.0-linux-x64-v${PV}.tgz ) - cuda10-2? ( cudnn-10.2-linux-x64-v${PV}.tgz ) - cuda10-1? ( cudnn-10.1-linux-x64-v${PV}.tgz )" - -SLOT="0/8" -KEYWORDS="~amd64 ~amd64-linux" -RESTRICT="fetch" -LICENSE="NVIDIA-cuDNN" -QA_PREBUILT="*" - -IUSE="cuda10-1 cuda10-2 cuda11-0 +cuda11-1" -REQUIRED_USE="^^ ( cuda10-2 cuda10-1 cuda11-0 cuda11-1 )" - -S="${WORKDIR}" - -DEPEND="cuda11-1? ( =dev-util/nvidia-cuda-toolkit-11.1* ) - cuda11-0? ( =dev-util/nvidia-cuda-toolkit-11.0* ) - cuda10-2? ( =dev-util/nvidia-cuda-toolkit-10.2* ) - cuda10-1? ( =dev-util/nvidia-cuda-toolkit-10.1* )" -RDEPEND="${DEPEND}" - -src_install() { - insinto /opt/cuda - doins cuda/NVIDIA_SLA_cuDNN_Support.txt - - insinto /opt/cuda/targets/x86_64-linux/include - doins -r cuda/include/* - - insinto /opt/cuda/targets/x86_64-linux/lib - doins -r cuda/lib*/* -} diff --git a/dev-libs/cudnn/cudnn-7.6.5.32-r2.ebuild b/dev-libs/cudnn/cudnn-8.0.5.39.ebuild index e4c0526676b3..08834aa3d656 100644 --- a/dev-libs/cudnn/cudnn-7.6.5.32-r2.ebuild +++ b/dev-libs/cudnn/cudnn-8.0.5.39.ebuild @@ -5,32 +5,32 @@ EAPI=7 DESCRIPTION="NVIDIA Accelerated Deep Learning on GPU library" HOMEPAGE="https://developer.nvidia.com/cuDNN" +SRC_URI=" + cuda11-1? ( cudnn-11.1-linux-x64-v${PV}.tgz ) + cuda10-2? ( cudnn-10.2-linux-x64-v${PV}.tgz )" -SRC_URI="cuda10-2? ( cudnn-10.2-linux-x64-v${PV}.tgz ) - cuda10-1? ( cudnn-10.1-linux-x64-v${PV}.tgz )" - -SLOT="0/7" +LICENSE="NVIDIA-cuDNN" +SLOT="0/8" KEYWORDS="~amd64 ~amd64-linux" +IUSE="cuda10-2 +cuda11-1" +REQUIRED_USE="^^ ( cuda10-2 cuda11-1 )" RESTRICT="fetch" -LICENSE="NVIDIA-cuDNN" -QA_PREBUILT="*" -IUSE="+cuda10-2 cuda10-1" -REQUIRED_USE="^^ ( cuda10-2 cuda10-1 )" +DEPEND=" + cuda11-1? ( =dev-util/nvidia-cuda-toolkit-11.1* ) + cuda10-2? ( =dev-util/nvidia-cuda-toolkit-10.2* )" +RDEPEND="${DEPEND}" S="${WORKDIR}" - -DEPEND="cuda10-2? ( =dev-util/nvidia-cuda-toolkit-10.2* ) - cuda10-1? ( =dev-util/nvidia-cuda-toolkit-10.1* )" -RDEPEND="${DEPEND}" +QA_PREBUILT="*" src_install() { insinto /opt/cuda doins cuda/NVIDIA_SLA_cuDNN_Support.txt - insinto /opt/cuda/targets/x86_64-linux/include - doins -r cuda/include/* + insinto /opt/cuda/targets/x86_64-linux + doins -r cuda/include insinto /opt/cuda/targets/x86_64-linux/lib - doins -r cuda/lib*/* + doins -r cuda/lib64/. } diff --git a/dev-libs/cudnn/metadata.xml b/dev-libs/cudnn/metadata.xml index f23e16c047e4..4eb8ce7abbfb 100644 --- a/dev-libs/cudnn/metadata.xml +++ b/dev-libs/cudnn/metadata.xml @@ -6,9 +6,7 @@ <name>Gentoo Science Project</name> </maintainer> <use> - <flag name="cuda10-1">On nVidia CUDA 10.1.</flag> <flag name="cuda10-2">On nVidia CUDA 10.2.</flag> - <flag name="cuda11-0">On nVidia CUDA 11.0.</flag> <flag name="cuda11-1">On nVidia CUDA 11.1.</flag> </use> <origin>gentoo-staging</origin> diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r3.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r3.ebuild index d7fb6c340991..240827a94f2d 100644 --- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r3.ebuild +++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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 ~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/cyrus-sasl/cyrus-sasl-2.1.27-r4.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r4.ebuild index 0427282c01cd..f03d111d2036 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 @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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 ~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/d0_blind_id/d0_blind_id-0.5.ebuild b/dev-libs/d0_blind_id/d0_blind_id-0.5.ebuild index 934be9f343f4..ff1d05e2aa7b 100644 --- a/dev-libs/d0_blind_id/d0_blind_id-0.5.ebuild +++ b/dev-libs/d0_blind_id/d0_blind_id-0.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 diff --git a/dev-libs/dbus-glib/dbus-glib-0.110.ebuild b/dev-libs/dbus-glib/dbus-glib-0.110.ebuild index 2d3b43af461d..0da7888c532e 100644 --- a/dev-libs/dbus-glib/dbus-glib-0.110.ebuild +++ b/dev-libs/dbus-glib/dbus-glib-0.110.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -10,7 +10,7 @@ SRC_URI="https://dbus.freedesktop.org/releases/${PN}/${P}.tar.gz" LICENSE="|| ( GPL-2 AFL-2.1 )" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" IUSE="debug static-libs test" RESTRICT="!test? ( test )" diff --git a/dev-libs/ding-libs/ding-libs-0.6.0.ebuild b/dev-libs/ding-libs/ding-libs-0.6.0.ebuild index be795d15b544..654721bc0024 100644 --- a/dev-libs/ding-libs/ding-libs-0.6.0.ebuild +++ b/dev-libs/ding-libs/ding-libs-0.6.0.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://releases.pagure.org/SSSD/${PN}/${P}.tar.gz" LICENSE="LGPL-3 GPL-3" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc ~x86 ~amd64-linux" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc ~x86 ~amd64-linux" IUSE="test static-libs" RESTRICT="!test? ( test )" diff --git a/dev-libs/ding-libs/ding-libs-0.6.1.ebuild b/dev-libs/ding-libs/ding-libs-0.6.1.ebuild index 13751314c449..f64be15bf4ae 100644 --- a/dev-libs/ding-libs/ding-libs-0.6.1.ebuild +++ b/dev-libs/ding-libs/ding-libs-0.6.1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://releases.pagure.org/SSSD/${PN}/${P}.tar.gz" LICENSE="LGPL-3 GPL-3" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux" IUSE="test static-libs" RESTRICT="!test? ( test )" diff --git a/dev-libs/ding-libs/metadata.xml b/dev-libs/ding-libs/metadata.xml index 35527d1ae4b0..d85b4252fc33 100644 --- a/dev-libs/ding-libs/metadata.xml +++ b/dev-libs/ding-libs/metadata.xml @@ -1,9 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="person"> - <email>maksbotan@gentoo.org</email> - <name>Maxim Koltsov</name> -</maintainer> +<!-- maintainer-needed --> <origin>gentoo-staging</origin> </pkgmetadata> diff --git a/dev-libs/dmalloc/dmalloc-5.5.2-r7.ebuild b/dev-libs/dmalloc/dmalloc-5.5.2-r7.ebuild index 447c2e1307ab..fb49d37d57e2 100644 --- a/dev-libs/dmalloc/dmalloc-5.5.2-r7.ebuild +++ b/dev-libs/dmalloc/dmalloc-5.5.2-r7.ebuild @@ -10,7 +10,7 @@ SRC_URI="https://dmalloc.com/releases/${P}.tgz" LICENSE="CC-BY-SA-3.0" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86" IUSE="static-libs threads" DEPEND="sys-apps/texinfo" diff --git a/dev-libs/dotconf/dotconf-1.3-r1.ebuild b/dev-libs/dotconf/dotconf-1.3-r1.ebuild index 293fd121585b..8d368cb59d05 100644 --- a/dev-libs/dotconf/dotconf-1.3-r1.ebuild +++ b/dev-libs/dotconf/dotconf-1.3-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux" IUSE="" DEPEND=">=sys-devel/autoconf-2.58" 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 4f2d8481a132..8ef06639af4d 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 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" diff --git a/dev-libs/eb/eb-4.4.1-r1.ebuild b/dev-libs/eb/eb-4.4.1-r1.ebuild index c9f59bb76237..432dd6254c17 100644 --- a/dev-libs/eb/eb-4.4.1-r1.ebuild +++ b/dev-libs/eb/eb-4.4.1-r1.ebuild @@ -9,7 +9,7 @@ SRC_URI="ftp://ftp.sra.co.jp/pub/misc/eb/${P}.tar.lzma" LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 sparc x86" +KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 sparc x86" IUSE="ipv6 nls threads" RDEPEND=" diff --git a/dev-libs/efl/efl-1.25.1-r10.ebuild b/dev-libs/efl/efl-1.25.1-r10.ebuild index d6f621178a8a..05a1d3433f70 100644 --- a/dev-libs/efl/efl-1.25.1-r10.ebuild +++ b/dev-libs/efl/efl-1.25.1-r10.ebuild @@ -1,14 +1,16 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -LUA_COMPAT=( lua5-{1..3} luajit ) - DOCS_BUILDER="doxygen" DOCS_DIR="${S}/doc" -inherit docs lua-single meson xdg-utils +LUA_COMPAT=( lua5-{1..4} luajit ) + +PYTHON_COMPAT=( python3_{6,7,8,9,10} ) + +inherit docs lua-single meson python-any-r1 xdg-utils DESCRIPTION="Enlightenment Foundation Libraries all-in-one package" HOMEPAGE="https://www.enlightenment.org" @@ -127,13 +129,16 @@ RDEPEND="${LUA_DEPS} xpresent? ( x11-libs/libXpresent ) zeroconf? ( net-dns/avahi )" DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig +BDEPEND="${PYTHON_DEPS} + virtual/pkgconfig nls? ( sys-devel/gettext )" pkg_setup() { # Deprecated, provided for backward-compatibility. Everything is moved to libefreet.so. QA_FLAGS_IGNORED="/usr/$(get_libdir)/libefreet_trash.so.1.25.1 /usr/$(get_libdir)/libefreet_mime.so.1.25.1" + + python-any-r1_pkg_setup } src_prepare() { @@ -155,6 +160,10 @@ src_prepare() { -e "s/@srcdir@/./g" \ Doxyfile || die popd || die + + # Fix python shebangs for python-exec[-native-symlinks], #764086 + local shebangs=($(grep -rl "#!/usr/bin/env python3" || die)) + python_fix_shebang -q ${shebangs[*]} } src_configure() { diff --git a/dev-libs/elfutils/elfutils-0.182.ebuild b/dev-libs/elfutils/elfutils-0.182.ebuild index 9497b4a96856..063f6130c7bb 100644 --- a/dev-libs/elfutils/elfutils-0.182.ebuild +++ b/dev-libs/elfutils/elfutils-0.182.ebuild @@ -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 zstd" RDEPEND=">=sys-libs/zlib-1.2.8-r1[static-libs?,${MULTILIB_USEDEP}] diff --git a/dev-libs/ell/Manifest b/dev-libs/ell/Manifest index 5d8012185b3d..399e57c6cafd 100644 --- a/dev-libs/ell/Manifest +++ b/dev-libs/ell/Manifest @@ -1,5 +1,2 @@ -DIST ell-0.28.tar.xz 474880 BLAKE2B 2c571f952056c9f4e3e8c245b2b57645c4baa2935fdbe758170dcfe689f4db2162322f25a80cc5a7d4d5bded6159d1fa0d583be979a2708d32e61e91d1ced585 SHA512 6c3aef4d403878c0c9b8a1e5e8861656f2abbab19dd275b1aecca899ca615c00aee30e18f194435ec6be859adcffbe3703a79b13508e1e76c2192ec51f7c0cd7 -DIST ell-0.31.tar.xz 478860 BLAKE2B f8f8d109605bf62396da001bd3d9b48fd6b7a6fc94ab890ab5a56fc8afb07a216b884fdf4b624ac8f39c3196de8149c7b32790da03262400aac6f8cd8b3fb56b SHA512 e304cc3bb1355fc0671412e793530503c83b1a036bfa3dd5b0cc36cfb28684b780293dc3d81a5727e0030743529882f71ac28d3c735860f6d46477e8ccf6a6e8 -DIST ell-0.32.tar.xz 479012 BLAKE2B 909c63f590ba45e5e9aabf0e7c5ce1c44ee5b5235472071ec16c4e160eddfd38dc5383103a684c4d43e325e832965cdade5d8465990ed4c2a2aa44b52d60869b SHA512 13712ac4ff7165b749b8e2dcd5cad4cd8170600c3dca7304eb4068ee916c1187207bc24ffa5d64c9d33253d4a8f56c63b627ad0783d5ca38d78f625211fdc315 -DIST ell-0.33.tar.xz 490180 BLAKE2B fc0f558a54bd57d7866c77ba3fdd97e0f35c33fd7ca79f6209c097824b303e69924ee9eb758af3a1881e8e87ac3ad84bea20767cd824cb8366a080eacac8b4be SHA512 4f0960b757c5cae55bf46a10aabb52280a76eda2a2d55ecc92f2a1321b72e936cab47102995597e985072d032f10379fdfc4f56360e535eeac444dab8b171ded DIST ell-0.35.tar.xz 506400 BLAKE2B 694df293ce5fd31581cbdd9c2f6f3806a07a23ffb76cf04d6c13f1eebc8af5228ab030f3f1f6d68e1f234c4f1c55a6a1c41e93c41957c19ffc57255e86a78b26 SHA512 a61fc6e8b16627920a24a4bc271549863042ba27489039311009b7e16fe04bb88debcdcd239603cb471b78674a57851ee5ab8ee16229ebdf77850e0945410179 +DIST ell-0.36.tar.xz 515888 BLAKE2B 094ccd94a73a0c9f4ffbf72f65137e4328c868f2bbf7cb0226502d2efdec7e7618dca0e73547d7a9d4cf9e0d01222f067ed5bfa053dbf38402a625a0044187fe SHA512 2b21220171e3be36e7f2779d78ebd1cb783c52813408d1cdd9ff742e30b426830f26b44784f2c96cbcd5f0cefc9152693795a16e6861087c45ef7539a86b944c diff --git a/dev-libs/ell/ell-0.28.ebuild b/dev-libs/ell/ell-0.28.ebuild deleted file mode 100644 index e4afae4a385c..000000000000 --- a/dev-libs/ell/ell-0.28.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic multilib-minimal - -DESCRIPTION="Embedded Linux Library provides core, low-level functionality for system daemons" -HOMEPAGE="https://01.org/ell" -if [[ "${PV}" == *9999 ]] ; then - inherit autotools git-r3 - EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git" -else - SRC_URI="https://mirrors.edge.kernel.org/pub/linux/libs/${PN}/${P}.tar.xz" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86" -fi -LICENSE="LGPL-2.1" -SLOT="0" - -IUSE="glib pie" - -RDEPEND=" - glib? ( dev-libs/glib:2[${MULTILIB_USEDEP}] ) -" -DEPEND="${RDEPEND}" - -src_prepare() { - default - [[ "${PV}" == *9999 ]] && eautoreconf -} - -multilib_src_configure() { - append-cflags "-fsigned-char" #662694 - local myeconfargs=( - $(use_enable glib) - $(use_enable pie) - ) - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" -} - -multilib_src_install_all() { - local DOCS=( ChangeLog README ) - einstalldocs - - find "${ED}" -name "*.la" -delete || die -} diff --git a/dev-libs/ell/ell-0.31.ebuild b/dev-libs/ell/ell-0.31.ebuild deleted file mode 100644 index 9589f04a43e1..000000000000 --- a/dev-libs/ell/ell-0.31.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic linux-info multilib-minimal - -DESCRIPTION="Embedded Linux Library provides core, low-level functionality for system daemons" -HOMEPAGE="https://01.org/ell" -if [[ "${PV}" == *9999 ]] ; then - inherit autotools git-r3 - EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git" -else - SRC_URI="https://mirrors.edge.kernel.org/pub/linux/libs/${PN}/${P}.tar.xz" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86" -fi -LICENSE="LGPL-2.1" -SLOT="0" - -IUSE="glib pie test" -RESTRICT="!test? ( test )" - -RDEPEND=" - glib? ( dev-libs/glib:2[${MULTILIB_USEDEP}] ) -" -DEPEND=" - ${RDEPEND} - test? ( sys-apps/dbus ) -" - -CONFIG_CHECK=" - ~TIMERFD - ~EVENTFD - ~CRYPTO_USER_API - ~CRYPTO_USER_API_HASH - ~CRYPTO_MD5 - ~CRYPTO_SHA1 - ~KEY_DH_OPERATIONS -" - -src_prepare() { - default - [[ "${PV}" == *9999 ]] && eautoreconf -} - -multilib_src_configure() { - append-cflags "-fsigned-char" #662694 - local myeconfargs=( - $(use_enable glib) - $(use_enable pie) - ) - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" -} - -multilib_src_install_all() { - local DOCS=( ChangeLog README ) - einstalldocs - - find "${ED}" -name "*.la" -delete || die -} diff --git a/dev-libs/ell/ell-0.32.ebuild b/dev-libs/ell/ell-0.32.ebuild deleted file mode 100644 index 9589f04a43e1..000000000000 --- a/dev-libs/ell/ell-0.32.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic linux-info multilib-minimal - -DESCRIPTION="Embedded Linux Library provides core, low-level functionality for system daemons" -HOMEPAGE="https://01.org/ell" -if [[ "${PV}" == *9999 ]] ; then - inherit autotools git-r3 - EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git" -else - SRC_URI="https://mirrors.edge.kernel.org/pub/linux/libs/${PN}/${P}.tar.xz" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86" -fi -LICENSE="LGPL-2.1" -SLOT="0" - -IUSE="glib pie test" -RESTRICT="!test? ( test )" - -RDEPEND=" - glib? ( dev-libs/glib:2[${MULTILIB_USEDEP}] ) -" -DEPEND=" - ${RDEPEND} - test? ( sys-apps/dbus ) -" - -CONFIG_CHECK=" - ~TIMERFD - ~EVENTFD - ~CRYPTO_USER_API - ~CRYPTO_USER_API_HASH - ~CRYPTO_MD5 - ~CRYPTO_SHA1 - ~KEY_DH_OPERATIONS -" - -src_prepare() { - default - [[ "${PV}" == *9999 ]] && eautoreconf -} - -multilib_src_configure() { - append-cflags "-fsigned-char" #662694 - local myeconfargs=( - $(use_enable glib) - $(use_enable pie) - ) - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" -} - -multilib_src_install_all() { - local DOCS=( ChangeLog README ) - einstalldocs - - find "${ED}" -name "*.la" -delete || die -} diff --git a/dev-libs/ell/ell-0.35.ebuild b/dev-libs/ell/ell-0.35.ebuild index 707fc0db4ef5..59aed122b178 100644 --- a/dev-libs/ell/ell-0.35.ebuild +++ b/dev-libs/ell/ell-0.35.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -14,7 +14,7 @@ else #remove on next bump inherit autotools 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/ell/ell-0.33.ebuild b/dev-libs/ell/ell-0.36.ebuild index d66532bb9418..752fd7b7e630 100644 --- a/dev-libs/ell/ell-0.33.ebuild +++ b/dev-libs/ell/ell-0.36.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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/eventlog/eventlog-0.2.12.ebuild b/dev-libs/eventlog/eventlog-0.2.12.ebuild index 0dfb29d60a88..60d20048119b 100644 --- a/dev-libs/eventlog/eventlog-0.2.12.ebuild +++ b/dev-libs/eventlog/eventlog-0.2.12.ebuild @@ -10,7 +10,7 @@ SRC_URI="http://www.balabit.com/downloads/files/eventlog/0.2//eventlog_${PV}.tar LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~m68k-mint" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86" IUSE="static-libs" DEPEND="" diff --git a/dev-libs/expat/expat-2.2.10.ebuild b/dev-libs/expat/expat-2.2.10.ebuild index 2da0a2ea35e0..cf18a8043d2b 100644 --- a/dev-libs/expat/expat-2.2.10.ebuild +++ b/dev-libs/expat/expat-2.2.10.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="https://github.com/libexpat/libexpat/releases/download/R_${PV//\./_}/ex 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 ~x86-winnt" +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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" IUSE="elibc_FreeBSD examples static-libs unicode" BDEPEND="unicode? ( ${AUTOTOOLS_DEPEND} )" diff --git a/dev-libs/expat/expat-2.2.8.ebuild b/dev-libs/expat/expat-2.2.8.ebuild index 7e7cd367ff73..6b489e1d460b 100644 --- a/dev-libs/expat/expat-2.2.8.ebuild +++ b/dev-libs/expat/expat-2.2.8.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="https://github.com/libexpat/libexpat/releases/download/R_${PV//\./_}/ex 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 ~x86-winnt" +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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" IUSE="elibc_FreeBSD examples static-libs unicode" BDEPEND="unicode? ( ${AUTOTOOLS_DEPEND} )" diff --git a/dev-libs/expat/expat-2.2.9.ebuild b/dev-libs/expat/expat-2.2.9.ebuild index 2da0a2ea35e0..259918860d5c 100644 --- a/dev-libs/expat/expat-2.2.9.ebuild +++ b/dev-libs/expat/expat-2.2.9.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="https://github.com/libexpat/libexpat/releases/download/R_${PV//\./_}/ex 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 ~x86-winnt" +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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" IUSE="elibc_FreeBSD examples static-libs unicode" BDEPEND="unicode? ( ${AUTOTOOLS_DEPEND} )" diff --git a/dev-libs/fcgi/fcgi-2.4.1_pre0910052249-r2.ebuild b/dev-libs/fcgi/fcgi-2.4.1_pre0910052249-r2.ebuild index 7c53197c97dc..5ac7c7ba7c6b 100644 --- a/dev-libs/fcgi/fcgi-2.4.1_pre0910052249-r2.ebuild +++ b/dev-libs/fcgi/fcgi-2.4.1_pre0910052249-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="http://www.fastcgi.com/dist/fcgi-2.4.1-SNAP-0910052249.tar.gz" LICENSE="FastCGI" SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="html" S="${WORKDIR}/${PN}-2.4.1-SNAP-0910052249" diff --git a/dev-libs/fcgi/metadata.xml b/dev-libs/fcgi/metadata.xml index fe774f6fe279..358b9f654cb1 100644 --- a/dev-libs/fcgi/metadata.xml +++ b/dev-libs/fcgi/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"> - <email>rafaelmartins@gentoo.org</email> - <name>Rafael G. Martins</name> -</maintainer> +<!-- maintainer-needed --> <use> <flag name="html">Install HTML documentation</flag> </use> diff --git a/dev-libs/ffcall/ffcall-2.1.ebuild b/dev-libs/ffcall/ffcall-2.1.ebuild index 443dec8afa92..9ba00e5bda71 100644 --- a/dev-libs/ffcall/ffcall-2.1.ebuild +++ b/dev-libs/ffcall/ffcall-2.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -16,7 +16,7 @@ SRC_URI="mirror://gnu/libffcall/${MY_PV}.tar.gz" # under GNU LGPL." -ffcall author LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" IUSE="" S=${WORKDIR}/${MY_PV} diff --git a/dev-libs/freexl/Manifest b/dev-libs/freexl/Manifest index ca6e1f510d98..738d63c9261f 100644 --- a/dev-libs/freexl/Manifest +++ b/dev-libs/freexl/Manifest @@ -1 +1,2 @@ DIST freexl-1.0.5.tar.gz 938994 BLAKE2B a3d2667271f6ab3de61a90f75ba8f7a645c5eddcd7f6d452fbbd59dc211c4676bdef7f7772235f60898de1e0a6d2e4951a3eadf77c4766bf938f5d8465f9de42 SHA512 86d742f58353be1f3ab683899a4d914845250b481acc078c769ef337d0a6ea24d25501a3e7c73b95904c6839ddd35f53e58ad4eee0c3b433caa84db0a8c6462b +DIST freexl-1.0.6.tar.gz 941179 BLAKE2B e0b04e66c56d3a2805eed3f86442269843a2ccf7133669b9506a1812562396f2b5bbc04e29c9f829d9df6e627fa31b87fccc5407275ffb205ff498bd47bc4b89 SHA512 efbbe261e57d5c05167ad8e1d5a5b348a7e702c0a4030b18dd2a8c60a38332caccbb073ff604bdf5bafac827310b41c7b79f9fa519ea512d6de2eafd9c1f71f6 diff --git a/dev-libs/freexl/freexl-1.0.5.ebuild b/dev-libs/freexl/freexl-1.0.5.ebuild index 86e702667c81..7726ea2dcb1f 100644 --- a/dev-libs/freexl/freexl-1.0.5.ebuild +++ b/dev-libs/freexl/freexl-1.0.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -7,7 +7,7 @@ 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" +LICENSE="|| ( MPL-1.1 GPL-2+ LGPL-2.1+ )" SLOT="0" KEYWORDS="amd64 ~arm arm64 ~ia64 ppc ppc64 x86" diff --git a/dev-libs/freexl/freexl-1.0.6.ebuild b/dev-libs/freexl/freexl-1.0.6.ebuild new file mode 100644 index 000000000000..0677e5dfba87 --- /dev/null +++ b/dev-libs/freexl/freexl-1.0.6.ebuild @@ -0,0 +1,25 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +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 GPL-2+ LGPL-2.1+ )" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86" + +DEPEND="virtual/libiconv" +RDEPEND="${DEPEND}" + +src_configure() { + econf --disable-static +} + +src_install() { + default + + find "${ED}" -name '*.la' -type f -delete || die +} diff --git a/dev-libs/fribidi/fribidi-1.0.9.ebuild b/dev-libs/fribidi/fribidi-1.0.9.ebuild index 6e3c04497bf8..eec75c2b00f0 100644 --- a/dev-libs/fribidi/fribidi-1.0.9.ebuild +++ b/dev-libs/fribidi/fribidi-1.0.9.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="https://github.com/fribidi/fribidi/releases/download/v${PV}/${P}.tar.xz LICENSE="LGPL-2.1+" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv 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 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="static-libs" RDEPEND="" diff --git a/dev-libs/fstrm/Manifest b/dev-libs/fstrm/Manifest index 12ff29612a14..839b14098c7a 100644 --- a/dev-libs/fstrm/Manifest +++ b/dev-libs/fstrm/Manifest @@ -1,2 +1 @@ -DIST fstrm-0.3.0.tar.gz 185153 BLAKE2B 1e1e16792288255c1d963f2831b6f362d08a343cb58ae7ae8e24c5d9a70d870b238c399b9f2cb30da939dbfbf5faa49a61609725036113e579f2c7d63a36e599 SHA512 4134da0ed8579cb6784a419bba76b3be7487ec67b6fad65e0e662b40e668389010381176794d15da9c96339292f0faedc143f87b7ef3815b69bbc8b165af5c4d DIST fstrm-0.6.0.tar.gz 135214 BLAKE2B 237b371450ea2e92e466aaeab2d6ebf9ba7c6bbf14d1517431818b01a2609c1765299bb576bb3a4a3a99a9ce7644992c3f5eaf82c01d903a1bad358d49ed47b4 SHA512 8e327f40fb49b36998d8bb9353b30b9924630b85adf1e4462ce4b456daa7eea727892a59f43ddd48de5bf5059a450fef54726b09af6d7f210fa182c4055d65f4 diff --git a/dev-libs/fstrm/fstrm-0.3.0.ebuild b/dev-libs/fstrm/fstrm-0.3.0.ebuild deleted file mode 100644 index 36ff91aa1a1d..000000000000 --- a/dev-libs/fstrm/fstrm-0.3.0.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 autotools multilib-minimal - -DESCRIPTION="Frame Streams implementation in C" -HOMEPAGE="https://github.com/farsightsec/fstrm" -SRC_URI="https://github.com/farsightsec/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~s390 ~sparc x86" -IUSE="static-libs utils" - -RDEPEND="utils? ( dev-libs/libevent[${MULTILIB_USEDEP}] )" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -src_prepare() { - default - eautoreconf - multilib_copy_sources -} - -multilib_src_configure() { - econf \ - $(use_enable static-libs static) \ - $(use_enable utils programs) -} - -multilib_src_install_all() { - default - find "${ED}" -name '*.la' -delete -} diff --git a/dev-libs/fstrm/fstrm-0.6.0.ebuild b/dev-libs/fstrm/fstrm-0.6.0.ebuild index 806ef1cc0cf3..8e91891c7a2e 100644 --- a/dev-libs/fstrm/fstrm-0.6.0.ebuild +++ b/dev-libs/fstrm/fstrm-0.6.0.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/farsightsec/fstrm/archive/v${PV}.tar.gz -> ${P}.tar. LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~s390 ~sparc x86" IUSE="static-libs utils" BDEPEND="virtual/pkgconfig" diff --git a/dev-libs/geoip/geoip-1.6.10.ebuild b/dev-libs/geoip/geoip-1.6.10.ebuild index 361665551bd2..282925bbff31 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 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux" +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 5765e23fd909..b951be9e1a64 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 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux" +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/gf-complete/Manifest b/dev-libs/gf-complete/Manifest index 8669d288bcae..ebe521979029 100644 --- a/dev-libs/gf-complete/Manifest +++ b/dev-libs/gf-complete/Manifest @@ -1,2 +1 @@ -DIST gf-complete-0.0.0.tar.gz 596339 BLAKE2B add52827288d08e8d546787f8bc42554ce8900a21dfdc47e66aea2990aa48604f8a51d573f84c667e2479a03ddb8412c43a0acae745cb1e3e5aed0bfd0dd0a83 SHA512 7942a29b80972fffab15dc86c560345911db5aa976d2c505804d0eff10c9135f674f3511b579e2bac26342ca53a81d323826a1ff1d790836a4650a07769851a2 DIST gf-complete-2.0.0.tar.gz 122566 BLAKE2B 20cfc2dcf437109f5ed703434c5c383bc910d57127583a4eca6ccea860d0f42c82c93558ba992b9b35d6025d745a8bb39c32ed35809ffc063fa83b11a975e0d9 SHA512 3b0693bf374086417f04cee09dceeb694aafaf7fb3c829b89f303b65634ae509406c8a0de10f57c666b4c78b11043f355bb3c81f95eac061cb16de9db2b71b89 diff --git a/dev-libs/gf-complete/gf-complete-0.0.0.ebuild b/dev-libs/gf-complete/gf-complete-0.0.0.ebuild deleted file mode 100644 index 704a5352dc27..000000000000 --- a/dev-libs/gf-complete/gf-complete-0.0.0.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit autotools eutils ltprune - -DESCRIPTION="A Comprehensive Open Source Library for Galois Field Arithmetic" -HOMEPAGE="https://jerasure.org/" -SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/${P}.tar.gz" -S="${WORKDIR}/${PN}.git" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -DEPEND="" -RDEPEND="${DEPEND}" - -src_prepare() { - sed -i -e 's/ -O3 $(SIMD_FLAGS)//g' src/Makefile.am tools/Makefile.am test/Makefile.am examples/Makefile.am|| die - eautoreconf -} - -src_install() { - default - prune_libtool_files -} diff --git a/dev-libs/gf-complete/gf-complete-2.0.0-r1.ebuild b/dev-libs/gf-complete/gf-complete-2.0.0-r1.ebuild index 87727bca10c4..82e0824790da 100644 --- a/dev-libs/gf-complete/gf-complete-2.0.0-r1.ebuild +++ b/dev-libs/gf-complete/gf-complete-2.0.0-r1.ebuild @@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}.git" LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 x86" +KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86" IUSE="" DEPEND="" diff --git a/dev-libs/gf-complete/gf-complete-2.0.0.ebuild b/dev-libs/gf-complete/gf-complete-2.0.0.ebuild deleted file mode 100644 index 36eda91ba597..000000000000 --- a/dev-libs/gf-complete/gf-complete-2.0.0.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit autotools eutils ltprune - -DESCRIPTION="A Comprehensive Open Source Library for Galois Field Arithmetic" -HOMEPAGE="https://jerasure.org/" -SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/${P}.tar.gz" -S="${WORKDIR}/${PN}.git" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" -IUSE="" - -DEPEND="" -RDEPEND="${DEPEND}" - -src_prepare() { - sed -i -e 's/ -O3 $(SIMD_FLAGS)//g' src/Makefile.am tools/Makefile.am test/Makefile.am examples/Makefile.am|| die - eautoreconf -} - -src_install() { - default - prune_libtool_files -} diff --git a/dev-libs/girara/Manifest b/dev-libs/girara/Manifest index 8176e0df3b82..d110df755d28 100644 --- a/dev-libs/girara/Manifest +++ b/dev-libs/girara/Manifest @@ -1,3 +1 @@ -DIST girara-0.3.3.tar.gz 72372 BLAKE2B 59171e104f1558ed794e1bb623bb5121007af0cf831524fac5170ce8e55d939d19ecb747b7bc4bb900e978d29fd987d592a0e16982a248adc5b085503ccb2b43 SHA512 2764f339c4b5744330c60fa5c8c902a06952d6c5a38589d236fe290f9934b9128527658d8aa99d42806255403b90f55ea1a85e5bd09da4b3a8f7c48be4d94f51 -DIST girara-0.3.4.tar.gz 72981 BLAKE2B 690b8de0e906e43e32b7a1009a04d4bb1d5b029924ea5b85491ec740ba4b4363f8729bd9b8498f1f25309e2eabde6868f41a689ed06dfb6aa36b081676232624 SHA512 1eca68f4f28505d897c2f7cfb8804e67591e8327feb347c66da216d8f764cb0c88028d1c4c162579a882df7db1883b834c97d8488296ea5c0a8f709dfcea1f1a DIST girara-0.3.5.tar.xz 60488 BLAKE2B 2d0f2f0635e8e8906810b1425191f5d70b7f9af0985c461bd90654e83d87ad698da225d70064438fed4473295aca8dbd26c4ce1efd96f8a7399e7145b1f8c111 SHA512 e7c5bf887b29767878502224ad45d62e43b3da91bd8e754603256550d4f0126f1493f0fb7473a4ebb8cc5909306564249c6a60e99eba2b0b417b98c728fcdc84 diff --git a/dev-libs/girara/girara-0.3.3.ebuild b/dev-libs/girara/girara-0.3.3.ebuild deleted file mode 100644 index e77e4d1de042..000000000000 --- a/dev-libs/girara/girara-0.3.3.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit meson virtualx - -DESCRIPTION="UI library that focuses on simplicity and minimalism" -HOMEPAGE="https://pwmt.org/projects/girara/" - -if [[ ${PV} == *999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://git.pwmt.org/pwmt/${PN}.git" - EGIT_BRANCH="develop" -else - SRC_URI="https://github.com/pwmt/girara/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 arm x86" -fi - -LICENSE="ZLIB" -SLOT="0" -IUSE="doc libnotify test" - -RESTRICT="!test? ( test )" - -RDEPEND="dev-libs/glib:2 - dev-libs/json-c:= - >=x11-libs/gtk+-3.20:3 - >=x11-libs/pango-1.14 - libnotify? ( x11-libs/libnotify )" - -DEPEND="${RDEPEND} - doc? ( app-doc/doxygen ) - test? ( dev-libs/check )" - -BDEPEND="virtual/pkgconfig" - -src_prepare() { - default - sed -i -e '/'-Werror.*'/d' meson.build || die "sed failed" -} - -src_configure() { - local emesonargs=( - -Djson=enabled - -Ddocs=$(usex doc enabled disabled) - -Dnotify=$(usex libnotify enabled disabled) - ) - meson_src_configure -} - -src_test() { - virtx meson_src_test -} diff --git a/dev-libs/girara/girara-0.3.4.ebuild b/dev-libs/girara/girara-0.3.4.ebuild deleted file mode 100644 index e77e4d1de042..000000000000 --- a/dev-libs/girara/girara-0.3.4.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit meson virtualx - -DESCRIPTION="UI library that focuses on simplicity and minimalism" -HOMEPAGE="https://pwmt.org/projects/girara/" - -if [[ ${PV} == *999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://git.pwmt.org/pwmt/${PN}.git" - EGIT_BRANCH="develop" -else - SRC_URI="https://github.com/pwmt/girara/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 arm x86" -fi - -LICENSE="ZLIB" -SLOT="0" -IUSE="doc libnotify test" - -RESTRICT="!test? ( test )" - -RDEPEND="dev-libs/glib:2 - dev-libs/json-c:= - >=x11-libs/gtk+-3.20:3 - >=x11-libs/pango-1.14 - libnotify? ( x11-libs/libnotify )" - -DEPEND="${RDEPEND} - doc? ( app-doc/doxygen ) - test? ( dev-libs/check )" - -BDEPEND="virtual/pkgconfig" - -src_prepare() { - default - sed -i -e '/'-Werror.*'/d' meson.build || die "sed failed" -} - -src_configure() { - local emesonargs=( - -Djson=enabled - -Ddocs=$(usex doc enabled disabled) - -Dnotify=$(usex libnotify enabled disabled) - ) - meson_src_configure -} - -src_test() { - virtx meson_src_test -} diff --git a/dev-libs/girara/girara-0.3.5.ebuild b/dev-libs/girara/girara-0.3.5.ebuild index 7009fe824cc0..b16354a30a1f 100644 --- a/dev-libs/girara/girara-0.3.5.ebuild +++ b/dev-libs/girara/girara-0.3.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -14,7 +14,7 @@ if [[ ${PV} == *999 ]]; then EGIT_BRANCH="develop" else SRC_URI="https://pwmt.org/projects/girara/download/${P}.tar.xz" - KEYWORDS="~amd64 ~arm ~x86" + KEYWORDS="amd64 arm x86" fi LICENSE="ZLIB" diff --git a/dev-libs/gjs/Manifest b/dev-libs/gjs/Manifest index 604957568747..c8ae00bd798d 100644 --- a/dev-libs/gjs/Manifest +++ b/dev-libs/gjs/Manifest @@ -1,2 +1,3 @@ DIST gjs-1.64.4.tar.xz 422496 BLAKE2B a96211f7240336dbb30c6965e405f59ee72e4288842837da8da8c6d3c59b7e04ebb6c7a8b0b02d38601c162ffdf1a1fef9f13e4db720c4c483f4a39dffd5dbb4 SHA512 21a15d7106ad6584fb1f02cb0a0a4cab211a3540adb8f2c03d35c211e3946b81935000a52351fedd95a18a7ff6b7f96e665fcafa3c411ff79f2b6cb332c82b42 DIST gjs-1.66.1.tar.xz 439992 BLAKE2B 2b6d25b50fd48ed8b9bb0c594321bd00525e7d6db8b348d7da5c1e10cfd588fccf5030edc93fc31da094da5a0327d4a7b26c26d18ee4284dc1ae767f7721a7b4 SHA512 601d0c645ab1586e7d770f753bf68653816dc631faf89b5e70216320f6b7707e4aaa3507111fb6ff3331f76656050e32e8b1441720bf080de957e03e4565a43f +DIST gjs-1.66.2.tar.xz 440184 BLAKE2B 8df23470c763d65733c6fb622a1de8b8fed3e16c1ba67883b6ae0e7150a5a30a334735be39f9c68217501b7674fee8bfce6ab704c0742ae639a1bc14cdce4cd8 SHA512 2e0ca24532b3203a55089eb25de19b4b4f33166f40d1231198947057e45f364d3c7f794ff2079c1d9aee3fde9f99cd844944229d89d5e344a97254aaa42bad40 diff --git a/dev-libs/gjs/gjs-1.66.2.ebuild b/dev-libs/gjs/gjs-1.66.2.ebuild new file mode 100644 index 000000000000..cd936bdbf15a --- /dev/null +++ b/dev-libs/gjs/gjs-1.66.2.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit gnome.org meson virtualx + +DESCRIPTION="Javascript bindings for GNOME" +HOMEPAGE="https://wiki.gnome.org/Projects/Gjs" + +LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )" +SLOT="0" +IUSE="+cairo examples gtk readline sysprof test" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=dev-libs/glib-2.58.0 + dev-libs/libffi:= + >=dev-libs/gobject-introspection-1.61.2:= + dev-lang/spidermonkey:78 + cairo? ( x11-libs/cairo[X] ) + readline? ( sys-libs/readline:0= ) +" +DEPEND="${RDEPEND} + sysprof? ( >=dev-util/sysprof-capture-3.38.1:4 ) + test? ( sys-apps/dbus + >=x11-libs/gtk+-3.20:3[introspection] ) +" +BDEPEND=" + virtual/pkgconfig +" + +src_configure() { + # FIXME: add systemtap/dtrace support, like in glib:2 + local emesonargs=( + $(meson_feature cairo) + $(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 +} + +src_test() { + virtx meson_src_test +} diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest index 6336f5dac126..4661caea1521 100644 --- a/dev-libs/glib/Manifest +++ b/dev-libs/glib/Manifest @@ -2,3 +2,4 @@ DIST glib-2.62.6.tar.xz 4703424 BLAKE2B 0a27245be2575c574dcc730dd051a8c284f421db DIST glib-2.64.5.tar.xz 4778456 BLAKE2B 7fdee0e16a7ac820f4c4f7dc66d37add464d3005e89e6013302d3ef103319331811d68e9b42db072b82242c3d7badfbd085b69333e770012def89dc8aae7a2eb SHA512 a87537274619b6de88a0e68555059036ac18c748b5005c8d84728646b0db342fde0b8c5b303b9ad79f64d71ea4ed990d52a4fbd68cda3ca74aed5fe4d497e060 DIST glib-2.66.2.tar.xz 4836456 BLAKE2B 5484a7fe497dbe06df7ce11dbc8836c95dbb01e6e309516b82158f2915eeee36ccbe6e904cb6ae9a5a0223ccc0b52f6e64d61a418bf790538bc90388430977b2 SHA512 30278c066c6b209f45fcfdb9ffc4732236451464506b93c0fff0964ff8aac58c15be85c3793c686d4740d9d97857984bc0ab71e38d5da11c5fd860e569fb6cb9 DIST glib-2.66.3.tar.xz 4837796 BLAKE2B 44632477b56bea5b6324deccc17e2d6b72e00dba518f9fc3ec5edad8b20df59f8bf9087e5de16b587b72c2f143d9ab650c478666132b1564da9bf333f380a4e3 SHA512 ab2670ae4eeb3b561c0e71ff9153908f450e430cd43771bfee09233a65826dc16462537ec64bdfcced867f4c8663341b6b9d17af5ba0fab8564b8f21b04a45d7 +DIST glib-2.66.4.tar.xz 4838124 BLAKE2B de2b8690c9ef9d66378b396ec0abe2bc83380654b3ca2e221678fb6dc9bf449c544a7e2b2a662739f7b400e9ce0a5a0af115ba2f06b8f5597967e518fdec4937 SHA512 b3bc3e6e5cca793139848940e5c0894f1c7e3bd3a770b213a1ea548ac54a2432aebb140ed54518712fb8af36382b3b13d5f7ffd3d87ff63cba9e2f55434f7260 diff --git a/dev-libs/glib/glib-2.62.6.ebuild b/dev-libs/glib/glib-2.62.6.ebuild index a176f30144bf..52c8656fdf84 100644 --- a/dev-libs/glib/glib-2.62.6.ebuild +++ b/dev-libs/glib/glib-2.62.6.ebuild @@ -250,14 +250,7 @@ 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 + multilib_foreach_abi multilib_pkg_postinst } pkg_postrm() { diff --git a/dev-libs/glib/glib-2.64.5.ebuild b/dev-libs/glib/glib-2.64.5.ebuild index 67c869c87e05..10c7d6da0887 100644 --- a/dev-libs/glib/glib-2.64.5.ebuild +++ b/dev-libs/glib/glib-2.64.5.ebuild @@ -257,14 +257,7 @@ 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 + multilib_foreach_abi multilib_pkg_postinst for v in ${REPLACING_VERSIONS}; do if ver_test "$v" "-lt" "2.63.6"; then diff --git a/dev-libs/glib/glib-2.66.2.ebuild b/dev-libs/glib/glib-2.66.2.ebuild index 5ae983393685..8cd3ffc040ec 100644 --- a/dev-libs/glib/glib-2.66.2.ebuild +++ b/dev-libs/glib/glib-2.66.2.ebuild @@ -259,14 +259,7 @@ 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 + multilib_foreach_abi multilib_pkg_postinst for v in ${REPLACING_VERSIONS}; do if ver_test "$v" "-lt" "2.63.6"; then diff --git a/dev-libs/glib/glib-2.66.3.ebuild b/dev-libs/glib/glib-2.66.3.ebuild index 23a4ff335d11..0808cd84770e 100644 --- a/dev-libs/glib/glib-2.66.3.ebuild +++ b/dev-libs/glib/glib-2.66.3.ebuild @@ -259,14 +259,7 @@ 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 + multilib_foreach_abi multilib_pkg_postinst for v in ${REPLACING_VERSIONS}; do if ver_test "$v" "-lt" "2.63.6"; then diff --git a/dev-libs/glib/glib-2.66.4.ebuild b/dev-libs/glib/glib-2.66.4.ebuild new file mode 100644 index 000000000000..23a4ff335d11 --- /dev/null +++ b/dev-libs/glib/glib-2.66.4.ebuild @@ -0,0 +1,290 @@ +# 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,10} ) + +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 sysprof 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}] ) + sysprof? ( >=dev-util/sysprof-capture-3.38:4[${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.33 + 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) + $(meson_feature sysprof) + -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/gmime/gmime-2.6.23-r1.ebuild b/dev-libs/gmime/gmime-2.6.23-r1.ebuild index fb99f90d7e72..715c7f67581d 100644 --- a/dev-libs/gmime/gmime-2.6.23-r1.ebuild +++ b/dev-libs/gmime/gmime-2.6.23-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -11,7 +11,7 @@ HOMEPAGE="https://sourceforge.net/projects/spruce/gmime/ https://developer.gnome SLOT="2.6" LICENSE="LGPL-2.1" -KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris" IUSE="doc smime static-libs test vala" RESTRICT="!test? ( test )" diff --git a/dev-libs/gmime/gmime-3.2.7.ebuild b/dev-libs/gmime/gmime-3.2.7.ebuild index 5b2aa36b0810..c3d17d6178a9 100644 --- a/dev-libs/gmime/gmime-3.2.7.ebuild +++ b/dev-libs/gmime/gmime-3.2.7.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -11,7 +11,7 @@ HOMEPAGE="https://sourceforge.net/projects/spruce/gmime/ https://developer.gnome SLOT="3.0" LICENSE="LGPL-2.1+" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris" IUSE="crypt doc idn static-libs test +vala" RESTRICT="!test? ( test )" diff --git a/dev-libs/gmp/Manifest b/dev-libs/gmp/Manifest index 4f1e9ea0825e..60d06efdb2ef 100644 --- a/dev-libs/gmp/Manifest +++ b/dev-libs/gmp/Manifest @@ -1,3 +1,2 @@ -DIST gmp-6.2.0.tar.xz 2012444 BLAKE2B 928141cf7b0b70f78b66e7bc52aecd39a5fc30e8865b6de6effb5b061ade05a5a51b4680ef2f36ea0d682b319d54ceb1c6c8ef93bde6c2eef2e8b826a34602c3 SHA512 a066f0456f0314a1359f553c49fc2587e484ff8ac390ff88537266a146ea373f97a1c0ba24608bf6756f4eab11c9056f103c8deb99e5b57741b4f7f0ec44b90c DIST gmp-6.2.1.tar.xz 2027316 BLAKE2B c0d85f175392a50cfa01bc6b0a312b235946ad8b4f6f84f6dabd33d7a6f2cc75c9b0e1e33057be07750bfa0145b7c4cf3b6188a5be6ca9d7271ec2276c84ebcb SHA512 c99be0950a1d05a0297d65641dd35b75b74466f7bf03c9e8a99895a3b2f9a0856cd17887738fa51cf7499781b65c049769271cbcb77d057d2e9f1ec52e07dd84 DIST gmp-man-6.2.0.pdf 828998 BLAKE2B 0bf56bf0a6f1aac0e1fb9a5a37552f846a2d4a01bfd3f5b5c531d42a9afc48c19552e08971785805f59e3f2a5fd89e3f986f841dca2e340813596cfd76574e61 SHA512 25d129efedd329cd2d4535557c6912191f587bfd8ef028618b4ca6199ec7bf7a9ae862e7f5e5b5448c86888452a39fc7bf95cf9c18311858dd1aa9ae1c716239 diff --git a/dev-libs/gmp/gmp-6.2.0-r1.ebuild b/dev-libs/gmp/gmp-6.2.0-r1.ebuild deleted file mode 100644 index 4417fecb70cc..000000000000 --- a/dev-libs/gmp/gmp-6.2.0-r1.ebuild +++ /dev/null @@ -1,105 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic eutils libtool multilib-minimal toolchain-funcs - -MY_PV=${PV/_p*} -MY_PV=${MY_PV/_/-} -MY_P=${PN}-${MY_PV} -PLEVEL=${PV/*p} -DESCRIPTION="Library for arbitrary-precision arithmetic on different type of numbers" -HOMEPAGE="https://gmplib.org/" -SRC_URI="ftp://ftp.gmplib.org/pub/${MY_P}/${MY_P}.tar.xz - mirror://gnu/${PN}/${MY_P}.tar.xz - doc? ( https://gmplib.org/${PN}-man-${MY_PV}.pdf )" - -LICENSE="|| ( LGPL-3+ GPL-2+ )" -# The subslot reflects the C & C++ SONAMEs. -SLOT="0/10.4" -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="+asm doc +cxx pic static-libs" - -BDEPEND="sys-devel/m4 - app-arch/xz-utils" - -S=${WORKDIR}/${MY_P%a} - -DOCS=( AUTHORS ChangeLog NEWS README doc/configuration doc/isa_abi_headache ) -HTML_DOCS=( doc ) -MULTILIB_WRAPPED_HEADERS=( /usr/include/gmp.h ) - -PATCHES=( - "${FILESDIR}"/${PN}-6.1.0-noexecstack-detect.patch -) - -src_prepare() { - default - - # note: we cannot run autotools here as gcc depends on this package - elibtoolize - - # https://bugs.gentoo.org/536894 - if [[ ${CHOST} == *-darwin* ]] ; then - eapply "${FILESDIR}"/${PN}-6.1.2-gcc-apple-4.0.1.patch - fi - - # GMP uses the "ABI" env var during configure as does Gentoo (econf). - # So, to avoid patching the source constantly, wrap things up. - mv configure configure.wrapped || die - cat <<-\EOF > configure - #!/usr/bin/env sh - exec env ABI="${GMPABI}" "$0.wrapped" "$@" - EOF - # Patches to original configure might have lost the +x bit. - chmod a+rx configure{,.wrapped} || die -} - -multilib_src_configure() { - # Because of our 32-bit userland, 1.0 is the only HPPA ABI that works - # https://gmplib.org/manual/ABI-and-ISA.html#ABI-and-ISA (bug #344613) - if [[ ${CHOST} == hppa2.0-* ]] ; then - GMPABI="1.0" - fi - - # ABI mappings (needs all architectures supported) - case ${ABI} in - 32|x86) GMPABI=32;; - 64|amd64|n64) GMPABI=64;; - [onx]32) GMPABI=${ABI};; - esac - export GMPABI - - #367719 - if [[ ${CHOST} == *-mint* ]]; then - filter-flags -O? - fi - - # --with-pic forces static libraries to be built as PIC - # and without TEXTRELs. musl does not support TEXTRELs: bug #707332 - tc-export CC - ECONF_SOURCE="${S}" econf \ - CC_FOR_BUILD="$(tc-getBUILD_CC)" \ - --localstatedir="${EPREFIX}"/var/state/gmp \ - --enable-shared \ - $(use_enable asm assembly) \ - $(use_enable cxx) \ - $(use pic && echo --with-pic) \ - $(use_enable static-libs static) -} - -multilib_src_install() { - emake DESTDIR="${D}" install - - # should be a standalone lib - rm -f "${ED}"/usr/$(get_libdir)/libgmp.la - # this requires libgmp - local la="${ED}/usr/$(get_libdir)/libgmpxx.la" - use static-libs || rm -f "${la}" -} - -multilib_src_install_all() { - einstalldocs - use doc && cp "${DISTDIR}"/gmp-man-${MY_PV}.pdf "${ED}"/usr/share/doc/${PF}/ -} diff --git a/dev-libs/gmp/gmp-6.2.1.ebuild b/dev-libs/gmp/gmp-6.2.1.ebuild index 85f0e1d3160b..e78f841aa4d6 100644 --- a/dev-libs/gmp/gmp-6.2.1.ebuild +++ b/dev-libs/gmp/gmp-6.2.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -20,7 +20,7 @@ SRC_URI="ftp://ftp.gmplib.org/pub/${MY_P}/${MY_P}.tar.xz LICENSE="|| ( LGPL-3+ GPL-2+ )" # The subslot reflects the C & C++ SONAMEs. SLOT="0/10.4" -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 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="+asm doc +cxx pic static-libs" BDEPEND="sys-devel/m4 diff --git a/dev-libs/gnulib/gnulib-2019.03.17.09.24.57.ebuild b/dev-libs/gnulib/gnulib-2019.03.17.09.24.57.ebuild index 500065fad3a4..f8ff711142ef 100644 --- a/dev-libs/gnulib/gnulib-2019.03.17.09.24.57.ebuild +++ b/dev-libs/gnulib/gnulib-2019.03.17.09.24.57.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,7 +11,7 @@ SRC_URI="https://git.savannah.gnu.org/cgit/${PN}.git/snapshot/${PN}-${GIT_TAG}.t LICENSE="GPL-2" SLOT="0" -KEYWORDS="~ppc-aix ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="doc" S="${WORKDIR}/${PN}-${GIT_TAG}" diff --git a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.62.0.ebuild b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.62.0.ebuild index 2b1f0b3ef7dd..9237db2d3ea1 100644 --- a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.62.0.ebuild +++ b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.62.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="" RDEPEND="!<${CATEGORY}/${GNOME_ORG_MODULE}-${PV}" 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 2b1f0b3ef7dd..9237db2d3ea1 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 @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="" RDEPEND="!<${CATEGORY}/${GNOME_ORG_MODULE}-${PV}" diff --git a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.66.1.ebuild b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.66.1.ebuild index 71976ed46f76..ff6157de2f64 100644 --- a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.66.1.ebuild +++ b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.66.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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 ~riscv ~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 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="" RDEPEND="!<${CATEGORY}/${GNOME_ORG_MODULE}-${PV}" diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.62.0-r1.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.62.0-r1.ebuild index 0f9a197842cb..0e6f1898fbe3 100644 --- a/dev-libs/gobject-introspection/gobject-introspection-1.62.0-r1.ebuild +++ b/dev-libs/gobject-introspection/gobject-introspection-1.62.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" # virtual/pkgconfig needed at runtime, bug #505408 RDEPEND=" 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 007ce5418a76..f7137aa6c18d 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 @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" # virtual/pkgconfig needed at runtime, bug #505408 RDEPEND=" diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.66.1.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.66.1.ebuild index 14d175e0ac8c..d092e38cf342 100644 --- a/dev-libs/gobject-introspection/gobject-introspection-1.66.1.ebuild +++ b/dev-libs/gobject-introspection/gobject-introspection-1.66.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" # virtual/pkgconfig needed at runtime, bug #505408 RDEPEND=" diff --git a/dev-libs/gumbo/gumbo-0.10.1.ebuild b/dev-libs/gumbo/gumbo-0.10.1.ebuild index 9111f7d2f3da..697dac747048 100644 --- a/dev-libs/gumbo/gumbo-0.10.1.ebuild +++ b/dev-libs/gumbo/gumbo-0.10.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="https://github.com/google/gumbo-parser/archive/v${PV}.tar.gz -> ${P}.ta LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="doc test" RESTRICT="!test? ( test )" diff --git a/dev-libs/hiredis/hiredis-1.0.0.ebuild b/dev-libs/hiredis/hiredis-1.0.0.ebuild index be1b00061713..20d56c4f2ebd 100644 --- a/dev-libs/hiredis/hiredis-1.0.0.ebuild +++ b/dev-libs/hiredis/hiredis-1.0.0.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/redis/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="BSD" SLOT="0/1.0.0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~x64-solaris" IUSE="examples ssl static-libs test" RESTRICT="!test? ( test )" diff --git a/dev-libs/hyperscan/Manifest b/dev-libs/hyperscan/Manifest index 2e5b6029c6ab..dd7672155aa2 100644 --- a/dev-libs/hyperscan/Manifest +++ b/dev-libs/hyperscan/Manifest @@ -1,2 +1,2 @@ -DIST hyperscan-5.2.1.tar.gz 1818935 BLAKE2B 8b073c946b970867221043b88f36203a0bfa3f2b94002ce2e46f0aa5c616d3e09f19a750510bd88ed30d0aa4324c0d0f04d6a816775b4bed2c246bbc1548b2f0 SHA512 e6ac2aef1f3efa1535c00d73fa590ea62fff4686c4ad3ee023d2e72c51896ca4616ec1b85d7c6f88ac7b42d92c3557b9c4bb3b51cfb796e20a79d53b28e53b6c DIST hyperscan-5.3.0.tar.gz 1824077 BLAKE2B 6d1c8ac8df32e8e4ac09f51ad292e566c2af2b7de9fb1f0bf99b233b9647b527ea115b6bdace5533927bc7a0eace626921b391ad3e78d62fe54636ae13b9f26e SHA512 a4d85ffd2264e8e6745340ba51431361775a1e7a2da78edd31f6f53552ac61fdef718710ae53a254b7d5000f9ec1aafe7a48d9c55e76f5c6822486150bbc6c56 +DIST hyperscan-5.4.0.tar.gz 1844963 BLAKE2B 1a5af88655854b4c1ec58e6663b6c9c4b6fca0aa9d3e4daad3992daf911b8f359f48a95b65e4f05c71aa644e0271471d016fafaca05d547b838a9c52ea016e27 SHA512 cfec3f43b9e8b3fbb2e761927f3a173c1230f2688da710ec7708f2941ce6f550a1d3cb48b0b0e2ccf709807390117a7e40047cb99190bcc341f37eb3da13ae62 diff --git a/dev-libs/hyperscan/files/hyperscan-5.2.1-locales.patch b/dev-libs/hyperscan/files/hyperscan-5.2.1-locales.patch deleted file mode 100644 index 985a6f130344..000000000000 --- a/dev-libs/hyperscan/files/hyperscan-5.2.1-locales.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 83197af..297a3b3 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -187,9 +187,9 @@ else() - set (EXEC_ARGS ${CC_ARG1} -c -Q --help=target -march=native -mtune=native) - execute_process(COMMAND ${CMAKE_C_COMPILER} ${EXEC_ARGS} - OUTPUT_VARIABLE _GCC_OUTPUT) -- string(FIND "${_GCC_OUTPUT}" "Known" POS) -- string(SUBSTRING "${_GCC_OUTPUT}" 0 ${POS} _GCC_OUTPUT) -- string(REGEX REPLACE ".*march=[ \t]*([^ \n]*)[ \n].*" "\\1" -+ string(FIND "${_GCC_OUTPUT}" "march" POS) -+ string(SUBSTRING "${_GCC_OUTPUT}" ${POS} -1 _GCC_OUTPUT) -+ string(REGEX REPLACE "march=[ \t]*([^ \n]*)[ \n].*" "\\1" - GNUCC_ARCH "${_GCC_OUTPUT}") - - # test the parsed flag --- -2.26.2 - diff --git a/dev-libs/hyperscan/hyperscan-5.3.0.ebuild b/dev-libs/hyperscan/hyperscan-5.3.0.ebuild index c258567932c9..0984c5c6ac24 100644 --- a/dev-libs/hyperscan/hyperscan-5.3.0.ebuild +++ b/dev-libs/hyperscan/hyperscan-5.3.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -13,7 +13,7 @@ HOMEPAGE="https://www.hyperscan.io/ https://github.com/intel/hyperscan" LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="cpu_flags_x86_avx2 +cpu_flags_x86_ssse3 static-libs" RDEPEND="dev-libs/boost" diff --git a/dev-libs/hyperscan/hyperscan-5.2.1-r1.ebuild b/dev-libs/hyperscan/hyperscan-5.4.0.ebuild index 1be8d6ecc9e9..33635ee27045 100644 --- a/dev-libs/hyperscan/hyperscan-5.2.1-r1.ebuild +++ b/dev-libs/hyperscan/hyperscan-5.4.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -16,7 +16,7 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="cpu_flags_x86_avx2 +cpu_flags_x86_ssse3 static-libs" -RDEPEND="dev-libs/boost" +RDEPEND="dev-libs/boost:=" DEPEND="${RDEPEND}" BDEPEND=" ${PYTHON_DEPS} @@ -25,10 +25,6 @@ BDEPEND=" REQUIRED_USE="cpu_flags_x86_ssse3" -PATCHES=( - "${FILESDIR}/${P}-locales.patch" -) - src_prepare() { # Respect user -O flags sed -i '/set(OPT_CX*_FLAG/d' CMakeLists.txt || die @@ -39,14 +35,13 @@ src_prepare() { } src_configure() { - CMAKE_BUILD_TYPE=Release - use cpu_flags_x86_ssse3 && append-flags -mssse3 use cpu_flags_x86_avx2 && append-flags -mavx2 local mycmakeargs=( -DBUILD_SHARED_LIBS=$(usex static-libs OFF ON) -DBUILD_STATIC_AND_SHARED=$(usex static-libs ON OFF) + -DBUILD_EXAMPLES=OFF -DFAT_RUNTIME=false ) cmake_src_configure diff --git a/dev-libs/icu-layoutex/Manifest b/dev-libs/icu-layoutex/Manifest index c5f1ce69c8b8..4838621448ee 100644 --- a/dev-libs/icu-layoutex/Manifest +++ b/dev-libs/icu-layoutex/Manifest @@ -1,2 +1,3 @@ DIST icu4c-67_1-src.tgz 24518055 BLAKE2B f8a263b5c3e5e8ffea88a3bb766cb265aac026b5f9b2f45a1f06076f99f9f0dc3a4512487652d774ccfc8dc65f8f4c40a974e0aa2aa4381ee0c9885f6b871779 SHA512 4779f1ce1ca7976f6fad6768853ea8c540da54d11509e3b6cfd864a04b5f2db1c3d4b546387f91ad02fb90804525bc37d2543173f0d705d6ca11dc6f2b7640a8 DIST icu4c-68_1-src.tgz 24722348 BLAKE2B 252ef254cba1a953a0defabae5bf06ba24b3cf48ae18fc4984b883d9f83a3a57129a0e782c85578cf69e9f397a8d6d3b16b70c3802084617d39ade68154f98f5 SHA512 24ff4ce5947c41fc12a168e15d4037556562c7f32c1da0bbedd705232476174a3b2318955a7124426a63c2034eb9ae077e728a5dbada8b9433d7173cac3db307 +DIST icu4c-68_2-src.tgz 24737478 BLAKE2B ff54f903aed1a16928656e5f4fee79e4301038a70ba1d389fb2a2cc7c7dc4c76bc2430c810cea484c0ef69fbafc5728e71776c39874a5395c9dd06d573e8ea90 SHA512 24f3b7981667b37df58118f56ae76a09b719358c1efa8d6f044d28ef8df1c722a894957acadfb3c37aee39ac845893924fc3370d6bbe09875aec8d937059f84b diff --git a/dev-libs/icu-layoutex/icu-layoutex-67.1.ebuild b/dev-libs/icu-layoutex/icu-layoutex-67.1.ebuild index c16c6096d788..3d991c2a006d 100644 --- a/dev-libs/icu-layoutex/icu-layoutex-67.1.ebuild +++ b/dev-libs/icu-layoutex/icu-layoutex-67.1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/unicode-org/icu/releases/download/release-${PV//./-} LICENSE="BSD" SLOT="0/${PV}" -KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86" +KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86" IUSE="debug static-libs" BDEPEND=" diff --git a/dev-libs/icu-layoutex/icu-layoutex-68.2.ebuild b/dev-libs/icu-layoutex/icu-layoutex-68.2.ebuild new file mode 100644 index 000000000000..16506a71c6f7 --- /dev/null +++ b/dev-libs/icu-layoutex/icu-layoutex-68.2.ebuild @@ -0,0 +1,109 @@ +# Copyright 1999-2021 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="External layout part of International Components for Unicode" +HOMEPAGE="https://www.icu-project.org/" +SRC_URI="https://github.com/unicode-org/icu/releases/download/release-${PV//./-}/icu4c-${PV//./_}-src.tgz" + +LICENSE="BSD" +SLOT="0/${PV}" +KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86" +IUSE="debug static-libs" + +BDEPEND=" + virtual/pkgconfig +" +DEPEND=" + ~dev-libs/icu-${PV}[${MULTILIB_USEDEP}] + dev-libs/icu-le-hb[${MULTILIB_USEDEP}] +" +RDEPEND="${DEPEND}" + +S="${WORKDIR}/${PN/-layoutex}/source" + +PATCHES=( + "${FILESDIR}/${PN}-65.1-remove-bashisms.patch" +) + +src_prepare() { + # apply patches + default + + # Disable renaming as it is stupid thing to do + sed -i \ + -e "s/#define U_DISABLE_RENAMING 0/#define U_DISABLE_RENAMING 1/" \ + common/unicode/uconfig.h || die + + # Fix linking of icudata + sed -i \ + -e "s:LDFLAGSICUDT=-nodefaultlibs -nostdlib:LDFLAGSICUDT=:" \ + config/mh-linux || die + + eautoreconf +} + +src_configure() { + # Use C++14 + append-cxxflags -std=c++14 + + if tc-is-cross-compiler; then + mkdir "${WORKDIR}"/host || die + pushd "${WORKDIR}"/host >/dev/null || die + + CFLAGS="" CXXFLAGS="" ASFLAGS="" LDFLAGS="" \ + CC="$(tc-getBUILD_CC)" CXX="$(tc-getBUILD_CXX)" AR="$(tc-getBUILD_AR)" \ + RANLIB="$(tc-getBUILD_RANLIB)" LD="$(tc-getBUILD_LD)" \ + "${S}"/configure --disable-renaming --disable-debug \ + --disable-samples --enable-static || die + emake + + popd >/dev/null || die + fi + + multilib-minimal_src_configure +} + +multilib_src_configure() { + local myeconfargs=( + --disable-renaming + --disable-samples + --enable-layoutex + $(use_enable debug) + $(use_enable static-libs static) + ) + + tc-is-cross-compiler && myeconfargs+=( + --with-cross-build="${WORKDIR}"/host + ) + + # icu tries to use clang by default + tc-export CC CXX + + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" +} + +multilib_src_test() { + # INTLTEST_OPTS: intltest options + # -e: Exhaustive testing + # -l: Reporting of memory leaks + # -v: Increased verbosity + # IOTEST_OPTS: iotest options + # -e: Exhaustive testing + # -v: Increased verbosity + # CINTLTST_OPTS: cintltst options + # -e: Exhaustive testing + # -v: Increased verbosity + pushd layoutex &>/dev/null || die + emake -j1 VERBOSE="1" check + popd &>/dev/null || die +} + +multilib_src_install() { + pushd layoutex &>/dev/null || die + default + popd &>/dev/null || die +} diff --git a/dev-libs/icu-le-hb/icu-le-hb-1.0.3-r1.ebuild b/dev-libs/icu-le-hb/icu-le-hb-1.0.3-r1.ebuild index b79303c26dc8..e095c2170f53 100644 --- a/dev-libs/icu-le-hb/icu-le-hb-1.0.3-r1.ebuild +++ b/dev-libs/icu-le-hb/icu-le-hb-1.0.3-r1.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://github.com/behdad/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="icu" SLOT="0" -KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86" +KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86" IUSE="" # dev-libs/icu is not linked into icu-le-hb but the latter still needs diff --git a/dev-libs/icu/Manifest b/dev-libs/icu/Manifest index c5f1ce69c8b8..4838621448ee 100644 --- a/dev-libs/icu/Manifest +++ b/dev-libs/icu/Manifest @@ -1,2 +1,3 @@ DIST icu4c-67_1-src.tgz 24518055 BLAKE2B f8a263b5c3e5e8ffea88a3bb766cb265aac026b5f9b2f45a1f06076f99f9f0dc3a4512487652d774ccfc8dc65f8f4c40a974e0aa2aa4381ee0c9885f6b871779 SHA512 4779f1ce1ca7976f6fad6768853ea8c540da54d11509e3b6cfd864a04b5f2db1c3d4b546387f91ad02fb90804525bc37d2543173f0d705d6ca11dc6f2b7640a8 DIST icu4c-68_1-src.tgz 24722348 BLAKE2B 252ef254cba1a953a0defabae5bf06ba24b3cf48ae18fc4984b883d9f83a3a57129a0e782c85578cf69e9f397a8d6d3b16b70c3802084617d39ade68154f98f5 SHA512 24ff4ce5947c41fc12a168e15d4037556562c7f32c1da0bbedd705232476174a3b2318955a7124426a63c2034eb9ae077e728a5dbada8b9433d7173cac3db307 +DIST icu4c-68_2-src.tgz 24737478 BLAKE2B ff54f903aed1a16928656e5f4fee79e4301038a70ba1d389fb2a2cc7c7dc4c76bc2430c810cea484c0ef69fbafc5728e71776c39874a5395c9dd06d573e8ea90 SHA512 24f3b7981667b37df58118f56ae76a09b719358c1efa8d6f044d28ef8df1c722a894957acadfb3c37aee39ac845893924fc3370d6bbe09875aec8d937059f84b diff --git a/dev-libs/icu/files/icu-64.2-darwin.patch b/dev-libs/icu/files/icu-64.2-darwin.patch index e6af282bd0ef..d0029fa0fe5e 100644 --- a/dev-libs/icu/files/icu-64.2-darwin.patch +++ b/dev-libs/icu/files/icu-64.2-darwin.patch @@ -22,7 +22,7 @@ forward-ported from v58.2 to v64.2 LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name $(libdir)/$(notdir $(MIDDLE_SO_TARGET)) else -LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name $(notdir $(MIDDLE_SO_TARGET)) $(PKGDATA_TRAILING_SPACE) -+LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name $(libdir)/$(notdir $(MIDDLE_SO_TARGET)) $(PKGDATA_TRAILING_SPACE) ++LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name $(libdir)/$(notdir $(MIDDLE_SO_TARGET)) endif ## Compiler switch to embed a runtime search path diff --git a/dev-libs/icu/icu-67.1.ebuild b/dev-libs/icu/icu-67.1.ebuild index 73325e456ac2..1f12ed0dcfb3 100644 --- a/dev-libs/icu/icu-67.1.ebuild +++ b/dev-libs/icu/icu-67.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -14,7 +14,7 @@ LICENSE="BSD" SLOT="0/${PV}" -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 ~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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" IUSE="debug doc examples static-libs" BDEPEND="${PYTHON_DEPS} diff --git a/dev-libs/icu/icu-68.1.ebuild b/dev-libs/icu/icu-68.1.ebuild index 149a5031f0e3..fa0bdf7cdf7d 100644 --- a/dev-libs/icu/icu-68.1.ebuild +++ b/dev-libs/icu/icu-68.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -14,7 +14,7 @@ LICENSE="BSD" SLOT="0/${PV}" -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 ~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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" IUSE="debug doc examples static-libs" BDEPEND="${PYTHON_DEPS} diff --git a/dev-libs/icu/icu-68.2.ebuild b/dev-libs/icu/icu-68.2.ebuild new file mode 100644 index 000000000000..5251a0393ddd --- /dev/null +++ b/dev-libs/icu/icu-68.2.ebuild @@ -0,0 +1,142 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6,7,8,9,10} ) +inherit autotools flag-o-matic multilib-minimal python-any-r1 toolchain-funcs + +DESCRIPTION="International Components for Unicode" +HOMEPAGE="https://site.icu-project.org/" +SRC_URI="https://github.com/unicode-org/icu/releases/download/release-${PV//./-}/icu4c-${PV//./_}-src.tgz" + +LICENSE="BSD" + +SLOT="0/${PV}" + +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" +IUSE="debug doc examples static-libs" + +BDEPEND="${PYTHON_DEPS} + virtual/pkgconfig + doc? ( app-doc/doxygen[dot] ) +" + +S="${WORKDIR}/${PN}/source" + +MULTILIB_CHOST_TOOLS=( + /usr/bin/icu-config +) + +PATCHES=( + "${FILESDIR}/${PN}-65.1-remove-bashisms.patch" + "${FILESDIR}/${PN}-64.2-darwin.patch" + "${FILESDIR}/${PN}-68.1-nonunicode.patch" +) + +src_prepare() { + default + + local variable + + # Disable renaming as it is stupid thing to do + sed -i \ + -e "s/#define U_DISABLE_RENAMING 0/#define U_DISABLE_RENAMING 1/" \ + common/unicode/uconfig.h || die + + # Fix linking of icudata + sed -i \ + -e "s:LDFLAGSICUDT=-nodefaultlibs -nostdlib:LDFLAGSICUDT=:" \ + config/mh-linux || die + + # Append doxygen configuration to configure + sed -i \ + -e 's:icudefs.mk:icudefs.mk Doxyfile:' \ + configure.ac || die + + eautoreconf +} + +src_configure() { + append-cxxflags -std=c++14 + + if tc-is-cross-compiler; then + mkdir "${WORKDIR}"/host || die + pushd "${WORKDIR}"/host >/dev/null || die + + CFLAGS="" CXXFLAGS="" ASFLAGS="" LDFLAGS="" \ + CC="$(tc-getBUILD_CC)" CXX="$(tc-getBUILD_CXX)" AR="$(tc-getBUILD_AR)" \ + RANLIB="$(tc-getBUILD_RANLIB)" LD="$(tc-getBUILD_LD)" \ + "${S}"/configure --disable-renaming --disable-debug \ + --disable-samples --enable-static || die + emake + + popd >/dev/null || die + fi + + multilib-minimal_src_configure +} + +multilib_src_configure() { + local myeconfargs=( + --disable-renaming + --disable-samples + --disable-layoutex + $(use_enable debug) + $(use_enable static-libs static) + $(multilib_native_use_enable examples samples) + ) + + tc-is-cross-compiler && myeconfargs+=( + --with-cross-build="${WORKDIR}"/host + ) + + # icu tries to use clang by default + tc-export CC CXX + + # make sure we configure with the same shell as we run icu-config + # with, or ECHO_N, ECHO_T and ECHO_C will be wrongly defined + export CONFIG_SHELL="${EPREFIX}/bin/sh" + # probably have no /bin/sh in prefix-chain + [[ -x ${CONFIG_SHELL} ]] || CONFIG_SHELL="${BASH}" + + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" +} + +multilib_src_compile() { + default + + if multilib_is_native_abi && use doc; then + doxygen -u Doxyfile || die + doxygen Doxyfile || die + fi +} + +multilib_src_test() { + # INTLTEST_OPTS: intltest options + # -e: Exhaustive testing + # -l: Reporting of memory leaks + # -v: Increased verbosity + # IOTEST_OPTS: iotest options + # -e: Exhaustive testing + # -v: Increased verbosity + # CINTLTST_OPTS: cintltst options + # -e: Exhaustive testing + # -v: Increased verbosity + emake -j1 VERBOSE="1" check +} + +multilib_src_install() { + default + + if multilib_is_native_abi && use doc; then + docinto html + dodoc -r doc/html/* + fi +} + +multilib_src_install_all() { + einstalldocs + docinto html + dodoc ../readme.html +} diff --git a/dev-libs/igraph/Manifest b/dev-libs/igraph/Manifest index bb647bf154d5..862a2b7315f0 100644 --- a/dev-libs/igraph/Manifest +++ b/dev-libs/igraph/Manifest @@ -1,3 +1,2 @@ -DIST igraph-0.7.1.tar.gz 2967134 BLAKE2B 27f0a2f51e561a3ea2e2e6d31853fe10ffd66f9f67603d77f2c0449a4c2bcd4d45c98516b526fb0f23a871ebe3db1fcf0c691551714d044124778faa147bd30f SHA512 ac7d7e3fbc6d27ae69079224881ca03db2c7e0b50d016706f3e167c614e2c9332c675d2fcd3cde12874e13a8fc402d42222308c6195afadee15152cec93f94dd -DIST igraph-0.8.2.tar.gz 3625308 BLAKE2B b3be5a28b6507c98c88a96c4a14e6b9c45645985f5b16aaae0739412a5f26a1ccdbda3180fac5d12525b4da2f5fc3d6caad3928cd1306b151b89104bbbb5f6e8 SHA512 e1035ed22541c7d253c201da5d2f8c5ceb154a6bf4be1b41981a02d6bbe72038647bf011432e2446307e615c27aa8079d4ef2c4447c2eba3764788e26e8f790b DIST igraph-0.8.3.tar.gz 3636192 BLAKE2B 1a6636a074182fc859d7c2982546668b221be8a71b9a8a60404764684b7488a41450cedb75f89558f1ffe6f6dbef298057b5294495f2e7992768f5fd4e40fbd9 SHA512 a25126fd5ee7cf823b6728d02d38c8d13c8561e9f6e10372faef15e98f4381c118f3dd9f308d003d7d18ca501e7055b838711a2a62e00afba32ca929c8d765f1 +DIST igraph-0.8.5.tar.gz 3303252 BLAKE2B 9aa920e39a1ef76376eb9a88b6d24e2d051aa22807d4e9bbac49fd1708c59f821d2d4ec55dc96a89de84dfc3ca394e3de9f60704b7f3880a40128863b209d0d6 SHA512 eeb7a21b3a0551e47c178e568811a415e39afb2cc99be39905a15d667fa59564e83979111e1ea5d93636d5b0c7dcbed18728f03aa7ee4d83f96c45af52de8370 diff --git a/dev-libs/igraph/files/igraph-0.7.1-unbundle.patch b/dev-libs/igraph/files/igraph-0.7.1-unbundle.patch deleted file mode 100644 index 755e749c1868..000000000000 --- a/dev-libs/igraph/files/igraph-0.7.1-unbundle.patch +++ /dev/null @@ -1,269 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index acf76cd..a9db7bd 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -167,7 +167,8 @@ if test "x$enable_gmp" != "xno"; then - AC_CHECK_HEADER([gmp.h], [ - AC_DEFINE([HAVE_GMP], [1], [Define to 1 if you have the GMP library]) - gmp_support=yes -- LDFLAGS="${LDFLAGS} -lgmp" -+ GMP_LIBS="-lgmp" -+ AC_SUBST(GMP_LIBS) - PKGCONFIG_LIBS_PRIVATE="${PKGCONFIG_LIBS_PRIVATE} -lgmp" - ]) - ]) -@@ -231,24 +232,16 @@ else - fi - - if test "$internal_blas" = "no"; then -- AC_CHECK_LIB([blas], [daxpy_], [], -- AC_CHECK_LIB([blas], [daxpy], [], -- AC_CHECK_LIB([blas], [DAXPY_], [], -- AC_CHECK_LIB([blas], [DAXPY], [], -- [AC_MSG_RESULT(not found, trying to use -lblas anyway.)])))) -- LDFLAGS="${LDFLAGS} -lblas" -+ PKG_CHECK_MODULES([BLAS],[blas]) -+ CPPFLAGS="${CPPFLAGS} ${BLAS_CFLAGS}" - PKGCONFIG_LIBS_PRIVATE="${PKGCONFIG_LIBS_PRIVATE} -lblas" - else - AC_DEFINE([INTERNAL_BLAS], [1], [Define to 1 if you use the internal BLAS library]) - fi - - if test "$internal_lapack" = "no"; then -- AC_CHECK_LIB([lapack], [dlarnv_], [], -- AC_CHECK_LIB([lapack], [dlarnv], [], -- AC_CHECK_LIB([lapack], [DLARNV_], [], -- AC_CHECK_LIB([lapack], [DLARNV], [], -- [AC_MSG_RESULT(not found, trying to use -llapack anyway.)])))) -- LDFLAGS="${LDFLAGS} -llapack" -+ PKG_CHECK_MODULES([LAPACK],[lapack]) -+ CPPFLAGS="${CPPFLAGS} ${LAPACK_CFLAGS}" - PKGCONFIG_LIBS_PRIVATE="${PKGCONFIG_LIBS_PRIVATE} -llapack" - else - AC_DEFINE([INTERNAL_LAPACK], [1], [Define to 1 if you use the internal LAPACK library]) -@@ -258,17 +251,15 @@ if test "$internal_arpack" = "no"; then - if test "$tls_support" = "yes"; then - AC_MSG_ERROR([Thread-local storage only supported with internal ARPACK library]) - fi -- AC_CHECK_LIB([arpack], [dsaupd_], [], -- AC_CHECK_LIB([arpack], [dsaupd], [], -- AC_CHECK_LIB([arpack], [DSAUPD_], [], -- AC_CHECK_LIB([arpack], [DSAUPD], [], -- [AC_MSG_RESULT(not found, trying to use -larpack anyway.)])))) -- LDFLAGS="${LDFLAGS} -larpack" -+ PKG_CHECK_MODULES([ARPACK],[arpack]) -+ CPPFLAGS="${CPPFLAGS} ${ARPACK_CFLAGS}" - PKGCONFIG_LIBS_PRIVATE="${PKGCONFIG_LIBS_PRIVATE} -larpack" - else - AC_DEFINE([INTERNAL_ARPACK], [1], [Define to 1 if you use the internal ARPACK library]) - fi - -+PKG_CHECK_MODULES([CS],[cxsparse]) -+ - glpk_support=no - AC_ARG_ENABLE(glpk, AC_HELP_STRING([--disable-glpk], [Compile without the GLPK library])) - if test "x$enable_glpk" != "xno"; then -@@ -283,7 +274,8 @@ if test "x$enable_glpk" != "xno"; then - ], [ - AC_DEFINE([HAVE_GLPK], [1], [Define to 1 if you have the GLPK library]) - glpk_support=yes -- LDFLAGS="${LDFLAGS} -lglpk" -+ GLPK_LIBS="-lglpk" -+ AC_SUBST(GLPK_LIBS) - PKGCONFIG_LIBS_PRIVATE="${PKGCONFIG_LIBS_PRIVATE} -lglpk" - ]) - ]) -diff --git a/examples/simple/igraph_arpack_rnsolve.out b/examples/simple/igraph_arpack_rnsolve.out -index ec38497..6603034 100644 ---- a/examples/simple/igraph_arpack_rnsolve.out -+++ b/examples/simple/igraph_arpack_rnsolve.out -@@ -16,7 +16,7 @@ - --- - 22.0483 0 - -21.3281 0 ---3.00735 -19.2957 -+-3.00735 19.2957 - --- - 0.373224 0.226696 0.204213 0.0473383 - -0.289145 -0.296079 -0.0479785 0.156365 -@@ -31,7 +31,7 @@ - --- - -21.3281 0 - -12.4527 0 ---3.00735 -19.2957 -+-3.00735 19.2957 - --- - -0.226696 0.695866 -0.204213 -0.0473383 - 0.296079 0.120213 0.0479785 -0.156365 -@@ -46,7 +46,7 @@ - --- - -3.00735 19.2957 - -3.00735 -19.2957 --12.1099 6.27293 -+12.1099 -6.27293 - --- - 0.0768616 -0.195028 -0.152389 0.21912 - 0.147607 0.0704569 0.346547 0.125122 -diff --git a/examples/simple/igraph_layout_merge2.out b/examples/simple/igraph_layout_merge2.out -index dfe2c22..9fe81bf 100644 ---- a/examples/simple/igraph_layout_merge2.out -+++ b/examples/simple/igraph_layout_merge2.out -@@ -1,13 +1,13 @@ ---2.73912 -2.95429 ---0.479512 -4.00008 --1.96326 -3.51798 --3.65613 -1.69214 --3.95248 0.780051 --2.73912 2.95429 --0.479512 4.00008 ---1.96326 3.51798 ---3.65613 1.69214 ---3.95248 -0.780051 -+-2.55311 -3.13964 -+-0.22007 -4.0407 -+2.19703 -3.39835 -+3.77493 -1.45795 -+3.91094 1.03935 -+2.55311 3.13964 -+0.22007 4.0407 -+-2.19703 3.39835 -+-3.77493 1.45795 -+-3.91094 -1.03935 - -1.6061 6.30088 - -4.92661 5.80435 - -3.69637 8.92826 -diff --git a/examples/simple/igraph_sparsemat2.c b/examples/simple/igraph_sparsemat2.c -index c39d0e5..fdfd264 100644 ---- a/examples/simple/igraph_sparsemat2.c -+++ b/examples/simple/igraph_sparsemat2.c -@@ -21,7 +21,7 @@ - - */ - --#include <cs/cs.h> -+#include <cs.h> - #include <igraph.h> - #include <igraph_sparsemat.h> - #include <igraph_blas_internal.h> -diff --git a/examples/simple/igraph_sparsemat3.c b/examples/simple/igraph_sparsemat3.c -index 630bf1a..b23cbe1 100644 ---- a/examples/simple/igraph_sparsemat3.c -+++ b/examples/simple/igraph_sparsemat3.c -@@ -21,7 +21,7 @@ - - */ - --#include <cs/cs.h> -+#include <cs.h> - #include <igraph.h> - #include <igraph_sparsemat.h> - -diff --git a/examples/simple/igraph_sparsemat4.c b/examples/simple/igraph_sparsemat4.c -index 4d85bde..7497faf 100644 ---- a/examples/simple/igraph_sparsemat4.c -+++ b/examples/simple/igraph_sparsemat4.c -@@ -21,7 +21,7 @@ - - */ - --#include <cs/cs.h> -+#include <cs.h> - #include <igraph.h> - #include <igraph_sparsemat.h> - -diff --git a/src/Makefile.am b/src/Makefile.am -index e7085c5..194f4a0 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -9,9 +9,6 @@ AM_YFLAGS = -d - - lib_LTLIBRARIES = libigraph.la - --include lapack/blas.inc --include lapack/lapack.inc --include lapack/arpack.inc - include plfit/plfit.inc - - F2C = f2c/abort_.c f2c/dolio.c f2c/r_sin.c\ -@@ -99,8 +96,6 @@ if INTERNAL_ARPACK - ARPACK_LIB = libarpack.la - endif - --include ../optional/glpk/glpk.inc -- - if INTERNAL_GLPK - libglpk_la_SOURCES = $(GLPK) - libglpk_la_CFLAGS = -I$(top_srcdir)/optional/glpk -@@ -255,7 +250,7 @@ SOURCES = basic_query.c games.c cocitation.c iterators.c \ - drl_layout_3d.cpp drl_graph_3d.cpp \ - DensityGrid_3d.cpp \ - foreign-dl-parser.y foreign-dl-lexer.l \ -- $(CS) sparsemat.c mixing.c bigint.c bignum.c \ -+ sparsemat.c mixing.c bigint.c bignum.c \ - version.c optimal_modularity.c \ - igraph_fixed_vectorlist.c separators.c \ - igraph_marked_queue.c igraph_estack.c st-cuts.c \ -@@ -274,8 +269,8 @@ libigraph_la_SOURCES = $(SOURCES) $(HEADERS_PRIVATE) - libigraph_la_CFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(WARNING_CFLAGS) - libigraph_la_CXXFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(WARNING_CFLAGS) - libigraph_la_LDFLAGS = -no-undefined --libigraph_la_LIBADD = -lm $(XML2_LIBS) $(F2C_LIB) $(BLAS_LIB) \ -- $(LAPACK_LIB) $(ARPACK_LIB) $(GLPK_LIB) $(PRPACK_LIB) \ -+libigraph_la_LIBADD = -lm $(XML2_LIBS) $(F2C_LIB) $(BLAS_LIBS) $(GMP_LIBS) \ -+ $(LAPACK_LIBS) $(ARPACK_LIBS) $(GLPK_LIBS) $(PRPACK_LIB) $(CS_LIBS) \ - $(PLFIT_LIB) - - if INTERNAL_GLPK -diff --git a/src/sparsemat.c b/src/sparsemat.c -index f96d022..6990c91 100644 ---- a/src/sparsemat.c -+++ b/src/sparsemat.c -@@ -23,7 +23,7 @@ - - #include "config.h" - --#include "cs/cs.h" -+#include "cs.h" - - #include "igraph_sparsemat.h" - #include "igraph_error.h" -diff --git a/tests/Makefile.am b/tests/Makefile.am -index 6da83b2..c0b82d6 100644 ---- a/tests/Makefile.am -+++ b/tests/Makefile.am -@@ -13,7 +13,7 @@ $(srcdir)/package.m4: $(top_srcdir)/configure.ac - echo 'm4_define([AT_PACKAGE_BUGREPORT], [@PACKAGE_BUGREPORT@])'; \ - } >$(srcdir)/package.m4 - --EXTRA_DIST += package.m4 -+#EXTRA_DIST += package.m4 - - TESTSUITE_AT = \ - testsuite.at \ -diff --git a/tests/mt.at b/tests/mt.at -index 050974a..9558d6f 100644 ---- a/tests/mt.at -+++ b/tests/mt.at -@@ -29,5 +29,5 @@ AT_CLEANUP - AT_SETUP([Thread-safe ARPACK:]) - AT_KEYWORDS([thread-safe ARPACK]) - AT_COMPILE_CHECK([simple/tls2.c], [simple/tls2.out], [], [internal], -- [-lpthread]) -+ [-lpthread $(${PKG_CONFIG} --libs arpack)]) - AT_CLEANUP -diff --git a/tests/types.at b/tests/types.at -index f80a6a2..29ac739 100644 ---- a/tests/types.at -+++ b/tests/types.at -@@ -133,7 +133,7 @@ AT_CLEANUP - AT_SETUP([Sparse matrix, multiplications (igraph_sparsemat_t): ]) - AT_KEYWORDS([sparse matrix igraph_sparsemat_t]) - AT_COMPILE_CHECK([simple/igraph_sparsemat2.c], [simple/igraph_sparsemat2.out], -- [], [INTERNAL], [-lblas]) -+ [], [INTERNAL], [$(${PKG_CONFIG} --libs blas)]) - AT_CLEANUP - - AT_SETUP([Sparse matrix, indexing (igraph_sparsemat_t): ]) --- -2.0.0 - diff --git a/dev-libs/igraph/igraph-0.7.1-r2.ebuild b/dev-libs/igraph/igraph-0.7.1-r2.ebuild deleted file mode 100644 index f3e5bb75be14..000000000000 --- a/dev-libs/igraph/igraph-0.7.1-r2.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools toolchain-funcs - -DESCRIPTION="Creating and manipulating undirected and directed graphs" -HOMEPAGE="https://www.igraph.org/" -SRC_URI="http://www.igraph.org/nightly/get/c/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0/0" -KEYWORDS="~amd64 ~x86" -IUSE="debug gmp" - -RDEPEND=" - dev-libs/libxml2 - >=sci-libs/arpack-3 - virtual/blas - virtual/lapack - >=sci-libs/cxsparse-3 - sci-mathematics/glpk - gmp? ( dev-libs/gmp:0 )" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -PATCHES=( "${FILESDIR}"/${P}-unbundle.patch ) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - tc-export PKG_CONFIG - econf \ - $(use_enable gmp) \ - $(use_enable debug) \ - --disable-static \ - --disable-tls \ - --with-external-arpack \ - --with-external-blas \ - --with-external-lapack \ - --with-external-f2c \ - --with-external-glpk -} - -src_install() { - default - - # no static archives - find "${D}" -name '*.la' -delete || die -} diff --git a/dev-libs/igraph/igraph-0.8.2.ebuild b/dev-libs/igraph/igraph-0.8.5.ebuild index b38b0fcd261c..19366631e5e7 100644 --- a/dev-libs/igraph/igraph-0.8.2.ebuild +++ b/dev-libs/igraph/igraph-0.8.5.ebuild @@ -15,17 +15,17 @@ KEYWORDS="~amd64 ~x86" IUSE="debug" RDEPEND=" - dev-libs/gmp:0 + dev-libs/gmp:0= dev-libs/libxml2 sci-libs/arpack sci-libs/cxsparse - sci-mathematics/glpk + sci-mathematics/glpk:= virtual/blas virtual/lapack" DEPEND="${RDEPEND}" BDEPEND="virtual/pkgconfig" -PATCHES=( "${FILESDIR}"/${P}-unbundle.patch ) +PATCHES=( "${FILESDIR}"/${PN}-0.8.2-unbundle.patch ) src_prepare() { default diff --git a/dev-libs/inih/inih-52-r1.ebuild b/dev-libs/inih/inih-52-r1.ebuild new file mode 100644 index 000000000000..288ada671b4b --- /dev/null +++ b/dev-libs/inih/inih-52-r1.ebuild @@ -0,0 +1,45 @@ +# Copyright 2020-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit meson multilib-minimal + +DESCRIPTION="inih (INI not invented here) simple .INI file parser" +HOMEPAGE="https://github.com/benhoyt/inih" + +SRC_URI="https://github.com/benhoyt/inih/archive/r${PV}.tar.gz -> ${P}.tar.gz" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" + +LICENSE="BSD" +SLOT="0" + +IUSE="static-libs" + +S="${WORKDIR}/inih-r${PV}" + +multilib_src_configure() { + local emesonargs=( + -Ddefault_library=$(usex static-libs both shared) + -Ddistro_install=true + -Dwith_INIReader=true + ) + + meson_src_configure +} + +multilib_src_compile() { + meson_src_compile +} + +multilib_src_install() { + meson_src_install +} + +multilib_src_install_all() { + local DOCS=( + LICENSE.txt + README.md + ) + einstalldocs +} diff --git a/dev-libs/inih/inih-52.ebuild b/dev-libs/inih/inih-52.ebuild index 643c90ef2a42..09154cf1b6eb 100644 --- a/dev-libs/inih/inih-52.ebuild +++ b/dev-libs/inih/inih-52.ebuild @@ -1,4 +1,4 @@ -# Copyright 2020 Gentoo Authors +# Copyright 2020-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,7 +9,7 @@ DESCRIPTION="inih (INI not invented here) simple .INI file parser" HOMEPAGE="https://github.com/benhoyt/inih" SRC_URI="https://github.com/benhoyt/inih/archive/r${PV}.tar.gz -> ${P}.tar.gz" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86" LICENSE="BSD" SLOT="0" diff --git a/dev-libs/iniparser/iniparser-3.1-r2.ebuild b/dev-libs/iniparser/iniparser-3.1-r2.ebuild index b4e6681160a3..2c945090aff9 100644 --- a/dev-libs/iniparser/iniparser-3.1-r2.ebuild +++ b/dev-libs/iniparser/iniparser-3.1-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ 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" +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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="doc examples" # the tests are rather examples than tests, no point in running them RESTRICT="test" diff --git a/dev-libs/iniparser/iniparser-4.1.ebuild b/dev-libs/iniparser/iniparser-4.1.ebuild index d3af126dfbf7..d524ee1cfc13 100644 --- a/dev-libs/iniparser/iniparser-4.1.ebuild +++ b/dev-libs/iniparser/iniparser-4.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="https://github.com/ndevilla/iniparser/archive/v${PV}.tar.gz -> ${P}.tar LICENSE="MIT" SLOT="4" -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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="doc examples" BDEPEND="doc? ( app-doc/doxygen )" diff --git a/dev-libs/isl/Manifest b/dev-libs/isl/Manifest index 9362bb67b30c..55a0904ac89b 100644 --- a/dev-libs/isl/Manifest +++ b/dev-libs/isl/Manifest @@ -1,2 +1 @@ -DIST isl-0.22.1.tar.xz 1676948 BLAKE2B cf1661f785344d8132e8f8a339ed8d457677ca1bf943a597d3d0be1e80d8c42e788cdde79fd073d130d681424da7a8e3ca9fa2cd4cd4232220f5c5a1ce99ab99 SHA512 8dc7b0c14e5bfdca8f2161be51d3c9afcd18bc217bb19b7de01dbba0c6f3fdc2b725fb999f8562c77bf2918d3005c9247f7a58474a6da7697390067944d4d4aa DIST isl-0.23.tar.xz 1729656 BLAKE2B ce026eaa1d6c814f4067c555d97a453bdf01d5fa240aa9b6ccd22c9a0e7f19b0c30cd834f976a29b10a5d57eaa747a3f45cf55717f05d98ae405ec93dd42f27b SHA512 da4e7cbd5045d074581d4e1c212acb074a8b2345a96515151b0543cbe2601db6ac2bbd93f9ad6643e98f845b68f438f3882c05b8b90969ae542802a3c78fea20 diff --git a/dev-libs/isl/isl-0.22.1.ebuild b/dev-libs/isl/isl-0.22.1.ebuild deleted file mode 100644 index 16c952bb2d7c..000000000000 --- a/dev-libs/isl/isl-0.22.1.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -inherit eutils multilib-minimal preserve-libs - -DESCRIPTION="A library for manipulating integer points bounded by linear constraints" -HOMEPAGE="https://isl.gforge.inria.fr/" -SRC_URI="http://isl.gforge.inria.fr/${P}.tar.xz" - -LICENSE="LGPL-2.1" -SLOT="0/22" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86" -IUSE="static-libs" - -RDEPEND=">=dev-libs/gmp-5.1.3-r1[${MULTILIB_USEDEP}]" -DEPEND="${RDEPEND} - app-arch/xz-utils - virtual/pkgconfig" - -DOCS=( ChangeLog AUTHORS doc/manual.pdf ) - -PATCHES=( - "${FILESDIR}"/${PN}-0.19-gdb-autoload-dir.patch -) - -multilib_src_configure() { - ECONF_SOURCE="${S}" econf $(use_enable static-libs static) -} - -multilib_src_install_all() { - einstalldocs - find "${ED}" -type f -name '*.la' -delete -} - -pkg_preinst() { - preserve_old_lib \ - /usr/$(get_libdir)/libisl$(get_libname 14) \ - /usr/$(get_libdir)/libisl$(get_libname 15) \ - /usr/$(get_libdir)/libisl$(get_libname 19) \ - /usr/$(get_libdir)/libisl$(get_libname 21) -} - -pkg_postinst() { - preserve_old_lib_notify \ - /usr/$(get_libdir)/libisl$(get_libname 14) \ - /usr/$(get_libdir)/libisl$(get_libname 15) \ - /usr/$(get_libdir)/libisl$(get_libname 19) \ - /usr/$(get_libdir)/libisl$(get_libname 21) -} diff --git a/dev-libs/isl/isl-0.23-r1.ebuild b/dev-libs/isl/isl-0.23-r1.ebuild index e183e75910ed..989d14ce70c2 100644 --- a/dev-libs/isl/isl-0.23-r1.ebuild +++ b/dev-libs/isl/isl-0.23-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -11,11 +11,12 @@ SRC_URI="http://isl.gforge.inria.fr/${P}.tar.xz" LICENSE="LGPL-2.1" SLOT="0/23" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="static-libs" RDEPEND=">=dev-libs/gmp-5.1.3-r1[${MULTILIB_USEDEP}]" -DEPEND="${RDEPEND} +DEPEND="${RDEPEND}" +BDEPEND=" app-arch/xz-utils virtual/pkgconfig" diff --git a/dev-libs/jemalloc/jemalloc-5.0.1.ebuild b/dev-libs/jemalloc/jemalloc-5.0.1.ebuild index bd4b63da8106..fe1a4f800445 100644 --- a/dev-libs/jemalloc/jemalloc-5.0.1.ebuild +++ b/dev-libs/jemalloc/jemalloc-5.0.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 diff --git a/dev-libs/jemalloc/jemalloc-5.1.0.ebuild b/dev-libs/jemalloc/jemalloc-5.1.0.ebuild index 1018e86f9331..95f65a34b8c1 100644 --- a/dev-libs/jemalloc/jemalloc-5.1.0.ebuild +++ b/dev-libs/jemalloc/jemalloc-5.1.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 diff --git a/dev-libs/json-c/Manifest b/dev-libs/json-c/Manifest index 66a308c2f404..99ea09eff23f 100644 --- a/dev-libs/json-c/Manifest +++ b/dev-libs/json-c/Manifest @@ -1,2 +1 @@ -DIST json-c-0.14.tar.gz 321677 BLAKE2B 39325988dd58dad589fc0f036c17b2337c81cf7aab8ecb2232f8d59fef9d38df28e096f8d22320e0003799d477debddc4926eaa7a170954263c6b303c1fa056e SHA512 75537c61d0632a01f94d2394d7a4387ef1eca0b68aa56c495d3d96dd29b38ed20eb0cc3f6e5e24dc6660c8939669f8954005d9c3ba20437f3fcc9f9dd896b00d DIST json-c-0.15.tar.gz 361488 BLAKE2B ae34f6dd45ebee55e6413ecb234e48fa5ae1c17e6fa12462aaaa04e8801457060e176abe90d76d04ad0ee9b903ff467bc3b8ed5816792da175aad8862b9d168e SHA512 dc01298bcc78f0f31a34f5fcfe45c0feebfd88518e97fb4f96f1a652f71ccdd303415a4c7bf5b573bdcbcca80428281f0dfccefc6545ea3a7f18dbb819332f34 diff --git a/dev-libs/json-c/json-c-0.14-r3.ebuild b/dev-libs/json-c/json-c-0.14-r3.ebuild deleted file mode 100644 index 483ad5f16310..000000000000 --- a/dev-libs/json-c/json-c-0.14-r3.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" - -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 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="cpu_flags_x86_rdrand doc static-libs threads" - -PATCHES=( - "${FILESDIR}/${PN}-0.14-cmake-static-libs.patch" - "${FILESDIR}/${P}-security-fix.patch" - "${FILESDIR}/${PN}-0.14-object-limitation.patch" -) - -MULTILIB_WRAPPED_HEADERS=( - /usr/include/json-c/config.h -) - -src_prepare() { - cmake_src_prepare -} - -multilib_src_configure() { - local mycmakeargs=( - -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) - ) - - 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-glib/json-glib-1.4.4.ebuild b/dev-libs/json-glib/json-glib-1.4.4.ebuild index b4a5172fae10..0f1020925a1d 100644 --- a/dev-libs/json-glib/json-glib-1.4.4.ebuild +++ b/dev-libs/json-glib/json-glib-1.4.4.ebuild @@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/JsonGlib" LICENSE="LGPL-2.1+" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86" IUSE="gtk-doc +introspection" RDEPEND=" diff --git a/dev-libs/json-glib/json-glib-1.6.0.ebuild b/dev-libs/json-glib/json-glib-1.6.0.ebuild index 3723a06a5540..35c0e160931a 100644 --- a/dev-libs/json-glib/json-glib-1.6.0.ebuild +++ b/dev-libs/json-glib/json-glib-1.6.0.ebuild @@ -39,7 +39,7 @@ src_prepare() { multilib_src_configure() { local emesonargs=( -Dintrospection=$(multilib_native_usex introspection enabled disabled) - -Ddocs=$(multilib_native_usex gtk-doc enabled disabled) + -Dgtk_doc=$(multilib_native_usex gtk-doc enabled disabled) -Dman=true ) meson_src_configure diff --git a/dev-libs/jsoncpp/jsoncpp-1.9.4.ebuild b/dev-libs/jsoncpp/jsoncpp-1.9.4.ebuild index aec7e51e5932..622ce2cc1048 100644 --- a/dev-libs/jsoncpp/jsoncpp-1.9.4.ebuild +++ b/dev-libs/jsoncpp/jsoncpp-1.9.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -15,7 +15,7 @@ SRC_URI=" LICENSE="|| ( public-domain MIT )" SLOT="0/24" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x64-macos ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x64-solaris" IUSE="doc test" RESTRICT="!test? ( test )" @@ -43,3 +43,8 @@ src_compile() { HTML_DOCS=( dist/doxygen/jsoncpp*/. ) fi } + +src_test() { + # increase test timeout due to failures on slower hardware + meson_src_test -t 2 +} diff --git a/dev-libs/judy/judy-1.0.5-r2.ebuild b/dev-libs/judy/judy-1.0.5-r2.ebuild index 9550ca8a3f97..409a04450a30 100644 --- a/dev-libs/judy/judy-1.0.5-r2.ebuild +++ b/dev-libs/judy/judy-1.0.5-r2.ebuild @@ -3,7 +3,7 @@ EAPI=6 -inherit autotools ltprune multilib-minimal +inherit autotools multilib-minimal DESCRIPTION="A C library that implements a dynamic array" HOMEPAGE="https://sourceforge.net/projects/judy/" @@ -30,5 +30,5 @@ multilib_src_configure() { multilib_src_install_all(){ einstalldocs - prune_libtool_files + find "${ED}" -name '*.la' -delete || die } diff --git a/dev-libs/judy/judy-1.0.5-r3.ebuild b/dev-libs/judy/judy-1.0.5-r3.ebuild new file mode 100644 index 000000000000..6ca37ae65835 --- /dev/null +++ b/dev-libs/judy/judy-1.0.5-r3.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools multilib-minimal + +DESCRIPTION="A C library that implements a dynamic array" +HOMEPAGE="https://sourceforge.net/projects/judy/" +SRC_URI="mirror://sourceforge/judy/Judy-${PV}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" +IUSE="static-libs" +DOCS=( AUTHORS ChangeLog README ) + +src_prepare() { + eapply -p0 "${FILESDIR}/${P}-parallel-make.patch" + eapply "${FILESDIR}/${P}-gcc49.patch" + sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac || die + eapply_user + eautoreconf + multilib_copy_sources +} + +multilib_src_configure() { + ECONF_SOURCE=${BUILD_DIR} econf $(use_enable static-libs static) +} + +multilib_src_install_all(){ + einstalldocs + find "${ED}" -name '*.la' -delete || die +} diff --git a/dev-libs/kdiagram/Manifest b/dev-libs/kdiagram/Manifest index 731df0b7845e..2c034cf30ddb 100644 --- a/dev-libs/kdiagram/Manifest +++ b/dev-libs/kdiagram/Manifest @@ -1 +1,2 @@ DIST kdiagram-2.7.0.tar.xz 681384 BLAKE2B 0736525293200873cd10f8752b76b8589324e5e1fa9a89c6e3a1c30fc8d82fdf627cb5043eac5633858574a027c9f3ec98549c69718636c8a65cd4199acd7c9e SHA512 d5004b409bbb79ca858755a02a3673a16a54ffa7c1ed530b9526b8d928bdf0a2ba9730f47fb67203a09ef49d48c0af9b3d933f8f934ca19290376bdb3eefde1d +DIST kdiagram-2.8.0.tar.xz 691044 BLAKE2B c7b3a4ba992192b34d8cda90bb50a495cb88f8456ca1109140841fd885b710ce1193868be148c25f813c2d26dd7365999bdd8572e66163f0d5d1a169afc3e448 SHA512 d981bce4feeb65038772125e5af1c096537ec87991fdb93d9a91dd5c9f089b1001647c8a63b209683a67b2d7b3aadeb7dd6279261eefaf6b6e046d0ab72723ec diff --git a/dev-libs/kdiagram/kdiagram-2.8.0.ebuild b/dev-libs/kdiagram/kdiagram-2.8.0.ebuild new file mode 100644 index 000000000000..f0bc2ecf78f3 --- /dev/null +++ b/dev-libs/kdiagram/kdiagram-2.8.0.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +ECM_EXAMPLES="true" +ECM_QTHELP="true" +ECM_TEST="true" +KDE_ORG_CATEGORY="graphics" +QTMIN=5.15.1 +VIRTUALX_REQUIRED="test" +inherit ecm kde.org + +DESCRIPTION="Powerful libraries (KChart, KGantt) for creating business diagrams" +HOMEPAGE="https://api.kde.org/kdiagram/index.html +https://www.kdab.com/development-resources/qt-tools/kd-chart/" + +if [[ ${KDE_BUILD_TYPE} = release ]]; then + SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz" + KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" +fi + +LICENSE="GPL-2" # TODO CHECK +SLOT="5" + +REQUIRED_USE="test? ( examples )" + +BDEPEND=" + >=dev-qt/linguist-tools-${QTMIN}:5 +" +DEPEND=" + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtprintsupport-${QTMIN}:5 + >=dev-qt/qtsvg-${QTMIN}:5 + >=dev-qt/qtwidgets-${QTMIN}:5 +" +RDEPEND="${DEPEND}" diff --git a/dev-libs/keybinder/keybinder-0.3.1-r201.ebuild b/dev-libs/keybinder/keybinder-0.3.1-r201.ebuild index 02e68ac665c5..94ce6fd1890b 100644 --- a/dev-libs/keybinder/keybinder-0.3.1-r201.ebuild +++ b/dev-libs/keybinder/keybinder-0.3.1-r201.ebuild @@ -10,14 +10,13 @@ SRC_URI="https://github.com/kupferlauncher/keybinder/releases/download/v${PV}/${ LICENSE="GPL-2" SLOT="0" KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 x86" -IUSE="+introspection lua" +IUSE="+introspection" RDEPEND=">=x11-libs/gtk+-2.20:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXrender - introspection? ( dev-libs/gobject-introspection ) - lua? ( >=dev-lang/lua-5.1 )" + introspection? ( dev-libs/gobject-introspection )" DEPEND="${RDEPEND} virtual/pkgconfig" @@ -25,9 +24,8 @@ src_configure() { local myconf=( $(use_enable introspection) --disable-python + --disable-lua ) - # upstream failed at AC_ARG_ENABLE - use lua || myconf+=( --disable-lua ) econf "${myconf[@]}" } diff --git a/dev-libs/keybinder/keybinder-0.3.2-r300.ebuild b/dev-libs/keybinder/keybinder-0.3.2-r300.ebuild index bf14d929fcf1..dae197934270 100644 --- a/dev-libs/keybinder/keybinder-0.3.2-r300.ebuild +++ b/dev-libs/keybinder/keybinder-0.3.2-r300.ebuild @@ -1,12 +1,13 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 MY_P=${PN}-3.0-${PV} DESCRIPTION="A library for registering global keyboard shortcuts" HOMEPAGE="https://github.com/kupferlauncher/keybinder" SRC_URI="https://github.com/kupferlauncher/keybinder/releases/download/${PN}-3.0-v${PV}/${MY_P}.tar.gz" +S=${WORKDIR}/${MY_P} LICENSE="MIT" SLOT="3" @@ -16,12 +17,10 @@ IUSE="+introspection" RDEPEND="x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/libXext - x11-libs/libXrender + x11-libs/libXrender" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig introspection? ( dev-libs/gobject-introspection )" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -S=${WORKDIR}/${MY_P} src_configure() { local myconf=( @@ -39,7 +38,7 @@ src_install() { pkg_preinst() { # remove old symlink as otherwise the files will be installed # in the wrong directory - if [[ -h ${EROOT%/}/usr/share/gtk-doc/html/keybinder-3.0 ]]; then - rm "${EROOT%/}/usr/share/gtk-doc/html/keybinder-3.0" || die + if [[ -h ${EROOT}/usr/share/gtk-doc/html/keybinder-3.0 ]]; then + rm "${EROOT}/usr/share/gtk-doc/html/keybinder-3.0" || die fi } diff --git a/dev-libs/keystone/keystone-0.9.1.ebuild b/dev-libs/keystone/keystone-0.9.1.ebuild deleted file mode 100644 index 83a9e2835795..000000000000 --- a/dev-libs/keystone/keystone-0.9.1.ebuild +++ /dev/null @@ -1,84 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DISTUTILS_OPTIONAL=1 -CMAKE_MIN_VERSION=3.8.7 -PYTHON_COMPAT=( python3_{6,7,8,9,10} ) - -inherit cmake-utils distutils-r1 llvm - -DESCRIPTION="assembly/assembler framework + bindings" -HOMEPAGE="https://www.keystone-engine.org/" - -if [[ ${PV} == 9999* ]]; then - EGIT_REPO_URI="https://github.com/keystone-engine/keystone.git" - inherit git-r3 - KEYWORDS="" -else - SRC_URI="https://github.com/keystone-engine/keystone/archive/${PV/_rc/-rc}.tar.gz -> ${P/-rc/_rc}.tar.gz" - KEYWORDS="~amd64 ~arm ~x86" -fi - -LICENSE="GPL-2" -SLOT="0" - -# Keep in sync with llvm/CMakeLists.txt, subset of sys-devel/llvm -ALL_LLVM_TARGETS=( AArch64 ARM Hexagon Mips PowerPC Sparc SystemZ X86 ) -ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" ) -LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?} - -IUSE="python ${ALL_LLVM_TARGETS[*]}" -RDEPEND="${PYTHON_DEPS} -" -DEPEND="${RDEPEND}" -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} - || ( ${ALL_LLVM_TARGETS[*]} ) -" - -S=${WORKDIR}/${P/_rc/-rc} - -CMAKE_BUILD_TYPE=RelWithDebInfo - -llvm_check_deps() { - has_version "sys-devel/llvm:${LLVM_SLOT}[${LLVM_TARGET_USEDEPS// /,}]" -} - -wrap_python() { - if use python; then - pushd bindings/python >/dev/null || die - distutils-r1_${EBUILD_PHASE_FUNC} "$@" - popd >/dev/null || die - fi -} - -src_prepare() { - default - cmake-utils_src_prepare - wrap_python -} - -src_configure() { - local mycmakeargs=( - -DLLVM_LIBDIR_SUFFIX=${libdir#lib} - - -DBUILD_SHARED_LIBS=ON - -DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}" - -DLLVM_HOST_TRIPLE="${CHOST}" - ) - - cmake-utils_src_configure - wrap_python -} - -src_compile() { - cmake-utils_src_compile - wrap_python -} - -src_install() { - cmake-utils_src_install - wrap_python -} diff --git a/dev-libs/kpathsea/kpathsea-6.3.2_p20200406.ebuild b/dev-libs/kpathsea/kpathsea-6.3.2_p20200406.ebuild index 518dd9fe4110..11c2848eb0ec 100644 --- a/dev-libs/kpathsea/kpathsea-6.3.2_p20200406.ebuild +++ b/dev-libs/kpathsea/kpathsea-6.3.2_p20200406.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -14,7 +14,7 @@ SRC_URI="https://dev.gentoo.org/~zlogene/distfiles/texlive/texlive-${PV#*_p}-sou LICENSE="GPL-2" SLOT="0/${PV%_p*}" -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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="doc source static-libs" S=${WORKDIR}/texlive-${PV#*_p}-source/texk/${PN} diff --git a/dev-libs/kreport/kreport-3.2.0-r1.ebuild b/dev-libs/kreport/kreport-3.2.0-r1.ebuild index 364d8b962215..d2cb8613a004 100644 --- a/dev-libs/kreport/kreport-3.2.0-r1.ebuild +++ b/dev-libs/kreport/kreport-3.2.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -16,7 +16,7 @@ HOMEPAGE="https://community.kde.org/KReport" if [[ ${KDE_BUILD_TYPE} = release ]]; then SRC_URI="mirror://kde/stable/${PN}/src/${P}.tar.xz" - KEYWORDS="~amd64 ~x86" + KEYWORDS="amd64 x86" fi LICENSE="LGPL-2+" diff --git a/dev-libs/kreport/kreport-3.2.0.ebuild b/dev-libs/kreport/kreport-3.2.0.ebuild deleted file mode 100644 index a0b91d1cd854..000000000000 --- a/dev-libs/kreport/kreport-3.2.0.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ECM_QTHELP="true" -ECM_TEST="true" -PYTHON_COMPAT=( python3_{6,7,8,9,10} ) -KFMIN=5.60.0 -QTMIN=5.12.3 -VIRTUALX_REQUIRED="test" -inherit ecm kde.org python-any-r1 - -DESCRIPTION="Framework for creation and generation of reports in multiple formats" -HOMEPAGE="https://community.kde.org/KReport" - -if [[ ${KDE_BUILD_TYPE} = release ]]; then - SRC_URI="mirror://kde/stable/${PN}/src/${P}.tar.xz" - KEYWORDS="amd64 x86" -fi - -LICENSE="LGPL-2+" -SLOT="5/4" -IUSE="marble +scripting webkit" - -RDEPEND=" - >=dev-libs/kproperty-3.1.0:5= - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtprintsupport-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=dev-qt/qtxml-${QTMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kguiaddons-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - marble? ( >=kde-apps/marble-19.04.3:5= ) - scripting? ( >=dev-qt/qtdeclarative-${QTMIN}:5 ) - webkit? ( >=dev-qt/qtwebkit-5.212.0_pre20180120:5 ) -" -DEPEND="${RDEPEND} - ${PYTHON_DEPS} -" - -pkg_setup() { - python-any-r1_pkg_setup - ecm_pkg_setup -} - -src_configure() { - local mycmakeargs=( - $(cmake_use_find_package marble Marble) - $(cmake_use_find_package webkit Qt5WebKitWidgets) - -DKREPORT_SCRIPTING=$(usex scripting) - ) - ecm_src_configure -} diff --git a/dev-libs/leatherman/Manifest b/dev-libs/leatherman/Manifest index 019859acdee5..0e2857d871b5 100644 --- a/dev-libs/leatherman/Manifest +++ b/dev-libs/leatherman/Manifest @@ -1,2 +1,2 @@ DIST leatherman-1.12.2.tar.gz 816010 BLAKE2B 4b7b00b88ef0ba5cb01405aa24fd5ff72918a122cc8a1c0a029e374152964f77afa29a1f503ed5863a39bd13aa808dba2a0b351f65756e97c8e2e8408358cbfc SHA512 9be8333b616bd9772f234474ae874c7214fa0c1bc4658ff042233d6e1683cc61b63d666d750297c79a8058490e42c8b2ff8999cb7f04aa329644f52540e43bde -DIST leatherman-1.12.3.tar.gz 816018 BLAKE2B 6245284856613b99df2ce412e497ba69fe1a016a82ca5ea7f78ba591dc287e2daef051214b303c1cc463efb537354a01ad6c57688f244382b3843b8bfdad6f3e SHA512 83f785ba7c69032e2c9c7f2fb07aa5c100ed9e1a81c88ece19d7a96647b9a46927b99fd7144c08d697863e44553f00adf6bc4964f45e900809827956c0949b36 +DIST leatherman-1.12.4.tar.gz 818043 BLAKE2B 7a8718d598bf48b70d555d2a21e2e930eba6b3407ad5414b43d30411acf4c9bf4193ad20058b63d3c8911b7c5b0d021f84d6eca6dd3d00165c7d145186f8177f SHA512 b2645a5049856f93c30bb89e87e3a47cf8137aeac73708248b2b228874818063fb31440ca2bd760783e8c95e880fe7ae34a387fcc448efee01dd0cda48089b55 diff --git a/dev-libs/leatherman/leatherman-1.12.3.ebuild b/dev-libs/leatherman/leatherman-1.12.4.ebuild index c7ed781d77ee..75654f08f0ec 100644 --- a/dev-libs/leatherman/leatherman-1.12.3.ebuild +++ b/dev-libs/leatherman/leatherman-1.12.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 diff --git a/dev-libs/libIDL/libIDL-0.8.14-r2.ebuild b/dev-libs/libIDL/libIDL-0.8.14-r2.ebuild index 84a4d8eaa1fc..b8846164f94a 100644 --- a/dev-libs/libIDL/libIDL-0.8.14-r2.ebuild +++ b/dev-libs/libIDL/libIDL-0.8.14-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -11,7 +11,7 @@ HOMEPAGE="https://www.gnome.org/" LICENSE="LGPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" IUSE="" RDEPEND=">=dev-libs/glib-2.44.1-r1:2[${MULTILIB_USEDEP}]" diff --git a/dev-libs/libassuan/libassuan-2.5.3.ebuild b/dev-libs/libassuan/libassuan-2.5.3.ebuild index 636a19bd14fe..35ede059a696 100644 --- a/dev-libs/libassuan/libassuan-2.5.3.ebuild +++ b/dev-libs/libassuan/libassuan-2.5.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2" LICENSE="GPL-3 LGPL-2.1" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" RDEPEND=">=dev-libs/libgpg-error-1.8" DEPEND="${RDEPEND}" diff --git a/dev-libs/libassuan/libassuan-2.5.4.ebuild b/dev-libs/libassuan/libassuan-2.5.4.ebuild index 888e3d99a4e2..f47712edfd6f 100644 --- a/dev-libs/libassuan/libassuan-2.5.4.ebuild +++ b/dev-libs/libassuan/libassuan-2.5.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2" LICENSE="GPL-3 LGPL-2.1" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" RDEPEND=">=dev-libs/libgpg-error-1.17" DEPEND="${RDEPEND}" diff --git a/dev-libs/libatasmart/libatasmart-0.19_p5.ebuild b/dev-libs/libatasmart/libatasmart-0.19_p5.ebuild index 7da99e26ec24..ca77a0f760aa 100644 --- a/dev-libs/libatasmart/libatasmart-0.19_p5.ebuild +++ b/dev-libs/libatasmart/libatasmart-0.19_p5.ebuild @@ -3,6 +3,8 @@ EAPI=7 +inherit toolchain-funcs + DESCRIPTION="A small and lightweight parser library for ATA S.M.A.R.T. hard disks" HOMEPAGE="https://salsa.debian.org/utopia-team/libatasmart" SRC_URI="mirror://debian/pool/main/liba/${PN}/${PN}_${PV/_p*}.orig.tar.xz @@ -10,14 +12,12 @@ SRC_URI="mirror://debian/pool/main/liba/${PN}/${PN}_${PV/_p*}.orig.tar.xz LICENSE="LGPL-2.1" SLOT="0/4" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86" IUSE="static-libs" RDEPEND="virtual/libudev:=" DEPEND="${RDEPEND}" -BDEPEND=" - virtual/pkgconfig -" +BDEPEND="virtual/pkgconfig" S="${WORKDIR}/${P/_p*}" @@ -34,6 +34,17 @@ src_configure() { econf $(use_enable static-libs static) } +src_compile() { + if tc-is-cross-compiler; then + tc-export_build_env + emake -C strpool strpool \ + CFLAGS="${BUILD_CFLAGS}" \ + CPPFLAGS="${BUILD_CPPFLAGS}" \ + LDFLAGS="${BUILD_LDFLAGS}" + fi + emake +} + src_install() { default find "${ED}" -type f -name "*.la" -delete || die diff --git a/dev-libs/libatomic_ops/libatomic_ops-7.6.10.ebuild b/dev-libs/libatomic_ops/libatomic_ops-7.6.10.ebuild index 738cbb142d5d..e8b75ba46a6b 100644 --- a/dev-libs/libatomic_ops/libatomic_ops-7.6.10.ebuild +++ b/dev-libs/libatomic_ops/libatomic_ops-7.6.10.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="https://github.com/ivmai/${PN}/releases/download/v${PV}/${P}.tar.gz" LICENSE="MIT boehm-gc GPL-2+" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv 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 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" multilib_src_configure() { ECONF_SOURCE="${S}" econf \ diff --git a/dev-libs/libbase58/libbase58-0.1.4-r1.ebuild b/dev-libs/libbase58/libbase58-0.1.4-r1.ebuild index 375b6956313a..e849059b854e 100644 --- a/dev-libs/libbase58/libbase58-0.1.4-r1.ebuild +++ b/dev-libs/libbase58/libbase58-0.1.4-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -25,7 +25,7 @@ src_prepare() { eapply_user eautoreconf - # NOTE: Needed because test suite uses srcdir instead of builddir to set PATH and for + # NOTE: Needed because test suite uses srcdir instead of builddir to set PATH and for # multilib support. multilib_copy_sources } diff --git a/dev-libs/libbpf/Manifest b/dev-libs/libbpf/Manifest index fbde9fd13778..af3a412b5cd9 100644 --- a/dev-libs/libbpf/Manifest +++ b/dev-libs/libbpf/Manifest @@ -5,3 +5,4 @@ DIST libbpf-0.0.9.tar.gz 273726 BLAKE2B 1277ce5b9dab9037e287910c43a71ee33cd6607d DIST libbpf-0.1.0.tar.gz 666896 BLAKE2B 5923b4c8fb915722f8cc2015ab8f07773a83c4252a59aef784983e46db7cd784e8ff5cc2284d3f5ded6bb92957f8d73b367a35fa1b5693e0cacaaef414a2f410 SHA512 3a5d823e4751408fd9e3bafe0be0a6a78de7dea0114bbd1166d8b3887938eef4e355ba6221b4bded9fc8a8280edede606c8c8078fd40aebdeaebbbb38f4221fe DIST libbpf-0.1.1.tar.gz 666908 BLAKE2B 0efb044b1dc02230d14a6e92c40d66f7cb28c7efbecc3d97d084a52dde581dbd02b02fb7fbbe8b4ca051f2f64497c6240c5dd9c992e6fe4629a1332311b7833c SHA512 b9f68323a8f53b0fb0bf418b8a37685e7d74b6f5ad7aa2f266f65cd57199b3b9b5865bc4579758e5adcfbb027ced83e12ee87f3ff3bf159c7b54cbdcd50fd62f DIST libbpf-0.2.tar.gz 699136 BLAKE2B d3c7005e5c27f805a33b444267ee28c3fb143c809a8a3ac733d51c56e7ee310e089964844cd4f1f7519b20dea1f4e4d6b0e6acd7bbdd173c99af54fad3635771 SHA512 22fed87cd4da1765465d812979b39ee3126b444fd6b460472a0a7e2f4fb496d278c9d7d672c3fb15005a58d361fd87c5173c18dcf55664dfbb8e6cadb2eed33a +DIST libbpf-0.3.tar.gz 979131 BLAKE2B 523040600cb08ed1ad301899f85fd7af8bc498ff8d1fd41783aeab223feb795d074072aba048d7e38af045bb3fbfe478bb2cb0ac34f4c22e4dea4ac5f0d34a4c SHA512 91c3368626e731b5868fd1bb6d16bd049b2ed0d5cbf966647fa1069cf8c912d91f3d734f05353a0c16c8ff03790ca8e1e6515fff66e4a76d70ffdf2dbac6d8e3 diff --git a/dev-libs/libbpf/files/libbpf-0.3.0-paths.patch b/dev-libs/libbpf/files/libbpf-0.3.0-paths.patch new file mode 100644 index 000000000000..ff087bb38712 --- /dev/null +++ b/dev-libs/libbpf/files/libbpf-0.3.0-paths.patch @@ -0,0 +1,34 @@ +--- a/Makefile ++++ b/Makefile +@@ -76,7 +76,7 @@ endif + PREFIX ?= /usr + LIBDIR ?= $(PREFIX)/$(LIBSUBDIR) + INCLUDEDIR ?= $(PREFIX)/include +-UAPIDIR ?= $(PREFIX)/include ++UAPIDIR ?= $(PREFIX)/include/bpf/uapi + + TAGS_PROG := $(if $(shell which etags 2>/dev/null),etags,ctags) + +@@ -101,6 +101,7 @@ $(OBJDIR)/libbpf.so.$(LIBBPF_VERSION): $(SHARED_OBJS) + $(OBJDIR)/libbpf.pc: + $(Q)sed -e "s|@PREFIX@|$(PREFIX)|" \ + -e "s|@LIBDIR@|$(LIBDIR_PC)|" \ ++ -e "s|@UAPIDIR@|$(UAPIDIR)|" \ + -e "s|@VERSION@|$(LIBBPF_VERSION)|" \ + < libbpf.pc.template > $@ + +--- a/libbpf.pc.template ++++ b/libbpf.pc.template +@@ -3,10 +3,11 @@ + prefix=@PREFIX@ + libdir=@LIBDIR@ + includedir=${prefix}/include ++uapidir=@UAPIDIR@ + + Name: libbpf + Description: BPF library + Version: @VERSION@ + Libs: -L${libdir} -lbpf + Requires.private: libelf zlib +-Cflags: -I${includedir} ++Cflags: -I${includedir} -I${uapidir} diff --git a/dev-libs/libbpf/files/libbpf-9999-paths.patch b/dev-libs/libbpf/files/libbpf-9999-paths.patch index cbc267b64a38..ff087bb38712 100644 --- a/dev-libs/libbpf/files/libbpf-9999-paths.patch +++ b/dev-libs/libbpf/files/libbpf-9999-paths.patch @@ -1,8 +1,6 @@ -diff --git a/Makefile b/Makefile -index bc25aba..e1db3d6 100644 --- a/Makefile +++ b/Makefile -@@ -66,7 +66,7 @@ endif +@@ -76,7 +76,7 @@ endif PREFIX ?= /usr LIBDIR ?= $(PREFIX)/$(LIBSUBDIR) INCLUDEDIR ?= $(PREFIX)/include @@ -11,16 +9,14 @@ index bc25aba..e1db3d6 100644 TAGS_PROG := $(if $(shell which etags 2>/dev/null),etags,ctags) -@@ -89,6 +89,7 @@ $(OBJDIR)/libbpf.so.$(LIBBPF_VERSION): $(SHARED_OBJS) +@@ -101,6 +101,7 @@ $(OBJDIR)/libbpf.so.$(LIBBPF_VERSION): $(SHARED_OBJS) $(OBJDIR)/libbpf.pc: - sed -e "s|@PREFIX@|$(PREFIX)|" \ - -e "s|@LIBDIR@|$(LIBDIR)|" \ + $(Q)sed -e "s|@PREFIX@|$(PREFIX)|" \ + -e "s|@LIBDIR@|$(LIBDIR_PC)|" \ + -e "s|@UAPIDIR@|$(UAPIDIR)|" \ -e "s|@VERSION@|$(LIBBPF_VERSION)|" \ < libbpf.pc.template > $@ -diff --git a/libbpf.pc.template b/libbpf.pc.template -index b45ed53..5ec63c2 100644 --- a/libbpf.pc.template +++ b/libbpf.pc.template @@ -3,10 +3,11 @@ diff --git a/dev-libs/libbpf/libbpf-0.3.ebuild b/dev-libs/libbpf/libbpf-0.3.ebuild new file mode 100644 index 000000000000..b74596abd7bf --- /dev/null +++ b/dev-libs/libbpf/libbpf-0.3.ebuild @@ -0,0 +1,55 @@ +# Copyright 2019-2021 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.3.0-paths.patch" +) + +src_compile() { + append-cflags -fPIC + emake \ + BUILD_SHARED=y \ + LIBSUBDIR="$(get_libdir)" \ + $(usex static-libs 'BUILD_STATIC=y' '' '' '') \ + CC="$(tc-getCC)" \ + AR="$(tc-getAR)" \ + V=1 +} + +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 6697b1c3a061..a122d56cb683 100644 --- a/dev-libs/libbpf/libbpf-9999.ebuild +++ b/dev-libs/libbpf/libbpf-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 2019-2020 Gentoo Authors +# Copyright 2019-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -37,7 +37,9 @@ src_compile() { BUILD_SHARED=y \ LIBSUBDIR="$(get_libdir)" \ $(usex static-libs 'BUILD_STATIC=y' '' '' '') \ - CC="$(tc-getCC)" + CC="$(tc-getCC)" \ + AR="$(tc-getAR)" \ + V=1 } src_install() { diff --git a/dev-libs/libbson/libbson-1.8.2.ebuild b/dev-libs/libbson/libbson-1.8.2.ebuild index d730cc35cea7..cc0a1d7a476a 100644 --- a/dev-libs/libbson/libbson-1.8.2.ebuild +++ b/dev-libs/libbson/libbson-1.8.2.ebuild @@ -9,7 +9,7 @@ SRC_URI="https://github.com/mongodb/${PN}/releases/download/${PV}/${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 hppa ~ppc ~sparc x86" +KEYWORDS="amd64 ~hppa ~ppc ~sparc x86" IUSE="debug examples static-libs" src_configure() { diff --git a/dev-libs/libburn/libburn-1.5.2_p1.ebuild b/dev-libs/libburn/libburn-1.5.2_p1.ebuild index d400be57d1ac..45baef1c2335 100644 --- a/dev-libs/libburn/libburn-1.5.2_p1.ebuild +++ b/dev-libs/libburn/libburn-1.5.2_p1.ebuild @@ -11,7 +11,7 @@ SRC_URI="http://files.libburnia-project.org/releases/${MY_P}.tar.gz" LICENSE="GPL-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="debug static-libs" BDEPEND=" diff --git a/dev-libs/libcbor/Manifest b/dev-libs/libcbor/Manifest index fa2e5872c046..74840a9ab218 100644 --- a/dev-libs/libcbor/Manifest +++ b/dev-libs/libcbor/Manifest @@ -1,5 +1 @@ -DIST libcbor-0.5.0.tar.gz 719348 BLAKE2B 57e15e648159e7858d9d57a8b4cb7f3682f8153248610c9a3385cf9cbdea8babaf81d596b25d44bf6d59c75de23e76cce462fa7860b294019f46636726206d5a SHA512 5c2e9610d9fbb0bfc59f89a180f70b58539a1760fd39cad696af372c164a87828a23bb4d3a54d8e9d846be5271204800f0ad63656ef830f06a0ccdd10edfdb2c -DIST libcbor-0.6.0.tar.gz 262622 BLAKE2B 2d3bc10bdb69c9205430718a8f2652672a8fa580ba7951c4012bdc8b502a9d6dcb26f398740f5fd35dfe0634f8e3d8ddf7eff5b9ec35c95cdc5383e2dce9f0ab SHA512 6adbb32780d428140388295c5d740bd77b0ae7b21e3f73629ba56a3aa4e4ee5dbb715454061b0f6f67f2b19ea8366e0e5c24f4ffb1ba629afcb7a776a15045f7 -DIST libcbor-0.6.1.tar.gz 263486 BLAKE2B 9a2415c1dde7ed611075c3b03ea1d8ab63bcb00dfc0cae3d7a3bb225b6fbee2a8f576b1f0f97eb6f0cf14c1a6e9df1c77f69320bac041287b0dec37c073f8b85 SHA512 dc9bb7d18b934fe33faabe30010425cb272d7e135f3bf233554bc934b1701f85c7b662e0d5a6a1921c21cd46acb4393600e9adc05b09d1b2a8e3c92ca9d7e4e8 -DIST libcbor-0.7.0.tar.gz 266323 BLAKE2B 76f93d3199e703c4167aeed262da7ba78d1df82e081754609391572b89f216efba0c54511d4021049fc6c62ab01b08835f02a58bbf226d973174b37eff087761 SHA512 4e2ed55ef17b8b77f82d780b1ee998d0342b67e6beabc24795117e5e222549640fe7fd261c8e78524d6489d03f7f5aa46b987709790a81f93e4d7409c32fecda DIST libcbor-0.8.0.tar.gz 267044 BLAKE2B e8548e7351984ebdcbeb5f13a7ca35412c3f3f05e2a44a5438d57b90bdcdc51f5265953163106f90ade911a96af665956ebeba7ed1c48cf207acf6d683af5606 SHA512 694d2d3a78d80072f96e0afb73590ca1f3572e41d2117330ef4313ed06271743b048d3ba3259c6ffe9a802d5e441379d0e54787d1d42fed08dc81ac4f06c6dbc diff --git a/dev-libs/libcbor/libcbor-0.5.0.ebuild b/dev-libs/libcbor/libcbor-0.5.0.ebuild deleted file mode 100644 index 7a1c35bcd5b0..000000000000 --- a/dev-libs/libcbor/libcbor-0.5.0.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7,8,9,10} ) -inherit python-any-r1 cmake-utils - -DESCRIPTION="CBOR protocol implementation for C and others" -HOMEPAGE="https://github.com/pjk/libcbor" -SRC_URI="https://github.com/PJK/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0/0" -KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86" -IUSE="+custom-alloc doc test" - -BDEPEND=" - doc? ( - $(python_gen_any_dep ' - dev-python/sphinx[${PYTHON_USEDEP}] - dev-python/breathe[${PYTHON_USEDEP}] - ') - ) - test? ( dev-util/cmocka ) -" - -RESTRICT="!test? ( test )" - -CMAKE_MAKEFILE_GENERATOR="emake" - -python_check_deps() { - has_version "dev-python/sphinx[${PYTHON_USEDEP}]" && \ - has_version "dev-python/breathe[${PYTHON_USEDEP}]" -} - -pkg_setup() { - use doc && python-any-r1_pkg_setup -} - -src_configure() { - local -a mycmakeargs=( - -DCMAKE_BUILD_TYPE=Release - -DCBOR_CUSTOM_ALLOC=$(usex custom-alloc 'ON' 'OFF') - -DWITH_TESTS=$(usex test 'ON' 'OFF') - ) - - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile - - if use doc; then - pushd doc >/dev/null || die - emake html man - popd >/dev/null || die - fi -} - -src_install() { - cmake-utils_src_install - - if use doc; then - dodoc -r doc/build/html - doman doc/build/man/* - fi -} diff --git a/dev-libs/libcbor/libcbor-0.6.0-r1.ebuild b/dev-libs/libcbor/libcbor-0.6.0-r1.ebuild deleted file mode 100644 index b66ff764d919..000000000000 --- a/dev-libs/libcbor/libcbor-0.6.0-r1.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7,8,9,10} ) -inherit python-any-r1 cmake-utils - -DESCRIPTION="CBOR protocol implementation for C and others" -HOMEPAGE="https://github.com/pjk/libcbor" -SRC_URI="https://github.com/PJK/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0/1" -KEYWORDS="~amd64 ~arm ~ppc64 ~x86" -IUSE="+custom-alloc doc test" - -BDEPEND=" - doc? ( - $(python_gen_any_dep ' - dev-python/sphinx[${PYTHON_USEDEP}] - dev-python/breathe[${PYTHON_USEDEP}] - ') - ) - test? ( dev-util/cmocka ) -" - -RESTRICT="!test? ( test )" - -CMAKE_MAKEFILE_GENERATOR="emake" - -python_check_deps() { - has_version "dev-python/sphinx[${PYTHON_USEDEP}]" && \ - has_version "dev-python/breathe[${PYTHON_USEDEP}]" -} - -pkg_setup() { - use doc && python-any-r1_pkg_setup -} - -src_configure() { - local -a mycmakeargs=( - -DCMAKE_BUILD_TYPE=Release - -DCBOR_CUSTOM_ALLOC=$(usex custom-alloc 'ON' 'OFF') - -DWITH_TESTS=$(usex test 'ON' 'OFF') - ) - - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile - - if use doc; then - pushd doc >/dev/null || die - emake html man - popd >/dev/null || die - fi -} - -src_install() { - cmake-utils_src_install - - if use doc; then - dodoc -r doc/build/html - doman doc/build/man/* - fi -} diff --git a/dev-libs/libcbor/libcbor-0.6.1.ebuild b/dev-libs/libcbor/libcbor-0.6.1.ebuild deleted file mode 100644 index b66ff764d919..000000000000 --- a/dev-libs/libcbor/libcbor-0.6.1.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7,8,9,10} ) -inherit python-any-r1 cmake-utils - -DESCRIPTION="CBOR protocol implementation for C and others" -HOMEPAGE="https://github.com/pjk/libcbor" -SRC_URI="https://github.com/PJK/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0/1" -KEYWORDS="~amd64 ~arm ~ppc64 ~x86" -IUSE="+custom-alloc doc test" - -BDEPEND=" - doc? ( - $(python_gen_any_dep ' - dev-python/sphinx[${PYTHON_USEDEP}] - dev-python/breathe[${PYTHON_USEDEP}] - ') - ) - test? ( dev-util/cmocka ) -" - -RESTRICT="!test? ( test )" - -CMAKE_MAKEFILE_GENERATOR="emake" - -python_check_deps() { - has_version "dev-python/sphinx[${PYTHON_USEDEP}]" && \ - has_version "dev-python/breathe[${PYTHON_USEDEP}]" -} - -pkg_setup() { - use doc && python-any-r1_pkg_setup -} - -src_configure() { - local -a mycmakeargs=( - -DCMAKE_BUILD_TYPE=Release - -DCBOR_CUSTOM_ALLOC=$(usex custom-alloc 'ON' 'OFF') - -DWITH_TESTS=$(usex test 'ON' 'OFF') - ) - - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile - - if use doc; then - pushd doc >/dev/null || die - emake html man - popd >/dev/null || die - fi -} - -src_install() { - cmake-utils_src_install - - if use doc; then - dodoc -r doc/build/html - doman doc/build/man/* - fi -} diff --git a/dev-libs/libcbor/libcbor-0.7.0.ebuild b/dev-libs/libcbor/libcbor-0.7.0.ebuild deleted file mode 100644 index 4dcf14efd9d8..000000000000 --- a/dev-libs/libcbor/libcbor-0.7.0.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7,8,9,10} ) -inherit python-any-r1 cmake-utils - -DESCRIPTION="CBOR protocol implementation for C and others" -HOMEPAGE="https://github.com/pjk/libcbor" -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 ~s390 ~sparc ~x86" -IUSE="+custom-alloc doc test" - -BDEPEND=" - doc? ( - $(python_gen_any_dep ' - dev-python/sphinx[${PYTHON_USEDEP}] - dev-python/breathe[${PYTHON_USEDEP}] - ') - ) - test? ( dev-util/cmocka ) -" - -RESTRICT="!test? ( test )" - -CMAKE_MAKEFILE_GENERATOR="emake" - -python_check_deps() { - has_version "dev-python/sphinx[${PYTHON_USEDEP}]" && \ - has_version "dev-python/breathe[${PYTHON_USEDEP}]" -} - -pkg_setup() { - use doc && python-any-r1_pkg_setup -} - -src_configure() { - local -a mycmakeargs=( - -DCMAKE_BUILD_TYPE=Release - -DCBOR_CUSTOM_ALLOC=$(usex custom-alloc 'ON' 'OFF') - -DWITH_TESTS=$(usex test 'ON' 'OFF') - ) - - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile - - if use doc; then - pushd doc >/dev/null || die - emake html man - popd >/dev/null || die - fi -} - -src_install() { - cmake-utils_src_install - - if use doc; then - dodoc -r doc/build/html - doman doc/build/man/* - fi -} diff --git a/dev-libs/libcbor/libcbor-0.8.0.ebuild b/dev-libs/libcbor/libcbor-0.8.0.ebuild index 94e9167cbf63..88295ec5a9f0 100644 --- a/dev-libs/libcbor/libcbor-0.8.0.ebuild +++ b/dev-libs/libcbor/libcbor-0.8.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 2020 Gentoo Authors +# Copyright 2020-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -12,7 +12,7 @@ SRC_URI="https://github.com/PJK/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="MIT" SLOT="0/$(ver_cut 1-2)" -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="+custom-alloc doc test" BDEPEND=" diff --git a/dev-libs/libcdio-paranoia/libcdio-paranoia-0.93_p1-r1.ebuild b/dev-libs/libcdio-paranoia/libcdio-paranoia-0.93_p1-r1.ebuild index 02b3e419163e..f286655a9ba1 100644 --- a/dev-libs/libcdio-paranoia/libcdio-paranoia-0.93_p1-r1.ebuild +++ b/dev-libs/libcdio-paranoia/libcdio-paranoia-0.93_p1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -16,7 +16,7 @@ SRC_URI="mirror://gnu/${PN%-*}/${MY_P}.tar.gz" # clause "or later" so we use LGPL-2.1 without + LICENSE="GPL-3+ GPL-2+ LGPL-2.1" SLOT="0" -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" +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris" IUSE="+cxx static-libs test" RDEPEND="app-eselect/eselect-cdparanoia diff --git a/dev-libs/libcdio-paranoia/libcdio-paranoia-0.94_p2-r2.ebuild b/dev-libs/libcdio-paranoia/libcdio-paranoia-0.94_p2-r2.ebuild index 83e809552966..5e6a4e8da4ee 100644 --- a/dev-libs/libcdio-paranoia/libcdio-paranoia-0.94_p2-r2.ebuild +++ b/dev-libs/libcdio-paranoia/libcdio-paranoia-0.94_p2-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -16,7 +16,7 @@ SRC_URI="mirror://gnu/${PN%-*}/${MY_P}.tar.gz" # clause "or later" so we use LGPL-2.1 without + LICENSE="GPL-3+ GPL-2+ LGPL-2.1" SLOT="0" -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" +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris" IUSE="+cxx static-libs test" RDEPEND="app-eselect/eselect-cdparanoia diff --git a/dev-libs/libcdio-paranoia/libcdio-paranoia-2.0.0-r1.ebuild b/dev-libs/libcdio-paranoia/libcdio-paranoia-2.0.0-r1.ebuild index 3eb24cff049a..d21799a10eae 100644 --- a/dev-libs/libcdio-paranoia/libcdio-paranoia-2.0.0-r1.ebuild +++ b/dev-libs/libcdio-paranoia/libcdio-paranoia-2.0.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -16,7 +16,7 @@ SRC_URI="mirror://gnu/${PN%-*}/${MY_P}.tar.bz2" # clause "or later" so we use LGPL-2.1 without + LICENSE="GPL-3+ GPL-2+ LGPL-2.1" SLOT="0/2" # soname version -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" +KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris" IUSE="+cxx static-libs test" RDEPEND="app-eselect/eselect-cdparanoia 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 f7d282ae17b0..fe7665a16bff 100644 --- a/dev-libs/libcdio-paranoia/libcdio-paranoia-2.0.1.ebuild +++ b/dev-libs/libcdio-paranoia/libcdio-paranoia-2.0.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -16,7 +16,7 @@ SRC_URI="mirror://gnu/${PN%-*}/${MY_P}.tar.bz2" # clause "or later" so we use LGPL-2.1 without + LICENSE="GPL-3+ GPL-2+ LGPL-2.1" SLOT="0/2" # soname version -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" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris" IUSE="+cxx static-libs test" RDEPEND="app-eselect/eselect-cdparanoia diff --git a/dev-libs/libcdio/libcdio-2.0.0-r1.ebuild b/dev-libs/libcdio/libcdio-2.0.0-r1.ebuild index 32821868a21d..4144e54f2f0d 100644 --- a/dev-libs/libcdio/libcdio-2.0.0-r1.ebuild +++ b/dev-libs/libcdio/libcdio-2.0.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -11,7 +11,7 @@ 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" +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris" IUSE="cddb +cxx minimal static-libs test" RESTRICT="!test? ( test )" diff --git a/dev-libs/libcdio/libcdio-2.1.0-r1.ebuild b/dev-libs/libcdio/libcdio-2.1.0-r1.ebuild index ea3b0f90cc89..cb581d0a1f92 100644 --- a/dev-libs/libcdio/libcdio-2.1.0-r1.ebuild +++ b/dev-libs/libcdio/libcdio-2.1.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2" LICENSE="GPL-3" SLOT="0/19" # 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" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris" IUSE="cddb +cxx minimal static-libs test" RESTRICT="!test? ( test )" diff --git a/dev-libs/libcec/libcec-6.0.2.ebuild b/dev-libs/libcec/libcec-6.0.2.ebuild index 319529745556..5850d2a06abc 100644 --- a/dev-libs/libcec/libcec-6.0.2.ebuild +++ b/dev-libs/libcec/libcec-6.0.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -15,7 +15,7 @@ SRC_URI="https://github.com/Pulse-Eight/${PN}/archive/${MY_P}.tar.gz" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~x86" +KEYWORDS="amd64 ~arm ~arm64 x86" IUSE="cubox exynos python raspberry-pi kernel-cec tools +xrandr udev" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" diff --git a/dev-libs/libclangformat-ide/Manifest b/dev-libs/libclangformat-ide/Manifest deleted file mode 100644 index 75e6601c5836..000000000000 --- a/dev-libs/libclangformat-ide/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff219888706d2b79d5296590934714e42ac79f6a6547941ac2b1d2c4e6313dd18b6c7068e748aa6ac033e49fccbf5d355aa8191 SHA512 baa182d62fef1851836013ae8a1a00861ea89769778d67fb97b407a9de664e6c85da2af9c5b3f75d2bf34ff6b00004e531ca7e4b3115a26c0e61c575cf2303a0 -DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59 diff --git a/dev-libs/libclangformat-ide/files/clang-qtcreator-compat.patch b/dev-libs/libclangformat-ide/files/clang-qtcreator-compat.patch deleted file mode 100644 index 72b9453ce7a4..000000000000 --- a/dev-libs/libclangformat-ide/files/clang-qtcreator-compat.patch +++ /dev/null @@ -1,185 +0,0 @@ -From fa1b9053729ec6a4425a44ec5502dd388928274a Mon Sep 17 00:00:00 2001 -From: Ivan Donchevskii <ivan.donchevskii@qt.io> -Date: Fri, 12 Oct 2018 08:19:25 +0200 -Subject: [PATCH] [clang-format] Introduce the flag which allows not to shrink - lines - --------------------------------------------------------------------------- -* https://reviews.llvm.org/D53072 --------------------------------------------------------------------------- - -Currently there's no way to prevent to lines optimization even -if you have intentionally put <CR> to split the line. - -In general case it's fine. So I would prefer to have such option -which you can enable in special cases (for me it's an IDE related use case). - -Revert this change if upstream clang-format offers better solution. - -This is a cherry pick from commits b748c82e3664c2e2e3d29645ede472d87b8cde63 -and 1817513d4f3a2e4e26be124dbe395340f798fd51. - -Change-Id: I9d2935b937bb68ea8dc59fac8463718475e9c080 -Reviewed-by: Orgad Shaneh <orgads@gmail.com> ---- - include/clang/Format/Format.h | 13 +++++++++++++ - lib/Format/Format.cpp | 4 ++++ - lib/Format/UnwrappedLineFormatter.cpp | 9 +++++---- - lib/Format/UnwrappedLineParser.cpp | 2 ++ - unittests/Format/FormatTest.cpp | 16 ++++++++++++++++ - 5 files changed, 40 insertions(+), 4 deletions(-) - -diff --git a/include/clang/Format/Format.h b/include/clang/Format/Format.h -index cb37b0c890c..b9c4df3d1af 100644 ---- a/include/clang/Format/Format.h -+++ b/include/clang/Format/Format.h -@@ -22,6 +22,8 @@ - #include "llvm/Support/Regex.h" - #include <system_error> - -+#define KEEP_LINE_BREAKS_FOR_NON_EMPTY_LINES_BACKPORTED -+ - namespace llvm { - namespace vfs { - class FileSystem; -@@ -1200,6 +1202,16 @@ struct FormatStyle { - /// \endcode - bool JavaScriptWrapImports; - -+ /// If true, no line breaks are optimized out (works only with ColumnLimit = 0) -+ /// \code -+ /// true: false: -+ /// int foo(int a, vs. int foo(int a, int b) { -+ /// int b) { -+ /// bar(); bar(); -+ /// } } -+ /// \endcode -+ bool KeepLineBreaksForNonEmptyLines; -+ - /// If true, the empty line at the start of blocks is kept. - /// \code - /// true: false: -@@ -1767,6 +1779,7 @@ struct FormatStyle { - JavaImportGroups == R.JavaImportGroups && - JavaScriptQuotes == R.JavaScriptQuotes && - JavaScriptWrapImports == R.JavaScriptWrapImports && -+ KeepLineBreaksForNonEmptyLines == R.KeepLineBreaksForNonEmptyLines && - KeepEmptyLinesAtTheStartOfBlocks == - R.KeepEmptyLinesAtTheStartOfBlocks && - MacroBlockBegin == R.MacroBlockBegin && -diff --git a/lib/Format/Format.cpp b/lib/Format/Format.cpp -index 2c4f8760540..61ea88626ee 100644 ---- a/lib/Format/Format.cpp -+++ b/lib/Format/Format.cpp -@@ -417,6 +417,8 @@ template <> struct MappingTraits<FormatStyle> { - IO.mapOptional("JavaImportGroups", Style.JavaImportGroups); - IO.mapOptional("JavaScriptQuotes", Style.JavaScriptQuotes); - IO.mapOptional("JavaScriptWrapImports", Style.JavaScriptWrapImports); -+ IO.mapOptional("KeepLineBreaksForNonEmptyLines", -+ Style.KeepLineBreaksForNonEmptyLines); - IO.mapOptional("KeepEmptyLinesAtTheStartOfBlocks", - Style.KeepEmptyLinesAtTheStartOfBlocks); - IO.mapOptional("MacroBlockBegin", Style.MacroBlockBegin); -@@ -678,6 +680,7 @@ FormatStyle getLLVMStyle() { - LLVMStyle.JavaScriptWrapImports = true; - LLVMStyle.TabWidth = 8; - LLVMStyle.MaxEmptyLinesToKeep = 1; -+ LLVMStyle.KeepLineBreaksForNonEmptyLines = false; - LLVMStyle.KeepEmptyLinesAtTheStartOfBlocks = true; - LLVMStyle.NamespaceIndentation = FormatStyle::NI_None; - LLVMStyle.ObjCBinPackProtocolList = FormatStyle::BPS_Auto; -@@ -745,6 +748,7 @@ FormatStyle getGoogleStyle(FormatStyle::LanguageKind Language) { - {"^<ext/.*\\.h>", 2}, {"^<.*\\.h>", 1}, {"^<.*", 2}, {".*", 3}}; - GoogleStyle.IncludeStyle.IncludeIsMainRegex = "([-_](test|unittest))?$"; - GoogleStyle.IndentCaseLabels = true; -+ GoogleStyle.KeepLineBreaksForNonEmptyLines = false; - GoogleStyle.KeepEmptyLinesAtTheStartOfBlocks = false; - GoogleStyle.ObjCBinPackProtocolList = FormatStyle::BPS_Never; - GoogleStyle.ObjCSpaceAfterProperty = false; -diff --git a/lib/Format/UnwrappedLineFormatter.cpp b/lib/Format/UnwrappedLineFormatter.cpp -index 6b6a9aff461..c88efbc6867 100644 ---- a/lib/Format/UnwrappedLineFormatter.cpp -+++ b/lib/Format/UnwrappedLineFormatter.cpp -@@ -684,7 +684,7 @@ public: - LineFormatter(ContinuationIndenter *Indenter, WhitespaceManager *Whitespaces, - const FormatStyle &Style, - UnwrappedLineFormatter *BlockFormatter) -- : Indenter(Indenter), Whitespaces(Whitespaces), Style(Style), -+ : Indenter(Indenter), Style(Style), Whitespaces(Whitespaces), - BlockFormatter(BlockFormatter) {} - virtual ~LineFormatter() {} - -@@ -727,7 +727,8 @@ protected: - // assert so that we can simply call this function for all tokens. - return true; - -- if (NewLine) { -+ if (NewLine || (Previous.Children[0]->First->MustBreakBefore && -+ Style.KeepLineBreaksForNonEmptyLines)) { - int AdditionalIndent = State.Stack.back().Indent - - Previous.Children[0]->Level * Style.IndentWidth; - -@@ -772,10 +773,10 @@ protected: - } - - ContinuationIndenter *Indenter; -+ const FormatStyle &Style; - - private: - WhitespaceManager *Whitespaces; -- const FormatStyle &Style; - UnwrappedLineFormatter *BlockFormatter; - }; - -@@ -798,7 +799,7 @@ public: - while (State.NextToken) { - bool Newline = - Indenter->mustBreak(State) || -- (Indenter->canBreak(State) && State.NextToken->NewlinesBefore > 0); -+ (State.NextToken->NewlinesBefore > 0 && Indenter->canBreak(State)); - unsigned Penalty = 0; - formatChildren(State, Newline, /*DryRun=*/false, Penalty); - Indenter->addTokenToState(State, Newline, /*DryRun=*/false); -diff --git a/lib/Format/UnwrappedLineParser.cpp b/lib/Format/UnwrappedLineParser.cpp -index 3cd3c8f9cdf..3aa30c7cb3f 100644 ---- a/lib/Format/UnwrappedLineParser.cpp -+++ b/lib/Format/UnwrappedLineParser.cpp -@@ -2554,6 +2554,8 @@ void UnwrappedLineParser::nextToken(int LevelDifference) { - else - readTokenWithJavaScriptASI(); - FormatTok->Previous = Previous; -+ if (FormatTok->NewlinesBefore && Style.KeepLineBreaksForNonEmptyLines) -+ FormatTok->MustBreakBefore = true; - } - - void UnwrappedLineParser::distributeComments( -diff --git a/unittests/Format/FormatTest.cpp b/unittests/Format/FormatTest.cpp -index c05fceb4766..38906d9ee31 100644 ---- a/unittests/Format/FormatTest.cpp -+++ b/unittests/Format/FormatTest.cpp -@@ -385,6 +385,22 @@ TEST_F(FormatTest, RemovesEmptyLines) { - " void funk() {}\n" - "};", - Style)); -+ -+ Style.KeepLineBreaksForNonEmptyLines = true; -+ Style.ColumnLimit = 0; -+ EXPECT_EQ("int foo(int a,\n" -+ " int b)\n" -+ "{\n" -+ "}", -+ format("int foo(int a,\n" -+ "int b) {}", -+ Style)); -+ -+ EXPECT_EQ("[]() {\n" -+ " foo(); }", -+ format("[]() {\n" -+ "foo(); }", -+ Style)); - } - - TEST_F(FormatTest, RecognizesBinaryOperatorKeywords) { --- -2.26.2 - diff --git a/dev-libs/libclangformat-ide/libclangformat-ide-10.0.0.ebuild b/dev-libs/libclangformat-ide/libclangformat-ide-10.0.0.ebuild deleted file mode 100644 index 768bfe1f0f4a..000000000000 --- a/dev-libs/libclangformat-ide/libclangformat-ide-10.0.0.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake llvm llvm.org toolchain-funcs - -DESCRIPTION="A static clangformat library patched for IDE use" -HOMEPAGE="https://www.qt.io/blog/2019/04/17/clangformat-plugin-qt-creator-4-9" -LLVM_COMPONENTS=( clang ) - -llvm.org_set_globals - -LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT" -SLOT="$(ver_cut 1)" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="debug" - -DEPEND="~sys-devel/llvm-${PV}:${SLOT}=[debug=]" - -# least intrusive of all -CMAKE_BUILD_TYPE=RelWithDebInfo - -PATCHES=( "${FILESDIR}/clang-qtcreator-compat.patch" ) - -pkg_setup() { - LLVM_MAX_SLOT=${SLOT} llvm_pkg_setup -} - -src_unpack() { - llvm.org_src_unpack -} - -src_configure() { - local mycmakeargs=( - -DLLVM_CMAKE_PATH="${EPREFIX}/usr/lib/llvm/${SLOT}/$(get_libdir)/cmake/llvm" - -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${SLOT}" - -DBUILD_SHARED_LIBS=OFF - -DLLVM_ENABLE_EH=ON - -DLLVM_ENABLE_RTTI=ON - ) - - if [[ -n ${EPREFIX} ]]; then - mycmakeargs+=( - -DGCC_INSTALL_PREFIX="${EPREFIX}/usr" - ) - fi - - if tc-is-cross-compiler; then - [[ -x "/usr/bin/clang-tblgen" ]] \ - || die "/usr/bin/clang-tblgen not found or usable" - mycmakeargs+=( - -DCMAKE_CROSSCOMPILING=ON - -DCLANG_TABLEGEN=/usr/bin/clang-tblgen - ) - fi - - # LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844 - use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG" - cmake_src_configure -} - -src_compile() { - cmake_src_compile libclangFormat.a -} - -src_install() { - into usr/lib/llvm/${SLOT} - newlib.a "${BUILD_DIR}/$(get_libdir)/libclangFormat.a" libclangFormatIDE.a - insinto usr/lib/llvm/${SLOT}/include/clang/Format - newins "${S}/include/clang/Format/Format.h" FormatIDE.h -} diff --git a/dev-libs/libclangformat-ide/libclangformat-ide-9.0.1.ebuild b/dev-libs/libclangformat-ide/libclangformat-ide-9.0.1.ebuild deleted file mode 100644 index 5c04b67cf27c..000000000000 --- a/dev-libs/libclangformat-ide/libclangformat-ide-9.0.1.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake llvm llvm.org toolchain-funcs - -DESCRIPTION="A static clangformat library patched for IDE use" -HOMEPAGE="https://www.qt.io/blog/2019/04/17/clangformat-plugin-qt-creator-4-9" -LLVM_COMPONENTS=( clang ) - -llvm.org_set_globals - -LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT" -SLOT="$(ver_cut 1)" -KEYWORDS="~amd64 ~x86" -IUSE="debug" - -DEPEND="~sys-devel/llvm-${PV}:${SLOT}=[debug=]" - -# least intrusive of all -CMAKE_BUILD_TYPE=RelWithDebInfo - -PATCHES=( "${FILESDIR}/clang-qtcreator-compat.patch" ) - -pkg_setup() { - LLVM_MAX_SLOT=${SLOT} llvm_pkg_setup -} - -src_unpack() { - llvm.org_src_unpack -} - -src_configure() { - local mycmakeargs=( - -DLLVM_CMAKE_PATH="${EPREFIX}/usr/lib/llvm/${SLOT}/$(get_libdir)/cmake/llvm" - -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${SLOT}" - -DBUILD_SHARED_LIBS=OFF - -DLLVM_ENABLE_EH=ON - -DLLVM_ENABLE_RTTI=ON - ) - - if [[ -n ${EPREFIX} ]]; then - mycmakeargs+=( - -DGCC_INSTALL_PREFIX="${EPREFIX}/usr" - ) - fi - - if tc-is-cross-compiler; then - [[ -x "/usr/bin/clang-tblgen" ]] \ - || die "/usr/bin/clang-tblgen not found or usable" - mycmakeargs+=( - -DCMAKE_CROSSCOMPILING=ON - -DCLANG_TABLEGEN=/usr/bin/clang-tblgen - ) - fi - - # LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844 - use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG" - cmake_src_configure -} - -src_compile() { - cmake_src_compile libclangFormat.a -} - -src_install() { - into usr/lib/llvm/${SLOT} - newlib.a "${BUILD_DIR}/$(get_libdir)/libclangFormat.a" libclangFormatIDE.a - insinto usr/lib/llvm/${SLOT}/include/clang/Format - newins "${S}/include/clang/Format/Format.h" FormatIDE.h -} diff --git a/dev-libs/libclc/Manifest b/dev-libs/libclc/Manifest index e0e257095077..cb72e90b8a08 100644 --- a/dev-libs/libclc/Manifest +++ b/dev-libs/libclc/Manifest @@ -1,2 +1 @@ -DIST libclc-0.2.0_pre20191024.tar.xz 128628 BLAKE2B dc750725ee48456e3678cb4f730cc889045ff7401c4b40ac3ae9b656da9fe429aa2094c2042a18eda4f7e87c786ff8ae121fbf726a18de03884f30dad48b3fa1 SHA512 b4c2ca980fb28b5662055bea951de844284fcf122695234d7618439234f0203baf82b5cc5cf8acddfe387f19d32be3a958e53511bb1e33e9469f6be5951dbcdb DIST libclc-0.2.0_pre20201001.tar.xz 122180 BLAKE2B 8587c5b29d517a6c54a927b529f7e5651f154785e4299ad6b90007bdbae19ffccea75ec873a308b9a025effbb6316f91e70f82af19cdcdaad87c4f1af2595f78 SHA512 1fc10fcd6163991fe3ce474351d07f892a628fbd4e4cfb9ea96f1288db421b7be87c1f818593bea7409e7a17a5fd4c84a07a88f5c3d998ef97ac0425970abf4d diff --git a/dev-libs/libclc/libclc-0.2.0_pre20191024.ebuild b/dev-libs/libclc/libclc-0.2.0_pre20191024.ebuild deleted file mode 100644 index 182c7eba4800..000000000000 --- a/dev-libs/libclc/libclc-0.2.0_pre20191024.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 -PYTHON_COMPAT=( python3_{6,7,8,9,10} ) - -inherit llvm prefix python-any-r1 toolchain-funcs - -DESCRIPTION="OpenCL C library" -HOMEPAGE="https://libclc.llvm.org/" -# libclc subdir of https://github.com/llvm/llvm-project.git -SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.xz" - -LICENSE="Apache-2.0-with-LLVM-exceptions || ( MIT BSD )" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE_VIDEO_CARDS="video_cards_nvidia video_cards_r600 video_cards_radeonsi" -IUSE="${IUSE_VIDEO_CARDS}" -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 - ) - ${PYTHON_DEPS}" - -llvm_check_deps() { - has_version -b "sys-devel/clang:${LLVM_SLOT}" -} - -src_prepare() { - default - if use prefix; then - hprefixify configure.py - fi -} - -pkg_setup() { - # we do not need llvm_pkg_setup - python-any-r1_pkg_setup -} - -src_configure() { - local libclc_targets=() - - use video_cards_nvidia && libclc_targets+=("nvptx--" "nvptx64--" "nvptx--nvidiacl" "nvptx64--nvidiacl") - use video_cards_r600 && libclc_targets+=("r600--") - use video_cards_radeonsi && libclc_targets+=("amdgcn--" "amdgcn-mesa-mesa3d" "amdgcn--amdhsa") - - [[ ${#libclc_targets[@]} ]] || die "libclc target missing!" - - ./configure.py \ - --with-cxx-compiler="$(tc-getCXX)" \ - --with-llvm-config="$(get_llvm_prefix "${LLVM_MAX_SLOT}")/bin/llvm-config" \ - --prefix="${EPREFIX}/usr" \ - "${libclc_targets[@]}" || die -} - -src_compile() { - emake VERBOSE=1 -} diff --git a/dev-libs/libclc/libclc-0.2.0_pre20201001.ebuild b/dev-libs/libclc/libclc-0.2.0_pre20201001.ebuild index 42394beff4d7..3b3d7f64b2a3 100644 --- a/dev-libs/libclc/libclc-0.2.0_pre20201001.ebuild +++ b/dev-libs/libclc/libclc-0.2.0_pre20201001.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.xz" LICENSE="Apache-2.0-with-LLVM-exceptions || ( MIT BSD )" SLOT="0" -KEYWORDS="amd64 ~x86" +KEYWORDS="amd64 x86" IUSE_VIDEO_CARDS="video_cards_nvidia video_cards_r600 video_cards_radeonsi" IUSE="${IUSE_VIDEO_CARDS}" REQUIRED_USE="|| ( ${IUSE_VIDEO_CARDS} )" diff --git a/dev-libs/libconfig/Manifest b/dev-libs/libconfig/Manifest index c0c61722dba4..87da50b902fc 100644 --- a/dev-libs/libconfig/Manifest +++ b/dev-libs/libconfig/Manifest @@ -1,3 +1 @@ -DIST libconfig-1.5.tar.gz 644432 BLAKE2B 9eaec8aca0692f30d6b51221a5d1bc624540da74f599292b1a161054dec8188b2ad2ee100a97c1e19f7b4763614206a5bf6ad03f6f7bbd33b40d57c51646e520 SHA512 16bead52ee8c880b25fd1ee6fa83c115dc51830f2f7954389bd8b72cc0e6fc05fc63fe415bd929851894a9f3a1127d51cfc4223149514246e9566305556b7bcd -DIST libconfig-1.7.1.tar.gz 2290501 BLAKE2B 6c55e0d41c1475434bcc61203bda40c478d0802ccb544866df4b7d9b69538ca1e2eab8642867b0ee7c56e26027d8fb326e470a5c9bdcbc37534fe23092be15e0 SHA512 b58b468e9e2d5175fbde1ad9765c6604dc9b3f3944613a88404a45d0d232e7d79a47321bf3c06b97cb46a2104b4313fad5c7f8944149f550b7af51ad523e775e DIST libconfig-1.7.2.tar.gz 3017891 BLAKE2B 1b8bc54857feff506d5cd62312a35f0f8a123380567881bdb8241f2232c5281399e4283687a3254b8f43a92b8f7d5ff3f72ec4fd875bf1b9d5d6c7703014cc3c SHA512 9df57355c2d08381b4a0a6366f0db3633fbe8f73c2bb8c370c040b0bae96ce89ee4ac6c17a5a247fed855d890fa383e5b70cb5573fc9cfc62194d5b94e161cee diff --git a/dev-libs/libconfig/files/libconfig-1.5-out-of-source-build.patch b/dev-libs/libconfig/files/libconfig-1.5-out-of-source-build.patch deleted file mode 100644 index d109b60d4363..000000000000 --- a/dev-libs/libconfig/files/libconfig-1.5-out-of-source-build.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/tests/Makefile.am -+++ b/tests/Makefile.am -@@ -3,7 +3,7 @@ - - libconfig_tests_SOURCES = tests.c - --libconfig_tests_CPPFLAGS = -I$(top_srcdir)/tinytest -I../lib -+libconfig_tests_CPPFLAGS = -I$(top_srcdir)/tinytest -I$(top_srcdir)/lib - - libconfig_tests_LDADD = -L$(top_builddir)/tinytest -ltinytest \ - -L$(top_builddir)/lib/.libs -lconfig diff --git a/dev-libs/libconfig/libconfig-1.5.ebuild b/dev-libs/libconfig/libconfig-1.5.ebuild deleted file mode 100644 index 9d5dbf0e9145..000000000000 --- a/dev-libs/libconfig/libconfig-1.5.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -AUTOTOOLS_AUTORECONF="1" -inherit eutils autotools-multilib ltprune - -DESCRIPTION="Libconfig is a simple library for manipulating structured configuration files" -HOMEPAGE="https://www.hyperrealm.com/libconfig/libconfig.html" -SRC_URI="http://www.hyperrealm.com/${PN}/${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~mips ppc ~ppc64 s390 sparc x86 ~x86-linux" -IUSE="+cxx examples static-libs" - -DEPEND=" - sys-devel/libtool - sys-devel/bison" - -PATCHES=( "${FILESDIR}/${PN}-1.5-out-of-source-build.patch" ) - -src_prepare() { - sed -i configure.ac -e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' || die - autotools-multilib_src_prepare -} - -multilib_src_configure() { - local myeconfargs=( - $(use_enable cxx) - --disable-examples - ) - autotools-utils_src_configure -} - -multilib_src_test() { - # It responds to check but that does not work as intended - emake test -} - -multilib_src_install_all() { - einstalldocs - prune_libtool_files - - if use examples; then - find examples -name "Makefile.*" -delete || die - dodoc -r examples - fi -} diff --git a/dev-libs/libconfig/libconfig-1.7.1.ebuild b/dev-libs/libconfig/libconfig-1.7.1.ebuild deleted file mode 100644 index 630dd6e6e085..000000000000 --- a/dev-libs/libconfig/libconfig-1.7.1.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools eutils ltprune multilib-minimal - -DESCRIPTION="Libconfig is a simple library for manipulating structured configuration files" -HOMEPAGE=" - http://www.hyperrealm.com/libconfig/libconfig.html - https://github.com/hyperrealm/libconfig -" -SRC_URI="https://github.com/hyperrealm/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0/11" -KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-linux" -IUSE="+cxx static-libs" - -DEPEND=" - sys-apps/texinfo - sys-devel/bison - sys-devel/libtool -" - -src_prepare() { - default - sed -i \ - -e '/sleep 3/d' \ - -e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' \ - configure.ac || die - eautoreconf - multilib_copy_sources -} - -multilib_src_configure() { - econf \ - $(use_enable cxx) \ - $(use_enable static-libs static) \ - --disable-examples -} - -multilib_src_test() { - # It responds to check but that does not work as intended - emake test -} - -multilib_src_install() { - default - - prune_libtool_files -} diff --git a/dev-libs/libconfig/libconfig-1.7.2.ebuild b/dev-libs/libconfig/libconfig-1.7.2.ebuild index 225468fb0c9c..cbbe4ac59f02 100644 --- a/dev-libs/libconfig/libconfig-1.7.2.ebuild +++ b/dev-libs/libconfig/libconfig-1.7.2.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -inherit autotools eutils ltprune multilib-minimal +EAPI=7 + +inherit autotools multilib-minimal DESCRIPTION="Libconfig is a simple library for manipulating structured configuration files" HOMEPAGE=" @@ -13,7 +14,7 @@ SRC_URI="https://github.com/hyperrealm/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g LICENSE="LGPL-2.1" SLOT="0/11" -KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~mips ppc ~ppc64 ~s390 sparc x86 ~x86-linux" +KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~mips ppc ~ppc64 ~s390 sparc x86 ~x86-linux" IUSE="+cxx static-libs" DEPEND=" @@ -46,5 +47,5 @@ multilib_src_test() { multilib_src_install() { default - prune_libtool_files + find "${ED}" -name '*.la' -delete || die } diff --git a/dev-libs/libcroco/libcroco-0.6.13.ebuild b/dev-libs/libcroco/libcroco-0.6.13.ebuild index 4208a3c7ceba..0c9998c63a95 100644 --- a/dev-libs/libcroco/libcroco-0.6.13.ebuild +++ b/dev-libs/libcroco/libcroco-0.6.13.ebuild @@ -1,8 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -GNOME2_LA_PUNT="yes" +EAPI=7 inherit gnome2 multilib-minimal @@ -11,7 +10,7 @@ HOMEPAGE="https://git.gnome.org/browse/libcroco/" LICENSE="LGPL-2" SLOT="0.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" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" IUSE="test" RESTRICT="!test? ( test )" @@ -19,7 +18,8 @@ RDEPEND=" >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] >=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}] " -DEPEND="${RDEPEND} +DEPEND="${RDEPEND}" +BDEPEND=" dev-util/gtk-doc-am virtual/pkgconfig " @@ -50,6 +50,6 @@ multilib_src_install() { } multilib_src_install_all() { - DOCS="AUTHORS ChangeLog HACKING NEWS README TODO" + DOCS=( AUTHORS ChangeLog HACKING NEWS README TODO ) einstalldocs } diff --git a/dev-libs/libcss/libcss-0.8.0-r2.ebuild b/dev-libs/libcss/libcss-0.8.0-r2.ebuild index d99c0f2c28d6..f380280c9605 100644 --- a/dev-libs/libcss/libcss-0.8.0-r2.ebuild +++ b/dev-libs/libcss/libcss-0.8.0-r2.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz" LICENSE="MIT" SLOT="0/${PV}" -KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~m68k-mint" +KEYWORDS="~amd64 ~arm ~ppc ~ppc64" IUSE="test" RESTRICT="!test? ( test )" diff --git a/dev-libs/libcss/libcss-0.9.0-r1.ebuild b/dev-libs/libcss/libcss-0.9.0-r1.ebuild index d4e88ad6624b..3eb0cebafb20 100644 --- a/dev-libs/libcss/libcss-0.9.0-r1.ebuild +++ b/dev-libs/libcss/libcss-0.9.0-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz" LICENSE="MIT" SLOT="0/${PV}" -KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~m68k-mint" +KEYWORDS="~amd64 ~arm ~ppc ~ppc64" IUSE="test" RESTRICT="!test? ( test )" diff --git a/dev-libs/libcss/libcss-0.9.1-r1.ebuild b/dev-libs/libcss/libcss-0.9.1-r1.ebuild index d4e88ad6624b..3eb0cebafb20 100644 --- a/dev-libs/libcss/libcss-0.9.1-r1.ebuild +++ b/dev-libs/libcss/libcss-0.9.1-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz" LICENSE="MIT" SLOT="0/${PV}" -KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~m68k-mint" +KEYWORDS="~amd64 ~arm ~ppc ~ppc64" IUSE="test" RESTRICT="!test? ( test )" diff --git a/dev-libs/libdnet/libdnet-1.14-r1.ebuild b/dev-libs/libdnet/libdnet-1.14-r1.ebuild index a57d98ceac43..bb199036984d 100644 --- a/dev-libs/libdnet/libdnet-1.14-r1.ebuild +++ b/dev-libs/libdnet/libdnet-1.14-r1.ebuild @@ -1,7 +1,8 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 + AT_M4DIR="config" PYTHON_COMPAT=( python3_{6,7,8,9,10} ) DISTUTILS_OPTIONAL=1 @@ -10,22 +11,20 @@ inherit autotools distutils-r1 DESCRIPTION="simplified, portable interface to several low-level networking routines" HOMEPAGE="https://github.com/ofalk/libdnet" SRC_URI="https://github.com/ofalk/${PN}/archive/${P}.tar.gz" -LICENSE="LGPL-2" +S="${WORKDIR}/${PN}-${P}" +LICENSE="LGPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86" +KEYWORDS="~alpha amd64 arm ~arm64 ~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} )" +RESTRICT="test" + +DEPEND="python? ( ${PYTHON_DEPS} )" +RDEPEND="${DEPEND}" + DOCS=( README.md THANKS TODO ) -S=${WORKDIR}/${PN}-${P} + PATCHES=( "${FILESDIR}"/${PN}-1.14-ndisc.patch "${FILESDIR}"/${PN}-1.14-strlcpy.patch @@ -48,7 +47,7 @@ src_prepare() { eautoreconf if use python; then - cd python + cd python || die distutils-r1_src_prepare fi } @@ -62,7 +61,7 @@ src_configure() { src_compile() { default if use python; then - cd python + cd python || die distutils-r1_src_compile fi } @@ -70,9 +69,9 @@ src_compile() { src_install() { default if use python; then - cd python + cd python || die unset DOCS distutils-r1_src_install fi - find "${D}" -name '*.la' -delete || die + find "${ED}" -name '*.la' -delete || die } diff --git a/dev-libs/libdnet/libdnet-9999.ebuild b/dev-libs/libdnet/libdnet-1.14-r2.ebuild index 7545ac6d73fa..2ff784e327d0 100644 --- a/dev-libs/libdnet/libdnet-9999.ebuild +++ b/dev-libs/libdnet/libdnet-1.14-r2.ebuild @@ -1,33 +1,38 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 + AT_M4DIR="config" PYTHON_COMPAT=( python3_{6,7,8,9,10} ) DISTUTILS_OPTIONAL=1 -inherit autotools distutils-r1 git-r3 +inherit autotools distutils-r1 DESCRIPTION="simplified, portable interface to several low-level networking routines" HOMEPAGE="https://github.com/ofalk/libdnet" -EGIT_REPO_URI="https://github.com/ofalk/libdnet" -EGIT_BRANCH="devel" -LICENSE="LGPL-2" +SRC_URI="https://github.com/ofalk/${PN}/archive/${P}.tar.gz" +S="${WORKDIR}/${PN}-${P}" +LICENSE="LGPL-2" SLOT="0" -KEYWORDS="" -IUSE="python static-libs test" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" +IUSE="python test" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" +RESTRICT="!test? ( test )" -DEPEND=" - python? ( ${PYTHON_DEPS} ) -" -RDEPEND=" - ${DEPEND} +DEPEND="python? ( ${PYTHON_DEPS} )" +RDEPEND="${DEPEND}" +BDEPEND=" + python? ( + dev-python/cython[${PYTHON_USEDEP}] + ) " -RESTRICT="test" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" -DOCS=( README.md THANKS TODO ) + +DOCS=( README.md THANKS ) + PATCHES=( - "${FILESDIR}"/${PN}-1.14-strlcpy.patch + "${FILESDIR}/${PN}-1.14-ndisc.patch" + "${FILESDIR}/${PN}-1.14-strlcpy.patch" ) src_prepare() { @@ -47,31 +52,33 @@ src_prepare() { eautoreconf if use python; then - cd python + cd python || die distutils-r1_src_prepare fi } src_configure() { econf \ - $(use_with python) \ - $(use_enable static-libs static) + --disable-static \ + $(use_with python) } src_compile() { default if use python; then - cd python + cd python || die distutils-r1_src_compile fi } src_install() { default + if use python; then - cd python + cd python || die unset DOCS distutils-r1_src_install fi - find "${D}" -name '*.la' -delete || die + + find "${ED}" -name '*.la' -delete || die } diff --git a/dev-libs/libdnsres/libdnsres-0.1a-r2.ebuild b/dev-libs/libdnsres/libdnsres-0.1a-r2.ebuild deleted file mode 100644 index 2811d24833bf..000000000000 --- a/dev-libs/libdnsres/libdnsres-0.1a-r2.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit autotools eutils - -DESCRIPTION="A non-blocking DNS resolver library" -HOMEPAGE="https://www.monkey.org/~provos/libdnsres/" -SRC_URI="https://www.monkey.org/~provos/${P}.tar.gz" - -LICENSE="BSD-4" -SLOT="0" -KEYWORDS="amd64 ~ppc sparc x86" - -DEPEND="dev-libs/libevent" -RDEPEND="${DEPEND}" - -DOCS=( README ) - -src_prepare() { - epatch "${FILESDIR}/${P}-autotools.patch" - sed -i configure.in -e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' || die - eautoreconf -} diff --git a/dev-libs/libdnsres/libdnsres-0.1a-r3.ebuild b/dev-libs/libdnsres/libdnsres-0.1a-r3.ebuild index 99fa34502800..2ecf5403264a 100644 --- a/dev-libs/libdnsres/libdnsres-0.1a-r3.ebuild +++ b/dev-libs/libdnsres/libdnsres-0.1a-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -10,7 +10,7 @@ SRC_URI="https://www.monkey.org/~provos/${P}.tar.gz" LICENSE="BSD-4" SLOT="0" -KEYWORDS="~amd64 ~ppc ~sparc ~x86" +KEYWORDS="amd64 ~ppc sparc x86" IUSE="static-libs" DEPEND="dev-libs/libevent" diff --git a/dev-libs/libdshconfig/libdshconfig-0.20.13.ebuild b/dev-libs/libdshconfig/libdshconfig-0.20.13.ebuild index 2c08ecb999c7..b7dbc25e751a 100644 --- a/dev-libs/libdshconfig/libdshconfig-0.20.13.ebuild +++ b/dev-libs/libdshconfig/libdshconfig-0.20.13.ebuild @@ -9,7 +9,7 @@ SRC_URI="http://www.netfort.gr.jp/~dancer/software/downloads/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~m68k-mint" +KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux" RDEPEND="virtual/ssh" diff --git a/dev-libs/libebml/Manifest b/dev-libs/libebml/Manifest index 617099114636..d22637fac8d6 100644 --- a/dev-libs/libebml/Manifest +++ b/dev-libs/libebml/Manifest @@ -1,3 +1,4 @@ DIST libebml-1.3.10.tar.xz 69488 BLAKE2B 0133ec041cd2f2aad9e8870d56c4ec8f3f3cbf745cbdbc2470f02f94152b8a236626d804bf8c42c00c6a49cc5e7d691394cffe0a888f26100ff67bd03a6ae2d7 SHA512 c7ba20664161e811a10847f888a833abaa2b7a4d43ddbef6ae927f391f5d1eff45bc703f13a52ccfc793521e3b22cbac2fd93550cd95119a4060153683b29c49 DIST libebml-1.3.9.tar.xz 69836 BLAKE2B d37bf9d74cb21a0c4cea3550bbd25f081e48085ba8d97d2f133e3f5da292527f0f31fc5aa3978c21f82262698877a76670b4b120e915573d339751234c4450c7 SHA512 a388fa8ff7acf9a0fb33faf9c00fc07f53794d86a4f894e04e2a690a24e781a7f380a0896e607e801a6f1f0b215407ee09a801e96d4b3e15f39ca71ec3a6d64e DIST libebml-1.4.0.tar.xz 69944 BLAKE2B 240c18d53ec73cc42b4cbed507e95ecc5ada0bd65e826b3f2e930bf6d4055097606b920c433ee5786112894ea6ad0eac229e784501ba14563274b7605dab01f5 SHA512 db78ee560a44b90b4df12ba23a00f8ccb0d3626f44296af6b79a492a00126690582764c6be6c9e9851302a0d0d70edfbe000cc217c5532abe862a821624af230 +DIST libebml-1.4.1.tar.xz 70096 BLAKE2B 9b4ae80bcc2184f018c25f1a644acdf9e79c5ebc6576a5b91ccd93286c0cab2d99a80e3d2aefcbc6210724d9e05229c9ea19e0def85ba28f7e1aa059ba52925d SHA512 ddde4975546ba4214cd22db37992c2b5130a731da1b34e171cca8d7f39d981b9643a193d06be1a1e156b316e51419d1eb4c1cfe40511a52b245152e69a507e4b diff --git a/dev-libs/libebml/libebml-1.4.1.ebuild b/dev-libs/libebml/libebml-1.4.1.ebuild new file mode 100644 index 000000000000..78a7706a34dc --- /dev/null +++ b/dev-libs/libebml/libebml-1.4.1.ebuild @@ -0,0 +1,22 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake + +DESCRIPTION="Extensible binary format library (kinda like XML)" +HOMEPAGE="https://www.matroska.org/ https://github.com/Matroska-Org/libebml/" +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" + +src_configure() { + local mycmakeargs=( + -DBUILD_SHARED_LIBS=YES + ) + + cmake_src_configure +} diff --git a/dev-libs/libedit/libedit-20191211.3.1.ebuild b/dev-libs/libedit/libedit-20191211.3.1.ebuild index e67d99473532..c5be4154428c 100644 --- a/dev-libs/libedit/libedit-20191211.3.1.ebuild +++ b/dev-libs/libedit/libedit-20191211.3.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -14,7 +14,7 @@ S=${WORKDIR}/${MY_P} LICENSE="BSD-2" 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" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" IUSE="static-libs" RDEPEND=">=sys-libs/ncurses-5.9-r3[static-libs?,${MULTILIB_USEDEP}]" diff --git a/dev-libs/libee/libee-0.4.1.ebuild b/dev-libs/libee/libee-0.4.1.ebuild index b448fdb21991..d755c12cc849 100644 --- a/dev-libs/libee/libee-0.4.1.ebuild +++ b/dev-libs/libee/libee-0.4.1.ebuild @@ -9,7 +9,7 @@ SRC_URI="http://www.libee.org/files/download/${P}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="amd64 arm ~arm64 hppa x86 ~amd64-linux" +KEYWORDS="amd64 arm ~arm64 ~hppa x86 ~amd64-linux" IUSE="debug" RDEPEND=" diff --git a/dev-libs/libee/metadata.xml b/dev-libs/libee/metadata.xml index caa0bddf6507..e4e2f481155b 100644 --- a/dev-libs/libee/metadata.xml +++ b/dev-libs/libee/metadata.xml @@ -5,8 +5,5 @@ <email>whissi@gentoo.org</email> <name>Thomas Deutschmann</name> </maintainer> -<maintainer type="person"> - <email>maksbotan@gentoo.org</email> -</maintainer> <origin>gentoo-staging</origin> </pkgmetadata> diff --git a/dev-libs/liberasurecode/Manifest b/dev-libs/liberasurecode/Manifest index 788ea61bcd7d..3fc48722cd31 100644 --- a/dev-libs/liberasurecode/Manifest +++ b/dev-libs/liberasurecode/Manifest @@ -1,2 +1 @@ -DIST liberasurecode-1.6.1.tar.gz 209761 BLAKE2B 94c26cd49e3181a02908c5379dec69da4e37501c7c0123e63d368c3c19b72f344f2246bfabfa5e7e0aee547f6a746ca5aa1f72ff4370c975425d68abe00c07ed SHA512 7d0fa00b12bc561272573f4425bdecab3c2f0f40914f50adfd471b464232047de70036f4cfbda5f93f843afbfc60ecc0afb40705bb772453c4956565083bb2d0 DIST liberasurecode-1.6.2.tar.gz 210331 BLAKE2B 174141a26872ce1cb57feaeed071f8b0740810a73ec4683e2661f908fc0d58264a01ed87e7a71185f0607cbd23ebfe0141154e082dd96478712f776b764a2631 SHA512 027def96275eac67b32b2e3e7144f3042acbcafe5b27b353eb5944e73b55d34931a11324018f131b2acb381007cc79e31a5afd7390fdc517ed30ee592d6f90d5 diff --git a/dev-libs/liberasurecode/liberasurecode-1.6.1.ebuild b/dev-libs/liberasurecode/liberasurecode-1.6.1.ebuild deleted file mode 100644 index 04ffe4e54cdf..000000000000 --- a/dev-libs/liberasurecode/liberasurecode-1.6.1.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools eutils ltprune multilib toolchain-funcs - -DESCRIPTION="Erasure Code API library written in C with pluggable Erasure Code backends." -HOMEPAGE="https://bitbucket.org/tsg-/liberasurecode/overview" -SRC_URI="https://github.com/openstack/liberasurecode/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ~arm64 x86" -IUSE="doc static-libs" - -RDEPEND="" -DEPEND="sys-devel/autoconf - doc? ( app-doc/doxygen )" - -src_prepare() { - eapply_user - eautoreconf -} - -src_configure() { - econf \ - --htmldir=/usr/share/doc/${PF} \ - --disable-werror \ - $(use_enable doc doxygen) \ - $(use_enable static-libs static) -} - -src_install() { - default - prune_libtool_files -} diff --git a/dev-libs/libestr/libestr-0.1.11.ebuild b/dev-libs/libestr/libestr-0.1.11.ebuild index 2c5eb88c8ae6..46bfad9d48e4 100644 --- a/dev-libs/libestr/libestr-0.1.11.ebuild +++ b/dev-libs/libestr/libestr-0.1.11.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://libestr.adiscon.com/files/download/${P}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="amd64 arm arm64 hppa x86" +KEYWORDS="amd64 arm arm64 ~hppa x86" IUSE="debug static-libs test" RESTRICT="!test? ( test )" diff --git a/dev-libs/libestr/metadata.xml b/dev-libs/libestr/metadata.xml index 54470fb97207..8fe7f46c3c06 100644 --- a/dev-libs/libestr/metadata.xml +++ b/dev-libs/libestr/metadata.xml @@ -5,10 +5,6 @@ <email>whissi@gentoo.org</email> <name>Thomas Deutschmann</name> </maintainer> - <maintainer type="person"> - <email>maksbotan@gentoo.org</email> - <name>Maxim Koltsov</name> - </maintainer> <upstream> <bugs-to>https://github.com/rsyslog/libestr/issues</bugs-to> <remote-id type="github">rsyslog/libestr</remote-id> diff --git a/dev-libs/libev/Manifest b/dev-libs/libev/Manifest index 9640fcc4c080..88ac5d5ab5bd 100644 --- a/dev-libs/libev/Manifest +++ b/dev-libs/libev/Manifest @@ -1,2 +1 @@ -DIST libev-4.31.tar.gz 565540 BLAKE2B 59df831f4cfc9a615234d8d5b845a687ea41cc27aea84698e213bfacb79d8f9862ff776c2bf3888495cc303daf3b9073a1f660eaedb1437ebaa6d678c8ef0873 SHA512 c2687c2e538c724ec8d02ce5bf6875d2e697c57623c4d5c4e6a09c5c480dd7ea38bb7af290f120ff9e61f0ecfc9b6a07a653a9f44ea8ecf2487438756105bd18 DIST libev-4.33.tar.gz 569527 BLAKE2B 8a6cae25ffde10b24a5bbf084f6a8559af326b37acdbdf47dda34b7f0c7955f3ebd26958594444a574cfa3e2b4011e4be93ad2bd994ffd4c094bf36620e67ba5 SHA512 c662a65360115e0b2598e3e8824cf7b33360c43a96ac9233f6b6ea2873a10102551773cad0e89e738541e75af9fd4f3e3c11cd2f251c5703aa24f193128b896b diff --git a/dev-libs/libev/libev-4.31.ebuild b/dev-libs/libev/libev-4.31.ebuild deleted file mode 100644 index 1760bbf70bdb..000000000000 --- a/dev-libs/libev/libev-4.31.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools eutils multilib-minimal - -DESCRIPTION="A high-performance event loop/event model with lots of feature" -HOMEPAGE="https://software.schmorp.de/pkg/libev.html" -SRC_URI="http://dist.schmorp.de/libev/${P}.tar.gz - http://dist.schmorp.de/libev/Attic/${P}.tar.gz" - -LICENSE="|| ( BSD GPL-2 )" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" -IUSE="elibc_glibc static-libs" - -# Bug #283558 -DEPEND="elibc_glibc? ( >=sys-libs/glibc-2.9_p20081201 )" -RDEPEND="${DEPEND}" - -DOCS=( Changes README ) - -# bug #411847 -PATCHES=( "${FILESDIR}/${PN}-4.25-pc.patch" ) - -src_prepare() { - default - sed -i -e "/^include_HEADERS/s/ event.h//" Makefile.am || die - - eautoreconf -} - -multilib_src_configure() { - ECONF_SOURCE="${S}" \ - econf \ - --disable-maintainer-mode \ - $(use_enable static-libs static) -} - -multilib_src_install_all() { - if ! use static-libs; then - find "${D}" -name '*.la' -type f -delete || die - fi - einstalldocs -} diff --git a/dev-libs/libev/libev-4.33.ebuild b/dev-libs/libev/libev-4.33.ebuild index 9b4343557ae3..3f7c641dff27 100644 --- a/dev-libs/libev/libev-4.33.ebuild +++ b/dev-libs/libev/libev-4.33.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -12,7 +12,7 @@ SRC_URI="http://dist.schmorp.de/libev/${P}.tar.gz LICENSE="|| ( BSD GPL-2 )" 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" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" IUSE="static-libs" DOCS=( Changes README ) diff --git a/dev-libs/libevdev/Manifest b/dev-libs/libevdev/Manifest index 2eae007f8b61..049073fdff1f 100644 --- a/dev-libs/libevdev/Manifest +++ b/dev-libs/libevdev/Manifest @@ -1,2 +1 @@ DIST libevdev-1.10.0.tar.xz 445792 BLAKE2B b7638ae85cac8b8d29c3255da1de50a06db9eb97d752b383852c85c32f8f93f31135e9d28acd474695d36d87eba04d455abd99badf6e492c2561893c47f796d2 SHA512 94ab4ee7e0854c41a491d8e4713baa95ae66dd337b41823011c0913aa1c72e8bbf8b808d5936c2ef456af794b6d3a5cd7cd0515fbd1d06dd1b7ba19275bd928f -DIST libevdev-1.9.1.tar.xz 442740 BLAKE2B 8a0e6c555ffa09890556c33e346e03b878eb0dac8585164d7561b6e20e5795c39299508f761a1fa15737d0802e362ba5c9d17de89d96fb79f1bfa1afa28423ab SHA512 7d845ce2279d2e2ef12437f6218550265ea0c85e5b6c0d116aff09787b73626b338fe3084baff060085d393688b5ae3d33772689e0581684eff257af01c4c645 diff --git a/dev-libs/libevdev/libevdev-1.10.0.ebuild b/dev-libs/libevdev/libevdev-1.10.0.ebuild index 676e67048abf..a69696d46b56 100644 --- a/dev-libs/libevdev/libevdev-1.10.0.ebuild +++ b/dev-libs/libevdev/libevdev-1.10.0.ebuild @@ -15,7 +15,7 @@ if [[ ${PV} == 9999* ]] ; then 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 ~riscv s390 ~sparc ~x86" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86" fi LICENSE="MIT" diff --git a/dev-libs/libevdev/libevdev-1.9.1.ebuild b/dev-libs/libevdev/libevdev-1.9.1.ebuild deleted file mode 100644 index e97d085f9555..000000000000 --- a/dev-libs/libevdev/libevdev-1.9.1.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,8,9,10} ) - -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 test -v -C "${BUILD_DIR}" -t 100 || die "tests failed" -} - -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/libevent/libevent-2.1.11.ebuild b/dev-libs/libevent/libevent-2.1.11.ebuild index 77958142ba2a..5addf6160254 100644 --- a/dev-libs/libevent/libevent-2.1.11.ebuild +++ b/dev-libs/libevent/libevent-2.1.11.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -15,7 +15,7 @@ SRC_URI=" LICENSE="BSD" 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" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" IUSE="debug libressl +ssl static-libs test +threads" RESTRICT="!test? ( test )" diff --git a/dev-libs/libevent/libevent-2.1.12.ebuild b/dev-libs/libevent/libevent-2.1.12.ebuild index 89f9d1095ebe..abbe39edb784 100644 --- a/dev-libs/libevent/libevent-2.1.12.ebuild +++ b/dev-libs/libevent/libevent-2.1.12.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -15,7 +15,7 @@ SRC_URI=" LICENSE="BSD" 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" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" IUSE=" +clock-gettime debug libressl malloc-replacement +ssl static-libs test +threads verbose-debug diff --git a/dev-libs/libfastjson/libfastjson-0.99.8.ebuild b/dev-libs/libfastjson/libfastjson-0.99.8.ebuild index 0001b9be630a..d708a382d6a2 100644 --- a/dev-libs/libfastjson/libfastjson-0.99.8.ebuild +++ b/dev-libs/libfastjson/libfastjson-0.99.8.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://www.rsyslog.com/tag/libfastjson/" SRC_URI="http://download.rsyslog.com/${PN}/${P}.tar.gz" LICENSE="MIT" SLOT="0/4.2.0" -KEYWORDS="amd64 arm arm64 hppa sparc x86" +KEYWORDS="amd64 arm arm64 ~hppa sparc x86" IUSE="static-libs" DEPEND=">=sys-devel/autoconf-archive-2015.02.04" diff --git a/dev-libs/libffi-compat/libffi-compat-3.2.1-r3.ebuild b/dev-libs/libffi-compat/libffi-compat-3.2.1-r3.ebuild index 8e6973d9985a..948e4ebef179 100644 --- a/dev-libs/libffi-compat/libffi-compat-3.2.1-r3.ebuild +++ b/dev-libs/libffi-compat/libffi-compat-3.2.1-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -10,7 +10,7 @@ SRC_URI="ftp://sourceware.org/pub/libffi/libffi-${PV}.tar.gz" LICENSE="MIT" SLOT="6" # libffi.so.6 -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~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 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="debug pax_kernel test" RESTRICT="!test? ( test )" diff --git a/dev-libs/libffi/libffi-3.3-r2.ebuild b/dev-libs/libffi/libffi-3.3-r2.ebuild index 55138eb082d5..fc243c08f0f6 100644 --- a/dev-libs/libffi/libffi-3.3-r2.ebuild +++ b/dev-libs/libffi/libffi-3.3-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -13,7 +13,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" +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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="debug pax_kernel static-libs test" RESTRICT="!test? ( test )" @@ -39,6 +39,15 @@ S=${WORKDIR}/${MY_P} ECONF_SOURCE=${S} +src_prepare() { + default + if [[ ${CHOST} == arm64-*-darwin* ]] ; then + # ensure we use aarch64 asm, not x86 on arm64 + sed -i -e 's/aarch64\*-\*-\*/arm64*-*-*|&/' \ + configure configure.host || die + fi +} + multilib_src_configure() { use userland_BSD && export HOST="${CHOST}" # --includedir= path maintains a few properties: diff --git a/dev-libs/libfido2/Manifest b/dev-libs/libfido2/Manifest index ce488475d64c..364924cc4acf 100644 --- a/dev-libs/libfido2/Manifest +++ b/dev-libs/libfido2/Manifest @@ -1,3 +1,2 @@ -DIST libfido2-1.3.1.tar.gz 1512676 BLAKE2B f69a04fc69c46b688d83afe9d72b2fb1860ac00a09665d55e25293595520e95d45486ecc5355c479bc8bc06dbe6ed4fd469c511f5bf5f341a0ec86cb099fce28 SHA512 fc56f7bcddd7ae0f950b4e94f08ad726f7de68b975c0bdcbca98c7932c2c3d2e2a51b30eaf41e8dba08e82af3926cbed44264244ae721902af46e47df9fcbe1b -DIST libfido2-1.4.0.tar.gz 391439 BLAKE2B d45ff3e1a5605c5ea4c5bddbe423bb69e6237e7a359fcc58469a86c503c934ce4491b98fdd673130d419cabe09acab7e201592f923ffe3908568b2b0888ae32a SHA512 5cf2f2d70bdba893fd33bf3ca91940c7eded5ed1728b517ff3fc46cbde58bf64f16da4104138b20dcea1d9a1cec730e532bc4938cdcba4ad86343e51a1c3c513 DIST libfido2-1.5.0.tar.gz 407259 BLAKE2B 23a04f9230c45652aa1ac9fd8b3e809096ae31699c65ca0fda27b27b1b47263e375bb99e5b1ebc515b9edfb801bb2fba9c4f50d88e755efe3eaa23463ca01946 SHA512 240e2368e43846fddf5e98bbcc247468833565bcde4ec27976b88c814d787f1a477241a82b064818aa0eb0a98ff46a65d80b8243f4d0bbd763270e42492354e2 +DIST libfido2-1.6.0.tar.gz 413904 BLAKE2B 59444cc9e32b5d9f2a0f9138fe4f3ad644865e1f7f24f50bbace262308aa7c10b58aa0e890a3493e8fd102468e26947f7fc0864b5d7a1e185e40ad730064db8e SHA512 c473732a2f7ef54156097d315e44457d89056446ab3112a7c7a6fd99d5c2c8ae0ca2451ff9cd45be6c32de1ab335d6dfdb2b0c56b40cae9eb41391d18d83be4a diff --git a/dev-libs/libfido2/files/libfido2-1.3.0-cmakelists.patch b/dev-libs/libfido2/files/libfido2-1.3.0-cmakelists.patch deleted file mode 100644 index a5a4b721ed0d..000000000000 --- a/dev-libs/libfido2/files/libfido2-1.3.0-cmakelists.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff --git a/man/CMakeLists.txt b/man/CMakeLists.txt -index 71bc502..ac424d2 100644 ---- a/man/CMakeLists.txt -+++ b/man/CMakeLists.txt -@@ -2,11 +2,12 @@ - # Use of this source code is governed by a BSD-style - # license that can be found in the LICENSE file. - -+include(GNUInstallDirs) -+ - find_program(MANDOC_PATH mandoc) - message(STATUS "MANDOC_PATH: ${MANDOC_PATH}") - - if(CMAKE_SYSTEM_NAME STREQUAL "Linux") -- find_program(GZIP_PATH gzip) - message(STATUS "GZIP_PATH: ${GZIP_PATH}") - endif() - -@@ -301,16 +302,16 @@ elseif(NOT MSVC) - foreach(f ${MAN_SOURCES}) - if (${f} MATCHES ".1$") - install(FILES ${CMAKE_BINARY_DIR}/man/${f} -- DESTINATION "${CMAKE_INSTALL_PREFIX}/man/man1") -+ DESTINATION "${CMAKE_INSTALL_MANDIR}/man1") - elseif(${f} MATCHES ".3$") - install(FILES ${CMAKE_BINARY_DIR}/man/${f} -- DESTINATION "${CMAKE_INSTALL_PREFIX}/man/man3") -+ DESTINATION "${CMAKE_INSTALL_MANDIR}/man3") - endif() - endforeach() - foreach(i RANGE 0 ${MAN_ALIAS_MAX} 2) - math(EXPR j "${i} + 1") - list(GET MAN_ALIAS ${j} DST) - install(FILES ${CMAKE_BINARY_DIR}/man/${DST}.3 -- DESTINATION ${CMAKE_INSTALL_PREFIX}/man/man3) -+ DESTINATION ${CMAKE_INSTALL_MANDIR}/man3) - endforeach() - endif() diff --git a/dev-libs/libfido2/files/libfido2-1.3.1-no-werror.patch b/dev-libs/libfido2/files/libfido2-1.3.1-no-werror.patch deleted file mode 100644 index d2ebc1a54a1b..000000000000 --- a/dev-libs/libfido2/files/libfido2-1.3.1-no-werror.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9481c46..b347fab 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -107,13 +107,11 @@ else() - - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wextra") -- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wshadow") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wwrite-strings") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wmissing-prototypes") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wbad-function-cast") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pedantic") -- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pedantic-errors") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fstack-protector-all") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99") - diff --git a/dev-libs/libfido2/files/libfido2-1.4.0-cmakelists.patch b/dev-libs/libfido2/files/libfido2-1.4.0-cmakelists.patch deleted file mode 100644 index df34a85dacc2..000000000000 --- a/dev-libs/libfido2/files/libfido2-1.4.0-cmakelists.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 0bb2e87..4d0ed00 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -128,13 +128,11 @@ else() - - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wextra") -- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wshadow") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wwrite-strings") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wmissing-prototypes") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wbad-function-cast") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pedantic") -- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pedantic-errors") - check_c_compiler_flag("-fstack-protector-all" HAVE_STACK_PROTECTOR_ALL) - if(HAVE_STACK_PROTECTOR_ALL) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fstack-protector-all") -diff --git a/man/CMakeLists.txt b/man/CMakeLists.txt -index 44e4a96..d04dacc 100644 ---- a/man/CMakeLists.txt -+++ b/man/CMakeLists.txt -@@ -5,11 +5,6 @@ - find_program(MANDOC_PATH mandoc) - message(STATUS "MANDOC_PATH: ${MANDOC_PATH}") - --if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "Linux") -- find_program(GZIP_PATH gzip) -- message(STATUS "GZIP_PATH: ${GZIP_PATH}") --endif() -- - list(APPEND MAN_SOURCES - eddsa_pk_new.3 - es256_pk_new.3 diff --git a/dev-libs/libfido2/libfido2-1.4.0.ebuild b/dev-libs/libfido2/libfido2-1.4.0.ebuild deleted file mode 100644 index 8fe49a3ff5f1..000000000000 --- a/dev-libs/libfido2/libfido2-1.4.0.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake-utils udev linux-info - -DESCRIPTION="Provides library functionality for FIDO 2.0" -HOMEPAGE="https://github.com/Yubico/libfido2" -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 ~s390 ~sparc ~x86" -IUSE="libressl +static-libs" - -DEPEND=" - dev-libs/libcbor:= - virtual/libudev:= - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) -" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}/libfido2-1.4.0-cmakelists.patch" -) - -pkg_pretend() { - CONFIG_CHECK=" - ~USB_HID - ~HIDRAW - " - - check_extra_config -} - -src_install() { - cmake-utils_src_install - - if ! use static-libs; then - rm -f "${D}/$(get_libdir)"/*.a || die - fi - - udev_newrules udev/70-u2f.rules 70-libfido2-u2f.rules -} diff --git a/dev-libs/libfido2/libfido2-1.5.0-r1.ebuild b/dev-libs/libfido2/libfido2-1.5.0-r1.ebuild index 8fbe1628305b..e836ac168b5d 100644 --- a/dev-libs/libfido2/libfido2-1.5.0-r1.ebuild +++ b/dev-libs/libfido2/libfido2-1.5.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 2020 Gentoo Authors +# Copyright 2020-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86" IUSE="libressl +static-libs" DEPEND=" diff --git a/dev-libs/libfido2/libfido2-1.3.1.ebuild b/dev-libs/libfido2/libfido2-1.6.0.ebuild index eb279f392c54..8fbe1628305b 100644 --- a/dev-libs/libfido2/libfido2-1.3.1.ebuild +++ b/dev-libs/libfido2/libfido2-1.6.0.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit cmake-utils udev linux-info +inherit cmake udev linux-info DESCRIPTION="Provides library functionality for FIDO 2.0" HOMEPAGE="https://github.com/Yubico/libfido2" @@ -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="~amd64 ~arm ~ppc ~ppc64 ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86" IUSE="libressl +static-libs" DEPEND=" @@ -20,11 +20,14 @@ DEPEND=" !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) " -RDEPEND="${DEPEND}" + +RDEPEND=" + ${DEPEND} + acct-group/plugdev +" PATCHES=( - "${FILESDIR}/libfido2-1.3.0-cmakelists.patch" - "${FILESDIR}/libfido2-1.3.1-no-werror.patch" + "${FILESDIR}/libfido2-1.5.0-cmakelists.patch" ) pkg_pretend() { @@ -37,10 +40,10 @@ pkg_pretend() { } src_install() { - cmake-utils_src_install + cmake_src_install if ! use static-libs; then - rm -f "${D}/$(get_libdir)"/*.a || die + rm -f "${ED}/$(get_libdir)"/*.a || die fi udev_newrules udev/70-u2f.rules 70-libfido2-u2f.rules diff --git a/dev-libs/libfilezilla/Manifest b/dev-libs/libfilezilla/Manifest index aef4494dcd10..edb771315b1c 100644 --- a/dev-libs/libfilezilla/Manifest +++ b/dev-libs/libfilezilla/Manifest @@ -1,3 +1,2 @@ -DIST libfilezilla-0.20.2.tar.bz2 549679 BLAKE2B 929c535ed7ad65fb35bc7f3a21c827ff51d01e387f383bf677f86b78aa79deafa81781eee87afe3c9c8a4d48c60ea02f7fff45b4e469f3755511c9b11001dc88 SHA512 242df38b335558c83fde91800787992adaa617292d119a15d8036adc1622b207127d0e8e6fb935b4300e1e0d63e196636589ba513e410c751dea052164a773d7 -DIST libfilezilla-0.24.1.tar.bz2 560439 BLAKE2B f4848149839fa121ed856726769a9517932ab0b34dd19696d66bd15ad8208fa0bb3e7dbf9cb31baeabea02ec6e0b7d0c8e48fbca3956c26251dcbbb4332c727c SHA512 f9075bb88e5c10617d21fb7b49f7e9bd38567eeca3c4a1cd8b1e20354b1e3da95f05618897cefa6758c7843efd9833230843f77a0c23e7019cf22c950e7e8e8c DIST libfilezilla-0.25.0.tar.bz2 562726 BLAKE2B 8e6f381d2eb00445b4553418aafca750ee2a49a10410fe8de0f31ee15a3d33bf679ee1a10bc6e77800747d14bd79e0e90a585a8a090a09e55adb392a96020907 SHA512 7c07807a6d11f3455e41c9593ddeab8b5947448c5205f10e1e7306e0df27df24821189c75167007e00671b5d573ded72208e6f923406e37e8e5e3c28181ebe1a +DIST libfilezilla-0.26.0.tar.bz2 564361 BLAKE2B 962f513846cf74a419a281c751266360196225c06577e7f5fe6b67f23ef3a4759f7372cac8fe11918e49a0ed20e08995c4bd971a02e692979dc09726be51fea9 SHA512 96ccc61e66dae744c092389a570f591e4f4e62ebf4fc39ed5a60206ea96b47b1aeb3d8f2fb7e22b4920560af4ec212540cc177d23ddbeea879dcd80143b86af6 diff --git a/dev-libs/libfilezilla/libfilezilla-0.20.2.ebuild b/dev-libs/libfilezilla/libfilezilla-0.20.2.ebuild deleted file mode 100644 index 13bbdb1ccbb0..000000000000 --- a/dev-libs/libfilezilla/libfilezilla-0.20.2.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 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/4" # 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.25.0.ebuild b/dev-libs/libfilezilla/libfilezilla-0.25.0.ebuild index 74e3d6fd82a5..db81501d1fee 100644 --- a/dev-libs/libfilezilla/libfilezilla-0.25.0.ebuild +++ b/dev-libs/libfilezilla/libfilezilla-0.25.0.ebuild @@ -10,7 +10,7 @@ SRC_URI="https://download.filezilla-project.org/${PN}/${P}.tar.bz2" LICENSE="GPL-2+" SLOT="0/10" # libfilezilla.so version -KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86" +KEYWORDS="amd64 ~arm ~ia64 ppc ppc64 x86" IUSE="test" RESTRICT="!test? ( test )" diff --git a/dev-libs/libfilezilla/libfilezilla-0.24.1.ebuild b/dev-libs/libfilezilla/libfilezilla-0.26.0.ebuild index 06fb1f38b744..2f343c359bae 100644 --- a/dev-libs/libfilezilla/libfilezilla-0.24.1.ebuild +++ b/dev-libs/libfilezilla/libfilezilla-0.26.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,7 +9,7 @@ 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 +SLOT="0/11" # libfilezilla.so version KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86" IUSE="test" diff --git a/dev-libs/libgamin/libgamin-0.1.10-r6.ebuild b/dev-libs/libgamin/libgamin-0.1.10-r6.ebuild index 00553e79c540..e5dd8a9130fc 100644 --- a/dev-libs/libgamin/libgamin-0.1.10-r6.ebuild +++ b/dev-libs/libgamin/libgamin-0.1.10-r6.ebuild @@ -17,7 +17,7 @@ SRC_URI="${SRC_URI} 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" +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 diff --git a/dev-libs/libgcrypt-compat/libgcrypt-compat-1.5.6.ebuild b/dev-libs/libgcrypt-compat/libgcrypt-compat-1.5.6.ebuild index 883aa2d30208..18a0edb2f72a 100644 --- a/dev-libs/libgcrypt-compat/libgcrypt-compat-1.5.6.ebuild +++ b/dev-libs/libgcrypt-compat/libgcrypt-compat-1.5.6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -13,7 +13,7 @@ HOMEPAGE="https://www.gnupg.org/" SRC_URI="mirror://gnupg/${MY_PN}/${MY_P}.tar.bz2" LICENSE="LGPL-2.1 MIT" SLOT="11" # soname major version -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" RDEPEND=">=dev-libs/libgpg-error-1.12[${MULTILIB_USEDEP}] !dev-libs/libgcrypt:0/11 diff --git a/dev-libs/libgcrypt/libgcrypt-1.8.6.ebuild b/dev-libs/libgcrypt/libgcrypt-1.8.6.ebuild index 9d43a773b9d0..4a892f63e455 100644 --- a/dev-libs/libgcrypt/libgcrypt-1.8.6.ebuild +++ b/dev-libs/libgcrypt/libgcrypt-1.8.6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,8 +11,8 @@ 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" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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}" @@ -40,9 +40,10 @@ multilib_src_configure() { append-cflags -Wa,--divide fi local myeconfargs=( - CC_FOR_BUILD=$(tc-getBUILD_CC) + CC_FOR_BUILD="$(tc-getBUILD_CC)" --enable-noexecstack - --disable-static + # required for sys-power/suspend[crypt], bug 751568 + $(use_enable static-libs static) $(use_enable o-flag-munging O-flag-munging) # disabled due to various applications requiring privileges diff --git a/dev-libs/libgcrypt/libgcrypt-1.8.7.ebuild b/dev-libs/libgcrypt/libgcrypt-1.8.7.ebuild index f599a339db84..ecface3601d1 100644 --- a/dev-libs/libgcrypt/libgcrypt-1.8.7.ebuild +++ b/dev-libs/libgcrypt/libgcrypt-1.8.7.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,8 +11,8 @@ 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" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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}" @@ -40,9 +40,10 @@ multilib_src_configure() { append-cflags -Wa,--divide fi local myeconfargs=( - CC_FOR_BUILD=$(tc-getBUILD_CC) + CC_FOR_BUILD="$(tc-getBUILD_CC)" --enable-noexecstack - --disable-static + # required for sys-power/suspend[crypt], bug 751568 + $(use_enable static-libs static) $(use_enable o-flag-munging O-flag-munging) # disabled due to various applications requiring privileges diff --git a/dev-libs/libgee/libgee-0.20.3.ebuild b/dev-libs/libgee/libgee-0.20.3.ebuild index 5239bab99826..1fc2c61ea356 100644 --- a/dev-libs/libgee/libgee-0.20.3.ebuild +++ b/dev-libs/libgee/libgee-0.20.3.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Libgee" LICENSE="LGPL-2.1+" SLOT="0.8/2" -KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 sparc x86 ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86 ~x86-linux" IUSE="+introspection" # FIXME: add doc support, requires valadoc diff --git a/dev-libs/libgit2-glib/libgit2-glib-0.99.0.1-r1.ebuild b/dev-libs/libgit2-glib/libgit2-glib-0.99.0.1-r2.ebuild index b68edfde1802..cdded51b6f98 100644 --- a/dev-libs/libgit2-glib/libgit2-glib-0.99.0.1-r1.ebuild +++ b/dev-libs/libgit2-glib/libgit2-glib-0.99.0.1-r2.ebuild @@ -19,8 +19,7 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" RDEPEND=" >=dev-libs/gobject-introspection-1.54:= >=dev-libs/glib-2.44.0:2 - <dev-libs/libgit2-1.1:0=[ssh?] - >=dev-libs/libgit2-0.26.0:0 + >=dev-libs/libgit2-0.26.0:0=[ssh?] python? ( ${PYTHON_DEPS} dev-python/pygobject:3[${PYTHON_USEDEP}] ) diff --git a/dev-libs/libgit2/Manifest b/dev-libs/libgit2/Manifest index 670805a7b739..8699bbf4ef87 100644 --- a/dev-libs/libgit2/Manifest +++ b/dev-libs/libgit2/Manifest @@ -1,2 +1 @@ -DIST libgit2-1.0.1.tar.gz 5312878 BLAKE2B 7eb97bb97d66240ce135e21d348f6dea0c5626992b608f8944b75f9bae5de933fffa07edd536c0353841f8d02c950feec1451008003e35f53554f3c59b069a7f SHA512 7c307822b22e3771e5e908b115600310f7901b3250287532c498003b25a5b1e007bfa23592f16ec4d83c1567a9213710526f78cab7c120316e9a8fc74c5e57a9 DIST libgit2-1.1.0.tar.gz 5426975 BLAKE2B 2a1c1f71d2a2e06448c78eb46028fdcfd59682dccf2365851c4bd059cdd78842320f9a5ba7345e761611a5b4eba634faf2e26cc669097da0ba2e1c832c23059f SHA512 347bb68900181b44fa58a0417506c91383adb965607fce049a5b4c57ac9cc286e0a140d164c339b50fb6cd6951f47757c2917a2df44ba004bfaa4fb643946bb8 diff --git a/dev-libs/libgit2/libgit2-1.0.1-r1.ebuild b/dev-libs/libgit2/libgit2-1.0.1-r1.ebuild deleted file mode 100644 index 81769843e2a8..000000000000 --- a/dev-libs/libgit2/libgit2-1.0.1-r1.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,8,9,10} ) -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=" - dev-libs/libpcre:= - net-libs/http-parser:= - sys-libs/zlib - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - 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.1.0-r2.ebuild b/dev-libs/libgit2/libgit2-1.1.0-r2.ebuild index c005f6686a3d..3900f6ed0fd6 100644 --- a/dev-libs/libgit2/libgit2-1.1.0-r2.ebuild +++ b/dev-libs/libgit2/libgit2-1.1.0-r2.ebuild @@ -13,7 +13,7 @@ S=${WORKDIR}/${P/_/-} LICENSE="GPL-2-with-linking-exception" SLOT="0/1.1" -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/libgnt/libgnt-2.14.0.ebuild b/dev-libs/libgnt/libgnt-2.14.0.ebuild index 6986a1fa1101..f0be4f330c90 100644 --- a/dev-libs/libgnt/libgnt-2.14.0.ebuild +++ b/dev-libs/libgnt/libgnt-2.14.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ 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" IUSE="doc" RDEPEND=" diff --git a/dev-libs/libgpg-error/Manifest b/dev-libs/libgpg-error/Manifest index 12d0c74cb2cb..3ae617ed7b4e 100644 --- a/dev-libs/libgpg-error/Manifest +++ b/dev-libs/libgpg-error/Manifest @@ -1,3 +1,4 @@ DIST gen-lock-obj-1.38.sh 2643 BLAKE2B 5040b027a95f10bac4a0ba463c8bb8387514ca9136e019fc647183456593df27473eb79af1d79e803984dd2b93166c286809b376968584cc320679de95fcfbba SHA512 d60999a08f70f5bcf1b66099c5d7b5f715dbd881bd0d75dbdde3a8932e9b064166f0524a45ae88b5b182c620aee526e14095ffdee68403b5d3b087b4dc4c0c2c DIST libgpg-error-1.38.tar.bz2 957637 BLAKE2B 9532402466748503805366b94c82c9adfe5b448f885c26b33ebf7ba9957161ca046b4057f5ca862224accb9f2af731652a55d20e7a4ab69107190a58c8e11ad6 SHA512 b936a4738c2cee111d855b1ba3ec433da8c77799a87d1f71275f974f871ebfa593c9db06ea53f0490b6cd6b94bef34f6052a587a4d13d839ec0128500c2dd9de DIST libgpg-error-1.39.tar.bz2 961676 BLAKE2B 8753a9295ca57ba79142ffbc7fa01a986addcdd6a8860cf80c9e1bf9f6f9dfce874f804205a5cdd956e026eb006f2662110c63e7ed52c7a42ee0c45923ae52be SHA512 b28be183ac3d3920363558c4b5b2c24f9074a302799915cc076674bb349dcfb6f09160bec1d3fb62e04047c3ce432d345f36b0905100a88cc730b53d4eb78e42 +DIST libgpg-error-1.41.tar.bz2 967117 BLAKE2B 9dc95bc09f55915d904e0f956ecf9281615028b8b8d876dbc786b752068fefea56adfb5dd5db65bad656ab664d567e56541e44a584c7f8672c30537ed05c4db0 SHA512 578d1d8090b9f6e6cbe59d9aeebec7df81aae492f75ec343f8df530950d30866fa0a7903ca050bf7bf721413f7b2708abe34f7467e2b208cc1447ffc9bd5b9a5 diff --git a/dev-libs/libgpg-error/libgpg-error-1.38.ebuild b/dev-libs/libgpg-error/libgpg-error-1.38.ebuild index 659af6020bcb..d37b93f1d197 100644 --- a/dev-libs/libgpg-error/libgpg-error-1.38.ebuild +++ b/dev-libs/libgpg-error/libgpg-error-1.38.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -12,8 +12,8 @@ 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" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="common-lisp nls static-libs" RDEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )" DEPEND="${RDEPEND}" @@ -53,7 +53,8 @@ multilib_src_configure() { $(multilib_is_native_abi || echo --disable-languages) $(use_enable common-lisp languages) $(use_enable nls) - --disable-static + # required for sys-power/suspend[crypt], bug 751568 + $(use_enable static-libs static) --enable-threads CC_FOR_BUILD="$(tc-getBUILD_CC)" $("${S}/configure" --help | grep -o -- '--without-.*-prefix') diff --git a/dev-libs/libgpg-error/libgpg-error-1.39.ebuild b/dev-libs/libgpg-error/libgpg-error-1.39.ebuild index 88ff7e806139..548ddb2954c2 100644 --- a/dev-libs/libgpg-error/libgpg-error-1.39.ebuild +++ b/dev-libs/libgpg-error/libgpg-error-1.39.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,8 +11,8 @@ 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" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="common-lisp nls static-libs" RDEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )" DEPEND="${RDEPEND}" @@ -44,7 +44,8 @@ multilib_src_configure() { $(multilib_is_native_abi || echo --disable-languages) $(use_enable common-lisp languages) $(use_enable nls) - --disable-static + # required for sys-power/suspend[crypt], bug 751568 + $(use_enable static-libs static) --enable-threads CC_FOR_BUILD="$(tc-getBUILD_CC)" $("${S}/configure" --help | grep -o -- '--without-.*-prefix') diff --git a/dev-libs/libgpg-error/libgpg-error-1.41.ebuild b/dev-libs/libgpg-error/libgpg-error-1.41.ebuild new file mode 100644 index 000000000000..c6202ddd30fc --- /dev/null +++ b/dev-libs/libgpg-error/libgpg-error-1.41.ebuild @@ -0,0 +1,65 @@ +# Copyright 1999-2021 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="https://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 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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 + + if use prefix ; then + # don't hardcode /usr/xpg4/bin/sh as shell on Solaris + sed -i -e 's/solaris\*/disabled/' configure.ac || die + fi + + # 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) + # required for sys-power/suspend[crypt], bug 751568 + $(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/libgpiod/libgpiod-1.1.1.ebuild b/dev-libs/libgpiod/libgpiod-1.1.1.ebuild index 3435a33062ce..a933e767983e 100644 --- a/dev-libs/libgpiod/libgpiod-1.1.1.ebuild +++ b/dev-libs/libgpiod/libgpiod-1.1.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -7,7 +7,7 @@ inherit multilib multilib-minimal DESCRIPTION="C library and tools for interacting with the linux GPIO character device" HOMEPAGE="https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/" -SRC_URI="https://mirrors.edge.kernel.org/pub/software/libs/libgpiod/libgpiod-1.1.1.tar.xz" +SRC_URI="https://mirrors.edge.kernel.org/pub/software/libs/libgpiod/${P}.tar.xz" LICENSE="LGPL-2.1" # Reflects the ABI of libgpiod.so diff --git a/dev-libs/libgudev/Manifest b/dev-libs/libgudev/Manifest index e63c05c5c944..f6f67a720306 100644 --- a/dev-libs/libgudev/Manifest +++ b/dev-libs/libgudev/Manifest @@ -1 +1,2 @@ DIST libgudev-233.tar.xz 271292 BLAKE2B 02c9a1040e3db21a9478927cce99cc8fdb360db922fc35421fd41ceeaffc786aa9f397f9387ac9d98bdd8ed45a457af2c0d33df731edfa08b63cb64a2c7fa4e6 SHA512 0e7beb35478bba2aed3cf8e750f524c562038b04fd59e4dd31618b0ae7cbd29545e5909c422325e4be84dcab9177a5256bf0f3ce7df7b6c07e4866cbb8ce570b +DIST libgudev-234.tar.xz 273244 BLAKE2B c0556988e37d5a5c48ba906b121d3c7a16c6a8ee4d05eb0e51913b9cde51bdc10966dcf8ceeccf62021dd8e47b004c85ed3412942d9d2bd5176d604931745f50 SHA512 cb01906d532b05cf8f69acdf80a8f05fbd4863fd98e88928b491e3657e60844f7ae6ca903ddd773fbea37268ff85d12719de47fd92a2f18b98fa2dbfe85e8151 diff --git a/dev-libs/libgudev/libgudev-234.ebuild b/dev-libs/libgudev/libgudev-234.ebuild new file mode 100644 index 000000000000..e163aab6636e --- /dev/null +++ b/dev-libs/libgudev/libgudev-234.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit gnome2 multilib-minimal + +DESCRIPTION="GObject bindings for libudev" +HOMEPAGE="https://wiki.gnome.org/Projects/libgudev" + +LICENSE="LGPL-2.1+" +SLOT="0/0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" +IUSE="introspection static-libs" + +DEPEND=" + >=dev-libs/glib-2.38.0:2[${MULTILIB_USEDEP},static-libs?] + >=virtual/libudev-199:=[${MULTILIB_USEDEP},static-libs(-)?] + introspection? ( >=dev-libs/gobject-introspection-1.31.1 ) +" +RDEPEND="${DEPEND} + !sys-fs/eudev[gudev(-)] + !sys-fs/udev[gudev(-)] + !sys-apps/systemd[gudev(-)] +" +BDEPEND=" + dev-util/glib-utils + >=dev-util/gtk-doc-am-1.18 + virtual/pkgconfig +" + +multilib_src_configure() { + local myconf=( + $(multilib_native_use_enable introspection) + $(use_enable static-libs static) + --disable-umockdev # umockdev tests currently don't pass (might need extra setup) + ) + local ECONF_SOURCE="${S}" + gnome2_src_configure "${myconf[@]}" +} + +multilib_src_install() { + gnome2_src_install +} diff --git a/dev-libs/libgusb/libgusb-0.3.3.ebuild b/dev-libs/libgusb/libgusb-0.3.3.ebuild index 364b24314774..54f4646d9e52 100644 --- a/dev-libs/libgusb/libgusb-0.3.3.ebuild +++ b/dev-libs/libgusb/libgusb-0.3.3.ebuild @@ -12,7 +12,7 @@ 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" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86" IUSE="gtk-doc +introspection static-libs test +vala" REQUIRED_USE="vala? ( introspection )" diff --git a/dev-libs/libical/libical-3.0.8.ebuild b/dev-libs/libical/libical-3.0.8.ebuild index e194b73bd222..dbba3a27bbd6 100644 --- a/dev-libs/libical/libical-3.0.8.ebuild +++ b/dev-libs/libical/libical-3.0.8.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz" LICENSE="|| ( MPL-2.0 LGPL-2.1 )" SLOT="0/3" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris" IUSE="berkdb doc examples +glib +introspection static-libs test vala" REQUIRED_USE="introspection? ( glib ) vala? ( introspection )" diff --git a/dev-libs/libiconv/libiconv-1.15.ebuild b/dev-libs/libiconv/libiconv-1.15.ebuild index 146ebfa72093..7afa37189e82 100644 --- a/dev-libs/libiconv/libiconv-1.15.ebuild +++ b/dev-libs/libiconv/libiconv-1.15.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="6" @@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/libiconv/${P}.tar.gz" LICENSE="LGPL-2+ GPL-3+" SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~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 ~x86-winnt" +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" IUSE="prefix static-libs" DEPEND="!sys-libs/glibc diff --git a/dev-libs/libinput/Manifest b/dev-libs/libinput/Manifest index 23ead4b17df6..e02e4cf1b277 100644 --- a/dev-libs/libinput/Manifest +++ b/dev-libs/libinput/Manifest @@ -1,3 +1 @@ -DIST libinput-1.16.1.tar.xz 595548 BLAKE2B 497089248c2104ff7784b7d46d8e846047e054f01c6ea192f1c41171b39213fa1f19be8c8253c32f988bfc6f025d2519697256ffaf62884182c511bcd5c5d335 SHA512 86b2d563c2cff2b3d3cae3acdd399030cc785cc9859a06357a99565ef51f95122a8427c8c0883121fb0760613460a29c8cd8c7a7e3ac68115c10330b3b75cbe0 -DIST libinput-1.16.3.tar.xz 594948 BLAKE2B 6fad03dc8ab0280435b89a1049ed019d29e795279273277c9cad4676f484856d2677845ddc1c5102f2430645053a77c1cde48bb32530d4290ade576843a51ded SHA512 cdf87988b24dc0a44b7b6ed3e15e70c7702bf65f1cfe257924967677c7a1f1485011a9e30254ba8962c83885de78f824e7955cedb07322676332d42532ec4a39 DIST libinput-1.16.4.tar.xz 596028 BLAKE2B ad2160d83bcbdd65383272e0c4b35e35c7b46a6d0c771d7c0188c92b204d57dae73d0820bb93f662f155c1eab19c0195110f5a18a68de890c808925d5c056814 SHA512 a95a3bcf58a9298946d15f4f2fd93dc5807d3042f8797950a1ffd96d3c979b55a764f035a9f7680d0ea400b033698c322eb61a4387dbc280db6110ffd3e137ee diff --git a/dev-libs/libinput/libinput-1.16.1.ebuild b/dev-libs/libinput/libinput-1.16.1.ebuild deleted file mode 100644 index ffefb4602a0a..000000000000 --- a/dev-libs/libinput/libinput-1.16.1.ebuild +++ /dev/null @@ -1,88 +0,0 @@ -# Copyright 2014-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{6,7,8,9,10} ) - -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_prepare() { - default - sed "s@, '-Werror'@@" -i meson.build || die #744250 -} - -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/libinput/libinput-1.16.3.ebuild b/dev-libs/libinput/libinput-1.16.3.ebuild deleted file mode 100644 index 4dcfd823d9e3..000000000000 --- a/dev-libs/libinput/libinput-1.16.3.ebuild +++ /dev/null @@ -1,88 +0,0 @@ -# Copyright 2014-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{6,7,8,9,10} ) - -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 ~riscv ~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_prepare() { - default - sed "s@, '-Werror'@@" -i meson.build || die #744250 -} - -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/libinput/libinput-1.16.4.ebuild b/dev-libs/libinput/libinput-1.16.4.ebuild index a0035975ee74..4dcfd823d9e3 100644 --- a/dev-libs/libinput/libinput-1.16.4.ebuild +++ b/dev-libs/libinput/libinput-1.16.4.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 ~riscv ~s390 sparc x86" IUSE="doc input_devices_wacom test" RESTRICT="!test? ( test )" diff --git a/dev-libs/libintl/libintl-0.19.7.ebuild b/dev-libs/libintl/libintl-0.19.7.ebuild index d3833d165dc0..dec3e8f51eed 100644 --- a/dev-libs/libintl/libintl-0.19.7.ebuild +++ b/dev-libs/libintl/libintl-0.19.7.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # Note: Keep version bumps in sync with sys-devel/gettext. @@ -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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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.19.8.1.ebuild b/dev-libs/libintl/libintl-0.19.8.1.ebuild index d3833d165dc0..dec3e8f51eed 100644 --- a/dev-libs/libintl/libintl-0.19.8.1.ebuild +++ b/dev-libs/libintl/libintl-0.19.8.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # Note: Keep version bumps in sync with sys-devel/gettext. @@ -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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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 83b7e5e77b3f..f5fe90548381 100644 --- a/dev-libs/libintl/libintl-0.20.1.ebuild +++ b/dev-libs/libintl/libintl-0.20.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # Note: Keep version bumps in sync with sys-devel/gettext. @@ -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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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 index 381e47de63d1..0dc5bb897e35 100644 --- a/dev-libs/libintl/libintl-0.20.2.ebuild +++ b/dev-libs/libintl/libintl-0.20.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # Note: Keep version bumps in sync with sys-devel/gettext. @@ -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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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.21.ebuild b/dev-libs/libintl/libintl-0.21.ebuild index 349df2d47e3c..85dd82bf4f60 100644 --- a/dev-libs/libintl/libintl-0.21.ebuild +++ b/dev-libs/libintl/libintl-0.21.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # Note: Keep version bumps in sync with sys-devel/gettext. @@ -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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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/libisoburn/libisoburn-1.5.2.ebuild b/dev-libs/libisoburn/libisoburn-1.5.2.ebuild index b9bd7d96470d..cdad7cdcc5fa 100644 --- a/dev-libs/libisoburn/libisoburn-1.5.2.ebuild +++ b/dev-libs/libisoburn/libisoburn-1.5.2.ebuild @@ -9,7 +9,7 @@ SRC_URI="http://files.libburnia-project.org/releases/${P}.tar.gz" LICENSE="GPL-2 GPL-3" 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="acl debug external-filters external-filters-setuid frontend-optional launch-frontend launch-frontend-setuid libedit readline static-libs xattr zlib" diff --git a/dev-libs/libisofs/libisofs-1.5.2.ebuild b/dev-libs/libisofs/libisofs-1.5.2.ebuild index ad408bb7c646..85ba5030dbca 100644 --- a/dev-libs/libisofs/libisofs-1.5.2.ebuild +++ b/dev-libs/libisofs/libisofs-1.5.2.ebuild @@ -9,7 +9,7 @@ SRC_URI="http://files.libburnia-project.org/releases/${P}.tar.gz" LICENSE="GPL-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="acl debug static-libs verbose-debug xattr zlib" BDEPEND=" diff --git a/dev-libs/libjcat/Manifest b/dev-libs/libjcat/Manifest index 97d28c25824f..44f83fcb4880 100644 --- a/dev-libs/libjcat/Manifest +++ b/dev-libs/libjcat/Manifest @@ -1,2 +1,3 @@ DIST libjcat-0.1.3.tar.gz 63765 BLAKE2B a9847fe2a93f49773ba6451036d7908b8b615a6334557a68c94db3c402e1f502e2915bb1abc9f58c495fe1453cb5653cae9b548d2f9d7b39dcd5d7824e965bc2 SHA512 f021e10d740ac6d0f0c73cefc9deacdbc74882a5e340b249c28427ece4917358940413914ce19c5aac96c86d8056349ff2ee633c2a9541f4382f109d9e0d9e69 DIST libjcat-0.1.4.tar.gz 63900 BLAKE2B 509a9916aa77193835e5a29a152acb0eb1cee24b6aae3e256dee42c1fd598b9c181009cdea4c276cc0d8c8cb56d22b9073f44dd11b7fab59d29df3633af6d042 SHA512 d58860410ce6e9d35a1eefcd0c6fcd956db42a12a3e8f856e19e3abe8bd6ae304ab7a60e2c1ee28f3848f2fee3b406dd900d7c1024eca5602797711528d3f7e3 +DIST libjcat-0.1.5.tar.gz 64244 BLAKE2B fce5324981b757c7d5f9196790984a0d02e4dad3a0f75bf7262dcadc82838137537865395d75cdb6c59dade45babe0143243202bc01e41a9af5696ef79a44ec4 SHA512 ad4fb27582d24d3a7f62c8fd39c6a45d77e4e8cb005b73fe2f0cf4d697b555ca3e503c5edb05694526609d8baf7e9c21dad1465c78c8e3ee125df6a1bb79835a diff --git a/dev-libs/libjcat/libjcat-0.1.3-r1.ebuild b/dev-libs/libjcat/libjcat-0.1.5.ebuild index c6f2e5ae3758..7948f5c68776 100644 --- a/dev-libs/libjcat/libjcat-0.1.3-r1.ebuild +++ b/dev-libs/libjcat/libjcat-0.1.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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 ~arm ~x86" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" IUSE="gpg gtk-doc +introspection +man pkcs7 test vala" RDEPEND="dev-libs/glib:2 @@ -39,7 +39,6 @@ RESTRICT="!test? ( test )" PATCHES=( "${FILESDIR}"/${PN}-0.1.1-disable_installed_tests.patch - "${FILESDIR}"/${PN}-0.1.3-optional_vala.patch ) python_check_deps() { @@ -60,7 +59,7 @@ src_configure() { $(meson_use man) $(meson_use pkcs7) $(meson_use test tests) - $(meson_use vala vala-bindings) + $(meson_use vala vapi) ) meson_src_configure } diff --git a/dev-libs/libksba/libksba-1.3.5-r1.ebuild b/dev-libs/libksba/libksba-1.3.5-r1.ebuild index 431c17fdab6a..718d54e20f0f 100644 --- a/dev-libs/libksba/libksba-1.3.5-r1.ebuild +++ b/dev-libs/libksba/libksba-1.3.5-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="6" @@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/libksba/${P}.tar.bz2" LICENSE="LGPL-3+ GPL-2+ GPL-3" SLOT="0" -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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="static-libs" RDEPEND=">=dev-libs/libgpg-error-1.8" diff --git a/dev-libs/libksba/libksba-1.3.5-r2.ebuild b/dev-libs/libksba/libksba-1.3.5-r2.ebuild index bbd058f9e22e..d578dfe902f2 100644 --- a/dev-libs/libksba/libksba-1.3.5-r2.ebuild +++ b/dev-libs/libksba/libksba-1.3.5-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,7 +9,7 @@ SRC_URI="mirror://gnupg/libksba/${P}.tar.bz2" LICENSE="LGPL-3+ GPL-2+ GPL-3" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="static-libs" RDEPEND=">=dev-libs/libgpg-error-1.8" diff --git a/dev-libs/libksba/libksba-1.4.0.ebuild b/dev-libs/libksba/libksba-1.4.0.ebuild index ab8d6efc3dc5..28ed8e619e8e 100644 --- a/dev-libs/libksba/libksba-1.4.0.ebuild +++ b/dev-libs/libksba/libksba-1.4.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,7 +9,7 @@ SRC_URI="mirror://gnupg/libksba/${P}.tar.bz2" LICENSE="LGPL-3+ GPL-2+ GPL-3" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="static-libs" RDEPEND=">=dev-libs/libgpg-error-1.8" diff --git a/dev-libs/libksba/libksba-1.5.0.ebuild b/dev-libs/libksba/libksba-1.5.0.ebuild index ab8d6efc3dc5..28ed8e619e8e 100644 --- a/dev-libs/libksba/libksba-1.5.0.ebuild +++ b/dev-libs/libksba/libksba-1.5.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,7 +9,7 @@ SRC_URI="mirror://gnupg/libksba/${P}.tar.bz2" LICENSE="LGPL-3+ GPL-2+ GPL-3" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="static-libs" RDEPEND=">=dev-libs/libgpg-error-1.8" diff --git a/dev-libs/liblinear/Manifest b/dev-libs/liblinear/Manifest index 0d3874cc1194..1561b8349484 100644 --- a/dev-libs/liblinear/Manifest +++ b/dev-libs/liblinear/Manifest @@ -1,5 +1,2 @@ -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 +DIST liblinear-242.tar.gz 561806 BLAKE2B 49c8f87909083addaf62666f34c008e6cf44240f28fdf2fbeca89862e9e19d451cc7ff51ce5b5da589cc701f70ce408c3eefb249f8585a8598e5ff3976177fe2 SHA512 fbcb219f7313b15898e55bd17c6b280007dd4feb913fafd2c3e10375b5a63b8bd274c9d52fd7b265a7575d4657cf4797b734e5793b18c758dfd9ab731fc0e904 diff --git a/dev-libs/liblinear/liblinear-210-r1.ebuild b/dev-libs/liblinear/liblinear-210-r1.ebuild deleted file mode 100644 index fb59d193d192..000000000000 --- a/dev-libs/liblinear/liblinear-210-r1.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -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/3" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86" - -src_prepare() { - 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 ${PN}.so.3 - dosym ${PN}.so.3 /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-221.ebuild b/dev-libs/liblinear/liblinear-221.ebuild deleted file mode 100644 index b99f3d0ac3d3..000000000000 --- a/dev-libs/liblinear/liblinear-221.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 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/3" -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.3 - dosym ${PN}.so.3 /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-230.ebuild b/dev-libs/liblinear/liblinear-230.ebuild deleted file mode 100644 index b99f3d0ac3d3..000000000000 --- a/dev-libs/liblinear/liblinear-230.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 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/3" -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.3 - dosym ${PN}.so.3 /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 index 94375db456f1..45dd62fa8788 100644 --- a/dev-libs/liblinear/liblinear-241.ebuild +++ b/dev-libs/liblinear/liblinear-241.ebuild @@ -10,7 +10,7 @@ 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" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos" src_prepare() { default diff --git a/dev-libs/liblinear/liblinear-240-r1.ebuild b/dev-libs/liblinear/liblinear-242.ebuild index ede9a159d953..a26af094c70c 100644 --- a/dev-libs/liblinear/liblinear-240-r1.ebuild +++ b/dev-libs/liblinear/liblinear-242.ebuild @@ -1,8 +1,9 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" -inherit multilib toolchain-funcs +EAPI=7 + +inherit toolchain-funcs DESCRIPTION="A Library for Large Linear Classification" HOMEPAGE="https://www.csie.ntu.edu.tw/~cjlin/liblinear/ https://github.com/cjlin1/liblinear" @@ -26,6 +27,12 @@ src_prepare() { -e '/^CFLAGS/d;/^CXXFLAGS/d' \ -e 's|$${SHARED_LIB_FLAG}|& $(LDFLAGS)|g' \ Makefile || die + + # fix install_name on Darwin + sed -i \ + -e '/install_name/s:liblinear.so.$(SHVER):'"${EPREFIX}"'/usr/lib/liblinear.$(SHVER).dylib:' \ + -e '/LDFLAGS/s:liblinear.so.$(SHVER):liblinear'"$(get_libname '$(SHVER)')"':' \ + Makefile || die } src_compile() { @@ -40,8 +47,8 @@ src_compile() { } src_install() { - dolib.so ${PN}.so.4 - dosym ${PN}.so.4 /usr/$(get_libdir)/${PN}.so + dolib.so ${PN}$(get_libname 4) + dosym ${PN}$(get_libname 4) /usr/$(get_libdir)/${PN}$(get_libname) newbin predict ${PN}-predict newbin train ${PN}-train diff --git a/dev-libs/liblogging/liblogging-1.0.6.ebuild b/dev-libs/liblogging/liblogging-1.0.6.ebuild index ea91d1718f7b..020b1e8e0616 100644 --- a/dev-libs/liblogging/liblogging-1.0.6.ebuild +++ b/dev-libs/liblogging/liblogging-1.0.6.ebuild @@ -11,7 +11,7 @@ SRC_URI="http://download.rsyslog.com/liblogging/${P}.tar.gz" LICENSE="BSD-2" SLOT="0/0" -KEYWORDS="amd64 arm ~arm64 hppa x86" +KEYWORDS="amd64 arm ~arm64 ~hppa x86" IUSE="rfc3195 +stdlog systemd" RDEPEND="systemd? ( sys-apps/systemd )" diff --git a/dev-libs/liblognorm/liblognorm-2.0.6.ebuild b/dev-libs/liblognorm/liblognorm-2.0.6.ebuild index 4454eb1aea10..0ee542364f3b 100644 --- a/dev-libs/liblognorm/liblognorm-2.0.6.ebuild +++ b/dev-libs/liblognorm/liblognorm-2.0.6.ebuild @@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]]; then inherit git-r3 else SRC_URI="https://www.liblognorm.com/files/download/${P}.tar.gz" - KEYWORDS="amd64 arm ~arm64 hppa x86 ~amd64-linux" + KEYWORDS="amd64 arm ~arm64 ~hppa x86 ~amd64-linux" fi LICENSE="LGPL-2.1 Apache-2.0" diff --git a/dev-libs/liblognorm/metadata.xml b/dev-libs/liblognorm/metadata.xml index 2b707f315ff4..f508d1827906 100644 --- a/dev-libs/liblognorm/metadata.xml +++ b/dev-libs/liblognorm/metadata.xml @@ -5,10 +5,6 @@ <email>whissi@gentoo.org</email> <name>Thomas Deutschmann</name> </maintainer> - <maintainer type="person"> - <email>maksbotan@gentoo.org</email> - <name>Maxim Koltsov</name> - </maintainer> <slots> <subslots>Reflect ABI of liblognorm.so.</subslots> </slots> diff --git a/dev-libs/liblouis/Manifest b/dev-libs/liblouis/Manifest index e8d3c656cf3b..f9119f8e9902 100644 --- a/dev-libs/liblouis/Manifest +++ b/dev-libs/liblouis/Manifest @@ -1,2 +1 @@ -DIST liblouis-3.10.0.tar.gz 13335626 BLAKE2B a4c7f81f15c202c0e1030119f805e218dd51852af57065c441241f4e182828036372750231726802adbb835a7af05ccbf029316da376f3f89dd62ae9d833f838 SHA512 e05d42ba352b1336b10ecd3d320c2bed33250cd636767ecd77837530577c537de4f4e806ddaf1ed7e8b9ec766c84adf6ab045595235c1020f2bb31ba791f3833 DIST liblouis-3.13.0.tar.gz 14683684 BLAKE2B 9596fac30ee8512498826ea11c3fe4d9dfba6706166938852242533f1fadde9ca8e363ea1364ebb4266b366ee49863d84ad757f8634d90e48dd8c562c31e9e8d SHA512 68f0205dc55a106c5707f959c1c0d3c121dfe62f263a664e6bec0780bee65cce2fb5d7033ae1c8312d1d79f7ccaf650af71906e8651b60f11219758e41051b61 diff --git a/dev-libs/liblouis/liblouis-3.10.0.ebuild b/dev-libs/liblouis/liblouis-3.10.0.ebuild deleted file mode 100644 index b2a34ed1992d..000000000000 --- a/dev-libs/liblouis/liblouis-3.10.0.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,9,10} ) -PYTHON_REQ_USE='wide-unicode(+)' -DISTUTILS_OPTIONAL=1 -inherit autotools distutils-r1 - -DESCRIPTION="An open-source braille translator and back-translator" -HOMEPAGE="https://github.com/liblouis/liblouis" -SRC_URI="https://github.com/liblouis/liblouis/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="LGPL-2.1+" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~sparc x86" -IUSE="python" -BDEPEND="sys-apps/help2man" -RDEPEND="python? ( ${PYTHON_DEPS} )" -DEPEND="${RDEPEND}" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -src_prepare() { - default - - if use python; then - pushd python > /dev/null - distutils-r1_src_prepare - popd > /dev/null - fi - eautoreconf -} - -src_configure() { - econf \ - --enable-ucs4 \ - --disable-static -} - -src_compile() { - default - - if use python; then - pushd python > /dev/null - # setup.py imports liblouis to get the version number, - # and this causes the shared library to be dlopened - # at build-time. Hack around it with LD_PRELOAD. - # Thanks ArchLinux. - LD_PRELOAD+=':../liblouis/.libs/liblouis.so' - distutils-r1_src_compile - popd > /dev/null - fi -} - -src_install() { - emake DESTDIR="${D}" install - - if use python; then - pushd python > /dev/null - LD_PRELOAD+=':../liblouis/.libs/liblouis.so' \ - distutils-r1_src_install - popd > /dev/null - fi - - DOCS=( README AUTHORS NEWS ChangeLog doc/liblouis.txt ) - HTML_DOCS=( doc/liblouis.html ) - einstalldocs - - find "${ED}" -name '*.la' -delete || die -} diff --git a/dev-libs/libltdl/libltdl-2.4.6.ebuild b/dev-libs/libltdl/libltdl-2.4.6.ebuild index 802a381eb96e..019882fda44e 100644 --- a/dev-libs/libltdl/libltdl-2.4.6.ebuild +++ b/dev-libs/libltdl/libltdl-2.4.6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/libtool/${MY_P}.tar.xz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="static-libs" # libltdl doesn't have a testsuite. RESTRICT="test" diff --git a/dev-libs/liblzw/liblzw-0.2-r1.ebuild b/dev-libs/liblzw/liblzw-0.2-r1.ebuild index ccfc8b9e57c6..cf4eda2ecdfd 100644 --- a/dev-libs/liblzw/liblzw-0.2-r1.ebuild +++ b/dev-libs/liblzw/liblzw-0.2-r1.ebuild @@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/freestdf/${P}.tar.lzma" LICENSE="public-domain" SLOT="0" -KEYWORDS="amd64 arm hppa ~ia64 ~m68k s390 x86" +KEYWORDS="amd64 arm ~hppa ~ia64 ~m68k s390 x86" src_configure() { econf --disable-static diff --git a/dev-libs/libmaxminddb/Manifest b/dev-libs/libmaxminddb/Manifest index 36385f92cdc4..099eafa997e6 100644 --- a/dev-libs/libmaxminddb/Manifest +++ b/dev-libs/libmaxminddb/Manifest @@ -1 +1,2 @@ DIST libmaxminddb-1.4.3.tar.gz 602272 BLAKE2B 2974d7268201a906c1c478ee36d4ef61e5f7483fd4f91bfcc5bf92f5bc698e8dd9eef256cceeb8c3217054481827d6fbf075f479e76c6506cc1f31d707a7d9dd SHA512 7fd97678ea6ca41cc4530864276b0233acbb16208571dc4694902943b3aa7e97c683c5676ea3f2de948c67aebd083f5d073b9ae36b7e89059c17f797ffddf65e +DIST libmaxminddb-1.5.0.tar.gz 603923 BLAKE2B 07c18f759a2d437d95be513d6dc3aaddd5dcd6f7201fdd7eba0f035c5a3221344f1e5e44253c0efdc2690cfffc5cecdaa9befed8d69f6f0ebd33588b3805443d SHA512 68c769f247156869b84a8ad0f9deec3cb79d39c0a6b8f1458461c223b9cf9967dd9d697ff4e92ac28216ef9e9f5a94908e03f76a5f70ab17636b163c17d2d432 diff --git a/dev-libs/libmaxminddb/libmaxminddb-1.4.3.ebuild b/dev-libs/libmaxminddb/libmaxminddb-1.4.3.ebuild index ecd39d177aeb..ccc7b3b23ecc 100644 --- a/dev-libs/libmaxminddb/libmaxminddb-1.4.3.ebuild +++ b/dev-libs/libmaxminddb/libmaxminddb-1.4.3.ebuild @@ -10,7 +10,7 @@ SRC_URI="https://github.com/maxmind/libmaxminddb/releases/download/${PV}/${P}.ta LICENSE="Apache-2.0" SLOT="0/0.0.7" -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="static-libs" DOCS=( Changes.md ) diff --git a/dev-libs/libmaxminddb/libmaxminddb-1.5.0-r1.ebuild b/dev-libs/libmaxminddb/libmaxminddb-1.5.0-r1.ebuild new file mode 100644 index 000000000000..45742bc23d7b --- /dev/null +++ b/dev-libs/libmaxminddb/libmaxminddb-1.5.0-r1.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit toolchain-funcs + +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="test" +RESTRICT="!test? ( test )" + +DEPEND=" + test? ( dev-perl/IPC-Run3 ) +" + +DOCS=( Changes.md ) + +src_configure() { + econf --disable-static + tc-export AR CC +} + +src_install() { + default + find "${ED}" -name '*.la' -delete || die +} diff --git a/dev-libs/libmaxminddb/libmaxminddb-99999.ebuild b/dev-libs/libmaxminddb/libmaxminddb-9999.ebuild index 307904ee7c42..4979eebf44d8 100644 --- a/dev-libs/libmaxminddb/libmaxminddb-99999.ebuild +++ b/dev-libs/libmaxminddb/libmaxminddb-9999.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit autotools git-r3 toolchain-funcs + +inherit toolchain-funcs git-r3 DESCRIPTION="C library for the MaxMind DB file format" HOMEPAGE="https://github.com/maxmind/libmaxminddb" @@ -10,8 +11,12 @@ EGIT_REPO_URI="https://github.com/maxmind/libmaxminddb.git" LICENSE="Apache-2.0" SLOT="0/0.0.7" -KEYWORDS="" -IUSE="static-libs" +IUSE="test" +RESTRICT="!test? ( test )" + +DEPEND=" + test? ( dev-perl/IPC-Run3 ) +" DOCS=( Changes.md ) @@ -21,12 +26,11 @@ src_prepare() { } src_configure() { - econf $(use_enable static-libs static) + econf --disable-static tc-export AR CC } src_install() { default - find "${ED}" -name '*.la' -delete || die } diff --git a/dev-libs/libmcrypt/libmcrypt-2.5.8-r4.ebuild b/dev-libs/libmcrypt/libmcrypt-2.5.8-r4.ebuild index 00ea16be74da..fd0f48e210d1 100644 --- a/dev-libs/libmcrypt/libmcrypt-2.5.8-r4.ebuild +++ b/dev-libs/libmcrypt/libmcrypt-2.5.8-r4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/mcrypt/${P}.tar.gz" LICENSE="GPL-2 LGPL-2.1" 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 ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris" DOCS=( AUTHORS NEWS README THANKS TODO ChangeLog diff --git a/dev-libs/libmemcached/libmemcached-1.0.18-r3.ebuild b/dev-libs/libmemcached/libmemcached-1.0.18-r3.ebuild index 0943ad249abf..07703af4feb4 100644 --- a/dev-libs/libmemcached/libmemcached-1.0.18-r3.ebuild +++ b/dev-libs/libmemcached/libmemcached-1.0.18-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -14,7 +14,7 @@ SRC_URI="https://launchpad.net/${PN}/1.0/${PV}/+download/${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="debug hsieh +libevent sasl static-libs" DEPEND="net-misc/memcached diff --git a/dev-libs/libmissing/Manifest b/dev-libs/libmissing/Manifest deleted file mode 100644 index 39d4a175c2a9..000000000000 --- a/dev-libs/libmissing/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST gnulib-b451121ab45497e78cb6f612c8673a9705193391.tar.gz 6666079 BLAKE2B e7d3b9478697067b57ab198e044f3c854128d5fe390d30947829ce4f34c695a748668c33ae19690e9927fff6df3e194a3160cb4adb7cf47235c603241c66889a SHA512 f6e165cfc0a3999c778d9f43ffc90ff9b569a77ff1e54ff5c50b12b0eddf262c24da8cd2719548574e0397535bb0eb835eef603cc74769f7876ef9db101bebec diff --git a/dev-libs/libmissing/libmissing-1.1.0.ebuild b/dev-libs/libmissing/libmissing-1.1.0.ebuild deleted file mode 100644 index a60e94ec453f..000000000000 --- a/dev-libs/libmissing/libmissing-1.1.0.ebuild +++ /dev/null @@ -1,171 +0,0 @@ -# Copyright 2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools - -# NOTE: PV is the libtool version number current:revision:age - -DESCRIPTION="Library with missing functions based on GNUlib" -HOMEPAGE="https://prefix.gentoo.org" -GIT_TAG="b451121ab45497e78cb6f612c8673a9705193391" -SRC_URI="https://git.savannah.gnu.org/cgit/gnulib.git/snapshot/gnulib-${GIT_TAG}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~ppc-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -#IUSE="static-libs" # dynamic won't work :( - -DEPEND="" -RDEPEND="${DEPEND}" -BDEPEND="" - -S="${WORKDIR}/gnulib-${GIT_TAG}" - -src_prepare() { - default - - # create a config file with just the definitions we need - mkdir extern-inline || die - cd extern-inline || die - - cat > configure.ac <<- EOS - AC_PREREQ([2.69]) - AC_INIT([${PN}], [${PV}], [prefix@gentoo.org]) - - AC_CONFIG_MACRO_DIR([../m4]) - AC_CONFIG_HEADER([missing-include.h]) - - gl_EXTERN_INLINE - EOS - - eautoreconf - sed -e '1,/PACKAGE_VERSION/d' missing-include.h.in \ - > "${T}"/missing-include.h - cd .. || die - - mkdir "${PN}" || die - cd "${PN}" || die - cat > configure.ac <<- EOS - AC_PREREQ([2.69]) - AC_INIT([${PN}], [${PV}], [prefix@gentoo.org]) - AM_INIT_AUTOMAKE - LT_INIT - - AC_CONFIG_MACRO_DIR([m4]) - AC_CONFIG_HEADER([config.h]) - - AC_PROG_CC - gl_INIT - gl_EARLY - - AC_CONFIG_FILES([Makefile lib/Makefile]) - - AC_OUTPUT - EOS - - cat > Makefile.am <<- EOS - SUBDIRS = lib - EOS - - local modules - local platform - local rev - - case "${CHOST}" in - *-apple-darwin*) - rev=${CHOST##*-darwin} - platform="Mac OS X 10.$((rev - 4))" - ;; - *-solaris2.*) - rev=${CHOST##*-solaris2.} - # we only support Solaris 10 (and perhaps 9) and up, so we - # don't have to bother about 2.x, just X - platform="Solaris ${rev}" - ;; - esac - - # blacklist some modules that cause collisions - # iconv provided by virtual/iconv -> sys-libs/libiconv - modules=( $( - cd "${S}"/doc/posix-functions - grep -A1 "This function is missing" *.texi | \ - grep "${platform}" | \ - sed -e 's:^\(.[^-]*\)-.*$:\1:' | \ - xargs sed -n 's/^Gnulib module: \([a-z].*\)$/\1/p' | \ - sed -e 's: or .*$::' -e 's:, :\n:g' | \ - sort -u | \ - grep -v "iconv" - ) ) - - # get platform specific set of missing functions - einfo "Including sources for missing functions on ${platform}:" - einfo "${modules[*]}" - "${S}"/gnulib-tool -S \ - --import \ - --lib=libmissing \ - --libtool \ - --no-vc-files \ - --no-cache-modules \ - "${modules[@]}" - - sed -i -e '/^noinst_LTLIBRARIES /s/noinst_/lib_/' lib/Makefile.am || die - echo "libmissing_la_LDFLAGS += -version-info ${PV//./:}" >> lib/Makefile.am - cat >> lib/Makefile.am << 'EOS' -install-data-local: $(BUILT_SOURCES) - @for hdr in $(BUILT_SOURCES); do \ - $(INSTALL_HEADER) -D "$$hdr" $(DESTDIR)$(includedir)/$${hdr}; \ - done; -EOS - - eautoreconf -} - -src_configure() { - cd "${PN}" || die - - # ensure we don't pick up installed libmissing - export CPPFLAGS+="-DDISABLE_LIBMISSING" # disable libmissing headers - export BINUTILS_CONFIG_DISABLE_MISSING=1 # disable -lmissing from ldwrapper - export CPPFLAGS="${CPPFLAGS/-I${EPREFIX}\/usr\/include\/missing/}" - export LIBS="${LIBS/-lmissing/}" - einfo "CPPFLAGS: ${CPPFLAGS}" - einfo "LIBS: ${LIBS}" - - # gnulib cannot be used a shared library, doing so results in stack - # protector checks failing for reasons yet unknown to me - econf --disable-shared --enable-static -} - -src_compile() { - cd "${PN}" || die - default -} - -src_install() { - cd "${PN}" || die - - default - - rm -f "${ED}"/usr/lib/libmissing.la || die - - cd "${ED}/usr/include" || die - - # fix config.h dependency so we can can distribute it without - local f - for f in $(grep "_GL_INLINE_HEADER_BEGIN" -l *.h */*.h) ; do - cat "${T}"/missing-include.h "${f}" > "${f}.new" - [[ -s "${f}.new" ]] && mv "${f}.new" "${f}" - done - - # modify all header-files so we can disable them and that they won't - # clash with gnulib-based packages - for f in *.h */*.h ; do - sed -i \ - -e '1i#ifdef DISABLE_LIBMISSING\n# include_next <'"${f}"'>\n#else' \ - -e '$a#endif /* DISABLE_LIBMISSING */' \ - -e 's/_GL_/_LIBMISSING_/g' \ - "${f}" || die - done -} diff --git a/dev-libs/libmissing/metadata.xml b/dev-libs/libmissing/metadata.xml deleted file mode 100644 index a580339ceb44..000000000000 --- a/dev-libs/libmissing/metadata.xml +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<maintainer type="project"> - <email>prefix@gentoo.org</email> - <name>Prefix Project</name> -</maintainer> - <origin>gentoo-staging</origin> -</pkgmetadata> diff --git a/dev-libs/libmix/libmix-2.05-r7.ebuild b/dev-libs/libmix/libmix-2.05-r7.ebuild index a58a86810985..7a68cfe5b0dd 100644 --- a/dev-libs/libmix/libmix-2.05-r7.ebuild +++ b/dev-libs/libmix/libmix-2.05-r7.ebuild @@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}-v${PV}" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux" +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux" IUSE="static-libs" PATCHES=( diff --git a/dev-libs/libmowgli/libmowgli-1.0.0-r1.ebuild b/dev-libs/libmowgli/libmowgli-1.0.0-r1.ebuild index bd3f6e58c2a6..48c4905cd685 100644 --- a/dev-libs/libmowgli/libmowgli-1.0.0-r1.ebuild +++ b/dev-libs/libmowgli/libmowgli-1.0.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -9,7 +9,7 @@ SRC_URI="http://distfiles.atheme.org/${P}.tar.bz2" LICENSE="BSD-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="" DOCS=( AUTHORS README doc/BOOST ) diff --git a/dev-libs/libmowgli/libmowgli-2.1.3-r2.ebuild b/dev-libs/libmowgli/libmowgli-2.1.3-r2.ebuild index 4158cb1b6e2c..a23b5b00bb96 100644 --- a/dev-libs/libmowgli/libmowgli-2.1.3-r2.ebuild +++ b/dev-libs/libmowgli/libmowgli-2.1.3-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="https://github.com/atheme/libmowgli-2/archive/v${PV}.tar.gz -> ${P}.tar LICENSE="BSD-2" SLOT="2" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-linux ~ppc-macos ~x86-macos" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="libressl ssl" RDEPEND="ssl? ( diff --git a/dev-libs/libmowgli/libmowgli-2.1.3.ebuild b/dev-libs/libmowgli/libmowgli-2.1.3.ebuild index a88e8a947421..fda525fcb4a5 100644 --- a/dev-libs/libmowgli/libmowgli-2.1.3.ebuild +++ b/dev-libs/libmowgli/libmowgli-2.1.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,7 +9,7 @@ SRC_URI="https://github.com/atheme/libmowgli-2/archive/v${PV}.tar.gz -> ${P}.tar LICENSE="BSD-2" SLOT="2" -KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~x86-linux ~ppc-macos ~x86-macos" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~x86-linux ~ppc-macos" IUSE="libressl ssl" RDEPEND="ssl? ( diff --git a/dev-libs/libmspack/Manifest b/dev-libs/libmspack/Manifest index d2797cb1e3b9..698014b9766f 100644 --- a/dev-libs/libmspack/Manifest +++ b/dev-libs/libmspack/Manifest @@ -1,2 +1 @@ DIST libmspack-0.10.1alpha.tar.gz 963274 BLAKE2B 39bcb3b7ea419d6d00850b70c217c802a2095dd4398038e594ae7c01ca12e71508218c1cfca5ae8b102636ab9517b13d55c1e411b31e87d28aa46331cd0127e6 SHA512 a7b5f7caa49190c5021f3e768b92f2e51cc0ce685c9ab6ed6fb36de885c73231b58d47a8a3b5c5aa5c9ac56c25c500eb683d84dbf11f09f97f6cb4fff5adc245 -DIST libmspack-0.9.1alpha.tar.gz 494651 BLAKE2B 4543215efbcac9cd2703cd56f2297645463831cc2dfa6b38d87c5f48f39676347bb20739e0e389e021983d910b9be99bfd369fb30d36090f3f72f09532d6bd1d SHA512 4e39c2be8768c5c0b0d0798c9322ff022173f5e05af1636c18541bbc9f58c1ae1af59252d5631340fca601495c5b1e5abed0ad83481387421d2df5efb75cd49a diff --git a/dev-libs/libmspack/files/libmspack-0.9.1_alpha-fix-bigendian.patch b/dev-libs/libmspack/files/libmspack-0.9.1_alpha-fix-bigendian.patch deleted file mode 100644 index c134fa0760d0..000000000000 --- a/dev-libs/libmspack/files/libmspack-0.9.1_alpha-fix-bigendian.patch +++ /dev/null @@ -1,17 +0,0 @@ -https://github.com/kyz/libmspack/commit/c19e707936947b45cf05bc9aaee68517c6c2aca6 - ---- - configure.ac | 1 + - 1 files changed, 1 insertions(+) - -diff --git a/libmspack/configure.ac b/libmspack/configure.ac ---- a/configure.ac -+++ b/configure.ac -@@ -30,6 +30,7 @@ AC_CHECK_HEADERS([inttypes.h]) - # Checks for typedefs, structures, and compiler characteristics. - AC_C_CONST - AC_C_INLINE -+AC_C_BIGENDIAN - AC_TYPE_MODE_T - AC_TYPE_OFF_T - AC_TYPE_SIZE_T diff --git a/dev-libs/libmspack/libmspack-0.9.1_alpha-r1.ebuild b/dev-libs/libmspack/libmspack-0.9.1_alpha-r1.ebuild deleted file mode 100644 index f4e6fbcc16b1..000000000000 --- a/dev-libs/libmspack/libmspack-0.9.1_alpha-r1.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -inherit autotools 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="" - -PATCHES=( "${FILESDIR}"/${P}-fix-bigendian.patch ) - -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/libnatspec-0.3.0.ebuild b/dev-libs/libnatspec/libnatspec-0.3.0.ebuild index 21662782d974..4a1cf2c86e7b 100644 --- a/dev-libs/libnatspec/libnatspec-0.3.0.ebuild +++ b/dev-libs/libnatspec/libnatspec-0.3.0.ebuild @@ -11,7 +11,7 @@ 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" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86" IUSE="doc" RDEPEND=" diff --git a/dev-libs/libnl/libnl-1.1.4-r1.ebuild b/dev-libs/libnl/libnl-1.1.4-r1.ebuild index eca1719a5ce8..40141bb55b71 100644 --- a/dev-libs/libnl/libnl-1.1.4-r1.ebuild +++ b/dev-libs/libnl/libnl-1.1.4-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -9,7 +9,7 @@ HOMEPAGE="https://www.infradead.org/~tgr/libnl/" SRC_URI="http://www.infradead.org/~tgr/libnl/files/${P}.tar.gz" LICENSE="LGPL-2.1" SLOT="1.1" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux" IUSE="doc static-libs" DEPEND="doc? ( app-doc/doxygen )" diff --git a/dev-libs/libnl/libnl-1.1.4.ebuild b/dev-libs/libnl/libnl-1.1.4.ebuild deleted file mode 100644 index c408edf1b291..000000000000 --- a/dev-libs/libnl/libnl-1.1.4.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit eutils multilib toolchain-funcs - -DESCRIPTION="Libraries providing APIs to netlink protocol based Linux kernel interfaces" -HOMEPAGE="https://www.infradead.org/~tgr/libnl/" -SRC_URI="http://www.infradead.org/~tgr/libnl/files/${P}.tar.gz" -LICENSE="LGPL-2.1" -SLOT="1.1" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux" -IUSE="doc static-libs" - -DEPEND="doc? ( app-doc/doxygen )" -DOCS=( ChangeLog ) - -src_prepare() { - epatch \ - "${FILESDIR}"/${PN}-1.1-vlan-header.patch \ - "${FILESDIR}"/${PN}-1.1-flags.patch \ - "${FILESDIR}"/${PN}-1.1.3-offsetof.patch - sed -i \ - -e '/@echo/d' \ - Makefile.rules {lib,src,tests}/Makefile || die - sed -i \ - -e 's|-g ||g' \ - Makefile.opts.in || die - - if ! use static-libs; then - sed -i lib/Makefile -e '/OUT_AR/d' || die - fi - - rm -f lib/libnl.a -} - -src_compile() { - emake AR=$(tc-getAR) - - if use doc ; then - cd "${S}/doc" - emake gendoc - fi -} - -src_install() { - default - - if use doc ; then - cd "${S}/doc" - dohtml -r html/* - fi -} diff --git a/dev-libs/libnl/libnl-3.5.0.ebuild b/dev-libs/libnl/libnl-3.5.0.ebuild index e93abb314164..1b48cb7b125e 100644 --- a/dev-libs/libnl/libnl-3.5.0.ebuild +++ b/dev-libs/libnl/libnl-3.5.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -13,34 +13,25 @@ LIBNL_DIR=${LIBNL_DIR//./_} DESCRIPTION="Libraries providing APIs to netlink protocol based Linux kernel interfaces" HOMEPAGE="https://www.infradead.org/~tgr/libnl/ https://github.com/thom311/libnl" -SRC_URI=" - https://github.com/thom311/${PN}/releases/download/${PN}${LIBNL_DIR}/${P/_rc/-rc}.tar.gz -" +SRC_URI="https://github.com/thom311/${PN}/releases/download/${PN}${LIBNL_DIR}/${P/_rc/-rc}.tar.gz" +S="${WORKDIR}/${LIBNL_P}" + LICENSE="LGPL-2.1 utils? ( GPL-2 )" SLOT="3" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux" IUSE="+debug static-libs python +threads utils" -RDEPEND=" - python? ( ${PYTHON_DEPS} ) -" -DEPEND=" - ${RDEPEND} -" +RDEPEND="python? ( ${PYTHON_DEPS} )" +DEPEND="${RDEPEND}" BDEPEND=" ${RDEPEND} python? ( dev-lang/swig ) sys-devel/bison sys-devel/flex " -REQUIRED_USE=" - python? ( ${PYTHON_REQUIRED_USE} ) -" -DOCS=( - ChangeLog -) +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" -S=${WORKDIR}/${LIBNL_P} +DOCS=( ChangeLog ) MULTILIB_WRAPPED_HEADERS=( # we do not install CLI stuff for non-native @@ -103,5 +94,5 @@ multilib_src_install() { multilib_src_install_all() { einstalldocs - find "${D}" -name '*.la' -delete || die + find "${ED}" -name '*.la' -delete || die } diff --git a/dev-libs/libnl/libnl-99999999.ebuild b/dev-libs/libnl/libnl-99999999.ebuild index e32ab2f6568b..a8d597402f52 100644 --- a/dev-libs/libnl/libnl-99999999.ebuild +++ b/dev-libs/libnl/libnl-99999999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -10,29 +10,24 @@ inherit autotools distutils-r1 git-r3 multilib-minimal DESCRIPTION="Libraries providing APIs to netlink protocol based Linux kernel interfaces" HOMEPAGE="https://www.infradead.org/~tgr/libnl/ https://github.com/thom311/libnl" EGIT_REPO_URI="https://github.com/thom311/libnl" + LICENSE="LGPL-2.1 utils? ( GPL-2 )" SLOT="3" KEYWORDS="" IUSE="+debug static-libs python +threads utils" -RDEPEND=" - python? ( ${PYTHON_DEPS} ) -" -DEPEND=" - ${RDEPEND} -" +RDEPEND="python? ( ${PYTHON_DEPS} )" +DEPEND="${RDEPEND}" BDEPEND=" ${RDEPEND} sys-devel/bison sys-devel/flex python? ( dev-lang/swig ) " -REQUIRED_USE=" - python? ( ${PYTHON_REQUIRED_USE} ) -" -DOCS=( - ChangeLog -) +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +DOCS=( ChangeLog ) + MULTILIB_WRAPPED_HEADERS=( # we do not install CLI stuff for non-native /usr/include/libnl3/netlink/cli/addr.h @@ -48,6 +43,7 @@ MULTILIB_WRAPPED_HEADERS=( /usr/include/libnl3/netlink/cli/tc.h /usr/include/libnl3/netlink/cli/utils.h ) + PATCHES=( "${FILESDIR}"/${PN}-99999999-2to3.patch ) @@ -107,5 +103,5 @@ multilib_src_install() { multilib_src_install_all() { einstalldocs - find "${D}" -name '*.la' -delete || die + find "${ED}" -name '*.la' -delete || die } diff --git a/dev-libs/libofx/Manifest b/dev-libs/libofx/Manifest index 7c30ee137d3f..7cd2c9d067ae 100644 --- a/dev-libs/libofx/Manifest +++ b/dev-libs/libofx/Manifest @@ -1 +1,2 @@ +DIST libofx-0.10.0.tar.gz 225574 BLAKE2B 29ce24ce8f0a333e2d35371cba217223e59e72e1f41051279c15033fecd5f33d7381e9be8403f2e639c007ca6aca1d53cf651e057c9842350772c2296b92c436 SHA512 b7767088701e22a2eba072c365d379987c6e9b2403888550068d6f62f48eaee7935e5355fa6ec97ac7a79bb847c833552250c0bd3065f9274b209585a7884f1d DIST libofx-0.9.15.tar.gz 207361 BLAKE2B c84fd4593a9888268c691653dc1b5fff5c38013f12ccc4a8454f9a5026ba190388e5747074aa800266efcfd49a0fdb391a605d5837f664bdcb8fe1dc5c064839 SHA512 6014bf9c457adbe9053a47718064e6246c911c3bf081c690bf761650220208aabe94824aaa38794c1834462894b7948a06b3ff6b517a9a84b9f881ba51aee3a1 diff --git a/dev-libs/libofx/libofx-0.10.0.ebuild b/dev-libs/libofx/libofx-0.10.0.ebuild new file mode 100644 index 000000000000..72d72da9a57b --- /dev/null +++ b/dev-libs/libofx/libofx-0.10.0.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools flag-o-matic + +DESCRIPTION="Library to support the Open Financial eXchange XML format" +HOMEPAGE="https://github.com/libofx/libofx" +SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0/10" +KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86" +IUSE="static-libs test" +RESTRICT="!test? ( test )" + +BDEPEND=" + dev-util/gengetopt + sys-apps/help2man + virtual/pkgconfig + test? ( app-crypt/gnupg ) +" +RDEPEND=" + >app-text/opensp-1.5 + >=dev-cpp/libxmlpp-2.40.1:2.6 + >=net-misc/curl-7.9.7 + virtual/libiconv +" +DEPEND="${RDEPEND}" + +src_prepare() { + default + + # Not included in the tarball + sed -i -e '/INSTALL/d' Makefile.am || die + # Use correct location for docs + sed -i -e 's:doc/libofx:doc/${PF}:' Makefile.am doc/Makefile.am || die + + eautoreconf + append-cxxflags -std=c++14 # bug #566456 +} + +src_compile() { + emake -j1 +} + +src_install() { + default + + find "${ED}" -name '*.la' -type f -delete || die + + if ! use static-libs; then + find "${ED}" -name '*.a' -type f -delete || die + fi +} diff --git a/dev-libs/liboil/liboil-0.3.17-r2.ebuild b/dev-libs/liboil/liboil-0.3.17-r2.ebuild index ccbb009e4de2..d46aa0f41d0a 100644 --- a/dev-libs/liboil/liboil-0.3.17-r2.ebuild +++ b/dev-libs/liboil/liboil-0.3.17-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -10,7 +10,7 @@ SRC_URI="https://liboil.freedesktop.org/download/${P}.tar.gz" LICENSE="BSD-2" SLOT="0.3" -KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" IUSE="+examples static-libs test" RESTRICT="!test? ( test )" diff --git a/dev-libs/libotf/libotf-0.9.13.ebuild b/dev-libs/libotf/libotf-0.9.13.ebuild index ab49b699635a..3492df68f15b 100644 --- a/dev-libs/libotf/libotf-0.9.13.ebuild +++ b/dev-libs/libotf/libotf-0.9.13.ebuild @@ -10,7 +10,7 @@ SRC_URI="mirror://nongnu/m17n/${P}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux" IUSE="static-libs X" RDEPEND=">=media-libs/freetype-2.4.9 diff --git a/dev-libs/libotf/libotf-0.9.16.ebuild b/dev-libs/libotf/libotf-0.9.16.ebuild index 1f8dc0b9ba76..53d4a2a08352 100644 --- a/dev-libs/libotf/libotf-0.9.16.ebuild +++ b/dev-libs/libotf/libotf-0.9.16.ebuild @@ -10,7 +10,7 @@ SRC_URI="mirror://nongnu/m17n/${P}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux" IUSE="static-libs X" RDEPEND=">=media-libs/freetype-2.4.9 diff --git a/dev-libs/libp11/libp11-0.4.10.ebuild b/dev-libs/libp11/libp11-0.4.10.ebuild index 929da98f274a..7903034316f0 100644 --- a/dev-libs/libp11/libp11-0.4.10.ebuild +++ b/dev-libs/libp11/libp11-0.4.10.ebuild @@ -9,7 +9,7 @@ SRC_URI="https://github.com/OpenSC/${PN}/releases/download/${P}/${P}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" -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="libressl bindist doc static-libs" RDEPEND=" diff --git a/dev-libs/libparserutils/libparserutils-0.2.4-r1.ebuild b/dev-libs/libparserutils/libparserutils-0.2.4-r1.ebuild index 8e44299669c5..3b0711b1f348 100644 --- a/dev-libs/libparserutils/libparserutils-0.2.4-r1.ebuild +++ b/dev-libs/libparserutils/libparserutils-0.2.4-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz" LICENSE="MIT" SLOT="0/${PV}" -KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86 ~m68k-mint" +KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86" IUSE="iconv test" RESTRICT="!test? ( test )" diff --git a/dev-libs/libparserutils/libparserutils-0.2.4-r3.ebuild b/dev-libs/libparserutils/libparserutils-0.2.4-r3.ebuild index 7a0e5e9a8cbf..3aba197ad9d0 100644 --- a/dev-libs/libparserutils/libparserutils-0.2.4-r3.ebuild +++ b/dev-libs/libparserutils/libparserutils-0.2.4-r3.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz" LICENSE="MIT" SLOT="0/${PV}" -KEYWORDS="~amd64 ~arm ~arm64 ppc ~ppc64 ~x86 ~m68k-mint" +KEYWORDS="~amd64 ~arm ~arm64 ppc ~ppc64 ~x86" IUSE="iconv test" RESTRICT="!test? ( test )" diff --git a/dev-libs/libpcre/libpcre-8.44.ebuild b/dev-libs/libpcre/libpcre-8.44.ebuild index 1c0daa4cef5e..ab540b2b6757 100644 --- a/dev-libs/libpcre/libpcre-8.44.ebuild +++ b/dev-libs/libpcre/libpcre-8.44.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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/libpcre2-10.35.ebuild b/dev-libs/libpcre2/libpcre2-10.35.ebuild index d57510107cb4..f785b364fbe0 100644 --- a/dev-libs/libpcre2/libpcre2-10.35.ebuild +++ b/dev-libs/libpcre2/libpcre2-10.35.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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/libpcre2/libpcre2-10.36.ebuild b/dev-libs/libpcre2/libpcre2-10.36.ebuild index 89944f501ccb..64d021adb4d8 100644 --- a/dev-libs/libpcre2/libpcre2-10.36.ebuild +++ b/dev-libs/libpcre2/libpcre2-10.36.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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/libpeas/Manifest b/dev-libs/libpeas/Manifest index fc2e1ebc5c5c..a39d31551634 100644 --- a/dev-libs/libpeas/Manifest +++ b/dev-libs/libpeas/Manifest @@ -1 +1,2 @@ DIST libpeas-1.26.0.tar.xz 191708 BLAKE2B 5845d5cb15724ba933572f48b9056a79cb2c167c7911ff1546c836fe56cd7e49d7461e5a413b79effa64e8e3fb2ed2eb370de665728e476e40ffb4d44c841543 SHA512 86157da14d17c16df2ef3f44ab48822ea1a8be8aec8f5419bc421bd475113f686cd16f9616ac53cbf3dc6f31f521384ac63eb8e9f1a46ea21b5cda8ba21e855f +DIST libpeas-1.28.0.tar.xz 191896 BLAKE2B 64fd65228b4ae4be59724a9e4b26133ed025866d0b7bf15377d579c87de1ebdf1225e3a2aeb004ae9733544cc53782c399581b5fb5f1625ef55532600d37afe0 SHA512 43f8bc426238f519d7a3b26409af2f7578e921893c085d00fab74699a45649d8343e5646658003980e6639f51e74f3b25519c3bbc248d5161b11c999f7dd0374 diff --git a/dev-libs/libpeas/files/libpeas-1.28.0-tests-Explicitly-depend-on-the-GIR-and-typelib.patch b/dev-libs/libpeas/files/libpeas-1.28.0-tests-Explicitly-depend-on-the-GIR-and-typelib.patch new file mode 100644 index 000000000000..55a425c9d513 --- /dev/null +++ b/dev-libs/libpeas/files/libpeas-1.28.0-tests-Explicitly-depend-on-the-GIR-and-typelib.patch @@ -0,0 +1,41 @@ +From 6d053ec0a4108be59f5e30a04ab4e6539e694e53 Mon Sep 17 00:00:00 2001 +From: Simon McVittie <smcv@debian.org> +Date: Fri, 18 Sep 2020 11:31:52 +0100 +Subject: [PATCH] tests: Explicitly depend on the GIR and typelib + +In Meson since 0.55.0, having the test executable depend on the GIR +dependency is not enough to ensure that uninstalled GIR and typelib +files are generated: we also need to have the test itself depend on +the GIR build target. + +It is not clear to me whether this is a workaround for a Meson +regression (if what libpeas previously did was meant to work), or a +solution to a libpeas bug (if it was never meant to be guaranteed to +work). For more details see +<https://github.com/mesonbuild/meson/issues/7756>. + +Resolves: https://gitlab.gnome.org/GNOME/libpeas/-/issues/40 +Bug-Debian: https://bugs.debian.org/966951 +--- + tests/libpeas/meson.build | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/tests/libpeas/meson.build b/tests/libpeas/meson.build +index 32cf5e9..c95190a 100644 +--- a/tests/libpeas/meson.build ++++ b/tests/libpeas/meson.build +@@ -53,5 +53,10 @@ foreach test: libpeas_tests_sources + c_args: libpeas_tests_c_args, + ) + +- test('test-@0@'.format(test_name), test_exe, env: test_env) ++ test( ++ 'test-@0@'.format(test_name), ++ test_exe, ++ depends: [libintrospection_gir], ++ env: test_env, ++ ) + endforeach +-- +2.26.2 + diff --git a/dev-libs/libpeas/libpeas-1.26.0-r100.ebuild b/dev-libs/libpeas/libpeas-1.26.0-r100.ebuild index 8a2759201034..39985dd5afe2 100644 --- a/dev-libs/libpeas/libpeas-1.26.0-r100.ebuild +++ b/dev-libs/libpeas/libpeas-1.26.0-r100.ebuild @@ -3,7 +3,7 @@ EAPI=7 -LUA_COMPAT=( lua5-1 luajit ) +LUA_COMPAT=( lua5-{1..4} luajit ) PYTHON_COMPAT=( python3_{6,7,8,9,10} ) inherit gnome.org lua-single meson python-single-r1 vala virtualx xdg diff --git a/dev-libs/libpeas/libpeas-1.28.0-r100.ebuild b/dev-libs/libpeas/libpeas-1.28.0-r100.ebuild new file mode 100644 index 000000000000..a16e81d921be --- /dev/null +++ b/dev-libs/libpeas/libpeas-1.28.0-r100.ebuild @@ -0,0 +1,85 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +LUA_COMPAT=( lua5-{1..4} luajit ) +PYTHON_COMPAT=( python3_{6,7,8,9,10} ) + +inherit gnome.org lua-single meson python-single-r1 vala virtualx xdg + +DESCRIPTION="A GObject plugins library" +HOMEPAGE="https://developer.gnome.org/libpeas/stable/" + +LICENSE="LGPL-2.1+" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" + +IUSE="glade +gtk gtk-doc lua +python vala" +REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} ) + python? ( ${PYTHON_REQUIRED_USE} )" + +RDEPEND=" + >=dev-libs/glib-2.38:2 + >=dev-libs/gobject-introspection-1.39:= + gtk? ( >=x11-libs/gtk+-3.0.0:3[introspection] ) + glade? ( >=dev-util/glade-3.9.1:3.10 ) + lua? ( + ${LUA_DEPS} + $(lua_gen_cond_dep ' + >=dev-lua/lgi-0.9.0[${LUA_USEDEP}] + ') + ) + python? ( + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + >=dev-python/pygobject-3.2:3[${PYTHON_MULTI_USEDEP}] + ') + ) +" +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 +" + +PATCHES=( + # Gentoo-specific lua tweak hack + "${FILESDIR}"/1.26.0-lua.patch + "${FILESDIR}"/${P}-tests-Explicitly-depend-on-the-GIR-and-typelib.patch +) + +pkg_setup() { + use lua && lua-single_pkg_setup + use python && python-single-r1_pkg_setup +} + +src_prepare() { + xdg_src_prepare + use vala && vala_src_prepare +} + +src_configure() { + local emesonargs=( + $(meson_feature $(usex lua '!lua_single_target_luajit' 'lua') lua51) + $(meson_feature $(usex lua 'lua_single_target_luajit' 'lua') luajit) + -Dpython2=false + $(meson_use python python3) + # introspection was always enabled in autotools; would need readiness by consumers + # to USE flag it, but most need it for python plugins anyways + -Dintrospection=true + $(meson_use vala vapi) + $(meson_use gtk widgetry) + $(meson_use glade glade_catalog) + -Ddemos=false + $(meson_use gtk-doc gtk_doc) + ) + meson_src_configure +} + +src_test() { + virtx meson_src_test +} diff --git a/dev-libs/libpeas/libpeas-1.28.0.ebuild b/dev-libs/libpeas/libpeas-1.28.0.ebuild new file mode 100644 index 000000000000..05ca9d371ae6 --- /dev/null +++ b/dev-libs/libpeas/libpeas-1.28.0.ebuild @@ -0,0 +1,79 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_{6,7,8,9,10} ) + +inherit gnome.org meson python-single-r1 vala virtualx xdg + +DESCRIPTION="A GObject plugins library" +HOMEPAGE="https://developer.gnome.org/libpeas/stable/" + +LICENSE="LGPL-2.1+" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" + +IUSE="glade +gtk gtk-doc lua luajit +python vala" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +RDEPEND=" + >=dev-libs/glib-2.38:2 + >=dev-libs/gobject-introspection-1.39:= + gtk? ( >=x11-libs/gtk+-3.0.0:3[introspection] ) + glade? ( >=dev-util/glade-3.9.1:3.10 ) + lua? ( + >=dev-lua/lgi-0.9.0 + luajit? ( >=dev-lang/luajit-2:2 ) + !luajit? ( =dev-lang/lua-5.1*:0 ) ) + python? ( + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + >=dev-python/pygobject-3.2:3[${PYTHON_MULTI_USEDEP}] + ') + ) +" +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 +" + +PATCHES=( + # Gentoo-specific lua tweak hack + "${FILESDIR}"/1.26.0-lua.patch + "${FILESDIR}"/${P}-tests-Explicitly-depend-on-the-GIR-and-typelib.patch +) + +pkg_setup() { + use python && python-single-r1_pkg_setup +} + +src_prepare() { + xdg_src_prepare + use vala && vala_src_prepare +} + +src_configure() { + local emesonargs=( + $(meson_feature $(usex lua !luajit lua) lua51) + $(meson_feature $(usex lua luajit lua) luajit) + -Dpython2=false + $(meson_use python python3) + # introspection was always enabled in autotools; would need readiness by consumers + # to USE flag it, but most need it for python plugins anyways + -Dintrospection=true + $(meson_use vala vapi) + $(meson_use gtk widgetry) + $(meson_use glade glade_catalog) + -Ddemos=false + $(meson_use gtk-doc gtk_doc) + ) + meson_src_configure +} + +src_test() { + virtx meson_src_test +} diff --git a/dev-libs/libpfm/Manifest b/dev-libs/libpfm/Manifest index 46fdbf3955ad..cb38241422ae 100644 --- a/dev-libs/libpfm/Manifest +++ b/dev-libs/libpfm/Manifest @@ -1,2 +1 @@ DIST libpfm-4.10.1.tar.gz 1005988 BLAKE2B 7bdc64540cdf0404bfab0a631e506f37a79ca090d68c798fe4943f627ebc3e15e01f6c4530d4eec2c82a6f759845af518cbf34b3ad19ecc5fa48a874611aaa16 SHA512 33d99824216b4d83784e0db9f1aae3b39f84c2ba42dee64dde0b3c43cc5ee3a18c206d9044e75bf10867768add7cb9967c6318f7aa196f178f334271fa05e1aa -DIST libpfm-4.8.0.tar.gz 828853 BLAKE2B e6caa0ffa4584dab805ef08ce5318bf73fda906afddb30b1490a34ec62e522a6bb713563c5ffecb22596e6c5c1c06c245c5b9bc59fea74face90a9edcbfb4eac SHA512 a06f3713c70fb4fe694154057604ae42627ad764486a3d3e28b0ef2e46fdd0a0431ec1a3c52ebc711ae174a1fbd7b3ddd0c736a568f57d4606ecf8064ff38228 diff --git a/dev-libs/libpfm/libpfm-4.10.1-r1.ebuild b/dev-libs/libpfm/libpfm-4.10.1-r1.ebuild index b1d810c6a3a0..0a0a748a6ff0 100644 --- a/dev-libs/libpfm/libpfm-4.10.1-r1.ebuild +++ b/dev-libs/libpfm/libpfm-4.10.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/perfmon2/${PN}4/${P}.tar.gz" LICENSE="GPL-2 MIT" SLOT="0/4" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" IUSE="static-libs" DEPEND="" diff --git a/dev-libs/libpfm/libpfm-4.10.1.ebuild b/dev-libs/libpfm/libpfm-4.10.1.ebuild deleted file mode 100644 index 0bfea7717c89..000000000000 --- a/dev-libs/libpfm/libpfm-4.10.1.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 multilib toolchain-funcs - -DESCRIPTION="Hardware-based performance monitoring interface for Linux" -HOMEPAGE="https://sourceforge.net/projects/perfmon2/" -SRC_URI="mirror://sourceforge/perfmon2/${PN}4/${P}.tar.gz" - -LICENSE="GPL-2 MIT" -SLOT="0/4" -KEYWORDS="amd64 arm arm64 ppc64 x86" -IUSE="static-libs" - -DEPEND="" -RDEPEND="${DEPEND}" - -src_prepare() { - default - - sed -e "s:SLDFLAGS=:SLDFLAGS=\$(LDFLAGS) :g" \ - -i lib/Makefile || die - sed -e "s:LIBDIR=\$(PREFIX)/lib:LIBDIR=\$(PREFIX)/$(get_libdir):g" \ - -i config.mk || die -} - -src_compile() { - # 'DBG=' unsets '-Werror' and other optional flags, bug #664294 - emake CC=$(tc-getCC) DBG= -} - -src_install() { - emake DESTDIR="${D}" LDCONFIG=true PREFIX="${EPREFIX}/usr" install - use static-libs || find "${ED}" -name '*.a' -exec rm -f '{}' + - dodoc README -} diff --git a/dev-libs/libpfm/libpfm-4.8.0.ebuild b/dev-libs/libpfm/libpfm-4.8.0.ebuild deleted file mode 100644 index 96e9f85ee0cf..000000000000 --- a/dev-libs/libpfm/libpfm-4.8.0.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit multilib toolchain-funcs - -DESCRIPTION="Hardware-based performance monitoring interface for Linux" -HOMEPAGE="https://sourceforge.net/projects/perfmon2/" -SRC_URI="mirror://sourceforge/perfmon2/${PN}4/${P}.tar.gz" - -LICENSE="GPL-2 MIT" -SLOT="0/4" -KEYWORDS="~amd64 ~arm ~arm64 ppc64 ~x86" -IUSE="static-libs" - -DEPEND="" -RDEPEND="${DEPEND}" - -src_prepare() { - sed -e "s:SLDFLAGS=:SLDFLAGS=\$(LDFLAGS) :g" \ - -i lib/Makefile || die - sed -e "s:LIBDIR=\$(PREFIX)/lib:LIBDIR=\$(PREFIX)/$(get_libdir):g" \ - -i config.mk || die -} - -src_compile() { - # 'DBG=' unsets '-Werror' and other optional flags, bug #664294 - emake CC=$(tc-getCC) DBG= -} - -src_install() { - emake DESTDIR="${D}" LDCONFIG=true PREFIX="${EPREFIX}/usr" install - use static-libs || find "${ED}" -name '*.a' -exec rm -f '{}' + - dodoc README -} diff --git a/dev-libs/libpipeline/libpipeline-1.5.2.ebuild b/dev-libs/libpipeline/libpipeline-1.5.2.ebuild index 44ed8f753b9f..0c967a91e348 100644 --- a/dev-libs/libpipeline/libpipeline-1.5.2.ebuild +++ b/dev-libs/libpipeline/libpipeline-1.5.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,7 +9,7 @@ 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" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" IUSE="static-libs test" RESTRICT="!test? ( test )" diff --git a/dev-libs/libpipeline/libpipeline-1.5.3.ebuild b/dev-libs/libpipeline/libpipeline-1.5.3.ebuild index c648b8a1255e..0c967a91e348 100644 --- a/dev-libs/libpipeline/libpipeline-1.5.3.ebuild +++ b/dev-libs/libpipeline/libpipeline-1.5.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,7 +9,7 @@ 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" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" IUSE="static-libs test" RESTRICT="!test? ( test )" diff --git a/dev-libs/libplatform/Manifest b/dev-libs/libplatform/Manifest index a601be9a2064..23db1951e1fe 100644 --- a/dev-libs/libplatform/Manifest +++ b/dev-libs/libplatform/Manifest @@ -1,2 +1 @@ -DIST libplatform-2.0.1.tar.gz 74676 BLAKE2B 11d7861a419fd50e26a6c27129ec45b27e65a1429ca822c2fced5803def8b818a224fcf46253aec2f76efafd930376c41f7db5d413cfdffc149c17279ab09981 SHA512 ac397ffc741617be4371dc2a4b44cdddd07f2bdbd54e20e91a77e7d00b90b4d54f9aa5d2908c389638f548a7b6f9aa0a93bb10697eaecfc23117dee6f789f555 DIST libplatform-2.1.0.1.tar.gz 75257 BLAKE2B 99887e7d8b1b51578a5b84cdb63c71caf75cce1674ab2c7c658bb9bbf67b69a23f4facdef8d4a4a9e2f7c0101886a5350fd92708cde3aa3010589c7055bf6a50 SHA512 76e6f1ac64b61e4def7d99965708d0f05698379e0f3e846317174f0bc12a9654b3341afc84bd8a3a70f101ecab6c692dea96b57d7e000dfabf6cedee2b8dcd8a diff --git a/dev-libs/libplatform/files/libplatform-2.0.1-arch-specific-libdirs.patch b/dev-libs/libplatform/files/libplatform-2.0.1-arch-specific-libdirs.patch deleted file mode 100644 index fce47f428cda..000000000000 --- a/dev-libs/libplatform/files/libplatform-2.0.1-arch-specific-libdirs.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 21317bf0bb90f16d591aec580fe70d58cb43e65e Mon Sep 17 00:00:00 2001 -From: Balint Reczey <balint@balintreczey.hu> -Date: Sun, 21 Feb 2016 23:06:28 +0100 -Subject: [PATCH] Install pkg-config and .cmake files in arch-specific libdirs - -They contain arch-specific strings thus they can't be in -architecture-independent dirs. This would prevent co-installing -i386 and amd64 versions for example, since the files would differ. ---- - CMakeLists.txt | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index a577410..6b5586f 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -74,12 +74,12 @@ install(FILES src/util/atomic.h - IF(NOT WIN32) - configure_file(p8-platform.pc.in p8-platform.pc @ONLY) - install(FILES ${CMAKE_BINARY_DIR}/p8-platform.pc -- DESTINATION ${CMAKE_INSTALL_LIBDIR_NOARCH}/pkgconfig) -+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) - ENDIF(NOT WIN32) - - # config mode - configure_file (p8-platform-config.cmake.in - p8-platform-config.cmake @ONLY) - install(FILES ${CMAKE_BINARY_DIR}/p8-platform-config.cmake -- DESTINATION ${CMAKE_INSTALL_LIBDIR_NOARCH}/p8-platform) -+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/p8-platform) - diff --git a/dev-libs/libplatform/libplatform-2.0.1.ebuild b/dev-libs/libplatform/libplatform-2.0.1.ebuild deleted file mode 100644 index 28d490264b66..000000000000 --- a/dev-libs/libplatform/libplatform-2.0.1.ebuild +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils - -MY_PN="platform" -MY_PN_PREFIX="p8" - -DESCRIPTION="Platform support library used by libCEC and binary add-ons for Kodi" -HOMEPAGE="https://github.com/Pulse-Eight/platform" -SRC_URI="https://github.com/Pulse-Eight/${MY_PN}/archive/${MY_PN_PREFIX}-${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="amd64 ~arm x86" -IUSE="" - -PATCHES=( "${FILESDIR}/${P}-arch-specific-libdirs.patch" ) - -S="${WORKDIR}/${MY_PN}-${MY_PN_PREFIX}-${MY_PN}-${PV}" diff --git a/dev-libs/libplatform/libplatform-2.1.0.1-r1.ebuild b/dev-libs/libplatform/libplatform-2.1.0.1-r1.ebuild index 93381cb5e792..9e534eefa006 100644 --- a/dev-libs/libplatform/libplatform-2.1.0.1-r1.ebuild +++ b/dev-libs/libplatform/libplatform-2.1.0.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -21,5 +21,5 @@ if [[ ${PV} == *9999 ]] ; then else SRC_URI="https://github.com/Pulse-Eight/${MY_PN}/archive/${MY_PN_PREFIX}-${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}/${MY_PN}-${MY_PN_PREFIX}-${MY_PN}-${PV}" - KEYWORDS="~amd64 ~arm ~arm64 ~x86" + KEYWORDS="amd64 ~arm ~arm64 x86" fi diff --git a/dev-libs/libplatform/libplatform-2.1.0.1.ebuild b/dev-libs/libplatform/libplatform-2.1.0.1.ebuild deleted file mode 100644 index 27aff31ce461..000000000000 --- a/dev-libs/libplatform/libplatform-2.1.0.1.ebuild +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils - -MY_PN="platform" -MY_PN_PREFIX="p8" - -DESCRIPTION="Platform support library used by libCEC and binary add-ons for Kodi" -HOMEPAGE="https://github.com/Pulse-Eight/platform" -SRC_URI="https://github.com/Pulse-Eight/${MY_PN}/archive/${MY_PN_PREFIX}-${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="" - -S="${WORKDIR}/${MY_PN}-${MY_PN_PREFIX}-${MY_PN}-${PV}" diff --git a/dev-libs/libpqxx/Manifest b/dev-libs/libpqxx/Manifest index c7e4685aa032..56d248f83f7d 100644 --- a/dev-libs/libpqxx/Manifest +++ b/dev-libs/libpqxx/Manifest @@ -1,2 +1,3 @@ DIST libpqxx-7.1.2.tar.gz 693152 BLAKE2B da28d0041fc345eb7774eadf0a886e2a89692ac47d870120991aa97328a6be7d10e8cb2d6deb9e056dc7e05b04fd317d9d0fe4dcf8eab901114b27cd64bf4ff6 SHA512 a4a76c62f6115f5898e4c4bb1c6f095284bdb7ae6a1efa45add9efd422d2a8280d1698caa2469acbb087168208ae0fd8efa36c8735a8ce30e58853e27acd4161 DIST libpqxx-7.2.1.tar.gz 691486 BLAKE2B ef1b12e436e33a26faa8f5acceef8d5ab1063b0618798fdf881fe38ab101da6d78989cc30c1e24f60fd81dd4f4034267e8b220b7b1d1932793028abf7e17c614 SHA512 baaa53f12aa87f512bbbe7494c915242cda8508b43414b79e6cd047dbd61902cbe54cb34af13d75bdccd70bdbafcaca155b4ccb426d8b831bd4df46e9a57e3a2 +DIST libpqxx-7.3.0.tar.gz 694012 BLAKE2B 35770599fcb3131081e08c18d96b753cc6d412c6ea8fddf5617df7da2035cf8ee3a031b7c14d592e0c9560e1e1074e633734337113ed0b3943e519aa44806307 SHA512 897af8e1c0ab12df745116e5387d3c31fb8800b6c599f49413ddcc67df7968fb1922c96896c818ce3f34d9649fb6c1d2ea59784f8765fb765481b156be44eaa2 diff --git a/dev-libs/libpqxx/libpqxx-7.2.1.ebuild b/dev-libs/libpqxx/libpqxx-7.2.1.ebuild index 3ca142f65ec5..f23e71978646 100644 --- a/dev-libs/libpqxx/libpqxx-7.2.1.ebuild +++ b/dev-libs/libpqxx/libpqxx-7.2.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -6,7 +6,7 @@ EAPI=7 PYTHON_COMPAT=( python3_{6,7,8,9,10} ) inherit python-any-r1 -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +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" diff --git a/dev-libs/libpqxx/libpqxx-7.3.0.ebuild b/dev-libs/libpqxx/libpqxx-7.3.0.ebuild new file mode 100644 index 000000000000..3ca142f65ec5 --- /dev/null +++ b/dev-libs/libpqxx/libpqxx-7.3.0.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,7,8,9,10} ) +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="https://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/libprelude/Manifest b/dev-libs/libprelude/Manifest index 2d1543e91d3e..a2b67c73275f 100644 --- a/dev-libs/libprelude/Manifest +++ b/dev-libs/libprelude/Manifest @@ -1,4 +1,2 @@ -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 DIST libprelude-5.2.0.tar.gz 2902019 BLAKE2B f4caecdc4d34a075fecef73e043e653943fb4af91f4ae5ec5bfdd2d00acccd2095087ba2e6e98aef786e801ba4396f7a66af2de64b5ab8de50921e078614e1a3 SHA512 e0dc0d7c06a4c250a5a12c5cddd8aa8db33d94f8afd85b1afdb264717d674e0dc0b4dc8a5336860df74ffe408023cc7a5356e3acc3c96876099659e33ce04dd0 diff --git a/dev-libs/libprelude/libprelude-4.0.0.ebuild b/dev-libs/libprelude/libprelude-4.0.0.ebuild deleted file mode 100644 index b3f6df987195..000000000000 --- a/dev-libs/libprelude/libprelude-4.0.0.ebuild +++ /dev/null @@ -1,89 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python3_{6,7,8,9,10} ) -USE_RUBY="ruby21 ruby22 ruby23 ruby24 ruby25" -DISTUTILS_OPTIONAL=1 - -inherit autotools distutils-r1 ruby-single - -DESCRIPTION="Prelude-SIEM Framework Library" -HOMEPAGE="https://www.prelude-siem.org" -SRC_URI="https://www.prelude-siem.org/pkg/src/${PV}/${P}.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="lua perl python ruby" - -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -RDEPEND="net-libs/gnutls:= - lua? ( dev-lang/lua:* ) - perl? ( dev-lang/perl:= virtual/perl-ExtUtils-MakeMaker ) - python? ( ${PYTHON_DEPS} ) - ruby? ( ${RUBY_DEPS} )" - -DEPEND="${RDEPEND} - >=dev-lang/swig-3.0.7 - dev-util/gtk-doc-am - sys-devel/flex - virtual/pkgconfig - virtual/yacc" - -PATCHES=( - "${FILESDIR}/${P}-fix-python-bindings.patch" -) - -src_prepare() { - default - - # Avoid null runpaths in Perl bindings. - sed -e 's/ LD_RUN_PATH=""//' -i "${S}/bindings/Makefile.am" || die "sed failed" - - eautoreconf - - if use python; then - cd bindings/python || die - distutils-r1_src_prepare - fi -} - -src_configure() { - local myconf=( - --enable-easy-bindings - --with-swig - --without-python2 - $(use_with lua) - $(use_with perl) - $(usex perl '--with-perl-installdirs=vendor' '') - $(use_with ruby) - ) - - if use python; then - python_setup - myconf+=( --with-python3="${EPYTHON}" ) - else - myconf+=( --without-python3 ) - fi - - econf "${myconf[@]}" -} - -src_compile() { - default - if use python; then - cd bindings/python || die - distutils-r1_src_compile - fi -} - -src_install() { - default - find "${D}" -name '*.la' -delete || die - if use python; then - cd bindings/python || die - distutils-r1_src_install - fi -} diff --git a/dev-libs/libprelude/libprelude-4.1.0.ebuild b/dev-libs/libprelude/libprelude-4.1.0.ebuild deleted file mode 100644 index eb7bb0fb4494..000000000000 --- a/dev-libs/libprelude/libprelude-4.1.0.ebuild +++ /dev/null @@ -1,89 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python3_{6,7,8,9,10} ) -USE_RUBY="ruby22 ruby23 ruby24 ruby25" -DISTUTILS_OPTIONAL=1 - -inherit autotools distutils-r1 ruby-single - -DESCRIPTION="Prelude-SIEM Framework Library" -HOMEPAGE="https://www.prelude-siem.org" -SRC_URI="https://www.prelude-siem.org/pkg/src/${PV}/${P}.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="lua perl python ruby" - -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -RDEPEND="net-libs/gnutls:= - lua? ( dev-lang/lua:* ) - perl? ( dev-lang/perl:= virtual/perl-ExtUtils-MakeMaker ) - python? ( ${PYTHON_DEPS} ) - ruby? ( ${RUBY_DEPS} )" - -DEPEND="${RDEPEND} - >=dev-lang/swig-3.0.11 - dev-util/gtk-doc-am - sys-devel/flex - virtual/pkgconfig - virtual/yacc" - -PATCHES=( - "${FILESDIR}/${PN}-4.0.0-fix-python-bindings.patch" -) - -src_prepare() { - default - - # Avoid null runpaths in Perl bindings. - sed -e 's/ LD_RUN_PATH=""//' -i "${S}/bindings/Makefile.am" || die "sed failed" - - eautoreconf - - if use python; then - cd bindings/python || die - distutils-r1_src_prepare - fi -} - -src_configure() { - local myconf=( - --enable-easy-bindings - --with-swig - --without-python2 - $(use_with lua) - $(use_with perl) - $(usex perl '--with-perl-installdirs=vendor' '') - $(use_with ruby) - ) - - if use python; then - python_setup - myconf+=( --with-python3="${EPYTHON}" ) - else - myconf+=( --without-python3 ) - fi - - econf "${myconf[@]}" -} - -src_compile() { - default - if use python; then - cd bindings/python || die - distutils-r1_src_compile - fi -} - -src_install() { - default - find "${D}" -name '*.la' -delete || die - if use python; then - cd bindings/python || die - distutils-r1_src_install - fi -} diff --git a/dev-libs/libprelude/libprelude-5.1.1.ebuild b/dev-libs/libprelude/libprelude-5.1.1.ebuild index 71e2681f172c..e113224eb428 100644 --- a/dev-libs/libprelude/libprelude-5.1.1.ebuild +++ b/dev-libs/libprelude/libprelude-5.1.1.ebuild @@ -21,7 +21,7 @@ IUSE="lua perl python ruby" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" RDEPEND="net-libs/gnutls:= - lua? ( dev-lang/lua:* ) + lua? ( dev-lang/lua:0= ) perl? ( dev-lang/perl:= ) python? ( ${PYTHON_DEPS} ) ruby? ( ${RUBY_DEPS} )" @@ -31,7 +31,7 @@ DEPEND="${RDEPEND}" BDEPEND=">=dev-lang/swig-3.0.11 dev-util/gtk-doc-am sys-devel/flex - lua? ( dev-lang/lua:* ) + lua? ( dev-lang/lua:0= ) perl? ( dev-lang/perl:= virtual/perl-ExtUtils-MakeMaker ) python? ( ${PYTHON_DEPS} ) ruby? ( ${RUBY_DEPS} ) diff --git a/dev-libs/libprelude/libprelude-5.2.0-r10.ebuild b/dev-libs/libprelude/libprelude-5.2.0-r10.ebuild index b6ab216a2dab..4e9d549df2a6 100644 --- a/dev-libs/libprelude/libprelude-5.2.0-r10.ebuild +++ b/dev-libs/libprelude/libprelude-5.2.0-r10.ebuild @@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{6,7,8,9,10} ) USE_RUBY="ruby25 ruby26 ruby27" DISTUTILS_OPTIONAL=1 -LUA_COMPAT=( lua5-{1..3} ) +LUA_COMPAT=( lua5-{1..4} luajit ) inherit autotools distutils-r1 lua-single ruby-single diff --git a/dev-libs/libprelude/libprelude-5.2.0.ebuild b/dev-libs/libprelude/libprelude-5.2.0.ebuild index 0ec3e6bc48c1..c86444e366ea 100644 --- a/dev-libs/libprelude/libprelude-5.2.0.ebuild +++ b/dev-libs/libprelude/libprelude-5.2.0.ebuild @@ -21,7 +21,7 @@ IUSE="lua perl python ruby" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" RDEPEND="net-libs/gnutls:= - lua? ( dev-lang/lua:* ) + lua? ( dev-lang/lua:0= ) perl? ( dev-lang/perl:= ) python? ( ${PYTHON_DEPS} ) ruby? ( ${RUBY_DEPS} )" @@ -31,7 +31,7 @@ DEPEND="${RDEPEND}" BDEPEND=">=dev-lang/swig-4.0.0 dev-util/gtk-doc-am sys-devel/flex - lua? ( dev-lang/lua:* ) + lua? ( dev-lang/lua:0= ) perl? ( dev-lang/perl:= virtual/perl-ExtUtils-MakeMaker ) python? ( ${PYTHON_DEPS} ) ruby? ( ${RUBY_DEPS} ) diff --git a/dev-libs/libpreludedb/Manifest b/dev-libs/libpreludedb/Manifest index 7e89a2aceede..47b6710121d2 100644 --- a/dev-libs/libpreludedb/Manifest +++ b/dev-libs/libpreludedb/Manifest @@ -1,5 +1,3 @@ -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-update_m4_postgresql.patch 20562 BLAKE2B 5db9a213c47296b308a641942e41c82eb9642dc7817ac1134ac52c8f24e38b68e0dacc5adedc30ba0611e84c97bb51f444b75b2b98884c0f21312da58f40b6d8 SHA512 24881cfe0e471e934fc9b1bd64dd901303f68615e1700ce92d6bc7324b28587aef8cc05be9cc7c2545f86666064607d8113c5273381bf9306ef69f569ab9d1bf DIST libpreludedb-5.1.0.tar.gz 1374511 BLAKE2B 569324a5ae484b1d13ac729f25a2f7f8924a8dced923859cdc393289acf0c0cf098ae6e0f9f572a707c85aa9af4a27bbaa0927e20d610b423e2aae86718d232b SHA512 9e45e0f7a945eef254f8e59c0c7212c6afca897584ea8f2c88e16478fde448abdeeb991828cc2482373d2c735e1229f1a11fe9780e40da1a8aed867fe158f481 DIST libpreludedb-5.2.0.tar.gz 1372810 BLAKE2B 5a6bed23eba77591b8e97bb3c6f2b321970c94f88fb86094146a1a3fa64cc0f0c97ca1d1488b2202ab7042207ca2ca4f74029415ef1ca6ea13c84d158a23473f SHA512 357e3ce69927ed405bc757774466631d34cad9b53031be6ce456238dd8aef3781471ecbb36ab4a3131468f4686a635095aaf837d23a0efc9db758322298e7744 diff --git a/dev-libs/libpreludedb/libpreludedb-4.0.0-r1.ebuild b/dev-libs/libpreludedb/libpreludedb-4.0.0-r1.ebuild deleted file mode 100644 index acc2b32b0e64..000000000000 --- a/dev-libs/libpreludedb/libpreludedb-4.0.0-r1.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python3_{6,7,8,9,10} ) -USE_RUBY="ruby21 ruby22 ruby23 ruby24" -DISTUTILS_OPTIONAL=1 - -inherit autotools distutils-r1 ruby-single - -DESCRIPTION="Framework to easy access to the Prelude database" -HOMEPAGE="https://www.prelude-siem.org" -SRC_URI="https://www.prelude-siem.org/pkg/src/${PV}/${P}.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="mysql postgres python sqlite" - -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -RDEPEND="~dev-libs/libprelude-${PV} - net-libs/gnutls:= - mysql? ( dev-db/mysql-connector-c:= ) - postgres? ( dev-db/postgresql:* ) - python? ( ${PYTHON_DEPS} ) - sqlite? ( dev-db/sqlite:3 )" - -DEPEND="${RDEPEND} - >=dev-lang/swig-3.0.7 - dev-util/gtk-doc-am - sys-devel/flex - virtual/pkgconfig - virtual/yacc" - -PATCHES=( - "${FILESDIR}/${P}-fix-python-bindings.patch" -) - -src_prepare() { - default - - eautoreconf - - if use python; then - cd bindings/python || die - distutils-r1_src_prepare - fi -} - -src_configure() { - local myconf=( - --enable-easy-bindings - --with-swig - --without-python2 - $(use_with mysql) - $(use_with postgres postgresql) - $(use_with sqlite sqlite3) - ) - - if use python; then - python_setup - myconf+=( --with-python3="${EPYTHON}" ) - else - myconf+=( --without-python3 ) - fi - - econf "${myconf[@]}" -} - -src_compile() { - default - if use python; then - cd bindings/python || die - distutils-r1_src_compile - fi -} - -src_install() { - default - find "${D}" -name '*.la' -delete || die - if use python; then - cd bindings/python || die - distutils-r1_src_install - fi -} diff --git a/dev-libs/libpreludedb/libpreludedb-4.1.0-r1.ebuild b/dev-libs/libpreludedb/libpreludedb-4.1.0-r1.ebuild deleted file mode 100644 index 8363d4512ca2..000000000000 --- a/dev-libs/libpreludedb/libpreludedb-4.1.0-r1.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python3_{6,7,8,9,10} ) -USE_RUBY="ruby22 ruby23 ruby24 ruby25" -DISTUTILS_OPTIONAL=1 - -inherit autotools distutils-r1 ruby-single - -DESCRIPTION="Framework to easy access to the Prelude database" -HOMEPAGE="https://www.prelude-siem.org" -SRC_URI="https://www.prelude-siem.org/pkg/src/${PV}/${P}.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="mysql postgres python sqlite" - -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -RDEPEND="~dev-libs/libprelude-${PV} - net-libs/gnutls:= - mysql? ( dev-db/mysql-connector-c:= ) - postgres? ( dev-db/postgresql:* ) - python? ( ${PYTHON_DEPS} ) - sqlite? ( dev-db/sqlite:3 )" - -DEPEND="${RDEPEND} - >=dev-lang/swig-3.0.11 - dev-util/gtk-doc-am - sys-devel/flex - virtual/pkgconfig - virtual/yacc" - -PATCHES=( - "${FILESDIR}/${PN}-4.0.0-fix-python-bindings.patch" -) - -src_prepare() { - default - - eautoreconf - - if use python; then - cd bindings/python || die - distutils-r1_src_prepare - fi -} - -src_configure() { - local myconf=( - --enable-easy-bindings - --with-swig - --without-python2 - $(use_with mysql) - $(use_with postgres postgresql) - $(use_with sqlite sqlite3) - ) - - if use python; then - python_setup - myconf+=( --with-python3="${EPYTHON}" ) - else - myconf+=( --without-python3 ) - fi - - econf "${myconf[@]}" -} - -src_compile() { - default - if use python; then - cd bindings/python || die - distutils-r1_src_compile - fi -} - -src_install() { - default - find "${D}" -name '*.la' -delete || die - if use python; then - cd bindings/python || die - distutils-r1_src_install - fi -} diff --git a/dev-libs/libpthread-stubs/libpthread-stubs-0.4-r1.ebuild b/dev-libs/libpthread-stubs/libpthread-stubs-0.4-r1.ebuild index 5857572bd62d..9db4fbaa641f 100644 --- a/dev-libs/libpthread-stubs/libpthread-stubs-0.4-r1.ebuild +++ b/dev-libs/libpthread-stubs/libpthread-stubs-0.4-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="https://xcb.freedesktop.org/dist/${P}.tar.bz2" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="" multilib_src_configure() { diff --git a/dev-libs/libratbag/libratbag-0.15.ebuild b/dev-libs/libratbag/libratbag-0.15.ebuild index 2b84bff5fc69..58ed34aaf10b 100644 --- a/dev-libs/libratbag/libratbag-0.15.ebuild +++ b/dev-libs/libratbag/libratbag-0.15.ebuild @@ -27,6 +27,7 @@ BDEPEND=" virtual/pkgconfig doc? ( app-doc/doxygen ) test? ( + dev-libs/check dev-libs/gobject-introspection dev-util/valgrind $(python_gen_cond_dep ' diff --git a/dev-libs/librdkafka/Manifest b/dev-libs/librdkafka/Manifest index eba346e62eba..dfcdf4dd6241 100644 --- a/dev-libs/librdkafka/Manifest +++ b/dev-libs/librdkafka/Manifest @@ -1,3 +1,4 @@ DIST librdkafka-1.4.4.tar.gz 2734332 BLAKE2B 47c22f00d88d58eb6366e17a8f0ddaee4984bc65f01a627c5d3b8eee019519a2de9a7ae6e2ab2053354a5d72337107b7f515ad65ff205b6838e154b95d9f2331 SHA512 478d17f56efd39b312ea774695bc31d22a83aae3a94913fb0dd07e7f04f3f2a6e3f3610dc7501864dbacbcf4a3207603c6e1d5eebac4e5246ee868cde398021d DIST librdkafka-1.5.0.tar.gz 2757553 BLAKE2B a9bbcdaa011944e43f9c70e2062199c5f12d1b92e40ba55707520002ed3a909ff13308336703924388625570d88a94d58b24cd19b5d6e9f79acd31dd92d0d7ed SHA512 ccd8dd3e90c9315833610745c28e0ffa60786324c938c7cbbb2ff847d7493d1b72d97adf5e5210bbc87970047cfd7e58a85141534d227187f2f17c492bef4262 DIST librdkafka-1.5.2.tar.gz 2771823 BLAKE2B 61a56d36ba49539eb52f89a0d5b48e0245b1cedd09c40e65063d65208b50bb95aa5f00ce3c050d4203b4720b2ce63a9f1d6eee7100fdf85c50e7a15457a52010 SHA512 6a796c58aef9d91fe85f3815ee523a0dcafad59f33c83e5c20c62d4e4337c21c2d223dd0d6a88f37cf86d14a8e55facfa87c651990e08d9522f7cf78b0d17446 +DIST librdkafka-1.5.3.tar.gz 2773929 BLAKE2B f23ed9fe04af5d17ee2066366d32701a07f1360d665fd06126008f42e2512434848829eeb2578b35bd7f8fb26663d72c3d2ee22a5b3f33b7029df28f919b2b77 SHA512 24c93658462f933766a026fede5f09e1056ee9532f27b56da64bdde5626ac6f2460bc92b950337a7c3a99d75201a3c3bc5aaa78e888ffd9665e248d62f2c87d9 diff --git a/dev-libs/librdkafka/librdkafka-1.4.4.ebuild b/dev-libs/librdkafka/librdkafka-1.4.4.ebuild index 719b22ab5511..141ec0f49725 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.5.3.ebuild b/dev-libs/librdkafka/librdkafka-1.5.3.ebuild new file mode 100644 index 000000000000..3687922361d1 --- /dev/null +++ b/dev-libs/librdkafka/librdkafka-1.5.3.ebuild @@ -0,0 +1,93 @@ +# 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,10} ) + +inherit python-any-r1 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(+)] +" + +BDEPEND=" + virtual/pkgconfig + ${PYTHON_DEPS} +" + +RDEPEND="!static-libs? ( ${LIB_DEPEND//\[static-libs(+)]} )" + +DEPEND=" + ${RDEPEND} + static-libs? ( ${LIB_DEPEND} ) +" + +pkg_setup() { + python-any-r1_pkg_setup +} + +src_prepare() { + default + + if [[ ${PV} != "9999" ]]; then + sed -i \ + -e "s/^\(export RDKAFKA_GITVER=\).*/\1\"${PV}@release\"/" \ + tests/run-test.sh || die + fi +} + +src_configure() { + tc-export AR CC CXX LD NM OBJDUMP PKG_CONFIG STRIP + + local myeconf=( + --no-cache + --no-download + --disable-debug-symbols + $(use_enable lz4) + $(use_enable sasl) + $(usex static-libs '--enable-static' '') + $(use_enable ssl) + $(use_enable zstd) + ) + + econf ${myeconf[@]} +} + +src_test() { + emake -C tests run_local +} + +src_install() { + emake -j1 \ + DESTDIR="${D}" \ + docdir="/usr/share/doc/${PF}" \ + install + + if ! use static-libs; then + find "${ED}" -type f \( -name "*.a" -o -name "*.la" \) -delete || die + fi +} diff --git a/dev-libs/librelp/librelp-1.7.0.ebuild b/dev-libs/librelp/librelp-1.7.0.ebuild index 883ba8ae4aba..d4da1f2d603e 100644 --- a/dev-libs/librelp/librelp-1.7.0.ebuild +++ b/dev-libs/librelp/librelp-1.7.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/librep/Manifest b/dev-libs/librep/Manifest index d8a807e9d3dd..c3822e20cfdb 100644 --- a/dev-libs/librep/Manifest +++ b/dev-libs/librep/Manifest @@ -1,2 +1 @@ -DIST librep_0.92.6.tar.xz 472152 BLAKE2B 165fa8b1d68360e0b08909663cab0f334774030e970c0d376652bc819368eae647882091f1e8d1329f4d3c1c53def4f69aeb8c4d7fe5f327d06d528dc9bb2267 SHA512 6e347e788922af9458e6eddfdaf7935b69df8f70b3f6deb11e6abd67596aec05e7dce7f41db1c84e478347d379ced10cfb34672a797c853913fd538a78a1f96d DIST librep_0.92.7.tar.xz 651344 BLAKE2B 3a0e9a3eef0afa2e095537dfc307418ba87ce7a9baabdba262fd9a24b71cc6577fe1282412da495d56bf22007f1931c5b834f5bcf4c5ebe87d6b43a4975d630e SHA512 752cb2da31457200b5896f70ce24a097b261b996da25998cd78a777f982597473afce1a216f449a4a969d29b1678bf54e2f148e86de6f9548eeb5cfd530ae377 diff --git a/dev-libs/librep/librep-0.92.6.ebuild b/dev-libs/librep/librep-0.92.6.ebuild deleted file mode 100644 index 617dc4263f88..000000000000 --- a/dev-libs/librep/librep-0.92.6.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools elisp-common eutils flag-o-matic ltprune - -DESCRIPTION="Shared library implementing a Lisp dialect" -HOMEPAGE="https://sourceforge.net/projects/librep/" -SRC_URI="http://download.tuxfamily.org/librep/${PN}_${PV}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86" -IUSE="emacs readline" - -RDEPEND=" - >=sys-libs/gdbm-1.8.0 - emacs? ( >=app-editors/emacs-23.1:* ) - readline? ( sys-libs/readline:0= ) -" -DEPEND="${RDEPEND} - sys-apps/texinfo - app-arch/xz-utils -" - -PATCHES=( - "${FILESDIR}/${PN}-0.92.0-disable-elisp.patch" -) - -S="${WORKDIR}/${PN}_${PV}" - -src_prepare() { - # fix #570072 by restoring pre-GCC5 inline semantics - append-cflags -std=gnu89 - default - - # The configure script is missing from this version. - eautoreconf -} - -src_configure() { - econf \ - --libexecdir=/usr/$(get_libdir) \ - --without-gmp \ - --without-ffi \ - --disable-static \ - $(use_with readline) -} - -src_compile() { - default - - if use emacs; then - elisp-compile rep-debugger.el || die "elisp-compile failed" - fi -} - -src_install() { - default - prune_libtool_files --modules - - dodoc doc/* - - if use emacs; then - elisp-install ${PN} rep-debugger.{el,elc} || die "elisp-install failed" - elisp-site-file-install "${FILESDIR}/50${PN}-gentoo.el" \ - || die "elisp-site-file-install failed" - fi -} - -pkg_postinst() { - use emacs && elisp-site-regen -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/dev-libs/librep/librep-0.92.7.ebuild b/dev-libs/librep/librep-0.92.7.ebuild index 829d45fb63d6..b5b9249eb9fa 100644 --- a/dev-libs/librep/librep-0.92.7.ebuild +++ b/dev-libs/librep/librep-0.92.7.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -10,7 +10,7 @@ SRC_URI="https://download.tuxfamily.org/librep/${PN}_${PV}.tar.xz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86" IUSE="emacs gmp readline" RDEPEND=" diff --git a/dev-libs/libressl/libressl-2.9.2.ebuild b/dev-libs/libressl/libressl-2.9.2.ebuild index 6c9c80756645..038e4525e95c 100644 --- a/dev-libs/libressl/libressl-2.9.2.ebuild +++ b/dev-libs/libressl/libressl-2.9.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -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/47" -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 ~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.0.2.ebuild b/dev-libs/libressl/libressl-3.0.2.ebuild index 895531127546..6c36bb3906c6 100644 --- a/dev-libs/libressl/libressl-3.0.2.ebuild +++ b/dev-libs/libressl/libressl-3.0.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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/47" -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 ~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.3.ebuild b/dev-libs/libressl/libressl-3.1.3.ebuild index 968f9b8418ad..80d558516419 100644 --- a/dev-libs/libressl/libressl-3.1.3.ebuild +++ b/dev-libs/libressl/libressl-3.1.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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 ~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.4.ebuild b/dev-libs/libressl/libressl-3.1.4.ebuild index 968f9b8418ad..80d558516419 100644 --- a/dev-libs/libressl/libressl-3.1.4.ebuild +++ b/dev-libs/libressl/libressl-3.1.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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 ~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.5.ebuild b/dev-libs/libressl/libressl-3.1.5.ebuild index a925dfee996e..80d558516419 100644 --- a/dev-libs/libressl/libressl-3.1.5.ebuild +++ b/dev-libs/libressl/libressl-3.1.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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 ~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.2.0.ebuild b/dev-libs/libressl/libressl-3.2.0.ebuild index ab31f2041689..1885f60b24c5 100644 --- a/dev-libs/libressl/libressl-3.2.0.ebuild +++ b/dev-libs/libressl/libressl-3.2.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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 ~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.2.1.ebuild b/dev-libs/libressl/libressl-3.2.1.ebuild index ab31f2041689..1885f60b24c5 100644 --- a/dev-libs/libressl/libressl-3.2.1.ebuild +++ b/dev-libs/libressl/libressl-3.2.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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 ~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.2.3.ebuild b/dev-libs/libressl/libressl-3.2.3.ebuild index ab31f2041689..1885f60b24c5 100644 --- a/dev-libs/libressl/libressl-3.2.3.ebuild +++ b/dev-libs/libressl/libressl-3.2.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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 ~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.3.0.ebuild b/dev-libs/libressl/libressl-3.3.0.ebuild index 2ffee4c0167e..a78469b4e02d 100644 --- a/dev-libs/libressl/libressl-3.3.0.ebuild +++ b/dev-libs/libressl/libressl-3.3.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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 ~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.3.1.ebuild b/dev-libs/libressl/libressl-3.3.1.ebuild index 2592744bafd4..b43f11d83498 100644 --- a/dev-libs/libressl/libressl-3.3.1.ebuild +++ b/dev-libs/libressl/libressl-3.3.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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 ~amd64-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 ~ppc-macos ~x64-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/libretls/Manifest b/dev-libs/libretls/Manifest new file mode 100644 index 000000000000..01df108e3ba7 --- /dev/null +++ b/dev-libs/libretls/Manifest @@ -0,0 +1 @@ +DIST libretls-3.3.1.tar.gz 431233 BLAKE2B b935cae7bdd2e2338099dbc830e2773198d5d4ed12df80b89291d0eb8ae68549e36413c79ba1373d8bce8fd857c4a291fbd9bce30c819cc182bd5b68ac7b9527 SHA512 ddb4eb7c2c7e9cbb36ced17424ea0e08863488e6b3e18cd462ccc52b2eca685b5299f79ed6ba58ad4da2d742b61fa4857109a19137a1ee4c6cfdb48463080f4a diff --git a/dev-libs/libretls/libretls-3.3.1-r1.ebuild b/dev-libs/libretls/libretls-3.3.1-r1.ebuild new file mode 100644 index 000000000000..9f50b7f5a3e2 --- /dev/null +++ b/dev-libs/libretls/libretls-3.3.1-r1.ebuild @@ -0,0 +1,31 @@ +# Copyright 2020-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit multilib-minimal + +DESCRIPTION="Port of libtls from LibreSSL to OpenSSL" +HOMEPAGE="https://git.causal.agency/libretls/about/" +SRC_URI="https://causal.agency/libretls/${P}.tar.gz" + +LICENSE="ISC" +SLOT="0" +KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" + +DEPEND="dev-libs/openssl:=" +RDEPEND="${DEPEND} + !dev-libs/libressl" +BDEPEND="virtual/pkgconfig" + +multilib_src_configure() { + local myconf=( + --disable-static + ) + ECONF_SOURCE="${S}" econf "${myconf[@]}" +} + +multilib_src_install() { + default + find "${D}" -name '*.la' -delete || die +} diff --git a/dev-libs/libclangformat-ide/metadata.xml b/dev-libs/libretls/metadata.xml index b295d2b34c2d..76d213cb00b1 100644 --- a/dev-libs/libclangformat-ide/metadata.xml +++ b/dev-libs/libretls/metadata.xml @@ -2,8 +2,12 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>zx2c4@gentoo.org</email> - <name>Jason A. Donenfeld</name> + <email>mgorny@gentoo.org</email> + <name>Michał Górny</name> + </maintainer> + <maintainer type="person"> + <email>blueness@gentoo.org</email> + <name>Anthony G. Basile</name> </maintainer> <origin>gentoo-staging</origin> </pkgmetadata> diff --git a/dev-libs/librevenge/librevenge-0.0.4-r1.ebuild b/dev-libs/librevenge/librevenge-0.0.4-r1.ebuild index 0081867a0c2e..8a05ee3828bd 100644 --- a/dev-libs/librevenge/librevenge-0.0.4-r1.ebuild +++ b/dev-libs/librevenge/librevenge-0.0.4-r1.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]] ; then inherit git-r3 autotools else SRC_URI="https://sf.net/projects/libwpd/files/${PN}/${P}/${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="|| ( MPL-2.0 LGPL-2.1 )" diff --git a/dev-libs/libserdes/libserdes-5.4.0.ebuild b/dev-libs/libserdes/libserdes-5.4.0.ebuild index 6ad4b367cff7..de284b4ea594 100644 --- a/dev-libs/libserdes/libserdes-5.4.0.ebuild +++ b/dev-libs/libserdes/libserdes-5.4.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,7 +9,7 @@ SRC_URI="https://github.com/confluentinc/libserdes/archive/v${PV}.tar.gz -> ${P} LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="amd64" DEPEND=" dev-libs/jansson diff --git a/dev-libs/libsigc++/libsigc++-1.2.7.ebuild b/dev-libs/libsigc++/libsigc++-1.2.7.ebuild index 343cc0cc0674..25b6ed8ce022 100644 --- a/dev-libs/libsigc++/libsigc++-1.2.7.ebuild +++ b/dev-libs/libsigc++/libsigc++-1.2.7.ebuild @@ -13,7 +13,7 @@ HOMEPAGE="https://libsigcplusplus.github.io/libsigcplusplus/ LICENSE="GPL-2 LGPL-2.1+" SLOT="1.2" -KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 sparc x86" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86" IUSE="" DEPEND="sys-devel/m4" diff --git a/dev-libs/libsigc++/libsigc++-2.10.1.ebuild b/dev-libs/libsigc++/libsigc++-2.10.1.ebuild index ae83beb1b896..79f39c3b14d1 100644 --- a/dev-libs/libsigc++/libsigc++-2.10.1.ebuild +++ b/dev-libs/libsigc++/libsigc++-2.10.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -10,7 +10,7 @@ HOMEPAGE="https://libsigcplusplus.github.io/libsigcplusplus/ LICENSE="LGPL-2.1+" 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 ~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 ~sparc-solaris ~x64-solaris ~x86-solaris" IUSE="doc static-libs test" RESTRICT="!test? ( test )" diff --git a/dev-libs/libsigc++/libsigc++-2.10.3.ebuild b/dev-libs/libsigc++/libsigc++-2.10.3.ebuild index 594c6195e8b8..4a5217a1a0a4 100644 --- a/dev-libs/libsigc++/libsigc++-2.10.3.ebuild +++ b/dev-libs/libsigc++/libsigc++-2.10.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -10,7 +10,7 @@ HOMEPAGE="https://libsigcplusplus.github.io/libsigcplusplus/ LICENSE="LGPL-2.1+" 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 ~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 ~sparc-solaris ~x64-solaris ~x86-solaris" IUSE="doc static-libs test" RESTRICT="!test? ( test )" diff --git a/dev-libs/libsigsegv/libsigsegv-2.11.ebuild b/dev-libs/libsigsegv/libsigsegv-2.11.ebuild index fd9d21ceee54..845f5b2456d2 100644 --- a/dev-libs/libsigsegv/libsigsegv-2.11.ebuild +++ b/dev-libs/libsigsegv/libsigsegv-2.11.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/libsigsegv/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris" IUSE="" src_configure() { diff --git a/dev-libs/libsigsegv/libsigsegv-2.12-r1.ebuild b/dev-libs/libsigsegv/libsigsegv-2.12-r1.ebuild index e026bced4a8b..fa9e96f3ff2d 100644 --- a/dev-libs/libsigsegv/libsigsegv-2.12-r1.ebuild +++ b/dev-libs/libsigsegv/libsigsegv-2.12-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/libsigsegv/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris" IUSE="" PATCHES=( diff --git a/dev-libs/libsigsegv/libsigsegv-2.12.ebuild b/dev-libs/libsigsegv/libsigsegv-2.12.ebuild index 2922cd738aeb..333cbcc9bf2d 100644 --- a/dev-libs/libsigsegv/libsigsegv-2.12.ebuild +++ b/dev-libs/libsigsegv/libsigsegv-2.12.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/libsigsegv/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris" IUSE="" src_configure() { diff --git a/dev-libs/libsodium/libsodium-1.0.18.ebuild b/dev-libs/libsodium/libsodium-1.0.18.ebuild index 245ff4ea74a0..181638171400 100644 --- a/dev-libs/libsodium/libsodium-1.0.18.ebuild +++ b/dev-libs/libsodium/libsodium-1.0.18.ebuild @@ -11,7 +11,7 @@ SRC_URI="http://download.libsodium.org/${PN}/releases/${P}.tar.gz" LICENSE="ISC" SLOT="0/23" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux" IUSE="+asm minimal static-libs +urandom cpu_flags_x86_sse4_1 cpu_flags_x86_aes" PATCHES=( "${FILESDIR}"/${PN}-1.0.10-cpuflags.patch ) diff --git a/dev-libs/libstroke/libstroke-0.5.1-r1.ebuild b/dev-libs/libstroke/libstroke-0.5.1-r1.ebuild index a3568f1994d4..8ba4e0154f0d 100644 --- a/dev-libs/libstroke/libstroke-0.5.1-r1.ebuild +++ b/dev-libs/libstroke/libstroke-0.5.1-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="http://www.etla.net/libstroke/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 sparc x86" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86" RDEPEND="x11-libs/libX11" DEPEND=" diff --git a/dev-libs/libstroke/metadata.xml b/dev-libs/libstroke/metadata.xml index 69b7aa4d4077..d85b4252fc33 100644 --- a/dev-libs/libstroke/metadata.xml +++ b/dev-libs/libstroke/metadata.xml @@ -1,9 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="person"> - <email>calchan@gentoo.org</email> - <name>Denis Dupeyron</name> -</maintainer> +<!-- maintainer-needed --> <origin>gentoo-staging</origin> </pkgmetadata> diff --git a/dev-libs/libstrophe/Manifest b/dev-libs/libstrophe/Manifest index 9097c741aa9c..6a0cc0156fe5 100644 --- a/dev-libs/libstrophe/Manifest +++ b/dev-libs/libstrophe/Manifest @@ -1,3 +1,4 @@ DIST libstrophe-0.10.0.tar.gz 520645 BLAKE2B 85998ffa7d2051bf3372842a0bc6d5404932c41853609943ae0420760e0434a74b711bd5f23657f061f1227647247b1989833c54c11a88490fe7617459687818 SHA512 9d2e8f95ab5f9611529e18b0130322a196d4b59aae69c931a6d7dc462d4a6a4fa395d6fbca56d9f329fc943e3de005b570ea34629a504175f3f2ec91f85bf40a +DIST libstrophe-0.10.1.tar.gz 520649 BLAKE2B aa5cf0c972d7ae8731752f351dc3c1d6d230b8a1411417a81126543dd47e79e324a8c258cbc4c2e608c748d62211dcde3802cb92bb3612c6a33bcd2209182a90 SHA512 1ee3cb76cdc76711b4928d69fb8add974ab8359b729ec12003d73530c93492f4e8d208cacbd50f8db7509bc01f56a9f945348bc3a6fdd18a7080b751fff8a783 DIST libstrophe-0.9.2.tar.gz 500459 BLAKE2B 0b1f6f1daac1215bcdcbde0e54264b98f5a863de339500826f625f8c5e8143ce7200fb251d04248715e9a8b6621a4360e7ca2780bf4684d916ec13361b5f6fcc SHA512 a0129c49ca574afaefa77c412143571af2eb1100c7d737d497b65d44680d35e2404ee2d4d4e1378b06ac1bcc5c587f505f79fea9251af1cbb36afd990d48570d DIST libstrophe-0.9.3.tar.gz 502449 BLAKE2B 662b0c329b0bf7d7f34fc80bf0608b921fa1ad54c8277e88f23f3ed17d0892dc7e3d9bcaaa9707306801e9254bba4a127390025ab95e1d9d850c299a7b26d980 SHA512 9c8ba980f532c5576c2c5a9e3cdca9f833ec78debcb06b17e2f534de0e710ec416b997b0498be77a89fa7f57187456edb1d602993c695a5e738718ea593697a5 diff --git a/dev-libs/libstrophe/libstrophe-0.10.1.ebuild b/dev-libs/libstrophe/libstrophe-0.10.1.ebuild new file mode 100644 index 000000000000..b52059c8b303 --- /dev/null +++ b/dev-libs/libstrophe/libstrophe-0.10.1.ebuild @@ -0,0 +1,51 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +DESCRIPTION="A simple, lightweight C library for writing XMPP clients" +HOMEPAGE="https://strophe.im/libstrophe/" +SRC_URI="https://github.com/strophe/${PN}/releases/download/${PV}/${P}.tar.gz" +LICENSE="|| ( MIT GPL-3 )" +SLOT="0" +KEYWORDS="~amd64" +IUSE="doc expat libressl" + +RDEPEND=" + expat? ( dev-libs/expat ) + !expat? ( dev-libs/libxml2:2 ) + libressl? ( dev-libs/libressl:0= ) + !libressl? ( dev-libs/openssl:0= ) +" +DEPEND="${RDEPEND} + doc? ( app-doc/doxygen ) +" + +DOCS=( ChangeLog ) + +src_configure() { + # shellcheck disable=SC2207 + local myeconf=( + --enable-tls + $(use_with !expat libxml2) + ) + econf "${myeconf[@]}" +} +src_compile() { + default + if use doc; then + doxygen || die + HTML_DOCS=( docs/html/* ) + fi +} + +src_install() { + default + use doc && dodoc -r examples + find "${D}" -name '*.la' -o -name '*.a' -delete || die +} + +# Explicit src_test is there to document that the test suite is integrated and +# is expected to pass. Please do not remove. +src_test() { + emake check +} diff --git a/dev-libs/libtasn1/libtasn1-4.13.ebuild b/dev-libs/libtasn1/libtasn1-4.13.ebuild index 5c7aec4f7bfd..33a39406d1e9 100644 --- a/dev-libs/libtasn1/libtasn1-4.13.ebuild +++ b/dev-libs/libtasn1/libtasn1-4.13.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" LICENSE="GPL-3 LGPL-2.1" SLOT="0/6" # subslot = libtasn1 soname version -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="doc static-libs test valgrind" RESTRICT="!test? ( test )" diff --git a/dev-libs/libtasn1/libtasn1-4.15.0-r1.ebuild b/dev-libs/libtasn1/libtasn1-4.15.0-r1.ebuild index ea29654ea970..70c4d4906352 100644 --- a/dev-libs/libtasn1/libtasn1-4.15.0-r1.ebuild +++ b/dev-libs/libtasn1/libtasn1-4.15.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" LICENSE="GPL-3 LGPL-2.1" SLOT="0/6" # subslot = libtasn1 soname version -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="doc static-libs test valgrind" RESTRICT="!test? ( test )" diff --git a/dev-libs/libtasn1/libtasn1-4.16.0.ebuild b/dev-libs/libtasn1/libtasn1-4.16.0.ebuild index b77d19fe1f2a..930631602f40 100644 --- a/dev-libs/libtasn1/libtasn1-4.16.0.ebuild +++ b/dev-libs/libtasn1/libtasn1-4.16.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" LICENSE="GPL-3 LGPL-2.1" SLOT="0/6" # subslot = libtasn1 soname version -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="doc static-libs test valgrind" RESTRICT="!test? ( test )" diff --git a/dev-libs/libtimezonemap/libtimezonemap-0.4.6.ebuild b/dev-libs/libtimezonemap/libtimezonemap-0.4.6.ebuild index a109233b6fef..86c528030c42 100644 --- a/dev-libs/libtimezonemap/libtimezonemap-0.4.6.ebuild +++ b/dev-libs/libtimezonemap/libtimezonemap-0.4.6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -7,12 +7,11 @@ inherit autotools xdg DESCRIPTION="GTK+3 timezone map widget" HOMEPAGE="https://launchpad.net/timezonemap" -SRC_URI="mirror://ubuntu/pool/main/libt/${PN}/${PN}_${PV}.tar.gz" -RESTRICT="mirror" +SRC_URI="mirror://debian/pool/main/libt/${PN}/${PN}_${PV}.orig.tar.gz -> ${PN}_${PV}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~arm64 x86" DEPEND="dev-libs/glib:2 dev-libs/gobject-introspection:0= diff --git a/dev-libs/libtomcrypt/Manifest b/dev-libs/libtomcrypt/Manifest new file mode 100644 index 000000000000..71ae48ee0d7c --- /dev/null +++ b/dev-libs/libtomcrypt/Manifest @@ -0,0 +1 @@ +DIST libtomcrypt-1.18.2.tar.xz 2638064 BLAKE2B fad67e9e2a2002425488db9987a853bda631d6638c2cb1052a1d0d1f393945e38037cc75c54cd3a4bf87bb2e13b1e868e81da054a84bbdb393519ddef5e27300 SHA512 f6117a12a42b07f8de4a8aedbccf6ff4ee94b4b81cb7263af99627c32eae646ca8ead7d3063737918db4aa118673001fcf2cfa8e4ca8b528fb00045fda7cc893 diff --git a/dev-libs/libtomcrypt/libtomcrypt-1.18.2-r2.ebuild b/dev-libs/libtomcrypt/libtomcrypt-1.18.2-r2.ebuild new file mode 100644 index 000000000000..aabf12d29620 --- /dev/null +++ b/dev-libs/libtomcrypt/libtomcrypt-1.18.2-r2.ebuild @@ -0,0 +1,102 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit toolchain-funcs + +DESCRIPTION="LibTomCrypt is a comprehensive, modular and portable cryptographic toolkit" +HOMEPAGE="https://www.libtom.net/LibTomCrypt/ https://github.com/libtom/libtomcrypt" +SRC_URI=" + https://github.com/libtom/${PN}/releases/download/v${PV}/crypt-${PV}.tar.xz + -> ${P}.tar.xz" + +LICENSE="|| ( WTFPL-2 public-domain )" +# Current SONAME is 1 +# Please bump when the ABI changes upstream +# Helpful site: +# https://abi-laboratory.pro/index.php?view=timeline&l=libtomcrypt +SLOT="0/1" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="+gmp +libtommath tomsfastmath" + +BDEPEND=" + sys-devel/libtool + virtual/pkgconfig +" +DEPEND=" + gmp? ( dev-libs/gmp:= ) + libtommath? ( dev-libs/libtommath:= ) + tomsfastmath? ( dev-libs/tomsfastmath:= ) +" +RDEPEND="${DEPEND}" + +mymake() { + # Standard boilerplate + # Upstream use homebrewed makefiles + # Best to use same args for all, for consistency, + # in case behaviour changes (v possible). + local enabled_features=() + local extra_libs=() + + # Build support as appropriate for consumers (MPI) + if use gmp; then + enabled_features+=( -DGMP_DESC=1 ) + extra_libs+=( -lgmp ) + fi + if use libtommath; then + enabled_features+=( -DLTM_DESC=1 ) + extra_libs+=( -ltommath ) + fi + if use tomsfastmath; then + enabled_features+=( -DTFM_DESC=1 ) + extra_libs+=( -ltfm ) + fi + + # For the test and example binaries, we have to choose + # which MPI we want to use. + # For now (see src_test), arbitrarily choose: + # gmp > libtommath > tomsfastmath > none + if use gmp ; then + enabled_features+=( -DUSE_GMP=1 ) + elif use libtommath ; then + enabled_features+=( -DUSE_LTM=1 ) + elif use tomsfastmath ; then + enabled_features+=( -DUSE_TFM=1 ) + fi + + # IGNORE_SPEED=1 is needed to respect CFLAGS + EXTRALIBS="${extra_libs[*]}" emake \ + CFLAGS="${CFLAGS} ${enabled_features[*]}" \ + CC="$(tc-getCC)" \ + AR="$(tc-getAR)" \ + RANLIB="$(tc-getRANLIB)" \ + LIBPATH="${ESYSROOT}/usr/$(get_libdir)" \ + INCPATH="${ESYSROOT}/usr/include" \ + IGNORE_SPEED=1 \ + "${@}" +} + +src_compile() { + mymake -f makefile.shared library +} + +src_test() { + # libtomcrypt can build with several MPI providers + # but the tests can only be built with one at a time. + # When the next release (> 1.18.2) containing + # 1) https://github.com/libtom/libtomcrypt/commit/a65cfb8dbe4 + # 2) https://github.com/libtom/libtomcrypt/commit/fdc6cd20137 + # is made, we can run tests for each provider. + mymake test + ./test || die "Running tests failed" +} + +src_install() { + mymake -f makefile.shared \ + DATAPATH="${EPREFIX}/usr/share/doc/${PF}" \ + DESTDIR="${ED}" \ + install install_docs + + find "${ED}" '(' -name '*.la' -o -name '*.a' ')' -delete || die +} diff --git a/dev-libs/libtomcrypt/metadata.xml b/dev-libs/libtomcrypt/metadata.xml new file mode 100644 index 000000000000..ab95df6f12a7 --- /dev/null +++ b/dev-libs/libtomcrypt/metadata.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>sam@gentoo.org</email> + <name>Sam James</name> + </maintainer> + <maintainer type="person"> + <email>mgorny@gentoo.org</email> + <name>Michał Górny</name> + </maintainer> + <use> + <flag name="libtommath">Uses <pkg>dev-libs/libtommath</pkg> for mathematical operations</flag> + <flag name="tomsfastmath">Uses <pkg>dev-libs/tomsfastmath</pkg> for mathematical operations</flag> + </use> + <upstream> + <remote-id type="github">libtom/libtomcrypt</remote-id> + </upstream> + <origin>gentoo-staging</origin> +</pkgmetadata> diff --git a/dev-libs/libtommath/Manifest b/dev-libs/libtommath/Manifest index 67760f63274f..eaf116692eb5 100644 --- a/dev-libs/libtommath/Manifest +++ b/dev-libs/libtommath/Manifest @@ -1,2 +1 @@ -DIST ltm-1.1.0.tar.xz 2125456 BLAKE2B 3aca7993704341f6a81e7fbef35389ac8ecd957dd78b5d576f0305d37493c3ddc32462cd787de2fb67d8e165417b18fcfde70accf991cd9433ff87591d8265ac SHA512 6d1b8b09d5b975a2b84ef6ab9cb1cc63db2f0503a906e499cb9d7eaba3f487be6e7f69bf692b188f888418c61ea563aa7e2411638d8979eac426b3d603ad1b91 DIST ltm-1.2.0.tar.xz 622120 BLAKE2B 1537dad7da5c14264f03280e9d49fa0b7e6c1c4924c805f202d31c60569b9e3bee40674301d67b0f5b049c1c2dc5ec71b6c566ff5c9b8168d16840b031acc400 SHA512 6f9ccd0691831f07f86ddc81cb6145504b3d5da66dd3e92312c64cce0ea986fa4e08ba65ca8991aaebe56702c2d7c15f309696785b813dffb4c112a4ad04b203 diff --git a/dev-libs/libtommath/libtommath-1.1.0.ebuild b/dev-libs/libtommath/libtommath-1.1.0.ebuild deleted file mode 100644 index 70d7c93256b9..000000000000 --- a/dev-libs/libtommath/libtommath-1.1.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 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="WTFPL-2" -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)" \ - -f makefile.shared \ - IGNORE_SPEED=1 \ - LIBPATH="${EPREFIX}/usr/$(get_libdir)" \ - INCPATH="${EPREFIX}/usr/include" \ - "$@" -} - -src_compile() { - _emake -} - -src_test() { - _emake test_standalone - ./test || die -} - -src_install() { - _emake DESTDIR="${D}" 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 *.pdf - - if use examples ; then - docinto demo - dodoc demo/*.c - fi -} diff --git a/dev-libs/libtommath/libtommath-1.2.0.ebuild b/dev-libs/libtommath/libtommath-1.2.0.ebuild index e8d9134439eb..78def9854c3f 100644 --- a/dev-libs/libtommath/libtommath-1.2.0.ebuild +++ b/dev-libs/libtommath/libtommath-1.2.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,9 +11,11 @@ SRC_URI="https://github.com/libtom/libtommath/releases/download/v${PV}/ltm-${PV} LICENSE="Unlicense" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="doc examples static-libs" +BDEPEND="sys-devel/libtool" + src_prepare() { default diff --git a/dev-libs/libucl/libucl-0.8.1-r1.ebuild b/dev-libs/libucl/libucl-0.8.1-r1.ebuild index c4c4911fe043..8c59554dfc50 100644 --- a/dev-libs/libucl/libucl-0.8.1-r1.ebuild +++ b/dev-libs/libucl/libucl-0.8.1-r1.ebuild @@ -22,7 +22,7 @@ SLOT="0" IUSE="lua +regex sign urls +utils static-libs" DEPEND="!!dev-libs/ucl - lua? ( >=dev-lang/lua-5.1:= ) + lua? ( >=dev-lang/lua-5.1:0= ) urls? ( net-misc/curl ) sign? ( dev-libs/openssl:0 ) " diff --git a/dev-libs/libucl/libucl-0.8.1-r100.ebuild b/dev-libs/libucl/libucl-0.8.1-r100.ebuild index 66e66cd2dc80..499eeed079b4 100644 --- a/dev-libs/libucl/libucl-0.8.1-r100.ebuild +++ b/dev-libs/libucl/libucl-0.8.1-r100.ebuild @@ -3,7 +3,7 @@ EAPI=7 -LUA_COMPAT=( lua5-{1..3} ) +LUA_COMPAT=( lua5-{1..4} luajit ) inherit lua-single autotools DESCRIPTION="Universal configuration library parser" @@ -42,7 +42,7 @@ src_prepare() { } src_configure() { - lua_setup + use lua && lua_setup local myeconfargs=( "$(use_enable lua)" @@ -50,6 +50,8 @@ src_configure() { "$(use_enable sign signatures)" "$(use_enable urls)" "$(use_enable utils)" + ) + use lua && myeconfargs+=( LUA_INCLUDE="$(lua_get_CFLAGS)" LIB_LIBS="$(lua_get_LIBS)" ) diff --git a/dev-libs/libucl/libucl-9999.ebuild b/dev-libs/libucl/libucl-9999.ebuild index 66e66cd2dc80..499eeed079b4 100644 --- a/dev-libs/libucl/libucl-9999.ebuild +++ b/dev-libs/libucl/libucl-9999.ebuild @@ -3,7 +3,7 @@ EAPI=7 -LUA_COMPAT=( lua5-{1..3} ) +LUA_COMPAT=( lua5-{1..4} luajit ) inherit lua-single autotools DESCRIPTION="Universal configuration library parser" @@ -42,7 +42,7 @@ src_prepare() { } src_configure() { - lua_setup + use lua && lua_setup local myeconfargs=( "$(use_enable lua)" @@ -50,6 +50,8 @@ src_configure() { "$(use_enable sign signatures)" "$(use_enable urls)" "$(use_enable utils)" + ) + use lua && myeconfargs+=( LUA_INCLUDE="$(lua_get_CFLAGS)" LIB_LIBS="$(lua_get_LIBS)" ) diff --git a/dev-libs/libunistring/libunistring-0.9.10.ebuild b/dev-libs/libunistring/libunistring-0.9.10.ebuild index 81c3f6ca19e9..4a9014675627 100644 --- a/dev-libs/libunistring/libunistring-0.9.10.ebuild +++ b/dev-libs/libunistring/libunistring-0.9.10.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" LICENSE="LGPL-3 GPL-3" SLOT="0/2" -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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="doc static-libs" PATCHES=( diff --git a/dev-libs/libusb-compat/libusb-compat-0.1.5-r2.ebuild b/dev-libs/libusb-compat/libusb-compat-0.1.5-r2.ebuild index a00a543fe739..01cb52974454 100644 --- a/dev-libs/libusb-compat/libusb-compat-0.1.5-r2.ebuild +++ b/dev-libs/libusb-compat/libusb-compat-0.1.5-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN/-compat}/${P}.tar.bz2" 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" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" IUSE="debug examples static-libs" RDEPEND=">=virtual/libusb-1-r1:1[${MULTILIB_USEDEP}] diff --git a/dev-libs/libusb-compat/libusb-compat-0.1.5-r3.ebuild b/dev-libs/libusb-compat/libusb-compat-0.1.5-r3.ebuild index a464162c51f5..6d6f50736076 100644 --- a/dev-libs/libusb-compat/libusb-compat-0.1.5-r3.ebuild +++ b/dev-libs/libusb-compat/libusb-compat-0.1.5-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN/-compat}/${P}.tar.bz2" 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" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" IUSE="debug examples static-libs" RDEPEND=">=virtual/libusb-1-r1:1[${MULTILIB_USEDEP}] diff --git a/dev-libs/libusb/libusb-1.0.23-r1.ebuild b/dev-libs/libusb/libusb-1.0.23-r1.ebuild index 283daa606605..15919c6c0a3a 100644 --- a/dev-libs/libusb/libusb-1.0.23-r1.ebuild +++ b/dev-libs/libusb/libusb-1.0.23-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -10,7 +10,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.bz2" LICENSE="LGPL-2.1" SLOT="1" -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" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" IUSE="debug doc examples static-libs test udev" RESTRICT="!test? ( test )" diff --git a/dev-libs/libusb/libusb-1.0.24-r1.ebuild b/dev-libs/libusb/libusb-1.0.24-r1.ebuild index 50c1cb3b454b..c234dc18fd80 100644 --- a/dev-libs/libusb/libusb-1.0.24-r1.ebuild +++ b/dev-libs/libusb/libusb-1.0.24-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -10,7 +10,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.bz2" LICENSE="LGPL-2.1" SLOT="1" -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" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" IUSE="debug doc examples static-libs test udev" RESTRICT="!test? ( test )" diff --git a/dev-libs/libutf8proc/libutf8proc-2.2.0_p1-r1.ebuild b/dev-libs/libutf8proc/libutf8proc-2.2.0_p1-r1.ebuild index e032bb5bb593..f8035620e02b 100644 --- a/dev-libs/libutf8proc/libutf8proc-2.2.0_p1-r1.ebuild +++ b/dev-libs/libutf8proc/libutf8proc-2.2.0_p1-r1.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://download.netsurf-browser.org/libs/releases/${MY_P}-src.tar.gz" LICENSE="MIT" SLOT="0/${PV}" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86" IUSE="" DEPEND="dev-util/netsurf-buildsystem" diff --git a/dev-libs/libuv/libuv-1.40.0.ebuild b/dev-libs/libuv/libuv-1.40.0.ebuild index 2bff012b3068..fe965cd36cfa 100644 --- a/dev-libs/libuv/libuv-1.40.0.ebuild +++ b/dev-libs/libuv/libuv-1.40.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -10,7 +10,7 @@ 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" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="static-libs" RESTRICT="test" @@ -25,6 +25,22 @@ src_prepare() { echo "m4_define([UV_EXTRA_AUTOMAKE_FLAGS], [serial-tests])" \ > m4/libuv-extra-automake-flags.m4 || die + if [[ ${CHOST} == *-darwin* && ${CHOST##*darwin} -le 9 ]] ; then + sed -i -e '/!defined(__DragonFly__)/i!defined(__APPLE__) && \\' \ + src/unix/udp.c || die + sed -i -e '/err = pthread_setname_np/cerr = 0;' \ + src/unix/darwin-proctitle.c || die + sed -i -e '/int uv_if_indextoname/i\ + static size_t strnlen(char *x, size_t len) {\ + char *r = memchr(x, '"'"'\\n'"'"', len);\ + if (r == NULL)\ + return len;\ + else\ + return r - x;\ + }' \ + src/unix/getaddrinfo.c || die + fi + # upstream fails to ship a configure script eautoreconf } diff --git a/dev-libs/libverto/Manifest b/dev-libs/libverto/Manifest index 3bfbe6547536..9aaab2bc48ed 100644 --- a/dev-libs/libverto/Manifest +++ b/dev-libs/libverto/Manifest @@ -1,3 +1 @@ -DIST libverto-0.2.5.tar.gz 349722 BLAKE2B fd46b1fd1500d4732baa2d461e4b490386ff54efa8a23f06f40048e1624b4698cfedcfda79cc0a21c9a77050baafe8572835f1c0d174873772afe46b199a6294 SHA512 d57a7f86e714d3fbed391984de3356d8a2769f846985769c1be7d881647c1be95a5fc6a82bba1660ef3241aa1a40150b5e005af6f35dc32473facfdea49c556e -DIST libverto-0.3.0.tar.gz 380822 BLAKE2B 7dd31e62a4f4d8ce5cdb77ba96b9e4c957b117ade67f2fb8d38c98e05334fd952386f5690bbe49eba60c545c02ef99dcf63dee3fb17910589013b2868ee24139 SHA512 af4fec9cd20058c1db404443004c2b6c98bcacd0742369bb91f46dde6a35358e44f659bdfef30ab113e112ac1afb3156b098f5b5e2f4a58d1f4cd949abf0f57f DIST libverto-0.3.1.tar.gz 383390 BLAKE2B 2d8366d85c2a02becf8fa9224d195a8d85f64aab735a0101997a52dd99750537b181a6dd2fc494b435b949b4a9cb785acb7222ba3f2424b7a7ddcf5d3c832387 SHA512 baef4fd280e0cb30167743608fd5a950fb4340eeb89e3630a0f63f8eab4d56f0f894a2e3283583b7ed8774d5e896c44e2c68c25882d95a07350f980af36b8740 diff --git a/dev-libs/libverto/files/libverto-0.3.1-non-bash.patch b/dev-libs/libverto/files/libverto-0.3.1-non-bash.patch new file mode 100644 index 000000000000..df7162e21a7e --- /dev/null +++ b/dev-libs/libverto/files/libverto-0.3.1-non-bash.patch @@ -0,0 +1,133 @@ +Strips bashisms from configure.ac causing breakage in net-nds/gssproxy +https://bugs.gentoo.org/762823 +--- a/configure.ac ++++ b/configure.ac +@@ -91,22 +91,22 @@ AC_ARG_WITH([tevent], + + # Ensure that if a builtin is chosen only one is built + BUILTIN_MODULE= +-if test x$WITH_GLIB == xbuiltin; then ++if test x$WITH_GLIB = xbuiltin; then + BUILTIN_MODULE=glib + WITH_LIBEV=no + WITH_LIBEVENT=no + WITH_TEVENT=no +-elif test x$WITH_LIBEV == xbuiltin; then ++elif test x$WITH_LIBEV = xbuiltin; then + BUILTIN_MODULE=libev + WITH_LIBGLIB=no + WITH_LIBEVENT=no + WITH_TEVENT=no +-elif test x$WITH_LIBEVENT == xbuiltin; then ++elif test x$WITH_LIBEVENT = xbuiltin; then + BUILTIN_MODULE=libevent + WITH_LIBGLIB=no + WITH_LIBEV=no + WITH_TEVENT=no +-elif test x$WITH_TEVENT == xbuiltin; then ++elif test x$WITH_TEVENT = xbuiltin; then + BUILTIN_MODULE=tevent + WITH_GLIB=no + WITH_LIBEV=no +@@ -118,29 +118,29 @@ if test x$BUILTIN_MODULE != x; then + fi + + # Ensure that there is only one default (convert duplicate default to yes) +-if test x$WITH_GLIB == xdefault; then ++if test x$WITH_GLIB = xdefault; then + AC_DEFINE([DEFUALT_MODULE], [glib]) +- test x$WITH_LIBEV == xdefault && WITH_LIBEV=yes +- test x$WITH_LIBEVENT == xdefault && WITH_LIBEVENT=yes +- test x$WITH_TEVENT == xdefault && WITH_TEVENT=yes ++ test x$WITH_LIBEV = xdefault && WITH_LIBEV=yes ++ test x$WITH_LIBEVENT = xdefault && WITH_LIBEVENT=yes ++ test x$WITH_TEVENT = xdefault && WITH_TEVENT=yes + fi +-if test x$WITH_LIBEV == xdefault; then ++if test x$WITH_LIBEV = xdefault; then + AC_DEFINE([DEFUALT_MODULE], [libev]) +- test x$WITH_LIBGLIB == xdefault && WITH_GLIB=yes +- test x$WITH_LIBEVENT == xdefault && WITH_LIBEVENT=yes +- test x$WITH_TEVENT == xdefault && WITH_TEVENT=yes ++ test x$WITH_LIBGLIB = xdefault && WITH_GLIB=yes ++ test x$WITH_LIBEVENT = xdefault && WITH_LIBEVENT=yes ++ test x$WITH_TEVENT = xdefault && WITH_TEVENT=yes + fi +-if test x$WITH_LIBEVENT == xdefault; then ++if test x$WITH_LIBEVENT = xdefault; then + AC_DEFINE([DEFUALT_MODULE], [libevent]) +- test x$WITH_GLIB == xdefault && WITH_GLIB=yes +- test x$WITH_LIBEV == xdefault && WITH_LIBEV=yes +- test x$WITH_TEVENT == xdefault && WITH_TEVENT=yes ++ test x$WITH_GLIB = xdefault && WITH_GLIB=yes ++ test x$WITH_LIBEV = xdefault && WITH_LIBEV=yes ++ test x$WITH_TEVENT = xdefault && WITH_TEVENT=yes + fi +-if test x$WITH_TEVENT == xdefault; then ++if test x$WITH_TEVENT = xdefault; then + AC_DEFINE([DEFUALT_MODULE], [tevent]) +- test x$WITH_GLIB == xdefault && WITH_GLIB=yes +- test x$WITH_LIBEV == xdefault && WITH_LIBEV=yes +- test x$WITH_LIBEVENT == xdefault && WITH_LIBEVENT=yes ++ test x$WITH_GLIB = xdefault && WITH_GLIB=yes ++ test x$WITH_LIBEV = xdefault && WITH_LIBEV=yes ++ test x$WITH_LIBEVENT = xdefault && WITH_LIBEVENT=yes + fi + + BUILD_GLIB=no +@@ -151,7 +151,7 @@ BUILD_TEVENT=no + if test x$WITH_GLIB != xno; then + PKG_CHECK_MODULES([glib], [glib-2.0], [BUILD_GLIB=$WITH_GLIB], + [test x$WITH_GLIB != xauto && AC_MSG_ERROR("glib not found")]) +- if test x$BUILD_GLIB == xauto; then ++ if test x$BUILD_GLIB = xauto; then + BUILD_GLIB=yes + fi + fi +@@ -165,7 +165,7 @@ if test x$WITH_LIBEV != xno; then + ), + [test x$WITH_LIBEV != xauto && AC_MSG_ERROR("ev.h not found")] + ) +- if test x$BUILD_LIBEV == xauto; then ++ if test x$BUILD_LIBEV = xauto; then + BUILD_LIBEV=yes + fi + fi +@@ -173,7 +173,7 @@ fi + if test x$WITH_LIBEVENT != xno; then + PKG_CHECK_MODULES([libevent], [libevent >= 2.0], [BUILD_LIBEVENT=$WITH_LIBEVENT], + [test x$WITH_LIBEVENT != xauto && AC_MSG_ERROR("libevent not found")]) +- if test x$BUILD_LIBEVENT == xauto; then ++ if test x$BUILD_LIBEVENT = xauto; then + BUILD_LIBEVENT=yes + fi + fi +@@ -181,19 +181,19 @@ fi + if test x$WITH_TEVENT != xno; then + PKG_CHECK_MODULES([tevent], [tevent], [BUILD_TEVENT=$WITH_TEVENT], + [test x$WITH_TEVENT != xauto && AC_MSG_ERROR("tevent not found")]) +- if test x$BUILD_TEVENT == xauto; then ++ if test x$BUILD_TEVENT = xauto; then + BUILD_TEVENT=yes + fi + fi + +-AM_CONDITIONAL([MODULE_GLIB], [test x$BUILTIN_MODULE == x && test x$BUILD_GLIB != xno]) +-AM_CONDITIONAL([MODULE_LIBEV], [test x$BUILTIN_MODULE == x && test x$BUILD_LIBEV != xno]) +-AM_CONDITIONAL([MODULE_LIBEVENT], [test x$BUILTIN_MODULE == x && test x$BUILD_LIBEVENT != xno]) +-AM_CONDITIONAL([MODULE_TEVENT], [test x$BUILTIN_MODULE == x && test x$BUILD_TEVENT != xno]) +-AM_CONDITIONAL([BUILTIN_GLIB], [test x$BUILTIN_MODULE == xglib]) +-AM_CONDITIONAL([BUILTIN_LIBEV], [test x$BUILTIN_MODULE == xlibev]) +-AM_CONDITIONAL([BUILTIN_LIBEVENT], [test x$BUILTIN_MODULE == xlibevent]) +-AM_CONDITIONAL([BUILTIN_TEVENT], [test x$BUILTIN_MODULE == xtevent]) ++AM_CONDITIONAL([MODULE_GLIB], [test x$BUILTIN_MODULE = x && test x$BUILD_GLIB != xno]) ++AM_CONDITIONAL([MODULE_LIBEV], [test x$BUILTIN_MODULE = x && test x$BUILD_LIBEV != xno]) ++AM_CONDITIONAL([MODULE_LIBEVENT], [test x$BUILTIN_MODULE = x && test x$BUILD_LIBEVENT != xno]) ++AM_CONDITIONAL([MODULE_TEVENT], [test x$BUILTIN_MODULE = x && test x$BUILD_TEVENT != xno]) ++AM_CONDITIONAL([BUILTIN_GLIB], [test x$BUILTIN_MODULE = xglib]) ++AM_CONDITIONAL([BUILTIN_LIBEV], [test x$BUILTIN_MODULE = xlibev]) ++AM_CONDITIONAL([BUILTIN_LIBEVENT], [test x$BUILTIN_MODULE = xlibevent]) ++AM_CONDITIONAL([BUILTIN_TEVENT], [test x$BUILTIN_MODULE = xtevent]) + + AC_MSG_NOTICE() + AC_MSG_NOTICE([BUILD CONFIGURATION]) diff --git a/dev-libs/libverto/files/libverto-Wflags.patch b/dev-libs/libverto/files/libverto-Wflags.patch deleted file mode 100644 index de403720dd62..000000000000 --- a/dev-libs/libverto/files/libverto-Wflags.patch +++ /dev/null @@ -1,25 +0,0 @@ -From f3935464e3a823539394dcb4669a6e7a889a95ef Mon Sep 17 00:00:00 2001 -From: Robbie Harwood <rharwood@redhat.com> -Date: Wed, 31 Jan 2018 18:21:04 +0100 -Subject: [PATCH] Turn off -Wcast-function-type - -The glib event library forces all callbacks to the same type, even -when they have different arities. Turn off the gcc warning for this -gross behavior. ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 4084965..dcab593 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -9,7 +9,7 @@ m4_ifdef([AC_USE_SYSTEM_EXTENSIONS], - - AC_PROG_CC_C99 - --for flag in -Wall -Wextra; do -+for flag in -Wall -Wextra -Wno-cast-function-type; do - OLD_CFLAGS=$CFLAGS - CFLAGS="$CFLAGS $flag" - AC_TRY_COMPILE(, [return 0;], [], [CFLAGS=$OLD_CFLAGS]) diff --git a/dev-libs/libverto/files/libverto-libev-c89.patch b/dev-libs/libverto/files/libverto-libev-c89.patch deleted file mode 100644 index e63c032b0c89..000000000000 --- a/dev-libs/libverto/files/libverto-libev-c89.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 09ee123..b7b5908 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -7,8 +7,8 @@ m4_ifdef([AC_USE_SYSTEM_EXTENSIONS], - [AC_USE_SYSTEM_EXTENSIONS], - [AC_GNU_SOURCE]) - --AC_PROG_CC_C89 --for flag in -std=c89 -Wall -Wextra; do -+AC_PROG_CC_C99 -+for flag in -Wall -Wextra; do - AC_TRY_COMPILE([], [return 0;], [CFLAGS="$CFLAGS $flag"],) - done - diff --git a/dev-libs/libverto/files/libverto-load.patch b/dev-libs/libverto/files/libverto-load.patch deleted file mode 100644 index 94dceac5d69c..000000000000 --- a/dev-libs/libverto/files/libverto-load.patch +++ /dev/null @@ -1,78 +0,0 @@ -From 7989b3c6bdfdeb8770d17d8717b4a0cd48e79386 Mon Sep 17 00:00:00 2001 -From: Robbie Harwood <rharwood@redhat.com> -Date: Wed, 24 Oct 2018 16:57:11 -0400 -Subject: [PATCH] Fix rare leak of DSO in module_load - ---- - src/module.c | 31 +++++++++++++++---------------- - 1 file changed, 15 insertions(+), 16 deletions(-) - -diff --git a/src/module.c b/src/module.c -index 1f1b7c9..0b59034 100644 ---- a/src/module.c -+++ b/src/module.c -@@ -182,7 +182,7 @@ module_load(const char *filename, const char *symbname, - intdll = dlopen(filename, RTLD_LAZY | RTLD_LOCAL); - #endif /* WIN32 */ - if (!intdll) -- return dllerror(); -+ goto fail; - - /* Get the module symbol */ - #ifdef WIN32 -@@ -190,16 +190,12 @@ module_load(const char *filename, const char *symbname, - #else /* WIN32 */ - intsym = dlsym(intdll, symbname); - #endif /* WIN32 */ -- if (!intsym) { -- module_close(intdll); -- return dllerror(); -- } -+ if (!intsym) -+ goto fail; - - /* Figure out whether or not to load this module */ -- if (!shouldload(intsym, misc, &interr)) { -- module_close(intdll); -- return interr; -- } -+ if (!shouldload(intsym, misc, &interr)) -+ goto fail; - - /* Re-open the module */ - module_close(intdll); -@@ -208,9 +204,8 @@ module_load(const char *filename, const char *symbname, - #else /* WIN32 */ - intdll = dlopen(filename, RTLD_NOW | RTLD_LOCAL); - #endif /* WIN32 */ -- if (!intdll) { -- return dllerror(); -- } -+ if (!intdll) -+ goto fail; - - /* Get the symbol again */ - #ifdef WIN32 -@@ -218,14 +213,18 @@ module_load(const char *filename, const char *symbname, - #else /* WIN32 */ - intsym = dlsym(intdll, symbname); - #endif /* WIN32 */ -- if (!intsym) { -- module_close(intdll); -- return dllerror(); -- } -+ if (!intsym) -+ goto fail; - - if (dll) - *dll = intdll; - if (symb) - *symb = intsym; - return NULL; -+ -+fail: -+ if (!interr) -+ interr = dllerror(); -+ module_close(intdll); -+ return interr; - } diff --git a/dev-libs/libverto/files/libverto-verify-cflags.patch b/dev-libs/libverto/files/libverto-verify-cflags.patch deleted file mode 100644 index dce747239dc7..000000000000 --- a/dev-libs/libverto/files/libverto-verify-cflags.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 5bbe8b009d6daa809f679fd1d25c270abba468b4 Mon Sep 17 00:00:00 2001 -From: Robbie Harwood <rharwood@redhat.com> -Date: Wed, 31 Jan 2018 17:52:39 +0100 -Subject: [PATCH] Verify flags prior to adding them to CFLAGS, not after - ---- - configure.ac | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index b7b5908..4084965 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -8,8 +8,11 @@ m4_ifdef([AC_USE_SYSTEM_EXTENSIONS], - [AC_GNU_SOURCE]) - - AC_PROG_CC_C99 -+ - for flag in -Wall -Wextra; do -- AC_TRY_COMPILE([], [return 0;], [CFLAGS="$CFLAGS $flag"],) -+ OLD_CFLAGS=$CFLAGS -+ CFLAGS="$CFLAGS $flag" -+ AC_TRY_COMPILE(, [return 0;], [], [CFLAGS=$OLD_CFLAGS]) - done - - AC_CANONICAL_SYSTEM diff --git a/dev-libs/libverto/libverto-0.2.5-r1.ebuild b/dev-libs/libverto/libverto-0.2.5-r1.ebuild deleted file mode 100644 index 12650e13dfb6..000000000000 --- a/dev-libs/libverto/libverto-0.2.5-r1.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit ltprune multilib-minimal - -DESCRIPTION="Main event loop abstraction library" -HOMEPAGE="https://github.com/latchset/libverto/" -SRC_URI="https://github.com/latchset/libverto/releases/download/${PV}/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86" -IUSE="glib +libev libevent tevent +threads static-libs" - -# file collisions -DEPEND="!=app-crypt/mit-krb5-1.10.1-r0 - !=app-crypt/mit-krb5-1.10.1-r1 - !=app-crypt/mit-krb5-1.10.1-r2 - glib? ( >=dev-libs/glib-2.34.3[${MULTILIB_USEDEP}] ) - libev? ( >=dev-libs/libev-4.15[${MULTILIB_USEDEP}] ) - libevent? ( >=dev-libs/libevent-2.0.21[${MULTILIB_USEDEP}] ) - tevent? ( >=sys-libs/tevent-0.9.19[${MULTILIB_USEDEP}] )" - -RDEPEND="${DEPEND}" - -REQUIRED_USE="|| ( glib libev libevent tevent ) " - -src_prepare() { - # known problem uptream with tevent write test. tevent does not fire a - # callback on error, but we explicitly test for this behaviour. Do not run - # tevent tests for now. - sed -i -e 's/def HAVE_TEVENT/ 0/' tests/test.h || die -} - -multilib_src_configure() { - ECONF_SOURCE="${S}" \ - econf \ - $(use_with glib) \ - $(use_with libev) \ - $(use_with libevent) \ - $(use_with tevent) \ - $(use_with threads pthread) \ - $(use_enable static-libs static) -} - -multilib_src_install_all() { - dodoc AUTHORS ChangeLog NEWS INSTALL README - use static-libs || prune_libtool_files --all -} diff --git a/dev-libs/libverto/libverto-0.3.0.ebuild b/dev-libs/libverto/libverto-0.3.0.ebuild deleted file mode 100644 index 7786a2f773cc..000000000000 --- a/dev-libs/libverto/libverto-0.3.0.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools multilib-minimal - -DESCRIPTION="Main event loop abstraction library" -HOMEPAGE="https://github.com/latchset/libverto/" -SRC_URI="https://github.com/latchset/libverto/releases/download/${PV}/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" -IUSE="glib +libev libevent tevent +threads static-libs" - -# file collisions -DEPEND="!=app-crypt/mit-krb5-1.10.1-r0 - !=app-crypt/mit-krb5-1.10.1-r1 - !=app-crypt/mit-krb5-1.10.1-r2 - glib? ( >=dev-libs/glib-2.34.3[${MULTILIB_USEDEP}] ) - libev? ( >=dev-libs/libev-4.15[${MULTILIB_USEDEP}] ) - libevent? ( >=dev-libs/libevent-2.0.21[${MULTILIB_USEDEP}] ) - tevent? ( >=sys-libs/tevent-0.9.19[${MULTILIB_USEDEP}] )" - -RDEPEND="${DEPEND}" - -REQUIRED_USE="|| ( glib libev libevent tevent ) " - -PATCHES=( "${FILESDIR}/${PN}-libev-c89.patch" \ - "${FILESDIR}/${PN}-verify-cflags.patch" \ - "${FILESDIR}/${PN}-Wflags.patch" \ - "${FILESDIR}/${PN}-load.patch" ) - -DOCS=( AUTHORS ChangeLog NEWS INSTALL README ) - -src_prepare() { - default - # known problem uptream with tevent write test. tevent does not fire a - # callback on error, but we explicitly test for this behaviour. Do not run - # tevent tests for now. - sed -i -e 's/def HAVE_TEVENT/ 0/' tests/test.h || die - eautoreconf -} - -multilib_src_configure() { - ECONF_SOURCE="${S}" \ - econf \ - $(use_with glib) \ - $(use_with libev) \ - $(use_with libevent) \ - $(use_with tevent) \ - $(use_with threads pthread) \ - $(use_enable static-libs static) -} - -multilib_src_install_all() { - default - use static-libs || find "${ED}" -name '*.la' -delete -} diff --git a/dev-libs/libverto/libverto-0.3.1.ebuild b/dev-libs/libverto/libverto-0.3.1-r1.ebuild index 883f3b2cfe0b..6964058d33d5 100644 --- a/dev-libs/libverto/libverto-0.3.1.ebuild +++ b/dev-libs/libverto/libverto-0.3.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,8 +11,9 @@ SRC_URI="https://github.com/latchset/libverto/releases/download/${PV}/${P}.tar.g LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86" IUSE="glib +libev libevent tevent +threads static-libs" +REQUIRED_USE="|| ( glib libev libevent tevent ) " DEPEND="glib? ( >=dev-libs/glib-2.34.3[${MULTILIB_USEDEP}] ) libev? ( >=dev-libs/libev-4.15[${MULTILIB_USEDEP}] ) @@ -21,10 +22,13 @@ DEPEND="glib? ( >=dev-libs/glib-2.34.3[${MULTILIB_USEDEP}] ) RDEPEND="${DEPEND}" -REQUIRED_USE="|| ( glib libev libevent tevent ) " - DOCS=( AUTHORS ChangeLog NEWS INSTALL README ) +PATCHES=( + # Runtime breakage caused by bashisms, bug #762823 + "${FILESDIR}/${PN}-0.3.1-non-bash.patch" +) + src_prepare() { default # known problem uptream with tevent write test. tevent does not fire a diff --git a/dev-libs/libwacom/Manifest b/dev-libs/libwacom/Manifest index a1069f2bb744..d7887891f939 100644 --- a/dev-libs/libwacom/Manifest +++ b/dev-libs/libwacom/Manifest @@ -1 +1,2 @@ DIST libwacom-1.1.tar.bz2 502696 BLAKE2B 1c2e03b00eb3b17dea2d5cd3e61afa4b7f36dcb727f07bb1cc42631febc9d1939bdd2652d6fd1f0d020815cac1f937c1daddae3019ac9aa01659442cdc8b9054 SHA512 8b63d9bad18c27f8078711408a7b79c70086cd0c64fe692ee693d53d834dff8ab45631eabd206f0dfac80d8cc86c14b5833831b1b99b06e34aacd235176d266b +DIST libwacom-1.7.tar.bz2 513320 BLAKE2B 36cead331b8d79fa629803441190de2c28e22c0e70822075d0ff31552f780e93d606ec2229a2fee744d9e6b91eb4879cb5a202075caf6adf1301b07502cefb7b SHA512 0cdd34c54a4477ffb763c4a291f0a6b33d2df6b1d237332b116e792685201a63a50c3ec98b84e9dc7c0b97c9e407c3531cd67c0af5a8398b5bbf8be6ca103066 diff --git a/dev-libs/libwacom/libwacom-1.7.ebuild b/dev-libs/libwacom/libwacom-1.7.ebuild new file mode 100644 index 000000000000..b1c7e433f6bd --- /dev/null +++ b/dev-libs/libwacom/libwacom-1.7.ebuild @@ -0,0 +1,60 @@ +# 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,10} ) + +inherit meson python-any-r1 toolchain-funcs udev + +DESCRIPTION="Library for identifying Wacom tablets and their model-specific features" +HOMEPAGE="https://github.com/linuxwacom/libwacom" +SRC_URI="https://github.com/linuxwacom/${PN}/releases/download/${P}/${P}.tar.bz2" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="doc test" +RESTRICT="!test? ( test )" + +BDEPEND=" + virtual/pkgconfig + doc? ( app-doc/doxygen ) + test? ( + ${PYTHON_DEPS} + $(python_gen_any_dep ' + dev-python/python-libevdev[${PYTHON_USEDEP}] + dev-python/pyudev[${PYTHON_USEDEP}] + dev-python/pytest[${PYTHON_USEDEP}] + ') + ) +" +RDEPEND=" + dev-libs/glib:2 + dev-libs/libgudev:= +" +DEPEND="${RDEPEND}" + +python_check_deps() { + has_version -b "dev-python/python-libevdev[${PYTHON_USEDEP}]" && + has_version -b "dev-python/pyudev[${PYTHON_USEDEP}]" && + has_version -b "dev-python/pytest[${PYTHON_USEDEP}]" +} + +pkg_setup() { + tc-ld-disable-gold # bug https://github.com/linuxwacom/libwacom/issues/170 + + if use test; then + python-any-r1_pkg_setup + fi +} + +src_configure() { + local emesonargs=( + $(meson_feature doc documentation) + $(meson_feature test tests) + -Dudev-dir=$(get_udevdir) + + ) + meson_src_configure +} diff --git a/dev-libs/libwapcaplet/libwapcaplet-0.4.1-r2.ebuild b/dev-libs/libwapcaplet/libwapcaplet-0.4.1-r2.ebuild index 226d826d81cb..ffbe25e7d93e 100644 --- a/dev-libs/libwapcaplet/libwapcaplet-0.4.1-r2.ebuild +++ b/dev-libs/libwapcaplet/libwapcaplet-0.4.1-r2.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz" LICENSE="MIT" SLOT="0/${PV}" -KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~m68k-mint" +KEYWORDS="~amd64 ~arm ~ppc ~ppc64" IUSE="test" RESTRICT="!test? ( test )" diff --git a/dev-libs/libwapcaplet/libwapcaplet-0.4.2-r1.ebuild b/dev-libs/libwapcaplet/libwapcaplet-0.4.2-r1.ebuild index 393ffbdbd404..f3e2d26a91fd 100644 --- a/dev-libs/libwapcaplet/libwapcaplet-0.4.2-r1.ebuild +++ b/dev-libs/libwapcaplet/libwapcaplet-0.4.2-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz" LICENSE="MIT" SLOT="0/${PV}" -KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~m68k-mint" +KEYWORDS="~amd64 ~arm ~ppc ~ppc64" IUSE="test" RESTRICT="!test? ( test )" diff --git a/dev-libs/libwapcaplet/libwapcaplet-0.4.3-r1.ebuild b/dev-libs/libwapcaplet/libwapcaplet-0.4.3-r1.ebuild index 393ffbdbd404..f3e2d26a91fd 100644 --- a/dev-libs/libwapcaplet/libwapcaplet-0.4.3-r1.ebuild +++ b/dev-libs/libwapcaplet/libwapcaplet-0.4.3-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz" LICENSE="MIT" SLOT="0/${PV}" -KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~m68k-mint" +KEYWORDS="~amd64 ~arm ~ppc ~ppc64" IUSE="test" RESTRICT="!test? ( test )" diff --git a/dev-libs/libxdg-basedir/libxdg-basedir-1.2.0-r1.ebuild b/dev-libs/libxdg-basedir/libxdg-basedir-1.2.0-r1.ebuild index f7055c8310b2..025e69060d40 100644 --- a/dev-libs/libxdg-basedir/libxdg-basedir-1.2.0-r1.ebuild +++ b/dev-libs/libxdg-basedir/libxdg-basedir-1.2.0-r1.ebuild @@ -10,7 +10,7 @@ SRC_URI="https://github.com/devnev/libxdg-basedir/archive/${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="amd64 arm arm64 hppa ppc ppc64 x86 ~amd64-linux ~x64-macos ~x86-solaris" +KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x64-macos ~x86-solaris" IUSE="doc static-libs" RDEPEND="" diff --git a/dev-libs/libxls/Manifest b/dev-libs/libxls/Manifest index 8120bbbe38f8..a093decbcdf7 100644 --- a/dev-libs/libxls/Manifest +++ b/dev-libs/libxls/Manifest @@ -1 +1,2 @@ DIST libxls-1.6.1.tar.gz 443736 BLAKE2B 47ed31bb16a65c764ee5882435ce11701e51b6ee5f03aa57ee7991e5445dc477143df48d757c618043a1abd864c46dacedeb1a18a608db1d5ae2b8fcab4a712f SHA512 99d4aa911bc12a52698e11c0592ed8ecb16fa055d4634e6bcc3e0a3900fd8311bade70d2cc8d2f60abbe72d644b6f30757b284544ca589e85c35eeb6f158b8cd +DIST libxls-1.6.2.tar.gz 443736 BLAKE2B 46f875613caa423dcb3acac0c38a68c7274993b25cc9be891266b8cf59e8eb0f17580e399305cf927854e090f34fa34f57f7fcbdceb75dffaf04c3362fa63095 SHA512 55e5cb33ec63484063d0893eee7352b89f993363762cd5ef42b5f918b09d1eafcf933fba076255267d9413c963481eb07c7054a2495d2d529db2e1d626353d22 diff --git a/dev-libs/libxls/libxls-1.6.2.ebuild b/dev-libs/libxls/libxls-1.6.2.ebuild new file mode 100644 index 000000000000..0f00bd86d800 --- /dev/null +++ b/dev-libs/libxls/libxls-1.6.2.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2021 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/8" # libxlsreader.so.8 +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND="" +DEPEND="" +BDEPEND=" + app-arch/unzip + virtual/pkgconfig +" + +RESTRICT=test # test driver is missing + +PATCHES=( + "${FILESDIR}"/${PN}-1.4.0-asprintf.patch +) + +src_configure() { + econf \ + --disable-static +} + +src_install() { + default + + find "${D}" -name '*.la' -type f -delete || die +} diff --git a/dev-libs/libxml2/libxml2-2.9.10-r4.ebuild b/dev-libs/libxml2/libxml2-2.9.10-r4.ebuild index cc7cc35bb452..0c07b2f41428 100644 --- a/dev-libs/libxml2/libxml2-2.9.10-r4.ebuild +++ b/dev-libs/libxml2/libxml2-2.9.10-r4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -13,7 +13,7 @@ HOMEPAGE="https://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" +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 ~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 )" @@ -82,10 +82,6 @@ src_prepare() { 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 @@ -182,15 +178,6 @@ multilib_src_install() { } 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 @@ -205,7 +192,7 @@ multilib_src_install_all() { 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 + if [[ -n ${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 diff --git a/dev-libs/libxmlb/Manifest b/dev-libs/libxmlb/Manifest index 9de6e04de725..d481fbe7efae 100644 --- a/dev-libs/libxmlb/Manifest +++ b/dev-libs/libxmlb/Manifest @@ -1,3 +1,2 @@ DIST libxmlb-0.1.15.tar.gz 92923 BLAKE2B 97b6af812397dd279e7e3c038627fcf8228cbfa5c3af91ceeb5361e32d37d357eda6a193f627a5f4442426fb08abca1ff11684fe199d9d3a4add72ca4f3f5d08 SHA512 58268b3a690af36c0923afdee3ae58e88bf778eebbc6a439be1bc85ed985efdc20cd7006c976586f7be87310dc091d67dddd370f4bbec58379fc4e7349bfa3d8 -DIST libxmlb-0.2.0.tar.gz 97521 BLAKE2B 7a47164503b5b682e2bb9d877622a7dcad06d40bf87d6a7cf9e21898d8444e610ba3985d6be8cf65068f0637ee44ef8678610315be2795476b2f5ccaacb098ea SHA512 cff4245a47a942dd37675921ba753858a3ee0572500a1cd7291d2a063fa7fa9d9157c167bf33694e4e0204504d7e88fbfd2873c4b9851247d6cdb338c2d587a8 DIST libxmlb-0.2.1.tar.gz 98284 BLAKE2B b9bf02560a231837d7837b43f01d8f78c54a80319379a7bfa191f8303b77c35e82d1e2bb57722f1bfe56224d96bd1513cef702a0375eb85a137bff8ca3104c5c SHA512 4e082f036eb62626d1724ac5093ad625f9259e9e81aa40d5ca0589a3a72dadd669c0718ff64dcae094973b6c282b6c8f8ce7212b7e47211f320035bb639ec59d diff --git a/dev-libs/libxmlb/libxmlb-0.1.15.ebuild b/dev-libs/libxmlb/libxmlb-0.1.15.ebuild index 150575618b19..83e9106c0f96 100644 --- a/dev-libs/libxmlb/libxmlb-0.1.15.ebuild +++ b/dev-libs/libxmlb/libxmlb-0.1.15.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -31,11 +31,11 @@ DEPEND=" " BDEPEND=" + ${PYTHON_DEPS} >=dev-util/meson-0.47.0 virtual/pkgconfig introspection? ( $(python_gen_any_dep 'dev-python/setuptools[${PYTHON_USEDEP}]') - ${PYTHON_DEPS} ) " @@ -44,7 +44,7 @@ python_check_deps() { } pkg_setup() { - use introspection && python-any-r1_pkg_setup + python-any-r1_pkg_setup } src_configure() { diff --git a/dev-libs/libxmlb/libxmlb-0.2.0.ebuild b/dev-libs/libxmlb/libxmlb-0.2.0.ebuild deleted file mode 100644 index c45f4d26be59..000000000000 --- a/dev-libs/libxmlb/libxmlb-0.2.0.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,8,9,10} ) - -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/2" # libxmlb.so version - -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.2.1.ebuild b/dev-libs/libxmlb/libxmlb-0.2.1.ebuild index 8786400fda73..aba6bb834ced 100644 --- a/dev-libs/libxmlb/libxmlb-0.2.1.ebuild +++ b/dev-libs/libxmlb/libxmlb-0.2.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -31,11 +31,11 @@ DEPEND=" " BDEPEND=" + ${PYTHON_DEPS} >=dev-util/meson-0.47.0 virtual/pkgconfig introspection? ( $(python_gen_any_dep 'dev-python/setuptools[${PYTHON_USEDEP}]') - ${PYTHON_DEPS} ) " @@ -44,7 +44,7 @@ python_check_deps() { } pkg_setup() { - use introspection && python-any-r1_pkg_setup + python-any-r1_pkg_setup } src_configure() { diff --git a/dev-libs/libyaml/libyaml-0.2.2.ebuild b/dev-libs/libyaml/libyaml-0.2.2.ebuild index d98952acd461..75975f00a462 100644 --- a/dev-libs/libyaml/libyaml-0.2.2.ebuild +++ b/dev-libs/libyaml/libyaml-0.2.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="https://github.com/yaml/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="MIT" 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 ~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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="doc static-libs test" RESTRICT="!test? ( test )" @@ -25,7 +25,7 @@ src_prepare() { sed -i -e 's: tests::g' Makefile* || die fi - elibtoolize # for FreeMiNT + elibtoolize eautoreconf } diff --git a/dev-libs/libyaml/libyaml-0.2.5.ebuild b/dev-libs/libyaml/libyaml-0.2.5.ebuild index 91cf1a6a176e..a06f6338b29e 100644 --- a/dev-libs/libyaml/libyaml-0.2.5.ebuild +++ b/dev-libs/libyaml/libyaml-0.2.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="https://github.com/yaml/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="MIT" 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 ~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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="doc static-libs test" RESTRICT="!test? ( test )" @@ -25,7 +25,7 @@ src_prepare() { sed -i -e 's: tests::g' Makefile* || die fi - elibtoolize # for FreeMiNT + elibtoolize eautoreconf } diff --git a/dev-libs/libzia/Manifest b/dev-libs/libzia/Manifest index 05d876506a47..c32bd7df0bb1 100644 --- a/dev-libs/libzia/Manifest +++ b/dev-libs/libzia/Manifest @@ -1,4 +1,2 @@ -DIST libzia-4.21.tar.gz 631871 BLAKE2B 8c54ae86e38569914c05da6c11b8ffe2c349884fb4e8ea00b05b88da12f6ee4e80ddac82f1790b67586c24d9df5b0ab71053fc80479cfdde22250a034db6dbef SHA512 e4277dfc3c004a0a1d1ccd8a11431e46344763ff5df68403b451e2be4b6bd00862fe2af0e15ce9017c3d6144d301e792f9279632687697e0dd4a238c805b04a8 -DIST libzia-4.22.tar.gz 626973 BLAKE2B 6cc87ce5bb11824fc6fbaebbf1ab3c4728884d626c18455088e02d61f84d361f194d07567eed5408671e0c31c015e1fb1d9245294457e699a0342f8487778023 SHA512 1b04460e3706e13e7b6e680a1c58c72131a7f7436a40e9b74ddfd1119cb8507e509658081b9d2daa8eb085f101091a897f8ffec518d74d4409cbd07d999d2c40 DIST libzia-4.23.tar.gz 627405 BLAKE2B 913173aca367dd660b8e04502e1198072e99e9ece5cd30ef2d4ad528292b3aba00799d89ee336bdf6a1cebf43118610caddfeeedccdd4b5af48bd54ac795066b SHA512 c34aff9b8a19713ea9881ea5a58a038fe7f0127c3503c845ecd6187ab07f90f7ae2727331e43b9cfb6b8db15d8dcbf80b2e1f4105bb4a34e9b30d9778d3a815b DIST libzia-4.24.tar.gz 630318 BLAKE2B 83792c75e776b039788d46568a967690e10086b1f5daf3304a658721f1139bbed65b41a8fdcfe213757d342287696c383be7668be111896388b292086ca2cd0a SHA512 e7952822861d7702494309d70e9d7385c5dfa929b521387bc81883d4316a5fae96c5776b00f81da6dcbaa2965fdf30ac8a8a1b9963806d36454ebd6886ddcbd1 diff --git a/dev-libs/libzia/libzia-4.21.ebuild b/dev-libs/libzia/libzia-4.21.ebuild deleted file mode 100644 index bbad25460029..000000000000 --- a/dev-libs/libzia/libzia-4.21.ebuild +++ /dev/null @@ -1,44 +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="https://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 \ - --disable-static -} - -src_install() { - emake DESTDIR="${D}" install - find "${D}" -name '*.la' -type f -delete || die -} diff --git a/dev-libs/libzia/libzia-4.22.ebuild b/dev-libs/libzia/libzia-4.22.ebuild deleted file mode 100644 index 681c796f4195..000000000000 --- a/dev-libs/libzia/libzia-4.22.ebuild +++ /dev/null @@ -1,48 +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="https://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 - - # Fix QA-Warning "QA Notice: pkg-config files with wrong LDFLAGS detected" - sed -i -e 's/@LDFLAGS@//' libzia.pc.in || die - - eautoreconf -} - -src_configure() { - econf \ - $(use_with ftdi) --with-sdl \ - --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/libzia-4.24.ebuild b/dev-libs/libzia/libzia-4.24.ebuild index c16023ab8d47..d79a25de5d25 100644 --- a/dev-libs/libzia/libzia-4.24.ebuild +++ b/dev-libs/libzia/libzia-4.24.ebuild @@ -17,7 +17,7 @@ RDEPEND="dev-libs/glib:2 x11-libs/gtk+:2 media-libs/libsdl media-libs/libpng:0 - ftdi? ( dev-embedded/libftdi:0 )" + ftdi? ( dev-embedded/libftdi:1 )" DEPEND="${RDEPEND} virtual/pkgconfig" diff --git a/dev-libs/libzip/libzip-1.7.3.ebuild b/dev-libs/libzip/libzip-1.7.3.ebuild index b79772c27f86..626153d5f736 100644 --- a/dev-libs/libzip/libzip-1.7.3.ebuild +++ b/dev-libs/libzip/libzip-1.7.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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" IUSE="bzip2 gnutls libressl lzma mbedtls ssl static-libs test tools" REQUIRED_USE="test? ( tools )" diff --git a/dev-libs/lockdev/lockdev-1.0.3.1.2-r3.ebuild b/dev-libs/lockdev/lockdev-1.0.3.1.2-r3.ebuild index ac221c51fd09..6cec67035a77 100644 --- a/dev-libs/lockdev/lockdev-1.0.3.1.2-r3.ebuild +++ b/dev-libs/lockdev/lockdev-1.0.3.1.2-r3.ebuild @@ -21,7 +21,7 @@ SRC_URI=" LICENSE="LGPL-2.1" SLOT="0" -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="perl" DEPEND="" diff --git a/dev-libs/log4cplus/log4cplus-1.2.0.ebuild b/dev-libs/log4cplus/log4cplus-1.2.0.ebuild index c71bc85e1068..5e703f0cfac9 100644 --- a/dev-libs/log4cplus/log4cplus-1.2.0.ebuild +++ b/dev-libs/log4cplus/log4cplus-1.2.0.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/project/${PN}/${PN}-stable/${PV}/${P}.tar.bz2" LICENSE="|| ( Apache-2.0 BSD-2 )" SLOT="0/1.2-5" -KEYWORDS="amd64 ~ppc64 ~x86" +KEYWORDS="amd64 ~arm64 ~ppc64 ~x86" IUSE="iconv qt5 threads working-locale working-c-locale" REQUIRED_USE="?? ( iconv working-locale working-c-locale )" diff --git a/dev-libs/log4cpp/Manifest b/dev-libs/log4cpp/Manifest index 11d9fe1e8c7e..b9af8f327ffe 100644 --- a/dev-libs/log4cpp/Manifest +++ b/dev-libs/log4cpp/Manifest @@ -1,2 +1 @@ DIST log4cpp-1.1.3.tar.gz 595639 BLAKE2B fc7d643aa70d739e38ec5aba127b4e760a47a064f4032690586c4698ec83a2b7f219d8476650d3bfc5e25563de0852869429ec45171233c6bd5c08b69476b169 SHA512 88e5e10bce8d7d6421c3dcf14aa25385159c4ae52becdc1f3666ab86e1ad3f633786d82afe398c517d4faaa57b3e7b7c0b524361d81c6b9040dbded5cecc19de -DIST log4cpp-1.1.tar.gz 547676 BLAKE2B 3fee8e575b404215d308a0d6c72feef612dcfb9c881c97500937d1a94d1c435108a24ae1ad20f19cedb1613735c22a37354226699fe6cafbf6d23dcd12668271 SHA512 e1a723641c75a0b7f9ad2338134b327cd9a0a1bd67ff76bca726389ad76e8ba0ee5a95abe6f29e05a77980255dc08b0aa5c906395b0a0ad094994c9e450e3ecb diff --git a/dev-libs/log4cpp/log4cpp-1.1.3.ebuild b/dev-libs/log4cpp/log4cpp-1.1.3.ebuild index 3f3475cd9f93..efb91e10102f 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-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="LGPL-2.1" SLOT="0/5" -KEYWORDS="~amd64 ~arm ~ppc ~s390 ~x86" +KEYWORDS="amd64 ~arm ppc s390 x86" IUSE="doc static-libs test" RESTRICT="!test? ( test )" diff --git a/dev-libs/log4cpp/log4cpp-1.1.ebuild b/dev-libs/log4cpp/log4cpp-1.1.ebuild deleted file mode 100644 index 1873910fb267..000000000000 --- a/dev-libs/log4cpp/log4cpp-1.1.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools multilib-minimal - -DESCRIPTION="C++ classes for flexible logging to files, syslog and other destinations" -HOMEPAGE="https://sourceforge.net/projects/log4cpp/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0/5" -KEYWORDS="amd64 ~arm ppc s390 x86" -IUSE="doc static-libs test" -RESTRICT="!test? ( test )" - -DEPEND="doc? ( app-doc/doxygen )" -RDEPEND="" - -PATCHES=( - "${FILESDIR}"/1.0-doc_install_path.patch - "${FILESDIR}"/1.0-gcc43.patch - "${FILESDIR}"/1.0-asneeded.patch - "${FILESDIR}"/${P}-cmath-fix.patch - "${FILESDIR}"/${P}-automake-1.13.patch -) - -S="${WORKDIR}/${PN}" - -MULTILIB_CHOST_TOOLS=( - /usr/bin/log4cpp-config -) - -src_prepare() { - default - - mv configure.{in,ac} || die - - # Build tests conditionally - if ! use test; then - sed -i -e '/^SUBDIRS/s/ tests//' Makefile.am || die - fi - - eautoreconf -} - -multilib_src_configure() { - ECONF_SOURCE=${S} econf \ - --without-idsa \ - $(use_enable doc doxygen) \ - $(use_enable static-libs static) -} - -multilib_src_install_all() { - einstalldocs - - # package installs .pc files - find "${D}" -name '*.la' -delete || die -} diff --git a/dev-libs/lzo/lzo-2.10.ebuild b/dev-libs/lzo/lzo-2.10.ebuild index 7f72ec374ac1..2cb8231ccd65 100644 --- a/dev-libs/lzo/lzo-2.10.ebuild +++ b/dev-libs/lzo/lzo-2.10.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -11,7 +11,7 @@ SRC_URI="https://www.oberhumer.com/opensource/lzo/download/${P}.tar.gz" LICENSE="GPL-2+" SLOT="2" -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 ~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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="examples static-libs" multilib_src_configure() { diff --git a/dev-libs/marisa/marisa-0.2.6.ebuild b/dev-libs/marisa/marisa-0.2.6.ebuild index 711487f43ba7..dacb090aac29 100644 --- a/dev-libs/marisa/marisa-0.2.6.ebuild +++ b/dev-libs/marisa/marisa-0.2.6.ebuild @@ -1,4 +1,4 @@ -# Copyright 2014-2020 Gentoo Authors +# Copyright 2014-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -24,7 +24,7 @@ fi LICENSE="|| ( BSD-2 LGPL-2.1+ )" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86" IUSE="python static-libs" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" diff --git a/dev-libs/miniz/files/Config.cmake.in b/dev-libs/miniz/files/Config.cmake.in new file mode 100644 index 000000000000..0865ae961005 --- /dev/null +++ b/dev-libs/miniz/files/Config.cmake.in @@ -0,0 +1 @@ +include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake") diff --git a/dev-libs/miniz/files/miniz-2.1.0-export-cmake-build-targets.patch b/dev-libs/miniz/files/miniz-2.1.0-export-cmake-build-targets.patch new file mode 100644 index 000000000000..6f8429222700 --- /dev/null +++ b/dev-libs/miniz/files/miniz-2.1.0-export-cmake-build-targets.patch @@ -0,0 +1,179 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,5 +1,15 @@ +-PROJECT(miniz C) +-cmake_minimum_required(VERSION 2.8) ++cmake_minimum_required(VERSION 3.12) ++ ++project(miniz) ++ ++include(GNUInstallDirs) ++ ++set(MINIZ_API_VERSION 2) ++set(MINIZ_MINOR_VERSION 1) ++set(MINIZ_PATCH_VERSION 0) ++set(MINIZ_VERSION ++ ${MINIZ_API_VERSION}.${MINIZ_MINOR_VERSION}.${MINIZ_PATCH_VERSION}) ++ + if(CMAKE_BUILD_TYPE STREQUAL "") + # CMake defaults to leaving CMAKE_BUILD_TYPE empty. This screws up + # differentiation between debug and release builds. +@@ -8,45 +18,122 @@ + CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel." FORCE) + endif () + +-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin) ++option(BUILD_EXAMPLES "Build examples" ON) ++option(BUILD_SHARED_LIBS "Build shared library instead of static" ON) ++ ++set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/bin) + ++include(GenerateExportHeader) ++ ++set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON) + set(miniz_SOURCE miniz.c miniz_zip.c miniz_tinfl.c miniz_tdef.c) ++add_library(${PROJECT_NAME} ${miniz_SOURCE}) ++generate_export_header(${PROJECT_NAME}) ++ ++if(NOT BUILD_SHARED_LIBS) ++string(TOUPPER ${PROJECT_NAME} PROJECT_UPPER) ++set_target_properties(${PROJECT_NAME} ++ PROPERTIES INTERFACE_COMPILE_DEFINITIONS ${PROJECT_UPPER}_STATIC_DEFINE) ++else() ++set_property(TARGET ${PROJECT_NAME} PROPERTY C_VISIBILITY_PRESET hidden) ++endif() ++ ++set_property(TARGET ${PROJECT_NAME} PROPERTY VERSION ${MINIZ_VERSION}) ++set_property(TARGET ${PROJECT_NAME} PROPERTY SOVERSION ${MINIZ_API_VERSION}) ++ ++file(GLOB INSTALL_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/*.h) ++ ++target_compile_definitions(${PROJECT_NAME} ++ PRIVATE $<$<C_COMPILER_ID:GNU>:_GNU_SOURCE>) + +-add_library(miniz ${miniz_SOURCE}) +-target_include_directories(miniz PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}") ++# pkg-config file ++configure_file(miniz.pc.in ${CMAKE_BINARY_DIR}/miniz.pc @ONLY) + +-set(EXAMPLE1_SRC_LIST "${CMAKE_CURRENT_SOURCE_DIR}/examples/example1.c") +-set(EXAMPLE2_SRC_LIST "${CMAKE_CURRENT_SOURCE_DIR}/examples/example2.c") +-set(EXAMPLE3_SRC_LIST "${CMAKE_CURRENT_SOURCE_DIR}/examples/example3.c") +-set(EXAMPLE4_SRC_LIST "${CMAKE_CURRENT_SOURCE_DIR}/examples/example4.c") +-set(EXAMPLE5_SRC_LIST "${CMAKE_CURRENT_SOURCE_DIR}/examples/example5.c") +-set(EXAMPLE6_SRC_LIST "${CMAKE_CURRENT_SOURCE_DIR}/examples/example6.c") +-set(MINIZ_TESTER_SRC_LIST +- "${CMAKE_CURRENT_SOURCE_DIR}/tests/miniz_tester.cpp" +- "${CMAKE_CURRENT_SOURCE_DIR}/tests/timer.cpp") ++install(FILES ++ ${CMAKE_BINARY_DIR}/miniz.pc ++ DESTINATION ${CMAKE_INSTALL_DATADIR}/pkgconfig) ++ ++ ++set_property(TARGET ${PROJECT_NAME} PROPERTY ++ INTERFACE_${PROJECT_NAME}_MAJOR_VERSION ${MINIZ_API_VERSION}) ++set_property(TARGET ${PROJECT_NAME} APPEND PROPERTY ++ COMPATIBLE_INTERFACE_STRING ${PROJECT_NAME}_MAJOR_VERSION ++) ++ ++install(TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME}Targets ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ++ # users can use <miniz.h> or <miniz/miniz.h> ++ INCLUDES DESTINATION include ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME} ++) ++ ++include(CMakePackageConfigHelpers) ++write_basic_package_version_file( ++ "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}ConfigVersion.cmake" ++ VERSION ${MINIZ_VERSION} ++ COMPATIBILITY AnyNewerVersion ++) ++ ++export(EXPORT ${PROJECT_NAME}Targets ++ FILE "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}Targets.cmake" ++ NAMESPACE ${PROJECT_NAME}:: ++) ++configure_file(Config.cmake.in ++ "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}Config.cmake" ++ @ONLY ++) ++ ++set(ConfigPackageLocation ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}) ++install(EXPORT ${PROJECT_NAME}Targets ++ FILE ++ ${PROJECT_NAME}Targets.cmake ++ NAMESPACE ++ ${PROJECT_NAME}:: ++ DESTINATION ++ ${ConfigPackageLocation} ++) ++install( ++ FILES ++ "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}Config.cmake" ++ "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}ConfigVersion.cmake" ++ DESTINATION ++ ${ConfigPackageLocation} ++ COMPONENT ++ Devel ++) ++ ++if(BUILD_EXAMPLES) ++ set(EXAMPLE1_SRC_LIST "${CMAKE_CURRENT_SOURCE_DIR}/examples/example1.c") ++ set(EXAMPLE2_SRC_LIST "${CMAKE_CURRENT_SOURCE_DIR}/examples/example2.c") ++ set(EXAMPLE3_SRC_LIST "${CMAKE_CURRENT_SOURCE_DIR}/examples/example3.c") ++ set(EXAMPLE4_SRC_LIST "${CMAKE_CURRENT_SOURCE_DIR}/examples/example4.c") ++ set(EXAMPLE5_SRC_LIST "${CMAKE_CURRENT_SOURCE_DIR}/examples/example5.c") ++ set(EXAMPLE6_SRC_LIST "${CMAKE_CURRENT_SOURCE_DIR}/examples/example6.c") ++ set(MINIZ_TESTER_SRC_LIST ++ "${CMAKE_CURRENT_SOURCE_DIR}/tests/miniz_tester.cpp" ++ "${CMAKE_CURRENT_SOURCE_DIR}/tests/timer.cpp") + +-add_executable(example1 ${EXAMPLE1_SRC_LIST}) +-target_link_libraries(example1 miniz) +-add_executable(example2 ${EXAMPLE2_SRC_LIST}) +-target_link_libraries(example2 miniz) +-add_executable(example3 ${EXAMPLE3_SRC_LIST}) +-target_link_libraries(example3 miniz) +-add_executable(example4 ${EXAMPLE4_SRC_LIST}) +-target_link_libraries(example4 miniz) +-add_executable(example5 ${EXAMPLE5_SRC_LIST}) +-target_link_libraries(example5 miniz) +-add_executable(example6 ${EXAMPLE6_SRC_LIST}) +-target_link_libraries(example6 miniz) +-if(${UNIX}) +- target_link_libraries(example6 m) +-endif() ++ add_executable(example1 ${EXAMPLE1_SRC_LIST}) ++ target_link_libraries(example1 miniz) ++ add_executable(example2 ${EXAMPLE2_SRC_LIST}) ++ target_link_libraries(example2 miniz) ++ add_executable(example3 ${EXAMPLE3_SRC_LIST}) ++ target_link_libraries(example3 miniz) ++ add_executable(example4 ${EXAMPLE4_SRC_LIST}) ++ target_link_libraries(example4 miniz) ++ add_executable(example5 ${EXAMPLE5_SRC_LIST}) ++ target_link_libraries(example5 miniz) ++ add_executable(example6 ${EXAMPLE6_SRC_LIST}) ++ target_link_libraries(example6 miniz) ++ if(${UNIX}) ++ target_link_libraries(example6 m) ++ endif() + +-# add_executable(miniz_tester ${MINIZ_TESTER_SRC_LIST}) +-# target_link_libraries(miniz_tester miniz) ++ # add_executable(miniz_tester ${MINIZ_TESTER_SRC_LIST}) ++ # target_link_libraries(miniz_tester miniz) ++endif(BUILD_EXAMPLES) + +-install(TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME}Targets +- ARCHIVE DESTINATION lib +- LIBRARY DESTINATION lib +- ) +-file(GLOB INSTALL_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/*.h) +-install(FILES ${INSTALL_HEADERS} DESTINATION include/${PROJECT_NAME}) +\ No newline at end of file ++set(INCLUDE_INSTALL_DIR "include") ++ ++install(FILES ${INSTALL_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}) diff --git a/dev-libs/miniz/files/miniz.pc.in b/dev-libs/miniz/files/miniz.pc.in new file mode 100644 index 000000000000..51128735847c --- /dev/null +++ b/dev-libs/miniz/files/miniz.pc.in @@ -0,0 +1,13 @@ +prefix=@CMAKE_INSTALL_PREFIX@ +exec_prefix=${prefix} +libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@ +includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ + +Name: @PROJECT_NAME@ +Description: @PROJECT_DESCRIPTION@ +Version: @MINIZ_VERSION@ +URL: @PROJECT_HOMEPAGE_URL@ + +Requires: +Libs: -L${libdir} -lminiz +Cflags: -I${includedir}
\ No newline at end of file diff --git a/dev-libs/miniz/miniz-2.1.0.ebuild b/dev-libs/miniz/miniz-2.1.0-r1.ebuild index 1141b3f020ce..cc26fba366c0 100644 --- a/dev-libs/miniz/miniz-2.1.0.ebuild +++ b/dev-libs/miniz/miniz-2.1.0-r1.ebuild @@ -5,7 +5,7 @@ EAPI=7 inherit cmake -DESCRIPTION="A mesh slicer to generate G-code for fused-filament-fabrication (3D printers)" +DESCRIPTION="A lossless, high performance data compression library" HOMEPAGE="https://github.com/richgel999/miniz" SRC_URI="https://github.com/richgel999/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" @@ -16,8 +16,13 @@ IUSE="" DOCS=( ChangeLog.md LICENSE readme.md ) +PATCHES=( + "${FILESDIR}/${P}-export-cmake-build-targets.patch" +) + src_prepare() { - sed -i -e 's/DESTINATION lib/DESTINATION ${CMAKE_INSTALL_LIBDIR}/' CMakeLists.txt + cp "${FILESDIR}/Config.cmake.in" . + cp "${FILESDIR}/miniz.pc.in" . cmake_src_prepare } @@ -25,5 +30,9 @@ src_prepare() { src_configure() { CMAKE_BUILD_TYPE=Release + local mycmakeargs=( + -DBUILD_EXAMPLES=OFF + ) + cmake_src_configure } diff --git a/dev-libs/miniz/miniz-9999.ebuild b/dev-libs/miniz/miniz-9999.ebuild new file mode 100644 index 000000000000..7bdf95f3cf88 --- /dev/null +++ b/dev-libs/miniz/miniz-9999.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 + +DESCRIPTION="A lossless, high performance data compression library" +HOMEPAGE="https://github.com/richgel999/miniz" +SRC_URI="" + +if [[ ${PV} == "9999" ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/richgel999/miniz.git" +else + SRC_URI="https://github.com/richgel999/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi + +LICENSE="MIT" +SLOT="0" +IUSE="examples static-libs" + +DOCS=( ChangeLog.md LICENSE readme.md ) + +src_prepare() { + sed -i -e 's/DESTINATION lib/DESTINATION ${CMAKE_INSTALL_LIBDIR}/' CMakeLists.txt + + cmake_src_prepare +} + +src_configure() { + CMAKE_BUILD_TYPE=Release + + local mycmakeargs=( + -DBUILD_EXAMPLES=$(usex examples) + -DBUILD_SHARED_LIBS=$(usex static-libs OFF ON) + ) + + cmake_src_configure +} diff --git a/dev-libs/mm/mm-1.4.2-r2.ebuild b/dev-libs/mm/mm-1.4.2-r2.ebuild index f7af5ee04ccb..34381df612eb 100644 --- a/dev-libs/mm/mm-1.4.2-r2.ebuild +++ b/dev-libs/mm/mm-1.4.2-r2.ebuild @@ -9,7 +9,7 @@ SRC_URI="ftp://ftp.ossp.org/pkg/lib/mm/${P}.tar.gz" LICENSE="mm" SLOT="1.2" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86" IUSE="" src_prepare() { diff --git a/dev-libs/mmtf-cpp/mmtf-cpp-1.0.0.ebuild b/dev-libs/mmtf-cpp/mmtf-cpp-1.0.0.ebuild index 18b4c860d755..0fa3e97566a2 100644 --- a/dev-libs/mmtf-cpp/mmtf-cpp-1.0.0.ebuild +++ b/dev-libs/mmtf-cpp/mmtf-cpp-1.0.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 2019 Gentoo Authors +# Copyright 2019-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="https://github.com/rcsb/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos" IUSE="" DEPEND="dev-libs/msgpack" diff --git a/dev-libs/mongo-c-driver/mongo-c-driver-1.8.2.ebuild b/dev-libs/mongo-c-driver/mongo-c-driver-1.8.2.ebuild index 044a37200616..e67b5edaaef3 100644 --- a/dev-libs/mongo-c-driver/mongo-c-driver-1.8.2.ebuild +++ b/dev-libs/mongo-c-driver/mongo-c-driver-1.8.2.ebuild @@ -9,7 +9,7 @@ SRC_URI="https://github.com/mongodb/${PN}/releases/download/${PV}/${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 hppa ~s390 x86" +KEYWORDS="amd64 ~hppa ~s390 x86" IUSE="debug examples libressl sasl ssl static-libs test" RDEPEND="app-arch/snappy:= diff --git a/dev-libs/mpc/mpc-1.2.1.ebuild b/dev-libs/mpc/mpc-1.2.1.ebuild index 55cbbd1477dd..f5a026e62f23 100644 --- a/dev-libs/mpc/mpc-1.2.1.ebuild +++ b/dev-libs/mpc/mpc-1.2.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ 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" +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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="static-libs" DEPEND=">=dev-libs/gmp-5.0.0:0=[${MULTILIB_USEDEP},static-libs?] diff --git a/dev-libs/mpfr/mpfr-4.1.0.ebuild b/dev-libs/mpfr/mpfr-4.1.0.ebuild index cc7640cfe2f5..e812670ea0dc 100644 --- a/dev-libs/mpfr/mpfr-4.1.0.ebuild +++ b/dev-libs/mpfr/mpfr-4.1.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ 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" +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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="static-libs" RDEPEND=">=dev-libs/gmp-5.0.0[${MULTILIB_USEDEP},static-libs?]" diff --git a/dev-libs/msgpack/msgpack-3.2.0.ebuild b/dev-libs/msgpack/msgpack-3.2.0.ebuild index 2857a09fb022..eea2ed4f1001 100644 --- a/dev-libs/msgpack/msgpack-3.2.0.ebuild +++ b/dev-libs/msgpack/msgpack-3.2.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -59,7 +59,9 @@ multilib_src_install() { mkdir docs || die mv doc_c/html docs/c || die - use cxx && mv doc_cpp/html docs/cpp || die + if use cxx; then + mv doc_cpp/html docs/cpp || die + fi fi if use examples; then diff --git a/dev-libs/msgpack/msgpack-3.3.0.ebuild b/dev-libs/msgpack/msgpack-3.3.0.ebuild index 532685cbd1c1..8d8ed36de2c5 100644 --- a/dev-libs/msgpack/msgpack-3.3.0.ebuild +++ b/dev-libs/msgpack/msgpack-3.3.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -50,7 +50,7 @@ multilib_src_compile() { cmake_src_compile if multilib_is_native_abi && use doc; then - emake doxygen + cmake_build doxygen fi } @@ -62,7 +62,9 @@ multilib_src_install() { mkdir docs || die mv doc_c/html docs/c || die - use cxx && mv doc_cpp/html docs/cpp || die + if use cxx; then + mv doc_cpp/html docs/cpp || die + fi fi if use examples; then diff --git a/dev-libs/nettle/Manifest b/dev-libs/nettle/Manifest index 705ffd20ec58..7b7ca7e26f9c 100644 --- a/dev-libs/nettle/Manifest +++ b/dev-libs/nettle/Manifest @@ -1,3 +1,2 @@ -DIST nettle-3.4.1.tar.gz 1947053 BLAKE2B 354318c46c28aeaaca611abe70298024ec12ff70aed53c741e43c1b5373361e5cffb03df7b8e86ef103a3b7770b2b4fe39fbca00b128f2b7ec810b3a4d9fd0fd SHA512 26aefbbe9927e90e28f271e56d2ba876611831222d0e1e1a58bdb75bbd50934fcd84418a4fe47b845f557e60a9786a72a4de2676c930447b104f2256aca7a54f -DIST nettle-3.5.1.tar.gz 1989593 BLAKE2B 40e527a4cc541674acc39072f2ebbab4b6ed1b043687d88c776ce9c58374538b111d282e0eea5424059260b0876c5cf01f97470c850e082c167b05a57e6c591a SHA512 f738121b9091cbe79435fb5d46b45cf6f10912320c233829356908127bab1cac6946ca56e022a832380c44f2c10f21d2feef64cb0f4f41e3da4a681dc0131784 DIST nettle-3.6.tar.gz 2288173 BLAKE2B 45e08832e9c337f10d958956545c77f521b747b8abca56ce40c755adf352bdc2a79584b1e1c0e50f5ede0ac54794aabd6883601c53593b965aada744502789db SHA512 2471af875e51327af61af8bda53cd9c3adc27b6e32592a4b5b10b3ec60999ebf771ab9c54c747b0bade4b3b5a717e77fdbdb53699dd9e8a9ed4eee07f46aed51 +DIST nettle-3.7.tar.gz 2375067 BLAKE2B 1e8a77db9b7e62dee9a01e3c3b476e206f36cc7235153b0a1a762276650c61d7c4c3be73b2ecae9313313e416e3c7a2bd999a3505c41b26e806f9b3eb486550f SHA512 be32eff0ea3c83abb8b6670d049a8ce21ea9c7cac3e1a5d41ae003d5160e2683572c7dd8930b869ac1db0b89f9423605e0a8ec0cff074c63e2a60c71996ef66c diff --git a/dev-libs/nettle/files/nettle-3.4.1-build.patch b/dev-libs/nettle/files/nettle-3.4.1-build.patch deleted file mode 100644 index 4351dfeb5bcb..000000000000 --- a/dev-libs/nettle/files/nettle-3.4.1-build.patch +++ /dev/null @@ -1,53 +0,0 @@ -From f5a3a224bf00bef5669366d2ae23c2b2b13b8016 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Niels=20M=C3=B6ller?= <nisse@lysator.liu.se> -Date: Wed, 26 Dec 2018 11:04:31 +0100 -Subject: [PATCH] Fix accidental use of C99 for loop. - -* rsa-sign-tr.c (sec_equal): Fix accidental use of C99 for loop. -Reported by Andreas Gustafsson. -* testsuite/rsa-sec-decrypt-test.c (test_main): Likewise. ---- - ChangeLog | 6 ++++++ - rsa-sign-tr.c | 3 ++- - testsuite/rsa-sec-decrypt-test.c | 3 ++- - 3 files changed, 10 insertions(+), 2 deletions(-) - -diff --git a/rsa-sign-tr.c b/rsa-sign-tr.c -index 59c9bd07..f824c4ca 100644 ---- a/rsa-sign-tr.c -+++ b/rsa-sign-tr.c -@@ -239,8 +239,9 @@ static int - sec_equal(const mp_limb_t *a, const mp_limb_t *b, size_t limbs) - { - volatile mp_limb_t z = 0; -+ size_t i; - -- for (size_t i = 0; i < limbs; i++) -+ for (i = 0; i < limbs; i++) - { - z |= (a[i] ^ b[i]); - } -diff --git a/testsuite/rsa-sec-decrypt-test.c b/testsuite/rsa-sec-decrypt-test.c -index 64f0b13c..fb0ed3a1 100644 ---- a/testsuite/rsa-sec-decrypt-test.c -+++ b/testsuite/rsa-sec-decrypt-test.c -@@ -68,6 +68,7 @@ test_main(void) - unsigned n_size = 1024; - mpz_t gibberish; - mpz_t garbage; -+ size_t size; - - rsa_private_key_init(&key); - rsa_public_key_init(&pub); -@@ -78,7 +79,7 @@ test_main(void) - - memset(verifybad, 'A', PAYLOAD_SIZE); - -- for (size_t size = 1; size < 51; size++) -+ for (size = 1; size < 51; size++) - { - ASSERT (rsa_generate_keypair(&pub, &key, &random_ctx, - (nettle_random_func *) knuth_lfib_random, --- -2.18.1 - diff --git a/dev-libs/nettle/nettle-3.4.1.ebuild b/dev-libs/nettle/nettle-3.4.1.ebuild deleted file mode 100644 index 7f358d6d9f14..000000000000 --- a/dev-libs/nettle/nettle-3.4.1.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools multilib-build multilib-minimal multilib toolchain-funcs - -DESCRIPTION="Low-level cryptographic library" -HOMEPAGE="https://www.lysator.liu.se/~nisse/nettle/" -SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" - -LICENSE="|| ( LGPL-3 LGPL-2.1 )" -SLOT="0/6.2" # subslot = libnettle soname version, .2 as broke ABI bug#601512 then fixed -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="doc +gmp neon static-libs test cpu_flags_x86_aes" -RESTRICT="!test? ( test )" - -DEPEND="gmp? ( >=dev-libs/gmp-6.0:0=[static-libs?,${MULTILIB_USEDEP}] )" -RDEPEND="${DEPEND}" - -MULTILIB_WRAPPED_HEADERS=( - /usr/include/nettle/nettle-stdint.h - /usr/include/nettle/version.h -) - -DOCS=() -HTML_DOCS=() - -PATCHES=( - "${FILESDIR}/${P}-build.patch" -) - -pkg_setup() { - use doc && DOCS+=( - nettle.pdf - ) - use doc && HTML_DOCS+=( - nettle.html - ) -} - -src_prepare() { - default - - sed -e '/CFLAGS=/s: -ggdb3::' \ - -e 's/solaris\*)/sunldsolaris*)/' \ - -i configure.ac || die - - # conditionally build tests and examples required by tests - use test || sed -i '/SUBDIRS/s/testsuite examples//' Makefile.in || die - - eautoreconf -} - -multilib_src_configure() { - # --disable-openssl bug #427526 - ECONF_SOURCE="${S}" econf \ - --libdir="${EPREFIX}"/usr/$(get_libdir) \ - --disable-openssl \ - --disable-fat \ - $(use_enable gmp public-key) \ - $(use_enable static-libs static) \ - $(tc-is-static-only && echo --disable-shared) \ - $(use_enable doc documentation) \ - $(use_enable neon arm-neon) \ - $(use_enable cpu_flags_x86_aes x86-aesni) -} diff --git a/dev-libs/nettle/nettle-3.6-r2.ebuild b/dev-libs/nettle/nettle-3.6-r2.ebuild index e098897977bf..face2a3e3d51 100644 --- a/dev-libs/nettle/nettle-3.6-r2.ebuild +++ b/dev-libs/nettle/nettle-3.6-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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 ~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/nettle/nettle-3.6-r3.ebuild b/dev-libs/nettle/nettle-3.6-r3.ebuild index 2f8ec0e6e898..500aafe309bd 100644 --- a/dev-libs/nettle/nettle-3.6-r3.ebuild +++ b/dev-libs/nettle/nettle-3.6-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos" +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 ~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/nettle/nettle-3.5.1-r1.ebuild b/dev-libs/nettle/nettle-3.7.ebuild index cedfe8dda1dc..99751707b707 100644 --- a/dev-libs/nettle/nettle-3.5.1-r1.ebuild +++ b/dev-libs/nettle/nettle-3.7.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -10,13 +10,14 @@ HOMEPAGE="https://www.lysator.liu.se/~nisse/nettle/" SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" LICENSE="|| ( LGPL-3 LGPL-2.1 )" -SLOT="0/7" # subslot = libnettle 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" +SLOT="0/8-6" # subslot = libnettle - libhogweed soname version +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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 )" -DEPEND="gmp? ( >=dev-libs/gmp-6.0:0=[static-libs?,${MULTILIB_USEDEP}] )" +DEPEND="gmp? ( >=dev-libs/gmp-6.1:0=[static-libs?,${MULTILIB_USEDEP}] )" RDEPEND="${DEPEND}" +BDEPEND="doc? ( sys-apps/texinfo )" MULTILIB_WRAPPED_HEADERS=( /usr/include/nettle/version.h @@ -47,17 +48,20 @@ src_prepare() { } multilib_src_configure() { - # --disable-openssl bug #427526 - ECONF_SOURCE="${S}" econf \ - $(tc-is-static-only && echo --disable-shared) \ - $(use_enable cpu_flags_x86_aes x86-aesni) \ - $(use_enable cpu_flags_x86_sha x86-sha-ni) \ - $(use_enable asm assembler) \ - $(use_enable doc documentation) \ - $(use_enable gmp public-key) \ - $(use_enable cpu_flags_arm_neon arm-neon) \ - $(use_enable static-libs static) \ - --disable-fat \ - --disable-openssl \ + local myeconfargs=( + CC_FOR_BUILD="$(tc-getBUILD_CC)" + $(tc-is-static-only && echo --disable-shared) + $(use_enable cpu_flags_x86_aes x86-aesni) + $(use_enable cpu_flags_x86_sha x86-sha-ni) + $(use_enable asm assembler) + $(use_enable doc documentation) + $(use_enable gmp public-key) + $(use_enable cpu_flags_arm_neon arm-neon) + $(use_enable static-libs static) + --disable-fat + # --disable-openssl bug #427526 + --disable-openssl --libdir="${EPREFIX}"/usr/$(get_libdir) + ) + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" } diff --git a/dev-libs/newt/newt-0.52.21-r1.ebuild b/dev-libs/newt/newt-0.52.21-r1.ebuild index 0fe50a2577b0..bb456c0faa95 100644 --- a/dev-libs/newt/newt-0.52.21-r1.ebuild +++ b/dev-libs/newt/newt-0.52.21-r1.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://releases.pagure.org/newt/${P}.tar.gz" LICENSE="LGPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86" IUSE="gpm nls tcl" RESTRICT="test" diff --git a/dev-libs/npth/npth-1.6-r1.ebuild b/dev-libs/npth/npth-1.6-r1.ebuild index 00b6f615b496..1255bcd4baea 100644 --- a/dev-libs/npth/npth-1.6-r1.ebuild +++ b/dev-libs/npth/npth-1.6-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" src_prepare() { default diff --git a/dev-libs/nspr/nspr-4.26.ebuild b/dev-libs/nspr/nspr-4.26.ebuild index d16b52ec47cb..46d48bc0bd18 100644 --- a/dev-libs/nspr/nspr-4.26.ebuild +++ b/dev-libs/nspr/nspr-4.26.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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 ~amd64-linux ~x86-linux ~x64-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 index bfc7d8e35a12..97fa8a26162a 100644 --- a/dev-libs/nspr/nspr-4.27.ebuild +++ b/dev-libs/nspr/nspr-4.27.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" IUSE="debug elibc_musl" MULTILIB_CHOST_TOOLS=( diff --git a/dev-libs/nspr/nspr-4.28.ebuild b/dev-libs/nspr/nspr-4.28.ebuild index d16b52ec47cb..46d48bc0bd18 100644 --- a/dev-libs/nspr/nspr-4.28.ebuild +++ b/dev-libs/nspr/nspr-4.28.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" IUSE="debug elibc_musl" MULTILIB_CHOST_TOOLS=( diff --git a/dev-libs/nspr/nspr-4.29.ebuild b/dev-libs/nspr/nspr-4.29.ebuild index d16b52ec47cb..46d48bc0bd18 100644 --- a/dev-libs/nspr/nspr-4.29.ebuild +++ b/dev-libs/nspr/nspr-4.29.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" IUSE="debug elibc_musl" MULTILIB_CHOST_TOOLS=( diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest index bcb4d937030e..7b74a4a17fd6 100644 --- a/dev-libs/nss/Manifest +++ b/dev-libs/nss/Manifest @@ -1,5 +1,4 @@ -DIST nss-3.56.tar.gz 81706176 BLAKE2B 84c3b9fd649ce38ad843725b180982692dcac34e851734813b959734054f2e9ebfad66496de320f46e861381f6d5f52db0cc4c0953f7504b79f6b529b871f173 SHA512 f2eed8252c13b38a4d80a11203136d22a521205f814b6d954cc119ccf8921fcb8f689d919944bea4739d1575e9bda7e13cf2ad054ac91d51e049abe246efc845 DIST nss-3.58.tar.gz 81846254 BLAKE2B f8e7d0b231916b197ad21706a057d055f8377059d76d4f09aff523cc4cd071a3184f02dc488259df22109b70be7b8a5d5fa7ea2273a830de825cc9a8c95dcca9 SHA512 03d2ab1517ac07620ea3f02dcf680cf019e0129006ff2559b2d0a047036340c20b98c9679b17a594e5502aa30e158caf309f046901b9ec7c7adeeaa13ec50b80 -DIST nss-3.59.tar.gz 82141516 BLAKE2B 74959b14ec42b4628dfc3365af00420cdbd41d202541e9379f6a4448c4496b76307af48c9ec405b370f8770327ce56742b4382f8cd49724b42732ce5cc5b0779 SHA512 8963e846f2ff7222457ae59f042672cf4e44f7752807226f46c215a772fd1cbd65d0ce634da4afb698eabd4eb1c1e78146cc2a089339ada11da03d259c609a38 +DIST nss-3.60.1.tar.gz 82036869 BLAKE2B 71f4ab4ee41a05b05493bb43bd0ebaa6258122ddf6bc82af565121ec32f72ae0f187ac2383501ed8e228b32b796f75a89538c76f737530215b3c6448ef1242a3 SHA512 ba398ddad6f90f3562a041b7fd5fc7b72eb20961cc5c1f4890c3b0d95d438404b26ae6feb54cb8c650707134479a915e1f522f0e9257bc2ede053dd0811156d5 DIST nss-3.60.tar.gz 82035831 BLAKE2B fffc0e26d58d4625be1b8b0123f248a0c7994b18868ece534ba4d60131dd4897d075d7b2dba672c31ccd333e0c18ea384e2aa2f495c23b5430d6d10b91922873 SHA512 6463b2da28b5d9f1f20d45f77a3179e2b93c874af5742c7fc51eb7c44cef93270acacf79174dc63905f227256cbcee23a36f98f1cfed10dd5c56ffc0a76e2695 DIST nss-cacert-class1-class3.patch 22950 BLAKE2B 9d5e60df5f161a3c27c41e5a9419440a54f888eda454e3cde5ebe626d4075b65cf9938b5144d0fb022377f4bd415bff5e5c67d104409860aa9391b3eb8872c68 SHA512 a5aa740bf110a3f0262e3f1ef2fc739ac2b44f042e220039d48aee8e97cd764d5c10718220364f4098aba955882bd02cadb5481512388971a8290312f88a7df0 diff --git a/dev-libs/nss/files/nss-3.59-dont-hold-slot-lock-when-taking-session-lock.patch b/dev-libs/nss/files/nss-3.59-dont-hold-slot-lock-when-taking-session-lock.patch deleted file mode 100644 index be4ebfe47961..000000000000 --- a/dev-libs/nss/files/nss-3.59-dont-hold-slot-lock-when-taking-session-lock.patch +++ /dev/null @@ -1,93 +0,0 @@ - -# HG changeset patch -# User Kevin Jacobs <kjacobs@mozilla.com> -# Date 1606813429 0 -# Node ID 19585ccc7a1f0f4e9a8d2b9c5ceeb408ea90acb9 -# Parent f1e48fbead3d9e69500d7aedc1ef6e4bf334f41e -Bug 1679290 - Don't hold slot lock when taking session lock r=bbeurdouche - -[[ https://hg.mozilla.org/projects/nss/rev/0ed11a5835ac1556ff978362cd61069d48f4c5db | 0ed11a5835ac1556ff978362cd61069d48f4c5db ]] fixed a number of race conditions related to NSSSlot member accesses. Unfortunately the locking order that was imposed by that patch has been found to cause problems for at least one PKCS11 module, libnsspem. - -This patch drops nested locking in favor of unlocking/re-locking. While this isn't perfect, the original problem in bug 1663661 was that `slot->token` could become NULL, which we can easily check after reacquiring. - -Differential Revision: https://phabricator.services.mozilla.com/D98247 - -diff --git a/lib/dev/devslot.c b/lib/dev/devslot.c ---- a/lib/dev/devslot.c -+++ b/lib/dev/devslot.c -@@ -183,25 +183,32 @@ nssSlot_IsTokenPresent( - if ((slot->ckFlags & CKF_TOKEN_PRESENT) == 0) { - if (!slot->token) { - /* token was never present */ - isPresent = PR_FALSE; - goto done; /* slot lock held */ - } - session = nssToken_GetDefaultSession(slot->token); - if (session) { -+ nssSlot_ExitMonitor(slot); - nssSession_EnterMonitor(session); - /* token is not present */ - if (session->handle != CK_INVALID_HANDLE) { - /* session is valid, close and invalidate it */ - CKAPI(epv) - ->C_CloseSession(session->handle); - session->handle = CK_INVALID_HANDLE; - } - nssSession_ExitMonitor(session); -+ nssSlot_EnterMonitor(slot); -+ if (!slot->token) { -+ /* Check token presence after re-acquiring lock */ -+ isPresent = PR_FALSE; -+ goto done; /* slot lock held */ -+ } - } - if (slot->token->base.name[0] != 0) { - /* notify the high-level cache that the token is removed */ - slot->token->base.name[0] = 0; /* XXX */ - nssToken_NotifyCertsNotVisible(slot->token); - } - slot->token->base.name[0] = 0; /* XXX */ - /* clear the token cache */ -@@ -218,34 +225,41 @@ nssSlot_IsTokenPresent( - } - - /* token is present, use the session info to determine if the card - * has been removed and reinserted. - */ - session = nssToken_GetDefaultSession(slot->token); - if (session) { - PRBool tokenRemoved; -+ nssSlot_ExitMonitor(slot); - nssSession_EnterMonitor(session); - if (session->handle != CK_INVALID_HANDLE) { - CK_SESSION_INFO sessionInfo; - ckrv = CKAPI(epv)->C_GetSessionInfo(session->handle, &sessionInfo); - if (ckrv != CKR_OK) { - /* session is screwy, close and invalidate it */ - CKAPI(epv) - ->C_CloseSession(session->handle); - session->handle = CK_INVALID_HANDLE; - } - } - tokenRemoved = (session->handle == CK_INVALID_HANDLE); - nssSession_ExitMonitor(session); -+ nssSlot_EnterMonitor(slot); - /* token not removed, finished */ - if (!tokenRemoved) { - isPresent = PR_TRUE; - goto done; /* slot lock held */ - } -+ if (!slot->token) { -+ /* Check token presence after re-acquiring lock */ -+ isPresent = PR_FALSE; -+ goto done; /* slot lock held */ -+ } - } - /* the token has been removed, and reinserted, or the slot contains - * a token it doesn't recognize. invalidate all the old - * information we had on this token, if we can't refresh, clear - * the present flag */ - nssToken_NotifyCertsNotVisible(slot->token); - nssToken_Remove(slot->token); - /* token has been removed, need to refresh with new session */ - diff --git a/dev-libs/nss/nss-3.56.ebuild b/dev-libs/nss/nss-3.56.ebuild deleted file mode 100644 index 22db77eeb003..000000000000 --- a/dev-libs/nss/nss-3.56.ebuild +++ /dev/null @@ -1,359 +0,0 @@ -# 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="https://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="" - # Fix build failure on arm64 - export NS_USE_GCC=1 - # Detect compiler type and set proper environment value - if tc-is-gcc; then - export CC_IS_GCC=1 - elif tc-is-clang; then - export CC_IS_CLANG=1 - fi - - 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.58-r2.ebuild b/dev-libs/nss/nss-3.58-r2.ebuild index 38528576dc70..f7bb97581f3b 100644 --- a/dev-libs/nss/nss-3.58-r2.ebuild +++ b/dev-libs/nss/nss-3.58-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,13 +9,13 @@ NSPR_VER="4.29" RTM_NAME="NSS_${PV//./_}_RTM" DESCRIPTION="Mozilla's Network Security Services library that implements PKI support" -HOMEPAGE="https://www.mozilla.org/projects/security/pki/nss/" +HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/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" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris" IUSE="cacert utils" # pkg-config called by nss-config -> virtual/pkgconfig in RDEPEND RDEPEND=" diff --git a/dev-libs/nss/nss-3.59-r1.ebuild b/dev-libs/nss/nss-3.60.1.ebuild index 82184ff8a710..7ac46a177d7a 100644 --- a/dev-libs/nss/nss-3.59-r1.ebuild +++ b/dev-libs/nss/nss-3.60.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,13 +9,13 @@ NSPR_VER="4.29" RTM_NAME="NSS_${PV//./_}_RTM" DESCRIPTION="Mozilla's Network Security Services library that implements PKI support" -HOMEPAGE="https://www.mozilla.org/projects/security/pki/nss/" +HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/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" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris" IUSE="cacert utils" # pkg-config called by nss-config -> virtual/pkgconfig in RDEPEND RDEPEND=" @@ -39,8 +39,6 @@ PATCHES=( "${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" - "${FILESDIR}/${PN}-3.59-dont-hold-slot-lock-when-taking-session-lock.patch" ) src_prepare() { diff --git a/dev-libs/nss/nss-3.60.ebuild b/dev-libs/nss/nss-3.60.ebuild index 383f86723a30..7ac46a177d7a 100644 --- a/dev-libs/nss/nss-3.60.ebuild +++ b/dev-libs/nss/nss-3.60.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,13 +9,13 @@ NSPR_VER="4.29" RTM_NAME="NSS_${PV//./_}_RTM" DESCRIPTION="Mozilla's Network Security Services library that implements PKI support" -HOMEPAGE="https://www.mozilla.org/projects/security/pki/nss/" +HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/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" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris" IUSE="cacert utils" # pkg-config called by nss-config -> virtual/pkgconfig in RDEPEND RDEPEND=" diff --git a/dev-libs/ntl/ntl-11.4.3.ebuild b/dev-libs/ntl/ntl-11.4.3.ebuild index b30b4e2fe4ee..130a7bf8c352 100644 --- a/dev-libs/ntl/ntl-11.4.3.ebuild +++ b/dev-libs/ntl/ntl-11.4.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -10,7 +10,7 @@ SRC_URI="https://www.shoup.net/ntl/${P}.tar.gz" LICENSE="LGPL-2.1+" SLOT="0/43" -KEYWORDS="amd64 ~arm64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +KEYWORDS="amd64 ~arm64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" IUSE="bindist doc static-libs threads cpu_flags_x86_avx2" BDEPEND="dev-lang/perl" diff --git a/dev-libs/onigmo/onigmo-6.2.0.ebuild b/dev-libs/onigmo/onigmo-6.2.0.ebuild index 43b020ab66c9..21ef5b828dbc 100644 --- a/dev-libs/onigmo/onigmo-6.2.0.ebuild +++ b/dev-libs/onigmo/onigmo-6.2.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -11,7 +11,7 @@ SRC_URI="https://github.com/k-takata/${PN^o}/releases/download/${P^o}/${P}.tar.g LICENSE="BSD-2" SLOT="0/6" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="combination-explosion-check crnl-as-line-terminator static-libs" DOCS=( AUTHORS HISTORY README{,.ja} doc/{API,FAQ,RE}{,.ja} doc/UnicodeProps.txt ) diff --git a/dev-libs/oniguruma/oniguruma-6.9.4.ebuild b/dev-libs/oniguruma/oniguruma-6.9.4.ebuild index e3be7fef9abc..7cce5c844279 100644 --- a/dev-libs/oniguruma/oniguruma-6.9.4.ebuild +++ b/dev-libs/oniguruma/oniguruma-6.9.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 2003-2020 Gentoo Authors +# Copyright 2003-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -21,7 +21,7 @@ fi LICENSE="BSD-2" SLOT="0/5" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris" IUSE="crnl-as-line-terminator static-libs" if [[ "${PV}" != "9999" ]]; then diff --git a/dev-libs/oniguruma/oniguruma-6.9.6-r1.ebuild b/dev-libs/oniguruma/oniguruma-6.9.6-r1.ebuild index e0a1c8d371cf..a4c616e538da 100644 --- a/dev-libs/oniguruma/oniguruma-6.9.6-r1.ebuild +++ b/dev-libs/oniguruma/oniguruma-6.9.6-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 2003-2020 Gentoo Authors +# Copyright 2003-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -21,7 +21,7 @@ fi LICENSE="BSD-2" SLOT="0/5" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris" IUSE="crnl-as-line-terminator static-libs" if [[ "${PV}" != "9999" ]]; then diff --git a/dev-libs/oniguruma/oniguruma-6.9.6.ebuild b/dev-libs/oniguruma/oniguruma-6.9.6.ebuild index 4c0eebf2c0ca..82be720995e8 100644 --- a/dev-libs/oniguruma/oniguruma-6.9.6.ebuild +++ b/dev-libs/oniguruma/oniguruma-6.9.6.ebuild @@ -1,4 +1,4 @@ -# Copyright 2003-2020 Gentoo Authors +# Copyright 2003-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ if [[ "${PV}" == "9999" ]]; then else SRC_URI="https://github.com/kkos/${PN}/releases/download/v${PV}/onig-${PV}.tar.gz" S="${WORKDIR}/onig-${PV}" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris" fi DESCRIPTION="Regular expression library for different character encodings" diff --git a/dev-libs/oniguruma/oniguruma-9999.ebuild b/dev-libs/oniguruma/oniguruma-9999.ebuild index 4c0eebf2c0ca..405b066a532a 100644 --- a/dev-libs/oniguruma/oniguruma-9999.ebuild +++ b/dev-libs/oniguruma/oniguruma-9999.ebuild @@ -1,27 +1,38 @@ # Copyright 2003-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI="7" inherit multilib-minimal if [[ "${PV}" == "9999" ]]; then inherit autotools git-r3 + EGIT_REPO_URI="https://github.com/kkos/oniguruma" -else - SRC_URI="https://github.com/kkos/${PN}/releases/download/v${PV}/onig-${PV}.tar.gz" - S="${WORKDIR}/onig-${PV}" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris" fi DESCRIPTION="Regular expression library for different character encodings" HOMEPAGE="https://github.com/kkos/oniguruma" +if [[ "${PV}" == "9999" ]]; then + SRC_URI="" +else + SRC_URI="https://github.com/kkos/${PN}/releases/download/v${PV}/onig-${PV}.tar.gz" +fi LICENSE="BSD-2" SLOT="0/5" +KEYWORDS="" IUSE="crnl-as-line-terminator static-libs" -DOCS=( AUTHORS HISTORY README{,_japanese} doc/{API,CALLOUTS.API,CALLOUTS.BUILTIN,FAQ,RE}{,.ja} doc/{SYNTAX.md,UNICODE_PROPERTIES} ) +BDEPEND="" +DEPEND="" +RDEPEND="" + +if [[ "${PV}" != "9999" ]]; then + S="${WORKDIR}/onig-${PV}" +fi + +DOCS=(AUTHORS HISTORY README{,_japanese} doc/{API,CALLOUTS.API,CALLOUTS.BUILTIN,FAQ,RE}{,.ja} doc/{SYNTAX.md,UNICODE_PROPERTIES}) src_prepare() { default @@ -33,11 +44,12 @@ src_prepare() { multilib_src_configure() { ECONF_SOURCE="${S}" econf \ + --enable-posix-api \ $(use_enable crnl-as-line-terminator) \ $(use_enable static-libs static) } multilib_src_install_all() { einstalldocs - find "${ED}" -name "*.la" -type f -delete || die + find "${ED}" -name "*.la" -delete || die } diff --git a/dev-libs/openct/openct-0.6.20-r4.ebuild b/dev-libs/openct/openct-0.6.20-r4.ebuild index a41bb1c04b9a..a9c60e5a3817 100644 --- a/dev-libs/openct/openct-0.6.20-r4.ebuild +++ b/dev-libs/openct/openct-0.6.20-r4.ebuild @@ -9,7 +9,7 @@ DESCRIPTION="library for accessing smart card terminals" HOMEPAGE="https://github.com/OpenSC/openct/wiki" SRC_URI="mirror://sourceforge/opensc/${PN}/${P}.tar.gz" -KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86" LICENSE="LGPL-2.1" SLOT="0" diff --git a/dev-libs/openssl-compat/files/gentoo.config-0.9.8 b/dev-libs/openssl-compat/files/gentoo.config-0.9.8 index 02698250c19d..e74e87ee8aba 100644 --- a/dev-libs/openssl-compat/files/gentoo.config-0.9.8 +++ b/dev-libs/openssl-compat/files/gentoo.config-0.9.8 @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # # Openssl doesn't play along nicely with cross-compiling diff --git a/dev-libs/openssl-compat/files/gentoo.config-1.0.2 b/dev-libs/openssl-compat/files/gentoo.config-1.0.2 index d16175e6292e..0a5b2ae00908 100644 --- a/dev-libs/openssl-compat/files/gentoo.config-1.0.2 +++ b/dev-libs/openssl-compat/files/gentoo.config-1.0.2 @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # # Openssl doesn't play along nicely with cross-compiling diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest index 49b73ef3c565..a7dabaf27ae4 100644 --- a/dev-libs/openssl/Manifest +++ b/dev-libs/openssl/Manifest @@ -1,10 +1,5 @@ DIST openssl-1.0.2-patches-1.5.tar.xz 12404 BLAKE2B 6c1b8c28f339f539b2ab8643379502a24cf62bffde00041dce54d5dd9e8d2620b181362ee5464b0ab32ba4948e209697bfabadbea2944a409a1009100d298f24 SHA512 5725e2d9d1ee8cc074bcef3bed61c71bdab2ff1c114362110c3fb8da11ad5bc8f2ff28e90a293f5f3a5cf96ecda54dffdb7ab3fb3f8b23ef6472250dc3037659 DIST openssl-1.0.2t-bindist-1.0.tar.xz 13872 BLAKE2B b2aade96a6e0ca6209a39e205b1c838de945903fcf959c62cc29ddcd1a0cb360fc5db234df86860a6a4c096f5ecc237611e4c2946b986a5500c24ba93c208ef4 SHA512 a48a7efb9b973b865bcc5009d450b428ed6b4b95e4cefe70c51056e47392c8a7bec58215168d8b07712419dc74646c2bd2fd23bcfbba2031376e292249a6b1b6 DIST openssl-1.0.2u.tar.gz 5355412 BLAKE2B b2ff2a10e5851af5aca4093422a9a072c794e87b997263826c1c35910c040f695fac63decac5856cb49399ed03d410f97701d9fd4e1ebfbcacd8f3a74ce8bf57 SHA512 c455bb309e20e2c2d47fdc5619c734d107d5c8c38c1409903ce979acc120b0d5fa0312917c0aa0d630e402d092a703d4249643f36078e8528a3cafc9dac6ab32 -DIST openssl-1.1.0l-bindist-1.0.tar.xz 13184 BLAKE2B c09e023458faff17b10d6f20c28462c0851757a20d59b4b751220ab307324d5778252df112ad74fd319407cc75fdd1cd507d48058dd0234dc8c03020c882ed42 SHA512 39720ecee3ec6080c1416f2fb7c9246b89ee55b21be2baabad51eb6823dbe1559450b1ae92fa61ac1cf5ba04ac8c02438aa469bc65eae6905cf1ea486f270793 -DIST openssl-1.1.0l.tar.gz 5294857 BLAKE2B 0e4f30f9e8a22414325bd780dc4e875e962487fbe72967f0392ace959955429192541881a98d097d7bb75ed7238b1817b0c3c2c4da04421512bd538f2b07cdd7 SHA512 81b74149f40ea7d9f7e235820a4f977844653ad1e2b302e65e712c12193f47542fe7e3385fd1e25e3dd074e4e6d04199836cbc492656f5a7692edab5e234f4ad -DIST openssl-1.1.1e-bindist-1.0.tar.xz 16948 BLAKE2B 78e034f1d263cbf5e57c92393f72acd07e86e39a5511a8852bad151371430954e07d787fd82cca55b373d1579bb22b9d29c9d677104ed68291a9d2dffe3ffbbb SHA512 0dbfb378b8f2724db82915e17fd4e43977e3e45030db25cdb9241c0ab842e41ef3d597ef71c4db5103635752dc2059ea6022597511a440f55fb56a5a52d3ccea -DIST openssl-1.1.1g.tar.gz 9801502 BLAKE2B 5e3dd4725ff89b959a5436d64b521317c6ffeb377418cc24c6d1927fab923423cb5f5fce2f9c2cdee597041c7be156d09668a5fd13dc6ff06d235a83db94cf19 SHA512 01e3d0b1bceeed8fb066f542ef5480862001556e0f612e017442330bbd7e5faee228b2de3513d7fc347446b7f217e27de1003dc9d7214d5833b97593f3ec25ab -DIST openssl-1.1.1h.tar.gz 9810045 BLAKE2B ac9ba6fb0c4da0a761e8655b6907634365ddb114216acfcfc981e13c211577b6bd23ea8d2ad0999c0960b039f5d3dead5733e6dc07c5231ab953307a9015cd36 SHA512 da50fd99325841ed7a4367d9251c771ce505a443a73b327d8a46b2c6a7d2ea99e43551a164efc86f8743b22c2bdb0020bf24a9cbd445e9d68868b2dc1d34033a DIST openssl-1.1.1i-bindist-1.0.tar.xz 18124 BLAKE2B bcbce700676d1d61498ac98281b7ad06f9970d91afa6bfb2c259ab7462b2554be79a1c06759bc7aaeca9948c2f5276bac2c4f42dbc6822669f863444b9913ccd SHA512 1dbb81bcb4cf7e634bb363c7e2bb2590a1fe3fcb6c3b5e377cac3c5241abd116c2a89c516be8e5fd1799ab64375a58052a4df944eeadc87b0b7785da710906d8 DIST openssl-1.1.1i.tar.gz 9808346 BLAKE2B ca98bab08e1874134da113dd0bda0583c133c7dce5b739f9601641ed2cf97894e5e13d901f0db9367aa5d7b78c552ac598aa0a3c2a3f0a438daae044e29f58d6 SHA512 fe12e0ab9e1688f24dd862ac633d0ab703b499c0f34b53c3560aa0d3879d81d647aa0678ed517dda5efb2711f669fcb1a1e0e24f6eac2efc2cf4eae6b62014d8 diff --git a/dev-libs/openssl/files/gentoo.config-1.0.2 b/dev-libs/openssl/files/gentoo.config-1.0.2 index 4e88dbabf135..68d7d0ac1fc1 100644 --- a/dev-libs/openssl/files/gentoo.config-1.0.2 +++ b/dev-libs/openssl/files/gentoo.config-1.0.2 @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # # Openssl doesn't play along nicely with cross-compiling @@ -104,6 +104,7 @@ linux) powerpc64*) machine=ppc64;; powerpc*le*) machine="generic32 -DL_ENDIAN";; powerpc*) machine=ppc;; + riscv32*) machine="generic32 -DL_ENDIAN";; riscv64*) machine="generic64 -DL_ENDIAN";; # sh64*) machine=elf;; sh*b*) machine="generic32 -DB_ENDIAN";; diff --git a/dev-libs/openssl/files/openssl-1.1.0k-fix-test_fuzz.patch b/dev-libs/openssl/files/openssl-1.1.0k-fix-test_fuzz.patch deleted file mode 100644 index 2c4cc31257ca..000000000000 --- a/dev-libs/openssl/files/openssl-1.1.0k-fix-test_fuzz.patch +++ /dev/null @@ -1,19 +0,0 @@ -Test fuzz was forgotten when - - Perl: Use our own globbing wrapper rather than File::Glob::glob - -was backported to openssl-1.1.0 branch. - -Link: https://github.com/openssl/openssl/commit/b81cfa07ada850fd287d0a0c82ba280907f18ce7 - ---- a/test/recipes/90-test_fuzz.t -+++ b/test/recipes/90-test_fuzz.t -@@ -9,7 +9,7 @@ - use strict; - use warnings; - --use if $^O ne "VMS", 'File::Glob' => qw/glob/; -+use OpenSSL::Glob; - use OpenSSL::Test qw/:DEFAULT srctop_file/; - use OpenSSL::Test::Utils; - diff --git a/dev-libs/openssl/files/openssl-1.1.0l-fix-no-ec2m-in-ec_curve.c.patch b/dev-libs/openssl/files/openssl-1.1.0l-fix-no-ec2m-in-ec_curve.c.patch deleted file mode 100644 index 35a435df28bf..000000000000 --- a/dev-libs/openssl/files/openssl-1.1.0l-fix-no-ec2m-in-ec_curve.c.patch +++ /dev/null @@ -1,30 +0,0 @@ -From bcf6a94c4bc912ad313ea21abdf7e83bbae450e5 Mon Sep 17 00:00:00 2001 -From: Nicola Tuveri <nic.tuv@gmail.com> -Date: Thu, 12 Sep 2019 01:57:47 +0300 -Subject: [PATCH] Fix no-ec2m in ec_curve.c (1.1.0) - -I made a mistake in d4a5dac9f9242c580fb9d0a4389440eccd3494a7 and -inverted the GF2m and GFp calls in ec_point_get_affine_coordinates, this -fixes it. ---- - crypto/ec/ec_curve.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/crypto/ec/ec_curve.c b/crypto/ec/ec_curve.c -index 2d28d7f70bb..6a58b3a23e0 100644 ---- a/crypto/ec/ec_curve.c -+++ b/crypto/ec/ec_curve.c -@@ -3200,11 +3200,11 @@ int ec_point_get_affine_coordinates(const EC_GROUP *group, - - #ifndef OPENSSL_NO_EC2M - if (field_nid == NID_X9_62_characteristic_two_field) { -- return EC_POINT_get_affine_coordinates_GFp(group, point, x, y, ctx); -+ return EC_POINT_get_affine_coordinates_GF2m(group, point, x, y, ctx); - } else - #endif /* !def(OPENSSL_NO_EC2M) */ - if (field_nid == NID_X9_62_prime_field) { -- return EC_POINT_get_affine_coordinates_GF2m(group, point, x, y, ctx); -+ return EC_POINT_get_affine_coordinates_GFp(group, point, x, y, ctx); - } else { - /* this should never happen */ - return 0; diff --git a/dev-libs/openssl/files/openssl-1.1.1i-riscv32.patch b/dev-libs/openssl/files/openssl-1.1.1i-riscv32.patch new file mode 100644 index 000000000000..c94b0323eb43 --- /dev/null +++ b/dev-libs/openssl/files/openssl-1.1.1i-riscv32.patch @@ -0,0 +1,61 @@ +From 5b5e2985f355c8e99c196d9ce5d02c15bebadfbc Mon Sep 17 00:00:00 2001 +From: Alistair Francis <alistair.francis@wdc.com> +Date: Thu, 29 Aug 2019 13:56:21 -0700 +Subject: [PATCH] Add support for io_pgetevents_time64 syscall + +32-bit architectures that are y2038 safe don't include syscalls that use +32-bit time_t. Instead these architectures have suffixed syscalls that +always use a 64-bit time_t. In the case of the io_getevents syscall the +syscall has been replaced with the io_pgetevents_time64 syscall instead. + +This patch changes the io_getevents() function to use the correct +syscall based on the avaliable syscalls and the time_t size. We will +only use the new 64-bit time_t syscall if the architecture is using a +64-bit time_t. This is to avoid having to deal with 32/64-bit +conversions and relying on a 64-bit timespec struct on 32-bit time_t +platforms. As of Linux 5.3 there are no 32-bit time_t architectures +without __NR_io_getevents. In the future if a 32-bit time_t architecture +wants to use the 64-bit syscalls we can handle the conversion. + +This fixes build failures on 32-bit RISC-V. + +Signed-off-by: Alistair Francis <alistair.francis@wdc.com> + +Reviewed-by: Richard Levitte <levitte@openssl.org> +Reviewed-by: Paul Dale <paul.dale@oracle.com> +(Merged from https://github.com/openssl/openssl/pull/9819) +--- + engines/e_afalg.c | 16 ++++++++++++++++ + 1 file changed, 16 insertions(+) + +diff --git a/engines/e_afalg.c b/engines/e_afalg.c +index dacbe358cb..99516cb1bb 100644 +--- a/engines/e_afalg.c ++++ b/engines/e_afalg.c +@@ -125,7 +125,23 @@ static ossl_inline int io_getevents(aio_context_t ctx, long min, long max, + struct io_event *events, + struct timespec *timeout) + { ++#if defined(__NR_io_getevents) + return syscall(__NR_io_getevents, ctx, min, max, events, timeout); ++#elif defined(__NR_io_pgetevents_time64) ++ /* Let's only support the 64 suffix syscalls for 64-bit time_t. ++ * This simplifies the code for us as we don't need to use a 64-bit ++ * version of timespec with a 32-bit time_t and handle converting ++ * between 64-bit and 32-bit times and check for overflows. ++ */ ++ if (sizeof(timeout->tv_sec) == 8) ++ return syscall(__NR_io_pgetevents_time64, ctx, min, max, events, timeout, NULL); ++ else { ++ errno = ENOSYS; ++ return -1; ++ } ++#else ++# error "We require either the io_getevents syscall or __NR_io_pgetevents_time64." ++#endif + } + + static void afalg_waitfd_cleanup(ASYNC_WAIT_CTX *ctx, const void *key, +-- +2.26.2 + diff --git a/dev-libs/openssl/openssl-1.1.0l.ebuild b/dev-libs/openssl/openssl-1.1.0l.ebuild deleted file mode 100644 index 7e8ec91525ca..000000000000 --- a/dev-libs/openssl/openssl-1.1.0l.ebuild +++ /dev/null @@ -1,306 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -inherit flag-o-matic toolchain-funcs multilib multilib-minimal - -MY_P=${P/_/-} - -# This patch set is based on the following files from Fedora 28, -# see https://src.fedoraproject.org/rpms/openssl/blob/f28/f/openssl.spec -# for more details: -# - hobble-openssl (SOURCE1) -# - ec_curve.c (SOURCE12) -- MODIFIED -# - ectest.c (SOURCE13) -# - openssl-1.1.0-ec-curves.patch (PATCH37) -- MODIFIED -BINDIST_PATCH_SET="openssl-1.1.0l-bindist-1.0.tar.xz" - -DESCRIPTION="full-strength general purpose cryptography library (including SSL and TLS)" -HOMEPAGE="https://www.openssl.org/" -SRC_URI="mirror://openssl/source/${MY_P}.tar.gz - bindist? ( - mirror://gentoo/${BINDIST_PATCH_SET} - https://dev.gentoo.org/~whissi/dist/openssl/${BINDIST_PATCH_SET} - )" - -LICENSE="openssl" -SLOT="0/1.1" # .so version of libssl/libcrypto -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux" -IUSE="+asm bindist elibc_musl rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-heartbeat vanilla zlib" -RESTRICT="!bindist? ( bindist ) - !test? ( test )" - -RDEPEND=">=app-misc/c_rehash-1.7-r1 - zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )" -DEPEND="${RDEPEND}" -BDEPEND=" - >=dev-lang/perl-5 - sctp? ( >=net-misc/lksctp-tools-1.0.12 ) - test? ( - sys-apps/diffutils - sys-devel/bc - )" -PDEPEND="app-misc/ca-certificates" - -PATCHES=( - "${FILESDIR}"/${PN}-1.0.2a-x32-asm.patch #542618 - "${FILESDIR}"/${PN}-1.1.0j-parallel_install_fix.patch #671602 - "${FILESDIR}"/${PN}-1.1.0k-fix-test_fuzz.patch -) - -S="${WORKDIR}/${MY_P}" - -MULTILIB_WRAPPED_HEADERS=( - usr/include/openssl/opensslconf.h -) - -src_prepare() { - if use bindist; then - mv "${WORKDIR}"/bindist-patches/hobble-openssl "${WORKDIR}" || die - bash "${WORKDIR}"/hobble-openssl || die - - cp -f "${WORKDIR}"/bindist-patches/ec_curve.c "${S}"/crypto/ec/ || die - cp -f "${WORKDIR}"/bindist-patches/ectest.c "${S}"/test/ || die - - eapply "${WORKDIR}"/bindist-patches/ec-curves.patch - - local known_failing_test - for known_failing_test in \ - 30-test_evp_extra.t \ - 80-test_ssl_new.t \ - ; do - ebegin "Disabling test '${known_failing_test}' which is known to fail with USE=bindist" - rm test/recipes/${known_failing_test} || die - eend $? - done - - # Also see the configure parts below: - # enable-ec \ - # $(use_ssl !bindist ec2m) \ - fi - - # keep this in sync with app-misc/c_rehash - SSL_CNF_DIR="/etc/ssl" - - # Make sure we only ever touch Makefile.org and avoid patching a file - # that gets blown away anyways by the Configure script in src_configure - rm -f Makefile - - if ! use vanilla ; then - if [[ $(declare -p PATCHES 2>/dev/null) == "declare -a"* ]] ; then - [[ ${#PATCHES[@]} -gt 0 ]] && eapply "${PATCHES[@]}" - fi - - use bindist || eapply "${FILESDIR}"/${PN}-1.1.0l-fix-no-ec2m-in-ec_curve.c.patch - fi - - eapply_user #332661 - - # make sure the man pages are suffixed #302165 - # don't bother building man pages if they're disabled - # Make DOCDIR Gentoo compliant - sed -i \ - -e '/^MANSUFFIX/s:=.*:=ssl:' \ - -e '/^MAKEDEPPROG/s:=.*:=$(CC):' \ - -e $(has noman FEATURES \ - && echo '/^install:/s:install_docs::' \ - || echo '/^MANDIR=/s:=.*:='${EPREFIX}'/usr/share/man:') \ - -e "/^DOCDIR/s@\$(BASENAME)@&-${PVR}@" \ - Configurations/unix-Makefile.tmpl \ - || die - - # show the actual commands in the log - sed -i '/^SET_X/s@=.*@=set -x@' Makefile.shared || die - - # quiet out unknown driver argument warnings since openssl - # doesn't have well-split CFLAGS and we're making it even worse - # and 'make depend' uses -Werror for added fun (#417795 again) - [[ ${CC} == *clang* ]] && append-flags -Qunused-arguments - - # allow openssl to be cross-compiled - cp "${FILESDIR}"/gentoo.config-1.0.2 gentoo.config || die - chmod a+rx gentoo.config || die - - append-flags -fno-strict-aliasing - append-flags $(test-flags-CC -Wa,--noexecstack) - append-cppflags -DOPENSSL_NO_BUF_FREELISTS - - # Prefixify Configure shebang (#141906) - sed \ - -e "1s,/usr/bin/env,${EPREFIX}&," \ - -i Configure || die - # Remove test target when FEATURES=test isn't set - if ! use test ; then - sed \ - -e '/^$config{dirs}/s@ "test",@@' \ - -i Configure || die - fi - # The config script does stupid stuff to prompt the user. Kill it. - sed -i '/stty -icanon min 0 time 50; read waste/d' config || die - ./config --test-sanity || die "I AM NOT SANE" - - multilib_copy_sources -} - -multilib_src_configure() { - unset APPS #197996 - unset SCRIPTS #312551 - unset CROSS_COMPILE #311473 - - tc-export CC AR RANLIB RC - - # Clean out patent-or-otherwise-encumbered code - # Camellia: Royalty Free https://en.wikipedia.org/wiki/Camellia_(cipher) - # IDEA: Expired https://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm - # EC: ????????? ??/??/2015 https://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography - # MDC2: Expired https://en.wikipedia.org/wiki/MDC-2 - # RC5: Expired https://en.wikipedia.org/wiki/RC5 - - use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; } - echoit() { echo "$@" ; "$@" ; } - - local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal") - - # See if our toolchain supports __uint128_t. If so, it's 64bit - # friendly and can use the nicely optimized code paths. #460790 - local ec_nistp_64_gcc_128 - # Disable it for now though #469976 - #if ! use bindist ; then - # echo "__uint128_t i;" > "${T}"/128.c - # if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then - # ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128" - # fi - #fi - - local sslout=$(./gentoo.config) - einfo "Use configuration ${sslout:-(openssl knows best)}" - local config="Configure" - [[ -z ${sslout} ]] && config="config" - - # Fedora hobbled-EC needs 'no-ec2m' - # 'srp' was restricted until early 2017 as well. - # "disable-deprecated" option breaks too many consumers. - # Don't set it without thorough revdeps testing. - # Make sure user flags don't get added *yet* to avoid duplicated - # flags. - CFLAGS= LDFLAGS= echoit \ - ./${config} \ - ${sslout} \ - $(use cpu_flags_x86_sse2 || echo "no-sse2") \ - enable-camellia \ - enable-ec \ - $(use_ssl !bindist ec2m) \ - enable-srp \ - $(use elibc_musl && echo "no-async") \ - ${ec_nistp_64_gcc_128} \ - enable-idea \ - enable-mdc2 \ - enable-rc5 \ - $(use_ssl sslv3 ssl3) \ - $(use_ssl sslv3 ssl3-method) \ - $(use_ssl asm) \ - $(use_ssl rfc3779) \ - $(use_ssl sctp) \ - $(use_ssl tls-heartbeat heartbeats) \ - $(use_ssl zlib) \ - --prefix="${EPREFIX}"/usr \ - --openssldir="${EPREFIX}"${SSL_CNF_DIR} \ - --libdir=$(get_libdir) \ - shared threads \ - || die - - # Clean out hardcoded flags that openssl uses - local DEFAULT_CFLAGS=$(grep ^CFLAGS= Makefile | LC_ALL=C sed \ - -e 's:^CFLAGS=::' \ - -e 's:\(^\| \)-fomit-frame-pointer::g' \ - -e 's:\(^\| \)-O[^ ]*::g' \ - -e 's:\(^\| \)-march=[^ ]*::g' \ - -e 's:\(^\| \)-mcpu=[^ ]*::g' \ - -e 's:\(^\| \)-m[^ ]*::g' \ - -e 's:^ *::' \ - -e 's: *$::' \ - -e 's: \+: :g' \ - -e 's:\\:\\\\:g' - ) - - # Now insert clean default flags with user flags - sed -i \ - -e "/^CFLAGS=/s|=.*|=${DEFAULT_CFLAGS} ${CFLAGS}|" \ - -e "/^LDFLAGS=/s|=[[:space:]]*$|=${LDFLAGS}|" \ - Makefile || die -} - -multilib_src_compile() { - # depend is needed to use $confopts; it also doesn't matter - # that it's -j1 as the code itself serializes subdirs - emake -j1 depend - emake all -} - -multilib_src_test() { - emake -j1 test -} - -multilib_src_install() { - # We need to create $ED/usr on our own to avoid a race condition #665130 - if [[ ! -d "${ED}/usr" ]]; then - # We can only create this directory once - mkdir "${ED}"/usr || die - fi - - emake DESTDIR="${D}" install -} - -multilib_src_install_all() { - # openssl installs perl version of c_rehash by default, but - # we provide a shell version via app-misc/c_rehash - rm "${ED}"/usr/bin/c_rehash || die - - dodoc CHANGES* FAQ NEWS README doc/*.txt doc/${PN}-c-indent.el - - # This is crappy in that the static archives are still built even - # when USE=static-libs. But this is due to a failing in the openssl - # build system: the static archives are built as PIC all the time. - # Only way around this would be to manually configure+compile openssl - # twice; once with shared lib support enabled and once without. - use static-libs || rm -f "${ED}"/usr/lib*/lib*.a - - # create the certs directory - keepdir ${SSL_CNF_DIR}/certs - - # Namespace openssl programs to prevent conflicts with other man pages - cd "${ED}"/usr/share/man || die - local m d s - for m in $(find . -type f | xargs grep -L '#include') ; do - d=${m%/*} ; d=${d#./} ; m=${m##*/} - [[ ${m} == openssl.1* ]] && continue - [[ -n $(find -L ${d} -type l) ]] && die "erp, broken links already!" - mv ${d}/{,ssl-}${m} - # fix up references to renamed man pages - sed -i '/^[.]SH "SEE ALSO"/,/^[.]/s:\([^(, ]*(1)\):ssl-\1:g' ${d}/ssl-${m} - ln -s ssl-${m} ${d}/openssl-${m} - # locate any symlinks that point to this man page ... we assume - # that any broken links are due to the above renaming - for s in $(find -L ${d} -type l) ; do - s=${s##*/} - rm -f ${d}/${s} - # We don't want to "|| die" here - ln -s ssl-${m} ${d}/ssl-${s} - ln -s ssl-${s} ${d}/openssl-${s} - done - done - [[ -n $(find -L ${d} -type l) ]] && die "broken manpage links found :(" - - dodir /etc/sandbox.d #254521 - echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl - - diropts -m0700 - keepdir ${SSL_CNF_DIR}/private -} - -pkg_postinst() { - ebegin "Running 'c_rehash ${EROOT}${SSL_CNF_DIR}/certs/' to rebuild hashes #333069" - c_rehash "${EROOT}${SSL_CNF_DIR}/certs" >/dev/null - eend $? -} diff --git a/dev-libs/openssl/openssl-1.1.1g.ebuild b/dev-libs/openssl/openssl-1.1.1g.ebuild deleted file mode 100644 index 7a3f675be54a..000000000000 --- a/dev-libs/openssl/openssl-1.1.1g.ebuild +++ /dev/null @@ -1,324 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -inherit flag-o-matic toolchain-funcs multilib multilib-minimal - -MY_P=${P/_/-} - -# This patch set is based on the following files from Fedora 31, -# see https://src.fedoraproject.org/rpms/openssl/blob/f31/f/openssl.spec -# for more details: -# - hobble-openssl (SOURCE1) -# - ec_curve.c (SOURCE12) -- MODIFIED -# - ectest.c (SOURCE13) -# - openssl-1.1.1-ec-curves.patch (PATCH37) -- MODIFIED -BINDIST_PATCH_SET="openssl-1.1.1e-bindist-1.0.tar.xz" - -DESCRIPTION="full-strength general purpose cryptography library (including SSL and TLS)" -HOMEPAGE="https://www.openssl.org/" -SRC_URI="mirror://openssl/source/${MY_P}.tar.gz - bindist? ( - mirror://gentoo/${BINDIST_PATCH_SET} - https://dev.gentoo.org/~whissi/dist/openssl/${BINDIST_PATCH_SET} - )" - -LICENSE="openssl" -SLOT="0/1.1" # .so version of libssl/libcrypto -[[ "${PV}" = *_pre* ]] || \ -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x86-linux" -IUSE="+asm bindist elibc_musl rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-heartbeat vanilla zlib" -RESTRICT="!bindist? ( bindist ) - !test? ( test )" - -RDEPEND=">=app-misc/c_rehash-1.7-r1 - zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )" -DEPEND="${RDEPEND}" -BDEPEND=" - >=dev-lang/perl-5 - sctp? ( >=net-misc/lksctp-tools-1.0.12 ) - test? ( - sys-apps/diffutils - sys-devel/bc - sys-process/procps - )" -PDEPEND="app-misc/ca-certificates" - -PATCHES=( - "${FILESDIR}"/${PN}-1.1.0j-parallel_install_fix.patch #671602 -) - -S="${WORKDIR}/${MY_P}" - -# force upgrade to prevent broken login, bug 696950 -RDEPEND+=" !<net-misc/openssh-8.0_p1-r3" - -MULTILIB_WRAPPED_HEADERS=( - usr/include/openssl/opensslconf.h -) - -pkg_setup() { - [[ ${MERGE_TYPE} == binary ]] && return - - # must check in pkg_setup; sysctl don't work with userpriv! - if has test ${FEATURES} && use sctp; then - # test_ssl_new will fail with "Ensure SCTP AUTH chunks are enabled in kernel" - # if sctp.auth_enable is not enabled. - local sctp_auth_status=$(sysctl -n net.sctp.auth_enable 2>/dev/null) - if [[ -z "${sctp_auth_status}" ]] || [[ ${sctp_auth_status} != 1 ]]; then - die "FEATURES=test with USE=sctp requires net.sctp.auth_enable=1!" - fi - fi -} - -src_prepare() { - # allow openssl to be cross-compiled - cp "${FILESDIR}"/gentoo.config-1.0.2 gentoo.config || die - chmod a+rx gentoo.config || die - - if use bindist; then - mv "${WORKDIR}"/bindist-patches/hobble-openssl "${WORKDIR}" || die - bash "${WORKDIR}"/hobble-openssl || die - - cp -f "${WORKDIR}"/bindist-patches/ec_curve.c "${S}"/crypto/ec/ || die - cp -f "${WORKDIR}"/bindist-patches/ectest.c "${S}"/test/ || die - - eapply "${WORKDIR}"/bindist-patches/ec-curves.patch - - local known_failing_test - for known_failing_test in \ - 30-test_evp_extra.t \ - 80-test_ssl_new.t \ - ; do - ebegin "Disabling test '${known_failing_test}' which is known to fail with USE=bindist" - rm test/recipes/${known_failing_test} || die - eend $? - done - - # Also see the configure parts below: - # enable-ec \ - # $(use_ssl !bindist ec2m) \ - fi - - # keep this in sync with app-misc/c_rehash - SSL_CNF_DIR="/etc/ssl" - - # Make sure we only ever touch Makefile.org and avoid patching a file - # that gets blown away anyways by the Configure script in src_configure - rm -f Makefile - - if ! use vanilla ; then - if [[ $(declare -p PATCHES 2>/dev/null) == "declare -a"* ]] ; then - [[ ${#PATCHES[@]} -gt 0 ]] && eapply "${PATCHES[@]}" - fi - fi - - eapply_user #332661 - - if has test ${FEATURES} && use sctp && has network-sandbox ${FEATURES}; then - ebegin "Disabling test '80-test_ssl_new.t' which is known to fail with FEATURES=network-sandbox" - rm test/recipes/80-test_ssl_new.t || die - eend $? - fi - - # make sure the man pages are suffixed #302165 - # don't bother building man pages if they're disabled - # Make DOCDIR Gentoo compliant - sed -i \ - -e '/^MANSUFFIX/s:=.*:=ssl:' \ - -e '/^MAKEDEPPROG/s:=.*:=$(CC):' \ - -e $(has noman FEATURES \ - && echo '/^install:/s:install_docs::' \ - || echo '/^MANDIR=/s:=.*:='${EPREFIX}'/usr/share/man:') \ - -e "/^DOCDIR/s@\$(BASENAME)@&-${PVR}@" \ - Configurations/unix-Makefile.tmpl \ - || die - - # quiet out unknown driver argument warnings since openssl - # doesn't have well-split CFLAGS and we're making it even worse - # and 'make depend' uses -Werror for added fun (#417795 again) - [[ ${CC} == *clang* ]] && append-flags -Qunused-arguments - - append-flags -fno-strict-aliasing - append-flags $(test-flags-CC -Wa,--noexecstack) - append-cppflags -DOPENSSL_NO_BUF_FREELISTS - - # Prefixify Configure shebang (#141906) - sed \ - -e "1s,/usr/bin/env,${EPREFIX}&," \ - -i Configure || die - # Remove test target when FEATURES=test isn't set - if ! use test ; then - sed \ - -e '/^$config{dirs}/s@ "test",@@' \ - -i Configure || die - fi - # The config script does stupid stuff to prompt the user. Kill it. - sed -i '/stty -icanon min 0 time 50; read waste/d' config || die - ./config --test-sanity || die "I AM NOT SANE" - - multilib_copy_sources -} - -multilib_src_configure() { - unset APPS #197996 - unset SCRIPTS #312551 - unset CROSS_COMPILE #311473 - - tc-export CC AR RANLIB RC - - # Clean out patent-or-otherwise-encumbered code - # Camellia: Royalty Free https://en.wikipedia.org/wiki/Camellia_(cipher) - # IDEA: Expired https://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm - # EC: ????????? ??/??/2015 https://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography - # MDC2: Expired https://en.wikipedia.org/wiki/MDC-2 - # RC5: Expired https://en.wikipedia.org/wiki/RC5 - - use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; } - echoit() { echo "$@" ; "$@" ; } - - local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal") - - # See if our toolchain supports __uint128_t. If so, it's 64bit - # friendly and can use the nicely optimized code paths. #460790 - local ec_nistp_64_gcc_128 - # Disable it for now though #469976 - #if ! use bindist ; then - # echo "__uint128_t i;" > "${T}"/128.c - # if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then - # ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128" - # fi - #fi - - local sslout=$(./gentoo.config) - einfo "Use configuration ${sslout:-(openssl knows best)}" - local config="Configure" - [[ -z ${sslout} ]] && config="config" - - # Fedora hobbled-EC needs 'no-ec2m' - # 'srp' was restricted until early 2017 as well. - # "disable-deprecated" option breaks too many consumers. - # Don't set it without thorough revdeps testing. - # Make sure user flags don't get added *yet* to avoid duplicated - # flags. - CFLAGS= LDFLAGS= echoit \ - ./${config} \ - ${sslout} \ - $(use cpu_flags_x86_sse2 || echo "no-sse2") \ - enable-camellia \ - enable-ec \ - $(use_ssl !bindist ec2m) \ - enable-srp \ - $(use elibc_musl && echo "no-async") \ - ${ec_nistp_64_gcc_128} \ - enable-idea \ - enable-mdc2 \ - enable-rc5 \ - $(use_ssl sslv3 ssl3) \ - $(use_ssl sslv3 ssl3-method) \ - $(use_ssl asm) \ - $(use_ssl rfc3779) \ - $(use_ssl sctp) \ - $(use_ssl tls-heartbeat heartbeats) \ - $(use_ssl zlib) \ - --prefix="${EPREFIX}"/usr \ - --openssldir="${EPREFIX}"${SSL_CNF_DIR} \ - --libdir=$(get_libdir) \ - shared threads \ - || die - - # Clean out hardcoded flags that openssl uses - local DEFAULT_CFLAGS=$(grep ^CFLAGS= Makefile | LC_ALL=C sed \ - -e 's:^CFLAGS=::' \ - -e 's:\(^\| \)-fomit-frame-pointer::g' \ - -e 's:\(^\| \)-O[^ ]*::g' \ - -e 's:\(^\| \)-march=[^ ]*::g' \ - -e 's:\(^\| \)-mcpu=[^ ]*::g' \ - -e 's:\(^\| \)-m[^ ]*::g' \ - -e 's:^ *::' \ - -e 's: *$::' \ - -e 's: \+: :g' \ - -e 's:\\:\\\\:g' - ) - - # Now insert clean default flags with user flags - sed -i \ - -e "/^CFLAGS=/s|=.*|=${DEFAULT_CFLAGS} ${CFLAGS}|" \ - -e "/^LDFLAGS=/s|=[[:space:]]*$|=${LDFLAGS}|" \ - Makefile || die -} - -multilib_src_compile() { - # depend is needed to use $confopts; it also doesn't matter - # that it's -j1 as the code itself serializes subdirs - emake -j1 depend - emake all -} - -multilib_src_test() { - emake -j1 test -} - -multilib_src_install() { - # We need to create $ED/usr on our own to avoid a race condition #665130 - if [[ ! -d "${ED}/usr" ]]; then - # We can only create this directory once - mkdir "${ED}"/usr || die - fi - - emake DESTDIR="${D}" install -} - -multilib_src_install_all() { - # openssl installs perl version of c_rehash by default, but - # we provide a shell version via app-misc/c_rehash - rm "${ED}"/usr/bin/c_rehash || die - - dodoc CHANGES* FAQ NEWS README doc/*.txt doc/${PN}-c-indent.el - - # This is crappy in that the static archives are still built even - # when USE=static-libs. But this is due to a failing in the openssl - # build system: the static archives are built as PIC all the time. - # Only way around this would be to manually configure+compile openssl - # twice; once with shared lib support enabled and once without. - use static-libs || rm -f "${ED}"/usr/lib*/lib*.a - - # create the certs directory - keepdir ${SSL_CNF_DIR}/certs - - # Namespace openssl programs to prevent conflicts with other man pages - cd "${ED}"/usr/share/man || die - local m d s - for m in $(find . -type f | xargs grep -L '#include') ; do - d=${m%/*} ; d=${d#./} ; m=${m##*/} - [[ ${m} == openssl.1* ]] && continue - [[ -n $(find -L ${d} -type l) ]] && die "erp, broken links already!" - mv ${d}/{,ssl-}${m} - # fix up references to renamed man pages - sed -i '/^[.]SH "SEE ALSO"/,/^[.]/s:\([^(, ]*(1)\):ssl-\1:g' ${d}/ssl-${m} - ln -s ssl-${m} ${d}/openssl-${m} - # locate any symlinks that point to this man page ... we assume - # that any broken links are due to the above renaming - for s in $(find -L ${d} -type l) ; do - s=${s##*/} - rm -f ${d}/${s} - # We don't want to "|| die" here - ln -s ssl-${m} ${d}/ssl-${s} - ln -s ssl-${s} ${d}/openssl-${s} - done - done - [[ -n $(find -L ${d} -type l) ]] && die "broken manpage links found :(" - - dodir /etc/sandbox.d #254521 - echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl - - diropts -m0700 - keepdir ${SSL_CNF_DIR}/private -} - -pkg_postinst() { - ebegin "Running 'c_rehash ${EROOT}${SSL_CNF_DIR}/certs/' to rebuild hashes #333069" - c_rehash "${EROOT}${SSL_CNF_DIR}/certs" >/dev/null - eend $? -} diff --git a/dev-libs/openssl/openssl-1.1.1h.ebuild b/dev-libs/openssl/openssl-1.1.1h.ebuild deleted file mode 100644 index ccc0cbc5d585..000000000000 --- a/dev-libs/openssl/openssl-1.1.1h.ebuild +++ /dev/null @@ -1,324 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -inherit flag-o-matic toolchain-funcs multilib multilib-minimal - -MY_P=${P/_/-} - -# This patch set is based on the following files from Fedora 31, -# see https://src.fedoraproject.org/rpms/openssl/blob/f31/f/openssl.spec -# for more details: -# - hobble-openssl (SOURCE1) -# - ec_curve.c (SOURCE12) -- MODIFIED -# - ectest.c (SOURCE13) -# - openssl-1.1.1-ec-curves.patch (PATCH37) -- MODIFIED -BINDIST_PATCH_SET="openssl-1.1.1e-bindist-1.0.tar.xz" - -DESCRIPTION="full-strength general purpose cryptography library (including SSL and TLS)" -HOMEPAGE="https://www.openssl.org/" -SRC_URI="mirror://openssl/source/${MY_P}.tar.gz - bindist? ( - mirror://gentoo/${BINDIST_PATCH_SET} - https://dev.gentoo.org/~whissi/dist/openssl/${BINDIST_PATCH_SET} - )" - -LICENSE="openssl" -SLOT="0/1.1" # .so version of libssl/libcrypto -[[ "${PV}" = *_pre* ]] || \ -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux" -IUSE="+asm bindist elibc_musl rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-heartbeat vanilla zlib" -RESTRICT="!bindist? ( bindist ) - !test? ( test )" - -RDEPEND=">=app-misc/c_rehash-1.7-r1 - zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )" -DEPEND="${RDEPEND}" -BDEPEND=" - >=dev-lang/perl-5 - sctp? ( >=net-misc/lksctp-tools-1.0.12 ) - test? ( - sys-apps/diffutils - sys-devel/bc - sys-process/procps - )" -PDEPEND="app-misc/ca-certificates" - -PATCHES=( - "${FILESDIR}"/${PN}-1.1.0j-parallel_install_fix.patch #671602 -) - -S="${WORKDIR}/${MY_P}" - -# force upgrade to prevent broken login, bug 696950 -RDEPEND+=" !<net-misc/openssh-8.0_p1-r3" - -MULTILIB_WRAPPED_HEADERS=( - usr/include/openssl/opensslconf.h -) - -pkg_setup() { - [[ ${MERGE_TYPE} == binary ]] && return - - # must check in pkg_setup; sysctl don't work with userpriv! - if has test ${FEATURES} && use sctp; then - # test_ssl_new will fail with "Ensure SCTP AUTH chunks are enabled in kernel" - # if sctp.auth_enable is not enabled. - local sctp_auth_status=$(sysctl -n net.sctp.auth_enable 2>/dev/null) - if [[ -z "${sctp_auth_status}" ]] || [[ ${sctp_auth_status} != 1 ]]; then - die "FEATURES=test with USE=sctp requires net.sctp.auth_enable=1!" - fi - fi -} - -src_prepare() { - # allow openssl to be cross-compiled - cp "${FILESDIR}"/gentoo.config-1.0.2 gentoo.config || die - chmod a+rx gentoo.config || die - - if use bindist; then - mv "${WORKDIR}"/bindist-patches/hobble-openssl "${WORKDIR}" || die - bash "${WORKDIR}"/hobble-openssl || die - - cp -f "${WORKDIR}"/bindist-patches/ec_curve.c "${S}"/crypto/ec/ || die - cp -f "${WORKDIR}"/bindist-patches/ectest.c "${S}"/test/ || die - - eapply "${WORKDIR}"/bindist-patches/ec-curves.patch - - local known_failing_test - for known_failing_test in \ - 30-test_evp_extra.t \ - 80-test_ssl_new.t \ - ; do - ebegin "Disabling test '${known_failing_test}' which is known to fail with USE=bindist" - rm test/recipes/${known_failing_test} || die - eend $? - done - - # Also see the configure parts below: - # enable-ec \ - # $(use_ssl !bindist ec2m) \ - fi - - # keep this in sync with app-misc/c_rehash - SSL_CNF_DIR="/etc/ssl" - - # Make sure we only ever touch Makefile.org and avoid patching a file - # that gets blown away anyways by the Configure script in src_configure - rm -f Makefile - - if ! use vanilla ; then - if [[ $(declare -p PATCHES 2>/dev/null) == "declare -a"* ]] ; then - [[ ${#PATCHES[@]} -gt 0 ]] && eapply "${PATCHES[@]}" - fi - fi - - eapply_user #332661 - - if has test ${FEATURES} && use sctp && has network-sandbox ${FEATURES}; then - ebegin "Disabling test '80-test_ssl_new.t' which is known to fail with FEATURES=network-sandbox" - rm test/recipes/80-test_ssl_new.t || die - eend $? - fi - - # make sure the man pages are suffixed #302165 - # don't bother building man pages if they're disabled - # Make DOCDIR Gentoo compliant - sed -i \ - -e '/^MANSUFFIX/s:=.*:=ssl:' \ - -e '/^MAKEDEPPROG/s:=.*:=$(CC):' \ - -e $(has noman FEATURES \ - && echo '/^install:/s:install_docs::' \ - || echo '/^MANDIR=/s:=.*:='${EPREFIX}'/usr/share/man:') \ - -e "/^DOCDIR/s@\$(BASENAME)@&-${PVR}@" \ - Configurations/unix-Makefile.tmpl \ - || die - - # quiet out unknown driver argument warnings since openssl - # doesn't have well-split CFLAGS and we're making it even worse - # and 'make depend' uses -Werror for added fun (#417795 again) - [[ ${CC} == *clang* ]] && append-flags -Qunused-arguments - - append-flags -fno-strict-aliasing - append-flags $(test-flags-CC -Wa,--noexecstack) - append-cppflags -DOPENSSL_NO_BUF_FREELISTS - - # Prefixify Configure shebang (#141906) - sed \ - -e "1s,/usr/bin/env,${EPREFIX}&," \ - -i Configure || die - # Remove test target when FEATURES=test isn't set - if ! use test ; then - sed \ - -e '/^$config{dirs}/s@ "test",@@' \ - -i Configure || die - fi - # The config script does stupid stuff to prompt the user. Kill it. - sed -i '/stty -icanon min 0 time 50; read waste/d' config || die - ./config --test-sanity || die "I AM NOT SANE" - - multilib_copy_sources -} - -multilib_src_configure() { - unset APPS #197996 - unset SCRIPTS #312551 - unset CROSS_COMPILE #311473 - - tc-export CC AR RANLIB RC - - # Clean out patent-or-otherwise-encumbered code - # Camellia: Royalty Free https://en.wikipedia.org/wiki/Camellia_(cipher) - # IDEA: Expired https://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm - # EC: ????????? ??/??/2015 https://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography - # MDC2: Expired https://en.wikipedia.org/wiki/MDC-2 - # RC5: Expired https://en.wikipedia.org/wiki/RC5 - - use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; } - echoit() { echo "$@" ; "$@" ; } - - local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal") - - # See if our toolchain supports __uint128_t. If so, it's 64bit - # friendly and can use the nicely optimized code paths. #460790 - local ec_nistp_64_gcc_128 - # Disable it for now though #469976 - #if ! use bindist ; then - # echo "__uint128_t i;" > "${T}"/128.c - # if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then - # ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128" - # fi - #fi - - local sslout=$(./gentoo.config) - einfo "Use configuration ${sslout:-(openssl knows best)}" - local config="Configure" - [[ -z ${sslout} ]] && config="config" - - # Fedora hobbled-EC needs 'no-ec2m' - # 'srp' was restricted until early 2017 as well. - # "disable-deprecated" option breaks too many consumers. - # Don't set it without thorough revdeps testing. - # Make sure user flags don't get added *yet* to avoid duplicated - # flags. - CFLAGS= LDFLAGS= echoit \ - ./${config} \ - ${sslout} \ - $(use cpu_flags_x86_sse2 || echo "no-sse2") \ - enable-camellia \ - enable-ec \ - $(use_ssl !bindist ec2m) \ - enable-srp \ - $(use elibc_musl && echo "no-async") \ - ${ec_nistp_64_gcc_128} \ - enable-idea \ - enable-mdc2 \ - enable-rc5 \ - $(use_ssl sslv3 ssl3) \ - $(use_ssl sslv3 ssl3-method) \ - $(use_ssl asm) \ - $(use_ssl rfc3779) \ - $(use_ssl sctp) \ - $(use_ssl tls-heartbeat heartbeats) \ - $(use_ssl zlib) \ - --prefix="${EPREFIX}"/usr \ - --openssldir="${EPREFIX}"${SSL_CNF_DIR} \ - --libdir=$(get_libdir) \ - shared threads \ - || die - - # Clean out hardcoded flags that openssl uses - local DEFAULT_CFLAGS=$(grep ^CFLAGS= Makefile | LC_ALL=C sed \ - -e 's:^CFLAGS=::' \ - -e 's:\(^\| \)-fomit-frame-pointer::g' \ - -e 's:\(^\| \)-O[^ ]*::g' \ - -e 's:\(^\| \)-march=[^ ]*::g' \ - -e 's:\(^\| \)-mcpu=[^ ]*::g' \ - -e 's:\(^\| \)-m[^ ]*::g' \ - -e 's:^ *::' \ - -e 's: *$::' \ - -e 's: \+: :g' \ - -e 's:\\:\\\\:g' - ) - - # Now insert clean default flags with user flags - sed -i \ - -e "/^CFLAGS=/s|=.*|=${DEFAULT_CFLAGS} ${CFLAGS}|" \ - -e "/^LDFLAGS=/s|=[[:space:]]*$|=${LDFLAGS}|" \ - Makefile || die -} - -multilib_src_compile() { - # depend is needed to use $confopts; it also doesn't matter - # that it's -j1 as the code itself serializes subdirs - emake -j1 depend - emake all -} - -multilib_src_test() { - emake -j1 test -} - -multilib_src_install() { - # We need to create $ED/usr on our own to avoid a race condition #665130 - if [[ ! -d "${ED}/usr" ]]; then - # We can only create this directory once - mkdir "${ED}"/usr || die - fi - - emake DESTDIR="${D}" install -} - -multilib_src_install_all() { - # openssl installs perl version of c_rehash by default, but - # we provide a shell version via app-misc/c_rehash - rm "${ED}"/usr/bin/c_rehash || die - - dodoc CHANGES* FAQ NEWS README doc/*.txt doc/${PN}-c-indent.el - - # This is crappy in that the static archives are still built even - # when USE=static-libs. But this is due to a failing in the openssl - # build system: the static archives are built as PIC all the time. - # Only way around this would be to manually configure+compile openssl - # twice; once with shared lib support enabled and once without. - use static-libs || rm -f "${ED}"/usr/lib*/lib*.a - - # create the certs directory - keepdir ${SSL_CNF_DIR}/certs - - # Namespace openssl programs to prevent conflicts with other man pages - cd "${ED}"/usr/share/man || die - local m d s - for m in $(find . -type f | xargs grep -L '#include') ; do - d=${m%/*} ; d=${d#./} ; m=${m##*/} - [[ ${m} == openssl.1* ]] && continue - [[ -n $(find -L ${d} -type l) ]] && die "erp, broken links already!" - mv ${d}/{,ssl-}${m} - # fix up references to renamed man pages - sed -i '/^[.]SH "SEE ALSO"/,/^[.]/s:\([^(, ]*(1)\):ssl-\1:g' ${d}/ssl-${m} - ln -s ssl-${m} ${d}/openssl-${m} - # locate any symlinks that point to this man page ... we assume - # that any broken links are due to the above renaming - for s in $(find -L ${d} -type l) ; do - s=${s##*/} - rm -f ${d}/${s} - # We don't want to "|| die" here - ln -s ssl-${m} ${d}/ssl-${s} - ln -s ssl-${s} ${d}/openssl-${s} - done - done - [[ -n $(find -L ${d} -type l) ]] && die "broken manpage links found :(" - - dodir /etc/sandbox.d #254521 - echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl - - diropts -m0700 - keepdir ${SSL_CNF_DIR}/private -} - -pkg_postinst() { - ebegin "Running 'c_rehash ${EROOT}${SSL_CNF_DIR}/certs/' to rebuild hashes #333069" - c_rehash "${EROOT}${SSL_CNF_DIR}/certs" >/dev/null - eend $? -} diff --git a/dev-libs/openssl/openssl-1.1.1i.ebuild b/dev-libs/openssl/openssl-1.1.1i.ebuild index 7d5fc56e026b..6c86f655c996 100644 --- a/dev-libs/openssl/openssl-1.1.1i.ebuild +++ b/dev-libs/openssl/openssl-1.1.1i.ebuild @@ -47,6 +47,7 @@ PDEPEND="app-misc/ca-certificates" PATCHES=( "${FILESDIR}"/${PN}-1.1.0j-parallel_install_fix.patch #671602 + "${FILESDIR}"/${PN}-1.1.1i-riscv32.patch ) S="${WORKDIR}/${MY_P}" diff --git a/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r6.ebuild b/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r6.ebuild index f01e1f3ff8a1..e842741c3da4 100644 --- a/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r6.ebuild +++ b/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="6" @@ -23,7 +23,7 @@ SRC_URI="ftp://ftp.ossp.org/pkg/lib/uuid/${MY_P}.tar.gz" LICENSE="ISC" SLOT="0" -KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos" IUSE="+cxx perl php static-libs" DEPEND="perl? ( dev-lang/perl:= )" diff --git a/dev-libs/pakchois/pakchois-0.4-r2.ebuild b/dev-libs/pakchois/pakchois-0.4-r2.ebuild index 5a2b0e252da4..c4a6a502f156 100644 --- a/dev-libs/pakchois/pakchois-0.4-r2.ebuild +++ b/dev-libs/pakchois/pakchois-0.4-r2.ebuild @@ -11,7 +11,7 @@ SRC_URI="http://www.manyfish.co.uk/pakchois/${P}.tar.gz" LICENSE="LGPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86" IUSE="nls" multilib_src_configure() { diff --git a/dev-libs/pegtl/files/pegtl-2.8.3-cmake.patch b/dev-libs/pegtl/files/pegtl-2.8.3-cmake.patch new file mode 100644 index 000000000000..140e1f5cfbb8 --- /dev/null +++ b/dev-libs/pegtl/files/pegtl-2.8.3-cmake.patch @@ -0,0 +1,29 @@ +--- a/CMakeLists.txt 2020-04-22 19:43:00.000000000 +0200 ++++ b/CMakeLists.txt 2020-12-27 00:00:15.886046938 +0100 +@@ -78,4 +78,3 @@ + + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pegtl-config-version.cmake DESTINATION ${PEGTL_INSTALL_CMAKE_DIR}) + install(DIRECTORY include/ DESTINATION ${PEGTL_INSTALL_INCLUDE_DIR}) +-install(FILES LICENSE DESTINATION ${PEGTL_INSTALL_DOC_DIR}) +--- a/src/test/pegtl/CMakeLists.txt 2020-04-22 19:43:00.000000000 +0200 ++++ b/src/test/pegtl/CMakeLists.txt 2020-12-27 00:07:19.122766830 +0100 +@@ -123,7 +123,7 @@ + if(MSVC) + target_compile_options(${exename} PRIVATE /W4 /WX /utf-8) + else() +- target_compile_options(${exename} PRIVATE -pedantic -Wall -Wextra -Wshadow -Werror) ++ target_compile_options(${exename} PRIVATE -pedantic -Wall -Wextra -Wshadow) + endif() + if(ANDROID) + add_test(NAME ${exename} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../../.. COMMAND ${CMAKE_COMMAND} -DANDROID_NDK=${ANDROID_NDK} "-DTEST_RESOURCES=src/test/pegtl/data;src/test/pegtl/file_data.txt;Makefile" -DTEST_RESOURCES_DIR=${CMAKE_CURRENT_SOURCE_DIR}/../../.. -DUNITTEST=${CMAKE_CURRENT_BINARY_DIR}/${exename} -DTEST_PARAMETER=-all -P ${CMAKE_CURRENT_SOURCE_DIR}/ExecuteOnAndroid.cmake) +--- a/src/example/pegtl/CMakeLists.txt 2020-04-22 19:43:00.000000000 +0200 ++++ b/src/example/pegtl/CMakeLists.txt 2020-12-27 00:07:32.970832890 +0100 +@@ -48,7 +48,7 @@ + if(MSVC) + target_compile_options(${exename} PRIVATE /W4 /WX /utf-8) + else() +- target_compile_options(${exename} PRIVATE -pedantic -Wall -Wextra -Wshadow -Werror) ++ target_compile_options(${exename} PRIVATE -pedantic -Wall -Wextra -Wshadow) + endif() + endforeach(examplesourcefile) + diff --git a/dev-libs/pegtl/files/pegtl-2.8.3-gcc-10.patch b/dev-libs/pegtl/files/pegtl-2.8.3-gcc-10.patch new file mode 100644 index 000000000000..ef418e44254e --- /dev/null +++ b/dev-libs/pegtl/files/pegtl-2.8.3-gcc-10.patch @@ -0,0 +1,43 @@ +From a3a292c2ba66bf09b4adc4cee8fcdfb1b1386067 Mon Sep 17 00:00:00 2001 +From: Daniel Frey <d.frey@gmx.de> +Date: Mon, 11 May 2020 22:19:31 +0200 +Subject: [PATCH] Repair warning from GCC 10 + +* Backported patch thx to Fedora. + +--- + include/tao/pegtl/contrib/rep_one_min_max.hpp | 21 +++++++++++++++++++ + 1 file changed, 21 insertions(+) + +diff --git a/include/tao/pegtl/contrib/rep_one_min_max.hpp b/include/tao/pegtl/contrib/rep_one_min_max.hpp +index 7ec4639e..ee0a3782 100644 +--- a/include/tao/pegtl/contrib/rep_one_min_max.hpp ++++ b/include/tao/pegtl/contrib/rep_one_min_max.hpp +@@ -45,6 +45,27 @@ namespace tao + } + }; + ++ template< unsigned Max, char C > ++ struct rep_one_min_max< 0, Max, C > ++ { ++ using analyze_t = analysis::counted< analysis::rule_type::any, 0 >; ++ ++ template< typename Input > ++ static bool match( Input& in ) ++ { ++ const auto size = in.size( Max + 1 ); ++ std::size_t i = 0; ++ while( ( i < size ) && ( in.peek_char( i ) == C ) ) { ++ ++i; ++ } ++ if( i <= Max ) { ++ bump_help< result_on_found::success, Input, char, C >( in, i ); ++ return true; ++ } ++ return false; ++ } ++ }; ++ + template< unsigned Min, unsigned Max, char C > + inline constexpr bool enable_control< rep_one_min_max< Min, Max, C > > = false; + diff --git a/dev-libs/pegtl/pegtl-2.8.3.ebuild b/dev-libs/pegtl/pegtl-2.8.3-r1.ebuild index a2ead2df29fe..ba9a54cdf773 100644 --- a/dev-libs/pegtl/pegtl-2.8.3.ebuild +++ b/dev-libs/pegtl/pegtl-2.8.3-r1.ebuild @@ -11,9 +11,22 @@ SRC_URI="https://github.com/taocpp/PEGTL/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~arm ~x86" IUSE="test" RESTRICT="!test? ( test )" S="${WORKDIR}/PEGTL-${PV}" + +PATCHES=( + "${FILESDIR}/${P}-cmake.patch" + "${FILESDIR}/${P}-gcc-10.patch" # bug 733678 +) + +src_configure() { + local mycmakeargs=( + -DPEGTL_INSTALL_CMAKE_DIR="$(get_libdir)/cmake/${PN}" + -DPEGTL_INSTALL_DOC_DIR="share/doc/${PF}" + ) + cmake_src_configure +} diff --git a/dev-libs/popt/popt-1.18.ebuild b/dev-libs/popt/popt-1.18.ebuild index 695f3cf1db4b..c10902006d52 100644 --- a/dev-libs/popt/popt-1.18.ebuild +++ b/dev-libs/popt/popt-1.18.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -10,7 +10,7 @@ SRC_URI="http://ftp.rpm.org/${PN}/releases/${PN}-1.x/${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" +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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="nls static-libs" RDEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )" diff --git a/dev-libs/protobuf-c/protobuf-c-1.3.2.ebuild b/dev-libs/protobuf-c/protobuf-c-1.3.2.ebuild index b47188055827..f6604b26b18c 100644 --- a/dev-libs/protobuf-c/protobuf-c-1.3.2.ebuild +++ b/dev-libs/protobuf-c/protobuf-c-1.3.2.ebuild @@ -15,7 +15,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${MY_PV}/${MY_P}.tar. LICENSE="BSD-2" # Subslot == SONAME version SLOT="0/1.0.0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86" IUSE="static-libs test" RESTRICT="!test? ( test )" diff --git a/dev-libs/protobuf-c/protobuf-c-1.3.3.ebuild b/dev-libs/protobuf-c/protobuf-c-1.3.3.ebuild index b47188055827..f6604b26b18c 100644 --- a/dev-libs/protobuf-c/protobuf-c-1.3.3.ebuild +++ b/dev-libs/protobuf-c/protobuf-c-1.3.3.ebuild @@ -15,7 +15,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${MY_PV}/${MY_P}.tar. LICENSE="BSD-2" # Subslot == SONAME version SLOT="0/1.0.0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86" IUSE="static-libs test" RESTRICT="!test? ( test )" diff --git a/dev-libs/protobuf/Manifest b/dev-libs/protobuf/Manifest index 517abfc7f262..f999d53e9889 100644 --- a/dev-libs/protobuf/Manifest +++ b/dev-libs/protobuf/Manifest @@ -1,4 +1,3 @@ -DIST protobuf-3.11.4.tar.gz 5140799 BLAKE2B 97b450c0623593efe6a42b66582ff183344b8831689e6a5b4d36096dbd57c33da9569bbf26578536aaf73ecd866ac0588b6cb7d55a6a9b9a6e840d4c57099001 SHA512 777bbb0e9e2375eaebe6b8c87abd660bac70ee469c9ad00dd25917b82d7fb5bbe33cf87f0d69c90e19d55c07a7285ec20974ba4768623ce9ccfadf147fd5e261 DIST protobuf-3.12.2.tar.gz 5309688 BLAKE2B 6f04ab75a165d8135b4c1de210f8698f56f309f73d664192209de10580e0ef850bf56f6f394b860f21912e341141f7bbb1f63198eaee55fd7ad74d86b00c3b1f SHA512 84a349a1dcb5bce6a6a892cf11264390b557ed1e7b05883b71fa9cfb7460d9f73119da1f2861066869e33c752246ea438d5ce2c2b3ff7a4b07696d9450b7916b DIST protobuf-3.12.4.tar.gz 5310348 BLAKE2B 2630941672963165467221843c10079a0ed966f2fdfcbc970b0b41e1ed3c7f78734496c1fbd3ec509c68999a14f637fff267b309cf82a8acf2bb5a948484f79b SHA512 c5d24502b9a6be0a606a19213186fe462e0de6830547003636f0897781f36d0bd7e4e7d9689d96390a0399ce04b6438cda3a0fe6f97f0feb700a110e90beef0c DIST protobuf-3.13.0.tar.gz 5277913 BLAKE2B 168aaa5beef83be675cd2543ca8efeaf5174f5e7fd861a056b04b01c8c781dc7b1fcbd05068ae89f051dfacfdc47c34b19cc33c8d09dd3212d3827746e3408f2 SHA512 514efa65fc8a36bc0791e6d39bdfb07b2689e9c2a4b82536c657859b800e7bc1e1a0ae86a7ee33f30c43a473a49b5c346ce830ac0057b6da104ed37f90b8b0fd diff --git a/dev-libs/protobuf/files/protobuf-3.11.0-disable_no-warning-test.patch b/dev-libs/protobuf/files/protobuf-3.11.0-disable_no-warning-test.patch deleted file mode 100644 index ec043e3865c1..000000000000 --- a/dev-libs/protobuf/files/protobuf-3.11.0-disable_no-warning-test.patch +++ /dev/null @@ -1,19 +0,0 @@ -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 -@@ -714,7 +714,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 \ -@@ -901,4 +901,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.11.0-protoc_input_output_files.patch b/dev-libs/protobuf/files/protobuf-3.11.0-protoc_input_output_files.patch deleted file mode 100644 index 0e22b34efc3e..000000000000 --- a/dev-libs/protobuf/files/protobuf-3.11.0-protoc_input_output_files.patch +++ /dev/null @@ -1,262 +0,0 @@ -https://github.com/protocolbuffers/protobuf/pull/235 - ---- /src/google/protobuf/compiler/command_line_interface.cc -+++ /src/google/protobuf/compiler/command_line_interface.cc -@@ -938,6 +938,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; -@@ -946,13 +968,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; - } - } - -@@ -990,6 +1019,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)) { -@@ -1650,6 +1684,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; -@@ -1786,29 +1826,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" -@@ -2123,7 +2184,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) { -@@ -2135,15 +2198,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 -@@ -288,7 +288,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( -@@ -420,6 +422,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); -@@ -2491,6 +2491,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_ = -@@ -2585,6 +2596,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.11.0-system_libraries.patch b/dev-libs/protobuf/files/protobuf-3.11.0-system_libraries.patch deleted file mode 100644 index 8311ce8b22e9..000000000000 --- a/dev-libs/protobuf/files/protobuf-3.11.0-system_libraries.patch +++ /dev/null @@ -1,121 +0,0 @@ ---- /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 -@@ -708,19 +708,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. -@@ -812,12 +804,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 \ -@@ -838,11 +826,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 \ -@@ -854,11 +838,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 \ -@@ -868,8 +848,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.11.4.ebuild b/dev-libs/protobuf/protobuf-3.11.4.ebuild deleted file mode 100644 index 568a3f45c37d..000000000000 --- a/dev-libs/protobuf/protobuf-3.11.4.ebuild +++ /dev/null @@ -1,128 +0,0 @@ -# Copyright 2008-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -inherit autotools elisp-common flag-o-matic multilib-minimal toolchain-funcs - -if [[ "${PV}" == "9999" ]]; then - inherit git-r3 - - EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf" - EGIT_SUBMODULES=() -fi - -DESCRIPTION="Google's Protocol Buffers - Extensible mechanism for serializing structured data" -HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf" -if [[ "${PV}" == "9999" ]]; then - SRC_URI="" -else - SRC_URI="https://github.com/protocolbuffers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" -fi - -LICENSE="BSD" -SLOT="0/22" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" -IUSE="emacs examples static-libs test zlib" -RESTRICT="!test? ( test )" - -BDEPEND="emacs? ( app-editors/emacs:* )" -DEPEND="test? ( >=dev-cpp/gtest-1.9[${MULTILIB_USEDEP}] ) - zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )" -RDEPEND="emacs? ( app-editors/emacs:* ) - zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )" - -PATCHES=( - "${FILESDIR}/${PN}-3.11.0-disable_no-warning-test.patch" - "${FILESDIR}/${PN}-3.11.0-system_libraries.patch" - "${FILESDIR}/${PN}-3.11.0-protoc_input_output_files.patch" -) - -DOCS=(CHANGES.txt CONTRIBUTORS.txt README.md) - -src_prepare() { - default - - # 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-3.12.2.ebuild b/dev-libs/protobuf/protobuf-3.12.2.ebuild index 4050ce7e43fa..e86ba1284f34 100644 --- a/dev-libs/protobuf/protobuf-3.12.2.ebuild +++ b/dev-libs/protobuf/protobuf-3.12.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 2008-2020 Gentoo Authors +# Copyright 2008-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -22,7 +22,7 @@ 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" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos" IUSE="emacs examples static-libs test zlib" RESTRICT="!test? ( test )" diff --git a/dev-libs/protobuf/protobuf-3.12.4.ebuild b/dev-libs/protobuf/protobuf-3.12.4.ebuild index 163d17cfe649..ce7b47101c51 100644 --- a/dev-libs/protobuf/protobuf-3.12.4.ebuild +++ b/dev-libs/protobuf/protobuf-3.12.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 2008-2020 Gentoo Authors +# Copyright 2008-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -22,7 +22,7 @@ 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" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos" IUSE="emacs examples static-libs test zlib" RESTRICT="!test? ( test )" diff --git a/dev-libs/protobuf/protobuf-3.13.0.ebuild b/dev-libs/protobuf/protobuf-3.13.0.ebuild index 591ab50c2919..416c4ef82989 100644 --- a/dev-libs/protobuf/protobuf-3.13.0.ebuild +++ b/dev-libs/protobuf/protobuf-3.13.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 2008-2020 Gentoo Authors +# Copyright 2008-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -22,7 +22,7 @@ fi LICENSE="BSD" SLOT="0/24" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos" IUSE="emacs examples static-libs test zlib" RESTRICT="!test? ( test )" diff --git a/dev-libs/protobuf/protobuf-3.14.0.ebuild b/dev-libs/protobuf/protobuf-3.14.0.ebuild index 706e7d50e34a..d1e71d4e5020 100644 --- a/dev-libs/protobuf/protobuf-3.14.0.ebuild +++ b/dev-libs/protobuf/protobuf-3.14.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 2008-2020 Gentoo Authors +# Copyright 2008-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -22,7 +22,7 @@ fi LICENSE="BSD" SLOT="0/25" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" +KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos" IUSE="emacs examples static-libs test zlib" RESTRICT="!test? ( test )" diff --git a/dev-libs/ptexenc/ptexenc-1.3.8_p20200406.ebuild b/dev-libs/ptexenc/ptexenc-1.3.8_p20200406.ebuild index 5fb1b6a05c54..c49c85097764 100644 --- a/dev-libs/ptexenc/ptexenc-1.3.8_p20200406.ebuild +++ b/dev-libs/ptexenc/ptexenc-1.3.8_p20200406.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -12,7 +12,7 @@ SRC_URI="https://dev.gentoo.org/~zlogene/distfiles/texlive/texlive-${PV#*_p}-sou LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-macos ~x64-macos ~x86-macos" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-macos ~x64-macos" IUSE="iconv static-libs" DEPEND="iconv? ( virtual/libiconv ) diff --git a/dev-libs/pugixml/Manifest b/dev-libs/pugixml/Manifest index b5debf23fbd4..bc0078070051 100644 --- a/dev-libs/pugixml/Manifest +++ b/dev-libs/pugixml/Manifest @@ -1,2 +1,3 @@ DIST pugixml-1.10.tar.gz 381990 BLAKE2B ea446d11fe5213a5250b7e737a9e80a3976454724e1a1c326b689214ad4d3e183abd417a7782b3d5c68a0aabce42228e121352e4d2dd33f5f2bb2334f6c72c27 SHA512 bfc80661005d0a0fb82ca6d5299e5efdd1bb468e11ee52d7ee9367e15776d28efb60266ce03842715cd43aae023afc2b369797bb3cbecd6d6a65c3ae3903e469 -DIST pugixml-1.11.2.tar.gz 386166 BLAKE2B 21dee2f04e8f9d962cd6f0ebf54d608fb0434ed815a13807f5939dea47e98128009b6b918a761b80566b959f1c0651c4b771028515fd9e8b8b51a0e4e592d3dd SHA512 403ef9f642fba6aff2d642399516886c0cda44ca19c58eeb05594aa7220562afbee939a5edab0c85263596834c5bdaea82a346dd8ee00a712e97b564f0d1e52d +DIST pugixml-1.11.3.tar.gz 386244 BLAKE2B 1c83b0e0c1f464d3ef2efc19decc425bac14b5f92face3ea3bbd9f970e442043d3c4d4c471178c8891d7b3245aa6193d89fe3bfea122886ec0261418a69cc2c6 SHA512 4af70f11bbbb8a33240bf12c6ea14973963303a8cf7fa6ce56376726a6c4764c2f6c87a4e6d7672961850a84d8f430712686d744da8bc12d5fe0a711dad6e90b +DIST pugixml-1.11.4.tar.gz 386229 BLAKE2B 93d9c537f10e3a12297e4d6a39f2866bd5c9678c6aff83e20fb79b6587191b6586b1fe4d9dd995a7be05cc9281cd9910fae3eddf6b2eac216873e918a5cf3231 SHA512 c83f57ef2492eee359d979597fb5089b8eca547bb9d41cfbb6bcf43d59fe75e6780b0f31dd593145ec9888c065153aba52702667e2de213fa080cd51e9e13a38 diff --git a/dev-libs/pugixml/pugixml-1.11.2.ebuild b/dev-libs/pugixml/pugixml-1.11.3.ebuild index 0750359ebd79..0750359ebd79 100644 --- a/dev-libs/pugixml/pugixml-1.11.2.ebuild +++ b/dev-libs/pugixml/pugixml-1.11.3.ebuild diff --git a/dev-libs/pugixml/pugixml-1.11.4.ebuild b/dev-libs/pugixml/pugixml-1.11.4.ebuild new file mode 100644 index 000000000000..0750359ebd79 --- /dev/null +++ b/dev-libs/pugixml/pugixml-1.11.4.ebuild @@ -0,0 +1,20 @@ +# 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/zeux/${PN}.git" + inherit git-r3 +else + SRC_URI="https://github.com/zeux/${PN}/releases/download/v${PV}/${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" +fi + +DESCRIPTION="Light-weight, simple, and fast XML parser for C++ with XPath support" +HOMEPAGE="https://pugixml.org/ https://github.com/zeux/pugixml/" + +LICENSE="MIT" +SLOT="0" diff --git a/dev-libs/raft/files/raft-0.9.25-Always-skip-init-oom-test.patch b/dev-libs/raft/files/raft-0.9.25-Always-skip-init-oom-test.patch new file mode 100644 index 000000000000..7a22682c2e03 --- /dev/null +++ b/dev-libs/raft/files/raft-0.9.25-Always-skip-init-oom-test.patch @@ -0,0 +1,31 @@ +commit e0948518f6eedad85c7705fb3963cfdda3627d8f +Author: Reto Gantenbein <reto.gantenbein@linuxmonk.ch> +Date: Thu Oct 22 00:19:31 2020 +0200 + + Always skip init/oom test + + The RPM package build in COPR is being executed on a tmpfs which + always results in a failure of this test: + + init/oom + heap-fault-delay=1, heap-fault-repeat=1 [ ERROR ] + Error: test/integration/test_uv_init.c:156: assertion failed: _rv == 1 (0 == 1) + + Instead only for certain architectures we always skip this test. + For more informations see https://github.com/ganto/copr-lxc4/issues/8 + +diff --git a/test/integration/test_uv_init.c b/test/integration/test_uv_init.c +index 8c9b5f7..57db7f3 100644 +--- a/test/integration/test_uv_init.c ++++ b/test/integration/test_uv_init.c +@@ -144,10 +144,8 @@ static MunitParameterEnum oomParams[] = { + TEST(init, oom, setUp, tearDown, 0, oomParams) + { + struct fixture *f = data; +-#if defined(__i686__) + /* XXX: tmpfs seems to not support O_DIRECT */ + return MUNIT_SKIP; +-#endif + #if defined(__powerpc64__) + /* XXX: fails on ppc64el */ + return MUNIT_SKIP; diff --git a/dev-libs/raft/raft-0.9.25.ebuild b/dev-libs/raft/raft-0.9.25.ebuild index b1d2d3822b20..b5f0f01804eb 100644 --- a/dev-libs/raft/raft-0.9.25.ebuild +++ b/dev-libs/raft/raft-0.9.25.ebuild @@ -1,4 +1,4 @@ -# Copyright 2020 Gentoo Authors +# Copyright 2020-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -18,6 +18,8 @@ RESTRICT="!test? ( test )" DEPEND="dev-libs/libuv" RDEPEND="${DEPEND}" +PATCHES=( "${FILESDIR}"/raft-0.9.25-Always-skip-init-oom-test.patch ) + src_prepare() { default diff --git a/dev-libs/rapidjson/files/rapidjson-1.1.0-system_gtest.patch b/dev-libs/rapidjson/files/rapidjson-1.1.0-system_gtest.patch new file mode 100644 index 000000000000..bdc720e8cf86 --- /dev/null +++ b/dev-libs/rapidjson/files/rapidjson-1.1.0-system_gtest.patch @@ -0,0 +1,44 @@ +--- /CMakeModules/FindGTestSrc.cmake ++++ /CMakeModules/FindGTestSrc.cmake +@@ -1,30 +1,9 @@ +- +-SET(GTEST_SEARCH_PATH +- "${GTEST_SOURCE_DIR}" +- "${CMAKE_CURRENT_LIST_DIR}/../thirdparty/gtest/googletest") +- +-IF(UNIX) +- IF(RAPIDJSON_BUILD_THIRDPARTY_GTEST) +- LIST(APPEND GTEST_SEARCH_PATH "/usr/src/gtest") +- ELSE() +- LIST(INSERT GTEST_SEARCH_PATH 1 "/usr/src/gtest") +- ENDIF() +-ENDIF() +- +-FIND_PATH(GTEST_SOURCE_DIR +- NAMES CMakeLists.txt src/gtest_main.cc +- PATHS ${GTEST_SEARCH_PATH}) +- +- + # Debian installs gtest include directory in /usr/include, thus need to look + # for include directory separately from source directory. + FIND_PATH(GTEST_INCLUDE_DIR + NAMES gtest/gtest.h +- PATH_SUFFIXES include +- HINTS ${GTEST_SOURCE_DIR} +- PATHS ${GTEST_SEARCH_PATH}) ++ PATH_SUFFIXES include) + + INCLUDE(FindPackageHandleStandardArgs) + find_package_handle_standard_args(GTestSrc DEFAULT_MSG +- GTEST_SOURCE_DIR + GTEST_INCLUDE_DIR) +--- /test/CMakeLists.txt ++++ /test/CMakeLists.txt +@@ -8,7 +8,6 @@ + set(gtest_force_shared_crt ON) + endif() + +- add_subdirectory(${GTEST_SOURCE_DIR} ${CMAKE_BINARY_DIR}/googletest) + include_directories(SYSTEM ${GTEST_INCLUDE_DIR}) + + set(TEST_LIBRARIES gtest gtest_main) diff --git a/dev-libs/rapidjson/files/rapidjson-1.1.0-valgrind_optional.patch b/dev-libs/rapidjson/files/rapidjson-1.1.0-valgrind_optional.patch new file mode 100644 index 000000000000..071a3d2392df --- /dev/null +++ b/dev-libs/rapidjson/files/rapidjson-1.1.0-valgrind_optional.patch @@ -0,0 +1,21 @@ +https://github.com/Tencent/rapidjson/issues/1808 + +--- /test/unittest/CMakeLists.txt ++++ /test/unittest/CMakeLists.txt +@@ -77,12 +77,15 @@ + COMMAND ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/unittest + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/bin) + +-if(NOT MSVC) ++find_program(VALGRIND_EXECUTABLE valgrind) ++if(VALGRIND_EXECUTABLE) + # Not running SIMD.* unit test cases for Valgrind + add_test(NAME valgrind_unittest + COMMAND valgrind --leak-check=full --error-exitcode=1 ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/unittest --gtest_filter=-SIMD.* + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/bin) ++endif(VALGRIND_EXECUTABLE) + ++if(NOT MSVC) + if(CMAKE_BUILD_TYPE STREQUAL "Debug") + add_test(NAME symbol_check + COMMAND sh -c "objdump -t -C libnamespacetest.a | grep rapidjson ; test $? -ne 0" diff --git a/dev-libs/rapidjson/files/rapidjson-1.1.1-valgrind_optional.patch b/dev-libs/rapidjson/files/rapidjson-1.1.1-valgrind_optional.patch new file mode 100644 index 000000000000..b40a39fb13db --- /dev/null +++ b/dev-libs/rapidjson/files/rapidjson-1.1.1-valgrind_optional.patch @@ -0,0 +1,21 @@ +https://github.com/Tencent/rapidjson/issues/1808 + +--- /test/unittest/CMakeLists.txt ++++ /test/unittest/CMakeLists.txt +@@ -78,12 +78,15 @@ + COMMAND ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/unittest + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/bin) + +-if(NOT MSVC) ++find_program(VALGRIND_EXECUTABLE valgrind) ++if(VALGRIND_EXECUTABLE) + # Not running SIMD.* unit test cases for Valgrind + add_test(NAME valgrind_unittest + COMMAND valgrind --suppressions=${CMAKE_SOURCE_DIR}/test/valgrind.supp --leak-check=full --error-exitcode=1 ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/unittest --gtest_filter=-SIMD.* + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/bin) ++endif(VALGRIND_EXECUTABLE) + ++if(NOT MSVC) + if(CMAKE_BUILD_TYPE STREQUAL "Debug") + add_test(NAME symbol_check + COMMAND sh -c "objdump -t -C libnamespacetest.a | grep rapidjson ; test $? -ne 0" diff --git a/dev-libs/rapidjson/rapidjson-1.1.0-r3.ebuild b/dev-libs/rapidjson/rapidjson-1.1.0-r3.ebuild new file mode 100644 index 000000000000..5b1dcd2314e6 --- /dev/null +++ b/dev-libs/rapidjson/rapidjson-1.1.0-r3.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake + +DESCRIPTION="A fast JSON parser/generator for C++ with both SAX/DOM style API" +HOMEPAGE="https://rapidjson.org/" + +LICENSE="MIT" +IUSE="doc examples test" +RESTRICT="!test? ( test )" +SLOT="0" + +if [[ ${PV} == *9999 ]] ; then + EGIT_REPO_URI="https://github.com/miloyip/rapidjson.git" + inherit git-r3 +else + SRC_URI="https://github.com/miloyip/rapidjson/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86" + S="${WORKDIR}/rapidjson-${PV}" +fi + +DEPEND=" + doc? ( app-doc/doxygen ) + test? ( dev-cpp/gtest )" +RDEPEND="" + +PATCHES=( + "${FILESDIR}/${P}-gcc-7.patch" + "${FILESDIR}/${P}-system_gtest.patch" + "${FILESDIR}/${P}-valgrind_optional.patch" +) + +src_prepare() { + cmake_src_prepare + + sed -i -e 's| -march=native||g' CMakeLists.txt || die + sed -i -e 's| -Werror||g' CMakeLists.txt example/CMakeLists.txt test/unittest/CMakeLists.txt || die +} + +src_configure() { + local mycmakeargs=( + -DDOC_INSTALL_DIR="${EPREFIX}/usr/share/doc/${PF}" + -DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)" + -DRAPIDJSON_BUILD_DOC=$(usex doc) + -DRAPIDJSON_BUILD_EXAMPLES=$(usex examples) + -DRAPIDJSON_BUILD_TESTS=$(usex test) + -DRAPIDJSON_BUILD_THIRDPARTY_GTEST=OFF + -DVALGRIND_EXECUTABLE= + ) + cmake_src_configure +} diff --git a/dev-libs/rapidjson/rapidjson-9999.ebuild b/dev-libs/rapidjson/rapidjson-9999.ebuild index 7abb247fd71d..081c33172b8d 100644 --- a/dev-libs/rapidjson/rapidjson-9999.ebuild +++ b/dev-libs/rapidjson/rapidjson-9999.ebuild @@ -19,23 +19,26 @@ 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 ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~x86" S="${WORKDIR}/rapidjson-${PV}" fi DEPEND=" doc? ( app-doc/doxygen ) - test? ( - dev-cpp/gtest - dev-util/valgrind - )" + test? ( dev-cpp/gtest )" RDEPEND="" +PATCHES=( + "${FILESDIR}/${PN}-1.1.0-system_gtest.patch" + "${FILESDIR}/${PN}-1.1.1-valgrind_optional.patch" +) + src_prepare() { cmake_src_prepare - sed -i -e 's|-Werror||g' CMakeLists.txt || die - sed -i -e 's|-Werror||g' example/CMakeLists.txt || die + sed -i -e 's| -march=native||g' CMakeLists.txt || die + sed -i -e 's| -mcpu=native||g' CMakeLists.txt || die + sed -i -e 's| -Werror||g' CMakeLists.txt || die } src_configure() { @@ -46,6 +49,7 @@ src_configure() { -DRAPIDJSON_BUILD_EXAMPLES=$(usex examples) -DRAPIDJSON_BUILD_TESTS=$(usex test) -DRAPIDJSON_BUILD_THIRDPARTY_GTEST=OFF + -DVALGRIND_EXECUTABLE= ) cmake_src_configure } diff --git a/dev-libs/rasqal/rasqal-0.9.33.ebuild b/dev-libs/rasqal/rasqal-0.9.33.ebuild index b7f147d78c0f..d438961b67f8 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" +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/redland-bindings/redland-bindings-1.0.17.1-r1.ebuild b/dev-libs/redland-bindings/redland-bindings-1.0.17.1-r1.ebuild index 2a28d3160eb9..3296e376f44e 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 @@ -29,7 +29,7 @@ BDEPEND="sys-apps/sed virtual/pkgconfig" RDEPEND=">=dev-libs/redland-1.0.14 - lua? ( >=dev-lang/lua-5.1:= ) + lua? ( >=dev-lang/lua-5.1:0= ) perl? ( dev-lang/perl:= ) python? ( ${PYTHON_DEPS} ) ruby? ( dev-lang/ruby:* dev-ruby/log4r ) diff --git a/dev-libs/redland-bindings/redland-bindings-1.0.17.1-r100.ebuild b/dev-libs/redland-bindings/redland-bindings-1.0.17.1-r100.ebuild new file mode 100644 index 000000000000..660ccbfbdbf7 --- /dev/null +++ b/dev-libs/redland-bindings/redland-bindings-1.0.17.1-r100.ebuild @@ -0,0 +1,190 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +LUA_COMPAT=( lua5-{1..4} luajit ) +PYTHON_COMPAT=( python3_{6,7,8,9,10} ) + +USE_PHP="php7-2 php7-3 php7-4" +PHP_EXT_ECONF_ARGS="--with-php=yes --without-lua --without-perl --without-python --without-ruby" +PHP_EXT_NAME="redland" +PHP_EXT_OPTIONAL_USE="php" +PHP_EXT_SKIP_PATCHES="yes" +PHP_EXT_SKIP_PHPIZE="yes" + +inherit lua php-ext-source-r3 python-single-r1 autotools + +DESCRIPTION="Language bindings for Redland" +HOMEPAGE="https://librdf.org/bindings/" +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" +IUSE="lua perl python php ruby test" +REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} ) + python? ( ${PYTHON_REQUIRED_USE} )" +RESTRICT="!test? ( test )" + +BDEPEND="sys-apps/sed + virtual/pkgconfig" + +RDEPEND=">=dev-libs/redland-1.0.14 + lua? ( ${LUA_DEPS} ) + perl? ( dev-lang/perl:= ) + python? ( ${PYTHON_DEPS} ) + ruby? ( dev-lang/ruby:* dev-ruby/log4r ) + php? ( + php_targets_php7-2? ( dev-lang/php:7.2[-threads] ) + php_targets_php7-3? ( dev-lang/php:7.3[-threads] ) + php_targets_php7-4? ( dev-lang/php:7.4[-threads] ) + )" + +DEPEND="${RDEPEND} + >=dev-lang/swig-2 + test? ( + >=dev-libs/redland-1.0.14[berkdb] + )" + +PATCHES=( + "${FILESDIR}"/${P}-bool.patch + "${FILESDIR}"/${PN}-1.0.17.1-php-config-r1.patch + "${FILESDIR}"/${PN}-1.0.17.1-add-PHP7-support.patch +) + +pkg_setup() { + use python && python-single-r1_pkg_setup +} + +src_prepare() { + default + + eautoreconf + + # As of version 1.0.17.1, out-of-tree builds fail with: + # "error: redland_wrap.c: No such file or directory", + # have to copy the sources. + use lua && lua_copy_sources + + use php && php-ext-source-r3_src_prepare +} + +lua_src_configure() { + pushd "${BUILD_DIR}" > /dev/null || die + + econf \ + --with-lua="${ELUA}" \ + --without-perl \ + --without-php \ + --without-python \ + --without-ruby + + popd > /dev/null || die +} + +src_configure() { + if use perl || use python || use ruby ; then + econf \ + $(use_with lua) \ + $(use_with perl) \ + $(use_with python) \ + --without-php \ + $(use_with ruby) + fi + + if use lua; then + lua_foreach_impl lua_src_configure + fi + + use php && php-ext-source-r3_src_configure +} + +lua_src_compile() { + pushd "${BUILD_DIR}" > /dev/null || die + + default_src_compile + + popd > /dev/null || die +} + +src_compile() { + if use perl || use python || use ruby ; then + default + fi + + if use lua; then + lua_foreach_impl lua_src_compile + fi + + use php && php-ext-source-r3_src_compile +} + +lua_src_test() { + pushd "${BUILD_DIR}" > /dev/null || die + + default_src_test + + popd > /dev/null || die +} + +src_test() { + if use perl || use python || use ruby ; then + default + fi + + if use lua; then + lua_foreach_impl lua_src_test + fi + + if use php ; then + local slot + for slot in $(php_get_slots) ; do + php_init_slot_env "${slot}" + cd php || die + ${PHPCLI} -v + ${PHPCLI} -d "extension=./${PHP_EXT_NAME}.so" -f test.php || die "PHP tests for ${slot} failed!" + cd "${S}" || die + done + fi +} + +lua_src_install() { + pushd "${BUILD_DIR}" > /dev/null || die + + emake DESTDIR="${D}" INSTALLDIRS=vendor luadir="$(lua_get_cmod_dir)" install + + popd > /dev/null || die +} + +src_install() { + if use perl || use python || use ruby ; then + emake DESTDIR="${D}" INSTALLDIRS=vendor install + fi + + if use lua; then + lua_foreach_impl lua_src_install + fi + + if use perl; then + find "${ED}" -type f -name perllocal.pod -delete + find "${ED}" -depth -mindepth 1 -type d -empty -delete + fi + + use python && python_optimize + + if use php; then + local slot + for slot in $(php_get_slots); do + php_init_slot_env "${slot}" + exeinto "${EXT_DIR#$EPREFIX}" + doexe "php/${PHP_EXT_NAME}.so" + done + + php-ext-source-r3_createinifiles + fi + + local DOCS=( AUTHORS ChangeLog NEWS README TODO ) + local HTML_DOCS=( {NEWS,README,RELEASE,TODO}.html ) + einstalldocs +} diff --git a/dev-libs/redland/redland-1.0.17-r2.ebuild b/dev-libs/redland/redland-1.0.17-r2.ebuild index 0f1a22da8732..ef77689077ec 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" +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 ff6d6f879ffb..9bd0358c13c3 100644 --- a/dev-libs/rinutils/Manifest +++ b/dev-libs/rinutils/Manifest @@ -1 +1,2 @@ DIST rinutils-0.6.0.tar.xz 16768 BLAKE2B a4fe413c6a4f18bd8c41a4d933a2515ba64f2dbe180d8a5868eadd8cd6ed7008d30f5b6cd5fa730edcb6548f6ea269ab419b912fd6c7346dd013a737320bb714 SHA512 2523747f9cf5f830e5fb5acc1e92691e8acfb59d6c4474d3768b68de9190dbc63c9e06cdd3c6ac67f8a853d37d1711d4c18550bb24446b2730198668f4ad0c45 +DIST rinutils-0.8.0.tar.xz 17112 BLAKE2B 362cf1e00092347e17a2a7da259316013af19f66ecb435b9e061355c7e3797b695b2334c86595380e70b6ea168fa50d4bcb055e75fa407601368d5a869a6d721 SHA512 06bbcdb5092762bf2ed92d4082eca17e8dc0e822ce8634f8ec8782fe7eccb4b954c081dbba3f1e2f72e0285607a813f020d4277af77accc43135bde50153359d diff --git a/dev-libs/rinutils/rinutils-0.8.0.ebuild b/dev-libs/rinutils/rinutils-0.8.0.ebuild new file mode 100644 index 000000000000..bd309594839d --- /dev/null +++ b/dev-libs/rinutils/rinutils-0.8.0.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2021 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/rlog/files/rlog-1.4-autoconf-2.70.patch b/dev-libs/rlog/files/rlog-1.4-autoconf-2.70.patch new file mode 100644 index 000000000000..f8e07813786d --- /dev/null +++ b/dev-libs/rlog/files/rlog-1.4-autoconf-2.70.patch @@ -0,0 +1,160 @@ +--- rlog-1.4/configure.ac ++++ rlog-1.4/configure.ac +@@ -64,15 +64,15 @@ + ACX_PTHREAD + + AC_ARG_ENABLE(printffp, +- AS_HELP_STRING([--disable-printffp], +- [disables printf attribute on function pointers]), +- with_printffp=$enableval,with_printffp="test") ++ [AS_HELP_STRING([--disable-printffp], ++ [disables printf attribute on function pointers])], ++ [with_printffp=$enableval], [with_printffp="test"]) + +-if test "x$with_printffp" = "xtest"; then ++AS_IF([test "x$with_printffp" = "xtest"], [ + + # check if we can use printf attribute on a function.. + AC_MSG_CHECKING(if __printf__ attribute can apply to function pointers) +- AC_COMPILE_IFELSE( [[ ++ AC_COMPILE_IFELSE([ + void testfunc(const char *format, ...) + { } + void (*funcProto)(const char *, ...) +@@ -85,28 +85,28 @@ + + return 0; + } +- ]], ++ ], [ + with_printffp="yes", +- with_printffp="no") ++ with_printffp="no"]) + + AC_MSG_RESULT($with_printffp) +-fi ++]) + +-if test "x$with_printffp" = "xyes"; then ++AS_IF([test "x$with_printffp" = "xyes"], [ + HAVE_PRINTF_FP_PROTOTYPE="1" +-else ++], [ + HAVE_PRINTF_FP_PROTOTYPE="0" +-fi ++]) + AC_SUBST(HAVE_PRINTF_FP_PROTOTYPE) + + AC_ARG_ENABLE(vararg, +- AS_HELP_STRING([--disable-vararg], +- [don't use vararg macros even if the compiler supports them]), +- enable_vararg=$enableval) +-if test "x$enable_vararg" != "xno"; then ++ [AS_HELP_STRING([--disable-vararg], ++ [don't use vararg macros even if the compiler supports them])], ++ [enable_vararg=$enableval]) ++AS_IF([test "x$enable_vararg" != "xno"], [ + # check if the compiler understands __VA_ARGS__ + AC_MSG_CHECKING(if compiler has C99 variadac macro) +-AC_COMPILE_IFELSE( [[ ++AC_COMPILE_IFELSE([ + #include <stdio.h> + + #define PRINT(FMT, ...) printf( FMT, __VA_ARGS__ ) +@@ -115,7 +115,7 @@ + { + PRINT("hello %s", "world"); + return 0; +-} ]], [C99_VARIADAC_MACROS="1" ++} ], [C99_VARIADAC_MACROS="1" + AC_MSG_RESULT(yes)], + [C99_VARIADAC_MACROS="0" + AC_MSG_RESULT(no)]) +@@ -123,7 +123,7 @@ + + # check if the compiler understands pre-c99 variadac macros + AC_MSG_CHECKING(if compiler has pre-C99 variadac macro) +-AC_COMPILE_IFELSE( [[ ++AC_COMPILE_IFELSE([ + #include <stdio.h> + + #define PRINT(FMT, ARGS...) printf( FMT, ##ARGS ) +@@ -132,15 +132,15 @@ + { + PRINT("hello %s", "world"); + return 0; +-} ]], [PREC99_VARIADAC_MACROS="1" ++} ], [PREC99_VARIADAC_MACROS="1" + AC_MSG_RESULT(yes)], + [PREC99_VARIADAC_MACROS="0" + AC_MSG_RESULT(no)]) +-else ++], [ + dnl vararg support disabled + C99_VARIADAC_MACROS=0 + PREC99_VARIADAC_MACROS=0 +-fi # enable_vararg ++]) # enable_vararg + + AC_SUBST(C99_VARIADAC_MACROS) + AC_SUBST(PREC99_VARIADAC_MACROS) +@@ -148,42 +148,42 @@ + + # check if the computer has hardware cycle counter + AC_ARG_ENABLE(rdtsc, +- AS_HELP_STRING([--enable-rdtsc], +- [use rdtsc for benchmarking rlog in test programs]), +- with_rdtsc=$enableval,with_rdtsc="no") +-if test "x$with_rdtsc" = "xyes"; then ++ [AS_HELP_STRING([--enable-rdtsc], ++ [use rdtsc for benchmarking rlog in test programs])], ++ [with_rdtsc=$enableval], [with_rdtsc="no"]) ++AS_IF([test "x$with_rdtsc" = "xyes"], [ + AC_DEFINE([USE_RDTSC], [1], [Define to use RDTSC calls for benchmark test]) +-else ++], [ + AC_DEFINE([USE_RDTSC], [0], [Define to use RDTSC calls for benchmark test]) +-fi ++]) + + AC_ARG_ENABLE(valgrind, +- AS_HELP_STRING([--disable-valgrind], +- [disables valgrind support code.]), +- with_valgrind=$enableval, with_valgrind="yes" ) ++ [AS_HELP_STRING([--disable-valgrind], ++ [disables valgrind support code.])], ++ [with_valgrind=$enableval], [with_valgrind="yes"]) + USE_VALGRIND="0" +-if test "x$with_valgrind" = "xyes"; then +- AC_CHECK_HEADER([valgrind/valgrind.h], ++AS_IF([test "x$with_valgrind" = "xyes"], [ ++ AC_CHECK_HEADER([valgrind/valgrind.h], [ + AC_CHECK_DECLS([VALGRIND_PRINTF_BACKTRACE], +- USE_VALGRIND="1",,[#include <valgrind/valgrind.h>])) +-fi ++ [USE_VALGRIND="1"],,[#include <valgrind/valgrind.h>])]) ++]) + AC_SUBST(USE_VALGRIND) + + + # allow documentation build to be disabled manually + AC_ARG_ENABLE(docs, +- AS_HELP_STRING([--disable-docs],[disable documentation build]), +- build_docs=$enableval, build_docs="yes") ++ [AS_HELP_STRING([--disable-docs],[disable documentation build])], ++ [build_docs=$enableval], [build_docs="yes"]) + + # check for tools necessary to build documentation + AC_PATH_PROG(DOXYGEN, doxygen, [no]) + AC_PATH_PROG(LATEX, latex, [no]) + AC_PATH_PROG(PDFLATEX, pdflatex, [no]) + +-AM_CONDITIONAL(BUILD_DOCS, test "x$build_docs" = "xyes" \ ++AM_CONDITIONAL([BUILD_DOCS], [test "x$build_docs" = "xyes" \ + -a "x$DOXYGEN" != "xno" \ + -a "x$LATEX" != "xno" \ +- -a "x$PDFLATEX" != "xno" ) ++ -a "x$PDFLATEX" != "xno"]) + + AC_CHECK_FUNCS(localtime_r) + diff --git a/dev-libs/rlog/rlog-1.4.ebuild b/dev-libs/rlog/rlog-1.4.ebuild index 386f5c328d21..1f58e0626556 100644 --- a/dev-libs/rlog/rlog-1.4.ebuild +++ b/dev-libs/rlog/rlog-1.4.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit autotools @@ -17,6 +17,7 @@ IUSE="" PATCHES=( "${FILESDIR}"/${PN}-1.3.7-gcc-4.3.patch "${FILESDIR}"/${PN}-1.4-fix-build-system.patch + "${FILESDIR}"/${PN}-1.4-autoconf-2.70.patch ) src_prepare() { @@ -28,5 +29,5 @@ src_install() { default # package installs .pc files - find "${D}" -name '*.la' -delete || die + find "${ED}" -name '*.la' -delete || die } diff --git a/dev-libs/rocclr/Manifest b/dev-libs/rocclr/Manifest index 384fa8b995d8..66a42fb5da00 100644 --- a/dev-libs/rocclr/Manifest +++ b/dev-libs/rocclr/Manifest @@ -1,6 +1,8 @@ DIST rocclr-3.10.0.tar.gz 813435 BLAKE2B c49f84d1ea62f14436bb6d24ad950427b353662d0a1e998953c14cb3a5bc7da6e754f04da9357c104a1b0d8ca3a616375ad6f875a704bd3cc5d5b6806f3f249e SHA512 d367777ab47063e53e768b5f16cda61b787a47a9946f6995f4f3e3e5e441737076a609a3aebb15187138a819c97ee0bd59b9476f8a27908b03d0d7c5871eba86 DIST rocclr-3.8.0.tar.gz 882055 BLAKE2B 12b62d2316f3f2886f656c8fcca946735e262e850d49ef8cdb21dc984eba121d9c37250209696b2945f80be363c8244a66c3da91bc26f8c65405b27625b9538e SHA512 79bbaa628815620824fdf320451d729f630949a0e7cb35e2eca638a93f4788175759f68666a1cae6c1320458692c145a0c577739386681d2299c887420400edb DIST rocclr-3.9.0.tar.gz 811081 BLAKE2B 7c3131adcc820a7f331ddd178cd06eb8f3a22dfc85e9634906e60d7cd1b5b1ac3f0ac0327a815139901c8e2d40f74e8b7c84c761a2aecb2c63812559528ebf13 SHA512 211bc0e8008cdaeabe9e9d51f22d939f4f9703d546e6602e59286027c439ee996c44f805154bb31bedc4916ef810e4cffd9b91f054baa76db4a8945b03b07a73 +DIST rocclr-4.0.0.tar.gz 813510 BLAKE2B b9043c6f2725bd8d1769669db522cfa8ece40d83f36dc0e79662137b285a6e89952693d55e5b241144aa7412fa31192c3aafa74ee8d498f02f9a0cffaec7de92 SHA512 81e64af843720efefd24478f65c2a8d9dafc55eb94e9c4865d7fc3e9fa15371570ed54882e3086dcb20f16487bf24bdde0d65c76c07195d854ed51895aad06b8 DIST rocm-opencl-runtime-3.10.0.tar.gz 1004148 BLAKE2B 3d2539d24f8b3fd039424d606ebe36d7d8d1db2425f646d093a1a48d95c1c8b1c20821674fc628e622c2a5e7cbb30547805c3b84af16ad53f860f1064efa572b SHA512 121d0f310b4b235adf5f34dbf1989016b4c875bb47779b18d35fd9fab01c2118d1860e520cc6202a6fc3405b4c7897f491f611193c992cc25fe48e12bdd9f83f DIST rocm-opencl-runtime-3.8.0.tar.gz 1004339 BLAKE2B 966a5bd1d4d188004b15fe4263f2c18f6dad6a07f4bc264a5afa010f6035fbf73288966cd624e6e31e1ba584ba322d93343e3482177e6480c4a57a4150546f5a SHA512 bb4e3568e32bf6acc3c4812d7db169396a01bf90d079dc420ffb7df4bd4146d39938e76e9b386548fe64276bbf938a545c898de599113f20cc73ae98268c3d6a DIST rocm-opencl-runtime-3.9.0.tar.gz 1004372 BLAKE2B f5485dfbc615826214e1071485636e94bc83d12d4412da912455cb0ddd39ede3429a749a16428cb3c10775e652ffbe31a63ad00b3ea38a7fa43a120776a12bfe SHA512 e8149e99a7116a2c2af0d04dde55290c35dd5c6c26d95da8c8a04fcfccdb23f6617ab8348f9fc201b6d9fde7202de4ede480d7ac547ae2471c6ae10897e1795e +DIST rocm-opencl-runtime-4.0.0.tar.gz 1004149 BLAKE2B a41ca63bdac1930599fd808d0a5609dd4c0d475ba5fd6278a6c201e1ac72867a587d1ac6fa7d7a18a29ab708dd14b24abddd1326e1489e6aaa82d4b26be5f2f5 SHA512 913a135d693c133e17e6b3abaecac46a4fbeb5683ed7cf04060e04bec5f37d4ba5dd5ff4b357b8304142346dbde8acd3ddfdc1028f788550e0ca245f7ce665ea diff --git a/dev-libs/rocclr/rocclr-4.0.0.ebuild b/dev-libs/rocclr/rocclr-4.0.0.ebuild new file mode 100644 index 000000000000..ffa5203065d2 --- /dev/null +++ b/dev-libs/rocclr/rocclr-4.0.0.ebuild @@ -0,0 +1,44 @@ +# 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} + >=dev-libs/rocr-runtime-${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/rocksdb/Manifest b/dev-libs/rocksdb/Manifest index df759a292f7d..894e9fdb0cbd 100644 --- a/dev-libs/rocksdb/Manifest +++ b/dev-libs/rocksdb/Manifest @@ -1,2 +1,3 @@ DIST rocksdb-6.14.5.tar.gz 6396476 BLAKE2B c5fc6e9e306ad428285d2c42958804ff403e14fc6b0c2f1231f49197a98937c0703422e1c14f357fb2b3c138fc038ce46c57cce1d184e4babec3c094b00e5180 SHA512 76e4a5b8a7061e42e9d010d04204429a446c857b29a199456db1f207a4849bedc98c7368346b87fa3a69ee5a3d68abedc943248b960273194a9e71634c767258 DIST rocksdb-6.14.6.tar.gz 6397194 BLAKE2B 43ad8e7e9fdf0c6c75ff03370f2107899bbcef9fd34630c85408abcf208a8213f5e24ea50407bd6a719220b6c29b9ba29c121e94a5a2701f637b17ccf50b90a4 SHA512 609f407b0b2810954541ad8ebad5c754ebfde5021f24ee4b3f1544a5335252c06cbe2b282562e3d084bb9cbe8de239668fdedb2d2d726056c31cf9463db08fe7 +DIST rocksdb-6.15.2.tar.gz 6499824 BLAKE2B e0fa1dd2c7a7b03e561690c6ac16b15bfafeb27ce226765a591c365b4c2f665138170e0b37f3c65990d6a78a63dbab1f78b875c4a81ca63df46d9118aab34c00 SHA512 1471776a87f1136a7276fbc4c53a1b69ca40110adf49ac459d6f641c1ef8a75482cff3c9b89482ff4edaa186c9a6d0285d38c544c6abf2931508359cfe4cf1a9 diff --git a/dev-libs/rocksdb/rocksdb-6.14.5.ebuild b/dev-libs/rocksdb/rocksdb-6.14.5.ebuild index bf3080e96dcf..7e6b47eb9ed7 100644 --- a/dev-libs/rocksdb/rocksdb-6.14.5.ebuild +++ b/dev-libs/rocksdb/rocksdb-6.14.5.ebuild @@ -44,6 +44,6 @@ src_install() { cmake_src_install if ! use static-libs; then - rm ${ED}/usr/$(get_libdir)/*.a || die + rm "${ED}"/usr/$(get_libdir)/*.a || die fi } diff --git a/dev-libs/rocksdb/rocksdb-6.14.6.ebuild b/dev-libs/rocksdb/rocksdb-6.14.6.ebuild index bf3080e96dcf..6fd016dbefca 100644 --- a/dev-libs/rocksdb/rocksdb-6.14.6.ebuild +++ b/dev-libs/rocksdb/rocksdb-6.14.6.ebuild @@ -1,4 +1,4 @@ -# Copyright 2020 Gentoo Authors +# Copyright 2020-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="https://github.com/facebook/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" +KEYWORDS="amd64 ~arm64 ~ppc64 ~x86" IUSE="cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_sse4_2 jemalloc static-libs" COMMON_DEPEND=" @@ -44,6 +44,6 @@ src_install() { cmake_src_install if ! use static-libs; then - rm ${ED}/usr/$(get_libdir)/*.a || die + rm "${ED}"/usr/$(get_libdir)/*.a || die fi } diff --git a/dev-libs/rocksdb/rocksdb-6.15.2.ebuild b/dev-libs/rocksdb/rocksdb-6.15.2.ebuild new file mode 100644 index 000000000000..6fd016dbefca --- /dev/null +++ b/dev-libs/rocksdb/rocksdb-6.15.2.ebuild @@ -0,0 +1,49 @@ +# Copyright 2020-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake + +DESCRIPTION="Embeddable, persistent key-value store for fast storage" +HOMEPAGE="https://rocksdb.org https://github.com/facebook/rocksdb/" +SRC_URI="https://github.com/facebook/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 ~arm64 ~ppc64 ~x86" +IUSE="cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_sse4_2 jemalloc static-libs" + +COMMON_DEPEND=" + app-arch/bzip2:= + app-arch/lz4:= + app-arch/snappy:= + dev-python/zstandard:= + sys-libs/zlib:= + jemalloc? ( dev-libs/jemalloc:= ) +" +DEPEND="${COMMON_DEPEND} + dev-cpp/gflags +" +RDEPEND="${COMMON_DEPEND}" + +src_configure() { + mycmakeargs=( + -DFAIL_ON_WARNINGS=OFF + -DFORCE_AVX2=$(usex cpu_flags_x86_avx2 ON OFF) + -DFORCE_AVX=$(usex cpu_flags_x86_avx ON OFF) + -DFORCE_SSE42=$(usex cpu_flags_x86_sse4_2 ON OFF) + -DPORTABLE=ON + -DWITH_JEMALLOC=$(usex jemalloc ON OFF) + -DWITH_TESTS=OFF + ) + cmake_src_configure +} + +src_install() { + cmake_src_install + + if ! use static-libs; then + rm "${ED}"/usr/$(get_libdir)/*.a || die + fi +} diff --git a/dev-libs/rocm-comgr/Manifest b/dev-libs/rocm-comgr/Manifest index 9849d782d9bc..562ba0e86206 100644 --- a/dev-libs/rocm-comgr/Manifest +++ b/dev-libs/rocm-comgr/Manifest @@ -1,2 +1,3 @@ DIST rocm-comgr-3.10.0.tar.gz 98322 BLAKE2B a7245531eb7e5e7a306a91ca917f03b25a159729a8fbd830cbb02355f807900f439d3d793c416ea277aa0aa64829e697ef8bb32a246a3618ed9bc2c42d25acdf SHA512 b9e0ae6d10a39d55855c35305560af8c5cdbef8f9d41022c40dc60b4fcc629a73a91c6d7235dd0785aba5e14f566f7ce0911a5a1c52c39cebd947f7b585c4d5a DIST rocm-comgr-3.9.0.tar.gz 98316 BLAKE2B 424ff5152d99b1ea001985fbd9a6ca1a0925931579205b487505a6c3733d95fe4ee21d91453c538995b3696984acdf4d45cc77c43e1a7c75db78ad1164e3f9e6 SHA512 f49c91ba0db244a0f0d820edeb60013c8a09220e9e1a6be464c48766ac3322b18ed1d0f009e5b1df58340a6dd324a75717194696214e2bb7455cb85e516f071a +DIST rocm-comgr-4.0.0.tar.gz 98316 BLAKE2B d96200d2fe8929631d1f40577a115b72e2341a66941e9de9de2e61c3d9eab9cb4a0cb51f3b2abc183be832ee86404b5f24d053396615038f4ca6bda23a7331d5 SHA512 fdbb334ff1cb2cd5eb40b9dcf1bbcb138b95d24fac80a90c12c9b5b2ac24226eed4f30ac2fa1923c274fae830e52542d5725436a77c404d1680266b103444549 diff --git a/dev-libs/rocm-comgr/rocm-comgr-4.0.0.ebuild b/dev-libs/rocm-comgr/rocm-comgr-4.0.0.ebuild new file mode 100644 index 000000000000..4401982de06b --- /dev/null +++ b/dev-libs/rocm-comgr/rocm-comgr-4.0.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 + +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=( + -DLLD_DIR="${EPREFIX}/usr/lib/llvm/roc/lib/cmake/lld" + -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 8850c0c7db9a..b93186cc3fcb 100644 --- a/dev-libs/rocm-device-libs/Manifest +++ b/dev-libs/rocm-device-libs/Manifest @@ -2,3 +2,4 @@ DIST rocm-device-libs-3.10.0.tar.gz 230505 BLAKE2B 7c34bcacb3056517ad06502c31301 DIST rocm-device-libs-3.7.0.tar.gz 228752 BLAKE2B e7406fd74b9bdfba5c32259c12761b46dee454e73cf1d6cbb0886c4da7bff7bcd13689e91e2715188fa2fe9d61d9dd9c6c481714cd67bdee11b1825a91c47546 SHA512 94b027aa27866257cf239b6951cbff928122fb7dfb23c81edc5957b30ee5aa64e2a25412a13ea33c249b8bd2d026274dcc276ea0908359b5ed14c75b0e59ff1f DIST rocm-device-libs-3.8.0.tar.gz 228737 BLAKE2B bf75c3f50960af55cc743d412259789d283fc8357231c31b7590ad81997b5a4ff195bb3e382641e9eed846c9c258174f1e8d27e6e1f0ae9f174c5c22b85ed2ea SHA512 d565c9bfde5f5f2d533cdd0b41e5c73247f9ca15e07b039c340daf3dece120a301c87b69b737af3d230c6c0a3ae1d6fbd5d1f78fee000a06d4ea7bfda3d8d436 DIST rocm-device-libs-3.9.0.tar.gz 230477 BLAKE2B dba7f2dd57fe39c8c69f2a4de34f06f8347e73c760805cebf8690b11c5c0b4c919d78bc31b05b5d5f283aa5281131b0f7d3fbe9faef525a3117ebdbd4b1b9b35 SHA512 fff70e9426ff2e6b6cf59554c36831b3c24c24a51753ca0f3c9cb4e9961c24e7e7d7714b2e75785622c6dcff92e1cb7fa5d2be0a2a08bb17a157f484845cd276 +DIST rocm-device-libs-4.0.0.tar.gz 230486 BLAKE2B 17d82a29e03d558a408e39550acd9f7fc76fd79a0c68936cb76e3e14bae6e770c0f581a80429aaa86e1d51491c31ce8b02b03095604678d03aa844379cfa9282 SHA512 a35fdc74c17d87ae52ccc218d5098b50863316b88908c147017c3d378c3892411a3f51737c1d5a4d6c1db87b66e1aacc94361bee28f3cc2e984e6e00db1dd7ed diff --git a/dev-libs/rocm-device-libs/rocm-device-libs-4.0.0.ebuild b/dev-libs/rocm-device-libs/rocm-device-libs-4.0.0.ebuild new file mode 100644 index 000000000000..507a68912932 --- /dev/null +++ b/dev-libs/rocm-device-libs/rocm-device-libs-4.0.0.ebuild @@ -0,0 +1,38 @@ +# 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_prepare() { + sed -e "s:amdgcn/bitcode:lib/amdgcn/bitcode:" -i "${S}/cmake/OCL.cmake" || die + sed -e "s:amdgcn/bitcode:lib/amdgcn/bitcode:" -i "${S}/cmake/Packages.cmake" || die + cmake_src_prepare +} + +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 8eb65768440f..46f8cff34850 100644 --- a/dev-libs/rocm-opencl-runtime/Manifest +++ b/dev-libs/rocm-opencl-runtime/Manifest @@ -1,3 +1,4 @@ DIST rocm-opencl-runtime-3.10.0.tar.gz 1004148 BLAKE2B 3d2539d24f8b3fd039424d606ebe36d7d8d1db2425f646d093a1a48d95c1c8b1c20821674fc628e622c2a5e7cbb30547805c3b84af16ad53f860f1064efa572b SHA512 121d0f310b4b235adf5f34dbf1989016b4c875bb47779b18d35fd9fab01c2118d1860e520cc6202a6fc3405b4c7897f491f611193c992cc25fe48e12bdd9f83f DIST rocm-opencl-runtime-3.8.0.tar.gz 1004339 BLAKE2B 966a5bd1d4d188004b15fe4263f2c18f6dad6a07f4bc264a5afa010f6035fbf73288966cd624e6e31e1ba584ba322d93343e3482177e6480c4a57a4150546f5a SHA512 bb4e3568e32bf6acc3c4812d7db169396a01bf90d079dc420ffb7df4bd4146d39938e76e9b386548fe64276bbf938a545c898de599113f20cc73ae98268c3d6a DIST rocm-opencl-runtime-3.9.0.tar.gz 1004372 BLAKE2B f5485dfbc615826214e1071485636e94bc83d12d4412da912455cb0ddd39ede3429a749a16428cb3c10775e652ffbe31a63ad00b3ea38a7fa43a120776a12bfe SHA512 e8149e99a7116a2c2af0d04dde55290c35dd5c6c26d95da8c8a04fcfccdb23f6617ab8348f9fc201b6d9fde7202de4ede480d7ac547ae2471c6ae10897e1795e +DIST rocm-opencl-runtime-4.0.0.tar.gz 1004149 BLAKE2B a41ca63bdac1930599fd808d0a5609dd4c0d475ba5fd6278a6c201e1ac72867a587d1ac6fa7d7a18a29ab708dd14b24abddd1326e1489e6aaa82d4b26be5f2f5 SHA512 913a135d693c133e17e6b3abaecac46a4fbeb5683ed7cf04060e04bec5f37d4ba5dd5ff4b357b8304142346dbde8acd3ddfdc1028f788550e0ca245f7ce665ea diff --git a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-4.0.0.ebuild b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-4.0.0.ebuild new file mode 100644 index 000000000000..125321094992 --- /dev/null +++ b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-4.0.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 flag-o-matic + +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.10.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 bb984a0eca2f..06eb36c68e83 100644 --- a/dev-libs/rocr-runtime/Manifest +++ b/dev-libs/rocr-runtime/Manifest @@ -1,3 +1,4 @@ DIST rocr-runtime-3.10.0.tar.gz 691857 BLAKE2B 68403081180fe1aead570f8055f91d13083516766afe6c9fd18d7619162cc12fa6dd0ec824ffdc44832d1ab7e823ac2cc399b7cbb4e603f95db54e492de152c5 SHA512 9ca7c7a22ea2a35437aa1a23a331c36684ada1af0f389f697bd6c1e35c4f9493b851d7e7176a0892be36d3d7de93000f7db37e3d2c109fa6c1932851c3bd703b DIST rocr-runtime-3.8.0.tar.gz 691209 BLAKE2B 0664b099a7ea4105e37cf42ee208c31dc58a1900aa35bbc0295df0cabba25e5352b3def0dbc1a8ea889ad4876321f99a73c4c6c9ec042186efda9b3308583825 SHA512 d968e96cabc98951890435a2b9bfc9943df9435848f0c6026a59953c78ad4c1048e7c532a8093e5f633fdc5d32622fb88ba0212f32f317d5473fd7e957e4dc4c DIST rocr-runtime-3.9.0.tar.gz 691645 BLAKE2B c90cdba93be510532a65ebfd69322972c61603b23932b95982d9a2bea742979b14acd83728a37ecacd7ec540268311bd313801acece89ec02a234dee66155dbe SHA512 e117536300ad05db27ccd92d2f9fadbdb9711fc724953ef65609c7af1ef369b8cf132c8b0f72d33e7ffd43acc3e59dc5525bacaa1507fd01fab79685f6b8d86e +DIST rocr-runtime-4.0.0.tar.gz 691835 BLAKE2B 328f7ea54767294036f435894d63354694447d964753de8b58b70ba5ae5f83561e5cda506890b43c80bdc480b1781d246ee77d5a0b08f74c5eb52d1ac5e8ddda SHA512 c95316cd8f221caee84f644e00b2b08d447b75ae4e5fe1871fa2ac6a879da57def497babfcabcaeb988d92421c165070e47d9fe846640b871249d66c82f82bea diff --git a/dev-libs/rocr-runtime/rocr-runtime-4.0.0.ebuild b/dev-libs/rocr-runtime/rocr-runtime-4.0.0.ebuild new file mode 100644 index 000000000000..22be187e6afe --- /dev/null +++ b/dev-libs/rocr-runtime/rocr-runtime-4.0.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 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)" + +COMMON_DEPEND="sys-process/numactl + dev-libs/elfutils:=" +RDEPEND="${COMMON_DEPEND}" +DEPEND="${COMMON_DEPEND} + >=dev-libs/roct-thunk-interface-${PV} + >=dev-libs/rocm-device-libs-${PV}" +BDEPEND="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/amdgcn/bitcode:" -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 676a4a452ee4..624426cb0b6f 100644 --- a/dev-libs/roct-thunk-interface/Manifest +++ b/dev-libs/roct-thunk-interface/Manifest @@ -2,3 +2,4 @@ DIST roct-thunk-interface-3.10.0.tar.gz 2694321 BLAKE2B c743e2df8133a382f62f0cac DIST roct-thunk-interface-3.7.0.tar.gz 2692297 BLAKE2B 5a060becb1b35e4eb499de5c177b5747789f02036d6e1bbf241a4054430e819bab4c188aa83f1cec0d35c80a3c0af47298fdd1c34d272f693dac9da191d8d111 SHA512 307e88808d3c852837f81c8745181edaa46e0f205fa36b9af531661c9a6a2dee5f360eb14e9f607376f27969e438f075dd44336606803ae2f7ce597f7fe46135 DIST roct-thunk-interface-3.8.0.tar.gz 2692624 BLAKE2B bb0d288da08081de63f3848987eb86a319c977250052b8bcccdd221b31167d2b344ecd17163aafe1fa5e7a4372248510af77c4ed992c39e71de05452b0b83a8c SHA512 b60461869f916791b702fb7a551978dd741873925154cb5980612f71bb19000f73fda8c1becb5e3482be872790d6cc8c34dfe3484349796c9fab2fedafef525b DIST roct-thunk-interface-3.9.0.tar.gz 2692605 BLAKE2B e256217aa8410eb3a1cbb430509c7426e2b00f4ad0a0a3d14879fc116a112e9d10e50b0e2d336f04bc52d98f0d98afda5195565995c6d8b64101132e9c71746c SHA512 eb0d3abaae1aa92f60eeb58ef07bf6dd0f954488e2e05bcf30cb75aa772430c49a3103b0498208c7f8f8fd35fb5d91f0f8c056064ce595263e1737e8f72ba462 +DIST roct-thunk-interface-4.0.0.tar.gz 2694100 BLAKE2B 49ca128902335fc36d44b9e71d444a467bdd0b39ce0b487c70f1f68180fb4b564b10a65e26e41b71d5e66721c3086ec834aee2550246172965f2d611ce9a644a SHA512 cbb45c4372ce2620fce6ccbf94e8e7600256d12acf6721da9d22aeb619cec9d4e4e25354649b83fb322f8d369347c251ebb7242ff8fc3976cc3983de0d8e30a9 diff --git a/dev-libs/roct-thunk-interface/roct-thunk-interface-4.0.0.ebuild b/dev-libs/roct-thunk-interface/roct-thunk-interface-4.0.0.ebuild new file mode 100644 index 000000000000..ee5be506ed83 --- /dev/null +++ b/dev-libs/roct-thunk-interface/roct-thunk-interface-4.0.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/s2n/files/s2n-0.10.21-remove_Werror.patch b/dev-libs/s2n/files/s2n-0.10.21-remove_Werror.patch new file mode 100644 index 000000000000..d0eadc7a8bd3 --- /dev/null +++ b/dev-libs/s2n/files/s2n-0.10.21-remove_Werror.patch @@ -0,0 +1,22 @@ +--- a/CMakeLists.txt 2020-12-14 17:24:27.577239622 +0100 ++++ b/CMakeLists.txt 2020-12-14 17:24:50.036240917 +0100 +@@ -193,7 +193,7 @@ + + set(CMAKE_C_FLAGS_DEBUGOPT "") + +-target_compile_options(${PROJECT_NAME} PRIVATE -pedantic -std=gnu99 -Wall -Werror -Wimplicit -Wunused -Wcomment -Wchar-subscripts ++target_compile_options(${PROJECT_NAME} PRIVATE -pedantic -std=gnu99 -Wall -Wimplicit -Wunused -Wcomment -Wchar-subscripts + -Wuninitialized -Wshadow -Wcast-qual -Wcast-align -Wwrite-strings -Wno-deprecated-declarations -Wno-unknown-pragmas -Wformat-security + -Wno-missing-braces -fvisibility=hidden -DS2N_EXPORTS) + +--- a/s2n.mk 2020-12-14 17:24:35.546240082 +0100 ++++ b/s2n.mk 2020-12-14 17:25:05.604241814 +0100 +@@ -42,7 +42,7 @@ + DEFAULT_CFLAGS = -std=c99 -Wcast-qual + endif + +-DEFAULT_CFLAGS += -pedantic -Wall -Werror -Wimplicit -Wunused -Wcomment -Wchar-subscripts -Wuninitialized \ ++DEFAULT_CFLAGS += -pedantic -Wall -Wimplicit -Wunused -Wcomment -Wchar-subscripts -Wuninitialized \ + -Wshadow -Wcast-align -Wwrite-strings -fPIC -Wno-missing-braces\ + -D_POSIX_C_SOURCE=200809L -O2 -I$(LIBCRYPTO_ROOT)/include/ \ + -I$(S2N_ROOT)/api/ -I$(S2N_ROOT) -Wno-deprecated-declarations -Wno-unknown-pragmas -Wformat-security \ diff --git a/dev-libs/s2n/s2n-0.10.21.ebuild b/dev-libs/s2n/s2n-0.10.21-r1.ebuild index 225dc5144615..270991d36e4d 100644 --- a/dev-libs/s2n/s2n-0.10.21.ebuild +++ b/dev-libs/s2n/s2n-0.10.21-r1.ebuild @@ -22,8 +22,12 @@ RDEPEND=" " DEPEND="${RDEPEND}" +PATCHES=( + "${FILESDIR}"/${P}-remove_Werror.patch +) + src_prepare() { - default + cmake_src_prepare # Fix # QA Notice: The following files contain writable and executable sections (...) @@ -31,7 +35,14 @@ src_prepare() { -e '$a\\n#if defined(__linux__) && defined(__ELF__)\n.section .note.GNU-stack,"",%progbits\n#endif' \ -i "${S}"/pq-crypto/sike_r2/fp_x64_asm.S || die "sed failed" - cmake_src_prepare + # Fix shared library building, needed for USE="test" + # See: https://github.com/awslabs/s2n/issues/2401 + if use test; then + sed -i -e 's, -fvisibility=hidden,,' "${S}"/CMakeLists.txt || die "sed failed" + # Remove s2n_self_talk_nonblocking_test, it is broken. + # See: https://github.com/awslabs/s2n/issues/2051#issuecomment-744543724 + rm "${S}"/tests/unit/s2n_self_talk_nonblocking_test.c + fi } src_configure() { diff --git a/dev-libs/serd/Manifest b/dev-libs/serd/Manifest index 821791aa2da1..1954e0f36179 100644 --- a/dev-libs/serd/Manifest +++ b/dev-libs/serd/Manifest @@ -1 +1,2 @@ DIST serd-0.30.6.tar.bz2 609365 BLAKE2B 35a86847642ffe806797ae8dbcd292ce26f08135edfa3b1fd39652f8964c35d73dba8f8627f32dcff399e9cddc332e5484f14a80580a32d52d93977cd9b42912 SHA512 db08d6c67d8627728679d0ed3770b8219a58f3eef82194ef8ba5682d3ff1f1033e2bbc8d6a1115a3fe0e32990f635c707a81ad8b4f457153fa78ff5991c9c30f +DIST serd-0.30.8.tar.bz2 590817 BLAKE2B 31a485fccfb13e54e124cde0626ad16f3cc7f9c1f8d8c051ace7a98bd2bd5d6a2d159943f15f5734e028a31ce5eeea9d602f55bf6cf1277d532ae799e0c1895f SHA512 d12c4dea1a15b2aed9fb9d640affae23a4fbfb53b7f873af30b462ce96f3c22ee464f5b111f87a221e6ac51f4885c23bba023892331ab10d0a8aa0e27fcbd0fa diff --git a/dev-libs/serd/serd-0.30.8.ebuild b/dev-libs/serd/serd-0.30.8.ebuild new file mode 100644 index 000000000000..2dc7801a9f1a --- /dev/null +++ b/dev-libs/serd/serd-0.30.8.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6,7,8,9,10} ) +PYTHON_REQ_USE='threads(+)' +inherit python-any-r1 waf-utils multilib-build multilib-minimal + +DESCRIPTION="Library for RDF syntax which supports reading and writing Turtle and NTriples" +HOMEPAGE="https://drobilla.net/software/serd/" +SRC_URI="http://download.drobilla.net/${P}.tar.bz2" + +LICENSE="ISC" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="doc static-libs test" +RESTRICT="!test? ( test )" + +BDEPEND=" + doc? ( app-doc/doxygen ) +" +RDEPEND="" +DEPEND="${RDEPEND} + ${PYTHON_DEPS} +" +DOCS=( "AUTHORS" "NEWS" "README.md" ) + +src_prepare() { + sed -i -e 's/^.*run_ldconfig/#\0/' wscript || die + default + multilib_copy_sources +} + +multilib_src_configure() { + waf-utils_src_configure \ + --docdir=/usr/share/doc/${PF} \ + $(multilib_native_usex doc --docs "") \ + $(usex test --test "") \ + $(usex static-libs --static "") +} + +multilib_src_test() { + ./waf test || die +} + +multilib_src_compile() { + waf-utils_src_compile + default +} + +multilib_src_install() { + waf-utils_src_install + default +} diff --git a/dev-libs/shhopt/files/shhopt-1.1.7-build.patch b/dev-libs/shhopt/files/shhopt-1.1.7-build.patch index 3405511e2238..954011994bc9 100644 --- a/dev-libs/shhopt/files/shhopt-1.1.7-build.patch +++ b/dev-libs/shhopt/files/shhopt-1.1.7-build.patch @@ -1,12 +1,12 @@ --- a/Makefile +++ b/Makefile -@@ -5,20 +5,15 @@ +@@ -5,17 +5,11 @@ VERPAT = 7 VERSION = $(VERMAJ).$(VERMIN).$(VERPAT) -# Define SHARED as 1 for Linux shared ELF library -#SHARED = 1 -- + -ifeq ($(SHARED),1) LIBTARGET = lib$(DIST).so.$(VERSION) LIBTARGETSO = lib$(DIST).so @@ -15,69 +15,55 @@ -else -LIBTARGET = lib$(DIST).a -endif -+ -+LIBTARGETA = lib$(DIST).a LIBHEAD = $(DIST).h --TARGETS = $(LIBTARGET) -+TARGETS = $(LIBTARGET) $(LIBTARGETA) - - INSTBASEDIR = /usr/local - INSTLIBDIR = $(INSTBASEDIR)/lib -@@ -27,12 +22,12 @@ + TARGETS = $(LIBTARGET) +@@ -27,12 +21,9 @@ INSTALLPROG = install -m 755 MKDIRP = install -d -m 755 -CC = gcc -OPTIM = -O2 - --INCDIR = -I. -- + INCDIR = -I. + -CCOPT = -s -Wall $(OPTIM) $(INCDIR) -+CC ?= gcc -+AR ?= ar -+ARFLAGS ?= rc -+RANLIB ?= ranlib -+CPPFLAGS += -I. -+CFLAGS += -Wall ++CCOPT = -Wall $(INCDIR) # Object files to store in the library LIBOBJS = shhopt.o -@@ -43,21 +38,19 @@ - # don't worry if you get ranlib not found errors. This probably means +@@ -44,12 +35,7 @@ # that your ar does an implicit ranlib and you do not need to run ranlib # separately. This error is harmless. --$(LIBTARGET): $(LIBOBJS) + $(LIBTARGET): $(LIBOBJS) -ifeq ($(SHARED),1) - $(CC) -shared -Wl,-soname,$(LIBTARGETSOMAJ) -o $(LIBTARGET) $(LIBOBJS) -else - ar rc $(LIBTARGET) $(LIBOBJS) - ranlib $(LIBTARGET) || true -endif -+$(LIBTARGET): $(LIBOBJS:.o=.lo) -+ $(CC) $(CFLAGS) $(LDFLAGS) -shared -Wl,-soname,$(LIBTARGETSOMAJ) -o $@ $^ -+$(LIBTARGETA): $(LIBOBJS) -+ $(AR) $(ARFLAGS) $@ $^ -+ $(RANLIB) $@ ++ $(CC) $(LDFLAGS) -shared -Wl,-soname,$(LIBTARGETSOMAJ) -o $(LIBTARGET) $(LIBOBJS) # Note that you may need GNU's -liberty if your libc lacks strtoul example: $(LIBTARGET) example.o - $(CC) -o example example.c \ +@@ -57,7 +43,7 @@ -L. -I. -L$(INSTLIBDIR) -I$(INSTINCDIR) -lshhopt --.c.o: + .c.o: - $(CC) $(CCSHRD) -o $@ -c $(CCOPT) $< -+%.lo: %.c -+ $(COMPILE.c) $(CCSHRD) $^ -o $@ ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(CCSHRD) -o $@ -c $(CCOPT) $< depend dep: $(CC) $(INCDIR) -MM *.c >depend -@@ -73,7 +66,7 @@ - endif +@@ -66,11 +52,9 @@ + $(MKDIRP) $(INSTLIBDIR) $(INSTINCDIR) + $(INSTALL) $(LIBTARGET) $(INSTLIBDIR) + $(INSTALL) $(LIBHEAD) $(INSTINCDIR) +-ifeq ($(SHARED),1) + ln -sf $(LIBTARGET) $(INSTLIBDIR)/$(LIBTARGETSOMAJ) + ln -sf $(LIBTARGETSOMAJ) $(INSTLIBDIR)/$(LIBTARGETSO) + echo "Now run ldconfig if necessary." +-endif clean: -- rm -f *.o core *~ depend -+ rm -f *.o *.lo *.so* *.a core *~ depend - - chmod: - chmod a+r * + rm -f *.o core *~ depend diff --git a/dev-libs/shhopt/shhopt-1.1.7-r3.ebuild b/dev-libs/shhopt/shhopt-1.1.7-r3.ebuild index 1d63a8b89ea7..3710e4d865d3 100644 --- a/dev-libs/shhopt/shhopt-1.1.7-r3.ebuild +++ b/dev-libs/shhopt/shhopt-1.1.7-r3.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 @@ -20,7 +20,6 @@ src_compile() { } src_install() { - dolib.a libshhopt.a ln -s libshhopt.so.${PV} libshhopt.so || die ln -s libshhopt.so.${PV} libshhopt.so.${PV:0:1} || die dolib.so libshhopt.so* diff --git a/dev-libs/snowball-stemmer/snowball-stemmer-0.20140325.ebuild b/dev-libs/snowball-stemmer/snowball-stemmer-0.20140325.ebuild index 17e23fe54c29..81ac5051433f 100644 --- a/dev-libs/snowball-stemmer/snowball-stemmer-0.20140325.ebuild +++ b/dev-libs/snowball-stemmer/snowball-stemmer-0.20140325.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -20,7 +20,7 @@ S="${WORKDIR}/libstemmer_c" LICENSE="BSD-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris" # This could be used to package both libstemmer_c and libstemmer_java together. IUSE="static-libs" diff --git a/dev-libs/sord/Manifest b/dev-libs/sord/Manifest index 0d9dc5ba9e74..5c28a5f44b23 100644 --- a/dev-libs/sord/Manifest +++ b/dev-libs/sord/Manifest @@ -1 +1,2 @@ DIST sord-0.16.6.tar.bz2 520690 BLAKE2B 7ec248a78e0d9e525d640363414ddd32acc3e32817e2ab86e791fd9232a46658538c9a4db936a5daa7eeb5ef9f7bf13e1aa1429ab6d9fc769e1391a014da919f SHA512 1d3c2bf47ff7e4b533e4e737e2ece8e29bace78bb00c41a252ad5c583abdcba3baa05b189cb8651c212861a2eea3c690354c99d684fd0f343b40e74c94572f98 +DIST sord-0.16.8.tar.bz2 525038 BLAKE2B 3ba43b2edb69efec64ac68f139a18f23dc1b92290b054f420c400d2907af74fa550b042596374136c53b7cf0db1b775cfc7edd24c771bbf26d25928845787c7b SHA512 24ed50de8e5bb321e557bac6d3e441b2ed49adabf828bf0e1b33a080c89306dde80443dc8b563098fcc184c4d6e53b7e716b523ddccdf56d08301d1b0120f2b2 diff --git a/dev-libs/sord/sord-0.16.8.ebuild b/dev-libs/sord/sord-0.16.8.ebuild new file mode 100644 index 000000000000..d68c92154b1e --- /dev/null +++ b/dev-libs/sord/sord-0.16.8.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6,7,8,9,10} ) +PYTHON_REQ_USE='threads(+)' +inherit python-any-r1 waf-utils multilib-build multilib-minimal + +DESCRIPTION="Library for storing RDF data in memory" +HOMEPAGE="https://drobilla.net/software/sord/" +SRC_URI="http://download.drobilla.net/${P}.tar.bz2" + +LICENSE="ISC" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="doc static-libs test" +RESTRICT="!test? ( test )" + +BDEPEND=" + virtual/pkgconfig + doc? ( app-doc/doxygen ) +" +RDEPEND=" + dev-libs/libpcre + dev-libs/serd +" +DEPEND="${RDEPEND} + ${PYTHON_DEPS} +" +DOCS=( "AUTHORS" "NEWS" "README.md" ) + +src_prepare() { + sed -i -e 's/^.*run_ldconfig/#\0/' wscript || die + default + multilib_copy_sources +} + +multilib_src_configure() { + waf-utils_src_configure \ + --docdir=/usr/share/doc/${PF} \ + $(multilib_native_usex doc --docs "") \ + $(usex test --test "") \ + $(usex static-libs --static "") +} + +multilib_src_test() { + ./waf test || die +} + +multilib_src_compile() { + waf-utils_src_compile + default +} + +multilib_src_install() { + waf-utils_src_install + default +} diff --git a/dev-libs/sord/sord-9999.ebuild b/dev-libs/sord/sord-9999.ebuild index ed44d587d8b7..160c988c833f 100644 --- a/dev-libs/sord/sord-9999.ebuild +++ b/dev-libs/sord/sord-9999.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 PYTHON_COMPAT=( python3_{6,7,8,9,10} ) PYTHON_REQ_USE='threads(+)' @@ -17,21 +17,19 @@ KEYWORDS="" IUSE="doc static-libs test" RESTRICT="!test? ( test )" +BDEPEND=" + virtual/pkgconfig + doc? ( app-doc/doxygen ) +" RDEPEND=" dev-libs/libpcre dev-libs/serd " DEPEND="${RDEPEND} ${PYTHON_DEPS} - doc? ( app-doc/doxygen ) - virtual/pkgconfig" - +" DOCS=( "AUTHORS" "NEWS" "README.md" ) -PATCHES=( - "${FILESDIR}/${P}-0.16.6-x86_32.patch" -) - src_prepare() { sed -i -e 's/^.*run_ldconfig/#\0/' wscript || die default diff --git a/dev-libs/spdlog/Manifest b/dev-libs/spdlog/Manifest index db46aee6dcd4..91f58948d704 100644 --- a/dev-libs/spdlog/Manifest +++ b/dev-libs/spdlog/Manifest @@ -1,3 +1,3 @@ DIST spdlog-1.5.0.tar.gz 270416 BLAKE2B bac6c6650f8347458dd2dd66f318b43a769b0896d68f6a6f1310754527a69feaa52b2f6f48d67c7e811c2dafa5d3863a9a07c738df8c12abed2718fb06254b28 SHA512 78991c943dd95af563c4b29545b9b5d635caf1af5031262dde734ecf70c0b4ae866d954ee77b050f9f0cc089a3bc57ee9583895e51cb00dd1cc6c10ff905ca34 DIST spdlog-1.7.0.tar.gz 285615 BLAKE2B f1a20f8ec8e9746e360106f284544b20e48664a91d17b014abec26fd0f2ce3d25dd33cfb925f4468fa32da394f6efaca033290bdcf66abe8b067444999b87b63 SHA512 e15d461ac7a6d3d3186fe4283e4fbaf56b2ce3011babf892e3b2d3dbdd7e999a861f1f6f67a9d88a5cf488a440add087ea78e96131f49b52ed6c7815a972799a -DIST spdlog-1.8.1.tar.gz 293528 BLAKE2B f5568a52489d9f6db459dd7733c493720551f7cb53be5f25fd7e02ec89de88b968bacd3eacb390473258cba2686e2614f21a700e3b3faf66d9b8eb74cfa263cb SHA512 ef855f4f91ed8aba89ef0191a9fd70f73a49567332f7eb42da1604e3a7dda3bbe48db3fd0fae317bb11ee95315d8cd62bf586d2de919ca0978d91e5a971b1c3f +DIST spdlog-1.8.2.tar.gz 319010 BLAKE2B a17ac7691c74600e435cff9d45495a7f7e8ae5439400a9f0b02c3891daca232aa57b25ba6d619ce19d50bf053b28454a7e4f205ed439ca4345dd044390512a29 SHA512 7a0a2353a10187cc314253b366fc46be8f9fe2480d2cbac3a96a8e6825ee4b62b0a5ebb3add2b22b5d7ca8fe6dddd963926603e5296e3431c0a4f7ac42beda7f diff --git a/dev-libs/spdlog/spdlog-1.8.1.ebuild b/dev-libs/spdlog/spdlog-1.8.2.ebuild index 0cd2105637eb..0cd2105637eb 100644 --- a/dev-libs/spdlog/spdlog-1.8.1.ebuild +++ b/dev-libs/spdlog/spdlog-1.8.2.ebuild diff --git a/dev-libs/squareball/metadata.xml b/dev-libs/squareball/metadata.xml index 973457c7e1d5..f24bd5a3bf60 100644 --- a/dev-libs/squareball/metadata.xml +++ b/dev-libs/squareball/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"> - <email>rafaelmartins@gentoo.org</email> - <name>Rafael G. Martins</name> - </maintainer> + <!-- maintainer-needed --> <upstream> <maintainer status="active"> <email>rafael@rafaelmartins.eng.br</email> diff --git a/dev-libs/tinyxml/tinyxml-2.6.2-r3.ebuild b/dev-libs/tinyxml/tinyxml-2.6.2-r3.ebuild index d045276c499d..4e31a17ff1b0 100644 --- a/dev-libs/tinyxml/tinyxml-2.6.2-r3.ebuild +++ b/dev-libs/tinyxml/tinyxml-2.6.2-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV//./_}.tar.gz" LICENSE="ZLIB" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~x64-macos ~x86-macos" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~x64-macos" IUSE="debug doc static-libs +stl" RDEPEND="" diff --git a/dev-libs/tinyxml/tinyxml-2.6.2-r4.ebuild b/dev-libs/tinyxml/tinyxml-2.6.2-r4.ebuild index c14de00f0e03..91b250c5507a 100644 --- a/dev-libs/tinyxml/tinyxml-2.6.2-r4.ebuild +++ b/dev-libs/tinyxml/tinyxml-2.6.2-r4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV//./_}.tar.gz" LICENSE="ZLIB" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos ~x86-macos" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos" IUSE="debug doc static-libs +stl" RDEPEND="" diff --git a/dev-libs/tinyxml2/tinyxml2-7.1.0.ebuild b/dev-libs/tinyxml2/tinyxml2-7.1.0.ebuild index f4454f186723..bd028697060a 100644 --- a/dev-libs/tinyxml2/tinyxml2-7.1.0.ebuild +++ b/dev-libs/tinyxml2/tinyxml2-7.1.0.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://github.com/leethomason/${PN}/archive/${PV}.tar.gz -> ${P}.tar.g LICENSE="ZLIB" SLOT="0/7" -KEYWORDS="amd64 arm arm64 hppa ~ppc64 sparc x86" +KEYWORDS="amd64 arm arm64 ~hppa ~ppc64 sparc x86" IUSE="test" RESTRICT="!test? ( test )" diff --git a/dev-libs/tinyxml2/tinyxml2-8.0.0.ebuild b/dev-libs/tinyxml2/tinyxml2-8.0.0.ebuild index ac6dca8d5542..1570f08fa967 100644 --- a/dev-libs/tinyxml2/tinyxml2-8.0.0.ebuild +++ b/dev-libs/tinyxml2/tinyxml2-8.0.0.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://github.com/leethomason/${PN}/archive/${PV}.tar.gz -> ${P}.tar.g LICENSE="ZLIB" SLOT="0/8" -KEYWORDS="amd64 arm arm64 hppa ~ppc64 sparc x86" +KEYWORDS="amd64 arm arm64 ~hppa ~ppc64 sparc x86" IUSE="test" RESTRICT="!test? ( test )" diff --git a/dev-libs/tomsfastmath/files/tomsfastmath-0.13.1-export-fp_isprime_ex.patch b/dev-libs/tomsfastmath/files/tomsfastmath-0.13.1-export-fp_isprime_ex.patch new file mode 100644 index 000000000000..627bf4b2f4d9 --- /dev/null +++ b/dev-libs/tomsfastmath/files/tomsfastmath-0.13.1-export-fp_isprime_ex.patch @@ -0,0 +1,13 @@ +Needed because libtomcrypt expects this symbol to be available +https://github.com/libtom/tomsfastmath/commit/81530c207da8b3a43867da14df7d79d2cdf96978.patch +--- a/libtfm.symbols ++++ b/libtfm.symbols +@@ -16,6 +16,7 @@ fp_gcd + fp_ident + fp_invmod + fp_isprime ++fp_isprime_ex + fp_lcm + fp_lshd + fp_mod + diff --git a/dev-libs/tomsfastmath/tomsfastmath-0.13.1-r1.ebuild b/dev-libs/tomsfastmath/tomsfastmath-0.13.1-r1.ebuild new file mode 100644 index 000000000000..844b7e312478 --- /dev/null +++ b/dev-libs/tomsfastmath/tomsfastmath-0.13.1-r1.ebuild @@ -0,0 +1,70 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit toolchain-funcs + +DESCRIPTION="Fast public domain large integer arithmetic library" +HOMEPAGE="https://www.libtom.net/TomsFastMath/ + https://github.com/libtom/tomsfastmath" +SRC_URI="https://github.com/libtom/tomsfastmath/releases/download/v${PV}/tfm-${PV}.tar.xz" + +LICENSE="Unlicense" +# Current SONAME is 1 +# Please bump when the ABI changes upstream +# Helpful site: +# https://abi-laboratory.pro/index.php?view=timeline&l=tomsfastmath +SLOT="0/1" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" + +BDEPEND="sys-devel/libtool" + +PATCHES=( + "${FILESDIR}/${P}-makefile-fix.patch" + "${FILESDIR}/${PN}-0.13.1-export-fp_isprime_ex.patch" +) + +_emake() { + # Standard boilerplate + # Upstream use homebrewed makefiles + # Best to use same args for all, for consistency, + # in case behaviour changes (v possible). + emake \ + CC="$(tc-getCC)" \ + AR="$(tc-getAR)" \ + RANLIB="$(tc-getRANLIB)" \ + DESTDIR="${ED}" \ + LIBPATH="/usr/$(get_libdir)" \ + IGNORE_SPEED=1 \ + "$@" +} + +src_compile() { + _emake -f makefile.shared +} + +src_test() { + _emake test_standalone stest rsatest + + # We choose to be verbose during the test process + # because the output is quite repetitive with no + # clear demarcation b/t tests + local tests=( "test" "stest" "rsatest" ) + + local test + for test in "${tests[@]}"; do + einfo "Running test (${test})" + ./${test} || die "Test (${test}) failed" + einfo "Completed test (${test})" + done +} + +src_install() { + _emake -f makefile.shared install + + # Remove unnecessary .la files + find "${ED}" -name '*.la' -delete || die + # Same for static libs + find "${ED}" -name "*.a" -delete || die +} diff --git a/dev-libs/tomsfastmath/tomsfastmath-0.13.1.ebuild b/dev-libs/tomsfastmath/tomsfastmath-0.13.1.ebuild index 84470bb7f274..708ecd1d02aa 100644 --- a/dev-libs/tomsfastmath/tomsfastmath-0.13.1.ebuild +++ b/dev-libs/tomsfastmath/tomsfastmath-0.13.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,16 +9,17 @@ DESCRIPTION="Fast public domain large integer arithmetic library" HOMEPAGE="https://www.libtom.net/TomsFastMath/ https://github.com/libtom/tomsfastmath" SRC_URI="https://github.com/libtom/tomsfastmath/releases/download/v${PV}/tfm-${PV}.tar.xz" -LICENSE="Unlicense" +LICENSE="Unlicense" # Current SONAME is 1 # Please bump when the ABI changes upstream # Helpful site: # https://abi-laboratory.pro/index.php?view=timeline&l=tomsfastmath SLOT="0/1" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86" +BDEPEND="sys-devel/libtool" + PATCHES=( "${FILESDIR}/${P}-makefile-fix.patch" ) diff --git a/dev-libs/tre/tre-0.8.0-r2.ebuild b/dev-libs/tre/tre-0.8.0-r2.ebuild index 734f35f78699..47c0af16df64 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/tree-sitter/Manifest b/dev-libs/tree-sitter/Manifest index 2959e6a352c9..394302039778 100644 --- a/dev-libs/tree-sitter/Manifest +++ b/dev-libs/tree-sitter/Manifest @@ -1 +1,2 @@ DIST tree-sitter-0.17.3.tar.gz 519006 BLAKE2B 81eb9bdfc9f27e7b172b6c17333eece5515cf292d5b08eb5362f108db483e329ff6d309ccc40ef2de23d1a32c437cdbc1b9cf800146902a3d913feecf8b63269 SHA512 48a827d7bea184a84ad9f594bc5dc1869bad9aa2823f83d1ac7d58e6feaa092e7088e7eb0dcc6d3aa3810d25ff9f25ecb531751c77314ff7d07fa05f95b7a013 +DIST tree-sitter-0.18.0.tar.gz 521866 BLAKE2B 16fdfa721b6895f4945f02875f6ffc8ba6931bb822ad0c7666e302d9a67fa0260ca09e8add6eae5cd5b37a3251dbfca7feb9581a78bb8385cf9466fc07745f49 SHA512 ba090b5136330e24ff3c23f3f9f98af197bddf5ed56fb4930fbbfac317ba5ebd02488afe6c1f35afa45e324baa785569f4fbdb1b8ca020f4bea5e22d9fc76aa8 diff --git a/dev-libs/tree-sitter/tree-sitter-0.17.3.ebuild b/dev-libs/tree-sitter/tree-sitter-0.17.3.ebuild index b50d6429cd9a..547703a2d329 100644 --- a/dev-libs/tree-sitter/tree-sitter-0.17.3.ebuild +++ b/dev-libs/tree-sitter/tree-sitter-0.17.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -22,5 +22,5 @@ PATCHES=( ) src_install() { - emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/lib64" install + emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" install } diff --git a/dev-libs/tree-sitter/tree-sitter-0.18.0.ebuild b/dev-libs/tree-sitter/tree-sitter-0.18.0.ebuild new file mode 100644 index 000000000000..547703a2d329 --- /dev/null +++ b/dev-libs/tree-sitter/tree-sitter-0.18.0.ebuild @@ -0,0 +1,26 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="Tree-sitter is a parser generator tool and an incremental parsing library." +HOMEPAGE="https://github.com/tree-sitter/tree-sitter" + +if [[ ${PV} == *9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/${PN}/${PN}" +else + SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64" +fi + +LICENSE="MIT" +SLOT="0" + +PATCHES=( + "${FILESDIR}/${PN}-No-static-libs-gentoo.patch" +) + +src_install() { + emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" install +} diff --git a/dev-libs/tree-sitter/tree-sitter-9999.ebuild b/dev-libs/tree-sitter/tree-sitter-9999.ebuild index b50d6429cd9a..547703a2d329 100644 --- a/dev-libs/tree-sitter/tree-sitter-9999.ebuild +++ b/dev-libs/tree-sitter/tree-sitter-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -22,5 +22,5 @@ PATCHES=( ) src_install() { - emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/lib64" install + emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" install } diff --git a/dev-libs/ucl/ucl-1.03-r1.ebuild b/dev-libs/ucl/ucl-1.03-r1.ebuild index c4524d9380d7..482d8c63c9a3 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 ~arm ~arm64 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/ucommon/Manifest b/dev-libs/ucommon/Manifest index 929a0e34f766..57e037574aea 100644 --- a/dev-libs/ucommon/Manifest +++ b/dev-libs/ucommon/Manifest @@ -1,3 +1 @@ -DIST ucommon-6.0.3.tar.gz 806841 BLAKE2B 08e384f535529dbd27271861c473e18624d81029f7fecc08057b646f9c22d9bda956da2655114ec693a17f20764e4635701d1a932eeff2cdc8e82ad0fefd6496 SHA512 3ff30865a7f3fae955717c9bc2d3b37ad8f63dff8d3addc05eb9ddefa2311792f21b97ede852e22959ae6aae5114cce777a04b937aa07d564dd92d6f25f77762 -DIST ucommon-6.5.7.tar.gz 855822 BLAKE2B 56b5eb5f8372f983e0f348e5fc494c15bea57dc711e88a9a9f4ceeb8abf03680a82948ea080053a9d4c846172b64443a3947b3774b50c6d0a60c1f2ced63e69d SHA512 9927c9726252cdf050f217fa5993d34dcf9f76fab8399ee3a4c91cf087d9409947ed486a21e8448cb57ea95b52826682120f99d39287983c306434f9121b4d24 DIST ucommon-7.0.0.tar.gz 837905 BLAKE2B ddc82d5d1a88d66f353d9e69eacd7cfaaa0204acb8b9c4152559a009d287f2ffdb7feedc6fc0303c93a39d607498dd15bf83798d088857582f79be435d010ca7 SHA512 d32f8603d920eb98b5d4bc75224a7a8bb8bf2001a8dd3152626a8438ea4c39503a7446dec3aa90cf464b7abb68a6e42bac488ef9705517bd333b64bce219915b diff --git a/dev-libs/ucommon/files/ucommon-6.0.3-disable_rtf_gen_doxy.patch b/dev-libs/ucommon/files/ucommon-6.0.3-disable_rtf_gen_doxy.patch deleted file mode 100644 index a872f54ffe23..000000000000 --- a/dev-libs/ucommon/files/ucommon-6.0.3-disable_rtf_gen_doxy.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/Doxyfile -+++ b/Doxyfile -@@ -37,13 +37,13 @@ - GENERATE_HTMLHELP = YES - GENERATE_TREEVIEW = YES - TREEVIEW_WIDTH = 256 --GENERATE_LATEX = YES -+GENERATE_LATEX = NO - COMPACT_LATEX = YES - PDF_HYPERLINKS = YES - USE_PDFLATEX = NO - LATEX_BATCHMODE = YES - LATEX_HIDE_INDICES = NO --GENERATE_RTF = YES -+GENERATE_RTF = NO - COMPACT_RTF = YES - RTF_HYPERLINKS = NO - GENERATE_MAN = NO diff --git a/dev-libs/ucommon/files/ucommon-6.0.3-gcrypt_autotools.patch b/dev-libs/ucommon/files/ucommon-6.0.3-gcrypt_autotools.patch deleted file mode 100644 index ff69e836a9d9..000000000000 --- a/dev-libs/ucommon/files/ucommon-6.0.3-gcrypt_autotools.patch +++ /dev/null @@ -1,59 +0,0 @@ ---- a/Makefile.am -+++ b/Makefile.am -@@ -8,6 +8,8 @@ - # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the - # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -+ACLOCAL_AMFLAGS = -I m4 -+ - AUTOMAKE_OPTIONS = no-dependencies dist-zip - EXTRA_DIST = autogen.sh README* *.pc.in *.spec.in *.spec *-config.in \ - *-config.1 Doxyfile cmodel.sh BUILDS SUPPORT COPYING* COPYRIGHT \ ---- a/configure.ac -+++ b/configure.ac -@@ -37,8 +37,12 @@ - UCOMMON_LIBS="" - OPENSSL_LINK="" - -+AM_SILENT_RULES([yes]) -+ - CHECKFLAGS="$CHECKFLAGS" - -+m4_include([m4/libgcrypt.m4]) -+ - case "$with_crypto" in - ssl|openssl) - ssl="openssl" -@@ -664,7 +668,8 @@ - ;; - gnutls|gnu) - if test ! -z "$GNUTLS_LIBS" ; then -- SECURE_LIBS="$GNUTLS_LIBS" -+ AM_PATH_LIBGCRYPT -+ SECURE_LIBS="$GNUTLS_LIBS $LIBGCRYPT_LIBS" - SECURE="gnutls" - fi - ;; ---- a/utils/Makefile.am -+++ b/utils/Makefile.am -@@ -9,9 +9,9 @@ - # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - - MAINTAINERCLEANFILES = Makefile.in Makefile --AM_CXXFLAGS = -I$(top_srcdir)/inc @UCOMMON_FLAGS@ -+AM_CXXFLAGS = -I$(top_srcdir)/inc @UCOMMON_FLAGS@ @LIBGCRYPT_CFLAGS@ - INCLUDES = -I$(top_srcdir)/inc --LDADD = ../corelib/libucommon.la @UCOMMON_LIBS@ @UCOMMON_CLINK@ -+LDADD = ../corelib/libucommon.la @UCOMMON_LIBS@ @UCOMMON_CLINK@ @LIBGCRYPT_LIBS@ - EXTRA_DIST = *.1 - - man_MANS = args.1 scrub-files.1 mdsum.1 zerofill.1 car.1 sockaddr.1 pdetach.1 -@@ -27,7 +27,7 @@ - scrub_files_LDFLAGS = @SECURE_LOCAL@ - - mdsum_SOURCES = mdsum.cpp --mdsum_LDFLAGS = @SECURE_LOCAL@ -+mdsum_LDFLAGS = @SECURE_LOCAL@ @LIBGCRYPT_LIBS@ - - zerofill_SOURCES = zerofill.cpp - zerofill_LDFLAGS = @SECURE_LOCAL@ diff --git a/dev-libs/ucommon/files/ucommon-6.3.1-gcrypt_autotools.patch b/dev-libs/ucommon/files/ucommon-6.3.1-gcrypt_autotools.patch deleted file mode 100644 index 7221890a9b7c..000000000000 --- a/dev-libs/ucommon/files/ucommon-6.3.1-gcrypt_autotools.patch +++ /dev/null @@ -1,48 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -38,8 +38,12 @@ - OPENSSL_LINK="" - MODULE_FLAGS="-module -shared -avoid-version" - -+AM_SILENT_RULES([yes]) -+ - CHECKFLAGS="$CHECKFLAGS" - -+m4_include([m4/libgcrypt.m4]) -+ - case "$with_crypto" in - ssl|openssl) - ssl="openssl" -@@ -598,7 +602,8 @@ - ;; - gnutls|gnu) - if test ! -z "$GNUTLS_LIBS" ; then -- SECURE_LIBS="$GNUTLS_LIBS" -+ AM_PATH_LIBGCRYPT -+ SECURE_LIBS="$GNUTLS_LIBS $LIBGCRYPT_LIBS" - SECURE="gnutls" - fi - ;; ---- a/utils/Makefile.am -+++ b/utils/Makefile.am -@@ -10,9 +10,9 @@ - # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - - MAINTAINERCLEANFILES = Makefile.in Makefile --AM_CXXFLAGS = -I$(top_srcdir)/inc @UCOMMON_FLAGS@ -+AM_CXXFLAGS = -I$(top_srcdir)/inc @UCOMMON_FLAGS@ @LIBGCRYPT_CFLAGS@ - AM_CPPFLAGS = -I$(top_srcdir)/inc --LDADD = ../corelib/libucommon.la @UCOMMON_LIBS@ -+LDADD = ../corelib/libucommon.la @UCOMMON_LIBS@ @LIBGCRYPT_LIBS@ - EXTRA_DIST = *.1 CMakeLists.txt - - man_MANS = args.1 scrub-files.1 mdsum.1 zerofill.1 car.1 sockaddr.1 \ -@@ -21,7 +21,7 @@ - - noinst_PROGRAMS = demoSSL - demoSSL_SOURCES = ssl.cpp --demoSSL_LDFLAGS = @SECURE_LOCAL@ -+demoSSL_LDFLAGS = @SECURE_LOCAL@ @LIBGCRYPT_LIBS@ - - args_SOURCES = args.cpp - diff --git a/dev-libs/ucommon/metadata.xml b/dev-libs/ucommon/metadata.xml index 69e41e296613..d85b4252fc33 100644 --- a/dev-libs/ucommon/metadata.xml +++ b/dev-libs/ucommon/metadata.xml @@ -1,12 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="person"> - <email>maksbotan@gentoo.org</email> - <name>Maxim Koltsov</name> -</maintainer> -<use> - <flag name="socks">Build with socks proxy support</flag> -</use> +<!-- maintainer-needed --> <origin>gentoo-staging</origin> </pkgmetadata> diff --git a/dev-libs/ucommon/ucommon-6.0.3.ebuild b/dev-libs/ucommon/ucommon-6.0.3.ebuild deleted file mode 100644 index 9c0884fe1ca6..000000000000 --- a/dev-libs/ucommon/ucommon-6.0.3.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -AUTOTOOLS_AUTORECONF=1 - -inherit autotools-utils eutils - -DESCRIPTION="Portable C++ runtime for threads and sockets" -HOMEPAGE="https://www.gnu.org/software/commoncpp" -SRC_URI="mirror://gnu/commoncpp/${P}.tar.gz" - -LICENSE="LGPL-3" -SLOT="0" -KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux" -IUSE="doc static-libs socks +cxx debug ssl gnutls" - -RDEPEND="ssl? ( - !gnutls? ( dev-libs/openssl:0= ) - gnutls? ( - net-libs/gnutls - dev-libs/libgcrypt:0 - ) - )" - -DEPEND="virtual/pkgconfig - doc? ( app-doc/doxygen ) - ${RDEPEND}" - -DOCS=(README NEWS SUPPORT ChangeLog AUTHORS) -PATCHES=( - "${FILESDIR}"/${PN}-6.0.3-disable_rtf_gen_doxy.patch - "${FILESDIR}"/${PN}-6.0.3-install_gcrypt.m4_file.patch - "${FILESDIR}"/${PN}-6.0.3-gcrypt_autotools.patch -) - -AUTOTOOLS_IN_SOURCE_BUILD=1 - -src_prepare() { - - # Aclocal 1.13 deprecated error #467674 - sed -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' -i configure.ac || die - - autotools-utils_src_prepare -} - -src_configure() { - local myconf="" - if use ssl; then - myconf+=" --with-sslstack=$(usex gnutls gnu ssl) " - else - myconf+=" --with-sslstack=nossl "; - fi - - local myeconfargs=( - $(use_enable socks) - $(use_enable cxx stdcpp) - ${myconf} - --enable-atomics - --with-pkg-config - ) - autotools-utils_src_configure -} - -src_compile() { - autotools-utils_src_compile - use doc && autotools-utils_src_compile doxy -} - -src_install() { - autotools-utils_src_install - if use doc; then - dohtml doc/html/* - fi -} diff --git a/dev-libs/ucommon/ucommon-6.5.7.ebuild b/dev-libs/ucommon/ucommon-6.5.7.ebuild deleted file mode 100644 index e8e90402975e..000000000000 --- a/dev-libs/ucommon/ucommon-6.5.7.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -AUTOTOOLS_AUTORECONF=1 - -inherit autotools-utils eutils - -DESCRIPTION="Portable C++ runtime for threads and sockets" -HOMEPAGE="https://www.gnu.org/software/commoncpp" -SRC_URI="mirror://gnu/commoncpp/${P}.tar.gz" - -LICENSE="LGPL-3" -SLOT="0/6" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux" -IUSE="doc static-libs socks +cxx debug libressl ssl gnutls" - -RDEPEND=" - ssl? ( - gnutls? ( - net-libs/gnutls:0= - dev-libs/libgcrypt:0= - ) - !gnutls? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - ) - )" - -DEPEND="virtual/pkgconfig - doc? ( app-doc/doxygen ) - ${RDEPEND}" - -DOCS=(README NEWS SUPPORT ChangeLog AUTHORS) -PATCHES=( - "${FILESDIR}/${PN}-6.0.3-install_gcrypt.m4_file.patch" - "${FILESDIR}/${PN}-6.3.1-gcrypt_autotools.patch" -) - -# Needed for doxygen, bug #526726 -AUTOTOOLS_IN_SOURCE_BUILD=1 - -src_prepare() { - # Aclocal 1.13 deprecated error BGO #467674 - sed -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' -i configure.ac || die - - # don't install latex and rtf documents - sed -e '/^GENERATE_LATEX/s@YES@NO@' -e '/^GENERATE_RTF/s@YES@NO@' \ - -i Doxyfile.in || die - - autotools-utils_src_prepare -} - -src_configure() { - local myconf="" - if use ssl; then - myconf+=" --with-sslstack=$(usex gnutls gnu ssl) " - else - myconf+=" --with-sslstack=nossl "; - fi - - local myeconfargs=( - $(use_enable socks) - $(use_enable cxx stdcpp) - ${myconf} - --enable-atomics - --with-pkg-config - ) - autotools-utils_src_configure -} - -src_compile() { - autotools-utils_src_compile - use doc && autotools-utils_src_compile doxy -} - -src_install() { - autotools-utils_src_install - if use doc; then - dohtml doc/html/* - fi -} diff --git a/dev-libs/unittest++/files/unittest++-2.0.0-Add-support-for-LIB_SUFFIX.patch b/dev-libs/unittest++/files/unittest++-2.0.0-Add-support-for-LIB_SUFFIX.patch new file mode 100644 index 000000000000..fcaad5b0e69f --- /dev/null +++ b/dev-libs/unittest++/files/unittest++-2.0.0-Add-support-for-LIB_SUFFIX.patch @@ -0,0 +1,55 @@ +From 0757ba8f903fc94ac852c8ba394cd96358b0e2c7 Mon Sep 17 00:00:00 2001 +From: Christoph Willing <chris.willing@iinet.net.au> +Date: Mon, 23 Jan 2017 17:49:12 +1000 +Subject: [PATCH] Add support for LIB_SUFFIX + +Signed-off-by: Christoph Willing <chris.willing@iinet.net.au> +--- + CMakeLists.txt | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a0f5511..6b490ef 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -11,6 +11,8 @@ option(UTPP_AMPLIFY_WARNINGS + "Set this to OFF if you wish to use CMake default warning levels; should generally only use to work around support issues for your specific compiler" + ON) + ++set(LIB_SUFFIX "" CACHE STRING "Identifier to add to end of lib directory name e.g. 64 for lib64") ++ + if(MSVC14 OR MSVC12) + # has the support we need + else() +@@ -92,10 +94,10 @@ else() + set (UTPP_INSTALL_DESTINATION "include/UnitTestPP") + endif() + +-set(config_install_dir_ lib/cmake/${PROJECT_NAME}) ++set(config_install_dir_ lib${LIB_SUFFIX}/cmake/${PROJECT_NAME}) + set(targets_export_name_ "${PROJECT_NAME}Targets") + +-install(TARGETS UnitTest++ EXPORT "${targets_export_name_}" DESTINATION lib) ++install(TARGETS UnitTest++ EXPORT "${targets_export_name_}" DESTINATION lib${LIB_SUFFIX}) + install(FILES ${headers_} DESTINATION ${UTPP_INSTALL_DESTINATION}) + install(FILES ${platformHeaders_} DESTINATION ${UTPP_INSTALL_DESTINATION}/${platformDir_}) + install(FILES cmake/UnitTest++Config.cmake DESTINATION "${config_install_dir_}") +@@ -103,13 +105,13 @@ install(EXPORT "${targets_export_name_}" DESTINATION "${config_install_dir_}") + + set(prefix ${CMAKE_INSTALL_PREFIX}) + set(exec_prefix ${CMAKE_INSTALL_PREFIX}/bin) +-set(libdir ${CMAKE_INSTALL_PREFIX}/lib) ++set(libdir ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}) + set(includedir ${CMAKE_INSTALL_PREFIX}/include/UnitTest++) + configure_file("UnitTest++.pc.in" "UnitTest++.pc" @ONLY) + if(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD") + set(pkgconfdir ${CMAKE_INSTALL_PREFIX}/libdata/pkgconfig) + else() +- set(pkgconfdir ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig) ++ set(pkgconfdir ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/pkgconfig) + endif() + install(FILES "${CMAKE_CURRENT_BINARY_DIR}/UnitTest++.pc" + DESTINATION "${pkgconfdir}") +-- +2.26.2 + diff --git a/dev-libs/unittest++/files/unittest++-2.0.0-cmake-fix-pkgconfig-dir-path-on-FreeBSD.patch b/dev-libs/unittest++/files/unittest++-2.0.0-cmake-fix-pkgconfig-dir-path-on-FreeBSD.patch new file mode 100644 index 000000000000..44c243670027 --- /dev/null +++ b/dev-libs/unittest++/files/unittest++-2.0.0-cmake-fix-pkgconfig-dir-path-on-FreeBSD.patch @@ -0,0 +1,28 @@ +From 85bade33f596a4dab33eb6d44f662d64fc20f510 Mon Sep 17 00:00:00 2001 +From: Iblis Lin <iblis@hs.ntnu.edu.tw> +Date: Sat, 14 Jan 2017 23:00:24 +0800 +Subject: [PATCH] cmake: fix pkgconfig dir path on FreeBSD + +--- + CMakeLists.txt | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index fb10f47..a0f5511 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -106,5 +106,10 @@ set(exec_prefix ${CMAKE_INSTALL_PREFIX}/bin) + set(libdir ${CMAKE_INSTALL_PREFIX}/lib) + set(includedir ${CMAKE_INSTALL_PREFIX}/include/UnitTest++) + configure_file("UnitTest++.pc.in" "UnitTest++.pc" @ONLY) ++if(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD") ++ set(pkgconfdir ${CMAKE_INSTALL_PREFIX}/libdata/pkgconfig) ++else() ++ set(pkgconfdir ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig) ++endif() + install(FILES "${CMAKE_CURRENT_BINARY_DIR}/UnitTest++.pc" +- DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/pkgconfig") ++ DESTINATION "${pkgconfdir}") +-- +2.26.2 + diff --git a/dev-libs/unittest++/unittest++-2.0.0-r2.ebuild b/dev-libs/unittest++/unittest++-2.0.0-r2.ebuild new file mode 100644 index 000000000000..4930c05f9b6e --- /dev/null +++ b/dev-libs/unittest++/unittest++-2.0.0-r2.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake + +MY_PN="unittest-cpp" +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" +KEYWORDS="~amd64 ~x86" +IUSE="test" +RESTRICT="!test? ( test )" + +PATCHES=( + # https://github.com/unittest-cpp/unittest-cpp/commit/2423fcac7668aa9c331a2dcf024c3ca06742942d + "${FILESDIR}"/${P}-fix-tests-with-clang.patch + + "${FILESDIR}"/${P}-cmake-fix-pkgconfig-dir-path-on-FreeBSD.patch + "${FILESDIR}"/${P}-Add-support-for-LIB_SUFFIX.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 +} + +src_configure() { + local mycmakeargs=( + # Don't build with -Werror: https://bugs.gentoo.org/747583 + -DUTPP_AMPLIFY_WARNINGS=OFF + -DUTPP_INCLUDE_TESTS_IN_BUILD=$(usex test) + ) + cmake_src_configure +} + +src_test() { + "${BUILD_DIR}/TestUnitTest++" || die "Tests failed" +} diff --git a/dev-libs/uriparser/uriparser-0.9.1.ebuild b/dev-libs/uriparser/uriparser-0.9.1.ebuild index e5976afb480f..8af0a3c0d760 100644 --- a/dev-libs/uriparser/uriparser-0.9.1.ebuild +++ b/dev-libs/uriparser/uriparser-0.9.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,7 +9,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.bz2" LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris" +KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris" IUSE="doc qt5 test unicode" RDEPEND="" diff --git a/dev-libs/uriparser/uriparser-0.9.3.ebuild b/dev-libs/uriparser/uriparser-0.9.3.ebuild index 48cecff8844f..54a967442dc8 100644 --- a/dev-libs/uriparser/uriparser-0.9.3.ebuild +++ b/dev-libs/uriparser/uriparser-0.9.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.bz2" LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris" +KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris" IUSE="doc qt5 test unicode" RDEPEND="" diff --git a/dev-libs/uriparser/uriparser-0.9.4.ebuild b/dev-libs/uriparser/uriparser-0.9.4.ebuild index 46b87a6f9091..eacccdce4b44 100644 --- a/dev-libs/uriparser/uriparser-0.9.4.ebuild +++ b/dev-libs/uriparser/uriparser-0.9.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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-solaris" IUSE="doc qt5 test unicode" RDEPEND="" diff --git a/dev-libs/userspace-rcu/userspace-rcu-0.10.1.ebuild b/dev-libs/userspace-rcu/userspace-rcu-0.10.1.ebuild index fce08c01159b..31b1212593f7 100644 --- a/dev-libs/userspace-rcu/userspace-rcu-0.10.1.ebuild +++ b/dev-libs/userspace-rcu/userspace-rcu-0.10.1.ebuild @@ -9,7 +9,7 @@ SRC_URI="https://lttng.org/files/urcu/${P}.tar.bz2" LICENSE="LGPL-2.1" SLOT="0/6" # subslot = soname version -KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ppc ppc64 sparc x86" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86" IUSE="static-libs regression-test test" RESTRICT="!test? ( test )" diff --git a/dev-libs/userspace-rcu/userspace-rcu-0.11.1.ebuild b/dev-libs/userspace-rcu/userspace-rcu-0.11.1.ebuild index 66b3fdd54941..fa94af45224e 100644 --- a/dev-libs/userspace-rcu/userspace-rcu-0.11.1.ebuild +++ b/dev-libs/userspace-rcu/userspace-rcu-0.11.1.ebuild @@ -9,7 +9,7 @@ SRC_URI="https://lttng.org/files/urcu/${P}.tar.bz2" LICENSE="LGPL-2.1" SLOT="0/6" # subslot = soname version -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86" IUSE="static-libs regression-test test" RESTRICT="!test? ( test )" diff --git a/dev-libs/userspace-rcu/userspace-rcu-0.9.1.ebuild b/dev-libs/userspace-rcu/userspace-rcu-0.9.1.ebuild index bc6d535ebc8c..29f07a0559d9 100644 --- a/dev-libs/userspace-rcu/userspace-rcu-0.9.1.ebuild +++ b/dev-libs/userspace-rcu/userspace-rcu-0.9.1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://lttng.org/files/urcu/${P}.tar.bz2" LICENSE="LGPL-2.1" SLOT="0/4" # subslot = soname version -KEYWORDS="~alpha amd64 arm hppa ppc ppc64 x86" +KEYWORDS="~alpha amd64 arm ~hppa ppc ppc64 x86" IUSE="static-libs regression-test test" RESTRICT="!test? ( test )" diff --git a/dev-libs/ustr/ustr-1.0.4-r8.ebuild b/dev-libs/ustr/ustr-1.0.4-r8.ebuild index 5b36619b7db2..31b67bdeeeab 100644 --- a/dev-libs/ustr/ustr-1.0.4-r8.ebuild +++ b/dev-libs/ustr/ustr-1.0.4-r8.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 diff --git a/dev-libs/uthash/Manifest b/dev-libs/uthash/Manifest index 294f633159b2..30e57e1d106c 100644 --- a/dev-libs/uthash/Manifest +++ b/dev-libs/uthash/Manifest @@ -1,2 +1,2 @@ -DIST uthash-2.0.2.tar.gz 191173 BLAKE2B a4a2ddb19fcc9af1105bc07deb8ccbe9c3f04518b609f7cfd16f0a05ec3e16ffb25fb5f0a5f258413f9f52facaa26adf4ea0683415416c12ab36bf11883976ae SHA512 0c2e686eb5a1d6a03a6fa1d42e803fca4e9b60b2d965c635a5a33d487c8d115f1f8155ff99a0e1874b69f6b66c04ea7d8866472a39abe5d1a23ae73f6fa956d7 DIST uthash-2.1.0.tar.gz 191782 BLAKE2B 322661aca33e8df27ec3166cd16549b11f49a6f9eb12f11c78f44b75baf5d9f208825028fb3b89a380277de5784bf2d4c41a6cd2ff070b1d3cd667ec074a85d2 SHA512 c8005113a48ec7636715ecec0286a5d9086971a7267947aba9e0ad031b6113a4f38a1fb512d33d6fefb5891635fdd31169ce4d6ab04b938bda612ebbccb3eda0 +DIST uthash-2.2.0.tar.gz 191356 BLAKE2B ca07634c30f49fa21af5fed9ed254351d038ca9f831b2c3f3fb545ee451833aaec9e1666572635e2fd31d6b791fb88800e7d870aba2cda0cfbeddcba20d969a9 SHA512 441ee907adc39c9b7e9c1f478966b7e8ddebb94cb6d5db9d2db409aee9a5e237033ee8cef3fed1c719fea01c7cfb5991554ac89f5a1e59241bd5c6eb4854cebe diff --git a/dev-libs/uthash/files/uthash-2.0.2-cflags.patch b/dev-libs/uthash/files/uthash-2.0.2-cflags.patch deleted file mode 100644 index e71506bce15b..000000000000 --- a/dev-libs/uthash/files/uthash-2.0.2-cflags.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- uthash-2.0.2/tests/Makefile -+++ uthash-2.0.2/tests/Makefile -@@ -18,7 +18,7 @@ - CFLAGS += -I$(HASHDIR) - #CFLAGS += -DHASH_BLOOM=16 - #CFLAGS += -O2 --CFLAGS += -g -+#CFLAGS += -g - #CFLAGS += -Wstrict-aliasing=2 - CFLAGS += -Wall - #CFLAGS += -Wextra diff --git a/dev-libs/uthash/files/uthash-2.1.0-cflags.patch b/dev-libs/uthash/files/uthash-2.1.0-cflags.patch index 588ec26078c0..246a5827afae 100644 --- a/dev-libs/uthash/files/uthash-2.1.0-cflags.patch +++ b/dev-libs/uthash/files/uthash-2.1.0-cflags.patch @@ -1,5 +1,5 @@ ---- uthash-2.1.0/tests/Makefile -+++ uthash-2.1.0/tests/Makefile +--- a/tests/Makefile ++++ b/tests/Makefile @@ -18,7 +18,7 @@ CFLAGS += -I$(HASHDIR) #CFLAGS += -DHASH_BLOOM=16 diff --git a/dev-libs/uthash/uthash-2.1.0.ebuild b/dev-libs/uthash/uthash-2.1.0.ebuild index 49f42356561e..c991385c4c34 100644 --- a/dev-libs/uthash/uthash-2.1.0.ebuild +++ b/dev-libs/uthash/uthash-2.1.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=7 @@ -11,7 +11,7 @@ SRC_URI="https://github.com/troydhanson/uthash/archive/v${PV}.tar.gz -> ${P}.tar LICENSE="BSD-1" SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc x86" IUSE="test" RESTRICT="!test? ( test )" diff --git a/dev-libs/uthash/uthash-2.0.2.ebuild b/dev-libs/uthash/uthash-2.2.0.ebuild index 95707126da3f..d8c9c97693a2 100644 --- a/dev-libs/uthash/uthash-2.0.2.ebuild +++ b/dev-libs/uthash/uthash-2.2.0.ebuild @@ -1,24 +1,25 @@ -# 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 toolchain-funcs DESCRIPTION="An easy-to-use hash implementation for C programmers" HOMEPAGE="https://troydhanson.github.io/uthash/index.html" -SRC_URI="https://github.com/troydhanson/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI="https://github.com/troydhanson/uthash/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="BSD-1" SLOT="0" -KEYWORDS="amd64 ~arm ppc ~ppc64 sparc x86" +KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86" IUSE="test" RESTRICT="!test? ( test )" -DEPEND="test? ( dev-lang/perl )" -RDEPEND="" +BDEPEND="test? ( dev-lang/perl )" -PATCHES=( "${FILESDIR}"/${P}-cflags.patch ) +PATCHES=( + "${FILESDIR}"/${PN}-2.1.0-cflags.patch +) src_test() { cd tests || die diff --git a/dev-libs/uulib/uulib-0.5.20-r1.ebuild b/dev-libs/uulib/uulib-0.5.20-r1.ebuild index 99e72336f218..199d486765d0 100644 --- a/dev-libs/uulib/uulib-0.5.20-r1.ebuild +++ b/dev-libs/uulib/uulib-0.5.20-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -13,7 +13,7 @@ SRC_URI="http://www.fpx.de/fp/Software/UUDeview/download/${MY_P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ~ppc64 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 ~hppa ~ia64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="" S=${WORKDIR}/${MY_P}/${PN} diff --git a/dev-libs/vala-common/Manifest b/dev-libs/vala-common/Manifest index 9470c77c7de9..8dde919d3945 100644 --- a/dev-libs/vala-common/Manifest +++ b/dev-libs/vala-common/Manifest @@ -1,4 +1,5 @@ DIST vala-0.48.11.tar.xz 3487944 BLAKE2B fe47bba9ddb31c469d63d9ca32d631901d59db19c417d864088bc33aa2845d388e762ecc39b2d9574aafbfc501eb61abb3604e07754b2d8eff63d23c53f1eb84 SHA512 6ddad88ab4d2a34352be9ce0a0c13dc3382ebcb494c08e2531a0195aad21a80db70e7dc3ffd2d27ef03a4ca30ac2bf31869521489ffd95fc520c4085362fc5e7 +DIST vala-0.48.12.tar.xz 3492200 BLAKE2B 0a401ac4349dc1c628fa608b5a89504583d6d2bb05ca74eb507e766cca418121e14adfe6e8cfeb8f42212c717280b9b91426309df415d869896654be626c46c5 SHA512 da7becf8b92985a07b139651c14bd41ec86aed3e2b610029d2b376f70335c98607f39de4a1fa4efe9d51e6088edd4c13d22431cada389679d55f684ad548f4d1 DIST vala-0.48.6.tar.xz 3451004 BLAKE2B 9c880cff885b934e1d82d21285839e040addecb0b3ce81936d5be118a951bd219eea2b8381ea42f13e6e858a1937a3789a3dee6d067735e5ee21eaced38b4646 SHA512 220a916d42cbae3853afdd7c35a72afb446a92fca039d8c660a478fd793686a0c82cbaf90a7c94ae182c1f41eec6df1aedb804013ab38e6e4bcc6d26e40e5375 DIST vala-0.48.9.tar.xz 3472540 BLAKE2B 1c85b5d9a1f3819d5b26b521c7da423adee313b2acacb354e324abd9ccf24707dcfcd1a455bab867043f674c4daa5f1a62210847ac271dfce09a288651220f53 SHA512 076fcbea34dde1a84c15e4e2b6acd009c2fea578d48eb28a99a604eb4edc8bb53ac6883ca93ec906968d43d4b341707abc730d6ac8a7b3682a2fa5f0030d5256 -DIST vala-0.50.1.tar.xz 3508924 BLAKE2B 4a6acd2ac9e098e8da9c1264584f02a22429ed096292ec8baf4c9c5ac2d0be4bf20c6c2eb6a41e31295461e1a7e0929c471512e435245c04228bf67c91f372ed SHA512 2f5d0bee6dcac3031108fffaa3a9a0339c8c79ff92d1824292f266a704bef1cf4f9eed15ebf424b608f09129b3e0577ed8cd7798a4fa12bfd9d06026909de769 +DIST vala-0.50.2.tar.xz 3514208 BLAKE2B f2f7e86b90ac1245d593ba82204667a830843e2fdb8e9a5afaa44453a146461f0ce2b9f9338ef4743bc6055bbce6c023ae92f0bf2ca66757cddd7fc3d7a4db63 SHA512 77069b53037adcd4c3fed2dc4a5c740216b950c52e8a0ed777a5cf9a5d9f078d0abbc4dbce08e122817cd3de0ac75ebd150b0f6f0b0cf4a09cb4a46f96bf4c3e diff --git a/dev-libs/vala-common/vala-common-0.50.1.ebuild b/dev-libs/vala-common/vala-common-0.48.12.ebuild index ee55cfcad100..ee55cfcad100 100644 --- a/dev-libs/vala-common/vala-common-0.50.1.ebuild +++ b/dev-libs/vala-common/vala-common-0.48.12.ebuild diff --git a/dev-libs/vala-common/vala-common-0.48.6.ebuild b/dev-libs/vala-common/vala-common-0.48.6.ebuild index 580d77e0c60c..d64b5929db95 100644 --- a/dev-libs/vala-common/vala-common-0.48.6.ebuild +++ b/dev-libs/vala-common/vala-common-0.48.6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ 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" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" IUSE="" RDEPEND="" diff --git a/dev-libs/vala-common/vala-common-0.50.2.ebuild b/dev-libs/vala-common/vala-common-0.50.2.ebuild new file mode 100644 index 000000000000..ee55cfcad100 --- /dev/null +++ b/dev-libs/vala-common/vala-common-0.50.2.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/vc/vc-1.4.1.ebuild b/dev-libs/vc/vc-1.4.1.ebuild index b2a09d101a1f..4ad0d2618b63 100644 --- a/dev-libs/vc/vc-1.4.1.ebuild +++ b/dev-libs/vc/vc-1.4.1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/VcDevel/Vc/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos" +KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux ~x64-macos" src_unpack() { default_src_unpack diff --git a/dev-libs/voikko-fi/Manifest b/dev-libs/voikko-fi/Manifest index 7eccce0b88c9..be7ebfab1837 100644 --- a/dev-libs/voikko-fi/Manifest +++ b/dev-libs/voikko-fi/Manifest @@ -1,2 +1,4 @@ DIST voikko-fi-2.3.tar.gz 694602 BLAKE2B 454afaa76be00645b8640f84c2c91ed0b31be5b46c98d31bba0f4967dce27919eee6a6c452941b3878b498c7f913a413a3d143d658bc38da2a07b32d876ac317 SHA512 b3478cbb6aecebcc25e1c4bce0881a657d664c11190a22c1c2c4ca7e7c62b4c4fd5d396718fbadc8c5ab3c9db5d4349d6cd81440a1394cf4c2f77c52ae608018 DIST voikko-fi-2.3.tar.gz.asc 833 BLAKE2B 4d960595ac948ec59499448219c5c84fe17060f80bdddaf358d222db63b1c2d167713ff9feec04fa9cbf35072a6cc153486078851319cf6631b7f18b346cd034 SHA512 1990f737673931580236e1765aabc2e47766f0bc1f6fef150fd2fb63dd459244ceb0fef99cea9ba1f1295a75daab0336400b7c6b367f694038849759e000adbc +DIST voikko-fi-2.4.tar.gz 701807 BLAKE2B 978871a733b12be53287ec2d4637428f6991cdb3098a97cc7fc673d7b1e1ac85eb6811653c1121a1f04b23f40e1b6ff6340a5514c2d1231cf7be37879c70cf20 SHA512 00098fd52d4f81b30fe7f0ecb97ee8f240d898dfd511da1fdc5e6fd7046f2bf94c0230dc733bc6034f178d56d26c3ee69965eb61c04fc7b30087131767701858 +DIST voikko-fi-2.4.tar.gz.asc 833 BLAKE2B f4f470118716cf3ad2348b8ae74f57d95a03adff3ffee66a1f09ae569e240a99ff08e026cd7bf575347ec9941bf6e0174c0b3b468a3434304dd8356db3e4d35d SHA512 bb68fe81c0d8cea206b93484d94d5bfc9a9272827616f3ce8016721027a736b190ae37679baed70df0350c3f84235fdb3d6a525d93123ff561ef6d83b7717562 diff --git a/dev-libs/voikko-fi/voikko-fi-2.4.ebuild b/dev-libs/voikko-fi/voikko-fi-2.4.ebuild new file mode 100644 index 000000000000..95615560af70 --- /dev/null +++ b/dev-libs/voikko-fi/voikko-fi-2.4.ebuild @@ -0,0 +1,35 @@ +# 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,10} ) + +inherit python-any-r1 verify-sig + +DESCRIPTION="Finnish dictionary for libvoikko based spell checkers (vvfst format)" +HOMEPAGE="https://voikko.puimula.org/" +SRC_URI="https://www.puimula.org/voikko-sources/${PN}/${P}.tar.gz + verify-sig? ( https://www.puimula.org/voikko-sources/voikko-fi/${P}.tar.gz.asc )" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +DEPEND="dev-libs/foma + dev-libs/libvoikko" +RDEPEND="${DEPEND}" +BDEPEND="${PYTHON_DEPS} + dev-libs/libvoikko + verify-sig? ( app-crypt/openpgp-keys-voikko )" + +VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/voikko.asc + +src_compile() { + emake vvfst +} + +src_install() { + emake DESTDIR="${D}/usr/share/voikko/" vvfst-install + einstalldocs +} diff --git a/dev-libs/volume_key/Manifest b/dev-libs/volume_key/Manifest index 300bb83d487d..0272b102308e 100644 --- a/dev-libs/volume_key/Manifest +++ b/dev-libs/volume_key/Manifest @@ -1,2 +1 @@ -DIST volume_key-0.3.11.tar.xz 484936 BLAKE2B f7bde79d290617a82de60a2105b6374dd03c2203804e3748336c8d09fbf749bf47157cf5e6b856477475d0074f3e4475dc85e0765308d60b9c6d0525685f73ea SHA512 b9da00578b31c96231ebde55fd91c9aafbd663e541c560460fb6c3305e1a0e1fb3115a95682dc4713027d084e14ffa39d638653384a18d69f5dc892fc4855a97 DIST volume_key-0.3.12.tar.xz 490432 BLAKE2B 4a0424d51878855c69bdf969b616f3a563074976ad7b07aa848140266d97f66de9c52e1a6ed8913df93077d5966c3ab99afc78c3b22c410f1eadf5447ca2f416 SHA512 d056154c9b9d23e4eb661946dd59ed97e116903a3afcff9d9e29258408082f33dcbb69958724143f6bf191a3da488a03b6c02af287790990ed6459e29d66553c diff --git a/dev-libs/volume_key/files/volume_key-0.3.12-find_python3.patch b/dev-libs/volume_key/files/volume_key-0.3.12-find_python3.patch new file mode 100644 index 000000000000..3f7d6da69366 --- /dev/null +++ b/dev-libs/volume_key/files/volume_key-0.3.12-find_python3.patch @@ -0,0 +1,27 @@ +From d64fcc43ad740c91f4f1e1a6827663b2485f127a Mon Sep 17 00:00:00 2001 +From: Lars Wendler <polynomial-c@gentoo.org> +Date: Thu, 7 Jan 2021 13:23:28 +0100 +Subject: [PATCH] configure.ac: Don't look for old python3 versions + +Gentoo-bug: https://bugs.gentoo.org/764230 +Signed-off-by: Lars Wendler <polynomial-c@gentoo.org> +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 4eda5eb..2dce575 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -101,7 +101,7 @@ if test "x$use_python3" = xno; then + else + AC_MSG_RESULT([testing]) + # Try to find Python 3 interpreter: +- AC_PATH_PROGS([PYTHON3], [python3.6 python3.5 python3 python], [no]) ++ AC_PATH_PROGS([PYTHON3], [python3], [no]) + if test "x$PYTHON3" != xno; then + AC_MSG_CHECKING([whether $PYTHON3 version is >= 3.5]) + python3_found=old +-- +2.30.0 + diff --git a/dev-libs/volume_key/volume_key-0.3.11.ebuild b/dev-libs/volume_key/volume_key-0.3.11.ebuild deleted file mode 100644 index 0bc012004f6e..000000000000 --- a/dev-libs/volume_key/volume_key-0.3.11.ebuild +++ /dev/null @@ -1,45 +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,9,10} ) - -inherit python-single-r1 - -DESCRIPTION="Library for manipulating and storing storage volume encryption keys" -HOMEPAGE="https://pagure.io/volume_key" -SRC_URI="http://releases.pagure.org/${PN}/${P}.tar.xz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86" -IUSE="test" -RESTRICT="!test? ( test )" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND=" - ${PYTHON_DEPS} - app-crypt/gpgme - dev-libs/glib:2 - dev-libs/nspr - dev-libs/nss - sys-apps/util-linux - sys-fs/cryptsetup:= -" -DEPEND=" - ${RDEPEND} - sys-devel/gettext - test? ( dev-libs/nss[utils] ) - " - -#RESTRICT="test" # possible gpgme issue - -pkg_setup() { - python-single-r1_pkg_setup -} - -src_install() { - default - find "${ED}" -name "*.la" -delete || die -} diff --git a/dev-libs/volume_key/volume_key-0.3.12-r1.ebuild b/dev-libs/volume_key/volume_key-0.3.12-r1.ebuild deleted file mode 100644 index a29fdf2f690f..000000000000 --- a/dev-libs/volume_key/volume_key-0.3.12-r1.ebuild +++ /dev/null @@ -1,51 +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,9,10} ) - -inherit python-single-r1 - -DESCRIPTION="Library for manipulating and storing storage volume encryption keys" -HOMEPAGE="https://pagure.io/volume_key" -SRC_URI="http://releases.pagure.org/${PN}/${P}.tar.xz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86" -IUSE="test" -RESTRICT="!test? ( test )" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND=" - ${PYTHON_DEPS} - app-crypt/gpgme - dev-libs/glib:2 - dev-libs/nspr - dev-libs/nss - sys-apps/util-linux - sys-fs/cryptsetup:= -" -DEPEND=" - ${RDEPEND} - sys-devel/gettext - test? ( dev-libs/nss[utils] ) - " - -pkg_setup() { - python-single-r1_pkg_setup -} - -src_configure() { - # --without-python disables python2 - econf --without-python --with-python3 -} - -src_install() { - default - find "${ED}" -type f -name "*.la" -delete || die - - python_optimize -} diff --git a/dev-libs/volume_key/volume_key-0.3.12-r2.ebuild b/dev-libs/volume_key/volume_key-0.3.12-r3.ebuild index 597d8ded0ed4..9c135346c23f 100644 --- a/dev-libs/volume_key/volume_key-0.3.12-r2.ebuild +++ b/dev-libs/volume_key/volume_key-0.3.12-r3.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 PYTHON_COMPAT=( python3_{6,7,8,9,10} ) -inherit python-single-r1 +inherit autotools python-single-r1 DESCRIPTION="Library for manipulating and storing storage volume encryption keys" HOMEPAGE="https://pagure.io/volume_key" @@ -13,7 +13,7 @@ SRC_URI="http://releases.pagure.org/${PN}/${P}.tar.xz" LICENSE="GPL-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="test" RESTRICT="!test? ( test )" @@ -36,12 +36,18 @@ BDEPEND=" PATCHES=( "${FILESDIR}/${P}-support_higher_LUKS_versions.patch" + "${FILESDIR}/${PN}-0.3.12-find_python3.patch" #764230 ) pkg_setup() { python-single-r1_pkg_setup } +src_prepare() { + default + eautoreconf #764230 +} + src_configure() { # --without-python disables python2 econf --without-python --with-python3 diff --git a/dev-libs/wayland-protocols/wayland-protocols-1.20.ebuild b/dev-libs/wayland-protocols/wayland-protocols-1.20.ebuild index ced84988d5c9..b7cea107f247 100644 --- a/dev-libs/wayland-protocols/wayland-protocols-1.20.ebuild +++ b/dev-libs/wayland-protocols/wayland-protocols-1.20.ebuild @@ -11,7 +11,7 @@ if [[ ${PV} = 9999* ]]; then inherit git-r3 autotools else SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86" fi LICENSE="MIT" diff --git a/dev-libs/wayland/Manifest b/dev-libs/wayland/Manifest index c2c407e3dfb6..6208e365ff88 100644 --- a/dev-libs/wayland/Manifest +++ b/dev-libs/wayland/Manifest @@ -1 +1,3 @@ DIST wayland-1.18.0.tar.xz 453968 BLAKE2B ee5b3f9dff07fda85b4d64bc753aff28c4a012184eb3a4bae8e3be0fb74324f12e9ea4e3dc049e06a11c7302e3c6b1e53e49109c814381641568d92b5572eed9 SHA512 e30199e30c2bbd361ee695b4f3f7a4e264f10ed8f46f2c90762b5739fc578ae757dc39aa0258d8fbf0ed418553470bccd4b2730ed9705481cfccdab5de96a8fc +DIST wayland-1.18.91.tar.xz 453500 BLAKE2B 6e234fa637bf4329fcf37c7372e3d02a50742812e2f61477ce302da4c2a1b9377874b0e4e2da899c726ede417081c4d459e40863169352825dd38a8fe0dcf267 SHA512 5ab770c87507e8248aa5197a253f27f3cca984bf1a69c52b438e9aaf512e6b0d841321f81c20643a49ef62eeb6c8b3a6391eadfee5c8822c3cf0d63bb0a8e0f8 +DIST wayland-1.18.92.tar.xz 456320 BLAKE2B bd88156773b5ca817544e0aa496101dc144723dc7f4602011ce1bc4fedbbb20081d99fc882866c0f572139cf4bf4dcf1e7b181af48653b2c67622af07c7ab650 SHA512 837afe1accc632c445868a85792e708daa5d7dc5942888c2fa0981cfb0dd34a3d37667407f1875f04aa5710a07089f3b620a6b78dd19030b477d8b25941e6305 diff --git a/dev-libs/wayland/wayland-1.18.0.ebuild b/dev-libs/wayland/wayland-1.18.0.ebuild index 2924e39d6f0e..e1e301322771 100644 --- a/dev-libs/wayland/wayland-1.18.0.ebuild +++ b/dev-libs/wayland/wayland-1.18.0.ebuild @@ -8,7 +8,7 @@ if [[ ${PV} = *9999* ]]; then inherit git-r3 else SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86" fi inherit autotools libtool multilib-minimal toolchain-funcs diff --git a/dev-libs/wayland/wayland-1.18.91.ebuild b/dev-libs/wayland/wayland-1.18.91.ebuild new file mode 100644 index 000000000000..c3d2b584f4ca --- /dev/null +++ b/dev-libs/wayland/wayland-1.18.91.ebuild @@ -0,0 +1,85 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +if [[ ${PV} = *9999* ]]; then + EGIT_REPO_URI="https://gitlab.freedesktop.org/wayland/wayland.git" + inherit git-r3 +else + SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +fi +inherit meson multilib-minimal + +DESCRIPTION="Wayland protocol libraries" +HOMEPAGE="https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/wayland/wayland" + +LICENSE="MIT" +SLOT="0" +IUSE="doc" + +BDEPEND=" + ~dev-util/wayland-scanner-${PV}[$MULTILIB_USEDEP] + virtual/pkgconfig + doc? ( + >=app-doc/doxygen-1.6[dot] + app-text/xmlto + >=media-gfx/graphviz-2.26.0 + ) +" +DEPEND=" + >=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}] + dev-libs/libxml2:= + >=dev-libs/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}] +" +RDEPEND="${DEPEND}" + +meson_multilib() { + if multilib_is_native_abi; then + echo true + else + echo false + fi +} + +meson_multilib_native_use() { + if multilib_is_native_abi && use "$1"; then + echo true + else + echo false + fi +} + +multilib_src_configure() { + local emesonargs=( + -Ddocumentation=$(meson_multilib_native_use doc) + -Ddtd_validation=$(meson_multilib) + -Dlibraries=true + -Dscanner=false + ) + meson_src_configure +} + +multilib_src_compile() { + meson_src_compile +} + +multilib_src_test() { + meson_src_test +} + +src_test() { + # We set it on purpose to only a short subdir name, as socket paths are + # created in there, which are 108 byte limited. With this it hopefully + # barely fits to the limit with /var/tmp/portage/$CAT/$PF/temp/x + export XDG_RUNTIME_DIR="${T}"/x + mkdir "${XDG_RUNTIME_DIR}" || die + chmod 0700 "${XDG_RUNTIME_DIR}" || die + + multilib-minimal_src_test +} + +multilib_src_install() { + meson_src_install +} diff --git a/dev-libs/wayland/wayland-1.18.92.ebuild b/dev-libs/wayland/wayland-1.18.92.ebuild new file mode 100644 index 000000000000..c3d2b584f4ca --- /dev/null +++ b/dev-libs/wayland/wayland-1.18.92.ebuild @@ -0,0 +1,85 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +if [[ ${PV} = *9999* ]]; then + EGIT_REPO_URI="https://gitlab.freedesktop.org/wayland/wayland.git" + inherit git-r3 +else + SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +fi +inherit meson multilib-minimal + +DESCRIPTION="Wayland protocol libraries" +HOMEPAGE="https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/wayland/wayland" + +LICENSE="MIT" +SLOT="0" +IUSE="doc" + +BDEPEND=" + ~dev-util/wayland-scanner-${PV}[$MULTILIB_USEDEP] + virtual/pkgconfig + doc? ( + >=app-doc/doxygen-1.6[dot] + app-text/xmlto + >=media-gfx/graphviz-2.26.0 + ) +" +DEPEND=" + >=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}] + dev-libs/libxml2:= + >=dev-libs/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}] +" +RDEPEND="${DEPEND}" + +meson_multilib() { + if multilib_is_native_abi; then + echo true + else + echo false + fi +} + +meson_multilib_native_use() { + if multilib_is_native_abi && use "$1"; then + echo true + else + echo false + fi +} + +multilib_src_configure() { + local emesonargs=( + -Ddocumentation=$(meson_multilib_native_use doc) + -Ddtd_validation=$(meson_multilib) + -Dlibraries=true + -Dscanner=false + ) + meson_src_configure +} + +multilib_src_compile() { + meson_src_compile +} + +multilib_src_test() { + meson_src_test +} + +src_test() { + # We set it on purpose to only a short subdir name, as socket paths are + # created in there, which are 108 byte limited. With this it hopefully + # barely fits to the limit with /var/tmp/portage/$CAT/$PF/temp/x + export XDG_RUNTIME_DIR="${T}"/x + mkdir "${XDG_RUNTIME_DIR}" || die + chmod 0700 "${XDG_RUNTIME_DIR}" || die + + multilib-minimal_src_test +} + +multilib_src_install() { + meson_src_install +} diff --git a/dev-libs/wayland/wayland-9999.ebuild b/dev-libs/wayland/wayland-9999.ebuild index cc89001c551d..c3d2b584f4ca 100644 --- a/dev-libs/wayland/wayland-9999.ebuild +++ b/dev-libs/wayland/wayland-9999.ebuild @@ -8,9 +8,9 @@ if [[ ${PV} = *9999* ]]; then inherit git-r3 else SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz" - 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 ~riscv ~s390 ~sparc ~x86" fi -inherit autotools libtool multilib-minimal toolchain-funcs +inherit meson multilib-minimal DESCRIPTION="Wayland protocol libraries" HOMEPAGE="https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/wayland/wayland" @@ -20,12 +20,12 @@ SLOT="0" IUSE="doc" BDEPEND=" + ~dev-util/wayland-scanner-${PV}[$MULTILIB_USEDEP] virtual/pkgconfig doc? ( >=app-doc/doxygen-1.6[dot] app-text/xmlto >=media-gfx/graphviz-2.26.0 - sys-apps/grep[pcre] ) " DEPEND=" @@ -35,34 +35,51 @@ DEPEND=" " RDEPEND="${DEPEND}" -src_prepare() { - default - [[ $PV = 9999* ]] && eautoreconf || elibtoolize +meson_multilib() { + if multilib_is_native_abi; then + echo true + else + echo false + fi +} + +meson_multilib_native_use() { + if multilib_is_native_abi && use "$1"; then + echo true + else + echo false + fi } multilib_src_configure() { - local myeconfargs=( - --disable-static - $(multilib_native_use_enable doc documentation) - $(multilib_native_enable dtd-validation) + local emesonargs=( + -Ddocumentation=$(meson_multilib_native_use doc) + -Ddtd_validation=$(meson_multilib) + -Dlibraries=true + -Dscanner=false ) - tc-is-cross-compiler && myeconfargs+=( --with-host-scanner ) + meson_src_configure +} - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" +multilib_src_compile() { + meson_src_compile } -multilib_src_install_all() { - find "${D}" -name '*.la' -delete || die - einstalldocs +multilib_src_test() { + meson_src_test } src_test() { # We set it on purpose to only a short subdir name, as socket paths are # created in there, which are 108 byte limited. With this it hopefully - # barely fits to the limit with /var/tmp/portage/$CAT/$PF/temp/xdr - export XDG_RUNTIME_DIR="${T}"/xdr + # barely fits to the limit with /var/tmp/portage/$CAT/$PF/temp/x + export XDG_RUNTIME_DIR="${T}"/x mkdir "${XDG_RUNTIME_DIR}" || die chmod 0700 "${XDG_RUNTIME_DIR}" || die multilib-minimal_src_test } + +multilib_src_install() { + meson_src_install +} diff --git a/dev-libs/weston/weston-8.0.0.ebuild b/dev-libs/weston/weston-8.0.0.ebuild index 494278ed2041..159f8af3b1b1 100644 --- a/dev-libs/weston/weston-8.0.0.ebuild +++ b/dev-libs/weston/weston-8.0.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -14,9 +14,8 @@ inherit meson readme.gentoo-r1 toolchain-funcs xdg-utils $GIT_ECLASS DESCRIPTION="Wayland reference compositor" HOMEPAGE="https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/wayland/weston" -if [[ $PV = 9999* ]]; then +if [[ ${PV} = *9999* ]]; then SRC_URI="${SRC_PATCHES}" - KEYWORDS="amd64 arm x86" else SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz" KEYWORDS="amd64 arm x86" diff --git a/dev-libs/weston/weston-9.0.0.ebuild b/dev-libs/weston/weston-9.0.0.ebuild index c01d4eda03b4..fcc8d36a421d 100644 --- a/dev-libs/weston/weston-9.0.0.ebuild +++ b/dev-libs/weston/weston-9.0.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -14,12 +14,11 @@ inherit meson readme.gentoo-r1 toolchain-funcs xdg-utils $GIT_ECLASS DESCRIPTION="Wayland reference compositor" HOMEPAGE="https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/wayland/weston" -if [[ $PV = 9999* ]]; then +if [[ ${PV} = *9999* ]]; then SRC_URI="${SRC_PATCHES}" - KEYWORDS="x86" else SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz" - KEYWORDS="~amd64 ~arm x86" + KEYWORDS="amd64 ~arm x86" fi LICENSE="MIT CC-BY-SA-3.0" diff --git a/dev-libs/weston/weston-9999.ebuild b/dev-libs/weston/weston-9999.ebuild index 097c7f0c70b9..ccac939f6d31 100644 --- a/dev-libs/weston/weston-9999.ebuild +++ b/dev-libs/weston/weston-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -14,9 +14,8 @@ inherit meson readme.gentoo-r1 toolchain-funcs xdg-utils $GIT_ECLASS DESCRIPTION="Wayland reference compositor" HOMEPAGE="https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/wayland/weston" -if [[ $PV = 9999* ]]; then +if [[ ${PV} = *9999* ]]; then SRC_URI="${SRC_PATCHES}" - KEYWORDS="" else SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz" KEYWORDS="~amd64 ~arm ~x86" 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 9390d9cbefca..8734fe52516f 100644 --- a/dev-libs/xapian-bindings/xapian-bindings-1.4.14.ebuild +++ b/dev-libs/xapian-bindings/xapian-bindings-1.4.14.ebuild @@ -23,14 +23,14 @@ SRC_URI="https://oligarchy.co.uk/xapian/${PV}/${P}.tar.xz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86" +KEYWORDS="~alpha amd64 arm ~hppa ~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.14 - lua? ( dev-lang/lua:= ) + lua? ( dev-lang/lua:0= ) perl? ( dev-lang/perl:= ) php? ( dev-lang/php:=[-threads] ) python? ( 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 45d4b5a2e87a..c31066f6c701 100644 --- a/dev-libs/xapian-bindings/xapian-bindings-1.4.15.ebuild +++ b/dev-libs/xapian-bindings/xapian-bindings-1.4.15.ebuild @@ -30,7 +30,7 @@ REQUIRED_USE="|| ( java lua mono perl php python ruby tcl ) ruby? ( || ( $(ruby_get_use_targets) ) )" COMMONDEPEND=">=dev-libs/xapian-1.4.15 - lua? ( dev-lang/lua:= ) + lua? ( dev-lang/lua:0= ) perl? ( dev-lang/perl:= ) php? ( dev-lang/php:=[-threads] ) python? ( 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 45d4b5a2e87a..c31066f6c701 100644 --- a/dev-libs/xapian-bindings/xapian-bindings-1.4.16.ebuild +++ b/dev-libs/xapian-bindings/xapian-bindings-1.4.16.ebuild @@ -30,7 +30,7 @@ REQUIRED_USE="|| ( java lua mono perl php python ruby tcl ) ruby? ( || ( $(ruby_get_use_targets) ) )" COMMONDEPEND=">=dev-libs/xapian-1.4.15 - lua? ( dev-lang/lua:= ) + lua? ( dev-lang/lua:0= ) perl? ( dev-lang/perl:= ) php? ( dev-lang/php:=[-threads] ) python? ( diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.4.17-r100.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.4.17-r100.ebuild new file mode 100644 index 000000000000..c5503707d062 --- /dev/null +++ b/dev-libs/xapian-bindings/xapian-bindings-1.4.17-r100.ebuild @@ -0,0 +1,340 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +LUA_COMPAT=( lua5-{1..4} luajit ) + +PYTHON_COMPAT=( python3_{6,7,8,9,10} ) +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 lua 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 ~hppa ~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 ) + lua? ( ${LUA_REQUIRED_USE} ) + python? ( ${PYTHON_REQUIRED_USE} ) + ruby? ( || ( $(ruby_get_use_targets) ) )" + +COMMONDEPEND=">=dev-libs/xapian-1.4.15 + lua? ( ${LUA_DEPS} ) + 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 lua, php, python and ruby are + return $(use mono || use java || 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 lua; then + lua_copy_sources + fi + + 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 perl) + $(use_with tcl) + --without-lua + --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 + + econf "${conf[@]}" + fi + + lua_configure() { + local myconf=( + --disable-documentation + --without-csharp + --without-java + --without-perl + --without-tcl + --without-php + --without-php7 + --without-python + --without-python3 + --without-ruby + --with-lua + ) + + local -x LUA_INC="$(lua_get_include_dir)" + local -x LUA_LIB="$(lua_get_cmod_dir)" + + econf "${myconf[@]}" + + } + + lua_foreach_impl run_in_build_dir lua_configure + + 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 lua; then + lua_foreach_impl run_in_build_dir emake + 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 lua; then + lua_foreach_impl run_in_build_dir emake check + 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 lua; then + lua_foreach_impl run_in_build_dir emake DESTDIR="${D}" install + 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-bindings/xapian-bindings-1.4.17.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.4.17.ebuild index 3555c1cf8789..d809c2422721 100644 --- a/dev-libs/xapian-bindings/xapian-bindings-1.4.17.ebuild +++ b/dev-libs/xapian-bindings/xapian-bindings-1.4.17.ebuild @@ -23,14 +23,14 @@ SRC_URI="https://oligarchy.co.uk/xapian/${PV}/${P}.tar.xz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86" +KEYWORDS="~alpha amd64 arm ~hppa ~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:= ) + lua? ( dev-lang/lua:0= ) perl? ( dev-lang/perl:= ) php? ( dev-lang/php:=[-threads] ) python? ( diff --git a/dev-libs/xapian/xapian-1.4.14.ebuild b/dev-libs/xapian/xapian-1.4.14.ebuild index cb7643fe28a1..f6ae79205eb5 100644 --- a/dev-libs/xapian/xapian-1.4.14.ebuild +++ b/dev-libs/xapian/xapian-1.4.14.ebuild @@ -13,7 +13,7 @@ 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" +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" diff --git a/dev-libs/xapian/xapian-1.4.17.ebuild b/dev-libs/xapian/xapian-1.4.17.ebuild index 5e5756e95b7d..59b45ca14067 100644 --- a/dev-libs/xapian/xapian-1.4.17.ebuild +++ b/dev-libs/xapian/xapian-1.4.17.ebuild @@ -13,7 +13,7 @@ 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 ~riscv ~s390 sparc x86 ~x64-macos ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos ~x64-solaris" IUSE="doc static-libs -cpu_flags_x86_sse +cpu_flags_x86_sse2 +inmemory +remote" DEPEND="sys-libs/zlib" diff --git a/dev-libs/xerces-c/xerces-c-3.2.2-r1.ebuild b/dev-libs/xerces-c/xerces-c-3.2.2-r1.ebuild index 65f5851feb4f..9671a52d453a 100644 --- a/dev-libs/xerces-c/xerces-c-3.2.2-r1.ebuild +++ b/dev-libs/xerces-c/xerces-c-3.2.2-r1.ebuild @@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]] ; then else SRC_URI="mirror://apache/xerces/c/3/sources/${P}.tar.gz https://dev.gentoo.org/~juippis/distfiles/tmp/xerces-c-3.2.2-fix-XERCESC-2161.patch" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos" fi LICENSE="Apache-2.0" diff --git a/dev-libs/xerces-c/xerces-c-3.2.3.ebuild b/dev-libs/xerces-c/xerces-c-3.2.3.ebuild index f0c894c9ed8c..9c89e65548c1 100644 --- a/dev-libs/xerces-c/xerces-c-3.2.3.ebuild +++ b/dev-libs/xerces-c/xerces-c-3.2.3.ebuild @@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]] ; then 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" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos" fi LICENSE="Apache-2.0" 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 71c4df9ad9a0..c81a30f2af34 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 @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tgz" LICENSE="BSD" SLOT="0" -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" +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris" IUSE="abyss +cgi +curl +cxx +libxml2 threads test tools" RESTRICT="!test? ( test )" diff --git a/dev-libs/xmlrpc-c/xmlrpc-c-1.51.06-r1.ebuild b/dev-libs/xmlrpc-c/xmlrpc-c-1.51.06-r2.ebuild index c4eb58260557..820cfe3c40be 100644 --- a/dev-libs/xmlrpc-c/xmlrpc-c-1.51.06-r1.ebuild +++ b/dev-libs/xmlrpc-c/xmlrpc-c-1.51.06-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -15,8 +15,8 @@ HOMEPAGE="https://sourceforge.net/projects/xmlrpc-c/" SRC_URI="mirror://sourceforge/${PN}/${P}.tgz" LICENSE="BSD" -SLOT="0" -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" +SLOT="0/4.51" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris" IUSE="abyss +cgi +curl +cxx +libxml2 threads test" diff --git a/dev-libs/xmlrpc-c/xmlrpc-c-1.51.06.ebuild b/dev-libs/xmlrpc-c/xmlrpc-c-1.51.06.ebuild index 25b4188c4fbd..f313ea0354f7 100644 --- a/dev-libs/xmlrpc-c/xmlrpc-c-1.51.06.ebuild +++ b/dev-libs/xmlrpc-c/xmlrpc-c-1.51.06.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tgz" LICENSE="BSD" SLOT="0" -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" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris" IUSE="abyss +cgi +curl +cxx +libxml2 threads test" diff --git a/dev-libs/xmlsec/Manifest b/dev-libs/xmlsec/Manifest index 25ec6655e80b..7f5e8c5f173f 100644 --- a/dev-libs/xmlsec/Manifest +++ b/dev-libs/xmlsec/Manifest @@ -1,2 +1,2 @@ -DIST xmlsec1-1.2.29.tar.gz 1989360 BLAKE2B a0057ddf2d641745933f8d788c5358b4bb17892ed175ef11a9041a34ff1f91d0ffe6cb90316308805b5bc2157b9c2e211b37731ff8cfc7723a85f349543aa7a6 SHA512 07c3012179da4392f0a9d41a51ed51d692ca8b491310488b955d5fef0637f104d3f82374754b0ef175fadc663a8ca8c996178198c5dd77b3a8b34393d1482e4d DIST xmlsec1-1.2.30.tar.gz 1989670 BLAKE2B b363d1661ba5fdf968725948598954c7d514ad92c4ad05b490aa3ac9ffb6be861ee81d660be30d37e26ae1cb327cdecd1c76d60055ec5aa900e390a4083099b3 SHA512 07152470a9fe5d077f8a358608ca1d8a79ee0d2777660f61ed5717dc640714a3adfe66843e6a4023898eb0f5ed79771d70c41132571f3a1aeda82c1894b69c98 +DIST xmlsec1-1.2.31.tar.gz 1989144 BLAKE2B ddc55e34867d5870fa434c739825ceaa68500a11fb2eabb482945901ad7fa0ba0d5fce7cd6c5f1b49c24d5bc07cee2875ff21833f09c0ec2ffeaf63875f5b001 SHA512 7a0e3d6f66746a22cf6468eb4d0691879c7468e4bef71fd8720e6a56b420f076a1d8a3094c35e721471dd029a643f5c4a553ef5788be5509f2786a419da1b7af diff --git a/dev-libs/xmlsec/xmlsec-1.2.29.ebuild b/dev-libs/xmlsec/xmlsec-1.2.31.ebuild index f16790f667b9..2da2a8e15d6d 100644 --- a/dev-libs/xmlsec/xmlsec-1.2.29.ebuild +++ b/dev-libs/xmlsec/xmlsec-1.2.31.ebuild @@ -3,15 +3,14 @@ EAPI=7 -inherit autotools - DESCRIPTION="Command line tool for signing, verifying, encrypting and decrypting XML" HOMEPAGE="https://www.aleksey.com/xmlsec" SRC_URI="https://www.aleksey.com/xmlsec/download/${PN}1-${PV}.tar.gz" +S="${WORKDIR}/${PN}1-${PV}" 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 ) @@ -37,10 +36,9 @@ BDEPEND="virtual/pkgconfig ) )" -S="${WORKDIR}/${PN}1-${PV}" - src_configure() { - econf \ + # Bash because of bug #721128 + CONFIG_SHELL=${BASH} econf \ $(use_enable doc docs) \ $(use_enable static-libs static) \ $(use_with gcrypt) \ @@ -53,7 +51,7 @@ src_configure() { } src_test() { - emake TMPFOLDER="${T}" check + SHELL=${BASH} emake TMPFOLDER="${T}" check } src_install() { diff --git a/dev-libs/yajl/yajl-2.1.0-r1.ebuild b/dev-libs/yajl/yajl-2.1.0-r1.ebuild index 8c07bc2cc99d..f1613406c0b4 100644 --- a/dev-libs/yajl/yajl-2.1.0-r1.ebuild +++ b/dev-libs/yajl/yajl-2.1.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -11,7 +11,7 @@ SRC_URI="https://github.com/lloyd/yajl/tarball/${PV} -> ${P}.tar.gz" LICENSE="ISC" SLOT="0/2" -KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 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 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="static-libs" PATCHES=( "${FILESDIR}"/${P}-uclibc.patch ) diff --git a/dev-libs/yajl/yajl-2.1.0-r2.ebuild b/dev-libs/yajl/yajl-2.1.0-r2.ebuild index 73a574fef1d9..93d4f3063c1b 100644 --- a/dev-libs/yajl/yajl-2.1.0-r2.ebuild +++ b/dev-libs/yajl/yajl-2.1.0-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -11,7 +11,7 @@ SRC_URI="https://github.com/lloyd/yajl/tarball/${PV} -> ${P}.tar.gz" LICENSE="ISC" SLOT="0/2" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 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 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="static-libs" PATCHES=( "${FILESDIR}"/${P}-uclibc.patch "${FILESDIR}"/${P}-pkg-config.patch ) diff --git a/dev-libs/yaz/yaz-3.0.53.ebuild b/dev-libs/yaz/yaz-3.0.53.ebuild index d1deba9ec18a..7653ee8e8110 100644 --- a/dev-libs/yaz/yaz-3.0.53.ebuild +++ b/dev-libs/yaz/yaz-3.0.53.ebuild @@ -10,7 +10,7 @@ SRC_URI="http://ftp.indexdata.dk/pub/${PN}/${P}.tar.gz" LICENSE="BSD GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc x86" +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc x86" IUSE="debug icu libressl tcpd ziffy" RDEPEND="dev-libs/libxml2 diff --git a/dev-libs/zziplib/Manifest b/dev-libs/zziplib/Manifest index f0ee88ddc3a4..56281af571c6 100644 --- a/dev-libs/zziplib/Manifest +++ b/dev-libs/zziplib/Manifest @@ -1,2 +1,3 @@ DIST zziplib-0.13.71.tar.gz 1150654 BLAKE2B 00394de5da8b3c5b95ef0aea060e523354845261b846e3c876b13d2d05c6569496475a279d6b211c3215a6f17e6bfe53958baabcebb13cd72d30a9f0c40d9449 SHA512 e035d0ac26dca78335ae3defc652543ff7b353a1a95d76ed1beeb21a08e16f287a62d488f528cfbb77d5b558581b68d439aa0823577524e9aa61a3cf5f208cb5 DIST zziplib-0.13.71_p20201021.tar.gz 1151849 BLAKE2B b4caf8b6b03d8de742d4e727a2aa03dd8b5e96df50c6e9d5aaf2df9bc072cd8389959019e41c06bd808f3df8e710dd11d198438bf70e58e5ae278a882d854d5b SHA512 ebbc5bc9e403e203d36cacb0ec5aea9d1750f1a8b144a41748c9475e6cc0b1c3af197a4ef7df5f38f90be40bd4f9b68edbcb4624ceff1d48a47127065e570cb3 +DIST zziplib-0.13.72.tar.gz 1162175 BLAKE2B ff5617645e25040e4666e5440651fbb2b04c0505c7bda08b158f44c63c5dd53ec97a9942908314c3b103a4685be49368e964d249fcf9b9d685e328f0ebabdedd SHA512 4bb089e74813c6fac9657cd96e44e4a6469bf86aba3980d885c4573e8db45e74fd07bbdfcec9f36297c72227c8c0b2c37dab1bc4326cef8529960e482fe501c8 diff --git a/dev-libs/zziplib/zziplib-0.13.71-r2.ebuild b/dev-libs/zziplib/zziplib-0.13.71-r2.ebuild index f5d5785c6ec4..46469e36168b 100644 --- a/dev-libs/zziplib/zziplib-0.13.71-r2.ebuild +++ b/dev-libs/zziplib/zziplib-0.13.71-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -13,7 +13,7 @@ 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" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="doc sdl static-libs test" RESTRICT="!test? ( test )" diff --git a/dev-libs/zziplib/zziplib-0.13.71_p20201021.ebuild b/dev-libs/zziplib/zziplib-0.13.71_p20201021.ebuild index 035bdb0ca08b..8839d32962f7 100644 --- a/dev-libs/zziplib/zziplib-0.13.71_p20201021.ebuild +++ b/dev-libs/zziplib/zziplib-0.13.71_p20201021.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -14,7 +14,7 @@ SRC_URI="https://github.com/gdraheim/${PN}/archive/${MY_COMMIT}.tar.gz -> ${P}.t 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" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="sdl static-libs" # Tests require internet access diff --git a/dev-libs/zziplib/zziplib-0.13.72.ebuild b/dev-libs/zziplib/zziplib-0.13.72.ebuild new file mode 100644 index 000000000000..f792d77dad15 --- /dev/null +++ b/dev-libs/zziplib/zziplib-0.13.72.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6,7,8,9,10} ) + +inherit cmake flag-o-matic python-any-r1 + +DESCRIPTION="Lightweight library for extracting data from files archived in a single zip file" +HOMEPAGE="https://github.com/gdraheim/zziplib 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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="sdl static-libs" + +# Tests require internet access +# https://github.com/gdraheim/zziplib/issues/24 + +BDEPEND=" + ${PYTHON_DEPS} +" +DEPEND=" + sys-libs/zlib + sdl? ( >=media-libs/libsdl-1.2.6 ) +" +RDEPEND="${DEPEND}" + +src_configure() { + # https://github.com/gdraheim/zziplib/commit/f3bfc0dd6663b7df272cc0cf17f48838ad724a2f#diff-b7b1e314614cf326c6e2b6eba1540682R100 + append-flags -fno-strict-aliasing + + local mycmakeargs=( + -DZZIPSDL="$(usex sdl)" + -DBUILD_STATIC_LIBS="$(usex static-libs)" + -DBUILD_TESTS=OFF + -DZZIPTEST=OFF + -DZZIPDOCS=ON + -DZZIPWRAP=OFF + ) + + cmake_src_configure +} |