From bf0c406ee9c565b68c96386cbe762dc80d6b5d5c Mon Sep 17 00:00:00 2001
From: Jory Pratt <anarchy@gentoo.org>
Date: Sat, 4 Dec 2010 14:43:32 +0000
Subject: Fix plugin installation, bug #347155

(Portage version: 2.2.0_alpha6/cvs/Linux x86_64)
---
 www-plugins/mozplugger/ChangeLog                        |  6 +++++-
 .../files/mozplugger-1.14.2-fix-nsplugin-install.patch  | 17 +++++++++++++++++
 www-plugins/mozplugger/mozplugger-1.14.2.ebuild         |  5 +++--
 3 files changed, 25 insertions(+), 3 deletions(-)
 create mode 100644 www-plugins/mozplugger/files/mozplugger-1.14.2-fix-nsplugin-install.patch

(limited to 'www-plugins')

diff --git a/www-plugins/mozplugger/ChangeLog b/www-plugins/mozplugger/ChangeLog
index 645ac4e14472..7f64621cb8e3 100644
--- a/www-plugins/mozplugger/ChangeLog
+++ b/www-plugins/mozplugger/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-plugins/mozplugger
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/mozplugger/ChangeLog,v 1.8 2010/11/09 15:40:14 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/mozplugger/ChangeLog,v 1.9 2010/12/04 14:43:32 anarchy Exp $
+
+  04 Dec 2010; Jory A. Pratt <anarchy@gentoo.org> mozplugger-1.14.2.ebuild,
+  +files/mozplugger-1.14.2-fix-nsplugin-install.patch:
+  Fix plugin installation, bug #347155
 
 *mozplugger-1.14.2 (09 Nov 2010)
 
diff --git a/www-plugins/mozplugger/files/mozplugger-1.14.2-fix-nsplugin-install.patch b/www-plugins/mozplugger/files/mozplugger-1.14.2-fix-nsplugin-install.patch
new file mode 100644
index 000000000000..9d4f4038a5d5
--- /dev/null
+++ b/www-plugins/mozplugger/files/mozplugger-1.14.2-fix-nsplugin-install.patch
@@ -0,0 +1,17 @@
+--- a/Makefile	2010-12-04 08:29:21.120000001 -0600
++++ b/Makefile	2010-12-04 08:29:47.292000001 -0600
+@@ -202,13 +202,13 @@
+ 
+ install:
+ 	-@mkdir -p $(root)$(prefix)/bin
+-	-@mkdir -p $(root)$(prefix)$(libprefix)/mozilla/plugins
++	-@mkdir -p $(root)$(prefix)$(libprefix)/nsplugin/plugins
+ 	-@mkdir -p $(root)$(prefix)/share/man/man7
+ 	-@mkdir -p $(root)/etc
+ 	cp mozplugger-helper $(root)$(prefix)/bin/
+ 	cp mozplugger-controller $(root)$(prefix)/bin/
+ 	cp mozplugger-linker $(root)$(prefix)/bin/
+-	cp mozplugger.so $(root)$(prefix)$(libprefix)/mozilla/plugins/
++	cp mozplugger.so $(root)$(prefix)$(libprefix)/nsplugin/plugins/
+ 	cp mozpluggerrc $(root)/etc/
+ 	cp mozplugger.7 $(root)$(prefix)/share/man/man7/
diff --git a/www-plugins/mozplugger/mozplugger-1.14.2.ebuild b/www-plugins/mozplugger/mozplugger-1.14.2.ebuild
index 808a697031fd..953eea32f523 100644
--- a/www-plugins/mozplugger/mozplugger-1.14.2.ebuild
+++ b/www-plugins/mozplugger/mozplugger-1.14.2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/mozplugger/mozplugger-1.14.2.ebuild,v 1.1 2010/11/09 15:40:14 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/mozplugger/mozplugger-1.14.2.ebuild,v 1.2 2010/12/04 14:43:32 anarchy Exp $
 
 EAPI=2
-inherit nsplugins multilib toolchain-funcs
+inherit eutils multilib toolchain-funcs
 
 DESCRIPTION="Configurable browser plugin to launch streaming media players."
 SRC_URI="http://mozplugger.mozdev.org/files/${P}.tar.gz"
@@ -19,6 +19,7 @@ DEPEND="${RDEPEND}
 	net-libs/xulrunner:1.9"
 
 src_prepare() {
+	epatch "${FILESDIR}/${PN}-1.14.2-fix-nsplugin-install.patch"
 	sed -i "s:libprefix=.*:libprefix=/$(get_libdir):" Makefile
 }
 
-- 
cgit v1.2.3-65-gdbad