Fix the X11 detection.

Package-Manager: portage-2.2_rc61/cvs/Linux x86_64

4 files changed, 37 insertions, 5 deletions

diff --git a/net-irc/quassel/ChangeLog b/net-irc/quassel/ChangeLog
index 845f05822fba..46a6f68e1f78 100644
--- a/net-irc/quassel/ChangeLog
+++ b/net-irc/quassel/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-irc/quassel
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/ChangeLog,v 1.77 2010/01/19 12:10:21 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/ChangeLog,v 1.78 2010/01/21 11:32:01 scarabeus Exp $
+
+  21 Jan 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  +files/0.5.2-fix_x11_detection.patch, quassel-0.5.2.ebuild:
+  Fix the X11 detection.
 
 *quassel-0.5.2 (19 Jan 2010)
 
diff --git a/net-irc/quassel/Manifest b/net-irc/quassel/Manifest
index a1e4cf80444a..c0122993cfb1 100644
--- a/net-irc/quassel/Manifest
+++ b/net-irc/quassel/Manifest
@@ -1,10 +1,11 @@
+AUX 0.5.2-fix_x11_detection.patch 854 RMD160 88585681941f9ed915edb4ec2f6a07d645ceb22e SHA1 80b6e5a9c75fb69d91f8ec86770369b20f412311 SHA256 1daa5834b1836756f74829e9d0861d9cfda7998a3a477c980fbdf5b2769c2500
 AUX quassel.logrotate 105 RMD160 42bde4a3d8a899971037b1e2d0ddfb5b136f065e SHA1 c4ddd2cebd364c213ed4443e5bf8bd2ae3b17ad9 SHA256 00c32e857d7a4346d09ac057768565692da9cacf41ed37cc7e357b395e033a45
 AUX quasselcore-2.conf 548 RMD160 afc8ee2d5bc8449c51afd46699e7b9796ff77b1f SHA1 e9492c10864df233edda84411f7cf15e1f7f3573 SHA256 973bff9a4dac8e25b6a7b8dc8355f763c65e31f070b1fc5904f6325045ad3cb5
 AUX quasselcore-2.init 1627 RMD160 fc0885dc6a2295ad1dcb49aefc1adfd184388fb2 SHA1 2629a3019913b1c685406fc88ead655e10bed943 SHA256 318e85a896fc2672651fa270dd98bfb664c0cb20cc8ae34c18363dbef36d820b
 DIST quassel-0.5.1.tar.bz2 3339773 RMD160 411f70ed4b4162f8523bf5498cd22aca43171b5c SHA1 448c2712176d5c0328b439b60ee27e06645339ba SHA256 c2aa0694b775b33380cb5bb452512433fa9f0bf4820778e8ec98f621e5458f62
 DIST quassel-0.5.2.tar.bz2 3307109 RMD160 bac05710c6126150c1546713325f319bef2640c8 SHA1 68abd45cd506303090b54e4aa21eb0273d3e4217 SHA256 9c98dcefa4b1655ae92b0204ef30594c9043701fb66350c5e69beafa86b88c8a
 EBUILD quassel-0.5.1.ebuild 3218 RMD160 62aadb3a9c8f83d150e1eb14ff1e3b8a76d19807 SHA1 42163521389834335a146ef15bc49dbb3177cb5f SHA256 f1ae33c2da36871dec586e5e077b9a931253fcd31baa52aa21fe7d00dc2641b0
-EBUILD quassel-0.5.2.ebuild 3224 RMD160 69e95bafe204e219d455f1eb672dbc8cfe63541f SHA1 66af5be9182712284e01b85a0eecec93d42346ca SHA256 5aa990c99444ffd470b5e334dd571661f91297f187f4e7ba4658282d4d1fe3d1
+EBUILD quassel-0.5.2.ebuild 3286 RMD160 63a5f30344de108115443bdfd15188d7ff20eb3d SHA1 3fde3cbc2ae6d5b2cf5b5380b64a371b1f51ea07 SHA256 50d32c4fbfca4529386903d60606706a8f35596f0b53609594689485b4d9cd4e
 EBUILD quassel-9999.ebuild 2852 RMD160 10f431615602df37a37c8b8db574f5eeb550e159 SHA1 fba44144643be83263f3257f5799be43417fc5ae SHA256 f4399a9f0e20dab268a69c63b7e455baf279656f3d8765b9c036f09594c32802
-MISC ChangeLog 13769 RMD160 5a60ce91c276b5dd5cc37f7ff3b593b40465a9a5 SHA1 7a984c082bd5d61027bfe916b85f67a4f45d8787 SHA256 6f9dd9fdfd1493e7d19038d5ea7a0af5dc06f80b12d729f406674cb2a3707d83
+MISC ChangeLog 13912 RMD160 182d89cdc2c3660442edff8fa55123c17ac1f81a SHA1 40ad5108dae7ce7664605d608dfd1bf4bb22e898 SHA256 811ea9e3882221d3b4fca500a330933e12ef4ef1687dcd237639e562b6d6c4d4
 MISC metadata.xml 1904 RMD160 0d6920637ae95ecf65ddeed89b533f7d38c2a9e7 SHA1 1184f2d819596ca938d3528b9db95c93bdd264dd SHA256 b3e24e86bcd423d041692bd6f18dbc72729444eb4a484adc6b3bab77ded76741
diff --git a/net-irc/quassel/files/0.5.2-fix_x11_detection.patch b/net-irc/quassel/files/0.5.2-fix_x11_detection.patch
new file mode 100644
index 000000000000..12f34fd67198
--- /dev/null
+++ b/net-irc/quassel/files/0.5.2-fix_x11_detection.patch
@@ -0,0 +1,25 @@
+From 8df3e82b02a980d4e00f3dc9c90c11e96501cf6f Mon Sep 17 00:00:00 2001
+From: Manuel Nickschas <sputnick@quassel-irc.org>
+Date: Tue, 19 Jan 2010 21:51:41 +0100
+Subject: [PATCH] Don't require X11 headers for building quasselcore
+
+---
+ cmake/modules/Qt4ConfigDependentSettings.cmake |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/cmake/modules/Qt4ConfigDependentSettings.cmake b/cmake/modules/Qt4ConfigDependentSettings.cmake
+index 1956aa5..a6b6c3d 100644
+--- a/cmake/modules/Qt4ConfigDependentSettings.cmake
++++ b/cmake/modules/Qt4ConfigDependentSettings.cmake
+@@ -27,7 +27,7 @@
+ IF(UNIX)
+   # on OS X X11 may not be required
+   IF (Q_WS_X11)
+-    FIND_PACKAGE(X11 REQUIRED)
++    FIND_PACKAGE(X11)
+   ENDIF (Q_WS_X11)
+   FIND_PACKAGE(Threads)
+   SET(QT_QTCORE_LIBRARY ${QT_QTCORE_LIBRARY} ${CMAKE_THREAD_LIBS_INIT})
+-- 
+1.6.5.1
+
diff --git a/net-irc/quassel/quassel-0.5.2.ebuild b/net-irc/quassel/quassel-0.5.2.ebuild
index b6c204b60163..99336eab4b3e 100644
--- a/net-irc/quassel/quassel-0.5.2.ebuild
+++ b/net-irc/quassel/quassel-0.5.2.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-0.5.2.ebuild,v 1.1 2010/01/19 12:10:21 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-0.5.2.ebuild,v 1.2 2010/01/21 11:32:01 scarabeus Exp $
 
 EAPI="2"
 
 MY_P="${P/_/-}"
 
-inherit cmake-utils eutils
+inherit base cmake-utils eutils
 
 DESCRIPTION="Qt4/KDE4 IRC client suppporting a remote daemon for 24/7 connectivity."
 HOMEPAGE="http://quassel-irc.org/"
@@ -54,6 +54,8 @@ DOCS="AUTHORS ChangeLog README"
 
 S="${WORKDIR}/${MY_P}"
 
+PATCHES=( "${FILESDIR}/0.5.2-fix_x11_detection.patch" )
+
 pkg_setup() {
 	if ! use monolithic && ! use server && ! use X ; then
 		eerror "You have to build at least one of the monolithic client (USE=monolithic),"