Fix configure dropped options. Wrt bug#451576.

Package-Manager: portage-2.2.0_alpha151/cvs/Linux x86_64
Manifest-Sign-Key: 0x8EEE3BE8

4 files changed, 27 insertions, 36 deletions

diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index 0278c89d6a39..9359e9a1175c 100644
--- a/app-office/libreoffice/ChangeLog
+++ b/app-office/libreoffice/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/libreoffice
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.430 2013/01/12 10:54:36 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.431 2013/01/13 10:52:53 scarabeus Exp $
+
+  13 Jan 2013; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-4.0.9999.ebuild,
+  libreoffice-9999-r2.ebuild:
+  Fix configure dropped options. Wrt bug#451576.
 
   12 Jan 2013; Tomáš Chvátal <scarabeus@gentoo.org> metadata.xml:
   Drop unused desc.
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index cba2a525a7ff..072b01872aaf 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -24,24 +24,24 @@ DIST libreoffice-help-4.0.0.1.tar.xz 1863312 SHA256 68432934b70645ed8e390a1fce73
 EBUILD libreoffice-3.6.4.3.ebuild 17474 SHA256 ebfebf22f2c06bc68f4a63e2ae74a9f0f378b79eb7fa297ead8f4741a39ce162 SHA512 2e540b456c2eaa2624cded3fe929678c5641797f0c8fbf044b760ce44c53b8008b9b70b0aa41350510fa671cf7f595acf355d8a804fdba2c7b0b3015db886858 WHIRLPOOL 5ffd405228caa4f36c7897db21ff10964b545b2180bd65854d2a9ce7e09f9b70228a294a2645c6bcb94f8635e08b9215a6a9943a54d745a927d5ce546b09fd1c
 EBUILD libreoffice-3.6.9999.ebuild 17504 SHA256 63590679442804681a97aeb2a575da274b6da92761f61df81eda0a38352a5411 SHA512 90b2c48c1e9f9bf2b543eb09d8a5d9fda7f26291adfc7f3a3a6da8502259542a0bb87503f093e8383ec2c3f4cc15be67a0d87a5045518833eab2842f93193195 WHIRLPOOL d7f48a6495f6901e5e7989d63dd23b242488b040cc128374c96816ff647fb3f263ebdffe8a8d32eb5e9913c8d97f83ce9a39ed83926d106bf6f83a3c416880e6
 EBUILD libreoffice-4.0.0.1.ebuild 17432 SHA256 78ca37f8702ac16a97839233c2f9540cd149c4cfa392f9be743a84b24fd41429 SHA512 60ad7f475fd7b6e875fdfb08a41cfb1d1d79f33a5fb9be5cdecee1ee5b83881a0d2991696de32a97f487b3e8c3e5600de3b1ad1cf2e1f71e93ec131c44e72ba4 WHIRLPOOL 96337d96f1e94b723ad67fbaa4b66f5697ceb2f482a485b238ef3b6418b6b42803edc6cefc289f8f02694f504d8ff25732db6bde0e03f7954848eb47a72a6f76
-EBUILD libreoffice-4.0.9999.ebuild 17439 SHA256 e26d1313a956dc567a8b75dc257db3df40eb5e61148828deaa96428d39960626 SHA512 d0175e16c46d1255ec41635360e5ecc5404e198d0e02750cd13a2b6ce879d14641f06e31e31549a4e51a31e045d4c892477534b67bf60c3084e01d9cac6ceb48 WHIRLPOOL f2559431879a00b5b1f381b64b8cd790f001885a3fdd5318e7937f6aa37564a21d95f613cdcd5f3fece98414d1b7b080f735bbf9d092fd4cdc3f72e13533239b
-EBUILD libreoffice-9999-r2.ebuild 17136 SHA256 3d6baa103e7cdf351f2c6e29abe6288b36c52d3154df132f5149de4d8b321b24 SHA512 473cf2610d92ceb8ee1c9e10d5494d81c51d4c1a647dc5209040a0ddc953dc9026e2f6d12d073d67698ee8942a2fd8c93eb8aec0839d149a01c6d6936ea001c3 WHIRLPOOL 6ad3c443d214a19c361943c71777fa56d6e31ed76a4ea54ef1db26ccb968060a1dc2fb1875aa6b2c700a750cab6ec1e439f89eda124f9c5c901db559cf540874
-MISC ChangeLog 77953 SHA256 f68b38c429b6614aa773343ea48605dd244e010ee6e20edb60bdf0a4977c89e9 SHA512 d02698f044f937798d4e86e486143240e21edd55173851c8b9752667e2204e793196e4bf1607bfb33ed396eba753519dcc7b8b7b913de9e55140368fe6bfcbae WHIRLPOOL f51f47168610bbe1a8f0d1cd7dd335db314e3c8362a3e886b7a633d22c376133224b769cf8605c3491a992eafd0b1ba6db41fd405d5d78c9fc0e2404e75b125e
+EBUILD libreoffice-4.0.9999.ebuild 17179 SHA256 d2aa7d5c87c228fc2059f878a37a01131d12da64941afc6f115a8a3cfd505365 SHA512 ba07d9279ae9fbc0c90b3d583c55da6e29b2ed6ed9012292bdc31b7e31fcf93f7d721a70afa73941cd2aafe428fc17e7135e11c876418af7264258c2ed7e1e02 WHIRLPOOL 723dbda8c09bf030dcab4f2056a3a6c0d580fa7a2750d577688937adea8b7b067a0e2cb91e30dff7fc0268c5892fc2033e80fdd0b6c2013ad75ea45cc0df1f65
+EBUILD libreoffice-9999-r2.ebuild 16992 SHA256 a2976d9bcad4f512b465a9b2a9e3c2687a04998235593353be59e5935d5b4372 SHA512 bf53cbd5ed3a1e0005ef94fcede33cd8ada55cb664063031cdb2836292d1a9cf8c51370517bd8270167eedad2273215d94d2fa3da53d5e8a3035dbb920d393c1 WHIRLPOOL 8aebfec65ea40ac83883500b7a6a1cd55545fe5abf9eb9889576586c5878aee8878066ef16538d1abdf0e639ee97f47901732a68b4c1d5f105f120ede4083385
+MISC ChangeLog 78117 SHA256 abe37df709d1f40f21a6e6146de94fc6bc64b1402be5dad3f610af0a984bc696 SHA512 d988c861b1a82506fbcebbd5478a250d42593239a2209076e9171962a1ae057fb751ccd3668ed5311ae4e2dc3127b1a212891cae1b02d97e194c7a553ce88085 WHIRLPOOL d5837ae5a4e4877afba734f73431fb26fe0bff1b9bd717fe686514f1e8d40ad4dadf6034209b949efca2c06919964770ab5c073bd2245a7355776cea4cfbccf4
 MISC metadata.xml 1176 SHA256 c1690efe4b2a0fa49801e5cbe66637e25ba71fb902115a75d363f6fe7dc444fb SHA512 2889263d6cf5388d402b2c3999d471e2a2e8c852dcd50755d9f6fd7a549e8b70af7afb66d2f58bc8b9f7bedb4d01a05dda6159c5433a5fdce20ba69f49b9d1b1 WHIRLPOOL e4b548267c79bee3de7bdec839c0fd4d2f1166ded0464d65e6103e63ffb8fb9c08c6a9ff0d01ab09c02826ff1b0b0233a55c5d49b701e963d8c732685b3267dd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQ8UI3AAoJEOSiRoyO7jvoJWwP/RkPXTDW3eVuvD3l/LNgTv87
-dxElKP5EAUoJpYN1zLttpj8TD3nFAZsOMQt/CuhbnEZkKHoxPFhNqGhus7/+Qcxo
-2yKjFPwi62cgsEBT3bRBmIEmD2Gy6q0JgCRBrnihdI/QnmTWugO3zh2Tq/lp6BiQ
-Tev1weR6dZZ5M5JayyI3N1EeoXIfNIXfsiNKw6qiBuAIpJURHgfXgMkQX0SrrC1l
-P/i8Ba1/OT3b+kidE7jAPqoPrKFTTO/TDPNoJhrbqHQNpste1uVc5IiRm+ZlaI+x
-sxIaP1EVBgMZMKMYFJe1tTSlWAVLvZT9FMoGBzWG8OPH/yMGkz40j6lVnZUazKNG
-UarovmELCCL6AhBzte+PQAGboFSLRikIrLAaCfIlkOZUZobiMfPXlOEtjw2AxNih
-A+XJkHOYu/ndIl4lymEwY/Bsuui+XbBeIYmSZqMfA9/0I7Nvhi9i7lbz/G2uvzwv
-b6eOp+o1uEtpLlcOxHZmO2pTVDeqEJaOWSJ6ywhZA+Q9kZCd/ZjBMBQx5lu1UWhJ
-QN9WaQzOJfw7hrTD+0jKywab38n4oe2NcDSTKNQudHc1sZliqLsPR5I4GP47RBWp
-Tne+6Rgk9e0SV1vOdFjOhIerHhD1m8reR9j56tykp7GbVQa0DxQv1Xo23DwvofHk
-JAfhz5JQACw5LRWk6sBk
-=u8wO
+iQIcBAEBCAAGBQJQ8pILAAoJEOSiRoyO7jvodvYP/3nM7oU8ULqRUsMl+OQqX8uD
+FHnpclQYDQ2QN76tqlSrW1+dq2XCX48whtEuj37vtQB+guUYmF3fO3UfWeP/V9Tg
+s8PmYHlBMwHq84AsqypZrZYndHw/4H4AEJ0M1mYI5RW2DpL5SH4K3m1gqq/IGPn5
+FvVsqoFXbO81AFfOIogBnksLH3GuJZUkNvtuXpN8MfP+1FfDSbTLBg6TzoveJ5ni
+LY7C/wUoGySSU4ZZ9BSF1FWfQEQIDaMRYwRJbRHvu2IXnvlULm1jkO5Sb60HsWDI
+Y79niDFLjLXamWtg8bZjG7X0+/WzxZ2NrqsVhRkRvxbXsgmzsme20gbflLpwBnrE
+tCUh3cpLfOTgxTCiVdt1fL9grGeyxcjcPR4q6TqloAlH8aV+dq4HJYqwbiqoE7+G
+t9owqSIhE+XBggx2fFUQGOJ8o/gXcBARDv76l7d1JJ7un4pKHau71bi+kQNp4ELh
+6F+HzeZbBXx30U7IZ3V7yp01184OValdn5BvqezK01SlZDu+j5ihvmcGxcJltdEF
+eaZpJzUqG+FvYxTsbO9TqvhjoBewnoOV8W8xxj3Ub7rOkzl/6Le+IhY2X6RTbbpf
+T5RuQPc0UZK0ZtVz956b1tWKhY5ajZo/PXUJlrvWylNWo5F1apUtmXTnCdj4h8Jx
+0g8Sn4yCluw0t47mfHGH
+=opBg
 -----END PGP SIGNATURE-----
diff --git a/app-office/libreoffice/libreoffice-4.0.9999.ebuild b/app-office/libreoffice/libreoffice-4.0.9999.ebuild
index 34ffd1a202e5..86dac56f26d3 100644
--- a/app-office/libreoffice/libreoffice-4.0.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-4.0.9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.0.9999.ebuild,v 1.11 2013/01/12 10:52:05 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.0.9999.ebuild,v 1.12 2013/01/13 10:52:53 scarabeus Exp $
 
 EAPI=5
 
@@ -73,8 +73,7 @@ unset EXT_URI
 unset ADDONS_SRC
 
 IUSE="bluetooth +branding +cups dbus debug eds gnome gstreamer +gtk
-gtk3 jemalloc kde mysql nsplugin odk opengl postgres telepathy test +vba
-+webdav"
+gtk3 jemalloc kde mysql odk opengl postgres telepathy test +vba +webdav"
 
 LO_EXTS="nlpsolver presenter-minimizer scripting-beanshell scripting-javascript wiki-publisher"
 # Unpackaged separate extensions:
@@ -236,7 +235,6 @@ REQUIRED_USE="
 	libreoffice_extensions_scripting-beanshell? ( java )
 	libreoffice_extensions_scripting-javascript? ( java )
 	libreoffice_extensions_wiki-publisher? ( java )
-	nsplugin? ( gtk )
 "
 
 CHECKREQS_MEMORY="512M"
@@ -415,8 +413,6 @@ src_configure() {
 	# --disable-gnome-vfs: old gnome virtual fs support
 	# --disable-kdeab: kde3 adressbook
 	# --disable-kde: kde3 support
-	# --disable-mozilla: mozilla internal is for contact integration, never
-	#   worked on linux
 	# --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
@@ -424,7 +420,6 @@ src_configure() {
 	# --disable-zenity: disable build icon
 	# --enable-extension-integration: enable any extension integration support
 	# --without-{afms,fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
-	# --without-stlport: disable deprecated extensions framework
 	# --disable-ext-report-builder: too much java packages pulled in
 	econf \
 		--docdir="${EPREFIX}/usr/share/doc/${PF}/" \
@@ -452,7 +447,6 @@ src_configure() {
 		--disable-ext-report-builder \
 		--disable-kdeab \
 		--disable-kde \
-		--disable-mozilla \
 		--disable-online-update \
 		--disable-pch \
 		--disable-rpath \
@@ -474,7 +468,6 @@ src_configure() {
 		--without-afms \
 		--without-fonts \
 		--without-myspell-dicts \
-		--without-stlport \
 		--without-system-mozilla \
 		--without-help \
 		--with-helppack-integration \
@@ -491,7 +484,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) \
@@ -548,7 +540,7 @@ src_install() {
 	fi
 
 	# symlink the nsplugin to proper location
-	use nsplugin && inst_plugin /usr/$(get_libdir)/libreoffice/program/libnpsoplugin.so
+	use gtk && 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
diff --git a/app-office/libreoffice/libreoffice-9999-r2.ebuild b/app-office/libreoffice/libreoffice-9999-r2.ebuild
index 9ab771dfdb32..2669d8e64bfb 100644
--- a/app-office/libreoffice/libreoffice-9999-r2.ebuild
+++ b/app-office/libreoffice/libreoffice-9999-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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.149 2013/01/12 10:52:05 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.150 2013/01/13 10:52:53 scarabeus Exp $
 
 EAPI=5
 
@@ -72,8 +72,7 @@ unset EXT_URI
 unset ADDONS_SRC
 
 IUSE="bluetooth +branding +cups dbus debug eds gnome gstreamer +gtk
-gtk3 jemalloc kde mysql nsplugin odk opengl postgres telepathy test +vba
-+webdav"
+gtk3 jemalloc kde mysql odk opengl postgres telepathy test +vba +webdav"
 
 LO_EXTS="nlpsolver presenter-minimizer scripting-beanshell scripting-javascript wiki-publisher"
 # Unpackaged separate extensions:
@@ -235,7 +234,6 @@ REQUIRED_USE="
 	libreoffice_extensions_scripting-beanshell? ( java )
 	libreoffice_extensions_scripting-javascript? ( java )
 	libreoffice_extensions_wiki-publisher? ( java )
-	nsplugin? ( gtk )
 "
 
 CHECKREQS_MEMORY="512M"
@@ -420,7 +418,6 @@ src_configure() {
 	# --disable-zenity: disable build icon
 	# --enable-extension-integration: enable any extension integration support
 	# --without-{afms,fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
-	# --without-stlport: disable deprecated extensions framework
 	# --disable-ext-report-builder: too much java packages pulled in
 	econf \
 		--docdir="${EPREFIX}/usr/share/doc/${PF}/" \
@@ -468,7 +465,6 @@ src_configure() {
 		--without-afms \
 		--without-fonts \
 		--without-myspell-dicts \
-		--without-stlport \
 		--without-help \
 		--with-helppack-integration \
 		--without-sun-templates \
@@ -484,7 +480,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) \
@@ -541,7 +536,7 @@ src_install() {
 	fi
 
 	# symlink the nsplugin to proper location
-	use nsplugin && inst_plugin /usr/$(get_libdir)/libreoffice/program/libnpsoplugin.so
+	use gtk && 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