[gentoo-commits] gentoo-x86 commit in app-office/libreoffice: metadata.xml ChangeLog libreoffice-9999-r1.ebuild

[Tomas Chvatal (scarabeus)]

scarabeus    11/11/02 16:53:26

  Modified:             metadata.xml ChangeLog libreoffice-9999-r1.ebuild
  Log:
  Introduce xmlsec useflag.
  
  (Portage version: 2.2.0_alpha72/cvs/Linux x86_64)

Revision  Changes    Path
1.13                 app-office/libreoffice/metadata.xml

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/metadata.xml?rev=1.13&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/metadata.xml?rev=1.13&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/metadata.xml?r1=1.12&r2=1.13

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/metadata.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- metadata.xml	8 Oct 2011 08:24:30 -0000	1.12
+++ metadata.xml	2 Nov 2011 16:53:26 -0000	1.13
@@ -16,5 +16,6 @@
 		<flag name="templates">Enable installation of Sun templates</flag>
 		<flag name="vba">Enable support for VBA compatibility and ActiveX embedding</flag>
 		<flag name="webdav">Adds support for HTTP repositories via <pkg>net-libs/neon</pkg></flag>
+		<flag name="xmlsec">Adds support for document signing using internal modified <pkg>dev-libs/xmlsec</pkg> and system <pkg>dev-libs/nss</pkg></flag>
 	</use>
 </pkgmetadata>



1.187                app-office/libreoffice/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.187&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.187&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?r1=1.186&r2=1.187

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -r1.186 -r1.187
--- ChangeLog	2 Nov 2011 12:58:35 -0000	1.186
+++ ChangeLog	2 Nov 2011 16:53:26 -0000	1.187
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/libreoffice
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.186 2011/11/02 12:58:35 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.187 2011/11/02 16:53:26 scarabeus Exp $
+
+  02 Nov 2011; Tomáš Chvátal <scarabeus@g.o>
+  libreoffice-9999-r1.ebuild, metadata.xml:
+  Introduce xmlsec useflag.
 
   02 Nov 2011; Tomáš Chvátal <scarabeus@g.o>
   libreoffice-3.4.3.2-r1.ebuild:



1.50                 app-office/libreoffice/libreoffice-9999-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r1.ebuild?rev=1.50&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r1.ebuild?rev=1.50&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r1.ebuild?r1=1.49&r2=1.50

Index: libreoffice-9999-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r1.ebuild,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- libreoffice-9999-r1.ebuild	2 Nov 2011 12:28:22 -0000	1.49
+++ libreoffice-9999-r1.ebuild	2 Nov 2011 16:53:26 -0000	1.50
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r1.ebuild,v 1.49 2011/11/02 12:28:22 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r1.ebuild,v 1.50 2011/11/02 16:53:26 scarabeus Exp $
 
 EAPI=4
 
@@ -55,7 +55,7 @@
 # These are bundles that can't be removed for now due to huge patchsets.
 # If you want them gone, patches are welcome.
 ADDONS_SRC+=" ${ADDONS_URI}/fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz"
-ADDONS_SRC+=" nsplugin? ( ${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz )"
+ADDONS_SRC+=" xmlsec? ( ${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz )"
 ADDONS_SRC+=" java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
 ADDONS_SRC+=" java? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
 ADDONS_SRC+=" java? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
@@ -78,7 +78,7 @@
 
 IUSE="binfilter +branding dbus debug eds gnome +graphite gstreamer gtk
 +jemalloc kde ldap mysql nsplugin odk opengl pdfimport svg templates test +vba
-+webdav"
++webdav +xmlsec"
 LICENSE="LGPL-3"
 SLOT="0"
 [[ ${PV} == *9999* ]] || KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
@@ -90,6 +90,11 @@
 done
 unset X
 
+NSS_DEPEND="
+	>=dev-libs/nspr-4.8.8
+	>=dev-libs/nss-3.12.9
+"
+
 COMMON_DEPEND="
 	app-arch/zip
 	app-arch/unzip
@@ -146,13 +151,13 @@
 	mysql? ( >=dev-db/mysql-connector-c++-1.1.0 )
 	nsplugin? (
 		net-libs/xulrunner:1.9
-		>=dev-libs/nspr-4.8.8
-		>=dev-libs/nss-3.12.9
+		${NSS_DEPEND}
 	)
 	opengl? ( virtual/opengl )
 	pdfimport? ( >=app-text/poppler-0.16[xpdf-headers] )
 	svg? ( gnome-base/librsvg )
 	webdav? ( net-libs/neon )
+	xmlsec? ( ${NSS_DEPEND} )
 "
 
 RDEPEND="${COMMON_DEPEND}
@@ -447,6 +452,7 @@
 		$(use_enable vba) \
 		$(use_enable vba activex-component) \
 		$(use_enable webdav neon) \
+		$(use_enable xmlsec) \
 		$(use_with java) \
 		$(use_with ldap openldap) \
 		$(use_with mysql system-mysql-cppconn) \