Introduce xmlsec useflag.

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

4 files changed, 33 insertions, 22 deletions

diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index b8443cc068c1..67bc4589318c 100644
--- a/app-office/libreoffice/ChangeLog
+++ b/app-office/libreoffice/ChangeLog
@@ -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@gentoo.org>
+  libreoffice-9999-r1.ebuild, metadata.xml:
+  Introduce xmlsec useflag.
 
   02 Nov 2011; Tomáš Chvátal <scarabeus@gentoo.org>
   libreoffice-3.4.3.2-r1.ebuild:
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 6772137944eb..770f3fc58544 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -174,23 +174,23 @@ EBUILD libreoffice-3.3.4.ebuild 18254 RMD160 f8ccfefe0f1663982a07f9468db62cd8be2
 EBUILD libreoffice-3.4.3.2-r1.ebuild 18518 RMD160 08657e1067a7769b11aa1a095a9e755a478f9a24 SHA1 035c05abc1ccc7fd3834ebc0150103be35bec5eb SHA256 4265eb3af09948f4145550f372ad3d632ca36472ec461aa93d2fcbea4a27d242
 EBUILD libreoffice-3.4.4.1.ebuild 16297 RMD160 2b9f9e9e649614f563e09a7407060070e12e16c0 SHA1 e1ab24349990f88f01031343588b355925345a4d SHA256 697e95a7632573f88e0f93c3378661c181bc1fa020b0201fa690a93f201ce30d
 EBUILD libreoffice-3.4.9999-r1.ebuild 16302 RMD160 b97872adbd22f9ee683d3ada98131de8dae31f39 SHA1 dd91bbc58f25dcc3f7d1551452d7b530cc1ea7bb SHA256 aa93f191a6df71d103d3855752a21965162eedb94d51285bf40fa36e626c47ce
-EBUILD libreoffice-9999-r1.ebuild 14522 RMD160 59b1ef3970ff147d5a81d2b11f5c8a1921c3365d SHA1 a26500fb16c6fde02c345a9801f06632494e7f66 SHA256 86e5e9672316d922ba84fd3bc0fcdc399f286cdf17c470a8e5d0eea8bda9b789
-MISC ChangeLog 34063 RMD160 fdaa95d87b4f18a7a92610d91b496f2b233c3aaf SHA1 38b0eed728baa979170f575c0360c31c220f2f7c SHA256 b101a255ebe3c84a4b6e71145f7bb277a01de3c919a85dc2e612d0eb699e1bb6
-MISC metadata.xml 1192 RMD160 f723ac57dc7424dea71c29a052e2aae915c908dd SHA1 87181bf865c0bd53b4215ec36063a1f422e5eca5 SHA256 e3515fe7fcec3baa6e0b2dfb769c91f459ab6c34cf29a6b68498e17c3c7400a3
+EBUILD libreoffice-9999-r1.ebuild 14610 RMD160 14d96a915eb7f977daa3900ccb89e5003ae64bb7 SHA1 2a97dc946047687125a42238e54323350d18a4b2 SHA256 59ad312e97e74690e7a238cefd8e01efbb9ed1a44c2ec5b7c09ae0aaf307d875
+MISC ChangeLog 34191 RMD160 75e20ea6b6f752717b30b7e2422a5d7274ea54b6 SHA1 3fefa528749ea403520596d23f2af992e7367d8c SHA256 0c5c998d83e10d3cda64d2fee0182a5067672a87dc2c121ec51ee3beedff4908
+MISC metadata.xml 1341 RMD160 532608f457f9d6f714051e0b118e6a6a1fc4dee4 SHA1 7890f0068f2750aee68293f9bc1248037f799ca7 SHA256 0f7c6fbbf0a908b5206bc6af740375006f903b61f356fb21b6df8d1fc6a59755
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJOsT4eAAoJEOSiRoyO7jvoyrEP/1CflBnRJWpW5QVB7iFkqEpt
-0UsgEtbiQqeNOOQExAtPPhto75N9Pu0q5iMYeNf/a0Pu4TB60xlGUyTGnUtxz2Nw
-0eiwR6aJxHnCo3KD+yeqEPMRU19KNcj94XRqDwO5EIPHL7713U2YHay5Y7vvFd3+
-M1a/IFQLLwD0IxTgQG0ewEmmFvb+QN+nIBRuOwxv2mj/psfkLf2se7FRbGORliCU
-hUffL0KI7CMSy/BgmQOc+MMyqzk2xJP+wvZZtNr24ZdcDuJCNp8IHtYADNbXfGeA
-mTtS2X9NHs7ns3SfQHBbpuQww1ojnK5cAVVmvjubtCpncX56F1+Ok4Du33l32Far
-cYB8pJmsbXC2adt4+EzluwndsKJRbacXOvSg2d+BHdGyX8UGlJY87eZRZlUf6ySr
-jTlB2gyWQnJ5AdhQIKJj7u9BpY5c4yRq1sTPI2/Uq5bFyd4eEwUbbT+55pTDgHCf
-/gPKe9PqNDZsUftyUqEy9fK74yGc4FtSX8qkM6EgKYczTKiBGcCTMd3a4zCBs2Qu
-b4iTbdyG0qUA/A9ZUdFenX+ne8PDkONNCX/XiBHDW1qBZiOrwoYFpwA/0RY1TTdn
-OhtvJqH5GpnGkFrGBzRj1B7v4iUaVpurqR9Uz0vZiwMcF3rbuMJN5KsfvRqpm2Tu
-SqNUGwJeHjkFObPOFOhj
-=xtal
+iQIcBAEBAgAGBQJOsXUvAAoJEOSiRoyO7jvo7XgP/3evgNcPLMBp2y245gfTjWGU
+xomd7loBYp8VWK9hdba56zB03GH7RmGvHOEOn7i7w41o2vBV7m8QC8JH6o+nnQ2U
+8Ja+bW2+1Zte1TDFKSS8VnRjzBz6XyDNXqxxn/SD3fkHK7kqeuHs3SENIIpQfdWr
+fD282iJYmaEQpXCJALqrNUr488eR+HflNpO7KXx0Dt5Ae48iYyrEqEZWblyOJMx4
+Ij++KvLj/RAdBh1VP9vpaNWEPs2RlVX8y86MJ8ajQEKWGQbHbX8MhAgxS0jqJU99
+LnNkpXFOOzE1sWFHv7YHSK5CauYmlE/et2VI3JoNwGxTFluuuEQVpctaAGBU5n7n
+ud8Chhh4Jf4uTRCu0RRsHKLHjKk/0z0t5V+dBqRZeAco2UDkvt8H4K1tWLkwoRvF
+kR1EcBpmMZ8V5MnT3t5WLkJrrEzA0qWzrzlznBWHJO2bDTJvLALACt4y3hxYgQA3
+jI0c2lHmIgEPgoUajUSukxi3A9Snd8RkP2UcFQSKa4QUuk4QVTstYZNdvub3KtDq
+AHyQSqd/Im1Fjo58CFVWhXK3tOdL186U5zE4dOJuL1If7Hfq7egWDphKRspzsIX4
+LpcjXDLZdNivI0uUUat3xREsHKH8b9y4OcRrTFXyYVBfGb0eAhd86z+d0tDFr0fc
+noi2Kw84w2Djjas8z+w+
+=Atg+
 -----END PGP SIGNATURE-----
diff --git a/app-office/libreoffice/libreoffice-9999-r1.ebuild b/app-office/libreoffice/libreoffice-9999-r1.ebuild
index a5aefe00609d..a6632a0efce6 100644
--- a/app-office/libreoffice/libreoffice-9999-r1.ebuild
+++ b/app-office/libreoffice/libreoffice-9999-r1.ebuild
@@ -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 @@ unset DEV_URI
 # 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 @@ unset ADDONS_SRC
 
 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 @@ for X in ${LANGUAGES} ; do
 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 @@ COMMON_DEPEND="
 	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 @@ src_configure() {
 		$(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) \
diff --git a/app-office/libreoffice/metadata.xml b/app-office/libreoffice/metadata.xml
index 2c094c39a565..fec5e3c492a8 100644
--- a/app-office/libreoffice/metadata.xml
+++ b/app-office/libreoffice/metadata.xml
@@ -16,5 +16,6 @@ version</longdescription>
 		<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>