Version bumped.

(Portage version: 2.0.51.16)

5 files changed, 36 insertions, 43 deletions

diff --git a/app-i18n/scim/ChangeLog b/app-i18n/scim/ChangeLog
index 3be0c4d64364..71a2876186b3 100644
--- a/app-i18n/scim/ChangeLog
+++ b/app-i18n/scim/ChangeLog
@@ -1,6 +1,12 @@
 # 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.48 2005/02/10 11:43:05 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim/ChangeLog,v 1.49 2005/03/01 15:52:03 usata Exp $
+
+*scim-1.2.0 (02 Mar 2005)
+
+  02 Mar 2005; Mamoru KOMACHI <usata@gentoo.org> -scim-1.0.1.ebuild,
+  +scim-1.2.0.ebuild:
+  Version bumped.
 
 *scim-1.1.3 (10 Feb 2005)
 
diff --git a/app-i18n/scim/Manifest b/app-i18n/scim/Manifest
index 27e91e4f952c..e193dba5fc70 100644
--- a/app-i18n/scim/Manifest
+++ b/app-i18n/scim/Manifest
@@ -1,11 +1,11 @@
-MD5 3d6280a59a7ae3d91070c423317184d3 scim-1.0.1-r1.ebuild 3309
 MD5 48e58c9b41a7e78597ccc7ff0189746c ChangeLog 7613
 MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
-MD5 34f1e8bc32e1771f8d4670e36d3d8dc3 scim-1.0.1.ebuild 3123
-MD5 0e0a7413cf59150da462f5e1c9d6384d scim-1.0.2.ebuild 3172
 MD5 dea0b33579dc109c91d09dc62e939c48 scim-1.1.3.ebuild 2641
-MD5 95e4d06699356649f034690e3c3e870e files/scim-0.6.1-gtk2immodule.patch 545
-MD5 2a235919f3066c4ffddb3f693ab8c0ce files/digest-scim-1.0.1 63
+MD5 dea0b33579dc109c91d09dc62e939c48 scim-1.2.0.ebuild 2641
+MD5 3d6280a59a7ae3d91070c423317184d3 scim-1.0.1-r1.ebuild 3309
+MD5 0e0a7413cf59150da462f5e1c9d6384d scim-1.0.2.ebuild 3172
+MD5 3dc49b9a8538f1ff713548928e05154b files/digest-scim-1.1.3 63
+MD5 84ed66110ce84283b196dd1a5c918400 files/digest-scim-1.2.0 63
 MD5 2a235919f3066c4ffddb3f693ab8c0ce files/digest-scim-1.0.1-r1 63
+MD5 95e4d06699356649f034690e3c3e870e files/scim-0.6.1-gtk2immodule.patch 545
 MD5 5b9acefad166f2f6e0a8635ceadc9d08 files/digest-scim-1.0.2 63
-MD5 3dc49b9a8538f1ff713548928e05154b files/digest-scim-1.1.3 63
diff --git a/app-i18n/scim/files/digest-scim-1.0.1 b/app-i18n/scim/files/digest-scim-1.0.1
deleted file mode 100644
index d4731defe574..000000000000
--- a/app-i18n/scim/files/digest-scim-1.0.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f30d235cd5942014a9f12a05118705a1 scim-1.0.1.tar.gz 2311537
diff --git a/app-i18n/scim/files/digest-scim-1.2.0 b/app-i18n/scim/files/digest-scim-1.2.0
new file mode 100644
index 000000000000..211b3365d6e7
--- /dev/null
+++ b/app-i18n/scim/files/digest-scim-1.2.0
@@ -0,0 +1 @@
+MD5 af0882ad74769a465be0674abe76279c scim-1.2.0.tar.gz 2223147
diff --git a/app-i18n/scim/scim-1.0.1.ebuild b/app-i18n/scim/scim-1.2.0.ebuild
index 07d837975af1..9581022877ef 100644
--- a/app-i18n/scim/scim-1.0.1.ebuild
+++ b/app-i18n/scim/scim-1.2.0.ebuild
@@ -1,16 +1,16 @@
 # 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.0.1.ebuild,v 1.4 2005/01/31 13:47:59 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim/scim-1.2.0.ebuild,v 1.1 2005/03/01 15:52:03 usata Exp $
 
-inherit gnome2 eutils
+inherit eutils
 
 DESCRIPTION="Smart Common Input Method (SCIM) is an Input Method (IM) development platform"
 HOMEPAGE="http://www.scim-im.org/"
-SRC_URI="http://freedesktop.org/~suzhe/sources/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/scim/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 alpha ppc ~amd64"
+KEYWORDS="~x86 ~alpha ~ppc ~amd64 ~sparc ~ppc64"
 IUSE="gnome gtk immqt immqt-bc"
 
 GTK_DEPEND=">=x11-libs/gtk+-2
@@ -28,15 +28,6 @@ RDEPEND="virtual/x11
 	!<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
@@ -46,32 +37,24 @@ has_gtk() {
 	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
+get_gtk_confdir() {
+	if useq amd64 || ( [ "${CONF_LIBDIR}" == "lib32" ] && useq x86 ) ; then
+		echo "/etc/gtk-2.0/${CHOST}"
+	else
+		echo "/etc/gtk-2.0"
+	fi
 }
 
 src_compile() {
-	use gnome || G2CONF="${G2CONF} --disable-config-gconf"
-	use gtk || use immqt || use immqt-bc || G2CONF="${G2CONF} --disable-panel-gtk --disable-setup-ui"
-	has_gtk || G2CONF="${G2CONF} --disable-gtk2-immodule"
-	gnome2_src_compile
+	use gnome || myconf="${myconf} --disable-config-gconf"
+	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
+	emake || die
 }
 
 src_install() {
-	gnome2_src_install || die "install failed"
+	make DESTDIR=${D} install || die
 	dodoc README AUTHORS ChangeLog docs/developers docs/scim.cfg
 	dohtml -r docs/html/*
 }
@@ -98,11 +81,15 @@ pkg_postinst() {
 	einfo "To use various input methods (more than 30 languages):"
 	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
+	epause 10
 
-	has_gtk && gtk-query-immodules-2.0 > ${ROOT}etc/gtk-2.0/gtk.immodules
+	has_gtk && gtk-query-immodules-2.0 > ${ROOT}$(get_gtk_confdir)/gtk.immodules
 }
 
 pkg_postrm() {
 
-	has_gtk && gtk-query-immodules-2.0 > ${ROOT}etc/gtk-2.0/gtk.immodules
+	has_gtk && gtk-query-immodules-2.0 > ${ROOT}$(get_gtk_confdir)/gtk.immodules
 }