remove old ebuild and unused files wrt bug #342545

(Portage version: 2.1.11.50/cvs/Linux i686, signed Manifest commit with key EC917A6D)

4 files changed, 7 insertions, 180 deletions

diff --git a/app-i18n/scim-bridge/ChangeLog b/app-i18n/scim-bridge/ChangeLog
index 63149d915aec..c0d3c32c4fbc 100644
--- a/app-i18n/scim-bridge/ChangeLog
+++ b/app-i18n/scim-bridge/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-i18n/scim-bridge
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-bridge/ChangeLog,v 1.36 2012/07/08 19:43:42 naota Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-bridge/ChangeLog,v 1.37 2013/02/27 13:09:53 hattya Exp $
+
+  27 Feb 2013; Akinori Hattori <hattya@gentoo.org>
+  -files/scim-bridge-0.4.14-qt4.patch,
+  -files/scim-bridge-0.4.15-qt4-focus.patch, -scim-bridge-0.4.16-r1.ebuild:
+  remove old ebuild and unused files wrt bug #342545
 
   08 Jul 2012; Naohiro Aota <naota@gentoo.org>
   +files/scim-bridge-0.4.16+gcc-4.7.patch, scim-bridge-0.4.16-r2.ebuild:
diff --git a/app-i18n/scim-bridge/files/scim-bridge-0.4.14-qt4.patch b/app-i18n/scim-bridge/files/scim-bridge-0.4.14-qt4.patch
deleted file mode 100644
index 872ef8f4714d..000000000000
--- a/app-i18n/scim-bridge/files/scim-bridge-0.4.14-qt4.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -Naur scim-bridge-0.4.14.orig/client-qt/qt4/Makefile.am scim-bridge-0.4.14/client-qt/qt4/Makefile.am
---- scim-bridge-0.4.14.orig/client-qt/qt4/Makefile.am	2007-11-07 18:57:46.000000000 +0900
-+++ scim-bridge-0.4.14/client-qt/qt4/Makefile.am	2008-01-28 01:24:30.000000000 +0900
-@@ -24,7 +24,7 @@
- 
- noinst_HEADERS = scim-bridge-client-qt.h scim-bridge-client-imcontext-qt.h  scim-bridge-client-key-event-utility-qt.h scim-bridge-client-common-qt.h
- 
--moduledir = @QT4_PREFIX@/plugins/inputmethods
-+moduledir = @QT4_LIBDIR@/plugins/inputmethods
- module_LTLIBRARIES = im-scim-bridge.la
- 
- im_scim_bridge_la_SOURCES = im-scim-bridge-qt.cpp \
-diff -Naur scim-bridge-0.4.14.orig/configure.ac scim-bridge-0.4.14/configure.ac
---- scim-bridge-0.4.14.orig/configure.ac	2007-12-06 00:50:13.000000000 +0900
-+++ scim-bridge-0.4.14/configure.ac	2008-01-28 01:24:30.000000000 +0900
-@@ -115,6 +115,10 @@
-     QT4_PREFIX=`$PKG_CONFIG --variable=prefix QtCore`
-   fi
-   AC_SUBST(QT4_PREFIX)
-+  if test -z "$QT4_LIBDIR"; then
-+    QT4_LIBDIR=`$PKG_CONFIG --variable=libdir QtCore`
-+  fi
-+  AC_SUBST(QT4_LIBDIR)
- fi
- 
- ###########################################################
diff --git a/app-i18n/scim-bridge/files/scim-bridge-0.4.15-qt4-focus.patch b/app-i18n/scim-bridge/files/scim-bridge-0.4.15-qt4-focus.patch
deleted file mode 100644
index 75f91f28ab93..000000000000
--- a/app-i18n/scim-bridge/files/scim-bridge-0.4.15-qt4-focus.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 94a089901574835c4f96e322a129c24bc73b76e6 Mon Sep 17 00:00:00 2001
-From: Alexander Gavrilov <angavrilov@gmail.com>
-Date: Sun, 7 Sep 2008 00:41:08 +0400
-Subject: [PATCH] Trying to fix KDE BUG#167982
-
-The bug is caused by preedit string update events that were sent by
-scim-bridge during the focus change sequence. Problems:
-
-1) QInputContext::setFocusWidget() is called before focus_out()
-2) Preedit string hide event is sent even if it wasn't displayed.
-
-As a result, when the focus is switched in, the _target_ Kate widget
-receives a preedit event, and trashes its selection.
-
-This patch is an obvious stopgap measure that seems unlikely to cause
-regression, but requires attention of people with better understanding
-of the affected interfaces.
-
-Signed-off-by: Alexander Gavrilov <angavrilov@gmail.com>
----
- client-qt/qt4/scim-bridge-client-imcontext-qt.cpp |   13 +++++++++++++
- 1 files changed, 13 insertions(+), 0 deletions(-)
-
-diff --git a/client-qt/qt4/scim-bridge-client-imcontext-qt.cpp b/client-qt/qt4/scim-bridge-client-imcontext-qt.cpp
-index f65ad02..fbdb327 100644
---- a/client-qt/qt4/scim-bridge-client-imcontext-qt.cpp
-+++ b/client-qt/qt4/scim-bridge-client-imcontext-qt.cpp
-@@ -219,6 +219,12 @@ void ScimBridgeClientIMContextImpl::widgetDestroyed (QWidget *widget)
- void ScimBridgeClientIMContextImpl::setFocusWidget (QWidget *widget)
- {
-     scim_bridge_pdebugln (4, "ScimBridgeClientIMContextImpl::setFocusWidget ()");
-+
-+    if (focused_imcontext != NULL) {
-+        focused_imcontext->focus_out ();
-+        focused_imcontext = NULL;
-+    }
-+
-     QInputContext::setFocusWidget (widget);
-     focus_in ();
-     update ();
-@@ -442,8 +448,15 @@ void ScimBridgeClientIMContextImpl::focus_out ()
-         }
-     }
- 
-+#ifdef QT4
-+    if (preedit_shown) {
-+        set_preedit_shown (false);
-+        update_preedit ();
-+    }
-+#else
-     set_preedit_shown (false);
-     update_preedit ();
-+#endif
- 
-     focused_imcontext = NULL;
- }
--- 
-1.6.0.20.g6148bc
-
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
deleted file mode 100644
index 2b7a2a085ddd..000000000000
--- a/app-i18n/scim-bridge/scim-bridge-0.4.16-r1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2012 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.6 2012/05/03 19:24:26 jdhore Exp $
-
-EAPI="2"
-
-inherit autotools eutils multilib
-
-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 ~x86"
-IUSE="doc gtk qt4"
-
-RESTRICT="test"
-
-RDEPEND=">=app-i18n/scim-1.4.6
-	gtk? (
-		>=x11-libs/gtk+-2.2:2
-		>=x11-libs/pango-1.1
-	)
-	qt4? (
-		x11-libs/qt-gui:4
-		x11-libs/qt-core:4
-		>=x11-libs/pango-1.1
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	dev-util/intltool
-	doc? ( app-doc/doxygen )"
-
-update_gtk_immodules() {
-	local GTK2_CONFDIR
-	has_multilib_profile && GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
-	GTK2_CONFDIR=${GTK2_CONFDIR:=/etc/gtk-2.0/}
-	if [ -x /usr/bin/gtk-query-immodules-2.0 ] ; then
-		/usr/bin/gtk-query-immodules-2.0 > "${ROOT}/${GTK2_CONFDIR}/gtk.immodules"
-	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() {
-	local myconf="$(use_enable doc documents)"
-	# '--disable-*-immodule' are b0rked, bug #280887
-
-	if use gtk ; then
-		myconf="${myconf} --enable-gtk2-immodule=yes"
-	else
-		myconf="${myconf} --enable-gtk2-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"
-	else
-		myconf="${myconf} --enable-qt4-immodule=no"
-	fi
-
-	econf ${myconf} || 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
-	use gtk && update_gtk_immodules
-}
-
-pkg_postrm() {
-	use gtk && update_gtk_immodules
-}