[gentoo-commits] repo/gentoo:master commit in: app-i18n/x-unikey/, app-i18n/x-unikey/files/, profiles/

[David Seifert]

commit:     b3c1f7cd01ea842f4e081a092f897e1981b425b6
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 17 07:49:43 2017 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Mon Apr 17 07:49:43 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3c1f7cd

app-i18n/x-unikey: Remove from tree

 app-i18n/x-unikey/Manifest                         |  1 -
 app-i18n/x-unikey/files/01x-unikey                 |  9 ---
 app-i18n/x-unikey/files/x-unikey-1.0.4-gcc43.patch | 12 ----
 app-i18n/x-unikey/files/x-unikey-1.0.4-gcc44.patch | 31 ---------
 .../x-unikey/files/x-unikey-1.0.4-gentoo.patch     | 20 ------
 app-i18n/x-unikey/metadata.xml                     | 11 ----
 app-i18n/x-unikey/x-unikey-1.0.4-r2.ebuild         | 77 ----------------------
 profiles/package.mask                              |  1 -
 8 files changed, 162 deletions(-)

diff --git a/app-i18n/x-unikey/Manifest b/app-i18n/x-unikey/Manifest
deleted file mode 100644
index be3c40cefd4..00000000000
--- a/app-i18n/x-unikey/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST x-unikey-1.0.4.tar.bz2 561391 SHA256 aa7dd444853538bcba0f24c4c19692c34d4553a1df213a260c2628a7116b2dd9 SHA512 47abe4087957c4926550a0121d5cdc7b760f39691fae91c8e0562fc0f4577c22a04192667d362c9838b87fd97d2111afef1260fc88d8234bc5656bab248b5b06 WHIRLPOOL 144788e4a43e55c5a30fbb11eba6953d147823d3229550cbec370d583fd1a74e97f68c3e14b1988074788561f4e0adb836829f06ab88b1f725051dd3840256d9

diff --git a/app-i18n/x-unikey/files/01x-unikey b/app-i18n/x-unikey/files/01x-unikey
deleted file mode 100644
index 595b6a183b5..00000000000
--- a/app-i18n/x-unikey/files/01x-unikey
+++ /dev/null
@@ -1,9 +0,0 @@
-# x-unikey works only with *.UTF-8 locales
-#LANG=en_US.UTF-8
-
-# Uncomment this if you use XIM.
-#GTK_IM_MODULE="xim"
-#XMODIFIERS="@im=unikey"
-
-# If you use unikey-gtk only, then comment this
-#GTK_IM_MODULE="unikey"

diff --git a/app-i18n/x-unikey/files/x-unikey-1.0.4-gcc43.patch b/app-i18n/x-unikey/files/x-unikey-1.0.4-gcc43.patch
deleted file mode 100644
index c7e46ff686b..00000000000
--- a/app-i18n/x-unikey/files/x-unikey-1.0.4-gcc43.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur x-unikey-1.0.4.orig/src/ukengine/usrkeymap.cpp x-unikey-1.0.4/src/ukengine/usrkeymap.cpp
---- x-unikey-1.0.4.orig/src/ukengine/usrkeymap.cpp	2008-12-18 00:39:38.000000000 +0900
-+++ x-unikey-1.0.4/src/ukengine/usrkeymap.cpp	2008-12-18 00:38:56.000000000 +0900
-@@ -23,6 +23,8 @@
- 
- #include "stdafx.h"
- #include <iostream>
-+#include <cstring>
-+
- using namespace std;
- 
- #include <ctype.h>

diff --git a/app-i18n/x-unikey/files/x-unikey-1.0.4-gcc44.patch b/app-i18n/x-unikey/files/x-unikey-1.0.4-gcc44.patch
deleted file mode 100644
index 5e59ca131b7..00000000000
--- a/app-i18n/x-unikey/files/x-unikey-1.0.4-gcc44.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -ur x-unikey-1.0.4.orig/src/ukengine/mactab.cpp x-unikey-1.0.4/src/ukengine/mactab.cpp
---- x-unikey-1.0.4.orig/src/ukengine/mactab.cpp	2006-04-09 14:46:02.000000000 +0300
-+++ x-unikey-1.0.4/src/ukengine/mactab.cpp	2009-08-10 14:50:50.000000000 +0300
-@@ -287,7 +287,7 @@
-   char key[MAX_MACRO_KEY_LEN];
-   
-   // Parse the input item
--  char * pos = strchr(item, ':');
-+  const char * pos = strchr(item, ':');
-   if (pos == NULL)
-     return -1;
-   int keyLen = (int)(pos - item);
-diff -ur x-unikey-1.0.4.orig/src/ukengine/usrkeymap.cpp x-unikey-1.0.4/src/ukengine/usrkeymap.cpp
---- x-unikey-1.0.4.orig/src/ukengine/usrkeymap.cpp	2006-04-09 02:31:40.000000000 +0300
-+++ x-unikey-1.0.4/src/ukengine/usrkeymap.cpp	2009-08-10 14:48:44.000000000 +0300
-@@ -21,6 +21,8 @@
-  * Boston, MA 02111-1307, USA.
-  */
- 
-+#include <stdio.h>
-+
- #include "stdafx.h"
- #include <iostream>
- using namespace std;
-@@ -262,4 +264,4 @@
-             return i;
-     }
-     return -1;
--}
-\ No newline at end of file
-+}

diff --git a/app-i18n/x-unikey/files/x-unikey-1.0.4-gentoo.patch b/app-i18n/x-unikey/files/x-unikey-1.0.4-gentoo.patch
deleted file mode 100644
index e3bef43b98b..00000000000
--- a/app-i18n/x-unikey/files/x-unikey-1.0.4-gentoo.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- x-unikey-1.0.4.orig/src/unikey-gtk/Makefile.am	2005-10-16 12:39:15.000000000 +0900
-+++ x-unikey-1.0.4/src/unikey-gtk/Makefile.am	2008-12-18 00:48:37.000000000 +0900
-@@ -34,7 +34,7 @@
- 
- install-data-hook:
- 	gtk-query-immodules-2.0 \
--	> @gtk_sysconfdir@/gtk.immodules
-+	> $(DESTDIR)@gtk_sysconfdir@/gtk.immodules
- 
- ##	$(moduledir)/im-vn.la \
- ##	@GTK_PREFIX@/lib/gtk-2.0/@GTK_VERSION@/immodules/*.la \
-@@ -42,7 +42,7 @@
- 
- uninstall-hook:
- 	gtk-query-immodules-2.0 > \
--	@gtk_sysconfdir@/gtk.immodules
-+	$(DESTDIR)@gtk_sysconfdir@/gtk.immodules
- ##	@GTK_PREFIX@/lib/gtk-2.0/@GTK_VERSION@/immodules/*.la \
- 
- 

diff --git a/app-i18n/x-unikey/metadata.xml b/app-i18n/x-unikey/metadata.xml
deleted file mode 100644
index 7d34bdcad69..00000000000
--- a/app-i18n/x-unikey/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>cjk@g.o</email>
-		<name>Cjk</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">unikey</remote-id>
-	</upstream>
-</pkgmetadata>

diff --git a/app-i18n/x-unikey/x-unikey-1.0.4-r2.ebuild b/app-i18n/x-unikey/x-unikey-1.0.4-r2.ebuild
deleted file mode 100644
index ce41d759bf7..00000000000
--- a/app-i18n/x-unikey/x-unikey-1.0.4-r2.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils multilib gnome2-utils
-
-DESCRIPTION="Vietnamese X Input Method"
-HOMEPAGE="http://www.unikey.org/"
-SRC_URI="mirror://sourceforge/unikey/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
-IUSE="nls gtk"
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libSM
-	x11-libs/libICE
-	gtk? ( >=x11-libs/gtk+-2.2:2 )
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	dev-libs/glib
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-pkg_setup() {
-	# An arch specific config directory is used on multilib systems
-	has_multilib_profile && GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
-	GTK2_CONFDIR=${GTK2_CONFDIR:=/etc/gtk-2.0/}
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gcc43.patch \
-		"${FILESDIR}"/${P}-gcc44.patch \
-		"${FILESDIR}"/${P}-gentoo.patch
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-	# --with-gtk-sysconfdir to prevent sandbox violation only
-	use gtk && myconf="--with-unikey-gtk --with-gtk-sysconfdir=${GTK2_CONFDIR}"
-	econf ${myconf}
-}
-
-src_install() {
-	if use gtk;then
-		dodir "${GTK2_CONFDIR}"
-#		emake DESTDIR="${D}" install -C src/unikey-gtk || die
-	fi
-#	dobin src/xim/ukxim src/gui/unikey
-	emake DESTDIR="${D}" install
-	doenvd "${FILESDIR}/01x-unikey"
-
-	dodoc AUTHORS CREDITS ChangeLog NEWS README TODO
-	cd doc
-	dodoc README1ST keymap-syntax manual options ukmacro \
-		unikey-manual-0.9.pdf unikey.png unikeyrc
-}
-
-pkg_postinst() {
-	elog
-	elog "Go to /etc/env.d/01x-unikey and uncomment appropriate lines"
-	elog "to enable x-unikey"
-	elog
-	if use gtk; then
-		gnome2_query_immodules_gtk2
-		elog "If you want to use x-unikey as the default gtk+ input method,"
-		elog "change GTK_IM_MODULE in /etc/env.d/01x-unikey to \"unikey\""
-		elog
-	fi
-}
-
-pkg_postrm() {
-	use gtk && gnome2_query_immodules_gtk2
-}

diff --git a/profiles/package.mask b/profiles/package.mask
index 64c6844c435..8f37bb70b3d 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -187,7 +187,6 @@ dev-java/swidgets
 # invokes undefined behaviour, last release in 2004.
 # Masked for removal in 30 days. Bug #593942, #593976.
 app-text/uvconv
-app-i18n/x-unikey
 
 # Michael Palimaka <kensington@g.o> (11 Mar 2017)
 # Fails to build. Dead upstream.