From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id DD7491381F3 for ; Wed, 14 Nov 2012 10:13:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C3F3C21C00D; Wed, 14 Nov 2012 10:13:09 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4331921C00D for ; Wed, 14 Nov 2012 10:13:09 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1311133DAD3 for ; Wed, 14 Nov 2012 10:13:08 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2230) id 72AED20C65; Wed, 14 Nov 2012 10:13:06 +0000 (UTC) From: "Tomas Chvatal (scarabeus)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, scarabeus@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in app-office/libreoffice: libreoffice-9999-r2.ebuild ChangeLog X-VCS-Repository: gentoo-x86 X-VCS-Files: libreoffice-9999-r2.ebuild ChangeLog X-VCS-Directories: app-office/libreoffice X-VCS-Committer: scarabeus X-VCS-Committer-Name: Tomas Chvatal Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Message-Id: <20121114101306.72AED20C65@flycatcher.gentoo.org> Date: Wed, 14 Nov 2012 10:13:06 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: a9d43f6c-46ae-4ff5-8a82-a3f91657c042 X-Archives-Hash: 6284056301adf1437fc0e74e5dd8d084 scarabeus 12/11/14 10:13:06 Modified: libreoffice-9999-r2.ebuild ChangeLog Log: Also symlink the nsplugin. Drop no longer needed disable. (Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key 8EEE3BE8) Revision Changes Path 1.127 app-office/libreoffice/libreoffice-9999-r2.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild?rev=1.127&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild?rev=1.127&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild?r1=1.126&r2=1.127 Index: libreoffice-9999-r2.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v retrieving revision 1.126 retrieving revision 1.127 diff -u -r1.126 -r1.127 --- libreoffice-9999-r2.ebuild 12 Nov 2012 19:40:31 -0000 1.126 +++ libreoffice-9999-r2.ebuild 14 Nov 2012 10:13:06 -0000 1.127 @@ -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.126 2012/11/12 19:40:31 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.127 2012/11/14 10:13:06 scarabeus Exp $ EAPI=4 @@ -425,8 +425,6 @@ # --disable-kde: kde3 support # --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 @@ -462,7 +460,6 @@ --disable-kdeab \ --disable-kde \ --disable-mozilla \ - --disable-nsplugin \ --disable-online-update \ --disable-pch \ --disable-rpath \ @@ -557,6 +554,9 @@ newins "${WORKDIR}/branding-sofficerc" sofficerc fi + # symlink the nsplugin to proper location + use nsplugin && inst_plugin /usr/$(get_libdir)/libreoffice/program/libnpsoplugin.so + # Hack for offlinehelp, this needs fixing upstream at some point. # It is broken because we send --without-help # https://bugs.freedesktop.org/show_bug.cgi?id=46506 1.391 app-office/libreoffice/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.391&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.391&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?r1=1.390&r2=1.391 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v retrieving revision 1.390 retrieving revision 1.391 diff -u -r1.390 -r1.391 --- ChangeLog 12 Nov 2012 19:40:31 -0000 1.390 +++ ChangeLog 14 Nov 2012 10:13:06 -0000 1.391 @@ -1,6 +1,9 @@ # 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.390 2012/11/12 19:40:31 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.391 2012/11/14 10:13:06 scarabeus Exp $ + + 14 Nov 2012; Tomáš Chvátal libreoffice-9999-r2.ebuild: + Also symlink the nsplugin. Drop no longer needed disable. 12 Nov 2012; Tomáš Chvátal libreoffice-9999-r2.ebuild: Add back the nsplugin.