--- warsow-2.0.1.ebuild 2016-01-23 23:48:09.676063066 +0100
+++ warsow-2.1.ebuild   2016-04-27 21:20:15.276477095 +0200
@@ -12,7 +12,7 @@
 DESCRIPTION="Multiplayer FPS based on the QFusion engine (evolved from Quake 2)"
 HOMEPAGE="http://www.warsow.net/"
 SRC_URI="http://mirror.null.one/${ENGINE_P}.tar.gz
-       http://mirror.null.one/warsow_${DATA_PV}_unified.tar.gz
+       http://mirror.null.one/${PN}_${DATA_PV}_unified.tar.gz
        mirror://gentoo/warsow.png"
 
 # ZLIB: bundled angelscript
@@ -36,8 +36,8 @@
 "
 DEPEND="${RDEPEND}"
 
-S=${WORKDIR}/source/source
-DATA_S=${WORKDIR}/${PN}_${DATA_PV:0:2}
+S=${WORKDIR}/${ENGINE_P}/source/source
+DATA_S=${WORKDIR}/${PN}_${DATA_PV}
 
 src_prepare() {
        if [[ $(tc-getCC) =~ clang ]]; then
@@ -77,14 +77,14 @@
 
        exeinto /usr/libexec/${PN}/
        doexe */*.so
-       newexe ${PN}.* ${PN}
-       newexe wsw_server.* ${PN}-ded
-       newexe wswtv_server.* ${PN}-tv
+       newexe qfusion.* ${PN}
+       newexe qfusion_server.* ${PN}-ded
+       newexe qfusiontv_server.* ${PN}-tv
        dobin_wrapper ${PN} ${PN}-ded ${PN}-tv
 
        local so
        dodir /usr/share/${PN}/libs
-       for so in basewsw/*.so libs/*.so ; do
+       for so in base/*.so libs/*.so ; do
                dosym /usr/libexec/${PN}/${so##*/} \
                        /usr/share/${PN}/${so}
        done