Version bump. #411589

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

3 files changed, 281 insertions, 16 deletions

diff --git a/app-i18n/uim/ChangeLog b/app-i18n/uim/ChangeLog
index 21cff039b7d1..37ff24fc09f5 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.239 2012/03/08 08:23:59 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/ChangeLog,v 1.240 2012/04/12 11:46:38 naota Exp $
+
+*uim-1.8.0 (12 Apr 2012)
+
+  12 Apr 2012; Naohiro Aota <naota@gentoo.org> +uim-1.8.0.ebuild:
+  Version bump. #411589
 
 *uim-1.7.3 (08 Mar 2012)
 
diff --git a/app-i18n/uim/Manifest b/app-i18n/uim/Manifest
index 8505a74bb091..ce4de9ae90a8 100644
--- a/app-i18n/uim/Manifest
+++ b/app-i18n/uim/Manifest
@@ -16,28 +16,30 @@ DIST uim-1.5.7.tar.bz2 3330555 RMD160 037677cd583c2b69293fbbc1c0393756d7c7adac S
 DIST uim-1.6.1.tar.bz2 6192431 RMD160 26c4e30f59c8eb005189d6778333079c81f8489c SHA1 412bb2df6041185084e2f64fb73357389bf992b5 SHA256 ee23965e26e6e9c52bdc37d87e66da9de2a491221b5f1989942f3666e9a44914
 DIST uim-1.7.1.tar.bz2 6354866 RMD160 af62d79be189e0cafda37fbb34bd94441ebeff77 SHA1 9001955f9efbd3cf23c9ad62c027f44060553fa8 SHA256 81964ed6786eaa8306b0a638193db8171b78b386b9443d2e6a78e7f2cdf9a773
 DIST uim-1.7.3.tar.bz2 6380469 RMD160 2cc9fda13289c2f0e4cf04d7dfb1472630bc5746 SHA1 5c07416b01383d0d8047035a98af9af16f776ff9 SHA256 d2909d2d624a92677935461ce03413f33b7e5af6e19796410406628e59bd561c
+DIST uim-1.8.0.tar.bz2 6453678 RMD160 54c18c7a19ff264da201b3a6f24da50dbfc86a13 SHA1 ec622f05d0d9c6dedad94421cd747e7935a1d201 SHA256 bf760f51b37e4d3a2c960357faea2ef52d1bb7ee06252284c47e431cde88ecc6
 EBUILD uim-1.4.2.ebuild 3987 RMD160 d290986b0fbefcd7855237c56ac59ec7457de6d4 SHA1 01fd6a01801b0aa17335c7df5582ef460cb229f3 SHA256 02cf0e6dba0b37e028d5e5aedd0aed1b4091a7522e245d55c95ef455d0a81143
 EBUILD uim-1.5.7.ebuild 5340 RMD160 e1bea05e98821a63e91c5c687757878744aa2c9e SHA1 fbd35bd0e661dc6c55a05eb81c41f6387d90c8f8 SHA256 681eaeae231fdb61e242a736988b8bce08978a0bc15788101476ab24ad9f278e
 EBUILD uim-1.6.1.ebuild 6058 RMD160 542e051057e3fd2bb996f4150ba4a7bd025cb0ff SHA1 14b65642e9802073ad5c94cdf32ee52f6a5a270d SHA256 8cdeb77ddaf32162a2986504b2ec8c7babe7f1ab7d93c06ee37f65ef9ff595ed
 EBUILD uim-1.7.1-r1.ebuild 6941 RMD160 cc33e643dfad1f84f0583b9606e65489a1114fd0 SHA1 d22e48e6b8e7b62c3b9d5415dfbd8cceabd5325a SHA256 b19cade197774e44966a1e84763bd9d42c4295f19575e826779123d877f62c04
 EBUILD uim-1.7.1.ebuild 6847 RMD160 b2eb29e193d5774dbaf5a3946b571648b1f70747 SHA1 f8555a41aa39c97f718e2f3342524fb274a07a3d SHA256 563f2bfff4e5c3c7233bda6ab8b5601b3c8e42b42ccfc2ed7aa3a9fb40511947
 EBUILD uim-1.7.3.ebuild 6898 RMD160 74c11905bbdb5ee5f278c848c3a9d9ad89e3a4b5 SHA1 4586682918bcc131b026c4ac3a5e3e9d68ae8c97 SHA256 935db4bbe200b3215240e1fa6eca88c405e9ec13cfa866fb376e02babe69a7d9
-MISC ChangeLog 34339 RMD160 7302fb0e2761a89dab1ef30a359fd14a2c567231 SHA1 1cc1ae92f8396c86124c11e1d521c9fc3fb333ff SHA256 533c30aa79a93f5ad284ab4daea5cd38a2fe6f0fab8dc7acfaba8057c5a1cb97
+EBUILD uim-1.8.0.ebuild 6898 RMD160 6ec9b30aa6ee2b5727cf8c8376638dfb1f65e0b8 SHA1 feee8632b7863fed4e6728f8e9b875baf146ccb7 SHA256 5f915cdcfc87108d0c9bd1db5e461c5da495130bd1acfc4c33bb912f7094c813
+MISC ChangeLog 34456 RMD160 d22e8b9da86ab4ca76f5ae5fe05184bdf5c22b74 SHA1 3c1ff941426bc8ad024fa6719852db6e7d8c21bd SHA256 a3e14ed38fc0c7654f144593bd9717eba57c5ad96dedebe9b9d1395512f71e89
 MISC metadata.xml 963 RMD160 2275f335832b0cf6d3b9a22138ea9a8c89ed76c1 SHA1 69c61337a5cec1abc7311a7e6543cc460679597d SHA256 f9ec0fb753307e61a6e6cc5381e41344f34fe4d774ec12d61063077e803c2a8b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJPWGycAAoJEDYO1FT4VRUU3zUQAIEsjuVLkaILtz9YLmiwfMeR
-6MX+oojq9DTPcqFWqrFM9zO7IV8X8UUEwGGx7Gm2Goafq0e+cEGyu/Ov+LlGG96X
-uTd+5BOE2C9kZT1O4g2KsbimVWpEZvHGPbH+RJjKlTssUaoT8Koe8wj7yuzpAUU2
-K06CohqhJPM5ezXypm1/hRzTf9XQbQY/zHEYar97FygjN0ZZlBZvhyJDzjDHIA/x
-jZERoM12l5wSSayQRKMrL6z+rgKlo9paQCNQGrGjRPQ1R8WQWpCrqA5oPpjRQpFM
-ag9GlOzqy6Tr+7/1oQKGNqI9M+wE03ydg7WdGHlQCnBcXcqQhNxmho/H1YgFoUaX
-m8q2VEG1KE6v41tXuO48BlIli/4QTMdmelEA47PxmSI3HtFQTUdEGU7MvXUCIiy8
-gtsHE8zX1wJ7HSR0yhh3SmG73ifdo5yt5LVT+VUiITUr12lf1Z3uaZAyLTu/ti/6
-uN0w1BskwXsOUpr2Ig+HoHL4kZtJwAdwRv4ooWMiII+dJizlFhsTH5fEc69z7zD2
-MaUB8LZl6afSM5/qxUs3pDUkApu0YGOmdFxdOA+4M6pn8GqYIylwsCL0cuHRT0iL
-btUgo7IJCsc02EujGYoYm7CxuGUSi5pQkfsByksw/NVoi6onoN97cWM+H2+HqGYY
-x12VGdUImAAM3PB8rDX7
-=JbM+
+iQIcBAEBCAAGBQJPhsCiAAoJEDYO1FT4VRUUFAwP/0JSYlCgkVuOnTkpaD3DM+JX
+w/CbMpowQg0DJo+a2xfjQETz3q/yrlCfp+t+C+cU/H/wFMPNXgyNKeajzqGz9NGU
+Dc0KZYVanbFV74/I8GQY/c8FC/UzeyZz7ZVpYFD4EMDFi+eaxEbbXxfSCAkhZUPM
+qVZS29/zN5kCtSzInihvf9v9pS/B2EGecjEzO0+ztBY9K202bPvJfILH+pFX8Rax
+1BpA3/wBNlleBRrPNZkOVGchpRmyhfz0kSOFdhuIQSK5K5GNTPpVYktnOdITvMFc
+IyHZywZB/9DarM1cHohCvkn5xi2ZXXwsO8SDvvyYU1zJqAzgbMADeTer65FEl8Nn
+3DOVNHvqvcofe3qI36SwIFkR7xm0B6MG0y20fSFxdyWatu4XRy48gqNcZYQ7XiZs
+QxUKiTAGRM/6BrtdoFtonjKKr+tgKwDcXCyQPEHhDEt2A0fw3id/rT/Maj5FjvBg
+HmiiGtYnUB/SszDEJrFUam9QCllKDUWqZ6qjUxuPvKwkb54fY246kninrHMLONrK
+B4ntCB70NOks1+1S0Jykw3UVVYiSns4Wf0ZZYiZQw4wS6TuhVMaYtm27Uz4k5lXv
+yDgBn7FDoZ2heW3cOtdbm1+vOqqiKszM1IUsiwoX3POz1J2AoEw0+HDis1PjkmxL
+0LXUMAug7ECDRlzbBUJy
+=ZMBK
 -----END PGP SIGNATURE-----
diff --git a/app-i18n/uim/uim-1.8.0.ebuild b/app-i18n/uim/uim-1.8.0.ebuild
new file mode 100644
index 000000000000..4aeffd728a90
--- /dev/null
+++ b/app-i18n/uim/uim-1.8.0.ebuild
@@ -0,0 +1,258 @@
+# 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.0.ebuild,v 1.1 2012/04/12 11:46:38 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
+	dev-util/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
+}
+
+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
+}