From ae6da0f3d8e25c5def39bfd0c8216a337154abfd Mon Sep 17 00:00:00 2001 From: Lars Wendler Date: Wed, 23 Nov 2011 23:01:00 +0000 Subject: [PATCH] Use nsplugins.eclass to handle the plugins directory Package-Manager: portage-2.2.0_alpha77/cvs/Linux x86_64 --- www-client/seamonkey-bin/ChangeLog | 5 ++++- www-client/seamonkey-bin/seamonkey-bin-2.5.ebuild | 8 ++++---- www-client/seamonkey/ChangeLog | 5 ++++- www-client/seamonkey/seamonkey-2.5.ebuild | 10 ++++------ 4 files changed, 16 insertions(+), 12 deletions(-) diff --git a/www-client/seamonkey-bin/ChangeLog b/www-client/seamonkey-bin/ChangeLog index f025c6095fd6..0ae385ab485e 100644 --- a/www-client/seamonkey-bin/ChangeLog +++ b/www-client/seamonkey-bin/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for www-client/seamonkey-bin # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey-bin/ChangeLog,v 1.107 2011/11/23 08:51:19 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey-bin/ChangeLog,v 1.108 2011/11/23 23:01:00 polynomial-c Exp $ + + 23 Nov 2011; Lars Wendler seamonkey-bin-2.5.ebuild: + Use nsplugins.eclass to handle the plugins directory. *seamonkey-bin-2.5 (23 Nov 2011) diff --git a/www-client/seamonkey-bin/seamonkey-bin-2.5.ebuild b/www-client/seamonkey-bin/seamonkey-bin-2.5.ebuild index 28825189a6a9..46da44f2d618 100644 --- a/www-client/seamonkey-bin/seamonkey-bin-2.5.ebuild +++ b/www-client/seamonkey-bin/seamonkey-bin-2.5.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey-bin/seamonkey-bin-2.5.ebuild,v 1.1 2011/11/23 08:51:19 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey-bin/seamonkey-bin-2.5.ebuild,v 1.2 2011/11/23 23:01:00 polynomial-c Exp $ EAPI="4" -inherit eutils mozilla-launcher multilib mozextension pax-utils +inherit eutils mozilla-launcher multilib mozextension pax-utils nsplugins LANGS=(be ca cs de en-GB en-US es-AR es-ES fi fr gl hu it ja lt nb-NO nl pl pt-PT ru sk sv-SE tr zh-CN) @@ -136,8 +136,8 @@ EOF insinto /etc/revdep-rebuild doins "${FILESDIR}"/10${PN} || die - ln -sfn "/usr/$(get_libdir)/nsbrowser/plugins" \ - "${D}${MOZILLA_FIVE_HOME}/plugins" || die + # Handle plugins dir through nsplugins.eclass + share_plugins_dir # Required in order to use plugins and even run seamonkey on hardened. pax-mark m "${ED}"/${MOZILLA_FIVE_HOME}/{seamonkey,seamonkey-bin,plugin-container} diff --git a/www-client/seamonkey/ChangeLog b/www-client/seamonkey/ChangeLog index f49fc8800d39..fdce50f43e6c 100644 --- a/www-client/seamonkey/ChangeLog +++ b/www-client/seamonkey/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for www-client/seamonkey # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/ChangeLog,v 1.345 2011/11/23 08:01:27 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/ChangeLog,v 1.346 2011/11/23 22:59:52 polynomial-c Exp $ + + 23 Nov 2011; Lars Wendler seamonkey-2.5.ebuild: + Use nsplugins.eclass to handle the plugins directory. *seamonkey-2.5 (23 Nov 2011) diff --git a/www-client/seamonkey/seamonkey-2.5.ebuild b/www-client/seamonkey/seamonkey-2.5.ebuild index 4fd6064e2e90..c2951556b3c0 100644 --- a/www-client/seamonkey/seamonkey-2.5.ebuild +++ b/www-client/seamonkey/seamonkey-2.5.ebuild @@ -1,11 +1,11 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/seamonkey-2.5.ebuild,v 1.1 2011/11/23 08:01:27 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/seamonkey-2.5.ebuild,v 1.2 2011/11/23 22:59:52 polynomial-c Exp $ EAPI="3" WANT_AUTOCONF="2.1" -inherit flag-o-matic toolchain-funcs eutils mozconfig-3 multilib pax-utils fdo-mime autotools mozextension versionator python +inherit flag-o-matic toolchain-funcs eutils mozconfig-3 multilib pax-utils fdo-mime autotools mozextension versionator python nsplugins PATCH="${PN}-2.5-patches-01" EMVER="1.3.3" @@ -322,10 +322,8 @@ src_install() { > "${D}"${MOZILLA_FIVE_HOME}/defaults/pref/all-gentoo.js \ || die - # Plugins dir - rm -rf "${D}"${MOZILLA_FIVE_HOME}/plugins || die "failed to remove existing plugins dir" - dosym ../nsbrowser/plugins "${MOZILLA_FIVE_HOME}"/plugins || die - #share_plugins_dir + # Handle plugins dir through nsplugins.eclass + share_plugins_dir doman "${S}"/suite/app/${PN}.1 || die } -- 2.26.2