From 27740031e57f968c1953edf37a0d430e7b437db6 Mon Sep 17 00:00:00 2001
From: Dror Levin <spatz@gentoo.org>
Date: Mon, 15 Feb 2010 15:09:04 +0000
Subject: Version bump. (Portage version: 2.2_rc62/cvs/Linux x86_64)

---
 x11-libs/qt-dbus/ChangeLog                     |  9 +++++-
 x11-libs/qt-dbus/files/qt-4.6-nolibx11.diff    | 18 ------------
 x11-libs/qt-dbus/files/qt-4.6-nolibx11.patch   | 18 ++++++++++++
 x11-libs/qt-dbus/files/qt-4.6.1-nolibx11.patch | 18 ------------
 x11-libs/qt-dbus/qt-dbus-4.6.1.ebuild          |  4 +--
 x11-libs/qt-dbus/qt-dbus-4.6.2.ebuild          | 40 ++++++++++++++++++++++++++
 6 files changed, 68 insertions(+), 39 deletions(-)
 delete mode 100644 x11-libs/qt-dbus/files/qt-4.6-nolibx11.diff
 create mode 100644 x11-libs/qt-dbus/files/qt-4.6-nolibx11.patch
 delete mode 100644 x11-libs/qt-dbus/files/qt-4.6.1-nolibx11.patch
 create mode 100644 x11-libs/qt-dbus/qt-dbus-4.6.2.ebuild

(limited to 'x11-libs/qt-dbus')

diff --git a/x11-libs/qt-dbus/ChangeLog b/x11-libs/qt-dbus/ChangeLog
index 1f3beca77d8b..34b8550b3034 100644
--- a/x11-libs/qt-dbus/ChangeLog
+++ b/x11-libs/qt-dbus/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-libs/qt-dbus
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-dbus/ChangeLog,v 1.59 2010/02/09 21:04:46 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-dbus/ChangeLog,v 1.60 2010/02/15 15:09:03 spatz Exp $
+
+*qt-dbus-4.6.2 (15 Feb 2010)
+
+  15 Feb 2010; Dror Levin <spatz@gentoo.org> -files/qt-4.6-nolibx11.diff,
+  qt-dbus-4.6.1.ebuild, +qt-dbus-4.6.2.ebuild, +files/qt-4.6-nolibx11.patch,
+  -files/qt-4.6.1-nolibx11.patch:
+  Version bump, rename patch.
 
   09 Feb 2010; Dror Levin <spatz@gentoo.org> -qt-dbus-4.6.0-r1.ebuild:
   Remove old.
diff --git a/x11-libs/qt-dbus/files/qt-4.6-nolibx11.diff b/x11-libs/qt-dbus/files/qt-4.6-nolibx11.diff
deleted file mode 100644
index d3c1d1f75121..000000000000
--- a/x11-libs/qt-dbus/files/qt-4.6-nolibx11.diff
+++ /dev/null
@@ -1,18 +0,0 @@
---- configure.old	2009-12-03 18:52:58.061117684 +0200
-+++ configure	2009-12-03 18:53:09.065116496 +0200
-@@ -5010,15 +5010,6 @@
-         X11TESTS_FLAGS="$X11TESTS_FLAGS -fpermissive"
-     fi
- 
--    # Check we actually have X11 :-)
--    "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/xlib "XLib" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS
--    if [ $? != "0" ]; then
--        echo "Basic XLib functionality test failed!"
--        echo " You might need to modify the include and library search paths by editing"
--        echo " QMAKE_INCDIR_X11 and QMAKE_LIBDIR_X11 in ${XQMAKESPEC}."
--        exit 1
--    fi
--
-     # auto-detect OpenGL support (es1 = OpenGL ES 1.x Common, es1cl = ES 1.x common lite, es2 = OpenGL ES 2.x)
-     if [ "$CFG_OPENGL" = "auto" ] || [ "$CFG_OPENGL" = "yes" ]; then
-         if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/opengl "OpenGL" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then
diff --git a/x11-libs/qt-dbus/files/qt-4.6-nolibx11.patch b/x11-libs/qt-dbus/files/qt-4.6-nolibx11.patch
new file mode 100644
index 000000000000..e5d13327b8ce
--- /dev/null
+++ b/x11-libs/qt-dbus/files/qt-4.6-nolibx11.patch
@@ -0,0 +1,18 @@
+--- configure-orig	2010-01-20 14:18:32.466798257 +0200
++++ configure	2010-01-20 14:18:58.516799116 +0200
+@@ -5059,15 +5059,6 @@
+         X11TESTS_FLAGS="$X11TESTS_FLAGS -fpermissive"
+     fi
+ 
+-    # Check we actually have X11 :-)
+-    "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/xlib "XLib" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS
+-    if [ $? != "0" ]; then
+-        echo "Basic XLib functionality test failed!"
+-        echo " You might need to modify the include and library search paths by editing"
+-        echo " QMAKE_INCDIR_X11 and QMAKE_LIBDIR_X11 in ${XQMAKESPEC}."
+-        exit 1
+-    fi
+-
+     # auto-detect OpenGL support (es1 = OpenGL ES 1.x Common, es1cl = ES 1.x common lite, es2 = OpenGL ES 2.x)
+     if [ "$CFG_OPENGL" = "auto" ] || [ "$CFG_OPENGL" = "yes" ]; then
+         if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/opengl "OpenGL" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then
diff --git a/x11-libs/qt-dbus/files/qt-4.6.1-nolibx11.patch b/x11-libs/qt-dbus/files/qt-4.6.1-nolibx11.patch
deleted file mode 100644
index e5d13327b8ce..000000000000
--- a/x11-libs/qt-dbus/files/qt-4.6.1-nolibx11.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- configure-orig	2010-01-20 14:18:32.466798257 +0200
-+++ configure	2010-01-20 14:18:58.516799116 +0200
-@@ -5059,15 +5059,6 @@
-         X11TESTS_FLAGS="$X11TESTS_FLAGS -fpermissive"
-     fi
- 
--    # Check we actually have X11 :-)
--    "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/xlib "XLib" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS
--    if [ $? != "0" ]; then
--        echo "Basic XLib functionality test failed!"
--        echo " You might need to modify the include and library search paths by editing"
--        echo " QMAKE_INCDIR_X11 and QMAKE_LIBDIR_X11 in ${XQMAKESPEC}."
--        exit 1
--    fi
--
-     # auto-detect OpenGL support (es1 = OpenGL ES 1.x Common, es1cl = ES 1.x common lite, es2 = OpenGL ES 2.x)
-     if [ "$CFG_OPENGL" = "auto" ] || [ "$CFG_OPENGL" = "yes" ]; then
-         if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/opengl "OpenGL" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then
diff --git a/x11-libs/qt-dbus/qt-dbus-4.6.1.ebuild b/x11-libs/qt-dbus/qt-dbus-4.6.1.ebuild
index fe8557450555..0da53ae8f485 100644
--- a/x11-libs/qt-dbus/qt-dbus-4.6.1.ebuild
+++ b/x11-libs/qt-dbus/qt-dbus-4.6.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-dbus/qt-dbus-4.6.1.ebuild,v 1.2 2010/01/20 12:30:20 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-dbus/qt-dbus-4.6.1.ebuild,v 1.3 2010/02/15 15:09:03 spatz Exp $
 
 EAPI="2"
 inherit qt4-build
@@ -31,7 +31,7 @@ src/corelib
 src/xml"
 
 PATCHES=(
-	"${FILESDIR}/qt-${PV}-nolibx11.patch"
+	"${FILESDIR}/qt-4.6-nolibx11.patch"
 )
 
 src_configure() {
diff --git a/x11-libs/qt-dbus/qt-dbus-4.6.2.ebuild b/x11-libs/qt-dbus/qt-dbus-4.6.2.ebuild
new file mode 100644
index 000000000000..0a67bffe8594
--- /dev/null
+++ b/x11-libs/qt-dbus/qt-dbus-4.6.2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-dbus/qt-dbus-4.6.2.ebuild,v 1.1 2010/02/15 15:09:03 spatz Exp $
+
+EAPI="2"
+inherit qt4-build
+
+DESCRIPTION="The DBus module for the Qt toolkit"
+SLOT="4"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND="~x11-libs/qt-core-${PV}[aqua=,debug=]
+	>=sys-apps/dbus-1.0.2"
+RDEPEND="${DEPEND}"
+
+QT4_TARGET_DIRECTORIES="
+src/dbus
+tools/qdbus/qdbus
+tools/qdbus/qdbusxml2cpp
+tools/qdbus/qdbuscpp2xml"
+QCONFIG_ADD="dbus dbus-linked"
+QCONFIG_DEFINE="QT_DBUS"
+
+#FIXME: Check if these are still needed with the header package
+QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
+include/QtCore
+include/QtDBus
+include/QtXml
+src/corelib
+src/xml"
+
+PATCHES=(
+	"${FILESDIR}/qt-4.6-nolibx11.patch"
+)
+
+src_configure() {
+	myconf="${myconf} -dbus-linked"
+	qt4-build_src_configure
+}
-- 
cgit v1.2.3-65-gdbad