Match useflags current options.

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

4 files changed, 33 insertions, 27 deletions

diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index ff7569a7fc2f..cc572a2c660f 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.369 2012/09/17 13:17:52 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.370 2012/09/20 07:36:56 scarabeus Exp $
+
+  20 Sep 2012; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-9999-r2.ebuild,
+  metadata.xml:
+  Match useflags current options.
 
   17 Sep 2012; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-3.6.1.2.ebuild,
   libreoffice-3.6.9999.ebuild, libreoffice-9999-r2.ebuild:
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 53c4d64415ac..2744fec9e93e 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -27,23 +27,23 @@ DIST libreoffice-help-3.6.1.2.tar.xz 1863760 SHA256 41672c3548f95ff8ad3b491b0ff7
 EBUILD libreoffice-3.5.6.2.ebuild 15672 SHA256 50964a32b3ccda096c43a01cf804b69f83807eef4ad3a791469250c25a40da6b SHA512 8ba424c19b59149b3f0b5635e99256a66d80dc6269eb14da1065ec126ef98a77c425c0d5424955cbb6ca1779d05f4be5a662838e65367e5a8c9dbbf4b90fe949 WHIRLPOOL 46172d9c9efa07f7254c9f5055da2e7f1c43c13574c5f706ea1610f89ff667091e0be40066ec0504f01135c1ab55d2635cf2618386e617de92a0bb9263f3c53d
 EBUILD libreoffice-3.6.1.2.ebuild 17507 SHA256 25037e3b15e33b42de6f4894151cc05ab9de8c4071ad05ac73c8a1e4539f31a4 SHA512 6aa1aab7d13a3475148115d9be2685abec8eed5ca98ea90d130d5ca3bde7013813190cb3e0c1938602c4417c55fd62515920f97d077ec894862122cb30fcdd44 WHIRLPOOL 37c85b6e3faefb31b03d6b32c777bce82d83084d46e3bc99362f1c4c5d20b4df1f24b486028db4bc2a8d5ececc810e6e287d8c6bb9440fe1afc01ca52a8522ed
 EBUILD libreoffice-3.6.9999.ebuild 17508 SHA256 d3736a5e414ee037beba6ddb0f997acda0f95292869893242669e16d08caed95 SHA512 a9b0db3428e7c10a36ca3de297704436298c479a7497770cb5dc719acc040e4d56e22475f2c804c173413e76e7df40bc67f5c8a5728e25f13af90fb387d351fc WHIRLPOOL 33c91560af89b634d666981b430b38e9789642ad13620f324cb7ea57f3111682c8b73f711469c0d36fd07ea1c6b6d835e5fdeedb6d8caf4ebd05a62d7073b78d
-EBUILD libreoffice-9999-r2.ebuild 17727 SHA256 9683ff38ab6b5622124dacdcd2b61f9156afd20279b4c86ec153c04412a51b08 SHA512 e4fc2c8481427f760e565b18415ee005521b5b2a488202d7ed4196015cecf5aa2c5a586e979c5acdae364e40f02a1ccfe4d09f2f0514bfccd688792d37d1a8f8 WHIRLPOOL 924e74bc92601fd37af3ea344ead7d4ba2233d100817edfbadaf261c5c88e3b103c7703e506039fd5a5936b8a35a589dc3e2f8b05f163081cddfb831faa6dd78
-MISC ChangeLog 67880 SHA256 ef5e43519bf79672508e897de9219815b832ca13a6a7c32c4c3502f526a36c0e SHA512 cfff57dfefb26c67de2862250e118adcc398c1cc68c03941178013cf0c6074ccb31627cab36fd6a66ddd92a3438c3fa029aa8a4f3249f37b2821f35a8b1bbe70 WHIRLPOOL d65576c8c06edf0f63cdfb58bd90d5fb7f6878195f236a1d33599125ef854a6cf5ebb5182be843d46c5f4e69b7ff99bd3aa8c7639c70c0b703e69a48ce2788ed
-MISC metadata.xml 1534 SHA256 2f095ea98ee3715366a47bfb72683434384d06526cb66a3db8b071fed537b401 SHA512 6e07d86c7aef51c72303ae0f41c49ebc9f0bb89d9bc176822c50a2f73684253c16acf718caef6bfe8bd072ae9e987235e0181806fb0989319ea40e894fa2ea39 WHIRLPOOL 4708c3823f88598934b7ffdcc5f02c8a1427e6d06d3424634042e22527f9e16786a45114ea6010fa085ae25170b8ca241a8f2741d522f159b563d511977d521f
+EBUILD libreoffice-9999-r2.ebuild 17695 SHA256 e85253732dadfe01ca5a54e046afeee50927dbedaade8fed0991b730993423d1 SHA512 aad307f9eb3ac7b0287376477398d252be9af025d5f63f4f5495c94c51bb5583a4a482531893a6eeff5c3a8132725bd7ffece77deebec9a47df67ad2de4c352e WHIRLPOOL a729a3369cb6340c9a93535ae96e9750a4018c7036a47e746840490b2d809d07826f984bbf808b59ebe4996e89b36b4d5ac8ef90329b88c575a0783eac2f5536
+MISC ChangeLog 68014 SHA256 3755d4a332265d038f044d5ddb1b12d6969d5e22884125b22911131fe1dc1566 SHA512 556d76bf0cbb1e7d56a2948eac8a9e4f76c8a8b59770538e1621ec99a2ec0c007d6084f0146376e26744dc572ab259626cc09b86d9afd2ad12356e545203fd95 WHIRLPOOL cd8a21fb57a942b6e3d46aeb2b12a0301cac9f578aeb0ebc3314acbcd22cbedcd4a2ea3f61ebbbfb2acce8e00b25aa173a169a605994c933f348b3551dda35a4
+MISC metadata.xml 1645 SHA256 24887289646f2058654a7701555baf8afabcffa2223f5bece682d537a43fdcda SHA512 dbf85074a9bc3b984a6f8188dee88a19123d0b6fed5131a70592f31769c317b8eb5ea1095fb72a406dad9fe5214ac51e33203c162a6891a63b9cbedb0d1affc0 WHIRLPOOL 7cbfb1f8644f8cf36efc4ddd8bdb0f757483c7fce7da0e2d61922d0a5e9ab4dd968c5120064ec3307fd547544cdb9501a4bedabf905f7a7d201f972534b41172
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQVyL6AAoJEOSiRoyO7jvoIMYP/A6nSTqp/gR0kpvnpE8daRXw
-6xA7cXGLYB74+m4XQ6rdfytNKwZ4Zfo4Zq7o7zbY4D4RhGfdOe257UiFDP0STb8M
-76iPjxPzqFDW2tVxj33CssInBrvx1Z2PI2fdRrK5zrrss7ojX+jkRuNObWsJ6lQ5
-wda52qO+noA9LPIYz8d3gLm77Am5NKjado2djCgL6HTQImJoF5dRZQiN/KNONQ6+
-nYAYj2AGLh4mvC3OjPP/BJFgUQTx9RjOFWMMy3vPMUZEq71sBCCgeKcwDcDzXekg
-n+NixgkvBRAFJ1uqkxpriFvymIfAQRETyWu+aoSIRRZ2am3zUREI3ssu+SmOQ5tT
-B8nthHIEdqTebqsCxzzz+LQCfL2+ne5aGfixAAtYSDjUH0R9dQ3u4m1YmF9ddpBS
-5Avk1+2QlUZczyYyoEwh4msabOSs6ahMhsl233Ew/o93Z+nUUV0QUM9wp4AufOX2
-X0331AaDOO5LkIkGLrXRUFDdp6y1Gn6ni9M4xW5ezKsJQlT6dCeoEdZIsaGP9eko
-7R9LQFR3xUQFSIMMWPZ6n241jwc7oCfe0Kt1osyl/kjVrYOw2uJWGUiDTbzeD0C7
-tvBYj6oaypL1aT0xD7dhKt6XWJbZJiEZ17g6NXMegoQKV4kP4f8gTlPqrFlnFex5
-TT0TiGWLrOFWMhx95MQy
-=rO7D
+iQIcBAEBCAAGBQJQWsfoAAoJEOSiRoyO7jvojS0P/RiJ9oZDIQpY/Ym7iWmybPTu
+yqshrGR76aCYeKd5kDY57hL+BrUtRodbEbTiE2QzuZ8QMKmlH9AvDq3jPWe9qOZp
+u7e6Vn+uw4SQrWRxqYPdIgrVuhiuOk49HHnLttHdeOBAq/6aws4PgMWOIbwasPVj
+pHmMyXtHHJUKJsGG/eehtcU+68TEPvnwQmdadb9MoJxl//vdlq07i7j00iWtVAui
+2geQvDpzVeZVcuBR6R8+5axVwAXgQW74p3TlKtkecAPLXovtSi+7RmfaIlEwo19G
+6/B67+9BclI0ggaXhsU6s4q9WUe/bsijMT5MjXuhlNO2ZYnEhsMN1La+WZK+Iu2h
+Fv9TpToIZcv5zZwjdpVQIBFlbU0RXWGZQ5dGWoI/FxW1zOF3O7zb8LStecCLdtQu
+RVcSY6kVGRWGBpixyCF5YJkQ5vehytrTh54XiG8CErCN/KhmImY8Uj/BSy0nV57u
+U32yBHOo9dypB6MDdaaV9rd5s/3qdyeSGYE+3gWEWm3oX+MC0vGpfqQom449fl3d
+6vmro6Z/y9P5YNkCv2RqPyGKjYB0p10Wy0z8e3V9nPGEC+vsWx/N2h/SXBdkTtjy
+OyqaKTWC1x+LDlg9DbCVmdbCDTPO+Gpkrxouoq4pyz6P6MiAjmhpV3M8HsJLXLUO
+fuU/lZ2TLmyobwrw5rpY
+=VV3M
 -----END PGP SIGNATURE-----
diff --git a/app-office/libreoffice/libreoffice-9999-r2.ebuild b/app-office/libreoffice/libreoffice-9999-r2.ebuild
index 019fb27ca553..67f55332eafa 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.109 2012/09/17 13:17:52 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.110 2012/09/20 07:36:56 scarabeus Exp $
 
 EAPI=4
 
@@ -72,8 +72,8 @@ unset ADDONS_URI
 unset EXT_URI
 unset ADDONS_SRC
 
-IUSE="binfilter binfilterdebug +branding +cups dbus eds gnome gstreamer +gtk
-gtk3 jemalloc kde mysql odk opengl postgres svg test +vba +webdav"
+IUSE="binfilter bluetooth +branding +cups dbus eds gnome gstreamer +gtk
+gtk3 jemalloc kde mysql odk opengl postgres svg telepathy test +vba +webdav"
 
 LO_EXTS="nlpsolver pdfimport presenter-console presenter-minimizer scripting-beanshell scripting-javascript wiki-publisher"
 # Unpackaged separate extensions:
@@ -132,6 +132,7 @@ COMMON_DEPEND="
 	x11-libs/libXinerama
 	x11-libs/libXrandr
 	x11-libs/libXrender
+	bluetooth? ( net-wireless/bluez )
 	cups? ( net-print/cups )
 	dbus? ( >=dev-libs/dbus-glib-0.92 )
 	eds? ( gnome-extra/evolution-data-server )
@@ -163,6 +164,10 @@ COMMON_DEPEND="
 	)
 	postgres? ( >=dev-db/postgresql-base-9.0[kerberos] )
 	svg? ( gnome-base/librsvg )
+	telepathy? (
+		dev-libs/glib:2
+		>=net-libs/telepathy-glib-0.18.0
+	)
 	webdav? ( net-libs/neon )
 "
 
@@ -223,6 +228,7 @@ PATCHES=(
 )
 
 REQUIRED_USE="
+	bluetooth? ( dbus )
 	gnome? ( gtk )
 	eds? ( gnome )
 	libreoffice_extensions_nlpsolver? ( java )
@@ -327,13 +333,6 @@ src_prepare() {
 
 	base_src_prepare
 
-	# please no debug in binfilter, it blows up things insanely
-	if use binfilter && ! use binfilterdebug ; then
-		for name in $(find "${S}/binfilter" -name makefile.mk) ; do
-			sed -i -e '1i\CFLAGS+= -g0' $name || die
-		done
-	fi
-
 	AT_M4DIR="m4"
 	eautoreconf
 	# hack in the autogen.sh
@@ -494,6 +493,7 @@ src_configure() {
 		--with-helppack-integration \
 		--without-sun-templates \
 		$(use_enable binfilter) \
+		$(use_enable bluetooth sdremote) \
 		$(use_enable cups) \
 		$(use_enable dbus) \
 		$(use_enable eds evolution2) \
@@ -509,6 +509,7 @@ src_configure() {
 		$(use_enable opengl) \
 		$(use_enable postgres postgresql-sdbc) \
 		$(use_enable svg librsvg system) \
+		$(use_enable telepathy) \
 		$(use_enable test linkoo) \
 		$(use_enable vba) \
 		$(use_enable webdav neon) \
diff --git a/app-office/libreoffice/metadata.xml b/app-office/libreoffice/metadata.xml
index f56aa2a82b48..d4c8e5c9dcbd 100644
--- a/app-office/libreoffice/metadata.xml
+++ b/app-office/libreoffice/metadata.xml
@@ -16,6 +16,7 @@ version</longdescription>
 		<flag name="nlpsolver">Build extension for non-linear solving in calc</flag>
 		<flag name="odk">Build the Office Development Kit</flag>
 		<flag name="pdfimport">Build pdf-import extension using <pkg>app-text/poppler</pkg>. Note that you don't need this for pdf-export!</flag>
+		<flag name="telepathy">Enable document colaboration features using telepathy communication framework.</flag>
 		<flag name="vba">Enable support for VBA compatibility and ActiveX embedding</flag>
 		<flag name="webdav">Adds support for HTTP content adding 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>