Version bumped. Changed LICENSE.

Package-Manager: portage-2.2_rc11/cvs/Linux 2.6.26-gentoo-r1 x86_64

6 files changed, 14 insertions, 282 deletions

diff --git a/app-i18n/ibus/ChangeLog b/app-i18n/ibus/ChangeLog
index 9a11c3b0fd9c..807236465ce0 100644
--- a/app-i18n/ibus/ChangeLog
+++ b/app-i18n/ibus/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-i18n/ibus
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ChangeLog,v 1.9 2008/10/05 15:41:49 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ChangeLog,v 1.10 2008/10/06 16:56:39 matsuu Exp $
+
+*ibus-0.1.1.20081006 (06 Oct 2008)
+
+  06 Oct 2008; MATSUU Takuto <matsuu@gentoo.org>
+  -ibus-0.1.1.20080923.ebuild, -ibus-0.1.1.20080930.ebuild,
+  -ibus-0.1.1.20081001.ebuild, -ibus-0.1.1.20081004.ebuild,
+  +ibus-0.1.1.20081006.ebuild:
+  Version bumped. Changed LICENSE. Removed old versions.
 
 *ibus-0.1.1.20081005 (05 Oct 2008)
 
diff --git a/app-i18n/ibus/Manifest b/app-i18n/ibus/Manifest
index 021864299c48..7a371c521743 100644
--- a/app-i18n/ibus/Manifest
+++ b/app-i18n/ibus/Manifest
@@ -1,12 +1,6 @@
-DIST ibus-0.1.1.20080923.tar.gz 674530 RMD160 b1ab52d717ce00babce6093f76b1961b27ca55ea SHA1 12eba18cddcedeea2cb9746bc680a1d1bbd3c03d SHA256 c4b5e2e752106ef9fd9a42162b16246a8f461dc805054ae1be03131afa097f43
-DIST ibus-0.1.1.20080930.tar.gz 676233 RMD160 4c3c07858a9b1d02d53ff7c11bf5bda79307fd94 SHA1 e188e93058de340788627224b415c9c94cbb7898 SHA256 b04b9cd4822ec5bace4493582db8c92da9de55b64b62325b85cc17f9229fd6c7
-DIST ibus-0.1.1.20081001.tar.gz 676707 RMD160 775a1f60c5520496964dc2948a94ec0e7ba8be9c SHA1 afeabbb93543241083a27748b6363d9aead7aa2d SHA256 e9bece970b2bec0a40a0f48f94312227cc76ae2bf17fa92f3735ad10a8593314
-DIST ibus-0.1.1.20081004.tar.gz 677306 RMD160 04ef9e8c2682036b33813bfb6257a1474c915156 SHA1 046db2e9fe8f9959ba5623725d93a27a73a2027e SHA256 dbe776023ca6cd5fd127d01a40408b6a1ce9a58fefb6d3bca0574c432635e37e
 DIST ibus-0.1.1.20081005.tar.gz 677415 RMD160 2f322976a72e10b8ba2a71f5b63017ba1d50e3c5 SHA1 7555c2c5aa0c8f110b6016fbcac69ac4086e942a SHA256 15546c2c9fda1a2bb750a04cb452314ca7e42c164a5c4b63d4f6fbe8a284e346
-EBUILD ibus-0.1.1.20080923.ebuild 2270 RMD160 ab8c46a894dcec5bc6eef356965abfd24862c7a7 SHA1 a7f420d626787911bf5ea55774ab27d2cfcaee9e SHA256 189db4d556699dcde7e7c66787f3e38c81c37e876026f69ba2b42ad72fb3c2b3
-EBUILD ibus-0.1.1.20080930.ebuild 2270 RMD160 fe73af2ee4c03a5c2e9102dac1c727178a1ab3ff SHA1 6e22ecc875ae2e1193af21026001be9e74acd582 SHA256 a1b9efc1a54ea87462d94a94a5deacb72dcb3a69482bb5aceaa2be768bf61226
-EBUILD ibus-0.1.1.20081001.ebuild 2270 RMD160 9370e5bf9157e29ea8ee045273106635ee417a87 SHA1 9a71553b3e3aee0b0262d6f5ab88cd717342bf0c SHA256 1328f618ad599ca2d5b1e7dc13fdbe84b675f319051f63be1601b0abe64fdc77
-EBUILD ibus-0.1.1.20081004.ebuild 2270 RMD160 231941c3fec01cb68bd9fd64b5fcda366975093a SHA1 05b539c8586cb8a3029944970ea926710a0ca7d6 SHA256 d83d42ca14c4c8d4e3fc72662a1ed29050a4319085cfbe8cccc98c83ae6e2ffd
+DIST ibus-0.1.1.20081006.tar.gz 680679 RMD160 cf943ab6b1fcd3c3426084090bc9b7675ee578d2 SHA1 9997de8dd0dffae9e3ca35c08e125e137d9f3e18 SHA256 833f5df969d0a3058efd85418089c0657ce72504cfcf475b0a143ab00bd0b06f
 EBUILD ibus-0.1.1.20081005.ebuild 2270 RMD160 eff6a674251a93728b2218cd4efb77216bc846c6 SHA1 84b28b30151593270933dc55d01ca8925a90bf0b SHA256 c7ed9935a130393d1fdf8d41a45f122be6df06f778d982d1b4e359734272aeb7
-MISC ChangeLog 1567 RMD160 a10bcd865db5addccb2674555c3f4264f8c54fa8 SHA1 8d7512ccc1059a6b84c911fc826d8fe3680e728d SHA256 8b54a1416c51bef2962705d7ad8bcc5524a1c002569d9bbaeed04837f1b6155a
+EBUILD ibus-0.1.1.20081006.ebuild 2272 RMD160 bc3b604c89a5d5e24ae43b5f8b8a9443c3641296 SHA1 03e3959d10631d3dbc1f2f725b0ca22f6b00713c SHA256 976aeed77bccea0897a7f8cc345513ecffc68792c58ccadbe9f42b73d282767b
+MISC ChangeLog 1862 RMD160 1d4914b65f85f0f8f144dfd97436a784061a7562 SHA1 34d95212b96cc21889bf4f758e5132bba2346153 SHA256 c28735c6e1ba4b21e294ba23454e70a01b09d2fe05912714484524b1706c6378
 MISC metadata.xml 412 RMD160 247791c63e8fc156c797836fca009b16f2ea30ab SHA1 f517966af22d725ade7672c3e346c8daf60b6461 SHA256 5d29d40b2dfff9cbbfbe9baacec5a3a8cefdfe99544bfe487547b9c5583901f5
diff --git a/app-i18n/ibus/ibus-0.1.1.20080930.ebuild b/app-i18n/ibus/ibus-0.1.1.20080930.ebuild
deleted file mode 100644
index c37528cf10c9..000000000000
--- a/app-i18n/ibus/ibus-0.1.1.20080930.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ibus-0.1.1.20080930.ebuild,v 1.1 2008/09/30 15:02:50 matsuu Exp $
-
-EAPI="1"
-inherit multilib
-
-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"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls qt4"
-
-RDEPEND=">=dev-libs/glib-2
-	>=x11-libs/gtk+-2
-	dev-libs/dbus-glib
-	qt4? ( || (
-		(
-			>=x11-libs/qt-core-4.4:4
-			>=x11-libs/qt-dbus-4.4:4
-		)
-		>=x11-libs/qt-4.4:4
-	) )
-	app-text/iso-codes
-	x11-libs/libX11
-	>=dev-lang/python-2.5
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	nls? ( >=sys-devel/gettext-0.16.1 )"
-RDEPEND="${RDEPEND}
-	dev-python/pygtk
-	>=dev-python/dbus-python-0.83
-	dev-python/pyxdg
-	dev-python/gconf-python"
-
-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_compile() {
-	econf \
-		$(use_enable nls) \
-		$(use_enable qt4 qt4-immodule) || die
-	emake || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	dodoc AUTHORS ChangeLog NEWS README
-}
-
-pkg_postinst() {
-	ewarn "This package is very experimental, please report your bug to"
-	ewarn "http://ibus.googlecode.com/issues/list"
-	elog
-	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 "2. Set the following in your"
-	elog "   user startup scripts such as .xinitrc or .bashrc"
-	elog
-	elog "   export XMODIFIERS=\"@im=ibus\""
-	elog "   export GTK_IM_MODULE=\"ibus\""
-	elog "   export QT_IM_MODULE=\"ibus\""
-	elog "   ibus &"
-	elog
-	if ! use qt4; then
-		ewarn "Missing qt4 use flag, ibus will not work in qt4 applications."
-		ebeep 3
-	fi
-	elog
-
-	if [ -x /usr/bin/gtk-query-immodules-2.0 ] ; then
-		gtk-query-immodules-2.0 > "${ROOT}/${GTK2_CONFDIR}/gtk.immodules"
-	fi
-}
-
-pkg_postrm() {
-	if [ -x /usr/bin/gtk-query-immodules-2.0 ] ; then
-		gtk-query-immodules-2.0 > "${ROOT}/${GTK2_CONFDIR}/gtk.immodules"
-	fi
-}
diff --git a/app-i18n/ibus/ibus-0.1.1.20081001.ebuild b/app-i18n/ibus/ibus-0.1.1.20081001.ebuild
deleted file mode 100644
index ec511f551c83..000000000000
--- a/app-i18n/ibus/ibus-0.1.1.20081001.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ibus-0.1.1.20081001.ebuild,v 1.1 2008/10/01 16:20:57 matsuu Exp $
-
-EAPI="1"
-inherit multilib
-
-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"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls qt4"
-
-RDEPEND=">=dev-libs/glib-2
-	>=x11-libs/gtk+-2
-	dev-libs/dbus-glib
-	qt4? ( || (
-		(
-			>=x11-libs/qt-core-4.4:4
-			>=x11-libs/qt-dbus-4.4:4
-		)
-		>=x11-libs/qt-4.4:4
-	) )
-	app-text/iso-codes
-	x11-libs/libX11
-	>=dev-lang/python-2.5
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	nls? ( >=sys-devel/gettext-0.16.1 )"
-RDEPEND="${RDEPEND}
-	dev-python/pygtk
-	>=dev-python/dbus-python-0.83
-	dev-python/pyxdg
-	dev-python/gconf-python"
-
-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_compile() {
-	econf \
-		$(use_enable nls) \
-		$(use_enable qt4 qt4-immodule) || die
-	emake || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	dodoc AUTHORS ChangeLog NEWS README
-}
-
-pkg_postinst() {
-	ewarn "This package is very experimental, please report your bug to"
-	ewarn "http://ibus.googlecode.com/issues/list"
-	elog
-	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 "2. Set the following in your"
-	elog "   user startup scripts such as .xinitrc or .bashrc"
-	elog
-	elog "   export XMODIFIERS=\"@im=ibus\""
-	elog "   export GTK_IM_MODULE=\"ibus\""
-	elog "   export QT_IM_MODULE=\"ibus\""
-	elog "   ibus &"
-	elog
-	if ! use qt4; then
-		ewarn "Missing qt4 use flag, ibus will not work in qt4 applications."
-		ebeep 3
-	fi
-	elog
-
-	if [ -x /usr/bin/gtk-query-immodules-2.0 ] ; then
-		gtk-query-immodules-2.0 > "${ROOT}/${GTK2_CONFDIR}/gtk.immodules"
-	fi
-}
-
-pkg_postrm() {
-	if [ -x /usr/bin/gtk-query-immodules-2.0 ] ; then
-		gtk-query-immodules-2.0 > "${ROOT}/${GTK2_CONFDIR}/gtk.immodules"
-	fi
-}
diff --git a/app-i18n/ibus/ibus-0.1.1.20081004.ebuild b/app-i18n/ibus/ibus-0.1.1.20081004.ebuild
deleted file mode 100644
index bfba8020244f..000000000000
--- a/app-i18n/ibus/ibus-0.1.1.20081004.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ibus-0.1.1.20081004.ebuild,v 1.1 2008/10/04 14:46:28 matsuu Exp $
-
-EAPI="1"
-inherit multilib
-
-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"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls qt4"
-
-RDEPEND=">=dev-libs/glib-2
-	>=x11-libs/gtk+-2
-	dev-libs/dbus-glib
-	qt4? ( || (
-		(
-			>=x11-libs/qt-core-4.4:4
-			>=x11-libs/qt-dbus-4.4:4
-		)
-		>=x11-libs/qt-4.4:4
-	) )
-	app-text/iso-codes
-	x11-libs/libX11
-	>=dev-lang/python-2.5
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	nls? ( >=sys-devel/gettext-0.16.1 )"
-RDEPEND="${RDEPEND}
-	dev-python/pygtk
-	>=dev-python/dbus-python-0.83
-	dev-python/pyxdg
-	dev-python/gconf-python"
-
-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_compile() {
-	econf \
-		$(use_enable nls) \
-		$(use_enable qt4 qt4-immodule) || die
-	emake || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	dodoc AUTHORS ChangeLog NEWS README
-}
-
-pkg_postinst() {
-	ewarn "This package is very experimental, please report your bug to"
-	ewarn "http://ibus.googlecode.com/issues/list"
-	elog
-	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 "2. Set the following in your"
-	elog "   user startup scripts such as .xinitrc or .bashrc"
-	elog
-	elog "   export XMODIFIERS=\"@im=ibus\""
-	elog "   export GTK_IM_MODULE=\"ibus\""
-	elog "   export QT_IM_MODULE=\"ibus\""
-	elog "   ibus &"
-	elog
-	if ! use qt4; then
-		ewarn "Missing qt4 use flag, ibus will not work in qt4 applications."
-		ebeep 3
-	fi
-	elog
-
-	if [ -x /usr/bin/gtk-query-immodules-2.0 ] ; then
-		gtk-query-immodules-2.0 > "${ROOT}/${GTK2_CONFDIR}/gtk.immodules"
-	fi
-}
-
-pkg_postrm() {
-	if [ -x /usr/bin/gtk-query-immodules-2.0 ] ; then
-		gtk-query-immodules-2.0 > "${ROOT}/${GTK2_CONFDIR}/gtk.immodules"
-	fi
-}
diff --git a/app-i18n/ibus/ibus-0.1.1.20080923.ebuild b/app-i18n/ibus/ibus-0.1.1.20081006.ebuild
index 60d7a5e36c80..d87087e47355 100644
--- a/app-i18n/ibus/ibus-0.1.1.20080923.ebuild
+++ b/app-i18n/ibus/ibus-0.1.1.20081006.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ibus-0.1.1.20080923.ebuild,v 1.1 2008/09/24 12:07:11 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ibus-0.1.1.20081006.ebuild,v 1.1 2008/10/06 16:56:39 matsuu Exp $
 
 EAPI="1"
 inherit multilib
@@ -9,7 +9,7 @@ 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"
+LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="nls qt4"