Version bump.

Package-Manager: portage-2.0.54

64 files changed, 891 insertions, 314 deletions

diff --git a/app-office/karbon/ChangeLog b/app-office/karbon/ChangeLog
index ff2c5d00200b..c31e9131db47 100644
--- a/app-office/karbon/ChangeLog
+++ b/app-office/karbon/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-office/karbon
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/karbon/ChangeLog,v 1.29 2006/02/21 23:55:36 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/karbon/ChangeLog,v 1.30 2006/03/11 15:55:07 carlo Exp $
+
+*karbon-1.5_beta2 (11 Mar 2006)
+
+  11 Mar 2006; Carsten Lohrke <carlo@gentoo.org> +karbon-1.5_beta2.ebuild:
+  Version bump.
 
   21 Feb 2006; Aron Griffis <agriffis@gentoo.org> karbon-1.4.2.ebuild:
   Mark 1.4.2 stable on ia64
diff --git a/app-office/karbon/Manifest b/app-office/karbon/Manifest
index d81fbde96975..34f325d39680 100644
--- a/app-office/karbon/Manifest
+++ b/app-office/karbon/Manifest
@@ -1,28 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 ff663c4d4897c3453eee29ea2d4cac1b ChangeLog 3207
-RMD160 512e199fc628a6d6cda8c7d28b3ee7113cb9b7fc ChangeLog 3207
-SHA256 c753fec9d3a7e3669f722115b9bcdd6234a77d256b48a2f235975bf2bdcc33bb ChangeLog 3207
+MD5 20abdd687fdfbbc38e9af2d53e7386a2 ChangeLog 3332
 MD5 902823ac54984271d00a3e72454440b1 files/digest-karbon-1.4.2 250
-RMD160 c2b4361538cd32dbfd79218c5fef8e4d6818ac3f files/digest-karbon-1.4.2 250
-SHA256 40d4d888fb4050306c03d0ea47b3c6c6448301faea176ef95e616071a57aba1e files/digest-karbon-1.4.2 250
 MD5 82af01b67d83c02945f1e26ae9529232 files/digest-karbon-1.5_beta1 253
-RMD160 0e78237b9b17a1c13e8f3a1031875bddec8bafdb files/digest-karbon-1.5_beta1 253
-SHA256 43ee5c0ab325495515723afb3fc2e4bc79eba3f6987fbc2dad504492e5a6e076 files/digest-karbon-1.5_beta1 253
+MD5 a08e04910037e4b3b9e9cbfb92eda61e files/digest-karbon-1.5_beta2 69
 MD5 420ed53c8e73ffa9d45e25d2904f7610 karbon-1.4.2.ebuild 1180
-RMD160 caa3bd376e3509f6e0165ff3c6993998d87535e7 karbon-1.4.2.ebuild 1180
-SHA256 22e65fe758fdaab15d0d3de77d5ca97d968332be5f4cef47e9625b507fbb0063 karbon-1.4.2.ebuild 1180
 MD5 42a51c7d47ecf144e20577a93e9a3fd2 karbon-1.5_beta1.ebuild 1172
-RMD160 840e4b73b1f8a96626a9056ffe5a12acbc072407 karbon-1.5_beta1.ebuild 1172
-SHA256 6be23f78e9b1caae150dae12951af7fc0bd2d47c9aa6c53ee10c906b71a61c4c karbon-1.5_beta1.ebuild 1172
+MD5 42a51c7d47ecf144e20577a93e9a3fd2 karbon-1.5_beta2.ebuild 1172
 MD5 02039d51ca4a42817775fd436dfaa956 metadata.xml 157
-RMD160 9258d9691830e58ee00ca89f0a6df9ce077f2439 metadata.xml 157
-SHA256 e0e268ca18fef286617fcfe97773d5df5b8fbdb5fbcb9a29adc5e8b0baea4292 metadata.xml 157
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.1 (GNU/Linux)
-
-iD8DBQFD+6iBJrHF4yAQTrARAs9XAKCOIcaCSyl74CKImDNhAVrpwLWWWgCfTV2d
-ZobST/JPbj1JW6zOaCN0Ijw=
-=bBOI
------END PGP SIGNATURE-----
diff --git a/app-office/karbon/files/digest-karbon-1.5_beta2 b/app-office/karbon/files/digest-karbon-1.5_beta2
new file mode 100644
index 000000000000..00714a77907c
--- /dev/null
+++ b/app-office/karbon/files/digest-karbon-1.5_beta2
@@ -0,0 +1 @@
+MD5 ddeca5c989e892baf4871a443fd2daea koffice-1.4.95.tar.bz2 36891017
diff --git a/app-office/karbon/karbon-1.5_beta2.ebuild b/app-office/karbon/karbon-1.5_beta2.ebuild
new file mode 100644
index 000000000000..f7190532bfa8
--- /dev/null
+++ b/app-office/karbon/karbon-1.5_beta2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/karbon/karbon-1.5_beta2.ebuild,v 1.1 2006/03/11 15:55:07 carlo Exp $
+
+MAXKOFFICEVER=${PV}
+KMNAME=koffice
+inherit kde-meta eutils
+
+DESCRIPTION="KOffice vector drawing application."
+HOMEPAGE="http://www.koffice.org/"
+LICENSE="GPL-2 LGPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND="$(deprange $PV $MAXKOFFICEVER app-office/koffice-libs)
+	>=media-gfx/imagemagick-5.5.2
+	>=media-libs/freetype-2
+	media-libs/fontconfig
+	media-libs/libart_lgpl"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+KMCOPYLIB="
+	libkformula lib/kformula
+	libkofficecore lib/kofficecore
+	libkofficeui lib/kofficeui
+	libkopainter lib/kopainter
+	libkopalette lib/kopalette
+	libkotext lib/kotext
+	libkwmf lib/kwmf
+	libkowmf lib/kwmf
+	libkstore lib/store"
+
+KMEXTRACTONLY="lib/"
+
+KMCOMPILEONLY="filters/liboofilter"
+
+KMEXTRA="filters/karbon"
+
+need-kde 3.4
+
+src_unpack() {
+	kde-meta_src_unpack unpack
+
+	# We need to compile liboofilter first
+	echo "SUBDIRS = liboofilter karbon" > $S/filters/Makefile.am
+
+	kde-meta_src_unpack makefiles
+}
diff --git a/app-office/kchart/ChangeLog b/app-office/kchart/ChangeLog
index bfd20a6355ef..63703850c9e4 100644
--- a/app-office/kchart/ChangeLog
+++ b/app-office/kchart/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-office/kchart
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kchart/ChangeLog,v 1.30 2006/02/22 00:07:01 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kchart/ChangeLog,v 1.31 2006/03/11 15:55:56 carlo Exp $
+
+*kchart-1.5_beta2 (11 Mar 2006)
+
+  11 Mar 2006; Carsten Lohrke <carlo@gentoo.org> +kchart-1.5_beta2.ebuild:
+  Version bump.
 
   22 Feb 2006; Aron Griffis <agriffis@gentoo.org> kchart-1.4.2.ebuild:
   Mark 1.4.2 stable on ia64
diff --git a/app-office/kchart/Manifest b/app-office/kchart/Manifest
index b4cae593a2af..d26cf843df51 100644
--- a/app-office/kchart/Manifest
+++ b/app-office/kchart/Manifest
@@ -1,28 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 5ff64bd414e0f35043bc9988e11c5f3a ChangeLog 3407
-RMD160 6ce2445d7a25e1b7bd5b314931ae86be3e52763e ChangeLog 3407
-SHA256 39d2b35fddf17dc12700b4fd61408ff9a16527bab2031b784281ea0624e66f47 ChangeLog 3407
+MD5 a66b280739ef1473b93a925687a640c6 ChangeLog 3532
 MD5 902823ac54984271d00a3e72454440b1 files/digest-kchart-1.4.2 250
-RMD160 c2b4361538cd32dbfd79218c5fef8e4d6818ac3f files/digest-kchart-1.4.2 250
-SHA256 40d4d888fb4050306c03d0ea47b3c6c6448301faea176ef95e616071a57aba1e files/digest-kchart-1.4.2 250
 MD5 82af01b67d83c02945f1e26ae9529232 files/digest-kchart-1.5_beta1 253
-RMD160 0e78237b9b17a1c13e8f3a1031875bddec8bafdb files/digest-kchart-1.5_beta1 253
-SHA256 43ee5c0ab325495515723afb3fc2e4bc79eba3f6987fbc2dad504492e5a6e076 files/digest-kchart-1.5_beta1 253
+MD5 a08e04910037e4b3b9e9cbfb92eda61e files/digest-kchart-1.5_beta2 69
 MD5 b2be4f48d6c3a22f2b019b15f3901e52 kchart-1.4.2.ebuild 908
-RMD160 b72b6bd533a6e76ef0ebcf1537edfc124b7180bf kchart-1.4.2.ebuild 908
-SHA256 b026bc8550f4b9e076a6d97064a36d5bdc8164c2600d631d86388f878a8d66b4 kchart-1.4.2.ebuild 908
 MD5 ccd720eaac7e71e78e57335104c8a7ac kchart-1.5_beta1.ebuild 1096
-RMD160 4863d90f18fc7e4c105760376bf9f35ae752db10 kchart-1.5_beta1.ebuild 1096
-SHA256 f7cee35d86e41cf89a288ec0e37fc150ac0ad40376f62e522824e4e3c639cbef kchart-1.5_beta1.ebuild 1096
+MD5 ccd720eaac7e71e78e57335104c8a7ac kchart-1.5_beta2.ebuild 1096
 MD5 02039d51ca4a42817775fd436dfaa956 metadata.xml 157
-RMD160 9258d9691830e58ee00ca89f0a6df9ce077f2439 metadata.xml 157
-SHA256 e0e268ca18fef286617fcfe97773d5df5b8fbdb5fbcb9a29adc5e8b0baea4292 metadata.xml 157
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.1 (GNU/Linux)
-
-iD8DBQFD+6svJrHF4yAQTrARAha/AKDNoaO0yXUQmHz+IeS+n/t5O1si7ACeMfcW
-47UvuHQaC/Dc8PImdvvXgi0=
-=MJao
------END PGP SIGNATURE-----
diff --git a/app-office/kchart/files/digest-kchart-1.5_beta2 b/app-office/kchart/files/digest-kchart-1.5_beta2
new file mode 100644
index 000000000000..00714a77907c
--- /dev/null
+++ b/app-office/kchart/files/digest-kchart-1.5_beta2
@@ -0,0 +1 @@
+MD5 ddeca5c989e892baf4871a443fd2daea koffice-1.4.95.tar.bz2 36891017
diff --git a/app-office/kchart/kchart-1.5_beta2.ebuild b/app-office/kchart/kchart-1.5_beta2.ebuild
new file mode 100644
index 000000000000..730f2cbdf03b
--- /dev/null
+++ b/app-office/kchart/kchart-1.5_beta2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/kchart/kchart-1.5_beta2.ebuild,v 1.1 2006/03/11 15:55:56 carlo Exp $
+
+MAXKOFFICEVER=${PV}
+KMNAME=koffice
+inherit kde-meta eutils
+
+DESCRIPTION="KOffice integrated graph and chart drawing tool."
+HOMEPAGE="http://www.koffice.org/"
+LICENSE="GPL-2 LGPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND="$(deprange $PV $MAXKOFFICEVER app-office/koffice-libs)"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+KMCOPYLIB="libkformula lib/kformula
+	libkofficecore lib/kofficecore
+	libkofficeui lib/kofficeui
+	libkopainter lib/kopainter
+	libkotext lib/kotext
+	libkwmf lib/kwmf
+	libkowmf lib/kwmf
+	libkstore lib/store
+	libkochart interfaces"
+
+KMEXTRACTONLY="lib/
+	interfaces/"
+
+KMEXTRA="filters/kchart"
+
+KMCOMPILEONLY="filters/libdialogfilter"
+
+need-kde 3.4
+
+src_unpack() {
+	kde-meta_src_unpack unpack
+
+	# We need to compile liboofilter first
+	echo "SUBDIRS = libdialogfilter kchart" > $S/filters/Makefile.am
+
+	kde-meta_src_unpack makefiles
+}
diff --git a/app-office/kexi/ChangeLog b/app-office/kexi/ChangeLog
index 897a267bc95b..22fa188a4d1e 100644
--- a/app-office/kexi/ChangeLog
+++ b/app-office/kexi/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-office/kexi
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kexi/ChangeLog,v 1.27 2006/02/23 03:06:58 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kexi/ChangeLog,v 1.28 2006/03/11 15:40:39 carlo Exp $
+
+*kexi-1.5_beta2 (11 Mar 2006)
+
+  11 Mar 2006; Carsten Lohrke <carlo@gentoo.org> +kexi-1.5_beta2.ebuild:
+  Version bump.
 
   23 Feb 2006; Aron Griffis <agriffis@gentoo.org> kexi-1.4.2.ebuild:
   Mark 1.4.2 stable on ia64
diff --git a/app-office/kexi/Manifest b/app-office/kexi/Manifest
index 2edf0f19d0d8..4c9ffb9481d7 100644
--- a/app-office/kexi/Manifest
+++ b/app-office/kexi/Manifest
@@ -1,19 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 2aef38b4194f34ef71cc8e2566aa1531 ChangeLog 3063
+MD5 cd2ea96dc2b06386f063e8b1462957a1 ChangeLog 3184
 MD5 cf5b314fdf4094ea845edfddf2cf39b5 files/digest-kexi-1.4.2 68
 MD5 cf5b314fdf4094ea845edfddf2cf39b5 files/digest-kexi-1.4.2-r1 68
 MD5 82af01b67d83c02945f1e26ae9529232 files/digest-kexi-1.5_beta1 253
+MD5 a08e04910037e4b3b9e9cbfb92eda61e files/digest-kexi-1.5_beta2 69
 MD5 5f3683b6817935e4f6269bd64398c479 files/kexi-1.4.2-gcc41.patch 1094
 MD5 01b797c688b5f719c1aa8172e7fefd1e kexi-1.4.2-r1.ebuild 1130
 MD5 3459c72e14104b6ae964cf21299a23dc kexi-1.4.2.ebuild 1077
 MD5 231ba18c6c699034c49b88c89438a10e kexi-1.5_beta1.ebuild 1137
+MD5 231ba18c6c699034c49b88c89438a10e kexi-1.5_beta2.ebuild 1137
 MD5 02039d51ca4a42817775fd436dfaa956 metadata.xml 157
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFD/SbbJrHF4yAQTrARAnuqAJ9N91U5vHCNtnkksT/msZHP9NcvzwCePBQg
-LFzgImDcQ358Rs2NIKkSOMo=
-=Hi7U
------END PGP SIGNATURE-----
diff --git a/app-office/kexi/files/digest-kexi-1.5_beta2 b/app-office/kexi/files/digest-kexi-1.5_beta2
new file mode 100644
index 000000000000..00714a77907c
--- /dev/null
+++ b/app-office/kexi/files/digest-kexi-1.5_beta2
@@ -0,0 +1 @@
+MD5 ddeca5c989e892baf4871a443fd2daea koffice-1.4.95.tar.bz2 36891017
diff --git a/app-office/kexi/kexi-1.5_beta2.ebuild b/app-office/kexi/kexi-1.5_beta2.ebuild
new file mode 100644
index 000000000000..26bb5007bc15
--- /dev/null
+++ b/app-office/kexi/kexi-1.5_beta2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/kexi/kexi-1.5_beta2.ebuild,v 1.1 2006/03/11 15:40:39 carlo Exp $
+
+MAXKOFFICEVER=${PV}
+KMNAME=koffice
+inherit kde-meta eutils
+
+DESCRIPTION="KOffice integrated environment for database management."
+HOMEPAGE="http://www.koffice.org/"
+LICENSE="GPL-2 LGPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~sparc ~x86"
+IUSE="mysql postgres"
+
+RDEPEND="$(deprange $PV $MAXKOFFICEVER app-office/koffice-libs)
+	sys-libs/readline
+	mysql? ( dev-db/mysql )
+	postgres? ( dev-libs/libpqxx )
+	dev-lang/python"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+KMCOPYLIB="
+	libkformula lib/kformula
+	libkofficecore lib/kofficecore
+	libkofficeui lib/kofficeui
+	libkopainter lib/kopainter
+	libkoproperty lib/koproperty
+	libkotext lib/kotext
+	libkwmf lib/kwmf
+	libkowmf lib/kwmf
+	libkstore lib/store
+	libkrossmain lib/kross/main/
+	libkrossapi lib/kross/api/"
+
+KMEXTRACTONLY="lib/"
+
+need-kde 3.4
+
+src_compile() {
+	local myconf="$(use_enable mysql) $(use_enable postgres pgsql) --enable-kexi-reports"
+
+	kde-meta_src_compile
+}
diff --git a/app-office/kformula/ChangeLog b/app-office/kformula/ChangeLog
index d5cb85a1ffec..02c167c39c2e 100644
--- a/app-office/kformula/ChangeLog
+++ b/app-office/kformula/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-office/kformula
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kformula/ChangeLog,v 1.29 2006/02/23 03:17:59 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kformula/ChangeLog,v 1.30 2006/03/11 15:58:55 carlo Exp $
+
+*kformula-1.5_beta2 (11 Mar 2006)
+
+  11 Mar 2006; Carsten Lohrke <carlo@gentoo.org> +kformula-1.5_beta2.ebuild:
+  Version bump.
 
   23 Feb 2006; Aron Griffis <agriffis@gentoo.org> kformula-1.4.2.ebuild:
   Mark 1.4.2 stable on ia64
diff --git a/app-office/kformula/Manifest b/app-office/kformula/Manifest
index 9d79d331b188..4d5cdda0f771 100644
--- a/app-office/kformula/Manifest
+++ b/app-office/kformula/Manifest
@@ -1,16 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 fd21f5454da34ba21654e02c7b50d64d ChangeLog 3300
+MD5 3a3e9002083aa6652656b9e3478cc979 ChangeLog 3429
 MD5 cf5b314fdf4094ea845edfddf2cf39b5 files/digest-kformula-1.4.2 68
 MD5 82af01b67d83c02945f1e26ae9529232 files/digest-kformula-1.5_beta1 253
+MD5 a08e04910037e4b3b9e9cbfb92eda61e files/digest-kformula-1.5_beta2 69
 MD5 ec5d94a086bb22c0d0aafe11953da0ca kformula-1.4.2.ebuild 855
 MD5 02af812cdd0a56074c984a968c8994b3 kformula-1.5_beta1.ebuild 819
+MD5 02af812cdd0a56074c984a968c8994b3 kformula-1.5_beta2.ebuild 819
 MD5 02039d51ca4a42817775fd436dfaa956 metadata.xml 157
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFD/SlwJrHF4yAQTrARAtt2AKDL5zsTJA1MtUoT9iF1VX4vmzqu/QCfTlZm
-M0Y0zB9vU9VQYo5m69KI2mI=
-=LplO
------END PGP SIGNATURE-----
diff --git a/app-office/kformula/files/digest-kformula-1.5_beta2 b/app-office/kformula/files/digest-kformula-1.5_beta2
new file mode 100644
index 000000000000..00714a77907c
--- /dev/null
+++ b/app-office/kformula/files/digest-kformula-1.5_beta2
@@ -0,0 +1 @@
+MD5 ddeca5c989e892baf4871a443fd2daea koffice-1.4.95.tar.bz2 36891017
diff --git a/app-office/kformula/kformula-1.5_beta2.ebuild b/app-office/kformula/kformula-1.5_beta2.ebuild
new file mode 100644
index 000000000000..ee62b64a683d
--- /dev/null
+++ b/app-office/kformula/kformula-1.5_beta2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/kformula/kformula-1.5_beta2.ebuild,v 1.1 2006/03/11 15:58:55 carlo Exp $
+
+MAXKOFFICEVER=${PV}
+KMNAME=koffice
+inherit kde-meta eutils
+
+DESCRIPTION="KOffice formula editor."
+HOMEPAGE="http://www.koffice.org/"
+LICENSE="GPL-2 LGPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND="$(deprange $PV $MAXKOFFICEVER app-office/koffice-libs)"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+KMCOPYLIB="
+	libkformula lib/kformula
+	libkofficecore lib/kofficecore
+	libkofficeui lib/kofficeui
+	libkopainter lib/kopainter
+	libkotext lib/kotext
+	libkwmf lib/kwmf
+	libkowmf lib/kwmf
+	libkstore lib/store"
+
+KMEXTRACTONLY="lib/"
+
+KMEXTRA="filters/kformula"
+
+need-kde 3.4
+
+
diff --git a/app-office/kivio/ChangeLog b/app-office/kivio/ChangeLog
index 51d20b855e44..bbd7a74777f0 100644
--- a/app-office/kivio/ChangeLog
+++ b/app-office/kivio/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-office/kivio
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kivio/ChangeLog,v 1.29 2006/02/23 15:00:48 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kivio/ChangeLog,v 1.30 2006/03/11 15:42:22 carlo Exp $
+
+*kivio-1.5_beta2 (11 Mar 2006)
+
+  11 Mar 2006; Carsten Lohrke <carlo@gentoo.org> +kivio-1.5_beta2.ebuild:
+  Version bump.
 
   23 Feb 2006; Aron Griffis <agriffis@gentoo.org> kivio-1.4.2.ebuild:
   Mark 1.4.2 stable on ia64
diff --git a/app-office/kivio/Manifest b/app-office/kivio/Manifest
index 967c31eac910..4e7451089a7d 100644
--- a/app-office/kivio/Manifest
+++ b/app-office/kivio/Manifest
@@ -1,28 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 f6388621e1472264f0e06ec60ec7c5a5 ChangeLog 3182
-RMD160 66faf3790f12b540dde1d6c0535a0f237b83fac6 ChangeLog 3182
-SHA256 6c6dbe5b206e85ddfe0d8b36d12c0b1c2dbcc89961d111bab1c50d7eb997c270 ChangeLog 3182
+MD5 a4999e8e0902954f7d29d32f63a9e2eb ChangeLog 3305
 MD5 902823ac54984271d00a3e72454440b1 files/digest-kivio-1.4.2 250
-RMD160 c2b4361538cd32dbfd79218c5fef8e4d6818ac3f files/digest-kivio-1.4.2 250
-SHA256 40d4d888fb4050306c03d0ea47b3c6c6448301faea176ef95e616071a57aba1e files/digest-kivio-1.4.2 250
 MD5 82af01b67d83c02945f1e26ae9529232 files/digest-kivio-1.5_beta1 253
-RMD160 0e78237b9b17a1c13e8f3a1031875bddec8bafdb files/digest-kivio-1.5_beta1 253
-SHA256 43ee5c0ab325495515723afb3fc2e4bc79eba3f6987fbc2dad504492e5a6e076 files/digest-kivio-1.5_beta1 253
+MD5 a08e04910037e4b3b9e9cbfb92eda61e files/digest-kivio-1.5_beta2 69
 MD5 4867a32ce0cc078f06aa6042bc0aefd9 kivio-1.4.2.ebuild 848
-RMD160 bce4d23db086532bde9e3f5e384edf03d4df67b4 kivio-1.4.2.ebuild 848
-SHA256 0da80e8b85452fa085436dcb87aeb9065018225ba00a652b2d46074614871804 kivio-1.4.2.ebuild 848
 MD5 55b7d640aaccbc1f85bb956eebc8317a kivio-1.5_beta1.ebuild 840
-RMD160 c9bceec1606f5cef8104e76b64c2859477b1b473 kivio-1.5_beta1.ebuild 840
-SHA256 8977b2cea54e42532ef12e23e9b051855602f7fe41118005bf5316a27e4ff51e kivio-1.5_beta1.ebuild 840
+MD5 55b7d640aaccbc1f85bb956eebc8317a kivio-1.5_beta2.ebuild 840
 MD5 02039d51ca4a42817775fd436dfaa956 metadata.xml 157
-RMD160 9258d9691830e58ee00ca89f0a6df9ce077f2439 metadata.xml 157
-SHA256 e0e268ca18fef286617fcfe97773d5df5b8fbdb5fbcb9a29adc5e8b0baea4292 metadata.xml 157
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.1 (GNU/Linux)
-
-iD8DBQFD/c4vJrHF4yAQTrARAv0tAJ95dc7zWeBO/XppNwvIC6xkW0fldgCgiSOU
-1N7+G2h17hilk5ZkPWqCoQQ=
-=Yrit
------END PGP SIGNATURE-----
diff --git a/app-office/kivio/files/digest-kivio-1.5_beta2 b/app-office/kivio/files/digest-kivio-1.5_beta2
new file mode 100644
index 000000000000..00714a77907c
--- /dev/null
+++ b/app-office/kivio/files/digest-kivio-1.5_beta2
@@ -0,0 +1 @@
+MD5 ddeca5c989e892baf4871a443fd2daea koffice-1.4.95.tar.bz2 36891017
diff --git a/app-office/kivio/kivio-1.5_beta2.ebuild b/app-office/kivio/kivio-1.5_beta2.ebuild
new file mode 100644
index 000000000000..8e18c73dcca8
--- /dev/null
+++ b/app-office/kivio/kivio-1.5_beta2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/kivio/kivio-1.5_beta2.ebuild,v 1.1 2006/03/11 15:42:22 carlo Exp $
+
+MAXKOFFICEVER=${PV}
+KMNAME=koffice
+inherit kde-meta eutils
+
+DESCRIPTION="KOffice flowchart and diagram tool."
+HOMEPAGE="http://www.koffice.org/"
+LICENSE="GPL-2 LGPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND="$(deprange $PV $MAXKOFFICEVER app-office/koffice-libs)
+	dev-lang/python"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+KMCOPYLIB="
+	libkformula lib/kformula
+	libkofficecore lib/kofficecore
+	libkofficeui lib/kofficeui
+	libkopainter lib/kopainter
+	libkopalette lib/kopalette
+	libkotext lib/kotext
+	libkwmf lib/kwmf
+	libkowmf lib/kwmf
+	libkstore lib/store"
+
+KMEXTRACTONLY="lib/"
+
+need-kde 3.4
diff --git a/app-office/koffice-data/ChangeLog b/app-office/koffice-data/ChangeLog
index 4f149d3b4a80..4411e09ef2e1 100644
--- a/app-office/koffice-data/ChangeLog
+++ b/app-office/koffice-data/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-office/koffice-data
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/koffice-data/ChangeLog,v 1.30 2006/02/16 02:20:48 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/koffice-data/ChangeLog,v 1.31 2006/03/11 15:52:15 carlo Exp $
+
+*koffice-data-1.5_beta2 (11 Mar 2006)
+
+  11 Mar 2006; Carsten Lohrke <carlo@gentoo.org>
+  +koffice-data-1.5_beta2.ebuild:
+  Version bump.
 
   16 Feb 2006; Jason Wever <weeve@gentoo.org> koffice-data-1.5_beta1.ebuild:
   Added ~sparc keyword wrt bug #122204.
diff --git a/app-office/koffice-data/Manifest b/app-office/koffice-data/Manifest
index 3973d8103d30..3a27afa4a2b7 100644
--- a/app-office/koffice-data/Manifest
+++ b/app-office/koffice-data/Manifest
@@ -1,18 +1,8 @@
-MD5 ac44ed8a90815d1d8ad9e9c8cd3623b0 ChangeLog 3662
-RMD160 8245ef1507729565a26d8e4bfdd15da93bf40185 ChangeLog 3662
-SHA256 ec287f7391d1879fb1b459406c29b2045f63c5e4071ad83e5a8b7db7c98fc2c0 ChangeLog 3662
+MD5 00b2eddb74e93c366b53a476a720f678 ChangeLog 3801
 MD5 902823ac54984271d00a3e72454440b1 files/digest-koffice-data-1.4.2 250
-RMD160 c2b4361538cd32dbfd79218c5fef8e4d6818ac3f files/digest-koffice-data-1.4.2 250
-SHA256 40d4d888fb4050306c03d0ea47b3c6c6448301faea176ef95e616071a57aba1e files/digest-koffice-data-1.4.2 250
 MD5 82af01b67d83c02945f1e26ae9529232 files/digest-koffice-data-1.5_beta1 253
-RMD160 0e78237b9b17a1c13e8f3a1031875bddec8bafdb files/digest-koffice-data-1.5_beta1 253
-SHA256 43ee5c0ab325495515723afb3fc2e4bc79eba3f6987fbc2dad504492e5a6e076 files/digest-koffice-data-1.5_beta1 253
+MD5 a08e04910037e4b3b9e9cbfb92eda61e files/digest-koffice-data-1.5_beta2 69
 MD5 52b09cd1ad4578b0a65a0abcd7e8eebc koffice-data-1.4.2.ebuild 596
-RMD160 a12d0d42b562c67beb2943d4f87cbba8d71d326c koffice-data-1.4.2.ebuild 596
-SHA256 6b12af8e8b2704c054f7d644b02581b56dc16fecfdf530ae1820fe8f900ba1c7 koffice-data-1.4.2.ebuild 596
 MD5 4764ee8005c7aeeafa7309a01b8df89f koffice-data-1.5_beta1.ebuild 586
-RMD160 c94f03ee27a8976a593366b0695beeaebf24c612 koffice-data-1.5_beta1.ebuild 586
-SHA256 744387d07ceb3175e9bd6807ac9a9c163d47e4b0d16a0cb91fc937ec25aae5b1 koffice-data-1.5_beta1.ebuild 586
+MD5 4764ee8005c7aeeafa7309a01b8df89f koffice-data-1.5_beta2.ebuild 586
 MD5 02039d51ca4a42817775fd436dfaa956 metadata.xml 157
-RMD160 9258d9691830e58ee00ca89f0a6df9ce077f2439 metadata.xml 157
-SHA256 e0e268ca18fef286617fcfe97773d5df5b8fbdb5fbcb9a29adc5e8b0baea4292 metadata.xml 157
diff --git a/app-office/koffice-data/files/digest-koffice-data-1.5_beta2 b/app-office/koffice-data/files/digest-koffice-data-1.5_beta2
new file mode 100644
index 000000000000..00714a77907c
--- /dev/null
+++ b/app-office/koffice-data/files/digest-koffice-data-1.5_beta2
@@ -0,0 +1 @@
+MD5 ddeca5c989e892baf4871a443fd2daea koffice-1.4.95.tar.bz2 36891017
diff --git a/app-office/koffice-data/koffice-data-1.5_beta2.ebuild b/app-office/koffice-data/koffice-data-1.5_beta2.ebuild
new file mode 100644
index 000000000000..7cfae8338461
--- /dev/null
+++ b/app-office/koffice-data/koffice-data-1.5_beta2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/koffice-data/koffice-data-1.5_beta2.ebuild,v 1.1 2006/03/11 15:52:15 carlo Exp $
+
+MAXKOFFICEVER=${PV}
+KMNAME=koffice
+KMMODULE=
+inherit kde-meta eutils
+
+DESCRIPTION="Shared KOffice data files."
+HOMEPAGE="http://www.koffice.org/"
+LICENSE="GPL-2 LGPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND=""
+
+DEPEND="dev-util/pkgconfig"
+
+KMEXTRA="
+	mimetypes/
+	servicetypes/
+	pics/
+	templates/
+	autocorrect/"
+
+need-kde 3.4
diff --git a/app-office/koffice-libs/ChangeLog b/app-office/koffice-libs/ChangeLog
index 68b5ffa6c16a..8674237b1e60 100644
--- a/app-office/koffice-libs/ChangeLog
+++ b/app-office/koffice-libs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-office/koffice-libs
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/koffice-libs/ChangeLog,v 1.32 2006/02/16 02:20:14 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/koffice-libs/ChangeLog,v 1.33 2006/03/11 15:53:10 carlo Exp $
+
+*koffice-libs-1.5_beta2 (11 Mar 2006)
+
+  11 Mar 2006; Carsten Lohrke <carlo@gentoo.org>
+  +koffice-libs-1.5_beta2.ebuild:
+  Version bump.
 
   16 Feb 2006; Jason Wever <weeve@gentoo.org> koffice-libs-1.5_beta1.ebuild:
   Added ~sparc keyword wrt bug #122204.
diff --git a/app-office/koffice-libs/Manifest b/app-office/koffice-libs/Manifest
index 2d69da237082..b9ae8d9392fd 100644
--- a/app-office/koffice-libs/Manifest
+++ b/app-office/koffice-libs/Manifest
@@ -1,18 +1,8 @@
-MD5 c042c346068f82676ffe46d3f81772c4 ChangeLog 3961
-RMD160 972ba5dc66005b9e1c5402efd6654f556c3a2251 ChangeLog 3961
-SHA256 872c44859f833300ed25468284cfce2ce055af6145779dda09800e7ec705b9f4 ChangeLog 3961
+MD5 e2415ca8a0190736092610f8f4b3600b ChangeLog 4100
 MD5 902823ac54984271d00a3e72454440b1 files/digest-koffice-libs-1.4.2 250
-RMD160 c2b4361538cd32dbfd79218c5fef8e4d6818ac3f files/digest-koffice-libs-1.4.2 250
-SHA256 40d4d888fb4050306c03d0ea47b3c6c6448301faea176ef95e616071a57aba1e files/digest-koffice-libs-1.4.2 250
 MD5 82af01b67d83c02945f1e26ae9529232 files/digest-koffice-libs-1.5_beta1 253
-RMD160 0e78237b9b17a1c13e8f3a1031875bddec8bafdb files/digest-koffice-libs-1.5_beta1 253
-SHA256 43ee5c0ab325495515723afb3fc2e4bc79eba3f6987fbc2dad504492e5a6e076 files/digest-koffice-libs-1.5_beta1 253
+MD5 a08e04910037e4b3b9e9cbfb92eda61e files/digest-koffice-libs-1.5_beta2 69
 MD5 8519285df64019854a727a5b9e7b64bb koffice-libs-1.4.2.ebuild 1187
-RMD160 755214f7afac626b36b754a609efe0e4a4218c82 koffice-libs-1.4.2.ebuild 1187
-SHA256 ea50193c01da181228a75e88b46877fbcb0e1e835908b4521468679d3ac8dce4 koffice-libs-1.4.2.ebuild 1187
 MD5 bbb7f6dbaf19243e004ce489aebc5669 koffice-libs-1.5_beta1.ebuild 1313
-RMD160 ca9e2da4cd9354aede0026ceba5cf6ef7c14e5fc koffice-libs-1.5_beta1.ebuild 1313
-SHA256 0a1080fdc1ca7af17760729f722301cef4f2831ff7b78d323d2ef69fe293e214 koffice-libs-1.5_beta1.ebuild 1313
+MD5 bbb7f6dbaf19243e004ce489aebc5669 koffice-libs-1.5_beta2.ebuild 1313
 MD5 02039d51ca4a42817775fd436dfaa956 metadata.xml 157
-RMD160 9258d9691830e58ee00ca89f0a6df9ce077f2439 metadata.xml 157
-SHA256 e0e268ca18fef286617fcfe97773d5df5b8fbdb5fbcb9a29adc5e8b0baea4292 metadata.xml 157
diff --git a/app-office/koffice-libs/files/digest-koffice-libs-1.5_beta2 b/app-office/koffice-libs/files/digest-koffice-libs-1.5_beta2
new file mode 100644
index 000000000000..00714a77907c
--- /dev/null
+++ b/app-office/koffice-libs/files/digest-koffice-libs-1.5_beta2
@@ -0,0 +1 @@
+MD5 ddeca5c989e892baf4871a443fd2daea koffice-1.4.95.tar.bz2 36891017
diff --git a/app-office/koffice-libs/koffice-libs-1.5_beta2.ebuild b/app-office/koffice-libs/koffice-libs-1.5_beta2.ebuild
new file mode 100644
index 000000000000..386ee63ed6b5
--- /dev/null
+++ b/app-office/koffice-libs/koffice-libs-1.5_beta2.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/koffice-libs/koffice-libs-1.5_beta2.ebuild,v 1.1 2006/03/11 15:53:10 carlo Exp $
+
+MAXKOFFICEVER=${PV}
+KMNAME=koffice
+KMMODULE=lib
+inherit kde-meta eutils
+
+DESCRIPTION="Shared KOffice libraries."
+HOMEPAGE="http://www.koffice.org/"
+LICENSE="GPL-2 LGPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~sparc ~x86"
+IUSE="doc"
+
+RDEPEND="$(deprange $PV $MAXKOFFICEVER app-office/koffice-data)
+	virtual/python
+	dev-lang/ruby"
+
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )
+	dev-util/pkgconfig"
+
+KMEXTRA="interfaces/
+	plugins/
+	tools/
+	filters/olefilters/
+	filters/xsltfilter/
+	filters/generic_wrapper/
+	kounavail/
+	doc/api/
+	doc/koffice/
+	doc/thesaurus/"
+
+KMEXTRACTONLY="
+	kchart/kdchart/"
+
+need-kde 3.4
+
+src_unpack() {
+	kde-meta_src_unpack unpack
+
+	# Force the compilation of libkopainter.
+	sed -i 's:$(KOPAINTERDIR):kopainter:' $S/lib/Makefile.am
+
+	kde-meta_src_unpack makefiles
+}
+
+src_compile() {
+	local myconf="--enable-scripting --with-pythonfir=${ROOT}/usr/$(get_libdir)/python${PYVER}/site-packages"
+	kde-meta_src_compile
+	if use doc; then
+		make apidox || die
+	fi
+}
+
+src_install() {
+	kde-meta_src_install
+	if use doc; then
+		make DESTDIR=${D} install-apidox || die
+	fi
+}
diff --git a/app-office/koffice-meta/ChangeLog b/app-office/koffice-meta/ChangeLog
index e823ddda12e1..cc76a409801e 100644
--- a/app-office/koffice-meta/ChangeLog
+++ b/app-office/koffice-meta/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-office/koffice-meta
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/koffice-meta/ChangeLog,v 1.31 2006/03/09 21:57:38 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/koffice-meta/ChangeLog,v 1.32 2006/03/11 15:53:56 carlo Exp $
+
+*koffice-meta-1.5_beta2 (11 Mar 2006)
+
+  11 Mar 2006; Carsten Lohrke <carlo@gentoo.org>
+  +koffice-meta-1.5_beta2.ebuild:
+  Version bump.
 
   09 Mar 2006; Aron Griffis <agriffis@gentoo.org> koffice-meta-1.4.2.ebuild:
   Mark 1.4.2 stable on ia64
diff --git a/app-office/koffice-meta/Manifest b/app-office/koffice-meta/Manifest
index bb40f8d085b5..fb322ea0e2f6 100644
--- a/app-office/koffice-meta/Manifest
+++ b/app-office/koffice-meta/Manifest
@@ -1,6 +1,8 @@
-MD5 fee00e3b5d45e45fd4748a56bf9dffa9 ChangeLog 3887
+MD5 aa8194a7aa0481b5f5c7e4c23b7bd07a ChangeLog 4026
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-koffice-meta-1.4.2 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-koffice-meta-1.5_beta1 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-koffice-meta-1.5_beta2 0
 MD5 ce70c764a24d97876befe4715202f25e koffice-meta-1.4.2.ebuild 1144
 MD5 dbe17e4f71fc77433ea3376582603b6d koffice-meta-1.5_beta1.ebuild 1184
+MD5 dbe17e4f71fc77433ea3376582603b6d koffice-meta-1.5_beta2.ebuild 1184
 MD5 02039d51ca4a42817775fd436dfaa956 metadata.xml 157
diff --git a/app-office/koffice-meta/files/digest-koffice-meta-1.5_beta2 b/app-office/koffice-meta/files/digest-koffice-meta-1.5_beta2
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/app-office/koffice-meta/files/digest-koffice-meta-1.5_beta2
diff --git a/app-office/koffice-meta/koffice-meta-1.5_beta2.ebuild b/app-office/koffice-meta/koffice-meta-1.5_beta2.ebuild
new file mode 100644
index 000000000000..a8ec70bdcf94
--- /dev/null
+++ b/app-office/koffice-meta/koffice-meta-1.5_beta2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/koffice-meta/koffice-meta-1.5_beta2.ebuild,v 1.1 2006/03/11 15:53:56 carlo Exp $
+
+MAXKOFFICEVER=${PV}
+inherit kde-functions
+
+DESCRIPTION="KOffice - merge this to pull in all KOffice-derived packages."
+HOMEPAGE="http://www.koffice.org/"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND="$(deprange $PV $MAXKOFFICEVER app-office/karbon)
+	$(deprange $PV $MAXKOFFICEVER app-office/kchart)
+	$(deprange $PV $MAXKOFFICEVER app-office/kexi)
+	$(deprange $PV $MAXKOFFICEVER app-office/kformula)
+	$(deprange $PV $MAXKOFFICEVER app-office/kivio)
+	$(deprange $PV $MAXKOFFICEVER app-office/koffice-data)
+	$(deprange $PV $MAXKOFFICEVER app-office/koffice-libs)
+	$(deprange $PV $MAXKOFFICEVER app-office/koshell)
+	$(deprange $PV $MAXKOFFICEVER app-office/kplato)
+	$(deprange $PV $MAXKOFFICEVER app-office/kpresenter)
+	$(deprange $PV $MAXKOFFICEVER app-office/krita)
+	$(deprange $PV $MAXKOFFICEVER app-office/kspread)
+	$(deprange $PV $MAXKOFFICEVER app-office/kugar)
+	$(deprange $PV $MAXKOFFICEVER app-office/kword)"
diff --git a/app-office/koffice/ChangeLog b/app-office/koffice/ChangeLog
index 5080d649f21e..445548f4ac2c 100644
--- a/app-office/koffice/ChangeLog
+++ b/app-office/koffice/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-office/koffice
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/ChangeLog,v 1.155 2006/03/02 12:39:41 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/ChangeLog,v 1.156 2006/03/11 15:48:39 carlo Exp $
+
+*koffice-1.5_beta2 (11 Mar 2006)
+
+  11 Mar 2006; Carsten Lohrke <carlo@gentoo.org> +koffice-1.5_beta2.ebuild:
+  Version bump.
 
   02 Mar 2006; Aron Griffis <agriffis@gentoo.org> koffice-1.4.2-r6.ebuild:
   Mark 1.4.2-r6 stable on ia64
diff --git a/app-office/koffice/Manifest b/app-office/koffice/Manifest
index 0255625ca507..b95a5e8edb69 100644
--- a/app-office/koffice/Manifest
+++ b/app-office/koffice/Manifest
@@ -1,55 +1,17 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 0a3113a0c21967cd71bd556cfc2c95b3 ChangeLog 21635
-RMD160 0daf6a483f289f63531331576dd98bcec4aba68e ChangeLog 21635
-SHA256 451bbbe496a2950b1e505ebbaa1dcf805677b27075c1f9470ee6fecc75a61fb0 ChangeLog 21635
+MD5 8cdfbdcf1e0fc9ebc04f33ca651f1178 ChangeLog 21762
 MD5 6ee3768e50296eb2a8158093ee518133 files/CAN-2005-0064.patch 829
-RMD160 1cbb2387398e03e2f44a64e345c1d6cbe765b926 files/CAN-2005-0064.patch 829
-SHA256 a08221584863aea7a4361dcd6e0e8d6b4b273891cea1e64fd54ae21fa0c0550c files/CAN-2005-0064.patch 829
 MD5 cf5b314fdf4094ea845edfddf2cf39b5 files/digest-koffice-1.4.2-r4 68
-RMD160 4fbdb279d7cdc49eeb424654474ff4b15dce2c5b files/digest-koffice-1.4.2-r4 68
-SHA256 7791e992f4d48e943f3d513459c63a8e5280d4052a33f729f6ef1a8be3b9cc81 files/digest-koffice-1.4.2-r4 68
 MD5 cf5b314fdf4094ea845edfddf2cf39b5 files/digest-koffice-1.4.2-r6 68
-RMD160 4fbdb279d7cdc49eeb424654474ff4b15dce2c5b files/digest-koffice-1.4.2-r6 68
-SHA256 7791e992f4d48e943f3d513459c63a8e5280d4052a33f729f6ef1a8be3b9cc81 files/digest-koffice-1.4.2-r6 68
 MD5 cf5b314fdf4094ea845edfddf2cf39b5 files/digest-koffice-1.4.2-r7 68
-RMD160 4fbdb279d7cdc49eeb424654474ff4b15dce2c5b files/digest-koffice-1.4.2-r7 68
-SHA256 7791e992f4d48e943f3d513459c63a8e5280d4052a33f729f6ef1a8be3b9cc81 files/digest-koffice-1.4.2-r7 68
 MD5 82af01b67d83c02945f1e26ae9529232 files/digest-koffice-1.5_beta1 253
-RMD160 0e78237b9b17a1c13e8f3a1031875bddec8bafdb files/digest-koffice-1.5_beta1 253
-SHA256 43ee5c0ab325495515723afb3fc2e4bc79eba3f6987fbc2dad504492e5a6e076 files/digest-koffice-1.5_beta1 253
+MD5 ec887471013626485519bfca72ab7281 files/digest-koffice-1.5_beta2 69
 MD5 5f3683b6817935e4f6269bd64398c479 files/kexi-1.4.2-gcc41.patch 1094
-RMD160 ffc028b187ec7437aab156f3e575b945b390845c files/kexi-1.4.2-gcc41.patch 1094
-SHA256 7c0790dacdc090b8cb176a8289facc471d6ef4ea2c93bb6ac985e6497fac1eef files/kexi-1.4.2-gcc41.patch 1094
 MD5 7d57f921f9a3827f925a3457413914b8 files/krita-1.4.2-gcc41.patch 656
-RMD160 38a6dddfb244c2b65525edd8bd219854397eff8a files/krita-1.4.2-gcc41.patch 656
-SHA256 4f7fdc791cc6f811ed375741d1e1cc97eec7fbc72f0b23a22e0520afdf37f108 files/krita-1.4.2-gcc41.patch 656
 MD5 f1f58cce115f40fcba31a4976b61d260 files/kspread-1.4.2-gcc41.patch 451
-RMD160 c0d17048a7b1dcb14cd00910a400287652c2b2f1 files/kspread-1.4.2-gcc41.patch 451
-SHA256 67d8e5722ad1aadab5811397c68aacd1d8a1d9d5363f95488231f00bb1fd047a files/kspread-1.4.2-gcc41.patch 451
 MD5 32ff061a8fba0e82d069a8a6fa6932e0 files/post-1.3-koffice-CAN-2005-3193.diff 6760
-RMD160 756f949cfcbf9fd2ce9237504d9c596970308f88 files/post-1.3-koffice-CAN-2005-3193.diff 6760
-SHA256 efd30eca9230905c884925bd6f6264e885ab2610d7f56a7a65db8f7ab48f548a files/post-1.3-koffice-CAN-2005-3193.diff 6760
 MD5 7185dbf038a28ae5e5e7b7256bd7fa51 koffice-1.4.2-r4.ebuild 1605
-RMD160 07b8cfc53eb3ef0ef7bcb9d90f1e848a93461c28 koffice-1.4.2-r4.ebuild 1605
-SHA256 0a51d4008b0fd02683789e169b32a1074f574fdc8dbcd3f306424d893014ec9d koffice-1.4.2-r4.ebuild 1605
 MD5 b3d9b72fb4595e51d7b48af3c1f1cf9c koffice-1.4.2-r6.ebuild 1605
-RMD160 b94567f9333ef8ff8857839a57e112cc912c06a3 koffice-1.4.2-r6.ebuild 1605
-SHA256 deed07bcb9cd35d1b76bc6418853043cdc70faaad50454acdee83fc28b7129fd koffice-1.4.2-r6.ebuild 1605
 MD5 6a1d2ec12afd0fcb1117d7f8e22d7152 koffice-1.4.2-r7.ebuild 1732
-RMD160 b20211d3779bc019cbb6623db1cabf77c534ce55 koffice-1.4.2-r7.ebuild 1732
-SHA256 db4b667d4c4abf14ae06932614aea18e7af2119dbb651b7f298b33f5e2437a3f koffice-1.4.2-r7.ebuild 1732
 MD5 36b3cd2605fdb937061e52d6a24a3e69 koffice-1.5_beta1.ebuild 1707
-RMD160 6ab87d258cde19198bb0548535a80bd15db9d96b koffice-1.5_beta1.ebuild 1707
-SHA256 b52439350460d7edba90b28540d1d998d145c4b28cbb9bdc9d27ba434f6c95e8 koffice-1.5_beta1.ebuild 1707
+MD5 36b3cd2605fdb937061e52d6a24a3e69 koffice-1.5_beta2.ebuild 1707
 MD5 02039d51ca4a42817775fd436dfaa956 metadata.xml 157
-RMD160 9258d9691830e58ee00ca89f0a6df9ce077f2439 metadata.xml 157
-SHA256 e0e268ca18fef286617fcfe97773d5df5b8fbdb5fbcb9a29adc5e8b0baea4292 metadata.xml 157
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.1 (GNU/Linux)
-
-iD8DBQFEBueWJrHF4yAQTrARAq3NAJ9ZCV16KJHPVjbKcXHLoutbseN8owCdHciE
-dSk46LzFPfPDUP8V9IODQDc=
-=8vZU
------END PGP SIGNATURE-----
diff --git a/app-office/koffice/files/digest-koffice-1.5_beta2 b/app-office/koffice/files/digest-koffice-1.5_beta2
new file mode 100644
index 000000000000..61ed3d6fc510
--- /dev/null
+++ b/app-office/koffice/files/digest-koffice-1.5_beta2
@@ -0,0 +1 @@
+MD5 99a8de4e93b00e1c3148a5f96b67d966 koffice-1.4.90.tar.bz2 42444039
diff --git a/app-office/koffice/koffice-1.5_beta2.ebuild b/app-office/koffice/koffice-1.5_beta2.ebuild
new file mode 100644
index 000000000000..3c22aff343ad
--- /dev/null
+++ b/app-office/koffice/koffice-1.5_beta2.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/koffice-1.5_beta2.ebuild,v 1.1 2006/03/11 15:48:39 carlo Exp $
+
+inherit kde
+
+RV="1.4.90"
+MY_P="koffice-${RV}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="An integrated office suite for KDE, the K Desktop Environment."
+HOMEPAGE="http://www.koffice.org/"
+#SRC_URI="mirror://kde/stable/koffice-${PV}/src/${P}.tar.bz2"
+SRC_URI="mirror://kde/unstable/koffice-${PV/_/-}/src/${MY_P}.tar.bz2"
+LICENSE="GPL-2 LGPL-2"
+
+SLOT="0"
+KEYWORDS="~ppc64 ~sparc ~x86"
+IUSE="doc mysql opengl postgres"
+
+RDEPEND=">=media-gfx/imagemagick-5.5.2
+	>=app-text/wv2-0.1.9
+	>=media-libs/freetype-2
+	media-libs/fontconfig
+	media-libs/libart_lgpl
+	dev-libs/libxml2
+	dev-libs/libxslt
+	sys-libs/readline
+	mysql? ( dev-db/mysql )
+	postgres? ( dev-libs/libpqxx )
+	virtual/python
+	dev-lang/ruby
+	>=media-libs/lcms-1.14-r1
+	>=app-text/libwpd-0.8.2
+	opengl? ( virtual/opengl virtual/glu )"
+
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )
+	dev-util/pkgconfig"
+
+# add blockers on split packages derived from this one
+for x in $(get-child-packages ${CATEGORY}/${PN}); do
+	DEPEND="${DEPEND} !${x}"
+	RDEPEND="${RDEPEND} !${x}"
+done
+
+need-kde 3.3
+
+# TODO: kword sql plugin needs Qt compiled with sql support
+# the dependency on python is needed for scripting support in kexi
+# and for kivio/kiviopart/kiviosdk.
+
+src_compile() {
+	local myconf="$(use_enable mysql) $(use_enable postgres pgsql) $(use_enable opengl gl)"
+
+	kde_src_compile
+	if use doc; then
+		make apidox || die
+	fi
+}
+
+src_install() {
+	kde_src_install
+	if use doc; then
+		make DESTDIR="${D}" install-apidox || die
+	fi
+
+	dodoc changes-*
+}
diff --git a/app-office/koshell/ChangeLog b/app-office/koshell/ChangeLog
index 7ae017ad76ed..27ccca0fc029 100644
--- a/app-office/koshell/ChangeLog
+++ b/app-office/koshell/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-office/koshell
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/koshell/ChangeLog,v 1.29 2006/02/16 02:09:16 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/koshell/ChangeLog,v 1.30 2006/03/11 15:49:58 carlo Exp $
+
+*koshell-1.5_beta2 (11 Mar 2006)
+
+  11 Mar 2006; Carsten Lohrke <carlo@gentoo.org> +koshell-1.5_beta2.ebuild:
+  Version bump.
 
   16 Feb 2006; Jason Wever <weeve@gentoo.org> koshell-1.5_beta1.ebuild:
   Added ~sparc keyword wrt bug #122204.
diff --git a/app-office/koshell/Manifest b/app-office/koshell/Manifest
index 5a88512104cf..8ff49481dc30 100644
--- a/app-office/koshell/Manifest
+++ b/app-office/koshell/Manifest
@@ -1,18 +1,8 @@
-MD5 0bba915885031551881126cd90b5ac83 ChangeLog 3257
-RMD160 3d641fe33eac8ef6bcf60396e2e262c01822e5be ChangeLog 3257
-SHA256 1b1e2360df64729376832f92d9a39c7d186fe09a1ca24a89b7f90e638c209774 ChangeLog 3257
+MD5 557e3b81753df1336df758693279c4b1 ChangeLog 3384
 MD5 902823ac54984271d00a3e72454440b1 files/digest-koshell-1.4.2 250
-RMD160 c2b4361538cd32dbfd79218c5fef8e4d6818ac3f files/digest-koshell-1.4.2 250
-SHA256 40d4d888fb4050306c03d0ea47b3c6c6448301faea176ef95e616071a57aba1e files/digest-koshell-1.4.2 250
 MD5 82af01b67d83c02945f1e26ae9529232 files/digest-koshell-1.5_beta1 253
-RMD160 0e78237b9b17a1c13e8f3a1031875bddec8bafdb files/digest-koshell-1.5_beta1 253
-SHA256 43ee5c0ab325495515723afb3fc2e4bc79eba3f6987fbc2dad504492e5a6e076 files/digest-koshell-1.5_beta1 253
+MD5 a08e04910037e4b3b9e9cbfb92eda61e files/digest-koshell-1.5_beta2 69
 MD5 46e5b89e805b6905c235eb8a840ed7a3 koshell-1.4.2.ebuild 818
-RMD160 3014ab68b027f758c2f0734a119dd77c178e4418 koshell-1.4.2.ebuild 818
-SHA256 0e31776e40d769821a9a4ac37b53d1e662461f300a892fbce3bfe149560b713e koshell-1.4.2.ebuild 818
 MD5 4c1ab0dd28c5545a446cec5d0ad4d7da koshell-1.5_beta1.ebuild 782
-RMD160 6d85862f1aba4e0a59a23814b4c07e44acf50364 koshell-1.5_beta1.ebuild 782
-SHA256 5f83a7db4fa913a06ff2552bd40561bd64b38e8ff81ba504c33903ed50b26641 koshell-1.5_beta1.ebuild 782
+MD5 4c1ab0dd28c5545a446cec5d0ad4d7da koshell-1.5_beta2.ebuild 782
 MD5 02039d51ca4a42817775fd436dfaa956 metadata.xml 157
-RMD160 9258d9691830e58ee00ca89f0a6df9ce077f2439 metadata.xml 157
-SHA256 e0e268ca18fef286617fcfe97773d5df5b8fbdb5fbcb9a29adc5e8b0baea4292 metadata.xml 157
diff --git a/app-office/koshell/files/digest-koshell-1.5_beta2 b/app-office/koshell/files/digest-koshell-1.5_beta2
new file mode 100644
index 000000000000..00714a77907c
--- /dev/null
+++ b/app-office/koshell/files/digest-koshell-1.5_beta2
@@ -0,0 +1 @@
+MD5 ddeca5c989e892baf4871a443fd2daea koffice-1.4.95.tar.bz2 36891017
diff --git a/app-office/koshell/koshell-1.5_beta2.ebuild b/app-office/koshell/koshell-1.5_beta2.ebuild
new file mode 100644
index 000000000000..54ef88f71a4b
--- /dev/null
+++ b/app-office/koshell/koshell-1.5_beta2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/koshell/koshell-1.5_beta2.ebuild,v 1.1 2006/03/11 15:49:58 carlo Exp $
+
+MAXKOFFICEVER=${PV}
+KMNAME=koffice
+inherit kde-meta eutils
+
+DESCRIPTION="KOffice workspace."
+HOMEPAGE="http://www.koffice.org/"
+LICENSE="GPL-2 LGPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND="$(deprange $PV $MAXKOFFICEVER app-office/koffice-libs)"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+KMCOPYLIB="
+	libkformula lib/kformula
+	libkofficecore lib/kofficecore
+	libkofficeui lib/kofficeui
+	libkopainter lib/kopainter
+	libkotext lib/kotext
+	libkwmf lib/kwmf
+	libkowmf lib/kwmf
+	libkstore lib/store"
+
+KMEXTRACTONLY="lib/"
+
+need-kde 3.4
diff --git a/app-office/kplato/ChangeLog b/app-office/kplato/ChangeLog
index 76b19e64a6b2..3522165799fa 100644
--- a/app-office/kplato/ChangeLog
+++ b/app-office/kplato/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-office/kplato
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kplato/ChangeLog,v 1.4 2006/02/16 02:10:33 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kplato/ChangeLog,v 1.5 2006/03/11 15:57:57 carlo Exp $
+
+*kplato-1.5_beta2 (11 Mar 2006)
+
+  11 Mar 2006; Carsten Lohrke <carlo@gentoo.org> +kplato-1.5_beta2.ebuild:
+  Version bump.
 
   16 Feb 2006; Jason Wever <weeve@gentoo.org> kplato-1.5_beta1.ebuild:
   Added ~sparc keyword wrt bug #122204.
diff --git a/app-office/kplato/Manifest b/app-office/kplato/Manifest
index e0a5c353ce76..474f5cfe1111 100644
--- a/app-office/kplato/Manifest
+++ b/app-office/kplato/Manifest
@@ -1,12 +1,6 @@
-MD5 e1d4f2ed2ec652da00563375e6b0aee7 ChangeLog 669
-RMD160 ac3f3af8e39a2ada3e789c53e222b83a2e5ecc90 ChangeLog 669
-SHA256 c8ddcedf7db3478fe49a8e2288534a9c7361eb08538782921933645f4735700d ChangeLog 669
+MD5 18b1212bb6e910555e9f008b20f9cc2f ChangeLog 794
 MD5 82af01b67d83c02945f1e26ae9529232 files/digest-kplato-1.5_beta1 253
-RMD160 0e78237b9b17a1c13e8f3a1031875bddec8bafdb files/digest-kplato-1.5_beta1 253
-SHA256 43ee5c0ab325495515723afb3fc2e4bc79eba3f6987fbc2dad504492e5a6e076 files/digest-kplato-1.5_beta1 253
+MD5 a08e04910037e4b3b9e9cbfb92eda61e files/digest-kplato-1.5_beta2 69
 MD5 eefb570dca3e3c1a6f83ae776e51305e kplato-1.5_beta1.ebuild 757
-RMD160 613ef056291984bb388627920eaf6158734420ad kplato-1.5_beta1.ebuild 757
-SHA256 a7ab584d9959937f035ddca6e1fe566586d1c290047b3bad50e3430fba38e348 kplato-1.5_beta1.ebuild 757
+MD5 eefb570dca3e3c1a6f83ae776e51305e kplato-1.5_beta2.ebuild 757
 MD5 02039d51ca4a42817775fd436dfaa956 metadata.xml 157
-RMD160 9258d9691830e58ee00ca89f0a6df9ce077f2439 metadata.xml 157
-SHA256 e0e268ca18fef286617fcfe97773d5df5b8fbdb5fbcb9a29adc5e8b0baea4292 metadata.xml 157
diff --git a/app-office/kplato/files/digest-kplato-1.5_beta2 b/app-office/kplato/files/digest-kplato-1.5_beta2
new file mode 100644
index 000000000000..00714a77907c
--- /dev/null
+++ b/app-office/kplato/files/digest-kplato-1.5_beta2
@@ -0,0 +1 @@
+MD5 ddeca5c989e892baf4871a443fd2daea koffice-1.4.95.tar.bz2 36891017
diff --git a/app-office/kplato/kplato-1.5_beta2.ebuild b/app-office/kplato/kplato-1.5_beta2.ebuild
new file mode 100644
index 000000000000..4f799c2297a9
--- /dev/null
+++ b/app-office/kplato/kplato-1.5_beta2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/kplato/kplato-1.5_beta2.ebuild,v 1.1 2006/03/11 15:57:58 carlo Exp $
+
+KMNAME=koffice
+MAXKOFFICEVER=${PV}
+inherit kde-meta eutils
+
+DESCRIPTION="KPlato is a project management application."
+HOMEPAGE="http://www.koffice.org/"
+LICENSE="GPL-2 LGPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND="$(deprange $PV $MAXKOFFICEVER app-office/koffice-libs)"
+
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+KMCOPYLIB="libkofficecore lib/kofficecore
+	libkofficeui lib/kofficeui
+	libkopainter lib/kopainter
+	libkstore lib/store"
+
+KMEXTRACTONLY="lib/
+	kugar/"
+
+KMCOMPILEONLY=""
+
+KMEXTRA="kdgantt"
+
+need-kde 3.4
diff --git a/app-office/kpresenter/ChangeLog b/app-office/kpresenter/ChangeLog
index 10bb8bdde3db..852c652c8e37 100644
--- a/app-office/kpresenter/ChangeLog
+++ b/app-office/kpresenter/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-office/kpresenter
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kpresenter/ChangeLog,v 1.29 2006/02/16 02:11:48 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kpresenter/ChangeLog,v 1.30 2006/03/11 15:56:46 carlo Exp $
+
+*kpresenter-1.5_beta2 (11 Mar 2006)
+
+  11 Mar 2006; Carsten Lohrke <carlo@gentoo.org>
+  +kpresenter-1.5_beta2.ebuild:
+  Version bump.
 
   16 Feb 2006; Jason Wever <weeve@gentoo.org> kpresenter-1.5_beta1.ebuild:
   Added ~sparc keyword wrt bug #122204.
diff --git a/app-office/kpresenter/Manifest b/app-office/kpresenter/Manifest
index d1c20546b6a6..8ab94a623f6c 100644
--- a/app-office/kpresenter/Manifest
+++ b/app-office/kpresenter/Manifest
@@ -1,18 +1,8 @@
-MD5 a272f44dc0d598548e4df91ad30863c0 ChangeLog 3370
-RMD160 a823960d8d27a371dbc185a3a3995e2febf41e11 ChangeLog 3370
-SHA256 d6ea9d3ca90ce189b20d1a1cd14c358798e593aff7e683758e3ff85d8a5bf8ef ChangeLog 3370
+MD5 79fb72d0f162192f70be39d27189cf7a ChangeLog 3505
 MD5 902823ac54984271d00a3e72454440b1 files/digest-kpresenter-1.4.2 250
-RMD160 c2b4361538cd32dbfd79218c5fef8e4d6818ac3f files/digest-kpresenter-1.4.2 250
-SHA256 40d4d888fb4050306c03d0ea47b3c6c6448301faea176ef95e616071a57aba1e files/digest-kpresenter-1.4.2 250
 MD5 82af01b67d83c02945f1e26ae9529232 files/digest-kpresenter-1.5_beta1 253
-RMD160 0e78237b9b17a1c13e8f3a1031875bddec8bafdb files/digest-kpresenter-1.5_beta1 253
-SHA256 43ee5c0ab325495515723afb3fc2e4bc79eba3f6987fbc2dad504492e5a6e076 files/digest-kpresenter-1.5_beta1 253
+MD5 a08e04910037e4b3b9e9cbfb92eda61e files/digest-kpresenter-1.5_beta2 69
 MD5 51b7bbc480bdd8687058bfa6aa393ebb kpresenter-1.4.2.ebuild 1087
-RMD160 21d74a7f0ddcba536487364e93ec22b3abc39b4c kpresenter-1.4.2.ebuild 1087
-SHA256 753101ee013c1ff41c66e8cef3804f85e5441b15297419ec1557008076e1b8ec kpresenter-1.4.2.ebuild 1087
 MD5 1fd49bcf56fb436e2af790bfc4a83998 kpresenter-1.5_beta1.ebuild 1179
-RMD160 b737d7c178b77e0df530f9532af67ac6330b3288 kpresenter-1.5_beta1.ebuild 1179
-SHA256 31295f6077532402d37a1bf6f2d49da0206a20aba3bbb70cb46743452b2e3987 kpresenter-1.5_beta1.ebuild 1179
+MD5 1fd49bcf56fb436e2af790bfc4a83998 kpresenter-1.5_beta2.ebuild 1179
 MD5 02039d51ca4a42817775fd436dfaa956 metadata.xml 157
-RMD160 9258d9691830e58ee00ca89f0a6df9ce077f2439 metadata.xml 157
-SHA256 e0e268ca18fef286617fcfe97773d5df5b8fbdb5fbcb9a29adc5e8b0baea4292 metadata.xml 157
diff --git a/app-office/kpresenter/files/digest-kpresenter-1.5_beta2 b/app-office/kpresenter/files/digest-kpresenter-1.5_beta2
new file mode 100644
index 000000000000..00714a77907c
--- /dev/null
+++ b/app-office/kpresenter/files/digest-kpresenter-1.5_beta2
@@ -0,0 +1 @@
+MD5 ddeca5c989e892baf4871a443fd2daea koffice-1.4.95.tar.bz2 36891017
diff --git a/app-office/kpresenter/kpresenter-1.5_beta2.ebuild b/app-office/kpresenter/kpresenter-1.5_beta2.ebuild
new file mode 100644
index 000000000000..7a759b99cbc2
--- /dev/null
+++ b/app-office/kpresenter/kpresenter-1.5_beta2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/kpresenter/kpresenter-1.5_beta2.ebuild,v 1.1 2006/03/11 15:56:46 carlo Exp $
+
+KMNAME=koffice
+MAXKOFFICEVER=${PV}
+inherit kde-meta eutils
+
+DESCRIPTION="KOffice presentation program."
+HOMEPAGE="http://www.koffice.org/"
+LICENSE="GPL-2 LGPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND="$(deprange $PV $MAXKOFFICEVER app-office/koffice-libs)"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+KMCOPYLIB="
+	libkformula lib/kformula
+	libkofficecore lib/kofficecore
+	libkofficeui lib/kofficeui
+	libkopainter lib/kopainter
+	libkotext lib/kotext
+	libkwmf lib/kwmf
+	libkowmf lib/kwmf
+	libkstore lib/store"
+
+KMEXTRACTONLY="lib/"
+
+KMCOMPILEONLY="filters/liboofilter"
+
+KMEXTRA="filters/kpresenter
+	filters/libdialogfilter"
+
+need-kde 3.4
+
+src_unpack() {
+	kde-meta_src_unpack unpack
+
+	# We need to compile filters first.
+	echo "SUBDIRS = liboofilter libdialogfilter kpresenter" > $S/filters/Makefile.am
+
+	for i in $(find ${S}/lib -iname "*\.ui"); do
+		${QTDIR}/bin/uic ${i} > ${i%.ui}.h
+	done
+
+	kde-meta_src_unpack makefiles
+}
diff --git a/app-office/krita/ChangeLog b/app-office/krita/ChangeLog
index e369336f60d2..3713c603bfde 100644
--- a/app-office/krita/ChangeLog
+++ b/app-office/krita/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-office/krita
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/krita/ChangeLog,v 1.31 2006/03/02 12:39:09 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/krita/ChangeLog,v 1.32 2006/03/11 15:44:26 carlo Exp $
+
+*krita-1.5_beta2 (11 Mar 2006)
+
+  11 Mar 2006; Carsten Lohrke <carlo@gentoo.org> +krita-1.5_beta2.ebuild:
+  Version bump.
 
   02 Mar 2006; Aron Griffis <agriffis@gentoo.org> krita-1.4.2.ebuild:
   Mark 1.4.2 stable on ia64
diff --git a/app-office/krita/Manifest b/app-office/krita/Manifest
index 0ebd890223a8..d25b3f72f27b 100644
--- a/app-office/krita/Manifest
+++ b/app-office/krita/Manifest
@@ -1,31 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 dcd0469b532dc7639e0951df50fb32de ChangeLog 3705
-RMD160 af13c30a52e4a48c16b98fdc100d74cf99e77bdc ChangeLog 3705
-SHA256 68e0b7ea8c59040889e0dcefe534d10bd7fd90aa8b7dd6c759f22bbf5200c21e ChangeLog 3705
+MD5 935bb65fb86226b8cd7a3fe7c19a6080 ChangeLog 3828
 MD5 cf5b314fdf4094ea845edfddf2cf39b5 files/digest-krita-1.4.2 68
-RMD160 4fbdb279d7cdc49eeb424654474ff4b15dce2c5b files/digest-krita-1.4.2 68
-SHA256 7791e992f4d48e943f3d513459c63a8e5280d4052a33f729f6ef1a8be3b9cc81 files/digest-krita-1.4.2 68
 MD5 82af01b67d83c02945f1e26ae9529232 files/digest-krita-1.5_beta1 253
-RMD160 0e78237b9b17a1c13e8f3a1031875bddec8bafdb files/digest-krita-1.5_beta1 253
-SHA256 43ee5c0ab325495515723afb3fc2e4bc79eba3f6987fbc2dad504492e5a6e076 files/digest-krita-1.5_beta1 253
+MD5 a08e04910037e4b3b9e9cbfb92eda61e files/digest-krita-1.5_beta2 69
 MD5 7d57f921f9a3827f925a3457413914b8 files/krita-1.4.2-gcc41.patch 656
-RMD160 38a6dddfb244c2b65525edd8bd219854397eff8a files/krita-1.4.2-gcc41.patch 656
-SHA256 4f7fdc791cc6f811ed375741d1e1cc97eec7fbc72f0b23a22e0520afdf37f108 files/krita-1.4.2-gcc41.patch 656
 MD5 6899eb2eb91d5005991e4680ace4f505 krita-1.4.2.ebuild 1004
-RMD160 40a188e95543656dae9c88695442f6145b0f3b90 krita-1.4.2.ebuild 1004
-SHA256 7bfa387897d57c579f9e75b9af845fdaf9809d37d28dcacb7cf36f5caae65586 krita-1.4.2.ebuild 1004
 MD5 0a4771e46a324b59fc1a4fb26165c4e7 krita-1.5_beta1.ebuild 1180
-RMD160 c1c928b72d2a0f680b4aa633ecf52800e5bcaad4 krita-1.5_beta1.ebuild 1180
-SHA256 2054a893fed480cc0b3b66f9c412168672958839a680835babbb9323092ec539 krita-1.5_beta1.ebuild 1180
+MD5 60a0170cdd2a43cf46539864a1940e57 krita-1.5_beta2.ebuild 1179
 MD5 02039d51ca4a42817775fd436dfaa956 metadata.xml 157
-RMD160 9258d9691830e58ee00ca89f0a6df9ce077f2439 metadata.xml 157
-SHA256 e0e268ca18fef286617fcfe97773d5df5b8fbdb5fbcb9a29adc5e8b0baea4292 metadata.xml 157
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.1 (GNU/Linux)
-
-iD8DBQFEBud2JrHF4yAQTrARAn48AKCtrW5Fp2qkLpVqGxrAvPEHpNh/EgCgwUbY
-4l01vQ2ZBaxHsedaAtO8YR8=
-=+zjx
------END PGP SIGNATURE-----
diff --git a/app-office/krita/files/digest-krita-1.5_beta2 b/app-office/krita/files/digest-krita-1.5_beta2
new file mode 100644
index 000000000000..00714a77907c
--- /dev/null
+++ b/app-office/krita/files/digest-krita-1.5_beta2
@@ -0,0 +1 @@
+MD5 ddeca5c989e892baf4871a443fd2daea koffice-1.4.95.tar.bz2 36891017
diff --git a/app-office/krita/krita-1.5_beta2.ebuild b/app-office/krita/krita-1.5_beta2.ebuild
new file mode 100644
index 000000000000..8b190134d7b6
--- /dev/null
+++ b/app-office/krita/krita-1.5_beta2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/krita/krita-1.5_beta2.ebuild,v 1.1 2006/03/11 15:44:26 carlo Exp $
+
+MAXKOFFICEVER=${PV}
+KMNAME=koffice
+inherit kde-meta eutils
+
+DESCRIPTION="KOffice image manipulation program."
+HOMEPAGE="http://www.koffice.org/"
+LICENSE="GPL-2 LGPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~sparc ~x86"
+IUSE="opengl"
+
+RDEPEND="$(deprange $PV $MAXKOFFICEVER app-office/koffice-libs)
+	>=media-gfx/imagemagick-5.5.2
+	>=media-libs/lcms-1.14-r1
+	opengl? ( virtual/opengl virtual/glu )"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+KMCOPYLIB="libkformula lib/kformula
+	libkofficecore lib/kofficecore
+	libkofficeui lib/kofficeui
+	libkopainter lib/kopainter
+	libkopalette lib/kopalette
+	libkotext lib/kotext
+	libkwmf lib/kwmf
+	libkowmf lib/kwmf
+	libkstore lib/store
+	libkrossapi lib/kross/api/
+	libkrossmain lib/kross/main/"
+
+KMEXTRACTONLY="lib/"
+
+KMEXTRA="filters/krita"
+
+need-kde 3.4
+
+src_compile() {
+	local myconf="$(use_enable opengl gl)"
+
+	for i in $(find ${S}/lib -iname "*\.ui"); do
+		${QTDIR}/bin/uic ${i} > ${i%.ui}.h
+	done
+
+	kde-meta_src_compile
+}
\ No newline at end of file
diff --git a/app-office/kspread/ChangeLog b/app-office/kspread/ChangeLog
index 50370d35c95f..83139e4e8d31 100644
--- a/app-office/kspread/ChangeLog
+++ b/app-office/kspread/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-office/kspread
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kspread/ChangeLog,v 1.32 2006/02/22 00:18:16 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kspread/ChangeLog,v 1.33 2006/03/11 15:51:01 carlo Exp $
+
+*kspread-1.5_beta2 (11 Mar 2006)
+
+  11 Mar 2006; Carsten Lohrke <carlo@gentoo.org> +kspread-1.5_beta2.ebuild:
+  Version bump.
 
   22 Feb 2006; Aron Griffis <agriffis@gentoo.org> kspread-1.4.2.ebuild:
   Mark 1.4.2 stable on ia64
diff --git a/app-office/kspread/Manifest b/app-office/kspread/Manifest
index 659d422d397b..08cf8092249f 100644
--- a/app-office/kspread/Manifest
+++ b/app-office/kspread/Manifest
@@ -1,37 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 72536c4e43352e647f3edfce1709e449 ChangeLog 3742
-RMD160 20c8d1c9c2c93eb41d6184bc110fc7bf42d95b12 ChangeLog 3742
-SHA256 7a7d18d1fdb45f0a5ef56e1bd916f95a536e8b8702b4ac4fb952b2799732a75d ChangeLog 3742
+MD5 c3c2bb98f6f00cf3c9654d41e6e8d4e3 ChangeLog 3869
 MD5 902823ac54984271d00a3e72454440b1 files/digest-kspread-1.4.2 250
-RMD160 c2b4361538cd32dbfd79218c5fef8e4d6818ac3f files/digest-kspread-1.4.2 250
-SHA256 40d4d888fb4050306c03d0ea47b3c6c6448301faea176ef95e616071a57aba1e files/digest-kspread-1.4.2 250
 MD5 cf5b314fdf4094ea845edfddf2cf39b5 files/digest-kspread-1.4.2-r1 68
-RMD160 4fbdb279d7cdc49eeb424654474ff4b15dce2c5b files/digest-kspread-1.4.2-r1 68
-SHA256 7791e992f4d48e943f3d513459c63a8e5280d4052a33f729f6ef1a8be3b9cc81 files/digest-kspread-1.4.2-r1 68
 MD5 82af01b67d83c02945f1e26ae9529232 files/digest-kspread-1.5_beta1 253
-RMD160 0e78237b9b17a1c13e8f3a1031875bddec8bafdb files/digest-kspread-1.5_beta1 253
-SHA256 43ee5c0ab325495515723afb3fc2e4bc79eba3f6987fbc2dad504492e5a6e076 files/digest-kspread-1.5_beta1 253
+MD5 a08e04910037e4b3b9e9cbfb92eda61e files/digest-kspread-1.5_beta2 69
 MD5 f1f58cce115f40fcba31a4976b61d260 files/kspread-1.4.2-gcc41.patch 451
-RMD160 c0d17048a7b1dcb14cd00910a400287652c2b2f1 files/kspread-1.4.2-gcc41.patch 451
-SHA256 67d8e5722ad1aadab5811397c68aacd1d8a1d9d5363f95488231f00bb1fd047a files/kspread-1.4.2-gcc41.patch 451
 MD5 3d2a2ae8f85c854c5d0968e926d78f89 kspread-1.4.2-r1.ebuild 1220
-RMD160 ab0594f5b1ed73c43458ad706991bdb49825f44d kspread-1.4.2-r1.ebuild 1220
-SHA256 b6e1c30323c7c0976c3ed7820d23ce839f23c3ed8ffb6dee31c307944a8c5019 kspread-1.4.2-r1.ebuild 1220
 MD5 c25f4c8ea619ddbe186c5c06f03fd2dd kspread-1.4.2.ebuild 1164
-RMD160 ac964788c46b9b2ef67003ba59b22b4082c464a5 kspread-1.4.2.ebuild 1164
-SHA256 edb6f7a7b7744516e776d12e1b40e6ebdf5a0c5aec1eebbd8fa5ef6fbfc31314 kspread-1.4.2.ebuild 1164
 MD5 a64c3b86bebf367a73cad56f9d69165d kspread-1.5_beta1.ebuild 1128
-RMD160 2845fd8b742b0aa20043f248cefb4863e040a05e kspread-1.5_beta1.ebuild 1128
-SHA256 b5b362bb71f6639ec7b81b5fdc92e7537a507fe81d2fee6d89002415dc3ab118 kspread-1.5_beta1.ebuild 1128
+MD5 a64c3b86bebf367a73cad56f9d69165d kspread-1.5_beta2.ebuild 1128
 MD5 02039d51ca4a42817775fd436dfaa956 metadata.xml 157
-RMD160 9258d9691830e58ee00ca89f0a6df9ce077f2439 metadata.xml 157
-SHA256 e0e268ca18fef286617fcfe97773d5df5b8fbdb5fbcb9a29adc5e8b0baea4292 metadata.xml 157
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.1 (GNU/Linux)
-
-iD8DBQFD+63SJrHF4yAQTrARAgdPAJ4wcn2JskgKOMkOkoJtO7c3NQwipgCgo007
-rYNGbURQS/4ILFjDcIH+NUA=
-=qToS
------END PGP SIGNATURE-----
diff --git a/app-office/kspread/files/digest-kspread-1.5_beta2 b/app-office/kspread/files/digest-kspread-1.5_beta2
new file mode 100644
index 000000000000..00714a77907c
--- /dev/null
+++ b/app-office/kspread/files/digest-kspread-1.5_beta2
@@ -0,0 +1 @@
+MD5 ddeca5c989e892baf4871a443fd2daea koffice-1.4.95.tar.bz2 36891017
diff --git a/app-office/kspread/kspread-1.5_beta2.ebuild b/app-office/kspread/kspread-1.5_beta2.ebuild
new file mode 100644
index 000000000000..927eaf079717
--- /dev/null
+++ b/app-office/kspread/kspread-1.5_beta2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/kspread/kspread-1.5_beta2.ebuild,v 1.1 2006/03/11 15:51:01 carlo Exp $
+
+KMNAME=koffice
+MAXKOFFICEVER=${PV}
+inherit kde-meta eutils
+
+DESCRIPTION="KOffice spreadsheet application."
+HOMEPAGE="http://www.koffice.org/"
+LICENSE="GPL-2 LGPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND="$(deprange $PV $MAXKOFFICEVER app-office/koffice-libs)
+	$(deprange $PV $MAXKOFFICEVER app-office/kchart)"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+KMCOPYLIB="
+	libkformula lib/kformula
+	libkofficecore lib/kofficecore
+	libkofficeui lib/kofficeui
+	libkopainter lib/kopainter
+	libkotext lib/kotext
+	libkwmf lib/kwmf
+	libkowmf lib/kwmf
+	libkstore lib/store
+	libkochart interfaces"
+
+KMEXTRACTONLY="lib/
+	interfaces/"
+
+KMCOMPILEONLY="filters/liboofilter"
+
+KMEXTRA="filters/kspread"
+
+need-kde 3.4
+
+src_unpack() {
+	kde-meta_src_unpack unpack
+
+	# We need to compile liboofilter first
+	echo "SUBDIRS = liboofilter kspread" > $S/filters/Makefile.am
+
+	kde-meta_src_unpack makefiles
+}
diff --git a/app-office/kugar/ChangeLog b/app-office/kugar/ChangeLog
index 3e1813548952..aa9cbfee448b 100644
--- a/app-office/kugar/ChangeLog
+++ b/app-office/kugar/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-office/kugar
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kugar/ChangeLog,v 1.30 2006/02/16 02:16:37 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kugar/ChangeLog,v 1.31 2006/03/11 15:45:37 carlo Exp $
+
+*kugar-1.5_beta2 (11 Mar 2006)
+
+  11 Mar 2006; Carsten Lohrke <carlo@gentoo.org> +kugar-1.5_beta2.ebuild:
+  Version bump.
 
   16 Feb 2006; Jason Wever <weeve@gentoo.org> kugar-1.5_beta1.ebuild:
   Added ~sparc keyword wrt bug #122204.
diff --git a/app-office/kugar/Manifest b/app-office/kugar/Manifest
index f42c20def109..a20ef01a59e3 100644
--- a/app-office/kugar/Manifest
+++ b/app-office/kugar/Manifest
@@ -1,18 +1,8 @@
-MD5 588593bbdcb8f7779f2c7e802f8e4422 ChangeLog 3257
-RMD160 dcf342867aae58ad8f683026d168002fd569cfc5 ChangeLog 3257
-SHA256 58fe66fd36dcc897e8ac0008df3c3f0862038f8cbdc4b7b6b998efd32012b22f ChangeLog 3257
+MD5 73ee1c53377852a9e2f7f751ee6d1807 ChangeLog 3380
 MD5 902823ac54984271d00a3e72454440b1 files/digest-kugar-1.4.2 250
-RMD160 c2b4361538cd32dbfd79218c5fef8e4d6818ac3f files/digest-kugar-1.4.2 250
-SHA256 40d4d888fb4050306c03d0ea47b3c6c6448301faea176ef95e616071a57aba1e files/digest-kugar-1.4.2 250
 MD5 82af01b67d83c02945f1e26ae9529232 files/digest-kugar-1.5_beta1 253
-RMD160 0e78237b9b17a1c13e8f3a1031875bddec8bafdb files/digest-kugar-1.5_beta1 253
-SHA256 43ee5c0ab325495515723afb3fc2e4bc79eba3f6987fbc2dad504492e5a6e076 files/digest-kugar-1.5_beta1 253
+MD5 a08e04910037e4b3b9e9cbfb92eda61e files/digest-kugar-1.5_beta2 69
 MD5 ee48955eae30f71e2331f2b92438a578 kugar-1.4.2.ebuild 857
-RMD160 fb55ef41b593659742f77fcc2124ad5fc84434b0 kugar-1.4.2.ebuild 857
-SHA256 3477c9e8fdf9ec7c1402e2a00186a8a6dff87bb77eb6841373d1aa4571fdd52f kugar-1.4.2.ebuild 857
 MD5 b774a204d14051e9b9aa161667a48dde kugar-1.5_beta1.ebuild 851
-RMD160 796393ac85127b96144fab7d1fb0479f6ac1d39d kugar-1.5_beta1.ebuild 851
-SHA256 07887a7b46999fb3f8586d73c5181383407f23745f4fdd7e48a4535db24cc727 kugar-1.5_beta1.ebuild 851
+MD5 b774a204d14051e9b9aa161667a48dde kugar-1.5_beta2.ebuild 851
 MD5 02039d51ca4a42817775fd436dfaa956 metadata.xml 157
-RMD160 9258d9691830e58ee00ca89f0a6df9ce077f2439 metadata.xml 157
-SHA256 e0e268ca18fef286617fcfe97773d5df5b8fbdb5fbcb9a29adc5e8b0baea4292 metadata.xml 157
diff --git a/app-office/kugar/files/digest-kugar-1.5_beta2 b/app-office/kugar/files/digest-kugar-1.5_beta2
new file mode 100644
index 000000000000..00714a77907c
--- /dev/null
+++ b/app-office/kugar/files/digest-kugar-1.5_beta2
@@ -0,0 +1 @@
+MD5 ddeca5c989e892baf4871a443fd2daea koffice-1.4.95.tar.bz2 36891017
diff --git a/app-office/kugar/kugar-1.5_beta2.ebuild b/app-office/kugar/kugar-1.5_beta2.ebuild
new file mode 100644
index 000000000000..cfa89360ce55
--- /dev/null
+++ b/app-office/kugar/kugar-1.5_beta2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/kugar/kugar-1.5_beta2.ebuild,v 1.1 2006/03/11 15:45:37 carlo Exp $
+
+KMNAME=koffice
+MAXKOFFICEVER=${PV}
+inherit kde-meta eutils
+
+DESCRIPTION="KOffice report viewer and generator."
+HOMEPAGE="http://www.koffice.org/"
+LICENSE="GPL-2 LGPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND="$(deprange $PV $MAXKOFFICEVER app-office/koffice-libs)"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+KMCOPYLIB="
+	libkformula lib/kformula
+	libkofficecore lib/kofficecore
+	libkofficeui lib/kofficeui
+	libkopainter lib/kopainter
+	libkoproperty lib/koproperty
+	libkotext lib/kotext
+	libkwmf lib/kwmf
+	libkowmf lib/kwmf
+	libkstore lib/store"
+
+KMEXTRACTONLY="lib/"
+
+KMEXTRA="filters/kugar"
+
+need-kde 3.4
diff --git a/app-office/kword/ChangeLog b/app-office/kword/ChangeLog
index 1eeccc4a37b2..a1124119f1a4 100644
--- a/app-office/kword/ChangeLog
+++ b/app-office/kword/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-office/kword
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kword/ChangeLog,v 1.51 2006/03/02 12:38:51 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kword/ChangeLog,v 1.52 2006/03/11 15:47:05 carlo Exp $
+
+*kword-1.5_beta2 (11 Mar 2006)
+
+  11 Mar 2006; Carsten Lohrke <carlo@gentoo.org> +kword-1.5_beta2.ebuild:
+  Version bump.
 
   02 Mar 2006; Aron Griffis <agriffis@gentoo.org> kword-1.4.2-r6.ebuild:
   Mark 1.4.2-r6 stable on ia64
diff --git a/app-office/kword/Manifest b/app-office/kword/Manifest
index 76ba3e70836a..f465ecaa0763 100644
--- a/app-office/kword/Manifest
+++ b/app-office/kword/Manifest
@@ -1,49 +1,15 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 97c11223e4de3f75dbe0f23dd90714c0 ChangeLog 6528
-RMD160 a55cb089630aacb42499e1d32697beff0de3a81c ChangeLog 6528
-SHA256 d9b7db5ae901bad3c32a47c6c82f992b65a828aacbe4e0c1e0d037a20f2f774b ChangeLog 6528
+MD5 ec4786e263a723a259b90027842f841e ChangeLog 6651
 MD5 6ee3768e50296eb2a8158093ee518133 files/CAN-2005-0064.patch 829
-RMD160 1cbb2387398e03e2f44a64e345c1d6cbe765b926 files/CAN-2005-0064.patch 829
-SHA256 a08221584863aea7a4361dcd6e0e8d6b4b273891cea1e64fd54ae21fa0c0550c files/CAN-2005-0064.patch 829
 MD5 cf5b314fdf4094ea845edfddf2cf39b5 files/digest-kword-1.4.2-r4 68
-RMD160 4fbdb279d7cdc49eeb424654474ff4b15dce2c5b files/digest-kword-1.4.2-r4 68
-SHA256 7791e992f4d48e943f3d513459c63a8e5280d4052a33f729f6ef1a8be3b9cc81 files/digest-kword-1.4.2-r4 68
 MD5 cf5b314fdf4094ea845edfddf2cf39b5 files/digest-kword-1.4.2-r6 68
-RMD160 4fbdb279d7cdc49eeb424654474ff4b15dce2c5b files/digest-kword-1.4.2-r6 68
-SHA256 7791e992f4d48e943f3d513459c63a8e5280d4052a33f729f6ef1a8be3b9cc81 files/digest-kword-1.4.2-r6 68
 MD5 cf5b314fdf4094ea845edfddf2cf39b5 files/digest-kword-1.4.2-r7 68
-RMD160 4fbdb279d7cdc49eeb424654474ff4b15dce2c5b files/digest-kword-1.4.2-r7 68
-SHA256 7791e992f4d48e943f3d513459c63a8e5280d4052a33f729f6ef1a8be3b9cc81 files/digest-kword-1.4.2-r7 68
 MD5 82af01b67d83c02945f1e26ae9529232 files/digest-kword-1.5_beta1 253
-RMD160 0e78237b9b17a1c13e8f3a1031875bddec8bafdb files/digest-kword-1.5_beta1 253
-SHA256 43ee5c0ab325495515723afb3fc2e4bc79eba3f6987fbc2dad504492e5a6e076 files/digest-kword-1.5_beta1 253
+MD5 a08e04910037e4b3b9e9cbfb92eda61e files/digest-kword-1.5_beta2 69
 MD5 f1f58cce115f40fcba31a4976b61d260 files/kspread-1.4.2-gcc41.patch 451
-RMD160 c0d17048a7b1dcb14cd00910a400287652c2b2f1 files/kspread-1.4.2-gcc41.patch 451
-SHA256 67d8e5722ad1aadab5811397c68aacd1d8a1d9d5363f95488231f00bb1fd047a files/kspread-1.4.2-gcc41.patch 451
 MD5 32ff061a8fba0e82d069a8a6fa6932e0 files/post-1.3-koffice-CAN-2005-3193.diff 6760
-RMD160 756f949cfcbf9fd2ce9237504d9c596970308f88 files/post-1.3-koffice-CAN-2005-3193.diff 6760
-SHA256 efd30eca9230905c884925bd6f6264e885ab2610d7f56a7a65db8f7ab48f548a files/post-1.3-koffice-CAN-2005-3193.diff 6760
 MD5 dd4e1252d9492a184a8a0066f734da34 kword-1.4.2-r4.ebuild 1265
-RMD160 38d8e0c03fffa52ed44256537322b788603d5463 kword-1.4.2-r4.ebuild 1265
-SHA256 3e71d3cceff4511faa5cc8b90880e2aebf962c4d00172775ad2e78651ad1d5a4 kword-1.4.2-r4.ebuild 1265
 MD5 3d8c253c535cf2140989fbe5587542c2 kword-1.4.2-r6.ebuild 1265
-RMD160 a317b6af5557928904c4176209f8e20af4776999 kword-1.4.2-r6.ebuild 1265
-SHA256 b61db02be96fb8518829429e4b77dd27b01e6cf62ae4f3f60c9e800558c1d090 kword-1.4.2-r6.ebuild 1265
 MD5 512a4cdd6055ce64c814620316c52c80 kword-1.4.2-r7.ebuild 1332
-RMD160 09f6e0c0965869030008827e4b93dc989dc0372b kword-1.4.2-r7.ebuild 1332
-SHA256 9502fd755ca8767171925fa7a8ae7a65ce2c0ac8422422b119ff6ddb99249618 kword-1.4.2-r7.ebuild 1332
 MD5 67d9545996955e9f82bc52b90d2b74c9 kword-1.5_beta1.ebuild 1273
-RMD160 48bb2665a2767cb22fd60bb7d5237ac65e019061 kword-1.5_beta1.ebuild 1273
-SHA256 ae98cde64eebf8f7f2d3850de50d166a0f87d5473af7779c09cd71d90b892ccc kword-1.5_beta1.ebuild 1273
+MD5 67d9545996955e9f82bc52b90d2b74c9 kword-1.5_beta2.ebuild 1273
 MD5 02039d51ca4a42817775fd436dfaa956 metadata.xml 157
-RMD160 9258d9691830e58ee00ca89f0a6df9ce077f2439 metadata.xml 157
-SHA256 e0e268ca18fef286617fcfe97773d5df5b8fbdb5fbcb9a29adc5e8b0baea4292 metadata.xml 157
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.1 (GNU/Linux)
-
-iD8DBQFEBudkJrHF4yAQTrARAosKAKDNFrcYmKLHeOmYz3jot11hmjJCZgCfVMBi
-iH4Bgns1xrPGIZin3tXdT5A=
-=z++5
------END PGP SIGNATURE-----
diff --git a/app-office/kword/files/digest-kword-1.5_beta2 b/app-office/kword/files/digest-kword-1.5_beta2
new file mode 100644
index 000000000000..00714a77907c
--- /dev/null
+++ b/app-office/kword/files/digest-kword-1.5_beta2
@@ -0,0 +1 @@
+MD5 ddeca5c989e892baf4871a443fd2daea koffice-1.4.95.tar.bz2 36891017
diff --git a/app-office/kword/kword-1.5_beta2.ebuild b/app-office/kword/kword-1.5_beta2.ebuild
new file mode 100644
index 000000000000..37d080c658a2
--- /dev/null
+++ b/app-office/kword/kword-1.5_beta2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/kword/kword-1.5_beta2.ebuild,v 1.1 2006/03/11 15:47:05 carlo Exp $
+
+KMNAME=koffice
+MAXKOFFICEVER=${PV}
+inherit kde-meta eutils
+
+DESCRIPTION="KOffice word processor."
+HOMEPAGE="http://www.koffice.org/"
+LICENSE="GPL-2 LGPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND="$(deprange $PV $MAXKOFFICEVER app-office/koffice-libs)
+	$(deprange $PV $MAXKOFFICEVER app-office/kspread)
+	>=app-text/wv2-0.1.8
+	>=media-gfx/imagemagick-5.5.2
+	>=app-text/libwpd-0.8.2"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+KMCOPYLIB="libkformula lib/kformula
+	libkofficecore lib/kofficecore
+	libkofficeui lib/kofficeui
+	libkopainter lib/kopainter
+	libkotext lib/kotext
+	libkwmf lib/kwmf
+	libkowmf lib/kwmf
+	libkstore lib/store
+	libkspreadcommon kspread"
+
+KMEXTRACTONLY="
+	lib/
+	kspread/"
+
+KMCOMPILEONLY="filters/liboofilter"
+
+KMEXTRA="filters/kword"
+
+need-kde 3.4
+
+src_unpack() {
+	kde-meta_src_unpack unpack
+
+	# We need to compile libs first
+	echo "SUBDIRS = liboofilter kword" > $S/filters/Makefile.am
+
+	for i in $(find ${S}/lib -iname "*\.ui"); do
+		${QTDIR}/bin/uic ${i} > ${i%.ui}.h
+	done
+
+	kde-meta_src_unpack makefiles
+}