fix qt again

6 files changed, 44 insertions, 15 deletions

diff --git a/sys-apps/dbus/ChangeLog b/sys-apps/dbus/ChangeLog
index d6b6fb46e7be..40c552a4384e 100644
--- a/sys-apps/dbus/ChangeLog
+++ b/sys-apps/dbus/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/dbus
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.26 2005/01/13 17:13:17 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.27 2005/01/13 17:37:52 lanius Exp $
+
+  13 Jan 2005; Heinrich Wendel <lanius@gentoo.org> +files/dbus-0.23-qt.patch,
+  dbus-0.23.ebuild:
+  fix qt again
 
 *dbus-0.23 (13 Jan 2005)
 
diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest
index f8e92edf05d8..675bf48e6721 100644
--- a/sys-apps/dbus/Manifest
+++ b/sys-apps/dbus/Manifest
@@ -1,10 +1,11 @@
-MD5 f30a48ba3a091f1e1472804d8fefba8d dbus-0.22-r2.ebuild 3213
-MD5 2c14fcceab017080c8ac6949b1b4cfc9 dbus-0.23.ebuild 2843
+MD5 0f366a3fd6a36c32a4b1448b662d881a dbus-0.22-r2.ebuild 3212
+MD5 23d62a4b46d7e2b8b19bc2c97f060e4f dbus-0.23.ebuild 2799
 MD5 d389f0542ab88162dc6372a1121724a1 dbus-0.22-r1.ebuild 2859
-MD5 c5531b6a096eff2f86084195544b6ace dbus-0.22-r3.ebuild 3239
-MD5 e7b1913ac83759975b88dfed9f692316 ChangeLog 3747
+MD5 67387471ff24abf960eb6e14521b7101 dbus-0.22-r3.ebuild 3239
+MD5 75f391dc5cd9c5cf0e514c2a5abe9693 ChangeLog 3862
 MD5 5b5bcd9c1a432b2c8157b0004a073f72 metadata.xml 224
 MD5 5ad50ae94f784548fc0d6f1364ce23bb files/dbus 544
+MD5 db2189cd44431086b05de29565090861 files/dbus-0.23-qt.patch 816
 MD5 032a780f5d3dd0c743f2b932424fd39c files/dbus-0.22-python_int64.patch 5448
 MD5 b0cc4f0bb3505fb083602b48c09f25a6 files/digest-dbus-0.22-r1 62
 MD5 b0cc4f0bb3505fb083602b48c09f25a6 files/digest-dbus-0.22-r2 62
diff --git a/sys-apps/dbus/dbus-0.22-r2.ebuild b/sys-apps/dbus/dbus-0.22-r2.ebuild
index 7316b1a5dd3c..3080b2d51215 100644
--- a/sys-apps/dbus/dbus-0.22-r2.ebuild
+++ b/sys-apps/dbus/dbus-0.22-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-0.22-r2.ebuild,v 1.4 2004/12/17 19:57:22 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-0.22-r2.ebuild,v 1.5 2005/01/13 17:37:52 lanius Exp $
 
 # because of the experimental nature debug by default
 inherit debug eutils mono python
diff --git a/sys-apps/dbus/dbus-0.22-r3.ebuild b/sys-apps/dbus/dbus-0.22-r3.ebuild
index f54ffc14b7c7..2285760736ad 100644
--- a/sys-apps/dbus/dbus-0.22-r3.ebuild
+++ b/sys-apps/dbus/dbus-0.22-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-0.22-r3.ebuild,v 1.2 2004/12/30 16:57:58 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-0.22-r3.ebuild,v 1.3 2005/01/13 17:37:52 lanius Exp $
 
 # because of the experimental nature debug by default
 inherit debug eutils mono python
diff --git a/sys-apps/dbus/dbus-0.23.ebuild b/sys-apps/dbus/dbus-0.23.ebuild
index 040078b3cbd2..3d723f4272c9 100644
--- a/sys-apps/dbus/dbus-0.23.ebuild
+++ b/sys-apps/dbus/dbus-0.23.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-0.23.ebuild,v 1.2 2005/01/13 17:13:17 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-0.23.ebuild,v 1.3 2005/01/13 17:37:52 lanius Exp $
 
 # because of the experimental nature debug by default
 inherit debug eutils mono python
@@ -39,14 +39,10 @@ DEPEND="${RDEPEND}
 #	java? ( sys-devel/gcc )
 
 src_unpack() {
-
 	unpack ${A}
 	cd ${S}
 
-#	epatch ${FILESDIR}/${PN}-0.22-qt.patch
-
-#	autoconf || die
-#	automake || die
+	epatch ${FILESDIR}/${P}-qt.patch
 }
 
 src_compile() {
diff --git a/sys-apps/dbus/files/dbus-0.23-qt.patch b/sys-apps/dbus/files/dbus-0.23-qt.patch
new file mode 100644
index 000000000000..d4858596ac6c
--- /dev/null
+++ b/sys-apps/dbus/files/dbus-0.23-qt.patch
@@ -0,0 +1,28 @@
+--- configure.org	2004-12-13 14:08:57.676399648 +0100
++++ configure	2004-12-13 14:09:31.113316464 +0100
+@@ -812,6 +812,7 @@
+         if test -f "$dir/qglobal.h"; then
+             have_qt=yes
+             DBUS_QT_CXXFLAGS="-I$dir"
++			DBUS_QT_LIBS="-I$QTDIR/lib/libqt-mt.la"
+        fi
+     done
+ fi
+@@ -26196,17 +26196,6 @@
+ echo "${ECHO_T}not found" >&6
+ fi
+ 
+-if (! kde-config >& /dev/null); then
+-    have_qt=no
+-else
+-    kdelibs=`kde-config --install lib --expandvars 2>/dev/null`
+-    if test -z $kdelibs -o ! -f $kdelibs/libkdecore.la; then
+-        have_qt=no
+-    else
+-        DBUS_QT_LIBS="$kdelibs/libkdecore.la"
+-    fi
+-fi
+-
+ if test x$have_qt = xno ; then
+     { echo "$as_me:$LINENO: WARNING: Qt development libraries not found" >&5
+ echo "$as_me: WARNING: Qt development libraries not found" >&2;}