Version bumped.

(Portage version: 2.1.1_pre2-r4)
 (Unsigned Manifest commit)

5 files changed, 12 insertions, 298 deletions

diff --git a/app-i18n/uim/Manifest b/app-i18n/uim/Manifest
index 0c2f779af3b7..f2cc13f80b14 100644
--- a/app-i18n/uim/Manifest
+++ b/app-i18n/uim/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 50uim-el-gentoo.el 296 RMD160 0a966341d3f19dee46a855257ed7636a58e4418b SHA1 a313337910f00e8cd920cbf036cc5d672e95a9b5 SHA256 e572b2c766fcf5534dc687ec9a7e4384e3a5747431f91695c977a925392baeb4
 MD5 f2d1f1632eaf89b416b29ee2001c7987 files/50uim-el-gentoo.el 296
 RMD160 0a966341d3f19dee46a855257ed7636a58e4418b files/50uim-el-gentoo.el 296
@@ -10,29 +7,24 @@ MD5 43709db248e2be1d40952ce99d3cae00 files/uim-gtk-query-immodules-gentoo.diff 5
 RMD160 e06a106bdc460057aeacab94bc471faf0e9180bc files/uim-gtk-query-immodules-gentoo.diff 552
 SHA256 ee7e06d7da7dd125ea4f820d5e25a3ac4cf30837a479c11cf004ac7859a262c1 files/uim-gtk-query-immodules-gentoo.diff 552
 DIST uim-0.5.0.1.tar.gz 1681257 RMD160 b7fa954b499b2d0dbddfb39b6e2cbdca0845d71b SHA1 d489003205c0e3a24d611e72d0b780ce35bf7474 SHA256 b9b99ca86f5f211b2ad5eafaed18147142e9d50b7eafc109f570e854bfb4f875
-DIST uim-1.0.0.tar.gz 1924314
 DIST uim-1.0.1.tar.gz 1924484 RMD160 fa0e0057a554382c06dc1f8c7287617db203bcee SHA1 a81e208856793edb6bfe748f6a5400ac03bf07b2 SHA256 cfd3a906763d0474576fd07b0ffcfbc829075a750fc4fe28dcb4e37999e4d57f
-DIST uim-1.1.0.tar.gz 2092779 RMD160 110f89de3218776fd862021147bf5a13b728689d SHA1 4d33a244ee7e432aa93fbde550048590da40cf5f SHA256 57d5799fd76bde17df859ebaffb7883c468f4bf8bb42f2bb9569c4e4b52e4ee0
+DIST uim-1.1.1.tar.gz 2093501 RMD160 36d52ab7f3588614250743ec2ff483d17cb8ec81 SHA1 23fc52da716611b34733cf2f1d45d950d3a61897 SHA256 26a7dfc258cd1c1c52f67680488804e75184db2f0ed5f4699eb4c325fb389c5a
 EBUILD uim-0.5.0.1.ebuild 3377 RMD160 332b1e3d44964e7810036cda945a4cc4f001a7a4 SHA1 d58d9866476d0cb9a3218b8e2f491e8a89d4332b SHA256 ac5420760f48148b9437f0457d0ad1446582d7de4ffc5be7a29ba70431529ebf
 MD5 3b2858b8a5b237e87a7454331e5084d9 uim-0.5.0.1.ebuild 3377
 RMD160 332b1e3d44964e7810036cda945a4cc4f001a7a4 uim-0.5.0.1.ebuild 3377
 SHA256 ac5420760f48148b9437f0457d0ad1446582d7de4ffc5be7a29ba70431529ebf uim-0.5.0.1.ebuild 3377
-EBUILD uim-1.0.0.ebuild 3634 RMD160 234fbdb2a2701a19aafcfeb88c1eefd8953950d6 SHA1 7a5a7d0ecca0c21782fa117c6dca7be95298e4f5 SHA256 f9cb472bdf09d1d52f22cc997834be5e101c1cb3ca642c0554eb0f361e1df6cb
-MD5 98bf74bc794088592c93c9d336079d27 uim-1.0.0.ebuild 3634
-RMD160 234fbdb2a2701a19aafcfeb88c1eefd8953950d6 uim-1.0.0.ebuild 3634
-SHA256 f9cb472bdf09d1d52f22cc997834be5e101c1cb3ca642c0554eb0f361e1df6cb uim-1.0.0.ebuild 3634
 EBUILD uim-1.0.1.ebuild 3634 RMD160 ebac922add3317ac37b843d3a8a3422403fd7c09 SHA1 16db0fa22a42fa6fc596a905b62b45b581d87419 SHA256 6c5d840d67dfa392c9afe9221910d0dec5d22e12beb61572cbd76a343b500f08
 MD5 c49ba8a750415ee721c30dcc7ed748b3 uim-1.0.1.ebuild 3634
 RMD160 ebac922add3317ac37b843d3a8a3422403fd7c09 uim-1.0.1.ebuild 3634
 SHA256 6c5d840d67dfa392c9afe9221910d0dec5d22e12beb61572cbd76a343b500f08 uim-1.0.1.ebuild 3634
-EBUILD uim-1.1.0.ebuild 3634 RMD160 13304db0fb1e222b5f30ddde035be22a7eb35773 SHA1 a482d8eab685d0470aa735b3c99f7b22c04c5174 SHA256 d3aa0d870aafe249eec66aabd3afcfd3a61dae2fef92ce4735ad8c92f7198119
-MD5 2edb99f3ba33f7b7b3566c3901063b99 uim-1.1.0.ebuild 3634
-RMD160 13304db0fb1e222b5f30ddde035be22a7eb35773 uim-1.1.0.ebuild 3634
-SHA256 d3aa0d870aafe249eec66aabd3afcfd3a61dae2fef92ce4735ad8c92f7198119 uim-1.1.0.ebuild 3634
-MISC ChangeLog 19345 RMD160 f11e4b11eedb2666484961d1f476368f994daaa5 SHA1 f25908c28f35a835743eeb5547e150aca862d970 SHA256 f4f866b388df19740dddfd3e1a126d50c94a4bda393b9bd37950a261a2fe3c7e
-MD5 426079914e6d09c40551e39c1876ddd4 ChangeLog 19345
-RMD160 f11e4b11eedb2666484961d1f476368f994daaa5 ChangeLog 19345
-SHA256 f4f866b388df19740dddfd3e1a126d50c94a4bda393b9bd37950a261a2fe3c7e ChangeLog 19345
+EBUILD uim-1.1.1.ebuild 3633 RMD160 3c792f43a512c7c343cac92abe49fd1fdc9dd8b0 SHA1 4e6c61b5121835e6f9c5f631f5adbfd2eb6f47d4 SHA256 762679c23d1606e43b4ff251b3b9f4dcfddb28c8ea66944a396ab47fa0f10abd
+MD5 70af9f2d66a16e2e309204f9651ec1fb uim-1.1.1.ebuild 3633
+RMD160 3c792f43a512c7c343cac92abe49fd1fdc9dd8b0 uim-1.1.1.ebuild 3633
+SHA256 762679c23d1606e43b4ff251b3b9f4dcfddb28c8ea66944a396ab47fa0f10abd uim-1.1.1.ebuild 3633
+MISC ChangeLog 19497 RMD160 7051ed4919c38f6e3268cba5f5fc026b41ce992e SHA1 8ebf6f9ab8628abb86864edbfcececf2f01fd842 SHA256 7fc22fdf630fc8e8e7fee473fb7e82f1fa5f3f02bfa44de32b8f1f2607333341
+MD5 c861f9c83a257564c7ef5f4b705899e4 ChangeLog 19497
+RMD160 7051ed4919c38f6e3268cba5f5fc026b41ce992e ChangeLog 19497
+SHA256 7fc22fdf630fc8e8e7fee473fb7e82f1fa5f3f02bfa44de32b8f1f2607333341 ChangeLog 19497
 MISC metadata.xml 642 RMD160 4e733f159a595e48d0d02c410145909944b09554 SHA1 8187a74132d09878946f84871a8a33462481d6cb SHA256 6108d3c7a6aaf3b5d0a74575e5e725578e5a4c01128fb22ce746ebf41bc8a8e5
 MD5 f5659d73ef347dcb529d867d6d5b4272 metadata.xml 642
 RMD160 4e733f159a595e48d0d02c410145909944b09554 metadata.xml 642
@@ -40,19 +32,9 @@ SHA256 6108d3c7a6aaf3b5d0a74575e5e725578e5a4c01128fb22ce746ebf41bc8a8e5 metadata
 MD5 aec0b0233c7dd742efa6bd56272b932c files/digest-uim-0.5.0.1 238
 RMD160 613e003449aa93075fdeed7df8f30ab65b11793c files/digest-uim-0.5.0.1 238
 SHA256 d0c84fae2d1415b7be4d634be2e24fd5a46d4dc4811dbe7da0d8054e7a1a6121 files/digest-uim-0.5.0.1 238
-MD5 2ae94233c8b9078f8bf5ae9d8b08cb62 files/digest-uim-1.0.0 62
-RMD160 0b71a69065aa7167f771932b216f15c689e57f8f files/digest-uim-1.0.0 62
-SHA256 5af1d248c9a680c939143790b575030b68446e38fb46349e280e3c9c042fb8cf files/digest-uim-1.0.0 62
 MD5 8470e0fe2e1e730863b769223579a247 files/digest-uim-1.0.1 232
 RMD160 2a1e39b677a2184197b949bbae634737863dcd64 files/digest-uim-1.0.1 232
 SHA256 9e3b8e63ea872fded9d7efd8414bd947b07f33940a3cd63624ec182914fe93db files/digest-uim-1.0.1 232
-MD5 d9d1ffaf111db0e4099d37a6326e8b37 files/digest-uim-1.1.0 232
-RMD160 532f5a44cecfa2b35008cd3fa3d0a62855c0c0c5 files/digest-uim-1.1.0 232
-SHA256 5ad50f3b62222b426870c16939a36922eab5f4546c1bfa0d078b3f3de4df8d07 files/digest-uim-1.1.0 232
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
-
-iD8DBQFEnIJToeSe8B0zEfwRAmYIAKCIxD5eMlhZmO2F4w/Bu6gVnd/QEQCfViMF
-u6J39BTBivPPIPU24rNGxQg=
-=5g/0
------END PGP SIGNATURE-----
+MD5 ffd0fac14cd18ed5c5f9ff4b5e935137 files/digest-uim-1.1.1 232
+RMD160 bf6a00a7e9f50c343bf8877baa1b8d44c708aa25 files/digest-uim-1.1.1 232
+SHA256 b4f553a74a9ec5312bd56cdc6c3122a497646a2b27d8a8193b5db9e0c0cffe1d files/digest-uim-1.1.1 232
diff --git a/app-i18n/uim/files/digest-uim-1.0.0 b/app-i18n/uim/files/digest-uim-1.0.0
deleted file mode 100644
index 3463ca24d141..000000000000
--- a/app-i18n/uim/files/digest-uim-1.0.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 63f5401466d8ec0a9c74abad691fc3d8 uim-1.0.0.tar.gz 1924314
diff --git a/app-i18n/uim/files/digest-uim-1.1.0 b/app-i18n/uim/files/digest-uim-1.1.0
deleted file mode 100644
index b13199eb83bc..000000000000
--- a/app-i18n/uim/files/digest-uim-1.1.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 40a886894ea31be876380e64b3387442 uim-1.1.0.tar.gz 2092779
-RMD160 110f89de3218776fd862021147bf5a13b728689d uim-1.1.0.tar.gz 2092779
-SHA256 57d5799fd76bde17df859ebaffb7883c468f4bf8bb42f2bb9569c4e4b52e4ee0 uim-1.1.0.tar.gz 2092779
diff --git a/app-i18n/uim/uim-1.0.0.ebuild b/app-i18n/uim/uim-1.0.0.ebuild
deleted file mode 100644
index b7d5a0cfe722..000000000000
--- a/app-i18n/uim/uim-1.0.0.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.0.0.ebuild,v 1.4 2006/06/24 00:07:28 cardoe Exp $
-
-inherit eutils kde-functions flag-o-matic multilib elisp-common
-
-MY_P="${P/_/-}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Simple, secure and flexible input method library"
-HOMEPAGE="http://uim.freedesktop.org/"
-SRC_URI="http://uim.freedesktop.org/releases/${MY_P}.tar.gz"
-
-LICENSE="GPL-2 BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="gtk qt3 immqt immqt-bc nls X m17n-lib canna emacs"
-
-RDEPEND="
-	X? ( || ( (
-	   	 	    x11-libs/libX11
-				x11-libs/libXft
-				x11-libs/libXt
-				x11-libs/libICE
-				x11-libs/libSM
-				x11-libs/libXext
-				x11-libs/libXrender
-			  )
-		   	  virtual/x11 ) )
-	gtk? ( >=x11-libs/gtk+-2 )
-	m17n-lib? ( dev-libs/m17n-lib )
-	!app-i18n/uim-svn
-	canna? ( app-i18n/canna )
-	immqt? ( $(qt_min_version 3.3.4) )
-	immqt-bc? ( $(qt_min_version 3.3.4) )
-	qt3? ( $(qt_min_version 3.3.4) )
-	emacs? ( virtual/emacs )
-	!<app-i18n/prime-0.9.4"
-
-DEPEND="${RDEPEND}
-	X? ( || ( ( x11-proto/xextproto x11-proto/xproto )
-	   	 	  virtual/x11 ) )
-	dev-lang/perl
-	dev-perl/XML-Parser
-	>=sys-apps/sed-4
-	sys-devel/autoconf
-	sys-devel/automake
-	sys-devel/libtool
-	nls? ( sys-devel/gettext )"
-
-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}"
-	# we execute gtk-query-immodules-2.0 in pkg_postinst()
-	# to not violate sandbox.
-	sed -i -e "/gtk-query-immodules-2.0/s/.*/	:\\\\/g" \
-		Makefile.am || die
-	use X || sed -i -e '/^SUBDIRS/s/xim//' Makefile.in || die
-}
-
-src_compile() {
-	local myconf
-	use qt3 && set-qtdir 3
-	if use immqt || use immqt-bc ; then
-		myconf="${myconf} --with-qt-immodule"
-		export CPPFLAGS="${CPPFLAGS} -DQT_THREAD_SUPPORT"
-	fi
-
-	myconf="${myconf}
-		$(use_enable nls)
-		$(use_with X x)
-		$(use_with gtk gtk2)
-		$(use_with m17n-lib m17nlib)
-		$(use_with canna)
-		$(use_with qt3 qt)
-		$(use_enable emacs)"
-
-	autoreconf
-	libtoolize --copy --force
-
-	# --with-scim is not stable enough
-	# --with-libedit should be fixed in SVN trunk, but not well tested
-	econf ${myconf} --without-scim --without-libedit || die "econf failed"
-	emake -j1 || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	dodoc AUTHORS ChangeLog INSTALL* NEWS README*
-	dodoc doc/{HELPER-CANDWIN,KEY,UIM-SH}
-	use X && dodoc doc/XIM-SERVER
-	use emacs && elisp-site-file-install ${FILESDIR}/50uim-el-gentoo.el
-}
-
-pkg_postinst() {
-	einfo
-	einfo "To use uim-anthy you should emerge app-i18n/anthy or app-i18n/anthy-ss."
-	einfo "To use uim-skk you should emerge app-i18n/skk-jisyo."
-	einfo "To use uim-prime you should emerge app-i18n/prime."
-	einfo
-
-	ewarn
-	ewarn "New input method switcher has been introduced. You need to set"
-	ewarn
-	ewarn "% GTK_IM_MODULE=uim ; export GTK_IM_MODULE"
-	ewarn "% QT_IM_MODULE=uim ; export QT_IM_MODULE"
-	ewarn "% XMODIFIERS=@im=uim ; export XMODIFIERS"
-	ewarn
-	ewarn "If you would like to use uim-anthy as default input method, put"
-	ewarn "(define default-im-name 'anthy)"
-	ewarn "to your ~/.uim."
-	ewarn
-	ewarn "All input methods can be found by running uim-im-switcher-gtk"
-	ewarn "or uim-im-switcher-qt."
-	ewarn
-
-	use gtk && gtk-query-immodules-2.0 > ${ROOT}/${GTK2_CONFDIR}/gtk.immodules
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use gtk && gtk-query-immodules-2.0 > ${ROOT}/${GTK2_CONFDIR}/gtk.immodules
-	use emacs && elisp-site-regen
-}
diff --git a/app-i18n/uim/uim-1.1.0.ebuild b/app-i18n/uim/uim-1.1.0.ebuild
deleted file mode 100644
index 2d870708106e..000000000000
--- a/app-i18n/uim/uim-1.1.0.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.1.0.ebuild,v 1.2 2006/06/24 00:07:28 cardoe Exp $
-
-inherit eutils kde-functions flag-o-matic multilib elisp-common
-
-MY_P="${P/_/-}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Simple, secure and flexible input method library"
-HOMEPAGE="http://uim.freedesktop.org/"
-SRC_URI="http://uim.freedesktop.org/releases/${MY_P}.tar.gz"
-
-LICENSE="GPL-2 BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="gtk qt3 immqt immqt-bc nls X m17n-lib canna emacs"
-
-RDEPEND="
-	X? ( || ( (
-	   	 	    x11-libs/libX11
-				x11-libs/libXft
-				x11-libs/libXt
-				x11-libs/libICE
-				x11-libs/libSM
-				x11-libs/libXext
-				x11-libs/libXrender
-			  )
-		   	  virtual/x11 ) )
-	gtk? ( >=x11-libs/gtk+-2 )
-	m17n-lib? ( dev-libs/m17n-lib )
-	!app-i18n/uim-svn
-	canna? ( app-i18n/canna )
-	immqt? ( $(qt_min_version 3.3.4) )
-	immqt-bc? ( $(qt_min_version 3.3.4) )
-	qt3? ( $(qt_min_version 3.3.4) )
-	emacs? ( virtual/emacs )
-	!<app-i18n/prime-0.9.4"
-
-DEPEND="${RDEPEND}
-	X? ( || ( ( x11-proto/xextproto x11-proto/xproto )
-	   	 	  virtual/x11 ) )
-	dev-lang/perl
-	dev-perl/XML-Parser
-	>=sys-apps/sed-4
-	sys-devel/autoconf
-	sys-devel/automake
-	sys-devel/libtool
-	nls? ( sys-devel/gettext )"
-
-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}"
-	# we execute gtk-query-immodules-2.0 in pkg_postinst()
-	# to not violate sandbox.
-	sed -i -e "/gtk-query-immodules-2.0/s/.*/	:\\\\/g" \
-		Makefile.am || die
-	use X || sed -i -e '/^SUBDIRS/s/xim//' Makefile.in || die
-}
-
-src_compile() {
-	local myconf
-	use qt3 && set-qtdir 3
-	if use immqt || use immqt-bc ; then
-		myconf="${myconf} --with-qt-immodule"
-		export CPPFLAGS="${CPPFLAGS} -DQT_THREAD_SUPPORT"
-	fi
-
-	myconf="${myconf}
-		$(use_enable nls)
-		$(use_with X x)
-		$(use_with gtk gtk2)
-		$(use_with m17n-lib m17nlib)
-		$(use_with canna)
-		$(use_with qt3 qt)
-		$(use_enable emacs)"
-
-	autoreconf
-	libtoolize --copy --force
-
-	# --with-scim is not stable enough
-	# --with-libedit should be fixed in SVN trunk, but not well tested
-	econf ${myconf} --without-scim --without-libedit || die "econf failed"
-	emake -j1 || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	dodoc AUTHORS ChangeLog INSTALL* NEWS README*
-	dodoc doc/{HELPER-CANDWIN,KEY,UIM-SH}
-	use X && dodoc doc/XIM-SERVER
-	use emacs && elisp-site-file-install ${FILESDIR}/50uim-el-gentoo.el
-}
-
-pkg_postinst() {
-	einfo
-	einfo "To use uim-anthy you should emerge app-i18n/anthy or app-i18n/anthy-ss."
-	einfo "To use uim-skk you should emerge app-i18n/skk-jisyo."
-	einfo "To use uim-prime you should emerge app-i18n/prime."
-	einfo
-
-	ewarn
-	ewarn "New input method switcher has been introduced. You need to set"
-	ewarn
-	ewarn "% GTK_IM_MODULE=uim ; export GTK_IM_MODULE"
-	ewarn "% QT_IM_MODULE=uim ; export QT_IM_MODULE"
-	ewarn "% XMODIFIERS=@im=uim ; export XMODIFIERS"
-	ewarn
-	ewarn "If you would like to use uim-anthy as default input method, put"
-	ewarn "(define default-im-name 'anthy)"
-	ewarn "to your ~/.uim."
-	ewarn
-	ewarn "All input methods can be found by running uim-im-switcher-gtk"
-	ewarn "or uim-im-switcher-qt."
-	ewarn
-
-	use gtk && gtk-query-immodules-2.0 > ${ROOT}/${GTK2_CONFDIR}/gtk.immodules
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use gtk && gtk-query-immodules-2.0 > ${ROOT}/${GTK2_CONFDIR}/gtk.immodules
-	use emacs && elisp-site-regen
-}