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

Package-Manager: portage-2.2.0_alpha166/cvs/Linux x86_64
Manifest-Sign-Key: 0xF8551514

5 files changed, 54 insertions, 76 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/Manifest b/app-i18n/ibus-qt/Manifest
index e726aa95af49..2c20cb0e7fc0 100644
--- a/app-i18n/ibus-qt/Manifest
+++ b/app-i18n/ibus-qt/Manifest
@@ -4,28 +4,25 @@ Hash: SHA256
 AUX ibus-qt-1.2.0.20091217-doc.patch 506 SHA256 c3f0134f3ad8954193f5b6b5b28d90459a343aeb25a386809b5fd578e69e486c SHA512 d347bf54eaaf667465937e4f256e17c75339eae022622d69833624a796296914e76b711f580265e82f99dc167723e00f835e5ea450e202a64ffb2d9a54bcaf74 WHIRLPOOL 91e76d9c41da27c894b45a7d4b5a4084228d68a29d0a2012ead08ca35f2a1fd917f5608beea2bb840f4d6402c3029a6c6f04dff115325e7a9333ac41c390b118
 AUX ibus-qt-1.3.1-display-unset.patch 2262 SHA256 e6fdf379fba1b6ec554728a1899896983e7868feedaec04f730151fbb7bb556c SHA512 d5b1f87ec4404d68adb054782bc312265e265f73f150164eb6c2da5bfd76cc3a1668db4e7e779f86fecc0da7e81e407e6ef727ae884fc63ef464671c5fd6a832 WHIRLPOOL 69d2dddaa509b29fddd4a5cd9bf244600e7d71b74148c79b045add257738a2cf863b6eeffb53605a0b01294ec97fb028f202ee89e8fda02cb96bb591eaa15303
 AUX ibus-qt-1.3.1-gold.patch 397 SHA256 0915ad0b41094e2768baadf65f2e2d703ba26d619b1d254d90328fddf0b65edd SHA512 1ef3e983c0aaf8ac59f8cb92b8255014ae081d45dfb4a779f5adfd7116c8376eacd04f6711febaeae26219da706a4dda377ef0eeb7c5fa3cfcf3a2e2ded2ce67 WHIRLPOOL 5fd6e21797856e3cd1f8f07bfcca06c44edc71c57d48d5cc3750f8fda4e4d90e020418045807afc5708252538b587f25e3bfad79746ae71853ec32466a849fe9
-DIST ibus-qt-1.3.0-Source.tar.gz 138525 SHA256 f7b143e53c775bd2db14079d0dd6ab9d404e43a5a1634ff3487fe372b494cee0 SHA512 5c8244f25bcd49c0da78a5b38e295df098fb9f8f4d27934036f2e637b43716b1580b2cae9c3fa66ff9c77aba2863f0ad77fb639b2ffa0e49a1f2a373e3b7bef0 WHIRLPOOL 0e98b94be3d1d8f3a72f1e5e1aa3cc3d3a1de39b7f87dda07447c0270a82233b03d8cdbaebf59b0c17ef5cc409a3e3430024cd1505c2b8886bb9796c40830ad4
+AUX ibus-qt-1.3.1-qvariant.patch 886 SHA256 b6aa90f89bd5d573b292d69d144c603c35d67883bbe4893873132bc1be9cce6f SHA512 125fb60ca82e1a74edc84f8a55c4eeced0cd595d5301ee62c6db4e9545227d75a1b3a0c0f69bb2b43029ee1b3d74a13fb0a62314a18cec6ffa25a09b41209033 WHIRLPOOL d810ec15c35f06db7e7bf345e5a9b464f991e47ef2dcabf0089882cb3d31bf8d263f1153bf50138dfbf4c5bcff3ad6f518a11552336bda2f90bc2496333fec2f
 DIST ibus-qt-1.3.1-Source.tar.gz 141488 SHA256 4079577a240c961278f7bdab11a5ad546dff414c687c60560fdbc19208b3ac85 SHA512 2cd28f8ff3fff411496ccaf9ab67ab5332b7f2d2d0d0e3460dbeb34874ed931aa56c222c3ea5ce39053577b91cd2de4ebe01152039cd6def37c366ab3065cff2 WHIRLPOOL 585ead9a02d2014f7536aa633c72e07f8ce990c768d0aa9b5bf00105166f467307fb12457c5da4c2aa0b7b5cf9656d616de7d0e344e8d02161e123368bdad9ff
-EBUILD ibus-qt-1.3.0.ebuild 1141 SHA256 01c702333d54a0c7b59259f3b4499b90163abd80a856f527021ebd9a66897e75 SHA512 a15ea56b32e85c8dfa257866cc836e77801e78f722bc6ee4b3316ccd42c35940bd6990375f23fda73343c37f8b5c3eeac1048933b4f138afdfa053395818b6db WHIRLPOOL b13f7408f5d58b02ee51f208d76857021dd1355c2a6675742f36203d46005feb59d4a20d7e91139f9906ddf0255c75baf365fba8d8e9c5f4dd2c39a81fc0e3c0
-EBUILD ibus-qt-1.3.1.ebuild 1234 SHA256 e535c42315876107ce0e506477798206460f6affe6fa419720411235d84692d5 SHA512 40a88c24187ed48c11e74379dc80a731863b1dda889ecb8b83f7e753b1301bbeba6e07af9ebe8def9d1e94a2bf4e33e94e31869a29402a9d69c14a1bbb019c41 WHIRLPOOL 12da9c298095540b8e9ad2f3013e4923cb94201d487cd236cba7fa01ac12bf40b64410a21eebdb2faf211a0b59505b5392ad7e818b276a4282dcd6f58e6dd3eb
-MISC ChangeLog 2945 SHA256 585f08f2ef41f1231038284055151d8d4e1ac06b7d2fe1ab9969f055c5bc106f SHA512 97a3f09506a2c172d11f5893df55276b5f521d25971ef3194ebf1df38ace95ff534cec525ac8ec2ffbe0bfe1b3402a1c76f97b342a402c4ddcb53afffbf481d1 WHIRLPOOL 6f78d6807d1ef686ae626c43780b0098b6b638a3dde2e419eb250d6327bfa09998dd434407e492c22490fea765d5a7cf839584bd712fc3c789b7ded2c913d17c
+EBUILD ibus-qt-1.3.1.ebuild 1276 SHA256 38140b33c3a289b814fd859a1c79d8a18c4b9880ea921c4cd38a21f48350749d SHA512 67cb295d2d7cf5639ca603539ae02cc424efee7419e37bf5642fee136e687edb4c767b5acd1e25fdb7552dc446a2ebdb226653aa843065257f7ea64551bd6524 WHIRLPOOL de2f3f095f3a6b97e13880cd244e2934f78072da77e5b708052bd6eb7a245b30e4785960ca6b000226be7789c8306e273085c4d8e57ce8eb512660eb08fe5eaf
+MISC ChangeLog 3144 SHA256 c3b02e6ceb8e6db5e8773ad531ec0c20151fa34aa2b51eef3eb97e72235e7d7e SHA512 3442031186c4d0feaaaf0d4e04eae498839be4b681bd8aa4b3f8fc00bd0b07e4f662ce088eaf0c3c2d53b7dbf13cc1704b8a9328059a070b5e2b39634d25d84f WHIRLPOOL 86f98b3441eb9b6f0ecd02525c0bbd5a67ad340791f4350f312a4943bdd5a7e6b9f53c2b775cb497679aadf7b5b77bf6676d90b38e29946b532ff3c99469c88f
 MISC metadata.xml 486 SHA256 cb45a841b498d72b6b88788fa935c2bb195db6049398468edc28481d5b619d10 SHA512 7df6a1ab6d5d1a18e0c682fd0f84b89987a60bcd06560d4ca1b12faf2fbd132277577325e9db80eb7eb9462c33f4d823f7390e1ee7d60ff500f2f777a77c9324 WHIRLPOOL ca436f8208a6aac2788dddb7bdcd008100646b2331f9c4f21698847a8e76a6d6c48d6a595499593f080e0a972d7b683f628d247a9faa6c1f736687c85857be1d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQJ8BAEBCABmBQJRMlKGXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
-OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88vsUP/2s5stwOOd4N3qIhUhmSFlHc
-K9mSrciznV4gbL8JrX55Dt7uiAZ3B7IJCAz2py0/gjlvUymoMhxvCbSLi70YNT5a
-giFKtVjWGZ7vG9DrB0gJVh6OvsxG2WpXQZOEbMapb+4au75N7HTAJohrP7rOyDmO
-HT1woKW/MF1edvgAQDAeujUstUclvnu8/Jug1x5R/M3AU+E6IWV5d3xkqrHaVPeB
-+WEPPntGVpRc+K5PqhKrUUadYa99gfiAyRRs6407DBBk5gdnDG3x7KXXT3068jF0
-lVcyl61VKIATw/Uvs7N357TouwA8xUeJWJnG53sJ6TAtkVwQntCQk0gWsiudb2aq
-Y7XuiXBw+RDnf/aRBRp0ExZAuxc98KyqQ+VzR56GbQl3+TaHasOqbqXIwmUGKCO8
-lF01YQVEKOrJDIZqCV2FMTW0XDR/3PJec11JM/hkvUcAgJSqsWliag5sPdPLUwvq
-7NMH0H75PqK8wfn4Isdx7Y1u0MFM82p5Akt3L3gEaKT/z7+ZkGc6jxn+jM0On+KT
-yRCl7gON/P0BjQsCukWS+RLnx1GOx+wYbUKqCaB6e9lbqoHQ1A0YL/VBMCTRmi/l
-cTr9fsFzx714/DcVLH0pafE+x5j+Pk1qYoh7flZ/DqoPW3Ve407rZDM+0VEShj/t
-2VqQlEunRgbGQh5yLeNj
-=NnIj
+iQIcBAEBCAAGBQJRUDPQAAoJEDYO1FT4VRUUAbUQAKQoWdQ5kixqvi6x0/MydB6w
+qiBXf+55bw7A+nQG1QmLK/r8kNc6SIfxneZ7DZqRTF72X8Nwv07r+I6vdcQr8ZoI
+27D/+cdeyltmboWrmCk3A1uYltZWkItf/RbdNV85AUogKSE0OLyJMME4oqsrUrDx
+EywJ4aYWlX9QZ5Rrqfhi6sSWaSqQCrMQpLKpfEF+dhI3sQglo4aM0lcqEGeUs6OI
+beJU6gfO0wBXXivn0T4OX3qcBoTk8wy8UjYCJoCOgVgm6/61NJz1rzXGKrsG3MnL
+XsIMEFw2k1zl97vzsGOF1KI7SbpmVtp44Jk6hUpZCwyGSLEU8mTn/bVIC2tiAuuy
+71iROURLKI10Z25IDtrrizlQSqWKzP6NzsxjfuszkfAih1Dd8DIoNMRYoe2oUv7r
+k8nSJLXYYirT7wnAPp6XcpV+/xLXJD1EMX+T52U9shQkUgAtD4sgzWOdyyk/64v+
+wRJmyFabLupxPmzolxiPDHW3j1g7M1gzmRuF2p0KrvY2AbTMS9vJtUCzEQstQXzq
+//0OMHFz8Zdf30eKvCdmz27q/5govPLRwGuHsa5LDN5ixvCTf61OzvaN63tWWDix
+BaenRN0XLEqA6ohSqDC/eJ3CMV4iJVsziRIF4ibmaGXJLjPQmBgaSqdiCOtMmdLD
+8cCe9kF35gsRTKj7s3Vm
+=qlAA
 -----END PGP SIGNATURE-----
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() {