Fixed GTK2_CONFDIR handling, bug #366889. Removed .la files.

(Portage version: 2.1.9.49/cvs/Linux x86_64)

4 files changed, 44 insertions, 16 deletions

diff --git a/app-i18n/ibus/ChangeLog b/app-i18n/ibus/ChangeLog
index 783237dab799..6090b6332194 100644
--- a/app-i18n/ibus/ChangeLog
+++ b/app-i18n/ibus/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-i18n/ibus
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ChangeLog,v 1.86 2011/05/20 17:30:36 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ChangeLog,v 1.87 2011/05/28 01:55:14 matsuu Exp $
+
+*ibus-1.3.99.20110419-r2 (28 May 2011)
+
+  28 May 2011; MATSUU Takuto <matsuu@gentoo.org> ibus-1.3.9.ebuild,
+  ibus-1.3.9-r2.ebuild, -ibus-1.3.99.20110419.ebuild,
+  +ibus-1.3.99.20110419-r2.ebuild:
+  Fixed GTK2_CONFDIR handling, bug #366889. Removed .la files. Removed old
+  version.
 
   20 May 2011; Naohiro Aota <naota@gentoo.org> ibus-1.3.9-r2.ebuild,
   +files/ibus-1.3.9-remove-unused-build.patch:
diff --git a/app-i18n/ibus/ibus-1.3.9-r2.ebuild b/app-i18n/ibus/ibus-1.3.9-r2.ebuild
index b86f08e912b4..f3141d7a1577 100644
--- a/app-i18n/ibus/ibus-1.3.9-r2.ebuild
+++ b/app-i18n/ibus/ibus-1.3.9-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ibus-1.3.9-r2.ebuild,v 1.2 2011/05/20 17:30:36 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ibus-1.3.9-r2.ebuild,v 1.3 2011/05/28 01:55:14 matsuu Exp $
 
 EAPI="3"
 PYTHON_DEPEND="python? 2:2.5"
@@ -51,8 +51,10 @@ RESTRICT="test"
 
 update_gtk_immodules() {
 	local GTK2_CONFDIR="/etc/gtk-2.0"
-	# An arch specific config directory is used on multilib systems
-	has_multilib_profile && GTK2_CONFDIR="${GTK2_CONFDIR}/${CHOST}"
+	# bug #366889
+	if has_version '>=x11-libs/gtk+-2.22.1-r1:2' || has_multilib_profile ; then
+		GTK2_CONFDIR="${GTK2_CONFDIR}/$(get_abi_CHOST)"
+	fi
 	mkdir -p "${EPREFIX}${GTK2_CONFDIR}"
 
 	if [ -x "${EPREFIX}/usr/bin/gtk-query-immodules-2.0" ] ; then
@@ -102,6 +104,8 @@ src_configure() {
 src_install() {
 	emake DESTDIR="${D}" install || die
 
+	find "${ED}" -name '*.la' -exec rm {} + || die
+
 	insinto /etc/X11/xinit/xinput.d
 	newins xinput-ibus ibus.conf || die
 
diff --git a/app-i18n/ibus/ibus-1.3.9.ebuild b/app-i18n/ibus/ibus-1.3.9.ebuild
index 6accff7c8243..6119dabee012 100644
--- a/app-i18n/ibus/ibus-1.3.9.ebuild
+++ b/app-i18n/ibus/ibus-1.3.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ibus-1.3.9.ebuild,v 1.10 2011/04/16 22:08:19 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ibus-1.3.9.ebuild,v 1.11 2011/05/28 01:55:14 matsuu Exp $
 
 EAPI="3"
 PYTHON_DEPEND="python? 2:2.5"
@@ -54,7 +54,9 @@ update_gtk_immodules() {
 	if [ -x /usr/bin/gtk-query-immodules-2.0 ] ; then
 		GTK2_CONFDIR="/etc/gtk-2.0"
 		# An arch specific config directory is used on multilib systems
-		has_multilib_profile && GTK2_CONFDIR="${GTK2_CONFDIR}/${CHOST}"
+		if has_version '>=x11-libs/gtk+-2.22.1-r1:2' || has_multilib_profile ; then
+			GTK2_CONFDIR="${GTK2_CONFDIR}/${CHOST}"
+		fi
 		mkdir -p "${ROOT}${GTK2_CONFDIR}"
 		gtk-query-immodules-2.0 > "${ROOT}${GTK2_CONFDIR}/gtk.immodules"
 	fi
diff --git a/app-i18n/ibus/ibus-1.3.99.20110419.ebuild b/app-i18n/ibus/ibus-1.3.99.20110419-r2.ebuild
index d872b1772f08..6032a213ebc6 100644
--- a/app-i18n/ibus/ibus-1.3.99.20110419.ebuild
+++ b/app-i18n/ibus/ibus-1.3.99.20110419-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ibus-1.3.99.20110419.ebuild,v 1.1 2011/04/24 03:06:25 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ibus-1.3.99.20110419-r2.ebuild,v 1.1 2011/05/28 01:55:14 matsuu Exp $
 
 EAPI="3"
 PYTHON_DEPEND="python? 2:2.5"
@@ -13,16 +13,15 @@ SRC_URI="http://ibus.googlecode.com/files/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="doc +gconf gtk introspection nls +python vala X"
+IUSE="doc +gconf gtk gtk3 introspection nls +python vala X"
 
 RDEPEND=">=dev-libs/glib-2.26:2
 	gconf? ( >=gnome-base/gconf-2.12:2 )
 	gnome-base/librsvg:2
 	sys-apps/dbus
 	app-text/iso-codes
-	gtk? (
-		x11-libs/gtk+:2
-	)
+	gtk? ( x11-libs/gtk+:2 )
+	gtk3? ( x11-libs/gtk+:3 )
 	X? (
 		x11-libs/libX11
 		x11-libs/gtk+:2
@@ -52,8 +51,10 @@ RESTRICT="test"
 
 update_gtk_immodules() {
 	local GTK2_CONFDIR="/etc/gtk-2.0"
-	# An arch specific config directory is used on multilib systems
-	has_multilib_profile && GTK2_CONFDIR="${GTK2_CONFDIR}/${CHOST}"
+	# bug #366889
+	if has_version '>=x11-libs/gtk+-2.22.1-r1:2' || has_multilib_profile ; then
+		GTK2_CONFDIR="${GTK2_CONFDIR}/$(get_abi_CHOST)"
+	fi
 	mkdir -p "${EPREFIX}${GTK2_CONFDIR}"
 
 	if [ -x "${EPREFIX}/usr/bin/gtk-query-immodules-2.0" ] ; then
@@ -61,10 +62,19 @@ update_gtk_immodules() {
 	fi
 }
 
+update_gtk3_immodules() {
+	if [ -x "${EPREFIX}/usr/bin/gtk-query-immodules-3.0" ] ; then
+		"${EPREFIX}/usr/bin/gtk-query-immodules-3.0" --update-cache
+	fi
+}
+
 pkg_setup() {
 	# bug #342903
-	confutils_require_any X gtk
-	python_set_active_version 2
+	confutils_require_any X gtk gtk3
+	if use python; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
 }
 
 src_prepare() {
@@ -82,16 +92,18 @@ src_configure() {
 		$(use_enable gconf) \
 		$(use_enable gtk gtk2) \
 		$(use_enable gtk xim) \
+		$(use_enable gtk3) \
 		$(use_enable nls) \
 		$(use_enable python) \
 		$(use_enable vala) \
 		$(use_enable X xim) || die
-		#$(use_enable gtk gtk3) \
 }
 
 src_install() {
 	emake DESTDIR="${D}" install || die
 
+	find "${ED}" -name '*.la' -type f -delete || die
+
 	insinto /etc/X11/xinit/xinput.d
 	newins xinput-ibus ibus.conf || die
 
@@ -109,6 +121,7 @@ pkg_preinst() {
 pkg_postinst() {
 	use gconf && gnome2_gconf_install
 	use gtk && update_gtk_immodules
+	use gtk3 && update_gtk3_immodules
 	use python && python_mod_optimize /usr/share/${PN}
 	gnome2_icon_cache_update
 
@@ -132,6 +145,7 @@ pkg_postinst() {
 
 pkg_postrm() {
 	use gtk && update_gtk_immodules
+	use gtk3 && update_gtk3_immodules
 	use python && python_mod_cleanup /usr/share/${PN}
 	gnome2_icon_cache_update
 }