--- games-fps/openarena/openarena-0.8.5.ebuild
+++ games-fps/openarena/openarena-0.8.8.ebuild
@@ -5,19 +5,14 @@
 EAPI=2
 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/${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"
+SRC_URI="mirror://sourceforge/oarena/${P}.zip
+	mirror://sourceforge/oarena/src/${PN}-engine-source-${PV}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="+curl +openal +vorbis"
 
 RDEPEND="virtual/opengl
@@ -34,8 +29,7 @@
 DEPEND="${RDEPEND}
 	app-arch/unzip"
 
-MY_S=${WORKDIR}/${PN}-engine-${BASE_PV}
-S=${WORKDIR}/${PN}-${BASE_PV}
+MY_S=${WORKDIR}/${PN}-engine-source-${PV}
 BUILD_DIR=${PN}-build
 DIR=${GAMES_DATADIR}/${PN}
 
@@ -43,15 +37,8 @@
 	cd "${WORKDIR}"
 	epatch "${FILESDIR}"/${P}-makefile.patch \
 		"${FILESDIR}"/${P}-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}"/${P}-bots-strcpy-fix.patch
 	touch jpegint.h
-
-	sed -i -e '1i#define OF(x) x' $(find -name unzip.c) || die
 }
 
 src_compile() {
@@ -71,6 +58,7 @@
 		DEFAULT_BASEDIR="${DIR}" \
 		BR="${BUILD_DIR}" \
 		${myopts} \
+		OPTIMIZE= \
 		|| die "emake failed"
 }