Force OpenGL, bug #130442. Correct dependency, bug #133984.

Package-Manager: portage-2.1.1_rc1

4 files changed, 86 insertions, 5 deletions

diff --git a/app-office/krita/ChangeLog b/app-office/krita/ChangeLog
index e73caff63f7a..63ce0b4d2c95 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.45 2006/08/16 12:41:50 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/krita/ChangeLog,v 1.46 2006/08/27 22:53:56 carlo Exp $
+
+*krita-1.5.2-r1 (27 Aug 2006)
+
+  27 Aug 2006; Carsten Lohrke <carlo@gentoo.org> +krita-1.5.2-r1.ebuild:
+  Force OpenGL, bug #130442. Correct dependency, bug #133984.
 
   16 Aug 2006; Markus Rothe <corsair@gentoo.org> krita-1.5.1.ebuild:
   Stable on ppc64
diff --git a/app-office/krita/Manifest b/app-office/krita/Manifest
index bb79de20c509..bfe66ff0d405 100644
--- a/app-office/krita/Manifest
+++ b/app-office/krita/Manifest
@@ -13,14 +13,18 @@ EBUILD krita-1.5.1.ebuild 1280 RMD160 8c2de8e9601fd6d0f9d436dd34321bf37089bdcb S
 MD5 6ef09d58c8600b477b04151d99349366 krita-1.5.1.ebuild 1280
 RMD160 8c2de8e9601fd6d0f9d436dd34321bf37089bdcb krita-1.5.1.ebuild 1280
 SHA256 e13394fdf62de4199ba798af83d03773244167a092ec2a0a0b60d7ae213c01f9 krita-1.5.1.ebuild 1280
+EBUILD krita-1.5.2-r1.ebuild 1499 RMD160 f909fcd52c41c39bdc09988f9d3c920b57bb20bf SHA1 c4534eae29b9f5d797053d113639293aacc6e7c0 SHA256 2d6cc42f169f3a1ba1295b0d570635dec9f923700e82f8b05559ea9c37e5fe24
+MD5 d84dd29da092e2a2dbeabcc5d050cecc krita-1.5.2-r1.ebuild 1499
+RMD160 f909fcd52c41c39bdc09988f9d3c920b57bb20bf krita-1.5.2-r1.ebuild 1499
+SHA256 2d6cc42f169f3a1ba1295b0d570635dec9f923700e82f8b05559ea9c37e5fe24 krita-1.5.2-r1.ebuild 1499
 EBUILD krita-1.5.2.ebuild 1294 RMD160 0381014de52438a6fdb0939686dbb529f8123a8c SHA1 84b0a9aa80b172b48a8f6e8d636480867aaa5f54 SHA256 9a24907ea9711ad01a4bc4eabc04ff62f7dfff160e076551c05c3dd10de8bb2d
 MD5 c47d371ad7d6cc7147b9dbf7274c6742 krita-1.5.2.ebuild 1294
 RMD160 0381014de52438a6fdb0939686dbb529f8123a8c krita-1.5.2.ebuild 1294
 SHA256 9a24907ea9711ad01a4bc4eabc04ff62f7dfff160e076551c05c3dd10de8bb2d krita-1.5.2.ebuild 1294
-MISC ChangeLog 5159 RMD160 c101f4fd73628f1a65d1897c7ace629de94be378 SHA1 e1848ce0acbde5d612ec2498d4b2e6c93001c035 SHA256 4c5fe1033232b39f0217bef8e82c911462b8b11fcb9ce245ec56cd2c506b6933
-MD5 3cf9b448e228beabc6b99272aadc4a9b ChangeLog 5159
-RMD160 c101f4fd73628f1a65d1897c7ace629de94be378 ChangeLog 5159
-SHA256 4c5fe1033232b39f0217bef8e82c911462b8b11fcb9ce245ec56cd2c506b6933 ChangeLog 5159
+MISC ChangeLog 5324 RMD160 181c78b7e922dd0491716b4f1ca6e99bddcedc0a SHA1 6fa3052f7d3523f4c5ae9d210e42fe3ddaf6f4df SHA256 d79e86e2cdba1a2bed7e7554c9df125ea831b6d50d31820dcec1cd3661ae96b4
+MD5 5309eadc3f8a5bb3f73bfb6a27cff655 ChangeLog 5324
+RMD160 181c78b7e922dd0491716b4f1ca6e99bddcedc0a ChangeLog 5324
+SHA256 d79e86e2cdba1a2bed7e7554c9df125ea831b6d50d31820dcec1cd3661ae96b4 ChangeLog 5324
 MISC metadata.xml 157 RMD160 9258d9691830e58ee00ca89f0a6df9ce077f2439 SHA1 b2ca0d856f38a09bf6d2e58ee77b344552585862 SHA256 e0e268ca18fef286617fcfe97773d5df5b8fbdb5fbcb9a29adc5e8b0baea4292
 MD5 02039d51ca4a42817775fd436dfaa956 metadata.xml 157
 RMD160 9258d9691830e58ee00ca89f0a6df9ce077f2439 metadata.xml 157
@@ -34,3 +38,6 @@ SHA256 86cf9a39992b08b505d0b19f69cd385dd34a3609ba82d583d46e5821a56d093c files/di
 MD5 6353f4b1dea05aa025ec83436c25e6b8 files/digest-krita-1.5.2 250
 RMD160 9141af51df3c51e43191e4193d1f5c61873599df files/digest-krita-1.5.2 250
 SHA256 13c1606ac5036bfd64ce43667b31a5494b8ae894317b016b703201f53409cfb3 files/digest-krita-1.5.2 250
+MD5 6353f4b1dea05aa025ec83436c25e6b8 files/digest-krita-1.5.2-r1 250
+RMD160 9141af51df3c51e43191e4193d1f5c61873599df files/digest-krita-1.5.2-r1 250
+SHA256 13c1606ac5036bfd64ce43667b31a5494b8ae894317b016b703201f53409cfb3 files/digest-krita-1.5.2-r1 250
diff --git a/app-office/krita/files/digest-krita-1.5.2-r1 b/app-office/krita/files/digest-krita-1.5.2-r1
new file mode 100644
index 000000000000..d1ae4451f5cb
--- /dev/null
+++ b/app-office/krita/files/digest-krita-1.5.2-r1
@@ -0,0 +1,3 @@
+MD5 cbe9deeb7c811a6bb5a954989b25c1f2 koffice-1.5.2.tar.bz2 35878218
+RMD160 eb33d9e74adec0fc3409d38c2bfe84b5dfdd5546 koffice-1.5.2.tar.bz2 35878218
+SHA256 d57d8a7611337f2678a7e28b100b9ab64148bf5483c01dbd204529f07b148611 koffice-1.5.2.tar.bz2 35878218
diff --git a/app-office/krita/krita-1.5.2-r1.ebuild b/app-office/krita/krita-1.5.2-r1.ebuild
new file mode 100644
index 000000000000..8bdf5bb50334
--- /dev/null
+++ b/app-office/krita/krita-1.5.2-r1.ebuild
@@ -0,0 +1,66 @@
+# 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.2-r1.ebuild,v 1.1 2006/08/27 22:53:56 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="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+# See bug #130442.
+#IUSE="opengl"
+IUSE=""
+
+DEPEND="$(deprange $PV $MAXKOFFICEVER app-office/koffice-libs)
+	>=media-gfx/imagemagick-6.2.5.5
+	>=media-libs/lcms-1.14-r1
+	media-libs/tiff
+	media-libs/jpeg
+	media-libs/openexr
+	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.4
+
+pkg_setup() {
+	# use opengl &&
+		if ! built_with_use kde-base/kdelibs opengl ; then
+			eerror "You need to build kde-base/kdelibs with opengl use flag enabled."
+			die
+		fi
+}
+
+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
+}
\ No newline at end of file