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

2020-02-25 Thread Mikle Kolyada 
commit: b774008eae9822d12210c750511fe97acaac5dac
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Tue Feb 25 10:12:27 2020 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Tue Feb 25 10:12:27 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b774008e

app-i18n/zhcon: remove last-rited pkg

Signed-off-by: Mikle Kolyada  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..000
--- 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..000
--- 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.0 +0200
-+++ zhcon-0.2.6/src/basefont.cpp   2008-04-29 23:15:37.0 +0200
-@@ -27,10 +27,12 @@
- #include "global.h"
- #include "debug.h"
- #include "hzdecoder.h"
- #include "basefont.h"
- 
-+#include 
-+
- 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.0 
+0200
-+++ zhcon-0.2.6/src/display/fblinear4.cpp  2008-04-29 23:15:37.0 
+0200
-@@ -20,10 +20,12 @@
- #include 
- #include 
- #include "global.h"
- #include "fblinear4.h"
- 
-+#include 
-+
- __u16 FBLinear4::nibbletab_cfb4[] = {
- #if BYTE_ORDER == LITTLE_ENDIAN
- 0x,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.0 
+0200
-+++ zhcon-0.2.6/src/display/fblinear8.cpp  2008-04-29 23:15:37.0 
+0200
-@@ -20,10 +20,12 @@
- #include 
- #include 
- #include "global.h"
- #include "fblinear8.h"
- 
-+#include 
-+
- __u32 FBLinear8::nibbletab_cfb8[] = {
- #if BYTE_ORDER == LITTLE_ENDIAN
- 0x,0xff00,0x00ff,0x,
- 0xff00,0xff00ff00,0x0000,0xff00,
- 0x00ff,0xffff,0x00ff00ff,0x00ff,
-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.0 +0200
-+++ zhcon-0.2.6/src/display/fbvgaplanes.cpp2008-04-29 23:15:37.0 
+0200
-@@ -36,10 +36,12 @@
- : "a" ((char) value),
- "d" ((unsigned short) port));
- }
- #endif
- 
-+#include 
-+
- /* 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.cpp2008-04-29 23:15:08.0 
+0200
-+++ zhcon-0.2.6/src/display/vgadev.cpp 2008-04-29 23:15:37.0 +0200
-@@ -35,10 +35,12 @@
- #include 
- #include "debug.h"
- #include "vgadev.h"
- #include "lrmi.h"
- 
-+#include 
-+
- #define GRAPH_BASE 0xA
- #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.0 +0200
-+++ zhcon-0.2.6/src/graphdev.cpp   2008-04-29 23:16:14.

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

2019-03-22 Thread Lars Wendler 
commit: 09ffa628956892f94fefc5ca1f2236eca23e361c
Author: Lars Wendler  gentoo  org>
AuthorDate: Fri Mar 22 11:11:22 2019 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Fri Mar 22 11:12:01 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09ffa628

app-i18n/zhcon: Fixed build with sys-libs/ncurses[tinfo]

Closes: https://bugs.gentoo.org/526256
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Lars Wendler  gentoo.org>

 app-i18n/zhcon/files/zhcon-0.2.6-curses.patch | 2 +-
 app-i18n/zhcon/zhcon-0.2.6-r3.ebuild  | 9 +
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app-i18n/zhcon/files/zhcon-0.2.6-curses.patch 
b/app-i18n/zhcon/files/zhcon-0.2.6-curses.patch
index 200014e1d71..cf8b07d3de4 100644
--- a/app-i18n/zhcon/files/zhcon-0.2.6-curses.patch
+++ b/app-i18n/zhcon/files/zhcon-0.2.6-curses.patch
@@ -7,7 +7,7 @@ index 63172e4..6c2afcc 100644
  
  AC_CHECK_LIB(util, forkpty)
 -AC_CHECK_LIB(curses, main)
-+AC_SEARCH_LIBS([tgetent], [cursesw curses ncursesw ncurses], [break;])
++AC_SEARCH_LIBS([tgetent], [tinfow tinfo cursesw curses ncursesw ncurses], 
[break;])
  
  dnl for freebsd
  dnl AC_CHECK_LIB(c, i386_set_ioperm)

diff --git a/app-i18n/zhcon/zhcon-0.2.6-r3.ebuild 
b/app-i18n/zhcon/zhcon-0.2.6-r3.ebuild
index f428d22d614..e32f503d307 100644
--- a/app-i18n/zhcon/zhcon-0.2.6-r3.ebuild
+++ b/app-i18n/zhcon/zhcon-0.2.6-r3.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
-WANT_AUTOMAKE="1.9"
 
-inherit autotools eutils
+inherit autotools
 
 MY_P="${P/6/5}"
 
@@ -36,11 +35,13 @@ PATCHES=(
 )
 
 src_prepare() {
-   epatch "${DISTDIR}"/zhcon-0.2.5-to-0.2.6.diff.gz
+   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
 }

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

2019-03-22 Thread Lars Wendler 
commit: 09ffa628956892f94fefc5ca1f2236eca23e361c
Author: Lars Wendler  gentoo  org>
AuthorDate: Fri Mar 22 11:11:22 2019 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Fri Mar 22 11:12:01 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09ffa628

app-i18n/zhcon: Fixed build with sys-libs/ncurses[tinfo]

Closes: https://bugs.gentoo.org/526256
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Lars Wendler  gentoo.org>

 app-i18n/zhcon/files/zhcon-0.2.6-curses.patch | 2 +-
 app-i18n/zhcon/zhcon-0.2.6-r3.ebuild  | 9 +
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app-i18n/zhcon/files/zhcon-0.2.6-curses.patch 
b/app-i18n/zhcon/files/zhcon-0.2.6-curses.patch
index 200014e1d71..cf8b07d3de4 100644
--- a/app-i18n/zhcon/files/zhcon-0.2.6-curses.patch
+++ b/app-i18n/zhcon/files/zhcon-0.2.6-curses.patch
@@ -7,7 +7,7 @@ index 63172e4..6c2afcc 100644
  
  AC_CHECK_LIB(util, forkpty)
 -AC_CHECK_LIB(curses, main)
-+AC_SEARCH_LIBS([tgetent], [cursesw curses ncursesw ncurses], [break;])
++AC_SEARCH_LIBS([tgetent], [tinfow tinfo cursesw curses ncursesw ncurses], 
[break;])
  
  dnl for freebsd
  dnl AC_CHECK_LIB(c, i386_set_ioperm)

diff --git a/app-i18n/zhcon/zhcon-0.2.6-r3.ebuild 
b/app-i18n/zhcon/zhcon-0.2.6-r3.ebuild
index f428d22d614..e32f503d307 100644
--- a/app-i18n/zhcon/zhcon-0.2.6-r3.ebuild
+++ b/app-i18n/zhcon/zhcon-0.2.6-r3.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
-WANT_AUTOMAKE="1.9"
 
-inherit autotools eutils
+inherit autotools
 
 MY_P="${P/6/5}"
 
@@ -36,11 +35,13 @@ PATCHES=(
 )
 
 src_prepare() {
-   epatch "${DISTDIR}"/zhcon-0.2.5-to-0.2.6.diff.gz
+   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
 }

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

2020-02-25 Thread Mikle Kolyada 
commit: b774008eae9822d12210c750511fe97acaac5dac
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Tue Feb 25 10:12:27 2020 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Tue Feb 25 10:12:27 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b774008e

app-i18n/zhcon: remove last-rited pkg

Signed-off-by: Mikle Kolyada  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..000
--- 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..000
--- 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.0 +0200
-+++ zhcon-0.2.6/src/basefont.cpp   2008-04-29 23:15:37.0 +0200
-@@ -27,10 +27,12 @@
- #include "global.h"
- #include "debug.h"
- #include "hzdecoder.h"
- #include "basefont.h"
- 
-+#include 
-+
- 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.0 
+0200
-+++ zhcon-0.2.6/src/display/fblinear4.cpp  2008-04-29 23:15:37.0 
+0200
-@@ -20,10 +20,12 @@
- #include 
- #include 
- #include "global.h"
- #include "fblinear4.h"
- 
-+#include 
-+
- __u16 FBLinear4::nibbletab_cfb4[] = {
- #if BYTE_ORDER == LITTLE_ENDIAN
- 0x,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.0 
+0200
-+++ zhcon-0.2.6/src/display/fblinear8.cpp  2008-04-29 23:15:37.0 
+0200
-@@ -20,10 +20,12 @@
- #include 
- #include 
- #include "global.h"
- #include "fblinear8.h"
- 
-+#include 
-+
- __u32 FBLinear8::nibbletab_cfb8[] = {
- #if BYTE_ORDER == LITTLE_ENDIAN
- 0x,0xff00,0x00ff,0x,
- 0xff00,0xff00ff00,0x0000,0xff00,
- 0x00ff,0xffff,0x00ff00ff,0x00ff,
-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.0 +0200
-+++ zhcon-0.2.6/src/display/fbvgaplanes.cpp2008-04-29 23:15:37.0 
+0200
-@@ -36,10 +36,12 @@
- : "a" ((char) value),
- "d" ((unsigned short) port));
- }
- #endif
- 
-+#include 
-+
- /* 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.cpp2008-04-29 23:15:08.0 
+0200
-+++ zhcon-0.2.6/src/display/vgadev.cpp 2008-04-29 23:15:37.0 +0200
-@@ -35,10 +35,12 @@
- #include 
- #include "debug.h"
- #include "vgadev.h"
- #include "lrmi.h"
- 
-+#include 
-+
- #define GRAPH_BASE 0xA
- #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.0 +0200
-+++ zhcon-0.2.6/src/graphdev.cpp   2008-04-29 23:16:14.

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

2019-03-22 Thread Lars Wendler 
commit: 09ffa628956892f94fefc5ca1f2236eca23e361c
Author: Lars Wendler  gentoo  org>
AuthorDate: Fri Mar 22 11:11:22 2019 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Fri Mar 22 11:12:01 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09ffa628

app-i18n/zhcon: Fixed build with sys-libs/ncurses[tinfo]

Closes: https://bugs.gentoo.org/526256
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Lars Wendler  gentoo.org>

 app-i18n/zhcon/files/zhcon-0.2.6-curses.patch | 2 +-
 app-i18n/zhcon/zhcon-0.2.6-r3.ebuild  | 9 +
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app-i18n/zhcon/files/zhcon-0.2.6-curses.patch 
b/app-i18n/zhcon/files/zhcon-0.2.6-curses.patch
index 200014e1d71..cf8b07d3de4 100644
--- a/app-i18n/zhcon/files/zhcon-0.2.6-curses.patch
+++ b/app-i18n/zhcon/files/zhcon-0.2.6-curses.patch
@@ -7,7 +7,7 @@ index 63172e4..6c2afcc 100644
  
  AC_CHECK_LIB(util, forkpty)
 -AC_CHECK_LIB(curses, main)
-+AC_SEARCH_LIBS([tgetent], [cursesw curses ncursesw ncurses], [break;])
++AC_SEARCH_LIBS([tgetent], [tinfow tinfo cursesw curses ncursesw ncurses], 
[break;])
  
  dnl for freebsd
  dnl AC_CHECK_LIB(c, i386_set_ioperm)

diff --git a/app-i18n/zhcon/zhcon-0.2.6-r3.ebuild 
b/app-i18n/zhcon/zhcon-0.2.6-r3.ebuild
index f428d22d614..e32f503d307 100644
--- a/app-i18n/zhcon/zhcon-0.2.6-r3.ebuild
+++ b/app-i18n/zhcon/zhcon-0.2.6-r3.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
-WANT_AUTOMAKE="1.9"
 
-inherit autotools eutils
+inherit autotools
 
 MY_P="${P/6/5}"
 
@@ -36,11 +35,13 @@ PATCHES=(
 )
 
 src_prepare() {
-   epatch "${DISTDIR}"/zhcon-0.2.5-to-0.2.6.diff.gz
+   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
 }

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

2020-02-25 Thread Mikle Kolyada 
commit: b774008eae9822d12210c750511fe97acaac5dac
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Tue Feb 25 10:12:27 2020 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Tue Feb 25 10:12:27 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b774008e

app-i18n/zhcon: remove last-rited pkg

Signed-off-by: Mikle Kolyada  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..000
--- 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..000
--- 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.0 +0200
-+++ zhcon-0.2.6/src/basefont.cpp   2008-04-29 23:15:37.0 +0200
-@@ -27,10 +27,12 @@
- #include "global.h"
- #include "debug.h"
- #include "hzdecoder.h"
- #include "basefont.h"
- 
-+#include 
-+
- 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.0 
+0200
-+++ zhcon-0.2.6/src/display/fblinear4.cpp  2008-04-29 23:15:37.0 
+0200
-@@ -20,10 +20,12 @@
- #include 
- #include 
- #include "global.h"
- #include "fblinear4.h"
- 
-+#include 
-+
- __u16 FBLinear4::nibbletab_cfb4[] = {
- #if BYTE_ORDER == LITTLE_ENDIAN
- 0x,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.0 
+0200
-+++ zhcon-0.2.6/src/display/fblinear8.cpp  2008-04-29 23:15:37.0 
+0200
-@@ -20,10 +20,12 @@
- #include 
- #include 
- #include "global.h"
- #include "fblinear8.h"
- 
-+#include 
-+
- __u32 FBLinear8::nibbletab_cfb8[] = {
- #if BYTE_ORDER == LITTLE_ENDIAN
- 0x,0xff00,0x00ff,0x,
- 0xff00,0xff00ff00,0x0000,0xff00,
- 0x00ff,0xffff,0x00ff00ff,0x00ff,
-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.0 +0200
-+++ zhcon-0.2.6/src/display/fbvgaplanes.cpp2008-04-29 23:15:37.0 
+0200
-@@ -36,10 +36,12 @@
- : "a" ((char) value),
- "d" ((unsigned short) port));
- }
- #endif
- 
-+#include 
-+
- /* 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.cpp2008-04-29 23:15:08.0 
+0200
-+++ zhcon-0.2.6/src/display/vgadev.cpp 2008-04-29 23:15:37.0 +0200
-@@ -35,10 +35,12 @@
- #include 
- #include "debug.h"
- #include "vgadev.h"
- #include "lrmi.h"
- 
-+#include 
-+
- #define GRAPH_BASE 0xA
- #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.0 +0200
-+++ zhcon-0.2.6/src/graphdev.cpp   2008-04-29 23:16:14.

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

2020-02-25 Thread Mikle Kolyada 
commit: b774008eae9822d12210c750511fe97acaac5dac
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Tue Feb 25 10:12:27 2020 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Tue Feb 25 10:12:27 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b774008e

app-i18n/zhcon: remove last-rited pkg

Signed-off-by: Mikle Kolyada  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..000
--- 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..000
--- 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.0 +0200
-+++ zhcon-0.2.6/src/basefont.cpp   2008-04-29 23:15:37.0 +0200
-@@ -27,10 +27,12 @@
- #include "global.h"
- #include "debug.h"
- #include "hzdecoder.h"
- #include "basefont.h"
- 
-+#include 
-+
- 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.0 
+0200
-+++ zhcon-0.2.6/src/display/fblinear4.cpp  2008-04-29 23:15:37.0 
+0200
-@@ -20,10 +20,12 @@
- #include 
- #include 
- #include "global.h"
- #include "fblinear4.h"
- 
-+#include 
-+
- __u16 FBLinear4::nibbletab_cfb4[] = {
- #if BYTE_ORDER == LITTLE_ENDIAN
- 0x,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.0 
+0200
-+++ zhcon-0.2.6/src/display/fblinear8.cpp  2008-04-29 23:15:37.0 
+0200
-@@ -20,10 +20,12 @@
- #include 
- #include 
- #include "global.h"
- #include "fblinear8.h"
- 
-+#include 
-+
- __u32 FBLinear8::nibbletab_cfb8[] = {
- #if BYTE_ORDER == LITTLE_ENDIAN
- 0x,0xff00,0x00ff,0x,
- 0xff00,0xff00ff00,0x0000,0xff00,
- 0x00ff,0xffff,0x00ff00ff,0x00ff,
-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.0 +0200
-+++ zhcon-0.2.6/src/display/fbvgaplanes.cpp2008-04-29 23:15:37.0 
+0200
-@@ -36,10 +36,12 @@
- : "a" ((char) value),
- "d" ((unsigned short) port));
- }
- #endif
- 
-+#include 
-+
- /* 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.cpp2008-04-29 23:15:08.0 
+0200
-+++ zhcon-0.2.6/src/display/vgadev.cpp 2008-04-29 23:15:37.0 +0200
-@@ -35,10 +35,12 @@
- #include 
- #include "debug.h"
- #include "vgadev.h"
- #include "lrmi.h"
- 
-+#include 
-+
- #define GRAPH_BASE 0xA
- #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.0 +0200
-+++ zhcon-0.2.6/src/graphdev.cpp   2008-04-29 23:16:14.

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

2019-03-22 Thread Lars Wendler 
commit: 09ffa628956892f94fefc5ca1f2236eca23e361c
Author: Lars Wendler  gentoo  org>
AuthorDate: Fri Mar 22 11:11:22 2019 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Fri Mar 22 11:12:01 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09ffa628

app-i18n/zhcon: Fixed build with sys-libs/ncurses[tinfo]

Closes: https://bugs.gentoo.org/526256
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Lars Wendler  gentoo.org>

 app-i18n/zhcon/files/zhcon-0.2.6-curses.patch | 2 +-
 app-i18n/zhcon/zhcon-0.2.6-r3.ebuild  | 9 +
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app-i18n/zhcon/files/zhcon-0.2.6-curses.patch 
b/app-i18n/zhcon/files/zhcon-0.2.6-curses.patch
index 200014e1d71..cf8b07d3de4 100644
--- a/app-i18n/zhcon/files/zhcon-0.2.6-curses.patch
+++ b/app-i18n/zhcon/files/zhcon-0.2.6-curses.patch
@@ -7,7 +7,7 @@ index 63172e4..6c2afcc 100644
  
  AC_CHECK_LIB(util, forkpty)
 -AC_CHECK_LIB(curses, main)
-+AC_SEARCH_LIBS([tgetent], [cursesw curses ncursesw ncurses], [break;])
++AC_SEARCH_LIBS([tgetent], [tinfow tinfo cursesw curses ncursesw ncurses], 
[break;])
  
  dnl for freebsd
  dnl AC_CHECK_LIB(c, i386_set_ioperm)

diff --git a/app-i18n/zhcon/zhcon-0.2.6-r3.ebuild 
b/app-i18n/zhcon/zhcon-0.2.6-r3.ebuild
index f428d22d614..e32f503d307 100644
--- a/app-i18n/zhcon/zhcon-0.2.6-r3.ebuild
+++ b/app-i18n/zhcon/zhcon-0.2.6-r3.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
-WANT_AUTOMAKE="1.9"
 
-inherit autotools eutils
+inherit autotools
 
 MY_P="${P/6/5}"
 
@@ -36,11 +35,13 @@ PATCHES=(
 )
 
 src_prepare() {
-   epatch "${DISTDIR}"/zhcon-0.2.5-to-0.2.6.diff.gz
+   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
 }

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

2020-02-25 Thread Mikle Kolyada 
commit: b774008eae9822d12210c750511fe97acaac5dac
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Tue Feb 25 10:12:27 2020 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Tue Feb 25 10:12:27 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b774008e

app-i18n/zhcon: remove last-rited pkg

Signed-off-by: Mikle Kolyada  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..000
--- 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..000
--- 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.0 +0200
-+++ zhcon-0.2.6/src/basefont.cpp   2008-04-29 23:15:37.0 +0200
-@@ -27,10 +27,12 @@
- #include "global.h"
- #include "debug.h"
- #include "hzdecoder.h"
- #include "basefont.h"
- 
-+#include 
-+
- 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.0 
+0200
-+++ zhcon-0.2.6/src/display/fblinear4.cpp  2008-04-29 23:15:37.0 
+0200
-@@ -20,10 +20,12 @@
- #include 
- #include 
- #include "global.h"
- #include "fblinear4.h"
- 
-+#include 
-+
- __u16 FBLinear4::nibbletab_cfb4[] = {
- #if BYTE_ORDER == LITTLE_ENDIAN
- 0x,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.0 
+0200
-+++ zhcon-0.2.6/src/display/fblinear8.cpp  2008-04-29 23:15:37.0 
+0200
-@@ -20,10 +20,12 @@
- #include 
- #include 
- #include "global.h"
- #include "fblinear8.h"
- 
-+#include 
-+
- __u32 FBLinear8::nibbletab_cfb8[] = {
- #if BYTE_ORDER == LITTLE_ENDIAN
- 0x,0xff00,0x00ff,0x,
- 0xff00,0xff00ff00,0x0000,0xff00,
- 0x00ff,0xffff,0x00ff00ff,0x00ff,
-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.0 +0200
-+++ zhcon-0.2.6/src/display/fbvgaplanes.cpp2008-04-29 23:15:37.0 
+0200
-@@ -36,10 +36,12 @@
- : "a" ((char) value),
- "d" ((unsigned short) port));
- }
- #endif
- 
-+#include 
-+
- /* 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.cpp2008-04-29 23:15:08.0 
+0200
-+++ zhcon-0.2.6/src/display/vgadev.cpp 2008-04-29 23:15:37.0 +0200
-@@ -35,10 +35,12 @@
- #include 
- #include "debug.h"
- #include "vgadev.h"
- #include "lrmi.h"
- 
-+#include 
-+
- #define GRAPH_BASE 0xA
- #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.0 +0200
-+++ zhcon-0.2.6/src/graphdev.cpp   2008-04-29 23:16:14.

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

2019-03-22 Thread Lars Wendler 
commit: 09ffa628956892f94fefc5ca1f2236eca23e361c
Author: Lars Wendler  gentoo  org>
AuthorDate: Fri Mar 22 11:11:22 2019 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Fri Mar 22 11:12:01 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09ffa628

app-i18n/zhcon: Fixed build with sys-libs/ncurses[tinfo]

Closes: https://bugs.gentoo.org/526256
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Lars Wendler  gentoo.org>

 app-i18n/zhcon/files/zhcon-0.2.6-curses.patch | 2 +-
 app-i18n/zhcon/zhcon-0.2.6-r3.ebuild  | 9 +
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app-i18n/zhcon/files/zhcon-0.2.6-curses.patch 
b/app-i18n/zhcon/files/zhcon-0.2.6-curses.patch
index 200014e1d71..cf8b07d3de4 100644
--- a/app-i18n/zhcon/files/zhcon-0.2.6-curses.patch
+++ b/app-i18n/zhcon/files/zhcon-0.2.6-curses.patch
@@ -7,7 +7,7 @@ index 63172e4..6c2afcc 100644
  
  AC_CHECK_LIB(util, forkpty)
 -AC_CHECK_LIB(curses, main)
-+AC_SEARCH_LIBS([tgetent], [cursesw curses ncursesw ncurses], [break;])
++AC_SEARCH_LIBS([tgetent], [tinfow tinfo cursesw curses ncursesw ncurses], 
[break;])
  
  dnl for freebsd
  dnl AC_CHECK_LIB(c, i386_set_ioperm)

diff --git a/app-i18n/zhcon/zhcon-0.2.6-r3.ebuild 
b/app-i18n/zhcon/zhcon-0.2.6-r3.ebuild
index f428d22d614..e32f503d307 100644
--- a/app-i18n/zhcon/zhcon-0.2.6-r3.ebuild
+++ b/app-i18n/zhcon/zhcon-0.2.6-r3.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
-WANT_AUTOMAKE="1.9"
 
-inherit autotools eutils
+inherit autotools
 
 MY_P="${P/6/5}"
 
@@ -36,11 +35,13 @@ PATCHES=(
 )
 
 src_prepare() {
-   epatch "${DISTDIR}"/zhcon-0.2.5-to-0.2.6.diff.gz
+   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
 }

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

2020-02-25 Thread Mikle Kolyada 
commit: b774008eae9822d12210c750511fe97acaac5dac
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Tue Feb 25 10:12:27 2020 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Tue Feb 25 10:12:27 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b774008e

app-i18n/zhcon: remove last-rited pkg

Signed-off-by: Mikle Kolyada  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..000
--- 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..000
--- 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.0 +0200
-+++ zhcon-0.2.6/src/basefont.cpp   2008-04-29 23:15:37.0 +0200
-@@ -27,10 +27,12 @@
- #include "global.h"
- #include "debug.h"
- #include "hzdecoder.h"
- #include "basefont.h"
- 
-+#include 
-+
- 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.0 
+0200
-+++ zhcon-0.2.6/src/display/fblinear4.cpp  2008-04-29 23:15:37.0 
+0200
-@@ -20,10 +20,12 @@
- #include 
- #include 
- #include "global.h"
- #include "fblinear4.h"
- 
-+#include 
-+
- __u16 FBLinear4::nibbletab_cfb4[] = {
- #if BYTE_ORDER == LITTLE_ENDIAN
- 0x,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.0 
+0200
-+++ zhcon-0.2.6/src/display/fblinear8.cpp  2008-04-29 23:15:37.0 
+0200
-@@ -20,10 +20,12 @@
- #include 
- #include 
- #include "global.h"
- #include "fblinear8.h"
- 
-+#include 
-+
- __u32 FBLinear8::nibbletab_cfb8[] = {
- #if BYTE_ORDER == LITTLE_ENDIAN
- 0x,0xff00,0x00ff,0x,
- 0xff00,0xff00ff00,0x0000,0xff00,
- 0x00ff,0xffff,0x00ff00ff,0x00ff,
-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.0 +0200
-+++ zhcon-0.2.6/src/display/fbvgaplanes.cpp2008-04-29 23:15:37.0 
+0200
-@@ -36,10 +36,12 @@
- : "a" ((char) value),
- "d" ((unsigned short) port));
- }
- #endif
- 
-+#include 
-+
- /* 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.cpp2008-04-29 23:15:08.0 
+0200
-+++ zhcon-0.2.6/src/display/vgadev.cpp 2008-04-29 23:15:37.0 +0200
-@@ -35,10 +35,12 @@
- #include 
- #include "debug.h"
- #include "vgadev.h"
- #include "lrmi.h"
- 
-+#include 
-+
- #define GRAPH_BASE 0xA
- #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.0 +0200
-+++ zhcon-0.2.6/src/graphdev.cpp   2008-04-29 23:16:14.

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

2019-03-22 Thread Lars Wendler 
commit: 09ffa628956892f94fefc5ca1f2236eca23e361c
Author: Lars Wendler  gentoo  org>
AuthorDate: Fri Mar 22 11:11:22 2019 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Fri Mar 22 11:12:01 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09ffa628

app-i18n/zhcon: Fixed build with sys-libs/ncurses[tinfo]

Closes: https://bugs.gentoo.org/526256
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Lars Wendler  gentoo.org>

 app-i18n/zhcon/files/zhcon-0.2.6-curses.patch | 2 +-
 app-i18n/zhcon/zhcon-0.2.6-r3.ebuild  | 9 +
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app-i18n/zhcon/files/zhcon-0.2.6-curses.patch 
b/app-i18n/zhcon/files/zhcon-0.2.6-curses.patch
index 200014e1d71..cf8b07d3de4 100644
--- a/app-i18n/zhcon/files/zhcon-0.2.6-curses.patch
+++ b/app-i18n/zhcon/files/zhcon-0.2.6-curses.patch
@@ -7,7 +7,7 @@ index 63172e4..6c2afcc 100644
  
  AC_CHECK_LIB(util, forkpty)
 -AC_CHECK_LIB(curses, main)
-+AC_SEARCH_LIBS([tgetent], [cursesw curses ncursesw ncurses], [break;])
++AC_SEARCH_LIBS([tgetent], [tinfow tinfo cursesw curses ncursesw ncurses], 
[break;])
  
  dnl for freebsd
  dnl AC_CHECK_LIB(c, i386_set_ioperm)

diff --git a/app-i18n/zhcon/zhcon-0.2.6-r3.ebuild 
b/app-i18n/zhcon/zhcon-0.2.6-r3.ebuild
index f428d22d614..e32f503d307 100644
--- a/app-i18n/zhcon/zhcon-0.2.6-r3.ebuild
+++ b/app-i18n/zhcon/zhcon-0.2.6-r3.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
-WANT_AUTOMAKE="1.9"
 
-inherit autotools eutils
+inherit autotools
 
 MY_P="${P/6/5}"
 
@@ -36,11 +35,13 @@ PATCHES=(
 )
 
 src_prepare() {
-   epatch "${DISTDIR}"/zhcon-0.2.5-to-0.2.6.diff.gz
+   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
 }

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

2019-03-22 Thread Lars Wendler 
commit: 09ffa628956892f94fefc5ca1f2236eca23e361c
Author: Lars Wendler  gentoo  org>
AuthorDate: Fri Mar 22 11:11:22 2019 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Fri Mar 22 11:12:01 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09ffa628

app-i18n/zhcon: Fixed build with sys-libs/ncurses[tinfo]

Closes: https://bugs.gentoo.org/526256
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Lars Wendler  gentoo.org>

 app-i18n/zhcon/files/zhcon-0.2.6-curses.patch | 2 +-
 app-i18n/zhcon/zhcon-0.2.6-r3.ebuild  | 9 +
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app-i18n/zhcon/files/zhcon-0.2.6-curses.patch 
b/app-i18n/zhcon/files/zhcon-0.2.6-curses.patch
index 200014e1d71..cf8b07d3de4 100644
--- a/app-i18n/zhcon/files/zhcon-0.2.6-curses.patch
+++ b/app-i18n/zhcon/files/zhcon-0.2.6-curses.patch
@@ -7,7 +7,7 @@ index 63172e4..6c2afcc 100644
  
  AC_CHECK_LIB(util, forkpty)
 -AC_CHECK_LIB(curses, main)
-+AC_SEARCH_LIBS([tgetent], [cursesw curses ncursesw ncurses], [break;])
++AC_SEARCH_LIBS([tgetent], [tinfow tinfo cursesw curses ncursesw ncurses], 
[break;])
  
  dnl for freebsd
  dnl AC_CHECK_LIB(c, i386_set_ioperm)

diff --git a/app-i18n/zhcon/zhcon-0.2.6-r3.ebuild 
b/app-i18n/zhcon/zhcon-0.2.6-r3.ebuild
index f428d22d614..e32f503d307 100644
--- a/app-i18n/zhcon/zhcon-0.2.6-r3.ebuild
+++ b/app-i18n/zhcon/zhcon-0.2.6-r3.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
-WANT_AUTOMAKE="1.9"
 
-inherit autotools eutils
+inherit autotools
 
 MY_P="${P/6/5}"
 
@@ -36,11 +35,13 @@ PATCHES=(
 )
 
 src_prepare() {
-   epatch "${DISTDIR}"/zhcon-0.2.5-to-0.2.6.diff.gz
+   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
 }

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

2020-02-25 Thread Mikle Kolyada 
commit: b774008eae9822d12210c750511fe97acaac5dac
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Tue Feb 25 10:12:27 2020 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Tue Feb 25 10:12:27 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b774008e

app-i18n/zhcon: remove last-rited pkg

Signed-off-by: Mikle Kolyada  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..000
--- 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..000
--- 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.0 +0200
-+++ zhcon-0.2.6/src/basefont.cpp   2008-04-29 23:15:37.0 +0200
-@@ -27,10 +27,12 @@
- #include "global.h"
- #include "debug.h"
- #include "hzdecoder.h"
- #include "basefont.h"
- 
-+#include 
-+
- 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.0 
+0200
-+++ zhcon-0.2.6/src/display/fblinear4.cpp  2008-04-29 23:15:37.0 
+0200
-@@ -20,10 +20,12 @@
- #include 
- #include 
- #include "global.h"
- #include "fblinear4.h"
- 
-+#include 
-+
- __u16 FBLinear4::nibbletab_cfb4[] = {
- #if BYTE_ORDER == LITTLE_ENDIAN
- 0x,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.0 
+0200
-+++ zhcon-0.2.6/src/display/fblinear8.cpp  2008-04-29 23:15:37.0 
+0200
-@@ -20,10 +20,12 @@
- #include 
- #include 
- #include "global.h"
- #include "fblinear8.h"
- 
-+#include 
-+
- __u32 FBLinear8::nibbletab_cfb8[] = {
- #if BYTE_ORDER == LITTLE_ENDIAN
- 0x,0xff00,0x00ff,0x,
- 0xff00,0xff00ff00,0x0000,0xff00,
- 0x00ff,0xffff,0x00ff00ff,0x00ff,
-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.0 +0200
-+++ zhcon-0.2.6/src/display/fbvgaplanes.cpp2008-04-29 23:15:37.0 
+0200
-@@ -36,10 +36,12 @@
- : "a" ((char) value),
- "d" ((unsigned short) port));
- }
- #endif
- 
-+#include 
-+
- /* 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.cpp2008-04-29 23:15:08.0 
+0200
-+++ zhcon-0.2.6/src/display/vgadev.cpp 2008-04-29 23:15:37.0 +0200
-@@ -35,10 +35,12 @@
- #include 
- #include "debug.h"
- #include "vgadev.h"
- #include "lrmi.h"
- 
-+#include 
-+
- #define GRAPH_BASE 0xA
- #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.0 +0200
-+++ zhcon-0.2.6/src/graphdev.cpp   2008-04-29 23:16:14.

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

2019-03-22 Thread Lars Wendler 
commit: 09ffa628956892f94fefc5ca1f2236eca23e361c
Author: Lars Wendler  gentoo  org>
AuthorDate: Fri Mar 22 11:11:22 2019 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Fri Mar 22 11:12:01 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09ffa628

app-i18n/zhcon: Fixed build with sys-libs/ncurses[tinfo]

Closes: https://bugs.gentoo.org/526256
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Lars Wendler  gentoo.org>

 app-i18n/zhcon/files/zhcon-0.2.6-curses.patch | 2 +-
 app-i18n/zhcon/zhcon-0.2.6-r3.ebuild  | 9 +
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app-i18n/zhcon/files/zhcon-0.2.6-curses.patch 
b/app-i18n/zhcon/files/zhcon-0.2.6-curses.patch
index 200014e1d71..cf8b07d3de4 100644
--- a/app-i18n/zhcon/files/zhcon-0.2.6-curses.patch
+++ b/app-i18n/zhcon/files/zhcon-0.2.6-curses.patch
@@ -7,7 +7,7 @@ index 63172e4..6c2afcc 100644
  
  AC_CHECK_LIB(util, forkpty)
 -AC_CHECK_LIB(curses, main)
-+AC_SEARCH_LIBS([tgetent], [cursesw curses ncursesw ncurses], [break;])
++AC_SEARCH_LIBS([tgetent], [tinfow tinfo cursesw curses ncursesw ncurses], 
[break;])
  
  dnl for freebsd
  dnl AC_CHECK_LIB(c, i386_set_ioperm)

diff --git a/app-i18n/zhcon/zhcon-0.2.6-r3.ebuild 
b/app-i18n/zhcon/zhcon-0.2.6-r3.ebuild
index f428d22d614..e32f503d307 100644
--- a/app-i18n/zhcon/zhcon-0.2.6-r3.ebuild
+++ b/app-i18n/zhcon/zhcon-0.2.6-r3.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
-WANT_AUTOMAKE="1.9"
 
-inherit autotools eutils
+inherit autotools
 
 MY_P="${P/6/5}"
 
@@ -36,11 +35,13 @@ PATCHES=(
 )
 
 src_prepare() {
-   epatch "${DISTDIR}"/zhcon-0.2.5-to-0.2.6.diff.gz
+   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
 }

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

2020-02-25 Thread Mikle Kolyada 
commit: b774008eae9822d12210c750511fe97acaac5dac
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Tue Feb 25 10:12:27 2020 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Tue Feb 25 10:12:27 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b774008e

app-i18n/zhcon: remove last-rited pkg

Signed-off-by: Mikle Kolyada  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..000
--- 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..000
--- 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.0 +0200
-+++ zhcon-0.2.6/src/basefont.cpp   2008-04-29 23:15:37.0 +0200
-@@ -27,10 +27,12 @@
- #include "global.h"
- #include "debug.h"
- #include "hzdecoder.h"
- #include "basefont.h"
- 
-+#include 
-+
- 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.0 
+0200
-+++ zhcon-0.2.6/src/display/fblinear4.cpp  2008-04-29 23:15:37.0 
+0200
-@@ -20,10 +20,12 @@
- #include 
- #include 
- #include "global.h"
- #include "fblinear4.h"
- 
-+#include 
-+
- __u16 FBLinear4::nibbletab_cfb4[] = {
- #if BYTE_ORDER == LITTLE_ENDIAN
- 0x,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.0 
+0200
-+++ zhcon-0.2.6/src/display/fblinear8.cpp  2008-04-29 23:15:37.0 
+0200
-@@ -20,10 +20,12 @@
- #include 
- #include 
- #include "global.h"
- #include "fblinear8.h"
- 
-+#include 
-+
- __u32 FBLinear8::nibbletab_cfb8[] = {
- #if BYTE_ORDER == LITTLE_ENDIAN
- 0x,0xff00,0x00ff,0x,
- 0xff00,0xff00ff00,0x0000,0xff00,
- 0x00ff,0xffff,0x00ff00ff,0x00ff,
-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.0 +0200
-+++ zhcon-0.2.6/src/display/fbvgaplanes.cpp2008-04-29 23:15:37.0 
+0200
-@@ -36,10 +36,12 @@
- : "a" ((char) value),
- "d" ((unsigned short) port));
- }
- #endif
- 
-+#include 
-+
- /* 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.cpp2008-04-29 23:15:08.0 
+0200
-+++ zhcon-0.2.6/src/display/vgadev.cpp 2008-04-29 23:15:37.0 +0200
-@@ -35,10 +35,12 @@
- #include 
- #include "debug.h"
- #include "vgadev.h"
- #include "lrmi.h"
- 
-+#include 
-+
- #define GRAPH_BASE 0xA
- #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.0 +0200
-+++ zhcon-0.2.6/src/graphdev.cpp   2008-04-29 23:16:14.