Version bump to 4.0rc2. Remove rc1.

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

5 files changed, 37 insertions, 38 deletions

diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index 16acb5e3e63b..04ca868419fb 100644
--- a/app-office/libreoffice/ChangeLog
+++ b/app-office/libreoffice/ChangeLog
@@ -1,6 +1,13 @@
 # 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.434 2013/01/15 15:45:50 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.435 2013/01/23 15:27:24 scarabeus Exp $
+
+*libreoffice-4.0.0.2 (23 Jan 2013)
+
+  23 Jan 2013; Tomáš Chvátal <scarabeus@gentoo.org> +libreoffice-4.0.0.2.ebuild,
+  -libreoffice-4.0.0.1.ebuild, libreoffice-4.0.9999.ebuild,
+  libreoffice-9999-r2.ebuild:
+  Version bump to 4.0rc2. Remove rc1.
 
   15 Jan 2013; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-4.0.0.1.ebuild,
   libreoffice-4.0.9999.ebuild, libreoffice-9999-r2.ebuild:
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 19a3ea527dca..767d874a5f91 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -14,34 +14,34 @@ DIST 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1521926 SHA256 1fb458d6aab0
 DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 SHA256 75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870 SHA512 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a WHIRLPOOL 60b98d9af2c83c0cf12a5a60ba30957d335b8b967cac07971e1edbc787b9caecd4b3c5bb480e8b38fe8109c1cf74439ebafae130c976182c2c15399f38f5d28c
 DIST ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip 2732347 SHA256 64f8d737c32756713d60c22efe3978a59fa167cdeaa2d3d0a1646b1f2232b825 SHA512 bba2fe76d09e3ab99b170685525ceb4ce8ce8d95ffa0df97c05ce18cd7edbe73028861e19c501bf00db369d36f43fe274d4220ad046518d89737249f61c7cf3a WHIRLPOOL 2dd0924defb85dc6a266126fdaabc29f051ccf525d1e1e7a5f74db19f162ee2d17f98ae96fd832dbd1600c006e277b75a4d88d9b3128c7ec9e2365a6704d32e9
 DIST ea91f2fb4212a21d708aced277e6e85a-vigra1.4.0.tar.gz 12735186 SHA256 dc6445d2c0445e5536010b80bd811adda6741ed82b288fe831d5be9902457941 SHA512 a8c39d205051a8f8abaecb7a6fdc0c2c37baf5eee2a082af8819555f442dab525649b86cae569048357eb1e6e651deff4b62183de417e15b403e1ac09c40ba7b WHIRLPOOL fd9b6bbd214113334d3d5e542bbc9b70d5a9505281454e7f4447c6c73af733e10b007a2d4225acb39db0fc17401c2ae36b6628c59d31f09bec485f4cfc009eb5
-DIST libreoffice-4.0.0.1.tar.xz 104146976 SHA256 dead0e32ab5f89c76ab8fe4323e7262804dc88560a897d0e250d43aaef0a90db SHA512 0c137bb2fec5cfad325153bac77dd5c191316e6940f03e2c61cd15bc32bf83ddd64612e2e62e55cab159952b214340ed53b2741ea9375b7eca8f498d277e48c9 WHIRLPOOL e78fb19bb1392b7ea49cc35afa56cc90c5d58bfe14f56bf8af8f4fce3e6d7976881019f36762343623f5d2d18c4c190cee1753bbce6fc4ca988e9d798044fbb6
+DIST libreoffice-4.0.0.2.tar.xz 104194172 SHA256 fa4f2df2d4c2e12770cbc46de8f28885285a5c7ab9e0725fb6198fad0aed4b19 SHA512 39d353cc85851ccd63c6652af965ed654608beb7e409b24c65a5de47ca6ee7e44bfe5e2860285029caed82ede19c4cd47a8eb0603d7df53dc55d68ba5df238b7 WHIRLPOOL 9ddd49c12844a1293f91083e78e4b48317c5a95a2839d239418d9a102b6c6c7ac2ad12810880c85bfc9b92d81f5354acadfa7a74bc36c63ad20c94357fae2ebd
 DIST libreoffice-binfilter-3.6.4.3.tar.xz 5979564 SHA256 309c6e59693a60622a4fc02e5408a81dd3f422b0721340767f7ff8271c32c788 SHA512 83ca29b8ce813b9a87e20afdac160f51b67b7849ecc4dfc6868c7a4eb2146757d4f65f2e568d12f7ab9ee2eefcf7bd076860dd8466564683511e73d694d8f3b7 WHIRLPOOL 4d1f916448a4707142a821a1821054c489ab52d0e1f85fa8fe2d2ac4c99fd21ead35be21c1bc09206d834e11e9cecd6a5c3e98f46e2aa9e48b896d989053df27
 DIST libreoffice-branding-gentoo-0.6.tar.xz 49756 SHA256 d5c2d12031a807d18e981a6df7e945e1787b96c7ee65fa3d9bb9eac17cf8ade9 SHA512 1126d92b6b8722fc8b7865ed42c98876922ce26c71ebff61faf03e07b338d5278ff41ba29ff296d281cbdee6a9a0965ccf8e2101fc0f4846eaddcf511ac74eed WHIRLPOOL 40f18619246ca0b6f91ff248d65e4a36639c6faee719a842fb57c6bd8fc871686156e1c991776877d5df0811088ca8f3f4390b60f10565deefa2739c99242c91
 DIST libreoffice-branding-gentoo-0.7.tar.xz 72556 SHA256 57912157fe8874f9d628dd971cb68941ad605f2d8beba05327e7ce7a721080be SHA512 fdfd8190c1155e95a8874f07d6893d94e28dd7482b195e22f704f4b1621ef76ee99e5ae1fcdb41c392d2e37e05da32830c42d47b4e62e14a9526d67ffd2d279f WHIRLPOOL 6c1886dfc31b918180b78797a41c0dff042ef4ddab50f284d9f9ee7aca7733dc73795dcad35262cf6c5608a5f99cf8d85a3a0d23316e15bb6650bdc437a4226b
 DIST libreoffice-core-3.6.4.3.tar.xz 107228036 SHA256 8f72530cf153707ce29a8db578c64609678375f86930b640c472c7bb9ef699cc SHA512 ff80fd960ea07911969e99993fb530d37a194e3381bd398aad0bd64c7849132d5a5ff7b81a93eaab0e772f5ef4f776dc88d4ef7375dee546e5a537a7e4a9865b WHIRLPOOL 1a15e5012a20b3d701d20e89dffac560cf28667c2678cd21fc1a617c02b5e0b16ef55464b6fd6590974043b5b8c9be184050d15f920de394004868925ced67ec
 DIST libreoffice-help-3.6.4.3.tar.xz 1863976 SHA256 ed4395f9264a27411050b0be4a953f67f754a9b7f913aad576ceef236db6686f SHA512 123009eef4d1ed342a4c23acf5ec52002cbe5f8083d1fc5d485e86f67f461765ebb34ff1edfcc0ff6d321de7f8a2bc40d87f757c66b3c2ac22785549f4098f27 WHIRLPOOL b275bded52e998e5a12111260123c7b3456d2dc7fba4e6b13ffda787b1712df4af4838ab426760f7abdb9824aced163a470255d83afb7daf46a83845bff900b8
-DIST libreoffice-help-4.0.0.1.tar.xz 1863312 SHA256 68432934b70645ed8e390a1fce73dfd9c3a52434e2384c30c11321aeef1a335f SHA512 cae1ebf2b282d0e93e169aa2849b5beea6d1a4b910b92067885ee605797aac7f08f4da7c7900f80daeb3105ec95c466a446b8468372cde497d80b8440f5f9988 WHIRLPOOL b31be242bd245a9af787aebc3d9f0baee7d6064c8262ac5a4c36d28d3304b73a06461a173aebf94bcf91f0fbb72ec96a310311821736657ee46c183183aaaab0
+DIST libreoffice-help-4.0.0.2.tar.xz 1856412 SHA256 5015283779fd3c14817d9870349082de4c75918886b21d33be15179d25b04e61 SHA512 33432816421f1806dc7cc839e06d6e2a600ec1a459da8b1458d787baace1bd24c9206356f1a4e20e2daa0d68f1bf5fd953e95f5f2c4eff2acfd726833194adf2 WHIRLPOOL b31befe502ae27a840d95fd6d17f8d4ebacca554ae9a9f68a75a4a6d415a6b6a600d1c975df327c4e2425c279add6aa31c4be331c52bfc5589812f87635970b5
 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 17442 SHA256 87d507706863f0bcaf18de66421fc7b5b393a646aee15506e818132e3206e5ee SHA512 b0d195de1ae14e6b520de98bbfc8bfac514441e32753e02e65b340103cf7a531719ee4421663b10657e9a7396d927321703cdaccd1d7ddc6e989b6ba96a5f8d6 WHIRLPOOL e6da3fd0cec48e858bcb55ad406fbae8b04cf49ad78f9416d78da4f3621e0eef9f69bcf1d9502ef312fd1131b8b15392eb25e45982c108612cb9c708c12eb7ea
-EBUILD libreoffice-4.0.9999.ebuild 17229 SHA256 752fc1424b9c9f7577c6cc0b8e743e6336701234996d4ed5b692abbd37a36b30 SHA512 e25d30f46eef0ad6fd3701eb7385ce9b6f336728aeec85e0bc70e1f141e84f7f552654c5a0081948101fe69b4f082e002500c2506e659a677f31ca42c3b42c89 WHIRLPOOL 12babe56ee3830b9752b40e8192554440064ce13839ad10bff4d0d2bc934aff66966a626bcae5e0bee7b887ccaed28dbf109261997c8ec6d20b1511439fc34e0
-EBUILD libreoffice-9999-r2.ebuild 17042 SHA256 89df89fff377b5e5bca81dfa80445780f147730f3e6a7e62ec8805077b8c0cf8 SHA512 73e10245577c40e86851e91feac784c983d8b87abf6ce0b1d659df50c8112c93e2286863a8b1cff8babd5c4d355aa2181b52d18ad2fdf6d48dca78d63b18a9ca WHIRLPOOL 885e9968af2d2a970ce5015aaf3207505d0f4a074d057811e9a027465d8d908e0d89896230bb635fc7bf948254cba00de11ff1324f83c54ba2b53d216d26fb39
-MISC ChangeLog 78653 SHA256 0af55c25a156ea352616742eea1419c130ec770b47632cbcabc664e9f1294ab7 SHA512 d775de940cde131f24443275af4eea95a9e1ac5851150e334fa79d510d78d203d6833cb9d3b3aa1c94475807dd1d412fa67235815a9cd59cb9b84354ec6ce6b8 WHIRLPOOL de629964b3cdbfa1142b6dab33b3f75cf9d79e71205c107473b52eec0f394259bba349794f4360e03675d6cfe897dc986b82deeabd4b5b34e5cd6d8ff1323601
+EBUILD libreoffice-4.0.0.2.ebuild 17222 SHA256 cbcd5541c529b6516942c2547d82b8353d9231b5f0a42990233c75f9f88b10bf SHA512 11a43d879686bc7a3040123725b86f093ead2755da6bc24731e5e6077db133a00e41bd800f2ff75e6e83859c752e90c9ed9004d16d2deeade344e7ff92d67dc6 WHIRLPOOL 91078f617fe4073dece59feec303aa862e2ef4958e0f1c6e4dabe8cd58d79b27662be767e2dc26dfecd057868b53f69ee06f5582bf30f1d70a4b6f110558e704
+EBUILD libreoffice-4.0.9999.ebuild 17229 SHA256 f0172dfa3339d02e1203c827b15d9630bc0351472698bc54846d649a48ba477c SHA512 10510dbaa043f8f6db5a089099fd309a88f0fea5dd1816a10629ac1f5946eee120006124f1aec478e26981c1b651e9949e1fa0501a92f3ebc54651dd510f2497 WHIRLPOOL 8f75f90562b31ec71ab8538b04d9d7d7168da8d2c2c87eaffe005432e0d57a5dad3f6e89d515b84e3d7884a8f345ab9dc0626e1fb64b65a594ea96e0ec9213d7
+EBUILD libreoffice-9999-r2.ebuild 17042 SHA256 d531840236508f4155eda1a903dde777dd3de40bc180eec0d2e7a3ae6dddc67f SHA512 f95054ffc0234d662e42452cb1254478bf9d068731c501fbded9caf33330733d97aaab785fe19e0514396bf8d807b179ad240e87ffed0101b566f32d22d4e3d5 WHIRLPOOL d8e4e100faa2f2717f966329b9e803bf4965a93f011a4cf4d13ec431e8fa27bed2f57f80a88af19acd59610cd2dcf0d1954d80d62f0d5630f3a98f23ee71cf3f
+MISC ChangeLog 78902 SHA256 734840cf5c8510a70ddcbb9956f5d1fa47f8cadaedf700184051ee04da5967be SHA512 2ece5f1173d054867a65147b211c99d7c2c7d4c436666bd299d39095798fcd48e440169c114a403dce215158f66322913f4b220635cec216e66ad397c06c94d9 WHIRLPOOL f2fb85b2239625a6263255ff72c0322fd1a8fca521f2e1ff030c15a60707c03a93b0e78952531508edbb1241f4647046c1ab32ad168fad255c560bf9ce31dba4
 MISC metadata.xml 1176 SHA256 c1690efe4b2a0fa49801e5cbe66637e25ba71fb902115a75d363f6fe7dc444fb SHA512 2889263d6cf5388d402b2c3999d471e2a2e8c852dcd50755d9f6fd7a549e8b70af7afb66d2f58bc8b9f7bedb4d01a05dda6159c5433a5fdce20ba69f49b9d1b1 WHIRLPOOL e4b548267c79bee3de7bdec839c0fd4d2f1166ded0464d65e6103e63ffb8fb9c08c6a9ff0d01ab09c02826ff1b0b0233a55c5d49b701e963d8c732685b3267dd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQ9XqbAAoJEOSiRoyO7jvoIfEQAJ67W3rf5worrDtwzj4Amf5d
-5Cv5aMGXNJU5uJGTKX5Ic1YwKl8HcbPBWvI3Ccs2p4nb+a9Jo0mhlU6N3LbGnR2g
-WkAJ3MLGpqu86dCUQHRNxKRu0ihwJD9WTHp30QzvjxDUeYEO941T2PMUOZ45IL/j
-EHW79Zu7BjB12bkL7OgD1KQ442R4jkl3wmJYpJYmLLYJtkAz0YU7Q6Ajav3XgydQ
-KJ7nhA/9c7Lv+YQD8Sb0NwOJQYnEOpfJ7WBPytoxUZUx+ozV//cE8J5FIkv0XdT1
-E3YRwT0tPV799eSXcLQrXG6KinsaT9LNzjNh3i0wzmbQAh+RaXwbnw0pGcJmtFL5
-MHbSnRZKea0+lUrsMtXmZxUukexkrPp6xi1l3Y1qa+vTz6SdkpDcwirep5GEj7DQ
-do1r+Ba6wocnEHjr+taRngeIPVtOp4ol/9GqVJqYIPo1mybcalf2x6avMno3ghWl
-ulKaYk6NJp7rrlt/rouQn31FYAP8qBsAKtCJ33ksXIaBZlvOWBC00Gd3TVDLQyzX
-qh1GTVE0OsmsEJK/o7k2aeugNJuYxU8kjzm6rYjT6w6+2B6EgsYOHk2QlqG6urv4
-kkx+sAiLEW6F+lFNekrNYlWb3qvo/iZMNLEoU6IFm0eCWBBi+enTsDECfpnfsx8T
-xvEjfEwJctsPof6xaK7y
-=c9gQ
+iQIcBAEBCAAGBQJRAAFzAAoJEOSiRoyO7jvoJsEP/17MWYr/dIVgmFVM8Bq++69U
+7HrZkEeQH2dqmIQ1gUot1L1BbrnHvGDga3KZsI2wHCn4QTu9S7kRQVKjC/7ZdfYx
+0UbVJ4TN0HSKdZbPK3wZtbbPgluw4tWKv+/bcGxklwOi7eoA8EuTjiJotRcDgFOF
+leXUCBRjPLBvgry9G5WulZYqdSvK92TAehs4ZvXxXkoBOAZG0V9pZgSZ+gnf+pKV
+GeWP/dbO3TVdWXK4tkLKuH+I7L6GDfyv+UaeVAdY20Ro8DWZKUHDS43/nQc/O/jl
+sQkxw48eBZJRwuOjL8Am/WYmO0XsSmuwhsGoiHb+/i5aHhDrMqsimUmBRaDphHDz
+7xl9OEDL10Z4WNv3Lxwq03+0CJm/lmqRtNCrRD6AlDt1SmSVezT7V+XiHaypi5Cy
+0wEc5dSUUjUrlJ3V6PIN7LxZBsaJzOXNu5Z3YGUFpkH5f7uEuOSokOdPWZq0qk1T
+92JJwmeBWTsUH//uvYpkhxxwV41TjlPZekIDoZgegW7TgE8rPFno+0LfHc7a00iO
+/hR1zvOKYuuQ6mIe/TWPRM8D19Int8pme2r47NLEI49ZtrCF61RLE/dHpQeEtrNp
+ou3sLyMPD/Nww/QAiB1UYcj4jHA99/tn1bsFzhqK5850IjXURxad/7xFiMtXJyIs
+QYRSzH4ExwVPxfFOFuL+
+=BKQ3
 -----END PGP SIGNATURE-----
diff --git a/app-office/libreoffice/libreoffice-4.0.0.1.ebuild b/app-office/libreoffice/libreoffice-4.0.0.2.ebuild
index e591dae03ee1..cbfb8c9dd524 100644
--- a/app-office/libreoffice/libreoffice-4.0.0.1.ebuild
+++ b/app-office/libreoffice/libreoffice-4.0.0.2.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.0.1.ebuild,v 1.3 2013/01/15 15:45:50 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.0.0.2.ebuild,v 1.1 2013/01/23 15:27:24 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:
@@ -126,7 +125,6 @@ COMMON_DEPEND="
 	>=media-libs/libcdr-0.0.5
 	media-libs/libvisio
 	>=net-misc/curl-7.21.4
-	net-misc/npapi-sdk
 	net-nds/openldap
 	sci-mathematics/lpsolve
 	virtual/jpeg
@@ -183,7 +181,7 @@ RDEPEND="${COMMON_DEPEND}
 "
 
 PDEPEND="
-	=app-office/libreoffice-l10n-3.6*
+	=app-office/libreoffice-l10n-4.0*
 "
 
 # FIXME: cppunit should be moved to test conditional
@@ -236,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"
@@ -292,7 +289,8 @@ src_unpack() {
 			mypv=${PV/.9999}
 			[[ ${mypv} != ${PV} ]] && EGIT_BRANCH="${PN}-${mypv/./-}"
 			EGIT_PROJECT="${PN}/${mod}"
-			EGIT_SOURCEDIR="${WORKDIR}/${PN}-${mod}-${PV}"
+			EGIT_SOURCEDIR="${WORKDIR}/${P}"
+			[[ ${mod} != core ]] && EGIT_SOURCEDIR="${WORKDIR}/${PN}-${mod}-${PV}"
 			EGIT_REPO_URI="git://anongit.freedesktop.org/${PN}/${mod}"
 			EGIT_NOUNPACK="true"
 			git-2_src_unpack
@@ -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-4.0.9999.ebuild b/app-office/libreoffice/libreoffice-4.0.9999.ebuild
index dddf5f5869e1..9552d686f744 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.15 2013/01/15 15:45:50 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.0.9999.ebuild,v 1.16 2013/01/23 15:27:24 scarabeus Exp $
 
 EAPI=5
 
@@ -181,7 +181,7 @@ RDEPEND="${COMMON_DEPEND}
 "
 
 PDEPEND="
-	=app-office/libreoffice-l10n-3.6*
+	=app-office/libreoffice-l10n-4.0*
 "
 
 # FIXME: cppunit should be moved to test conditional
diff --git a/app-office/libreoffice/libreoffice-9999-r2.ebuild b/app-office/libreoffice/libreoffice-9999-r2.ebuild
index fa50e8b76b13..29b4131f6a45 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.153 2013/01/15 15:45:50 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.154 2013/01/23 15:27:24 scarabeus Exp $
 
 EAPI=5
 
@@ -180,7 +180,7 @@ RDEPEND="${COMMON_DEPEND}
 "
 
 PDEPEND="
-	=app-office/libreoffice-l10n-3.6*
+	=app-office/libreoffice-l10n-4.0*
 "
 
 # FIXME: cppunit should be moved to test conditional