Drop qt3 support. Remove obsolete versions.

Package-Manager: portage-2.2_rc61/cvs/Linux x86_64

4 files changed, 12 insertions, 172 deletions

diff --git a/app-i18n/scim-bridge/ChangeLog b/app-i18n/scim-bridge/ChangeLog
index a81aabf69071..883568ec7206 100644
--- a/app-i18n/scim-bridge/ChangeLog
+++ b/app-i18n/scim-bridge/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-i18n/scim-bridge
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-bridge/ChangeLog,v 1.30 2009/10/10 15:43:53 armin76 Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-bridge/ChangeLog,v 1.31 2010/01/02 22:40:39 yngwin Exp $
+
+  02 Jan 2010; Ben de Groot <yngwin@gentoo.org> -scim-bridge-0.4.9.ebuild,
+  -scim-bridge-0.4.16.ebuild, scim-bridge-0.4.16-r1.ebuild:
+  Drop qt3 support. Remove obsolete versions.
 
   10 Oct 2009; Raúl Porcel <armin76@gentoo.org> scim-bridge-0.4.9.ebuild:
   Drop to ~sparc
diff --git a/app-i18n/scim-bridge/scim-bridge-0.4.16-r1.ebuild b/app-i18n/scim-bridge/scim-bridge-0.4.16-r1.ebuild
index 21efa989c8cb..649dd0efe682 100644
--- a/app-i18n/scim-bridge/scim-bridge-0.4.16-r1.ebuild
+++ b/app-i18n/scim-bridge/scim-bridge-0.4.16-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-bridge/scim-bridge-0.4.16-r1.ebuild,v 1.2 2009/10/05 19:19:05 ayoy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-bridge/scim-bridge-0.4.16-r1.ebuild,v 1.3 2010/01/02 22:40:39 yngwin Exp $
 
 EAPI="2"
 
-inherit autotools eutils multilib qt3
+inherit autotools eutils multilib
 
 DESCRIPTION="Yet another IM-client of SCIM"
 HOMEPAGE="http://www.scim-im.org/projects/scim_bridge"
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/scim/${P}.tar.gz"
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~hppa ~ppc64 ~sparc ~x86"
-IUSE="doc gtk qt3 qt4"
+IUSE="doc gtk qt4"
 
 RESTRICT="test"
 
@@ -22,13 +22,6 @@ RDEPEND=">=app-i18n/scim-1.4.6
 		>=x11-libs/gtk+-2.2
 		>=x11-libs/pango-1.1
 	)
-	qt3? (
-		|| (
-			>=x11-libs/qt-3.3:3[immqt-bc]
-			>=x11-libs/qt-3.3:3[immqt]
-		)
-		>=x11-libs/pango-1.1
-	)
 	qt4? (
 		x11-libs/qt-gui:4
 		x11-libs/qt-core:4
@@ -68,11 +61,8 @@ src_configure() {
 		myconf="${myconf} --enable-gtk2-immodule=no"
 	fi
 
-	if use qt3 ; then
-		myconf="${myconf} --enable-qt3-immodule=yes"
-	else
-		myconf="${myconf} --enable-qt3-immodule=no"
-	fi
+	# Qt3 is no longer supported, bug 283429
+	myconf="${myconf} --enable-qt3-immodule=no"
 
 	if use qt4 ; then
 		myconf="${myconf} --enable-qt4-immodule=yes"
diff --git a/app-i18n/scim-bridge/scim-bridge-0.4.16.ebuild b/app-i18n/scim-bridge/scim-bridge-0.4.16.ebuild
deleted file mode 100644
index 703484c18ff9..000000000000
--- a/app-i18n/scim-bridge/scim-bridge-0.4.16.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-bridge/scim-bridge-0.4.16.ebuild,v 1.4 2009/10/05 19:19:05 ayoy Exp $
-
-EAPI="2"
-
-inherit autotools eutils qt3
-
-DESCRIPTION="Yet another IM-client of SCIM"
-HOMEPAGE="http://www.scim-im.org/projects/scim_bridge"
-SRC_URI="mirror://sourceforge/scim/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc64 ~sparc ~x86"
-IUSE="doc gtk qt3 qt4"
-
-RESTRICT="test"
-
-RDEPEND=">=app-i18n/scim-1.4.6
-	gtk? (
-		>=x11-libs/gtk+-2.2
-		>=x11-libs/pango-1.1
-	)
-	qt3? (
-		|| (
-			x11-libs/qt:3[immqt-bc]
-			x11-libs/qt:3[immqt]
-		)
-		>=x11-libs/pango-1.1
-	)
-	qt4? (
-		x11-libs/qt-gui:4
-		x11-libs/qt-core:4
-		>=x11-libs/pango-1.1
-	)"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	dev-util/intltool
-	doc? ( app-doc/doxygen )"
-
-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_prepare() {
-	epatch "${FILESDIR}/${PN}-0.4.15.2-qt4.patch"
-	epatch "${FILESDIR}/${PN}-0.4.15.2-gcc43.patch"
-	epatch "${FILESDIR}/${P}+gcc-4.4.patch"
-
-	# bug #241954
-	intltoolize --force
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable gtk gtk2-immodule) \
-		$(use_enable qt3 qt3-immodule) \
-		$(use_enable qt4 qt4-immodule) \
-		$(use_enable doc documents) || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	dodoc AUTHORS ChangeLog NEWS README || die
-}
-
-pkg_postinst() {
-	elog
-	elog "If you would like to use ${PN} as default instead of scim, set"
-	elog " $ export GTK_IM_MODULE=scim-bridge"
-	elog " $ export QT_IM_MODULE=scim-bridge"
-	elog
-	[ -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-bridge/scim-bridge-0.4.9.ebuild b/app-i18n/scim-bridge/scim-bridge-0.4.9.ebuild
deleted file mode 100644
index 2038ffdd9613..000000000000
--- a/app-i18n/scim-bridge/scim-bridge-0.4.9.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-bridge/scim-bridge-0.4.9.ebuild,v 1.7 2009/10/10 15:43:53 armin76 Exp $
-
-EAPI=1
-
-inherit eutils qt3
-
-DESCRIPTION="Yet another IM-client of SCIM"
-HOMEPAGE="http://www.scim-im.org/projects/scim_bridge"
-SRC_URI="mirror://sourceforge/scim/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc64 ~sparc ~x86"
-IUSE="doc gtk qt3"
-
-RDEPEND=">=app-i18n/scim-1.4.0
-	gtk? (
-		>=x11-libs/gtk+-2.2
-		>=x11-libs/pango-1.1
-	)
-	qt3? (
-		x11-libs/qt:3
-		>=x11-libs/pango-1.1
-	)"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
-
-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
-}
-
-pkg_setup() {
-	if use qt3 && ! built_with_use =x11-libs/qt-3* immqt-bc && ! built_with_use =x11-libs/qt-3* immqt; then
-		die "You need to rebuild >=x11-libs/qt-3.3.4 with immqt-bc(recommended) or immqt USE flag enabled."
-	fi
-}
-
-src_compile() {
-	econf \
-		$(use_enable gtk gtk2-immodule) \
-		$(use_enable qt3 qt3-immodule) \
-		$(use_enable doc documents) || die
-	emake || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	dodoc AUTHORS ChangeLog NEWS README
-}
-
-pkg_postinst() {
-	elog
-	elog "If you would like to use ${PN} as default instead of scim, set"
-	elog " $ export GTK_IM_MODULE=scim-bridge"
-	elog " $ export QT_IM_MODULE=scim-bridge"
-	elog
-	[ -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"
-}