Support building pygtk2; Call icon cache update. #455614

Package-Manager: portage-2.2.0_alpha159/cvs/Linux x86_64
Manifest-Sign-Key: 0xF8551514

5 files changed, 80 insertions, 12 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/Manifest b/app-i18n/ibus-anthy/Manifest
index 20676cad9bc0..f89db37aa8dd 100644
--- a/app-i18n/ibus-anthy/Manifest
+++ b/app-i18n/ibus-anthy/Manifest
@@ -1,3 +1,8 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX ibus-anthy-1.5.0-configure.patch 1072 SHA256 1234d7bda94974c2f4c7dbeee72934fb9c170cd4a2df93d23d40e5659a6e860a SHA512 aa4680bd37b3f0c13636fd9a303b8bf53719bc39c4719a56750c9a04cedf1ed1bb0fdf87955054d72353b0c0330df4007aae4c5387ea20017fb14385b10948e1 WHIRLPOOL baeac2b59cee845ff07058668bcb281b1efd329cb3d69f50c6b6259d2402e142018027809abf223d9d38fa2e990cd199c3cc5f2edbe15f190764bfebfa48ff2d
+DIST anthy.i 3170 SHA256 3615639f5cd9bf2adcbc2bac8d3ae968646df1d9d2ba987d80442d5ad99ecdf9 SHA512 400d67c2f0ffbdb3eab241646922d549ec4a42ae5b33714a91b864f4b5dfdf0d9a0d28cb6dcdffa55eb9633651ceae034bb547d7a5c41d9b8d352e955773e069 WHIRLPOOL 9be409df613530658c68bc7491e1dd258f5f1ef1d09895a3557a9e63c3ced5083c1ecd9e274536c9afbc98031c353c05c73304bb4354aaf8e21a1c15de39b8b6
 DIST ibus-anthy-1.2.0.20100115.tar.gz 448717 SHA256 5c01abd9977a9594593ad27998b98441b700e57af2b2316e0633432a58b13177 SHA512 418ebdd819bf26e8b13d868b1ca5a2e3186886ef2baba7189bd4fb6ca8282cbf1818cef8134d793b625ad8cc45173589e7d7c1c608bb69e0ec4bb1efaf78771b WHIRLPOOL 1f26b97f5cae0bc3bff58f29685f96fe51296dfd3267cd2ea60559e6479b33e6640cd4c7de35bf479d0a97da060fbb1c3d1bcfc9149dca187a445d0b6d5a5f7a
 DIST ibus-anthy-1.2.6.tar.gz 519488 SHA256 e4d5eb27c35295a69c0baa308a6589c8aea19f72317d08b692437af5512dd6f6 SHA512 e7d9cca76fb7d5754304200c96fbc5002dd66e5a960ecb5275eb821c68ac3d3122932fa127ee1f993bfb5958937b153c1f35558034ed5fc49391f8f52ba9d60c WHIRLPOOL 76179ecc15e385e65a7f28a50478f6f7c57d6accba08c821f0e62383cdb49132d3e9077f20ce25cbd0aca7eecc4a3d830327aafe5ff04205816a9308c1423cfd
 DIST ibus-anthy-1.2.7.tar.gz 523139 SHA256 33c42c1612423f84fddd8c38f8b2439b8af5f0b5fc7725ae195a01b8999d85e9 SHA512 ee45759bb8303967d09d0f92ee0a97fa63611de936c61073078d795b9ba8858cc882e539611bb5ea68848d471e6d2b0e4d8f51df5335aad7942f15e63c4d159d WHIRLPOOL a27945667347d0fb121d028b23b68219df6417369d32d47a43665c828e8935cd74e04b861e0a4e04a117c08665771c22750eab2869fffd21f23b1e21f633b358
@@ -6,6 +11,23 @@ EBUILD ibus-anthy-1.2.0.20100115.ebuild 1177 SHA256 beae5fafe5622f59855d1f74382d
 EBUILD ibus-anthy-1.2.6.ebuild 1377 SHA256 0bfa5d5280b1e890b0c6fdc8391f1af1c0b5961d0ae1bbb693193fca0a42b8d7 SHA512 59f66d7a1a4c06dea20f8a6315dc66110bd8806c67181d4391335db8a95ca9e7ffb1c5fe16e21b1ce292efe753f0a6a234a5daedf7ed0eb8203cfb7147cbe2f0 WHIRLPOOL 42bc310c68b8028666f7d53de15b5724c771bddfa3031f8e39034906f7809dfeda693b922409935b07fd212650f725d8d3d07e49c1da49ebdf0e26772c527265
 EBUILD ibus-anthy-1.2.7-r1.ebuild 1315 SHA256 5c6894bc40c3c0aa4e7f8374e644ad044b0b81f239165478d96cbd0d0c99b7a8 SHA512 7ce6375d91a0dde2f2e1789c0a06eed6c816c59b6c50dabe79d5ce6e3a723b54d0a98fc8348c0e4bddf049f7db35d4b08379701ca7685a74f6c21e19024e31f2 WHIRLPOOL 3aafaa1e81eb8b88ae7fc6b4e0e35cf862bd3fb669a00a44315e9afd3ae0cd3a1342b24b9b568cb5dae8d283a099b5a60674c398bd1ebdefc0e8da6f4ab3db91
 EBUILD ibus-anthy-1.2.7.ebuild 1387 SHA256 2d80c229c2963d0acd9bc9ba6fead3fb437e971f76223ee6781b6b3a8e6bdcf5 SHA512 d933186cdba816ecbe731d415414974e8b23196baad7429b48378589e8bdf00463ca34de3a91c3b187cc2bbc4765390022d8eaae87475c622dda3c5687501f5d WHIRLPOOL c695ef0b9eb78c494b9cbfe59dc6bf5cdacdf014f8e1e738e6881ebeb63210323d0594d59875144c1081a4a165938d06117fa61e11b8d4bd945ca0d93e15f3c3
-EBUILD ibus-anthy-1.5.0.ebuild 1351 SHA256 81b564ad3b55432428358c1b4e1ae9e76ed36927556e49b8890c2fdcd6358f24 SHA512 7ab332088aef9aa6700ed83fdc0ccd2696b4fabb3060494610c66b7e2179af91061e5e22c753ad37d8a8e1ea1931b184f3451601330425db2df1b837790f01e0 WHIRLPOOL 8a185627c4ff1ed50820ab24b61a287aa033653ce9b535b2050d08f43b8642cbbe192d21c09695f2df3d0a2a72d97213f0db53e139d386ee9307115f40672720
-MISC ChangeLog 6764 SHA256 0899d5d5e415dcf664d19bcc197fff231bde0c65a03bc93c672cbe7ccb3464b0 SHA512 23f6f7d458532ec1957d479e7fb0f861954f48bf3d55ac793485a339518acfd451dffbef094ce567c21ccbdedcfd236fdcb83b28a638ca37a58bdb252e5bb4d7 WHIRLPOOL 8fc91dc703a27114e616c0e739a3f86f7a55518a1e2ff9dcf9cc0d831b62fce80fd2b50fb58e68227f0f53608affdc7d9168ed3026b3a7440621d3269273ceb6
-MISC metadata.xml 362 SHA256 2f2a88681e1cb70a49e0415479e896ec16eae7cfa469be21ae29d98dd9c9ce09 SHA512 8be0e8770458c8da5a966a96fb11c533f2e6b536e00d916f56db406674371a002966421b6b6cb80f02f9948ba8642712490bf36db92cbf47ee1ffac88b08a3e8 WHIRLPOOL c0a0c0b931d207e3c042d5d70cb5469114f0c627615cc7381a19ef5446dd8c1df117f4c4007e6fe6da43c3bf2f0fb11f19f6134f357e5f7a90a69aed8a1466e3
+EBUILD ibus-anthy-1.5.0.ebuild 1755 SHA256 dca6ae4a670197c946085f087ca4b91ffa73bc9d7f7422eab42d30ef799dde0a SHA512 fea98262e913cc5b1b5620dca4588dbf106cc27016f48f731bf18bfbe101fb38c07b144ba350ec5f302d056ec5e79713d282dd47a43b9ddf0f3d6246c5c61321 WHIRLPOOL 7fc416ae40fc2e22377381a27b9fe20a305efb5d3f067d2f74f71cb17cdaa205b86867d84f28d86e1a1ba8664e18ec64d8eb4c563372e3ddfb9d14298f4218a3
+MISC ChangeLog 6954 SHA256 bb600ae1f2eac13e4d1d19b73a10e02cc714df1787c1ac93bb969534c7312c05 SHA512 6afca9278e9039991a23da8e9131a856186888023518b32002d0a749093b5df6b1863b5e3cf533907045ae9d3a5f376ea7c08db3c7bbe6fa3a9edaa02cdf8f26 WHIRLPOOL d647bedca82181fcedb2d8b8e90a9b12398296412b8ea8e0a1659e238e433aceb2b80d7f79e8767eda819ce2357e6acaa23b297120c1491611a2e0104cdc4c46
+MISC metadata.xml 444 SHA256 2158ef0d0057bc5460a2912301745c8eb51a856594e364c9d9226b83811f5cbb SHA512 34786164cfc8cb6f2814a631ccd6e1ba16bcd81ea5b3a1cee886cf1a0f959b6361869e7408cd9582829cb6dda782ea4c6a9722eaefd8e27c9bbb18a971d15ecb WHIRLPOOL ac496cc0437eeab069ccf5b97c78e31b4a48719c63e47f8f5b3f3b341e645269cd27a3f0c7f018e93eee8eab3441a47cc3471c2b6089ee4d5845a4b4b688c961
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBCAAGBQJRFkmcAAoJEDYO1FT4VRUULB0QAIAhoAD0prdn/BbT3BFg4iwd
+bo9sf7OKmbej/ff7Q/r6lMdQxhBNAyJieSuFVXJphIxQMy3zOMxO8dZrjpZJsjCr
+VzKGDVMmrNCbxHXfFOwk1YEx6YRL6F0ZJaeLhtCA9aTQQmoAoW57fc1vCN+3bbsa
+IoJI53KNa6sXaAUapFFB/Q+dO8EtU80lOt+pomKBQVg34Ew2KWA3iaRf54CTOaSM
+P9jfDg98/AKr45dV6P1zZUP+1qufjuiJCQjpeHwCvN2w2tYQcw+yBFeJ+iUhUTPX
+dkhyQh/iA+s26nJwLMakvkAIu3fwpkWN6eQQq9pn9x4Gb03kP9cxboXv7FleoPFO
+CcG2zzih9l7s+doJKmS4Gbf4sWSTXCnrLuvM7UkXCMv5lgRbCivlM03A3/lNOGGi
+AieIcmRi74XFoqBNWpDJo3A55J/Kaz0LQPpaov0VkuNOfAyAulKmt+OB3Zq5u2QH
+TSa3Fpg3XUyRkBhqeqt0VcCRdFT0XBzi/YT08J7cfOwJLfKfiR5FU4VFdargiJY8
+dBUil8i8NbVPIeFaQzfeQEqDBpNNRdstTl+XHdrTxtTCq6CAlq5EiMg2jLsXSpqR
+zWn6V7auJhp6ADwzU1tetBDpKBfToPhtcert8rTfQ3OStecv7eqsH7XhcEXIEcdW
+EXeekyrhammJmz4S8J2+
+=ar/8
+-----END PGP SIGNATURE-----
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>