Version bump for zhcon, thanks to Zhang Lee (bug #144944) who's also going to be the proxied maintainer for this package.

(Portage version: 2.1.2_pre3-r6)

7 files changed, 243 insertions, 2 deletions

diff --git a/app-i18n/zhcon/ChangeLog b/app-i18n/zhcon/ChangeLog
index 20e52f614642..9cee2842a60c 100644
--- a/app-i18n/zhcon/ChangeLog
+++ b/app-i18n/zhcon/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-i18n/zhcon
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/zhcon/ChangeLog,v 1.6 2005/01/25 17:59:43 liquidx Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/zhcon/ChangeLog,v 1.7 2006/10/22 20:49:17 flameeyes Exp $
+
+*zhcon-0.2.6 (22 Oct 2006)
+
+  22 Oct 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/zhcon-0.2.5.make-fix.patch, +files/zhcon-0.2.6.configure.in.patch,
+  +files/zhcon-0.2.6.sysconfdir.patch, metadata.xml, +zhcon-0.2.6.ebuild:
+  Version bump for zhcon, thanks to Zhang Lee (bug #144944) who's also going
+  to be the proxied maintainer for this package.
 
 *zhcon-0.2.3-r1 (25 Jan 2005)
 
diff --git a/app-i18n/zhcon/files/digest-zhcon-0.2.6 b/app-i18n/zhcon/files/digest-zhcon-0.2.6
new file mode 100644
index 000000000000..f3849bf46883
--- /dev/null
+++ b/app-i18n/zhcon/files/digest-zhcon-0.2.6
@@ -0,0 +1,6 @@
+MD5 971f68507f9c48a6b5cbee4ba0c1e2a6 zhcon-0.2.5-to-0.2.6.diff.gz 2881
+RMD160 b461e19f79c7a904d79f889106418eefee433d1c zhcon-0.2.5-to-0.2.6.diff.gz 2881
+SHA256 c9da3f7290f7d74f3ca4f0d78c00c73c0100bcca5eba5d08c629ddc6c7ced9e1 zhcon-0.2.5-to-0.2.6.diff.gz 2881
+MD5 79e1c68aab8341e32129f61c1670baeb zhcon-0.2.5.tar.gz 5011644
+RMD160 d72650f5f08eaedca55006c4cd96e45b1890abc4 zhcon-0.2.5.tar.gz 5011644
+SHA256 4ce4dc1395b6f6a920d44aac069a284bff76df4019ac4164850d263538465d59 zhcon-0.2.5.tar.gz 5011644
diff --git a/app-i18n/zhcon/files/zhcon-0.2.5.make-fix.patch b/app-i18n/zhcon/files/zhcon-0.2.5.make-fix.patch
new file mode 100644
index 000000000000..182c80b8dd1d
--- /dev/null
+++ b/app-i18n/zhcon/files/zhcon-0.2.5.make-fix.patch
@@ -0,0 +1,143 @@
+diff -Nur zhcon-0.2.5.orig/doc/Makefile.am zhcon-0.2.5/doc/Makefile.am
+--- zhcon-0.2.5.orig/doc/Makefile.am	2006-06-21 18:02:23.000000000 +0800
++++ zhcon-0.2.5/doc/Makefile.am	2006-06-21 18:13:59.000000000 +0800
+@@ -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 -Nur zhcon-0.2.5.orig/doc/Makefile.in zhcon-0.2.5/doc/Makefile.in
+--- zhcon-0.2.5.orig/doc/Makefile.in	2006-06-21 18:02:23.000000000 +0800
++++ zhcon-0.2.5/doc/Makefile.in	2006-06-21 18:13:30.000000000 +0800
+@@ -326,11 +326,11 @@
+ 
+ 
+ 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
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+diff -Nur zhcon-0.2.5.orig/font/Makefile.am zhcon-0.2.5/font/Makefile.am
+--- zhcon-0.2.5.orig/font/Makefile.am	2006-06-21 18:02:23.000000000 +0800
++++ zhcon-0.2.5/font/Makefile.am	2006-06-21 18:14:30.000000000 +0800
+@@ -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 -Nur zhcon-0.2.5.orig/font/Makefile.in zhcon-0.2.5/font/Makefile.in
+--- zhcon-0.2.5.orig/font/Makefile.in	2006-06-21 18:02:23.000000000 +0800
++++ zhcon-0.2.5/font/Makefile.in	2006-06-21 18:15:02.000000000 +0800
+@@ -321,11 +321,11 @@
+ 
+ 
+ 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
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+diff -Nur zhcon-0.2.5.orig/input/Makefile.am zhcon-0.2.5/input/Makefile.am
+--- zhcon-0.2.5.orig/input/Makefile.am	2006-06-21 18:02:23.000000000 +0800
++++ zhcon-0.2.5/input/Makefile.am	2006-06-21 18:15:35.000000000 +0800
+@@ -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 -Nur zhcon-0.2.5.orig/input/Makefile.in zhcon-0.2.5/input/Makefile.in
+--- zhcon-0.2.5.orig/input/Makefile.in	2006-06-21 18:02:23.000000000 +0800
++++ zhcon-0.2.5/input/Makefile.in	2006-06-21 18:16:02.000000000 +0800
+@@ -321,11 +321,11 @@
+ 
+ 
+ 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
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+diff -Nur zhcon-0.2.5.orig/src/Makefile.am zhcon-0.2.5/src/Makefile.am
+--- zhcon-0.2.5.orig/src/Makefile.am	2006-06-21 18:02:23.000000000 +0800
++++ zhcon-0.2.5/src/Makefile.am	2006-06-22 08:35:42.000000000 +0800
+@@ -8,14 +8,14 @@
+ SUBDIRS = display
+ 
+ install-exec-local:
+-	chmod 4755 $(bindir)/zhcon
++	chmod 4755 $(DESTDIR)$(bindir)/zhcon
+ 
+ install-data-local:
+-	$(mkinstalldirs) $(prefix)/etc
+-	$(INSTALL_DATA) $(srcdir)/zhcon.conf $(prefix)/etc/zhcon.conf
++	$(mkinstalldirs) $(DESTDIR)/etc
++	$(INSTALL_DATA) $(srcdir)/zhcon.conf $(DESTDIR)/etc/zhcon.conf
+ 
+ uninstall-local:
+-	-rm -f $(prefix)/etc/zhcon.conf
++	-rm -f $(DESTDIR)/etc/zhcon.conf
+ 
+ # set the include path found by configure
+ INCLUDES= $(all_includes)
+diff -Nur zhcon-0.2.5.orig/src/Makefile.in zhcon-0.2.5/src/Makefile.in
+--- zhcon-0.2.5.orig/src/Makefile.in	2006-06-21 18:02:23.000000000 +0800
++++ zhcon-0.2.5/src/Makefile.in	2006-06-22 08:36:05.000000000 +0800
+@@ -602,14 +602,14 @@
+ 
+ 
+ install-exec-local:
+-	chmod 4755 $(bindir)/zhcon
++	chmod 4755 $(DESTDIR)$(bindir)/zhcon
+ 
+ install-data-local:
+-	$(mkinstalldirs) $(prefix)/etc
+-	$(INSTALL_DATA) $(srcdir)/zhcon.conf $(prefix)/etc/zhcon.conf
++	$(mkinstalldirs) $(DESTDIR)/etc
++	$(INSTALL_DATA) $(srcdir)/zhcon.conf $(DESTDIR)/etc/zhcon.conf
+ 
+ uninstall-local:
+-	-rm -f $(prefix)/etc/zhcon.conf
++	-rm -f $(DESTDIR)/etc/zhcon.conf
+ 
+ # the library search path.
+ #zhcon_LDFLAGS = $(all_libraries) -L/usr/lib/unicon 
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
new file mode 100644
index 000000000000..fef2ae02d33d
--- /dev/null
+++ b/app-i18n/zhcon/files/zhcon-0.2.6.configure.in.patch
@@ -0,0 +1,11 @@
+--- configure.in	2006-06-22 13:02:59.197841560 +0800
++++ /tmp/zhcon-0.2.5/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.sysconfdir.patch b/app-i18n/zhcon/files/zhcon-0.2.6.sysconfdir.patch
new file mode 100644
index 000000000000..b9434effadc4
--- /dev/null
+++ b/app-i18n/zhcon/files/zhcon-0.2.6.sysconfdir.patch
@@ -0,0 +1,24 @@
+diff -ruN zhcon-0.2.5/src/Makefile.am /tmp/zhcon-0.2.5/src/Makefile.am
+--- zhcon-0.2.5/src/Makefile.am	2006-06-22 12:35:01.531885552 +0800
++++ /tmp/zhcon-0.2.5/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 zhcon-0.2.5/src/zhcon.cpp /tmp/zhcon-0.2.5/src/zhcon.cpp
+--- zhcon-0.2.5/src/zhcon.cpp	2006-06-22 12:35:01.398905768 +0800
++++ /tmp/zhcon-0.2.5/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
index e9247d69960d..02b2e5279fe2 100644
--- a/app-i18n/zhcon/metadata.xml
+++ b/app-i18n/zhcon/metadata.xml
@@ -2,6 +2,18 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>cjk</herd>
+<maintainer>
+  <email>robert.zhangle@gmail.com</email>
+  <name>Zhang Le, Robert</name>
+  <description>Proxied maintainer</description>
+</maintainer>
+
+<maintainer>
+  <email>flameeyes@gentoo.org</email>
+  <name>Diego Pettenò</name>
+  <description>Proxying maintainer</description>
+</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
diff --git a/app-i18n/zhcon/zhcon-0.2.6.ebuild b/app-i18n/zhcon/zhcon-0.2.6.ebuild
new file mode 100644
index 000000000000..25d39b2462ed
--- /dev/null
+++ b/app-i18n/zhcon/zhcon-0.2.6.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/zhcon/zhcon-0.2.6.ebuild,v 1.1 2006/10/22 20:49:17 flameeyes Exp $
+
+WANT_AUTOMAKE="1.9"
+WANT_AUTOCONF="latest"
+
+inherit eutils autotools
+
+MY_P=${P/6/5}
+S="${WORKDIR}/${MY_P}"
+
+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="~x86"
+IUSE=""
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${DISTDIR}"/zhcon-0.2.5-to-0.2.6.diff.gz
+	epatch "${FILESDIR}"/zhcon-0.2.5.make-fix.patch
+	epatch "${FILESDIR}"/${P}.sysconfdir.patch
+	epatch "${FILESDIR}"/${P}.configure.in.patch
+	eautoreconf
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog README NEWS TODO THANKS
+	dodoc ABOUT-NLS README.BSD README.gpm README.utf8
+}