summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas K. Huettel (dilfridge) <mail@akhuettel.de>2011-01-12 21:51:08 +0100
committerAndreas K. Huettel (dilfridge) <mail@akhuettel.de>2011-01-12 21:51:08 +0100
commit8921ca88d104149a0e8c1098afe89935babb4af6 (patch)
treec856d95b151ac67714a0fb27becf49cd40fad3b9
parent20d1d4dee64cff6a019ddd421d028ee3376955dd (diff)
downloadkde-8921ca88d104149a0e8c1098afe89935babb4af6.tar.gz
kde-8921ca88d104149a0e8c1098afe89935babb4af6.tar.bz2
kde-8921ca88d104149a0e8c1098afe89935babb4af6.zip
[app-office/kpresenter] Bump EAPI; update live ebuild
(Portage version: 2.1.9.30/git/Linux x86_64, signed Manifest commit with key B6C5F7DE)
-rw-r--r--app-office/kpresenter/Manifest30
-rw-r--r--app-office/kpresenter/kpresenter-2.3.0.ebuild6
-rw-r--r--app-office/kpresenter/kpresenter-9999.ebuild16
3 files changed, 31 insertions, 21 deletions
diff --git a/app-office/kpresenter/Manifest b/app-office/kpresenter/Manifest
index 47b1993505e..fadbae8e682 100644
--- a/app-office/kpresenter/Manifest
+++ b/app-office/kpresenter/Manifest
@@ -2,23 +2,23 @@
Hash: SHA1
DIST koffice-2.3.0.tar.bz2 75689297 RMD160 c4fb1ad0895a527f9c2abb96be64f45bf6a23a3c SHA1 4eda6ba3f56e9697cde37421b27de1f8da531ba1 SHA256 a8e9a3ed882536cc4ca59388cc82268478339d328b62daaaec1a7bc970b73e1c
-EBUILD kpresenter-2.3.0.ebuild 756 RMD160 7c4c2f8115847f4e58176a3cf4b1cc5e697076f2 SHA1 9de540d08ff8899374c4fdd5e072190997b63f41 SHA256 ff253a8791ccb36614c57c1b7b5d939bb9dccb8b400f9d2939ed5832ec7afbce
-EBUILD kpresenter-9999.ebuild 548 RMD160 0e86eaff7cfa0c212d6b9a8e649ce05a7efd1993 SHA1 aa79bbf2cecd267a93a0f754b21a2109b0916628 SHA256 3b85f3ddfd1e07892cac899462ee9d49c6c94c99dc8380213afc7a7e914b2f3e
+EBUILD kpresenter-2.3.0.ebuild 644 RMD160 094281f4ed2fa5830c6255495bd26f6758f16846 SHA1 95c0b0288b423686a2a32b065a0168c2a82bc1a9 SHA256 693fdbbcb980e4ad52bb994a7e376c38c20fdd65106a651bd2cdc16e08c6a54e
+EBUILD kpresenter-9999.ebuild 753 RMD160 5fe0cce4fca724d4538d7ac9cbb5528efd7f0087 SHA1 e4a336f1ff779c78fb344bb95ea83adc67c25989 SHA256 20970081010fc9311c537e244ad6b13e404fab39809ff0888bcb05050d415ff6
MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.16 (GNU/Linux)
-iQIcBAEBAgAGBQJNKQ+uAAoJENwGBM22xffeYSgP/2zfhNGZ3kv7gKXlMoLbpFIv
-D5ugdLT/vce1VQeQGZGuQVwSC/Sdkjzhg89s817DDxHbN096j75zle3XCsNB87cX
-3tYh0Q4Yb4rR4M2si3oLzSw/bOiDkcOfqfQeHcFmlEg3tvd+MtHWqIfPuHmFns5e
-wK0SF3AavVC1OfoUGotToKFQU/lk5EAMjR6yAm1/3WsEToO+kj3vI+fLehsX7Doh
-nftZsEXiA2gYAqbf+2jmo+KStm1AcBsv3FSMYUAtqnxuXYDvzRet4wz0j9T3pnG1
-1NciEAX8lr2ez/uihUe0Gti4A2elCuYTDPhWDc06LX938ue/jwDwEX6K8gYdLABy
-9VcwkN1/6tAf4WslSVtHyqTH+D7hn2INk+zcObH0GAdR/MCZi8gblLl6SX4liwoS
-T+6AwNjSlGQ35iX97TuCIBa2oD9r1Up4rt5I/cJgD4OpoIMUEnZMovhbDAcrlDb3
-w5JYfPAtLQmgPxZFXYCPUKaDT1ts5jsM15Mo5STOFnNrNAEH3dTL0bia9uBbiEXO
-5YsUxCiPKPevXBl/NNyc3jZFrkZoskYW+C0nvykp4nIZnpheDVHkLotSuJaEksd6
-ei2465fKUGDkRPvcSJxXnIbsO4qf5M9GytZq6jJY2dBmEBc7L73z+TvWXInMaH3m
-VbX1fQfxJdaIi5Oe/E9v
-=utiD
+iQIcBAEBAgAGBQJNLhQ8AAoJENwGBM22xffevH0QAKJIwKWrSmLFfSLNGQtDPjui
+/2VcTAazBPpf56UgCtelwaxG2mIyCSb7BvBl4FeQG+fmfxLCYfZfRQWFCGLObnVP
+9Opba4pZwUb7Wb0KCBix9D2ESNCvn9OBZjx/N4mZZ9UlY19WCdC1qoru7MoNnDcp
+qLeOF6udhr9UnUfQPEBkeks2hCr3STR8RaA4TVFi+7w8uLDfz0GEC9gdxot+yGCt
+dLeARJ0P2rTCbviYlUpEZlMsgz/uN81Lj7tlqAwjA/FgCv5rP9Im//14ZIvyGzPU
+pHWFnNYBiYq4Ca07cOJ2ne6+gfWHqSKLUvzYhCtBNNbDghLewbxkx7FVqUz936wJ
+vEp6YmxrkEr8bOLUGRGLWCDUTUSr8CSPze9LjAgwkITTGV2MkQFWUHadpJZT54rU
+DOllhgIdvqvs7YophbZtdu/8cuorGqrFMweoytNrmOmF4GMBpaGC3QL5DdNQHgQK
+XmsYeh8UAcBPfSWJ+/c2f+xHHi20iGpALFaLOwZrzN56qXjByTWLpnZBBLnWSaXH
+fMFV6F+5szWTrVRBH7V3GGyJsOyx/oK/7/nYh+p2amWyDbfUpXRg7mHBVA7P8Nwo
+1VHKseQGxBb/VCphE0dUaD+c+H/9v5duWLC3inuzX9JWYjR6MMH3h+LrLbtVGfnC
+svihGRbmTDn81kwRuaph
+=Mvun
-----END PGP SIGNATURE-----
diff --git a/app-office/kpresenter/kpresenter-2.3.0.ebuild b/app-office/kpresenter/kpresenter-2.3.0.ebuild
index 5d015e10e8f..a69f8866ce7 100644
--- a/app-office/kpresenter/kpresenter-2.3.0.ebuild
+++ b/app-office/kpresenter/kpresenter-2.3.0.ebuild
@@ -1,14 +1,14 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kpresenter/kpresenter-2.2.2.ebuild,v 1.4 2010/11/04 13:43:41 hwoarang Exp $
+# $Header: $
-EAPI="2"
+EAPI=3
KMNAME="koffice"
KMMODULE="${PN}"
inherit kde4-meta
-DESCRIPTION="KOffice presentation program."
+DESCRIPTION="KOffice presentation program"
KEYWORDS="~amd64 ~x86"
IUSE=""
diff --git a/app-office/kpresenter/kpresenter-9999.ebuild b/app-office/kpresenter/kpresenter-9999.ebuild
index 70160ed96e8..d01fb904898 100644
--- a/app-office/kpresenter/kpresenter-9999.ebuild
+++ b/app-office/kpresenter/kpresenter-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -7,13 +7,13 @@
# ebuild is more or less unmaintained.
#
-EAPI="2"
+EAPI=3
KMNAME="koffice"
KMMODULE="${PN}"
inherit kde4-meta
-DESCRIPTION="KOffice presentation program."
+DESCRIPTION="KOffice presentation program"
KEYWORDS=""
IUSE=""
@@ -22,7 +22,9 @@ DEPEND=">=dev-libs/boost-1.35.0"
RDEPEND="${DEPEND}"
KMEXTRACTONLY="
+ KoConfig.h.cmake
filters/libmsooxml/
+ filters/kspread/xlsx/
libs/
"
KMEXTRA="
@@ -31,3 +33,11 @@ KMEXTRA="
"
KMLOADLIBS="koffice-libs"
+
+src_install() {
+ 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"
+}