Version bumped.

Package-Manager: portage-2.1.10.44/cvs/Linux x86_64

4 files changed, 45 insertions, 160 deletions

diff --git a/app-i18n/ibus/ChangeLog b/app-i18n/ibus/ChangeLog
index 5c2c81b9a405..ec59a7856414 100644
--- a/app-i18n/ibus/ChangeLog
+++ b/app-i18n/ibus/ChangeLog
@@ -1,6 +1,12 @@
 # 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.97 2012/02/05 01:38:23 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ChangeLog,v 1.98 2012/02/05 16:33:16 matsuu Exp $
+
+*ibus-1.4.1 (05 Feb 2012)
+
+  05 Feb 2012; MATSUU Takuto <matsuu@gentoo.org> -ibus-1.3.99.20110817.ebuild,
+  -ibus-1.4.0.ebuild, +ibus-1.4.1.ebuild, +files/ibus-1.4.1-no-gconf.patch:
+  Version bumped.
 
   05 Feb 2012; Mike Gilbert <floppym@gentoo.org> ibus-1.2.0.20100111.ebuild,
   ibus-1.3.9.ebuild:
diff --git a/app-i18n/ibus/files/ibus-1.4.1-no-gconf.patch b/app-i18n/ibus/files/ibus-1.4.1-no-gconf.patch
new file mode 100644
index 000000000000..bdc1f206a2d0
--- /dev/null
+++ b/app-i18n/ibus/files/ibus-1.4.1-no-gconf.patch
@@ -0,0 +1,29 @@
+diff -Naur ibus-1.4.1.orig/configure.ac ibus-1.4.1/configure.ac
+--- ibus-1.4.1.orig/configure.ac	2012-02-05 23:04:15.000000000 +0900
++++ ibus-1.4.1/configure.ac	2012-02-06 01:20:18.303186786 +0900
+@@ -259,23 +259,8 @@
+ )
+ AM_CONDITIONAL([ENABLE_GCONF], [test x"$enable_gconf" = x"yes"])
+ 
+-if test x"$enable_gconf" = x"yes"; then
+-    # check gconf
+-    PKG_CHECK_MODULES(GCONF,
+-        [gconf-2.0 >= 2.12],
+-    )
+-
+-    AC_PATH_PROG(GCONFTOOL, gconftool-2, no)
+-    if test x"$GCONFTOOL" = xno; then
+-        AC_MSG_ERROR([gconftool-2 executable not found in your path - should be installed with GConf])
+-    fi
+-
+-    AM_GCONF_SOURCE_2
+-    # GCONF_SCHEMAS_INSTALL should be set in macro AM_GCONF_SOURCE_2
+-else
+-    AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [false])
+-    enable_gconf="no (disabled, use --enable-gconf to enable)"
+-fi
++AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [false])
++enable_gconf="no (disabled, use --enable-gconf to enable)"
+ 
+ # --enable-memconf option.
+ AC_ARG_ENABLE(memconf,
diff --git a/app-i18n/ibus/ibus-1.3.99.20110817.ebuild b/app-i18n/ibus/ibus-1.3.99.20110817.ebuild
deleted file mode 100644
index 5f4db5134f73..000000000000
--- a/app-i18n/ibus/ibus-1.3.99.20110817.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# 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.20110817.ebuild,v 1.3 2011/11/22 23:27:59 naota Exp $
-
-EAPI="3"
-PYTHON_DEPEND="python? 2:2.5"
-inherit confutils eutils gnome2-utils multilib python
-
-DESCRIPTION="Intelligent Input Bus for Linux / Unix OS"
-HOMEPAGE="http://code.google.com/p/ibus/"
-SRC_URI="http://ibus.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-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 )
-	gtk3? ( x11-libs/gtk+:3 )
-	X? (
-		sys-apps/dbus[X]
-		x11-libs/libX11
-		x11-libs/gtk+:2
-	)
-	introspection? ( >=dev-libs/gobject-introspection-0.6.8 )
-	python? (
-		dev-python/notify-python
-		>=dev-python/dbus-python-0.83
-	)
-	nls? ( virtual/libintl )"
-#	X? ( x11-libs/libX11 )
-#	gtk? ( x11-libs/gtk+:2 x11-libs/gtk+:3 )
-#	vala? ( dev-lang/vala )
-DEPEND="${RDEPEND}
-	>=dev-lang/perl-5.8.1
-	dev-perl/XML-Parser
-	dev-util/pkgconfig
-	doc? ( >=dev-util/gtk-doc-1.9 )
-	nls? ( >=sys-devel/gettext-0.16.1 )"
-RDEPEND="${RDEPEND}
-	python? (
-		dev-python/pygtk
-		dev-python/pyxdg
-	)"
-
-RESTRICT="test"
-
-update_gtk_immodules() {
-	local GTK2_CONFDIR="/etc/gtk-2.0"
-	# 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
-		"${EPREFIX}/usr/bin/gtk-query-immodules-2.0" > "${EPREFIX}${GTK2_CONFDIR}/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 gtk3
-	if use python; then
-		python_set_active_version 2
-		python_pkg_setup
-	fi
-}
-
-src_prepare() {
-	mv py-compile py-compile.orig || die
-	ln -s "$(type -P true)" py-compile || die
-	echo "ibus/_config.py" >> po/POTFILES.skip || die
-	sed -i -e "s/python/python2/" setup/ibus-setup.in ui/gtk/ibus-ui-gtk.in || die
-}
-
-src_configure() {
-	econf \
-		$(use_enable doc gtk-doc) \
-		$(use_enable doc gtk-doc-html) \
-		$(use_enable introspection) \
-		$(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
-}
-
-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
-
-	# bug 289547
-	keepdir /usr/share/ibus/{engine,icons} || die
-
-	dodoc AUTHORS ChangeLog NEWS README || die
-}
-
-pkg_preinst() {
-	use gconf && gnome2_gconf_savelist
-	gnome2_icon_savelist
-}
-
-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
-
-	elog "To use ibus, you should:"
-	elog "1. Get input engines from sunrise overlay."
-	elog "   Run \"emerge -s ibus-\" in your favorite terminal"
-	elog "   for a list of packages we already have."
-	elog
-	elog "2. Setup ibus:"
-	elog
-	elog "   $ ibus-setup"
-	elog
-	elog "3. Set the following in your user startup scripts"
-	elog "   such as .xinitrc, .xsession or .xprofile:"
-	elog
-	elog "   export XMODIFIERS=\"@im=ibus\""
-	elog "   export GTK_IM_MODULE=\"ibus\""
-	elog "   export QT_IM_MODULE=\"xim\""
-	elog "   ibus-daemon -d -x"
-}
-
-pkg_postrm() {
-	use gtk && update_gtk_immodules
-	use gtk3 && update_gtk3_immodules
-	use python && python_mod_cleanup /usr/share/${PN}
-	gnome2_icon_cache_update
-}
diff --git a/app-i18n/ibus/ibus-1.4.0.ebuild b/app-i18n/ibus/ibus-1.4.1.ebuild
index 03dd9547518a..5d4ba8d96191 100644
--- a/app-i18n/ibus/ibus-1.4.0.ebuild
+++ b/app-i18n/ibus/ibus-1.4.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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.0.ebuild,v 1.3 2011/11/22 23:27:59 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ibus-1.4.1.ebuild,v 1.1 2012/02/05 16:33:16 matsuu Exp $
 
 EAPI="3"
 PYTHON_DEPEND="python? 2:2.5"
@@ -79,12 +79,13 @@ pkg_setup() {
 }
 
 src_prepare() {
-	mv py-compile py-compile.orig || die
-	ln -s "$(type -P true)" py-compile || die
+	>py-compile #397497
 	echo "ibus/_config.py" >> po/POTFILES.skip || die
-	sed -i -e "s/python/python2/" setup/ibus-setup.in ui/gtk/ibus-ui-gtk.in || die
 
-	epatch "${FILESDIR}"/${P}-doc-typo.patch
+	epatch \
+		"${FILESDIR}"/${PN}-1.4.0-machine-id-fallback.patch
+	use gconf || epatch "${FILESDIR}/${P}-no-gconf.patch"
+
 	eautoreconf
 }
 
@@ -101,7 +102,8 @@ src_configure() {
 		$(use_enable nls) \
 		$(use_enable python) \
 		$(use_enable vala) \
-		$(use_enable X xim) || die
+		$(use_enable X xim) \
+		PYTHON="$(PYTHON)" || die
 }
 
 src_install() {