Patch gconf-2.m4 to m4/ directory for eautoreconf wrt #395239 by Mori Rámar

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

5 files changed, 90 insertions, 53 deletions

diff --git a/app-i18n/ibus-mozc/Manifest b/app-i18n/ibus-mozc/Manifest
index 304ff3545a07..3fa56f7d00d5 100644
--- a/app-i18n/ibus-mozc/Manifest
+++ b/app-i18n/ibus-mozc/Manifest
@@ -2,38 +2,19 @@
 Hash: SHA1
 
 AUX 50ibus-mozc-gentoo.el 121 RMD160 7af57ab410ccd126594046c74e0d2daaca78ea94 SHA1 3108d0cbd0e33ac967be14a3577b86ddbf03d86d SHA256 833039439dea484a430e832df869b3af0b8d42bae63c4d6999e72c97d55d897b
-AUX ibus-mozc-0.11.365.102-gentoo.patch 768 RMD160 bc8160076eba1aae383f672a2c19845e89cf6ea1 SHA1 ba64ca1d4ee100342163f76704c0350ee9d426ee SHA256 eb18673f2d544e652868cbe00e7976715d31d3e9815f51b9edba8d3d0cab70e6
-AUX ibus-mozc-1.1.717.102-gcc46.patch 1386 RMD160 a7342340515761b3c765fe6925bb9da28d27b178 SHA1 e4a04ea7bf09f8053ce6e3816d155ca50cac7796 SHA256 13e1cefbe0a08053c25b0203ce62d5a8094ab31e446174f3b331aa2c01c14a50
-AUX ibus-mozc-1.1.758.102-gentoo.patch 612 RMD160 75ef300d281005b413bb88281c70e93f9d2f72f7 SHA1 faba9dcf33a52774efe072ddd4ea851e55f6a197 SHA256 7e305e0b19b3fe46dc016924518f51428e72d6d30079a9d8d2eb0563fb0f7651
 AUX ibus-mozc-1.2.809.102-gentoo.patch 652 RMD160 68e2da6b75e62a0b1d4a099f3a2f94b3e1f53f84 SHA1 382e9f4288acbb054353ac01272f22ec7e1a0cb0 SHA256 2a06a2f9430a1e1407288d535c41b54b6cef1e9488b92e484f8d4cb86eeb0494
-DIST mozc-1.0.558.102.tar.bz2 41540430 RMD160 46d00bdac42cfa56e4a1eebc79653a7bf5050caa SHA1 24fbb0d39d6d81953114d39e546edd85361cef3a SHA256 52849be12c77c2bebc1038a47366e36f5e86bcc1089c12ae0dc4901be4e2f548
-DIST mozc-1.1.773.102.tar.bz2 36818453 RMD160 9e8b24bbb551e3f3c252605f584af73dca774291 SHA1 8552b89d428571b034f757161a08995d725fc4aa SHA256 24f9f05111ac40a7f121bc3c460429c54a7308cd65a7536a69c41cfc6c6c7850
-DIST mozc-1.2.855.102.tar.bz2 40681117 RMD160 fb15df25a56be174c0bc18acad1dd3bd8d1a5bf1 SHA1 c078e9cbc00d3c216aa0d739ae4f4405a2259e94 SHA256 d9d0a0e7fe00ad28a4e99776616157bae05b3d3cea327eac41e8f6a020a28227
-DIST mozc-1.3.911.102.tar.bz2 39180652 RMD160 4cb286286107ee9ce4f3d6e37b0dad8742a8808b SHA1 d3b130001cebf560d2ce10e89eb55643fa056d93 SHA256 da27945d6732e4fc70c08534cc8d10cd23d6fba5ebc52e6b31cac5d04ba1588a
-DIST mozc-1.3.931.102.tar.bz2 55891776 RMD160 762263c0c49ae849d22ca06f0ff659e694aeb844 SHA1 41f349b9b4ea87dda19d42653d5f4b584da16c37 SHA256 f56a899e1e445e01d0f28fec45a7b3cc3dd9c68e0d6507bca00a8c01ef68c7a0
 DIST mozc-1.3.975.102.tar.bz2 55961505 RMD160 b52eddc64a79a7a9f1579648f3ee878837355971 SHA1 ef3f23083152fa564eba98235e83d72d14a06404 SHA256 1ee57425c159bc0066645f086472f72aa16567fe5be272f35339c41e9a52d27a
-EBUILD ibus-mozc-1.0.558.102.ebuild 3305 RMD160 532ce117f462352dc51ddb1996029ac7080c76c6 SHA1 61b9816730363dd902e5eee919cfab5e28c0c46e SHA256 5379dafe1abd944a1eb0a41a948ae768e4d0af75af56755782363aaedd30c589
-EBUILD ibus-mozc-1.1.773.102.ebuild 3538 RMD160 671da895aaaf6691d0610365dd111009394c3084 SHA1 0e9c7ee104a649eebea7ee6ca027ccfbc030aa91 SHA256 facef113871166c0611f248c2a5425184f3a1fe8c246744a058ec91cd3774a43
-EBUILD ibus-mozc-1.2.855.102.ebuild 3538 RMD160 5d9784f310569c060ef457b2bfa3721ff31af3f8 SHA1 a7e3bac9f66fa223e1ebb6e675c68c93e5a0b4f3 SHA256 4533ab2e77b8772c4583cdf2b3028ffa1d7786f3bd1f53354ae15b25cbe9af24
-EBUILD ibus-mozc-1.3.911.102.ebuild 3539 RMD160 ced2c378efe372fcb4332bfc41bbae634bead8a5 SHA1 4765a03fbe78ab4f0916b6cefc0793773b170201 SHA256 3c01c9486f84f4e11273ca95443c97c5dd1af8f51b32cdb56af21eca50229ebb
-EBUILD ibus-mozc-1.3.931.102.ebuild 3650 RMD160 2e40b7a21fdd02620a0ce884873870b93afb16d0 SHA1 8246e9ea90c91d3a8580b0948d541d4ed40bc8c3 SHA256 1dd1a8572a2cdf8e2ae48a2028c5467a37ebb31b5742e0608cbab20cecccda33
 EBUILD ibus-mozc-1.3.975.102.ebuild 4348 RMD160 110ddae68a341fad9ccf03cc2fb586df038da563 SHA1 146ca2fd847c55922fa04ee8a8961cba1c0fd5a4 SHA256 e2e038016ce129fb9f5667d84261fe9f8d6f947c433254a45c46a7fd2f2a294f
-MISC ChangeLog 5084 RMD160 2c13ae139af9cda792d3d538fc5ac11766528120 SHA1 3eddb27b7deeef195d680cfce01c7e339b2c5100 SHA256 6127dc3c2053de632e5d0bbb88fe63bcda78a0c52dc84e5eb2486f6b31bbf63e
+MISC ChangeLog 5442 RMD160 586f4228f9c9ef84b89290513fea8b658e518b93 SHA1 fb6b7dccceba16acb3e2ae6f328344b4da63c9c7 SHA256 6f822cf3946823a869c1cfcc08d415becd1becfb0c583e199e65f78447440c37
 MISC metadata.xml 540 RMD160 92098609fd6a4d8ec147c6bf675bb3626d5e1962 SHA1 6658b008a7f6a3143836901e576b556eecaf1fd9 SHA256 dbc77031a0e9b603d1a15f79367f86375719d4cace47f8c2cb35ef2be29cfe25
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPI2K9AAoJECaGw+YFKA1pCf8P/2PUw/IsgpFMwtsWAWFC7BZ1
-kLOhYiFjSEiBYFaapfuVRUQhU7cnSmqv1WOCwfDSP2tn03l0ASXrlbrYZDjuZafP
-W4d7xY61NkQZc/qt4U4Itva5XWIBQjpwEro9kmho8dE1CaJMZ2ldSI49+zs7tqmI
-SlFRRs843Xw0fPnVqlrPXvsC265CUs8qHXycRnqXlFYbUvA7YyZ9WlmCW4OhRVoM
-pJJwW5gE35IsMLS0kAKHjwJnKLOyoe7dMIQKLrcKcj/yG3jy3mrbQSvF9q6jzsAp
-NxN1UjnCgLP3FSEEQLokSPeNpfjTsNKZ1qM49ijb9UYWkPmYFFxkFDEmD/nsXAu8
-WgVUy7F9LNIU0lL4e0KdsRlsG7DPe7foXUXfSARq9jDOWZOJVUAchNV2WusBOtq0
-1/fkvPfcVCeE+LuIEEPJBVVyxr7Ca+39QiKaOLtufIyqSuSk5NR2udgZf5f9cPVA
-h8YEUqvbIRvNvTHC+vFNVhz1rLzch2NjAX8603/f5fz2JQgw1bnhgxzel+5VejZx
-jJ4fYkVKUmJS0IZjJGsiQbLVz9s0mXc8yuzJErh7ow0Gh+q8et4v9xu8j377F+tH
-i7tefqHsAv36zYkeec5BqrdC5yVgpPi3ZQqCH/J+ixABrLjFzCYlSwAhPs13oB1f
-mrQLgtMFB66NAIbY4opQ
-=K3ZW
+iQEcBAEBAgAGBQJPWlv+AAoJEEdUh39IaPFNKnkH/1D4GXLlyh0zCcwrMjdboGg2
+NfL/vsbtsRTttc2leEUSGJesl0TNac9VL0MsKoljL0M0vFaBbHcfE3m9m3cZVtNb
+scDUsnLr3/gC06TeInjzLsySVe8DNdas0SPye7t1bB7fNlBgcrAGbF1qI2YMckFw
+/H52B0ElLTmHaljlJeN+ENAD2cpcH33BMe4cYz9eg2TOzAAgUv2aahhJqj/ftgB6
+9EnF2iBUsMZYJ18Mr1hzHYcdboT7rVAFsa9zMteglshAgv31oriI8vNcLSsT7v0G
+8bTwOtwDBtdgd6EFQhbTYtCirov6A+jrAR68ZKar3PRTeN5lIuWeJz18oGLZwFs=
+=yLtl
 -----END PGP SIGNATURE-----
diff --git a/app-i18n/ibus/ChangeLog b/app-i18n/ibus/ChangeLog
index 91dfb5a1dcea..bb8d9e798ed2 100644
--- a/app-i18n/ibus/ChangeLog
+++ b/app-i18n/ibus/ChangeLog
@@ -1,6 +1,11 @@
 # 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.104 2012/03/09 19:05:03 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ChangeLog,v 1.105 2012/03/09 19:33:27 ssuominen Exp $
+
+  09 Mar 2012; Samuli Suominen <ssuominen@gentoo.org> ibus-1.4.1.ebuild,
+  +files/ibus-gconf-2.m4.patch:
+  Enable introspection by default. Patch gconf-2.m4 to m4/ directory for
+  eautoreconf wrt #395239 by Mori Rámar
 
   09 Mar 2012; Samuli Suominen <ssuominen@gentoo.org>
   -ibus-1.2.0.20100111.ebuild, -ibus-1.3.9.ebuild, -ibus-1.3.9-r2.ebuild,
diff --git a/app-i18n/ibus/Manifest b/app-i18n/ibus/Manifest
index f82eed064dab..6b63b92a1d72 100644
--- a/app-i18n/ibus/Manifest
+++ b/app-i18n/ibus/Manifest
@@ -3,18 +3,19 @@ Hash: SHA1
 
 AUX ibus-1.4.0-machine-id-fallback.patch 750 RMD160 2d02699dbd9555adcc18c4bd9afb15b1c4c33673 SHA1 b007aedfe70d2ab1e69581c07a4c43595328151e SHA256 ad1b7538e324a29fd779d7545860e06f22904974bae931fa3cda045ae74af8ed
 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 3951 RMD160 49b50a65e84d99dca19b220c033089ef213bef49 SHA1 f73c1b140324f2ef03fd3e24dbd775a7660fe788 SHA256 c332f8335bad7ce0464dd2ab1f0ea69068f0aaaf5a87e4232fb1e05578032d8b
-MISC ChangeLog 17131 RMD160 7a0e1302877169ba077af7f5a1c887622f1a1e22 SHA1 2761c9d400682313afa514e11020f36187653361 SHA256 63983604609daf87d41f6557645d6fb6b2e50a07ac1bd429b452d8065cba9610
+EBUILD ibus-1.4.1.ebuild 3891 RMD160 09009ea9ec65005c1456301bda1e620757ed5e03 SHA1 f7e5ac35ed5fbc126e2325dcc0a6851bc9f8ddaa SHA256 e24e128861921d47901d516a7d9540f730ae700aeab76d208cd9770c447dd926
+MISC ChangeLog 17351 RMD160 e60432be5be35bcce3079634738143306ba1ce26 SHA1 02eb26c094577d17dd5db5b6da9d36fb1bf6504f SHA256 7215fa3dc458c9cd555e3faf693c6f5c2f82c147d65117495714099fbb09bc77
 MISC metadata.xml 798 RMD160 00aebf0dab958b7d9a13d7456d9f19c07d247641 SHA1 9208222da6f4015ba64ce30f59ccf20069507159 SHA256 f8cfd5b99a00d0b8cef1a903818e00a957cebb4612dc482b4cb34ed19d73958d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPWlRkAAoJEEdUh39IaPFNb+IIAJ3qqRq1pkMo2rAV3TiTF5vG
-ScpPG0MExrTGM2nD1fa3KjEqesjn+Ccuj4ljx5NjNPCC66lIJeMSA2ofKaEC4VIK
-qiRed5aqh2bTtLsrqXRGY379DSpGZYvjCOlZ284vYS3GoSDGN7qmMwboD/aOWUf6
-5CXxfFo9eCoFxfi7pP30Lxi5YcLkp8Dh1KwvntzqbkAel+OoJ+hhBIJNH7aopsHo
-vI8HRxaG7n07sc0EKrV34vwudM/LxLc0w+AK8Fk8L/snZP8nMMjQa/ytrpWJ+724
-4kZRJuPgVLwYSDhULgul4yLyE8EYV93gN1zPqviS3Y8wkOpioDcQq/PQEzFknPo=
-=L43p
+iQEcBAEBAgAGBQJPWlsMAAoJEEdUh39IaPFNcc4IAJIa5tQVXH3lzezFBkUqVjX4
+nZd5SZvPLwpByxmJXvhp6nVz/FmZ+2+iUZiUd4Yh9aoMsW9KCy29UbmpJDuU3xiA
+/CBH1lQ5Lu7kijJ9d5jhbOYNqDqih5s3c24Y1Ru/bdJif/rP+G8gCXx+iu46/Z35
+C7W/h6mSpxET2sGP6hR/4yj5JB/P9GHcal2Z6u1Cs2aFNiZNgTFu1PdzX+01FqMG
+vs9GFgeTYjYHDMnCSJVKOXqeQug2f5nkZXJjKiUB3lLgV75zlrO3lYFlF8OnyiWr
+VVEN5OK5YQ/Gbxx+VZqMF57+c9bB0F4wwExf/UMrhDxu4qD5yyvX/LTVDIZCSWg=
+=oeJL
 -----END PGP SIGNATURE-----
diff --git a/app-i18n/ibus/files/ibus-gconf-2.m4.patch b/app-i18n/ibus/files/ibus-gconf-2.m4.patch
new file mode 100644
index 000000000000..266a2bf61339
--- /dev/null
+++ b/app-i18n/ibus/files/ibus-gconf-2.m4.patch
@@ -0,0 +1,49 @@
+http://bugs.gentoo.org/395239
+
+--- m4/gconf-2.m4
++++ m4/gconf-2.m4
+@@ -0,0 +1,44 @@
++dnl AM_GCONF_SOURCE_2
++dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas
++dnl  (i.e. pass to gconftool-2
++dnl Defines GCONF_SCHEMA_FILE_DIR which is a filesystem directory where
++dnl  you should install foo.schemas files
++dnl
++
++AC_DEFUN([AM_GCONF_SOURCE_2],
++[
++  if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then
++    GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source`
++  else
++    GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE
++  fi
++
++  AC_ARG_WITH([gconf-source],
++	      AC_HELP_STRING([--with-gconf-source=sourceaddress],
++			     [Config database for installing schema files.]),
++	      [GCONF_SCHEMA_CONFIG_SOURCE="$withval"],)
++
++  AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE)
++  AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation])
++
++  if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
++    GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas'
++  fi
++
++  AC_ARG_WITH([gconf-schema-file-dir],
++	      AC_HELP_STRING([--with-gconf-schema-file-dir=dir],
++			     [Directory for installing schema files.]),
++	      [GCONF_SCHEMA_FILE_DIR="$withval"],)
++
++  AC_SUBST(GCONF_SCHEMA_FILE_DIR)
++  AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files])
++
++  AC_ARG_ENABLE(schemas-install,
++  	AC_HELP_STRING([--disable-schemas-install],
++		       [Disable the schemas installation]),
++     [case ${enableval} in
++       yes|no) ;;
++       *) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-install]) ;;
++      esac])
++  AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no])
++])
diff --git a/app-i18n/ibus/ibus-1.4.1.ebuild b/app-i18n/ibus/ibus-1.4.1.ebuild
index cd4f51f8a4b6..9fe617e2f790 100644
--- a/app-i18n/ibus/ibus-1.4.1.ebuild
+++ b/app-i18n/ibus/ibus-1.4.1.ebuild
@@ -1,9 +1,10 @@
 # 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.5 2012/03/09 14:43:26 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ibus-1.4.1.ebuild,v 1.6 2012/03/09 19:33:27 ssuominen Exp $
 
-EAPI="3"
+EAPI=4
 PYTHON_DEPEND="python? 2:2.5"
+
 inherit confutils eutils gnome2-utils multilib python autotools
 
 DESCRIPTION="Intelligent Input Bus for Linux / Unix OS"
@@ -13,12 +14,12 @@ SRC_URI="http://ibus.googlecode.com/files/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
-IUSE="dconf doc +gconf gtk gtk3 introspection nls +python vala X"
+IUSE="dconf doc +gconf gtk gtk3 +introspection nls +python vala X"
 
-RDEPEND=">=dev-libs/glib-2.26:2
+RDEPEND=">=dev-libs/glib-2.26
 	dconf? ( >=gnome-base/dconf-0.7.5 )
 	gconf? ( >=gnome-base/gconf-2.12:2 )
-	gnome-base/librsvg:2
+	gnome-base/librsvg
 	sys-apps/dbus[X?]
 	app-text/iso-codes
 	gtk? ( x11-libs/gtk+:2 )
@@ -38,7 +39,6 @@ RDEPEND=">=dev-libs/glib-2.26:2
 #	vala? ( dev-lang/vala )
 DEPEND="${RDEPEND}
 	>=dev-lang/perl-5.8.1
-	dev-perl/XML-Parser
 	dev-util/intltool
 	dev-util/pkgconfig
 	doc? ( >=dev-util/gtk-doc-1.9 )
@@ -51,6 +51,8 @@ RDEPEND="${RDEPEND}
 
 RESTRICT="test"
 
+DOCS="AUTHORS ChangeLog NEWS README"
+
 update_gtk_immodules() {
 	local GTK2_CONFDIR="/etc/gtk-2.0"
 	# bug #366889
@@ -81,11 +83,13 @@ pkg_setup() {
 
 src_prepare() {
 	>py-compile #397497
-	echo "ibus/_config.py" >> po/POTFILES.skip || die
+	echo ibus/_config.py >> po/POTFILES.skip
 
 	epatch \
+		"${FILESDIR}"/${PN}-gconf-2.m4.patch \
 		"${FILESDIR}"/${PN}-1.4.0-machine-id-fallback.patch
-	use gconf || epatch "${FILESDIR}/${P}-no-gconf.patch"
+
+	use gconf || epatch "${FILESDIR}"/${P}-no-gconf.patch
 
 	eautoreconf
 }
@@ -104,21 +108,18 @@ src_configure() {
 		$(use_enable python) \
 		$(use_enable vala) \
 		$(use_enable X xim) \
-		PYTHON="$(PYTHON)" || die
+		PYTHON="$(PYTHON)"
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die
+	default
 
-	find "${ED}" -name '*.la' -type f -delete || die
+	find "${ED}" -name '*.la' -exec rm -f {} +
 
 	insinto /etc/X11/xinit/xinput.d
-	newins xinput-ibus ibus.conf || die
-
-	# bug 289547
-	keepdir /usr/share/ibus/{engine,icons} || die
+	newins xinput-ibus ibus.conf
 
-	dodoc AUTHORS ChangeLog NEWS README || die
+	keepdir /usr/share/ibus/{engine,icons} #289547
 }
 
 pkg_preinst() {