[gentoo-commits] dev/dilfridge:master commit in: app-office/karbon/

["Andreas Hüttel" <dilfridge@gentoo.org>]

commit:     10801bf40291a011f90808a507c018769e5abd3d
Author:     Andreas K. Huettel <andreas.huettel <AT> physik <DOT> uni-r <DOT> de>
AuthorDate: Tue May 24 11:41:23 2011 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Tue May 24 11:49:02 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=10801bf4

[app-office/karbon] Resync with tree

(Portage version: 2.1.9.49/git/Linux x86_64, RepoMan options: --force, signed Manifest commit with key 7887F787)

---
 app-office/karbon/ChangeLog                        |    6 ++++
 app-office/karbon/Manifest                         |   26 ++++++++++++++++++-
 .../{karbon-2.3.3.ebuild => karbon-2.2.2.ebuild}   |   12 ++++-----
 app-office/karbon/karbon-2.3.3.ebuild              |    4 +-
 4 files changed, 37 insertions(+), 11 deletions(-)

diff --git a/app-office/karbon/ChangeLog b/app-office/karbon/ChangeLog
index 8437683..8c32f61 100644
--- a/app-office/karbon/ChangeLog
+++ b/app-office/karbon/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*karbon-2.2.2 (24 May 2011)
+
+  24 May 2011; Andreas K. Huettel <dilfridge@gentoo.org> +karbon-2.2.2.ebuild,
+  karbon-2.3.3.ebuild:
+  Resync with tree
+
 *karbon-2.3.3 (23 Feb 2011)
 
   23 Feb 2011; Andreas K. Huettel <dilfridge@gentoo.org>

diff --git a/app-office/karbon/Manifest b/app-office/karbon/Manifest
index 3868479..734b402 100644
--- a/app-office/karbon/Manifest
+++ b/app-office/karbon/Manifest
@@ -1,8 +1,30 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
+DIST koffice-2.2.2.tar.bz2 56470974 RMD160 bdd75cb056e2fa96b799eeec0ecb5ed6b6aef4c2 SHA1 ab6405e0efae0d8e895879183f1369facae410e0 SHA256 e5b060f640dd7ecd13b5d17f7e9ace7c0d1c0621e5fb83529f6e6db2d5c1edcb
 DIST koffice-2.3.0.tar.bz2 75689297 RMD160 c4fb1ad0895a527f9c2abb96be64f45bf6a23a3c SHA1 4eda6ba3f56e9697cde37421b27de1f8da531ba1 SHA256 a8e9a3ed882536cc4ca59388cc82268478339d328b62daaaec1a7bc970b73e1c
 DIST koffice-2.3.1.tar.bz2 75687214 RMD160 0d40d38108bef14dfc04399c0f5505d38436102b SHA1 6337cb2efa8deec9a9fca57e5b604863475af1a0 SHA256 e73da38cfbfb2c6b7170767065addc0de38725e82c4fa49c76bcf375ee44f143
 DIST koffice-2.3.3.tar.bz2 75688999 RMD160 d91fadd686e7f4b773031b642c89c012690f754f SHA1 53eaac4d17922e9fff8cc8028612e581003e1add SHA256 31ba0d98c0d29c7b8ab97efdeb6c618b82177b2b0ec85da088178254da43c099
+EBUILD karbon-2.2.2.ebuild 880 RMD160 fd7d23d4833dcdde561687e3e393ebe631ac3baf SHA1 b47cd925b228c96e1df6e46bccaf390b5025507a SHA256 1f4b1e85fd1fd57cc610fba7c693ec9a0ae02a280f3db0bd9b6143919328cad6
 EBUILD karbon-2.3.0.ebuild 913 RMD160 38d3042d5cb847a2611ed6252b4491276dc0df66 SHA1 7d1f22147c5afda0efdd678e18f746428385dd25 SHA256 f3a57a0084000f6007070c5f66aee4d6be12d71bcc09ef7ab7b8ddac48ad51b7
 EBUILD karbon-2.3.1.ebuild 913 RMD160 38d3042d5cb847a2611ed6252b4491276dc0df66 SHA1 7d1f22147c5afda0efdd678e18f746428385dd25 SHA256 f3a57a0084000f6007070c5f66aee4d6be12d71bcc09ef7ab7b8ddac48ad51b7
-EBUILD karbon-2.3.3.ebuild 913 RMD160 38d3042d5cb847a2611ed6252b4491276dc0df66 SHA1 7d1f22147c5afda0efdd678e18f746428385dd25 SHA256 f3a57a0084000f6007070c5f66aee4d6be12d71bcc09ef7ab7b8ddac48ad51b7
-MISC ChangeLog 1292 RMD160 d95ba39a6e583658212a102e66cbe6d8f82216ff SHA1 1eede9609682bc9a5283cde4939b433ed6cbabf2 SHA256 57fb44183f082851fb69f19c5faa81a4ae5be31b0d434a0e6bf3cb1a8208d023
+EBUILD karbon-2.3.3.ebuild 910 RMD160 a320b7e00695778e6fc9a3b311eabf4444cfbd2b SHA1 fc74a5eb2600f9bc6fb236baa059a470605dab0d SHA256 bc6cd45a726607a620a62c92f661c76b74427cd5af0f188e465508ef2edd9962
+MISC ChangeLog 1443 RMD160 e2b7afa36acbc8e248e6247d17cb0f53306a8f26 SHA1 289c65ab1116787fe968d554708143b46ea263a2 SHA256 df80f521d66ae27b3aaca999e8b600dad54b571efc83db2c8f1f63df340f048c
 MISC metadata.xml 294 RMD160 f659e3aae5ebd8df5b9edb4e242335bbe63dff15 SHA1 bc9ee1e6b54d2fbfd080c7232cff6be7af58d337 SHA256 4c974c7e7e60514567d6a5683862a9d96ea993d6d3b427538315ff7eee1c40d6
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBCgAGBQJN25ljAAoJEEb+UGWnxTyH76YP/2iecXCiXOIFHOPTPJR9SzHd
+kUXRQ0Ef9bnp59l9dA9p5W7b+iqIAp8uYf0Ow18qtU9gyHey6muVEsA0ndoPjYYu
+oO7beyVXyakpw8r3X0u1C8NHmClkoGQsspvvQyJc6J4zL+W9MeZn/UhEXnCwUPQx
+wVBmYn1kllzsRdIXWplT4A+26jIZCyojr7c9B8Kno2Lfskb8Um/3qw2hIy2B2pOk
+EamG5ddtHIdGjeYbDdW0rn3JBoDTJhCw+PMM7YYxFxVcYpyxUrrziLJevT41NhNc
+FqtAUaCusGetCNCrj9Ch8EN3ldTPjq73hIJ8s1Q3Mc7SOCq60WBnZ70uf7Xrp+eB
+4m7VI19YZx0o0d70DHl0rSyTmuqVzRIhGI48rNpmfjNngPu8WgvYpdP/jITsbLop
+f2hzlS3C7InpIsUnfBfX6br0tBK/7kon2zk42wVb/srwFjx+LzRForvkjALTQM+Z
+h755KlUzf4bMivtpVAuLrqdT3OIrWBPDnCz6WMjnEgdUj9Q3EYG9OOHeT6dmJHMY
+gm5A/hfblWV6KG7hCRSWsLGuGQGEFTzkQ+NYhwrfILB+o4Yuy2vlQzAdxGutXdvP
+kr1voEYXVGHCwh54uAqCggOyLjuqGoOxQTN2Ic+FRcY5+ybh4yEjABAXVP+Hqm0l
+r5BQdoUoHI5Ax8zldPYx
+=tOWq
+-----END PGP SIGNATURE-----

diff --git a/app-office/karbon/karbon-2.3.3.ebuild b/app-office/karbon/karbon-2.2.2.ebuild
similarity index 72%
copy from app-office/karbon/karbon-2.3.3.ebuild
copy to app-office/karbon/karbon-2.2.2.ebuild
index e526df3..f4620b7 100644
--- a/app-office/karbon/karbon-2.3.3.ebuild
+++ b/app-office/karbon/karbon-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/karbon/karbon-2.3.0.ebuild,v 1.1 2011/01/14 20:38:15 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/karbon/karbon-2.2.2.ebuild,v 1.6 2011/03/13 08:13:04 dilfridge Exp $
 
-EAPI=3
+EAPI="3"
 KMNAME="koffice"
 KMMODULE="${PN}"
 
@@ -10,10 +10,10 @@ inherit kde4-meta
 
 DESCRIPTION="KOffice vector drawing application."
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+pstoedit wpg"
 
-DEPEND="
+DEPEND="<kde-base/kdelibs-4.6
 	media-libs/libart_lgpl
 	pstoedit? ( media-gfx/pstoedit )
 	wpg? ( media-libs/libwpg )
@@ -22,7 +22,6 @@ RDEPEND="${DEPEND}"
 
 KMEXTRA="filters/${KMMODULE}"
 KMEXTRACTONLY="
-	KoConfig.h.cmake
 	libs/
 	plugins/
 	filters/
@@ -41,6 +40,5 @@ 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"
+	rm -f "${ED}/usr/include/config-opengl.h"
 }

diff --git a/app-office/karbon/karbon-2.3.3.ebuild b/app-office/karbon/karbon-2.3.3.ebuild
index e526df3..85babb7 100644
--- a/app-office/karbon/karbon-2.3.3.ebuild
+++ b/app-office/karbon/karbon-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/karbon/karbon-2.3.0.ebuild,v 1.1 2011/01/14 20:38:15 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/karbon/karbon-2.3.3.ebuild,v 1.3 2011/05/09 23:12:04 hwoarang Exp $
 
 EAPI=3
 KMNAME="koffice"
@@ -10,7 +10,7 @@ inherit kde4-meta
 
 DESCRIPTION="KOffice vector drawing application."
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+pstoedit wpg"
 
 DEPEND="