Version bump. #432664

Package-Manager: portage-2.2.0_alpha123/cvs/Linux x86_64

3 files changed, 282 insertions, 15 deletions

diff --git a/app-i18n/uim/ChangeLog b/app-i18n/uim/ChangeLog
index 93443f698f4f..54ddabdc4f2d 100644
--- a/app-i18n/uim/ChangeLog
+++ b/app-i18n/uim/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-i18n/uim
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/ChangeLog,v 1.255 2012/08/03 22:21:36 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/ChangeLog,v 1.256 2012/08/29 10:47:45 naota Exp $
+
+*uim-1.8.2 (29 Aug 2012)
+
+  29 Aug 2012; Naohiro Aota <naota@gentoo.org> +uim-1.8.2.ebuild:
+  Version bump. #432664
 
   03 Aug 2012; Markos Chandras <hwoarang@gentoo.org> uim-1.8.0.ebuild:
   Stable on amd64 wrt bug #428042
diff --git a/app-i18n/uim/Manifest b/app-i18n/uim/Manifest
index e5e29390ef38..549d8e8ec74d 100644
--- a/app-i18n/uim/Manifest
+++ b/app-i18n/uim/Manifest
@@ -19,6 +19,7 @@ DIST uim-1.6.1.tar.bz2 6192431 SHA256 ee23965e26e6e9c52bdc37d87e66da9de2a491221b
 DIST uim-1.7.1.tar.bz2 6354866 SHA256 81964ed6786eaa8306b0a638193db8171b78b386b9443d2e6a78e7f2cdf9a773 SHA512 84ce08c84ebd0225b93395bb3842d64c403983b04446542c0fbebc08c089269078e366f08fd1e29478e3efcf2973ac04fd685c1fa27200b9575cd1e75e2afbdd WHIRLPOOL c81762a16ea4a91a64aa6a6a1990b427abe16d72c38aa37d2f8c1149f193dab07d3524f3406f0888ad9e08a88a9a92fcb0d981ba4dd15bbf8c224e5ec8e0c0f5
 DIST uim-1.7.3.tar.bz2 6380469 SHA256 d2909d2d624a92677935461ce03413f33b7e5af6e19796410406628e59bd561c SHA512 4879595417c77c3c14e579b2fa6e393f87a056910f9eb126262eedfc39c8b45192e8647c45dfbcd57e0a8bc074694b9988c5d5bafdd99942d9d89e90a66fc14c WHIRLPOOL 27e0865ad63d5daa0047927b7dee89097e39efc6dc4d82915768b5cb3deabc93464cc7f9836d22a620d530834dc03af2fe0bd5ae4e1390e8164520579f26d6aa
 DIST uim-1.8.0.tar.bz2 6453678 SHA256 bf760f51b37e4d3a2c960357faea2ef52d1bb7ee06252284c47e431cde88ecc6 SHA512 4ec5897436fde50c1b79ea235c89d512cba0e88affcd340188341e7f7335c443dcd132c794e9711d4c8fe329c47dd3502cc9e9772f4f43f49d3864469ba69048 WHIRLPOOL 8aa5b1385e71b9b0d0570e052adcd091601a0f80f0698ef374f29b0337d569804678c9635a29d95e92a1a4f3eacb5ae6d895df85bac6a0e491815da212e94100
+DIST uim-1.8.2.tar.bz2 6480613 SHA256 44c2003179291b3279dae7f911d638418a54910f2b99e58418acc88e10067835 SHA512 4433db6913611c753c896e89c79880b87bc55cf0888eefbc76f04e72f8b4d0bf3a97e355e9beeeb51f6dabdbeafaf575399562585b44717a660b8efac9ae80ab WHIRLPOOL 0b089785a5e0b12abbeb6edf7cb5dce162e15e1fef8ea17475511d0a95f733be616bf00dc2cebc6833dc611c31655d1ef5c5c584325ecf0160cbaf4f48a871cc
 EBUILD uim-1.4.2.ebuild 3987 SHA256 02cf0e6dba0b37e028d5e5aedd0aed1b4091a7522e245d55c95ef455d0a81143 SHA512 c928671fbe195ecb8bb27ff92133567c124b6d14fe5a6b666fb3c88aff463a12e5e1819d8d278cc16b91855d8da8f4a28d355983cf1783f4014742897fd3f675 WHIRLPOOL aedae4f0d44af5be189adf7f08a0c736eec126a85a3adf503e9e5c9d0ba30f06c5c275ffe9d81f072412a1b983e6670857b23b4fd58310148f831131958be623
 EBUILD uim-1.5.7.ebuild 5336 SHA256 8e7234ecee854674b74f147933d58798790f64a1be270681562baebbec5212cc SHA512 32f647681984c101199a8e0b51c6b87e6427573a55450994b24f11afd84fffdc0c7c9b855edfe5b9904ad769af3bb063f86e31579a03e34b36d3dfe383e31458 WHIRLPOOL 3efaa7d5cf4814ddccbd3e6cbd4f9b88daff86462cdaac633693105cc5a67e5817f1095851dcd7c34edd9e5c433b61b629d600ea5a714fb374283cccaafd19be
 EBUILD uim-1.6.1.ebuild 6054 SHA256 af09dd323665150db51a3e7ff4d743d6dee997492b9981afbe0c0f3ad149b2f8 SHA512 17695022cd16fca133e0d293f9788b4ff963eee566eca1e791ed502c217454edc9cea763889ba9655eb233f7d144fe29b2d01652ba60a473c76785abfdb74635 WHIRLPOOL 7cb97f7c88715f5eb3c756ec729da3f74db730773de41eaa3d56c39d505a8297a7e1458016f60fd0b4356f7dcf503aa966bae22fa3856ee14d7320e4a90cb9ec
@@ -26,22 +27,23 @@ EBUILD uim-1.7.1-r1.ebuild 6941 SHA256 49e631b9660526469f0703710fef197abc5169d70
 EBUILD uim-1.7.1.ebuild 6843 SHA256 5bb347d3cd53c3059a0bb917bbbd88daa8a05b53455dfbd656096c3c7b944386 SHA512 ff534751495bf13aa701ea71d531209c351d3dfa947b5059db1ab1df933661a46e99943233d1d0056ccdccaa8554830c6e6989dfdff538290a3c7c68acc492e4 WHIRLPOOL 3251cd275b945d9567eab5ed5ef2f9b3bcca55ef7b64c8db5c5b7caccacea74a59ecf35f69411b2f532e38e8e92b3bd8b751c0e171f0b621dbbe82fa76cf7ca3
 EBUILD uim-1.7.3.ebuild 7550 SHA256 d57f0dec0f5562cfbd070dbf1ddd9f20a46679e393094b3e5093b46e2d4f77d5 SHA512 a2a66005c30b95a59666903967992f04e4614568c7fc29773514dd55e4b078efea53599cc8407e2411b4e90b04ac8e6a6434d619129855f6a53367452b06c693 WHIRLPOOL cfe577b228d3a4558e2937916f648dcbf7b22215988d0f6289a3a6e5f408fa684c85488c7f7b3b42e979f0768b337d1bb4ad5ed3b07cbb7ad794526ea60ba3c0
 EBUILD uim-1.8.0.ebuild 6987 SHA256 e1d282d195984fbec2acd935011f3620ae76f51edaa61d8fa18e26150f35c7a3 SHA512 a591c9d9053108cfe22b3f24f908a3f6ef4e45e41e3eae5cf8ccf92f389296414cb5ce670dcef0ad9cf2a0407f1680df81ec2ebca69b7fe2d590df8b559bc630 WHIRLPOOL d09aad0ab65244bc36f590cea27072560cfff91d28ee418a943654897787cc77c3453f4f1c59abca01f1b206c164cb73e950c7eac5c60fef053435e030f563ea
-MISC ChangeLog 36234 SHA256 5ed9eae0db5efa90fa6a3d409a36254a4dc5b4833a5f7005c3cf4690a59a8bea SHA512 bb86e52ae3b934fb8127537956d80ce2659096d4031a0b25d52b1af204c0468fcb69d5c375c5cf397040f6ce21b9ef136b998e3dde335d36ebd4369562b89333 WHIRLPOOL cb508796e67adefca0d17accefb614129f6dce464fcaa5623d0cbdde404f5084507d4c5f9e4dad0ffe70300778059397e3ffa94678d6210c88f61dc80c124244
+EBUILD uim-1.8.2.ebuild 6944 SHA256 30c6f4432d66d1cde43c717b90fd7a0823e7742e18505b5e9c7d676b510decb4 SHA512 9c20fe9f7c6435446d1a8d9a0305a9dca48c0bc97fb8b459d0059713de1835d47c92235e84707094589e4d886a0a01ceb15bcecb3b148ce31d41ca60c1497c38 WHIRLPOOL 6caa65fcd33d9f85422461d1d3a6288b094ff989b57723ca550bcb1f98c98e49566349868e2d26695402b75637c321d0a9c7f272373077503e4688b53ed483ae
+MISC ChangeLog 36348 SHA256 3bfdcf3f7adf8301c71428ebd64e6d406a44ba63b79841cf2f028c1d03392f40 SHA512 cfea41d54c64327e3ab33fdddf6f2211a355e20d7f574784d3998a1c42c70c511d427edee3abcdc0946c51e544b3d1c48f1dbb54e931759126c0e9e7851a64a3 WHIRLPOOL 168b79eb2562d3baa00e36d7b1078ddde9b77a9edc901f557b2d6ff3f85f047195d89692cb68338b0562736cfd1374586d006398b6201d21c8e948324720e2f9
 MISC metadata.xml 963 SHA256 f9ec0fb753307e61a6e6cc5381e41344f34fe4d774ec12d61063077e803c2a8b SHA512 07cbf037403887aee2402e27d9592e68ace684664305c215f21f480faa094faf66b7d8fdcf5977e22ced8bf19d7d88f6b5f96a8327d1c57580d1b0743cb9a5cd WHIRLPOOL 81fca7c8cea972c45b00b221b583b41bfb535ab2823f7f5d554d8c5f953d34807465797c814434149f7274f760d9718d36d8f561d21e8aba030fdb0cab600be3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQHE70AAoJEPqDWhW0r/LCMPMP/RXEsonjS6BGpBIJY6NWFNNE
-be7FGnaDTjnWHaVK298MItlT+/XJ8ouDhZy7+hKrrZ59qpQJW5m58Sc1505WcVsB
-OLXe8zdlt+tyr8LlUD2dYcGSomsZsgOQfxOOhdbHpLf49IYQZxx+NlbBUXNyMDEh
-v8S+cuBgjwMgIzwXEuJpxZhtt5TU952Pee9BpPL5Q2tmSCDCyRmlZCGIELgzlMjR
-+uhV7f9wP7aIBiQelX/dpcsRiIzdZkKx8dQRzp3Q9Hf20mRtgvIB2NAIv4ndSZYA
-1d2MzTEJIvD3ElfppC4EHRXrIsXBWSmFlZW/Per/FBdRtPj2GajgvSOWj44yYWuG
-SVSaAF3XYXA5MhSsfMVCIxORkq6SnCjdgXWmW/FYvaHx0f16yLjmyfqz9WwcYT6t
-F9o0VrDPYqD3nDFv0TtNI/rQBBIKrVo5ush2oFRb+w7TSAMclsUX6/2qVtyVwbWE
-nIrP3oRcAHd9TdCEoYA8UeDzbfAPyyd6BfyflDKwER6VUX+TUqBiKy1r93/MzEZ7
-KoSyg9xvb7a4LYFp1HQPNROLpCeD8l3OQ+pf9D4Y+vdIrjhiXg9tPx+CoXloC0EW
-fz+KQHXZFwovpKuxlfB1eNZQM1DP9X/Q+Jkx457sFzICuBbkzBjqoqViopVS7QCw
-HJlNaDU1/DdpN+n2qYVV
-=p7Xn
+iQIcBAEBCAAGBQJQPfM6AAoJEDYO1FT4VRUUVc4P/1rJZeR0vOMNnI++P+btNA97
+QE7sO7Tt3dOl5z2jrETy3LIr1/QWkgtbQZO19lKReZHR9Ffn/5edddHdjXZB9zXY
+Rnp5Vt2xxmLZ475RcvEdBz+vzd5NQ2LOPyBCTCbyEkFMy6zTHUiucOYeYUmyEfqQ
+dtcm9YZZYfK/5mcZK1RKRM7dajryl8SNIpyswH9k+vkCwzjku+HxriCGa2BZlC7e
+bu/Ww1XYMJs1KVuu3P4dkwAi2HZzT1sGOnY4Y1ZmrYyIv+1qNyQG41ODd9W3lD0a
+Rzvet2xbarqokDYIlZz3iyJSxuciDfGcFBbtXiurIIpD5lI7i9w8m8XN8rtaLzuI
+cq9nKnddcLl9KTd6lOY3DjNxzEDaeV+WWJjFIrFWJnehaOINCpucZXu/OF9MBarY
+r2vhRuTpB+uq7m6ER6oXvf9+vpxp01t5wpUQPzXuRXmco8vQI/qnsPGaZgZawjun
+C4L+DwRPvyMxvQxNJ3q1bwZvkBMbjImAsJGM/5iOlKpGVnU1Vm6q61RlcISvQBY/
+ug7iRR61GOzIf0B+KBkmzak52LPPwv3PahUPmRpucykx1X1oeyAaQzjrfA/Tgjng
+Z6vdawzqVfNQGfvMBbgDzMLLFD02k/HASPT6DkL/AlOJbXAipaZSFeygooxUP+ir
+GrHvtAw5c9MJRM1U1QtY
+=k6K6
 -----END PGP SIGNATURE-----
diff --git a/app-i18n/uim/uim-1.8.2.ebuild b/app-i18n/uim/uim-1.8.2.ebuild
new file mode 100644
index 000000000000..563fe1ed0ab4
--- /dev/null
+++ b/app-i18n/uim/uim-1.8.2.ebuild
@@ -0,0 +1,260 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.8.2.ebuild,v 1.1 2012/08/29 10:47:45 naota Exp $
+
+EAPI="4"
+inherit autotools eutils 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="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="+anthy canna curl eb emacs libffi gnome gtk gtk3 kde libedit libnotify m17n-lib ncurses nls prime qt4 skk sqlite ssl static-libs test unicode X xft linguas_zh_CN linguas_zh_TW linguas_ja linguas_ko"
+
+RESTRICT="test"
+
+REQUIRED_USE="gtk? ( X ) qt4? ( X )"
+
+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 )
+	curl? ( >=net-misc/curl-7.16.4 )
+	eb? ( dev-libs/eb )
+	emacs? ( virtual/emacs )
+	libffi? ( virtual/libffi )
+	gnome? ( >=gnome-base/gnome-panel-2.14 )
+	gtk? ( >=x11-libs/gtk+-2.4:2 )
+	gtk3? ( x11-libs/gtk+:3 )
+	kde? ( >=kde-base/kdelibs-4 )
+	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 )
+	qt4? ( x11-libs/qt-gui:4[qt3support] )
+	skk? ( app-i18n/skk-jisyo )
+	sqlite? ( dev-db/sqlite:3 )
+	ssl? ( dev-libs/openssl )
+	!dev-scheme/sigscheme
+	!app-i18n/uim-svn
+	!<app-i18n/prime-0.9.4"
+#	>=dev-scheme/sigscheme-0.8.5
+#	mana? ( app-i18n/mana )
+#	scim? ( >=app-i18n/scim-1.3.0 ) # broken
+#	sj3? ( >=app-i18n/sj3-2.0.1.21 )
+#	wnn? ( app-i18n/wnn )
+#	gnome? (
+#		gtk? ( >=gnome-base/gnome-panel-2.14 )
+#		gtk3? ( >=gnome-base/gnome-panel-3 )
+#	)
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	virtual/pkgconfig
+	>=sys-devel/gettext-0.15
+	kde? ( dev-util/cmake )
+	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 )
+		)
+	)"
+#	test? ( dev-scheme/gauche )
+
+SITEFILE=50${PN}-gentoo.el
+
+update_gtk_immodules() {
+	local GTK2_CONFDIR="/etc/gtk-2.0"
+	# bug #366889
+	if has_version '>=x11-libs/gtk+-2.22.1-r1:2' || has_multilib_profile ; then
+		GTK2_CONFDIR="${GTK2_CONFDIR}/$(get_abi_CHOST)"
+	fi
+	mkdir -p "${EPREFIX}${GTK2_CONFDIR}"
+
+	if [ -x "${EPREFIX}/usr/bin/gtk-query-immodules-2.0" ] ; then
+		"${EPREFIX}/usr/bin/gtk-query-immodules-2.0" > "${EPREFIX}${GTK2_CONFDIR}/gtk.immodules"
+	fi
+}
+
+update_gtk3_immodules() {
+	if [ -x "${EPREFIX}/usr/bin/gtk-query-immodules-3.0" ] ; then
+		"${EPREFIX}/usr/bin/gtk-query-immodules-3.0" --update-cache
+	fi
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-1.6.0-gentoo.patch \
+		"${FILESDIR}"/${PN}-1.5.4-zhTW.patch
+
+	# bug 275420
+	sed -i -e "s:\$libedit_path/lib:/$(get_libdir):g" configure.ac || die
+
+	echo "QMAKE_LFLAGS = ${LDFLAGS}" >> qt4/common.pro.in || die
+
+	#./autogen.sh
+	AT_NO_RECURSIVE=1 eautoreconf
+}
+
+src_configure() {
+	local myconf
+
+	if (use gtk || use gtk3) && (use anthy || use canna) ; then
+		myconf="${myconf} --enable-dict"
+	else
+		myconf="${myconf} --disable-dict"
+	fi
+
+	if use gtk || use gtk3 || use qt4 ; 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 libnotify ; then
+		myconf="${myconf} --enable-notify=libnotify"
+	fi
+
+	#if use gnome ; then
+	#	myconf="${myconf} $(use_enable gtk gnome-applet)"
+	#	myconf="${myconf} $(use_enable gtk3 gnome3-applet)"
+	#fi
+
+	econf $(use_with X x) \
+		$(use_with canna) \
+		$(use_with curl) \
+		$(use_with eb) \
+		$(use_enable emacs) \
+		$(use_with emacs lispdir "${SITELISP}") \
+		$(use_with libffi ffi) \
+		$(use_enable gnome gnome-applet) \
+		$(use_with gtk gtk2) \
+		$(use_with gtk3) \
+		$(use_with libedit) \
+		--disable-kde-applet \
+		$(use_enable kde kde4-applet) \
+		$(use_with m17n-lib m17nlib) \
+		$(use_enable ncurses fep) \
+		$(use_enable nls) \
+		$(use_with prime) \
+		--without-qt \
+		--without-qt-immodule \
+		$(use_with qt4 qt4) \
+		$(use_with qt4 qt4-immodule) \
+		$(use_enable qt4 qt4-qt3support) \
+		$(use_with skk) \
+		$(use_with sqlite sqlite3) \
+		$(use_enable ssl openssl) \
+		$(use_enable static-libs static) \
+		$(use_with xft) \
+		${myconf}
+}
+
+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 b0rked, bug #222677
+	emake -j1 INSTALL_ROOT="${D}" DESTDIR="${D}" install || die "make install failed"
+
+	dodoc AUTHORS ChangeLog* NEWS README RELNOTE || die
+	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
+
+	find "${ED}/usr/$(get_libdir)/uim" -name '*.la' -exec rm {} +
+	use static-libs || find "${ED}" -name '*.la' -exec rm {} +
+
+	sed -e "s:@EPREFIX@:${EPREFIX}:" "${FILESDIR}/xinput-uim" > "${T}/uim.conf" || die
+	insinto /etc/X11/xinit/xinput.d
+	doins "${T}/uim.conf" || die
+
+	# collision with dev-scheme/sigscheme, bug #330975
+	# find "${ED}" -name '*gcroots*' -delete || die
+
+	rmdir "${ED}"/usr/share/doc/sigscheme || die
+}
+
+pkg_postinst() {
+	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 "uim-im-switcher-gtk3 or uim-im-switcher-qt4."
+	elog
+	elog "If you upgrade from a version of uim older than 1.4.0,"
+	elog "you should run revdep-rebuild."
+
+	use gtk && update_gtk_immodules
+	use gtk3 && update_gtk3_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 && update_gtk_immodules
+	use gtk3 && update_gtk3_immodules
+	use emacs && elisp-site-regen
+}