Force OpenGL, bug #130442. Correct dependencies, inclusive bug #133984.

Package-Manager: portage-2.1.1_rc1

4 files changed, 107 insertions, 5 deletions

diff --git a/app-office/koffice/ChangeLog b/app-office/koffice/ChangeLog
index 66732d230a6e..38f6df42226d 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.175 2006/08/17 19:36:37 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/ChangeLog,v 1.176 2006/08/27 22:59:36 carlo Exp $
+
+*koffice-1.5.2-r1 (27 Aug 2006)
+
+  27 Aug 2006; Carsten Lohrke <carlo@gentoo.org> +koffice-1.5.2-r1.ebuild:
+  Force OpenGL, bug #130442. Correct dependencies, inclusive bug #133984.
 
   17 Aug 2006; Markus Rothe <corsair@gentoo.org> koffice-1.5.1-r1.ebuild:
   Stable on ppc64
diff --git a/app-office/koffice/Manifest b/app-office/koffice/Manifest
index d9fa9d6f13ac..a2ee3c5779c5 100644
--- a/app-office/koffice/Manifest
+++ b/app-office/koffice/Manifest
@@ -37,14 +37,18 @@ EBUILD koffice-1.5.1-r1.ebuild 1836 RMD160 99557ad3b5915cffada1e68b11bab390da206
 MD5 3c80993f25176f290aa554ced70ac736 koffice-1.5.1-r1.ebuild 1836
 RMD160 99557ad3b5915cffada1e68b11bab390da206c61 koffice-1.5.1-r1.ebuild 1836
 SHA256 68081bbb0e8483b675bd0ea8fcf2b51a7071f9608935dce8163dd6d52a72ead7 koffice-1.5.1-r1.ebuild 1836
+EBUILD koffice-1.5.2-r1.ebuild 2086 RMD160 8636b9a84c2abef067f525909b4f2cb59e8e4096 SHA1 163e87f7440a12f883d43dffc207b53576160db8 SHA256 16d00ecaa77e3f0e55e10ee01d845eab65b770c88e45a273907ac3e7591806ca
+MD5 4a7c4dd4b1f87f692a590fb608ac6701 koffice-1.5.2-r1.ebuild 2086
+RMD160 8636b9a84c2abef067f525909b4f2cb59e8e4096 koffice-1.5.2-r1.ebuild 2086
+SHA256 16d00ecaa77e3f0e55e10ee01d845eab65b770c88e45a273907ac3e7591806ca koffice-1.5.2-r1.ebuild 2086
 EBUILD koffice-1.5.2.ebuild 1731 RMD160 e95e7750acdb40d1a6d6667efcacd6229812e312 SHA1 af1863e475749029bba35fe1cfb39d4c5e6dfd13 SHA256 46732dc4ea7e17f57569ab3d52bde41ad7fa28a5a84fb070682611d1a9606d46
 MD5 41ea31e81fa7ac55e09d27f8a3555ceb koffice-1.5.2.ebuild 1731
 RMD160 e95e7750acdb40d1a6d6667efcacd6229812e312 koffice-1.5.2.ebuild 1731
 SHA256 46732dc4ea7e17f57569ab3d52bde41ad7fa28a5a84fb070682611d1a9606d46 koffice-1.5.2.ebuild 1731
-MISC ChangeLog 24166 RMD160 239dca86df6c3df0e9a1b68cdaab350b6c2041e4 SHA1 80cdc80410f90388f449c1405256d21f05f07967 SHA256 f9249f47ecfcfd4441210e834d6b7c0685be065bd73cca6f32ee856c2a5e404a
-MD5 801b0c994abcd269749fd3650e6a0c5f ChangeLog 24166
-RMD160 239dca86df6c3df0e9a1b68cdaab350b6c2041e4 ChangeLog 24166
-SHA256 f9249f47ecfcfd4441210e834d6b7c0685be065bd73cca6f32ee856c2a5e404a ChangeLog 24166
+MISC ChangeLog 24347 RMD160 488679e98ebcb4052f02101f4a487b9db4ceab4e SHA1 7b80c7058d80e35b2083f59303fcdd4be72c8535 SHA256 38e723c9c457eb8162169a209a39faac312c131a0c223ade99343172cda0bea6
+MD5 a375a03c0276dc5198829ffc9041ea2b ChangeLog 24347
+RMD160 488679e98ebcb4052f02101f4a487b9db4ceab4e ChangeLog 24347
+SHA256 38e723c9c457eb8162169a209a39faac312c131a0c223ade99343172cda0bea6 ChangeLog 24347
 MISC metadata.xml 157 RMD160 9258d9691830e58ee00ca89f0a6df9ce077f2439 SHA1 b2ca0d856f38a09bf6d2e58ee77b344552585862 SHA256 e0e268ca18fef286617fcfe97773d5df5b8fbdb5fbcb9a29adc5e8b0baea4292
 MD5 02039d51ca4a42817775fd436dfaa956 metadata.xml 157
 RMD160 9258d9691830e58ee00ca89f0a6df9ce077f2439 metadata.xml 157
@@ -61,3 +65,6 @@ SHA256 86cf9a39992b08b505d0b19f69cd385dd34a3609ba82d583d46e5821a56d093c files/di
 MD5 6353f4b1dea05aa025ec83436c25e6b8 files/digest-koffice-1.5.2 250
 RMD160 9141af51df3c51e43191e4193d1f5c61873599df files/digest-koffice-1.5.2 250
 SHA256 13c1606ac5036bfd64ce43667b31a5494b8ae894317b016b703201f53409cfb3 files/digest-koffice-1.5.2 250
+MD5 6353f4b1dea05aa025ec83436c25e6b8 files/digest-koffice-1.5.2-r1 250
+RMD160 9141af51df3c51e43191e4193d1f5c61873599df files/digest-koffice-1.5.2-r1 250
+SHA256 13c1606ac5036bfd64ce43667b31a5494b8ae894317b016b703201f53409cfb3 files/digest-koffice-1.5.2-r1 250
diff --git a/app-office/koffice/files/digest-koffice-1.5.2-r1 b/app-office/koffice/files/digest-koffice-1.5.2-r1
new file mode 100644
index 000000000000..d1ae4451f5cb
--- /dev/null
+++ b/app-office/koffice/files/digest-koffice-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/koffice/koffice-1.5.2-r1.ebuild b/app-office/koffice/koffice-1.5.2-r1.ebuild
new file mode 100644
index 000000000000..e274a0139591
--- /dev/null
+++ b/app-office/koffice/koffice-1.5.2-r1.ebuild
@@ -0,0 +1,87 @@
+# 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.2-r1.ebuild,v 1.1 2006/08/27 22:59:36 carlo Exp $
+
+inherit kde
+
+RV="${PV}"
+MY_P="koffice-${RV}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="KOffice is 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="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+
+# See bug #130442.
+#IUSE="doc mysql opengl postgres"
+IUSE="doc mysql postgres"
+
+RDEPEND=">=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
+	>=app-text/wv2-0.1.9
+	>=app-text/libwpd-0.8.2
+	>=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 )"
+
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )"
+
+# 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.4
+
+# 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.
+
+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_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-*
+}