--- bsd-games-2.17-r4.ebuild	2013-02-28 12:28:31.703242228 -0600
+++ bsd-games-2.17-r4.ebuild	2013-02-28 11:43:38.242091481 -0600
@@ -2,14 +2,14 @@ 
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/games-misc/bsd-games/bsd-games-2.17-r4.ebuild,v 1.12 2010/10/19 15:55:33 mr_bones_ Exp $
 
-EAPI=2
-inherit eutils games
+EAPI=5
+inherit eutils games toolchain-funcs
 
-DEB_PATCH_VER=16
+DEB_PATCH_VER=21
 DESCRIPTION="collection of games from NetBSD"
 HOMEPAGE="http://www.advogato.org/proj/bsd-games/"
 SRC_URI="ftp://metalab.unc.edu/pub/Linux/games/${P}.tar.gz
-	mirror://debian/pool/main/b/bsdgames/bsdgames_${PV}-${DEB_PATCH_VER}.diff.gz"
+	mirror://debian/pool/main/b/bsdgames/bsdgames_${PV}-${DEB_PATCH_VER}.debian.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
@@ -23,6 +23,7 @@ 
 	sys-libs/ncurses
 	sys-apps/miscfiles"
 DEPEND="${RDEPEND}
+	virtual/pkgconfig
 	sys-devel/flex
 	sys-devel/bison"
 
@@ -34,13 +35,15 @@ 
 tetris trek wargames worm worms wtf}
 
 src_prepare() {
+	local debpatch
+	for debpatch in $(cat "${WORKDIR}/debian/patches/series"); do
+		epatch "${WORKDIR}/debian/patches/${debpatch}"
+	done
 	epatch \
-		"${WORKDIR}"/bsdgames_${PV}-${DEB_PATCH_VER}.diff \
 		"${FILESDIR}"/${P}-64bitutmp.patch \
 		"${FILESDIR}"/${P}-headers.patch \
 		"${FILESDIR}"/${P}-bg.patch \
-		"${FILESDIR}"/${P}-gcc4.patch \
-		"${FILESDIR}"/${P}-glibc2.10.patch
+		"${FILESDIR}"/${P}-gcc4.patch
 
 	sed -i \
 		-e "s:/usr/games:${GAMES_BINDIR}:" \
@@ -60,6 +63,7 @@ 
 	echo bsd_games_cfg_usrlibdir=\"$(games_get_libdir)\" >> ./config.params
 	echo bsd_games_cfg_build_dirs=\"${GAMES_TO_BUILD}\" >> ./config.params
 	echo bsd_games_cfg_docdir=\"/usr/share/doc/${PF}\" >> ./config.params
+	echo bsd_games_cfg_ncurses_lib=\"$($(tc-getPKG_CONFIG) --libs ncurses)\" >> ./config.params
 }
 
 src_test() {
@@ -119,7 +123,6 @@ 
 		newman factor/factor.6 primes.6
 	fi
 
-	prepalldocs
 	prepgamesdirs
 
 	# state dirs