(games-action/tumikifighters) using debian patches tumikifighters-0.2.ebuild

(games-action/tumikifighters)	new Manifest

2 files changed, 18 insertions, 14 deletions

diff --git a/games-action/tumikifighters/Manifest b/games-action/tumikifighters/Manifest
index 7169b63..29bd312 100644
--- a/games-action/tumikifighters/Manifest
+++ b/games-action/tumikifighters/Manifest
@@ -1,5 +1,4 @@
-AUX tumikifighters-0.2.diff 37502 RMD160 c2a01084cefe183cb1f9b955d3ba4bcc05c33779 SHA1 d6aafbc06db2e79d9397ffd7b782d42dcb09e24a SHA256 ac68eef44c3ca1dcfaa61d6f28a5c560e8f3f798416aceaf0325a48dada64036
-AUX tumikifighters.png 2198 RMD160 ad8bed670a9620f7fbb09f8dda0974141669121c SHA1 1b49cec6a7f1a506253fe9f141ebe479261c0b24 SHA256 f77ecdb7d747836130985aa1eaf2f69a5ace60cf9999e85f135b7864aa8abf73
 DIST tf0_2.zip 5278017 RMD160 68d81ea4c70b2f596e16c6638271003cd4554c2a SHA1 42ab2b2af38f9e7ec71051713f172407f00e2a63 SHA256 dd2f7f793acb5a38da58632041a07d7cd09717dfb7450dfc973638a68f2a5f22
-EBUILD tumikifighters-0.2.ebuild 1820 RMD160 b18515002b4acff6dc837922cdb594ec8597d010 SHA1 da6f2831598080b63cdd3ac0c7af902a0dee8878 SHA256 8f2bfd454aac2561b0a5da6f6035b86b9f796ec694f732efd691f90b2db43a8c
+DIST tumiki-fighters_0.2.dfsg1-3.diff.gz 15171 RMD160 408db6b4c24f6bb1602b490938621f4a789e6045 SHA1 3566e05425599d9394b0c6c63631645b55b46851 SHA256 08533263e1c3400f81848d3b9595f015dfaf91a2f5846cc24a3bd0ff78ee443a
+EBUILD tumikifighters-0.2.ebuild 2459 RMD160 beb6bc9bc144db131c55bd7690baf8de400e7e7a SHA1 f06e53f7023dcb961a28ccf5b8dce9ab4f607bf0 SHA256 871e1a1cf093780e036f0f7be818bc3fd9efa6cefb1d49e3e5b2db744071d5f0
 MISC metadata.xml 249 RMD160 220cde0fc1a8d7d355705f0f6772bd8d77cdc17a SHA1 34b33eb8d24cd8bfef2ddfb8e80334fd77cc9488 SHA256 3875fd5008d7f5bfe7f3cf7bf330c209a5034f5988d37c1699fb3be35a7be906
diff --git a/games-action/tumikifighters/tumikifighters-0.2.ebuild b/games-action/tumikifighters/tumikifighters-0.2.ebuild
index bf83e45..7aa9a85 100644
--- a/games-action/tumikifighters/tumikifighters-0.2.ebuild
+++ b/games-action/tumikifighters/tumikifighters-0.2.ebuild
@@ -7,11 +7,13 @@ EAPI="2"
 inherit d-games
 
 MY_PN=tf
+MY_PD=tumiki-fighters
 MY_PV=${PV//./_}
 
 DESCRIPTION="Stick more enemies and become much stronger. Sticky 2D shooter, 'TUMIKI Fighters'. "
 HOMEPAGE="http://www.asahi-net.or.jp/~cs8k-cyu/windows/tf_e.html"
-SRC_URI="http://www.asahi-net.or.jp/~cs8k-cyu/windows/${MY_PN}${MY_PV}.zip"
+SRC_URI="http://www.asahi-net.or.jp/~cs8k-cyu/windows/${MY_PN}${MY_PV}.zip
+	mirror://debian/pool/main/t/${MY_PD}/${MY_PD}_${PV}.dfsg1-3.diff.gz"
 
 LICENSE="BSD"
 SLOT="0"
@@ -21,13 +23,23 @@ IUSE=""
 RDEPEND="media-libs/libsdl
 	media-libs/mesa
 	media-libs/sdl-mixer
-	dev-libs/bulletss"
+	dev-libs/libbulletml"
 DEPEND="${RDEPEND}"
 
 S=${WORKDIR}/${MY_PN}
 
 src_prepare(){
-	epatch "${FILESDIR}"/${P}.diff
+	# using frostworks patches with debian's cleanups and minor patches
+	epatch "${WORKDIR}"/${MY_PD}_${PV}.dfsg1-3.diff
+	sed -i -e "s:${MY_PD}-${PV}.dfsg1/::g" -i "${S}"/${MY_PD}-${PV}.dfsg1/debian/patches/makefile.patch
+	sed -i -e "s:${MY_PD}:${PN}:g" -i "${S}"/${MY_PD}-${PV}.dfsg1/debian/patches/makefile.patch
+	epatch "${S}"/${MY_PD}-${PV}.dfsg1/debian/patches/imports.patch
+	epatch "${S}"/${MY_PD}-${PV}.dfsg1/debian/patches/fixes.patch
+	epatch "${S}"/${MY_PD}-${PV}.dfsg1/debian/patches/windowed.patch
+	epatch "${S}"/${MY_PD}-${PV}.dfsg1/debian/patches/dotfile.patch
+	epatch "${S}"/${MY_PD}-${PV}.dfsg1/debian/patches/makefile.patch
+	epatch "${S}"/${MY_PD}-${PV}.dfsg1/debian/patches/gdc-0.24-semantics-for-version.patch
+	epatch "${S}"/${MY_PD}-${PV}.dfsg1/debian/patches/window-resizing.patch
 	sed -i \
 	-e 's:"\(sounds/[^"]*\)":"'${GAMES_DATADIR}'/'${PN}'/\1":g' -i src/abagames/util/sdl/sound.d \
 	-e 's:"\(barrage[^"]*\)":"'${GAMES_DATADIR}'/'${PN}'/\1":g' -i src/abagames/tf/barragemanager.d \
@@ -35,29 +47,22 @@ src_prepare(){
 	-e 's:"\(field[^"]*\)":"'${GAMES_DATADIR}'/'${PN}'/\1":g' -i src/abagames/tf/field.d \
 	-e 's:"\(stage[^"]*\)":"'${GAMES_DATADIR}'/'${PN}'/\1":g' -i src/abagames/tf/stagemanager.d \
 	-e 's:"\(tumiki[^"]*\)":"'${GAMES_DATADIR}'/'${PN}'/\1":g' -i src/abagames/tf/tumikiset.d \
-	-e 's:"\(tf.prf[^"]*\)":"'${GAMES_STATEDIR}'/\1":g' -i src/abagames/tf/prefmanager.d \
 		|| die "sed failed"
 }
 
 src_install() {
 	dogamesbin ${PN}
 
-	if [ ! -e "${GAMES_STATEDIR}"/tf.prf ]; then
-		dodir "${GAMES_STATEDIR}"
-		touch ${D}/"${GAMES_STATEDIR}"/tf.prf
-	fi
-
 	local datadir="${GAMES_DATADIR}"/${PN}
 	dodir ${datadir}
 	insinto "${GAMES_DATADIR}"/${PN}
 	doins -r barrage enemy field sounds stage tumiki || die
-	newicon "${FILESDIR}"/${PN}.png ${PN}.png
+	newicon "${S}"/${MY_PD}-${PV}.dfsg1/debian/${MY_PD}.xpm ${PN}.xpm
 	make_desktop_entry ${PN} ${PN}
 	dodoc readme*
 	prepgamesdirs
 }
 
 pkg_postinst() {
-	chmod 660 "${GAMES_STATEDIR}"/tf.prf
 	games_pkg_postinst
 }