From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1RSW7a-00079x-CS for garchives@archives.gentoo.org; Mon, 21 Nov 2011 15:49:26 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5B00F21C061; Mon, 21 Nov 2011 15:49:11 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 108A421C061 for ; Mon, 21 Nov 2011 15:49:10 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 65DE96443B for ; Mon, 21 Nov 2011 15:49:10 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id BA70280042 for ; Mon, 21 Nov 2011 15:49:09 +0000 (UTC) From: "Jory Pratt" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jory Pratt" Message-ID: <20e8c1eae007f22dc876cf17db1e71d0020d282e.anarchy@gentoo> Subject: [gentoo-commits] proj/mozilla:master commit in: eclass/ X-VCS-Repository: proj/mozilla X-VCS-Files: eclass/mozcoreconf-2.eclass X-VCS-Directories: eclass/ X-VCS-Committer: anarchy X-VCS-Committer-Name: Jory Pratt X-VCS-Revision: 20e8c1eae007f22dc876cf17db1e71d0020d282e Date: Mon, 21 Nov 2011 15:49:09 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: b9d0afc4-e04c-4919-b52c-7ce80975bd24 X-Archives-Hash: 77b4a1f855376c1a44f0a71fdf4b0877 commit: 20e8c1eae007f22dc876cf17db1e71d0020d282e Author: Jory A. Pratt gentoo org> AuthorDate: Mon Nov 21 15:48:09 2011 +0000 Commit: Jory Pratt gentoo org> CommitDate: Mon Nov 21 15:48:09 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/mozilla.git;a= =3Dcommit;h=3D20e8c1ea Fix share_plugins_dir to work with -bin and seamonkey properly --- eclass/mozcoreconf-2.eclass | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/eclass/mozcoreconf-2.eclass b/eclass/mozcoreconf-2.eclass index 27bd045..4930532 100644 --- a/eclass/mozcoreconf-2.eclass +++ b/eclass/mozcoreconf-2.eclass @@ -282,5 +282,16 @@ mozconfig_final() { =20 # ${MOZILLA_FIVE_HOME} must be defined in src_install to support share_plugins_dir() { - dosym ../nsbrowser/plugins "${MOZILLA_FIVE_HOME}"/plugins || die + if [[ ${PN} =3D=3D seamonkey ]] ; then + rm -rf "${D}"${MOZILLA_FIVE_HOME}/plugins \ + || die "failed to remove existing plugins dir" + fi + + if [[ ${PN} =3D=3D *-bin ]] ; then + PLUGIN_BASE_PATH=3D"/usr/$(get_libdir)" + else + PLUGIN_BASE_PATH=3D".." + fi + + dosym "${PLUGIN_BASE_PATH}/nsbrowser/plugins" "${MOZILLA_FIVE_HOME}/plu= gins" }