From 842d3e0e4d0d886e52ac629eb47be8beb21b7950 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Diego=20Elio=20Petten=C3=B2?= Date: Wed, 6 Sep 2006 11:38:19 +0000 Subject: [PATCH] Again, don't check kdelibs for opengl useflag, it's Qt. Thanks to Richard Fish in bug #146496. Package-Manager: portage-2.1.1_rc1-r4 --- app-office/koffice/ChangeLog | 7 +++++- app-office/koffice/Manifest | 26 +++++++++++++++------- app-office/koffice/koffice-1.5.2-r1.ebuild | 6 ++--- 3 files changed, 27 insertions(+), 12 deletions(-) diff --git a/app-office/koffice/ChangeLog b/app-office/koffice/ChangeLog index eceae6fa12dc..d5f363812463 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.177 2006/09/03 02:17:10 kloeri Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/ChangeLog,v 1.178 2006/09/06 11:38:19 flameeyes Exp $ + + 06 Sep 2006; Diego Pettenò + koffice-1.5.2-r1.ebuild: + Again, don't check kdelibs for opengl useflag, it's Qt. Thanks to Richard + Fish in bug #146496. 03 Sep 2006; Bryan Østergaard koffice-1.5.2-r1.ebuild: diff --git a/app-office/koffice/Manifest b/app-office/koffice/Manifest index bf6b7b160eac..de1b0fe9ad2e 100644 --- a/app-office/koffice/Manifest +++ b/app-office/koffice/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX kexi-1.4.2-gcc41.patch 1094 RMD160 ffc028b187ec7437aab156f3e575b945b390845c SHA1 2c5944a2e705d05abcb65674639b1b85ec22f6c9 SHA256 7c0790dacdc090b8cb176a8289facc471d6ef4ea2c93bb6ac985e6497fac1eef MD5 5f3683b6817935e4f6269bd64398c479 files/kexi-1.4.2-gcc41.patch 1094 RMD160 ffc028b187ec7437aab156f3e575b945b390845c files/kexi-1.4.2-gcc41.patch 1094 @@ -37,18 +40,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 2093 RMD160 dd60f8350bcd0380b1638f0bf6299625a1a42cbd SHA1 12fa5d7439677eabd4e37c984979052b663e210b SHA256 d02bc88c23cd044bfac11b4af61f9d229a624d94e5ecbd887b7d04f83eddd3b8 -MD5 59a17a7fe5c65b5b2d2b96daf19d1a32 koffice-1.5.2-r1.ebuild 2093 -RMD160 dd60f8350bcd0380b1638f0bf6299625a1a42cbd koffice-1.5.2-r1.ebuild 2093 -SHA256 d02bc88c23cd044bfac11b4af61f9d229a624d94e5ecbd887b7d04f83eddd3b8 koffice-1.5.2-r1.ebuild 2093 +EBUILD koffice-1.5.2-r1.ebuild 2090 RMD160 1a5ac508b1d0379686a8f311eb4008d499bd4fca SHA1 2a27771f80b40ab38559cf159799aec9afd7edd8 SHA256 55acbfe9ca4a7b9279acac3504c2bce1f3609abe84e73d4e624530c1bae5c3c9 +MD5 735306b2e9c73be95addfd0ca1f20b7d koffice-1.5.2-r1.ebuild 2090 +RMD160 1a5ac508b1d0379686a8f311eb4008d499bd4fca koffice-1.5.2-r1.ebuild 2090 +SHA256 55acbfe9ca4a7b9279acac3504c2bce1f3609abe84e73d4e624530c1bae5c3c9 koffice-1.5.2-r1.ebuild 2090 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 24450 RMD160 a49906ce3c5f0e9003fca9c3dd59ed0a59509ecf SHA1 8f1c5325fabd638d79fc22b4fc0931b313bd402f SHA256 159c382ab9711bc7fc6265056c0d211cfa038fc1871af4964de01df33c8a95e2 -MD5 b3309ac35c993e3f65812e3c25f39ef3 ChangeLog 24450 -RMD160 a49906ce3c5f0e9003fca9c3dd59ed0a59509ecf ChangeLog 24450 -SHA256 159c382ab9711bc7fc6265056c0d211cfa038fc1871af4964de01df33c8a95e2 ChangeLog 24450 +MISC ChangeLog 24633 RMD160 d02dc3287c44385c8ce753e0f0145ff0dbdd6f2c SHA1 b26284099ce675225c399d5e6892db6426f0dc6f SHA256 906ccec9c9a92b200f5565ceece597c6458a69ebefcdf08404f9bc1410360b54 +MD5 564d9f3e83b4b2b2c3a388b5982414fe ChangeLog 24633 +RMD160 d02dc3287c44385c8ce753e0f0145ff0dbdd6f2c ChangeLog 24633 +SHA256 906ccec9c9a92b200f5565ceece597c6458a69ebefcdf08404f9bc1410360b54 ChangeLog 24633 MISC metadata.xml 157 RMD160 9258d9691830e58ee00ca89f0a6df9ce077f2439 SHA1 b2ca0d856f38a09bf6d2e58ee77b344552585862 SHA256 e0e268ca18fef286617fcfe97773d5df5b8fbdb5fbcb9a29adc5e8b0baea4292 MD5 02039d51ca4a42817775fd436dfaa956 metadata.xml 157 RMD160 9258d9691830e58ee00ca89f0a6df9ce077f2439 metadata.xml 157 @@ -68,3 +71,10 @@ SHA256 13c1606ac5036bfd64ce43667b31a5494b8ae894317b016b703201f53409cfb3 files/di 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 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.5 (GNU/Linux) + +iD8DBQFE/rNBAiZjviIA2XgRAu52AJ91ELG2ITeiUVf5kywrf6ECw/NSFwCg3N+Z +OOb2jTHZNrLVJv8T6wzmtog= +=fZsY +-----END PGP SIGNATURE----- diff --git a/app-office/koffice/koffice-1.5.2-r1.ebuild b/app-office/koffice/koffice-1.5.2-r1.ebuild index a6d263d0acab..017e88aa147d 100644 --- a/app-office/koffice/koffice-1.5.2-r1.ebuild +++ b/app-office/koffice/koffice-1.5.2-r1.ebuild @@ -1,6 +1,6 @@ # 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.2 2006/09/03 02:17:10 kloeri Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/koffice-1.5.2-r1.ebuild,v 1.3 2006/09/06 11:38:19 flameeyes Exp $ inherit kde @@ -61,8 +61,8 @@ 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." + 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 } -- 2.26.2