Fix plugin installation, bug #347155

Package-Manager: portage-2.2.0_alpha6/cvs/Linux x86_64

4 files changed, 28 insertions, 5 deletions

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/Manifest b/www-plugins/mozplugger/Manifest
index 8e55bd166cb5..94755bb65ac6 100644
--- a/www-plugins/mozplugger/Manifest
+++ b/www-plugins/mozplugger/Manifest
@@ -1,8 +1,9 @@
+AUX mozplugger-1.14.2-fix-nsplugin-install.patch 709 RMD160 f38e49d6db14f410d9e139619e56b8fd7be8fccd SHA1 77d7a579a6d4c2fca3a928eb9e80f658f00a400c SHA256 b572bc8641c8948def3b637e7e31bccae378ea4619e15d263f7a6e0f5736b9ce
 DIST mozplugger-1.13.2.tar.gz 89003 RMD160 3ae799df4ec58c0948760b976f5aa9872a3e93ec SHA1 704269a3afbdb173caa2e00c7e274dc65b009f41 SHA256 e7b1d6f1a0a22340dae1ba57c29a512b34d39bab55be4b0e32fb0cec872825b2
 DIST mozplugger-1.14.0.tar.gz 92164 RMD160 a787a1d0428fe375217ae9c7e0b2bb5e56d0ddde SHA1 ac53fefe559d96aec2aecc67e9f3831b4ac3d263 SHA256 90a5d458183094f1fa83199ec4e847680954e109b264245ebbbada288ac31351
 DIST mozplugger-1.14.2.tar.gz 93406 RMD160 563ef13b82745de60fdd2c6cc1e15f7fd8832982 SHA1 5a7b82a3c0d0647a674330cfb5a768bace71d6b9 SHA256 ee768a2c04898da9525200f601ec1f1adeeb5116a0adecded0db6796ecc07b3d
 EBUILD mozplugger-1.13.2.ebuild 885 RMD160 5fa1fa2d78b4d2a719f68bc467b7d71e19d26a25 SHA1 ec63c57f61d7bda2e3c58d4c31bed806c21e2b5b SHA256 f0259e21dfd0314270d811044d37f36c28a98461472b5acefd0cb149ca1ad4c3
 EBUILD mozplugger-1.14.0-r1.ebuild 935 RMD160 55ddcbeabd30d22cc2117e59e587a6c8f5596a9a SHA1 f5706e085cd830a1002f56e79619bc25f7b919b0 SHA256 9b100d41018e49df18c4cf0fa8112bb49a7227e0fb719d478cb8355a70e42d86
-EBUILD mozplugger-1.14.2.ebuild 934 RMD160 97db0f55a1b304ee1d48a9c9ace9c66f8489f4d2 SHA1 a5676c4f088349b78ab801990aafe28695c0fed6 SHA256 478f04f7198f0a4da64814a854a4e7759a37f9897da931b4cefb1549d97e9b95
-MISC ChangeLog 4946 RMD160 5cdc20e33062402cd775fbc134f69a08c020e8a6 SHA1 07c4a711a60e34f1654ebec4ddf9d0eb12a6ac96 SHA256 210cf41be82e3b3c7f2168bc5d810bbb9cebc863e4d8eee0114c8fc701174b09
+EBUILD mozplugger-1.14.2.ebuild 990 RMD160 20ad7db37524269fadd0624013aa17fa52d40770 SHA1 bd75b2f5cfbca9337e504ebb60b2b53a6cf95ad1 SHA256 c7bd454545a605499498db3ae8f79ea0573528140d5bc43f06a260ea6399ab19
+MISC ChangeLog 5114 RMD160 8512685c90f3a780b78b15b392e119173be50633 SHA1 47336a2670a04b0d3c6ac011575702e30cf948a9 SHA256 c8496d54a546a6aefa08becf02830c80075bcac41c17f1a3c10410db818286da
 MISC metadata.xml 252 RMD160 63f47ae817f26b798f5055b32bd87d4e87c79333 SHA1 5e23c4c1b0bedce4cc2784c72f83e1a9aa23f9cb SHA256 04c5450ecf2dc062c8c50cbdcba6c5e2bafe0be3aa36bb78a0e3bd765250aaac
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
 }