From 2f871a4b2cae563907ce9af97def8fcfdcb975df Mon Sep 17 00:00:00 2001 From: Tomas Chvatal Date: Fri, 11 Nov 2011 14:54:04 +0000 Subject: [PATCH] Add back nsplugin switch as i introduced it again. Package-Manager: portage-2.2.0_alpha73/cvs/Linux x86_64 --- app-office/libreoffice/ChangeLog | 6 +++- app-office/libreoffice/Manifest | 30 +++++++++---------- .../libreoffice/libreoffice-9999-r1.ebuild | 8 +++-- 3 files changed, 25 insertions(+), 19 deletions(-) diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog index 74e51f631bd8..998ba1c8fbba 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.196 2011/11/10 21:11:30 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.197 2011/11/11 14:54:04 scarabeus Exp $ + + 11 Nov 2011; Tomáš Chvátal + libreoffice-9999-r1.ebuild: + Add back nsplugin switch as i introduced it again. 10 Nov 2011; Tomáš Chvátal libreoffice-3.3.4.ebuild: diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest index 6a7438d3d45d..36d2c5d890f3 100644 --- a/app-office/libreoffice/Manifest +++ b/app-office/libreoffice/Manifest @@ -175,23 +175,23 @@ EBUILD libreoffice-3.3.4.ebuild 18266 RMD160 c0204063e1a6bd7621267fd4dc92d8b7334 EBUILD libreoffice-3.4.3.2-r1.ebuild 18518 RMD160 08657e1067a7769b11aa1a095a9e755a478f9a24 SHA1 035c05abc1ccc7fd3834ebc0150103be35bec5eb SHA256 4265eb3af09948f4145550f372ad3d632ca36472ec461aa93d2fcbea4a27d242 EBUILD libreoffice-3.4.4.2-r1.ebuild 16537 RMD160 859a610da9e697a9e5b7832108f3f57dc9145d33 SHA1 0be702423727887cb1b42b3157766c0235fa03b5 SHA256 fe8abb5d7a09586e76f5181064f0d88ad91814db459084b332adbff4e80694d8 EBUILD libreoffice-3.4.9999-r1.ebuild 16561 RMD160 d29d090c711bfd6b4cfc6ecfdb7c410c0e0df0d4 SHA1 1df0d0fc1912e9763d51494e0da2032a0ce4d2d1 SHA256 e4fab488961d4691bcfdab124c642f1bd99c030ea8dda87d2637e5edbb5f5407 -EBUILD libreoffice-9999-r1.ebuild 14904 RMD160 20a571e87b6032b5b61223ec946edbaaa7f545b2 SHA1 2c0647f6ee8f2a69150f5982e46e7d63643a8e25 SHA256 c9d717a76e477c64977060387faf9d659664cf7539c4ce07202478d68d769aaf -MISC ChangeLog 36303 RMD160 ef40a08865de03295e40363246e91eded01b362b SHA1 8afa4827a8db2ab6a84d26ad4739e3f0cc95ea75 SHA256 5c3ffc46bb3891fd79ef200925890855614697569f03da09a34d0298a7bda887 +EBUILD libreoffice-9999-r1.ebuild 14964 RMD160 c01d614daf751ee6a058b56e4a542d5088642204 SHA1 d4e915afba3dc1981a6fbe73519db76b35320b53 SHA256 46d8cd41c7c58bac6b102890f47b76da2346e9b38df309313b55f1090b7c9d74 +MISC ChangeLog 36442 RMD160 547ef460c894060b040f571009aaa42aad6763dc SHA1 747e6f8b11a32be7560e47f07e1acf1b80041ec6 SHA256 7b08b8a9019bb651208873c3b19f29414009ea18b54b94212c10ed9c904053e6 MISC metadata.xml 1341 RMD160 532608f457f9d6f714051e0b118e6a6a1fc4dee4 SHA1 7890f0068f2750aee68293f9bc1248037f799ca7 SHA256 0f7c6fbbf0a908b5206bc6af740375006f903b61f356fb21b6df8d1fc6a59755 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iQIcBAEBAgAGBQJOvD36AAoJEOSiRoyO7jvohFUP/0ZnKFYgG8CkEQ6mszzxl7OI -hmDtBgmNUNlDTc8YqKsviHaqVMmdLucX1SMHm8OmEeRnk5jN2Z9YhcuE0poCL5Zy -K/eZcJ8BEqN1SJ1p0B51VbCTC8e94i6SZgBCjT0yYTcz4nbOegOGpNcgpTd3w+f9 -sLqZTOW4fCLogrYTVzi5q6ifz5mRRjs+EP++8lXy3760wBthmZiY2bagaMTLY75P -RCOEk8n4649yddvlJZz2sL1R7jd8AVQeK8pRT4+vU5Ek8wX++zwN6Er5foi4RhEt -9BhTxdnm0zgd1lO+7VlnjrvOvCbnSK1D6ihBq838ACkKWIi1huPUAI51304BByHj -2PFo5GZIrxpnHC5ixbNAhseRqU/TNvfQg5vOLyJ7fXDe+X7yFQHBO8HYlFI6VHH7 -HD4OwtK+Fxq2ZZm3Sjsd/9BkTKyUqszaXfXd+z/1EHQDMbfQPDwVl89AEQcd1VLW -ohTm7IBgz6T+HPqcv6l550uep+uEP6uJYt9oLxlNDwVpqRvBqp7MBq5d/jKkcwIa -qGlbgi7PIbKIVCkrRsLYv7x621JmVs8KRFi/SByKmCKbkOjMlWklhuu3NfSiCrK8 -NvZkMw7orU816w/flc9c58sGBOkvWlHptfh+04NWHOfdLsommME8LYouUVlUNsNK -+LKFEsoALmXkw4l5yyIh -=PSnb +iQIcBAEBAgAGBQJOvTe6AAoJEOSiRoyO7jvoEnkP/3mTfsHBBvHNgu+CbWEM+vry +dCM7KESRfy0K3q+DhGu4XKogkgm2mAuRUCtdc72J7pJwh2B2ILmzq52mVRJQgW04 +HhMfEgBXvrnt4AeFmuPUkmDkE08K0H5m7r0+82S3uHpo1Kva+7X6tfiostFbThjt +dY+0odoqxNstaPNa30CZn3/64MoaGNQr6cvsdIo5UkQSxhyr3+iSyLSz9g3JOjPE +X3ktPf4HBC/vuL867d1NsHPQrZAzAXpqq0LEBGyCjptW/MleBM5dMylqgDyzLJmL +qEg5NJPyd1cOs4x68xBQfztoblkQWYliaStGz4p21VMVbZDLVYtqyA/BKtVZt4Ou +rgkZasgsYldcy5NXDCUntGuN2uvuvZiRP7nuQtGGh/ODGVnntHxKNfoNErDXj3P0 +iHOjbKZk2opV7BKt8f3GXGdU5Y3dZZ7VtyMouGsJu4154UhzcsUlDZEiq8Sdgu65 +0YJBcfTySY9M9wbGjGfws3j1WBhsQ0ygkPAj2s6+ILtmPMLdjLjOarLq0hMtlzZ2 +Y32JWaWZHzS6aJjqn/XGvwZQImfhS0qguGg3J5ogG8mRs9b+4UEQjBVSzZqIK3yl +llX3rkyN8hzwkH4yCFCz9Oif6TMqdd2zIS6egaQl85KUJprSdSlik3UKWfOXO8lp +bXCX/lfZhSYDwkAXmMJ8 +=0I7Z -----END PGP SIGNATURE----- diff --git a/app-office/libreoffice/libreoffice-9999-r1.ebuild b/app-office/libreoffice/libreoffice-9999-r1.ebuild index 229a58cee3d2..5e941cb3b489 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.57 2011/11/10 12:28:02 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r1.ebuild,v 1.58 2011/11/11 14:54:04 scarabeus Exp $ EAPI=4 @@ -79,7 +79,7 @@ unset EXT_URI unset ADDONS_SRC IUSE="binfilter +branding dbus debug eds gnome +graphite gstreamer gtk -+jemalloc kde mysql odk opengl pdfimport svg templates test +vba ++jemalloc kde mysql nsplugin odk opengl pdfimport svg templates test +vba +webdav +xmlsec" LICENSE="LGPL-3" SLOT="0" @@ -209,6 +209,7 @@ PATCHES=( ) REQUIRED_USE=" + nsplugin? ( gtk ) gnome? ( gtk ) eds? ( gnome ) " @@ -453,6 +454,7 @@ src_configure() { $(use_enable java ext-scripting-beanshell) \ $(use_enable kde kde4) \ $(use_enable mysql ext-mysql-connector) \ + $(use_enable nsplugin) \ $(use_enable odk) \ $(use_enable opengl) \ $(use_enable pdfimport ext-pdfimport) \ @@ -487,7 +489,7 @@ src_install() { rm -rf "${ED}"/etc/ # symlink the nsplugin to system location - if use gtk; then + if use nsplugin; then inst_plugin /usr/$(get_libdir)/libreoffice/program/libnpsoplugin.so fi -- 2.26.2