Support building pygtk2; Call icon cache update. #455614

(Portage version: 2.2.0_alpha159/cvs/Linux x86_64, signed Manifest commit with key F8551514)

4 files changed, 55 insertions, 9 deletions

diff --git a/app-i18n/ibus-anthy/ChangeLog b/app-i18n/ibus-anthy/ChangeLog
index d827efa70152..404763f356e9 100644
--- a/app-i18n/ibus-anthy/ChangeLog
+++ b/app-i18n/ibus-anthy/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-i18n/ibus-anthy
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-anthy/ChangeLog,v 1.41 2013/02/05 11:33:29 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-anthy/ChangeLog,v 1.42 2013/02/09 13:04:49 naota Exp $
+
+  09 Feb 2013; Naohiro Aota <naota@gentoo.org>
+  +files/ibus-anthy-1.5.0-configure.patch, ibus-anthy-1.5.0.ebuild,
+  metadata.xml:
+  Support building pygtk2; Call icon cache update. #455614
 
 *ibus-anthy-1.5.0 (05 Feb 2013)
 
diff --git a/app-i18n/ibus-anthy/files/ibus-anthy-1.5.0-configure.patch b/app-i18n/ibus-anthy/files/ibus-anthy-1.5.0-configure.patch
new file mode 100644
index 000000000000..2beb17d47c69
--- /dev/null
+++ b/app-i18n/ibus-anthy/files/ibus-anthy-1.5.0-configure.patch
@@ -0,0 +1,26 @@
+diff --git a/configure.ac b/configure.ac
+index 7a4ca49..1ddcf16 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -210,9 +210,7 @@ dnl - check pygtk2
+ AC_MSG_CHECKING([whether you enable pygtk2 anthy])
+ AC_ARG_ENABLE(pygtk2-anthy,
+               AS_HELP_STRING([--enable-pygtk2-anthy=no/yes],
+-                             [Install pygtk2 anthy default=no]),
+-              enable_pygtk2_anthy=yes,
+-              enable_pygtk2_anthy=no)
++                             [Install pygtk2 anthy default=no]))
+ AC_MSG_RESULT($enable_pygtk2_anthy)
+ 
+ if test x"$enable_pygtk2_anthy" = xyes; then
+@@ -287,9 +285,7 @@ dnl - check private png
+ AC_MSG_CHECKING([if you install the private png file])
+ AC_ARG_ENABLE(private-png,
+               AS_HELP_STRING([--enable-private-png=no/yes],
+-                             [Install ibus-anthy.png default=no]),
+-              enable_private_png=yes,
+-              enable_private_png=no)
++                             [Install ibus-anthy.png default=no]))
+ AC_MSG_RESULT($enable_private_png)
+ 
+ if test x"$enable_private_png" = xyes; then
diff --git a/app-i18n/ibus-anthy/ibus-anthy-1.5.0.ebuild b/app-i18n/ibus-anthy/ibus-anthy-1.5.0.ebuild
index 3ae656663b10..a1c826b53ebe 100644
--- a/app-i18n/ibus-anthy/ibus-anthy-1.5.0.ebuild
+++ b/app-i18n/ibus-anthy/ibus-anthy-1.5.0.ebuild
@@ -1,28 +1,30 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-anthy/ibus-anthy-1.5.0.ebuild,v 1.1 2013/02/05 11:33:29 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-anthy/ibus-anthy-1.5.0.ebuild,v 1.2 2013/02/09 13:04:49 naota Exp $
 
 EAPI=5
 PYTHON_DEPEND="2:2.5"
-inherit eutils python
+inherit eutils python autotools gnome2-utils
 
 DESCRIPTION="Japanese input method Anthy IMEngine for IBus Framework"
 HOMEPAGE="http://code.google.com/p/ibus/"
-SRC_URI="http://ibus.googlecode.com/files/${P}.tar.gz"
+SRC_URI="http://ibus.googlecode.com/files/${P}.tar.gz
+	https://raw.github.com/ibus/ibus-anthy/${PV}/engine/anthy.i"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="nls"
+IUSE="deprecated nls"
 
-RDEPEND=">=app-i18n/ibus-1.2.0.20100111
+RDEPEND=">=app-i18n/ibus-1.5.0
 	app-i18n/anthy
-	>=dev-python/pygtk-2.15.2
+	deprecated? ( >=dev-python/pygtk-2.15.2 )
 	nls? ( virtual/libintl )"
 DEPEND="${RDEPEND}
-	dev-lang/swig
+	dev-libs/gobject-introspection
 	dev-util/intltool
 	virtual/pkgconfig
+	deprecated? ( dev-lang/swig )
 	nls? ( >=sys-devel/gettext-0.16.1 )"
 
 pkg_setup() {
@@ -34,10 +36,15 @@ src_prepare() {
 	>py-compile #397497
 	sed -i -e "s/python/python2/" \
 		engine/ibus-engine-anthy.in setup/ibus-setup-anthy.in || die
+	epatch "${FILESDIR}"/${P}-configure.patch
+	eautoreconf
+	cp "${DISTDIR}"/anthy.i "${S}"/engine # deal with packaging bug
 }
 
 src_configure() {
-	econf $(use_enable nls)
+	econf --enable-private-png \
+		$(use_enable deprecated pygtk2-anthy) \
+		$(use_enable nls)
 }
 
 src_install() {
@@ -48,6 +55,10 @@ src_install() {
 	find "${ED}" -name '*.la' -type f -delete || die
 }
 
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
 pkg_postinst() {
 	elog
 	elog "app-dicts/kasumi is not required but probably useful for you."
@@ -60,4 +71,5 @@ pkg_postinst() {
 
 pkg_postrm() {
 	python_mod_cleanup /usr/share/${PN}
+	gnome2_icon_cache_update
 }
diff --git a/app-i18n/ibus-anthy/metadata.xml b/app-i18n/ibus-anthy/metadata.xml
index 6792e0053f0a..96a29926bf06 100644
--- a/app-i18n/ibus-anthy/metadata.xml
+++ b/app-i18n/ibus-anthy/metadata.xml
@@ -7,4 +7,7 @@ libanthy.</longdescription>
 	<upstream>
 		<remote-id type="google-code">ibus</remote-id>
 	</upstream>
+	<use>
+		<flag name="deprecated">Install deprecated pygtk2 library</flag>
+	</use>
 </pkgmetadata>