Add upstream patch to deal with clang. #439676; Drop old version.

(Portage version: 2.2.0_alpha166/cvs/Linux x86_64, signed Manifest commit with key F8551514)

4 files changed, 38 insertions, 57 deletions

diff --git a/app-i18n/ibus-qt/ChangeLog b/app-i18n/ibus-qt/ChangeLog
index 21fc15fd0210..3f4040135d25 100644
--- a/app-i18n/ibus-qt/ChangeLog
+++ b/app-i18n/ibus-qt/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-i18n/ibus-qt
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-qt/ChangeLog,v 1.18 2013/03/02 19:27:03 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-qt/ChangeLog,v 1.19 2013/03/25 11:23:46 naota Exp $
+
+  25 Mar 2013; Naohiro Aota <naota@gentoo.org>
+  +files/ibus-qt-1.3.1-qvariant.patch, -ibus-qt-1.3.0.ebuild,
+  ibus-qt-1.3.1.ebuild:
+  Add upstream patch to deal with clang. #439676; Drop old version.
 
   02 Mar 2013; Markos Chandras <hwoarang@gentoo.org> ibus-qt-1.3.0.ebuild,
   ibus-qt-1.3.1.ebuild:
diff --git a/app-i18n/ibus-qt/files/ibus-qt-1.3.1-qvariant.patch b/app-i18n/ibus-qt/files/ibus-qt-1.3.1-qvariant.patch
new file mode 100644
index 000000000000..23981b35ded5
--- /dev/null
+++ b/app-i18n/ibus-qt/files/ibus-qt-1.3.1-qvariant.patch
@@ -0,0 +1,29 @@
+From 40e119bd5577fc383990ad02b175ec64292f764b Mon Sep 17 00:00:00 2001
+From: Jekyll Wu <adaptee@gmail.com>
+Date: Tue, 16 Oct 2012 11:24:06 +0900
+Subject: [PATCH] Fix a non-const lvalue build error with clang-3.1
+
+BUG=http://code.google.com/p/ibus/issues/detail?id=1506
+
+Review URL: https://codereview.appspot.com/6697048
+Patch from Jekyll Wu <adaptee@gmail.com>.
+---
+ src/qibusserializable.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/qibusserializable.h b/src/qibusserializable.h
+index 594d973..92a32ed 100644
+--- a/src/qibusserializable.h
++++ b/src/qibusserializable.h
+@@ -91,7 +91,7 @@ class Serializable : public Object
+ 
+ template<typename T>
+ QVariant &
+-qVariantFromSerializable (const Pointer<T> &p, QVariant & variant = QVariant ())
++qVariantFromSerializable (const Pointer<T> &p, QVariant & variant)
+ {
+     QDBusArgument argument;
+ 
+-- 
+1.8.1.5
+
diff --git a/app-i18n/ibus-qt/ibus-qt-1.3.0.ebuild b/app-i18n/ibus-qt/ibus-qt-1.3.0.ebuild
deleted file mode 100644
index 5bdf13c3e8e4..000000000000
--- a/app-i18n/ibus-qt/ibus-qt-1.3.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-qt/ibus-qt-1.3.0.ebuild,v 1.6 2013/03/02 19:27:03 hwoarang Exp $
-
-EAPI="5"
-inherit cmake-utils eutils multilib
-
-MY_P="${P}-Source"
-DESCRIPTION="Qt IBus library and Qt input method plugin"
-HOMEPAGE="http://code.google.com/p/ibus/"
-SRC_URI="http://ibus.googlecode.com/files/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc"
-
-RDEPEND=">=app-i18n/ibus-1.2
-	>=sys-apps/dbus-1.2
-	x11-libs/libX11
-	>=dev-qt/qtcore-4.5:4
-	>=dev-qt/qtdbus-4.5:4"
-DEPEND="${RDEPEND}
-	>=dev-libs/icu-4:=
-	dev-util/cmake
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS="AUTHORS README TODO"
-
-mycmakeargs="-DLIBDIR=$(get_libdir) -DDOCDIR=/usr/share/doc/${PF} all"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-1.2.0.20091217-doc.patch"
-}
-
-src_compile() {
-	cmake-utils_src_compile
-
-	if use doc ; then
-		cd "${CMAKE_BUILD_DIR}"
-		emake docs || die
-	fi
-}
-
-src_install() {
-	if use doc ; then
-		HTML_DOCS="${CMAKE_BUILD_DIR}/docs/html/*"
-	fi
-
-	cmake-utils_src_install
-}
diff --git a/app-i18n/ibus-qt/ibus-qt-1.3.1.ebuild b/app-i18n/ibus-qt/ibus-qt-1.3.1.ebuild
index 546eb1ccec70..fb743611b8c9 100644
--- a/app-i18n/ibus-qt/ibus-qt-1.3.1.ebuild
+++ b/app-i18n/ibus-qt/ibus-qt-1.3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-qt/ibus-qt-1.3.1.ebuild,v 1.8 2013/03/02 19:27:03 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-qt/ibus-qt-1.3.1.ebuild,v 1.9 2013/03/25 11:23:46 naota Exp $
 
 EAPI="5"
 inherit cmake-utils eutils multilib
@@ -35,7 +35,8 @@ mycmakeargs="-DLIBDIR=$(get_libdir) -DDOCDIR=/usr/share/doc/${PF} all"
 src_prepare() {
 	epatch "${FILESDIR}/${PN}-1.2.0.20091217-doc.patch" \
 		"${FILESDIR}"/${PN}-1.3.1-display-unset.patch \
-		"${FILESDIR}"/${PN}-1.3.1-gold.patch
+		"${FILESDIR}"/${PN}-1.3.1-gold.patch \
+		"${FILESDIR}"/${PN}-1.3.1-qvariant.patch
 }
 
 src_compile() {