[gentoo-commits] repo/gentoo:master commit in: app-i18n/zhcon/, app-i18n/zhcon/files/

[Mikle Kolyada]

commit:     b774008eae9822d12210c750511fe97acaac5dac
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 25 10:12:27 2020 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Tue Feb 25 10:12:27 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b774008e

app-i18n/zhcon: remove last-rited pkg

Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>

 app-i18n/zhcon/Manifest                            |   2 -
 app-i18n/zhcon/files/zhcon-0.2.6+gcc-4.3.patch     | 185 ---------------------
 .../files/zhcon-0.2.6+linux-headers-2.6.26.patch   |  18 --
 app-i18n/zhcon/files/zhcon-0.2.6-amd64.patch       |  77 ---------
 .../zhcon/files/zhcon-0.2.6-automagic-fix.patch    |  36 ----
 app-i18n/zhcon/files/zhcon-0.2.6-curses.patch      |  22 ---
 .../zhcon/files/zhcon-0.2.6.configure.in.patch     |  11 --
 app-i18n/zhcon/files/zhcon-0.2.6.make-fix.patch    |  82 ---------
 app-i18n/zhcon/files/zhcon-0.2.6.sysconfdir.patch  |  24 ---
 app-i18n/zhcon/metadata.xml                        |  16 --
 app-i18n/zhcon/zhcon-0.2.6-r3.ebuild               |  58 -------
 11 files changed, 531 deletions(-)

diff --git a/app-i18n/zhcon/Manifest b/app-i18n/zhcon/Manifest
deleted file mode 100644
index bec7b2bc0c3..00000000000
--- a/app-i18n/zhcon/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST zhcon-0.2.5-to-0.2.6.diff.gz 2881 BLAKE2B eb7b3bc38ae77c7a0add2a0693822fb34a7721ec4224a5be6fc533f0c69878a66c123a12b2d38a09ab1a3360f3d1e0658ccaf35e138d102748675cd60f81df21 SHA512 c4725e600cde5a629735506c8eaa3b78df4606cd2745891a21c4f25889cff10b6fe4cbeb3cf60b85ad62ed0e46c8e7bbb802b7675f79f3a1d82f6942c393d4ad
-DIST zhcon-0.2.5.tar.gz 5011644 BLAKE2B 326add20cac0bab31c4a34a0261374f2daf8db84f0fafd774c3498c4ba42275a6258bac0b74447626e691c1e86bcd6e0a6408cb8d6af5c1ff2a8912b5dc3d411 SHA512 35f1517b649e5afe3156eb1aa7735f3d3a988fad08c433b8f343df6ba3fdef89493afe61488a76059e4bfa1db4455d21d0bde7041bab37eb50e5ab0b622218fa

diff --git a/app-i18n/zhcon/files/zhcon-0.2.6+gcc-4.3.patch b/app-i18n/zhcon/files/zhcon-0.2.6+gcc-4.3.patch
deleted file mode 100644
index beece66b1da..00000000000
--- a/app-i18n/zhcon/files/zhcon-0.2.6+gcc-4.3.patch
+++ /dev/null
@@ -1,185 +0,0 @@
-diff -NrU5 zhcon-0.2.6.orig/src/basefont.cpp zhcon-0.2.6/src/basefont.cpp
---- zhcon-0.2.6.orig/src/basefont.cpp	2008-04-29 23:15:08.000000000 +0200
-+++ zhcon-0.2.6/src/basefont.cpp	2008-04-29 23:15:37.000000000 +0200
-@@ -27,10 +27,12 @@
- #include "global.h"
- #include "debug.h"
- #include "hzdecoder.h"
- #include "basefont.h"
- 
-+#include <cstring>
-+
- BaseFont::BaseFont(string & fn, int w, int h)
- :mFd(0)
- ,mpBuf(0)
- ,mWidth(w)
- ,mHeight(h) {
-diff -NrU5 zhcon-0.2.6.orig/src/display/fblinear4.cpp zhcon-0.2.6/src/display/fblinear4.cpp
---- zhcon-0.2.6.orig/src/display/fblinear4.cpp	2008-04-29 23:15:08.000000000 +0200
-+++ zhcon-0.2.6/src/display/fblinear4.cpp	2008-04-29 23:15:37.000000000 +0200
-@@ -20,10 +20,12 @@
- #include <assert.h>
- #include <endian.h>
- #include "global.h"
- #include "fblinear4.h"
- 
-+#include <cstring>
-+
- __u16 FBLinear4::nibbletab_cfb4[] = {
- #if BYTE_ORDER == LITTLE_ENDIAN
- 0x0000,0xf000,0x0f00,0xff00,
- 0x00f0,0xf0f0,0x0ff0,0xfff0,
- 0x000f,0xf00f,0x0f0f,0xff0f,
-diff -NrU5 zhcon-0.2.6.orig/src/display/fblinear8.cpp zhcon-0.2.6/src/display/fblinear8.cpp
---- zhcon-0.2.6.orig/src/display/fblinear8.cpp	2008-04-29 23:15:08.000000000 +0200
-+++ zhcon-0.2.6/src/display/fblinear8.cpp	2008-04-29 23:15:37.000000000 +0200
-@@ -20,10 +20,12 @@
- #include <assert.h>
- #include <endian.h>
- #include "global.h"
- #include "fblinear8.h"
- 
-+#include <cstring>
-+
- __u32 FBLinear8::nibbletab_cfb8[] = {
- #if BYTE_ORDER == LITTLE_ENDIAN
- 0x00000000,0xff000000,0x00ff0000,0xffff0000,
- 0x0000ff00,0xff00ff00,0x00ffff00,0xffffff00,
- 0x000000ff,0xff0000ff,0x00ff00ff,0xffff00ff,
-diff -NrU5 zhcon-0.2.6.orig/src/display/fbvgaplanes.cpp zhcon-0.2.6/src/display/fbvgaplanes.cpp
---- zhcon-0.2.6.orig/src/display/fbvgaplanes.cpp	2008-04-29 23:15:08.000000000 +0200
-+++ zhcon-0.2.6/src/display/fbvgaplanes.cpp	2008-04-29 23:15:37.000000000 +0200
-@@ -36,10 +36,12 @@
-         : "a" ((char) value),
-         "d" ((unsigned short) port));
- }
- #endif
- 
-+#include <cstring>
-+
- /* based on kernel
-  * Force strict CPU ordering.
-  * And yes, this is required on UP too when we're talking
-  * to devices.
-  *
-diff -NrU5 zhcon-0.2.6.orig/src/display/vgadev.cpp zhcon-0.2.6/src/display/vgadev.cpp
---- zhcon-0.2.6.orig/src/display/vgadev.cpp	2008-04-29 23:15:08.000000000 +0200
-+++ zhcon-0.2.6/src/display/vgadev.cpp	2008-04-29 23:15:37.000000000 +0200
-@@ -35,10 +35,12 @@
- #include <cassert>
- #include "debug.h"
- #include "vgadev.h"
- #include "lrmi.h"
- 
-+#include <cstring>
-+
- #define GRAPH_BASE 0xA0000
- #define GRAPH_ADDR  0x3ce
- #define GRAPH_DATA  0x3cf
- 
- char *VGADev::mpBuf = NULL;
-diff -NrU5 zhcon-0.2.6.orig/src/graphdev.cpp zhcon-0.2.6/src/graphdev.cpp
---- zhcon-0.2.6.orig/src/graphdev.cpp	2008-04-29 23:15:08.000000000 +0200
-+++ zhcon-0.2.6/src/graphdev.cpp	2008-04-29 23:16:14.000000000 +0200
-@@ -24,20 +24,23 @@
- #include <fcntl.h>
- #include <sys/ioctl.h>
- #include <sys/mman.h>
- #include <assert.h>
- #include <iostream>
-+#include <cstdlib>
- #include "debug.h"
- 
- #include "display/fbdev.h"
- #include "display/vgadev.h"
- #if defined(linux) || defined(__FreeBSD__)
-     #ifdef HAVE_GGI_LIB
-     #include "display/libggi.h"
-     #endif
- #endif
- 
-+#include <cstring>
-+
- using namespace std;
- // mmap framebuffer address
- GraphDev *GraphDev::mpGraphDev = NULL;
- 
- // font
-diff -NrU5 zhcon-0.2.6.orig/src/inputclient.cpp zhcon-0.2.6/src/inputclient.cpp
---- zhcon-0.2.6.orig/src/inputclient.cpp	2008-04-29 23:15:08.000000000 +0200
-+++ zhcon-0.2.6/src/inputclient.cpp	2008-04-29 23:15:37.000000000 +0200
-@@ -14,10 +14,12 @@
-  *   the Free Software Foundation; either version 2 of the License, or     *
-  *   (at your option) any later version.                                   *
-  *                                                                         *
-  ***************************************************************************/
- 
-+#include <cstdlib>
-+
- #include "inputclient.h"
- 
- Console* InputClient::mpCon = NULL;
- InputClient::InputClient()
- : mVisible(false),
-diff -NrU5 zhcon-0.2.6.orig/src/inputmanager.cpp zhcon-0.2.6/src/inputmanager.cpp
---- zhcon-0.2.6.orig/src/inputmanager.cpp	2008-04-29 23:15:08.000000000 +0200
-+++ zhcon-0.2.6/src/inputmanager.cpp	2008-04-29 23:19:01.000000000 +0200
-@@ -22,10 +22,11 @@
- using namespace std;
- 
- #include <unistd.h>
- #include <sys/time.h>
- #include <string>
-+#include <cstdlib>
- 
- #include "global.h"
- #include "debug.h"
- #include "keymap.h"
- #include "console.h"
-diff -NrU5 zhcon-0.2.6.orig/src/inputmanager.h zhcon-0.2.6/src/inputmanager.h
---- zhcon-0.2.6.orig/src/inputmanager.h	2008-04-29 23:15:08.000000000 +0200
-+++ zhcon-0.2.6/src/inputmanager.h	2008-04-29 23:15:37.000000000 +0200
-@@ -24,10 +24,11 @@
-   *@author ejoy
-   */
- using namespace std;
- #include <cassert>
- #include <vector>
-+#include <sys/types.h>
- 
- #include "mouse.h"
- #if defined(__FreeBSD__)
-     #include <sys/kbio.h>
- #endif
-diff -NrU5 zhcon-0.2.6.orig/src/window.cpp zhcon-0.2.6/src/window.cpp
---- zhcon-0.2.6.orig/src/window.cpp	2008-04-29 23:15:08.000000000 +0200
-+++ zhcon-0.2.6/src/window.cpp	2008-04-29 23:15:37.000000000 +0200
-@@ -22,10 +22,12 @@
- #include <algorithm>
- #include "global.h"
- #include "debug.h"
- #include "window.h"
- 
-+#include <cstring>
-+
- //static members for all the windows
- Window* Window::mpConsole = NULL;
- char* Window::mpOverlaps = NULL;
- 
- Window::Window(int x1, int y1, int x2, int y2, int type)
-diff -NrU5 zhcon-0.2.6.orig/src/zhcon.cpp zhcon-0.2.6/src/zhcon.cpp
---- zhcon-0.2.6.orig/src/zhcon.cpp	2008-04-29 23:15:08.000000000 +0200
-+++ zhcon-0.2.6/src/zhcon.cpp	2008-04-29 23:15:37.000000000 +0200
-@@ -81,10 +81,12 @@
- #ifndef NDEBUG
- #include "debug.h"
- ofstream debug("debug");
- #endif
- 
-+#include <cstring>
-+
- Zhcon* Zhcon::mpZhcon = NULL;
- int Zhcon::mTtyPid = 0;
- Zhcon::STATE Zhcon::mState = STOP;
- 
- void Zhcon::SignalVtLeave(int signo) {

diff --git a/app-i18n/zhcon/files/zhcon-0.2.6+linux-headers-2.6.26.patch b/app-i18n/zhcon/files/zhcon-0.2.6+linux-headers-2.6.26.patch
deleted file mode 100644
index 67d5b961a07..00000000000
--- a/app-i18n/zhcon/files/zhcon-0.2.6+linux-headers-2.6.26.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/src/display/lrmi.c b/src/display/lrmi.c
-index 85c6fe6..5c74260 100644
---- a/src/display/lrmi.c
-+++ b/src/display/lrmi.c
-@@ -33,6 +33,13 @@ This software has NO WARRANTY.  Use it at your own risk.
- 
- #include "lrmi.h"
- 
-+#if defined(__linux__) && !defined(TF_MASK)
-+	#define TF_MASK X86_EFLAGS_TF
-+	#define IF_MASK X86_EFLAGS_IF
-+	#define VIF_MASK X86_EFLAGS_VIF
-+	#define IOPL_MASK X86_EFLAGS_IOPL
-+#endif
-+
- #define REAL_MEM_BASE 	((void *)0x10000)
- #define REAL_MEM_SIZE 	0x10000
- #define REAL_MEM_BLOCKS 	0x100

diff --git a/app-i18n/zhcon/files/zhcon-0.2.6-amd64.patch b/app-i18n/zhcon/files/zhcon-0.2.6-amd64.patch
deleted file mode 100644
index 58da5e99766..00000000000
--- a/app-i18n/zhcon/files/zhcon-0.2.6-amd64.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-diff --git a/src/winime.cpp b/src/winime.cpp
-index 0c52393..85729a3 100644
---- a/src/winime.cpp
-+++ b/src/winime.cpp
-@@ -56,10 +56,10 @@ mCandilistBufLen(0)
- 
-     memcpy(&mHead, mpBuf, sizeof(mHead));
-     int len = strlen(mHead.mCodeSet);
--    mpIndex1 = (char **) (mpBuf + sizeof(mHead));
--    mpIndex2 = (char **) (mpBuf + sizeof(mHead) + len * sizeof(char *));
--    mpText = mpBuf + sizeof(mHead) + len * sizeof(char *) +
--                len * len * sizeof(char *);
-+    mpIndex1 = (int *) (mpBuf + sizeof(mHead));
-+    mpIndex2 = (int *) (mpBuf + sizeof(mHead) + len * sizeof(int));
-+    mpText = mpBuf + sizeof(mHead) + len * sizeof(int) +
-+                len * len * sizeof(int);
- }
- 
- WinIme::~WinIme() {
-@@ -246,32 +246,33 @@ int WinIme::Search(char c) {
-             //                p = *t;
-         }
-         else
--            p = mpIndex1[Index(c)];
-+            p = (char *)mpIndex1[Index(c)];
- 
-         if (p == (char *) 0xffffffff)
-             found = false;
--        p = (unsigned int) p + mpText;
-+        p = (unsigned long) p + mpText;
-     } //2nd level index
-     else if (mNum == 1) {
-         int l = strlen(mHead.mCodeSet);
-         if (c == mHead.mWildChar) {
-             char **t;
-             t =
--                find_if(mpIndex2 + Index(mInput[0]) * l,
--                        mpIndex2 + (Index(mInput[0]) + 1) * l,
-+                find_if((char **)(mpIndex2 + Index(mInput[0]) * l),
-+                        (char **)(mpIndex2 + (Index(mInput[0]) + 1) * l),
-                         bind2nd(not_equal_to < char *>(),
-                                 (char *) 0xffffffff));
--            if (t == mpIndex2 + (Index(mInput[0]) + 1) * l)
-+            if (t == ((char **)mpIndex2) + (Index(mInput[0]) + 1) * l)
-                 p = (char *) 0xffffffff;
-             else
-                 p = *t;
--        } else
--            p = mpIndex2[Index(mInput[0]) * l + Index(c)];
-+        } else {
-+            int dd =  Index(mInput[0]) * l + Index(c);
-+            p = (char *)(mpIndex2[Index(mInput[0]) * l + Index(c)]);
-+        }
- 
-         if (p == (char *) 0xffffffff)
-             found = false;
--
--        p = (unsigned int) p + mpText;
-+        p = (unsigned long) p + mpText;
-     } else if (mNum < mHead.mMaxCodes) {
-         p = mpOffset[mNum - 1];
-         if (p == (char *) 0xffffffff)
-diff --git a/src/winime.h b/src/winime.h
-index c2f51ab..816a270 100644
---- a/src/winime.h
-+++ b/src/winime.h
-@@ -83,8 +83,8 @@ class WinIme {
-         char* mpOffset[12];
-         int mFd;
-         char* mpBuf;
--        char** mpIndex1;
--        char** mpIndex2;
-+        int *mpIndex1;
-+        int *mpIndex2;
-         char* mpText;
-         char* mpCur;                  //current search position
-         unsigned int mBufSize;

diff --git a/app-i18n/zhcon/files/zhcon-0.2.6-automagic-fix.patch b/app-i18n/zhcon/files/zhcon-0.2.6-automagic-fix.patch
deleted file mode 100644
index 5b4b24137f1..00000000000
--- a/app-i18n/zhcon/files/zhcon-0.2.6-automagic-fix.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- zhcon-0.2.5.orig/configure.in	2010-01-31 15:12:10.521592172 +0100
-+++ zhcon-0.2.5/configure.in	2010-01-31 15:12:33.939593092 +0100
-@@ -170,18 +170,25 @@
- dnl-----------------------------------------------------------------------
- dnl Checks for gpm
- dnl-----------------------------------------------------------------------
--usegpm="yes"
--AC_CHECK_HEADERS(gpm.h,,usegpm="no")
--AC_CHECK_LIB(gpm,Gpm_Open,,usegpm="no")
-+AC_ARG_WITH([gpm], AS_HELP_STRING([--without-gpm], [Build without gpm library (default: test)]))
-+
-+usegpm='no'
-+if test "x$with_gpm" != "xno"; then
-+    AC_CHECK_HEADERS(gpm.h,,AC_ERROR([gpm.h not found]))
-+    AC_CHECK_LIB(gpm,Gpm_Open,,AC_ERROR([libgpm not found]))
-+    usegpm='yes'
-+fi
- 
- dnl-----------------------------------------------------------------------
- dnl Checks for libggi
- dnl-----------------------------------------------------------------------
--useggi="yes"
--AC_CHECK_HEADERS(ggi/ggi.h,,useggi="no")
--AC_CHECK_LIB(ggi, main,,useggi="no")
--if test "$useggi" = 'yes';then
--	AC_DEFINE(HAVE_GGI_LIB)
-+AC_ARG_WITH([ggi], AS_HELP_STRING([--without-ggi], [Build without ggi library (default: test)]))
-+
-+useggi='no'
-+if test "x$with_ggi" != "xno"; then
-+    AC_CHECK_HEADERS(ggi/ggi.h,,AC_ERROR([ggi.h not found]))
-+    AC_CHECK_LIB(ggi, ggiInit,, AC_ERROR([libggi not found]))
-+    useggi='yes'
- fi
- 
- AC_OUTPUT([Makefile

diff --git a/app-i18n/zhcon/files/zhcon-0.2.6-curses.patch b/app-i18n/zhcon/files/zhcon-0.2.6-curses.patch
deleted file mode 100644
index cf8b07d3de4..00000000000
--- a/app-i18n/zhcon/files/zhcon-0.2.6-curses.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/configure.in b/configure.in
-index 63172e4..6c2afcc 100644
---- a/configure.in
-+++ b/configure.in
-@@ -132,7 +132,7 @@ fi
- AC_SUBST(ZHCON_LOCALE_DIR)
- 
- AC_CHECK_LIB(util, forkpty)
--AC_CHECK_LIB(curses, main)
-+AC_SEARCH_LIBS([tgetent], [tinfow tinfo cursesw curses ncursesw ncurses], [break;])
- 
- dnl for freebsd
- dnl AC_CHECK_LIB(c, i386_set_ioperm)
-@@ -172,7 +172,7 @@ dnl Checks for gpm
- dnl-----------------------------------------------------------------------
- usegpm="yes"
- AC_CHECK_HEADERS(gpm.h,,usegpm="no")
--AC_CHECK_LIB(gpm,main,,usegpm="no")
-+AC_CHECK_LIB(gpm,Gpm_Open,,usegpm="no")
- 
- dnl-----------------------------------------------------------------------
- dnl Checks for libggi

diff --git a/app-i18n/zhcon/files/zhcon-0.2.6.configure.in.patch b/app-i18n/zhcon/files/zhcon-0.2.6.configure.in.patch
deleted file mode 100644
index 0624a934e02..00000000000
--- a/app-i18n/zhcon/files/zhcon-0.2.6.configure.in.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.in	2006-06-22 13:02:59.197841560 +0800
-+++ b/configure.in	2006-06-22 12:48:59.000000000 +0800
-@@ -55,7 +55,7 @@
- 
- CFLAGS="$CFLAGS -funsigned-char -O2" 
- CXXFLAGS="$CXXFLAGS -funsigned-char -O2"
--if test $enable_debug = 'yes';then
-+if test "x$enable_debug" = "xyes";then
-         CFLAGS="$CFLAGS -O0 -g3 -Wall" 
-         CXXFLAGS="$CXXFLAGS -O0 -g3 -Wall" 
- else

diff --git a/app-i18n/zhcon/files/zhcon-0.2.6.make-fix.patch b/app-i18n/zhcon/files/zhcon-0.2.6.make-fix.patch
deleted file mode 100644
index ccde407ef81..00000000000
--- a/app-i18n/zhcon/files/zhcon-0.2.6.make-fix.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-diff -Naur zhcon-0.2.5.orig/doc/Makefile.am zhcon-0.2.5/doc/Makefile.am
---- zhcon-0.2.5.orig/doc/Makefile.am	2006-05-03 02:57:18.000000000 +0900
-+++ zhcon-0.2.5/doc/Makefile.am	2011-01-25 18:08:26.483746175 +0900
-@@ -3,8 +3,8 @@
- EXTRA_DIST = zhcon.1.in poem.big5 poem.gb poem.gb.utf8 bpsf.txt manual.tex manual.dvi manual.ps README.html default.css html.tar.gz
- 
- install-data-local:
--	$(mkinstalldirs) $(mandir)/man1/
--	$(INSTALL_DATA) $(top_builddir)/doc/zhcon.1 $(mandir)/man1/zhcon.1
-+	$(mkinstalldirs) $(DESTDIR)$(mandir)/man1/
-+	$(INSTALL_DATA) $(top_builddir)/doc/zhcon.1 $(DESTDIR)$(mandir)/man1/zhcon.1
- 
- uninstall-local:
--	-rm -f $(mandir)/man1/zhcon.1
-+	-rm -f $(DESTDIR)$(mandir)/man1/zhcon.1
-diff -Naur zhcon-0.2.5.orig/font/Makefile.am zhcon-0.2.5/font/Makefile.am
---- zhcon-0.2.5.orig/font/Makefile.am	2006-04-25 01:39:04.000000000 +0900
-+++ zhcon-0.2.5/font/Makefile.am	2011-01-25 18:08:26.483746175 +0900
-@@ -1,8 +1,8 @@
- EXTRA_DIST = *.bpsf
- 
- install-data-local:
--	$(mkinstalldirs) $(libdir)/zhcon/font/
--	$(INSTALL_DATA) $(srcdir)/*.bpsf $(libdir)/zhcon/font/
-+	$(mkinstalldirs) $(DESTDIR)$(libdir)/zhcon/font/
-+	$(INSTALL_DATA) $(srcdir)/*.bpsf $(DESTDIR)$(libdir)/zhcon/font/
- 
- uninstall-local:
--	-rm -f $(libdir)/zhcon/font/*.bpsf
-+	-rm -f $(DESTDIR)$(libdir)/zhcon/font/*.bpsf
-diff -Naur zhcon-0.2.5.orig/input/Makefile.am zhcon-0.2.5/input/Makefile.am
---- zhcon-0.2.5.orig/input/Makefile.am	2006-04-25 01:38:44.000000000 +0900
-+++ zhcon-0.2.5/input/Makefile.am	2011-01-25 18:08:26.483746175 +0900
-@@ -1,8 +1,8 @@
- EXTRA_DIST = *.mb
- 
- install-data-local:
--	$(mkinstalldirs) $(libdir)/zhcon/input/
--	$(INSTALL_DATA) $(srcdir)/*.mb $(libdir)/zhcon/input/
-+	$(mkinstalldirs) $(DESTDIR)$(libdir)/zhcon/input/
-+	$(INSTALL_DATA) $(srcdir)/*.mb $(DESTDIR)$(libdir)/zhcon/input/
- 
- uninstall-local:
--	-rm -f $(libdir)/zhcon/input/*.mb
-+	-rm -f $(DESTDIR)$(libdir)/zhcon/input/*.mb
-diff -Naur zhcon-0.2.5.orig/src/Makefile.am zhcon-0.2.5/src/Makefile.am
---- zhcon-0.2.5.orig/src/Makefile.am	2006-05-03 02:12:41.000000000 +0900
-+++ zhcon-0.2.5/src/Makefile.am	2011-01-25 18:11:42.446555911 +0900
-@@ -7,15 +7,12 @@
- 
- SUBDIRS = display
- 
--install-exec-local:
--	chmod 4755 $(bindir)/zhcon
--
- install-data-local:
--	$(mkinstalldirs) $(prefix)/etc
--	$(INSTALL_DATA) $(srcdir)/zhcon.conf $(prefix)/etc/zhcon.conf
-+	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)
-+	$(INSTALL_DATA) $(srcdir)/zhcon.conf $(DESTDIR)$(sysconfdir)/zhcon.conf
- 
- uninstall-local:
--	-rm -f $(prefix)/etc/zhcon.conf
-+	-rm -f $(DESTDIR)$(sysconfdir)/zhcon.conf
- 
- # set the include path found by configure
- INCLUDES= $(all_includes)
-diff -Naur zhcon-0.2.5.orig/tools/Makefile.am zhcon-0.2.5/tools/Makefile.am
---- zhcon-0.2.5.orig/tools/Makefile.am	2006-04-25 01:38:46.000000000 +0900
-+++ zhcon-0.2.5/tools/Makefile.am	2011-01-25 18:04:22.701226453 +0900
-@@ -9,11 +9,6 @@
- #getbpsf_LDADD = -L/usr/X11R6/lib -lX11
- #getbpsf_CPPFLAGS = -I/usr/X11R6/include
- 
--LDFLAGS=
--CXXFLAGS=
--CCFLAGS=
--LIBS=
--
- EXTRA_DIST = README getbpsf.txt gpm-1.19.6-pty.diff\
-              gpm-1.19.6-patched.tar.gz
- 

diff --git a/app-i18n/zhcon/files/zhcon-0.2.6.sysconfdir.patch b/app-i18n/zhcon/files/zhcon-0.2.6.sysconfdir.patch
deleted file mode 100644
index 551d656dd6e..00000000000
--- a/app-i18n/zhcon/files/zhcon-0.2.6.sysconfdir.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ruN /src/Makefile.am /tmp/src/Makefile.am
---- a/src/Makefile.am	2006-06-22 12:35:01.531885552 +0800
-+++ b/src/Makefile.am	2006-06-22 12:31:44.000000000 +0800
-@@ -5,6 +5,8 @@
- 
- zhcon_LDADD = display/libdisplay.a
- 
-+zhcon_CPPFLAGS = -DSYSCONF_DIR=\"${sysconfdir}\"
-+
- SUBDIRS = display
- 
- install-exec-local:
-diff -ruN src/zhcon.cpp /tmp/src/zhcon.cpp
---- a/src/zhcon.cpp	2006-06-22 12:35:01.398905768 +0800
-+++ b/src/zhcon.cpp	2006-06-22 12:32:41.000000000 +0800
-@@ -123,7 +123,7 @@
-     string cfgfile = getenv("HOME");
-     cfgfile += "/.zhconrc";
-     if (access(cfgfile.c_str(), R_OK) != 0)
--        cfgfile = PREFIX "/etc/zhcon.conf";
-+        cfgfile = SYSCONF_DIR"/zhcon.conf";
- 
-     //for debug,a pause enable us to attach zhcon's pid in gdb
-     //char c;cin>>c;

diff --git a/app-i18n/zhcon/metadata.xml b/app-i18n/zhcon/metadata.xml
deleted file mode 100644
index b720aad5796..00000000000
--- a/app-i18n/zhcon/metadata.xml
+++ /dev/null
@@ -1,16 +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>
-	<longdescription>zhcon is a Fast double-byte virtual console for
-Chinese/Japanese/Korean (CJK) running under GNU/Linux and FreeBSD.
-It adds the ability of displaying and inputting CJK double-byte
-characters on console device. Currently Japanese display and input
-function seems to be broken.</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">zhcon</remote-id>
-	</upstream>
-</pkgmetadata>

diff --git a/app-i18n/zhcon/zhcon-0.2.6-r3.ebuild b/app-i18n/zhcon/zhcon-0.2.6-r3.ebuild
deleted file mode 100644
index e32f503d307..00000000000
--- a/app-i18n/zhcon/zhcon-0.2.6-r3.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit autotools
-
-MY_P="${P/6/5}"
-
-DESCRIPTION="A Fast CJK (Chinese/Japanese/Korean) Console Environment"
-HOMEPAGE="http://zhcon.sourceforge.net/"
-SRC_URI="mirror://sourceforge/zhcon/${MY_P}.tar.gz
-		mirror://sourceforge/zhcon/zhcon-0.2.5-to-0.2.6.diff.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ggi gpm"
-
-DEPEND="ggi? ( media-libs/libggi[X] )
-	gpm? ( sys-libs/gpm )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}.sysconfdir.patch
-	"${FILESDIR}"/${P}.configure.in.patch
-	"${FILESDIR}"/${P}+gcc-4.3.patch
-	"${FILESDIR}"/${P}+linux-headers-2.6.26.patch
-	"${FILESDIR}"/${P}-curses.patch
-	"${FILESDIR}"/${P}-amd64.patch
-	"${FILESDIR}"/${P}-automagic-fix.patch
-	"${FILESDIR}"/${P}.make-fix.patch
-)
-
-src_prepare() {
-	eapply "${WORKDIR}"/zhcon-0.2.5-to-0.2.6.diff
-	default
-	for f in $(grep -lir HAVE_GGI_LIB *); do
-		sed -i -e "s/HAVE_GGI_LIB/HAVE_LIBGGI/" "${f}" || die "sed failed"
-	done
-	# Required for newer automake
-	touch config.rpath || die
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_with ggi) \
-		$(use_with gpm)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc AUTHORS ChangeLog README NEWS TODO THANKS
-	dodoc README.BSD README.gpm README.utf8
-}