Version bumped.

(Portage version: 2.0.51.22-r2)

6 files changed, 28 insertions, 34 deletions

diff --git a/app-i18n/scim/ChangeLog b/app-i18n/scim/ChangeLog
index 5d4e51d3ade4..f3c2741f2bd1 100644
--- a/app-i18n/scim/ChangeLog
+++ b/app-i18n/scim/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-i18n/scim
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim/ChangeLog,v 1.73 2005/08/03 20:01:24 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim/ChangeLog,v 1.74 2005/08/11 13:03:44 usata Exp $
+
+*scim-1.4.1 (11 Aug 2005)
+
+  11 Aug 2005; Mamoru KOMACHI <usata@gentoo.org>
+  -files/scim-0.6.1-gtk2immodule.patch, -scim-1.2.0.ebuild,
+  +scim-1.4.1.ebuild:
+  Version bumped.
 
   03 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> scim-1.2.3.ebuild:
   Stable on alpha.
diff --git a/app-i18n/scim/Manifest b/app-i18n/scim/Manifest
index 5c4411138ae8..d21242c3672e 100644
--- a/app-i18n/scim/Manifest
+++ b/app-i18n/scim/Manifest
@@ -1,23 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 b459d1b1ca750e518154b60b58dae512 ChangeLog 10547
-MD5 4ccb50876b8b690cd906e2e802216e37 scim-1.2.2.ebuild 2593
 MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
+MD5 4ccb50876b8b690cd906e2e802216e37 scim-1.2.2.ebuild 2593
+MD5 7eef5321daf2fa2d91862b2e24c928f1 scim-1.4.1.ebuild 2766
+MD5 7301ddde378c8e3080f8246752268ece scim-1.2.3.ebuild 2594
 MD5 da9127a01f569fefe5d56ba16e0ac2e3 scim-1.3.3.ebuild 2766
 MD5 7eef5321daf2fa2d91862b2e24c928f1 scim-1.4.0.ebuild 2766
-MD5 3195763192a325c08c4bb3c5d9691715 scim-1.2.0.ebuild 2488
-MD5 7301ddde378c8e3080f8246752268ece scim-1.2.3.ebuild 2594
-MD5 912ff950152ffa12347d58b90732354b files/digest-scim-1.4.0 63
-MD5 82eea24cbbcb316453e8ba41d946532d files/digest-scim-1.3.3 63
-MD5 84ed66110ce84283b196dd1a5c918400 files/digest-scim-1.2.0 63
-MD5 99b3eee4a8cc881197b9b4ecb14a60d4 files/digest-scim-1.2.3 63
 MD5 d0dc438b971197894dc1b298d2101311 files/digest-scim-1.2.2 63
+MD5 dd0aa4fefdd378f8a2e4fee1d27863fd files/digest-scim-1.4.1 63
+MD5 99b3eee4a8cc881197b9b4ecb14a60d4 files/digest-scim-1.2.3 63
 MD5 95e4d06699356649f034690e3c3e870e files/scim-0.6.1-gtk2immodule.patch 545
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFC8SKvKf2g/qXtneoRAvrcAKC+oCuR9W9uqhVI1Sv1Rz8Ce+jfggCgn1G+
-yD72z0EKU02GCJFV50sghH8=
-=k/UI
------END PGP SIGNATURE-----
+MD5 82eea24cbbcb316453e8ba41d946532d files/digest-scim-1.3.3 63
+MD5 912ff950152ffa12347d58b90732354b files/digest-scim-1.4.0 63
diff --git a/app-i18n/scim/files/digest-scim-1.2.0 b/app-i18n/scim/files/digest-scim-1.2.0
deleted file mode 100644
index 211b3365d6e7..000000000000
--- a/app-i18n/scim/files/digest-scim-1.2.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 af0882ad74769a465be0674abe76279c scim-1.2.0.tar.gz 2223147
diff --git a/app-i18n/scim/files/digest-scim-1.4.1 b/app-i18n/scim/files/digest-scim-1.4.1
new file mode 100644
index 000000000000..20abfcaca7ee
--- /dev/null
+++ b/app-i18n/scim/files/digest-scim-1.4.1
@@ -0,0 +1 @@
+MD5 8615e96ecb55fde2876fc71b9287dd31 scim-1.4.1.tar.gz 2576162
diff --git a/app-i18n/scim/files/scim-0.6.1-gtk2immodule.patch b/app-i18n/scim/files/scim-0.6.1-gtk2immodule.patch
deleted file mode 100644
index 55f45c4bc061..000000000000
--- a/app-i18n/scim/files/scim-0.6.1-gtk2immodule.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- scim-0.6.1/extras/gtk2_immodule/imscim.cpp	2003-03-31 05:01:25.000000000 +0100
-+++ scim-0.6.1/extras/gtk2_immodule/imscim.cpp.new	2003-07-07 02:25:00.000000000 +0100
-@@ -33,7 +33,7 @@
-   "SCIM Input Method",		/* Human readable name */
-   "scim",			/* Translation domain */
-   SCIM_LOCALEDIR,		/* Dir for bindtextdomain (not strictly needed for "gtk+") */
--  "*"				/* Languages for which this module is the default */
-+  "ko:ja:zh"			/* Languages for which this module is the default */
- };
- 
- static const GtkIMContextInfo *info_list[] = {
diff --git a/app-i18n/scim/scim-1.2.0.ebuild b/app-i18n/scim/scim-1.4.1.ebuild
index 387cef037b30..546e7437e7f7 100644
--- a/app-i18n/scim/scim-1.2.0.ebuild
+++ b/app-i18n/scim/scim-1.4.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim/scim-1.2.0.ebuild,v 1.7 2005/07/31 04:59:55 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim/scim-1.4.1.ebuild,v 1.1 2005/08/11 13:03:44 usata Exp $
 
-inherit eutils
+inherit eutils flag-o-matic
 
 DESCRIPTION="Smart Common Input Method (SCIM) is an Input Method (IM) development platform"
 HOMEPAGE="http://www.scim-im.org/"
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/scim/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 alpha ppc amd64 ~sparc ppc64"
+KEYWORDS="~x86 ~alpha ~ppc ~amd64 ~sparc ~ppc64"
 IUSE="gtk immqt immqt-bc"
 
 GTK_DEPEND=">=x11-libs/gtk+-2
@@ -43,6 +43,12 @@ get_gtk_confdir() {
 }
 
 src_compile() {
+	# bug #83625
+	filter-flags -fvisibility-inlines-hidden
+	filter-flags -fvisibility=hidden
+
+	sed -i -e '/Languages/s/"\*"/"ko:ja:zh"/' extras/gtk2_immodule/imscim.cpp || die
+
 	use gtk || use immqt || use immqt-bc || myconf="${myconf} --disable-panel-gtk --disable-setup-ui"
 	has_gtk || myconf="${myconf} --disable-gtk2-immodule"
 	econf ${myconf} || die
@@ -62,6 +68,8 @@ pkg_postinst() {
 	einfo
 	einfo "LANG='your_language' scim -d"
 	einfo "export XMODIFIERS=@im=SCIM"
+	einfo "export GTK_IM_MODULE=\"scim\""
+	einfo "export QT_IM_MODULE=\"scim\""
 	einfo
 	einfo "where 'your_language' can be zh_CN, zh_TW, ja_JP.eucJP or any other"
 	einfo "UTF-8 locale such as en_US.UTF-8 or ja_JP.UTF-8"
@@ -78,7 +86,7 @@ pkg_postinst() {
 	einfo "	# emerge app-i18n/scim-m17n"
 	einfo
 	ewarn
-	ewarn "If you are upgrading from scim-1.0.x, you should remerge all SCIM modules."
+	ewarn "If you upgraded from scim-1.2.x or scim-1.0.x, you should remerge all SCIM modules."
 	ewarn
 	epause 10