Add patch not to loook for ibus-1.0.pc generating GIR. #409191

Package-Manager: portage-2.2.0_alpha93/cvs/Linux x86_64

4 files changed, 36 insertions, 13 deletions

diff --git a/app-i18n/ibus/ChangeLog b/app-i18n/ibus/ChangeLog
index bb8d9e798ed2..d724ba7357bc 100644
--- a/app-i18n/ibus/ChangeLog
+++ b/app-i18n/ibus/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-i18n/ibus
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ChangeLog,v 1.105 2012/03/09 19:33:27 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ChangeLog,v 1.106 2012/03/26 22:39:45 naota Exp $
+
+  26 Mar 2012; Naohiro Aota <naota@gentoo.org> +files/ibus-1.4.1-gir.patch,
+  ibus-1.4.1.ebuild:
+  Add patch not to loook for ibus-1.0.pc generating GIR. #409191
 
   09 Mar 2012; Samuli Suominen <ssuominen@gentoo.org> ibus-1.4.1.ebuild,
   +files/ibus-gconf-2.m4.patch:
diff --git a/app-i18n/ibus/Manifest b/app-i18n/ibus/Manifest
index 6b63b92a1d72..2f2357cbc0a8 100644
--- a/app-i18n/ibus/Manifest
+++ b/app-i18n/ibus/Manifest
@@ -1,21 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX ibus-1.4.0-machine-id-fallback.patch 750 RMD160 2d02699dbd9555adcc18c4bd9afb15b1c4c33673 SHA1 b007aedfe70d2ab1e69581c07a4c43595328151e SHA256 ad1b7538e324a29fd779d7545860e06f22904974bae931fa3cda045ae74af8ed
+AUX ibus-1.4.1-gir.patch 482 RMD160 025cafc4977f240f70b72173a6d73cc015938a68 SHA1 a98fafe84b685d078c1322151f4725d279cf9912 SHA256 802581c7c4293dd34c5fda9143d8b46d6a2e65dda82836643fbb4122f1b5b275
 AUX ibus-1.4.1-no-gconf.patch 1002 RMD160 2da6aba617aa054000fe21dff49b5b1866748e6d SHA1 447a03e2bf43dbc2a1dc6ad69306bd70dcbea637 SHA256 7f136de585b41d4ae47e1d9cb58a982f8ab70dc142eb579702e60f67f7f093f2
 AUX ibus-gconf-2.m4.patch 1707 RMD160 c98d6caa7c956e3e04ef8664eb7b637485af7043 SHA1 b7cc4a18711f147365df1fbc15e95452ef3189f4 SHA256 40c54a970779f4586161f45ebd245c9db71b46ced0d7deda22f47de851c02954
 DIST ibus-1.4.1.tar.gz 1479412 RMD160 4003fc9392c59ce35048689aa50a941cfd151cff SHA1 4cc045553885d35a118ec4b44c2694910209509e SHA256 2f46de279ef3c0a48d3f52061794cfc6544ad8cfe3f04d9d12b251d119a180d6
-EBUILD ibus-1.4.1.ebuild 3891 RMD160 09009ea9ec65005c1456301bda1e620757ed5e03 SHA1 f7e5ac35ed5fbc126e2325dcc0a6851bc9f8ddaa SHA256 e24e128861921d47901d516a7d9540f730ae700aeab76d208cd9770c447dd926
-MISC ChangeLog 17351 RMD160 e60432be5be35bcce3079634738143306ba1ce26 SHA1 02eb26c094577d17dd5db5b6da9d36fb1bf6504f SHA256 7215fa3dc458c9cd555e3faf693c6f5c2f82c147d65117495714099fbb09bc77
+EBUILD ibus-1.4.1.ebuild 3927 RMD160 04c0c5b8a2a0eafa54a2f2fc6aa1878e4214615f SHA1 2e0a11df8017b7bd4d80213ca1d0526343cdfb25 SHA256 727f31c0151c2337c54a17635de56387be2bb5c1ab28a8f1de2176eacfdb02d3
+MISC ChangeLog 17510 RMD160 353d128de7c60be9529dee56aa3775506026f8f3 SHA1 123046393c1617fb7b275d53c3a75ab7c2267135 SHA256 b49714cdd7fe7fe456f16b513bfea4e4c199c959209879a1e9c2ba6be4f73b6e
 MISC metadata.xml 798 RMD160 00aebf0dab958b7d9a13d7456d9f19c07d247641 SHA1 9208222da6f4015ba64ce30f59ccf20069507159 SHA256 f8cfd5b99a00d0b8cef1a903818e00a957cebb4612dc482b4cb34ed19d73958d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPWlsMAAoJEEdUh39IaPFNcc4IAJIa5tQVXH3lzezFBkUqVjX4
-nZd5SZvPLwpByxmJXvhp6nVz/FmZ+2+iUZiUd4Yh9aoMsW9KCy29UbmpJDuU3xiA
-/CBH1lQ5Lu7kijJ9d5jhbOYNqDqih5s3c24Y1Ru/bdJif/rP+G8gCXx+iu46/Z35
-C7W/h6mSpxET2sGP6hR/4yj5JB/P9GHcal2Z6u1Cs2aFNiZNgTFu1PdzX+01FqMG
-vs9GFgeTYjYHDMnCSJVKOXqeQug2f5nkZXJjKiUB3lLgV75zlrO3lYFlF8OnyiWr
-VVEN5OK5YQ/Gbxx+VZqMF57+c9bB0F4wwExf/UMrhDxu4qD5yyvX/LTVDIZCSWg=
-=oeJL
+iQIcBAEBCAAGBQJPcPA/AAoJEDYO1FT4VRUUXucP/38ShYGK403rw2L8b/3hWHrP
+nJf3kVFeDI7jCsBw7VOlWqi9tETFtrry9eTP1/booPiXhD5ufMK1t/OmamM+CVj5
+lVcDXaGnxm+qeIwfIxTMi35KKrwTYZ4/Pavzy8lM2lklgzerW/XW8x4pcgF3x7fO
+Ke1+TNFErcdjEXnRGOYwfglX1UHK0WBbtvYWCWLbXs96f0gXev8ud/202EaZ/m+h
+VN3jsl4/djDCjazhVGeMxWomaqJ8J+iO0d5qxsyRMhjlGaVJ3jsyrikJOCzVKPR8
+m8XXo0e7jQFkUeZoa5boWSKfmYQ/Rrp5oPCyJLWyC3c97KfeHRt/WhKUtkmsGbOq
+vJji63pDSKvzY5bttzg1EZnyLW2yMloOLzPx/NOBFvu9MnXWkocFJEhPvWvrrnFD
+J3KYHtmxAkfZzw6ndsx6j5jWEkqLaXASvVdWUOlVMCgEXxPLdQIuekm050cvMuOb
+Vcg7y71nenxWGd+vWf6iZJG+SWyyDpW5EFfQbnc0k1T6e1h/qfFDTbJNkitVPXul
+7g4isP7RWZLPVBoDW0MP4zbB6mdVjXgmV5uK5AnXYzi67nA3a7NeHozTnp0HA7Du
+sG0drm5FnV3dSh0YkQFGyGgnJ1h/T9mB77z9QL+56jmkjreXQfSs58hNrvwzZx+T
+fI/YalYAx+bCsVOV6Qme
+=Afqj
 -----END PGP SIGNATURE-----
diff --git a/app-i18n/ibus/files/ibus-1.4.1-gir.patch b/app-i18n/ibus/files/ibus-1.4.1-gir.patch
new file mode 100644
index 000000000000..91f06c6768b4
--- /dev/null
+++ b/app-i18n/ibus/files/ibus-1.4.1-gir.patch
@@ -0,0 +1,11 @@
+--- src/Makefile.am.orig
++++ src/Makefile.am
+@@ -170,7 +170,7 @@ introspection_files =           \
+     ibusenumtypes.h             \
+     $(NULL)
+ IBus-1.0.gir: $(libibus) Makefile
+-IBus_1_0_gir_SCANNERFLAGS = --pkg=ibus-1.0 $(IBUS_GIR_SCANNERFLAGS)
++IBus_1_0_gir_SCANNERFLAGS = --pkg-export=ibus-1.0 $(IBUS_GIR_SCANNERFLAGS)
+ IBus_1_0_gir_INCLUDES = GLib-2.0 GObject-2.0 Gio-2.0
+ IBus_1_0_gir_LIBS = $(libibus)
+ IBus_1_0_gir_FILES = $(addprefix $(srcdir)/,$(introspection_files))
diff --git a/app-i18n/ibus/ibus-1.4.1.ebuild b/app-i18n/ibus/ibus-1.4.1.ebuild
index 9fe617e2f790..c13c25d6cfa9 100644
--- a/app-i18n/ibus/ibus-1.4.1.ebuild
+++ b/app-i18n/ibus/ibus-1.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ibus-1.4.1.ebuild,v 1.6 2012/03/09 19:33:27 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ibus-1.4.1.ebuild,v 1.7 2012/03/26 22:39:45 naota Exp $
 
 EAPI=4
 PYTHON_DEPEND="python? 2:2.5"
@@ -87,7 +87,8 @@ src_prepare() {
 
 	epatch \
 		"${FILESDIR}"/${PN}-gconf-2.m4.patch \
-		"${FILESDIR}"/${PN}-1.4.0-machine-id-fallback.patch
+		"${FILESDIR}"/${PN}-1.4.0-machine-id-fallback.patch \
+		"${FILESDIR}"/${PN}-1.4.1-gir.patch
 
 	use gconf || epatch "${FILESDIR}"/${P}-no-gconf.patch