Version bumped.

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

4 files changed, 13 insertions, 112 deletions

diff --git a/app-i18n/ibus/ChangeLog b/app-i18n/ibus/ChangeLog
index 46427bd6c2ac..255d94bf6d61 100644
--- a/app-i18n/ibus/ChangeLog
+++ b/app-i18n/ibus/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-i18n/ibus
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ChangeLog,v 1.30 2009/05/31 13:24:52 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ChangeLog,v 1.31 2009/06/12 13:28:13 matsuu Exp $
+
+*ibus-1.1.0.20090612 (12 Jun 2009)
+
+  12 Jun 2009; MATSUU Takuto <matsuu@gentoo.org>
+  -ibus-1.1.0.20090413.ebuild, -ibus-1.1.0.20090423.ebuild,
+  +ibus-1.1.0.20090612.ebuild:
+  Version bumped. Removed old versions.
 
 *ibus-1.1.0.20090531 (31 May 2009)
 
diff --git a/app-i18n/ibus/Manifest b/app-i18n/ibus/Manifest
index b50dce6a897b..5a033690d6aa 100644
--- a/app-i18n/ibus/Manifest
+++ b/app-i18n/ibus/Manifest
@@ -1,10 +1,8 @@
-DIST ibus-1.1.0.20090413.tar.gz 1155412 RMD160 3ae10383d662b276bac7739354931de74a65986c SHA1 c98725153cc0a793b3d6cb2b31eef8e1872a8c65 SHA256 191ef16726ac28e27c1f94834b581ca5198b123889b308ec7230b9860d31d527
-DIST ibus-1.1.0.20090423.tar.gz 1198768 RMD160 c153a8bd4aca918f5dc7465ce4e4f2fc63220218 SHA1 b273114fdc0756f95e81fbf9ef23447c09f0dd63 SHA256 3e8bb4e7af4ec5b3c35554c8465ff05ffe7a496fc0d05272af079b993d947756
 DIST ibus-1.1.0.20090508.tar.gz 1200578 RMD160 45a38939f829ae64b671e6e7fedd156256cafaf8 SHA1 b4da8682a9f2b9b6bad4cb18fe8a33396d5e06d0 SHA256 e6147c15ff5668a2f7ba034a70d0e127421432ff3256a06b01b6b7a9697f6830
 DIST ibus-1.1.0.20090531.tar.gz 1212778 RMD160 35e71522a930bf801ae73ff2265ed0b850184eb1 SHA1 6fba7260dd1beb3ba41485c384ef23aeaf509703 SHA256 89d6bc2c4ab5a5390b4ab7e6f1c32ad393bc4a5cf4e7a5b6ffa68b4d94af3cbf
-EBUILD ibus-1.1.0.20090413.ebuild 2701 RMD160 097150665227ef594318d43121aea72dc05462bb SHA1 5f4b16a2c66ea07c94fb2c09dc9ac20cb8782156 SHA256 e1fa96326e7d57b9e3338792c4c3d29da3f9c6196fa05e551b5bcbc4bb7aaf5b
-EBUILD ibus-1.1.0.20090423.ebuild 2701 RMD160 e3ccac736ff68233e794806f4d5717f0d7a93fc2 SHA1 98bf20aae3fbaa25908c63860b15b334b968db61 SHA256 31e39cf552126bfd2654b6a56912fb4449d885d6dc2a69a379d5a38a2d95a11d
+DIST ibus-1.1.0.20090612.tar.gz 1227074 RMD160 679922d3658bd4572b2b808ee69029161d70936b SHA1 b084e12002e1ee673732d19f89f28a88af48b9eb SHA256 02192cceefa822f590dad1f8a8564e72541b07c87fc5717349c7cc5defdbe80d
 EBUILD ibus-1.1.0.20090508.ebuild 2701 RMD160 336e0e8ff95511ea168d18c4c5654dd16de3de2b SHA1 eb3888b6e9166671866d9a662eec0769c3edee30 SHA256 ebb074638cc46fb3ebe9197f4d4ca35841a4cce8e10b90a95ea28946db8f4e7b
 EBUILD ibus-1.1.0.20090531.ebuild 2699 RMD160 0c051f0f00af92abb4f8a5c71021d15adb7afcb5 SHA1 e78d4be8565b53261b9ac406fdd15762fea6473d SHA256 9f0044735da2dfdf7dca359daea67b3ed11db2a83006a465511a96e02aaaddad
-MISC ChangeLog 5000 RMD160 16c1134a9733fd1d9ec014a11b3e754f9b4a4df2 SHA1 01c761c00aad69d6c5c60022f23d553f8bc56f13 SHA256 105e990aa4b736dc1fc986076c7f86fe9aab2ba0a2af3e93ece13c335d5b4fb5
+EBUILD ibus-1.1.0.20090612.ebuild 2699 RMD160 4464a41023c8fb0f56b7e681816bf8751b620a8b SHA1 6f4c61e7e0187e811190947d187c7b1c7d940f83 SHA256 5db6e9bf17a7ad034a8d2d7a0b9ad3b2c0e9df87e9d64362e23f2349a7e269e3
+MISC ChangeLog 5217 RMD160 a2b012da1a1d2989bbe4721ba127149e9a293228 SHA1 e299009d118f740605913a2bf68600ade2097c59 SHA256 4f5cd4406eb09d7a3604dfedf613c86bd427870a6b21ce593fd4153dd2d480e9
 MISC metadata.xml 412 RMD160 247791c63e8fc156c797836fca009b16f2ea30ab SHA1 f517966af22d725ade7672c3e346c8daf60b6461 SHA256 5d29d40b2dfff9cbbfbe9baacec5a3a8cefdfe99544bfe487547b9c5583901f5
diff --git a/app-i18n/ibus/ibus-1.1.0.20090423.ebuild b/app-i18n/ibus/ibus-1.1.0.20090423.ebuild
deleted file mode 100644
index e89baeacc265..000000000000
--- a/app-i18n/ibus/ibus-1.1.0.20090423.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ibus-1.1.0.20090423.ebuild,v 1.2 2009/05/11 14:44:59 matsuu Exp $
-
-EAPI="1"
-inherit autotools eutils 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 ~x86"
-#IUSE="doc nls qt4"
-IUSE="doc nls"
-
-RDEPEND=">=dev-libs/glib-2.18
-	>=x11-libs/gtk+-2
-	>=gnome-base/gconf-2.12
-	>=gnome-base/librsvg-2
-	sys-apps/dbus
-	app-text/iso-codes
-	x11-libs/libX11
-	>=dev-lang/python-2.5
-	>=dev-python/pygobject-2.14
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	doc? ( >=dev-util/gtk-doc-1.9 )
-	nls? ( >=sys-devel/gettext-0.16.1 )"
-RDEPEND="${RDEPEND}
-	dev-python/pygtk
-	>=dev-python/dbus-python-0.83
-	dev-python/pyxdg"
-#	qt4? (
-#		>=x11-libs/qt-core-4.4:4
-#		>=x11-libs/qt-dbus-4.4:4
-#	)
-
-pkg_setup() {
-	# An arch specific config directory is used on multilib systems
-	has_multilib_profile && GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
-	GTK2_CONFDIR=${GTK2_CONFDIR:=/etc/gtk-2.0/}
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	mv py-compile py-compile.orig || die
-	ln -s "$(type -P true)" py-compile || die
-	sed -i -e '/QMAKE/s/$/ "CONFIG+=nostrip"/' client/qt4/Makefile.am || die
-	eautoreconf
-}
-
-src_compile() {
-	# qt4-immodule won't work
-	# http://code.google.com/p/ibus/issues/detail?id=341
-	econf \
-		$(use_enable doc gtk-doc) \
-		$(use_enable nls) || die
-#		$(use_enable qt4 qt4-immodule)
-	emake || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	dodoc AUTHORS ChangeLog NEWS README
-}
-
-pkg_postinst() {
-	local qt_im_module="xim"
-#	use qt4 && qt_im_module="ibus"
-
-	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=\"${qt_im_module}\""
-	elog "   ibus-daemon -d -x"
-
-	[ "${ROOT}" = "/" -a -x /usr/bin/gtk-query-immodules-2.0 ] && \
-		gtk-query-immodules-2.0 > "${ROOT}/${GTK2_CONFDIR}/gtk.immodules"
-
-	python_mod_optimize /usr/share/${PN}
-}
-
-pkg_postrm() {
-	[ "${ROOT}" = "/" -a -x /usr/bin/gtk-query-immodules-2.0 ] && \
-		gtk-query-immodules-2.0 > "${ROOT}/${GTK2_CONFDIR}/gtk.immodules"
-
-	python_mod_cleanup /usr/share/${PN}
-}
diff --git a/app-i18n/ibus/ibus-1.1.0.20090413.ebuild b/app-i18n/ibus/ibus-1.1.0.20090612.ebuild
index caae650e586f..8af69ebc8953 100644
--- a/app-i18n/ibus/ibus-1.1.0.20090413.ebuild
+++ b/app-i18n/ibus/ibus-1.1.0.20090612.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ibus-1.1.0.20090413.ebuild,v 1.2 2009/05/11 14:44:59 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ibus-1.1.0.20090612.ebuild,v 1.1 2009/06/12 13:28:13 matsuu Exp $
 
 EAPI="1"
 inherit autotools eutils multilib python
@@ -50,7 +50,7 @@ src_unpack() {
 	mv py-compile py-compile.orig || die
 	ln -s "$(type -P true)" py-compile || die
 	sed -i -e '/QMAKE/s/$/ "CONFIG+=nostrip"/' client/qt4/Makefile.am || die
-	eautoreconf
+	eautomake
 }
 
 src_compile() {