--- kdrill-6.4.ebuild	2009-03-31 21:40:59.702540501 -0400
+++ kdrill-6.4.ebuild	2009-03-31 21:40:42.934514913 -0400
@@ -2,10 +2,8 @@ 
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-inherit eutils flag-o-matic
-
 S="${WORKDIR}/${PN}${PV}"
-DESCRIPTION="Kanji quiz and a lookup tool for X, help in memorizing
+DESCRIPTION="Kanji quiz and a lookup tool for X, helps in memorizing
 Japanese characters"
 HOMEPAGE="http://www.bolthole.com/kdrill/"
 SRC_URI="http://www.bolthole.com/kdrill/${PN}${PV}.tar.gz"
@@ -15,19 +13,11 @@ 
 KEYWORDS="~x86"
 IUSE=""
 
-DEPEND="virtual/x11"
+DEPEND="x11-base/xorg-x11
+		x11-misc/imake"
 
 src_unpack() {
 	unpack ${A}
-
-	if ! built_with_use 'virtual/x11' cjk ; then
-		eerror
-		eerror 'KDrill requieres an X server built with the cjk USE'
-		eerror 'flag (Asian languages support). You should run:'
-		eerror '  USE="cjk" emerge virtual/x11 kdrill' 
-		eerror
-		die "Please remerge the X server with cjk USE flag enabled."
-	fi
 }
 
 src_compile() {
@@ -36,27 +26,25 @@ 
 	echo "CFLAGS+=${CFLAGS}" >> Imakefile
 	echo "LDFLAGS+=${LDFLAGS}" >> Imakefile
 	cat Imakefile.orig >> Imakefile
-	sed -i s,/usr/local/lib,/usr/share/dict,g Imakefile
+	sed -i s,/usr/local/lib,/usr/share/kdrill,g Imakefile
 	xmkmf || die "xmkmf failed"
 
 	emake || die "make failed"
-	emake -C makedic || die "make failed"
 }
 
 src_install() {
-	make install || die "make install failed"
+	emake install || die "emake install failed"
 	dobin makedic/makedic makedic/makeedict
 
-	dodoc LICENSE NOTES README PATCHLIST
+	dodoc LICENSE NOTES README PATCHLIST BUGS TODO
 
 	mv kdrill.man kdrill.1
 	doman kdrill.1 makedic/makedic.1 makedic/makeedict.1
 
 	insinto /usr/share/pixmaps
 	doins kdrill.xpm
-	domenu ${FILESDIR}/kdrill.desktop
 
-	insinto /usr/share/dict
+	insinto /usr/share/kdrill
 	gzip kanjidic
 	doins makedic/*.edic kanjidic.gz
 }
@@ -66,13 +54,13 @@ 
 	einfo "KDrill will by default use the kanjidic dictionary file."
 	einfo "If you're a beginner you may want to start with a kana only"
 	einfo "quiz, e.g:"
-	einfo "kdrill -edictfile /usr/share/dict/fullkatahira.edic -kdictfile none"
+	einfo "kdrill -edictfile /usr/share/kdrill/fullkatahira.edic -kdictfile none"
 	einfo "or"
-	einfo "kdrill -edictfile /usr/share/dict/hiraplus.edic -kdictfile none"
+	einfo "kdrill -edictfile /usr/share/kdrill/hiraplus.edic -kdictfile none"
 	einfo "Then, when you're ready for kanjidic, run:"
-	einfo "kdrill -kdictfile /usr/share/dict/kanjidic.gz"
+	einfo "kdrill -kdictfile /usr/share/kdrill/kanjidic.gz"
 	einfo
-	einfo "Additional dictionaries can be installed in /usr/share/dict."
+	einfo "Additional dictionaries can be installed in /usr/share/kdrill."
 	einfo "http://www.bolthole.com/kdrill/kmirrors.html has many good ones."
 	einfo
 }