--- zhcon-0.2.6-r1.ebuild.orig	2010-01-31 17:34:11.000000000 +0100
+++ zhcon-0.2.6-r1.ebuild	2010-01-31 17:19:25.000000000 +0100
@@ -1,13 +1,14 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 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-r1.ebuild,v 1.2 2009/06/09 13:21:55 flameeyes Exp $
 
 WANT_AUTOMAKE="1.9"
+EAPI="2"
 
 inherit eutils autotools
 
 MY_P=${P/6/5}
-S="${WORKDIR}/${MY_P}"
+S=${WORKDIR}/${MY_P}
 
 DESCRIPTION="A Fast CJK (Chinese/Japanese/Korean) Console Environment"
 HOMEPAGE="http://zhcon.sourceforge.net/"
@@ -17,11 +18,13 @@
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~amd64"
-IUSE=""
+IUSE="ggi gpm"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+DEPEND="ggi? ( media-libs/libggi[X] )
+	gpm? ( sys-libs/gpm )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
 	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
@@ -30,9 +33,18 @@
 	epatch "${FILESDIR}"/${P}+linux-headers-2.6.26.patch
 	epatch "${FILESDIR}"/${P}-curses.patch
 	epatch "${FILESDIR}"/${P}-amd64.patch
+	epatch "${FILESDIR}"/${P}-automagic-fix.patch
+	for f in $(grep -lir HAVE_GGI_LIB *); do
+		sed -i -e "s/HAVE_GGI_LIB/HAVE_LIBGGI/" $f || die "sed failed"
+	done
 	eautoreconf
 }
 
+src_configure() {
+	econf $(use_with ggi) \
+		$(use_with gpm)
+}
+
 src_install() {
 	emake -j1 DESTDIR="${D}" install || die
 	dodoc AUTHORS ChangeLog README NEWS TODO THANKS