summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMamoru Komachi <usata@gentoo.org>2004-09-09 03:50:34 +0000
committerMamoru Komachi <usata@gentoo.org>2004-09-09 03:50:34 +0000
commitc7cff29eb9d1ee429bbd2a4a3ad226fd1da52496 (patch)
treeb11135ad24433621a61731f3945af2f30c1ba07e /app-i18n/scim
parentinitial commit of 2004.3 profile (diff)
downloadgentoo-2-c7cff29eb9d1ee429bbd2a4a3ad226fd1da52496.tar.gz
gentoo-2-c7cff29eb9d1ee429bbd2a4a3ad226fd1da52496.tar.bz2
gentoo-2-c7cff29eb9d1ee429bbd2a4a3ad226fd1da52496.zip
Fixed has_gtk. Thanks to kenzelma@stud.uni-frankfurt.de. This closes bug #63351.
Diffstat (limited to 'app-i18n/scim')
-rw-r--r--app-i18n/scim/ChangeLog9
-rw-r--r--app-i18n/scim/Manifest2
-rw-r--r--app-i18n/scim/files/digest-scim-1.0.0-r11
-rw-r--r--app-i18n/scim/files/digest-scim-1.0.0-r2 (renamed from app-i18n/scim/files/digest-scim-1.0.0)0
-rw-r--r--app-i18n/scim/scim-1.0.0-r2.ebuild (renamed from app-i18n/scim/scim-1.0.0-r1.ebuild)4
-rw-r--r--app-i18n/scim/scim-1.0.0.ebuild105
6 files changed, 12 insertions, 109 deletions
diff --git a/app-i18n/scim/ChangeLog b/app-i18n/scim/ChangeLog
index 553f30a1dd8d..065db331ce64 100644
--- a/app-i18n/scim/ChangeLog
+++ b/app-i18n/scim/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for app-i18n/scim
# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim/ChangeLog,v 1.35 2004/09/08 15:25:24 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim/ChangeLog,v 1.36 2004/09/09 03:50:34 usata Exp $
+
+*scim-1.0.0-r2 (09 Sep 2004)
+
+ 09 Sep 2004; Mamoru KOMACHI <usata@gentoo.org> -scim-1.0.0-r1.ebuild,
+ +scim-1.0.0-r2.ebuild, -scim-1.0.0.ebuild:
+ Fixed has_gtk. Thanks to kenzelma@stud.uni-frankfurt.de.
+ This closes bug #63351.
*scim-1.0.0-r1 (08 Sep 2004)
diff --git a/app-i18n/scim/Manifest b/app-i18n/scim/Manifest
index 12a26ba77f65..4eaae59948ad 100644
--- a/app-i18n/scim/Manifest
+++ b/app-i18n/scim/Manifest
@@ -3,9 +3,11 @@ MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
MD5 f5b0471076ccc3da923492a094af4b55 scim-0.9.7.ebuild 2150
MD5 7f5fd7da54788b9a26df05995d60607e scim-1.0.0-r1.ebuild 3134
MD5 7b985fea17c4b2e950d71324bccd52d8 scim-1.0.0.ebuild 3008
+MD5 e7fc64ecb89798b4620df7046890e92d scim-1.0.0-r2.ebuild 3135
MD5 662533a4f21a352e5f1194afd683fa98 scim-0.99.8.ebuild 2812
MD5 4b50ec45c69e938123b22d03e8049859 files/digest-scim-0.9.7 63
MD5 ce0f75383c966331dfcad6088ec9daba files/digest-scim-1.0.0-r1 63
+MD5 ce0f75383c966331dfcad6088ec9daba files/digest-scim-1.0.0-r2 63
MD5 95e4d06699356649f034690e3c3e870e files/scim-0.6.1-gtk2immodule.patch 545
MD5 ce0f75383c966331dfcad6088ec9daba files/digest-scim-1.0.0 63
MD5 da242924a42bdb73b70898a598f6ad07 files/digest-scim-0.99.8 64
diff --git a/app-i18n/scim/files/digest-scim-1.0.0-r1 b/app-i18n/scim/files/digest-scim-1.0.0-r1
deleted file mode 100644
index e518067ee194..000000000000
--- a/app-i18n/scim/files/digest-scim-1.0.0-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 810741700b2ea73467eb3de6b61f3330 scim-1.0.0.tar.gz 2309045
diff --git a/app-i18n/scim/files/digest-scim-1.0.0 b/app-i18n/scim/files/digest-scim-1.0.0-r2
index e518067ee194..e518067ee194 100644
--- a/app-i18n/scim/files/digest-scim-1.0.0
+++ b/app-i18n/scim/files/digest-scim-1.0.0-r2
diff --git a/app-i18n/scim/scim-1.0.0-r1.ebuild b/app-i18n/scim/scim-1.0.0-r2.ebuild
index 98f7d05196a1..614de9c163fb 100644
--- a/app-i18n/scim/scim-1.0.0-r1.ebuild
+++ b/app-i18n/scim/scim-1.0.0-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim/scim-1.0.0-r1.ebuild,v 1.1 2004/09/08 15:25:24 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim/scim-1.0.0-r2.ebuild,v 1.1 2004/09/09 03:50:34 usata Exp $
inherit gnome2 eutils
@@ -39,7 +39,7 @@ SCROLLKEEPER_UPDATE="0"
USE_DESTDIR="1"
has_gtk() {
- if has_version '>=x11-libs/gtk-2' ; then
+ if has_version '>=x11-libs/gtk+-2' ; then
true
else
false
diff --git a/app-i18n/scim/scim-1.0.0.ebuild b/app-i18n/scim/scim-1.0.0.ebuild
deleted file mode 100644
index 930e2aed01a4..000000000000
--- a/app-i18n/scim/scim-1.0.0.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim/scim-1.0.0.ebuild,v 1.1 2004/09/07 13:42:41 usata Exp $
-
-inherit gnome2 eutils
-
-DESCRIPTION="Smart Common Input Method (SCIM) is a Input Method (IM) development platform"
-HOMEPAGE="http://freedesktop.org/~suzhe/"
-SRC_URI="http://freedesktop.org/~suzhe/sources/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~alpha ~ppc ~amd64"
-IUSE="gnome gtk"
-
-RDEPEND="virtual/x11
- gnome? ( >=gnome-base/gconf-1.2
- >=dev-libs/libxml2-2.5
- >=gnome-base/orbit-2.8 )
- gtk? ( >=x11-libs/gtk+-2
- >=dev-libs/atk-1
- >=x11-libs/pango-1
- >=dev-libs/glib-2 )
- !app-i18n/scim-cvs
- !<app-i18n/scim-chinese-0.4.0"
-DEPEND="${RDEPEND}
- dev-lang/perl"
-PDEPEND="|| ( app-i18n/scim-m17n
- app-i18n/scim-uim
- app-i18n/scim-chinese
- app-i18n/scim-hangul
- app-i18n/scim-tables )"
-
-ELTCONF="--reverse-deps"
-SCROLLKEEPER_UPDATE="0"
-USE_DESTDIR="1"
-
-has_gtk() {
- if has_version '>=x11-libs/gtk-2' ; then
- true
- else
- false
- fi
-}
-
-src_unpack() {
- unpack ${A}
- # use scim gtk2 IM module only for chinese/japanese/korean
- EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/${PN}-0.6.1-gtk2immodule.patch
-
- # workaround for problematic makefile
- sed -i -e "s:^\(scim.*LDFLAGS.*\):\1 -ldl:g" \
- ${S}/src/Makefile.* || die
- sed -i -e "s:^\(scim_make_table_LDFLAGS.*\):\1 -ldl:" \
- ${S}/modules/IMEngine/Makefile.* || die
- sed -i -e "s:^LDFLAGS = :LDFLAGS = -ldl :g" \
- -e "s:^\(test.*LDFLAGS.*\):\1 -ldl:g" \
- ${S}/tests/Makefile.* || die
- sed -i -e "s:GTK_VERSION=2.3.5:GTK_VERSION=2.4.0:" \
- ${S}/configure || die
-}
-
-src_compile() {
- use gnome || G2CONF="${G2CONF} --disable-config-gconf"
- use gtk || G2CONF="${G2CONF} --disable-panel-gtk --disable-setup-ui"
- has_gtk || G2CONF="${G2CONF} --disable-gtk2-immodule"
- gnome2_src_compile
-}
-
-src_install() {
- gnome2_src_install || die "install failed"
- dodoc README AUTHORS ChangeLog docs/developers docs/scim.cfg
- dohtml -r docs/html/*
-}
-
-pkg_postinst() {
- einfo
- einfo "To use SCIM with both GTK2 and XIM, you should use the following"
- einfo "in your user startup scripts such as .gnomerc or .xinitrc:"
- einfo
- einfo "LANG='your_language' scim -d"
- einfo "export XMODIFIERS=@im=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"
- einfo
- einfo "If you prefer KDE/Qt interface, try emerge app-i18n/skim."
- einfo
- einfo "To use Chinese input methods:"
- einfo " # emerge app-i18n/scim-tables app-i18n/scim-chinese"
- einfo "To use Korean input methods:"
- einfo " # emerge app-i18n/scim-hangul"
- einfo "To use Japanese input methods:"
- einfo " # emerge app-i18n/scim-uim"
- einfo "To use various input methods (more than 30 languages):"
- einfo " # emerge app-i18n/scim-m17n"
- einfo
-
- has_gtk && gtk-query-immodules-2.0 > ${ROOT}etc/gtk-2.0/gtk.immodules
-}
-
-pkg_postrm() {
-
- has_gtk && gtk-query-immodules-2.0 > ${ROOT}etc/gtk-2.0/gtk.immodules
-}