Removed kde and qt3 USE flag. Removed PDEPEND.

Package-Manager: portage-2.1.4.4

6 files changed, 13 insertions, 262 deletions

diff --git a/app-i18n/scim/ChangeLog b/app-i18n/scim/ChangeLog
index 8fa721f41286..d6bdf5ddde71 100644
--- a/app-i18n/scim/ChangeLog
+++ b/app-i18n/scim/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-i18n/scim
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim/ChangeLog,v 1.121 2008/06/14 09:40:12 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim/ChangeLog,v 1.122 2008/08/10 16:16:52 matsuu Exp $
+
+  10 Aug 2008; MATSUU Takuto <matsuu@gentoo.org> scim-1.4.5-r1.ebuild,
+  -scim-1.4.6.ebuild, -scim-1.4.7.ebuild, scim-1.4.7-r1.ebuild:
+  Removed kde and qt3 USE flag. Removed PDEPEND. Removed old versions.
 
 *scim-1.4.7-r1 (14 Jun 2008)
 
diff --git a/app-i18n/scim/Manifest b/app-i18n/scim/Manifest
index 7989b126cc91..6139589f4bb6 100644
--- a/app-i18n/scim/Manifest
+++ b/app-i18n/scim/Manifest
@@ -1,22 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX scim-1.4.5-fbsd.patch 395 RMD160 1ce0f0cc90a8981bcc89ed0d59056e1ae17a528c SHA1 bcb1871085a2788d69ae32dff01cc1f38b51136d SHA256 a02290b079a131c393366400fdc9adf3b65c6b3a9523bd419e16e8e21ea4d7a6
 AUX scim-1.4.5-imengine.patch 869 RMD160 609baff78ef99ab6895e17a18a20dfc9a4c21a08 SHA1 ecedf7b09467829d63d905a950cebeddd3cab40c SHA256 bb4eb7e0e0a06dc2ed9d99703b5d7f63b1356a2ffd59a4736caa3c6a75bf11b6
 AUX scim-1.4.7-syslibltdl.patch 1676 RMD160 a6ad514f5beb1bbcbaa7a07083eecba44866ee70 SHA1 f1c485ab9c47251322fa8686d63aaeb931a5f364 SHA256 ee807b34d95df48af40abc1a4d285d7929548481be44aba1bab407e22f406d88
 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 3075769 RMD160 0b24e24f547ce39469811076420bfcd41d1e906c SHA1 54ab2ab0ef28a84c24fbc32d37e996ecae416d50 SHA256 a0883bc5938476b33247194fe61ab5ce224eb4fb68bd7f8befc4baa8aaa8160b
-EBUILD scim-1.4.5-r1.ebuild 3304 RMD160 c86643b776df07e31f2aedb2365ad181742e7b75 SHA1 407ce9bb6c00f7186f2ed63b3f45ab821018908a SHA256 fbe921acab3bc65d77ddc9784bae9742f8e14e013733838279960f4d7aeb9643
-EBUILD scim-1.4.6.ebuild 3179 RMD160 f7062c2c9676a97bf1497b1d5397eeff27d330de SHA1 439b818aac44445938e80a74bb791b9183700024 SHA256 99a16d3c946827052e221626be4974e4dd03fb74459e3e7770e43a31bb0ab31c
-EBUILD scim-1.4.7-r1.ebuild 3234 RMD160 f1599518ac16441580e5e2e4f65fe076da6d8919 SHA1 b9fe64f44a2acebbc5bd9ed46630e80c06da8b2f SHA256 2e4a95b9af02e4306c4a1527ea685cafc1fa06f252a4cc2c61b42952fcfac4cb
-EBUILD scim-1.4.7.ebuild 3179 RMD160 d0f863b76c96c8b641fbec9112d3c4cfb8c945cc SHA1 afeef8af3da41303b7fb7e1608b42f44722d131e SHA256 2a31ef2b79d50a8a9986f038aa9f99d9e0a0d49a38cb9221fe8a4e22e8c65bae
-MISC ChangeLog 16371 RMD160 5fa951a68347f3292d142d768ca5dd0ab8ec3df5 SHA1 2f716bc7fe032e5f30447939ffa1679e2be2f618 SHA256 94a91d47eb98cec8f35a9f28b7d319bc1e8b517d3d813838ace4fb578238f592
+EBUILD scim-1.4.5-r1.ebuild 3156 RMD160 3f56a66fe8fc3156852d6d6cb9abf28a3849f74a SHA1 3e4e54eaad21eaeed3e95d301805e1ac6c80a187 SHA256 a189e6726e5b43f85a2a7be0558dbbabfd5d5b1df0175d218628eef38de9c8ce
+EBUILD scim-1.4.7-r1.ebuild 3131 RMD160 56b961b4faac30763e86b845a6264406a70958a2 SHA1 138711433eb96aa08d49fe3ede4a32b497c9b600 SHA256 cbcbad7c993b19c19ef83042e90872b216a450aa568d88662a60f0df4452e81b
+MISC ChangeLog 16575 RMD160 51c98917b4d692ee7ce6a60b360a0e77da92f39a SHA1 b38e8abfdee7cba63c3262a5a269af1abdfad3b7 SHA256 d21db971b2165b2fc782d6478812249e7e39489b58acc702dd159038ed0c4dab
 MISC metadata.xml 156 RMD160 8adcf0a760a605cd42501f53097ca3a1c4e8daad SHA1 8ccc2b0f20743002b783b1f7b5162c71f7f54c2e SHA256 815820f2e5866d973fafb29a8b8027d022ccea43023309b6dc294cf077598215
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkhTkgUACgkQAiZjviIA2Xj1IACfWpxLNbp71lDsF/SDOg+aZ7v0
-xhYAn0RJek9CrHBUpOeTTZYKiYF7zKa4
-=XHFy
------END PGP SIGNATURE-----
diff --git a/app-i18n/scim/scim-1.4.5-r1.ebuild b/app-i18n/scim/scim-1.4.5-r1.ebuild
index 0256b8d52792..eeab4643078c 100644
--- a/app-i18n/scim/scim-1.4.5-r1.ebuild
+++ b/app-i18n/scim/scim-1.4.5-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim/scim-1.4.5-r1.ebuild,v 1.10 2007/07/22 09:20:28 calchan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim/scim-1.4.5-r1.ebuild,v 1.11 2008/08/10 16:16:52 matsuu Exp $
 
 WANT_AUTOMAKE=latest
 WANT_AUTOCONF=latest
@@ -14,7 +14,7 @@ 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"
+IUSE="doc gtk"
 
 RDEPEND="x11-libs/libX11
 	gtk? ( >=x11-libs/gtk+-2
@@ -30,9 +30,6 @@ DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	>=dev-util/intltool-0.33"
 
-PDEPEND="!alpha? ( kde? ( app-i18n/skim ) )
-	!alpha? ( !hppa? ( !sparc? ( 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}"
diff --git a/app-i18n/scim/scim-1.4.6.ebuild b/app-i18n/scim/scim-1.4.6.ebuild
deleted file mode 100644
index d732ce7399cc..000000000000
--- a/app-i18n/scim/scim-1.4.6.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# 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.3 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"
-}
diff --git a/app-i18n/scim/scim-1.4.7-r1.ebuild b/app-i18n/scim/scim-1.4.7-r1.ebuild
index 7f0b4bf0eba4..1c2a8f97ed2f 100644
--- a/app-i18n/scim/scim-1.4.7-r1.ebuild
+++ b/app-i18n/scim/scim-1.4.7-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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-r1.ebuild,v 1.1 2008/06/14 09:40:12 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim/scim-1.4.7-r1.ebuild,v 1.2 2008/08/10 16:16:52 matsuu Exp $
 
 inherit eutils flag-o-matic autotools
 
@@ -11,7 +11,7 @@ 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"
+IUSE="doc gtk"
 
 RDEPEND="x11-libs/libX11
 	gtk? ( >=x11-libs/gtk+-2
@@ -28,9 +28,6 @@ DEPEND="${RDEPEND}
 	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}"
diff --git a/app-i18n/scim/scim-1.4.7.ebuild b/app-i18n/scim/scim-1.4.7.ebuild
deleted file mode 100644
index c0c88da1ab7c..000000000000
--- a/app-i18n/scim/scim-1.4.7.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# 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"
-}