Add a patch to deal with latest gir-scanner. #485800

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

4 files changed, 57 insertions, 21 deletions

diff --git a/app-i18n/imsettings/ChangeLog b/app-i18n/imsettings/ChangeLog
index 11e01dd8828c..ad4f28154e00 100644
--- a/app-i18n/imsettings/ChangeLog
+++ b/app-i18n/imsettings/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-i18n/imsettings
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/imsettings/ChangeLog,v 1.15 2013/05/04 00:17:24 naota Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/imsettings/ChangeLog,v 1.16 2014/01/10 10:13:52 naota Exp $
+
+  10 Jan 2014; Naohiro Aota <naota@gentoo.org>
+  +files/imsettings-1.5.0-gir-scanner.patch, imsettings-1.5.0.ebuild:
+  Add a patch to deal with latest gir-scanner. #485800
 
 *imsettings-1.5.0 (04 May 2013)
 
diff --git a/app-i18n/imsettings/Manifest b/app-i18n/imsettings/Manifest
index fbe8a8e89413..de05688ebd06 100644
--- a/app-i18n/imsettings/Manifest
+++ b/app-i18n/imsettings/Manifest
@@ -3,6 +3,7 @@ Hash: SHA256
 
 AUX imsettings-1.2.2-gtk.patch 789 SHA256 2930f378dd83fb17ee4279b30ce8e1e8339a084fe3e143ea28025d819d3f4864 SHA512 0e257f0005f3c91f531633d62e01f5f63f92b430f1d8d5932ebf4ceae1513f110acd4e31c3b8c00fbc9d064d6a288dfff4cafd120578a3b4cc3906f59adbfc6d WHIRLPOOL 4ff23828e6a6f69b4244d75d28bc83744f6df219025da6ad45f791cf6d2d298e09e6dd198dc7e6b99bd2f0048c6e01f45de5bb1663485e0a05c7c326dd05ccaf
 AUX imsettings-1.2.8.1-glib32.patch 275 SHA256 fda4a86cd72fdce27003275d8880548ebdc3aa24323c730da8c6aca8b9975c70 SHA512 d803889a01c3ad45d8b24e003e210737775780894ad25e7a799c57ca8fab4e16e04cef2d000587c4381150212c1118c230d1718de6767c9a54c5747542a59318 WHIRLPOOL 10b060d53b9adf39a89e93cd1b910005d61453f487c89f6ec72a38216f5b057475d023b899f86bd459f2267bbb4c391f7057bf7ab4e51415ffb9b5c77279ea2a
+AUX imsettings-1.5.0-gir-scanner.patch 829 SHA256 101936ec1a93c07a93aed88a5331be7a35c0b88da6af6943330c16814c1177f3 SHA512 ec604c4d2e57578c58b1443a302ce54ae5aaa255c4b6e1d67bc7a56abf897945e6eae51627042cc699d88edfae289b8fa3b977a07b9a8776efb1bc88d8389865 WHIRLPOOL 461fb306dc494e9b587783f775c48968f70d4837326fa96e13ebcad67dab05ab6c971ff02b60158c767caabd4ca791898ba0d813add49097b0c69d12c95ce34a
 DIST imsettings-1.2.4.tar.bz2 528403 SHA256 853c996df56c70b5b4aab3c6835f672d69ddc99cd8f0b7f790af741cedb9ac75 SHA512 4389b47adc2e9b559975ed92dda64abcb02238c033fe431d501386f75fbadf1f270606486b3dc669171b0f8d034e5fe4be76e62c16bf36db59f54ee8f8d612a8 WHIRLPOOL 6586efe146829c21d2aa5bdf2c0f0d15ffde2254d1fe19dcaa206aaa9cb1dd82d08061f3a9e76c97e2a05776e7ec611ec576b35fe8abcae302e670e6d6f0dd70
 DIST imsettings-1.2.5.tar.bz2 528570 SHA256 fc6442afb3608d45d32a3611b2c7d77404c05102377bc45e083b0ad8bcf9ba54 SHA512 0cb20c878ca03180f35acef1266b8c00642021ac6853a2570a448841549efd132f8755665013408ea868ebbadcb187b3137cce2d850cdaf48eb5f7272ef6a730 WHIRLPOOL 0c6282c9fb4bb4381ddb60980084b2e00343ddaa2921231b30cef83a5a45938ff4fd9cfe667e2eb149fb3c300cafcd6c1af4fd5abb71221c94332d65459de81a
 DIST imsettings-1.2.6.tar.bz2 529105 SHA256 af98c784675c0375ef72482469e07b81c819e8827282deb93c1e66b25ce2b766 SHA512 37254f4418db27d05bb96730b27240c7e2c69957a2e1071f62d91c62fc34dcbbbebb5b988cf53654b8f98b3e12f85881e890479e77e9c5edad668e631cc154b9 WHIRLPOOL 3efd1365f729dc04190c9264da936df050e5d7fe15d134052024960a22e94ce0b6857c3dde69bbfc1876952ad19660ea5566bf7823713fb43a000a176242cecf
@@ -12,23 +13,23 @@ EBUILD imsettings-1.2.4.ebuild 1665 SHA256 32fea8e203e6b594a4524fcd51c9909a9c205
 EBUILD imsettings-1.2.5.ebuild 1665 SHA256 7ee4d91d1324ebaa52a205d9d4906f6c78513d89f6827e768a0c3ae135dd8f56 SHA512 406bf0c2075cea06140ba2ea399b3dbe989e70a03d2eaac40bc0c91af45ac1e8a1a8264c84850e57d9877debce9f74036f8c8aca64d1f66c73e5c951d01bb5d7 WHIRLPOOL 87d0bbaf01bba0d0ef672f52fd75ec55f066f706a178e160fc79fc3bd423085733061e070822c03906eb5e67ba9ecd9c0c6e0366b5d8ac2ef7efe95dc63132aa
 EBUILD imsettings-1.2.6.ebuild 1665 SHA256 4681618a3e6b00997bb102f69977e1831657033e5300968cb22fcd789e7e1957 SHA512 786c4926a95a4660c33a3210cc7c5c595d2da5080fb255f36aa9a9fed4ca72a240aa6fa2164125265436f8bc3d35ad534fc470409c490a684268c9624b712cd5 WHIRLPOOL 37bce636cb2815487dafb8a793f45d345785e41b896469880cf6b6d789106741f32fa0483dff7264b15a0d5f7ab48f933f244446dbb2c0b1e73788240394c862
 EBUILD imsettings-1.2.8.1.ebuild 1686 SHA256 7674dbae35840d42b8a5d8bd40655f220dd2aef0c66ebdc21c60e6a66dea42e4 SHA512 fdc82f647c4910f70565f081c4bc8bd55e93d8c9dbfdc42727a68a40d7c175ef8ea522ec302253826e73bedd37a1d58468a3d5d44ea266afa60d963288a387b7 WHIRLPOOL 52051a5041c8ea1a307529d625ee9eba4fbb9227e32ddd1923f6bf1c77cbc26b3bbfb6b00ff1e2b192f17ac55b3f6ddacc82398b75e7497954d561bdc97ee36d
-EBUILD imsettings-1.5.0.ebuild 1808 SHA256 a45e3b316a26ac15c22cb890242ae3ddab1e7d216b99702864cbdc4af947405a SHA512 9fa59f2bb8ca3176700998de14b6385daa1c12d3975161f95637530dda01a486f40c078ce49390914e245f7e9a66cb474f8ea49c40bbdff017e51df480540205 WHIRLPOOL ae5aa3e54c75448f6ce64945a5b293e71d210d12760865e226cb2ee421971212eec998f999f69ffa92c2d8cde7d918f51ed997f66804c10fee7208c409bdb8a4
-MISC ChangeLog 2855 SHA256 f3e8dcae9aa101bc02d3fcde13a601b34e877fd8b3af1a6253acb44c9b8decd0 SHA512 3891cf7e9e89533b755ed1d0892da2684df744d9be76e1a413759746fe0a81e94c640b610670db055b2f0aebd20b76f9787ef64686b60989a161a085c8769e9b WHIRLPOOL 907d033ffa91d41051276de23e19e6dc692eb5d4d4155588314a7a8c2b562513cb6df0080b27764c4fd0310ee9dd4d68578e3db70803df381b2a361761db4e53
+EBUILD imsettings-1.5.0.ebuild 1876 SHA256 7e1f94c20cf7af0badae45b88d24f2d996ec29cd4e59dc916eb549647d883431 SHA512 a08e36e4b9717a97a35fa42c88e4231664068798efd9ddbe2a47e1fc363f01c17611f3d8d5a3d4f17eb805eceba48d52bb20960be3ff43ff7ae4e8a47b06fe93 WHIRLPOOL 038a27cd9212e28d179bcf42bb0074996c94875f070442cd73e8ecd893d5b2335a5ae53a8ae6f2c49c7ec02744d6e4bf1ad94cab6a62a95cca5e06f21efe9dfd
+MISC ChangeLog 3028 SHA256 d38346449ec5acf7571cc60330b0ecc3ceb0be042643493d1f33435f5dcde3fc SHA512 5006329d8be46547e98b25e79d04e3b7e888e2ca18f2b73bf00718607242930331455d1c5a26eb2e201bd7e81fc9e75ce8236cefd8e1b244f11ddb83b40af79c WHIRLPOOL 01364214c5fe41e0a2d8f301979135390c256deba3300750141fc04c98f129dd8a52c771dba669448ef6344feaac9a8c4d36155c17d0c48a4820b7a47c8a9b0f
 MISC metadata.xml 404 SHA256 46737f77993cca38d07a3c66617efff2cb9ed5c139147fae9692550acd13f863 SHA512 196848cae4e2ce431d9f4f4eb1d6d84eff8e1a7655f5d136d04ff75924bede7fe71f9683f9d807d6b8fe562a8bc7d19c9719a19c1fb1d4d402c13772a0feefaf WHIRLPOOL 4ac650eeee78333dbd98cb8a8cbd9f500491209ec3202491a504de11384d865b70ca146aad6c46cf75f3ee7e19a579feff00d901c0ac348e50ef7b2dddcaf95b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRhFOWAAoJEDYO1FT4VRUUArkP/0p7q1QTjSwSYX8DcE1vlhrJ
-5hmwftZX8U6pAgdJbnrYNYs8/S4yKXomVU5uxbLWj49CFaZkJ33V4S7XVMgqjKPV
-s10p/j1Qzgw8Y8NlL3h24oybdH7JRU2kH8v99DyoTxoaZTY0tfO1LvzWyGHVEhwG
-cL9HWFtsiWKdUxa0zdvTDCX0vQMdqyvyL+5mwbe5EZ0zG380a3Bn6AJSki48KfmH
-iYjItHRpNf1/UfGtCK2k5P23CIL5E83Dh41iYRXnlARAYt3v+A76FXAiT32aX3Gl
-hDx0ieURpnAwFZyd9yxCKQy/a0JZsFzaHtQLbf1dr2F/ed4vk8lNWfma1TGTa5UJ
-kxC9uD0WwGBitx2aNCPhL8qnnUIOyra6t9ZUgQf5XeVQukzsI/eKUBE2B2JAEcro
-sxR4HC71/h9o6xat0uhUfWjPcHnSirnjzWsTvWaZvOIBTe2bfLirvtBg8L9+lW4P
-xG5dH+sEL4AdnhK+jwvPVzUtKp1j7TT9gojkxwIXgmOdOm6R4YUxsGVQIFDpbPVa
-Uhh13ivJuLSRJ1Px+kLwKVzLKtoJtmDqlOoJ6N/KOblPQCuoa8BMNwUvcSK8m35a
-GtTivPbah72y3x2zT+UsfCNLMgZNOHwItU6SKpZNXq9RTw0tt2YTLKhj2S1UoWRU
-jgQ3TCXHuqP90ze6P5FD
-=9X2v
+iQIcBAEBCAAGBQJSz8fxAAoJEDYO1FT4VRUU1s4P/iu3NzLP3i8UB4TI3lckXALY
+DaIMZTnajF+f0mQiCX3OqKnrv8oVM8c39OEwYg3GRsqrkycYv5Dnz17BH4qdfSuk
+OCKb/8a0l2Dzug2JaryheMPGFej/PWFnV8SCMAJZ+1TNYuuNAIjQGHCw/Msf9aws
+wxG/npmIhuF18HGI4qzxwRWHCVljnOZBN6l75ZdCf4EDDlApJBAI2WBjniB9fRaO
+Dtb/AssTHXO86cmaVTlaRL2AW2QLBp8WKsSGU/VEHjvDrDS//sSSHz0KKUeTUhrz
+Q4bnMSjBn8EQtYDugyuYp6lhElsyRuxBdOpTkGg53gj5wqXuZXSW7X+cffyS5jxP
+pFK4KPKRP2dH6FFjISuck+NNmkdmZu1UCp575FgwDRMHJydVXVpRU0wN7gI9/bsU
+6YsqtXq/OvbYM5wCKHObGu0vylra/l8p+DylXNTKheZBSmkMhd9H8A8ceG7XxS0g
+Tu62+A7Zgwk+9Ejge3WAdlWJnxqhLyG9hy6MObBtDwh3lk802Wl8jEBOqPoF//oj
+TGPZQsw27P4NZ6F0CResiz6RHs2q04TPga13ulXJt9uiiuO01odOUN4Th21+tlzb
+bSNfd4EwXWnbEnEvGaXmkiT88MyxQue07DFBh/18HlnTVLgiC7aNXA3mGIGUELaP
+Wz9fWH+zMcnhuPcm6fNn
+=FHkg
 -----END PGP SIGNATURE-----
diff --git a/app-i18n/imsettings/files/imsettings-1.5.0-gir-scanner.patch b/app-i18n/imsettings/files/imsettings-1.5.0-gir-scanner.patch
new file mode 100644
index 000000000000..be7350f9401f
--- /dev/null
+++ b/app-i18n/imsettings/files/imsettings-1.5.0-gir-scanner.patch
@@ -0,0 +1,29 @@
+From 75e1ec9cea4bb9f108c0637a4b62cabfa500ed61 Mon Sep 17 00:00:00 2001
+From: Akira TAGOH <akira@tagoh.org>
+Date: Wed, 3 Apr 2013 19:37:15 +0900
+Subject: [PATCH] Fix a build issue with the latest gobject-introspection
+
+---
+ imsettings/Makefile.am | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/imsettings/Makefile.am b/imsettings/Makefile.am
+index 574480a..8e5999a 100644
+--- a/imsettings/Makefile.am
++++ b/imsettings/Makefile.am
+@@ -117,9 +117,11 @@ IMSettings_1_3_gir_INCLUDES =		\
+ 	GObject-2.0			\
+ 	Gio-2.0				\
+ 	$(NULL)
++IMSettings_1_3_gir_SCANNERFLAGS =	\
++	--symbol-prefix=imsettings	\
++	$(NULL)
+ IMSettings_1_3_gir_CFLAGS =		\
+ 	$(INCLUDES)			\
+-	--symbol-prefix=imsettings	\
+ 	$(NULL)
+ IMSettings_1_3_gir_LIBS = libimsettings.la
+ IMSettings_1_3_gir_FILES = $(introspection_sources)
+-- 
+1.8.5.2
+
diff --git a/app-i18n/imsettings/imsettings-1.5.0.ebuild b/app-i18n/imsettings/imsettings-1.5.0.ebuild
index 6768716a2bd9..5ee07aa2a455 100644
--- a/app-i18n/imsettings/imsettings-1.5.0.ebuild
+++ b/app-i18n/imsettings/imsettings-1.5.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/imsettings/imsettings-1.5.0.ebuild,v 1.1 2013/05/04 00:17:24 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/imsettings/imsettings-1.5.0.ebuild,v 1.2 2014/01/10 10:13:52 naota Exp $
 
 EAPI=5
 
-inherit eutils
+inherit eutils autotools
 
 DESCRIPTION="Delivery framework for general Input Method configuration"
 HOMEPAGE="http://tagoh.github.com/imsettings/"
@@ -52,6 +52,8 @@ src_prepare() {
 	if ! use xfconf; then
 		sed -i -e 's:libxfconf-0:dIsAbLe&:' configure || die
 	fi
+	epatch "${FILESDIR}"/${P}-gir-scanner.patch
+	eautoreconf
 }
 
 src_configure() {