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

4 files changed, 82 insertions, 26 deletions

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() {