commit: a7f0128e58f11120526f06d7307e3127aef9601b Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Wed Jul 5 13:25:48 2017 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Wed Jul 5 13:35:41 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7f0128e
app-i18n/im-ja: Remove last-rited pkg, #608418 app-i18n/im-ja/Manifest | 1 - app-i18n/im-ja/files/im-ja-1.5-gentoo.patch | 30 ------- app-i18n/im-ja/files/im-ja-1.5-pofiles.patch | 17 ---- app-i18n/im-ja/files/im-ja-1.5-underlinking.patch | 18 ----- app-i18n/im-ja/files/xinput-im-ja | 7 -- app-i18n/im-ja/im-ja-1.5-r3.ebuild | 96 ----------------------- app-i18n/im-ja/metadata.xml | 22 ------ profiles/package.mask | 2 - 8 files changed, 193 deletions(-) diff --git a/app-i18n/im-ja/Manifest b/app-i18n/im-ja/Manifest deleted file mode 100644 index 14a67be26cd..00000000000 --- a/app-i18n/im-ja/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST im-ja-1.5.tar.gz 905539 SHA256 96f4ed82706a873bdade99a934a1a66431f146758837ed0f007e3c145649f780 SHA512 97c75aa5437b3f887d7004d87f4dd7e444fb2ad393af0117dab64fdef87c0a92b1a97c1934a8e1e67e6c1753ad78f1c9a67f5aca10710115a8b331aae4f17864 WHIRLPOOL c9d3cd722ce3b31cedfc75667d752a0df22fd3eda6e6f3421c5d381c86735e047c80db5c14b0b59a71d524b617276850fddc8b0378e18bbda825208381fa7700 diff --git a/app-i18n/im-ja/files/im-ja-1.5-gentoo.patch b/app-i18n/im-ja/files/im-ja-1.5-gentoo.patch deleted file mode 100644 index af78e77876f..00000000000 --- a/app-i18n/im-ja/files/im-ja-1.5-gentoo.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -Naur im-ja-1.5.orig/configure.in im-ja-1.5/configure.in ---- im-ja-1.5.orig/configure.in 2006-04-18 19:52:25.000000000 +0900 -+++ im-ja-1.5/configure.in 2009-10-19 08:19:22.000000000 +0900 -@@ -28,6 +28,7 @@ - PKG_CHECK_MODULES([GTK], gtk+-2.0 >= 2.4.0) - PKG_CHECK_MODULES([GCONF], gconf-2.0) - PKG_CHECK_MODULES([LIBGLADE], libglade-2.0 >= 2.4.0) -+PKG_CHECK_MODULES([LIBGNOMEUI], libgnomeui-2.0 >= 2.4.0) - - AM_GCONF_SOURCE_2 - -diff -Naur im-ja-1.5.orig/src/gnome-panel-applet/Makefile.am im-ja-1.5/src/gnome-panel-applet/Makefile.am ---- im-ja-1.5.orig/src/gnome-panel-applet/Makefile.am 2006-04-18 19:52:24.000000000 +0900 -+++ im-ja-1.5/src/gnome-panel-applet/Makefile.am 2009-10-19 08:21:24.000000000 +0900 -@@ -26,13 +26,14 @@ - -DIM_JA_LIBPROGDIR=\"$(libprogdir)\" \ - -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ - $(LIBPANELAPPLET_CFLAGS) \ -+ $(LIBGNOMEUI_CFLAGS) \ - @DEBUG_FLAGS@ \ - @DISABLE_CANNA_FLAG@ \ - @DISABLE_ANTHY_FLAG@ \ - @DISABLE_SKK_FLAG@ \ - @DISABLE_WNN_FLAG@ - --im_ja_applet_LDADD = $(LIBPANELAPPLET_LIBS) -+im_ja_applet_LDADD = $(LIBPANELAPPLET_LIBS) $(LIBGNOMEUI_LIBS) - - uidir = $(datadir)/gnome-2.0/ui - ui_DATA = GNOME_ImJaApplet.xml diff --git a/app-i18n/im-ja/files/im-ja-1.5-pofiles.patch b/app-i18n/im-ja/files/im-ja-1.5-pofiles.patch deleted file mode 100644 index 611cc61450d..00000000000 --- a/app-i18n/im-ja/files/im-ja-1.5-pofiles.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/po/POTFILES.in b/po/POTFILES.in -index a52fa9a..7fac135 100644 ---- a/po/POTFILES.in -+++ b/po/POTFILES.in -@@ -3,10 +3,12 @@ gnome/im-ja.desktop.in - src/actionmenu.c - src/candwin.c - src/conf.c -+src/eggtrayicon/eggtrayicon.c - src/gnome-panel-applet/GNOME_ImJaApplet.server.in.in - src/gnome-panel-applet/GNOME_ImJaApplet.xml - src/gnome-panel-applet/im-ja-applet.c - src/gtk/im-ja-gtk.c -+src/helper/im-ja-helper.c - src/im-ja-conf/im-ja-conf.c - src/im-ja-conf/im-ja-conf.glade - src/im-ja.c diff --git a/app-i18n/im-ja/files/im-ja-1.5-underlinking.patch b/app-i18n/im-ja/files/im-ja-1.5-underlinking.patch deleted file mode 100644 index adbc2144d23..00000000000 --- a/app-i18n/im-ja/files/im-ja-1.5-underlinking.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- src/xim/Makefile.am.old 2014-06-01 20:06:19.209885674 +0200 -+++ src/xim/Makefile.am 2014-06-01 20:06:27.020040088 +0200 -@@ -88,4 +88,4 @@ - @DISABLE_SKK_FLAG@ \ - @X_CFLAGS@ - im_ja_xim_server_LDADD = IMdkit/libXimd.a --im_ja_xim_server_LDFLAGS = @GTK_LIBS@ @GCONF_LIBS@ @X_LIBS@ @X_PRE_LIBS@ -lX11 @CANNA_LIBS@ @WNN_LIBS@ @ANTHY_LIBS@ -+im_ja_xim_server_LDFLAGS = @GTK_LIBS@ @GCONF_LIBS@ @X_LIBS@ @X_PRE_LIBS@ -lX11 -lm @CANNA_LIBS@ @WNN_LIBS@ @ANTHY_LIBS@ ---- src/helper/Makefile.am.old 2014-06-01 20:09:11.592293279 +0200 -+++ src/helper/Makefile.am 2014-06-01 20:09:24.454547489 +0200 -@@ -23,6 +23,6 @@ - @DISABLE_SKK_FLAG@ \ - @DISABLE_WNN_FLAG@ - --im_ja_helper_LDADD = @GTK_LIBS@ @GCONF_LIBS@ -+im_ja_helper_LDADD = @GTK_LIBS@ @GCONF_LIBS@ -lX11 - - diff --git a/app-i18n/im-ja/files/xinput-im-ja b/app-i18n/im-ja/files/xinput-im-ja deleted file mode 100644 index 6f76ec609ac..00000000000 --- a/app-i18n/im-ja/files/xinput-im-ja +++ /dev/null @@ -1,7 +0,0 @@ -XIM=im-ja-xim-server -XIM_PROGRAM="@EPREFIX@/usr/bin/im-ja-xim-server" -PREFERENCE_PROGRAM="@EPREFIX@/usr/bin/im-ja-conf" -ICON=im-ja-capplet -SHORT_DESC="im-ja" -GTK_IM_MODULE=im-ja -#QT_IM_MODULE=im-ja diff --git a/app-i18n/im-ja/im-ja-1.5-r3.ebuild b/app-i18n/im-ja/im-ja-1.5-r3.ebuild deleted file mode 100644 index 9cc1b423d50..00000000000 --- a/app-i18n/im-ja/im-ja-1.5-r3.ebuild +++ /dev/null @@ -1,96 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" -GNOME2_LA_PUNT="yes" -GCONF_DEBUG="no" - -inherit autotools gnome2 eutils multilib readme.gentoo - -DESCRIPTION="A Japanese input module for GTK2 and XIM" -HOMEPAGE="http://im-ja.sourceforge.net/"; -SRC_URI="http://im-ja.sourceforge.net/${P}.tar.gz - http://im-ja.sourceforge.net/old/${P}.tar.gz"; - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc x86" -IUSE="canna freewnn skk anthy" -# --enable-debug causes build failure with gtk+-2.4 -#IUSE="${IUSE} debug" - -RDEPEND=" - >=dev-libs/glib-2.4:2 - >=dev-libs/atk-1.6 - >=x11-libs/gtk+-2.4:2 - >=x11-libs/pango-1.2.1 - >=gnome-base/gconf-2.4:2 - >=gnome-base/libglade-2.4:2.0 - >=gnome-base/libgnomeui-2.4 - freewnn? ( app-i18n/freewnn ) - canna? ( app-i18n/canna ) - skk? ( virtual/skkserv ) - anthy? ( app-i18n/anthy ) -" -DEPEND="${RDEPEND} - dev-lang/perl - dev-util/intltool - dev-perl/URI - virtual/pkgconfig -" - -DISABLE_AUTOFORMATTING="yes" -DOC_CONTENTS="This version of im-ja comes with experimental XIM support. -If you'd like to try it out, run im-ja-xim-server and set -environment variable XMODIFIERS to @im=im-ja-xim-server -e.g.) -$ export XMODIFIERS=@im=im-ja-xim-server (sh) -> setenv XMODIFIERS @im=im-ja-xim-server (csh)" - -src_prepare() { - epatch "${FILESDIR}/${P}-gentoo.patch" \ - "${FILESDIR}"/${P}-pofiles.patch \ - "${FILESDIR}/${P}-underlinking.patch" - - sed -ie 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.in || die - - eautoreconf - gnome2_src_prepare -} - -src_configure() { - local myconf - # You cannot use `use_enable ...` here. im-ja's configure script - # doesn't distinguish --enable-canna from --disable-canna, so - # --enable-canna stands for --disable-canna in the script ;-( - use canna || myconf="$myconf --disable-canna" - use freewnn || myconf="$myconf --disable-wnn" - use anthy || myconf="$myconf --disable-anthy" - use skk || myconf="$myconf --disable-skk" - #use debug && myconf="$myconf --enable-debug" - - gnome2_src_configure \ - --disable-gnome \ - $myconf -} - -src_install() { - gnome2_src_install - - sed -e "s:@EPREFIX@:${EPREFIX}:" "${FILESDIR}/xinput-${PN}" > "${T}/${PN}.conf" || die - insinto /etc/X11/xinit/xinput.d - doins "${T}/${PN}.conf" - - readme.gentoo_create_doc -} - -pkg_postinst() { - gnome2_query_immodules_gtk2 - gnome2_pkg_postinst - readme.gentoo_print_elog -} - -pkg_postrm() { - gnome2_query_immodules_gtk2 - gnome2_pkg_postrm -} diff --git a/app-i18n/im-ja/metadata.xml b/app-i18n/im-ja/metadata.xml deleted file mode 100644 index c127b90d8fd..00000000000 --- a/app-i18n/im-ja/metadata.xml +++ /dev/null @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <maintainer type="project"> - <email>c...@gentoo.org</email> - <name>Cjk</name> - </maintainer> - <longdescription> - IM-JA is a Japanese input module for GTK+2. It supports kanji - conversion using either the Canna or the (Free)Wnn kanji conversion - engine. IM-JA can also do kanji character recognition, you can draw - kanji into a widget using the mouse. This feature is based on the - KanjiPad application which has been enhanced in IM-JA. - </longdescription> - <use> - <flag name="anthy">Support for Anthy input method</flag> - <flag name="skk">Support for SKK input method</flag> - </use> - <upstream> - <remote-id type="sourceforge">im-ja</remote-id> - </upstream> -</pkgmetadata> diff --git a/profiles/package.mask b/profiles/package.mask index 3a02331e234..7a7b6f9bccd 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -321,9 +321,7 @@ sci-chemistry/gamessq # Abandoned upstream. Require obsolete GNOME libraries. Multiple # alternatives exist. Removal in 30 days. # app-dicts/gjiten -- bug #608404; alternative: app-dicts/gwaei -# app-i18n/im-ja -- bug #608418. app-dicts/gjiten -app-i18n/im-ja # Michał Górny <mgo...@gentoo.org> (05 Jun 2017) # (on behalf of Treecleaner project)
