Remove old.

(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key )

6 files changed, 7 insertions, 413 deletions

diff --git a/app-i18n/scim/ChangeLog b/app-i18n/scim/ChangeLog
index d36cb79a1489..c82b35b0b72d 100644
--- a/app-i18n/scim/ChangeLog
+++ b/app-i18n/scim/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-i18n/scim
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim/ChangeLog,v 1.162 2015/04/03 08:11:35 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim/ChangeLog,v 1.163 2015/04/20 19:30:48 mrueg Exp $
+
+  20 Apr 2015; Manuel Rüger <mrueg@gentoo.org>
+  -files/scim-1.4.7-syslibltdl.patch,
+  -files/scim-fix-disappeared-status-icon.patch, -scim-1.4.11.ebuild,
+  -scim-1.4.9-r1.ebuild, -scim-1.4.9-r2.ebuild:
+  Remove old.
 
   03 Apr 2015; Markus Meier <maekke@gentoo.org> scim-1.4.14.ebuild:
   arm stable, bug #538720
diff --git a/app-i18n/scim/files/scim-1.4.7-syslibltdl.patch b/app-i18n/scim/files/scim-1.4.7-syslibltdl.patch
deleted file mode 100644
index 0e514b3195a8..000000000000
--- a/app-i18n/scim/files/scim-1.4.7-syslibltdl.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-Index: scim-1.4.7/src/Makefile.am
-===================================================================
---- scim-1.4.7.orig/src/Makefile.am
-+++ scim-1.4.7/src/Makefile.am
-@@ -33,7 +33,7 @@ INCLUDES		= -I$(top_builddir) \
- 			  -DSCIM_MODULE_PATH=\"@SCIM_MODULE_PATH@\"
- 
- 
--noinst_HEADERS		= ltdl.h \
-+noinst_HEADERS		= \
- 			  scim_private.h \
- 			  scim_compose_key_data.h \
- 			  scim_keyboard_layout_data.h \
-@@ -84,11 +84,6 @@ libsciminclude_HEADERS 	= scim.h \
- 			  scim_utility.h
- 
- 
--noinst_LTLIBRARIES	= libltdlc.la
--
--libltdlc_la_SOURCES	= ltdl.cpp
--libltdlc_la_LIBADD	= $(LIBADD_DL)
--
- if SCIM_LD_VERSION_SCRIPT
- LD_VERSION_SCRIPT_OPTION="-Wl,--version-script=$(srcdir)/libscim.version-script"
- endif
-@@ -137,7 +132,7 @@ libscim@SCIM_EPOCH@_la_LDFLAGS= -version
- 			  @LTLIBINTL@ \
- 			  -lstdc++
- 
--libscim@SCIM_EPOCH@_la_LIBADD	= libltdlc.la
-+libscim@SCIM_EPOCH@_la_LIBADD	= -lltdl
- 
- 
- bin_PROGRAMS		= scim scim-config-agent
-Index: scim-1.4.7/src/scim_module.cpp
-===================================================================
---- scim-1.4.7.orig/src/scim_module.cpp
-+++ scim-1.4.7/src/scim_module.cpp
-@@ -27,7 +27,9 @@
- #define Uses_STL_ALGORITHM
- #include "scim_private.h"
- #include "scim.h"
--#include "ltdl.h"
-+extern "C" {
-+  #include <ltdl.h>
-+}
- #include <dirent.h>
- #include <sys/types.h>
- #include <sys/stat.h>
-Index: scim-1.4.7/configure.ac
-===================================================================
---- scim-1.4.7.orig/configure.ac
-+++ scim-1.4.7/configure.ac
-@@ -71,7 +71,6 @@ AM_GNU_GETTEXT
- # Init libtool
- AC_LIBTOOL_DLOPEN
- AC_PROG_LIBTOOL
--AC_LIB_LTDL
- AC_SUBST(LIBTOOL_DEPS)
- 
- # libtool option to control which symbols are exported
diff --git a/app-i18n/scim/files/scim-fix-disappeared-status-icon.patch b/app-i18n/scim/files/scim-fix-disappeared-status-icon.patch
deleted file mode 100644
index 8052f79472f3..000000000000
--- a/app-i18n/scim/files/scim-fix-disappeared-status-icon.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff --git a/extras/panel/scim_panel_gtk.cpp b/extras/panel/scim_panel_gtk.cpp
-index 613613f..b53ef75 100644
---- a/extras/panel/scim_panel_gtk.cpp
-+++ b/extras/panel/scim_panel_gtk.cpp
-@@ -1072,11 +1072,13 @@ ui_initialize (void)
- #ifdef GDK_WINDOWING_X11
-     // Add an event filter function to observe X root window's properties.
-     GdkWindow *root_window = gdk_get_default_root_window ();
-+    GdkEventMask event_mask;
- #if GDK_MULTIHEAD_SAFE
-     if (_current_screen)
-         root_window = gdk_screen_get_root_window (_current_screen);
- #endif
--    gdk_window_set_events (root_window, (GdkEventMask)GDK_PROPERTY_NOTIFY);
-+    event_mask = (GdkEventMask) (gdk_window_get_events (root_window) | GDK_PROPERTY_NOTIFY);
-+    gdk_window_set_events (root_window, event_mask);
-     gdk_window_add_filter (root_window, ui_event_filter, NULL);
- #endif
- 
-@@ -1323,9 +1325,11 @@ ui_switch_screen (GdkScreen *screen)
- 
- #ifdef GDK_WINDOWING_X11
-         GdkWindow *root_window = gdk_get_default_root_window ();
-+        GdkEventMask event_mask;
-         if (_current_screen)
-             root_window = gdk_screen_get_root_window (_current_screen);
--        gdk_window_set_events (root_window, (GdkEventMask)GDK_PROPERTY_NOTIFY);
-+        event_mask = (GdkEventMask) (gdk_window_get_events (root_window) | GDK_PROPERTY_NOTIFY);
-+        gdk_window_set_events (root_window, event_mask);
-         gdk_window_add_filter (root_window, ui_event_filter, NULL);
- #endif
- 
diff --git a/app-i18n/scim/scim-1.4.11.ebuild b/app-i18n/scim/scim-1.4.11.ebuild
deleted file mode 100644
index b06f08299d0a..000000000000
--- a/app-i18n/scim/scim-1.4.11.ebuild
+++ /dev/null
@@ -1,101 +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/scim-1.4.11.ebuild,v 1.3 2012/06/21 14:22:36 naota Exp $
-
-EAPI="3"
-inherit eutils flag-o-matic multilib
-
-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"
-
-RDEPEND="x11-libs/libX11
-	dev-libs/glib:2
-	x11-libs/gtk+:2
-	>=dev-libs/atk-1
-	>=x11-libs/pango-1
-	!app-i18n/scim-cvs"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen
-		>=app-text/docbook-xsl-stylesheets-1.73.1 )
-	dev-lang/perl
-	virtual/pkgconfig
-	>=dev-util/intltool-0.33
-	sys-devel/libtool"
-
-update_gtk_immodules() {
-	local GTK2_CONFDIR="/etc/gtk-2.0"
-	# bug #366889
-	if has_version '>=x11-libs/gtk+-2.22.1-r1:2' || has_multilib_profile ; then
-		GTK2_CONFDIR="${GTK2_CONFDIR}/$(get_abi_CHOST)"
-	fi
-	mkdir -p "${EPREFIX}${GTK2_CONFDIR}"
-
-	if [ -x "${EPREFIX}/usr/bin/gtk-query-immodules-2.0" ] ; then
-		"${EPREFIX}/usr/bin/gtk-query-immodules-2.0" > "${EPREFIX}${GTK2_CONFDIR}/gtk.immodules"
-	fi
-}
-
-src_configure() {
-	local myconf
-	# bug #83625
-	filter-flags -fvisibility-inlines-hidden
-	filter-flags -fvisibility=hidden
-
-	econf \
-		$(use_with doc doxygen) \
-		--enable-ld-version-script \
-		${myconf} || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	sed -e "s:@EPREFIX@:${EPREFIX}:" "${FILESDIR}/xinput-${PN}" > "${T}/${PN}.conf" || die
-	insinto /etc/X11/xinit/xinput.d
-	doins "${T}/${PN}.conf" || die
-
-	dodoc README AUTHORS ChangeLog docs/developers docs/scim.cfg || die
-	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 "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
-	elog "Please modify ${EPREFIX}/etc/scim/global and add your UTF-8 locale to"
-	elog "/SupportedUnicodeLocales entry."
-	elog
-	ewarn
-	ewarn "If you upgraded from scim-1.2.x or scim-1.0.x, you should remerge all SCIM modules."
-	ewarn
-
-	update_gtk_immodules
-}
-
-pkg_postrm() {
-	update_gtk_immodules
-}
diff --git a/app-i18n/scim/scim-1.4.9-r1.ebuild b/app-i18n/scim/scim-1.4.9-r1.ebuild
deleted file mode 100644
index f877cdf2abd8..000000000000
--- a/app-i18n/scim/scim-1.4.9-r1.ebuild
+++ /dev/null
@@ -1,108 +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/scim-1.4.9-r1.ebuild,v 1.16 2012/06/21 14:22:36 naota Exp $
-
-EAPI="2"
-inherit autotools eutils flag-o-matic multilib
-
-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="amd64 hppa ppc ppc64 x86 ~x86-fbsd"
-IUSE="doc"
-
-RDEPEND="x11-libs/libX11
-	dev-libs/glib:2
-	x11-libs/gtk+:2
-	>=dev-libs/atk-1
-	>=x11-libs/pango-1
-	!app-i18n/scim-cvs"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen
-		>=app-text/docbook-xsl-stylesheets-1.73.1 )
-	dev-lang/perl
-	virtual/pkgconfig
-	>=dev-util/intltool-0.33
-	sys-devel/libtool"
-
-pkg_setup() {
-	# bug #366889
-	if has_version '>=x11-libs/gtk+-2.22.1-r1:2' || has_multilib_profile ; then
-		GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
-	fi
-	GTK2_CONFDIR=${GTK2_CONFDIR:=/etc/gtk-2.0/}
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-1.4.7-syslibltdl.patch"
-	# bug #283317
-	epatch "${FILESDIR}/${PN}-fix-disappeared-status-icon.patch"
-	# remove m4/intltool.me to update it #417563
-	rm "${S}"/src/ltdl.{cpp,h} m4/intltool.m4 || die
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-	# bug #83625
-	filter-flags -fvisibility-inlines-hidden
-	filter-flags -fvisibility=hidden
-
-	# bug #191696
-	## 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
-}
-
-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 "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
-	elog "Please modify ${EPREFIX}/etc/scim/global and add your UTF-8 locale to"
-	elog "/SupportedUnicodeLocales entry."
-	elog
-	ewarn
-	ewarn "If you upgraded from scim-1.2.x or scim-1.0.x, you should remerge all SCIM modules."
-	ewarn
-
-	[ -x /usr/bin/gtk-query-immodules-2.0 ] && gtk-query-immodules-2.0 > "${ROOT}/${GTK2_CONFDIR}/gtk.immodules"
-}
-
-pkg_postrm() {
-	[ -x /usr/bin/gtk-query-immodules-2.0 ] && gtk-query-immodules-2.0 > "${ROOT}/${GTK2_CONFDIR}/gtk.immodules"
-}
diff --git a/app-i18n/scim/scim-1.4.9-r2.ebuild b/app-i18n/scim/scim-1.4.9-r2.ebuild
deleted file mode 100644
index 255d7ba856b5..000000000000
--- a/app-i18n/scim/scim-1.4.9-r2.ebuild
+++ /dev/null
@@ -1,110 +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/scim-1.4.9-r2.ebuild,v 1.4 2012/06/21 14:22:36 naota Exp $
-
-EAPI="3"
-inherit autotools eutils flag-o-matic multilib
-
-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"
-
-RDEPEND="x11-libs/libX11
-	dev-libs/glib:2
-	x11-libs/gtk+:2
-	>=dev-libs/atk-1
-	>=x11-libs/pango-1
-	!app-i18n/scim-cvs"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen
-		>=app-text/docbook-xsl-stylesheets-1.73.1 )
-	dev-lang/perl
-	virtual/pkgconfig
-	>=dev-util/intltool-0.33
-	sys-devel/libtool"
-
-update_gtk_immodules() {
-	local GTK2_CONFDIR="/etc/gtk-2.0"
-	# bug #366889
-	if has_version '>=x11-libs/gtk+-2.22.1-r1:2' || has_multilib_profile ; then
-		GTK2_CONFDIR="${GTK2_CONFDIR}/$(get_abi_CHOST)"
-	fi
-	mkdir -p "${EPREFIX}${GTK2_CONFDIR}"
-
-	if [ -x "${EPREFIX}/usr/bin/gtk-query-immodules-2.0" ] ; then
-		"${EPREFIX}/usr/bin/gtk-query-immodules-2.0" > "${EPREFIX}${GTK2_CONFDIR}/gtk.immodules"
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-1.4.7-syslibltdl.patch"
-	# bug #283317
-	epatch "${FILESDIR}/${PN}-fix-disappeared-status-icon.patch"
-	# remove m4/intltool.m4 to update it #417563
-	rm "${S}"/src/ltdl.{cpp,h} m4/intltool.m4 || die
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-	# bug #83625
-	filter-flags -fvisibility-inlines-hidden
-	filter-flags -fvisibility=hidden
-
-	econf \
-		$(use_with doc doxygen) \
-		--enable-ld-version-script \
-		${myconf} || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	sed -e "s:@EPREFIX@:${EPREFIX}:" "${FILESDIR}/xinput-${PN}" > "${T}/${PN}.conf" || die
-	insinto /etc/X11/xinit/xinput.d
-	doins "${T}/${PN}.conf" || die
-
-	dodoc README AUTHORS ChangeLog docs/developers docs/scim.cfg || die
-	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 "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
-	elog "Please modify ${EPREFIX}/etc/scim/global and add your UTF-8 locale to"
-	elog "/SupportedUnicodeLocales entry."
-	elog
-	ewarn
-	ewarn "If you upgraded from scim-1.2.x or scim-1.0.x, you should remerge all SCIM modules."
-	ewarn
-
-	update_gtk_immodules
-}
-
-pkg_postrm() {
-	update_gtk_immodules
-}