diff options
60 files changed, 15 insertions, 4558 deletions
diff --git a/dev-libs/jemalloc/Manifest b/dev-libs/jemalloc/Manifest deleted file mode 100644 index 06a80d2..0000000 --- a/dev-libs/jemalloc/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST jemalloc-5.2.0.tar.bz2 543892 BLAKE2B 042dd32452713d0524ae8aedbd3aa96a420037ae3ff0345bbf56a7839ae6ba9e0c700034fab9d5c7b6f4cbb43e2d8199b412901afce16c2785a816d439166e6d SHA512 e3be4d534770126caf10f2684aed9fe4ba1422dd47625fe50343cfb750f26eff869fcc7d1e30a96dd6c73f6614c4bbcd560fd24fc26b55ac731c43e60fd05234 diff --git a/dev-libs/jemalloc/files/jemalloc-5.2.0-gentoo-fixups.patch b/dev-libs/jemalloc/files/jemalloc-5.2.0-gentoo-fixups.patch deleted file mode 100644 index 2e7fd0d..0000000 --- a/dev-libs/jemalloc/files/jemalloc-5.2.0-gentoo-fixups.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 482a28e74f9b3c83bef6499842f1191c04ae80d9 Mon Sep 17 00:00:00 2001 -From: Jory Pratt <anarchy@gentoo.org> -Date: Tue, 23 Apr 2019 10:04:19 -0500 -Subject: [PATCH] Don't override user cflags, disable html_doc from being - installed - -Signed-off-by: Jory Pratt <anarchy@gentoo.org> ---- - Makefile.in | 2 +- - configure.ac | 15 --------------- - 2 files changed, 1 insertion(+), 16 deletions(-) - -diff --git a/Makefile.in b/Makefile.in -index 0777f6a..31767b6 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -511,7 +511,7 @@ install_doc_man: - $(INSTALL) -m 644 $$d $(MANDIR)/man3; \ - done - --install_doc: build_doc install_doc_html install_doc_man -+install_doc: build_doc install_doc_man - - install: install_bin install_include install_lib install_doc - -diff --git a/configure.ac b/configure.ac -index 96f76d3..f716ebd 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1108,21 +1108,6 @@ if test "x$enable_debug" = "x1" ; then - fi - AC_SUBST([enable_debug]) - --dnl Only optimize if not debugging. --if test "x$enable_debug" = "x0" ; then -- if test "x$GCC" = "xyes" ; then -- JE_CFLAGS_ADD([-O3]) -- JE_CXXFLAGS_ADD([-O3]) -- JE_CFLAGS_ADD([-funroll-loops]) -- elif test "x$je_cv_msvc" = "xyes" ; then -- JE_CFLAGS_ADD([-O2]) -- JE_CXXFLAGS_ADD([-O2]) -- else -- JE_CFLAGS_ADD([-O]) -- JE_CXXFLAGS_ADD([-O]) -- fi --fi -- - dnl Enable statistics calculation by default. - AC_ARG_ENABLE([stats], - [AS_HELP_STRING([--disable-stats], --- -2.21.0 - diff --git a/dev-libs/jemalloc/jemalloc-5.2.0.ebuild b/dev-libs/jemalloc/jemalloc-5.2.0.ebuild deleted file mode 100644 index ecf6d5e..0000000 --- a/dev-libs/jemalloc/jemalloc-5.2.0.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 toolchain-funcs multilib-minimal - -DESCRIPTION="Jemalloc is a general-purpose scalable concurrent allocator" -HOMEPAGE="http://jemalloc.net/ https://github.com/jemalloc/jemalloc" -SRC_URI="https://github.com/jemalloc/jemalloc/releases/download/${PV}/${P}.tar.bz2" - -LICENSE="BSD" -SLOT="0/2" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" -IUSE="debug hardened lazy-lock static-libs stats xmalloc" -HTML_DOCS=( doc/jemalloc.html ) -PATCHES=( "${FILESDIR}/${PN}-5.2.0-gentoo-fixups.patch" ) - -MULTILIB_WRAPPED_HEADERS=( /usr/include/jemalloc/jemalloc.h ) -# autotools-utils.eclass auto-adds configure options when static-libs is in IUSE -# but jemalloc doesn't implement them in its configure; need this here to -# supress the warnings until automagic is removed from the eclass -QA_CONFIGURE_OPTIONS="--enable-static --disable-static --enable-shared --disable-shared" - -src_prepare() { - default - eautoreconf -} - -multilib_src_configure() { - local myconf=() - - if use hardened ; then - myconf+=( --disable-syscall ) - fi - - ECONF_SOURCE="${S}" \ - econf \ - $(use_enable debug) \ - $(use_enable lazy-lock) \ - $(use_enable stats) \ - $(use_enable xmalloc) \ - "${myconf[@]}" -} - -multilib_src_install() { - # Copy man file which the Makefile looks for - cp "${S}/doc/jemalloc.3" "${BUILD_DIR}/doc" || die - emake DESTDIR="${D}" install -} - -multilib_src_install_all() { - if [[ ${CHOST} == *-darwin* ]] ; then - # fixup install_name, #437362 - install_name_tool \ - -id "${EPREFIX}"/usr/$(get_libdir)/libjemalloc.2.dylib \ - "${ED}"/usr/$(get_libdir)/libjemalloc.2.dylib || die - fi - use static-libs || find "${ED}" -name '*.a' -delete -} diff --git a/dev-libs/jemalloc/metadata.xml b/dev-libs/jemalloc/metadata.xml deleted file mode 100644 index 08893bb..0000000 --- a/dev-libs/jemalloc/metadata.xml +++ /dev/null @@ -1,19 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>mozilla@gentoo.org</email> - <name>Gentoo Mozilla Team</name> - </maintainer> - <longdescription lang="en"> - Jemalloc is a general-purpose scalable concurrent allocator - </longdescription> - <use> - <flag name="lazy-lock">Enable lazy locking (only lock when multi-threaded)</flag> - <flag name="stats">Enable statistics calculation/reporting</flag> - <flag name="xmalloc">Add support for xmalloc (abort-on-out-of-memory)</flag> - </use> - <upstream> - <remote-id type="github">jemalloc/jemalloc</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-libs/nspr/Manifest b/dev-libs/nspr/Manifest deleted file mode 100644 index 131b101..0000000 --- a/dev-libs/nspr/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST nspr-4.25.tar.gz 1079633 BLAKE2B 377e5ec0e60cca13f1ee988adb10870bbb6cb9e4eb61e4434152418d4f8d446741a192d7019298ec2669b8e190cacb6a1ca9c4b2838e9b14dd3590ed40facdd2 SHA512 b9aa576e0da37e8729088fe559d94030cf18f277c1f7a30104d3088a804913343ed884645c0adb62144da475e20934b359f897bf3ae9a6ebb5f9daf283d5a562 diff --git a/dev-libs/nspr/files/nspr-4.10.6-solaris.patch b/dev-libs/nspr/files/nspr-4.10.6-solaris.patch deleted file mode 100644 index 6ae04f4..0000000 --- a/dev-libs/nspr/files/nspr-4.10.6-solaris.patch +++ /dev/null @@ -1,32 +0,0 @@ -* drop Solaris linker stuff - ---- a/configure.in -+++ b/configure.in -@@ -1988,26 +1988,14 @@ - CPU_ARCH=`uname -p` - MDCPUCFG_H=_solaris.cfg - PR_MD_CSRCS=solaris.c -- LD=/usr/ccs/bin/ld - MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@' - RESOLVE_LINK_SYMBOLS=1 -- case "${OS_RELEASE}" in -- 5.8|5.9) -- ;; -- *) -- # It is safe to use the -Bdirect linker flag on Solaris 10 or later. -- USE_B_DIRECT=1 -- ;; -- esac - if test -n "$GNU_CC"; then - DSO_CFLAGS=-fPIC - if `$CC -print-prog-name=ld` -v 2>&1 | grep -c GNU >/dev/null; then - GCC_USE_GNU_LD=1 - fi -- DSO_LDOPTS='-shared -Wl,-h,$(notdir $@),-z,combreloc,-z,defs,-z,ignore' -- if test -n "$USE_B_DIRECT"; then -- DSO_LDOPTS="$DSO_LDOPTS,-Bdirect" -- fi -+ DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)' - else - DSO_CFLAGS=-KPIC - DSO_LDOPTS='-G -h $(notdir $@) -z combreloc -z defs -z ignore' diff --git a/dev-libs/nspr/files/nspr-4.21-ipv6-musl-support.patch b/dev-libs/nspr/files/nspr-4.21-ipv6-musl-support.patch deleted file mode 100644 index 2c8ebd4..0000000 --- a/dev-libs/nspr/files/nspr-4.21-ipv6-musl-support.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 8c57451f44d7ceb37bfb4ae6e457fc70b1f58d0a Mon Sep 17 00:00:00 2001 -From: Moritz Kick <gentoo@blackphoenix.de> -Date: Wed, 20 Mar 2019 13:36:06 -0500 -Subject: [PATCH] Added IPv6 compatibility for musl libc - -Signed-off-by: Moritz Kick <gentoo@blackphoenix.de> -Signed-off-by: Jory Pratt <anarchy@gentoo.org> ---- - pr/include/md/_linux.h | 13 +------------ - 1 file changed, 1 insertion(+), 12 deletions(-) - -diff --git a/pr/include/md/_linux.h b/pr/include/md/_linux.h -index 2370ab8..612184c 100644 ---- a/pr/include/md/_linux.h -+++ b/pr/include/md/_linux.h -@@ -289,33 +289,22 @@ static inline PRInt32 _MD_ATOMIC_SET(PRInt32 *ptr, PRInt32 nv) - #endif /* __arm__ */ - - #define USE_SETJMP --#if (defined(__GLIBC__) && __GLIBC__ >= 2) || defined(ANDROID) - #define _PR_POLL_AVAILABLE --#endif - #undef _PR_USE_POLL - #define _PR_STAT_HAS_ONLY_ST_ATIME - #if defined(__alpha) || defined(__ia64__) - #define _PR_HAVE_LARGE_OFF_T --#elif (__GLIBC__ > 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) \ -- || defined(ANDROID) --#define _PR_HAVE_OFF64_T - #else --#define _PR_NO_LARGE_FILES -+#define _PR_HAVE_OFF64_T - #endif --#if (__GLIBC__ > 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) \ -- || defined(ANDROID) - #define _PR_INET6 - #define _PR_HAVE_INET_NTOP - #define _PR_HAVE_GETHOSTBYNAME2 - #define _PR_HAVE_GETADDRINFO - #define _PR_INET6_PROBE --#endif - #ifndef ANDROID - #define _PR_HAVE_SYSV_SEMAPHORES - #define PR_HAVE_SYSV_NAMED_SHARED_MEMORY --#endif --/* Android has gethostbyname_r but not gethostbyaddr_r or gethostbyname2_r. */ --#if (__GLIBC__ >= 2) && defined(_PR_PTHREADS) - #define _PR_HAVE_GETHOST_R - #define _PR_HAVE_GETHOST_R_INT - #endif --- -2.21.0 - diff --git a/dev-libs/nspr/files/nspr-4.23-prtime.patch b/dev-libs/nspr/files/nspr-4.23-prtime.patch deleted file mode 100644 index 087e427..0000000 --- a/dev-libs/nspr/files/nspr-4.23-prtime.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- a/pr/src/misc/prtime.c -+++ b/pr/src/misc/prtime.c -@@ -1621,7 +1621,7 @@ - case TT_EET: zone_offset = 2 * 60; break; - case TT_JST: zone_offset = 9 * 60; break; - default: -- PR_ASSERT (0); -+ return PR_FAILURE; - break; - } - } -@@ -1677,11 +1677,12 @@ - struct tm localTime; - time_t secs; - -- PR_ASSERT(result->tm_month > -1 && -+ if (!(result->tm_month > -1 && - result->tm_mday > 0 && - result->tm_hour > -1 && - result->tm_min > -1 && -- result->tm_sec > -1); -+ result->tm_sec > -1)) -+ return PR_FAILURE; - - /* - * To obtain time_t from a tm structure representing the local diff --git a/dev-libs/nspr/files/nspr-4.7.1-solaris.patch b/dev-libs/nspr/files/nspr-4.7.1-solaris.patch deleted file mode 100644 index 1afab1d..0000000 --- a/dev-libs/nspr/files/nspr-4.7.1-solaris.patch +++ /dev/null @@ -1,14 +0,0 @@ -Same magic as haubi did for glib compilation, which works again here -resolving a linker problem on Solaris with GNU ld. Bug #222625 - ---- a/pr/src/Makefile.in -+++ b/pr/src/Makefile.in -@@ -95,7 +95,7 @@ - endif - - ifdef USE_PTHREADS --OS_LIBS = -lpthread ${LIBRT} -lsocket -lnsl -ldl -lc -+OS_LIBS = -pthread ${LIBRT} -lsocket -lnsl -ldl -lc - else - ifdef LOCAL_THREADS_ONLY - OS_LIBS = -lsocket -lnsl -ldl -lc diff --git a/dev-libs/nspr/files/nspr-4.8.4-darwin-install_name.patch b/dev-libs/nspr/files/nspr-4.8.4-darwin-install_name.patch deleted file mode 100644 index 4045e90..0000000 --- a/dev-libs/nspr/files/nspr-4.8.4-darwin-install_name.patch +++ /dev/null @@ -1,25 +0,0 @@ -Don't use @executable_path, it messed up linking against nspr from e.g. -nss. - ---- a/configure.in -+++ b/configure.in -@@ -1007,7 +1007,7 @@ - ;; - esac - DSO_CFLAGS=-fPIC -- DSO_LDOPTS='-dynamiclib -compatibility_version 1 -current_version 1 -all_load -install_name @executable_path/$@ -headerpad_max_install_names' -+ DSO_LDOPTS='-dynamiclib -compatibility_version 1 -current_version 1 -all_load -install_name $(libdir)/$@ -headerpad_max_install_names' - _OPTIMIZE_FLAGS=-O2 - MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@' - STRIP="$STRIP -x -S" ---- a/configure -+++ b/configure -@@ -1007,7 +1007,7 @@ - ;; - esac - DSO_CFLAGS=-fPIC -- DSO_LDOPTS='-dynamiclib -compatibility_version 1 -current_version 1 -all_load -install_name @executable_path/$@ -headerpad_max_install_names' -+ DSO_LDOPTS='-dynamiclib -compatibility_version 1 -current_version 1 -all_load -install_name $(libdir)/$@ -headerpad_max_install_names' - _OPTIMIZE_FLAGS=-O2 - MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@' - STRIP="$STRIP -x -S" diff --git a/dev-libs/nspr/files/nspr-4.8.9-link-flags.patch b/dev-libs/nspr/files/nspr-4.8.9-link-flags.patch deleted file mode 100644 index 5d37018..0000000 --- a/dev-libs/nspr/files/nspr-4.8.9-link-flags.patch +++ /dev/null @@ -1,28 +0,0 @@ -Use CFLAGS when linking. Some flags can add functionality to generated -code that requires extra libs to be linked in (eg. libgomp when using -autoparallelization). Other flags are required when building and linking -(eg. -flto). - -https://bugs.gentoo.org/365975 - ---- a/config/autoconf.mk.in -+++ b/config/autoconf.mk.in -@@ -81,6 +81,7 @@ OS_DLLFLAGS = @OS_DLLFLAGS@ - DLLFLAGS = @DLLFLAGS@ - EXEFLAGS = @EXEFLAGS@ - OPTIMIZER = @OPTIMIZER@ -+LD_CFLAGS = @CFLAGS@ - - PROFILE_GEN_CFLAGS = @PROFILE_GEN_CFLAGS@ - PROFILE_GEN_LDFLAGS = @PROFILE_GEN_LDFLAGS@ ---- a/config/config.mk -+++ b/config/config.mk -@@ -72,7 +72,7 @@ NOMD_CFLAGS = $(CC_ONLY_FLAGS) $(OPTIMIZER) $(NOMD_OS_CFLAGS)\ - NOMD_CCFLAGS = $(CCC_ONLY_FLAGS) $(OPTIMIZER) $(NOMD_OS_CFLAGS)\ - $(XP_DEFINE) $(DEFINES) $(INCLUDES) $(XCFLAGS) - --LDFLAGS = $(OS_LDFLAGS) -+LDFLAGS = $(LD_CFLAGS) $(OS_LDFLAGS) - - # Enable profile-guided optimization - ifdef MOZ_PROFILE_GENERATE diff --git a/dev-libs/nspr/files/nspr-4.9.5_nspr_config.patch b/dev-libs/nspr/files/nspr-4.9.5_nspr_config.patch deleted file mode 100644 index a22b0b9..0000000 --- a/dev-libs/nspr/files/nspr-4.9.5_nspr_config.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/config/nspr-config.in -+++ b/config/nspr-config.in -@@ -126,7 +126,7 @@ - fi - - if test "$echo_libs" = "yes"; then -- libdirs=-L$libdir -+ libdirs="" - if test -n "$lib_plds"; then - libdirs="$libdirs -lplds${major_version}" - fi diff --git a/dev-libs/nspr/metadata.xml b/dev-libs/nspr/metadata.xml deleted file mode 100644 index d9b367e..0000000 --- a/dev-libs/nspr/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<maintainer type="project"> - <email>mozilla@gentoo.org</email> - <name>Gentoo Mozilla Team</name> -</maintainer> -</pkgmetadata> diff --git a/dev-libs/nspr/nspr-4.25.ebuild b/dev-libs/nspr/nspr-4.25.ebuild deleted file mode 100644 index 0c02c60..0000000 --- a/dev-libs/nspr/nspr-4.25.ebuild +++ /dev/null @@ -1,122 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools toolchain-funcs multilib-minimal - -MIN_PV="$(ver_cut 2)" - -DESCRIPTION="Netscape Portable Runtime" -HOMEPAGE="http://www.mozilla.org/projects/nspr/" -SRC_URI="https://archive.mozilla.org/pub/nspr/releases/v${PV}/src/${P}.tar.gz" - -LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="debug elibc_musl" - -MULTILIB_CHOST_TOOLS=( - /usr/bin/nspr-config -) - -PATCHES=( - "${FILESDIR}"/${PN}-4.23-prtime.patch - "${FILESDIR}"/${PN}-4.7.1-solaris.patch - "${FILESDIR}"/${PN}-4.10.6-solaris.patch - "${FILESDIR}"/${PN}-4.8.4-darwin-install_name.patch - "${FILESDIR}"/${PN}-4.8.9-link-flags.patch - # We do not need to pass -L$libdir via nspr-config --libs - "${FILESDIR}"/${PN}-4.9.5_nspr_config.patch -) - -src_prepare() { - cd "${S}"/nspr || die - - default - - use elibc_musl && eapply "${FILESDIR}"/${PN}-4.21-ipv6-musl-support.patch - - # rename configure.in to configure.ac for new autotools compatibility - if [[ -e "${S}"/nspr/configure.in ]] ; then - einfo "Renaming configure.in to configure.ac" - mv "${S}"/nspr/configure.{in,ac} || die - else - elog "configure.in rename logic can be removed from ebuild." - fi - - # We must run eautoconf to regenerate configure - eautoconf - - # make sure it won't find Perl out of Prefix - sed -i -e "s/perl5//g" "${S}"/nspr/configure || die - - # Respect LDFLAGS - sed -i -e 's/\$(MKSHLIB) \$(OBJS)/\$(MKSHLIB) \$(LDFLAGS) \$(OBJS)/g' \ - "${S}"/nspr/config/rules.mk || die -} - -multilib_src_configure() { - # We use the standard BUILD_xxx but nspr uses HOST_xxx - tc-export_build_env BUILD_CC - export HOST_CC=${BUILD_CC} HOST_CFLAGS=${BUILD_CFLAGS} HOST_LDFLAGS=${BUILD_LDFLAGS} - tc-export AR CC CXX RANLIB - [[ ${CBUILD} != ${CHOST} ]] \ - && export CROSS_COMPILE=1 \ - || unset CROSS_COMPILE - - local myconf=( - --libdir="${EPREFIX}/usr/$(get_libdir)" - $(use_enable debug) - $(use_enable !debug optimize) - ) - - # The configure has some fancy --enable-{{n,x}32,64bit} switches - # that trigger some code conditional to platform & arch. This really - # matters for the few common arches (x86, ppc) but we pass a little - # more of them to be future-proof. - - # use ABI first, this will work for most cases - case "${ABI}" in - alpha|arm|hppa|m68k|o32|ppc|s390|sh|sparc|x86) ;; - n32) myconf+=( --enable-n32 );; - x32) myconf+=( --enable-x32 );; - s390x|*64) myconf+=( --enable-64bit );; - default) # no abi actually set, fall back to old check - einfo "Running a short build test to determine 64bit'ness" - echo > "${T}"/test.c || die - ${CC} ${CFLAGS} ${CPPFLAGS} -c "${T}"/test.c -o "${T}"/test.o || die - case $(file "${T}"/test.o) in - *32-bit*x86-64*) myconf+=( --enable-x32 );; - *64-bit*|*ppc64*|*x86_64*) myconf+=( --enable-64bit );; - *32-bit*|*ppc*|*i386*) ;; - *) die "Failed to detect whether your arch is 64bits or 32bits, disable distcc if you're using it, please";; - esac ;; - *) ;; - esac - - # Ancient autoconf needs help finding the right tools. - LC_ALL="C" ECONF_SOURCE="${S}/nspr" \ - ac_cv_path_AR="${AR}" \ - econf "${myconf[@]}" -} - -multilib_src_install() { - # Their build system is royally confusing, as usual - MINOR_VERSION=${MIN_PV} # Used for .so version - emake DESTDIR="${D}" install - - einfo "removing static libraries as upstream has requested!" - rm "${ED}"/usr/$(get_libdir)/*.a || die "failed to remove static libraries." - - # install nspr-config - dobin config/nspr-config - - # Remove stupid files in /usr/bin - rm "${ED}"/usr/bin/prerr.properties || die - - # This is used only to generate prerr.c and prerr.h at build time. - # No other projects use it, and we don't want to depend on perl. - # Talked to upstream and they agreed w/punting. - rm "${ED}"/usr/bin/compile-et.pl || die -} diff --git a/dev-libs/nss-pem/Manifest b/dev-libs/nss-pem/Manifest deleted file mode 100644 index 5a3fe75..0000000 --- a/dev-libs/nss-pem/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST nss-pem-1.0.5.tar.xz 36320 BLAKE2B c2294595d95a2de2bf6d9e68dc10955297fb6ef27c9e85dbabc7854b900942070f70a8e4c1abef618e7265daa75f5bd2a2fca3fe923973345f9c1b64a3da8ff5 SHA512 8dabebf114ac94441caf6d279f810de4124a3ffc05ae66777496b3e66f8b8148d535cb438a165d84f53111c468d595f3b16651cd7a990eeedca9d413aad65b2b diff --git a/dev-libs/nss-pem/metadata.xml b/dev-libs/nss-pem/metadata.xml deleted file mode 100644 index 013b4ad..0000000 --- a/dev-libs/nss-pem/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>anarchy@gentoo.org</email> - <name>Jory A. Pratt</name> - </maintainer> -<upstream> - <remote-id type="github">kdudka/nss-pem</remote-id> -</upstream> -</pkgmetadata> diff --git a/dev-libs/nss-pem/nss-pem-1.0.5.ebuild b/dev-libs/nss-pem/nss-pem-1.0.5.ebuild deleted file mode 100644 index 8c40845..0000000 --- a/dev-libs/nss-pem/nss-pem-1.0.5.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -CMAKE_ECLASS="cmake" - -inherit cmake-multilib - -DESCRIPTION="PEM file reader for Network Security Services (NSS)" -HOMEPAGE="https://github.com/kdudka/nss-pem" -SRC_URI="https://github.com/kdudka/${PN}/releases/download/${P}/${P}.tar.xz" - -LICENSE="MPL-1.1" -SLOT="0" -KEYWORDS="~amd64 ~arm64" -IUSE="" - -BDEPEND=" >=dev-libs/nss-3.50-r1 " -RDEPEND="${BDEPEND}" - -DEPEND="!<=dev-libs/nss-3.50 - ${RDEPEND}" - -S="${WORKDIR}/${P}/src" - -multilib_src_configure() { - local mycmakeargs=( - -DLIB_INSTALL_DIR="$(get_libdir)" - ) - cmake_src_configure -} diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest deleted file mode 100644 index 3f1f003..0000000 --- a/dev-libs/nss/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST nss-3.57.tar.gz 81712830 BLAKE2B 998160fe16e13d1997f3d11a054148349b068214afb3c0cd3b9e82ce03999e46ca34b02907dc27e3f253653f6e57a9f1498e6c16f8665350c629f5c3c98ea0bc SHA512 7e312d7539a26f57b968548935a7715cfa895aa61da21d0542ae45b71cb16f63167728534cdfd15f8eca68c75753a0df3d05e87b4c5acaabbda63c736e552ea2 -DIST nss-cacert-class1-class3.patch 22950 BLAKE2B 9d5e60df5f161a3c27c41e5a9419440a54f888eda454e3cde5ebe626d4075b65cf9938b5144d0fb022377f4bd415bff5e5c67d104409860aa9391b3eb8872c68 SHA512 a5aa740bf110a3f0262e3f1ef2fc739ac2b44f042e220039d48aee8e97cd764d5c10718220364f4098aba955882bd02cadb5481512388971a8290312f88a7df0 diff --git a/dev-libs/nss/files/nss-3.21-gentoo-fixup-warnings.patch b/dev-libs/nss/files/nss-3.21-gentoo-fixup-warnings.patch deleted file mode 100644 index 14234e8..0000000 --- a/dev-libs/nss/files/nss-3.21-gentoo-fixup-warnings.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- nss/coreconf/Linux.mk -+++ nss/coreconf/Linux.mk -@@ -130,6 +130,7 @@ - OPTIMIZER += -gdwarf-2 - endif - endif -+OPTIMIZER += -fno-strict-aliasing - endif - - ifndef COMPILER_TAG diff --git a/dev-libs/nss/files/nss-3.23-hppa-byte_order.patch b/dev-libs/nss/files/nss-3.23-hppa-byte_order.patch deleted file mode 100644 index 63cfadd..0000000 --- a/dev-libs/nss/files/nss-3.23-hppa-byte_order.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- nss/lib/dbm/include/mcom_db.h -+++ nss/lib/dbm/include/mcom_db.h -@@ -110,11 +110,13 @@ - #endif /* !BYTE_ORDER */ - #endif /* __sun */ - -+#ifndef BYTE_ORDER - #if defined(__hpux) || defined(__hppa) - #define BYTE_ORDER BIG_ENDIAN - #define BIG_ENDIAN 4321 - #define LITTLE_ENDIAN 1234 /* LSB first: i386, vax, all NT risc */ - #endif -+#endif /* !BYTE_ORDER */ - - #if defined(AIXV3) || defined(AIX) - /* BYTE_ORDER, LITTLE_ENDIAN, BIG_ENDIAN are all defined here */ diff --git a/dev-libs/nss/files/nss-3.53-fix-building-on-ppc.patch b/dev-libs/nss/files/nss-3.53-fix-building-on-ppc.patch deleted file mode 100644 index 962b9cb..0000000 --- a/dev-libs/nss/files/nss-3.53-fix-building-on-ppc.patch +++ /dev/null @@ -1,39 +0,0 @@ -https://bugzilla.mozilla.org/show_bug.cgi?id=1642174 - -From a7a862bab5e4aae4615ddae3cbe230345f92ed0d Mon Sep 17 00:00:00 2001 -From: Lauri Kasanen <cand@gmx.com> -Date: Mon, 1 Jun 2020 12:11:45 +0300 -Subject: [PATCH v3] Bug 1642174 /usr/bin/ld: OBJS/Linux_SINGLE_SHLIB/sha512-p8.o: - ABI version 2 is not compatible with ABI version 1 output - -Don't try to build the SHA-2 accelerated asm on old-ABI ppc. - -Currently make only, I don't have enough gyp-fu to do that side. -However, the reporters of 1642174 and 1635625 both used make, not gyp. - -Signed-off-by: Lauri Kasanen <cand@gmx.com> ---- - lib/freebl/Makefile | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/lib/freebl/Makefile b/lib/freebl/Makefile -index 5f7384429..e0461c7d3 100644 ---- a/lib/freebl/Makefile -+++ b/lib/freebl/Makefile -@@ -267,9 +267,12 @@ ifeq ($(CPU_ARCH),arm) - endif - ifeq ($(CPU_ARCH),ppc) - EXTRA_SRCS += gcm-ppc.c -- ASFILES += sha512-p8.s - ifdef USE_64 - DEFINES += -DNSS_NO_INIT_SUPPORT -+ PPC_ABI := $(shell $(CC) -dM -E - < /dev/null | awk '$$2 == "_CALL_ELF" {print $$3}') -+ ifeq ($(PPC_ABI),2) -+ ASFILES += sha512-p8.s -+ endif - endif # USE_64 - endif # ppc - endif # Linux --- -2.19.1 - diff --git a/dev-libs/nss/files/nss-3.53-gentoo-fixups.patch b/dev-libs/nss/files/nss-3.53-gentoo-fixups.patch deleted file mode 100644 index 2d8bdb6..0000000 --- a/dev-libs/nss/files/nss-3.53-gentoo-fixups.patch +++ /dev/null @@ -1,290 +0,0 @@ -From 1b3c48499abb000d708abe5f05413c1f4155e086 Mon Sep 17 00:00:00 2001 -From: Jory Pratt <anarchy@gentoo.org> -Date: Mon, 8 Jun 2020 12:22:29 -0500 -Subject: [PATCH] Add pkg-config and nss-config for Gentoo - ---- - Makefile | 15 +---- - config/Makefile | 40 ++++++++++++ - config/nss-config.in | 145 +++++++++++++++++++++++++++++++++++++++++++ - config/nss.pc.in | 12 ++++ - manifest.mn | 2 +- - 5 files changed, 200 insertions(+), 14 deletions(-) - create mode 100644 config/Makefile - create mode 100644 config/nss-config.in - create mode 100644 config/nss.pc.in - -diff --git a/Makefile b/Makefile -index eb4ed1a..f979d90 100644 ---- a/Makefile -+++ b/Makefile -@@ -4,6 +4,8 @@ - # License, v. 2.0. If a copy of the MPL was not distributed with this - # file, You can obtain one at http://mozilla.org/MPL/2.0/. - -+default: nss_build_all -+ - ####################################################################### - # (1) Include initial platform-independent assignments (MANDATORY). # - ####################################################################### -@@ -48,12 +50,9 @@ include $(CORE_DEPTH)/coreconf/rules.mk - ####################################################################### - - nss_build_all: -- $(MAKE) build_nspr - $(MAKE) all -- $(MAKE) latest - - nss_clean_all: -- $(MAKE) clobber_nspr - $(MAKE) clobber - - NSPR_CONFIG_STATUS = $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME)/config.status -@@ -138,16 +137,6 @@ $(NSPR_CONFIG_STATUS): $(NSPR_CONFIGURE) - --prefix='$(NSS_GYP_PREFIX)' - endif - --build_nspr: $(NSPR_CONFIG_STATUS) -- $(MAKE) -C $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME) -- $(MAKE) -C $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME)/pr/tests -- --install_nspr: build_nspr -- $(MAKE) -C $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME) install -- --clobber_nspr: $(NSPR_CONFIG_STATUS) -- $(MAKE) -C $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME) clobber -- - build_docs: - $(MAKE) -C $(CORE_DEPTH)/doc - -diff --git a/config/Makefile b/config/Makefile -new file mode 100644 -index 0000000..aaf1991 ---- /dev/null -+++ b/config/Makefile -@@ -0,0 +1,40 @@ -+CORE_DEPTH = .. -+DEPTH = .. -+ -+include $(CORE_DEPTH)/coreconf/config.mk -+ -+NSS_MAJOR_VERSION = $(shell grep -F "NSS_VMAJOR" ../lib/nss/nss.h | awk '{print $$3}') -+NSS_MINOR_VERSION = $(shell grep -F "NSS_VMINOR" ../lib/nss/nss.h | awk '{print $$3}') -+NSS_PATCH_VERSION = $(shell grep -F "NSS_VPATCH" ../lib/nss/nss.h | awk '{print $$3}') -+PREFIX = /usr -+ -+all: export libs -+ -+export: -+ # Create the nss.pc file -+ mkdir -p $(DIST)/lib/pkgconfig -+ sed -e "s,@prefix@,$(PREFIX)," \ -+ -e "s,@exec_prefix@,\$${prefix}," \ -+ -e "s,@libdir@,\$${prefix}/lib64," \ -+ -e "s,@includedir@,\$${prefix}/include/nss," \ -+ -e "s,@NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION),g" \ -+ -e "s,@NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \ -+ -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \ -+ nss.pc.in > nss.pc -+ chmod 0644 nss.pc -+ ln -sf ../../../../config/nss.pc $(DIST)/lib/pkgconfig -+ -+ # Create the nss-config script -+ mkdir -p $(DIST)/bin -+ sed -e "s,@prefix@,$(PREFIX)," \ -+ -e "s,@NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION)," \ -+ -e "s,@NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \ -+ -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \ -+ nss-config.in > nss-config -+ chmod 0755 nss-config -+ ln -sf ../../../config/nss-config $(DIST)/bin -+ -+libs: -+ -+dummy: all export libs -+ -diff --git a/config/nss-config.in b/config/nss-config.in -new file mode 100644 -index 0000000..3a957b8 ---- /dev/null -+++ b/config/nss-config.in -@@ -0,0 +1,145 @@ -+#!/bin/sh -+ -+prefix=@prefix@ -+ -+major_version=@NSS_MAJOR_VERSION@ -+minor_version=@NSS_MINOR_VERSION@ -+patch_version=@NSS_PATCH_VERSION@ -+ -+usage() -+{ -+ cat <<EOF -+Usage: nss-config [OPTIONS] [LIBRARIES] -+Options: -+ [--prefix[=DIR]] -+ [--exec-prefix[=DIR]] -+ [--includedir[=DIR]] -+ [--libdir[=DIR]] -+ [--version] -+ [--libs] -+ [--cflags] -+Dynamic Libraries: -+ nss -+ ssl -+ smime -+ nssutil -+EOF -+ exit $1 -+} -+ -+if test $# -eq 0; then -+ usage 1 1>&2 -+fi -+ -+lib_ssl=yes -+lib_smime=yes -+lib_nss=yes -+lib_nssutil=yes -+ -+while test $# -gt 0; do -+ case "$1" in -+ -*=*) optarg=$(echo "$1" | sed 's/[-_a-zA-Z0-9]*=//') ;; -+ *) optarg= ;; -+ esac -+ -+ case $1 in -+ --prefix=*) -+ prefix=${optarg} -+ ;; -+ --prefix) -+ echo_prefix=yes -+ ;; -+ --exec-prefix=*) -+ exec_prefix=${optarg} -+ ;; -+ --exec-prefix) -+ echo_exec_prefix=yes -+ ;; -+ --includedir=*) -+ includedir=${optarg} -+ ;; -+ --includedir) -+ echo_includedir=yes -+ ;; -+ --libdir=*) -+ libdir=${optarg} -+ ;; -+ --libdir) -+ echo_libdir=yes -+ ;; -+ --version) -+ echo ${major_version}.${minor_version}.${patch_version} -+ ;; -+ --cflags) -+ echo_cflags=yes -+ ;; -+ --libs) -+ echo_libs=yes -+ ;; -+ ssl) -+ lib_ssl=yes -+ ;; -+ smime) -+ lib_smime=yes -+ ;; -+ nss) -+ lib_nss=yes -+ ;; -+ nssutil) -+ lib_nssutil=yes -+ ;; -+ *) -+ usage 1 1>&2 -+ ;; -+ esac -+ shift -+done -+ -+# Set variables that may be dependent upon other variables -+if test -z "${exec_prefix}"; then -+ exec_prefix=$(pkg-config --variable=exec_prefix nss) -+fi -+if test -z "${includedir}"; then -+ includedir=$(pkg-config --variable=includedir nss) -+fi -+if test -z "${libdir}"; then -+ libdir=$(pkg-config --variable=libdir nss) -+fi -+ -+if test "${echo_prefix}" = "yes"; then -+ echo ${prefix} -+fi -+ -+if test "${echo_exec_prefix}" = "yes"; then -+ echo ${exec_prefix} -+fi -+ -+if test "${echo_includedir}" = "yes"; then -+ echo ${includedir} -+fi -+ -+if test "${echo_libdir}" = "yes"; then -+ echo ${libdir} -+fi -+ -+if test "${echo_cflags}" = "yes"; then -+ echo -I${includedir} -+fi -+ -+if test "${echo_libs}" = "yes"; then -+ libdirs="" -+ if test -n "${lib_ssl}"; then -+ libdirs="${libdirs} -lssl${major_version}" -+ fi -+ if test -n "${lib_smime}"; then -+ libdirs="${libdirs} -lsmime${major_version}" -+ fi -+ if test -n "${lib_nss}"; then -+ libdirs="${libdirs} -lnss${major_version}" -+ fi -+ if test -n "${lib_nssutil}"; then -+ libdirs="${libdirs} -lnssutil${major_version}" -+ fi -+ echo ${libdirs} -+fi -+ -diff --git a/config/nss.pc.in b/config/nss.pc.in -new file mode 100644 -index 0000000..03f1e39 ---- /dev/null -+++ b/config/nss.pc.in -@@ -0,0 +1,12 @@ -+prefix=@prefix@ -+exec_prefix=@exec_prefix@ -+libdir=@libdir@ -+includedir=@includedir@ -+ -+Name: NSS -+Description: Network Security Services -+Version: @NSS_MAJOR_VERSION@.@NSS_MINOR_VERSION@.@NSS_PATCH_VERSION@ -+Requires: nspr >= 4.25 -+Libs: -lssl3 -lsmime3 -lnss3 -lnssutil3 -+Cflags: -I${includedir} -+ -diff --git a/manifest.mn b/manifest.mn -index dada8ab..72dc9b3 100644 ---- a/manifest.mn -+++ b/manifest.mn -@@ -10,7 +10,7 @@ IMPORTS = nspr20/v4.8 \ - - RELEASE = nss - --DIRS = coreconf lib cmd cpputil gtests -+DIRS = coreconf lib cmd cpputil config - - lib: coreconf - cmd: lib --- -2.26.2 - diff --git a/dev-libs/nss/metadata.xml b/dev-libs/nss/metadata.xml deleted file mode 100644 index c76b165..0000000 --- a/dev-libs/nss/metadata.xml +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<maintainer type="project"> - <email>mozilla@gentoo.org</email> - <name>Gentoo Mozilla Team</name> -</maintainer> -<use> - <flag name="cacert"> - Include root/class3 certs from CAcert (http://www.cacert.org/) - </flag> - <flag name="utils">Install utilities included with the library</flag> -</use> -<upstream> - <remote-id type="cpe">cpe:/a:mozilla:nss</remote-id> -</upstream> -</pkgmetadata> diff --git a/dev-libs/nss/nss-3.57.ebuild b/dev-libs/nss/nss-3.57.ebuild deleted file mode 100644 index c5e3dea..0000000 --- a/dev-libs/nss/nss-3.57.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="http://www.mozilla.org/projects/security/pki/nss/" -SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/${P}.tar.gz - cacert? ( https://dev.gentoo.org/~axs/distfiles/${PN}-cacert-class1-class3.patch )" - -LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="cacert utils" -# pkg-config called by nss-config -> virtual/pkgconfig in RDEPEND -RDEPEND=" - >=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}] - >=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}] - >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] - virtual/pkgconfig -" -DEPEND="${RDEPEND}" - -RESTRICT="test" - -S="${WORKDIR}/${P}/${PN}" - -MULTILIB_CHOST_TOOLS=( - /usr/bin/nss-config -) - -PATCHES=( - # Custom changes for gentoo - "${FILESDIR}/${PN}-3.53-gentoo-fixups.patch" - "${FILESDIR}/${PN}-3.21-gentoo-fixup-warnings.patch" - "${FILESDIR}/${PN}-3.23-hppa-byte_order.patch" - "${FILESDIR}/${PN}-3.53-fix-building-on-ppc.patch" -) - -src_prepare() { - if use cacert ; then #521462 - PATCHES+=( - "${DISTDIR}/${PN}-cacert-class1-class3.patch" - ) - fi - - default - - pushd coreconf >/dev/null || die - # hack nspr paths - echo 'INCLUDES += -I$(DIST)/include/dbm' \ - >> headers.mk || die "failed to append include" - - # modify install path - sed -e '/CORE_DEPTH/s:SOURCE_PREFIX.*$:SOURCE_PREFIX = $(CORE_DEPTH)/dist:' \ - -i source.mk || die - - # Respect LDFLAGS - sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk - popd >/dev/null || die - - # Fix pkgconfig file for Prefix - sed -i -e "/^PREFIX =/s:= /usr:= ${EPREFIX}/usr:" \ - config/Makefile || die - - # use host shlibsign if need be #436216 - if tc-is-cross-compiler ; then - sed -i \ - -e 's:"${2}"/shlibsign:shlibsign:' \ - cmd/shlibsign/sign.sh || die - fi - - # dirty hack - sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../freebl/\$(OBJDIR):" \ - lib/ssl/config.mk || die - sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../../lib/freebl/\$(OBJDIR):" \ - cmd/platlibs.mk || die - - multilib_copy_sources - - strip-flags -} - -multilib_src_configure() { - # Ensure we stay multilib aware - sed -i -e "/@libdir@/ s:lib64:$(get_libdir):" config/Makefile || die -} - -nssarch() { - # Most of the arches are the same as $ARCH - local t=${1:-${CHOST}} - case ${t} in - aarch64*)echo "aarch64";; - hppa*) echo "parisc";; - i?86*) echo "i686";; - x86_64*) echo "x86_64";; - *) tc-arch ${t};; - esac -} - -nssbits() { - local cc cppflags="${1}CPPFLAGS" cflags="${1}CFLAGS" - if [[ ${1} == BUILD_ ]]; then - cc=$(tc-getBUILD_CC) - else - cc=$(tc-getCC) - fi - echo > "${T}"/test.c || die - ${cc} ${!cppflags} ${!cflags} -c "${T}"/test.c -o "${T}/${1}test.o" || die - case $(file "${T}/${1}test.o") in - *32-bit*x86-64*) echo USE_X32=1;; - *64-bit*|*ppc64*|*x86_64*) echo USE_64=1;; - *32-bit*|*ppc*|*i386*) ;; - *) die "Failed to detect whether ${cc} builds 64bits or 32bits, disable distcc if you're using it, please";; - esac -} - -multilib_src_compile() { - # use ABI to determine bit'ness, or fallback if unset - local buildbits mybits - case "${ABI}" in - n32) mybits="USE_N32=1";; - x32) mybits="USE_X32=1";; - s390x|*64) mybits="USE_64=1";; - ${DEFAULT_ABI}) - einfo "Running compilation test to determine bit'ness" - mybits=$(nssbits) - ;; - esac - # bitness of host may differ from target - if tc-is-cross-compiler; then - buildbits=$(nssbits BUILD_) - fi - - local makeargs=( - CC="$(tc-getCC)" - CCC="$(tc-getCXX)" - AR="$(tc-getAR) rc \$@" - RANLIB="$(tc-getRANLIB)" - OPTIMIZER= - ${mybits} - ) - - # Take care of nspr settings #436216 - local myCPPFLAGS="${CPPFLAGS} $($(tc-getPKG_CONFIG) nspr --cflags)" - unset NSPR_INCLUDE_DIR - - export NSS_ALLOW_SSLKEYLOGFILE=1 - export NSS_ENABLE_WERROR=0 #567158 - export BUILD_OPT=1 - export NSS_USE_SYSTEM_SQLITE=1 - export NSDISTMODE=copy - export FREEBL_NO_DEPEND=1 - export FREEBL_LOWHASH=1 - export NSS_SEED_ONLY_DEV_URANDOM=1 - export USE_SYSTEM_ZLIB=1 - export ZLIB_LIBS=-lz - export ASFLAGS="" - # 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-qt/qtnetwork/Manifest b/dev-qt/qtnetwork/Manifest deleted file mode 100644 index 8401e88..0000000 --- a/dev-qt/qtnetwork/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST qtbase-everywhere-src-5.14.2.tar.xz 49865752 BLAKE2B ed8eb18dfc79e9983248655eb62e8305ef8b79f96c7880c88533250fef8f0d187cf576082d41df08314711b4c007b94686486abd77bf9bc201336caa02ced300 SHA512 8c83e06d58b56e9f288e83d6c3dd4ad6cc9f1eb1a32c7b44fb912fda34ed7255766fd9fa60cd740ee001df7d6172f25df05f1f95e986c3e793fbcd9bf4f18de9 diff --git a/dev-qt/qtnetwork/files/qtnetwork-5.12.1-libressl.patch b/dev-qt/qtnetwork/files/qtnetwork-5.12.1-libressl.patch deleted file mode 100644 index bd86269..0000000 --- a/dev-qt/qtnetwork/files/qtnetwork-5.12.1-libressl.patch +++ /dev/null @@ -1,93 +0,0 @@ -diff --git a/src/network/configure.json b/src/network/configure.json -index f3e18662aa..8990763756 100644 ---- a/src/network/configure.json -+++ b/src/network/configure.json -@@ -165,7 +165,7 @@ - "test": { - "include": "openssl/opensslv.h", - "tail": [ -- "#if !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER-0 < 0x10100000L", -+ "#if !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER-0 < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)", - "# error OpenSSL >= 1.1 is required", - "#endif" - ] -diff --git a/src/network/ssl/qsslcontext_openssl.cpp b/src/network/ssl/qsslcontext_openssl.cpp -index 35cca9f01a..03afdc5945 100644 ---- a/src/network/ssl/qsslcontext_openssl.cpp -+++ b/src/network/ssl/qsslcontext_openssl.cpp -@@ -249,7 +249,7 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext) - if (sslContext->sslConfiguration.backendConfiguration().isEmpty()) - return; - --#if OPENSSL_VERSION_NUMBER >= 0x10002000L -+#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(LIBRESSL_VERSION_NUMBER) - if (QSslSocket::sslLibraryVersionNumber() >= 0x10002000L) { - QSharedPointer<SSL_CONF_CTX> cctx(q_SSL_CONF_CTX_new(), &q_SSL_CONF_CTX_free); - if (cctx) { -diff --git a/src/network/ssl/qsslsocket_openssl_symbols.cpp b/src/network/ssl/qsslsocket_openssl_symbols.cpp -index 299df6b685..670314d7e5 100644 ---- a/src/network/ssl/qsslsocket_openssl_symbols.cpp -+++ b/src/network/ssl/qsslsocket_openssl_symbols.cpp -@@ -216,8 +216,13 @@ DEFINEFUNC3(void *, ASN1_dup, i2d_of_void *a, a, d2i_of_void *b, b, char *c, c, - #endif - DEFINEFUNC2(BIO *, BIO_new_file, const char *filename, filename, const char *mode, mode, return nullptr, return) - DEFINEFUNC(void, ERR_clear_error, DUMMYARG, DUMMYARG, return, DUMMYARG) -+#ifdef LIBRESSL_VERSION_NUMBER -+DEFINEFUNC(BIO *, BIO_new, const BIO_METHOD *a, a, return nullptr, return) -+DEFINEFUNC(const BIO_METHOD *, BIO_s_mem, void, DUMMYARG, return nullptr, return) -+#else - DEFINEFUNC(BIO *, BIO_new, BIO_METHOD *a, a, return nullptr, return) - DEFINEFUNC(BIO_METHOD *, BIO_s_mem, void, DUMMYARG, return nullptr, return) -+#endif - DEFINEFUNC(int, CRYPTO_num_locks, DUMMYARG, DUMMYARG, return 0, return) - DEFINEFUNC(void, CRYPTO_set_locking_callback, void (*a)(int, int, const char *, int), a, return, DUMMYARG) - DEFINEFUNC(void, CRYPTO_set_id_callback, unsigned long (*a)(), a, return, DUMMYARG) -@@ -443,7 +448,7 @@ DEFINEFUNC2(int, SSL_CTX_use_PrivateKey, SSL_CTX *a, a, EVP_PKEY *b, b, return - - DEFINEFUNC2(int, SSL_CTX_use_RSAPrivateKey, SSL_CTX *a, a, RSA *b, b, return -1, return) - DEFINEFUNC3(int, SSL_CTX_use_PrivateKey_file, SSL_CTX *a, a, const char *b, b, int c, c, return -1, return) - DEFINEFUNC(X509_STORE *, SSL_CTX_get_cert_store, const SSL_CTX *a, a, return nullptr, return) --#if OPENSSL_VERSION_NUMBER >= 0x10002000L -+#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(LIBRESSL_VERSION_NUMBER) - DEFINEFUNC(SSL_CONF_CTX *, SSL_CONF_CTX_new, DUMMYARG, DUMMYARG, return nullptr, return); - DEFINEFUNC(void, SSL_CONF_CTX_free, SSL_CONF_CTX *a, a, return ,return); - DEFINEFUNC2(void, SSL_CONF_CTX_set_ssl_ctx, SSL_CONF_CTX *a, a, SSL_CTX *b, b, return, return); -@@ -1246,7 +1251,7 @@ bool q_resolveOpenSslSymbols() - RESOLVEFUNC(SSL_CTX_use_RSAPrivateKey) - RESOLVEFUNC(SSL_CTX_use_PrivateKey_file) - RESOLVEFUNC(SSL_CTX_get_cert_store); --#if OPENSSL_VERSION_NUMBER >= 0x10002000L -+#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(LIBRESSL_VERSION_NUMBER) - RESOLVEFUNC(SSL_CONF_CTX_new); - RESOLVEFUNC(SSL_CONF_CTX_free); - RESOLVEFUNC(SSL_CONF_CTX_set_ssl_ctx); -diff --git a/src/network/ssl/qsslsocket_openssl_symbols_p.h b/src/network/ssl/qsslsocket_openssl_symbols_p.h -index bfdfbf0efc..ad2bd4056b 100644 ---- a/src/network/ssl/qsslsocket_openssl_symbols_p.h -+++ b/src/network/ssl/qsslsocket_openssl_symbols_p.h -@@ -359,7 +359,7 @@ int q_SSL_CTX_use_PrivateKey(SSL_CTX *a, EVP_PKEY *b); - int q_SSL_CTX_use_RSAPrivateKey(SSL_CTX *a, RSA *b); - int q_SSL_CTX_use_PrivateKey_file(SSL_CTX *a, const char *b, int c); - X509_STORE *q_SSL_CTX_get_cert_store(const SSL_CTX *a); --#if OPENSSL_VERSION_NUMBER >= 0x10002000L -+#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(LIBRESSL_VERSION_NUMBER) - SSL_CONF_CTX *q_SSL_CONF_CTX_new(); - void q_SSL_CONF_CTX_free(SSL_CONF_CTX *a); - void q_SSL_CONF_CTX_set_ssl_ctx(SSL_CONF_CTX *a, SSL_CTX *b); -diff --git a/src/network/ssl/qsslsocket_opensslpre11_symbols_p.h b/src/network/ssl/qsslsocket_opensslpre11_symbols_p.h -index b7bac5d2a2..9a1a89b0e4 100644 ---- a/src/network/ssl/qsslsocket_opensslpre11_symbols_p.h -+++ b/src/network/ssl/qsslsocket_opensslpre11_symbols_p.h -@@ -78,8 +78,13 @@ - unsigned char * q_ASN1_STRING_data(ASN1_STRING *a); - BIO *q_BIO_new_file(const char *filename, const char *mode); - void q_ERR_clear_error(); -+#ifdef LIBRESSL_VERSION_NUMBER -+Q_AUTOTEST_EXPORT BIO *q_BIO_new(const BIO_METHOD *a); -+Q_AUTOTEST_EXPORT const BIO_METHOD *q_BIO_s_mem(); -+#else - Q_AUTOTEST_EXPORT BIO *q_BIO_new(BIO_METHOD *a); - Q_AUTOTEST_EXPORT BIO_METHOD *q_BIO_s_mem(); -+#endif - int q_CRYPTO_num_locks(); - void q_CRYPTO_set_locking_callback(void (*a)(int, int, const char *, int)); - void q_CRYPTO_set_id_callback(unsigned long (*a)()); diff --git a/dev-qt/qtnetwork/files/qtnetwork-5.12.4-libressl.patch b/dev-qt/qtnetwork/files/qtnetwork-5.12.4-libressl.patch deleted file mode 100644 index 8f33a93..0000000 --- a/dev-qt/qtnetwork/files/qtnetwork-5.12.4-libressl.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/network/ssl/qsslsocket_openssl.cpp b/src/network/ssl/qsslsocket_openssl.cpp -index c8bc6e06..76324ea5 100644 ---- a/src/network/ssl/qsslsocket_openssl.cpp -+++ b/src/network/ssl/qsslsocket_openssl.cpp -@@ -460,7 +460,7 @@ bool QSslSocketBackendPrivate::initSslContext() - q_SSL_set_psk_server_callback(ssl, &q_ssl_psk_server_callback); - } - #endif --#if OPENSSL_VERSION_NUMBER >= 0x10101006L -+#if OPENSSL_VERSION_NUMBER >= 0x10101006L && !defined(LIBRESSL_VERSION_NUMBER) - // Set the client callback for TLSv1.3 PSK - if (mode == QSslSocket::SslClientMode - && QSslSocket::sslLibraryBuildVersionNumber() >= 0x10101006L) { diff --git a/dev-qt/qtnetwork/files/qtnetwork-5.14.2-CVE-2020-13962.patch b/dev-qt/qtnetwork/files/qtnetwork-5.14.2-CVE-2020-13962.patch deleted file mode 100644 index 9bbdda6..0000000 --- a/dev-qt/qtnetwork/files/qtnetwork-5.14.2-CVE-2020-13962.patch +++ /dev/null @@ -1,172 +0,0 @@ -From 8ddffc6ba4f38bb8dbeb0cf61b6b10ee73505bbb Mon Sep 17 00:00:00 2001 -From: Timur Pocheptsov <timur.pocheptsov@qt.io> -Date: Mon, 13 Apr 2020 20:31:34 +0200 -Subject: [PATCH] OpenSSL: handle SSL_shutdown's errors properly -MIME-Version: 1.0 -Content-Type: text/plain; charset=utf8 -Content-Transfer-Encoding: 8bit - -Do not call SSL_shutdown on a session that is in handshake state (SSL_in_init(s) -returns 1). Also, do not call SSL_shutdown if a session encountered a fatal -error (SSL_ERROR_SYSCALL or SSL_ERROR_SSL was found before). If SSL_shutdown -was unsuccessful (returned code != 1), we have to clear the error(s) it queued. -Unfortunately, SSL_in_init was a macro in OpenSSL 1.0.x. We have to -resolve SSL_state to implement SSL_in_init. - -Fixes: QTBUG-83450 -Change-Id: I6326119f4e79605429263045ac20605c30dccca3 -Reviewed-by: MÃ¥rten Nordheim <marten.nordheim@qt.io> -(cherry picked from commit 8907635da59c2ae0e8db01f27b24a841b830e655) ---- - src/network/ssl/qsslsocket.cpp | 2 +- - src/network/ssl/qsslsocket_openssl.cpp | 23 ++++++++++++++++------ - src/network/ssl/qsslsocket_openssl11_symbols_p.h | 7 +++++++ - src/network/ssl/qsslsocket_openssl_symbols.cpp | 8 ++++++++ - .../ssl/qsslsocket_opensslpre11_symbols_p.h | 2 ++ - src/network/ssl/qsslsocket_p.h | 1 + - 6 files changed, 36 insertions(+), 7 deletions(-) - -diff --git a/src/network/ssl/qsslsocket.cpp b/src/network/ssl/qsslsocket.cpp -index 4e9e9472631..5c9e589ec39 100644 ---- a/src/network/ssl/qsslsocket.cpp -+++ b/src/network/ssl/qsslsocket.cpp -@@ -2166,7 +2166,7 @@ void QSslSocketPrivate::init() - pendingClose = false; - flushTriggered = false; - ocspResponses.clear(); -- -+ systemOrSslErrorDetected = false; - // we don't want to clear the ignoreErrorsList, so - // that it is possible setting it before connecting - // ignoreErrorsList.clear(); -diff --git a/src/network/ssl/qsslsocket_openssl.cpp b/src/network/ssl/qsslsocket_openssl.cpp -index 51510f1c60b..855865209bc 100644 ---- a/src/network/ssl/qsslsocket_openssl.cpp -+++ b/src/network/ssl/qsslsocket_openssl.cpp -@@ -648,10 +648,16 @@ bool QSslSocketBackendPrivate::initSslContext() - void QSslSocketBackendPrivate::destroySslContext() - { - if (ssl) { -- // We do not send a shutdown alert here. Just mark the session as -- // resumable for qhttpnetworkconnection's "optimization", otherwise -- // OpenSSL won't start a session resumption. -- q_SSL_shutdown(ssl); -+ if (!q_SSL_in_init(ssl) && !systemOrSslErrorDetected) { -+ // We do not send a shutdown alert here. Just mark the session as -+ // resumable for qhttpnetworkconnection's "optimization", otherwise -+ // OpenSSL won't start a session resumption. -+ if (q_SSL_shutdown(ssl) != 1) { -+ // Some error may be queued, clear it. -+ const auto errors = getErrorsFromOpenSsl(); -+ Q_UNUSED(errors); -+ } -+ } - q_SSL_free(ssl); - ssl = nullptr; - } -@@ -1084,6 +1090,7 @@ void QSslSocketBackendPrivate::transmit() - case SSL_ERROR_SSL: // error in the SSL library - // we do not know exactly what the error is, nor whether we can recover from it, - // so just return to prevent an endless loop in the outer "while" statement -+ systemOrSslErrorDetected = true; - { - const ScopedBool bg(inSetAndEmitError, true); - setErrorAndEmit(QAbstractSocket::SslInternalError, -@@ -1681,8 +1688,12 @@ bool QSslSocketBackendPrivate::checkOcspStatus() - void QSslSocketBackendPrivate::disconnectFromHost() - { - if (ssl) { -- if (!shutdown) { -- q_SSL_shutdown(ssl); -+ if (!shutdown && !q_SSL_in_init(ssl) && !systemOrSslErrorDetected) { -+ if (q_SSL_shutdown(ssl) != 1) { -+ // Some error may be queued, clear it. -+ const auto errors = getErrorsFromOpenSsl(); -+ Q_UNUSED(errors); -+ } - shutdown = true; - transmit(); - } -diff --git a/src/network/ssl/qsslsocket_openssl11_symbols_p.h b/src/network/ssl/qsslsocket_openssl11_symbols_p.h -index 0fe0899d4fd..b7193ad1807 100644 ---- a/src/network/ssl/qsslsocket_openssl11_symbols_p.h -+++ b/src/network/ssl/qsslsocket_openssl11_symbols_p.h -@@ -192,4 +192,11 @@ typedef int (*q_SSL_psk_use_session_cb_func_t)(SSL *, const EVP_MD *, const unsi - } - void q_SSL_set_psk_use_session_callback(SSL *s, q_SSL_psk_use_session_cb_func_t); - -+#if OPENSSL_VERSION_NUMBER < 0x10101000L -+// What a mess! -+int q_SSL_in_init(SSL *s); -+#else -+int q_SSL_in_init(const SSL *s); -+#endif // 1.1.1 or 1.1.0 -+ - #endif -diff --git a/src/network/ssl/qsslsocket_openssl_symbols.cpp b/src/network/ssl/qsslsocket_openssl_symbols.cpp -index 85029a6ff3f..d1bd84cf25f 100644 ---- a/src/network/ssl/qsslsocket_openssl_symbols.cpp -+++ b/src/network/ssl/qsslsocket_openssl_symbols.cpp -@@ -160,6 +160,11 @@ DEFINEFUNC(void, OPENSSL_sk_free, OPENSSL_STACK *a, a, return, DUMMYARG) - DEFINEFUNC2(void *, OPENSSL_sk_value, OPENSSL_STACK *a, a, int b, b, return nullptr, return) - DEFINEFUNC(int, SSL_session_reused, SSL *a, a, return 0, return) - DEFINEFUNC2(unsigned long, SSL_CTX_set_options, SSL_CTX *ctx, ctx, unsigned long op, op, return 0, return) -+#if OPENSSL_VERSION_NUMBER < 0x10101000L -+DEFINEFUNC(int, SSL_in_init, SSL *a, a, return 0, return) -+#else -+DEFINEFUNC(int, SSL_in_init, const SSL *a, a, return 0, return) -+#endif - #ifdef TLS1_3_VERSION - DEFINEFUNC2(int, SSL_CTX_set_ciphersuites, SSL_CTX *ctx, ctx, const char *str, str, return 0, return) - DEFINEFUNC2(void, SSL_set_psk_use_session_callback, SSL *ssl, ssl, q_SSL_psk_use_session_cb_func_t callback, callback, return, DUMMYARG) -@@ -242,6 +247,7 @@ DEFINEFUNC2(void, BIO_set_shutdown, BIO *a, a, int shut, shut, return, DUMMYARG) - // Functions below are either deprecated or removed in OpenSSL >= 1.1: - - DEFINEFUNC(unsigned char *, ASN1_STRING_data, ASN1_STRING *a, a, return nullptr, return) -+DEFINEFUNC(int, SSL_state, const SSL *a, a, return 0, return) - - #ifdef SSLEAY_MACROS - DEFINEFUNC3(void *, ASN1_dup, i2d_of_void *a, a, d2i_of_void *b, b, char *c, c, return nullptr, return) -@@ -971,6 +977,7 @@ bool q_resolveOpenSslSymbols() - #if QT_CONFIG(opensslv11) - - RESOLVEFUNC(OPENSSL_init_ssl) -+ RESOLVEFUNC(SSL_in_init) - RESOLVEFUNC(OPENSSL_init_crypto) - RESOLVEFUNC(ASN1_STRING_get0_data) - RESOLVEFUNC(EVP_CIPHER_CTX_reset) -@@ -1066,6 +1073,7 @@ bool q_resolveOpenSslSymbols() - #else // !opensslv11 - - RESOLVEFUNC(ASN1_STRING_data) -+ RESOLVEFUNC(SSL_state) - - #ifdef SSLEAY_MACROS - RESOLVEFUNC(ASN1_dup) -diff --git a/src/network/ssl/qsslsocket_opensslpre11_symbols_p.h b/src/network/ssl/qsslsocket_opensslpre11_symbols_p.h -index f5626d5d164..92841017793 100644 ---- a/src/network/ssl/qsslsocket_opensslpre11_symbols_p.h -+++ b/src/network/ssl/qsslsocket_opensslpre11_symbols_p.h -@@ -121,6 +121,8 @@ SSL_CTX *q_SSL_CTX_new(const SSL_METHOD *a); - - int q_SSL_library_init(); - void q_SSL_load_error_strings(); -+int q_SSL_state(const SSL *a); -+#define q_SSL_in_init(a) (q_SSL_state(a) & SSL_ST_INIT) - - #if OPENSSL_VERSION_NUMBER >= 0x10001000L - int q_SSL_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func, CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func); -diff --git a/src/network/ssl/qsslsocket_p.h b/src/network/ssl/qsslsocket_p.h -index daa9be23f4a..350b1f1fc18 100644 ---- a/src/network/ssl/qsslsocket_p.h -+++ b/src/network/ssl/qsslsocket_p.h -@@ -208,6 +208,7 @@ protected: - bool verifyErrorsHaveBeenIgnored(); - bool paused; - bool flushTriggered; -+ bool systemOrSslErrorDetected = false; - QVector<QOcspResponse> ocspResponses; - }; - --- -2.16.3 diff --git a/dev-qt/qtnetwork/metadata.xml b/dev-qt/qtnetwork/metadata.xml deleted file mode 100644 index 19a09a6..0000000 --- a/dev-qt/qtnetwork/metadata.xml +++ /dev/null @@ -1,26 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>qt@gentoo.org</email> - <name>Gentoo Qt Project</name> - </maintainer> - <use> - <flag name="bindist">Disable EC support via <pkg>dev-libs/openssl</pkg></flag> - <flag name="connman">Enable <pkg>net-misc/connman</pkg>-based bearer plugin</flag> - <flag name="gssapi">Enable support for GSSAPI (<pkg>virtual/krb5</pkg>)</flag> - <flag name="libproxy">Use <pkg>net-libs/libproxy</pkg> for automatic - HTTP/SOCKS proxy configuration</flag> - <flag name="networkmanager">Enable <pkg>net-misc/networkmanager</pkg>-based - bearer plugin</flag> - </use> - <upstream> - <bugs-to>https://bugreports.qt.io/</bugs-to> - <doc>https://doc.qt.io/</doc> - </upstream> - <slots> - <subslots> - Must only be used by packages that are known to use private parts of the Qt API. - </subslots> - </slots> -</pkgmetadata> diff --git a/dev-qt/qtnetwork/qtnetwork-5.14.2-r1.ebuild b/dev-qt/qtnetwork/qtnetwork-5.14.2-r1.ebuild deleted file mode 100644 index 6f2da58..0000000 --- a/dev-qt/qtnetwork/qtnetwork-5.14.2-r1.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -QT5_MODULE="qtbase" -inherit qt5-build - -DESCRIPTION="Network abstraction library for the Qt5 framework" - -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm arm64 ~hppa ~ppc ppc64 ~sparc x86" -fi - -IUSE="bindist connman gssapi libproxy libressl networkmanager sctp +ssl" - -DEPEND=" - ~dev-qt/qtcore-${PV}:5= - sys-libs/zlib:= - connman? ( ~dev-qt/qtdbus-${PV} ) - gssapi? ( virtual/krb5 ) - libproxy? ( net-libs/libproxy ) - networkmanager? ( ~dev-qt/qtdbus-${PV} ) - sctp? ( kernel_linux? ( net-misc/lksctp-tools ) ) - ssl? ( - !libressl? ( dev-libs/openssl:0=[bindist=] ) - libressl? ( dev-libs/libressl:0= ) - ) -" -RDEPEND="${DEPEND} - connman? ( net-misc/connman ) - networkmanager? ( net-misc/networkmanager ) -" - -PATCHES=( - "${FILESDIR}/${P}-CVE-2020-13962.patch" # bug 727604, QTBUG-83450 - "${FILESDIR}"/${PN}-5.12.1-libressl.patch - "${FILESDIR}"/${PN}-5.12.4-libressl.patch -) - -QT5_TARGET_SUBDIRS=( - src/network - src/plugins/bearer/generic -) - -QT5_GENTOO_CONFIG=( - libproxy:libproxy: - ssl::SSL - ssl::OPENSSL - ssl:openssl-linked:LINKED_OPENSSL -) - -QT5_GENTOO_PRIVATE_CONFIG=( - :network -) - -pkg_setup() { - use connman && QT5_TARGET_SUBDIRS+=(src/plugins/bearer/connman) - use networkmanager && QT5_TARGET_SUBDIRS+=(src/plugins/bearer/networkmanager) -} - -src_configure() { - local myconf=( - $(usex connman -dbus-linked '') - $(usex gssapi -feature-gssapi -no-feature-gssapi) - $(qt_use libproxy) - $(usex networkmanager -dbus-linked '') - $(qt_use sctp) - $(usex ssl -openssl-linked '') - ) - qt5-build_src_configure -} diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest deleted file mode 100644 index 35eb4b1..0000000 --- a/mail-client/thunderbird/Manifest +++ /dev/null @@ -1,58 +0,0 @@ -DIST 2013_update_libvpx_esr.patch 14356080 BLAKE2B e54473e9d70c7beb85762ceb39e02d8542e7b33c5f81ba4faab9a3762673fbe65868d2130ade3503f17c02c7890731748682e86aeb31369f6deca8ce9ee814eb SHA512 d8ca55023b22516461275f4be96e22d7c0a4acc299f23e2db5e15f1eec09e4f08a2e10d2b3d10c697219d70dba948751c5be5ec0ba6ef85122c419bfb805a472 -DIST firefox-68.0-patches-13.tar.xz 18160 BLAKE2B e77d63787ac5f2f1900325f03b2f905e65a5f767349fcec283ae6e5aadb77489f55551065a1867f697af47570127f3a81620f2bf79d2ff98a5ddf4d05ea6cf5c SHA512 fc900c31e01c8a093cac42acbb2289cc20d000367a02f6e490980a8897dec120657b1981bd2a5999d1d18923c71a320dfba925ca0b8714c60495fac293be78bd -DIST gdata-provider-4.4.1.tar.xz 78728 BLAKE2B bfe04d714334c38c932d2186ffd859583176ef455b283534c5f8f9e1ab7dc13bdfb8c15db6007de482ab015afc2b8524aad725380bec75ee5f59ea81d6307ba9 SHA512 6c9b5ac41a1064bd1799d2a2f633c3064b27f1294ac3c8908cdef6c1d2eea7b602f2f7bf240b71f507fe9ad286588f030e12f49a41b3bed7bbcc99f3021369f9 -DIST lightning-6.2.5.tar.xz 1745976 BLAKE2B 31e237f8d34ab2a2ac522767460467257d1f49d15fbe24f5b80dde9fb709ffafd0c0442d99c6643ce434cf7bdf0d670447f86da9fcdadc7ada6814431ef41e8a SHA512 1e997bb91d484908f225cc6e971874d308e8a8e2451a3e678f8a74bcb9e360babbd1f8aebcafb3e628ef5b10eb697ee47af2bfedbc956fee71d99084c8816235 -DIST thunderbird-68.7.0-ar.xpi 617169 BLAKE2B 383913959eb715b75e048d3244c00676af99e043f575a168eab698b49fe165fb2ae1258f8d991b3710fb3c8fbd7737118e5fa0f960ab14139902a2b0dd6a1042 SHA512 303669b6a8e27d08ce40bd6c5d70b9516110caf4012559263166b890ac37c94873a4377deacb1a888f2e2407ef7cda75c16e06df70e95323557061a2035ade22 -DIST thunderbird-68.7.0-ast.xpi 551299 BLAKE2B d1512027a8ea3f390d4e9aec3c431a5a015c32e9df1140102c63d4405e8629d8196f6557a4f777385a8185dd68c0f7d15b42d2de026a13723cbe65f986ad883b SHA512 0ce499f794fdd0543f8d45c3caca50202f87edde1accc6b82d2f560fc7559772eede3700242040597af7cfee8252a9b23d5c2aa534a53cfc2a634a9608081c0e -DIST thunderbird-68.7.0-be.xpi 646280 BLAKE2B 5f841fe907361dcf0e9379a81b65453a8d0cae84e13f45b45572d91dcc0e5b3281419ec99eb8a8442e6c06e9fc17f17f0202556151ecb8b91360bca23cb6da61 SHA512 4504169a324374be237b0ea42eb40582f29f076e852a052ad340b43df0c1bf63bf5eddc513e3b53bb56d064af814a6ce142210cb605ec57040b2878d5c2b1b52 -DIST thunderbird-68.7.0-bg.xpi 646228 BLAKE2B 73957e2d15489daf1781eb97367f93bacce048d8f748db46600e9f5f586ed8ecff8b08a1f895e9f2bed7a6caf781a0ce327e767f292a7614254d80826433ca4e SHA512 1dbd035eef08f2f0ab040d1211c74cd7206f41eca2ec390554624c2f0041eb4fc525b0596693fe46ffbbfd31b1527cfa94ec83c9d70ad44c22c241cec10fd890 -DIST thunderbird-68.7.0-br.xpi 574853 BLAKE2B 7c0d1fe819bc233126eb0ac71aae83d0d2d6ff6d8bdc41f878c8a523fcea789fdb9a804fa7d8675fe15ac3fbb551c2f5e10c720095d56b6f237f7ab03461aed9 SHA512 28bebfd4afc5cdef8c8dfdabf54ac92a460438c9689f7f50296374f429cf2974a8d7eb2317d0961181774bdbe88f6683999d76879b673191f3d66772e66a3b3e -DIST thunderbird-68.7.0-ca.xpi 578441 BLAKE2B 09223b64c8ea237984ac59f4f92edeb8f77e3cf2fe40f13630f6b94e6e72e797ebf3a898040ae0837ecafaaceca8978608da8d03d3a9968ed00d5d7d8603a07f SHA512 152452db3a828f9a28c44b23ada822d6f7728aebe5c18ff906fa00db9f32270409365709e8596eee6d7ac2a7ab4248678f8ed143aed4c4b1091ef8b81a82b7a3 -DIST thunderbird-68.7.0-cs.xpi 603042 BLAKE2B 98eca34d952fadd7d612d6abd375f56e1bb70de9a0fa96d9303b977c0d2a0aa88f76020c91f64391b8b0101346daaed2e4d8bd2eb3d128e57c566ed3e2bdf4f3 SHA512 90ecaef1083a9e8e281ccfc52325da1fa6ead8b3128df7af9faeb8b5138e0b587769bf87328c3a7080a2c45b8981242b2431ae70a90abb76dbe7462cb2cc4c0a -DIST thunderbird-68.7.0-cy.xpi 589902 BLAKE2B 8bb88ec9b2c0f6092703213ca9f819efa85675736f9255fba688e45e109223773df677e9584c37008ae943dd8b6feaf659795c2ded92c8441e4074c01530d177 SHA512 ed35da50a58e4d5ed1855f1c3d904384e52c41cdb9a434a9d1e27664aaa4598d52ac11b0dc2761d6c286edf3896fc0ea0ef390c17681bc48a8abfd87a20dc79b -DIST thunderbird-68.7.0-da.xpi 588349 BLAKE2B f155e219653dc67b56a565fa5a3c8ab6303f871d121a08295626abd3120238440f0be74b58155b9a001b050aacc37fa0202e7dca86d54c18f942f736bc4bcb99 SHA512 68ebd94aa90938eaff18354d03384ba09e54f8a1e7a4482ccf274c38b1e1722304bb22a4cbb809f97a1d272e229cfe08f3cd905ef2c340400dd23feb24d587d6 -DIST thunderbird-68.7.0-de.xpi 597805 BLAKE2B 8e6003b3578498b4be564557e6fc8666cc99be8bf4b0b31a355ab1d3aa8b70c1426204bc7bf9694d0e9d4075da709bc6734dbafb10f0bb13c212d491951b6ebc SHA512 f8dbc7074ba0e4190003096b597ebfe2bbfead4132b3bb05ff705705af99c25dd1ccb6ff5248b28f7f278b1893dffe83fc595d3b6c68c197ce8d5aad6e8eac95 -DIST thunderbird-68.7.0-el.xpi 699224 BLAKE2B 69161e102c21df01382ad06acad4969568733e0554765bc063303c1dd0b1782cbc7dd8db1d042261287a39a7adb6e25f7c7bf6aecb156f898ae9811a5f76d888 SHA512 b88817e31d3dbe019194be3b3445eb8630437e7fa3b23c499d984a04a3119ff2da681a51c73984032eff6e82210ee9e04c298ab55d01501631380abe3dd36707 -DIST thunderbird-68.7.0-en-GB.xpi 556403 BLAKE2B 36655a3c6486f2fa5dc521c8bb2f14555445823c36e2b2cfd39c2c8a5ba8c184144f8c9383dff21fed4138e81004f17749f61a3e4ee26227a5741f52c1dc29e0 SHA512 648a5ddfc43af5a701040a3adb91af7cae43ead51fd1f86c8d219b2cfa59a6180221765f6e7c6b78f94360fd5442b27a02e17e6c474fdebcf5beda8370aeea46 -DIST thunderbird-68.7.0-es-AR.xpi 596552 BLAKE2B 108cdc80d7f6f493d22287616df821e62527cf95733a510f74569380d5be3bb0918369ff2ae01a673eaa57ef1da4f93c44e0d075ab6879c4cdf1ef183205e380 SHA512 63b90cc2e7c68209bc914d286b1abaf95d91ce5b47ef4e521a8e6a6ce540f864c55cc981552fa9e5621b496d10737a47060eb3963822268561de9edffeb84381 -DIST thunderbird-68.7.0-es-ES.xpi 518352 BLAKE2B fd5e86b23cb86d537d5cb32498402e25117e7be0cda2035f4ee13d8c0455c3ebf7542ddf4306a62f9065376dda1d16b200474bbd851cd36da1aebedf5ff806e8 SHA512 be8e52ae697e51a76d39460b7753b499424c47877aeff7916cf876df609c3594223286c93ff71c4386a49838d394c757c63162eecc8b7a915736ca45c86fad6a -DIST thunderbird-68.7.0-et.xpi 573581 BLAKE2B b78846ec81eeace3f40eb370c3a4c0390f5ad8782b9253e49cc2a99a16bad0b3cc7b16e57180a28664e51c48dfb6da6f045075a985d619961b0eca113acd2413 SHA512 df1f5837f1e75587ce7c1f3c5e09c9433e6e75ebecc2c1399cb781cc85e256b79a9e8c26a006229fb570483d638991aad4741aac030ab6d51289386578b248da -DIST thunderbird-68.7.0-eu.xpi 579946 BLAKE2B 8fd0cd9ca322c0bd7b95fe76e86029cb639d6ab49a986dce444c75bb22699980091559557e506c49b75b0ea48b0cc8b66cecc203c46270968bb7c2cd5b31d311 SHA512 a3561476e47105ab6d8b36e2375903ffc37515c805de7d75c26af7e59e6ba28df0374df660c51b4d59930df055de3e9bd8e5c3ec991b2895f86647fae3d0f54d -DIST thunderbird-68.7.0-fi.xpi 578419 BLAKE2B 49ebb583f2aa14761dfd0035a7dd1f9eb20acdaf475ef0241375d035bffe6994e65161b533509edc25d052111eb5fb3fd6f3c2fc107c7f257f96bfae3b30f48f SHA512 f9f103d5351ca49cd3bb071feaa0042d52a8728125a1a5029f97056506d6a41ef7089ce51c9fb5e900201e99a11ef1a12af857e4d69d1fd45330b79c9d272f07 -DIST thunderbird-68.7.0-fr.xpi 607811 BLAKE2B 13c042a29efab204db5874400cadcdb369653fdfd8021270f1f0c1b53866b8e48cbc6802d7c12a6230e6d6cc3ffa7f8f5fecb9be4d210dd331f1784806e68d4a SHA512 9283139da4ed518b3120b28cdebcd80df31c886053fb38c27926d8c437c606bf1be7e6107585317630b2b077f95bfe19813108b71abde64f9ffa7793a2c18907 -DIST thunderbird-68.7.0-fy-NL.xpi 594468 BLAKE2B b7ea1bc4ce24b8b5d91775e3adc95d5126c51e1dd0b8c5c318f99e3ac690d31ac775a60f4ebc5bdabd2a16ec0eb9a6db95cf970af433da40946826bbf1ab4fe9 SHA512 c0a463274b8a70f5f2dae080db829c1db77236e274d4c912b5961d12b65dc70952eb38ed9a69cb46639cb5021019c512e158f1c6183ded58da368226e3ed2aa8 -DIST thunderbird-68.7.0-ga-IE.xpi 588711 BLAKE2B 090f84287955a76d30ea9144eea50fbb7265ad972aeb53db6246216c6b3258a4de20f7505f373b5f5baaf173235943d4324beab802f85c556f526d7a809c2a48 SHA512 6a70d8cb62e3f9eddacb2720c7c8f3839c408f2801507c60d069bc9c4070b2c0be8f848c55fde5faaf56fe4ffee259fbc8e80f3f6cf41a95a4ab7ffeb46d9937 -DIST thunderbird-68.7.0-gd.xpi 587110 BLAKE2B 4ebe3f6f0fd7a1ac465dbbfc6d49dd5c15138cb8128e7b9c5b8dbc39a45f1f42b1373d08cb3558097c75ae3823d9fad1411c4ed06c809a5ee6d1c3609501d485 SHA512 5f485eebf995a788978113bea428c20bb205aeb573b56de5a020b28e757e0c921e1b5349d03b858abc6531e8b596d362f219ada8dc04840d2c29f94c853f8b5c -DIST thunderbird-68.7.0-gl.xpi 568397 BLAKE2B 8c35adedd9db20d0ce89ee316a241ef13358e9e701dbb2ee96aafe96e1e985fb78fd0c7535c2c11402286399ef2655fe23c5818c17cd7f2f3aec0b24aa2083dd SHA512 1b595ddbfa0e775f7b1e2b0d271c9bfa790647a7cbfd0e5fc8d93c07dc0d75c6860477c69874a32d635f68ffaf8fe4718684368712aec3241cbd995456571ba3 -DIST thunderbird-68.7.0-he.xpi 604788 BLAKE2B b1e01dced005983eab6a55cddd71429918b2e60b2632341f3f17267dd6ef582d6c2e54d385025ab89e5a9c834b5ac4d73c3a88fc0cb4b022bc2b83f83fbc425c SHA512 2d528981a6a697d15ff2fb6ac47e195bdb5ea0f29bb32e10dd0c8c5b67473aaaf6adfd039b90eaa52970caf38ef3195ac4254818ab588ef2faca82772beb9c63 -DIST thunderbird-68.7.0-hr.xpi 583784 BLAKE2B e7b9c1d22e6d6903874798c86ff469b5dd27953fee697cbf2ea4c37051f6a0f5ee4c7f933f5b2a59e3cd493114605813beeaf536f73806a36313461c82543932 SHA512 693678b62e93b90635fe8532759cda9a743d87f29e458eb91045a7ffefca9c3f10b6ebe7974902cc6d3ae3a05c4cae622f7a3fba25fcc91e10942b9fe4f94b06 -DIST thunderbird-68.7.0-hsb.xpi 616035 BLAKE2B 75fcb69367e7bb3edd2c43dafdbd0af33e2ce62ce9f65feb7669abf55d38368c777fd399c23516546f3be62fe7e579e7fd746fbd5d79273f8396287a1d2013b9 SHA512 8a889f989d0692bc0d0db23058dec395295fe380d575c3c67d1f903eb9d6e07dc405634d9951b1184df4b6fc235c38dcc4dc23521787bbee33ecde2b86c35aab -DIST thunderbird-68.7.0-hu.xpi 618155 BLAKE2B 16f535b17fbf5a2a78897be9a627d0a84ed54eef5ee4a78830177aa8efe25327e6cd1b7f592c69753ce233eb5534ef8bd45beab8d95f63a131a63f0610816526 SHA512 e46a50e75a07d42cd8b46d42970434e55ec738668fe32bffc1da5fb01fe988d843ac8b61520cc5ce34568f2aeff4030f4d04656cee2871febc7d2f984ff94349 -DIST thunderbird-68.7.0-hy-AM.xpi 631979 BLAKE2B 4dc8b6ccbbe19c9f86edbc2f124952ee9f18fd48b49726d95a3f82a8e46eb03ef8d4d058e4a2ca7a7548e3c791d0172a5112498f88f75fd5f491e78a9ff72849 SHA512 a7d4ff58bcd83b59025df990042883b3aae0fc1a7e7e36047105f174dd2cf56db2c58151eabb4e0de94d456195aff26bc36a277bda4f9e75be51939346e96c11 -DIST thunderbird-68.7.0-id.xpi 567747 BLAKE2B 4c0f562866a2691183f89c5e2bc836e29ae2f0edb050fe91a3488eedf98101c31a686e6aae892c526665aeb9e2c49dc5fef5870e813d1f7a895f14756ee4e96f SHA512 6e752e11f0a96923358600f51cc43481e58c147e3059e9d08a8b07ffc60a72f4c8371d9d6ba660a91bd7cadec904d9610d4a1cd98e60f3965da3139bc998b038 -DIST thunderbird-68.7.0-is.xpi 575441 BLAKE2B 14cb4ba32988824c22547a549c67d57c467800b14b2c36d51e711bd74df2da247068ce0fcaaa31ed4749e71f91524591d28c46c077121ef5891bf06060b8c53b SHA512 16b943516b5769aef029051538a911c8e09c142af2d466547ee533457edb1d6f1ae65a903e570940636014cd021adcf1bcf8b60dff7be5a48212c708b772eee9 -DIST thunderbird-68.7.0-it.xpi 489520 BLAKE2B 223d0195574dbe9ff6e432ccbffca4135204290b277e5870dff3ee9992ed5f346049424ef57bd6fa7c894d03886bb0f6f675db532b78793e4534d4132dd836c5 SHA512 9358697499a0fde859cb72d27bfbbb2a039fe1c121690673bd71a9624adc50858b7930da6e6c672c5f1808196ac36b93cd650fe69ebea1f0c8e12af9fbf635e0 -DIST thunderbird-68.7.0-ja.xpi 643575 BLAKE2B 24ad0f9dcc2b338381a55b19a0d29feff794fb8a369e52539af150181b6a88b71699edc95cec2e4b7e194e52b1c0abb7069361990efcf66ca3e3876c5ec14e49 SHA512 3e22160ed91c6ca601133f387dd8862de3f3ad5e22fe50e3b2409efe97f0e3cafa089faf78511300fc3cf9afbefcbec8848f1be6dd4e2eb9800c8067f3b6e6a4 -DIST thunderbird-68.7.0-ko.xpi 620529 BLAKE2B 4afdd5746a9796e46ccf5f5b833d5d1b3915e35832c8a51f7ad1e19e7c1521afdb677f3766251d5300da40ea8066c8085a79da341f15594270bdedb931cd9b78 SHA512 659cd141d31cd1049582df95241b6c021a1fc1966cab8b08042cfbd29489c9875e320285c4a302d8b79b7b9ad1ef3b3cfd32fdd17529ec129c6776a136a735a3 -DIST thunderbird-68.7.0-lt.xpi 603847 BLAKE2B 12b947e4aa0864b7578ce61afcc3c0b23c58e82d20ad255d23dc64c020dc19443ee240f54974f54739c906e9077c7ef8375dae413a5d1faaae16d7adfa96dfec SHA512 067a8ca0cb87d77972da0f398f5abd5ee29e0fb9debc7f117f227770ee14ba4613b5e4866918a0138dac18d5ae5956778e98771c89cad9fbdbbe8a226962db5d -DIST thunderbird-68.7.0-nb-NO.xpi 574022 BLAKE2B 8bcfab22775e00f76c8f90073bcaea5200faa837b0d48329cb5a7d8ef9471527e3e3f910e8b422e6a1e770eda53df0a8e953283db67c5cfe6672ea552542ae1c SHA512 c3e00abe1b293c3d041d58f59a1aa169a751ec78203665a45e062ca9e567b37d3eec1c9964040015a0d95453c9d634f2b4e1a6b3d9e66b67fc39d9454fda296a -DIST thunderbird-68.7.0-nl.xpi 581354 BLAKE2B 803e282695ce3b0727a3115f89fba8a162364e42c23c8fdadc1db67f683fd5cab79fa0c6a76e06512b2c20551a2388fead320ba14759a2379ab4004f2437ced0 SHA512 142c7615d50b5366bf287670f1cb041696ace347613c921c93543d288e38d35f8d85650e1df19e61e60d4d4615aa259981ff8afb5c9989f803fd2db93d0ac864 -DIST thunderbird-68.7.0-nn-NO.xpi 574949 BLAKE2B 73a724316c54ba7ec31c043507eca0467c1e4fbbd822463a17910932f2dc6b1ba2ce7c26ffcff277ef80e4224b6ece728c7885aacd4d08e923b9ee2e9366a26e SHA512 d9217e334ee225b851d2fb1654d1885e861176aab9cc59d2e5fa2b7151dd6e984b19c2186eadb91f0f817cd05fcff472dabb14113074e7ab5933ca3530efd062 -DIST thunderbird-68.7.0-pl.xpi 576086 BLAKE2B ff4b026a333bf2b96011fc296ae82547c0efd5751e0461d60e645b4cf2c36782e8dc262ca9d6009362fe284e54eff898f765dfdf33517e45b2aaeef45eaa830c SHA512 2a49ff18711c3ec0b9da481f7470fb458ab4acafbc3f7780fd6f2c0527eb95a82d3de052bd179d8b35bd783ed4a882087efd49cbdff9609df6f3c09f2d95f790 -DIST thunderbird-68.7.0-pt-BR.xpi 589837 BLAKE2B b362d6de0fa75935496aa9275d874bd5ea86fcd8e57df1b9556d7126349bfee07900a230f4bb08cbfec8b3964c901e7db8e6a09dcc8b201f8d070e3c406897c9 SHA512 f50109c7f248d8fcc217fc7e1bebcd67a4d0b040c36484d08df6e39854af074c59b1a5b8bde720ec4f965330659ba24e61752f0363181df8f6b0735f00bdd863 -DIST thunderbird-68.7.0-pt-PT.xpi 588103 BLAKE2B 014ea181b57c6a602ed598a265d6564a882a3221f7bb85fa6f91d8a6b378769d249cb1b9a2abf0c2658bd977bb546d76ed6aca9cf93804706d83eb34de2c67e5 SHA512 c087572e999364e469aad4b9b2855c23d25a8074bd2faa9367ceb6ef6af7c07381d31af2226014ba15d2ad87151581a626c3f3ad4c7b2441ceacce3ea6bbea42 -DIST thunderbird-68.7.0-rm.xpi 578050 BLAKE2B 098f2b646bf34b4cbff0f65867480a8ee05da38791d11eda852e46a23271ecc71cf32171255c7a1360f4cee1a42a15c09fee9f69ea0f71b091cb3360336531c8 SHA512 f9e203d01a22ba71e09e49cad625f6989907b18a0ff65539b0495276c3a1242313ec3361f84be9f804017e98282dd61e086ae0fc1ee0532afc6fedd71a7820ab -DIST thunderbird-68.7.0-ro.xpi 594841 BLAKE2B 3d4341a0e3bb2b63ce986b938cd696308bca36d683f85c966725a0596fa593328ad72bf61186939eb35c8137e992a52012078058d316a010d78ed4e3be60dd65 SHA512 ca361550ffee692082c720d0383df19f8a69295274ecc63b2d67b5273e107930c322a0409a9cfd3f12d2afc3bd26cf15d2e9f60130f63de8477d97ddf747a276 -DIST thunderbird-68.7.0-ru.xpi 683326 BLAKE2B 12ce976f3ea5d4633691949fb56bea0153150854cf7b033b4b23d5c95b39ea7b5b325b14581ec1ca8a3288b4ce7f621916cde8195da54c3a7fa3c0adbc84fce6 SHA512 c13d850fd1d7729ebd0a9fa49de2047e8545fbdee6b0ba743a62f03768852f5d600014f51f6f703a34abb0b83bc640a08b12df7246da73ab6146f123342d5d49 -DIST thunderbird-68.7.0-si.xpi 637405 BLAKE2B 0d902ad99e077179bcb512a3951264c1c0ef9e45c6649fe8a5da7331c92665b25a56fb2a49cde13c37a34355bac316a8b64dfa15a8532ce2119edfa474cb4ed8 SHA512 184f3e5ac869339579c87679e58c8866ba58695d15fd9f01900250cf0302c7e3f0033542aad9ab81b278d64f1926e30a1e3f05728f157306eb193702aa153f7f -DIST thunderbird-68.7.0-sk.xpi 609752 BLAKE2B a548e73b2fd874a613c2de04fb61608b60aace364701cd03ca79a5cba5f284bf15b39ba78a0fdb9fd99c61c749d03118a8ff927fab216177a41c87ca08c068d2 SHA512 90bc8bdc8b4787dc69eba196a42f848410541f5370566e3c26c8398b64b2bae41af98d613eb44947fbc361fb73b4dc96fd3a30b03fd8feca1274f05202bf812b -DIST thunderbird-68.7.0-sl.xpi 590628 BLAKE2B 7576fae4ca0fc4977f109b24fd27f0164d20a744f55c0dba778686df1c1b631a26ab4c78c2e3210897c9da185400de1939421d613531790277e5a317c2aa860d SHA512 8b949a9e7d80800daccf0984b0e735cce00023a31120a217b96561209c5c559407a89983507d43b9348440c650a80e622ae3f52e974bf0d2c6c1ad7f044add1e -DIST thunderbird-68.7.0-sq.xpi 598901 BLAKE2B 5417a0c71092e91b1cc89f53849da92609046d36ddd4c0d61009109c861c2240a9b4d2ddf8b9a5117a6338a1bcbb82b2b55219dc4c95f0b56b8fdfadc2916185 SHA512 daa2af4736bdbe6640096a86034a9b1a5959b75830f107beec915b43331472e9760d6f55292715338505f89b03084927981dbd9f81360d083614c9b7ed0580a2 -DIST thunderbird-68.7.0-sr.xpi 624897 BLAKE2B 00c6a5eacb81d918f52d8070d39d429f999e297e459d3548c696f6147bd4ff65a237867b1ca260b75933f4cb14db6cfc6f8fd3b0b47bc3e10f1990ae32823a7c SHA512 2d52efb1106fed0df969131a85c907de14bc6deea79f30cb2b65bf68e22143a9311a5b64d3153df51034df5ad0ae434b9b9f4ad3b27b3c10d4a81acc7961cac4 -DIST thunderbird-68.7.0-sv-SE.xpi 591595 BLAKE2B 390f4aa0e620288d2db563c65e8cf812ffae3f2fb195df7a37afc03df302320af90a09a93e3106bfa2d49f7cb81705333f2dcaa2295282cbe574cb07a7be12eb SHA512 4c37b052ddb922a23d6e1c82b7b5767445c22b77fae64a2e7c85d19d4cbd4d0696a43d9085a396aff8bc594f2de28705ed97c8d06e6f1d29a8d6a30fa18bd264 -DIST thunderbird-68.7.0-tr.xpi 599707 BLAKE2B 9b5296d5a9cd03b387f468daf7f79b66761ae405ca15075be49bae21a64366831b5b937824a4b9ce52ef6f2aefef571b09af735a1511962cf8a0c9fa3c021b5e SHA512 4e4ce67c43a636579f68ef7e13e01bbe870faaaa21b91f263ac02459c81882e2897979856750e1753e3e2b02202319c5b6f3c4e90e4e5f45efa3dd217bf6d3c1 -DIST thunderbird-68.7.0-uk.xpi 671454 BLAKE2B 5cac851136f44492865f64d741bfdcb3488e9e4ca431d9f7624eae6385dc1df9f953af0734ed8e676e1d409ec4a9de1ad79ae6b5ea835a625679d8d63e58f16a SHA512 0967f17ae34fa75693c8e963865208c776dfd5a384d14f19ddd5956deae69c0ebc497bac5f95e3fa1a27bf7c7f68c6efe5a1b77b0d9e7fd4933031c924b1608a -DIST thunderbird-68.7.0-vi.xpi 623423 BLAKE2B 220b6fc90ef1dc7e04aef9dccc70328e2f9ce04f06736e81076ace17363430248b22e5449d234265add455a4fd875f7056c5c7b1c64ea22a09f11dd9420efd5b SHA512 08cfbe2ddaba990cd4b714e2ba51a6c472f26c7ecb4ac2a81b595de23533cea686f4ad03f7bcf408d0ba8b6b867fb21ab08d5b753ba3add253d4efd0af676724 -DIST thunderbird-68.7.0-zh-CN.xpi 626820 BLAKE2B 4cc9ff32c4ad28a8204d2efa2af7e7c0b895dd99234d32fe7b7da297bedd7170dca4dc4bfc83b262410bde28266d729163ed23d069538f3d234532ae51b2a6ee SHA512 3c3f16b0d9514be3ad53832ebef7770d9bda8d700a99aa636355fa48a7bcf5f73f544087a8e8820a3a1de1a645c02dbf2e345a3729a42c67f8dc885874204e17 -DIST thunderbird-68.7.0-zh-TW.xpi 627476 BLAKE2B 691aeae9654c206a74c91cfa046a9c00836dba6ab22bd5c6f2baa320d9935adf65d40407bc3092c14b72244a75f61bad880c938468f48b3008c22e9f24b8a17b SHA512 f1f94129f28eda53327a49b509fc76cf950fe0cf75976cc4ad83bce064b0002156d5002474fe3244f6723e8addf446448d36828dfa3aef9e55abc031859518a5 -DIST thunderbird-68.7.0.source.tar.xz 339588604 BLAKE2B a623374aa00b577110d01b1c2c77064b16afc6d283150b81367eae74d33c7ecee9ebdb7866e5d9d69e9d28d9ec503ef1890ffaaac8835954e6b7591e0a3e473f SHA512 fae763030b7a54930291a10f298b7fa4ffc400849082f576556b9040d095f1007ae686daf1241dff8b73bac35c14acf21c156a18a3e16d62a7719c6cc34e4d1f diff --git a/mail-client/thunderbird/files/1000_fix_gentoo_preferences.patch b/mail-client/thunderbird/files/1000_fix_gentoo_preferences.patch deleted file mode 100644 index 0154210..0000000 --- a/mail-client/thunderbird/files/1000_fix_gentoo_preferences.patch +++ /dev/null @@ -1,25 +0,0 @@ -From: Jory A. Pratt <anarchy@gentoo.org> - -Add the gentoo preferences for the omni.jar creation - -diff --git a/mail/installer/package-manifest.in b/mail/installer/package-manifest.in ---- a/mail/installer/package-manifest.in -+++ b/mail/installer/package-manifest.in -@@ -313,16 +313,17 @@ - @RESPATH@/components/devtools-startup.manifest - @RESPATH@/components/devtools-startup.js - - ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - ; Default Profile Settings - ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - - ; default pref files -+@RESPATH@/defaults/pref/all-gentoo.js - @RESPATH@/defaults/pref/all-thunderbird.js - @RESPATH@/defaults/pref/channel-prefs.js - @RESPATH@/defaults/pref/composer.js - @RESPATH@/defaults/pref/mailnews.js - @RESPATH@/defaults/pref/mdn.js - @RESPATH@/defaults/pref/smime.js - @RESPATH@/defaults/pref/thunderbird-branding.js - @RESPATH@/greprefs.js diff --git a/mail-client/thunderbird/files/disable-auto-update.policy.json b/mail-client/thunderbird/files/disable-auto-update.policy.json deleted file mode 100644 index f366220..0000000 --- a/mail-client/thunderbird/files/disable-auto-update.policy.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "policies": { - "DisableAppUpdate": true - } -} diff --git a/mail-client/thunderbird/files/icon/thunderbird-unbranded.desktop b/mail-client/thunderbird/files/icon/thunderbird-unbranded.desktop deleted file mode 100644 index 055bca4..0000000 --- a/mail-client/thunderbird/files/icon/thunderbird-unbranded.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Name=Mozilla Thunderbird -Comment=Mail & News Reader -Exec=/usr/bin/thunderbird %u -Icon=thunderbird-icon-unbranded -Terminal=false -Type=Application -Categories=Office;Email; -MimeType=text/x-vcard;text/directory;application/mbox;message/rfc822;x-scheme-handler/mailto; - diff --git a/mail-client/thunderbird/files/icon/thunderbird.desktop b/mail-client/thunderbird/files/icon/thunderbird.desktop deleted file mode 100644 index 3ab5826..0000000 --- a/mail-client/thunderbird/files/icon/thunderbird.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Name=Mozilla Thunderbird -Comment=Mail & News Reader -Exec=/usr/bin/thunderbird %u -Icon=thunderbird-icon -Terminal=false -Type=Application -Categories=Office;Email; -MimeType=text/x-vcard;text/directory;application/mbox;message/rfc822;x-scheme-handler/mailto; diff --git a/mail-client/thunderbird/files/thunderbird-gentoo-default-prefs.js-2 b/mail-client/thunderbird/files/thunderbird-gentoo-default-prefs.js-2 deleted file mode 100644 index 9770a1a..0000000 --- a/mail-client/thunderbird/files/thunderbird-gentoo-default-prefs.js-2 +++ /dev/null @@ -1,10 +0,0 @@ -pref("app.update.enabled", false); -pref("app.update.autoInstallEnabled", false); -pref("browser.display.use_system_colors", true); -pref("intl.locale.matchOS", true); -pref("intl.locale.requested", ""); -pref("general.useragent.locale", "chrome://global/locale/intl.properties"); -pref("mail.shell.checkDefaultClient", false); -# Do not switch to Smart Folders after upgrade to 3.0b4 -pref("mail.folder.views.version", "1"); -pref("extensions.autoDisableScopes", 0); diff --git a/mail-client/thunderbird/metadata.xml b/mail-client/thunderbird/metadata.xml deleted file mode 100644 index 9011712..0000000 --- a/mail-client/thunderbird/metadata.xml +++ /dev/null @@ -1,42 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<maintainer type="project"> - <email>mozilla@gentoo.org</email> - <name>Gentoo Mozilla Team</name> -</maintainer> -<use> - <flag name="bindist">Disable official Firefox branding (icons, name) which - are not binary-redistributable according to upstream.</flag> - <flag name="clang">Use Clang compiler instead of GCC</flag> - <flag name="custom-optimization">Build with user-specified compiler optimizations - (-Os, -O0, -O1, -O2, -O3) from CFLAGS (unsupported)</flag> - <flag name="eme-free">Disable EME (DRM plugin) cabability at build time</flag> - <flag name="gmp-autoupdate">Allow Gecko Media Plugins (binary blobs) to be automatically - downloaded and kept up-to-date in user profiles</flag> - <flag name="lightning">Enable app-global calendar support - (note 38.0 and above bundles calendar support when this flag is off)</flag> - <flag name="lto">Enable Link Time Optimization (LTO). Requires Gold linker when using GCC - or LDD linker when using Clang</flag> - <flag name="pgo">Add support for profile-guided optimization using gcc-4.5, - for faster binaries. This option will double the compile time.</flag> - <flag name="system-av1">Use the system-wide <pkg>media-libs/dav1d</pkg> - and <pkg>media-libs/libaom</pkg> library instead of bundled.</flag> - <flag name="system-harfbuzz">Use the system-wide <pkg>media-libs/harfbuzz</pkg> - and <pkg>media-gfx/graphite2</pkg> instead of bundled.</flag> - <flag name="system-icu">Use the system-wide <pkg>dev-libs/icu</pkg> - instead of bundled.</flag> - <flag name="system-jpeg">Use the system-wide <pkg>media-libs/libjpeg-turbo</pkg> - instead of bundled.</flag> - <flag name="system-libevent">Use the system-wide <pkg>dev-libs/libevent</pkg> - instead of bundled.</flag> - <flag name="system-libvpx">Use the system-wide <pkg>media-libs/libvpx</pkg> - instead of bundled.</flag> - <flag name="system-sqlite">Use the system-wide <pkg>dev-db/sqlite</pkg> - installation with secure-delete enabled</flag> - <flag name="system-webp">Use the system-wide <pkg>media-libs/libwebp</pkg> - instead of bundled.</flag> - - -</use> -</pkgmetadata> diff --git a/mail-client/thunderbird/thunderbird-68.7.0-r1.ebuild b/mail-client/thunderbird/thunderbird-68.7.0-r1.ebuild deleted file mode 100644 index 0e04361..0000000 --- a/mail-client/thunderbird/thunderbird-68.7.0-r1.ebuild +++ /dev/null @@ -1,779 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -VIRTUALX_REQUIRED="pgo" -WANT_AUTOCONF="2.1" -MOZ_ESR="" -MOZ_LIGHTNING_VER="6.2.5" -MOZ_LIGHTNING_GDATA_VER="4.4.1" - -PYTHON_COMPAT=( python3_{6,7,8} ) -PYTHON_REQ_USE='ncurses,sqlite,ssl,threads(+)' - -# This list can be updated using scripts/get_langs.sh from the mozilla overlay -MOZ_LANGS=(ar ast be bg br ca cs cy da de el en en-GB en-US es-AR -es-ES et eu fi fr fy-NL ga-IE gd gl he hr hsb hu hy-AM id is it -ja ko lt nb-NO nl nn-NO pl pt-BR pt-PT rm ro ru si sk sl sq sr -sv-SE tr uk vi zh-CN zh-TW ) - -# Convert the ebuild version to the upstream mozilla version, used by mozlinguas -MOZ_PV="${PV/_beta/b}" - -# Patches -PATCHFF="firefox-68.0-patches-13" - -MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases" - -# ESR releases have slightly version numbers -if [[ ${MOZ_ESR} == 1 ]]; then - MOZ_PV="${MOZ_PV}esr" -fi -MOZ_P="${PN}-${MOZ_PV}" - -LLVM_MAX_SLOT=10 - -DESCRIPTION="Thunderbird Mail Client" -HOMEPAGE="https://www.mozilla.org/thunderbird" - -KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux" -SLOT="0" -LICENSE="MPL-2.0 GPL-2 LGPL-2.1" -IUSE="bindist clang cpu_flags_x86_avx2 dbus debug eme-free - +gmp-autoupdate hardened jack lightning lto cpu_flags_arm_neon pgo - pulseaudio selinux startup-notification +system-av1 +system-harfbuzz - +system-icu +system-jpeg +system-libevent +system-sqlite - +system-libvpx +system-webp test wayland wifi" -RESTRICT="!bindist? ( bindist ) - !test? ( test )" - -PATCH_URIS=( https://dev.gentoo.org/~{anarchy,axs,polynomial-c,whissi}/mozilla/patchsets/${PATCHFF}.tar.xz ) -SRC_URI="${SRC_URI} - ${MOZ_HTTP_URI}/${MOZ_PV}/source/${MOZ_P}.source.tar.xz - https://dev.gentoo.org/~axs/distfiles/lightning-${MOZ_LIGHTNING_VER}.tar.xz - lightning? ( https://dev.gentoo.org/~axs/distfiles/gdata-provider-${MOZ_LIGHTNING_GDATA_VER}.tar.xz ) - system-libvpx? ( https://dev.gentoo.org/~anarchy/patches/2013_update_libvpx_esr.patch ) - ${PATCH_URIS[@]}" - -inherit check-reqs eapi7-ver flag-o-matic toolchain-funcs eutils \ - gnome2-utils llvm mozcoreconf-v6 pax-utils xdg-utils \ - autotools mozlinguas-v2 virtualx multiprocessing - -CDEPEND=" - >=dev-libs/nss-3.44.1 - >=dev-libs/nspr-4.21 - dev-libs/atk - dev-libs/expat - >=x11-libs/cairo-1.10[X] - >=x11-libs/gtk+-2.18:2 - >=x11-libs/gtk+-3.4.0:3[X] - x11-libs/gdk-pixbuf - >=x11-libs/pango-1.22.0 - >=media-libs/libpng-1.6.35:0=[apng] - >=media-libs/mesa-10.2:* - media-libs/fontconfig - >=media-libs/freetype-2.4.10 - kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) - virtual/freedesktop-icon-theme - dbus? ( >=sys-apps/dbus-0.60 - >=dev-libs/dbus-glib-0.72 ) - startup-notification? ( >=x11-libs/startup-notification-0.8 ) - >=x11-libs/pixman-0.19.2 - >=dev-libs/glib-2.26:2 - >=sys-libs/zlib-1.2.3 - >=dev-libs/libffi-3.0.10:= - media-video/ffmpeg - x11-libs/libX11 - x11-libs/libXcomposite - x11-libs/libXdamage - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libXrender - x11-libs/libXt - system-av1? ( - >=media-libs/dav1d-0.3.0:= - >=media-libs/libaom-1.0.0:= - ) - system-harfbuzz? ( >=media-libs/harfbuzz-2.4.0:0= >=media-gfx/graphite2-1.3.13 ) - system-icu? ( >=dev-libs/icu-63.1:= ) - system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) - system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) - system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] ) - system-sqlite? ( >=dev-db/sqlite-3.28.0:3[secure-delete,debug=] ) - system-webp? ( >=media-libs/libwebp-1.0.2:0= ) - wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60 - >=dev-libs/dbus-glib-0.72 - net-misc/networkmanager ) ) - jack? ( virtual/jack ) - selinux? ( sec-policy/selinux-mozilla )" - -RDEPEND="${CDEPEND} - jack? ( virtual/jack ) - pulseaudio? ( || ( media-sound/pulseaudio - >=media-sound/apulse-0.1.9 ) ) - selinux? ( sec-policy/selinux-mozilla )" - -DEPEND="${CDEPEND} - app-arch/zip - app-arch/unzip - >=dev-util/cbindgen-0.8.7 - >=net-libs/nodejs-8.11.0 - >=sys-devel/binutils-2.30 - sys-apps/findutils - || ( - ( - sys-devel/clang:10 - !clang? ( sys-devel/llvm:10 ) - clang? ( - =sys-devel/lld-10* - sys-devel/llvm:10[gold] - pgo? ( =sys-libs/compiler-rt-sanitizers-10*[profile] ) - ) - ) - ( - sys-devel/clang:9 - !clang? ( sys-devel/llvm:9 ) - clang? ( - =sys-devel/lld-9* - sys-devel/llvm:9[gold] - pgo? ( =sys-libs/compiler-rt-sanitizers-9*[profile] ) - ) - ) - ( - sys-devel/clang:8 - !clang? ( sys-devel/llvm:8 ) - clang? ( - =sys-devel/lld-8* - sys-devel/llvm:8[gold] - pgo? ( =sys-libs/compiler-rt-sanitizers-8*[profile] ) - ) - ) - ( - sys-devel/clang:7 - !clang? ( sys-devel/llvm:7 ) - clang? ( - =sys-devel/lld-7* - sys-devel/llvm:7[gold] - pgo? ( =sys-libs/compiler-rt-sanitizers-7*[profile] ) - ) - ) - ) - pulseaudio? ( media-sound/pulseaudio ) - >=virtual/rust-1.34.0 - wayland? ( >=x11-libs/gtk+-3.11:3[wayland] ) - amd64? ( >=dev-lang/yasm-1.1 virtual/opengl ) - x86? ( >=dev-lang/yasm-1.1 virtual/opengl ) - !system-av1? ( - amd64? ( >=dev-lang/nasm-2.13 ) - x86? ( >=dev-lang/nasm-2.13 ) - )" - -REQUIRED_USE="wifi? ( dbus ) - pgo? ( lto )" - -S="${WORKDIR}/${MOZ_P%b[0-9]*}" - -BUILD_OBJ_DIR="${S}/tbird" - -# allow GMP_PLUGIN_LIST to be set in an eclass or -# overridden in the enviromnent (advanced hackers only) -if [[ -z $GMP_PLUGIN_LIST ]] ; then - GMP_PLUGIN_LIST=( gmp-gmpopenh264 gmp-widevinecdm ) -fi - -llvm_check_deps() { - if ! has_version --host-root "sys-devel/clang:${LLVM_SLOT}" ; then - ewarn "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2 - return 1 - fi - - if use clang ; then - if ! has_version --host-root "=sys-devel/lld-${LLVM_SLOT}*" ; then - ewarn "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2 - return 1 - fi - - if use pgo ; then - if ! has_version --host-root "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*" ; then - ewarn "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2 - return 1 - fi - fi - fi - - einfo "Will use LLVM slot ${LLVM_SLOT}!" >&2 -} - -pkg_setup() { - moz_pkgsetup - - if use pgo ; then - if ! has usersandbox $FEATURES ; then - die "You must enable usersandbox as X server can not run as root!" - fi - fi - - # Avoid PGO profiling problems due to enviroment leakage - # These should *always* be cleaned up anyway - unset DBUS_SESSION_BUS_ADDRESS \ - DISPLAY \ - ORBIT_SOCKETDIR \ - SESSION_MANAGER \ - XDG_SESSION_COOKIE \ - XAUTHORITY - - if ! use bindist ; then - einfo - elog "You are enabling official branding. You may not redistribute this build" - elog "to any users on your network or the internet. Doing so puts yourself into" - elog "a legal problem with Mozilla Foundation." - elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag." - fi - - addpredict /proc/self/oom_score_adj - - llvm_pkg_setup -} - -pkg_pretend() { - # Ensure we have enough disk space to compile - if use pgo || use lto || use debug || use test ; then - CHECKREQS_DISK_BUILD="8G" - else - CHECKREQS_DISK_BUILD="4G" - fi - - check-reqs_pkg_setup -} - -src_unpack() { - unpack ${A} - - # Unpack language packs - mozlinguas_src_unpack -} - -src_prepare() { - # Apply firefox patchset then apply thunderbird patches - rm "${WORKDIR}"/firefox/2013_avoid_noinline_on_GCC_with_skcms.patch || die - rm "${WORKDIR}"/firefox/2015_fix_cssparser.patch || die - eapply "${WORKDIR}/firefox" - use system-libvpx && eapply "${DISTDIR}/2013_update_libvpx_esr.patch" - pushd "${S}"/comm &>/dev/null || die - eapply "${FILESDIR}/1000_fix_gentoo_preferences.patch" - popd &>/dev/null || die - - # Allow user to apply any additional patches without modifing ebuild - eapply_user - - local n_jobs=$(makeopts_jobs) - if [[ ${n_jobs} == 1 ]]; then - einfo "Building with MAKEOPTS=-j1 is known to fail (bug #687028); Forcing MAKEOPTS=-j2 ..." - export MAKEOPTS=-j2 - fi - - # Enable gnomebreakpad - if use debug ; then - sed -i -e "s:GNOME_DISABLE_CRASH_DIALOG=1:GNOME_DISABLE_CRASH_DIALOG=0:g" \ - "${S}"/build/unix/run-mozilla.sh || die "sed failed!" - fi - - # Drop -Wl,--as-needed related manipulation for ia64 as it causes ld sefgaults, bug #582432 - if use ia64 ; then - sed -i \ - -e '/^OS_LIBS += no_as_needed/d' \ - -e '/^OS_LIBS += as_needed/d' \ - "${S}"/widget/gtk/mozgtk/gtk2/moz.build \ - "${S}"/widget/gtk/mozgtk/gtk3/moz.build \ - || die "sed failed to drop --as-needed for ia64" - fi - - # Fix sandbox violations during make clean, bug 372817 - sed -e "s:\(/no-such-file\):${T}\1:g" \ - -i "${S}"/config/rules.mk \ - -i "${S}"/nsprpub/configure{.in,} \ - || die - - # Don't exit with error when some libs are missing which we have in - # system. - sed '/^MOZ_PKG_FATAL_WARNINGS/s@= 1@= 0@' \ - -i "${S}"/comm/mail/installer/Makefile.in || die - - # Don't error out when there's no files to be removed: - sed 's@\(xargs rm\)$@\1 -f@' \ - -i "${S}"/toolkit/mozapps/installer/packager.mk || die - - # Keep codebase the same even if not using official branding - sed '/^MOZ_DEV_EDITION=1/d' \ - -i "${S}"/browser/branding/aurora/configure.sh || die - - # rustfmt, a tool to format Rust code, is optional and not required to build Firefox. - # However, when available, an unsupported version can cause problems, bug #669548 - sed -i -e "s@check_prog('RUSTFMT', add_rustup_path('rustfmt')@check_prog('RUSTFMT', add_rustup_path('rustfmt_do_not_use')@" \ - "${S}"/build/moz.configure/rust.configure || die - - # Autotools configure is now called old-configure.in - # This works because there is still a configure.in that happens to be for the - # shell wrapper configure script - eautoreconf old-configure.in - - # Must run autoconf in js/src - cd "${S}"/js/src || die - eautoconf old-configure.in -} - -src_configure() { - MEXTENSIONS="default" - # Google API keys (see http://www.chromium.org/developers/how-tos/api-keys) - # Note: These are for Gentoo Linux use ONLY. For your own distribution, please - # get your own set of keys. - _google_api_key=AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc - - # Add information about TERM to output (build.log) to aid debugging - # blessings problems - if [[ -n "${TERM}" ]] ; then - einfo "TERM is set to: \"${TERM}\"" - else - einfo "TERM is unset." - fi - - if use clang && ! tc-is-clang ; then - # Force clang - einfo "Enforcing the use of clang due to USE=clang ..." - CC=${CHOST}-clang - CXX=${CHOST}-clang++ - strip-unsupported-flags - elif ! use clang && ! tc-is-gcc ; then - # Force gcc - einfo "Enforcing the use of gcc due to USE=-clang ..." - CC=${CHOST}-gcc - CXX=${CHOST}-g++ - strip-unsupported-flags - fi - - #################################### - # - # mozconfig, CFLAGS and CXXFLAGS setup - # - #################################### - - mozconfig_init - # common config components - mozconfig_annotate 'system_libs' \ - --with-system-zlib \ - --with-system-bz2 - - # Must pass release in order to properly select linker - mozconfig_annotate 'Enable by Gentoo' --enable-release - - if use pgo ; then - if ! has userpriv $FEATURES ; then - eerror "Building firefox with USE=pgo and FEATURES=-userpriv is not supported!" - fi - fi - - # Don't let user's LTO flags clash with upstream's flags - filter-flags -flto* - - if use lto ; then - local show_old_compiler_warning= - - if use clang ; then - # At this stage CC is adjusted and the following check will - # will work - if [[ $(clang-major-version) -lt 7 ]] ; then - show_old_compiler_warning=1 - fi - - # Upstream only supports lld when using clang - mozconfig_annotate "forcing ld=lld due to USE=clang and USE=lto" --enable-linker=lld - else - if [[ $(gcc-major-version) -lt 8 ]] ; then - show_old_compiler_warning=1 - fi - - # Bug 689358 - append-cxxflags -flto - - if ! use cpu_flags_x86_avx2 ; then - local _gcc_version_with_ipa_cdtor_fix="8.3" - local _current_gcc_version="$(gcc-major-version).$(gcc-minor-version)" - - if ver_test "${_current_gcc_version}" -lt "${_gcc_version_with_ipa_cdtor_fix}" ; then - # due to a GCC bug, GCC will produce AVX2 instructions - # even if the CPU doesn't support AVX2, https://gcc.gnu.org/ml/gcc-patches/2018-12/msg01142.html - einfo "Disable IPA cdtor due to bug in GCC and missing AVX2 support -- triggered by USE=lto" - append-ldflags -fdisable-ipa-cdtor - else - einfo "No GCC workaround required, GCC version is already patched!" - fi - else - einfo "No GCC workaround required, system supports AVX2" - fi - - # Linking only works when using ld.gold when LTO is enabled - mozconfig_annotate "forcing ld=gold due to USE=lto" --enable-linker=gold - fi - - if [[ -n "${show_old_compiler_warning}" ]] ; then - # Checking compiler's major version uses CC variable. Because we allow - # user to control used compiler via USE=clang flag, we cannot use - # initial value. So this is the earliest stage where we can do this check - # because pkg_pretend is not called in the main phase function sequence - # environment saving is not guaranteed so we don't know if we will have - # correct compiler until now. - ewarn "" - ewarn "USE=lto requires up-to-date compiler (>=gcc-8 or >=clang-7)." - ewarn "You are on your own -- expect build failures. Don't file bugs using that unsupported configuration!" - ewarn "" - sleep 5 - fi - - mozconfig_annotate '+lto' --enable-lto=thin - - if use pgo ; then - mozconfig_annotate '+pgo' MOZ_PGO=1 - fi - else - # Avoid auto-magic on linker - if use clang ; then - # This is upstream's default - mozconfig_annotate "forcing ld=lld due to USE=clang" --enable-linker=lld - elif tc-ld-is-gold ; then - mozconfig_annotate "linker is set to gold" --enable-linker=gold - else - mozconfig_annotate "linker is set to bfd" --enable-linker=bfd - fi - fi - - # It doesn't compile on alpha without this LDFLAGS - use alpha && append-ldflags "-Wl,--no-relax" - - # Add full relro support for hardened - if use hardened ; then - append-ldflags "-Wl,-z,relro,-z,now" - mozconfig_use_enable hardened hardening - fi - - # Modifications to better support ARM, bug 553364 - if use cpu_flags_arm_neon ; then - mozconfig_annotate '' --with-fpu=neon - - if ! tc-is-clang ; then - # thumb options aren't supported when using clang, bug 666966 - mozconfig_annotate '' --with-thumb=yes - mozconfig_annotate '' --with-thumb-interwork=no - fi - fi - - if [[ ${CHOST} == armv*h* ]] ; then - mozconfig_annotate '' --with-float-abi=hard - if ! use system-libvpx ; then - sed -i -e "s|softfp|hard|" \ - "${S}"/media/libvpx/moz.build - fi - fi - - mozconfig_use_enable !bindist official-branding - - mozconfig_use_enable debug - mozconfig_use_enable debug tests - if ! use debug ; then - mozconfig_annotate 'disabled by Gentoo' --disable-debug-symbols - else - mozconfig_annotate 'enabled by Gentoo' --enable-debug-symbols - fi - # These are enabled by default in all mozilla applications - mozconfig_annotate '' --with-system-nspr --with-nspr-prefix="${SYSROOT}${EPREFIX}"/usr - mozconfig_annotate '' --with-system-nss --with-nss-prefix="${SYSROOT}${EPREFIX}"/usr - mozconfig_annotate '' --x-includes="${SYSROOT}${EPREFIX}"/usr/include \ - --x-libraries="${SYSROOT}${EPREFIX}"/usr/$(get_libdir) - mozconfig_annotate '' --prefix="${EPREFIX}"/usr - mozconfig_annotate '' --libdir="${EPREFIX}"/usr/$(get_libdir) - mozconfig_annotate '' --disable-crashreporter - mozconfig_annotate 'Gentoo default' --with-system-png - mozconfig_annotate '' --enable-system-ffi - mozconfig_annotate '' --disable-gconf - mozconfig_annotate '' --with-intl-api - mozconfig_annotate '' --enable-system-pixman - # Instead of the standard --build= and --host=, mozilla uses --host instead - # of --build, and --target intstead of --host. - # Note, mozilla also has --build but it does not do what you think it does. - # Set both --target and --host as mozilla uses python to guess values otherwise - mozconfig_annotate '' --target="${CHOST}" - mozconfig_annotate '' --host="${CBUILD:-${CHOST}}" - if use system-libevent ; then - mozconfig_annotate '' --with-system-libevent="${SYSROOT}${EPREFIX}"/usr - fi - - if ! use x86 && [[ ${CHOST} != armv*h* ]] ; then - mozconfig_annotate '' --enable-rust-simd - fi - - # use the gtk3 toolkit (the only one supported at this point) - # TODO: Will this result in automagic dependency on x11-libs/gtk+[wayland]? - if use wayland ; then - mozconfig_annotate '' --enable-default-toolkit=cairo-gtk3-wayland - else - mozconfig_annotate '' --enable-default-toolkit=cairo-gtk3 - fi - - mozconfig_use_enable startup-notification - mozconfig_use_enable system-sqlite - mozconfig_use_with system-av1 - mozconfig_use_with system-harfbuzz - mozconfig_use_with system-harfbuzz system-graphite2 - mozconfig_use_with system-icu - mozconfig_use_with system-jpeg - mozconfig_use_with system-libvpx - mozconfig_use_with system-webp - mozconfig_use_enable pulseaudio - # force the deprecated alsa sound code if pulseaudio is disabled - if use kernel_linux && ! use pulseaudio ; then - mozconfig_annotate '-pulseaudio' --enable-alsa - fi - - # Disable built-in ccache support to avoid sandbox violation, #665420 - # Use FEATURES=ccache instead! - mozconfig_annotate '' --without-ccache - sed -i -e 's/ccache_stats = None/return None/' \ - python/mozbuild/mozbuild/controller/building.py || \ - die "Failed to disable ccache stats call" - - mozconfig_use_enable dbus - - mozconfig_use_enable wifi necko-wifi - - # enable JACK, bug 600002 - mozconfig_use_enable jack - - # Other tb-specific settings - mozconfig_annotate '' --with-user-appdir=.thunderbird - mozconfig_annotate '' --enable-ldap - mozconfig_annotate '' --enable-calendar - - # Enable/Disable eme support - use eme-free && mozconfig_annotate '+eme-free' --disable-eme - - # Setup api key for location services and safebrowsing, https://bugzilla.mozilla.org/show_bug.cgi?id=1531176#c34 - echo -n "${_google_api_key}" > "${S}"/google-api-key - mozconfig_annotate '' --with-google-location-service-api-keyfile="${S}/google-api-key" - mozconfig_annotate '' --with-google-safebrowsing-api-keyfile="${S}/google-api-key" - - mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}" - - # allow elfhack to work in combination with unstripped binaries - # when they would normally be larger than 2GiB. - append-ldflags "-Wl,--compress-debug-sections=zlib" - - if use clang ; then - # https://bugzilla.mozilla.org/show_bug.cgi?id=1482204 - # https://bugzilla.mozilla.org/show_bug.cgi?id=1483822 - mozconfig_annotate 'elf-hack is broken when using Clang' --disable-elf-hack - fi - - echo "mk_add_options MOZ_OBJDIR=${BUILD_OBJ_DIR}" >> "${S}"/.mozconfig - echo "mk_add_options XARGS=/usr/bin/xargs" >> "${S}"/.mozconfig - - # Finalize and report settings - mozconfig_final - - mkdir -p "${S}"/third_party/rust/libloading/.deps - - # workaround for funky/broken upstream configure... - SHELL="${SHELL:-${EPREFIX}/bin/bash}" MOZ_NOSPAM=1 \ - ./mach configure || die -} - -src_compile() { - local _virtx= - if use pgo ; then - _virtx=virtx - - # Reset and cleanup environment variables used by GNOME/XDG - gnome2_environment_reset - - addpredict /root - addpredict /etc/gconf - fi - - GDK_BACKEND=x11 \ - MOZ_MAKE_FLAGS="${MAKEOPTS} -O" \ - SHELL="${SHELL:-${EPREFIX}/bin/bash}" \ - MOZ_NOSPAM=1 \ - ${_virtx} \ - ./mach build --verbose \ - || die -} - -src_install() { - MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}" - cd "${BUILD_OBJ_DIR}" || die - - # Pax mark xpcshell for hardened support, only used for startupcache creation. - pax-mark m "${BUILD_OBJ_DIR}"/dist/bin/xpcshell - - # Copy our preference before omnijar is created. - cp "${FILESDIR}"/thunderbird-gentoo-default-prefs.js-2 \ - "${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" \ - || die - - # set dictionary path, to use system hunspell - echo "pref(\"spellchecker.dictionary_path\", \"${EPREFIX}/usr/share/myspell\");" \ - >>"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" || die - - # force the graphite pref if system-harfbuzz is enabled, since the pref cant disable it - if use system-harfbuzz ; then - echo "sticky_pref(\"gfx.font_rendering.graphite.enabled\",true);" \ - >>"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" || die - fi - - # force cairo as the canvas renderer on platforms without skia support - if [[ $(tc-endian) == "big" ]] ; then - echo "sticky_pref(\"gfx.canvas.azure.backends\",\"cairo\");" \ - >>"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" || die - echo "sticky_pref(\"gfx.content.azure.backends\",\"cairo\");" \ - >>"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" || die - fi - - echo "pref(\"extensions.autoDisableScopes\", 3);" >> \ - "${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" \ - || die - - local plugin - use gmp-autoupdate || use eme-free || for plugin in "${GMP_PLUGIN_LIST[@]}" ; do - echo "pref(\"media.${plugin}.autoupdate\", false);" >> \ - "${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" \ - || die - done - - cd "${S}" - MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX}/bin/bash}" MOZ_NOSPAM=1 \ - DESTDIR="${D}" ./mach install || die - - # Install language packs - MOZEXTENSION_TARGET="distribution/extensions" MOZ_INSTALL_L10N_XPIFILE="1" mozlinguas_src_install - - local size sizes icon_path icon - if ! use bindist; then - icon_path="${S}/comm/mail/branding/thunderbird" - icon="${PN}-icon" - - domenu "${FILESDIR}"/icon/${PN}.desktop - else - icon_path="${S}/comm/mail/branding/nightly" - icon="${PN}-icon-unbranded" - - newmenu "${FILESDIR}"/icon/${PN}-unbranded.desktop \ - ${PN}.desktop - - sed -i -e "s:Mozilla\ Thunderbird:EarlyBird:g" \ - "${ED}"/usr/share/applications/${PN}.desktop - fi - - # Install a 48x48 icon into /usr/share/pixmaps for legacy DEs - newicon "${icon_path}"/default48.png "${icon}".png - # Install icons for menu entry - sizes="16 22 24 32 48 256" - for size in ${sizes}; do - newicon -s ${size} "${icon_path}/default${size}.png" "${icon}.png" - done - - # Disable built-in auto-update because we update firefox through package manager - insinto ${MOZILLA_FIVE_HOME}/distribution/ - newins "${FILESDIR}"/disable-auto-update.policy.json policies.json - - # Add StartupNotify=true bug 237317 - if use startup-notification ; then - echo "StartupNotify=true"\ - >> "${ED}/usr/share/applications/${PN}.desktop" \ - || die - fi - - # Don't install llvm-symbolizer from sys-devel/llvm package - [[ -f "${ED%/}${MOZILLA_FIVE_HOME}/llvm-symbolizer" ]] && \ - rm "${ED%/}${MOZILLA_FIVE_HOME}/llvm-symbolizer" - - local emid - # stage extra locales for lightning and install over existing - emid='{e2fda1a4-762b-4020-b5ad-a41df1933103}' - rm -f "${ED}"/${MOZILLA_FIVE_HOME}/distribution/extensions/${emid}.xpi || die - mozlinguas_xpistage_langpacks "${BUILD_OBJ_DIR}"/dist/bin/distribution/extensions/${emid} \ - "${WORKDIR}"/lightning-${MOZ_LIGHTNING_VER} lightning calendar - - mkdir -p "${T}/${emid}" || die - cp -RLp -t "${T}/${emid}" "${BUILD_OBJ_DIR}"/dist/bin/distribution/extensions/${emid}/* || die - insinto ${MOZILLA_FIVE_HOME}/distribution/extensions - doins -r "${T}/${emid}" - - if use lightning; then - # move lightning out of distribution/extensions and into extensions for app-global install - mkdir -p "${ED}"/${MOZILLA_FIVE_HOME}/extensions - mv "${ED}"/${MOZILLA_FIVE_HOME}/{distribution,}/extensions/${emid} || die - - # stage extra locales for gdata-provider and install app-global - mozlinguas_xpistage_langpacks "${BUILD_OBJ_DIR}"/dist/xpi-stage/gdata-provider \ - "${WORKDIR}"/gdata-provider-${MOZ_LIGHTNING_GDATA_VER} - emid='{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}' - mkdir -p "${T}/${emid}" || die - cp -RLp -t "${T}/${emid}" "${BUILD_OBJ_DIR}"/dist/xpi-stage/gdata-provider/* || die - - # manifest.json does not allow the addon to load, put install.rdf in place - # note, version number needs to be set properly - cp -RLp -t "${T}/${emid}" "${WORKDIR}"/gdata-provider-${MOZ_LIGHTNING_GDATA_VER}/install.rdf - sed -i -e '/em:version/ s/>[^<]*</>4.1</' "${T}/${emid}"/install.rdf - - insinto ${MOZILLA_FIVE_HOME}/extensions - doins -r "${T}/${emid}" - fi - - # thunderbird and thunderbird-bin are identical - rm "${ED%/}"${MOZILLA_FIVE_HOME}/thunderbird-bin || die - dosym thunderbird ${MOZILLA_FIVE_HOME}/thunderbird-bin - - # Required in order to use plugins and even run thunderbird on hardened. - pax-mark pm "${ED%/}"${MOZILLA_FIVE_HOME}/{thunderbird,plugin-container} -} - -pkg_preinst() { - # if the apulse libs are available in MOZILLA_FIVE_HOME then apulse - # doesn't need to be forced into the LD_LIBRARY_PATH - if use pulseaudio && has_version ">=media-sound/apulse-0.1.9" ; then - einfo "APULSE found - Generating library symlinks for sound support" - local lib - pushd "${ED}"${MOZILLA_FIVE_HOME} &>/dev/null || die - for lib in ../apulse/libpulse{.so{,.0},-simple.so{,.0}} ; do - # a quickpkg rolled by hand will grab symlinks as part of the package, - # so we need to avoid creating them if they already exist. - if [[ ! -L ${lib##*/} ]] ; then - ln -s "${lib}" ${lib##*/} || die - fi - done - popd &>/dev/null || die - fi -} - -pkg_postinst() { - xdg_desktop_database_update - xdg_icon_cache_update - - if ! use gmp-autoupdate && ! use eme-free ; then - elog "USE='-gmp-autoupdate' has disabled the following plugins from updating or" - elog "installing into new profiles:" - local plugin - for plugin in "${GMP_PLUGIN_LIST[@]}"; do elog "\t ${plugin}" ; done - elog - fi - - if use pulseaudio && has_version ">=media-sound/apulse-0.1.9" ; then - elog "Apulse was detected at merge time on this system and so it will always be" - elog "used for sound. If you wish to use pulseaudio instead please unmerge" - elog "media-sound/apulse." - elog - fi -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_icon_cache_update -} diff --git a/media-tv/kodi/Manifest b/media-tv/kodi/Manifest deleted file mode 100644 index bcc6d34..0000000 --- a/media-tv/kodi/Manifest +++ /dev/null @@ -1,6 +0,0 @@ -DIST ffmpeg-kodi-4.0.4-Leia-18.4.tar.gz 12430413 BLAKE2B 6de6fde2c16264f851466b46f87c23c34e7d503203f69d47342d46034f153860190d196da51221f866315405c8a33325b2160283333256ee5d5e293336afae99 SHA512 c6dd75dbff7119adeeda246cfb640b5e8d3b4c242ef83e5ba070207b60f0c715c3fe3cb328d87687b70a133f122a03aba990f0e95f3aac7d5dbcee25bec59078 -DIST kodi-18.2-no-java-required.patch 991361 BLAKE2B ec58367d2ac378107bf84ab0b675a74f4eac620984811f50051e1fa0ccae5b52520eb106e3508c4bf4d98899a5068279370a2ddcebe33278d20642208d3a17e2 SHA512 8267f3ca7156c9498473ac33c24419f62541f68beffbb090a5e3da18fc6e9c32e509c10c91bc2721d07fc0d3ffc723966306d44cc0a00a51e363b1c24ac5d03f -DIST kodi-18.8.tar.gz 51052219 BLAKE2B 6e49b08b5e2bfe778dafb687658e82b90226a9f1c1a7827a4290d601fe4c98e5cbaabaa39563c19a2956b83ce3a76640f081a56a41dfea4d65fb8b503c6f37b0 SHA512 242eaa9144ba0d9b15f02ab41282295de76d375cf66d595e7f6687d47c996133fcf5647448dcd06759df9f30bd86cdba239720b9bdd8b57827b6f261c08c4aaa -DIST libdvdcss-1.4.2-Leia-Beta-5.tar.gz 101068 BLAKE2B 283aa2cec0a2200d3569bc280cb9659e9224a6b3a77db8a35b269cd8caf1337ac9d8b92b806df66f63ef7458a46bd6261f0b8b14678b10e26644a79dcbeea5da SHA512 5185dbdbeb1bd13ea9d8723f1f4ab599d6f3102f5ba1096cd085aa1cda252c045f327c719227bba8e1b742352ade5e335106c8d0c1637a5a6b93ce661620dd7e -DIST libdvdnav-6.0.0-Leia-Alpha-3.tar.gz 137942 BLAKE2B 7573434a0ae8e8ccabf48173f81fcde29074eb138e119a2ae9156cde3c3d8bfd716f5d0e605b97f2dcac21f570781137c8533c5ae306b51e3905822fda318355 SHA512 11c93eaacd156f8fd7dec7c43d366438b201f31ad55b2870463a9e286912b6ada08882319a021fb7992190f87b909a49f2b83e0321cc17aedc29f7fe5898fa72 -DIST libdvdread-6.0.0-Leia-Alpha-3.tar.gz 130649 BLAKE2B 0c206acdaf0776841ab792c74e023af07d9539eb72e03ae164382a31ed950f60e5e15f1d055979d28f1398924471b294d11f064b11b8373353b3962a3777ff3c SHA512 b3419ba0a1a2dd70f1bb6236afdfe1c6e88c9ad4264198b289e3bba9375e077cecf7f89848c7b09debaa445327f3507101f3d157e692f7a7163b2bb52643e1e7 diff --git a/media-tv/kodi/files/musl/0001-add-missing-stdint.h.patch b/media-tv/kodi/files/musl/0001-add-missing-stdint.h.patch deleted file mode 100644 index 8a1bfcd..0000000 --- a/media-tv/kodi/files/musl/0001-add-missing-stdint.h.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 014f4b37a13366d1df37ab86db7fcb7c7cb6da7c Mon Sep 17 00:00:00 2001 -From: Jory Pratt <anarchy@gentoo.org> -Date: Wed, 24 Apr 2019 10:09:26 -0500 -Subject: [PATCH 1/7] add missing stdint.h - ---- - xbmc/filesystem/ZipManager.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/xbmc/filesystem/ZipManager.h b/xbmc/filesystem/ZipManager.h -index f24d459..4cd899c 100644 ---- a/xbmc/filesystem/ZipManager.h -+++ b/xbmc/filesystem/ZipManager.h -@@ -21,6 +21,7 @@ - #include <string> - #include <vector> - #include <map> -+#include <stdint.h> - - class CURL; - --- -2.21.0 - diff --git a/media-tv/kodi/files/musl/0002-fix-fileemu.patch b/media-tv/kodi/files/musl/0002-fix-fileemu.patch deleted file mode 100644 index 25b8e5a..0000000 --- a/media-tv/kodi/files/musl/0002-fix-fileemu.patch +++ /dev/null @@ -1,94 +0,0 @@ -From eee360d98c2a506a3124b538a9f6629596607698 Mon Sep 17 00:00:00 2001 -From: Jory Pratt <anarchy@gentoo.org> -Date: Wed, 24 Apr 2019 10:10:22 -0500 -Subject: [PATCH 2/7] fix fileemu - ---- - xbmc/cores/DllLoader/exports/emu_msvcrt.cpp | 15 +++++++++------ - xbmc/cores/DllLoader/exports/emu_msvcrt.h | 2 +- - xbmc/cores/DllLoader/exports/wrapper.c | 2 +- - 3 files changed, 11 insertions(+), 8 deletions(-) - -diff --git a/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp b/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp -index 5546f6e..c40eee8 100644 ---- a/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp -+++ b/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp -@@ -38,6 +38,7 @@ - #include <fcntl.h> - #include <time.h> - #include <signal.h> -+#include <paths.h> - #ifdef TARGET_POSIX - #include "PlatformDefs.h" // for __stat64 - #include "XFileUtils.h" -@@ -1480,7 +1481,7 @@ extern "C" - int ret; - - ret = dll_fgetpos64(stream, &tmpPos); --#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) -+#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__) - *pos = (fpos_t)tmpPos; - #else - pos->__pos = (off_t)tmpPos.__pos; -@@ -1493,8 +1494,9 @@ extern "C" - CFile* pFile = g_emuFileWrapper.GetFileXbmcByStream(stream); - if (pFile != NULL) - { --#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) -- *pos = pFile->GetPosition(); -+#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__) -+ uint64_t *ppos = (uint64_t *) pos; -+ *ppos = pFile->GetPosition(); - #else - pos->__pos = pFile->GetPosition(); - #endif -@@ -1509,8 +1511,9 @@ extern "C" - int fd = g_emuFileWrapper.GetDescriptorByStream(stream); - if (fd >= 0) - { --#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) -- if (dll_lseeki64(fd, *pos, SEEK_SET) >= 0) -+#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__) -+ const uint64_t *ppos = (const uint64_t *) pos; -+ if (dll_lseeki64(fd, *ppos, SEEK_SET) >= 0) - #else - if (dll_lseeki64(fd, (__off64_t)pos->__pos, SEEK_SET) >= 0) - #endif -@@ -1532,7 +1535,7 @@ extern "C" - if (fd >= 0) - { - fpos64_t tmpPos; --#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) -+#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__) - tmpPos= *pos; - #else - tmpPos.__pos = (off64_t)(pos->__pos); -diff --git a/xbmc/cores/DllLoader/exports/emu_msvcrt.h b/xbmc/cores/DllLoader/exports/emu_msvcrt.h -index eb30c44..d8ca2cb 100644 ---- a/xbmc/cores/DllLoader/exports/emu_msvcrt.h -+++ b/xbmc/cores/DllLoader/exports/emu_msvcrt.h -@@ -12,7 +12,7 @@ - #define _onexit_t void* - #endif - --#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) -+#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__) - typedef off_t __off_t; - typedef int64_t off64_t; - typedef off64_t __off64_t; -diff --git a/xbmc/cores/DllLoader/exports/wrapper.c b/xbmc/cores/DllLoader/exports/wrapper.c -index d618565..05e6368 100644 ---- a/xbmc/cores/DllLoader/exports/wrapper.c -+++ b/xbmc/cores/DllLoader/exports/wrapper.c -@@ -27,7 +27,7 @@ - #endif - #include <dlfcn.h> - --#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) -+#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__) - typedef off_t __off_t; - typedef int64_t off64_t; - typedef off64_t __off64_t; --- -2.21.0 - diff --git a/media-tv/kodi/files/musl/0003_use_stdint_for_musl.patch b/media-tv/kodi/files/musl/0003_use_stdint_for_musl.patch deleted file mode 100644 index df5d52f..0000000 --- a/media-tv/kodi/files/musl/0003_use_stdint_for_musl.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 6ba5baa56fcfadc66a6e36184dbab7f111737663 Mon Sep 17 00:00:00 2001 -From: Jory Pratt <anarchy@gentoo.org> -Date: Wed, 24 Apr 2019 11:20:27 -0500 -Subject: [PATCH] Use stdint.h defined types uint8_t, uint16_t, uint32_t and - uint64_t for compatibility with musl libc - ---- - xbmc/platform/linux/storage/UDisks2Provider.h | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/xbmc/platform/linux/storage/UDisks2Provider.h b/xbmc/platform/linux/storage/UDisks2Provider.h -index c0eb915..3697ef4 100644 ---- a/xbmc/platform/linux/storage/UDisks2Provider.h -+++ b/xbmc/platform/linux/storage/UDisks2Provider.h -@@ -10,6 +10,7 @@ - - #include <string> - #include <vector> -+#include <stdint.h> - - #include "storage/IStorageProvider.h" - #include "DBusUtil.h" -@@ -40,7 +41,7 @@ class CUDisks2Provider : public IStorageProvider - std::string m_label; - std::string m_device; - bool m_isSystem = false; -- u_int64_t m_size = 0; -+ int64_t m_size = 0; - - explicit Block(const char *object); - ~Block() = default; --- -2.21.0 - diff --git a/media-tv/kodi/files/musl/0004-Fix-ldt-for-musl.patch b/media-tv/kodi/files/musl/0004-Fix-ldt-for-musl.patch deleted file mode 100644 index bf45c28..0000000 --- a/media-tv/kodi/files/musl/0004-Fix-ldt-for-musl.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 557e8a2e6616e6946558276aa93d812d1ffa860c Mon Sep 17 00:00:00 2001 -From: Jory Pratt <anarchy@gentoo.org> -Date: Wed, 24 Apr 2019 10:10:59 -0500 -Subject: [PATCH 3/7] Fix ldt for musl - ---- - xbmc/cores/DllLoader/ldt_keeper.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/xbmc/cores/DllLoader/ldt_keeper.c b/xbmc/cores/DllLoader/ldt_keeper.c -index 0e6bc81..73f1346 100644 ---- a/xbmc/cores/DllLoader/ldt_keeper.c -+++ b/xbmc/cores/DllLoader/ldt_keeper.c -@@ -49,7 +49,7 @@ - #ifdef __cplusplus - extern "C" { - #endif --#if defined(TARGET_ANDROID) && defined(__i386__) && !defined(modify_ldt) -+#if defined(__linux__) && !defined(__GLIBC__) && !defined(modify_ldt) - #define modify_ldt(a,b,c) syscall( __NR_modify_ldt, a, b, c); - #else - int modify_ldt(int func, void *ptr, unsigned long bytecount); --- -2.21.0 - diff --git a/media-tv/kodi/files/musl/0005-fix-fortify-sources.patch b/media-tv/kodi/files/musl/0005-fix-fortify-sources.patch deleted file mode 100644 index 82d5141..0000000 --- a/media-tv/kodi/files/musl/0005-fix-fortify-sources.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 995276d672ecebf01b7a36f5ea7532f02f7ec68e Mon Sep 17 00:00:00 2001 -From: Jory Pratt <anarchy@gentoo.org> -Date: Wed, 24 Apr 2019 10:13:46 -0500 -Subject: [PATCH 4/7] fix fortify sources - ---- - xbmc/cores/DllLoader/exports/wrapper.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/xbmc/cores/DllLoader/exports/wrapper.c b/xbmc/cores/DllLoader/exports/wrapper.c -index 05e6368..a2ce079 100644 ---- a/xbmc/cores/DllLoader/exports/wrapper.c -+++ b/xbmc/cores/DllLoader/exports/wrapper.c -@@ -453,7 +453,7 @@ struct mntent *__wrap_getmntent(FILE *fp) - // are actually #defines which are inlined when compiled with -O. Those defines - // actually call __*chk (for example, __fread_chk). We need to bypass this whole - // thing to actually call our wrapped functions. --#if _FORTIFY_SOURCE > 1 -+#if defined(__GLIBC__) && _FORTIFY_SOURCE > 1 - - size_t __wrap___fread_chk(void * ptr, size_t ptrlen, size_t size, size_t n, FILE * stream) - { --- -2.21.0 - diff --git a/media-tv/kodi/files/musl/0006-remove-filewrap.patch b/media-tv/kodi/files/musl/0006-remove-filewrap.patch deleted file mode 100644 index 93c90fa..0000000 --- a/media-tv/kodi/files/musl/0006-remove-filewrap.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 04e63b1f7a3ead576bcf504950af48b3d7383301 Mon Sep 17 00:00:00 2001 -From: Jory Pratt <anarchy@gentoo.org> -Date: Wed, 24 Apr 2019 10:14:17 -0500 -Subject: [PATCH 5/7] remove filewrap - ---- - xbmc/platform/posix/utils/PosixInterfaceForCLog.cpp | 6 +----- - xbmc/platform/posix/utils/PosixInterfaceForCLog.h | 4 +--- - 2 files changed, 2 insertions(+), 8 deletions(-) - -diff --git a/xbmc/platform/posix/utils/PosixInterfaceForCLog.cpp b/xbmc/platform/posix/utils/PosixInterfaceForCLog.cpp -index ce4c5aa..8c674eb 100644 ---- a/xbmc/platform/posix/utils/PosixInterfaceForCLog.cpp -+++ b/xbmc/platform/posix/utils/PosixInterfaceForCLog.cpp -@@ -17,10 +17,6 @@ - #include "platform/android/activity/XBMCApp.h" - #endif // TARGET_ANDROID - --struct FILEWRAP : public FILE --{}; -- -- - CPosixInterfaceForCLog::CPosixInterfaceForCLog() : - m_file(NULL) - { } -@@ -40,7 +36,7 @@ bool CPosixInterfaceForCLog::OpenLogFile(const std::string &logFilename, const s - (void)remove(backupOldLogToFilename.c_str()); // if it's failed, try to continue - (void)rename(logFilename.c_str(), backupOldLogToFilename.c_str()); // if it's failed, try to continue - -- m_file = (FILEWRAP*)fopen(logFilename.c_str(), "wb"); -+ m_file = fopen(logFilename.c_str(), "wb"); - if (!m_file) - return false; // error, can't open log file - -diff --git a/xbmc/platform/posix/utils/PosixInterfaceForCLog.h b/xbmc/platform/posix/utils/PosixInterfaceForCLog.h -index 4e0f6c6..758debd 100644 ---- a/xbmc/platform/posix/utils/PosixInterfaceForCLog.h -+++ b/xbmc/platform/posix/utils/PosixInterfaceForCLog.h -@@ -10,8 +10,6 @@ - - #include <string> - --struct FILEWRAP; // forward declaration, wrapper for FILE -- - class CPosixInterfaceForCLog - { - public: -@@ -23,5 +21,5 @@ public: - void PrintDebugString(const std::string& debugString); - static void GetCurrentLocalTime(int& year, int& month, int& day, int& hour, int& minute, int& second, double& millisecond); - private: -- FILEWRAP* m_file; -+ FILE* m_file; - }; --- -2.21.0 - diff --git a/media-tv/kodi/files/musl/0007-set-default-stacksize-for-musl.patch b/media-tv/kodi/files/musl/0007-set-default-stacksize-for-musl.patch deleted file mode 100644 index 5b0f4a3..0000000 --- a/media-tv/kodi/files/musl/0007-set-default-stacksize-for-musl.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 099f2448dd4294abb91bae2135bac103a819ff8f Mon Sep 17 00:00:00 2001 -From: Jory Pratt <anarchy@gentoo.org> -Date: Wed, 24 Apr 2019 10:15:33 -0500 -Subject: [PATCH 6/7] set default stacksize for musl - ---- - xbmc/threads/platform/pthreads/ThreadImpl.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/xbmc/threads/platform/pthreads/ThreadImpl.cpp b/xbmc/threads/platform/pthreads/ThreadImpl.cpp -index 4ad675e..46efbc2 100644 ---- a/xbmc/threads/platform/pthreads/ThreadImpl.cpp -+++ b/xbmc/threads/platform/pthreads/ThreadImpl.cpp -@@ -56,6 +56,7 @@ void CThread::SpawnThread(unsigned stacksize) - { - pthread_attr_t attr; - pthread_attr_init(&attr); -+ if (!stacksize) stacksize = 1024*1024; - #if !defined(TARGET_ANDROID) // http://code.google.com/p/android/issues/detail?id=7808 - if (stacksize > PTHREAD_STACK_MIN) - pthread_attr_setstacksize(&attr, stacksize); --- -2.21.0 - diff --git a/media-tv/kodi/kodi-18.8.ebuild b/media-tv/kodi/kodi-18.8.ebuild deleted file mode 100644 index a0fc9a8..0000000 --- a/media-tv/kodi/kodi-18.8.ebuild +++ /dev/null @@ -1,334 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_REQ_USE="libressl?,sqlite,ssl" -LIBDVDCSS_VERSION="1.4.2-Leia-Beta-5" -LIBDVDREAD_VERSION="6.0.0-Leia-Alpha-3" -LIBDVDNAV_VERSION="6.0.0-Leia-Alpha-3" -FFMPEG_VERSION="4.0.4" -CODENAME="Leia" -FFMPEG_KODI_VERSION="18.4" -SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_VERSION}.tar.gz -> libdvdcss-${LIBDVDCSS_VERSION}.tar.gz - https://github.com/xbmc/libdvdread/archive/${LIBDVDREAD_VERSION}.tar.gz -> libdvdread-${LIBDVDREAD_VERSION}.tar.gz - https://github.com/xbmc/libdvdnav/archive/${LIBDVDNAV_VERSION}.tar.gz -> libdvdnav-${LIBDVDNAV_VERSION}.tar.gz - !java? ( https://dev.gentoo.org/~anarchy/patches/${PN}-18.2-no-java-required.patch ) - !system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz -> ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz )" - - -PATCHES=( - "${FILESDIR}/musl/0001-add-missing-stdint.h.patch" - "${FILESDIR}/musl/0002-fix-fileemu.patch" - "${FILESDIR}/musl/0003_use_stdint_for_musl.patch" - "${FILESDIR}/musl/0004-Fix-ldt-for-musl.patch" - "${FILESDIR}/musl/0005-fix-fortify-sources.patch" - "${FILESDIR}/musl/0006-remove-filewrap.patch" - "${FILESDIR}/musl/0007-set-default-stacksize-for-musl.patch" -) - -if [[ ${PV} == *9999 ]] ; then - PYTHON_COMPAT=( python2_7 python3_{6,7} ) - EGIT_REPO_URI="https://github.com/xbmc/xbmc.git" - inherit git-r3 -else - PYTHON_COMPAT=( python2_7 ) - MY_PV=${PV/_p/_r} - MY_PV=${MY_PV/_alpha/a} - MY_PV=${MY_PV/_beta/b} - MY_PV=${MY_PV/_rc/rc} - MY_P="${PN}-${MY_PV}" - SRC_URI+=" https://github.com/xbmc/xbmc/archive/${MY_PV}-${CODENAME}.tar.gz -> ${MY_P}.tar.gz" - KEYWORDS="~amd64 ~x86" - S=${WORKDIR}/xbmc-${MY_PV}-${CODENAME} -fi - -inherit autotools cmake desktop linux-info pax-utils python-single-r1 xdg - -DESCRIPTION="A free and open source media-player and entertainment hub" -HOMEPAGE="https://kodi.tv/ https://kodi.wiki/" - -LICENSE="GPL-2+" -SLOT="0" -# use flag is called libusb so that it doesn't fool people in thinking that -# it is _required_ for USB support. Otherwise they'll disable udev and -# that's going to be worse. -IUSE="airplay alsa bluetooth bluray caps cec +css dbus dvd gbm gles java lcms libressl libusb lirc mariadb mysql nfs +opengl pulseaudio raspberry-pi samba systemd +system-ffmpeg test +udev udisks upnp upower vaapi vdpau wayland webserver +X +xslt zeroconf" -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} - || ( gles opengl ) - ^^ ( gbm raspberry-pi wayland X ) - ?? ( mariadb mysql ) - udev? ( !libusb ) - udisks? ( dbus ) - upower? ( dbus ) -" -RESTRICT="!test? ( test )" - -COMMON_DEPEND="${PYTHON_DEPS} - airplay? ( - >=app-pda/libplist-2.0.0 - net-libs/shairplay - ) - alsa? ( >=media-libs/alsa-lib-1.1.4.1 ) - bluetooth? ( net-wireless/bluez ) - bluray? ( >=media-libs/libbluray-1.0.2 ) - caps? ( sys-libs/libcap ) - dbus? ( sys-apps/dbus ) - dev-db/sqlite - dev-libs/expat - dev-libs/flatbuffers - >=dev-libs/fribidi-0.19.7 - cec? ( >=dev-libs/libcec-4.0[raspberry-pi?] ) - dev-libs/libpcre[cxx] - >=dev-libs/libinput-1.10.5 - >=dev-libs/libxml2-2.9.4 - >=dev-libs/lzo-2.04 - dev-libs/tinyxml[stl] - $(python_gen_cond_dep 'dev-python/pillow[${PYTHON_MULTI_USEDEP}]') - $(python_gen_cond_dep 'dev-python/pycryptodome[${PYTHON_MULTI_USEDEP}]' 'python3*') - >=dev-libs/libcdio-0.94 - >=dev-libs/libfmt-3.0.1 - dev-libs/libfstrcmp - gbm? ( media-libs/mesa[gbm] ) - gles? ( - !raspberry-pi? ( media-libs/mesa[gles2] ) - ) - lcms? ( media-libs/lcms:2 ) - libusb? ( virtual/libusb:1 ) - virtual/ttf-fonts - media-fonts/roboto - >=media-libs/fontconfig-2.12.4 - >=media-libs/freetype-2.8 - >=media-libs/libass-0.13.4 - !raspberry-pi? ( media-libs/mesa[egl,X(+)] ) - >=media-libs/taglib-1.11.1 - system-ffmpeg? ( - >=media-video/ffmpeg-${FFMPEG_VERSION}:=[encode,postproc] - libressl? ( media-video/ffmpeg[libressl,-openssl] ) - !libressl? ( media-video/ffmpeg[-libressl,openssl] ) - ) - mysql? ( dev-db/mysql-connector-c:= ) - mariadb? ( dev-db/mariadb-connector-c:= ) - >=net-misc/curl-7.56.1[http2] - nfs? ( >=net-fs/libnfs-2.0.0:= ) - opengl? ( media-libs/glu ) - !libressl? ( >=dev-libs/openssl-1.0.2l:0= ) - libressl? ( dev-libs/libressl:0= ) - raspberry-pi? ( - || ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin media-libs/mesa[egl,gles2,video_cards_vc4] ) - ) - pulseaudio? ( media-sound/pulseaudio ) - samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) - >=sys-libs/zlib-1.2.11 - udev? ( virtual/udev ) - vaapi? ( - x11-libs/libva:= - opengl? ( x11-libs/libva[opengl] ) - system-ffmpeg? ( media-video/ffmpeg[vaapi] ) - vdpau? ( x11-libs/libva[vdpau] ) - wayland? ( x11-libs/libva[wayland] ) - X? ( x11-libs/libva[X] ) - ) - virtual/libiconv - vdpau? ( - || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) - system-ffmpeg? ( media-video/ffmpeg[vdpau] ) - ) - wayland? ( - >=dev-cpp/waylandpp-0.2.3:= - media-libs/mesa[wayland] - >=dev-libs/wayland-protocols-1.7 - ) - webserver? ( >=net-libs/libmicrohttpd-0.9.55[messages(+)] ) - X? ( - x11-libs/libX11 - x11-libs/libXrandr - x11-libs/libXrender - system-ffmpeg? ( media-video/ffmpeg[X] ) - ) - x11-libs/libdrm - >=x11-libs/libxkbcommon-0.4.1 - xslt? ( dev-libs/libxslt ) - zeroconf? ( net-dns/avahi[dbus] ) -" -RDEPEND="${COMMON_DEPEND} - lirc? ( app-misc/lirc ) - !media-tv/xbmc - udisks? ( sys-fs/udisks:2 ) - upower? ( sys-power/upower ) -" -DEPEND="${COMMON_DEPEND} - app-arch/bzip2 - app-arch/xz-utils - dev-lang/swig - dev-libs/crossguid - dev-libs/rapidjson - dev-util/cmake - dev-util/gperf - media-libs/giflib - >=media-libs/libjpeg-turbo-1.5.1:= - >=media-libs/libpng-1.6.26:0= - test? ( dev-cpp/gtest ) - virtual/pkgconfig - java? ( virtual/jre ) - x86? ( dev-lang/nasm ) -" - -CONFIG_CHECK="~IP_MULTICAST" -ERROR_IP_MULTICAST=" -In some cases Kodi needs to access multicast addresses. -Please consider enabling IP_MULTICAST under Networking options. -" - -pkg_setup() { - check_extra_config - python-single-r1_pkg_setup -} - -src_unpack() { - if [[ ${PV} == *9999 ]] ; then - if python_is_python3; then - EGIT_BRANCH="feature_python3" - ewarn "Using the experimental Python 3 branch!" - ewarn "See https://kodi.wiki/view/Migration_to_Python_3 for more information." - ewarn "To use the non-experimental Python 2 version:" - ewarn "echo '~${CATEGORY}/${P} PYTHON_TARGETS: -* python2_7 PYTHON_SINGLE_TARGET: -* python2_7' >> /etc/portage/package.use" - ewarn "then re-merge using: emerge -a =${CATEGORY}/${PF}" - fi - git-r3_src_unpack - else - default - fi -} - -src_prepare() { - if in_iuse java && use !java; then - eapply "${DISTDIR}"/${PN}-18.2-no-java-required.patch - fi - - cmake_src_prepare - - # avoid long delays when powerkit isn't running #348580 - sed -i \ - -e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \ - xbmc/platform/linux/*.cpp || die - - # Prepare tools and libs witch are configured with autotools during compile time - AUTOTOOLS_DIRS=( - "${S}"/lib/cpluff - "${S}"/tools/depends/native/TexturePacker/src - "${S}"/tools/depends/native/JsonSchemaBuilder/src - ) - - local d - for d in "${AUTOTOOLS_DIRS[@]}" ; do - pushd ${d} >/dev/null || die - AT_NOELIBTOOLIZE="yes" AT_TOPLEVEL_EAUTORECONF="yes" eautoreconf - popd >/dev/null || die - done - elibtoolize - - # Prevent autoreconf rerun - sed -e 's/autoreconf -vif/echo "autoreconf already done in src_prepare()"/' -i \ - "${S}"/cmake/modules/FindCpluff.cmake \ - "${S}"/tools/depends/native/TexturePacker/src/autogen.sh \ - "${S}"/tools/depends/native/JsonSchemaBuilder/src/autogen.sh \ - || die -} - -src_configure() { - local mycmakeargs=( - -Ddocdir="${EPREFIX}/usr/share/doc/${PF}" - -DENABLE_LDGOLD=OFF # https://bugs.gentoo.org/show_bug.cgi?id=606124 - -DENABLE_ALSA=$(usex alsa) - -DENABLE_AIRTUNES=$(usex airplay) - -DENABLE_AVAHI=$(usex zeroconf) - -DENABLE_BLUETOOTH=$(usex bluetooth) - -DENABLE_BLURAY=$(usex bluray) - -DENABLE_CCACHE=OFF - -DENABLE_CEC=$(usex cec) - -DENABLE_DBUS=$(usex dbus) - -DENABLE_DVDCSS=$(usex css) - -DENABLE_INTERNAL_CROSSGUID=OFF - -DENABLE_INTERNAL_FFMPEG="$(usex !system-ffmpeg)" - -DENABLE_INTERNAL_FSTRCMP=OFF - -DENABLE_CAP=$(usex caps) - -DENABLE_LCMS2=$(usex lcms) - -DENABLE_LIRCCLIENT=$(usex lirc) - -DENABLE_MARIADBCLIENT=$(usex mariadb) - -DENABLE_MICROHTTPD=$(usex webserver) - -DENABLE_MYSQLCLIENT=$(usex mysql) - -DENABLE_NFS=$(usex nfs) - -DENABLE_OPENGLES=$(usex gles) - -DENABLE_OPENGL=$(usex opengl) - -DENABLE_OPTICAL=$(usex dvd) - -DENABLE_PLIST=$(usex airplay) - -DENABLE_PULSEAUDIO=$(usex pulseaudio) - -DENABLE_SMBCLIENT=$(usex samba) - -DENABLE_UDEV=$(usex udev) - -DENABLE_UPNP=$(usex upnp) - -DENABLE_VAAPI=$(usex vaapi) - -DENABLE_VDPAU=$(usex vdpau) - -DENABLE_XSLT=$(usex xslt) - -Dlibdvdread_URL="${DISTDIR}/libdvdread-${LIBDVDREAD_VERSION}.tar.gz" - -Dlibdvdnav_URL="${DISTDIR}/libdvdnav-${LIBDVDNAV_VERSION}.tar.gz" - -Dlibdvdcss_URL="${DISTDIR}/libdvdcss-${LIBDVDCSS_VERSION}.tar.gz" - ) - - use libusb && mycmakeargs+=( -DENABLE_LIBUSB=$(usex libusb) ) - - if use system-ffmpeg; then - mycmakeargs+=( -DWITH_FFMPEG="yes" ) - else - mycmakeargs+=( -DFFMPEG_URL="${DISTDIR}/ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz" ) - fi - - if use gbm; then - mycmakeargs+=( - -DCORE_PLATFORM_NAME="gbm" - -DGBM_RENDER_SYSTEM="$(usex opengl gl gles)" - ) - fi - - if use wayland; then - mycmakeargs+=( - -DCORE_PLATFORM_NAME="wayland" - -DWAYLAND_RENDER_SYSTEM="$(usex opengl gl gles)" - ) - fi - - if use raspberry-pi; then - mycmakeargs+=( -DCORE_PLATFORM_NAME="rbpi" ) - fi - - if use X; then - mycmakeargs+=( -DCORE_PLATFORM_NAME="x11" ) - fi - - cmake_src_configure -} - -src_compile() { - cmake_src_compile all -} - -src_test() { - # see https://github.com/xbmc/xbmc/issues/17860#issuecomment-630120213 - KODI_HOME="${BUILD_DIR}" cmake_build check -} - -src_install() { - cmake_src_install - - pax-mark Em "${ED}"/usr/$(get_libdir)/${PN}/${PN}.bin - - newicon media/icon48x48.png kodi.png - - rm "${ED}"/usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf || die - dosym ../../../../fonts/roboto/Roboto-Thin.ttf \ - usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf - - python_domodule tools/EventClients/lib/python/xbmcclient.py - python_newscript "tools/EventClients/Clients/KodiSend/kodi-send.py" kodi-send -} diff --git a/media-tv/kodi/metadata.xml b/media-tv/kodi/metadata.xml deleted file mode 100644 index 269b8bf..0000000 --- a/media-tv/kodi/metadata.xml +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>candrews@gentoo.org</email> - <name>Craig Andrews</name> - </maintainer> - <use> - <flag name="airplay">enable AirPlay support</flag> - <flag name="bluray">Enable playback of Blu-ray filesystems</flag> - <flag name="cec">Enable support for HDMI-CEC devices via libcec</flag> - <flag name="gbm">Use the Graphics Buffer Manager for EGL on KMS.</flag> - <flag name="gles">Enable support for GLES</flag> - <flag name="lirc">Enable support for controlling Totem with a remote control using <pkg>app-misc/lirc</pkg></flag> - <flag name="mariadb">Add MariaDB support</flag> - <flag name="nfs">Enable NFS client support</flag> - <flag name="dvd">Enable optical (CD/DVD drive) support</flag> - <flag name="raspberry-pi">Enable support for the Raspberry Pi</flag> - <flag name="system-ffmpeg">Use system ffmpeg instead of the bundled one</flag> - <flag name="libusb">Use <pkg>virtual/libusb</pkg> for usb device hotplug support. This flag should only be enabled if you're running a non-Linux kernel or you don't want to use <pkg>sys-fs/udev</pkg>.</flag> - <flag name="udev">Use <pkg>sys-fs/udev</pkg> rules to handle devices' permissions and hotplug support. Unless you know what you're doing do not disable this flag on Linux kernels. This is provided as an option for completeness.</flag> - <flag name="webserver">Enable internal webserver</flag> - <flag name="xslt">Enable XSLT support using <pkg>dev-libs/libxslt</pkg></flag> - </use> - <upstream> - <bugs-to>https://trac.kodi.tv/</bugs-to> - <remote-id type="github">xbmc/xbmc</remote-id> - </upstream> -</pkgmetadata> diff --git a/virtual/rust/rust-1.42.0.ebuild b/virtual/rust/rust-1.42.0.ebuild deleted file mode 100644 index 3a4058d..0000000 --- a/virtual/rust/rust-1.42.0.ebuild +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit multilib-build - -DESCRIPTION="Virtual for Rust language compiler" - -LICENSE="" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" - -BDEPEND="" -RDEPEND="|| ( =dev-lang/rust-${PV}*[${MULTILIB_USEDEP}] =dev-lang/rust-bin-${PV}* )" diff --git a/virtual/rust/rust-1.48.0.ebuild b/virtual/rust/rust-1.48.0.ebuild new file mode 100644 index 0000000..82af915 --- /dev/null +++ b/virtual/rust/rust-1.48.0.ebuild @@ -0,0 +1,15 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit multilib-build + +DESCRIPTION="Virtual for Rust language compiler" + +LICENSE="" +SLOT="0" +KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" + +BDEPEND="" +RDEPEND="|| ( ~dev-lang/rust-${PV}[${MULTILIB_USEDEP}] ~dev-lang/rust-bin-${PV}[${MULTILIB_USEDEP}] )" diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest deleted file mode 100644 index f2b520a..0000000 --- a/www-client/firefox/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST firefox-81.0-patches-02.tar.xz 18952 BLAKE2B e82ad3e3fe9bbf5574d0724449ecda351b817e7c83ee554d5404e33f2e54f66e85511e68f57e0919797c8b402fde02f21d4cc1902976e23f2e89247c9a5d8c4d SHA512 20421b7c84f4d239af2b6dd2b9a11361c450d49e3d0f904bc8f790061003cf2db4fc8b8be9ac335549d0e72a3906801290edad142695eab4d66ef0d0ef753e6d -DIST firefox-81.0b9.source.tar.xz 345753632 BLAKE2B 94fce36e7c96e7afef2755b241866702340895a86c2205b9779fed0519c1ef904ae5d043204b72f28f1a68f31788db3091fbd885a49ac6e574019a0ae1a12af3 SHA512 011e69c58c739bf04097db8d57c3011876544a2e3c62bcf64b7c4f4cf9b81bf39692ec026ab0796477601f657ee43ac483c15659897198f707bc1df46bdffe7c diff --git a/www-client/firefox/files/disable-auto-update.policy.json b/www-client/firefox/files/disable-auto-update.policy.json deleted file mode 100644 index f366220..0000000 --- a/www-client/firefox/files/disable-auto-update.policy.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "policies": { - "DisableAppUpdate": true - } -} diff --git a/www-client/firefox/files/firefox-wayland.sh b/www-client/firefox/files/firefox-wayland.sh deleted file mode 100644 index 4428025..0000000 --- a/www-client/firefox/files/firefox-wayland.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -# -# Run Mozilla Firefox under Wayland -# -export MOZ_ENABLE_WAYLAND=1 -exec @PREFIX@/bin/firefox "$@" diff --git a/www-client/firefox/files/firefox-x11.sh b/www-client/firefox/files/firefox-x11.sh deleted file mode 100644 index 7565566..0000000 --- a/www-client/firefox/files/firefox-x11.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -# -# Run Mozilla Firefox on X11 -# -export MOZ_DISABLE_WAYLAND=1 -exec @PREFIX@/bin/firefox "$@" diff --git a/www-client/firefox/files/firefox.sh b/www-client/firefox/files/firefox.sh deleted file mode 100644 index eb66a42..0000000 --- a/www-client/firefox/files/firefox.sh +++ /dev/null @@ -1,106 +0,0 @@ -#!/bin/bash - -## -## Usage: -## -## $ firefox -## -## This script is meant to run Mozilla Firefox in Gentoo. - -cmdname=$(basename "$0") - -## -## Variables -## -MOZ_ARCH=$(uname -m) -case ${MOZ_ARCH} in - x86_64|s390x|sparc64) - MOZ_LIB_DIR="@PREFIX@/lib64" - SECONDARY_LIB_DIR="@PREFIX@/lib" - ;; - *) - MOZ_LIB_DIR="@PREFIX@/lib" - SECONDARY_LIB_DIR="@PREFIX@/lib64" - ;; -esac - -MOZ_FIREFOX_FILE="firefox" - -if [[ ! -r ${MOZ_LIB_DIR}/firefox/${MOZ_FIREFOX_FILE} ]]; then - if [[ ! -r ${SECONDARY_LIB_DIR}/firefox/${MOZ_FIREFOX_FILE} ]]; then - echo "Error: ${MOZ_LIB_DIR}/firefox/${MOZ_FIREFOX_FILE} not found" >&2 - if [[ -d $SECONDARY_LIB_DIR ]]; then - echo " ${SECONDARY_LIB_DIR}/firefox/${MOZ_FIREFOX_FILE} not found" >&2 - fi - exit 1 - fi - MOZ_LIB_DIR="$SECONDARY_LIB_DIR" -fi -MOZILLA_FIVE_HOME="${MOZ_LIB_DIR}/firefox" -MOZ_EXTENSIONS_PROFILE_DIR="${HOME}/.mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}" -MOZ_PROGRAM="${MOZILLA_FIVE_HOME}/${MOZ_FIREFOX_FILE}" -DESKTOP_FILE="firefox" - -## -## Enable Wayland backend? -## -if @DEFAULT_WAYLAND@ && [[ -z ${MOZ_DISABLE_WAYLAND} ]]; then - if [[ -n "$WAYLAND_DISPLAY" ]]; then - DESKTOP_FILE="firefox-wayland" - export MOZ_ENABLE_WAYLAND=1 - fi -elif [[ -n ${MOZ_DISABLE_WAYLAND} ]]; then - DESKTOP_FILE="firefox-x11" -fi - -## -## Use D-Bus remote exclusively when there's Wayland display. -## -if [[ -n "${WAYLAND_DISPLAY}" ]]; then - export MOZ_DBUS_REMOTE=1 -fi - -## -## Make sure that we set the plugin path -## -MOZ_PLUGIN_DIR="plugins" - -if [[ -n "${MOZ_PLUGIN_PATH}" ]]; then - MOZ_PLUGIN_PATH=${MOZ_PLUGIN_PATH}:${MOZ_LIB_DIR}/mozilla/${MOZ_PLUGIN_DIR} -else - MOZ_PLUGIN_PATH=${MOZ_LIB_DIR}/mozilla/${MOZ_PLUGIN_DIR} -fi - -if [[ -d "${SECONDARY_LIB_DIR}/mozilla/${MOZ_PLUGIN_DIR}" ]]; then - MOZ_PLUGIN_PATH=${MOZ_PLUGIN_PATH}:${SECONDARY_LIB_DIR}/mozilla/${MOZ_PLUGIN_DIR} -fi - -export MOZ_PLUGIN_PATH - -## -## Set MOZ_APP_LAUNCHER for gnome-session -## -export MOZ_APP_LAUNCHER="@PREFIX@/bin/${cmdname}" - -## -## Disable the GNOME crash dialog, Moz has it's own -## -if [[ "$XDG_CURRENT_DESKTOP" == "GNOME" ]]; then - GNOME_DISABLE_CRASH_DIALOG=1 - export GNOME_DISABLE_CRASH_DIALOG -fi - - -# Don't throw "old profile" dialog box. -export MOZ_ALLOW_DOWNGRADE=0 - -## -## Route to the correct .desktop file to get proper -## name and actions -## -if [[ $@ != *"--name "* ]]; then - set -- --name "${DESKTOP_FILE}" "$@" -fi - -# Run the browser -exec ${MOZ_PROGRAM} "$@" diff --git a/www-client/firefox/files/gentoo-default-prefs.js-3 b/www-client/firefox/files/gentoo-default-prefs.js-3 deleted file mode 100644 index 073ea77..0000000 --- a/www-client/firefox/files/gentoo-default-prefs.js-3 +++ /dev/null @@ -1,19 +0,0 @@ -pref("app.update.enabled", false); -pref("app.update.autoInstallEnabled", false); -pref("browser.display.use_system_colors", true); -pref("browser.link.open_external", 3); -pref("general.smoothScroll", true); -pref("general.autoScroll", false); -pref("browser.tabs.tabMinWidth", 15); -pref("browser.backspace_action", 0); -pref("browser.urlbar.hideGoButton", true); -pref("accessibility.typeaheadfind", true); -pref("browser.shell.checkDefaultBrowser", false); -pref("browser.EULA.override", true); -pref("general.useragent.vendor", "Gentoo"); -pref("general.useragent.locale", "chrome://global/locale/intl.properties"); -pref("intl.locale.requested", ""); -pref("extensions.autoDisableScopes", 0); -pref("layout.css.dpi", 0); -pref("network.trr.mode", 5); -pref("app.normandy.enabled", false); diff --git a/www-client/firefox/files/gentoo-hwaccel-prefs.js-1 b/www-client/firefox/files/gentoo-hwaccel-prefs.js-1 deleted file mode 100644 index 0cb92b0..0000000 --- a/www-client/firefox/files/gentoo-hwaccel-prefs.js-1 +++ /dev/null @@ -1,2 +0,0 @@ -pref("layers.acceleration.force-enabled", true); -pref("webgl.force-enabled", true); diff --git a/www-client/firefox/files/icon/firefox-r1.desktop b/www-client/firefox/files/icon/firefox-r1.desktop deleted file mode 100644 index a000dff..0000000 --- a/www-client/firefox/files/icon/firefox-r1.desktop +++ /dev/null @@ -1,230 +0,0 @@ -[Desktop Entry] -Version=1.0 -Name=@NAME@ -GenericName=Web Browser -Comment=Browse the Web -Exec=@EXEC@ %u -Icon=@ICON@ -Terminal=false -Type=Application -MimeType=application/pdf;application/vnd.mozilla.xul+xml;application/xhtml+xml;text/html;text/mml;text/xml;x-scheme-handler/ftp;x-scheme-handler/http;x-scheme-handler/https; -StartupNotify=@STARTUP_NOTIFY@ -Categories=Network;WebBrowser; -Keywords=web;browser;internet; -Actions=new-window;new-private-window; - -[Desktop Action new-window] -Name=Open a New Window -Name[ach]=Dirica manyen -Name[af]=Nuwe venster -Name[an]=Nueva finestra -Name[ar]=نافذة جديدة -Name[as]=নতুন উইন্ডো -Name[ast]=Ventana nueva -Name[az]=Yeni Pəncərə -Name[be]=Новае акно -Name[bg]=Нов прозорец -Name[bn_BD]=নতুন উইন্ডো (N) -Name[bn_IN]=নতুন উইন্ডো -Name[br]=Prenestr nevez -Name[brx]=गोदान उइन्ड'(N) -Name[bs]=Novi prozor -Name[ca]=Finestra nova -Name[cak]=K'ak'a' tzuwäch -Name[cs]=Nové okno -Name[cy]=Ffenestr Newydd -Name[da]=Nyt vindue -Name[de]=Neues Fenster -Name[dsb]=Nowe wokno -Name[el]=Νέο παράθυρο -Name[en_GB]=New Window -Name[en_US]=New Window -Name[en_ZA]=New Window -Name[eo]=Nova fenestro -Name[es_AR]=Nueva ventana -Name[es_CL]=Nueva ventana -Name[es_ES]=Nueva ventana -Name[es_MX]=Nueva ventana -Name[et]=Uus aken -Name[eu]=Leiho berria -Name[fa]=پنجره جدید -Name[ff]=Henorde Hesere -Name[fi]=Uusi ikkuna -Name[fr]=Nouvelle fenêtre -Name[fy_NL]=Nij finster -Name[ga_IE]=Fuinneog Nua -Name[gd]=Uinneag ùr -Name[gl]=Nova xanela -Name[gn]=Ovetã pyahu -Name[gu_IN]=નવી વિન્ડો -Name[he]=חלון חדש -Name[hi_IN]=नया विंडो -Name[hr]=Novi prozor -Name[hsb]=Nowe wokno -Name[hu]=Új ablak -Name[hy_AM]=Նոր Պատուհան -Name[id]=Jendela Baru -Name[is]=Nýr gluggi -Name[it]=Nuova finestra -Name[ja]=新しいウィンドウ -Name[ja_JP-mac]=新規ウインドウ -Name[ka]=ახალი ფანჯარა -Name[kk]=Жаңа терезе -Name[km]=បង្អួចថ្មី -Name[kn]=ಹೊಸ ಕಿಟಕಿ -Name[ko]=새 창 -Name[kok]=नवें जनेल -Name[ks]=نئئ وِنڈو -Name[lij]=Neuvo barcon -Name[lo]=ຫນ້າຕ່າງໃຫມ່ -Name[lt]=Naujas langas -Name[ltg]=Jauns lūgs -Name[lv]=Jauns logs -Name[mai]=नव विंडो -Name[mk]=Нов прозорец -Name[ml]=പുതിയ ജാലകം -Name[mr]=नवीन पटल -Name[ms]=Tetingkap Baru -Name[my]=ဝင်းဒိုးအသစ် -Name[nb_NO]=Nytt vindu -Name[ne_NP]=नयाँ सञ्झ्याल -Name[nl]=Nieuw venster -Name[nn_NO]=Nytt vindauge -Name[or]=ନୂତନ ୱିଣ୍ଡୋ -Name[pa_IN]=ਨਵੀਂ ਵਿੰਡੋ -Name[pl]=Nowe okno -Name[pt_BR]=Nova janela -Name[pt_PT]=Nova janela -Name[rm]=Nova fanestra -Name[ro]=Fereastră nouă -Name[ru]=Новое окно -Name[sat]=नावा विंडो (N) -Name[si]=නව කවුළුවක් -Name[sk]=Nové okno -Name[sl]=Novo okno -Name[son]=Zanfun taaga -Name[sq]=Dritare e Re -Name[sr]=Нови прозор -Name[sv_SE]=Nytt fönster -Name[ta]=புதிய சாளரம் -Name[te]=కొత్త విండో -Name[th]=หน้าต่างใหม่ -Name[tr]=Yeni pencere -Name[tsz]=Eraatarakua jimpani -Name[uk]=Нове вікно -Name[ur]=نیا دریچہ -Name[uz]=Yangi oyna -Name[vi]=Cửa sổ mới -Name[wo]=Palanteer bu bees -Name[xh]=Ifestile entsha -Name[zh_CN]=新建窗口 -Name[zh_TW]=開新視窗 -Exec=@EXEC@ --new-window %u - -[Desktop Action new-private-window] -Name=Open a New Private Window -Name[ach]=Dirica manyen me mung -Name[af]=Nuwe privaatvenster -Name[an]=Nueva finestra privada -Name[ar]=نافذة خاصة جديدة -Name[as]=নতুন ব্যক্তিগত উইন্ডো -Name[ast]=Ventana privada nueva -Name[az]=Yeni Məxfi Pəncərə -Name[be]=Новае акно адасаблення -Name[bg]=Нов прозорец за поверително сърфиране -Name[bn_BD]=নতুন ব্যক্তিগত উইন্ডো -Name[bn_IN]=নতুন ব্যক্তিগত উইন্ডো -Name[br]=Prenestr merdeiñ prevez nevez -Name[brx]=गोदान प्राइभेट उइन्ड' -Name[bs]=Novi privatni prozor -Name[ca]=Finestra privada nova -Name[cak]=K'ak'a' ichinan tzuwäch -Name[cs]=Nové anonymní okno -Name[cy]=Ffenestr Breifat Newydd -Name[da]=Nyt privat vindue -Name[de]=Neues privates Fenster -Name[dsb]=Nowe priwatne wokno -Name[el]=Νέο παράθυρο ιδιωτικής περιήγησης -Name[en_GB]=New Private Window -Name[en_US]=New Private Window -Name[en_ZA]=New Private Window -Name[eo]=Nova privata fenestro -Name[es_AR]=Nueva ventana privada -Name[es_CL]=Nueva ventana privada -Name[es_ES]=Nueva ventana privada -Name[es_MX]=Nueva ventana privada -Name[et]=Uus privaatne aken -Name[eu]=Leiho pribatu berria -Name[fa]=پنجره ناشناس جدید -Name[ff]=Henorde Suturo Hesere -Name[fi]=Uusi yksityinen ikkuna -Name[fr]=Nouvelle fenêtre de navigation privée -Name[fy_NL]=Nij priveefinster -Name[ga_IE]=Fuinneog Nua Phríobháideach -Name[gd]=Uinneag phrìobhaideach ùr -Name[gl]=Nova xanela privada -Name[gn]=Ovetã ñemi pyahu -Name[gu_IN]=નવી ખાનગી વિન્ડો -Name[he]=חלון פרטי חדש -Name[hi_IN]=नयी निजी विंडो -Name[hr]=Novi privatni prozor -Name[hsb]=Nowe priwatne wokno -Name[hu]=Új privát ablak -Name[hy_AM]=Սկսել Գաղտնի դիտարկում -Name[id]=Jendela Mode Pribadi Baru -Name[is]=Nýr huliðsgluggi -Name[it]=Nuova finestra anonima -Name[ja]=新しいプライベートウィンドウ -Name[ja_JP-mac]=新規プライベートウインドウ -Name[ka]=ახალი პირადი ფანჯარა -Name[kk]=Жаңа жекелік терезе -Name[km]=បង្អួចឯកជនថ្មី -Name[kn]=ಹೊಸ ಖಾಸಗಿ ಕಿಟಕಿ -Name[ko]=새 사생활 보호 모드 -Name[kok]=नवो खाजगी विंडो -Name[ks]=نْو پرایوٹ وینڈو& -Name[lij]=Neuvo barcon privou -Name[lo]=ເປີດຫນ້າຕ່າງສວນຕົວຂື້ນມາໃຫມ່ -Name[lt]=Naujas privataus naršymo langas -Name[ltg]=Jauns privatais lūgs -Name[lv]=Jauns privātais logs -Name[mai]=नया निज विंडो (W) -Name[mk]=Нов приватен прозорец -Name[ml]=പുതിയ സ്വകാര്യ ജാലകം -Name[mr]=नवीन वैयक्तिक पटल -Name[ms]=Tetingkap Persendirian Baharu -Name[my]=New Private Window -Name[nb_NO]=Nytt privat vindu -Name[ne_NP]=नयाँ निजी सञ्झ्याल -Name[nl]=Nieuw privévenster -Name[nn_NO]=Nytt privat vindauge -Name[or]=ନୂତନ ବ୍ୟକ୍ତିଗତ ୱିଣ୍ଡୋ -Name[pa_IN]=ਨਵੀਂ ਪ੍ਰਾਈਵੇਟ ਵਿੰਡੋ -Name[pl]=Nowe okno prywatne -Name[pt_BR]=Nova janela privativa -Name[pt_PT]=Nova janela privada -Name[rm]=Nova fanestra privata -Name[ro]=Fereastră privată nouă -Name[ru]=Новое приватное окно -Name[sat]=नावा निजेराक् विंडो (W ) -Name[si]=නව පුද්ගලික කවුළුව (W) -Name[sk]=Nové okno v režime Súkromné prehliadanie -Name[sl]=Novo zasebno okno -Name[son]=Sutura zanfun taaga -Name[sq]=Dritare e Re Private -Name[sr]=Нови приватан прозор -Name[sv_SE]=Nytt privat fönster -Name[ta]=புதிய தனிப்பட்ட சாளரம் -Name[te]=కొత్త ఆంతరంగిక విండో -Name[th]=หน้าต่างส่วนตัวใหม่ -Name[tr]=Yeni gizli pencere -Name[tsz]=Juchiiti eraatarakua jimpani -Name[uk]=Приватне вікно -Name[ur]=نیا نجی دریچہ -Name[uz]=Yangi maxfiy oyna -Name[vi]=Cửa sổ riêng tư mới -Name[wo]=Panlanteeru biir bu bees -Name[xh]=Ifestile yangasese entsha -Name[zh_CN]=新建隐私浏览窗口 -Name[zh_TW]=新增隱私視窗 -Exec=@EXEC@ --private-window %u diff --git a/www-client/firefox/firefox-81.0_beta9.ebuild b/www-client/firefox/firefox-81.0_beta9.ebuild deleted file mode 100644 index 9cf5c82..0000000 --- a/www-client/firefox/firefox-81.0_beta9.ebuild +++ /dev/null @@ -1,926 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" -VIRTUALX_REQUIRED="pgo" -WANT_AUTOCONF="2.1" -MOZ_ESR="" - -PYTHON_COMPAT=( python3_{7,8,9} ) -PYTHON_REQ_USE='ncurses,sqlite,ssl,threads(+)' - -# This list can be updated with scripts/get_langs.sh from the mozilla overlay -MOZ_LANGS=( ach af an ar ast az be bg bn br bs ca cak cs cy da de dsb -el en en-CA en-GB en-US eo es-AR es-CL es-ES es-MX et eu fa ff fi fr -fy-NL ga-IE gd gl gn gu-IN he hi-IN hr hsb hu hy-AM ia id is it ja ka -kab kk km kn ko lij lt lv mk mr ms my nb-NO nl nn-NO oc pa-IN pl pt-BR -pt-PT rm ro ru si sk sl son sq sr sv-SE ta te th tr uk ur uz vi xh -zh-CN zh-TW ) - -# Convert the ebuild version to the upstream mozilla version, used by mozlinguas -MOZ_PV="${PV/_alpha/a}" # Handle alpha for SRC_URI -MOZ_PV="${MOZ_PV/_beta/b}" # Handle beta for SRC_URI -MOZ_PV="${MOZ_PV%%_rc*}" # Handle rc for SRC_URI - -if [[ ${MOZ_ESR} == 1 ]] ; then - # ESR releases have slightly different version numbers - MOZ_PV="${MOZ_PV}esr" -fi - -# Patch version -PATCH="${PN}-81.0-patches-02" - -MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases" -MOZ_SRC_URI="${MOZ_HTTP_URI}/${MOZ_PV}/source/${PN}-${MOZ_PV}.source.tar.xz" - -if [[ "${PV}" == *_rc* ]]; then - MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/candidates/${MOZ_PV}-candidates/build${PV##*_rc}" - MOZ_LANGPACK_PREFIX="linux-i686/xpi/" - MOZ_SRC_URI="${MOZ_HTTP_URI}/source/${PN}-${MOZ_PV}.source.tar.xz -> $P.tar.xz" -fi - -LLVM_MAX_SLOT=10 - -inherit check-reqs eapi7-ver flag-o-matic toolchain-funcs eutils \ - gnome2-utils llvm mozcoreconf-v6 pax-utils xdg-utils \ - autotools mozlinguas-v2 multiprocessing virtualx - -DESCRIPTION="Firefox Web Browser" -HOMEPAGE="https://www.mozilla.com/firefox" - -KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" - -SLOT="0" -LICENSE="MPL-2.0 GPL-2 LGPL-2.1" -IUSE="bindist clang cpu_flags_x86_avx2 dbus debug eme-free geckodriver - +gmp-autoupdate hardened hwaccel jack lto cpu_flags_arm_neon - +openh264 pgo pulseaudio selinux +system-av1 - +system-harfbuzz +system-icu +system-jpeg +system-libevent - +system-libvpx +system-webp test wayland wifi" - -REQUIRED_USE="pgo? ( lto )" - -RESTRICT="!bindist? ( bindist ) - !test? ( test )" - -PATCH_URIS=( https://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.xz ) -SRC_URI="${SRC_URI} - ${MOZ_SRC_URI} - ${PATCH_URIS[@]}" - -CDEPEND=" - >=dev-libs/nss-3.55 - >=dev-libs/nspr-4.26 - dev-libs/atk - dev-libs/expat - >=x11-libs/cairo-1.10[X] - >=x11-libs/gtk+-2.18:2 - >=x11-libs/gtk+-3.4.0:3[X] - x11-libs/gdk-pixbuf - >=x11-libs/pango-1.22.0 - >=media-libs/libpng-1.6.35:0=[apng] - >=media-libs/mesa-10.2:* - media-libs/fontconfig - >=media-libs/freetype-2.4.10 - kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) - virtual/freedesktop-icon-theme - >=x11-libs/pixman-0.19.2 - >=dev-libs/glib-2.26:2 - >=sys-libs/zlib-1.2.3 - >=dev-libs/libffi-3.0.10:= - media-video/ffmpeg - x11-libs/libX11 - x11-libs/libXcomposite - x11-libs/libXdamage - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libXrender - x11-libs/libXt - dbus? ( - sys-apps/dbus - dev-libs/dbus-glib - ) - system-av1? ( - >=media-libs/dav1d-0.3.0:= - >=media-libs/libaom-1.0.0:= - ) - system-harfbuzz? ( - >=media-libs/harfbuzz-2.6.8:0= - >=media-gfx/graphite2-1.3.13 - ) - system-icu? ( >=dev-libs/icu-67.1:= ) - system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) - system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) - system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] ) - system-webp? ( >=media-libs/libwebp-1.1.0:0= ) - wifi? ( - kernel_linux? ( - sys-apps/dbus - dev-libs/dbus-glib - net-misc/networkmanager - ) - ) - jack? ( virtual/jack ) - selinux? ( sec-policy/selinux-mozilla )" - -RDEPEND="${CDEPEND} - jack? ( virtual/jack ) - openh264? ( media-libs/openh264:*[plugin] ) - pulseaudio? ( - || ( - media-sound/pulseaudio - >=media-sound/apulse-0.1.12-r4 - ) - ) - selinux? ( sec-policy/selinux-mozilla )" - -DEPEND="${CDEPEND} - app-arch/zip - app-arch/unzip - >=dev-util/cbindgen-0.14.3 - >=net-libs/nodejs-10.19.0 - >=sys-devel/binutils-2.30 - sys-apps/findutils - virtual/pkgconfig - >=virtual/rust-1.43.0 - || ( - ( - sys-devel/clang:10 - !clang? ( sys-devel/llvm:10 ) - clang? ( - =sys-devel/lld-10* - sys-devel/llvm:10[gold] - pgo? ( =sys-libs/compiler-rt-sanitizers-10*[profile] ) - ) - ) - ( - sys-devel/clang:9 - !clang? ( sys-devel/llvm:9 ) - clang? ( - =sys-devel/lld-9* - sys-devel/llvm:9[gold] - pgo? ( =sys-libs/compiler-rt-sanitizers-9*[profile] ) - ) - ) - ( - sys-devel/clang:8 - !clang? ( sys-devel/llvm:8 ) - clang? ( - =sys-devel/lld-8* - sys-devel/llvm:8[gold] - pgo? ( =sys-libs/compiler-rt-sanitizers-8*[profile] ) - ) - ) - ( - sys-devel/clang:7 - !clang? ( sys-devel/llvm:7 ) - clang? ( - =sys-devel/lld-7* - sys-devel/llvm:7[gold] - pgo? ( =sys-libs/compiler-rt-sanitizers-7*[profile] ) - ) - ) - ) - pulseaudio? ( - || ( - media-sound/pulseaudio - >=media-sound/apulse-0.1.12-r4[sdk] - ) - ) - wayland? ( >=x11-libs/gtk+-3.11:3[wayland] ) - amd64? ( >=dev-lang/yasm-1.1 virtual/opengl ) - x86? ( >=dev-lang/yasm-1.1 virtual/opengl ) - !system-av1? ( - amd64? ( >=dev-lang/nasm-2.13 ) - x86? ( >=dev-lang/nasm-2.13 ) - )" - -S="${WORKDIR}/firefox-${PV%_*}" - -BUILD_OBJ_DIR="${S}/ff" - -# allow GMP_PLUGIN_LIST to be set in an eclass or -# overridden in the enviromnent (advanced hackers only) -if [[ -z $GMP_PLUGIN_LIST ]] ; then - GMP_PLUGIN_LIST=( gmp-gmpopenh264 gmp-widevinecdm ) -fi - -llvm_check_deps() { - if ! has_version --host-root "sys-devel/clang:${LLVM_SLOT}" ; then - ewarn "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2 - return 1 - fi - - if use clang ; then - if ! has_version --host-root "=sys-devel/lld-${LLVM_SLOT}*" ; then - ewarn "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2 - return 1 - fi - - if use pgo ; then - if ! has_version --host-root "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*" ; then - ewarn "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2 - return 1 - fi - fi - fi - - einfo "Will use LLVM slot ${LLVM_SLOT}!" >&2 -} - -pkg_pretend() { - if [[ ${MERGE_TYPE} != binary ]] ; then - if use pgo ; then - if ! has usersandbox $FEATURES ; then - die "You must enable usersandbox as X server can not run as root!" - fi - fi - - # Ensure we have enough disk space to compile - if use pgo || use lto || use debug || use test ; then - CHECKREQS_DISK_BUILD="11G" - else - CHECKREQS_DISK_BUILD="5G" - fi - - check-reqs_pkg_pretend - fi -} - -pkg_setup() { - moz_pkgsetup - - # Use system python instead of depending on mozilla's virtualenv - export MACH_USE_SYSTEM_PYTHON=1 - - if [[ ${MERGE_TYPE} != binary ]] ; then - # Ensure we have enough disk space to compile - if use pgo || use lto || use debug || use test ; then - CHECKREQS_DISK_BUILD="11G" - else - CHECKREQS_DISK_BUILD="5G" - fi - - check-reqs_pkg_setup - - # Avoid PGO profiling problems due to enviroment leakage - # These should *always* be cleaned up anyway - unset DBUS_SESSION_BUS_ADDRESS \ - DISPLAY \ - ORBIT_SOCKETDIR \ - SESSION_MANAGER \ - XDG_CACHE_HOME \ - XDG_SESSION_COOKIE \ - XAUTHORITY - - addpredict /proc/self/oom_score_adj - - llvm_pkg_setup - fi - - if ! use bindist ; then - einfo - elog "You are enabling official branding. You may not redistribute this build" - elog "to any users on your network or the internet. Doing so puts yourself into" - elog "a legal problem with Mozilla Foundation." - elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag." - fi -} - -src_unpack() { - default - - # Unpack language packs - mozlinguas_src_unpack -} - -src_prepare() { - use pgo && rm "${WORKDIR}"/firefox/0032-LTO-Only-enable-LTO-for-Rust-when-complete-build-use.patch - eapply "${WORKDIR}/firefox" - - # Make LTO respect MAKEOPTS - sed -i \ - -e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \ - "${S}"/build/moz.configure/lto-pgo.configure \ - || die "sed failed to set num_cores" - - # Make ICU respect MAKEOPTS - sed -i \ - -e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \ - "${S}"/intl/icu_sources_data.py \ - || die "sed failed to set num_cores" - - # sed-in toolchain prefix - sed -i \ - -e "s/objdump/${CHOST}-objdump/" \ - "${S}"/python/mozbuild/mozbuild/configure/check_debug_ranges.py \ - || die "sed failed to set toolchain prefix" - - # Allow user to apply any additional patches without modifing ebuild - eapply_user - - einfo "Removing pre-built binaries ..." - find "${S}"/third_party -type f \( -name '*.so' -o -name '*.o' \) -print -delete || die - - # Enable gnomebreakpad - if use debug ; then - sed -i -e "s:GNOME_DISABLE_CRASH_DIALOG=1:GNOME_DISABLE_CRASH_DIALOG=0:g" \ - "${S}"/build/unix/run-mozilla.sh || die "sed failed!" - fi - - # Drop -Wl,--as-needed related manipulation for ia64 as it causes ld sefgaults, bug #582432 - if use ia64 ; then - sed -i \ - -e '/^OS_LIBS += no_as_needed/d' \ - -e '/^OS_LIBS += as_needed/d' \ - "${S}"/widget/gtk/mozgtk/gtk2/moz.build \ - "${S}"/widget/gtk/mozgtk/gtk3/moz.build \ - || die "sed failed to drop --as-needed for ia64" - fi - - # Fix sandbox violations during make clean, bug 372817 - sed -e "s:\(/no-such-file\):${T}\1:g" \ - -i "${S}"/config/rules.mk \ - -i "${S}"/nsprpub/configure{.in,} \ - || die - - # Don't exit with error when some libs are missing which we have in - # system. - sed '/^MOZ_PKG_FATAL_WARNINGS/s@= 1@= 0@' \ - -i "${S}"/browser/installer/Makefile.in || die - - # Don't error out when there's no files to be removed: - sed 's@\(xargs rm\)$@\1 -f@' \ - -i "${S}"/toolkit/mozapps/installer/packager.mk || die - - # Keep codebase the same even if not using official branding - sed '/^MOZ_DEV_EDITION=1/d' \ - -i "${S}"/browser/branding/aurora/configure.sh || die - - # rustfmt, a tool to format Rust code, is optional and not required to build Firefox. - # However, when available, an unsupported version can cause problems, bug #669548 - sed -i -e "s@check_prog('RUSTFMT', add_rustup_path('rustfmt')@check_prog('RUSTFMT', add_rustup_path('rustfmt_do_not_use')@" \ - "${S}"/build/moz.configure/rust.configure || die - - # Autotools configure is now called old-configure.in - # This works because there is still a configure.in that happens to be for the - # shell wrapper configure script - eautoreconf old-configure.in - - # Must run autoconf in js/src - cd "${S}"/js/src || die - eautoconf old-configure.in - - # Clear checksums that present a problem - sed -i 's/\("files":{\)[^}]*/\1/' "${S}"/third_party/rust/target-lexicon-0.9.0/.cargo-checksum.json || die -} - -src_configure() { - MEXTENSIONS="default" - # Google API keys (see http://www.chromium.org/developers/how-tos/api-keys) - # Note: These are for Gentoo Linux use ONLY. For your own distribution, please - # get your own set of keys. - _google_api_key=AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc - - # Add information about TERM to output (build.log) to aid debugging - # blessings problems - if [[ -n "${TERM}" ]] ; then - einfo "TERM is set to: \"${TERM}\"" - else - einfo "TERM is unset." - fi - - if use clang && ! tc-is-clang ; then - # Force clang - einfo "Enforcing the use of clang due to USE=clang ..." - CC=${CHOST}-clang - CXX=${CHOST}-clang++ - strip-unsupported-flags - elif ! use clang && ! tc-is-gcc ; then - # Force gcc - einfo "Enforcing the use of gcc due to USE=-clang ..." - CC=${CHOST}-gcc - CXX=${CHOST}-g++ - strip-unsupported-flags - fi - - #################################### - # - # mozconfig, CFLAGS and CXXFLAGS setup - # - #################################### - - mozconfig_init - # common config components - mozconfig_annotate 'system_libs' \ - --with-system-zlib - - # Must pass release in order to properly select linker - mozconfig_annotate 'Enable by Gentoo' --enable-release - - # libclang.so is not properly detected work around issue - mozconfig_annotate '' --with-libclang-path="$(llvm-config --libdir)" - - if use pgo ; then - if ! has userpriv $FEATURES ; then - eerror "Building firefox with USE=pgo and FEATURES=-userpriv is not supported!" - fi - fi - - # Don't let user's LTO flags clash with upstream's flags - filter-flags -flto* - - if use lto ; then - local show_old_compiler_warning= - - if use clang ; then - # At this stage CC is adjusted and the following check will - # will work - if [[ $(clang-major-version) -lt 7 ]] ; then - show_old_compiler_warning=1 - fi - - # Upstream only supports lld when using clang - mozconfig_annotate "forcing ld=lld due to USE=clang and USE=lto" --enable-linker=lld - else - if [[ $(gcc-major-version) -lt 8 ]] ; then - show_old_compiler_warning=1 - fi - - if ! use cpu_flags_x86_avx2 ; then - local _gcc_version_with_ipa_cdtor_fix="8.3" - local _current_gcc_version="$(gcc-major-version).$(gcc-minor-version)" - - if ver_test "${_current_gcc_version}" -lt "${_gcc_version_with_ipa_cdtor_fix}" ; then - # due to a GCC bug, GCC will produce AVX2 instructions - # even if the CPU doesn't support AVX2, https://gcc.gnu.org/ml/gcc-patches/2018-12/msg01142.html - einfo "Disable IPA cdtor due to bug in GCC and missing AVX2 support -- triggered by USE=lto" - append-ldflags -fdisable-ipa-cdtor - else - einfo "No GCC workaround required, GCC version is already patched!" - fi - else - einfo "No GCC workaround required, system supports AVX2" - fi - - # Linking only works when using ld.gold when LTO is enabled - mozconfig_annotate "forcing ld=gold due to USE=lto" --enable-linker=gold - fi - - if [[ -n "${show_old_compiler_warning}" ]] ; then - # Checking compiler's major version uses CC variable. Because we allow - # user to control used compiler via USE=clang flag, we cannot use - # initial value. So this is the earliest stage where we can do this check - # because pkg_pretend is not called in the main phase function sequence - # environment saving is not guaranteed so we don't know if we will have - # correct compiler until now. - ewarn "" - ewarn "USE=lto requires up-to-date compiler (>=gcc-8 or >=clang-7)." - ewarn "You are on your own -- expect build failures. Don't file bugs using that unsupported configuration!" - ewarn "" - sleep 5 - fi - - mozconfig_annotate '+lto' --enable-lto=thin - - if use pgo ; then - mozconfig_annotate '+pgo' MOZ_PGO=1 - fi - else - # Avoid auto-magic on linker - if use clang ; then - # This is upstream's default - mozconfig_annotate "forcing ld=lld due to USE=clang" --enable-linker=lld - elif tc-ld-is-gold ; then - mozconfig_annotate "linker is set to gold" --enable-linker=gold - else - mozconfig_annotate "linker is set to bfd" --enable-linker=bfd - fi - fi - - # It doesn't compile on alpha without this LDFLAGS - use alpha && append-ldflags "-Wl,--no-relax" - - # Add full relro support for hardened - use hardened && append-ldflags "-Wl,-z,now" - - # Modifications to better support ARM, bug 553364 - if use cpu_flags_arm_neon ; then - mozconfig_annotate '' --with-fpu=neon - - if ! tc-is-clang ; then - # thumb options aren't supported when using clang, bug 666966 - mozconfig_annotate '' --with-thumb=yes - mozconfig_annotate '' --with-thumb-interwork=no - fi - fi - - if [[ ${CHOST} == armv*h* ]] ; then - mozconfig_annotate '' --with-float-abi=hard - if ! use system-libvpx ; then - sed -i -e "s|softfp|hard|" \ - "${S}"/media/libvpx/moz.build - fi - fi - - mozconfig_use_enable !bindist official-branding - - mozconfig_use_enable debug - mozconfig_use_enable debug tests - if ! use debug ; then - mozconfig_annotate 'disabled by Gentoo' --disable-debug-symbols - else - mozconfig_annotate 'enabled by Gentoo' --enable-debug-symbols - fi - # These are enabled by default in all mozilla applications - mozconfig_annotate '' --with-system-nspr - mozconfig_annotate '' --with-system-nss - mozconfig_annotate '' --x-includes="${SYSROOT}${EPREFIX}"/usr/include \ - --x-libraries="${SYSROOT}${EPREFIX}"/usr/$(get_libdir) - mozconfig_annotate '' --prefix="${EPREFIX}"/usr - mozconfig_annotate '' --libdir="${EPREFIX}"/usr/$(get_libdir) - mozconfig_annotate '' --disable-crashreporter - mozconfig_annotate 'Gentoo default' --with-system-png - mozconfig_annotate '' --enable-system-ffi - mozconfig_annotate '' --with-intl-api - mozconfig_annotate '' --enable-system-pixman - # Instead of the standard --build= and --host=, mozilla uses --host instead - # of --build, and --target intstead of --host. - # Note, mozilla also has --build but it does not do what you think it does. - # Set both --target and --host as mozilla uses python to guess values otherwise - mozconfig_annotate '' --target="${CHOST}" - mozconfig_annotate '' --host="${CBUILD:-${CHOST}}" - mozconfig_annotate '' --with-toolchain-prefix="${CHOST}-" - if use system-libevent ; then - mozconfig_annotate '' --with-system-libevent="${SYSROOT}${EPREFIX}"/usr - fi - - if ! use x86 && [[ ${CHOST} != armv*h* ]] ; then - mozconfig_annotate '' --enable-rust-simd - fi - - # use the gtk3 toolkit (the only one supported at this point) - # TODO: Will this result in automagic dependency on x11-libs/gtk+[wayland]? - if use wayland ; then - mozconfig_annotate '' --enable-default-toolkit=cairo-gtk3-wayland - else - mozconfig_annotate '' --enable-default-toolkit=cairo-gtk3 - fi - - mozconfig_use_with system-av1 - mozconfig_use_with system-harfbuzz - mozconfig_use_with system-harfbuzz system-graphite2 - mozconfig_use_with system-icu - mozconfig_use_with system-jpeg - mozconfig_use_with system-libvpx - mozconfig_use_with system-webp - mozconfig_use_enable pulseaudio - # force the deprecated alsa sound code if pulseaudio is disabled - if use kernel_linux && ! use pulseaudio ; then - mozconfig_annotate '-pulseaudio' --enable-alsa - fi - - # Disable built-in ccache support to avoid sandbox violation, #665420 - # Use FEATURES=ccache instead! - mozconfig_annotate '' --without-ccache - sed -i -e 's/ccache_stats = None/return None/' \ - python/mozbuild/mozbuild/controller/building.py || \ - die "Failed to disable ccache stats call" - - mozconfig_use_enable dbus - - mozconfig_use_enable wifi necko-wifi - - mozconfig_use_enable geckodriver - - # enable JACK, bug 600002 - mozconfig_use_enable jack - - # Enable/Disable eme support - use eme-free && mozconfig_annotate '+eme-free' --disable-eme - - # Setup api key for location services and safebrowsing, https://bugzilla.mozilla.org/show_bug.cgi?id=1531176#c34 - echo -n "${_google_api_key}" > "${S}"/google-api-key - mozconfig_annotate '' --with-google-location-service-api-keyfile="${S}/google-api-key" - mozconfig_annotate '' --with-google-safebrowsing-api-keyfile="${S}/google-api-key" - - mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}" - - # allow elfhack to work in combination with unstripped binaries - # when they would normally be larger than 2GiB. - append-ldflags "-Wl,--compress-debug-sections=zlib" - - if use clang ; then - # https://bugzilla.mozilla.org/show_bug.cgi?id=1482204 - # https://bugzilla.mozilla.org/show_bug.cgi?id=1483822 - # toolkit/moz.configure Elfhack section: target.cpu in ('arm', 'x86', 'x86_64') - local disable_elf_hack= - if use amd64 ; then - disable_elf_hack=yes - elif use x86 ; then - disable_elf_hack=yes - elif use arm ; then - disable_elf_hack=yes - fi - - if [[ -n ${disable_elf_hack} ]] ; then - mozconfig_annotate 'elf-hack is broken when using Clang' --disable-elf-hack - fi - fi - - echo "mk_add_options MOZ_OBJDIR=${BUILD_OBJ_DIR}" >> "${S}"/.mozconfig - echo "mk_add_options XARGS=/usr/bin/xargs" >> "${S}"/.mozconfig - - # Finalize and report settings - mozconfig_final - - mkdir -p "${S}"/third_party/rust/libloading/.deps - - # workaround for funky/broken upstream configure... - SHELL="${SHELL:-${EPREFIX}/bin/bash}" MOZ_NOSPAM=1 \ - ./mach configure || die -} - -src_compile() { - local _virtx= - if use pgo ; then - _virtx=virtx - - # Reset and cleanup environment variables used by GNOME/XDG - gnome2_environment_reset - - addpredict /root - fi - - GDK_BACKEND=x11 \ - MOZ_MAKE_FLAGS="${MAKEOPTS} -O" \ - SHELL="${SHELL:-${EPREFIX}/bin/bash}" \ - MOZ_NOSPAM=1 \ - ${_virtx} \ - ./mach build --verbose \ - || die -} - -src_install() { - cd "${BUILD_OBJ_DIR}" || die - - # Pax mark xpcshell for hardened support, only used for startupcache creation. - pax-mark m "${BUILD_OBJ_DIR}"/dist/bin/xpcshell - - # Add our default prefs for firefox - cp "${FILESDIR}"/gentoo-default-prefs.js-3 \ - "${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \ - || die - - # set dictionary path, to use system hunspell - echo "pref(\"spellchecker.dictionary_path\", \"${EPREFIX}/usr/share/myspell\");" \ - >>"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" || die - - # force the graphite pref if system-harfbuzz is enabled, since the pref cant disable it - if use system-harfbuzz ; then - echo "sticky_pref(\"gfx.font_rendering.graphite.enabled\",true);" \ - >>"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" || die - fi - - # force cairo as the canvas renderer on platforms without skia support - if [[ $(tc-endian) == "big" ]] ; then - echo "sticky_pref(\"gfx.canvas.azure.backends\",\"cairo\");" \ - >>"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" || die - echo "sticky_pref(\"gfx.content.azure.backends\",\"cairo\");" \ - >>"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" || die - fi - - # Augment this with hwaccel prefs - if use hwaccel ; then - cat "${FILESDIR}"/gentoo-hwaccel-prefs.js-1 >> \ - "${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \ - || die - fi - - echo "pref(\"extensions.autoDisableScopes\", 3);" >> \ - "${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \ - || die - - if ! use gmp-autoupdate ; then - local plugin - for plugin in "${GMP_PLUGIN_LIST[@]}" ; do - echo "pref(\"media.${plugin}.autoupdate\", false);" >> \ - "${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \ - || die - done - fi - - cd "${S}" - MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX}/bin/bash}" MOZ_NOSPAM=1 \ - DESTDIR="${D}" ./mach install || die - - if use geckodriver ; then - cp "${BUILD_OBJ_DIR}"/dist/bin/geckodriver "${ED%/}"${MOZILLA_FIVE_HOME} || die - pax-mark m "${ED%/}"${MOZILLA_FIVE_HOME}/geckodriver - - dosym ${MOZILLA_FIVE_HOME}/geckodriver /usr/bin/geckodriver - fi - - # Install language packs - MOZEXTENSION_TARGET="distribution/extensions" MOZ_INSTALL_L10N_XPIFILE="1" mozlinguas_src_install - - local size sizes icon_path icon name - if use bindist ; then - sizes="16 32 48" - icon_path="${S}/browser/branding/aurora" - # Firefox's new rapid release cycle means no more codenames - # Let's just stick with this one... - icon="aurora" - name="Aurora" - - # Override preferences to set the MOZ_DEV_EDITION defaults, since we - # don't define MOZ_DEV_EDITION to avoid profile debaucles. - # (source: browser/app/profile/firefox.js) - cat >>"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" <<PROFILE_EOF -pref("app.feedback.baseURL", "https://input.mozilla.org/%LOCALE%/feedback/firefoxdev/%VERSION%/"); -sticky_pref("lightweightThemes.selectedThemeID", "firefox-devedition@mozilla.org"); -sticky_pref("browser.devedition.theme.enabled", true); -sticky_pref("devtools.theme", "dark"); -PROFILE_EOF - - else - sizes="16 22 24 32 48 64 128 256" - icon_path="${S}/browser/branding/official" - icon="${PN}" - name="Mozilla Firefox" - fi - - # Disable built-in auto-update because we update firefox through package manager - insinto ${MOZILLA_FIVE_HOME}/distribution/ - newins "${FILESDIR}"/disable-auto-update.policy.json policies.json - - # Install icons and .desktop for menu entry - for size in ${sizes} ; do - insinto "/usr/share/icons/hicolor/${size}x${size}/apps" - newins "${icon_path}/default${size}.png" "${icon}.png" - done - # Install a 48x48 icon into /usr/share/pixmaps for legacy DEs - newicon "${icon_path}/default48.png" "${icon}.png" - - local display_protocols="auto X11" use_wayland="false" - if use wayland ; then - display_protocols+=" Wayland" - use_wayland="true" - fi - - local app_name desktop_filename display_protocol exec_command - for display_protocol in ${display_protocols} ; do - app_name="${name} on ${display_protocol}" - desktop_filename="${PN}-${display_protocol,,}.desktop" - - case ${display_protocol} in - Wayland) - exec_command='firefox-wayland --name firefox-wayland' - newbin "${FILESDIR}"/firefox-wayland.sh firefox-wayland - ;; - X11) - if ! use wayland ; then - # Exit loop here because there's no choice so - # we don't need wrapper/.desktop file for X11. - continue - fi - - exec_command='firefox-x11 --name firefox-x11' - newbin "${FILESDIR}"/firefox-x11.sh firefox-x11 - ;; - *) - app_name="${name}" - desktop_filename="${PN}.desktop" - exec_command='firefox' - ;; - esac - - newmenu "${FILESDIR}/icon/${PN}-r1.desktop" "${desktop_filename}" - sed -i \ - -e "s:@NAME@:${app_name}:" \ - -e "s:@EXEC@:${exec_command}:" \ - -e "s:@ICON@:${icon}:" \ - "${ED%/}/usr/share/applications/${desktop_filename}" || die - done - - rm "${ED%/}"/usr/bin/firefox || die - newbin "${FILESDIR}"/firefox.sh firefox - - local wrapper - for wrapper in \ - "${ED%/}"/usr/bin/firefox \ - "${ED%/}"/usr/bin/firefox-x11 \ - "${ED%/}"/usr/bin/firefox-wayland \ - ; do - [[ ! -f "${wrapper}" ]] && continue - - sed -i \ - -e "s:@PREFIX@:${EPREFIX%/}/usr:" \ - -e "s:@DEFAULT_WAYLAND@:${use_wayland}:" \ - "${wrapper}" || die - done - - # Don't install llvm-symbolizer from sys-devel/llvm package - [[ -f "${ED%/}${MOZILLA_FIVE_HOME}/llvm-symbolizer" ]] && \ - rm "${ED%/}${MOZILLA_FIVE_HOME}/llvm-symbolizer" - - # firefox and firefox-bin are identical - rm "${ED%/}"${MOZILLA_FIVE_HOME}/firefox-bin || die - dosym firefox ${MOZILLA_FIVE_HOME}/firefox-bin - - # Required in order to use plugins and even run firefox on hardened. - pax-mark m "${ED%/}"${MOZILLA_FIVE_HOME}/{firefox,plugin-container} -} - -pkg_preinst() { - # if the apulse libs are available in MOZILLA_FIVE_HOME then apulse - # doesn't need to be forced into the LD_LIBRARY_PATH - if use pulseaudio && has_version ">=media-sound/apulse-0.1.12-r4" ; then - einfo "APULSE found - Generating library symlinks for sound support" - local lib - pushd "${ED}"${MOZILLA_FIVE_HOME} &>/dev/null || die - for lib in ../apulse/libpulse{.so{,.0},-simple.so{,.0}} ; do - # a quickpkg rolled by hand will grab symlinks as part of the package, - # so we need to avoid creating them if they already exist. - if [[ ! -L ${lib##*/} ]] ; then - ln -s "${lib}" ${lib##*/} || die - fi - done - popd &>/dev/null || die - fi -} - -pkg_postinst() { - xdg_desktop_database_update - xdg_icon_cache_update - - if ! use gmp-autoupdate ; then - elog "USE='-gmp-autoupdate' has disabled the following plugins from updating or" - elog "installing into new profiles:" - local plugin - for plugin in "${GMP_PLUGIN_LIST[@]}" ; do - elog "\t ${plugin}" - done - elog - fi - - if use pulseaudio && has_version ">=media-sound/apulse-0.1.12-r4" ; then - elog "Apulse was detected at merge time on this system and so it will always be" - elog "used for sound. If you wish to use pulseaudio instead please unmerge" - elog "media-sound/apulse." - elog - fi - - local show_doh_information show_normandy_information - - if [[ -z "${REPLACING_VERSIONS}" ]] ; then - # New install; Tell user that DoH is disabled by default - show_doh_information=yes - show_normandy_information=yes - else - local replacing_version - for replacing_version in ${REPLACING_VERSIONS} ; do - if ver_test "${replacing_version}" -lt 70 ; then - # Tell user only once about our DoH default - show_doh_information=yes - fi - - if ver_test "${replacing_version}" -lt 74.0-r2 ; then - # Tell user only once about our Normandy default - show_normandy_information=yes - fi - done - fi - - if [[ -n "${show_doh_information}" ]] ; then - elog - elog "Note regarding Trusted Recursive Resolver aka DNS-over-HTTPS (DoH):" - elog "Due to privacy concerns (encrypting DNS might be a good thing, sending all" - elog "DNS traffic to Cloudflare by default is not a good idea and applications" - elog "should respect OS configured settings), \"network.trr.mode\" was set to 5" - elog "(\"Off by choice\") by default." - elog "You can enable DNS-over-HTTPS in ${PN^}'s preferences." - fi - - # bug 713782 - if [[ -n "${show_normandy_information}" ]] ; then - elog - elog "Upstream operates a service named Normandy which allows Mozilla to" - elog "push changes for default settings or even install new add-ons remotely." - elog "While this can be useful to address problems like 'Armagadd-on 2.0' or" - elog "revert previous decisions to disable TLS 1.0/1.1, privacy and security" - elog "concerns prevail, which is why we have switched off the use of this" - elog "service by default." - elog - elog "To re-enable this service set" - elog - elog " app.normandy.enabled=true" - elog - elog "in about:config." - fi -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_icon_cache_update -} diff --git a/www-client/firefox/metadata.xml b/www-client/firefox/metadata.xml deleted file mode 100644 index 9d612ed..0000000 --- a/www-client/firefox/metadata.xml +++ /dev/null @@ -1,42 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<maintainer type="project"> - <email>mozilla@gentoo.org</email> - <name>Gentoo Mozilla Team</name> -</maintainer> -<use> - <flag name="bindist">Disable official Firefox branding (icons, name) which - are not binary-redistributable according to upstream.</flag> - <flag name="clang">Use Clang compiler instead of GCC</flag> - <flag name="custom-optimization">Build with user-specified compiler optimizations - (-Os, -O0, -O1, -O2, -O3) from CFLAGS (unsupported)</flag> - <flag name="eme-free">Disable EME (DRM plugin) cabability at build time</flag> - <flag name="geckodriver">Enable WebDriver support</flag> - <flag name="gmp-autoupdate">Allow Gecko Media Plugins (binary blobs) to be automatically - downloaded and kept up-to-date in user profiles</flag> - <flag name="hwaccel">Force-enable hardware-accelerated rendering (Mozilla bug 594876)</flag> - <flag name="lto">Enable Link Time Optimization (LTO). Requires Gold linker when using GCC - or LDD linker when using Clang</flag> - <flag name="openh264">Use <pkg>media-libs/openh264</pkg> for H.264 support - instead of downloading binary blob from Mozilla at runtime</flag> - <flag name="pgo">Add support for profile-guided optimization using gcc-4.5, - for faster binaries. This option will double the compile time.</flag> - <flag name="system-av1">Use the system-wide <pkg>media-libs/dav1d</pkg> - and <pkg>media-libs/libaom</pkg> library instead of bundled.</flag> - <flag name="system-harfbuzz">Use the system-wide <pkg>media-libs/harfbuzz</pkg> - and <pkg>media-gfx/graphite2</pkg> instead of bundled.</flag> - <flag name="system-icu">Use the system-wide <pkg>dev-libs/icu</pkg> - instead of bundled.</flag> - <flag name="system-jpeg">Use the system-wide <pkg>media-libs/libjpeg-turbo</pkg> - instead of bundled.</flag> - <flag name="system-libevent">Use the system-wide <pkg>dev-libs/libevent</pkg> - instead of bundled.</flag> - <flag name="system-libvpx">Use the system-wide <pkg>media-libs/libvpx</pkg> - instead of bundled.</flag> - <flag name="system-webp">Use the system-wide <pkg>media-libs/libwebp</pkg> - instead of bundled.</flag> - - -</use> -</pkgmetadata> |