From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QOq8l-0006Lz-7X for garchives@archives.gentoo.org; Tue, 24 May 2011 11:51:13 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6A7C31C4A1; Tue, 24 May 2011 11:50:34 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 2862B1C4A0 for ; Tue, 24 May 2011 11:50:34 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7A4211B4039 for ; Tue, 24 May 2011 11:50:33 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id A40BE80510 for ; Tue, 24 May 2011 11:50:32 +0000 (UTC) From: "Andreas Hüttel" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Hüttel" Message-ID: <3866ad335eae8b522df20e38a65637baaef78c46.dilfridge@gentoo> Subject: [gentoo-commits] dev/dilfridge:master commit in: app-office/koffice-libs/ X-VCS-Repository: dev/dilfridge X-VCS-Files: app-office/koffice-libs/ChangeLog app-office/koffice-libs/Manifest app-office/koffice-libs/koffice-libs-2.2.2.ebuild app-office/koffice-libs/koffice-libs-2.3.3.ebuild X-VCS-Directories: app-office/koffice-libs/ X-VCS-Committer: dilfridge X-VCS-Committer-Name: Andreas Hüttel X-VCS-Revision: 3866ad335eae8b522df20e38a65637baaef78c46 Date: Tue, 24 May 2011 11:50:32 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 0c2f7d3fe957cea8e6254ec0bf44d0e0 commit: 3866ad335eae8b522df20e38a65637baaef78c46 Author: Andreas K. Huettel physik uni-r <= DOT> de> AuthorDate: Tue May 24 11:44:22 2011 +0000 Commit: Andreas H=C3=BCttel gentoo org> CommitDate: Tue May 24 11:49:02 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Ddev/dilfridge.git;= a=3Dcommit;h=3D3866ad33 [app-office/koffice-libs] Resync with tree (Portage version: 2.1.9.49/git/Linux x86_64, RepoMan options: --force, si= gned Manifest commit with key 7887F787) --- app-office/koffice-libs/ChangeLog | 6 ++++ app-office/koffice-libs/Manifest | 26 ++++++++++++++= ++++- ...libs-2.3.3.ebuild =3D> koffice-libs-2.2.2.ebuild} | 22 +++++++++---= ---- app-office/koffice-libs/koffice-libs-2.3.3.ebuild | 6 +++- 4 files changed, 46 insertions(+), 14 deletions(-) diff --git a/app-office/koffice-libs/ChangeLog b/app-office/koffice-libs/= ChangeLog index f2f84ad..471cb35 100644 --- a/app-office/koffice-libs/ChangeLog +++ b/app-office/koffice-libs/ChangeLog @@ -2,6 +2,12 @@ # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ =20 +*koffice-libs-2.2.2 (24 May 2011) + + 24 May 2011; Andreas K. Huettel + +koffice-libs-2.2.2.ebuild, koffice-libs-2.3.3.ebuild: + Resync with tree + *koffice-libs-2.3.3 (23 Feb 2011) =20 23 Feb 2011; Andreas K. Huettel diff --git a/app-office/koffice-libs/Manifest b/app-office/koffice-libs/M= anifest index 3208fe3..bb47252 100644 --- a/app-office/koffice-libs/Manifest +++ b/app-office/koffice-libs/Manifest @@ -1,11 +1,33 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA512 + AUX koffice-libs-2.2.0-kspreadcommon.patch 744 RMD160 02173829041b40acef= 6aaa83338920ae492af120 SHA1 96abc53524fb2a9955326499ac084d2291a65762 SHA2= 56 8577e3c9b5a00bc14379e92fdb556ac911ace2d2caa975f8ca88ab18cc956ef3 AUX koffice-libs-2.2.1-kspreadcommon.patch 744 RMD160 02173829041b40acef= 6aaa83338920ae492af120 SHA1 96abc53524fb2a9955326499ac084d2291a65762 SHA2= 56 8577e3c9b5a00bc14379e92fdb556ac911ace2d2caa975f8ca88ab18cc956ef3 AUX koffice-libs-2.2.2-kspreadcommon.patch 744 RMD160 02173829041b40acef= 6aaa83338920ae492af120 SHA1 96abc53524fb2a9955326499ac084d2291a65762 SHA2= 56 8577e3c9b5a00bc14379e92fdb556ac911ace2d2caa975f8ca88ab18cc956ef3 +DIST koffice-2.2.2.tar.bz2 56470974 RMD160 bdd75cb056e2fa96b799eeec0ecb5= ed6b6aef4c2 SHA1 ab6405e0efae0d8e895879183f1369facae410e0 SHA256 e5b060f6= 40dd7ecd13b5d17f7e9ace7c0d1c0621e5fb83529f6e6db2d5c1edcb DIST koffice-2.3.0.tar.bz2 75689297 RMD160 c4fb1ad0895a527f9c2abb96be64f= 45bf6a23a3c SHA1 4eda6ba3f56e9697cde37421b27de1f8da531ba1 SHA256 a8e9a3ed= 882536cc4ca59388cc82268478339d328b62daaaec1a7bc970b73e1c DIST koffice-2.3.1.tar.bz2 75687214 RMD160 0d40d38108bef14dfc04399c0f550= 5d38436102b SHA1 6337cb2efa8deec9a9fca57e5b604863475af1a0 SHA256 e73da38c= fbfb2c6b7170767065addc0de38725e82c4fa49c76bcf375ee44f143 DIST koffice-2.3.3.tar.bz2 75688999 RMD160 d91fadd686e7f4b773031b642c89c= 012690f754f SHA1 53eaac4d17922e9fff8cc8028612e581003e1add SHA256 31ba0d98= c0d29c7b8ab97efdeb6c618b82177b2b0ec85da088178254da43c099 +EBUILD koffice-libs-2.2.2.ebuild 1735 RMD160 457e0305e46aa0d8e8598c4529a= 7bb16efa9ac43 SHA1 73641316a28381b68b95d516009e149c93f2e4c3 SHA256 09d346= a9ea1fc80b3f0a7606385a6b399f24bdcba8480e31b554c22316e05974 EBUILD koffice-libs-2.3.0.ebuild 1636 RMD160 26272edd09aad471f9317d95844= eb2e3d41ed71b SHA1 4d48dd3896f680fae8a21d7e9f51cc9a247aecce SHA256 4a8f9f= 1e09370b3966e1169babad4a828872897135330c93fb0deb186a699f93 EBUILD koffice-libs-2.3.1.ebuild 1636 RMD160 568797daeee6ed5343d5eca7a8e= df1c3c90d39b7 SHA1 98905c837b62fc7226b708058ffb18c5bd9c1af2 SHA256 464633= f44d665db9a1447b83f216845fb7864c73704ebdc6b581ca39037c3a56 -EBUILD koffice-libs-2.3.3.ebuild 1636 RMD160 568797daeee6ed5343d5eca7a8e= df1c3c90d39b7 SHA1 98905c837b62fc7226b708058ffb18c5bd9c1af2 SHA256 464633= f44d665db9a1447b83f216845fb7864c73704ebdc6b581ca39037c3a56 -MISC ChangeLog 1608 RMD160 223c61feb6906c34c5da6a1bb9002c0c00bdf3af SHA1= 42c6d5dd16b32e9546d4a55c4cfdc4ad9343c297 SHA256 396456758b72533f4239154b= d49220a5d3b443bffd00b157fc17344547ff6d48 +EBUILD koffice-libs-2.3.3.ebuild 1670 RMD160 373793aa819b100a9fca19ef59a= 7945ff4128522 SHA1 1e234a4d6a5f9798d4f9c8bfde2d90cc1269b961 SHA256 f07f49= 5d9c09b654bba1dccd18bbdfe46be969768180e5c58c63256ad6ee08b5 +MISC ChangeLog 1777 RMD160 18103a4b8d369a1b3a91267388fa59275e3238c0 SHA1= 1a1a5a9e539bdc76cdb159187f9ffd10d46e0f43 SHA256 5c5278b7b70f1a7178acfb50= f0643dffb7d0fafeb1d7f56b15e94390997d3482 MISC metadata.xml 271 RMD160 7b873f7a7117b4be86538c470d85278a9992dc73 SH= A1 4f1267a34b3c7a5f0d021bd57e19432e534e5808 SHA256 22d63c4f9ae597569bdb4a= 549b2b0e7dddb300759fb59c61f46d1a365c6110f0 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.17 (GNU/Linux) + +iQIcBAEBCgAGBQJN25oWAAoJEEb+UGWnxTyHKncP/io3hs5Y6AlF66nBL86WwayW +G07leIPRDZfd7w/KuX5sqAE9zieTf06gu2xTPLVi5AdroW27uIKM6DDU8iNBxTem ++/EVV5nqwyYGGua5P8UmBk+S8VxY6vtc4hUQHqAQQs0gwhfBxkgCgDz16ZczQuns +Z8GEEDASjmrAN/dC8hLlk7DQlsFm9iuufcGxHF37sJpOcOl1plSKVwHz0ctO7y+s +FtOuF4CLVyEFOI6z8X02iym8e2PO5eGFwYvNauHbtJHFO8KHlgDrGWHgcal+Mi43 +MRJb1csHjeNydpSYlV7aAkpnvK0FDD2UDaTdcsroFOUZgabUGk9jpLGR+EB/kE92 +WIOW6Bpv3HoXoKp8lMD6nY28jm2kFYp4w3zTd9orSynwHCruaoOG3pBJSOZiCr7d +Y+Zo1JsUXebhuD6FPnYpZORr1Rpt93Bto36WTWJXPwVxbC3u1HSbLir89HpxmNnj +DIxrzHOGN8mWccojM6B+UdInvPZnABOCde+Z6Mh7IN9X42c7C/L1jmqrChcn5L98 +VIscuSLd84wlXtfycT6/RlHkp1k1fd1F0UMpul2vKPJGuldR2lUt2tLjVPhIbkHm +2c/SYSINdhwCgt/3luDt04XCpssjENQ2euPJidEcW7fxQAyBr7GATNrTQOKu9Buo +T4PoKJSCQsNBXF7lJFIz +=3Dy8AH +-----END PGP SIGNATURE----- diff --git a/app-office/koffice-libs/koffice-libs-2.3.3.ebuild b/app-offi= ce/koffice-libs/koffice-libs-2.2.2.ebuild similarity index 82% copy from app-office/koffice-libs/koffice-libs-2.3.3.ebuild copy to app-office/koffice-libs/koffice-libs-2.2.2.ebuild index 8790c35..58fa612 100644 --- a/app-office/koffice-libs/koffice-libs-2.3.3.ebuild +++ b/app-office/koffice-libs/koffice-libs-2.2.2.ebuild @@ -1,8 +1,8 @@ # 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.1.ebuild,v 1.1 2011/01/20 00:09:10 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/koffice-libs/koffice-libs-= 2.2.2.ebuild,v 1.7 2011/03/13 08:29:22 dilfridge Exp $ =20 -EAPI=3D3 +EAPI=3D"3" =20 KMNAME=3D"koffice" KMMODULE=3D"libs" @@ -11,10 +11,12 @@ CPPUNIT_REQUIRED=3D"optional" inherit kde4-meta =20 DESCRIPTION=3D"Shared KOffice libraries." -KEYWORDS=3D"~amd64 ~x86" +KEYWORDS=3D"amd64 x86" IUSE=3D"crypt openexr reports" =20 -RDEPEND=3D" +# the contents of kchart have been moved into koffice-libs in 2.2.0 + +RDEPEND=3D"=3Dapp-office/koffice-data-${PV}:${SLOT} dev-libs/libxml2 dev-libs/libxslt @@ -28,6 +30,8 @@ RDEPEND=3D" DEPEND=3D"${RDEPEND}" # doc? ( app-doc/doxygen )" =20 +PATCHES=3D( "${FILESDIR}/${P}-kspreadcommon.patch" ) + KMEXTRA=3D" doc/koffice/ doc/thesaurus/ @@ -38,15 +42,14 @@ KMEXTRA=3D" filters/kchart/ filters/kformula/ interfaces/ - kchart/ - kformula/ kounavail/ plugins/ tools/ + kchart/ + kformula/ " - +# doc/api/" KMEXTRACTONLY=3D" - KoConfig.h.cmake doc/koffice.desktop filters/ " @@ -74,6 +77,5 @@ src_install() { kde4-meta_src_install =20 # this is already installed by koffice-data - rm -f "${D}/usr/include/config-opengl.h" - rm -f "${D}/usr/include/KoConfig.h" + rm -f "${ED}/usr/include/config-opengl.h" } diff --git a/app-office/koffice-libs/koffice-libs-2.3.3.ebuild b/app-offi= ce/koffice-libs/koffice-libs-2.3.3.ebuild index 8790c35..5d6b7d2 100644 --- a/app-office/koffice-libs/koffice-libs-2.3.3.ebuild +++ b/app-office/koffice-libs/koffice-libs-2.3.3.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/koffice-libs/koffice-libs-= 2.3.1.ebuild,v 1.1 2011/01/20 00:09:10 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/koffice-libs/koffice-libs-= 2.3.3.ebuild,v 1.4 2011/05/09 23:12:48 hwoarang Exp $ =20 EAPI=3D3 =20 @@ -11,13 +11,14 @@ CPPUNIT_REQUIRED=3D"optional" inherit kde4-meta =20 DESCRIPTION=3D"Shared KOffice libraries." -KEYWORDS=3D"~amd64 ~x86" +KEYWORDS=3D"amd64 x86" IUSE=3D"crypt openexr reports" =20 RDEPEND=3D" >=3Dapp-office/koffice-data-${PV}:${SLOT} dev-libs/libxml2 dev-libs/libxslt + dev-libs/soprano >=3Dkde-base/kdepimlibs-${KDE_MINIMAL} media-libs/lcms:0 crypt? ( app-crypt/qca:2 ) @@ -58,6 +59,7 @@ src_configure() { $(cmake-utils_use_with crypt QCA2) $(cmake-utils_use_with opengl OpenGL) $(cmake-utils_use_with openexr OpenEXR) + -DWITH_Spnav=3DOFF -DBUILD_kchart=3DON -DBUILD_kformula=3DON $(cmake-utils_use_build reports koreport)