From 56f3381ce5397397b52681bb394cdf6ee2174f5e Mon Sep 17 00:00:00 2001 From: Przemyslaw Maciag Date: Mon, 1 Jan 2007 23:07:46 +0000 Subject: [PATCH] check for qt3support has to be done, even without jingle enabled Package-Manager: portage-2.1.2_rc4-r2 --- net-im/psi/ChangeLog | 9 +++++++-- net-im/psi/Manifest | 22 +++++++++++----------- net-im/psi/psi-0.11_pre20061231.ebuild | 11 +++++------ 3 files changed, 23 insertions(+), 19 deletions(-) diff --git a/net-im/psi/ChangeLog b/net-im/psi/ChangeLog index 0861c6decedf..0865429e922a 100644 --- a/net-im/psi/ChangeLog +++ b/net-im/psi/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-im/psi -# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/psi/ChangeLog,v 1.107 2006/12/31 12:13:26 troll Exp $ +# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-im/psi/ChangeLog,v 1.108 2007/01/01 23:07:46 troll Exp $ + + 01 Jan 2007; Przemysław Maciąg + psi-0.11_pre20061231.ebuild: + qt3support use flag in qt-4 ebuilds has to be turned on even when not + compiling against jingle support (thx to Rudi Mayerhofer, see #158285) *psi-0.11_pre20061231 (31 Dec 2006) diff --git a/net-im/psi/Manifest b/net-im/psi/Manifest index 1cd79f6eecd9..fc8c09277d25 100644 --- a/net-im/psi/Manifest +++ b/net-im/psi/Manifest @@ -75,14 +75,14 @@ EBUILD psi-0.10.ebuild 10906 RMD160 5a452dd092a015412e34f5b0771fae4e9d9b3a3a SHA MD5 283f39cfa965adea24408861427e5139 psi-0.10.ebuild 10906 RMD160 5a452dd092a015412e34f5b0771fae4e9d9b3a3a psi-0.10.ebuild 10906 SHA256 253e978bd2c47d6de7f983c2c468b5081e56afe712eb7e21b77486b2280963fb psi-0.10.ebuild 10906 -EBUILD psi-0.11_pre20061231.ebuild 3227 RMD160 835ccc52d7d5c4745dfbacaf3a6d21487e47efb0 SHA1 abb86494a0ad5a23c130264bea53c27d23051027 SHA256 8bfe0bbe1e5367fd45b099fdf2d8874472adcc6444d0c8ee4e68705ac0bf4a04 -MD5 5f45d4ccfb63b5a9d95fba809e7d5b18 psi-0.11_pre20061231.ebuild 3227 -RMD160 835ccc52d7d5c4745dfbacaf3a6d21487e47efb0 psi-0.11_pre20061231.ebuild 3227 -SHA256 8bfe0bbe1e5367fd45b099fdf2d8874472adcc6444d0c8ee4e68705ac0bf4a04 psi-0.11_pre20061231.ebuild 3227 -MISC ChangeLog 15256 RMD160 c9d987dc92a9acaac1f90072ef29099c442d39fc SHA1 4e355265e41a067d6314931e866aba8c5d052429 SHA256 293c89f83cfa1d2d6e8e7915a7aac1175cfc55d47f080aaec9765d39a4d5a951 -MD5 a316a404e5470c920269c3e55ee5ad41 ChangeLog 15256 -RMD160 c9d987dc92a9acaac1f90072ef29099c442d39fc ChangeLog 15256 -SHA256 293c89f83cfa1d2d6e8e7915a7aac1175cfc55d47f080aaec9765d39a4d5a951 ChangeLog 15256 +EBUILD psi-0.11_pre20061231.ebuild 3120 RMD160 dfe5ef984aeb53eb67abd903dae568a6cc9b64a0 SHA1 9c746dab5eac09bbfbce86db7603a0a36c9b56f7 SHA256 eae03ffa9ebce93b6a22e6a8966a3053a0003334f30ab23ddb8f9f8cf8c9b4e4 +MD5 150755209b0d221ba119181acd0ea717 psi-0.11_pre20061231.ebuild 3120 +RMD160 dfe5ef984aeb53eb67abd903dae568a6cc9b64a0 psi-0.11_pre20061231.ebuild 3120 +SHA256 eae03ffa9ebce93b6a22e6a8966a3053a0003334f30ab23ddb8f9f8cf8c9b4e4 psi-0.11_pre20061231.ebuild 3120 +MISC ChangeLog 15487 RMD160 809288a4a1bc9fa826d2e3ba162ed33122001f79 SHA1 f228aca7a42fcbb4724c8ab2cc2ca2a564d109d8 SHA256 ccbf7aca794c55f038a27b2435e4768be83e8e644866f03701c5ea4172135fb0 +MD5 785f22a225a80429e1ce72706f8ef939 ChangeLog 15487 +RMD160 809288a4a1bc9fa826d2e3ba162ed33122001f79 ChangeLog 15487 +SHA256 ccbf7aca794c55f038a27b2435e4768be83e8e644866f03701c5ea4172135fb0 ChangeLog 15487 MISC metadata.xml 303 RMD160 deecd227e21d24af6eae6f787e0efd65765741e6 SHA1 a379c487e73d24f68f1036f913c745775a6e9846 SHA256 ea6a7b120f076cc2fa66725d5361639a74895eeb3adc404a887da3be921dfb92 MD5 5436d288bb839d51d856765357e80098 metadata.xml 303 RMD160 deecd227e21d24af6eae6f787e0efd65765741e6 metadata.xml 303 @@ -99,7 +99,7 @@ SHA256 4cffca4243378a52768ab2615f18b6e1887349b65c4bd0e03c0f4d5a0a731276 files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (GNU/Linux) -iD8DBQFFl6jCexDpKttj3ykRAltpAJ9fESTjckHq5M3ASG2WiRbAKeSr3wCdFs0Z -ztVtqLciLaNS8eyDXZgnzEc= -=LvJW +iD8DBQFFmZOwexDpKttj3ykRAiYCAJ48a4FJNGmzSARNckxkBMWaWMbT8ACfUmi2 +6jYYEIvtJ8/+6q3TOlyMAhE= +=NKuz -----END PGP SIGNATURE----- diff --git a/net-im/psi/psi-0.11_pre20061231.ebuild b/net-im/psi/psi-0.11_pre20061231.ebuild index 842d2ba1b755..9ee12fbd7400 100644 --- a/net-im/psi/psi-0.11_pre20061231.ebuild +++ b/net-im/psi/psi-0.11_pre20061231.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/psi/psi-0.11_pre20061231.ebuild,v 1.1 2006/12/31 12:13:26 troll Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/psi/psi-0.11_pre20061231.ebuild,v 1.2 2007/01/01 23:07:46 troll Exp $ inherit confutils eutils qt4 @@ -35,11 +35,10 @@ DEPEND="$(qt4_min_version 4.2) RDEPEND="${DEPEND}" pkg_setup() { - if use jingle && !(built_with_use x11-libs/qt qt3support); then - eerror "In order to compile psi with jingle support (google/talk" - eerror "xmpp extension) you will need to recompile qt4 with" + if !(built_with_use x11-libs/qt qt3support); then + eerror "In order to compile psi you will need to recompile qt4 with" eerror "qt3support use flag enabled." - die "Recompile qt4 with qt3support use flag enabled or disable jingle support in psi" + die "Recompile qt4 with qt3support use flag enabled" fi; } -- 2.26.2