Fixed to work with qt4 USE flag, bug #233872.

Package-Manager: portage-2.1.4.4

4 files changed, 13 insertions, 202 deletions

diff --git a/app-i18n/uim/ChangeLog b/app-i18n/uim/ChangeLog
index 5e3e93d0ed25..be8722972eee 100644
--- a/app-i18n/uim/ChangeLog
+++ b/app-i18n/uim/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-i18n/uim
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/ChangeLog,v 1.183 2008/08/04 15:36:22 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/ChangeLog,v 1.184 2008/08/09 00:12:53 matsuu Exp $
+
+*uim-1.5.2-r1 (09 Aug 2008)
+
+  09 Aug 2008; MATSUU Takuto <matsuu@gentoo.org> -uim-1.5.1.ebuild,
+  -uim-1.5.2.ebuild, +uim-1.5.2-r1.ebuild:
+  Fixed to work with qt4 USE flag, bug #233872.
 
 *uim-1.5.2 (04 Aug 2008)
 
diff --git a/app-i18n/uim/Manifest b/app-i18n/uim/Manifest
index 72e9a33c541b..7addf919b1a0 100644
--- a/app-i18n/uim/Manifest
+++ b/app-i18n/uim/Manifest
@@ -2,11 +2,9 @@ AUX 50uim-el-gentoo.el 296 RMD160 0a966341d3f19dee46a855257ed7636a58e4418b SHA1
 AUX 50uim-gentoo.el 113 RMD160 4830acc8f32525aaae156cf0252d9e93cd41cc2c SHA1 64b0c88335dbfdab07938a8d92218407ebec2db1 SHA256 58a536e5b7d0ffac6802e60d348b092623601d25c8917d64a51347efab9e4cb7
 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.1.tar.bz2 3345651 RMD160 bb286bafc36a0d2c2f4ca45be3247615aa7470ef SHA1 d171e9a933fc9e2fefb948d94bc27171bf32dee7 SHA256 6d16485913456d48fcbc69caab9d80742b50dc73feee1e05eb78ea2afaf90ddd
 DIST uim-1.5.2.tar.bz2 3246057 RMD160 e5c3bff6785d3b0736e1db2119642feea4031db0 SHA1 cd685e5194e91dce52e0cf46a8d5a7a9cab1d013 SHA256 297bf67bebd9074c0e235ed3a903e5d86b65073ba29a6348ca78bcaf7fde606a
 EBUILD uim-1.4.1.ebuild 3956 RMD160 e5c4f8885725cac6f6f78f4937cbb67904e72bce SHA1 5bd58ce7165a99bc8b716c20e8ecb853e677e361 SHA256 48f2fc7e38c7b233012f611893c5be115e84498a7789ee1f31a442cc228357a7
 EBUILD uim-1.4.2.ebuild 4583 RMD160 037c3a138af952b3d7bb843738f67dc53809dace SHA1 0aa47b4625f81604b97e864a25995386e8f68686 SHA256 018dd4dcac6732b536ab14b96deec893d6fd493def7ae2a7fc5c54a38e0f19d7
-EBUILD uim-1.5.1.ebuild 5162 RMD160 78d327831668a9dd65f79ba7ca41c926613c495a SHA1 1d9f742962b33fa30036948c3118a6231a79581d SHA256 ffa218ad8e70892856c9ccb9cb97e80f1793e26d7b144f603570e4c0ab6d1a02
-EBUILD uim-1.5.2.ebuild 5163 RMD160 f94b3fe86697d6505ec1247388997ff2e17706cd SHA1 27cf1a94b377f87f7bb508a35448d074fe9155b4 SHA256 5f369466e2b28b0efed6e474ad2b2116213baf1ef0296ccf8e9419ea700e99f5
-MISC ChangeLog 25496 RMD160 483d523969fe6b05cf7f47c0b3d185c55dd0853f SHA1 0e39b4e02abcd93a7d5f0b6100cc0178895a16c7 SHA256 f2ad7b8905f1787d6ee5946bd916cfb404541e56b45a4c5595b995f529a59ce1
+EBUILD uim-1.5.2-r1.ebuild 5122 RMD160 b1318cda96ebff57a1af6bbcc41d06417e44acf1 SHA1 844d9331abf32ddb3fa2333c51477e47100fd5e6 SHA256 9b8354b8fab99042fd9ef48acd5a3ca2e9c6af8400795aa80c24135000588096
+MISC ChangeLog 25685 RMD160 453a30a55d68106cf077c1ea3d721dac933c8f7b SHA1 bf165f2cbaa3693352a2af888e836356a9909d32 SHA256 5f2cd42e0a048f96d66c4da36c03ee76a6b98abfb8e24a04511d8968bb2884e8
 MISC metadata.xml 815 RMD160 012fd0ff539fa5f7d943f2b2b955af2b1a51579f SHA1 1c035765a6908e1b767689d899a68876e44dc772 SHA256 a1f64b1559c0291cb60d8783c53482f9235f03802984816c827255f92d171d5e
diff --git a/app-i18n/uim/uim-1.5.1.ebuild b/app-i18n/uim/uim-1.5.2-r1.ebuild
index a09314ee0240..e40fb7c68bec 100644
--- a/app-i18n/uim/uim-1.5.1.ebuild
+++ b/app-i18n/uim/uim-1.5.2-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.5.1.ebuild,v 1.4 2008/07/27 19:40:16 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.5.2-r1.ebuild,v 1.1 2008/08/09 00:12:53 matsuu Exp $
 
 EAPI=1
-inherit autotools eutils qt3 multilib elisp-common flag-o-matic
+inherit eutils qt3 multilib elisp-common flag-o-matic
 
 MY_P="${P/_/-}"
 DESCRIPTION="Simple, secure and flexible input method library"
@@ -70,12 +70,6 @@ pkg_setup() {
 	GTK2_CONFDIR=${GTK2_CONFDIR:=/etc/gtk-2.0/}
 }
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	elibtoolize
-}
-
 src_compile() {
 	local myconf
 
@@ -124,7 +118,7 @@ src_compile() {
 		$(use_enable ncurses fep) \
 		$(use_enable nls) \
 		$(use_with qt3 qt-immodule) \
-		$(use_with qt4 qt-immodule) \
+		$(use_with qt4 qt4-immodule) \
 		$(use_with truetype xft) \
 		${myconf} || die "econf failed"
 	emake -j1 || die "emake failed"
@@ -137,7 +131,7 @@ src_compile() {
 
 src_install() {
 	# parallel make install borks, bug #222677
-	emake -j1 DESTDIR="${D}" install || die "make install failed"
+	emake -j1 INSTALL_ROOT="${D}" DESTDIR="${D}" install || die "make install failed"
 
 	dodoc AUTHORS ChangeLog* NEWS README RELNOTE
 	if use emacs; then
diff --git a/app-i18n/uim/uim-1.5.2.ebuild b/app-i18n/uim/uim-1.5.2.ebuild
deleted file mode 100644
index ea59f6f923de..000000000000
--- a/app-i18n/uim/uim-1.5.2.ebuild
+++ /dev/null
@@ -1,187 +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/uim/uim-1.5.2.ebuild,v 1.1 2008/08/04 15:36:22 matsuu Exp $
-
-EAPI=1
-inherit autotools eutils qt3 multilib elisp-common flag-o-matic
-
-MY_P="${P/_/-}"
-DESCRIPTION="Simple, secure and flexible input method library"
-HOMEPAGE="http://code.google.com/p/uim/"
-SRC_URI="http://uim.googlecode.com/files/${MY_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 m17n-lib ncurses nls prime qt3
-qt4 truetype unicode X linguas_zh_CN 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? ( || ( app-i18n/anthy app-i18n/anthy-ss ) )
-	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 )
-	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 )
-	qt4? ( || ( x11-libs/qt-core:4 =x11-libs/qt-4.3*:4 ) )
-	!app-i18n/uim-svn
-	!<app-i18n/prime-0.9.4"
-
-DEPEND="${RDEPEND}
-	X? ( x11-proto/xextproto
-		x11-proto/xproto )
-	nls? ( sys-devel/gettext )"
-
-RDEPEND="${RDEPEND}
-	X? (
-		media-fonts/font-sony-misc
-		linguas_zh_CN? ( media-fonts/font-isas-misc )
-		linguas_ja? ( media-fonts/font-jis-misc )
-		linguas_ko? ( media-fonts/font-daewoo-misc )
-	)"
-#		linguas_zh_TW? ( media-fonts/taipeifonts )
-
-S="${WORKDIR}/${MY_P}"
-
-SITEFILE=50${PN}-gentoo.el
-
-pkg_setup() {
-	if use qt3 && ! built_with_use =x11-libs/qt-3* immqt-bc && ! built_with_use =x11-libs/qt-3* immqt; then
-		eerror "To support qt3 in this package is required to have"
-		eerror "=x11-libs/qt-3* compiled with immqt-bc(recommended) or immqt USE flag."
-		die "Please reemerge =x11-libs/qt-3* with USE=\"immqt-bc\" or USE=\"immqt\"."
-
-	fi
-	# 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}"
-	elibtoolize
-}
-
-src_compile() {
-	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 || 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 qt3 || use qt4 ; then
-		myconf="${myconf} --with-qt"
-	else
-		myconf="${myconf} --without-qt"
-	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 qt3 qt-immodule) \
-		$(use_with qt4 qt-immodule) \
-		$(use_with truetype xft) \
-		${myconf} || die "econf failed"
-	emake -j1 || die "emake failed"
-
-	if use emacs; then
-		cd emacs
-		elisp-comp *.el || die "elisp-comp failed"
-	fi
-}
-
-src_install() {
-	# parallel make install borks, bug #222677
-	emake -j1 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
-}