| 1 |
commit: f96d4ac794cdc1a5cf6a20ef57c22e6e9234beaf |
| 2 |
Author: Jory Pratt <anarchy <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Apr 18 13:07:57 2019 +0000 |
| 4 |
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Apr 18 13:07:57 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=f96d4ac7 |
| 7 |
|
| 8 |
www-client/torbrowser: use system nss/nspr misc other cleanup |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.63, Repoman-2.3.12 |
| 11 |
Signed-off-by: Jory Pratt <anarchy <AT> gentoo.org> |
| 12 |
|
| 13 |
www-client/torbrowser/torbrowser-60.6.1.8.0.8.1.1-r1.ebuild | 13 ++----------- |
| 14 |
1 file changed, 2 insertions(+), 11 deletions(-) |
| 15 |
|
| 16 |
diff --git a/www-client/torbrowser/torbrowser-60.6.1.8.0.8.1.1-r1.ebuild b/www-client/torbrowser/torbrowser-60.6.1.8.0.8.1.1-r1.ebuild |
| 17 |
index 0690db2..bfe9bcb 100644 |
| 18 |
--- a/www-client/torbrowser/torbrowser-60.6.1.8.0.8.1.1-r1.ebuild |
| 19 |
+++ b/www-client/torbrowser/torbrowser-60.6.1.8.0.8.1.1-r1.ebuild |
| 20 |
@@ -57,6 +57,8 @@ RESTRICT="primaryuri" |
| 21 |
ASM_DEPEND=">=dev-lang/yasm-1.1" |
| 22 |
|
| 23 |
RDEPEND=" |
| 24 |
+ >=dev-libs/nss-3.36.7 |
| 25 |
+ >=dev-libs/nspr-4.19 |
| 26 |
>=net-vpn/tor-0.3.3.9 |
| 27 |
system-icu? ( >=dev-libs/icu-60.2 ) |
| 28 |
jack? ( virtual/jack ) |
| 29 |
@@ -236,11 +238,6 @@ src_configure() { |
| 30 |
mozconfig_annotate 'torbrowser' --with-tor-browser-version="${TOR_PV}" |
| 31 |
mozconfig_annotate 'torbrowser' --disable-tor-browser-update |
| 32 |
|
| 33 |
- # torbrowser uses a patched nss library |
| 34 |
- # see https://gitweb.torproject.org/tor-browser.git/log/security/nss?h=tor-browser-60.2.0esr-8.0-1-build1 |
| 35 |
- mozconfig_annotate 'torbrowser' --without-system-nspr |
| 36 |
- mozconfig_annotate 'torbrowser' --without-system-nss |
| 37 |
- |
| 38 |
echo "mk_add_options MOZ_OBJDIR=${BUILD_OBJ_DIR}" >> "${S}"/.mozconfig |
| 39 |
echo "mk_add_options XARGS="${EPREFIX}"/usr/bin/xargs" >> "${S}"/.mozconfig |
| 40 |
|
| 41 |
@@ -262,7 +259,6 @@ src_compile() { |
| 42 |
|
| 43 |
src_install() { |
| 44 |
cd "${BUILD_OBJ_DIR}" || die |
| 45 |
- export LD_LIBRARY_PATH="${BUILD_OBJ_DIR}/dist/bin" |
| 46 |
|
| 47 |
# Pax mark xpcshell for hardened support, only used for startupcache creation. |
| 48 |
pax-mark m "${BUILD_OBJ_DIR}"/dist/bin/xpcshell |
| 49 |
@@ -319,11 +315,6 @@ src_install() { |
| 50 |
dodoc "${FILESDIR}/99torbrowser.example" |
| 51 |
|
| 52 |
dodoc "${WORKDIR}/tor-browser_en-US/Browser/TorBrowser/Docs/ChangeLog.txt" |
| 53 |
- |
| 54 |
- # Profile without the tor-launcher extension |
| 55 |
- # see: https://trac.torproject.org/projects/tor/ticket/10160 |
| 56 |
- rm "${MOZILLA_FIVE_HOME}/defaults/profile/extensions/tor-launcher@××××××××××××××.xpi" || die \ |
| 57 |
- "Failed to remove torlauncher extension" |
| 58 |
} |
| 59 |
|
| 60 |
pkg_preinst() { |
Archives