Removed kde and qt3 USE flag. Removed PDEPEND.

(Portage version: 2.1.4.4)

5 files changed, 10 insertions, 246 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/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"
-}