Version bumped. Removed virtual/x11.

Package-Manager: portage-2.1.2.9

5 files changed, 149 insertions, 14 deletions

diff --git a/app-i18n/scim/ChangeLog b/app-i18n/scim/ChangeLog
index c4dfc8356f6c..2caa1d2b53b1 100644
--- a/app-i18n/scim/ChangeLog
+++ b/app-i18n/scim/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-i18n/scim
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim/ChangeLog,v 1.118 2007/04/24 15:37:19 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim/ChangeLog,v 1.119 2007/07/07 03:49:50 matsuu Exp $
+
+*scim-1.4.7 (07 Jul 2007)
+
+  07 Jul 2007; MATSUU Takuto <matsuu@gentoo.org> scim-1.4.6.ebuild,
+  +scim-1.4.7.ebuild:
+  Version bumped.
+  Removed virtual/x11.
 
   24 Apr 2007; MATSUU Takuto <matsuu@gentoo.org>
   -files/1.4.4-nodoxygen.patch, -scim-1.4.4.ebuild, -scim-1.4.5.ebuild:
diff --git a/app-i18n/scim/Manifest b/app-i18n/scim/Manifest
index 2179c0f82071..a3c466492bd0 100644
--- a/app-i18n/scim/Manifest
+++ b/app-i18n/scim/Manifest
@@ -8,18 +8,23 @@ RMD160 609baff78ef99ab6895e17a18a20dfc9a4c21a08 files/scim-1.4.5-imengine.patch
 SHA256 bb4eb7e0e0a06dc2ed9d99703b5d7f63b1356a2ffd59a4736caa3c6a75bf11b6 files/scim-1.4.5-imengine.patch 869
 DIST scim-1.4.5.tar.gz 3157124 RMD160 c4ea3c3bb06cdedb29ec32f8cabb0d32330dd6f6 SHA1 b9dd07a49abdba6d86385c92f8103ebf6df7f341 SHA256 3565ecbe7f093254179d8fd216e6a54644859b59a5e5daf48a6c9cff3d5be481
 DIST scim-1.4.6.tar.gz 3112494 RMD160 2af7ec3a23ac0c3c553c98a1517b96a66cb2465f SHA1 3b8d26ff5a4ebab1ca90928d0363d2d2b0028ccf SHA256 578e605b9549c9a2f44ca31508ad00f1cc6456ab929b89df1593350618c2263f
+DIST scim-1.4.7.tar.gz 3074844 RMD160 156867707f3c40577905c79c0159366c48791c52 SHA1 e9b3e119e29e24f41cb4deda66fc27e8ea4ef938 SHA256 e6f5476078dc0174407da934682a8956e93a16c6a279f2af51b5c40234fecf9b
 EBUILD scim-1.4.5-r1.ebuild 3337 RMD160 62cff3b1d9f95f6e082c836a70c7b53a3521cc97 SHA1 ad3a3cfd5ced56e55029a17406337c3270fefcd8 SHA256 6e53ba602fc4724e5a376eb5a7ed4bbf4ef5b39fcf3916913186d8cd68508653
 MD5 4bf42528efd7656d16fb9a951019b9d8 scim-1.4.5-r1.ebuild 3337
 RMD160 62cff3b1d9f95f6e082c836a70c7b53a3521cc97 scim-1.4.5-r1.ebuild 3337
 SHA256 6e53ba602fc4724e5a376eb5a7ed4bbf4ef5b39fcf3916913186d8cd68508653 scim-1.4.5-r1.ebuild 3337
-EBUILD scim-1.4.6.ebuild 3240 RMD160 054cda92f414226beb3945c8ba46c0039a374a44 SHA1 539896bd0aaff3d02752b81a73846a7e54fe24dc SHA256 ee7fa40e9b0b5ab880b54a0442e419d238b03a41edd48762b8adc5554c99f227
-MD5 22ba3d5effd7047b356027b49399e2af scim-1.4.6.ebuild 3240
-RMD160 054cda92f414226beb3945c8ba46c0039a374a44 scim-1.4.6.ebuild 3240
-SHA256 ee7fa40e9b0b5ab880b54a0442e419d238b03a41edd48762b8adc5554c99f227 scim-1.4.6.ebuild 3240
-MISC ChangeLog 15863 RMD160 71fc6fd6f4d5ddee33ce90ae9c5c770758c9a806 SHA1 1084236105ea5c0f83b8d439cf5479cae5e97989 SHA256 205ace0d508b1b1fbee0e982093e94617bdf050b2e1a241bb4fbb620dfc23d40
-MD5 7d7e6e73e6b9fe6f8ceadb4ea6a18a6b ChangeLog 15863
-RMD160 71fc6fd6f4d5ddee33ce90ae9c5c770758c9a806 ChangeLog 15863
-SHA256 205ace0d508b1b1fbee0e982093e94617bdf050b2e1a241bb4fbb620dfc23d40 ChangeLog 15863
+EBUILD scim-1.4.6.ebuild 3179 RMD160 f7062c2c9676a97bf1497b1d5397eeff27d330de SHA1 439b818aac44445938e80a74bb791b9183700024 SHA256 99a16d3c946827052e221626be4974e4dd03fb74459e3e7770e43a31bb0ab31c
+MD5 b4469f4622dbfa720d2534b6bebefbd4 scim-1.4.6.ebuild 3179
+RMD160 f7062c2c9676a97bf1497b1d5397eeff27d330de scim-1.4.6.ebuild 3179
+SHA256 99a16d3c946827052e221626be4974e4dd03fb74459e3e7770e43a31bb0ab31c scim-1.4.6.ebuild 3179
+EBUILD scim-1.4.7.ebuild 3179 RMD160 d0f863b76c96c8b641fbec9112d3c4cfb8c945cc SHA1 afeef8af3da41303b7fb7e1608b42f44722d131e SHA256 2a31ef2b79d50a8a9986f038aa9f99d9e0a0d49a38cb9221fe8a4e22e8c65bae
+MD5 a066b8863edc41b5e1eab39f35645c3b scim-1.4.7.ebuild 3179
+RMD160 d0f863b76c96c8b641fbec9112d3c4cfb8c945cc scim-1.4.7.ebuild 3179
+SHA256 2a31ef2b79d50a8a9986f038aa9f99d9e0a0d49a38cb9221fe8a4e22e8c65bae scim-1.4.7.ebuild 3179
+MISC ChangeLog 16022 RMD160 d566dff7715b8588fb6d4f93b2db17fc4765797b SHA1 25ef0ab68d5a807a551783cf6e00d0a85d87a60d SHA256 7265f018f80285c711cd2e40f66f53570e1ce20d362622abff98926a921582b7
+MD5 195b2294d819b3c770db13861c561041 ChangeLog 16022
+RMD160 d566dff7715b8588fb6d4f93b2db17fc4765797b ChangeLog 16022
+SHA256 7265f018f80285c711cd2e40f66f53570e1ce20d362622abff98926a921582b7 ChangeLog 16022
 MISC metadata.xml 156 RMD160 8adcf0a760a605cd42501f53097ca3a1c4e8daad SHA1 8ccc2b0f20743002b783b1f7b5162c71f7f54c2e SHA256 815820f2e5866d973fafb29a8b8027d022ccea43023309b6dc294cf077598215
 MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
 RMD160 8adcf0a760a605cd42501f53097ca3a1c4e8daad metadata.xml 156
@@ -30,3 +35,6 @@ SHA256 3d5d230a45a771da3de069a4973c248a9f6e58330c5b6f67fe3754c87ea10012 files/di
 MD5 ba0f3618149e64c23c848e50f0af3aae files/digest-scim-1.4.6 235
 RMD160 bcc96581711c7a74bbeee290e3ee2302f622d128 files/digest-scim-1.4.6 235
 SHA256 a3cd20dc7002071684251ea98452cb6d56aab6b6da990a65a48978389ad5df82 files/digest-scim-1.4.6 235
+MD5 1760de699eb3957ef985a33609317009 files/digest-scim-1.4.7 235
+RMD160 034504989a52c7e9a11919b6fa511266e6ad3631 files/digest-scim-1.4.7 235
+SHA256 3dde50cdb1c1051327cc0bf75855e4537a49232f362ceecd37707de63a2e2f1e files/digest-scim-1.4.7 235
diff --git a/app-i18n/scim/files/digest-scim-1.4.7 b/app-i18n/scim/files/digest-scim-1.4.7
new file mode 100644
index 000000000000..46adf5ddabd2
--- /dev/null
+++ b/app-i18n/scim/files/digest-scim-1.4.7
@@ -0,0 +1,3 @@
+MD5 b76a725e5d5d83fe111ba23bf8b01adc scim-1.4.7.tar.gz 3074844
+RMD160 156867707f3c40577905c79c0159366c48791c52 scim-1.4.7.tar.gz 3074844
+SHA256 e6f5476078dc0174407da934682a8956e93a16c6a279f2af51b5c40234fecf9b scim-1.4.7.tar.gz 3074844
diff --git a/app-i18n/scim/scim-1.4.6.ebuild b/app-i18n/scim/scim-1.4.6.ebuild
index b08f7783654f..d732ce7399cc 100644
--- a/app-i18n/scim/scim-1.4.6.ebuild
+++ b/app-i18n/scim/scim-1.4.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim/scim-1.4.6.ebuild,v 1.2 2007/04/24 01:55:35 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim/scim-1.4.6.ebuild,v 1.3 2007/07/07 03:49:50 matsuu Exp $
 
 WANT_AUTOMAKE=latest
 WANT_AUTOCONF=latest
@@ -16,22 +16,22 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="doc gtk kde qt3"
 
-RDEPEND="|| ( x11-libs/libX11 virtual/x11 )
+RDEPEND="x11-libs/libX11
 	gtk? ( >=x11-libs/gtk+-2
 		>=dev-libs/atk-1
 		>=x11-libs/pango-1
 		>=dev-libs/glib-2 )
 	!app-i18n/scim-cvs"
 DEPEND="${RDEPEND}
-	|| ( x11-libs/libXt virtual/x11 )
+	x11-libs/libXt
 	doc? ( app-doc/doxygen
 		app-text/docbook-xsl-stylesheets )
 	dev-lang/perl
 	dev-util/pkgconfig
 	>=dev-util/intltool-0.33"
 
-PDEPEND="!hppa? ( kde? ( app-i18n/skim ) )
-	!alpha? ( qt3? ( || ( app-i18n/scim-qtimm app-i18n/scim-bridge ) ) )"
+PDEPEND="kde? ( app-i18n/skim )
+	qt3? ( || ( app-i18n/scim-qtimm app-i18n/scim-bridge ) )"
 
 get_gtk_confdir() {
 	if use amd64 || ( [ "${CONF_LIBDIR}" == "lib32" ] && use x86 ) ; then
diff --git a/app-i18n/scim/scim-1.4.7.ebuild b/app-i18n/scim/scim-1.4.7.ebuild
new file mode 100644
index 000000000000..c0c88da1ab7c
--- /dev/null
+++ b/app-i18n/scim/scim-1.4.7.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim/scim-1.4.7.ebuild,v 1.1 2007/07/07 03:49:50 matsuu Exp $
+
+WANT_AUTOMAKE=latest
+WANT_AUTOCONF=latest
+
+inherit eutils flag-o-matic autotools
+
+DESCRIPTION="Smart Common Input Method (SCIM) is an Input Method (IM) development platform"
+HOMEPAGE="http://www.scim-im.org/"
+SRC_URI="mirror://sourceforge/scim/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="doc gtk kde qt3"
+
+RDEPEND="x11-libs/libX11
+	gtk? ( >=x11-libs/gtk+-2
+		>=dev-libs/atk-1
+		>=x11-libs/pango-1
+		>=dev-libs/glib-2 )
+	!app-i18n/scim-cvs"
+DEPEND="${RDEPEND}
+	x11-libs/libXt
+	doc? ( app-doc/doxygen
+		app-text/docbook-xsl-stylesheets )
+	dev-lang/perl
+	dev-util/pkgconfig
+	>=dev-util/intltool-0.33"
+
+PDEPEND="kde? ( app-i18n/skim )
+	qt3? ( || ( app-i18n/scim-qtimm app-i18n/scim-bridge ) )"
+
+get_gtk_confdir() {
+	if use amd64 || ( [ "${CONF_LIBDIR}" == "lib32" ] && use x86 ) ; then
+		echo "/etc/gtk-2.0/${CHOST}"
+	else
+		echo "/etc/gtk-2.0"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}"
+
+	if use doc ; then
+		local xsl=$(ls -1d /usr/share/sgml/docbook/xsl-stylesheets* | head -n 1)
+		sed -i -e "s:/usr/share/sgml/docbook/xsl-stylesheets:${xsl}:" configure.ac || die
+	fi
+	eautoreconf
+}
+
+src_compile() {
+	local myconf
+	# bug #83625
+	filter-flags -fvisibility-inlines-hidden
+	filter-flags -fvisibility=hidden
+
+	# We cannot use "use_enable"
+	if ! use gtk ; then
+		myconf="${myconf} --disable-panel-gtk"
+		myconf="${myconf} --disable-setup-ui"
+		myconf="${myconf} --disable-gtk2-immodule"
+	fi
+
+	econf \
+		$(use_with doc doxygen) \
+		--enable-ld-version-script \
+		${myconf} || die
+	emake || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc README AUTHORS ChangeLog docs/developers docs/scim.cfg
+	use doc && dohtml -r docs/html/*
+}
+
+pkg_postinst() {
+	elog
+	elog "To use SCIM with both GTK2 and XIM, you should use the following"
+	elog "in your user startup scripts such as .gnomerc or .xinitrc:"
+	elog
+	elog "LANG='your_language' scim -d"
+	elog "export XMODIFIERS=@im=SCIM"
+	elog "export GTK_IM_MODULE=\"scim\""
+	elog "export QT_IM_MODULE=\"scim\""
+	elog
+	elog "where 'your_language' can be zh_CN, zh_TW, ja_JP.eucJP or any other"
+	elog "UTF-8 locale such as en_US.UTF-8 or ja_JP.UTF-8"
+	elog
+	elog "If you prefer KDE/Qt interface, try emerge app-i18n/skim."
+	elog
+	elog "To use Chinese input methods:"
+	elog "	# emerge app-i18n/scim-tables app-i18n/scim-pinyin"
+	elog "To use Korean input methods:"
+	elog "	# emerge app-i18n/scim-hangul"
+	elog "To use Japanese input methods:"
+	elog "	# emerge app-i18n/scim-anthy"
+	elog "To use various input methods (more than 30 languages):"
+	elog "	# emerge app-i18n/scim-m17n"
+	elog
+	ewarn
+	ewarn "If you upgraded from scim-1.2.x or scim-1.0.x, you should remerge all SCIM modules."
+	ewarn
+	epause 10
+
+	[ -x /usr/bin/gtk-query-immodules-2.0 ] && gtk-query-immodules-2.0 > "${ROOT}$(get_gtk_confdir)/gtk.immodules"
+}
+
+pkg_postrm() {
+
+	[ -x /usr/bin/gtk-query-immodules-2.0 ] && gtk-query-immodules-2.0 > "${ROOT}$(get_gtk_confdir)/gtk.immodules"
+}