--- /usr/portage/games-fps/openarena/openarena-0.8.1-r1.ebuild	2010-05-23 17:06:06.000000000 -0430
+++ openarena-0.8.5.ebuild	2010-09-08 23:11:06.151000030 -0430
@@ -6,11 +6,14 @@
 inherit eutils flag-o-matic versionator games
 
 MY_PV=$(delete_all_version_separators)
+BASE_PV="0.8.1"
+OLD_PV=$(delete_all_version_separators $BASE_PV)
 
 DESCRIPTION="Open-source replacement for Quake 3 Arena"
 HOMEPAGE="http://openarena.ws/"
-SRC_URI="http://download.tuxfamily.org/openarena/rel/${MY_PV}/oa${MY_PV}.zip
-	http://openarena.ws/svn/source/${MY_PV}/${PN}-engine-${PV}-1.tar.bz2"
+SRC_URI="http://download.tuxfamily.org/openarena/rel/${OLD_PV}/oa${OLD_PV}.zip
+	http://download.tuxfamily.org/openarena/rel/${MY_PV}/oa${MY_PV}p.zip
+	http://openarena.ws/svn/source/${OLD_PV}/${PN}-engine-${BASE_PV}-1.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -31,19 +34,21 @@
 DEPEND="${RDEPEND}
 	app-arch/unzip"
 
-MY_S=${WORKDIR}/${PN}-engine-${PV}
+MY_S="${WORKDIR}/${PN}-engine-${BASE_PV}"
+S="${WORKDIR}/${PN}-${BASE_PV}"
 BUILD_DIR=${PN}-build
 DIR=${GAMES_DATADIR}/${PN}
 
 src_prepare() {
 	cd "${WORKDIR}"
-	epatch "${FILESDIR}"/${P}-makefile.patch \
-		"${FILESDIR}"/${P}-unbundling.patch
+	epatch "${FILESDIR}"/${PN}-${BASE_PV}-makefile.patch \
+		"${FILESDIR}"/${PN}-${BASE_PV}-unbundling.patch
 	sed -i \
 		-e '/ALDRIVER_DEFAULT/s/libopenal.so.0/libopenal.so/' \
 		"${MY_S}"/code/client/snd_openal.c \
 		|| die "sed failed"
 	cd "${MY_S}"
+	epatch "${FILESDIR}"/${PN}-${BASE_PV}-bots-strcpy-fix.patch
 	touch jpegint.h
 }