[gentoo-commits] proj/mozilla:master commit in: www-client/seamonkey/

[Ian Stakenvicius]

commit:     fb87c85a3c1d903d6b82ef400f2df51b86bd59ec
Author:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
AuthorDate: Thu Aug  4 20:47:09 2016 +0000
Commit:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
CommitDate: Thu Aug  4 20:47:09 2016 +0000
URL:        https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=fb87c85a

Revert "seamonkey-2.42.2.0 - forced LD_DEBUG output on xpcshell call, for LD_LIBRARY_PATH related install failure"

This reverts commit d3bb7a04b04600e1531e82bc9623d05ba05e5651.

 www-client/seamonkey/seamonkey-2.42.2.0_p0.ebuild | 20 +-------------------
 1 file changed, 1 insertion(+), 19 deletions(-)

diff --git a/www-client/seamonkey/seamonkey-2.42.2.0_p0.ebuild b/www-client/seamonkey/seamonkey-2.42.2.0_p0.ebuild
index 0da02e4..5a752e1 100644
--- a/www-client/seamonkey/seamonkey-2.42.2.0_p0.ebuild
+++ b/www-client/seamonkey/seamonkey-2.42.2.0_p0.ebuild
@@ -298,29 +298,11 @@ src_install() {
 	if ! use gmp-autoupdate ; then
 		for plugin in gmp-gmpopenh264 ; do
 			echo "pref(\"media.${plugin}.autoupdate\", false);" >> \
-				"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
+				"${S}/${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
 				|| dir
 		done
 	fi
 
-	# DEBUGGING xpcshell libxul error
-	cat <<EOF >"${BUILD_OBJ_DIR}"/dist/bin/xpcshell.sh
-#!/bin/bash
-echo "****** XPCSHELL CALLING ENVIRONMENT:"
-env
-echo "****** STAT XPCSHELL:"
-stat ${BUILD_OBJ_DIR}/dist/bin/xpcshell
-echo "****** MOUNTINFO:"
-cat /proc/self/mountinfo
-echo "****** XPCSHELL COMMAND CALL WITH LD_DEBUG:"
-export LD_DEBUG=all
-exec ${BUILD_OBJ_DIR}/dist/bin/xpcshell "\$@"
-EOF
-	chmod +x "${BUILD_OBJ_DIR}"/dist/bin/xpcshell.sh
-	sed -i -e '/launcher.launch/s/xpcshell/xpcshell.sh/' \
-		"${S}"/mozilla/toolkit/mozapps/installer/packager.py || die
-
-
 	MOZ_MAKE_FLAGS="${MAKEOPTS}" \
 	emake DESTDIR="${D}" install
 	cp "${FILESDIR}"/${PN}.desktop "${T}" || die