Do not install koffice.desktop file, bug 381955

Package-Manager: portage-2.1.10.19/cvs/Linux x86_64

diff --git a/app-office/koffice-libs/ChangeLog b/app-office/koffice-libs/ChangeLog
index 6f430c4a9872380f03bcc1a0955bfa47d81c22d3..ac5896542de64f81a9bfb44bec3bfe14b8a10921 100644 (file)
--- a/app-office/koffice-libs/ChangeLog
+++ b/app-office/koffice-libs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-office/koffice-libs
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/koffice-libs/ChangeLog,v 1.129 2011/06/07 03:06:16 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/koffice-libs/ChangeLog,v 1.130 2011/09/22 21:37:39 dilfridge Exp $
+
+*koffice-libs-2.3.3-r1 (22 Sep 2011)
+
+  22 Sep 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  +koffice-libs-2.3.3-r1.ebuild:
+  Do not install koffice.desktop file, bug 381955
 
   07 Jun 2011; Jonathan Callen <abcd@gentoo.org> koffice-libs-2.3.3.ebuild:
   Use add_kdebase_dep() for KDE deps

diff --git a/app-office/koffice-libs/Manifest b/app-office/koffice-libs/Manifest
index e3cf1f0ae5be1615428421815b47494734d1b29f..ff582039566f66abcead4d3e680d6ed4a0f123e9 100644 (file)
--- a/app-office/koffice-libs/Manifest
+++ b/app-office/koffice-libs/Manifest
@@ -2,23 +2,24 @@
 Hash: SHA512
 
 DIST koffice-2.3.3.tar.bz2 75688999 RMD160 d91fadd686e7f4b773031b642c89c012690f754f SHA1 53eaac4d17922e9fff8cc8028612e581003e1add SHA256 31ba0d98c0d29c7b8ab97efdeb6c618b82177b2b0ec85da088178254da43c099
+EBUILD koffice-libs-2.3.3-r1.ebuild 1794 RMD160 4ae66c39ff70b17d53a35362d74b7ab825c51d15 SHA1 3d493bb79e775a2eca16530fe5febed8d90650b7 SHA256 a81902cdaef59f265abf66c78d0bcd1fc028ab201d873d3e946ee8c71c3df14c
 EBUILD koffice-libs-2.3.3.ebuild 1659 RMD160 65078b97c208e9e719c2fe5c84b2fcc5f35b885f SHA1 bb895e860fd9ea009801ae28c94d87f6b84cacee SHA256 b1343a398f6e06fd7132d489667674ef47de8678cf94c724572bdae91caaa4ea
-MISC ChangeLog 16386 RMD160 888b7d3ea1e550be23459d0b05566e7c4562f51b SHA1 4697677a34f3c9ca534cfa22a4cdd328c75994b8 SHA256 68b321a9dc20466b4787972d1bcec77ba1989db1a2101c47d0f667b8d607254f
+MISC ChangeLog 16570 RMD160 ea0611dd428cb5b6f988f6f5ecd81fd6f690a53d SHA1 c999c125dd49c9116745c68b9b529791548bf314 SHA256 c160ed407c8a0ee836d2d5a9a48212ff362b6db24369fd8290700992d305cf4c
 MISC metadata.xml 332 RMD160 ed621574ea5d0e836743ead9166a398f42cc04b3 SHA1 8e2a635c2a12f40aa51fc4d3a3ce09ba2f0c82bd SHA256 d7025e5f6f2138b0782cc89bc63f4a6be3bdb6cf35d7487b39950efa2d8bfb2f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJN7ZWuAAoJELHSF2kinlg4unAP/ibZuv0YEz/Qa8vGjfLyw+1v
-YcwmXfwpldj9gPL70htYhUR8x0wSbDE29RFQJgEOuWu5enfw8Qi7s0oZyDL4jZ18
-amjTkHYRZQ14/6Vlc+SRpFqOl7gvbSMi6UTieYEu2qgZEyZwoNvPn32Y67iPEKW5
-DZvUYZPPfxDsVboVcU0C5bJcmquCpngg8d1vuFa8i6f80M8ghV2yWfXoGitCwDrF
-C2suHWkH/yGzCkmIVKPl8jNMocY4/iQL9zjFwI+BUlgBtlMGUvoA3mAGT9k2Jde2
-L51sjvYzagZhnlM6r4N//9DP/CNPvLmxomyf9vKpLyT9Azd8eBVsw24MwdQZ5vsG
-wS1XOw88fsEOqEPiZgkUDUHTWodWDqdBVGrH0SXzTuqpZG5VZ/7dp12QjsYPhkKa
-N6b9APLZzAZi93EKDbwZsqyGh/fa5Lo5oDM7oCdFKbMEXMHFxiKrcbNG4eViSECS
-/K8zB9l0SFkn9tD9ewKwGnXNlaN0etgxKpm3gPgClkvPOwq/wlVa58kekIC4fEJt
-45/QnEFkYMbzvVKHULNd/4jafm54x/pj5ROZipbFdl+0kUKr6GXMqO58NBu5uUfM
-VAKGEB1G59hph1ES7SXG5A6im0inkrN6FVufA9VApSbQhrk/luXP4wNVSuPTi7UA
-3OcrMDY43APSvbN5p3M2
-=kwJW
+iQIcBAEBCgAGBQJOe6rKAAoJENwGBM22xffeb9UQAIKxKHbsh07Ctwm3eGK591uI
+mDCp+eDfMshgRVLK0z+1RppwGPO8aeLUsRph+XBMameCXqyS7XPyUYT9Z8Oees2o
+m3WnptMesqwVr6+aBEZBQGqY69w2FnqKn6Vk95xUQEczO5smMe0nyF3LTdsaAIg3
+HgQZ9rWthihOdu2OUqkcQ10Fxx5ujUk35NP+FyB4bTvXu93lKN6cPbt58rT/F4Ie
+6eCDhBh8ZnHbE8YT0KY/4CnABDwxdZTsSqBXMTIyJW4ZUhQ8SoxkJDS4VTjAcozT
+8uhZGqy4J0BuvBnY8MCalDAuTYlxv7rNBa7z591Io15JXMbVYZhV8f27/YOUIUgU
+j0AxlxQE7mNMDhzvqim/frVuhcByXsPvgm7ESwrnoryi0IH4psnCeueAJWz6O4Ar
+jFuN4yuW+a5Lq0YB0LOL+g23OcU7mOuQ86hBApfKl3WxBgrseb8/0KA7lmVVBHHA
+EbMBkNDps13DpQBH/VLELxIh5t+A9h4X6xxj8DEA+IGADFzAJQrxuFLrsQa0m87C
+QoeqgAxLmNhSYmT6n4wyL9XYvJfeUxBs25sIxnSpcvqMFae7AuoG5KrpTMYbdXmF
+NrImpILwFoJSi5g8MS35BlJkETl4yyDBKXDG8Za9vMBuVyuHe4XQ2vWVEedqfYvC
+4ZdidcZdLkFKJ9odhDbn
+=MMcD
 -----END PGP SIGNATURE-----

diff --git a/app-office/koffice-libs/koffice-libs-2.3.3-r1.ebuild b/app-office/koffice-libs/koffice-libs-2.3.3-r1.ebuild
new file mode 100644 (file)
index 0000000..df5278c
--- /dev/null
+++ b/app-office/koffice-libs/koffice-libs-2.3.3-r1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/koffice-libs/koffice-libs-2.3.3-r1.ebuild,v 1.1 2011/09/22 21:37:39 dilfridge Exp $
+
+EAPI=3
+
+KMNAME="koffice"
+KMMODULE="libs"
+OPENGL_REQUIRED="optional"
+CPPUNIT_REQUIRED="optional"
+inherit kde4-meta
+
+DESCRIPTION="Shared KOffice libraries"
+KEYWORDS="~amd64 ~x86"
+IUSE="crypt openexr reports"
+
+RDEPEND="
+       >=app-office/koffice-data-${PV}:${SLOT}
+       dev-libs/libxml2
+       dev-libs/libxslt
+       dev-libs/soprano
+       $(add_kdebase_dep kdepimlibs)
+       media-libs/lcms:0
+       crypt? ( app-crypt/qca:2 )
+       openexr? ( media-libs/openexr )
+       opengl? ( media-libs/mesa )
+       !app-office/kchart
+"
+DEPEND="${RDEPEND}"
+#      doc? ( app-doc/doxygen )"
+
+KMEXTRA="
+       doc/koffice/
+       doc/thesaurus/
+       filters/generic_wrapper/
+       filters/libkowmf/
+       filters/libmsooxml/
+       filters/xsltfilter/
+       filters/kchart/
+       filters/kformula/
+       interfaces/
+       kchart/
+       kformula/
+       kounavail/
+       plugins/
+       tools/
+"
+
+KMEXTRACTONLY="
+       KoConfig.h.cmake
+       doc/koffice.desktop
+       filters/
+"
+
+KMSAVELIBS="true"
+
+src_configure() {
+       mycmakeargs=(
+               $(cmake-utils_use_with crypt QCA2)
+               $(cmake-utils_use_with opengl OpenGL)
+               $(cmake-utils_use_with openexr OpenEXR)
+               -DWITH_Spnav=OFF
+               -DBUILD_kchart=ON
+               -DBUILD_kformula=ON
+               $(cmake-utils_use_build reports koreport)
+       )
+       use crypt && \
+               mycmakeargs+=(-DQCA2_LIBRARIES=/usr/$(get_libdir)/qca2/libqca.so.2)
+
+       kde4-meta_src_configure
+}
+
+src_install() {
+       newdoc kounavail/README README.kounavail || die
+
+       kde4-meta_src_install
+
+       # this is already installed by koffice-data
+       rm -f "${D}/usr/include/config-opengl.h"
+       rm -f "${D}/usr/include/KoConfig.h"
+
+       # this is not useful and only leads to error messages, bug 381955
+       rm -f "${D}/usr/share/applications/kde4/koffice.desktop"
+}