Version bumped.

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

4 files changed, 11 insertions, 220 deletions

diff --git a/app-i18n/uim/ChangeLog b/app-i18n/uim/ChangeLog
index 642b5955d93d..e367e88dfcfe 100644
--- a/app-i18n/uim/ChangeLog
+++ b/app-i18n/uim/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-i18n/uim
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/ChangeLog,v 1.195 2009/06/24 05:35:38 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/ChangeLog,v 1.196 2009/06/25 14:54:39 matsuu Exp $
+
+*uim-1.5.6 (25 Jun 2009)
+
+  25 Jun 2009; MATSUU Takuto <matsuu@gentoo.org> -uim-1.5.4-r2.ebuild,
+  -uim-1.5.5.ebuild, +uim-1.5.6.ebuild:
+  Version bumped. Removed old versions.
 
   24 Jun 2009; Jeroen Roovers <jer@gentoo.org> uim-1.5.4-r2.ebuild,
   uim-1.5.5.ebuild:
diff --git a/app-i18n/uim/Manifest b/app-i18n/uim/Manifest
index 88ca78db9804..6dbd7d57bcd6 100644
--- a/app-i18n/uim/Manifest
+++ b/app-i18n/uim/Manifest
@@ -6,12 +6,11 @@ AUX uim-1.5.4-zhTW.patch 1034 RMD160 8d9102b0937d2746a1b4bad5470b1480b94b5eb8 SH
 AUX uim-1.5.5-applet.patch 1091 RMD160 3094d86f539a0d2bf318d8c7e18bff0381ab61e6 SHA1 ee0a110a67027e0d51a6cd661cd08110312f47f2 SHA256 8842cef3f4a7df062abb5d05526ee34b638e3b72d037cfcb99bba3b873664f5d
 DIST uim-1.4.1.tar.bz2 2634265 RMD160 84d95720af62990e0fca1bd3d1a53eeca25d5deb SHA1 5de27af0f59d2e9775c1688dcd6d3848a434fb26 SHA256 145e77ea713b0ebc7afd4be4e8775029b764c4cdd2d54b96594f00b999117771
 DIST uim-1.4.2.tar.bz2 2723523 RMD160 7f0c6a93fb31799643f6c1e594896fc817b2e7f9 SHA1 2ece459ac14e95b2bb2be6135c1a134354dcef09 SHA256 381a4981d942ad5aae01eb711318170706c1cd8ac91a45ab5c733906699d25c2
-DIST uim-1.5.4.tar.bz2 3212490 RMD160 e7beb0602fff76444d47350c3057a7b533c15b20 SHA1 ce5b44040f951c7d07e0b0fa8540e0e5107c484f SHA256 4ff520f607be4195531ff53cb28a20bf8e342622ff94c518a4cd46fe7b2a3daf
 DIST uim-1.5.5.tar.bz2 3259238 RMD160 ac3815658d02abde9d2bf68b90f3e3777734d7e9 SHA1 d688f962073f0f95391fa38cb82ee5703c2ff3b8 SHA256 b5be3e3651234a442723d8ae4c15219520dac1cab087c62958d0ba8dd0fff43d
+DIST uim-1.5.6.tar.bz2 3343584 RMD160 01774ff38e64436945290a5c3b2e1dc1a14d6771 SHA1 24b33991db4813fe82af7862c5e0d0f6d6b284dd SHA256 ce6b7218c3b79e5d100d52fa745e51abc83a1fe7668b3b759584b9ec7a00c28f
 EBUILD uim-1.4.1.ebuild 3956 RMD160 e5c4f8885725cac6f6f78f4937cbb67904e72bce SHA1 5bd58ce7165a99bc8b716c20e8ecb853e677e361 SHA256 48f2fc7e38c7b233012f611893c5be115e84498a7789ee1f31a442cc228357a7
 EBUILD uim-1.4.2.ebuild 4586 RMD160 3370c7659bfefaaf4dab1d6e0aabbf98d7f65612 SHA1 3361443f8dfe07634e52aae81ee8d137d843e878 SHA256 d20decc372b71f7b80c63dcb0846d52f5a821fa35d87b8357a011ff59107e28c
-EBUILD uim-1.5.4-r2.ebuild 5700 RMD160 0d255e35a0b530ec90ed2eb03c2cd6167fb5e09e SHA1 cfc541464e8c63fdb181a490ed09a6c68cb0c25d SHA256 7087e598c4b04890b07f6537824cdadeb560a4fc9ac82594ee3b53ebb2c91ba4
 EBUILD uim-1.5.5-r1.ebuild 5455 RMD160 ef6583ec0df1d2ba714fe3b02aedff0e3de5f7f2 SHA1 fb106c0257c809521873afa339cc220a62223ede SHA256 527f5e7d965bef45af1c64c19237177c7b432655659751f5e99ca3c77af65568
-EBUILD uim-1.5.5.ebuild 5390 RMD160 495c11ef5983d6ecae9ac6189b204ac63cf36177 SHA1 026ba82206749f01ed147d5c45942727e110f21d SHA256 e7e858c000cf7ac5f471d60855516dacb55f049a696dfe8e251be5ed67deb6c1
-MISC ChangeLog 27345 RMD160 c135956fbaaf061d1a59e35593a213bfc0c42b48 SHA1 7140ae0ab80e5756a3dd2cfb1ab77faff447846a SHA256 bc519f18f7b1d9ad42f297c661188ba722280e19350d23cc61c002b7e31c1d8d
+EBUILD uim-1.5.6.ebuild 5393 RMD160 970e6b6aeb5895ec8bc8a58c806dd266ad60b6f2 SHA1 8edfd17debad475ee0181f15beb81f71b17aaaf5 SHA256 55dae85376b0385a9fd2de9c485dfd5da651fd96d12353caf919c0c21eb48570
+MISC ChangeLog 27526 RMD160 caf388fa12855fc0fd50770f5e9b37d075bf7320 SHA1 c4792c7b5304efd9f8a054dcd2133ec3c8284a9a SHA256 811de64d22c1615540a2d56974265dd2b1b58176c0e668d0239967ac7cddd99c
 MISC metadata.xml 815 RMD160 012fd0ff539fa5f7d943f2b2b955af2b1a51579f SHA1 1c035765a6908e1b767689d899a68876e44dc772 SHA256 a1f64b1559c0291cb60d8783c53482f9235f03802984816c827255f92d171d5e
diff --git a/app-i18n/uim/uim-1.5.4-r2.ebuild b/app-i18n/uim/uim-1.5.4-r2.ebuild
deleted file mode 100644
index dc38176eda12..000000000000
--- a/app-i18n/uim/uim-1.5.4-r2.ebuild
+++ /dev/null
@@ -1,214 +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/uim/uim-1.5.4-r2.ebuild,v 1.3 2009/06/24 05:35:38 jer Exp $
-
-EAPI=2
-inherit libtool eutils qt3 multilib elisp-common flag-o-matic
-
-DESCRIPTION="Simple, secure and flexible input method library"
-HOMEPAGE="http://code.google.com/p/uim/"
-SRC_URI="http://uim.googlecode.com/files/${P}.tar.bz2"
-
-LICENSE="BSD GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="+anthy canna eb emacs gnome gtk kde libedit libnotify m17n-lib ncurses nls prime qt3 qt4 unicode X xft linguas_zh_CN linguas_zh_TW linguas_ja linguas_ko"
-
-RDEPEND="X? (
-		x11-libs/libX11
-		x11-libs/libXft
-		x11-libs/libXt
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libXext
-		x11-libs/libXrender
-	)
-	anthy? (
-		unicode? ( >=app-i18n/anthy-8622 )
-		!unicode? ( app-i18n/anthy )
-	)
-	canna? ( app-i18n/canna )
-	eb? ( dev-libs/eb )
-	emacs? ( virtual/emacs )
-	gnome? ( >=gnome-base/gnome-panel-2.14 )
-	gtk? ( >=x11-libs/gtk+-2.4 )
-	kde? ( kde-base/kdelibs:3.5 )
-	libedit? ( dev-libs/libedit )
-	libnotify? ( >=x11-libs/libnotify-0.4 )
-	m17n-lib? ( >=dev-libs/m17n-lib-1.3.1 )
-	ncurses? ( sys-libs/ncurses )
-	nls? ( virtual/libintl )
-	prime? ( app-i18n/prime )
-	qt3? ( || ( >=x11-libs/qt-3.2.0:3[immqt-bc] >=x11-libs/qt-3.2.0:3[immqt] ) )
-	qt4? ( || ( x11-libs/qt-core:4 =x11-libs/qt-4.3*:4 ) )
-	!app-i18n/uim-svn
-	!<app-i18n/prime-0.9.4"
-#	mana? ( app-i18n/mana )
-#	scim? ( >=app-i18n/scim-1.3.0 ) # broken
-#	sj3? ( >=app-i18n/sj3-2.0.1.21 )
-#	wnn? ( app-i18n/wnn )
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	>=sys-devel/gettext-0.15
-	X? (
-		x11-proto/xextproto
-		x11-proto/xproto
-	)"
-
-RDEPEND="${RDEPEND}
-	X? (
-		media-fonts/font-sony-misc
-		linguas_zh_CN? (
-			|| ( media-fonts/font-isas-misc media-fonts/intlfonts )
-		)
-		linguas_zh_TW? (
-			media-fonts/intlfonts
-		)
-		linguas_ja? (
-			|| ( media-fonts/font-jis-misc media-fonts/intlfonts )
-		)
-		linguas_ko? (
-			|| ( media-fonts/font-daewoo-misc media-fonts/intlfonts )
-		)
-	)"
-
-SITEFILE=50${PN}-gentoo.el
-
-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_prepare() {
-	epatch "${FILESDIR}/${P}-gentoo.patch"
-	epatch "${FILESDIR}/${P}-gcc43.patch"
-	epatch "${FILESDIR}/${P}-zhTW.patch"
-	# Stolen from enlightenment.eclass
-	cp $(type -p gettextize) "${T}/" || die
-	sed -i -e '/read dummy/d' "${T}/gettextize" || die
-	( "${T}/gettextize" -f --no-changelog > /dev/null ) || die "gettexize failed"
-	intltoolize -f || die
-	elibtoolize
-}
-
-src_configure() {
-	local myconf
-
-	if use gtk && (use anthy || use canna) ; then
-		myconf="${myconf} --enable-dict"
-	else
-		myconf="${myconf} --disable-dict"
-	fi
-
-	if use qt3 ; then
-		append-flags -DQT_THREAD_SUPPORT
-	fi
-
-	if use gtk || use qt3 ; then
-		myconf="${myconf} --enable-pref"
-	else
-		myconf="${myconf} --disable-pref"
-	fi
-
-	if use anthy ; then
-		if use unicode ; then
-			myconf="${myconf} --with-anthy-utf8"
-		else
-			myconf="${myconf} --with-anthy"
-		fi
-	else
-		myconf="${myconf} --without-anthy"
-	fi
-
-	if use qt3 ; then
-		myconf="${myconf} --with-qt"
-	else
-		myconf="${myconf} --without-qt"
-	fi
-
-	if use qt3 && use kde ; then
-		myconf="${myconf} --enable-notify=knotify3"
-	elif use libnotify ; then
-		myconf="${myconf} --enable-notify=libnotify"
-	fi
-
-	econf $(use_with X x) \
-		$(use_with canna) \
-		$(use_with eb) \
-		$(use_enable emacs) \
-		$(use_with emacs lispdir "${SITELISP}") \
-		$(use_enable gnome gnome-applet) \
-		$(use_with gtk gtk2) \
-		$(use_with libedit) \
-		$(use_enable kde kde-applet) \
-		$(use_with m17n-lib m17nlib) \
-		$(use_enable ncurses fep) \
-		$(use_enable nls) \
-		$(use_with prime) \
-		$(use_with qt3 qt-immodule) \
-		$(use_with qt4 qt4-immodule) \
-		$(use_with xft) \
-		${myconf} || die "econf failed"
-}
-
-src_compile() {
-	emake || die "emake failed"
-
-	if use emacs; then
-		cd emacs
-		elisp-compile *.el || die "elisp-compile failed"
-	fi
-}
-
-src_install() {
-	# parallel make install borks, bug #222677
-	emake -j1 INSTALL_ROOT="${D}" DESTDIR="${D}" install || die "make install failed"
-
-	dodoc AUTHORS ChangeLog* NEWS README RELNOTE
-	if use emacs; then
-		elisp-install uim-el emacs/*.elc || die "elisp-install failed"
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}" uim-el \
-			|| die "elisp-site-file-install failed"
-	fi
-}
-
-pkg_postinst() {
-	elog
-	elog "To use uim-skk you should emerge app-i18n/skk-jisyo."
-	elog
-
-	elog
-	elog "New input method switcher has been introduced. You need to set"
-	elog
-	elog "% GTK_IM_MODULE=uim ; export GTK_IM_MODULE"
-	elog "% QT_IM_MODULE=uim ; export QT_IM_MODULE"
-	elog "% XMODIFIERS=@im=uim ; export XMODIFIERS"
-	elog
-	elog "If you would like to use uim-anthy as default input method, put"
-	elog "(define default-im-name 'anthy)"
-	elog "to your ~/.uim."
-	elog
-	elog "All input methods can be found by running uim-im-switcher-gtk"
-	elog "or uim-im-switcher-qt."
-	elog
-	elog "If you upgrade from a version of uim older than 1.4.0,"
-	elog "you should run revdep-rebuild."
-
-	use gtk && gtk-query-immodules-2.0 > "${ROOT}/${GTK2_CONFDIR}/gtk.immodules"
-	if use emacs; then
-		elisp-site-regen
-		echo
-		elog "uim is autoloaded with Emacs with a minimal set of features:"
-		elog "There is no keybinding defined to call it directly, so please"
-		elog "create one yourself and choose an input method."
-		elog "Integration with LEIM is not done with this ebuild, please have"
-		elog "a look at the documentation how to achieve this."
-	fi
-}
-
-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.5.5.ebuild b/app-i18n/uim/uim-1.5.6.ebuild
index f2a8f1eba034..ae84c95568c5 100644
--- a/app-i18n/uim/uim-1.5.5.ebuild
+++ b/app-i18n/uim/uim-1.5.6.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/uim/uim-1.5.5.ebuild,v 1.2 2009/06/24 05:35:38 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.5.6.ebuild,v 1.1 2009/06/25 14:54:39 matsuu Exp $
 
 EAPI="2"
 inherit eutils qt3 multilib elisp-common flag-o-matic