Fixed to build gtk components, bug 150905.

(Portage version: 2.1.1-r1)

5 files changed, 8 insertions, 228 deletions

diff --git a/app-i18n/scim/Manifest b/app-i18n/scim/Manifest
index e5b6ccfa0619..0b5bdf18295b 100644
--- a/app-i18n/scim/Manifest
+++ b/app-i18n/scim/Manifest
@@ -6,40 +6,24 @@ AUX scim-1.4.5-imengine.patch 869 RMD160 609baff78ef99ab6895e17a18a20dfc9a4c21a0
 MD5 329fd62b512b9c4a0f6736ddc3f34f86 files/scim-1.4.5-imengine.patch 869
 RMD160 609baff78ef99ab6895e17a18a20dfc9a4c21a08 files/scim-1.4.5-imengine.patch 869
 SHA256 bb4eb7e0e0a06dc2ed9d99703b5d7f63b1356a2ffd59a4736caa3c6a75bf11b6 files/scim-1.4.5-imengine.patch 869
-DIST scim-1.4.2.tar.gz 2574997 RMD160 7e237b4e1a886b67c7d02cb4c0236f1bb6ca356f SHA1 e8563cb0e464f3595b16909c3ee47edcb86ce622 SHA256 c9e62cc5ee18ed0982dde6b6a258a239f5812ff9a6807283472ff16df1e6421e
-DIST scim-1.4.3.tar.gz 2608572 RMD160 3c7dbe33896cede20858e9414966a28fef194765 SHA1 e6f88a123f43315fe2ef470629197a8f298e76b4 SHA256 b8587b45d841b559e9b36c6b1db034a5f4223643dbdb9e0a2ba02c493b5c6bca
 DIST scim-1.4.4.tar.gz 2610165 RMD160 e2025f246b82583fff6bc0237fa747d5ff2a6816 SHA1 f6d7cb0ca70d9c3430e460bef58e78ba04919137 SHA256 a0bc87a5e779250a6ae7cdc56c2fbfb3ca09aec8ae01d90b2f18116fa624110c
 DIST scim-1.4.5.tar.gz 3157124 RMD160 c4ea3c3bb06cdedb29ec32f8cabb0d32330dd6f6 SHA1 b9dd07a49abdba6d86385c92f8103ebf6df7f341 SHA256 3565ecbe7f093254179d8fd216e6a54644859b59a5e5daf48a6c9cff3d5be481
-EBUILD scim-1.4.2.ebuild 2789 RMD160 ab7b362c53987560868afe40f37d06a1573a2664 SHA1 fd5caed93f902c70f06a41401c42ce3c3f09fea1 SHA256 39ad18ef40a448d2ab0908c3e612f1062f09c4c128a20e3c589ad5bc63a14334
-MD5 01d359ab8c545c1dfd14c4126d4d89bf scim-1.4.2.ebuild 2789
-RMD160 ab7b362c53987560868afe40f37d06a1573a2664 scim-1.4.2.ebuild 2789
-SHA256 39ad18ef40a448d2ab0908c3e612f1062f09c4c128a20e3c589ad5bc63a14334 scim-1.4.2.ebuild 2789
-EBUILD scim-1.4.3.ebuild 2794 RMD160 12db28f360ebf0058919a19b0c953d611147b0a1 SHA1 7ba1d0f3e2bd8151cb5fbae7e8b1f294ccca26b7 SHA256 0b89b9ed2b69c6f938450e60664da25bbb5b159064b21ddf8b13f19cd49256b1
-MD5 ab1b1a34809fbaa4ce8523aae9b7b90b scim-1.4.3.ebuild 2794
-RMD160 12db28f360ebf0058919a19b0c953d611147b0a1 scim-1.4.3.ebuild 2794
-SHA256 0b89b9ed2b69c6f938450e60664da25bbb5b159064b21ddf8b13f19cd49256b1 scim-1.4.3.ebuild 2794
 EBUILD scim-1.4.4.ebuild 3046 RMD160 1dd18f66a863c589593fc5fe842fe9205c56f807 SHA1 b6d5b89606815c85c6b0f8810202bc9d8e64c1e1 SHA256 ce36de1a5a816f8be0df7db973aa719e47e7ba9a0890bc705ccaeabd3cd31238
 MD5 6f299cb70bf8ccdf43dccbc921198ccf scim-1.4.4.ebuild 3046
 RMD160 1dd18f66a863c589593fc5fe842fe9205c56f807 scim-1.4.4.ebuild 3046
 SHA256 ce36de1a5a816f8be0df7db973aa719e47e7ba9a0890bc705ccaeabd3cd31238 scim-1.4.4.ebuild 3046
-EBUILD scim-1.4.5.ebuild 2892 RMD160 9fa9658cf3a04fbd7104ef0e430c517d46cb0ddf SHA1 17ab0e42dae63103f3df3595f00c8cea485817fb SHA256 00c51b63d84487412bba653178086162ba7e56cea9eca437ca5d10f57d8d2703
-MD5 a555d1e6420e38d0b6239a83efb325ef scim-1.4.5.ebuild 2892
-RMD160 9fa9658cf3a04fbd7104ef0e430c517d46cb0ddf scim-1.4.5.ebuild 2892
-SHA256 00c51b63d84487412bba653178086162ba7e56cea9eca437ca5d10f57d8d2703 scim-1.4.5.ebuild 2892
-MISC ChangeLog 13854 RMD160 0dbe667681c53376c834986bf66f55b5a1e79c14 SHA1 04013862a94ef3c29dd0ded20ffe4bb7d8cd9411 SHA256 8bc592c5e2581f8240fc5ba485a8fd7720bb86e544ac2ed284451d4f43e7345e
-MD5 26207606eb1b4eb6b7a9b86144074d37 ChangeLog 13854
-RMD160 0dbe667681c53376c834986bf66f55b5a1e79c14 ChangeLog 13854
-SHA256 8bc592c5e2581f8240fc5ba485a8fd7720bb86e544ac2ed284451d4f43e7345e ChangeLog 13854
+EBUILD scim-1.4.5.ebuild 3290 RMD160 8effe96d15dcb5e7e6569b66c0136acf5d6a17c5 SHA1 396179b836a8f4d1a242ff5cd0729ab9fe599086 SHA256 828912ff4cc263648ee573e3bf9bca95d189f2afde3e48387861e119168834aa
+MD5 523eab5ee75ca65dd7382558fdbcd594 scim-1.4.5.ebuild 3290
+RMD160 8effe96d15dcb5e7e6569b66c0136acf5d6a17c5 scim-1.4.5.ebuild 3290
+SHA256 828912ff4cc263648ee573e3bf9bca95d189f2afde3e48387861e119168834aa scim-1.4.5.ebuild 3290
+MISC ChangeLog 14033 RMD160 ddd970f41d460e0fa4db53f4cea10ff3273488d6 SHA1 cd2fd1349c376d6e65b5e7734ef1285d93d27493 SHA256 57a9bf38a3701baf8b8a8d5d3a075d415a2fb1bcf1eeea036488023568bd80ca
+MD5 c344684662ecc40f0beedd41a06f3ba5 ChangeLog 14033
+RMD160 ddd970f41d460e0fa4db53f4cea10ff3273488d6 ChangeLog 14033
+SHA256 57a9bf38a3701baf8b8a8d5d3a075d415a2fb1bcf1eeea036488023568bd80ca ChangeLog 14033
 MISC metadata.xml 156 RMD160 8adcf0a760a605cd42501f53097ca3a1c4e8daad SHA1 8ccc2b0f20743002b783b1f7b5162c71f7f54c2e SHA256 815820f2e5866d973fafb29a8b8027d022ccea43023309b6dc294cf077598215
 MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
 RMD160 8adcf0a760a605cd42501f53097ca3a1c4e8daad metadata.xml 156
 SHA256 815820f2e5866d973fafb29a8b8027d022ccea43023309b6dc294cf077598215 metadata.xml 156
-MD5 770df88adef7843d2f3e70e2f5dc2b2a files/digest-scim-1.4.2 235
-RMD160 69ca604159a8c4b0d5c62da87a06b9a0d4b78bfe files/digest-scim-1.4.2 235
-SHA256 c648344e6475da7fe16b25fe4c5e8b7993a4a816bc61526c7db22a24a70e3996 files/digest-scim-1.4.2 235
-MD5 fd1bb6a820b7b8c8eed019334242b964 files/digest-scim-1.4.3 235
-RMD160 0750b0a5534d6771ffa74079afb55ffcbe8d6fb8 files/digest-scim-1.4.3 235
-SHA256 9450155f9eb28aa209aae996a9a8d4ee39cbf971d2bbde003ea68d7726108ae7 files/digest-scim-1.4.3 235
 MD5 fda14eb453ebaff518ba4bde01b76b22 files/digest-scim-1.4.4 235
 RMD160 239257486cc23d339d8914d30aea0e0e0d0292d4 files/digest-scim-1.4.4 235
 SHA256 5dac939072f0b34aebbf7e17020cdf9013b4769ba38bcea578352fbc6683d0f6 files/digest-scim-1.4.4 235
diff --git a/app-i18n/scim/files/digest-scim-1.4.2 b/app-i18n/scim/files/digest-scim-1.4.2
deleted file mode 100644
index 4f066ecc0972..000000000000
--- a/app-i18n/scim/files/digest-scim-1.4.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 024cc7b98f68b56b23dd24535ec0388d scim-1.4.2.tar.gz 2574997
-RMD160 7e237b4e1a886b67c7d02cb4c0236f1bb6ca356f scim-1.4.2.tar.gz 2574997
-SHA256 c9e62cc5ee18ed0982dde6b6a258a239f5812ff9a6807283472ff16df1e6421e scim-1.4.2.tar.gz 2574997
diff --git a/app-i18n/scim/files/digest-scim-1.4.3 b/app-i18n/scim/files/digest-scim-1.4.3
deleted file mode 100644
index a0136c2a591a..000000000000
--- a/app-i18n/scim/files/digest-scim-1.4.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 504d43c56710e574be11320f3b0a2b2d scim-1.4.3.tar.gz 2608572
-RMD160 3c7dbe33896cede20858e9414966a28fef194765 scim-1.4.3.tar.gz 2608572
-SHA256 b8587b45d841b559e9b36c6b1db034a5f4223643dbdb9e0a2ba02c493b5c6bca scim-1.4.3.tar.gz 2608572
diff --git a/app-i18n/scim/scim-1.4.2.ebuild b/app-i18n/scim/scim-1.4.2.ebuild
deleted file mode 100644
index 559b014a8c64..000000000000
--- a/app-i18n/scim/scim-1.4.2.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim/scim-1.4.2.ebuild,v 1.8 2006/06/06 09:29:44 matsuu Exp $
-
-inherit eutils flag-o-matic
-
-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 ppc ppc64 ~sparc x86"
-IUSE="gtk immqt immqt-bc"
-
-GTK_DEPEND=">=x11-libs/gtk+-2
-	>=dev-libs/atk-1
-	>=x11-libs/pango-1
-	>=dev-libs/glib-2"
-RDEPEND="|| ( x11-libs/libX11 virtual/x11 )
-	gtk? ( ${GTK_DEPEND} )
-	immqt? ( ${GTK_DEPEND} )
-	immqt-bc? ( ${GTK_DEPEND} )
-	!app-i18n/scim-cvs"
-DEPEND="${RDEPEND}
-	|| ( x11-libs/libXt virtual/x11 )
-	dev-lang/perl"
-
-has_gtk() {
-	if has_version '>=x11-libs/gtk+-2' ; then
-		true
-	else
-		false
-	fi
-}
-
-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() {
-	# 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
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-	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 "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"
-	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-pinyin"
-	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
-	ewarn
-	ewarn "If you upgraded from scim-1.2.x or scim-1.0.x, you should remerge all SCIM modules."
-	ewarn
-	epause 10
-
-	has_gtk && gtk-query-immodules-2.0 > ${ROOT}$(get_gtk_confdir)/gtk.immodules
-}
-
-pkg_postrm() {
-
-	has_gtk && gtk-query-immodules-2.0 > ${ROOT}$(get_gtk_confdir)/gtk.immodules
-}
diff --git a/app-i18n/scim/scim-1.4.3.ebuild b/app-i18n/scim/scim-1.4.3.ebuild
deleted file mode 100644
index 4392f3b65ae5..000000000000
--- a/app-i18n/scim/scim-1.4.3.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim/scim-1.4.3.ebuild,v 1.4 2006/10/10 01:11:27 jhuebel Exp $
-
-inherit eutils flag-o-matic
-
-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 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="gtk immqt immqt-bc"
-
-GTK_DEPEND=">=x11-libs/gtk+-2
-	>=dev-libs/atk-1
-	>=x11-libs/pango-1
-	>=dev-libs/glib-2"
-RDEPEND="|| ( x11-libs/libX11 virtual/x11 )
-	gtk? ( ${GTK_DEPEND} )
-	immqt? ( ${GTK_DEPEND} )
-	immqt-bc? ( ${GTK_DEPEND} )
-	!app-i18n/scim-cvs"
-DEPEND="${RDEPEND}
-	|| ( x11-libs/libXt virtual/x11 )
-	dev-lang/perl"
-
-has_gtk() {
-	if has_version '>=x11-libs/gtk+-2' ; then
-		true
-	else
-		false
-	fi
-}
-
-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() {
-	# 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
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-	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 "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"
-	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-pinyin"
-	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
-	ewarn
-	ewarn "If you upgraded from scim-1.2.x or scim-1.0.x, you should remerge all SCIM modules."
-	ewarn
-	epause 10
-
-	has_gtk && gtk-query-immodules-2.0 > ${ROOT}$(get_gtk_confdir)/gtk.immodules
-}
-
-pkg_postrm() {
-
-	has_gtk && gtk-query-immodules-2.0 > ${ROOT}$(get_gtk_confdir)/gtk.immodules
-}