Added missing virtual/x11 to DEPEND. Applied gcc-3.4 patch, submitted by summoon1997 <sunmoon1997@gmail.com>; bug #74183. Thanks to Jackey Yang <043936y@acadiau.ca>.

(Portage version: 2.0.51.19)

7 files changed, 157 insertions, 11 deletions

diff --git a/app-i18n/unicon/ChangeLog b/app-i18n/unicon/ChangeLog
index 79e0da6787a7..373f178d5508 100644
--- a/app-i18n/unicon/ChangeLog
+++ b/app-i18n/unicon/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-i18n/unicon
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/unicon/ChangeLog,v 1.6 2005/01/02 19:39:51 dsd Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/unicon/ChangeLog,v 1.7 2005/04/23 12:07:29 usata Exp $
+
+*unicon-3.0.4-r1 (23 Apr 2005)
+
+  23 Apr 2005; <usata@gentoo.org> +files/unicon-3.0.4-gcc34.patch,
+  +files/unicon.confd, +files/unicon.initd, +unicon-3.0.4-r1.ebuild:
+  Added missing virtual/x11 to DEPEND. Applied gcc-3.4 patch, submitted by
+  summoon1997 <sunmoon1997@gmail.com>; bug #74183. Thanks to Jackey Yang
+  <043936y@acadiau.ca>.
 
   02 Jan 2005; Daniel Drake <dsd@gentoo.org> unicon-3.0.4.ebuild:
   Change virtual/kernel to virtual/linux-sources
diff --git a/app-i18n/unicon/Manifest b/app-i18n/unicon/Manifest
index 2dadf1fadc2a..4fcd4ba31d0e 100644
--- a/app-i18n/unicon/Manifest
+++ b/app-i18n/unicon/Manifest
@@ -1,16 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 7415547af81b5d998e21bc41f48436c9 unicon-3.0.4.ebuild 1394
 MD5 a1c927d7f16bf519b1cb76a5f963ca6c ChangeLog 785
 MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
+MD5 819d7cca603fdeaadfc6c5d0e52756fa unicon-3.0.4-r1.ebuild 975
 MD5 e69f90a124ed00f574cc5ae111df1bd7 files/digest-unicon-3.0.4 66
 MD5 cc6f3b807859a0d79f19b3f649de45b5 files/unicon-3.0.4-debian.patch 59606
 MD5 31b30bcac54f35d0a41f969075a136de files/unicon-3.0.4-gentoo.patch 302
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFB2FVtiJcSIUGNthERAvXGAKCuaT2BlBRtzz9e7ODymMRQRlbGzgCeMmj9
-i8yOilF2Yq7F0L34dM6d/1w=
-=JJ5S
------END PGP SIGNATURE-----
+MD5 4d14b878b4a1c5c51a7f4633ec437f41 files/digest-unicon-3.0.4-r1 154
diff --git a/app-i18n/unicon/files/digest-unicon-3.0.4-r1 b/app-i18n/unicon/files/digest-unicon-3.0.4-r1
new file mode 100644
index 000000000000..837af77661c5
--- /dev/null
+++ b/app-i18n/unicon/files/digest-unicon-3.0.4-r1
@@ -0,0 +1,2 @@
+MD5 465b470ca952599ac231938e58c2fdfd unicon-3.0.4-20010924.tar.gz 5771109
+MD5 406730f440474f0a27e0f62de0489cfa vd_unicon-userland-20031122vd.patch 289430
diff --git a/app-i18n/unicon/files/unicon-3.0.4-gcc34.patch b/app-i18n/unicon/files/unicon-3.0.4-gcc34.patch
new file mode 100644
index 000000000000..7fa2550b5187
--- /dev/null
+++ b/app-i18n/unicon/files/unicon-3.0.4-gcc34.patch
@@ -0,0 +1,44 @@
+diff -urN unicon-3.0.4.orig/unicon/ImmModules/cxterm/utils/cit2tit.c unicon-3.0.4/unicon/ImmModules/cxterm/utils/cit2tit.c
+--- unicon-3.0.4.orig/unicon/ImmModules/cxterm/utils/cit2tit.c	2004-12-15 14:09:18.836641936 +0800
++++ unicon-3.0.4/unicon/ImmModules/cxterm/utils/cit2tit.c	2004-12-15 14:10:01.207200632 +0800
+@@ -29,7 +29,7 @@
+ #include <ctype.h>
+ #include <stdio.h>
+ 
+-extern char *malloc(), *calloc(), *realloc();
++/*extern char *malloc(), *calloc(), *realloc();*/
+ 
+ extern char *HZencodeName();	/* from HZutil.c */
+ 
+diff -urN unicon-3.0.4.orig/unicon/ImmModules/cxterm/utils/tit2cit.c unicon-3.0.4/unicon/ImmModules/cxterm/utils/tit2cit.c
+--- unicon-3.0.4.orig/unicon/ImmModules/cxterm/utils/tit2cit.c	2004-12-15 14:09:18.836641936 +0800
++++ unicon-3.0.4/unicon/ImmModules/cxterm/utils/tit2cit.c	2004-12-15 14:11:06.249312728 +0800
+@@ -54,7 +54,7 @@
+ #include <ctype.h>
+ #include <stdio.h>
+ 
+-extern char *malloc(), *calloc(), *realloc();
++/*extern char *malloc(), *calloc(), *realloc();*/
+ 
+ extern int HZencode();		/* from HZutil.o */
+ extern int HZgetprompt();	/* from HZutil.o */
+@@ -744,7 +744,7 @@
+ 	    Error ("Run out of memory");
+ 	strcpy (tptr->son->hzptr, hzptr);
+     } else {
+-	tptr->son->hzptr = realloc (tptr->son->hzptr,
++	tptr->son->hzptr = (void *)realloc (tptr->son->hzptr,
+ 		strlen (tptr->son->hzptr) + strlen (hzptr) + 1);
+ 	if (tptr->son->hzptr == NULL)
+ 	    Error ("Run out of memory");
+diff -urN unicon-3.0.4.orig/tools/uniconcfg.c unicon-3.0.4/tools/uniconcfg.c
+--- unicon-3.0.4.orig/tools/uniconcfg.c	2004-12-14 16:57:42.000000000 +0800
++++ unicon-3.0.4/tools/uniconcfg.c	2004-12-14 16:59:50.000000000 +0800
+@@ -214,6 +214,7 @@
+         case XL_DB_GBK:
+         case XL_DB_EUCJP:
+         case XL_DB_SJIS:
++		break;
+     }
+     return 1;
+ }
diff --git a/app-i18n/unicon/files/unicon.confd b/app-i18n/unicon/files/unicon.confd
new file mode 100644
index 000000000000..a9a716db5c9a
--- /dev/null
+++ b/app-i18n/unicon/files/unicon.confd
@@ -0,0 +1,4 @@
+# preferred encoding for tty
+# define one of "gb gbk big5 jis kscm eucjp sjis"
+#
+#UNICON_ENCODE="eucjp"
diff --git a/app-i18n/unicon/files/unicon.initd b/app-i18n/unicon/files/unicon.initd
new file mode 100755
index 000000000000..b048a8e77460
--- /dev/null
+++ b/app-i18n/unicon/files/unicon.initd
@@ -0,0 +1,34 @@
+#!/sbin/runscript
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/unicon/files/unicon.initd,v 1.1 2005/04/23 12:07:29 usata Exp $
+
+depend() {
+	after modules
+}
+
+start() {
+	ebegin "Starting unicon"
+	/sbin/modprobe unikey
+
+	if [ -n "${UNICON_ENCODE}" ] ; then
+		ebegin "  Loading encode-${UNICON_ENCODE}"
+		/sbin/modprobe encode-"${UNICON_ENCODE}"
+		eend $?
+	fi
+
+	loadunimap /usr/lib/unicon/direct.uni
+
+	if [ -n "${UNICON_ENCODE}" ] ; then
+		for i in 0 1 2 3 4 5 6 ; do
+			/usr/bin/uniconctrl --"${UNICON_ENCODE}" tty$i
+		done
+	fi
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping unicon"
+	/sbin/modprobe -r unikey
+	eend $?
+}
diff --git a/app-i18n/unicon/unicon-3.0.4-r1.ebuild b/app-i18n/unicon/unicon-3.0.4-r1.ebuild
new file mode 100644
index 000000000000..661bf55c3f95
--- /dev/null
+++ b/app-i18n/unicon/unicon-3.0.4-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/unicon/unicon-3.0.4-r1.ebuild,v 1.1 2005/04/23 12:07:29 usata Exp $
+
+inherit eutils
+
+# TODO: Figure out how to build the kernel-modules.
+
+VD_P="${P}-20010924"
+VD_PATCH="vd_unicon-userland-20031122vd.patch"
+
+DESCRIPTION="CJK (Chinese/Japanese/Korean) console input, display system and input modules."
+HOMEPAGE="http://www.gnu.org/directory/UNICON.html
+	http://vdr.jp/d/unicon.html"
+SRC_URI="http://vdlinux.sourceforge.jp/dists/${VD_P}.tar.gz
+	http://vdlinux.sourceforge.jp/dists/${VD_PATCH}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE=""
+
+DEPEND="virtual/linux-sources
+	dev-libs/newt
+	dev-libs/pth
+	virtual/x11"
+
+src_unpack() {
+	unpack ${VD_P}.tar.gz
+	cd ${S}
+	epatch ${DISTDIR}/${VD_PATCH}
+	epatch ${FILESDIR}/${P}-gcc34.patch
+}
+
+src_compile() {
+	econf || die "econf failed"
+	emake -j1 || die "make failed"
+	emake data || die "make data failed"
+}
+
+src_install() {
+	make prefix=${D}/usr install || die "make install failed"
+	make prefix=${D}/usr data-install || die "make data-install failed"
+
+	dosed /usr/lib/unicon/load-unimap.sh
+
+	newconfd ${FILESDIR}/unicon.confd unicon
+	newinitd ${FILESDIR}/unicon.initd unicon
+}
+
+pkg_postinst() {
+	ewarn
+	ewarn "You need to patch your kernel in order to use this software."
+	ewarn "The latest unicon patch can be found at"
+	ewarn "	${HOMEPAGE}"
+	ewarn "Please make sure you remove consolefont from boot runlevel"
+	ewarn "and add unicon after editting /etc/conf.d/unicon, and the reboot."
+	ewarn
+	ewarn "# rc-update del consolefont boot"
+	ewarn "# rc-update add unicon boot"
+	ewarn
+}