diff options
55 files changed, 40 insertions, 4444 deletions
diff --git a/README.txt b/README.txt new file mode 100644 index 00000000..2ca5d31d --- /dev/null +++ b/README.txt @@ -0,0 +1,36 @@ +### +### Mozilla overlay +### + +1: Purpose of this overlay + + The purpose of this overlay is to provide alpha & beta ebuilds for + Mozilla's software before being released. This helps not only the + Gentoo maintainers, but also upstream, to weed out any bugs in the + build system or ebuilds before a release is made to public. Or to + experiment with the official ebuilds without causing breakage to + main tree users. + + +2: Compatibility with main tree + + While the overlay doesn't have to adhere to main tree's QA + standards, it'd be most convenient in tryint to write the ebuilds + by keeping the main tree compatibility in mind. This way, + long-term, the ebuilds will be much more maintainable. + + +3: Access + + All members of the Gentoo's Mozilla project have commit access to + this repository. For other interested parties, access can be + requested via bugzilla, or by e-mailing the project directly. + + +4: External + + Please see: + https://wiki.gentoo.org/wiki/Project:Mozilla + https://wiki.gentoo.org/wiki/Project:Mozilla/Version_Bump_Guide + https://packages.gentoo.org/maintainer/mozilla@gentoo.org + diff --git a/dev-libs/jemalloc/Manifest b/dev-libs/jemalloc/Manifest deleted file mode 100644 index 168443fc..00000000 --- a/dev-libs/jemalloc/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST jemalloc-5.1.0.tar.bz2 515622 BLAKE2B 3c8b35d30fca0018e3e32452e6fa41c7ac59f9f2f7d4bc243237fde95025ab5a7562fb86b5afe2ca9b7bb072f7baf6ac7589a4862d9ebaafddae187d93e20da0 SHA512 d9abebe54d303ca931b8c31c1033f23ff5fb060f2377ec8386f4d79c352e65c78ed34f680c352dac14f7d7115d10245782d553d988bc13df2eb34a2f0942ef6f diff --git a/dev-libs/jemalloc/files/jemalloc-4.5.0-fix_html_install.patch b/dev-libs/jemalloc/files/jemalloc-4.5.0-fix_html_install.patch deleted file mode 100644 index 159702e6..00000000 --- a/dev-libs/jemalloc/files/jemalloc-4.5.0-fix_html_install.patch +++ /dev/null @@ -1,25 +0,0 @@ -From c04d0b954adef2d3f1a30d91dc687f6a03b108eb Mon Sep 17 00:00:00 2001 -From: -Date: Mon, 29 May 2017 00:58:32 -0500 -Subject: [PATCH 2/2] Do not install html doc - ---- - Makefile.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile.in b/Makefile.in -index e49a871..733932a 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -381,7 +381,7 @@ install_doc_man: - $(INSTALL) -m 644 $$d $(MANDIR)/man3; \ - done - --install_doc: install_doc_html install_doc_man -+install_doc: install_doc_man - - install: install_bin install_include install_lib install_doc - --- -2.13.0 - diff --git a/dev-libs/jemalloc/files/jemalloc-5.0.1-strip-optimization.patch b/dev-libs/jemalloc/files/jemalloc-5.0.1-strip-optimization.patch deleted file mode 100644 index 523badf5..00000000 --- a/dev-libs/jemalloc/files/jemalloc-5.0.1-strip-optimization.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 1551ded8..2f470672 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -976,21 +976,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], diff --git a/dev-libs/jemalloc/jemalloc-5.1.0.ebuild b/dev-libs/jemalloc/jemalloc-5.1.0.ebuild deleted file mode 100644 index 7eda36ea..00000000 --- a/dev-libs/jemalloc/jemalloc-5.1.0.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# 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.0.1-strip-optimization.patch" - "${FILESDIR}/${PN}-4.5.0-fix_html_install.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 848a0a79..00000000 --- a/dev-libs/jemalloc/metadata.xml +++ /dev/null @@ -1,20 +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="hugepages">Enable transparent huge page support</flag> - <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 0b2c630f..00000000 --- a/dev-libs/nspr/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST nspr-4.21.tar.gz 1140741 BLAKE2B 9d6d079ac50c97ed7fff957e23506a24ab0d723cadc2ddb0c4283a2abdf387f0d55116ff82bf748500026b5d493909aa5495bd220f3b6e83ad4990f29eb446a0 SHA512 4f152c6ca32d9dd4cf3d92b4b54f249ac1fa39047811f7c0c7a67bdc73173cf7de0dce36dc278ad781189ea2fdc71fa70e044597676a8b1f5e6d664907e5ab7c 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 6ae04f40..00000000 --- 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 2c8ebd4c..00000000 --- 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.7.0-prtime.patch b/dev-libs/nspr/files/nspr-4.7.0-prtime.patch deleted file mode 100644 index 2de3ba34..00000000 --- a/dev-libs/nspr/files/nspr-4.7.0-prtime.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- a/pr/src/misc/prtime.c -+++ b/pr/src/misc/prtime.c -@@ -1536,7 +1536,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; - } - } -@@ -1578,11 +1578,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 1afab1dd..00000000 --- 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 4045e909..00000000 --- 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 5d37018d..00000000 --- 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 a22b0b93..00000000 --- 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 d9b367ed..00000000 --- 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.21.ebuild b/dev-libs/nspr/nspr-4.21.ebuild deleted file mode 100644 index dd4c8f16..00000000 --- a/dev-libs/nspr/nspr-4.21.ebuild +++ /dev/null @@ -1,120 +0,0 @@ -# Copyright 1999-2019 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 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~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.7.0-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 - 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/Manifest b/dev-libs/nss/Manifest deleted file mode 100644 index 46966727..00000000 --- a/dev-libs/nss/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST nss-3.43.tar.gz 23466026 BLAKE2B 1b43036daeedea1643a7fe1a8defa167097997efec529417c4857eaa29d453b6a588f462078f13662193d58dfd8f9566c22d729729591934ef154b9befb8f98d SHA512 e9dfba5bd6f68c5ab58fc7a6fa1b16a035be1b1b7c436cf787bdc99257c5f54c78d73d94d015bffd29420df19b2a2818166c68fe592dd7208ab5605344827fb5 -DIST nss-cacert-class1-class3.patch 22950 BLAKE2B 9d5e60df5f161a3c27c41e5a9419440a54f888eda454e3cde5ebe626d4075b65cf9938b5144d0fb022377f4bd415bff5e5c67d104409860aa9391b3eb8872c68 SHA512 a5aa740bf110a3f0262e3f1ef2fc739ac2b44f042e220039d48aee8e97cd764d5c10718220364f4098aba955882bd02cadb5481512388971a8290312f88a7df0 -DIST nss-pem-20160329.tar.xz 27732 BLAKE2B 7c23133a7bfb969d8eac98fb6311e76ab60c5d6601c7329f3c492da30c017e66d64a1f8bc827dd36e52e65c1a1ec02b58816442aaf410345c5ed759a02264b84 SHA512 5834b06e4c64205447573d4f4c8989e20986ae67ee00eebce3817eb73794a6355a404143ba1c676ec302ceefaf9df103cb879b1d4ff14ba4e3790dbee3e40eb2 diff --git a/dev-libs/nss/files/nss-3.21-enable-pem.patch b/dev-libs/nss/files/nss-3.21-enable-pem.patch deleted file mode 100644 index e6de2757..00000000 --- a/dev-libs/nss/files/nss-3.21-enable-pem.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- nss/lib/ckfw/manifest.mn -+++ nss/lib/ckfw/manifest.mn -@@ -5,7 +5,7 @@ - - CORE_DEPTH = ../.. - --DIRS = builtins -+DIRS = builtins pem - - PRIVATE_EXPORTS = \ - ck.h \ 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 14234e8d..00000000 --- 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 63cfaddb..00000000 --- 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.32-gentoo-fixups.patch b/dev-libs/nss/files/nss-3.32-gentoo-fixups.patch deleted file mode 100644 index 1773da98..00000000 --- a/dev-libs/nss/files/nss-3.32-gentoo-fixups.patch +++ /dev/null @@ -1,274 +0,0 @@ -From 8e49e1c92dadc2e7a41cad44637f4a224e4f5b39 Mon Sep 17 00:00:00 2001 -From: "Jory A. Pratt" <anarchy@gentoo.org> -Date: Fri, 28 Jul 2017 14:00:41 -0500 -Subject: [PATCH] add pkg-config file - -Signed-off-by: Jory A. Pratt <anarchy@gentoo.org> ---- - Makefile | 11 +--- - config/Makefile | 40 ++++++++++++++ - config/nss-config.in | 145 +++++++++++++++++++++++++++++++++++++++++++++++++++ - config/nss.pc.in | 12 +++++ - manifest.mn | 2 +- - 5 files changed, 199 insertions(+), 11 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 48bae37..9850883 100644 ---- a/Makefile -+++ b/Makefile -@@ -47,7 +47,7 @@ include $(CORE_DEPTH)/coreconf/rules.mk - # (7) Execute "local" rules. (OPTIONAL). # - ####################################################################### - --nss_build_all: build_nspr all latest -+nss_build_all: all latest - - nss_clean_all: clobber_nspr clobber - -@@ -135,15 +135,6 @@ $(NSPR_CONFIG_STATUS): $(NSPR_CONFIGURE) - --prefix='$(NSS_GYP_PREFIX)' - endif - --build_nspr: $(NSPR_CONFIG_STATUS) -- $(MAKE) -C $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME) -- --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..600fe48 ---- /dev/null -+++ b/config/Makefile -@@ -0,0 +1,40 @@ -+CORE_DEPTH = .. -+DEPTH = .. -+ -+include $(CORE_DEPTH)/coreconf/config.mk -+ -+NSS_MAJOR_VERSION = `grep "NSS_VMAJOR" ../lib/nss/nss.h | awk '{print $$3}'` -+NSS_MINOR_VERSION = `grep "NSS_VMINOR" ../lib/nss/nss.h | awk '{print $$3}'` -+NSS_PATCH_VERSION = `grep "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..1d7c444 ---- /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..df9e2cf ---- /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.8 -+Libs: -lssl3 -lsmime3 -lnss3 -lnssutil3 -+Cflags: -I${includedir} -+ -diff --git a/manifest.mn b/manifest.mn -index 500a5ad..87c905e 100644 ---- a/manifest.mn -+++ b/manifest.mn -@@ -10,4 +10,4 @@ IMPORTS = nspr20/v4.8 \ - - RELEASE = nss - --DIRS = coreconf lib cmd cpputil gtests -+DIRS = coreconf lib cmd cpputil config --- -2.13.3 - diff --git a/dev-libs/nss/metadata.xml b/dev-libs/nss/metadata.xml deleted file mode 100644 index 009a0973..00000000 --- a/dev-libs/nss/metadata.xml +++ /dev/null @@ -1,18 +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="nss-pem">Add support for libnsspem</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.43.ebuild b/dev-libs/nss/nss-3.43.ebuild deleted file mode 100644 index 35f258be..00000000 --- a/dev-libs/nss/nss-3.43.ebuild +++ /dev/null @@ -1,372 +0,0 @@ -# Copyright 1999-2019 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.16" -RTM_NAME="NSS_${PV//./_}_RTM" -# Rev of https://git.fedorahosted.org/cgit/nss-pem.git -PEM_GIT_REV="429b0222759d8ad8e6dcd29e62875ae3efd69116" -PEM_P="${PN}-pem-20160329" - -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 ) - nss-pem? ( https://dev.gentoo.org/~polynomial-c/${PEM_P}.tar.xz )" - -LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="cacert +nss-pem utils" -CDEPEND=">=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}] - >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]" -DEPEND=">=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] - >=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}] - ${CDEPEND}" -RDEPEND=">=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}] - ${CDEPEND} -" - -RESTRICT="test" - -S="${WORKDIR}/${P}/${PN}" - -MULTILIB_CHOST_TOOLS=( - /usr/bin/nss-config -) - -PATCHES=( - # Custom changes for gentoo - "${FILESDIR}/${PN}-3.32-gentoo-fixups.patch" - "${FILESDIR}/${PN}-3.21-gentoo-fixup-warnings.patch" - "${FILESDIR}/${PN}-3.23-hppa-byte_order.patch" -) - -src_unpack() { - unpack ${A} - if use nss-pem ; then - mv "${PN}"/lib/ckfw/pem/ "${S}"/lib/ckfw/ || die - fi -} - -src_prepare() { - if use nss-pem ; then - PATCHES+=( - "${FILESDIR}/${PN}-3.21-enable-pem.patch" - ) - fi - 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 - - # Do not let `uname` be used. - if use kernel_linux ; then - makeargs+=( - OS_TARGET=Linux - OS_RELEASE=2.6 - OS_TEST="$(nssarch)" - ) - fi - - export NSS_ENABLE_WERROR=0 #567158 - export BUILD_OPT=1 - export NSS_USE_SYSTEM_SQLITE=1 - export NSDISTMODE=copy - export NSS_ENABLE_ECC=1 - export FREEBL_NO_DEPEND=1 - export FREEBL_LOWHASH=1 - export ASFLAGS="" - - local d - - # Build the host tools first. - LDFLAGS="${BUILD_LDFLAGS}" \ - XCFLAGS="${BUILD_CFLAGS}" \ - NSPR_LIB_DIR="${T}/fakedir" \ - emake -j1 -C coreconf \ - CC="$(tc-getBUILD_CC)" \ - ${buildbits:-${mybits}} - makeargs+=( NSINSTALL="${PWD}/$(find -type f -name nsinstall)" ) - - # Then build the target tools. - for d in . lib/dbm ; do - CPPFLAGS="${myCPPFLAGS}" \ - XCFLAGS="${CFLAGS} ${CPPFLAGS}" \ - NSPR_LIB_DIR="${T}/fakedir" \ - emake -j1 "${makeargs[@]}" -C ${d} - done -} - -# Altering these 3 libraries breaks the CHK verification. -# All of the following cause it to break: -# - stripping -# - prelink -# - ELF signing -# http://www.mozilla.org/projects/security/pki/nss/tech-notes/tn6.html -# Either we have to NOT strip them, or we have to forcibly resign after -# stripping. -#local_libdir="$(get_libdir)" -#export STRIP_MASK=" -# */${local_libdir}/libfreebl3.so* -# */${local_libdir}/libnssdbm3.so* -# */${local_libdir}/libsoftokn3.so*" - -export NSS_CHK_SIGN_LIBS="freebl3 nssdbm3 softokn3" - -generate_chk() { - local shlibsign="$1" - local libdir="$2" - einfo "Resigning core NSS libraries for FIPS validation" - shift 2 - local i - for i in ${NSS_CHK_SIGN_LIBS} ; do - local libname=lib${i}.so - local chkname=lib${i}.chk - "${shlibsign}" \ - -i "${libdir}"/${libname} \ - -o "${libdir}"/${chkname}.tmp \ - && mv -f \ - "${libdir}"/${chkname}.tmp \ - "${libdir}"/${chkname} \ - || die "Failed to sign ${libname}" - done -} - -cleanup_chk() { - local libdir="$1" - shift 1 - local i - for i in ${NSS_CHK_SIGN_LIBS} ; do - local libfname="${libdir}/lib${i}.so" - # If the major version has changed, then we have old chk files. - [ ! -f "${libfname}" -a -f "${libfname}.chk" ] \ - && rm -f "${libfname}.chk" - done -} - -multilib_src_install() { - pushd dist >/dev/null || die - - dodir /usr/$(get_libdir) - cp -L */lib/*$(get_libname) "${ED%/}"/usr/$(get_libdir) || die "copying shared libs failed" - local i - for i in crmf freebl nssb nssckfw ; do - cp -L */lib/lib${i}.a "${ED%/}"/usr/$(get_libdir) || die "copying libs failed" - done - - # Install nss-config and pkgconfig file - dodir /usr/bin - cp -L */bin/nss-config "${ED%/}"/usr/bin || die - dodir /usr/$(get_libdir)/pkgconfig - cp -L */lib/pkgconfig/nss.pc "${ED%/}"/usr/$(get_libdir)/pkgconfig || die - - # create an nss-softokn.pc from nss.pc for libfreebl and some private headers - # bug 517266 - sed -e 's#Libs:#Libs: -lfreebl#' \ - -e 's#Cflags:#Cflags: -I${includedir}/private#' \ - */lib/pkgconfig/nss.pc >"${ED%/}"/usr/$(get_libdir)/pkgconfig/nss-softokn.pc \ - || die "could not create nss-softokn.pc" - - # all the include files - insinto /usr/include/nss - doins public/nss/*.{h,api} - insinto /usr/include/nss/private - doins private/nss/{blapi,alghmac}.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/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest deleted file mode 100644 index 57109d68..00000000 --- a/mail-client/thunderbird/Manifest +++ /dev/null @@ -1,58 +0,0 @@ -DIST firefox-60.6-patches-05.tar.xz 35980 BLAKE2B eea4ed2061f36b85bfa0677434f3acf478d9a58ed3130c2b2cab4dc78613e16ff481cc063d71525fc16b01be3cfe17a4a5dcd60c5070205246eb8b2b78387393 SHA512 3a591d68f5911c6547de24e73390478eb389f467a49f4010cd8c295569a09d878ffa2db4a072fe118c1195d1f0acf0adbb7540de14c367cb4cec522b4f1e4b05 -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-60.0-patches-0.tar.xz 10292 BLAKE2B a81ac6708389baff21accccac1511c1fc372324cac8bb3ee0f3b5d2a0690b6e22ef658b41c887b99168b43c4ea4bb0947d3e48ad9b7e80db558db22c976df868 SHA512 1dae465676b2ff4faae08ebf69e6bac46552bc0331659bf5f444c45b026e4c8d2fc46cd3758e3bd121716aa85d5dcc56de6483919f7f0077b9d9720574dbd1aa -DIST thunderbird-60.6.1-ar.xpi 627180 BLAKE2B 56df555c0681214450a28d1eb126a1e0ebad308049c2f64480dbf20f39b5e62ea5600ecf81052a2c13396044ce77c6d27ad0c1fb6453c329968ccfb505de16a9 SHA512 76a92d776fa1efd6db1a312ad6ca016ca1cd2b70eb62ed3e309417ee02a2fb78112295d58a0d1e092cf1b36440339643a3c290dd1098c6087d08fa39515157b3 -DIST thunderbird-60.6.1-ast.xpi 559642 BLAKE2B 77892bbbe45a04c60e62a01ca98f47aac139f282a5ac06eea62d2ce518ac6cbc8d6c3765d16f929c8792b5731feeb82491eeeeeba0ef6d0116442f1e569c0d51 SHA512 66130b52317bce1b92ca6d1922d56c062196bdd5e158239640e1d040830b5522227f13e86b1286f6ebf569a8de5491ab37b4e8d7af7c5965b2a7e5b14509235e -DIST thunderbird-60.6.1-be.xpi 659080 BLAKE2B bde346f25b24c2253c7c4ef034dc8ffa1d3b742254db95a0baf9dc2a00fdd27a22f9dd7e6d32ff288ac87e6302193f7e7e1aff0e76dcff0b64ef6b9acd6093f0 SHA512 95a8afbf179697f819704668951907709033bb10d7212e7b6741910b39960a7c9800e70f343022185d716ef689c1c43e10718d5245c64db4cb5fb128a3b641df -DIST thunderbird-60.6.1-bg.xpi 669318 BLAKE2B 59f3a7930b829cbb8bf4f681ca25dc364b4291717e535700573f708749b9e7fdfe7279366038f42e4c5352406261d4ce5453c84f48f213512b6c345a657308b2 SHA512 7c64c7b1363c6001d854cbdec400c28d775bc8fba500e7c743eb254604d5babacee3fa1c3bd49e48a523d73a5343c07d1b7f25c4d2580f07c5f899e88eec0aee -DIST thunderbird-60.6.1-br.xpi 580371 BLAKE2B 1bab764801789578565226c12bc379f893d566d29cdff87e40a75d1ff187c136eef7b155bbd66ec5c652f761f3c96c62d1f5fc47d7cbc2f4b17b9f63e024bbe2 SHA512 0fbca5fc5a2f959d620380831c37d8400da26f9bf7f190a0e62c6fe1e92324bcfaa6b3650d2a8251faf595c67af7a639147ecce70e1040461ab0cd7ef077f8aa -DIST thunderbird-60.6.1-ca.xpi 591971 BLAKE2B 79bccec3825b4060ca06a81df8e70f63d6e51a12db4290b3ee81f3cd962edbfc3b3221e97e7e175a1bd2d439a5633dcc646d966661bfd2a917d219294f9bb025 SHA512 7bd0c671582543825e1bba520cce6a86fc8fc43a163aa66fc87a2e02a27b4655c296510c069e54969e1db58666ac136c8a3f98d18b7eb6a562ad91e6f1a2de69 -DIST thunderbird-60.6.1-cs.xpi 611203 BLAKE2B 49367316e806fa0ca831952f3135da1249826321bb8f7b2436359256862a0289f3b445b62129f86ea16ac030b9a4cca6f72a062a81244ab9a5659169b3cc4863 SHA512 1195c6b4aa8d80222af7c05403bc32a0b61f3fb38c99361ce1da0face6ac9346eb2817bc27b1d07008fb05aef0f680a11cc43369c6494fa37a7330356faa857f -DIST thunderbird-60.6.1-cy.xpi 586038 BLAKE2B 8e8285a0e2f667cb439066a9d94095aea44dfd8cf0b8d8dc33eee06011523dcb376c20a95b80ea7e9350b0df65bf8c61090cd80eb66d4be3ca693bd7d00bfb29 SHA512 f9e1e3e41e5eb3b2967acd6c4af53d608c3cea47a603b31b0f95980801274a9378646497b4831f8feff48d8cb5f58734a8bba8a319c7138bc23d23ac4c998d34 -DIST thunderbird-60.6.1-da.xpi 570806 BLAKE2B 5c269f47ede5214938e3e9d11c782076dd956f37e90c957645518643247a1354e84da3e5fc7f3a7171fa1ab92c0f85f425834809f207432fd7a71cd0ba03e271 SHA512 be8c3e97f757e5d1a136b4426937091cbedcd8e4f8b34a0c4528e4135840c6f2bf21298547f7f0dc520cd94322d072ae06f57907104df09604fe362fc1c3bfb4 -DIST thunderbird-60.6.1-de.xpi 582575 BLAKE2B 09f5b688993a9ac04853c7f54db678cd98a7b6d8f8fd3ab5dc9dcca38536ccde33d056ba8aa48c3ca75c213e2ec4e30ba3137d98f44d5ff367d633451578d735 SHA512 35aab53e32835a70b78399385332497d9f3da61837d02cec4a022e467b1898ea856c62307a943fdad48bdd0841ce50967525adc935ef3d612f1931ab86336f95 -DIST thunderbird-60.6.1-el.xpi 694861 BLAKE2B 6544f2cce7fea4c5e1978d16bc900c7604e4c872ae8ee11afe9d5aee679dca3b4e167ada561a351455d07a57ed88ddb3c880ea52d4e87214c9428790ec222b48 SHA512 20a432ab1a333d1d00b05d9c51c8ef05dd0b647574702dcaff53a30413b751b651c04c6d170906dc95619ac8a6cfc449790d8a3e8ec518fa4c4a04852715426d -DIST thunderbird-60.6.1-en-GB.xpi 553896 BLAKE2B d6eeca840b7edc4a25b244f087899c5c7f69966b628b09b1533efe0a510e3ff5b731b92413994ad13b8268152407f96d502682cd810dd39d9ddb4d478c9437da SHA512 428b34d4f4c306b02d7fdf0a9407592f09ac7df28cf92a11b20e465619ce390777613a251ecce2f58f9e6630b805f5aaaab693bbdb23212fb4070eff019138e6 -DIST thunderbird-60.6.1-es-AR.xpi 595048 BLAKE2B db65638db4a983b0716a51610c0b74232462540ca621b55e8c66d0a6b045d1fbcb2b5d87235bbfa44ed62b4bfaa3c471cda1eefbafc2a3a1afffea4d24da26f5 SHA512 c04b8818b0cb74621519de6f26691171c9b5a962ac805947b377a59a0947c4ea4e1790aff820de0dd25f75da951484459da02cf08ac13272f2789df7b3fdc6f2 -DIST thunderbird-60.6.1-es-ES.xpi 492212 BLAKE2B fc793d13d8325093312e9df7ab7887a290e3b3fc32b0aa7b904276bbbf06812cf78caa06375b9fe1c257324f9d822dd08f5860f2ba049f2ca2d7a133a585f240 SHA512 6770519f277bda76c9398ff6d5b5c558b9af91df16813bc7669c418dc050dec0b590cfccdacf90a346f0aa7dc980272dc3ddcdc42a20c678d730f48bdc059ee2 -DIST thunderbird-60.6.1-et.xpi 570867 BLAKE2B de2f0bfc8747e8bdba1037aa7fed5854097ed3a8db6aad12b8cb72c916e5ec2756eccf942da3e516ff14df68f220b281ed70ce9307b346d66a90efbe85fba606 SHA512 a5118ae5d512d67efece65b5850f8409cf6f368a49170922e8fd085f68f7898686b78448db4d299fb6f5e36b71e309ef336abb5c22cd0cd48b80771b9a1d675c -DIST thunderbird-60.6.1-eu.xpi 581384 BLAKE2B bba0e11f1dc2e9c356f39519fa477b45694300cf782bbd8c89ab2947f781f11a413e83d89ac3e8b2c70de5d0065ba8bf2fcff23af942321a441042d15edeac77 SHA512 f91323065d5d504cabbb35bfd9e7e58a743cae0e6aa170d20ff37223f116ba943d4b0d4cd1253dfd69c2c26b53a481e7b4f68ff8cbfcd062bd09d8167b0868c8 -DIST thunderbird-60.6.1-fi.xpi 575753 BLAKE2B fc21093e645f5b303c2cee41fc3be39af8827739bdb8e221716784dddf28dabe737da3b2e901b9d56a6e6d5b204c4b79c216bf506ef4c8e71f21c4a08401aa4c SHA512 536ff18fa4c70b27da626161ed3c9d6072eb0d6eb33845a41a0170525bf8c2606b520fd3fd7082dbbe16a32dac21f7feb967f2e38683199009bff91dc0fd33ea -DIST thunderbird-60.6.1-fr.xpi 608467 BLAKE2B dacedb27256a10a8f73fd74e04d792370b4d11a0c029b535304ecb40a01e3381b12af9e32f36393ece37ed63c65a8cc9752fa35c1224daf66ae1108487e1a784 SHA512 7f9a9bd291041fb953ce60a36fe508dd64014e39ba31b0de3f304f9666ef1993ac95babce8b0c4ee7b74091228408904ee47c4719d3569293b9904c899fffae3 -DIST thunderbird-60.6.1-fy-NL.xpi 593851 BLAKE2B cffad3490c684dd4d8a45ac50ceed5e105aec9ad3dd67caecfda94ce4e67aa4e58097c3039a6d585537b7232661890efef42bfd20f0a67dbf29a19d6db596905 SHA512 f734d8ef90b5564be66a8ff408f48ef079c2281b4f86e17ae75a890b2493c13476104d3af2047b7b1873f56e1695fd8aff1f88517a37a9db0dfc0119cf28d1c6 -DIST thunderbird-60.6.1-ga-IE.xpi 603507 BLAKE2B 4c18496fd67549a93454c311898fa0840788c2419f7249e4cc70725feae457e64bcf7ad343f1cabb1ec2db71f615683d5f7ecd39fe7e2cad12c62d6cd8a0bf05 SHA512 1666dc8580aadc288a9d55b45472bc4a0b142b028e7b618467256827caef5b13b8bb35969ddee00f438092433b69c87e6fdc50b5a0d6d2f4abaf09c5279204cd -DIST thunderbird-60.6.1-gd.xpi 599262 BLAKE2B 5ed8121a874fd98fb8e3ceae85af80af6d2488938001e1e3198b9c638f33f5aee89496b42d5a67aa1381551e2a74ed74509bdeea846ec58669338960c3d13cfc SHA512 5b1a1459b8b86760223906e4aed08f8db333e90a0787c440b1a6aab52e585074a1fc7830e256cc5100633bf9558cadc6c724cd0743d800c2a1c9b96706acf685 -DIST thunderbird-60.6.1-gl.xpi 580343 BLAKE2B d832d4269022feb02c454fdd52ddbe3e1724beebc0cd62a8da2b7dd880bd2c6769c7d64125f276248dca68f4c5ed6e8b310fe01058ac5d352730cb54fa27622b SHA512 18d697932c0d876dc73509ad7503672e3cd9e4a02a24ce6fd6fb3dc952672b912bf9faa4f83cecb7163f1b61b378a317a109d34b82041f6fd4dae5c8e5fbfea8 -DIST thunderbird-60.6.1-he.xpi 617143 BLAKE2B c8026e3fe06bb793474aee2f38f443040eae0b1fe6914dd277746e431b6cbfb000b6d14438037b25cf60e2b99f306cfdac9f08d36f251a59661cd6166db808d2 SHA512 a66b5ef0762b8f8e5bc5e3a7eca502d1f6f8361486cc9b7f553b620a1e29941d0e4a5d2469345b74227cea7803d837044ef591464c63762deca22e52b2635548 -DIST thunderbird-60.6.1-hr.xpi 582239 BLAKE2B 17b4b673fd1ab24331697a8228d17e15a2ef1a5e54833f0548e7259cac80a5c350c886b4e5c1f27749c21ff2f5b3bb95055f423ab8fe59e773a8717d7897cb74 SHA512 02560a03cb36a7292f7b62d542d8da4e38ca19ac8a10708b79e9d8fc277fc4bb40c78332ae7b59b678368417fe1ca0f7ead7a80d16a99aa9a7f5b217a9e1e394 -DIST thunderbird-60.6.1-hsb.xpi 615132 BLAKE2B 90e293cca66d31dc009f8e24c4b636ff489359ddaac4ccb38bc3a579183f7f13fbd0a2726f57678f54132d35db1b6dbf780d20491e70d848bb7e6bb05aff90be SHA512 0797df56a44d4f6668b98b8de8d8fbe61ce3308f68e87773110d37e4ab57fc04a6fce525bd6819e3fa1c9906182dc2279dbc3d7949d7a5d314506e21f42214d5 -DIST thunderbird-60.6.1-hu.xpi 615345 BLAKE2B 2b319e984fea626351b1a0be98d40e564994e109c8e9a1b484b4f8b1a1aceba2c998a4ec6358a193a294b7c77cb73b68ae9ea36429a8f2be2c09bb08029dca4a SHA512 e8a77b8e2061e341aa4cee80ab54dd6a0a2f3b616d1772965b8b1b78d882dec8932287a97dcefecffa031b8737d8aee326cc84f7eaeb8dc2b91a729fbe70c666 -DIST thunderbird-60.6.1-hy-AM.xpi 653530 BLAKE2B 49327ccf28291884c9eed20aac24e039c9332bb2460afa49abb94dea36774c9922c1530fc1c2ab73f4d980819078e2186d0bc4843bf6809b4332d0db82642a75 SHA512 717f66080450dfdcdd2a92cd7a2e433b1d70b3d9b86c75f9878b62f89d9874b197e04faf30da3f1f4b79b707144b021111cb766117b838e7d79156b4de709655 -DIST thunderbird-60.6.1-id.xpi 568861 BLAKE2B ea2a7c14a9c241f399b5deab7d978d74432e8a2cba085e7926ae6146d88afa3cc7978cad4716b7d9e7c2e752f473bebbf8fa68982d98d1014a10f77f5c01f6df SHA512 d493e3af62839d0496f0a1706eed4e98872a4a34861b8fa3073c97d137ce241994e1c4af486b61a3b5025fb732b455c4f1fa4544f3eb4ea03697b13d49a62941 -DIST thunderbird-60.6.1-is.xpi 579047 BLAKE2B 0279ab9542c2c3de79f4e022a2546077a2b804ced254a7de9f333a92dc4877141164b8597f11e301f4e2bdafe2870bb7b2ee87b55f38fc6ec9efa6a2dfbc51fd SHA512 c2a6653b96ca1461ad3122fe46912fc03477dd4d389527f33ff68d0e0b259dc9db516c0dcc77018fc13f77082b082802fa8b53b012c22fe86dca61658d754375 -DIST thunderbird-60.6.1-it.xpi 477501 BLAKE2B 5a181544c71a5eda0ac986de20681b1ad35057f761f33e15d176af10a1f5196dd4ace8eceeea4fb56302bdee8fe756aa34991a1f527b0cbaba0b97d9eb30e229 SHA512 882bbd0ea3e3bae627141e401c993fb20074b35b8af8c88f243bc8e96cac8a1eff8f52bb3fce70ef1ce795e9dfc6fe9e22886bba15b2268fa7856f5f9d7d286b -DIST thunderbird-60.6.1-ja.xpi 653345 BLAKE2B fff1f041c0c4afdcaacc33e5610e2f96c07cbbbd8d6d3e88fa950e8b1895668ad81e7dcffc24757c00decac942390a12a117886bb01116d901a9ed74d1474712 SHA512 9e9a260c793bc24a672993425d9c79595d9f60d77e471ede66e47655f188651bfcfbd792f6471ae4a919c0995ff3db13664718d6a093309d3a2c5ea7f198fbe1 -DIST thunderbird-60.6.1-ko.xpi 619730 BLAKE2B 53545025b8b447950a3001a8c5482a242c649545fe8661e8b76d34a04398046eeab2552c1060749dcec015d86dacbdbb0568fe370dd7472870e6bbe9a53486d6 SHA512 3b5e468ef74c1263ad39bba3782c782a435d23b42396ad9930ca2ee1bdaa4ee63c7b997ba5311dee713a698cf153a3049b256c00a5d426990ea7fff9aa9c5537 -DIST thunderbird-60.6.1-lt.xpi 605441 BLAKE2B 2a1539e05054fe8862946986ac3ab059f4d4a895be82caef06eecacf26d9685f269129626fdfa915bafa88d7d15d5d6ef0102fdcabb8f53c5e85d43b2288b47f SHA512 6ba6e39b76e475b69323f6884011a75c96996db298a0fa33d133926b5b8195cf59f0a77e77e175c76d82219d4dc316b9eea461260bca1d78387565fde6c3f8ab -DIST thunderbird-60.6.1-nb-NO.xpi 577003 BLAKE2B 17edd7c8958e425d42d9e3cfaa6a084d483a67503110b0c7bd9650e69529677ecdc5615fdbe3036928f3773254bc3de7510e856197b97e6ed27e13f9b177820a SHA512 c99c3b848b1b2679b7f9efe991e9fdab75347f0b099024f87de4513aa2788c7f1ec8d5bb2d3cd5cfc0643799243c34a22fb953874181c7f26993c7ea9effbbbb -DIST thunderbird-60.6.1-nl.xpi 583913 BLAKE2B d183fbd95633ed502f5f39f7e1928607abae57751287c6af9f343234fc5689239b019bf9c69dcf3201a249730186ab5df39bce45978f347a1edcc16ca67cb2d1 SHA512 33ddfd5a506a172e336650d5a4146fb60219c716713da11f351760556148d6244836fe332ad746bdcf4ce016a20c93023bcce98933f114fb360c096180744598 -DIST thunderbird-60.6.1-nn-NO.xpi 576422 BLAKE2B 38d29121667495decfd1fe65ee5f57e6b4a45acfa30b17ecd8b32c279ce37936d85251b73bb17ed32fb159de66bdfb7ec428d948a0dba004ad9a6c58f6562113 SHA512 2ce727232396c2d9472fc8064defb45ec851990f08091d2aafa8ffad82e339c738877c5992886302ab52e3fb2c554802008f84e11c11f0b5dae8f19ed2c148c1 -DIST thunderbird-60.6.1-pl.xpi 480726 BLAKE2B 46816d99718c1deda1bf40f22ac5221fd7b8e8e4f3a20f1e169f41ed8ac21f8948fc47623021887b1f06833d5102e4d8acaf36103571014f831b2e13c254d46b SHA512 26466aec061073863c4d3cc4c41d1671b8014546158e9a823d070a0012b4c6d9189d9be0529d376a65e12365d2e5c06856ebaafa0302bfd013407c7d5fa2c225 -DIST thunderbird-60.6.1-pt-BR.xpi 588835 BLAKE2B 731210c3353f84750e9aeb71bf7edfed7b0a1f54af07d942d882331091fe230e50615fbd74d2194d0cef5d332ffcfef19cdedea3854ab8dbe3a9e5ea79ae185b SHA512 c67567cc20300f027a7849444a39e87ed0c84aee689d8acf0a5c8075fe9193987b777e64ba92a1c4f2169575c9ab961b5c09823a83d3cb8088c39876d9ab366f -DIST thunderbird-60.6.1-pt-PT.xpi 593186 BLAKE2B 39e7fac6b870f4ab654602e66a169fc45979bb4c2832fc380414464383096183da7f9b105da4b99ae5bf7d61e9b0ca29d20800109d24de6bb991801d0a4a1127 SHA512 3acbe9555bfc133d55c6b52665d6ad1861a49bb2c48af30c05b6bf280a58430451f0e5a633b3316b2af0a8bb42c7d2899ba08d23e1b478c66f5eaf32e792f194 -DIST thunderbird-60.6.1-rm.xpi 578384 BLAKE2B 012927b43d96cac27fc0ed7f162dfcec9b0b99db6244a7f08d776d2d25a62b5a1e78d0c2de0d1d466a66d350f36c9e78818fed320fe54149ba002edeb1237537 SHA512 3b261775cf3fa4c49e417cc197afb1d195133e0eda79357ccb8b8f72ca55ae19883846b94791c25672c77c872a4579867b71ba10c5fb5ad81a6967685403458b -DIST thunderbird-60.6.1-ro.xpi 584309 BLAKE2B f88d17092b06b52af6d99bfc2de0e57800dbe63cff0bccc05e3aa2d71c485534a55e4897f9381d98efafd7b97470d999333e3eed1d10d02c995b43208acb24d2 SHA512 9df01a511f05835ba9e16325a2ed7560b950c1838b9fa4fd02c3e699462a2fb87cb5657a0f5ad6f8168116e8425a20f15c5be2c623ecf1fc0766229e298e2e78 -DIST thunderbird-60.6.1-ru.xpi 694706 BLAKE2B 4fbdaf06a243e949d7fdf958282877f60e45b143278dc561608e4386f8daa0323951157b06f48cf5c42befae20c0943e8507af2e5a47109e4f216382f2bf2fbb SHA512 a54deccba86914d8329ffef7a88e3df713f5ecdd6f8097d521dcc3abc8c998b007ea3caebbb3a11d1cbff5f919bb3f6865e95a6159f90fe8c2b919194e5380f0 -DIST thunderbird-60.6.1-si.xpi 647590 BLAKE2B 59a4cd4e0974aec375a4647e02d5689bfbd9effc2a81c5c7b2b8d7f2fdab58d8c061481dd18a5ee9e8131408c525afecf662785956ededca619fdd6bd46df9ee SHA512 05535fa042e4132e619484a0ed26dbac4f7f994b963247c09c80a77fe65bfeb874ad7ff37ce55580c9126ba31a2cd9f8ec1890935e73a4fd970c81825aa08f50 -DIST thunderbird-60.6.1-sk.xpi 612217 BLAKE2B 872ef3246cdf6bde000711d2a20f50b60aea8f37a7adad0ac6898d4784c1544a1eaee60d276549e8313c21865e0111546d378e6db0e8620c986766e8a3c4b0b8 SHA512 b17f9dd8da97747ad68f67a1dc7fdb16c7bf767f0b4ac48fcb4097e919ed5a6dbade8fdec13983e8eca28ed9c0e93b9bef5afc58c591c13f997e882e71693a8d -DIST thunderbird-60.6.1-sl.xpi 589947 BLAKE2B 460d7aa48d1c71a51218478d360c29e287c315955cb3de9a60291af4f3df1136be9c3d3d9b68488185b38a63df271ca94b9b2ec9d8d853a989a4a3ed086eef91 SHA512 fe8e506c59e99c82676df6e96474c3cd59bba3d4921de8e71f197901560e95467601b46131d16e385d50d6126d074171de4577e358fb333491c35b89e5d51f14 -DIST thunderbird-60.6.1-sq.xpi 593096 BLAKE2B 5afad0959f8846b8ee87fd5f61284abe7fc8c3dad03273074b6df7fc650ebbacdc853b8eac9c1e6b9014a59f9620d77287249f27059499ae44a9f11b15cf9fa3 SHA512 25a624120288739b3c3294206e520e6e37fd7ffcf9852a4b23174ddcec9dc54f7c86f8301841f0ff2c7be90f8695bf00e029fba9878d31a51fb23fb649b2e32c -DIST thunderbird-60.6.1-sr.xpi 641527 BLAKE2B 3a344f50f94652b7bf3ac366efae3a91e308a1545af537539bdf5d4fc8c42fc77b86ca18970be33f18717f1b201810e566c2694fcaa44637cae87016d9ee0e95 SHA512 d8205f60219c3f2be1213c8cd7cdbae15c7ec8324f32153037b30369d3e195a4c5f18cf1496d0b0b1ee200b48ff5108921ad396948a00212a26e5b2f55512786 -DIST thunderbird-60.6.1-sv-SE.xpi 594079 BLAKE2B 9ce29b52d5477d9e7170965064fce88133b6af9147b47433afa921bf2e68452cc486b87975b27c96aa8ccefcd6268e4addbf9b7791e96400caa89a109c48ac9d SHA512 8bf32c59a206fda2b2536bda12b1dba06ce2e63579211a05396d516b49e6daed0b989f706d246b8d6226d85616c48d0e1cc61e1c0ede41c5d7049fb28df56203 -DIST thunderbird-60.6.1-tr.xpi 598011 BLAKE2B b5cfac69f4e7f1f2bc029fd7ddda8622c748cfa36120959c28bc6c0bf12acf3073e2696d4ce4d896002c3c84e4321c0a132b1759870cdcd46bfe96146e2c4096 SHA512 10828d6ff786a69c5f03e4fbd54df052a44b82b74b8b13b0237d225225e957c431ab8f782dbee4ba12b0b236655111bf10223ff33c28ec646c7560b1ab77a334 -DIST thunderbird-60.6.1-uk.xpi 684154 BLAKE2B 67d612a4d7b4e84f3cd9d42b902f99a7843cac1f9a441ec261d1e82778b7f587267191c87eede6a2ebbd79d4e14c0a9da1b2ad87a1dd78b7e227af1ef9fbf072 SHA512 16ccd2a079a9219af46568f2d087e35cd972dbf5dec1f67d52fdc1916b9c6a60b7b4c566685c9026bfdfe9b3f73ca03eb6faca9636affa55852654a22d7f3567 -DIST thunderbird-60.6.1-vi.xpi 637187 BLAKE2B 3ad95e1dc2626b24e7ae6d262594b3b384c5e8b87e27c75944c1f12059673067abd95cd8b506b9d131c239b3a243a66349f538dadcfb655acbe592dd7df6ec9d SHA512 a509932fe2ff82f7cb9bc9407c4253359d24fa60dd44795ce211a3488d1e49c4c56b79405dba240eaf0f60f3f4ca4228c7e30b064f339e7e53e0884d1be4da16 -DIST thunderbird-60.6.1-zh-CN.xpi 626283 BLAKE2B aeeb293e5c81323c2ca873d589ec5e6e187767e3535fdb1d039c547ed7bb661a134c84a76fa971ef72e2c1acca947ca7170fa7355797f51443e32618bbec63d6 SHA512 b668158ff20baacfea259b17b9b0f1993d59352b3ec47fa22b5fd337c8733fe966e75142b85fb65d6de30dfb5fc6be48f3fad6decfd9f0cc467f68bf8c49c884 -DIST thunderbird-60.6.1-zh-TW.xpi 626190 BLAKE2B a4b79f607151e532598ac7c4a1d834e83445601a0db304b249e569b592a21c3967b8f89535a45882dac5d5c851e4ad640c955e44bef5606840356f0c280d4563 SHA512 934f9ea341619e0eccd83472bac778767f10f3676c2d072f42301aaa9cdc0ce683a12fd51d9981fffd6b26cc8a61da0ed13b52f9b97914b8309b082fc4f8736d -DIST thunderbird-60.6.1.source.tar.xz 288706632 BLAKE2B bb72d9c92d36bcc4c0f9fe8f64b348322cb0891f3c7d2e13767e94fef7b055f2c34b55a6a81fb9ab48c2eca9f68c8bc00c0e4315937a4f736aed6956c7572ef6 SHA512 78e96aeb235a07ea3f53c4212a764e9b92dacd0e5d5561e454008a56d165a1e235ed05a8ecdb77efecf80f4c7f7ba2cf7a682c775047d7c175dfb50a1d9a42d2 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 c3e767f6..00000000 --- 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; -StartupNotify=true diff --git a/mail-client/thunderbird/files/icon/thunderbird.desktop b/mail-client/thunderbird/files/icon/thunderbird.desktop deleted file mode 100644 index 1ef28d2a..00000000 --- a/mail-client/thunderbird/files/icon/thunderbird.desktop +++ /dev/null @@ -1,10 +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; -StartupNotify=true diff --git a/mail-client/thunderbird/files/thunderbird-60-sqlite3-fts3-tokenizer.patch b/mail-client/thunderbird/files/thunderbird-60-sqlite3-fts3-tokenizer.patch deleted file mode 100644 index 48ebbf15..00000000 --- a/mail-client/thunderbird/files/thunderbird-60-sqlite3-fts3-tokenizer.patch +++ /dev/null @@ -1,99 +0,0 @@ -# HG changeset patch -# User Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org> -# Date 1543532530 0 -# Thu Nov 29 23:02:10 2018 +0000 -# Node ID 1c480085935783bd1d240860bb44f410e2d36322 -# Parent 6453222232be364fb8ce3fd29b6cbcd480e5f2e3 -Bug 1270882 - Enable support for SQLite custom FTS3 tokenizers at run time. - -Do not require that SQLite has been built with support for custom FTS3 -tokenizers enabled by default. This allows to use system SQLite in -distributions which provide SQLite configured in this way (which is SQLite -upstream's default configuration due to security concerns). - -Requires exposing the sqlite3_db_config symbol in bundled SQLite. - -Disable no longer needed setting of SQLITE_ENABLE_FTS3_TOKENIZER macro in -bundled SQLite build. - ---- a/db/sqlite3/src/moz.build Thu Nov 29 19:08:28 2018 +0000 -+++ b/db/sqlite3/src/moz.build Thu Nov 29 23:02:10 2018 +0000 -@@ -58,10 +58,6 @@ - if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'uikit': - DEFINES['SQLITE_ENABLE_LOCKING_STYLE'] = 0 - --# Thunderbird needs the 2-argument version of fts3_tokenizer() --if CONFIG['MOZ_THUNDERBIRD'] or CONFIG['MOZ_SUITE']: -- DEFINES['SQLITE_ENABLE_FTS3_TOKENIZER'] = 1 -- - # Turn on SQLite's assertions in debug builds. - if CONFIG['MOZ_DEBUG']: - DEFINES['SQLITE_DEBUG'] = 1 ---- a/db/sqlite3/src/sqlite.symbols Thu Nov 29 19:08:28 2018 +0000 -+++ b/db/sqlite3/src/sqlite.symbols Thu Nov 29 23:02:10 2018 +0000 -@@ -45,6 +45,7 @@ - sqlite3_create_function16 - sqlite3_create_module - sqlite3_data_count -+sqlite3_db_config - sqlite3_db_filename - sqlite3_db_handle - sqlite3_db_mutex ---- a/storage/mozStorageConnection.cpp Thu Nov 29 19:08:28 2018 +0000 -+++ b/storage/mozStorageConnection.cpp Thu Nov 29 23:02:10 2018 +0000 -@@ -679,6 +679,10 @@ - return convertResultCode(srv); - } - -+#ifdef INIT_SQLITE_FTS3_TOKENIZER -+ ::sqlite3_db_config(mDBConn, SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER, 1, 0); -+#endif -+ - // Do not set mDatabaseFile or mFileURL here since this is a "memory" - // database. - -@@ -715,6 +719,10 @@ - return convertResultCode(srv); - } - -+#ifdef INIT_SQLITE_FTS3_TOKENIZER -+ ::sqlite3_db_config(mDBConn, SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER, 1, 0); -+#endif -+ - // Do not set mFileURL here since this is database does not have an associated - // URL. - mDatabaseFile = aDatabaseFile; -@@ -746,6 +754,10 @@ - return convertResultCode(srv); - } - -+#ifdef INIT_SQLITE_FTS3_TOKENIZER -+ ::sqlite3_db_config(mDBConn, SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER, 1, 0); -+#endif -+ - // Set both mDatabaseFile and mFileURL here. - mFileURL = aFileURL; - mDatabaseFile = databaseFile; ---- a/storage/moz.build 2018-11-14 10:14:14.000000000 -0500 -+++ b/storage/moz.build 2018-11-29 17:05:42.106058951 -0500 -@@ -101,16 +101,20 @@ - # - # Note: On Windows our sqlite build assumes we use jemalloc. If you disable - # MOZ_STORAGE_MEMORY on Windows, you will also need to change the "ifdef - # MOZ_MEMORY" options in db/sqlite3/src/Makefile.in. - if CONFIG['MOZ_MEMORY'] and not CONFIG['MOZ_SYSTEM_SQLITE']: - if CONFIG['OS_TARGET'] != 'Android': - DEFINES['MOZ_STORAGE_MEMORY'] = True - -+# Thunderbird needs the 2-argument version of fts3_tokenizer() -+if CONFIG['MOZ_THUNDERBIRD'] or CONFIG['MOZ_SUITE']: -+ DEFINES['INIT_SQLITE_FTS3_TOKENIZER'] = 1 -+ - # This is the default value. If we ever change it when compiling sqlite, we - # will need to change it here as well. - DEFINES['SQLITE_MAX_LIKE_PATTERN_LENGTH'] = 50000 - - # See Sqlite moz.build for reasoning about TEMP_STORE. - # For system sqlite we cannot use the compile time option, so we use a pragma. - if CONFIG['MOZ_SYSTEM_SQLITE'] and (CONFIG['OS_TARGET'] == 'Android' - or CONFIG['HAVE_64BIT_BUILD']): diff --git a/mail-client/thunderbird/files/thunderbird-60.0-blessings-TERM.patch b/mail-client/thunderbird/files/thunderbird-60.0-blessings-TERM.patch deleted file mode 100644 index 975e0cf6..00000000 --- a/mail-client/thunderbird/files/thunderbird-60.0-blessings-TERM.patch +++ /dev/null @@ -1,70 +0,0 @@ -https://github.com/erikrose/blessings/pull/137 - -Fixes: https://bugs.gentoo.org/654316 - -From 5fefc65c306cf9ec492e7b422d6bb4842385afbc Mon Sep 17 00:00:00 2001 -From: Jay Kamat <jaygkamat@gmail.com> -Date: Fri, 24 Aug 2018 11:11:57 -0700 -Subject: [PATCH 1/2] Fix error when TERM is unset or improperly set - ---- - blessings/__init__.py | 9 +++++++-- - 1 file changed, 7 insertions(+), 2 deletions(-) - -diff --git a/blessings/__init__.py b/blessings/__init__.py -index 98b75c3..3872b5f 100644 ---- a/third_party/python/blessings/blessings/__init__.py -+++ b/third_party/python/blessings/blessings/__init__.py -@@ -94,8 +94,13 @@ def __init__(self, kind=None, stream=None, force_styling=False): - # init sequences to the stream if it has a file descriptor, and - # send them to stdout as a fallback, since they have to go - # somewhere. -- setupterm(kind or environ.get('TERM', 'unknown'), -- self._init_descriptor) -+ try: -+ setupterm(kind or environ.get('TERM', 'dumb') or 'dumb', -+ self._init_descriptor) -+ except: -+ # There was an error setting up the terminal, either curses is -+ # not supported or TERM is incorrectly set. Fall back to dumb. -+ self._does_styling = False - - self.stream = stream - - -From d885df78c6f931abf3259343aaaa897e16c8cba1 Mon Sep 17 00:00:00 2001 -From: Jay Kamat <jaygkamat@gmail.com> -Date: Sat, 1 Sep 2018 13:20:32 -0700 -Subject: [PATCH 2/2] Explicitly catch curses.error - ---- - blessings/__init__.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/blessings/__init__.py b/blessings/__init__.py -index 3872b5f..fdceb09 100644 ---- a/third_party/python/blessings/blessings/__init__.py -+++ b/third_party/python/blessings/blessings/__init__.py -@@ -97,7 +97,7 @@ def __init__(self, kind=None, stream=None, force_styling=False): - try: - setupterm(kind or environ.get('TERM', 'dumb'), - self._init_descriptor) -- except: -+ except curses.error: - # There was an error setting up the terminal, either curses is - # not supported or TERM is incorrectly set. Fall back to dumb. - self._does_styling = False - - ---- a/python/mach/mach/logging.py -+++ b/python/mach/mach/logging.py -@@ -93,7 +93,7 @@ - - def set_terminal(self, terminal): - self.terminal = terminal -- self._sgr0 = blessings.tigetstr('sgr0') or '' if terminal and blessings else '' -+ self._sgr0 = terminal.normal if terminal and blessings else '' - - def format(self, record): - f = record.msg.format(**record.params) - diff --git a/mail-client/thunderbird/files/thunderbird-60.0-rust-1.29-comp.patch b/mail-client/thunderbird/files/thunderbird-60.0-rust-1.29-comp.patch deleted file mode 100644 index 6fbd13fe..00000000 --- a/mail-client/thunderbird/files/thunderbird-60.0-rust-1.29-comp.patch +++ /dev/null @@ -1,37 +0,0 @@ -https://bugs.gentoo.org/666898 - -https://bugzilla.mozilla.org/show_bug.cgi?id=1479540 ---- a/build/moz.configure/init.configure -+++ b/build/moz.configure/init.configure -@@ -572,17 +572,26 @@ option('--target', nargs=1, - @imports(_from='__builtin__', _import='KeyError') - @imports(_from='__builtin__', _import='ValueError') - def split_triplet(triplet, allow_unknown=False): - # The standard triplet is defined as - # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM - # There is also a quartet form: - # CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM - # But we can consider the "KERNEL-OPERATING_SYSTEM" as one. -- cpu, manufacturer, os = triplet.split('-', 2) -+ # Additionally, some may omit "unknown" when the manufacturer -+ # is not specified and emit -+ # CPU_TYPE-OPERATING_SYSTEM -+ parts = triplet.split('-', 2) -+ if len(parts) == 3: -+ cpu, _, os = parts -+ elif len(parts) == 2: -+ cpu, os = parts -+ else: -+ die("Unexpected triplet string: %s" % triplet) - - # Autoconf uses config.sub to validate and canonicalize those triplets, - # but the granularity of its results has never been satisfying to our - # use, so we've had our own, different, canonicalization. We've also - # historically not been very consistent with how we use the canonicalized - # values. Hopefully, this will help us make things better. - # The tests are inherited from our decades-old autoconf-based configure, - # which can probably be improved/cleaned up because they are based on a - - - - diff --git a/mail-client/thunderbird/files/thunderbird-gentoo-default-prefs-1.js-1 b/mail-client/thunderbird/files/thunderbird-gentoo-default-prefs-1.js-1 deleted file mode 100644 index 97c5fd09..00000000 --- a/mail-client/thunderbird/files/thunderbird-gentoo-default-prefs-1.js-1 +++ /dev/null @@ -1,9 +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("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/files/thunderbird-gentoo-default-prefs.js-2 b/mail-client/thunderbird/files/thunderbird-gentoo-default-prefs.js-2 deleted file mode 100644 index 9770a1ac..00000000 --- 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 4f210969..00000000 --- a/mail-client/thunderbird/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="project"> - <email>mozilla@gentoo.org</email> - <name>Gentoo Mozilla Team</name> -</maintainer> -<use> - <flag name="bindist">Disable official Thunderbird branding (icons, name) which - are not binary-redistributable according to upstream.</flag> - <flag name="clang">Use Clang compiler instead of GCC</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="custom-optimization">Build with user-specified compiler optimizations - (-Os, -O0, -O1, -O2, -O3) from CFLAGS (unsupported)</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> -</use> -</pkgmetadata> diff --git a/mail-client/thunderbird/thunderbird-60.6.1-r1.ebuild b/mail-client/thunderbird/thunderbird-60.6.1-r1.ebuild deleted file mode 100644 index 6a343abc..00000000 --- a/mail-client/thunderbird/thunderbird-60.6.1-r1.ebuild +++ /dev/null @@ -1,602 +0,0 @@ -# Copyright 1999-2019 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_{5,6,7} ) -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 -PATCHTB="thunderbird-60.0-patches-0" -PATCHFF="firefox-60.6-patches-05" - -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=8 - -inherit check-reqs flag-o-matic toolchain-funcs gnome2-utils llvm mozcoreconf-v6 pax-utils xdg-utils autotools mozlinguas-v2 - -DESCRIPTION="Thunderbird Mail Client" -HOMEPAGE="https://www.mozilla.org/thunderbird" - -KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" -SLOT="0" -LICENSE="MPL-2.0 GPL-2 LGPL-2.1" -IUSE="bindist clang dbus debug hardened jack lightning neon pulseaudio - selinux startup-notification system-harfbuzz system-icu system-jpeg - system-libevent system-libvpx system-sqlite wifi" -RESTRICT="!bindist? ( bindist )" - -PATCH_URIS=( https://dev.gentoo.org/~{anarchy,axs,polynomial-c,whissi}/mozilla/patchsets/{${PATCHTB},${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 ) - ${PATCH_URIS[@]}" - -ASM_DEPEND=">=dev-lang/yasm-1.1" - -CDEPEND=" - >=dev-libs/nss-3.36.7 - >=dev-libs/nspr-4.19 - >=app-text/hunspell-1.5.4:= - 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 - x11-libs/gdk-pixbuf - >=x11-libs/pango-1.22.0 - >=media-libs/libpng-1.6.34: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 - >=virtual/libffi-3.0.10:= - virtual/ffmpeg - x11-libs/libX11 - x11-libs/libXcomposite - x11-libs/libXdamage - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libXrender - x11-libs/libXt - system-harfbuzz? ( - >=media-libs/harfbuzz-1.4.2:0= - >=media-gfx/graphite2-1.3.9-r1 - ) - system-icu? ( >=dev-libs/icu-59.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.5.0:0=[postproc] - <media-libs/libvpx-1.8:0=[postproc] - ) - system-sqlite? ( >=dev-db/sqlite-3.23.1:3[secure-delete,debug=] ) - wifi? ( - kernel_linux? ( - >=sys-apps/dbus-0.60 - >=dev-libs/dbus-glib-0.72 - net-misc/networkmanager - ) - ) - jack? ( virtual/jack )" - -DEPEND="${CDEPEND} - app-arch/zip - app-arch/unzip - >=sys-devel/binutils-2.30 - sys-apps/findutils - || ( - ( - sys-devel/clang:8 - !clang? ( sys-devel/llvm:8 ) - clang? ( - =sys-devel/lld-8* - sys-devel/llvm:8[gold] - ) - ) - ( - sys-devel/clang:7 - !clang? ( sys-devel/llvm:7 ) - clang? ( - =sys-devel/lld-7* - sys-devel/llvm:7[gold] - ) - ) - ( - sys-devel/clang:6 - !clang? ( sys-devel/llvm:6 ) - clang? ( - =sys-devel/lld-6* - sys-devel/llvm:6[gold] - ) - ) - ) - pulseaudio? ( media-sound/pulseaudio ) - elibc_glibc? ( - virtual/cargo - virtual/rust - ) - elibc_musl? ( - virtual/cargo - virtual/rust - ) - amd64? ( - ${ASM_DEPEND} - virtual/opengl - ) - x86? ( - ${ASM_DEPEND} - virtual/opengl - )" - -RDEPEND="${CDEPEND} - pulseaudio? ( - || ( - media-sound/pulseaudio - >=media-sound/apulse-0.1.9 - ) - ) - selinux? ( - sec-policy/selinux-mozilla - sec-policy/selinux-thunderbird - )" - -REQUIRED_USE="wifi? ( dbus )" - -S="${WORKDIR}/${MOZ_P%b[0-9]*}" - -BUILD_OBJ_DIR="${S}/tbird" - -llvm_check_deps() { - if ! has_version "sys-devel/clang:${LLVM_SLOT}" ; then - ewarn "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." - return 1 - fi - - if use clang ; then - if ! has_version "=sys-devel/lld-${LLVM_SLOT}*" ; then - ewarn "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." - return 1 - fi - fi - - einfo "Will use LLVM slot ${LLVM_SLOT}!" -} - -pkg_setup() { - moz_pkgsetup - - # 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 - 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" - elog - fi - - addpredict /proc/self/oom_score_adj - - llvm_pkg_setup -} - -pkg_pretend() { - # Ensure we have enough disk space to compile - CHECKREQS_DISK_BUILD="4G" - check-reqs_pkg_setup -} - -src_unpack() { - unpack ${A} - - # Unpack language packs - mozlinguas_src_unpack -} - -src_prepare() { - # Apply our patchset from firefox to thunderbird as well - rm -f "${WORKDIR}"/firefox/2007_fix_nvidia_latest.patch \ - "${WORKDIR}"/firefox/2005_ffmpeg4.patch \ - "${WORKDIR}"/firefox/2012_update-cc-to-honor-CC.patch \ - || die - eapply "${WORKDIR}/firefox" - - eapply "${FILESDIR}"/thunderbird-60-sqlite3-fts3-tokenizer.patch - - # Ensure that are plugins dir is enabled as default - sed -i -e "s:/usr/lib/mozilla/plugins:/usr/lib/nsbrowser/plugins:" \ - "${S}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 32bit!" - sed -i -e "s:/usr/lib64/mozilla/plugins:/usr/lib64/nsbrowser/plugins:" \ - "${S}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 64bit!" - - # 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 - - # 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 - - # Apply our Thunderbird patchset - pushd "${S}"/comm &>/dev/null || die - eapply "${WORKDIR}"/thunderbird - - # NOT TRIGGERED starting with 60.3, as script just maps ${PV} without any actual - # check on lightning version or changes: - # - # Confirm the version of lightning being grabbed for langpacks is the same - # as that used in thunderbird - #local THIS_MOZ_LIGHTNING_VER=$(${PYTHON} calendar/lightning/build/makeversion.py ${PV}) - #if [[ ${MOZ_LIGHTNING_VER} != ${THIS_MOZ_LIGHTNING_VER} ]]; then - # eqawarn "The version of lightning used for localization differs from the version" - # eqawarn "in thunderbird. Please update MOZ_LIGHTNING_VER in the ebuild from ${MOZ_LIGHTNING_VER}" - # eqawarn "to ${THIS_MOZ_LIGHTNING_VER}" - #fi - - popd &>/dev/null || die - - # Allow user to apply any additional patches without modifing ebuild - eapply_user - - # 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() { - # 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 - - # 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 - - # 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 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 - # Enable position independent executables - mozconfig_annotate 'enabled by Gentoo' --enable-pie - - 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 'Gentoo default' --enable-system-hunspell - 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 - - # skia has no support for big-endian platforms - if [[ $(tc-endian) == "big" ]]; then - mozconfig_annotate 'big endian target' --disable-skia - else - mozconfig_annotate '' --enable-skia - fi - - # use the gtk3 toolkit (the only one supported at this point) - mozconfig_annotate '' --enable-default-toolkit=cairo-gtk3 - - mozconfig_use_enable startup-notification - mozconfig_use_enable system-sqlite - mozconfig_use_with system-jpeg - mozconfig_use_with system-icu - mozconfig_use_with system-libvpx - mozconfig_use_with system-harfbuzz - mozconfig_use_with system-harfbuzz system-graphite2 - 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 - - 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 - - # 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" - - # Stylo is only broken on x86 builds - use x86 && mozconfig_annotate 'Upstream bug 1341234' --disable-stylo - - # Stylo is horribly broken on arm, renders GUI unusable - use arm && mozconfig_annotate 'breaks UI on arm' --disable-stylo - - if use clang ; then - # libprldap60.so: terminate called after throwing an instance of 'std::runtime_error', bug 667186 - mozconfig_annotate 'elf-hack is broken when using clang' --disable-elf-hack - elif use arm ; then - mozconfig_annotate 'elf-hack is broken on arm' --disable-elf-hack - fi - - # Use an objdir to keep things organized. - echo "mk_add_options MOZ_OBJDIR=${BUILD_OBJ_DIR}" >> "${S}"/.mozconfig - echo "mk_add_options XARGS=/usr/bin/xargs" >> "${S}"/.mozconfig - - mozlinguas_mozconfig - - # Finalize and report settings - mozconfig_final - - #################################### - # - # Configure and build - # - #################################### - - # Disable no-print-directory - MAKEOPTS=${MAKEOPTS/--no-print-directory/} - - if [[ $(gcc-major-version) -lt 4 ]]; then - append-cxxflags -fno-stack-protector - fi - - # workaround for funky/broken upstream configure... - SHELL="${SHELL:-${EPREFIX}/bin/bash}" MOZ_NOSPAM=1 \ - ./mach configure || die -} - -src_compile() { - MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX}/bin/bash}" MOZ_NOSPAM=1 \ - ./mach build --verbose || die -} - -src_install() { - declare emid - 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 - - cd "${S}" || die - MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX}/bin/bash}" MOZ_NOSPAM=1 \ - DESTDIR="${D}" ./mach install || die - - # Install language packs - 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 - - 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 - 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() { - gnome2_icon_savelist -} - -pkg_postinst() { - gnome2_icon_cache_update - xdg_desktop_database_update -} - -pkg_postrm() { - gnome2_icon_cache_update - xdg_desktop_database_update -} diff --git a/metadata/layout.conf b/metadata/layout.conf index 22a0f8d7..12397492 100644 --- a/metadata/layout.conf +++ b/metadata/layout.conf @@ -1,5 +1,4 @@ -# sign manifests in this repo -#sign-manifests = true -# thin-manifests only contain DIST entries -thin-manifests = true masters = gentoo +thin-manifests = true +manifest-hashes = BLAKE2B SHA512 +manifest-required-hashes = SHA512 diff --git a/profiles/package.mask b/profiles/package.mask deleted file mode 100644 index 188878eb..00000000 --- a/profiles/package.mask +++ /dev/null @@ -1,13 +0,0 @@ -#################################################################### -# When you add an entry to this file, add your name, the date, and an -# explanation of why something is getting masked -# -# NOTE: Please add your entry at the top! -# - -# Masked for testing, thunderbird beta known to have configure problem -=dev-lang/spidermonkey-31.0_beta* - -# Please don't remove neither this mask nor the affected ebuilds without -# speaking to Lars Wendler <polynomial-c@gentoo.org> first. -~www-client/seamonkey-2.35_pre20150713 diff --git a/profiles/package.use.mask b/profiles/package.use.mask deleted file mode 100644 index fb775350..00000000 --- a/profiles/package.use.mask +++ /dev/null @@ -1,9 +0,0 @@ -# mask crypt flag until enigmail releases something compatible -# we do not want to try and play with the enigmail nightlies -=mail-client/thunderbird-31.0_beta1 crypt - -# cairo-qt builds but it's runtime support really isn't good enough for -# normal usage; seems there is a very long list of fixes needed, probably -# similar to the 'Port gtk2 to gtk3' list. -www-client/firefox qt5 -www-client/torbrowser system-cairo
\ No newline at end of file diff --git a/scripts/get_langs.sh b/scripts/get_langs.sh index 50adba43..7098da69 100755 --- a/scripts/get_langs.sh +++ b/scripts/get_langs.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # vim: set sts=2 sw=2 et tw=0 : if test -z "${2}"; then diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest deleted file mode 100644 index 454be4c6..00000000 --- a/www-client/firefox/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST firefox-67.0-patches-02.tar.xz 150248 BLAKE2B 033a4497ff7d3b2dcd51ea5eb71ba6a44884031b9a04a477047d39e72eb0a2f00313cc0aa994ba8418ff332ce443dff27f1bd0b1dec4b87b87392cbdd4f4519b SHA512 5d201971038da405d03bd8513535503380fc953a6fa96b78ee042b014f376112f29a07beb35004e06c7d11cff2fd5afc1a7e3645d2e85f35b39dfd35a81d9aa3 -DIST firefox-67.0b11.source.tar.xz 285412720 BLAKE2B 86cfb0523772839b9544abe2f212663c83bb2cb0b72e29b925f9587efdcb9ac8d50460687a8d261026ad741a041522c13a2696486567448cd9e8689e445ed820 SHA512 cc53328155c476c4914cbeaaded226ff5b89b79344b5525fb35a6ab45f65839416500d95d8d7daaf3f0a4d54a7f7a2b214fc89b921fe75ddd5abed0b1b5201b1 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 f3662202..00000000 --- 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/gentoo-default-prefs.js-2 b/www-client/firefox/files/gentoo-default-prefs.js-2 deleted file mode 100644 index ffd0d7dc..00000000 --- a/www-client/firefox/files/gentoo-default-prefs.js-2 +++ /dev/null @@ -1,17 +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); 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 0cb92b04..00000000 --- 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.desktop b/www-client/firefox/files/icon/firefox.desktop deleted file mode 100644 index 54bb2919..00000000 --- a/www-client/firefox/files/icon/firefox.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Name=@NAME@ -Comment=Web Browser -Exec=firefox %u -Icon=@ICON@ -Terminal=false -Type=Application -MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https; -Categories=Network;WebBrowser; -StartupNotify=true diff --git a/www-client/firefox/firefox-67.0_beta11.ebuild b/www-client/firefox/firefox-67.0_beta11.ebuild deleted file mode 100644 index a76e9eef..00000000 --- a/www-client/firefox/firefox-67.0_beta11.ebuild +++ /dev/null @@ -1,748 +0,0 @@ -# Copyright 1999-2019 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_{5,6,7} ) -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 as ast az bg bn-BD bn-IN br bs ca cak cs cy da de dsb -el en en-GB en-US en-ZA 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 id is it ja ka kab kk km kn ko lij lt lv -mai mk ml mr ms nb-NO nl nn-NO or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq -sr sv-SE ta te th tr uk 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}-67.0-patches-02" - -MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases" -MOZ_SRC_URI="${MOZ_HTTP_URI}/${MOZ_PV}/source/firefox-${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=8 - -inherit check-reqs eapi7-ver flag-o-matic toolchain-funcs eutils \ - gnome2-utils llvm mozcoreconf-v6 pax-utils xdg-utils \ - autotools mozlinguas-v2 virtualx - -DESCRIPTION="Firefox Web Browser" -HOMEPAGE="https://www.mozilla.com/firefox" - -KEYWORDS="~amd64 ~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 neon pgo pulseaudio - +screenshot 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 )" - -PATCH_URIS=( https://dev.gentoo.org/~{anarchy,axs,polynomial-c,whissi}/mozilla/patchsets/${PATCH}.tar.xz ) -SRC_URI="${SRC_URI} - ${MOZ_SRC_URI} - ${PATCH_URIS[@]}" - -CDEPEND=" - >=dev-libs/nss-3.42 - >=dev-libs/nspr-4.19 - >=app-text/hunspell-1.5.4:* - 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 - 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 - >=virtual/libffi-3.0.10:= - virtual/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.2.0:= - >=media-libs/libaom-1.0.0:= - ) - system-harfbuzz? ( >=media-libs/harfbuzz-2.3.1: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.7.0:0=[postproc] - <media-libs/libvpx-1.8:0=[postproc] - ) - system-sqlite? ( >=dev-db/sqlite-3.26: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.6.8 - >=net-libs/nodejs-8.11.0 - >=sys-devel/binutils-2.30 - sys-apps/findutils - || ( - ( - 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] ) - ) - ) - ( - sys-devel/clang:6 - !clang? ( sys-devel/llvm:6 ) - clang? ( - =sys-devel/lld-6* - sys-devel/llvm:6[gold] - pgo? ( =sys-libs/compiler-rt-sanitizers-6*[profile] ) - ) - ) - ) - pulseaudio? ( media-sound/pulseaudio ) - >=virtual/cargo-1.31.0 - >=virtual/rust-1.31.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? ( dev-lang/nasm )" - -# Due to a bug in GCC, profile guided optimization will produce -# AVX2 instructions, bug #677052 -REQUIRED_USE="wifi? ( dbus ) - pgo? ( lto )" - -S="${WORKDIR}/firefox-${PV%_*}" - -QA_PRESTRIPPED="usr/lib*/${PN}/firefox" - -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} ..." - 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} ..." - 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} ..." - return 1 - fi - fi - fi - - einfo "Will use LLVM slot ${LLVM_SLOT}!" -} - -pkg_setup() { - moz_pkgsetup - - # 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 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() { - eapply "${WORKDIR}/firefox" - - # Allow user to apply any additional patches without modifing ebuild - eapply_user - - # 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 - - # Ensure that our plugins dir is enabled as default - sed -i -e "s:/usr/lib/mozilla/plugins:/usr/lib/nsbrowser/plugins:" \ - "${S}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 32bit!" - sed -i -e "s:/usr/lib64/mozilla/plugins:/usr/lib64/nsbrowser/plugins:" \ - "${S}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 64bit!" - - # 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 -} - -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 - - # 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 - 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 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]? - mozconfig_annotate '' --enable-default-toolkit=cairo-gtk3 - - 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 - - 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}" - - # disable webrtc for now, bug 667642 - use arm && mozconfig_annotate 'broken on arm' --disable-webrtc - - # 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 - - 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-2 \ - "${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 - - if ! use screenshot ; then - echo "pref(\"extensions.screenshots.disabled\", true);" >> \ - "${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 - - 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/browser/defaults/preferences/all-gentoo.js" \ - || die - done - - 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 - 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" - newmenu "${FILESDIR}/icon/${PN}.desktop" "${PN}.desktop" - sed -i -e "s:@NAME@:${name}:" -e "s:@ICON@:${icon}:" \ - "${ED}/usr/share/applications/${PN}.desktop" || die - - # 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" - - # 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() { - gnome2_icon_savelist - - # 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() { - gnome2_icon_cache_update - xdg_desktop_database_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() { - gnome2_icon_cache_update - xdg_desktop_database_update -} diff --git a/www-client/firefox/metadata.xml b/www-client/firefox/metadata.xml deleted file mode 100644 index 2b1828c5..00000000 --- a/www-client/firefox/metadata.xml +++ /dev/null @@ -1,43 +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="pgo">Add support for profile-guided optimization using gcc-4.5, - for faster binaries. This option will double the compile time.</flag> - <flag name="screenshot">Allow to disable screenshot extension in global profile</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/www-client/seamonkey/Manifest b/www-client/seamonkey/Manifest deleted file mode 100644 index 01537d17..00000000 --- a/www-client/seamonkey/Manifest +++ /dev/null @@ -1,23 +0,0 @@ -DIST chatzilla-SEA2_48_RELBRANCH.tar.bz2 440336 BLAKE2B 3fe09e3d2ba698d95054cbb65aad66984cb859b0b6fd8ffca45593cc63f418c898cf022c9cfd41187c71631a74e62c9b300ca48d6cc9c791a600f3ea71544879 SHA512 cb695aa40543ebc1621739207c5e6c5d49b3dc6e9715543cb35abfdfdeddf899a62c2cbb76123297072682a94319944388a6428b39e458c8e3b412144943120c -DIST dom-inspector-DOMI_2_0_17.tar.bz2 155095 BLAKE2B e67e90a09db4c5acd4f58d004992094bec38145d48f8aa4abf1b39289222aa9be0498ebc45f01c7e94e90936ffe8b0cb415e3fb42d09b4bb8855317b1b9b4522 SHA512 0b9915566270d1d6670075263fffb0c59f834c4bfae933e6da23747914f069918f6f3dcf1ab3de6ea3b456623ef6e008f2d2aadcad0da84e483cae02e11f0b9b -DIST firefox-52.4-patches-02.tar.xz 14412 BLAKE2B 9c15aa293dfc36efe1236d9b5736012a3efd0480f0d8eb243687b50245ccdb6e0ed13e564271569211eb767bd01ba3c7688c350005ce862403335dcc2e87bca7 SHA512 6befeaefc118bc161ad05eed619142814e5cf31aaeede3fb5618b1f5ace887e9e1fa6914320b513404380a426cfb0f45107435f92b2d7e95d95cd7c44e03ad96 -DIST seamonkey-2.46-patches-01.tar.xz 768 BLAKE2B e886f8c43cd856bb7cc4ea2a03c2a364bde1faef5c77156456d161c87867c52e0fb9bd348cc92330a22cff8ae0ebbab997b3d3985bb40c6c0883da4a35789f9c SHA512 2bbf09c8285f9f1ef5e194da7c43a8d1bbd4f2366ba182c78a7be4f0c36f549eb8cfee5e42d2eea87ea5d6920b36196e901b31ddca94e792aa2d3fb28de097ad -DIST seamonkey-2.49.9.1-cs.xpi 941974 BLAKE2B 4de71b190c63e4284b5915ab3f9f9672026fd2375996df26064598a6e1859f3e9b56c668c63a4741c37471c23dadb6eefc018a1715d7afa3e5ced8477a16eb50 SHA512 c3b061e0b735c6949a0ce7f8be22c7818e6bd039de5284015b0ff63b8456f18bd51db9f3a3d1f9a5df2a6d0610043ea9e33f16ccd3ba64e20ac53e901196afd3 -DIST seamonkey-2.49.9.1-de.xpi 949902 BLAKE2B a51a5ccf0a86708b26c9394cc88d3a05f6108760933b5ccca92d54390090f379ab34b4d90796e77764bcba1fbb20a8ffe56f7cf5ba7aeefc80e0e01d3f5cc86b SHA512 fb85fa867b5b9417190aa25cc678d68e3afed04bfe052896167aaf46042397da6e1bbeb70acc321f46bd0bed4f0856152d80a348b478a336d28825c4120af1c6 -DIST seamonkey-2.49.9.1-en-GB.xpi 911789 BLAKE2B 495cd6fcb8cde5dcbab636bad20e1da5f89dcfb3bbafea12fec1c2fc68bdf9145d533828163884dd25988f792839739a3374a233567820cdf97fb49c44d7228c SHA512 973fc7f693abe9b87bd971f79e050bd4bd9a16e4e6f6a50d9298f2c71d45aa328c4279055382b7f9bf8c807dff9c1ab8855d97dbbe3eb4d71c40ee5e3a02f3b6 -DIST seamonkey-2.49.9.1-es-AR.xpi 952759 BLAKE2B fb882c78290507b7bd349ab01545c7263b983b156c26938fa77565658b55d567d3f057b177b2e98be0d83e5bfb21c3b9bf39f31ecbc4b406739afa6f3af5e5ec SHA512 ec198ed919079e16bf638be032cc7de165d0e9d05d0742a12828b5ad510884d4dd0da57c0cbae85b3fe0089a1be26f42c9887957ab6ecac8b8ef6cf0fbbcb345 -DIST seamonkey-2.49.9.1-es-ES.xpi 897737 BLAKE2B 6ddefeeff9b9d1c96b4dc8d068a179d92a353470329571e8b84962f3c667bdb06cd4f9851a64868958e99412d7eb7f3a3910edf48c4a73c86474283a8268c504 SHA512 e9fb5834f3086ee1cf99404930149f06ee7f3f0d5796550c3368b915ed9f729dbd92032682c6273b687b6f3077a4ca3a78192e101f1276d90ebf2eb71f39f22e -DIST seamonkey-2.49.9.1-fr.xpi 969290 BLAKE2B ec7bbac2dda87d64486e36a18b18ab89c5940df2134704c5fa5af892c0b9669ff2cea81fb34355d383b6207c0993504afe052c5c435a4a402862a5c814debfe7 SHA512 188f4a8c79b10f95c807a08837290fbc3245c983e6797b8f8a0beea4f4ffad915abeb942920f9986910a0530218f4e35ba16de60b4f21d33116ae16756eb4e8c -DIST seamonkey-2.49.9.1-hu.xpi 955174 BLAKE2B 60784e962a43bf01630f76693b17954d4788daebb54d29f95ff5f3650ecd78b7067f1af20421d104feffaed10d08dfe1b25f8551969678bd4e1fe9b414a7edcf SHA512 e28beb23242a6535230df4fd1adb82e8957487179402cb82dedc2faa6464b411d22ddb2732e0490a916597301eebf2fda727bcadb34e029bd468bd066dbc3080 -DIST seamonkey-2.49.9.1-it.xpi 793590 BLAKE2B 4c7e837b93a090b3f0934a37bb1c63534dce632839677b0127055502cb7dc57f210c1390afa663ca9c2f4f01196756579750d94b8815de12fc6b2bd9c12a6a19 SHA512 c750a85b74bb37d966f1bbecdafcd6ad9d4532eaf0f49f9148081f821c61aec332646eb7c43f0eef4b736362a8c2ab0a1205a38537129f6fe920dc8ae0f16ca9 -DIST seamonkey-2.49.9.1-ja.xpi 1033801 BLAKE2B 0fb8ebcde8c64f60872d3ed4acd17249c852fb43863e5649cf778dfffde13cdee5ed63af4d66647d4c57a9d456a769b2b43f28cf9637b8b71ffb053dc0f46bee SHA512 454756af04d5d3301c3ffe321109e1c78aa69a3b9e4a29e1b1e7226b958062e451551d73c3df87785fd80e74a4e433fc2094e3702ceb1a547abb858551878056 -DIST seamonkey-2.49.9.1-lt.xpi 956024 BLAKE2B 75ffe875f683e8e47e703574e4a3b73cb2bb764e8163f833208e06b914709acf772734848a2164b94f138dae021c4915e8b20f417132c84197042215548b5b25 SHA512 14124e0b9b60f360f6f2b77b5bafe80569894754a3ffd27b6a3aab34136d7876d785b5e9178cb1d34ec46a7b858f26327658e1a3e43ac97abe272838dde78228 -DIST seamonkey-2.49.9.1-nl.xpi 957391 BLAKE2B 859a5cce26654b3f67d4a340d40b96d66199461250342a699f3186f97edad0347174e87a68a6be21bd6c2ff91497195be98bfb717679d76aa9be2590b809ee9c SHA512 0f3e68df37e211b73773e1b84d39d4540d1d8865cc534bad841babc30c074bb9301cc472aa0e4e61e09bc26948270e1106e1546d27705380819d830ca158215d -DIST seamonkey-2.49.9.1-pl.xpi 913004 BLAKE2B 8fa4e937c41b6585075f920a778c13d08fcbb6a5759d5371a05d278b5646963d4b8a066aedd60e7521caf354d4ed57e14864d6cb802900284a8be05553ea0e38 SHA512 532b64032b6e4cb902cd9d99ef5505f3ac57964452196f3a9f49eff1bd965c5a8a8271960951482266f12214cce4cad876268f9f38a193f5d91c2644fef0aff8 -DIST seamonkey-2.49.9.1-pt-PT.xpi 939012 BLAKE2B 16bcdbd9c04f023dba7de4e5caaa16f2bbd0bda45625008b909fa360eb98409b21081b892d9e3dcc4fbc5a3ffb1bafc630f2266f69149c70ad96a81025aa7e01 SHA512 f8cac43e61de1d4dfbc0febddcadfa10cc457e7552016c79ff954cddef900470e60912c607076976b15811944a07cd785fbd2ffd85a5af3ce545ec98c12bdc05 -DIST seamonkey-2.49.9.1-ru.xpi 995907 BLAKE2B ce02fd35e093b3f5c2fed309a2fae066e48c7b3351075d55b72751d66b6e13fb13758b8ef4ffa351e85907152ac78a0fb4ced99e2af2993f5906440ba69b0051 SHA512 846f7f361a15ea1b04539ec789dffb459e1fbd85283c720883d6545da67a979e040c80b5cb6a0938f0ca9e059e837310cf3fb2d97671e37ff256ad2ac780291c -DIST seamonkey-2.49.9.1-sk.xpi 967988 BLAKE2B fd7db86b778be8b1202c031ccb6b18805fc9027f50dd513e3ca0ef2afa1208f5df0b7636c0b6f822fda9618ebe48dc1b16710888284c2d5681e00e4be26c03cf SHA512 8fb02cb8f95c68ce40aabaf79c57bd7c655092dd5fb939d68a62a1bec707b903fbcf16299ff8dd094e161b5f4c732a813d63e33b3ff3ac09f9e1afcf740426d9 -DIST seamonkey-2.49.9.1-sv-SE.xpi 940793 BLAKE2B ec901577f833e69f78d0fba13fe1ee1297105332db66fa5e0c841f19aca4e3274822f43f49b925eba7e86bb8682963424369bb4ce8b089df32d8fc7fbd294e2d SHA512 0ac1b0a8e599ef0ffe49d8a7b94dd25818601fb5603273ed995b9a4bb52c5e13a360c76b9278bf8a14b8dce5609f33be319c43fa13ee7b16eda897f6c2d39ddf -DIST seamonkey-2.49.9.1-zh-CN.xpi 946349 BLAKE2B ff8d5dfc671cf51e9af849e7781eb3ada2cda97cc542a8a28306a7c060043752be7614574c0c4882c54dec8a82972a46a7c8bc8085d94a9273264cd15dbfbc83 SHA512 5d3a6accc9deb69b6d52bccca0b52e12b8727d0e6a99067dba52921a147c333b7b777d7dc4935510fb981c9cfae2c4cfc30f310fad9b06e5537ef1dbb89b5e28 -DIST seamonkey-2.49.9.1-zh-TW.xpi 1002365 BLAKE2B e66f68187c0373f96ba8f58f420c8a4c917015e6c38a54a6c80d9cdf4b31620ff3c104ffccc1f4e0f140673b15eefe1742a2b0f3208e00abb4a593322cb1edf9 SHA512 a5797304f4de6edf807238a551676fe9755d9ae0dc0141ea959c6edae8bc742ad11976a2b1cf4f2a324ad6b94c1a97c77e29b8100a679af7002156d1d0150376 -DIST thunderbird-52.9.1.source.tar.xz 230475264 BLAKE2B ec2763d21bf88779867f4478dfc544b5afbe1062ce51f09c1ecc423c3289f0cd91ae79bc87d726ae77d885290843631f36800fff18d802cd4a998966e7793b74 SHA512 0de80a5036b1e8a5a8549c546b4693cb285ee4d10f546f4b4aceed9e1d6c64b9dbafce7bacaaf057112130036f7b41fb2e0fa3343412140e6ac926dd94c27d23 diff --git a/www-client/seamonkey/files/all-gentoo-1.js b/www-client/seamonkey/files/all-gentoo-1.js deleted file mode 100644 index 86b55cac..00000000 --- a/www-client/seamonkey/files/all-gentoo-1.js +++ /dev/null @@ -1,19 +0,0 @@ -pref("browser.display.use_system_colors", true); -pref("general.smoothScroll", true); -pref("general.useragent.vendor", "Gentoo"); -pref("general.useragent.vendorSub", "SEAMONKEY_PVR"); -pref("update_notifications.enabled", false); - -pref("app.update.enabled", false); -pref("app.update.autoInstallEnabled", false); -pref("browser.link.open_external", 3); -pref("general.autoScroll", false); -pref("browser.tabs.tabMinWidth", 15); -pref("browser.backspace_action", 0); -pref("accessibility.typeaheadfind", true); -pref("browser.EULA.override", true); -pref("intl.locale.matchOS", true); -pref("general.useragent.locale", "chrome://global/locale/intl.properties"); -pref("extensions.autoDisableScopes", 0); -pref("layout.css.dpi", 0); -pref("browser.tabs.mouseScrollAdvancesTab", 0); diff --git a/www-client/seamonkey/files/seamonkey.desktop b/www-client/seamonkey/files/seamonkey.desktop deleted file mode 100644 index 1b1dd7ad..00000000 --- a/www-client/seamonkey/files/seamonkey.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Name=SeaMonkey -Comment=SeaMonkey Suite -Exec=seamonkey %u -Icon=seamonkey -Terminal=false -Type=Application -MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https; -Categories=Network;WebBrowser; -StartupNotify=true diff --git a/www-client/seamonkey/metadata.xml b/www-client/seamonkey/metadata.xml deleted file mode 100644 index b240cff9..00000000 --- a/www-client/seamonkey/metadata.xml +++ /dev/null @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>polynomial-c@gentoo.org</email> - <name>Lars Wendler</name> - </maintainer> - <maintainer type="project"> - <email>mozilla@gentoo.org</email> - <name>Gentoo Mozilla Team</name> - </maintainer> - <use> - <flag name="calendar">Build Mozilla's calendar</flag> - <flag name="chatzilla">Build Mozilla's IRC client (default on)</flag> - <flag name="custom-optimization">Build with user-specified compiler optimizations (-Os, -O0, -O1, -O2, -O3) from CFLAGS (unsupported)</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="force-gtk3">Use the cairo-gtk3 rendering engine</flag> - <flag name="ipc">Use inter-process communication between tabs and plugins. Allows for greater stability in case of plugin crashes</flag> - <flag name="roaming">Build roaming extension support (default on)</flag> - <flag name="system-cairo">Use the system-wide <pkg>x11-libs/cairo</pkg> instead of bundled</flag> - <flag name="system-harfbuzz">Use the system-wide <pkg>media-libs/harfbuzz</pkg> instead of bundled</flag> - <flag name="system-icu">Use the sytem-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> - </use> -</pkgmetadata> diff --git a/www-client/seamonkey/seamonkey-2.49.9.1_p0.ebuild b/www-client/seamonkey/seamonkey-2.49.9.1_p0.ebuild deleted file mode 100644 index 05e55c8f..00000000 --- a/www-client/seamonkey/seamonkey-2.49.9.1_p0.ebuild +++ /dev/null @@ -1,403 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -WANT_AUTOCONF="2.1" - -# This list can be updated with scripts/get_langs.sh from the mozilla overlay -# note - could not roll langpacks for: ca fi -#MOZ_LANGS=(ca cs de en-GB es-AR es-ES fi fr gl hu it ja lt nb-NO nl pl pt-PT -# ru sk sv-SE tr uk zh-CN zh-TW) -MOZ_LANGS=(cs de en-GB es-AR es-ES fr hu it ja lt nl pl pt-PT - ru sk sv-SE zh-CN zh-TW) - -MOZ_PV="${PV/_pre*}" -MOZ_PV="${MOZ_PV/_alpha/a}" -MOZ_PV="${MOZ_PV/_beta/b}" -MOZ_PV="${MOZ_PV/_rc/rc}" -MOZ_PV="${MOZ_PV/_p[0-9]}" -MOZ_P="${P}" -MY_MOZ_P="${PN}-${MOZ_PV}" - -if [[ ${PV} == *_pre* ]] ; then -# the following are for upstream build candidates - MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/candidates/${MOZ_PV}-candidates/build${PV##*_pre}" - MOZ_LANGPACK_PREFIX="linux-i686/xpi/" - SRC_URI+=" ${MOZ_HTTP_URI}/source/${MY_MOZ_P}.source.tar.xz -> ${P}.source.tar.xz" - S="${WORKDIR}/${MY_MOZ_P}" - # And the langpack stuff stays at eclass defaults -# the following is for self-rolled releases - #MOZ_HTTP_URI="https://dev.gentoo.org/~axs/distfiles" - #MOZ_LANGPACK_PREFIX="${MY_MOZ_P}." - #MOZ_LANGPACK_SUFFIX=".langpack.xpi" - #SRC_URI="${SRC_URI} - #${MOZ_HTTP_URI}/${P}.source.tar.xz - #" -elif [[ ${PV} == *_p[0-9] ]]; then - # gentoo-unofficial release using thunderbird distfiles to build seamonkey instead - TB_MAJOR=52 - SMPV="${PV%.[0-9].*}" - MOZ_P="${PN}-${MOZ_PV}" - MOZ_HTTP_URI="https://archive.mozilla.org/pub/thunderbird/releases/${MOZ_PV/${SMPV}/${TB_MAJOR}}" - #MOZ_GENERATE_LANGPACKS=1 - #https://dev.gentoo.org/~axs/distfiles/${PN}-${SMPV}-l10n-sources-20170727.tar.xz - MOZ_LANGPACK_PREFIX="../../../seamonkey/releases/2.49.1/linux-i686/xpi/" - MOZ_LANGPACK_SUFFIX=".xpi" - S="${WORKDIR}/thunderbird-${MOZ_PV/${SMPV}/${TB_MAJOR}}" - CHATZILLA_VER="SEA2_48_RELBRANCH" - INSPECTOR_VER="DOMI_2_0_17" - SRC_URI="${SRC_URI} - ${MOZ_HTTP_URI}/source/thunderbird-${MOZ_PV/${SMPV}/${TB_MAJOR}}.source.tar.xz - https://hg.mozilla.org/chatzilla/archive/${CHATZILLA_VER}.tar.bz2 -> chatzilla-${CHATZILLA_VER}.tar.bz2 - https://hg.mozilla.org/dom-inspector/archive/${INSPECTOR_VER}.tar.bz2 -> dom-inspector-${INSPECTOR_VER}.tar.bz2 - " -else - MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases/${MOZ_PV}" - MOZ_LANGPACK_PREFIX="langpack/${MY_MOZ_P}." - MOZ_LANGPACK_SUFFIX=".langpack.xpi" - S="${WORKDIR}/${PN}-${MOZ_PV}" - SRC_URI="${SRC_URI} - ${MOZ_HTTP_URI}/source/${MY_MOZ_P}.source.tar.xz -> ${P}.source.tar.xz - " -fi - -MOZCONFIG_OPTIONAL_GTK3=1 -MOZCONFIG_OPTIONAL_WIFI=1 -inherit check-reqs flag-o-matic toolchain-funcs eutils mozconfig-v6.52 pax-utils xdg-utils autotools mozextension nsplugins mozlinguas-v2 - -PATCHFF="firefox-52.4-patches-02" -PATCH="${PN}-2.46-patches-01" - -DESCRIPTION="Seamonkey Web Browser" -HOMEPAGE="http://www.seamonkey-project.org" -KEYWORDS="~alpha amd64 ~arm ~ppc ~ppc64 x86" - -SLOT="0" -LICENSE="MPL-2.0 GPL-2 LGPL-2.1" -IUSE="+calendar +chatzilla +crypt +gmp-autoupdate +ipc jack minimal pulseaudio +roaming selinux test" - -SRC_URI+=" - https://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCHFF}.tar.xz - https://dev.gentoo.org/~axs/mozilla/patchsets/${PATCHFF}.tar.xz - https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/${PATCHFF}.tar.xz - https://dev.gentoo.org/~axs/mozilla/patchsets/${PATCH}.tar.xz - https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/${PATCH}.tar.xz -" - -ASM_DEPEND=">=dev-lang/yasm-1.1" - -RDEPEND=" - >=dev-libs/nss-3.28.3 - >=dev-libs/nspr-4.13.1 - jack? ( virtual/jack ) - crypt? ( >=x11-plugins/enigmail-2.0.5 ) -" - -DEPEND=" - ${RDEPEND} - !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( dev-libs/libexecinfo ) ) ) - amd64? ( ${ASM_DEPEND} - virtual/opengl ) - x86? ( ${ASM_DEPEND} - virtual/opengl ) -" - -BUILD_OBJ_DIR="${S}/seamonk" - -# 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 - -pkg_setup() { - if [[ ${PV} == *_pre* ]] ; then - ewarn "You're using an unofficial release of ${PN}. Don't file any bug in" - ewarn "Gentoo's Bugtracker against this package in case it breaks for you." - ewarn "Those belong to upstream: https://bugzilla.mozilla.org" - fi - - moz_pkgsetup -} - -pkg_pretend() { - # Ensure we have enough disk space to compile - if 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 - - if [[ -n $TB_MAJOR ]]; then - # move the irc and inspector code into the correct locations - # when we are building from a thunderbird tarball - mv "${WORKDIR}"/chatzilla-${CHATZILLA_VER} \ - "${S}"/mozilla/extensions/irc || die - mv "${WORKDIR}"/dom-inspector-${INSPECTOR_VER} \ - "${S}"/mozilla/extensions/inspector || die - fi -} - -src_prepare() { - # Apply our patches - eapply "${WORKDIR}"/seamonkey - - # browser patches go here - pushd "${S}"/mozilla &>/dev/null || die - rm -f "${WORKDIR}"/firefox/1000_gentoo_install_dir.patch - eapply "${WORKDIR}"/firefox - popd &>/dev/null || die - - if grep -q '^sdkdir.*$(MOZ_APP_NAME)-devel' mozilla/config/baseconfig.mk ; then - sed '/^sdkdir/s@-devel@@' \ - -i mozilla/config/baseconfig.mk || die - else - einfo "baseconfig.mk hackery no longer needed." - fi - - # Shell scripts sometimes contain DOS line endings; bug 391889 - grep -rlZ --include="*.sh" $'\r$' . | - while read -r -d $'\0' file ; do - einfo edos2unix "${file}" - edos2unix "${file}" - done - - # force a version update that matches the minor and patch version of thunderbird - if [[ -n ${TB_MAJOR} ]]; then - echo ${MOZ_PV} >"${S}"/suite/config/version.txt - fi - - # Allow user to apply any additional patches without modifing ebuild - eapply_user - - local ms="${S}/mozilla" - - # Enable gnomebreakpad - if use debug ; then - sed -i -e "s:GNOME_DISABLE_CRASH_DIALOG=1:GNOME_DISABLE_CRASH_DIALOG=0:g" \ - "${ms}"/build/unix/run-mozilla.sh || die "sed failed!" - fi - - # Ensure that are plugins dir is enabled as default - sed -i -e "s:/usr/lib/mozilla/plugins:/usr/lib/nsbrowser/plugins:" \ - "${ms}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 32bit!" - sed -i -e "s:/usr/lib64/mozilla/plugins:/usr/lib64/nsbrowser/plugins:" \ - "${ms}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 64bit!" - - # 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}"/suite/installer/Makefile.in || die - # Don't error out when there's no files to be removed: - sed 's@\(xargs rm\)$@\1 -f@' \ - -i "${ms}"/toolkit/mozapps/installer/packager.mk || die - - # Don't build libs-% locale files for chatzilla if we are not building chatzilla - # (this is hard-coded in the build system at present rather than being based on configuration) - use chatzilla || sed '/extensions\/irc\/locales libs-/s@^@#@' \ - -i "${S}"/suite/locales/Makefile.in || die - - eautoreconf old-configure.in - cd "${S}"/mozilla || die - eautoconf old-configure.in - cd "${S}"/mozilla/js/src || die - eautoconf old-configure.in - cd "${S}"/mozilla/memory/jemalloc/src || die - WANT_AUTOCONF= eautoconf -} - -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 - - #################################### - # - # mozconfig, CFLAGS and CXXFLAGS setup - # - #################################### - - mozconfig_init - mozconfig_config - - # enable JACK, bug 600002 - mozconfig_use_enable jack - - # It doesn't compile on alpha without this LDFLAGS - use alpha && append-ldflags "-Wl,--no-relax" - - if ! use chatzilla ; then - MEXTENSIONS+=",-irc" - fi - if ! use roaming ; then - MEXTENSIONS+=",-sroaming" - fi - - # Setup api key for location services - echo -n "${_google_api_key}" > "${S}"/google-api-key - mozconfig_annotate '' --with-google-api-keyfile="${S}/google-api-key" - - mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}" - - # Other sm-specific settings - mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME} - mozconfig_annotate '' --enable-safe-browsing - mozconfig_use_enable calendar - - mozlinguas_mozconfig - - # Use an objdir to keep things organized. - 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 - - # Work around breakage in makeopts with --no-print-directory - MAKEOPTS="${MAKEOPTS/--no-print-directory/}" - - if [[ $(gcc-major-version) -lt 4 ]] ; then - append-cxxflags -fno-stack-protector - elif [[ $(gcc-major-version) -gt 4 || $(gcc-minor-version) -gt 3 ]] ; then - if use amd64 || use x86 ; then - append-flags -mno-avx - fi - fi - - # workaround for funky/broken upstream configure... - SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" \ - emake V=1 -f client.mk configure -} - -src_compile() { - MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL}" \ - emake V=1 -f client.mk - - mozlinguas_src_compile -} - -src_install() { - MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}" - DICTPATH="\"${EPREFIX}/usr/share/myspell\"" - - local emid - 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. - sed "s|SEAMONKEY_PVR|${PVR}|" "${FILESDIR}"/all-gentoo-1.js > \ - "${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" \ - || die - - # Set default path to search for dictionaries. - echo "pref(\"spellchecker.dictionary_path\", ${DICTPATH});" \ - >> "${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" \ - || die - - echo 'pref("extensions.autoDisableScopes", 3);' >> \ - "${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" \ - || die - - local plugin - if ! use gmp-autoupdate ; then - for plugin in "${GMP_PLUGIN_LIST[@]}" ; do - echo "pref(\"media.${plugin}.autoupdate\", false);" >> \ - "${S}/${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \ - || dir - done - fi - - MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" \ - emake DESTDIR="${D}" install - cp "${FILESDIR}"/${PN}.desktop "${T}" || die - - sed 's|^\(MimeType=.*\)$|\1text/x-vcard;text/directory;application/mbox;message/rfc822;x-scheme-handler/mailto;|' \ - -i "${T}"/${PN}.desktop || die - sed 's|^\(Categories=.*\)$|\1Email;|' -i "${T}"/${PN}.desktop \ - || die - - # Install language packs - mozlinguas_src_install - - # Add StartupNotify=true bug 290401 - if use startup-notification ; then - echo "StartupNotify=true" >> "${T}"/${PN}.desktop || die - fi - - # Install icon and .desktop for menu entry - newicon "${S}"/suite/branding/nightly/content/icon64.png ${PN}.png - domenu "${T}"/${PN}.desktop - - # Required in order to use plugins and even run seamonkey on hardened. - pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/{seamonkey,seamonkey-bin,plugin-container} - - if use minimal ; then - rm -rf "${ED}"/usr/include "${ED}${MOZILLA_FIVE_HOME}"/{idl,include,lib,sdk} - fi - - if use chatzilla ; then - local emid='{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}' - - # remove the en_US-only xpi file so a version with all requested locales can be installed - if [[ -e "${ED}"${MOZILLA_FIVE_HOME}/distribution/extensions/${emid}.xpi ]]; then - rm -f "${ED}"${MOZILLA_FIVE_HOME}/distribution/extensions/${emid}.xpi || die - fi - - # merge the extra locales into the main extension - mozlinguas_xpistage_langpacks "${BUILD_OBJ_DIR}"/dist/xpi-stage/chatzilla - - # install the merged extension - mkdir -p "${T}/${emid}" || die - cp -RLp -t "${T}/${emid}" "${BUILD_OBJ_DIR}"/dist/xpi-stage/chatzilla/* || die - insinto ${MOZILLA_FIVE_HOME}/distribution/extensions - doins -r "${T}/${emid}" - fi - - # Handle plugins dir through nsplugins.eclass - share_plugins_dir - - # revdep-rebuild entry - insinto /etc/revdep-rebuild - echo "SEARCH_DIRS_MASK=${MOZILLA_FIVE_HOME}*" >> ${T}/11${PN} - doins "${T}"/11${PN} -} - -pkg_preinst() { - MOZILLA_FIVE_HOME="${ROOT}/usr/$(get_libdir)/${PN}" - - if [ -d ${MOZILLA_FIVE_HOME}/plugins ] ; then - rm ${MOZILLA_FIVE_HOME}/plugins -rf - fi -} - -pkg_postinst() { - MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}" - - # Update mimedb for the new .desktop file - xdg_desktop_database_update - #gnome2_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 - fi - - if use chatzilla ; then - elog "chatzilla is now an extension which can be en-/disabled and configured via" - elog "the Add-on manager." - fi -} diff --git a/www-client/torbrowser/Manifest b/www-client/torbrowser/Manifest deleted file mode 100644 index 4f1ad0fb..00000000 --- a/www-client/torbrowser/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -DIST firefox-60.6-patches-05.tar.xz 35980 BLAKE2B eea4ed2061f36b85bfa0677434f3acf478d9a58ed3130c2b2cab4dc78613e16ff481cc063d71525fc16b01be3cfe17a4a5dcd60c5070205246eb8b2b78387393 SHA512 3a591d68f5911c6547de24e73390478eb389f467a49f4010cd8c295569a09d878ffa2db4a072fe118c1195d1f0acf0adbb7540de14c367cb4cec522b4f1e4b05 -DIST tor-browser-60.6.1esr-8.0-1-build1.tar.gz 386384151 BLAKE2B 18c9a07296317a0e62e40939c9b839850069836f9d489910fc364e1e2929a3218d3a2fc8a521a59d8971b925a09e0c29820a964bc326b0143480f2839b9f72cf SHA512 9a39ed63494cd2be4952312d8160884f2fa35211f3ea54fc2e9dcc737236102938d8c17b3a112420d847b7c7e98d0f33f210afb3d0fd979e21f7e23769372b4b -DIST tor-browser-linux32-8.0.8_en-US.tar.xz 76761628 BLAKE2B 0c21f3c5718da9fcfe8961a59cd98be495411ea85200294f1918aa9c27af25428e18d7b8a52bab1c27360e6ded221ea981554b7f4130ccd646bc9edb53039f43 SHA512 ebd2b93bdaf87d34cb03ecc2d0811d376a3942de9ea84b6f049358127e91c76aaef4bdd7fcaa9467660e907f9ee5d3fd239f80d7a1667fea2e9b5fbb80355d42 -DIST tor-browser-linux64-8.0.8_en-US.tar.xz 75228720 BLAKE2B 2e368225ca44868b700f1a6c8cb7a0f8f532adbca0f38d998741f5a8e24b76553ab861416724d0101b5b30a8bb305b96d308bfc6315619be4489a8f98ebc979a SHA512 a046d56280b24c3a524b894b94ecacd876d27f732bcc1744a5b194684b1477fcb468e6978a20bee456242708e7f9a4e58a7e82e58f31ed3b84f652689cec546e diff --git a/www-client/torbrowser/files/icon/torbrowser.desktop b/www-client/torbrowser/files/icon/torbrowser.desktop deleted file mode 100644 index ecfabde7..00000000 --- a/www-client/torbrowser/files/icon/torbrowser.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Name=@NAME@ -Comment=Web Browser -Exec=torbrowser %u -Icon=@ICON@ -Terminal=false -Type=Application -MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https; -Categories=Network;WebBrowser diff --git a/www-client/torbrowser/files/torbrowser-60.5.0-Change_the_default_Firefox_profile_directory.patch b/www-client/torbrowser/files/torbrowser-60.5.0-Change_the_default_Firefox_profile_directory.patch deleted file mode 100644 index 3559402e..00000000 --- a/www-client/torbrowser/files/torbrowser-60.5.0-Change_the_default_Firefox_profile_directory.patch +++ /dev/null @@ -1,425 +0,0 @@ -From e5b0afd7fee16e7f755095b8b85296fe401fb04d Mon Sep 17 00:00:00 2001 -From: Poncho <poncho@spahan.ch> -Date: Wed, 30 Jan 2019 09:55:48 +0100 -Subject: [PATCH 2/4] Revert "Bug 9173: Change the default Firefox profile - directory to be TBB-relative." - -This reverts commit b82691c60b6a3ade6939b0f68f28de1e3c120292. ---- - toolkit/xre/nsXREDirProvider.cpp | 147 +++++++++++++++++++------ - toolkit/xre/nsXREDirProvider.h | 12 +- - xpcom/io/nsAppFileLocationProvider.cpp | 97 ++++++++++------ - 3 files changed, 181 insertions(+), 75 deletions(-) - -diff --git a/toolkit/xre/nsXREDirProvider.cpp b/toolkit/xre/nsXREDirProvider.cpp -index dbbaffd2a15f..00ee37ce9b5f 100644 ---- a/toolkit/xre/nsXREDirProvider.cpp -+++ b/toolkit/xre/nsXREDirProvider.cpp -@@ -32,7 +32,6 @@ - #include "nsArrayEnumerator.h" - #include "nsEnumeratorUtils.h" - #include "nsReadableUtils.h" --#include "nsXPCOMPrivate.h" // for XPCOM_FILE_PATH_SEPARATOR - - #include "SpecialSystemDirectory.h" - -@@ -215,6 +214,9 @@ nsresult nsXREDirProvider::GetUserProfilesRootDir(nsIFile** aResult) { - nsresult rv = GetUserDataDirectory(getter_AddRefs(file), false); - - if (NS_SUCCEEDED(rv)) { -+#if !defined(XP_UNIX) || defined(XP_MACOSX) -+ rv = file->AppendNative(NS_LITERAL_CSTRING("Profiles")); -+#endif - // We must create the profile directory here if it does not exist. - nsresult tmp = EnsureDirectoryExists(file); - if (NS_FAILED(tmp)) { -@@ -230,6 +232,9 @@ nsresult nsXREDirProvider::GetUserProfilesLocalDir(nsIFile** aResult) { - nsresult rv = GetUserDataDirectory(getter_AddRefs(file), true); - - if (NS_SUCCEEDED(rv)) { -+#if !defined(XP_UNIX) || defined(XP_MACOSX) -+ rv = file->AppendNative(NS_LITERAL_CSTRING("Profiles")); -+#endif - // We must create the profile directory here if it does not exist. - nsresult tmp = EnsureDirectoryExists(file); - if (NS_FAILED(tmp)) { -@@ -1332,42 +1337,84 @@ nsresult nsXREDirProvider::GetProfileDir(nsIFile** aResult) { - nsresult nsXREDirProvider::GetUserDataDirectoryHome(nsIFile** aFile, - bool aLocal) { - // Copied from nsAppFileLocationProvider (more or less) -- NS_ENSURE_ARG_POINTER(aFile); -+ nsresult rv; - nsCOMPtr<nsIFile> localDir; - -- nsresult rv = GetAppDir()->Clone(getter_AddRefs(localDir)); -- NS_ENSURE_SUCCESS(rv, rv); -- -- int levelsToRemove = 1; // In FF21+, appDir points to browser subdirectory. - #if defined(XP_MACOSX) -- levelsToRemove += 2; -+ FSRef fsRef; -+ OSType folderType; -+ if (aLocal) { -+ folderType = kCachedDataFolderType; -+ } else { -+#ifdef MOZ_THUNDERBIRD -+ folderType = kDomainLibraryFolderType; -+#else -+ folderType = kApplicationSupportFolderType; - #endif -- while (localDir && (levelsToRemove > 0)) { -- // When crawling up the hierarchy, components named "." do not count. -- nsAutoCString removedName; -- rv = localDir->GetNativeLeafName(removedName); -- NS_ENSURE_SUCCESS(rv, rv); -- bool didRemove = !removedName.Equals("."); -- -- // Remove a directory component. -- nsCOMPtr<nsIFile> parentDir; -- rv = localDir->GetParent(getter_AddRefs(parentDir)); -- NS_ENSURE_SUCCESS(rv, rv); -- localDir = parentDir; -- if (didRemove) --levelsToRemove; - } -+ OSErr err = ::FSFindFolder(kUserDomain, folderType, kCreateFolder, &fsRef); -+ NS_ENSURE_FALSE(err, NS_ERROR_FAILURE); - -- if (!localDir) return NS_ERROR_FAILURE; -+ rv = NS_NewNativeLocalFile(EmptyCString(), true, getter_AddRefs(localDir)); -+ NS_ENSURE_SUCCESS(rv, rv); -+ -+ nsCOMPtr<nsILocalFileMac> dirFileMac = do_QueryInterface(localDir); -+ NS_ENSURE_TRUE(dirFileMac, NS_ERROR_UNEXPECTED); - -- rv = localDir->AppendRelativeNativePath( -- NS_LITERAL_CSTRING("TorBrowser" XPCOM_FILE_PATH_SEPARATOR -- "Data" XPCOM_FILE_PATH_SEPARATOR "Browser")); -+ rv = dirFileMac->InitWithFSRef(&fsRef); - NS_ENSURE_SUCCESS(rv, rv); - -+ localDir = do_QueryInterface(dirFileMac, &rv); -+#elif defined(XP_IOS) -+ nsAutoCString userDir; -+ if (GetUIKitDirectory(aLocal, userDir)) { -+ rv = NS_NewNativeLocalFile(userDir, true, getter_AddRefs(localDir)); -+ } else { -+ rv = NS_ERROR_FAILURE; -+ } -+ NS_ENSURE_SUCCESS(rv, rv); -+#elif defined(XP_WIN) -+ nsString path; - if (aLocal) { -- rv = localDir->AppendNative(NS_LITERAL_CSTRING("Caches")); -- NS_ENSURE_SUCCESS(rv, rv); -+ rv = GetShellFolderPath(FOLDERID_LocalAppData, path); -+ if (NS_FAILED(rv)) rv = GetRegWindowsAppDataFolder(aLocal, path); -+ } -+ if (!aLocal || NS_FAILED(rv)) { -+ rv = GetShellFolderPath(FOLDERID_RoamingAppData, path); -+ if (NS_FAILED(rv)) { -+ if (!aLocal) rv = GetRegWindowsAppDataFolder(aLocal, path); -+ } -+ } -+ NS_ENSURE_SUCCESS(rv, rv); -+ -+ rv = NS_NewLocalFile(path, true, getter_AddRefs(localDir)); -+#elif defined(XP_UNIX) -+ const char* homeDir = getenv("HOME"); -+ if (!homeDir || !*homeDir) return NS_ERROR_FAILURE; -+ -+#ifdef ANDROID /* We want (ProfD == ProfLD) on Android. */ -+ aLocal = false; -+#endif -+ -+ if (aLocal) { -+ // If $XDG_CACHE_HOME is defined use it, otherwise use $HOME/.cache. -+ const char* cacheHome = getenv("XDG_CACHE_HOME"); -+ if (cacheHome && *cacheHome) { -+ rv = NS_NewNativeLocalFile(nsDependentCString(cacheHome), true, -+ getter_AddRefs(localDir)); -+ } else { -+ rv = NS_NewNativeLocalFile(nsDependentCString(homeDir), true, -+ getter_AddRefs(localDir)); -+ if (NS_SUCCEEDED(rv)) -+ rv = localDir->AppendNative(NS_LITERAL_CSTRING(".cache")); -+ } -+ } else { -+ rv = NS_NewNativeLocalFile(nsDependentCString(homeDir), true, -+ getter_AddRefs(localDir)); - } -+#else -+#error "Don't know how to get product dir on your platform" -+#endif - - NS_IF_ADDREF(*aFile = localDir); - return rv; -@@ -1537,23 +1584,39 @@ nsresult nsXREDirProvider::AppendProfilePath(nsIFile* aFile, bool aLocal) { - } - - nsAutoCString profile; -+ nsAutoCString appName; -+ nsAutoCString vendor; - if (gAppData->profile) { - profile = gAppData->profile; -+ } else { -+ appName = gAppData->name; -+ vendor = gAppData->vendor; - } - -- nsresult rv = NS_ERROR_FAILURE; -+ nsresult rv; - - #if defined(XP_MACOSX) - if (!profile.IsEmpty()) { - rv = AppendProfileString(aFile, profile.get()); -- NS_ENSURE_SUCCESS(rv, rv); -+ } else { -+ // Note that MacOS ignores the vendor when creating the profile hierarchy - -+ // all application preferences directories live alongside one another in -+ // ~/Library/Application Support/ -+ rv = aFile->AppendNative(appName); - } -+ NS_ENSURE_SUCCESS(rv, rv); - - #elif defined(XP_WIN) - if (!profile.IsEmpty()) { - rv = AppendProfileString(aFile, profile.get()); -- NS_ENSURE_SUCCESS(rv, rv); -+ } else { -+ if (!vendor.IsEmpty()) { -+ rv = aFile->AppendNative(vendor); -+ NS_ENSURE_SUCCESS(rv, rv); -+ } -+ rv = aFile->AppendNative(appName); - } -+ NS_ENSURE_SUCCESS(rv, rv); - - #elif defined(ANDROID) - // The directory used for storing profiles -@@ -1563,6 +1626,11 @@ nsresult nsXREDirProvider::AppendProfilePath(nsIFile* aFile, bool aLocal) { - rv = aFile->AppendNative(nsDependentCString("mozilla")); - NS_ENSURE_SUCCESS(rv, rv); - #elif defined(XP_UNIX) -+ nsAutoCString folder; -+ // Make it hidden (by starting with "."), except when local (the -+ // profile is already under ~/.cache or XDG_CACHE_HOME). -+ if (!aLocal) folder.Assign('.'); -+ - if (!profile.IsEmpty()) { - // Skip any leading path characters - const char* profileStart = profile.get(); -@@ -1570,16 +1638,29 @@ nsresult nsXREDirProvider::AppendProfilePath(nsIFile* aFile, bool aLocal) { - - // On the off chance that someone wanted their folder to be hidden don't - // let it become ".." -- if (*profileStart == '.') profileStart++; -+ if (*profileStart == '.' && !aLocal) profileStart++; - -- // Make it hidden (by starting with "."). -- nsAutoCString folder("."); - folder.Append(profileStart); - ToLowerCase(folder); - - rv = AppendProfileString(aFile, folder.BeginReading()); -- NS_ENSURE_SUCCESS(rv, rv); -+ } else { -+ if (!vendor.IsEmpty()) { -+ folder.Append(vendor); -+ ToLowerCase(folder); -+ -+ rv = aFile->AppendNative(folder); -+ NS_ENSURE_SUCCESS(rv, rv); -+ -+ folder.Truncate(); -+ } -+ -+ folder.Append(appName); -+ ToLowerCase(folder); -+ -+ rv = aFile->AppendNative(folder); - } -+ NS_ENSURE_SUCCESS(rv, rv); - - #else - #error "Don't know how to get profile path on your platform" -diff --git a/toolkit/xre/nsXREDirProvider.h b/toolkit/xre/nsXREDirProvider.h -index 6b92f3812882..5060b33cdded 100644 ---- a/toolkit/xre/nsXREDirProvider.h -+++ b/toolkit/xre/nsXREDirProvider.h -@@ -48,15 +48,15 @@ class nsXREDirProvider final : public nsIDirectoryServiceProvider2, - - void DoShutdown(); - -- nsresult GetUserAppDataDirectory(nsIFile** aFile) { -+ static nsresult GetUserAppDataDirectory(nsIFile** aFile) { - return GetUserDataDirectory(aFile, false); - } -- nsresult GetUserLocalDataDirectory(nsIFile** aFile) { -+ static nsresult GetUserLocalDataDirectory(nsIFile** aFile) { - return GetUserDataDirectory(aFile, true); - } - - // GetUserDataDirectory gets the profile path from gAppData. -- nsresult GetUserDataDirectory(nsIFile** aFile, bool aLocal); -+ static nsresult GetUserDataDirectory(nsIFile** aFile, bool aLocal); - - /* make sure you clone it, if you need to do stuff to it */ - nsIFile* GetGREDir() { return mGREDir; } -@@ -90,9 +90,9 @@ class nsXREDirProvider final : public nsIDirectoryServiceProvider2, - protected: - nsresult GetFilesInternal(const char* aProperty, - nsISimpleEnumerator** aResult); -- nsresult GetUserDataDirectoryHome(nsIFile** aFile, bool aLocal); -- nsresult GetSysUserExtensionsDirectory(nsIFile** aFile); -- nsresult GetSysUserExtensionsDevDirectory(nsIFile** aFile); -+ static nsresult GetUserDataDirectoryHome(nsIFile** aFile, bool aLocal); -+ static nsresult GetSysUserExtensionsDirectory(nsIFile** aFile); -+ static nsresult GetSysUserExtensionsDevDirectory(nsIFile** aFile); - #if defined(XP_UNIX) || defined(XP_MACOSX) - static nsresult GetSystemExtensionsDirectory(nsIFile** aFile); - #endif -diff --git a/xpcom/io/nsAppFileLocationProvider.cpp b/xpcom/io/nsAppFileLocationProvider.cpp -index 2aa5482f5789..f1491595a8ea 100644 ---- a/xpcom/io/nsAppFileLocationProvider.cpp -+++ b/xpcom/io/nsAppFileLocationProvider.cpp -@@ -14,7 +14,6 @@ - #include "nsISimpleEnumerator.h" - #include "prenv.h" - #include "nsCRT.h" --#include "nsXPCOMPrivate.h" // for XPCOM_FILE_PATH_SEPARATOR - #if defined(MOZ_WIDGET_COCOA) - #include <Carbon/Carbon.h> - #include "nsILocalFileMac.h" -@@ -248,8 +247,9 @@ nsresult nsAppFileLocationProvider::CloneMozBinDirectory(nsIFile** aLocalFile) { - // GetProductDirectory - Gets the directory which contains the application data - // folder - // --// UNIX and WIN : <App Folder>/TorBrowser/Data/Browser --// Mac : <App Folder>/../../TorBrowser/Data/Browser -+// UNIX : ~/.mozilla/ -+// WIN : <Application Data folder on user's machine>\Mozilla -+// Mac : :Documents:Mozilla: - //---------------------------------------------------------------------------------------- - nsresult nsAppFileLocationProvider::GetProductDirectory(nsIFile** aLocalFile, - bool aLocal) { -@@ -261,45 +261,49 @@ nsresult nsAppFileLocationProvider::GetProductDirectory(nsIFile** aLocalFile, - bool exists; - nsCOMPtr<nsIFile> localDir; - -- rv = CloneMozBinDirectory(getter_AddRefs(localDir)); -- NS_ENSURE_SUCCESS(rv, rv); -- -- int levelsToRemove = 1; // In FF21+, bin dir points to browser subdirectory. --#if defined(XP_MACOSX) -- levelsToRemove += 2; --#endif -- while (localDir && (levelsToRemove > 0)) { -- // When crawling up the hierarchy, components named "." do not count. -- nsAutoCString removedName; -- rv = localDir->GetNativeLeafName(removedName); -- NS_ENSURE_SUCCESS(rv, rv); -- bool didRemove = !removedName.Equals("."); -- -- // Remove a directory component. -- nsCOMPtr<nsIFile> parentDir; -- rv = localDir->GetParent(getter_AddRefs(parentDir)); -- NS_ENSURE_SUCCESS(rv, rv); -- localDir = parentDir; -- -- if (didRemove) { -- --levelsToRemove; -- } -+#if defined(MOZ_WIDGET_COCOA) -+ FSRef fsRef; -+ OSType folderType = -+ aLocal ? (OSType)kCachedDataFolderType : (OSType)kDomainLibraryFolderType; -+ OSErr err = ::FSFindFolder(kUserDomain, folderType, kCreateFolder, &fsRef); -+ if (err) { -+ return NS_ERROR_FAILURE; - } -- -+ NS_NewLocalFile(EmptyString(), true, getter_AddRefs(localDir)); - if (!localDir) { - return NS_ERROR_FAILURE; - } -- -- rv = localDir->AppendRelativeNativePath( -- NS_LITERAL_CSTRING("TorBrowser" XPCOM_FILE_PATH_SEPARATOR -- "Data" XPCOM_FILE_PATH_SEPARATOR "Browser")); -- NS_ENSURE_SUCCESS(rv, rv); -- -- if (aLocal) { -- rv = localDir->AppendNative(NS_LITERAL_CSTRING("Caches")); -- NS_ENSURE_SUCCESS(rv, rv); -+ nsCOMPtr<nsILocalFileMac> localDirMac(do_QueryInterface(localDir)); -+ rv = localDirMac->InitWithFSRef(&fsRef); -+ if (NS_FAILED(rv)) { -+ return rv; -+ } -+#elif defined(XP_WIN) -+ nsCOMPtr<nsIProperties> directoryService = -+ do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv); -+ if (NS_FAILED(rv)) { -+ return rv; -+ } -+ const char* prop = aLocal ? NS_WIN_LOCAL_APPDATA_DIR : NS_WIN_APPDATA_DIR; -+ rv = directoryService->Get(prop, NS_GET_IID(nsIFile), -+ getter_AddRefs(localDir)); -+ if (NS_FAILED(rv)) { -+ return rv; -+ } -+#elif defined(XP_UNIX) -+ rv = NS_NewNativeLocalFile(nsDependentCString(PR_GetEnv("HOME")), true, -+ getter_AddRefs(localDir)); -+ if (NS_FAILED(rv)) { -+ return rv; - } -+#else -+#error dont_know_how_to_get_product_dir_on_your_platform -+#endif - -+ rv = localDir->AppendRelativeNativePath(DEFAULT_PRODUCT_DIR); -+ if (NS_FAILED(rv)) { -+ return rv; -+ } - rv = localDir->Exists(&exists); - - if (NS_SUCCEEDED(rv) && !exists) { -@@ -318,6 +322,10 @@ nsresult nsAppFileLocationProvider::GetProductDirectory(nsIFile** aLocalFile, - //---------------------------------------------------------------------------------------- - // GetDefaultUserProfileRoot - Gets the directory which contains each user - // profile dir -+// -+// UNIX : ~/.mozilla/ -+// WIN : <Application Data folder on user's machine>\Mozilla\Profiles -+// Mac : :Documents:Mozilla:Profiles: - //---------------------------------------------------------------------------------------- - nsresult nsAppFileLocationProvider::GetDefaultUserProfileRoot( - nsIFile** aLocalFile, bool aLocal) { -@@ -333,6 +341,23 @@ nsresult nsAppFileLocationProvider::GetDefaultUserProfileRoot( - return rv; - } - -+#if defined(MOZ_WIDGET_COCOA) || defined(XP_WIN) -+ // These 3 platforms share this part of the path - do them as one -+ rv = localDir->AppendRelativeNativePath(NS_LITERAL_CSTRING("Profiles")); -+ if (NS_FAILED(rv)) { -+ return rv; -+ } -+ -+ bool exists; -+ rv = localDir->Exists(&exists); -+ if (NS_SUCCEEDED(rv) && !exists) { -+ rv = localDir->Create(nsIFile::DIRECTORY_TYPE, 0775); -+ } -+ if (NS_FAILED(rv)) { -+ return rv; -+ } -+#endif -+ - localDir.forget(aLocalFile); - - return rv; --- -2.19.2 - diff --git a/www-client/torbrowser/files/torbrowser-60.5.0-Do_not_store_data_in_the_app_bundle.patch b/www-client/torbrowser/files/torbrowser-60.5.0-Do_not_store_data_in_the_app_bundle.patch deleted file mode 100644 index a4e6ae9f..00000000 --- a/www-client/torbrowser/files/torbrowser-60.5.0-Do_not_store_data_in_the_app_bundle.patch +++ /dev/null @@ -1,189 +0,0 @@ -From 0e4105afea7b10cf20ab20cb41b187d7d690ff46 Mon Sep 17 00:00:00 2001 -From: Poncho <poncho@spahan.ch> -Date: Wed, 30 Jan 2019 09:55:25 +0100 -Subject: [PATCH 1/4] Revert "Bug 13252: Do not store data in the app bundle" - -This reverts commit 2ee4d81a2fbcac90996f4f4a99633a0b2d7019bb. ---- - toolkit/xre/nsXREDirProvider.cpp | 43 ++++++++++++--------- - toolkit/xre/nsXREDirProvider.h | 6 --- - xpcom/io/nsAppFileLocationProvider.cpp | 53 +++++++++++++++----------- - 3 files changed, 55 insertions(+), 47 deletions(-) - -diff --git a/toolkit/xre/nsXREDirProvider.cpp b/toolkit/xre/nsXREDirProvider.cpp -index d811da50b63d..dbbaffd2a15f 100644 ---- a/toolkit/xre/nsXREDirProvider.cpp -+++ b/toolkit/xre/nsXREDirProvider.cpp -@@ -44,8 +44,6 @@ - #include "mozilla/Preferences.h" - #include "mozilla/Telemetry.h" - --#include "TorFileUtils.h" -- - #include <stdlib.h> - - #ifdef XP_WIN -@@ -1337,18 +1335,34 @@ nsresult nsXREDirProvider::GetUserDataDirectoryHome(nsIFile** aFile, - NS_ENSURE_ARG_POINTER(aFile); - nsCOMPtr<nsIFile> localDir; - -- nsresult rv = GetTorBrowserUserDataDir(getter_AddRefs(localDir)); -+ nsresult rv = GetAppDir()->Clone(getter_AddRefs(localDir)); - NS_ENSURE_SUCCESS(rv, rv); - --#if !defined(ANDROID) --#ifdef TOR_BROWSER_DATA_OUTSIDE_APP_DIR -- rv = localDir->AppendNative(NS_LITERAL_CSTRING("Browser")); --#else -- rv = localDir->AppendRelativeNativePath( -- NS_LITERAL_CSTRING("Data" XPCOM_FILE_PATH_SEPARATOR "Browser")); -+ int levelsToRemove = 1; // In FF21+, appDir points to browser subdirectory. -+#if defined(XP_MACOSX) -+ levelsToRemove += 2; - #endif -+ while (localDir && (levelsToRemove > 0)) { -+ // When crawling up the hierarchy, components named "." do not count. -+ nsAutoCString removedName; -+ rv = localDir->GetNativeLeafName(removedName); -+ NS_ENSURE_SUCCESS(rv, rv); -+ bool didRemove = !removedName.Equals("."); -+ -+ // Remove a directory component. -+ nsCOMPtr<nsIFile> parentDir; -+ rv = localDir->GetParent(getter_AddRefs(parentDir)); -+ NS_ENSURE_SUCCESS(rv, rv); -+ localDir = parentDir; -+ if (didRemove) --levelsToRemove; -+ } -+ -+ if (!localDir) return NS_ERROR_FAILURE; -+ -+ rv = localDir->AppendRelativeNativePath( -+ NS_LITERAL_CSTRING("TorBrowser" XPCOM_FILE_PATH_SEPARATOR -+ "Data" XPCOM_FILE_PATH_SEPARATOR "Browser")); - NS_ENSURE_SUCCESS(rv, rv); --#endif - - if (aLocal) { - rv = localDir->AppendNative(NS_LITERAL_CSTRING("Caches")); -@@ -1433,15 +1447,6 @@ nsresult nsXREDirProvider::GetUserDataDirectory(nsIFile** aFile, bool aLocal) { - return NS_OK; - } - --nsresult nsXREDirProvider::GetTorBrowserUserDataDir(nsIFile** aFile) { -- NS_ENSURE_ARG_POINTER(aFile); -- nsCOMPtr<nsIFile> exeFile; -- bool per = false; -- nsresult rv = GetFile(XRE_EXECUTABLE_FILE, &per, getter_AddRefs(exeFile)); -- NS_ENSURE_SUCCESS(rv, rv); -- return TorBrowser_GetUserDataDir(exeFile, aFile); --} -- - nsresult nsXREDirProvider::EnsureDirectoryExists(nsIFile* aDirectory) { - bool exists; - nsresult rv = aDirectory->Exists(&exists); -diff --git a/toolkit/xre/nsXREDirProvider.h b/toolkit/xre/nsXREDirProvider.h -index 6fe9d9ecbce5..6b92f3812882 100644 ---- a/toolkit/xre/nsXREDirProvider.h -+++ b/toolkit/xre/nsXREDirProvider.h -@@ -87,12 +87,6 @@ class nsXREDirProvider final : public nsIDirectoryServiceProvider2, - */ - nsresult GetProfileDir(nsIFile** aResult); - -- /** -- * Get the TorBrowser user data directory by calling the -- * TorBrowser_GetUserDataDir() utility function. -- */ -- nsresult GetTorBrowserUserDataDir(nsIFile** aFile); -- - protected: - nsresult GetFilesInternal(const char* aProperty, - nsISimpleEnumerator** aResult); -diff --git a/xpcom/io/nsAppFileLocationProvider.cpp b/xpcom/io/nsAppFileLocationProvider.cpp -index 3906c6590090..2aa5482f5789 100644 ---- a/xpcom/io/nsAppFileLocationProvider.cpp -+++ b/xpcom/io/nsAppFileLocationProvider.cpp -@@ -27,8 +27,6 @@ - #include <sys/param.h> - #endif - --#include "TorFileUtils.h" -- - // WARNING: These hard coded names need to go away. They need to - // come from localizable resources - -@@ -250,14 +248,8 @@ nsresult nsAppFileLocationProvider::CloneMozBinDirectory(nsIFile** aLocalFile) { - // GetProductDirectory - Gets the directory which contains the application data - // folder - // --#ifdef TOR_BROWSER_DATA_OUTSIDE_APP_DIR --// UNIX and WIN : <App Folder>/../TorBrowser-Data/Browser --// Mac : <App Folder>/../../../TorBrowser-Data/Browser OR --// ~/Library/Application Support/TorBrowser-Data/Browser --#else - // UNIX and WIN : <App Folder>/TorBrowser/Data/Browser - // Mac : <App Folder>/../../TorBrowser/Data/Browser --#endif - //---------------------------------------------------------------------------------------- - nsresult nsAppFileLocationProvider::GetProductDirectory(nsIFile** aLocalFile, - bool aLocal) { -@@ -265,25 +257,42 @@ nsresult nsAppFileLocationProvider::GetProductDirectory(nsIFile** aLocalFile, - return NS_ERROR_INVALID_ARG; - } - -- nsresult rv = NS_ERROR_UNEXPECTED; -+ nsresult rv; - bool exists; -- nsCOMPtr<nsIFile> localDir, exeFile; -+ nsCOMPtr<nsIFile> localDir; - -- nsCOMPtr<nsIProperties> directoryService( -- do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv)); -- NS_ENSURE_SUCCESS(rv, rv); -- rv = directoryService->Get(XRE_EXECUTABLE_FILE, NS_GET_IID(nsIFile), -- getter_AddRefs(exeFile)); -- NS_ENSURE_SUCCESS(rv, rv); -- rv = TorBrowser_GetUserDataDir(exeFile, getter_AddRefs(localDir)); -+ rv = CloneMozBinDirectory(getter_AddRefs(localDir)); - NS_ENSURE_SUCCESS(rv, rv); - --#ifdef TOR_BROWSER_DATA_OUTSIDE_APP_DIR -- rv = localDir->AppendNative(NS_LITERAL_CSTRING("Browser")); --#else -- rv = localDir->AppendRelativeNativePath( -- NS_LITERAL_CSTRING("Data" XPCOM_FILE_PATH_SEPARATOR "Browser")); -+ int levelsToRemove = 1; // In FF21+, bin dir points to browser subdirectory. -+#if defined(XP_MACOSX) -+ levelsToRemove += 2; - #endif -+ while (localDir && (levelsToRemove > 0)) { -+ // When crawling up the hierarchy, components named "." do not count. -+ nsAutoCString removedName; -+ rv = localDir->GetNativeLeafName(removedName); -+ NS_ENSURE_SUCCESS(rv, rv); -+ bool didRemove = !removedName.Equals("."); -+ -+ // Remove a directory component. -+ nsCOMPtr<nsIFile> parentDir; -+ rv = localDir->GetParent(getter_AddRefs(parentDir)); -+ NS_ENSURE_SUCCESS(rv, rv); -+ localDir = parentDir; -+ -+ if (didRemove) { -+ --levelsToRemove; -+ } -+ } -+ -+ if (!localDir) { -+ return NS_ERROR_FAILURE; -+ } -+ -+ rv = localDir->AppendRelativeNativePath( -+ NS_LITERAL_CSTRING("TorBrowser" XPCOM_FILE_PATH_SEPARATOR -+ "Data" XPCOM_FILE_PATH_SEPARATOR "Browser")); - NS_ENSURE_SUCCESS(rv, rv); - - if (aLocal) { --- -2.19.2 - diff --git a/www-client/torbrowser/metadata.xml b/www-client/torbrowser/metadata.xml deleted file mode 100644 index 6c812064..00000000 --- a/www-client/torbrowser/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="person"> - <email>4nykey@gmail.com</email> - </maintainer> - <use> - <flag name="clang">Use Clang compiler instead of GCC</flag> - <flag name="custom-optimization">Fine-tune custom compiler - optimizations (-Os, -O0, -O1, -O2, -O3)</flag> - <flag name="hwaccel">Use hardware-accelerated rendering</flag> - <flag name="screenshot">Allow to disable screenshot extension in global profile</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> - </use> -</pkgmetadata> diff --git a/www-client/torbrowser/torbrowser-60.6.1.8.0.8.1.1-r2.ebuild b/www-client/torbrowser/torbrowser-60.6.1.8.0.8.1.1-r2.ebuild deleted file mode 100644 index 68989d08..00000000 --- a/www-client/torbrowser/torbrowser-60.6.1.8.0.8.1.1-r2.ebuild +++ /dev/null @@ -1,365 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -WANT_AUTOCONF="2.1" - -PYTHON_COMPAT=( python3_{5,6,7} ) -PYTHON_REQ_USE='ncurses,sqlite,ssl,threads(+)' -MOZCONFIG_OPTIONAL_WIFI=1 - -LLVM_MAX_SLOT=8 - -inherit check-reqs desktop flag-o-matic toolchain-funcs eutils gnome2-utils \ - llvm mozconfig-v6.${PV%%.*} pax-utils xdg-utils autotools -inherit eapi7-ver - -MOZ_PV="$(ver_cut 1-3)esr" -# https://dist.torproject.org/torbrowser -TOR_PV="$(ver_cut 4-6)" -if [[ -z ${PV%%*_alpha} ]]; then - TOR_PV="$(ver_rs 2 a ${TOR_PV})" -else - KEYWORDS="~amd64 ~x86" -fi -TOR_PV="${TOR_PV%.0}" -# https://gitweb.torproject.org/tor-browser.git/refs/tags -GIT_TAG="$(ver_cut 4-5)-$(ver_cut 7-8)" -GIT_TAG="tor-browser-${MOZ_PV}-$(ver_rs 3 '-build' ${GIT_TAG})" - -DESCRIPTION="The Tor Browser" -HOMEPAGE=" - https://www.torproject.org/projects/torbrowser.html - https://gitweb.torproject.org/tor-browser.git" - -SLOT="0" -# BSD license applies to torproject-related code like the patches -# icons are under CCPL-Attribution-3.0 -LICENSE="BSD CC-BY-3.0 MPL-2.0 GPL-2 LGPL-2.1" -IUSE="hardened hwaccel jack -screenshot selinux test" - -SRC_URI="mirror://tor/${PN}/${TOR_PV}" -PATCH="firefox-${PV%%.*}.6-patches-05" -PATCH=( https://dev.gentoo.org/~{anarchy,axs,polynomial-c}/mozilla/patchsets/${PATCH}.tar.xz ) -SRC_URI=" - https://gitweb.torproject.org/tor-browser.git/snapshot/${GIT_TAG}.tar.gz - -> ${GIT_TAG}.tar.gz - x86? ( - ${SRC_URI}/tor-browser-linux32-${TOR_PV}_en-US.tar.xz - ) - amd64? ( - ${SRC_URI}/tor-browser-linux64-${TOR_PV}_en-US.tar.xz - ) - ${PATCH[@]} -" -RESTRICT="primaryuri" - -ASM_DEPEND=">=dev-lang/yasm-1.1" - -RDEPEND=" - >=dev-libs/nss-3.36.7 - >=dev-libs/nspr-4.19 - >=net-vpn/tor-0.3.3.9 - system-icu? ( >=dev-libs/icu-60.2 ) - jack? ( virtual/jack ) - selinux? ( sec-policy/selinux-mozilla )" - -DEPEND=" - ${RDEPEND} - amd64? ( ${ASM_DEPEND} virtual/opengl ) - x86? ( ${ASM_DEPEND} virtual/opengl )" - -S="${WORKDIR}/${GIT_TAG}" - -QA_PRESTRIPPED="usr/lib*/${PN}/${PN}" - -BUILD_OBJ_DIR="${WORKDIR}/torbrowser-build" - -llvm_check_deps() { - if ! has_version "sys-devel/clang:${LLVM_SLOT}" ; then - ewarn "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." - return 1 - fi - - if use clang ; then - if ! has_version "=sys-devel/lld-${LLVM_SLOT}*" ; then - ewarn "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." - return 1 - fi - fi - - einfo "Will use LLVM slot ${LLVM_SLOT}!" -} - -pkg_setup() { - moz_pkgsetup - - # 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 - - addpredict /proc/self/oom_score_adj - - llvm_pkg_setup -} - -pkg_pretend() { - # Ensure we have enough disk space to compile - CHECKREQS_DISK_BUILD="4G" - - check-reqs_pkg_setup -} - -src_prepare() { - local PATCHES=( - "${WORKDIR}"/firefox - - # Revert "Change the default Firefox profile directory to be TBB-relative" - "${FILESDIR}"/torbrowser-60.5.0-Do_not_store_data_in_the_app_bundle.patch - "${FILESDIR}"/torbrowser-60.5.0-Change_the_default_Firefox_profile_directory.patch - ) - - # 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 - - # Ensure that our plugins dir is enabled as default - sed -i -e "s:/usr/lib/mozilla/plugins:/usr/lib/nsbrowser/plugins:" \ - "${S}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 32bit!" - sed -i -e "s:/usr/lib64/mozilla/plugins:/usr/lib64/nsbrowser/plugins:" \ - "${S}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 64bit!" - - # 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 - - default - - # 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" - - # 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 - - #################################### - # - # mozconfig, CFLAGS and CXXFLAGS setup - # - #################################### - - mozconfig_init - mozconfig_config - - # enable JACK, bug 600002 - mozconfig_use_enable jack - - # Add full relro support for hardened - if use hardened; then - append-ldflags "-Wl,-z,relro,-z,now" - mozconfig_use_enable hardened hardening - 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_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=1423822 - 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="${EPREFIX}"/usr/bin/xargs" >> "${S}"/.mozconfig - - # Use .mozconfig settings from torbrowser (setting this here since it gets overwritten by mozcoreconf-v6.eclass) - # see https://gitweb.torproject.org/tor-browser.git/tree/.mozconfig?h=tor-browser-60.2.0esr-8.0-1 - echo "mk_add_options MOZ_APP_DISPLAYNAME=\"Tor Browser\"" >> "${S}"/.mozconfig - echo "mk_add_options MOZILLA_OFFICIAL=1" >> "${S}"/.mozconfig - echo "mk_add_options BUILD_OFFICIAL=1" >> "${S}"/.mozconfig - mozconfig_annotate 'torbrowser' --enable-official-branding - mozconfig_annotate 'torbrowser' --disable-webrtc - mozconfig_annotate 'torbrowser' --disable-eme - mozconfig_annotate 'torbrowser' --enable-proxy-bypass-protection - - # Rename the binary and set the profile location - mozconfig_annotate 'torbrowser' --with-app-name="${PN}" - mozconfig_annotate 'torbrowser' --with-app-basename="${PN}" - - # see https://gitweb.torproject.org/tor-browser.git/tree/old-configure.in?h=tor-browser-60.2.0esr-8.0-1#n3205 - mozconfig_annotate 'torbrowser' --with-tor-browser-version="${TOR_PV}" - mozconfig_annotate 'torbrowser' --disable-tor-browser-update - - echo "mk_add_options MOZ_OBJDIR=${BUILD_OBJ_DIR}" >> "${S}"/.mozconfig - echo "mk_add_options XARGS="${EPREFIX}"/usr/bin/xargs" >> "${S}"/.mozconfig - - # Default mozilla_five_home no longer valid option - sed '/with-default-mozilla-five-home=/d' -i "${S}"/.mozconfig - - # Finalize and report settings - mozconfig_final - - # workaround for funky/broken upstream configure... - SHELL="${SHELL:-${EPREFIX}/bin/bash}" MOZ_NOSPAM=1 \ - ./mach configure || die -} - -src_compile() { - MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX}/bin/bash}" MOZ_NOSPAM=1 \ - ./mach build --verbose || die -} - -src_install() { - local profile_dir="${WORKDIR}/tor-browser_en-US/Browser/TorBrowser/Data/Browser/profile.default" - cd "${BUILD_OBJ_DIR}" || die - - cat "${profile_dir}"/bookmarks.html > \ - dist/bin/browser/chrome/en-US/locale/browser/bookmarks.html - - # Pax mark xpcshell for hardened support, only used for startupcache creation. - pax-mark m "${BUILD_OBJ_DIR}"/dist/bin/xpcshell - - touch "${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \ - || die - - mozconfig_install_prefs \ - "${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" - - # Augment this with hwaccel prefs - if use hwaccel ; then - printf 'pref("%s", true);\npref("%s", true);\n' \ - layers.acceleration.force-enabled webgl.force-enabled >> \ - "${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \ - || die - fi - - if ! use screenshot; then - echo "pref(\"extensions.screenshots.disabled\", true);" >> \ - "${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \ - || die - fi - - # Must ensure we use bundled nss/nspr during signing and not system - cd "${S}" - MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX}/bin/bash}" MOZ_NOSPAM=1 \ - DESTDIR="${D}" ./mach install || die - - # Install icons and .desktop for menu entry - local size icon_path name - icon_path="${S}/browser/branding/official" - name="Tor Browser" - for size in 16 32 48 64 128 256; do - newicon -s ${size} "${icon_path}/default${size}.png" ${PN}.png - done - newicon "${icon_path}/default48.png" "${icon}.png" - newmenu "${FILESDIR}/icon/${PN}.desktop" "${PN}.desktop" - sed -i -e "s:@NAME@:${name}:" -e "s:@ICON@:${PN}:" \ - "${ED}/usr/share/applications/${PN}.desktop" || die - - # Add StartupNotify=true bug 237317 - if use startup-notification ; then - echo "StartupNotify=true"\ - >> "${ED}/usr/share/applications/${PN}.desktop" \ - || die - fi - - # Required in order to use plugins and even run torbrowser on hardened. - pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/{${PN},plugin-container} - - # Profile without the tor-launcher extension - # see: https://trac.torproject.org/projects/tor/ticket/10160 - rm "${profile_dir}/extensions/tor-launcher@torproject.org.xpi" || die \ - "Failed to remove torlauncher extension" - - insinto ${MOZILLA_FIVE_HOME}/browser - doins -r "${profile_dir}"/extensions - - dodoc "${WORKDIR}/tor-browser_en-US/Browser/TorBrowser/Docs/ChangeLog.txt" -} - -pkg_preinst() { - gnome2_icon_savelist - - # 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() { - ewarn "This patched firefox build is _NOT_ recommended by Tor upstream but uses" - ewarn "the exact same sources. Use this only if you know what you are doing!" - elog "Torbrowser uses port 9150 to connect to Tor. You can change the port" - elog "in the connection settings to match your setup." - - gnome2_icon_cache_update - xdg_desktop_database_update - - 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() { - gnome2_icon_cache_update - xdg_desktop_database_update -} |