Remove nsplugin support as it does not work at all.

(Portage version: 2.2.0_alpha114/cvs/Linux x86_64)

3 files changed, 18 insertions, 24 deletions

diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index 9387db9065ee..5e039f841647 100644
--- a/app-office/libreoffice/ChangeLog
+++ b/app-office/libreoffice/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/libreoffice
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.342 2012/06/27 09:11:32 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.343 2012/07/02 10:38:32 scarabeus Exp $
+
+  02 Jul 2012; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-3.6.9999.ebuild,
+  libreoffice-9999-r2.ebuild:
+  Remove nsplugin support as it does not work at all.
 
 *libreoffice-3.5.5.2 (27 Jun 2012)
 
diff --git a/app-office/libreoffice/libreoffice-3.6.9999.ebuild b/app-office/libreoffice/libreoffice-3.6.9999.ebuild
index 7d55353ae0a1..c50037309f29 100644
--- a/app-office/libreoffice/libreoffice-3.6.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-3.6.9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.6.9999.ebuild,v 1.9 2012/06/24 21:50:55 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.6.9999.ebuild,v 1.10 2012/07/02 10:38:32 scarabeus Exp $
 
 EAPI=4
 
@@ -27,7 +27,7 @@ BRANDING="${PN}-branding-gentoo-0.6.tar.xz"
 # PATCHSET="${P}-patchset-01.tar.xz"
 
 [[ ${PV} == *9999* ]] && SCM_ECLASS="git-2"
-inherit base autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python multilib toolchain-funcs flag-o-matic nsplugins ${SCM_ECLASS}
+inherit base autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python multilib toolchain-funcs flag-o-matic ${SCM_ECLASS}
 unset SCM_ECLASS
 
 DESCRIPTION="LibreOffice, a full office productivity suite."
@@ -71,7 +71,7 @@ unset EXT_URI
 unset ADDONS_SRC
 
 IUSE="binfilter binfilterdebug +branding +cups dbus eds gnome +graphite
-gstreamer +gtk jemalloc kde mysql +nsplugin odk opengl postgres svg test +vba
+gstreamer +gtk jemalloc kde mysql odk opengl postgres svg test +vba
 +webdav +xmlsec"
 
 LO_EXTS="nlpsolver pdfimport presenter-console presenter-minimizer scripting-beanshell scripting-javascript wiki-publisher"
@@ -216,7 +216,6 @@ PATCHES=(
 )
 
 REQUIRED_USE="
-	nsplugin? ( gtk )
 	gnome? ( gtk )
 	eds? ( gnome )
 	libreoffice_extensions_nlpsolver? ( java )
@@ -456,6 +455,7 @@ src_configure() {
 		--disable-kde \
 		--disable-ldap \
 		--disable-mozilla \
+		--disable-nsplugin \
 		--disable-online-update \
 		--disable-pch \
 		--disable-rpath \
@@ -495,7 +495,6 @@ src_configure() {
 		$(use_enable gtk) \
 		$(use_enable kde kde4) \
 		$(use_enable mysql ext-mysql-connector) \
-		$(use_enable nsplugin) \
 		$(use_enable odk) \
 		$(use_enable opengl) \
 		$(use_enable postgres postgresql-sdbc) \
@@ -545,11 +544,6 @@ src_install() {
 	newbashcomp "${ED}"/etc/bash_completion.d/libreoffice.sh ${PN}
 	rm -rf "${ED}"/etc/
 
-	# symlink the nsplugin to system location
-	if use nsplugin; then
-		inst_plugin /usr/$(get_libdir)/libreoffice/program/libnpsoplugin.so
-	fi
-
 	if use branding; then
 		insinto /usr/$(get_libdir)/${PN}/program
 		newins "${WORKDIR}/branding-sofficerc" sofficerc
diff --git a/app-office/libreoffice/libreoffice-9999-r2.ebuild b/app-office/libreoffice/libreoffice-9999-r2.ebuild
index d6c05cb2ade4..6dbe6bd781d4 100644
--- a/app-office/libreoffice/libreoffice-9999-r2.ebuild
+++ b/app-office/libreoffice/libreoffice-9999-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.89 2012/06/24 21:50:55 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.90 2012/07/02 10:38:32 scarabeus Exp $
 
 EAPI=4
 
@@ -27,7 +27,7 @@ BRANDING="${PN}-branding-gentoo-0.6.tar.xz"
 # PATCHSET="${P}-patchset-01.tar.xz"
 
 [[ ${PV} == *9999* ]] && SCM_ECLASS="git-2"
-inherit base autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python multilib toolchain-funcs flag-o-matic nsplugins ${SCM_ECLASS}
+inherit base autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python multilib toolchain-funcs flag-o-matic ${SCM_ECLASS}
 unset SCM_ECLASS
 
 DESCRIPTION="LibreOffice, a full office productivity suite."
@@ -71,8 +71,8 @@ unset EXT_URI
 unset ADDONS_SRC
 
 IUSE="binfilter binfilterdebug +branding +cups dbus eds gnome +graphite
-gstreamer +gtk gtk3 jemalloc kde mysql +nsplugin odk opengl postgres svg test
-+vba +webdav +xmlsec"
+gstreamer +gtk gtk3 jemalloc kde mysql odk opengl postgres svg test +vba
++webdav +xmlsec"
 
 LO_EXTS="nlpsolver pdfimport presenter-console presenter-minimizer scripting-beanshell scripting-javascript wiki-publisher"
 # Unpackaged separate extensions:
@@ -218,7 +218,6 @@ PATCHES=(
 )
 
 REQUIRED_USE="
-	nsplugin? ( gtk )
 	gnome? ( gtk )
 	eds? ( gnome )
 	libreoffice_extensions_nlpsolver? ( java )
@@ -421,8 +420,10 @@ src_configure() {
 	# --disable-kdeab: kde3 adressbook
 	# --disable-kde: kde3 support
 	# --disable-ldap: ldap requires internal mozilla stuff, same like mozab
-	# --disable-mozilla: disable mozilla build that is used for adresbook, not
-	#   affecting the nsplugin that is always ON
+	# --disable-mozilla: mozilla internal is for contact integration, never
+	#   worked on linux
+	# --disable-nsplugin: does not work at all, reall effort to fix this
+	#   required
 	# --disable-pch: precompiled headers cause build crashes
 	# --disable-rpath: relative runtime path is not desired
 	# --disable-systray: quickstarter does not actually work at all so do not
@@ -458,6 +459,7 @@ src_configure() {
 		--disable-kde \
 		--disable-ldap \
 		--disable-mozilla \
+		--disable-nsplugin \
 		--disable-online-update \
 		--disable-pch \
 		--disable-rpath \
@@ -497,7 +499,6 @@ src_configure() {
 		$(use_enable gtk3) \
 		$(use_enable kde kde4) \
 		$(use_enable mysql ext-mysql-connector) \
-		$(use_enable nsplugin) \
 		$(use_enable odk) \
 		$(use_enable opengl) \
 		$(use_enable postgres postgresql-sdbc) \
@@ -547,11 +548,6 @@ src_install() {
 	newbashcomp "${ED}"/etc/bash_completion.d/libreoffice.sh ${PN}
 	rm -rf "${ED}"/etc/
 
-	# symlink the nsplugin to system location
-	if use nsplugin; then
-		inst_plugin /usr/$(get_libdir)/libreoffice/program/libnpsoplugin.so
-	fi
-
 	if use branding; then
 		insinto /usr/$(get_libdir)/${PN}/program
 		newins "${WORKDIR}/branding-sofficerc" sofficerc