Sync to branch plus various fixes.

(Portage version: 2.2_rc23/cvs/Linux i686)

2 files changed, 87 insertions, 2 deletions

diff --git a/app-office/krita/ChangeLog b/app-office/krita/ChangeLog
index 8eda18c3fd2f..0575b598ee86 100644
--- a/app-office/krita/ChangeLog
+++ b/app-office/krita/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-office/krita
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/krita/ChangeLog,v 1.84 2008/04/21 22:53:13 flameeyes Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/krita/ChangeLog,v 1.85 2009/02/08 17:27:18 carlo Exp $
+
+*krita-1.6.3_p20090204 (08 Feb 2009)
+
+  08 Feb 2009; Carsten Lohrke <carlo@gentoo.org>
+  +krita-1.6.3_p20090204.ebuild:
+  Sync to branch plus various fixes.
 
   21 Apr 2008; Diego Pettenò <flameeyes@gentoo.org>
   +files/krita-1.6.3+gcc-4.3.patch, krita-1.6.3.ebuild:
diff --git a/app-office/krita/krita-1.6.3_p20090204.ebuild b/app-office/krita/krita-1.6.3_p20090204.ebuild
new file mode 100644
index 000000000000..477a4029342e
--- /dev/null
+++ b/app-office/krita/krita-1.6.3_p20090204.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/krita/krita-1.6.3_p20090204.ebuild,v 1.1 2009/02/08 17:27:18 carlo Exp $
+
+ARTS_REQUIRED="never"
+
+KMNAME=koffice
+inherit kde-meta eutils
+
+DESCRIPTION="KOffice image manipulation program."
+HOMEPAGE="http://www.koffice.org/"
+LICENSE="GPL-2 LGPL-2"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+# See bug #130442.
+#IUSE="opengl"
+IUSE=""
+
+DEPEND="~app-office/koffice-libs-1.6.3_p20090204
+	>=media-libs/lcms-1.15
+	media-libs/tiff
+	media-libs/jpeg
+	>=media-libs/openexr-1.2.2-r2
+	media-libs/libpng
+	>=media-libs/libexif-0.6.13-r1
+	virtual/opengl
+	virtual/glu"
+
+#opengl? ( virtual/opengl virtual/glu )"
+
+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.5
+
+pkg_setup() {
+	# use opengl &&
+		if ! built_with_use =x11-libs/qt-3* opengl ; then
+			eerror "You need to build x11-libs/qt with opengl use flag enabled."
+			die
+		fi
+
+	kde_pkg_setup
+}
+
+src_unpack() {
+	kde-meta_src_unpack
+
+	# Broken - with Imagemagick 6.4 functions went private.
+	sed -i -e 's:$(IMAGEMAGICK_SUBDIR)::' "${S}"/filters/krita/Makefile.am
+
+	# FIXME - disable broken tests for now
+	sed -i -e "s:TESTSDIR =.*:TESTSDIR=:" "${S}"/krita/core/Makefile.am \
+		$(ls "${S}"/krita/colorspaces/*/Makefile.am)
+}
+
+src_compile() {
+#	local myconf="$(use_with opengl gl)"
+
+	for i in $(find "${S}"/lib -iname "*\.ui"); do
+		"${QTDIR}"/bin/uic ${i} > ${i%.ui}.h
+	done
+
+	kde-meta_src_compile
+}