Fixed fonts problems, bug #221813.

(Portage version: 2.1.5_rc6)

3 files changed, 102 insertions, 2 deletions

diff --git a/app-i18n/fbiterm/ChangeLog b/app-i18n/fbiterm/ChangeLog
index 2ff891a3fdca..8d2417cf75ef 100644
--- a/app-i18n/fbiterm/ChangeLog
+++ b/app-i18n/fbiterm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-i18n/fbiterm
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/fbiterm/ChangeLog,v 1.8 2007/02/21 22:01:06 peper Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/fbiterm/ChangeLog,v 1.9 2008/05/17 00:57:49 matsuu Exp $
+
+*fbiterm-0.5-r1 (17 May 2008)
+
+  17 May 2008; MATSUU Takuto <matsuu@gentoo.org>
+  +files/fbiterm-0.5-r1-gentoo.diff, +fbiterm-0.5-r1.ebuild:
+  Fixed fonts problems, bug #221813.
 
   21 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
   Transition to Manifest2.
diff --git a/app-i18n/fbiterm/fbiterm-0.5-r1.ebuild b/app-i18n/fbiterm/fbiterm-0.5-r1.ebuild
new file mode 100644
index 000000000000..efc551291923
--- /dev/null
+++ b/app-i18n/fbiterm/fbiterm-0.5-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/fbiterm/fbiterm-0.5-r1.ebuild,v 1.1 2008/05/17 00:57:49 matsuu Exp $
+
+inherit autotools eutils flag-o-matic multilib
+
+IUSE=""
+
+DESCRIPTION="Framebuffer internationalized terminal emulator"
+HOMEPAGE="http://www-124.ibm.com/linux/projects/iterm/"
+SRC_URI="http://www-124.ibm.com/linux/projects/iterm/releases/iterm-${PV}.tar.gz"
+
+LICENSE="CPL-0.5"
+SLOT="0"
+KEYWORDS="~x86"
+
+DEPEND="x11-libs/libXfont
+	>=media-libs/freetype-2
+	x11-libs/libiterm-mbt
+	sys-libs/zlib"
+RDEPEND="${DEPEND}
+	media-fonts/font-sony-misc
+	media-fonts/unifont"
+
+S="${WORKDIR}/iterm/unix/fbiterm"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${PF}-gentoo.diff"
+	eautoreconf
+}
+
+src_compile() {
+	append-ldflags -lfreetype
+	append-ldflags $(bindnow-flags)
+	econf --x-includes=/usr/include \
+		--x-libraries=/usr/$(get_libdir) || die
+	emake || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog README*
+}
+
+pkg_postinst() {
+	elog
+	elog "1. If you haven't created your locale, run localedef."
+	elog "# localedef -v -c -i en_GB -f UTF-8 en_GB.UTF-8"
+	elog "(If you want to use other locales such as Japanese, replace"
+	elog "en_GB with ja_JP and en_GB.UTF-8 with ja_JP.UTF-8, respectively)"
+	elog
+	elog "2. Set enviroment variable."
+	elog "% export LC_CTYPE=en_GB.UTF-8 (sh, bash, zsh, ...)"
+	elog "> setenv LC_CTYPE en_GB.UTF-8 (csh, tcsh, ...)"
+	elog "(Again, if you want to use Japanese locale, create ja_JP.UTF-8"
+	elog " locale by localedef and set LC_CTYPE to ja_JP.UTF-8)"
+	elog
+	elog "3. Run unicode_start."
+	elog "% unicode_start"
+	elog
+	elog "4. Run fbiterm."
+	elog "% fbiterm"
+	elog
+}
diff --git a/app-i18n/fbiterm/files/fbiterm-0.5-r1-gentoo.diff b/app-i18n/fbiterm/files/fbiterm-0.5-r1-gentoo.diff
new file mode 100644
index 000000000000..6c4dc2533021
--- /dev/null
+++ b/app-i18n/fbiterm/files/fbiterm-0.5-r1-gentoo.diff
@@ -0,0 +1,28 @@
+diff -Naur fbiterm.orig/src/Makefile.am fbiterm/src/Makefile.am
+--- fbiterm.orig/src/Makefile.am	2002-12-17 16:39:43.000000000 +0900
++++ fbiterm/src/Makefile.am	2008-05-17 09:27:27.000000000 +0900
+@@ -15,7 +15,7 @@
+ 	vt.c VTScreenView.c fbiterm.h palette.h VTScreenView.h
+ 
+ fbiterm_LDADD = \
+-	-L$(libdir) @X_LIBS@ -lXfont -literm
++	-L$(libdir) @X_LIBS@ -lm -lXfont -literm
+ 
+ CFLAGS = -I$(includedir) @X_CFLAGS@ -I$(top_srcdir)/include -I/usr/local/include $(EXTRA_CFLAGS)
+ 
+diff -Naur fbiterm.orig/src/fbiterm.h fbiterm/src/fbiterm.h
+--- fbiterm.orig/src/fbiterm.h	2002-10-24 21:44:01.000000000 +0900
++++ fbiterm/src/fbiterm.h	2008-05-17 08:58:04.000000000 +0900
+@@ -53,9 +53,9 @@
+ #define FB_ENV    "FRAMEBUFFER"
+ #define FB_DEFDEV "/dev/fb0"
+ 
+-#define DefaultAsc	"/usr/lib/X11/fonts/misc/8x16.pcf.gz"
+-#define DefaultMB	"/usr/lib/X11/fonts/misc/unifont.pcf.gz"
+-#define DefaultFont	"/usr/local/share/iterm/fonts/8x16.pcf.gz"
++#define DefaultAsc	"/usr/share/fonts/misc/8x16.pcf.gz"
++#define DefaultMB	"/usr/share/fonts/misc/unifont.pcf.gz"
++#define DefaultFont	"/usr/share/iterm/fonts/8x16.pcf.gz"
+ 
+ enum ITERM_RETCODE
+ {