commit: 47bc7066f75bc1a3be09802e65cd128eedb92360 Author: Learath <learath2 <AT> gmail <DOT> com> AuthorDate: Sun Apr 9 17:45:07 2017 +0000 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> CommitDate: Thu May 4 21:20:49 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47bc7066
games-action/teeworlds: Version bump to 0.6.4 Gentoo-Bug: https://bugs.gentoo.org/600178 Package-Manager: Portage-2.3.3, Repoman-2.3.1 Closes: https://github.com/gentoo/gentoo/pull/4400 games-action/teeworlds/Manifest | 1 + .../files/{0.6.3 => 0.6}/01-use-system-wavpack.patch | 0 .../{0.6.3 => 0.6}/02-fixed-wavpack-sound-loading.patch | 0 .../files/{0.6.3 => 0.6}/03-use-system-pnglite.patch | 0 .../teeworlds/files/{0.6.3 => 0.6}/04-dedicated.patch | 0 .../teeworlds/files/{0.6.3 => 0.6}/05-cc-cflags.patch | 0 games-action/teeworlds/teeworlds-0.6.3-r1.ebuild | 13 +++++++------ games-action/teeworlds/teeworlds-0.6.3.ebuild | 5 +++-- .../{teeworlds-0.6.3-r1.ebuild => teeworlds-0.6.4.ebuild} | 15 ++++++++------- 9 files changed, 19 insertions(+), 15 deletions(-) diff --git a/games-action/teeworlds/Manifest b/games-action/teeworlds/Manifest index 9829eb71349..74b45ac09c5 100644 --- a/games-action/teeworlds/Manifest +++ b/games-action/teeworlds/Manifest @@ -1 +1,2 @@ DIST teeworlds-0.6.3-src.tar.gz 13101446 SHA256 490ee7c372898761c609af8d7b0c6bd55942c6c6fcd7f361eefa00abfc70077b SHA512 0c7ef6ca59e4b49f9e208f39e8b0edd76965d67848008af3a223cb7615a6c62ff433d3113f733ae4dafc364baf522d2f56255e058d26d9f5c48071cdde41526d WHIRLPOOL dc501bb9a2f4c3971ad063102a55cc70633857e3052f3a349d032dd8e92ea05f6138c62e9775b743b38dc3a56366d9920850b5a7ffbf6913ed73536a5cacdff4 +DIST teeworlds-0.6.4-src.tar.gz 8771622 SHA256 c261d19ebb00b5451faa2ceb4a7ca945cad2add48b06046eb43b40ccc9fd98e2 SHA512 7546ee358a2126339f6c727bb7b5f49009a8fad0b5e77a796202cba4d8fc5dfcaf79b7e65151d85fead2a70ad61ef3e1888b8c07fe0206f87575d5dd8c9f91ce WHIRLPOOL ea45aeb1eeef511e38b19e051dc575b7506dba002ed27a3850aabbb9bfac9a0530bc033d3428ede75a0081c054a573a91c0c942cf49477645674ad5d4aa28764 diff --git a/games-action/teeworlds/files/0.6.3/01-use-system-wavpack.patch b/games-action/teeworlds/files/0.6/01-use-system-wavpack.patch similarity index 100% rename from games-action/teeworlds/files/0.6.3/01-use-system-wavpack.patch rename to games-action/teeworlds/files/0.6/01-use-system-wavpack.patch diff --git a/games-action/teeworlds/files/0.6.3/02-fixed-wavpack-sound-loading.patch b/games-action/teeworlds/files/0.6/02-fixed-wavpack-sound-loading.patch similarity index 100% rename from games-action/teeworlds/files/0.6.3/02-fixed-wavpack-sound-loading.patch rename to games-action/teeworlds/files/0.6/02-fixed-wavpack-sound-loading.patch diff --git a/games-action/teeworlds/files/0.6.3/03-use-system-pnglite.patch b/games-action/teeworlds/files/0.6/03-use-system-pnglite.patch similarity index 100% rename from games-action/teeworlds/files/0.6.3/03-use-system-pnglite.patch rename to games-action/teeworlds/files/0.6/03-use-system-pnglite.patch diff --git a/games-action/teeworlds/files/0.6.3/04-dedicated.patch b/games-action/teeworlds/files/0.6/04-dedicated.patch similarity index 100% rename from games-action/teeworlds/files/0.6.3/04-dedicated.patch rename to games-action/teeworlds/files/0.6/04-dedicated.patch diff --git a/games-action/teeworlds/files/0.6.3/05-cc-cflags.patch b/games-action/teeworlds/files/0.6/05-cc-cflags.patch similarity index 100% rename from games-action/teeworlds/files/0.6.3/05-cc-cflags.patch rename to games-action/teeworlds/files/0.6/05-cc-cflags.patch diff --git a/games-action/teeworlds/teeworlds-0.6.3-r1.ebuild b/games-action/teeworlds/teeworlds-0.6.3-r1.ebuild index fe0ccfa211b..c7affb67818 100644 --- a/games-action/teeworlds/teeworlds-0.6.3-r1.ebuild +++ b/games-action/teeworlds/teeworlds-0.6.3-r1.ebuild @@ -3,7 +3,7 @@ EAPI=6 PYTHON_COMPAT=( python2_7 ) -inherit eutils multiprocessing python-any-r1 toolchain-funcs +inherit eutils multiprocessing python-any-r1 toolchain-funcs versionator REVISION="b177-r50edfd37" @@ -32,13 +32,14 @@ DEPEND="${RDEPEND} ~dev-util/bam-0.4.0" S=${WORKDIR}/${P}-src +MY_PV=$(get_version_component_range 1-2) PATCHES=( - "${FILESDIR}/${PV}/01-use-system-wavpack.patch" - "${FILESDIR}/${PV}/02-fixed-wavpack-sound-loading.patch" - "${FILESDIR}/${PV}/03-use-system-pnglite.patch" - "${FILESDIR}/${PV}/04-dedicated.patch" - "${FILESDIR}/${PV}/05-cc-cflags.patch" + "${FILESDIR}/${MY_PV}/01-use-system-wavpack.patch" + "${FILESDIR}/${MY_PV}/02-fixed-wavpack-sound-loading.patch" + "${FILESDIR}/${MY_PV}/03-use-system-pnglite.patch" + "${FILESDIR}/${MY_PV}/04-dedicated.patch" + "${FILESDIR}/${MY_PV}/05-cc-cflags.patch" ) pkg_setup() { diff --git a/games-action/teeworlds/teeworlds-0.6.3.ebuild b/games-action/teeworlds/teeworlds-0.6.3.ebuild index 6ec2bfd5c05..791c9d00e07 100644 --- a/games-action/teeworlds/teeworlds-0.6.3.ebuild +++ b/games-action/teeworlds/teeworlds-0.6.3.ebuild @@ -3,7 +3,7 @@ EAPI=5 PYTHON_COMPAT=( python2_7 ) -inherit eutils multiprocessing python-any-r1 toolchain-funcs games +inherit eutils multiprocessing python-any-r1 toolchain-funcs games versionator REVISION="b177-r50edfd37" @@ -31,6 +31,7 @@ DEPEND="${RDEPEND} ~dev-util/bam-0.4.0" S=${WORKDIR}/${P}-src +MY_PV=$(get_version_component_range 1-2) pkg_setup() { python-any-r1_pkg_setup @@ -41,7 +42,7 @@ src_prepare() { rm -r src/engine/external/* || die # 01 & 02 from pull request: https://github.com/oy/teeworlds/pull/493 - EPATCH_SOURCE="${FILESDIR}/${PV}" EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" \ + EPATCH_SOURCE="${FILESDIR}/${MY_PV}" EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" \ epatch cat <<- __EOF__ > "${S}/gentoo.lua" diff --git a/games-action/teeworlds/teeworlds-0.6.3-r1.ebuild b/games-action/teeworlds/teeworlds-0.6.4.ebuild similarity index 84% copy from games-action/teeworlds/teeworlds-0.6.3-r1.ebuild copy to games-action/teeworlds/teeworlds-0.6.4.ebuild index fe0ccfa211b..dc1a0d9c2f2 100644 --- a/games-action/teeworlds/teeworlds-0.6.3-r1.ebuild +++ b/games-action/teeworlds/teeworlds-0.6.4.ebuild @@ -3,9 +3,9 @@ EAPI=6 PYTHON_COMPAT=( python2_7 ) -inherit eutils multiprocessing python-any-r1 toolchain-funcs +inherit eutils multiprocessing python-any-r1 toolchain-funcs versionator -REVISION="b177-r50edfd37" +REVISION="b177-rff25472" DESCRIPTION="Online multi-player platform 2D shooter" HOMEPAGE="http://www.teeworlds.com/"; @@ -32,13 +32,14 @@ DEPEND="${RDEPEND} ~dev-util/bam-0.4.0" S=${WORKDIR}/${P}-src +MY_PV=$(get_version_component_range 1-2) PATCHES=( - "${FILESDIR}/${PV}/01-use-system-wavpack.patch" - "${FILESDIR}/${PV}/02-fixed-wavpack-sound-loading.patch" - "${FILESDIR}/${PV}/03-use-system-pnglite.patch" - "${FILESDIR}/${PV}/04-dedicated.patch" - "${FILESDIR}/${PV}/05-cc-cflags.patch" + "${FILESDIR}/${MY_PV}/01-use-system-wavpack.patch" + "${FILESDIR}/${MY_PV}/02-fixed-wavpack-sound-loading.patch" + "${FILESDIR}/${MY_PV}/03-use-system-pnglite.patch" + "${FILESDIR}/${MY_PV}/04-dedicated.patch" + "${FILESDIR}/${MY_PV}/05-cc-cflags.patch" ) pkg_setup() {
