Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: James Le Cuirot <chewi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: games-action/teeworlds/files/0.6.3/, games-action/teeworlds/, ...
Date: Thu, 04 May 2017 21:21:48
Message-Id: 1493932849.47bc7066f75bc1a3be09802e65cd128eedb92360.chewi@gentoo
1 commit: 47bc7066f75bc1a3be09802e65cd128eedb92360
2 Author: Learath <learath2 <AT> gmail <DOT> com>
3 AuthorDate: Sun Apr 9 17:45:07 2017 +0000
4 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
5 CommitDate: Thu May 4 21:20:49 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47bc7066
7
8 games-action/teeworlds: Version bump to 0.6.4
9
10 Gentoo-Bug: https://bugs.gentoo.org/600178
11
12 Package-Manager: Portage-2.3.3, Repoman-2.3.1
13 Closes: https://github.com/gentoo/gentoo/pull/4400
14
15 games-action/teeworlds/Manifest | 1 +
16 .../files/{0.6.3 => 0.6}/01-use-system-wavpack.patch | 0
17 .../{0.6.3 => 0.6}/02-fixed-wavpack-sound-loading.patch | 0
18 .../files/{0.6.3 => 0.6}/03-use-system-pnglite.patch | 0
19 .../teeworlds/files/{0.6.3 => 0.6}/04-dedicated.patch | 0
20 .../teeworlds/files/{0.6.3 => 0.6}/05-cc-cflags.patch | 0
21 games-action/teeworlds/teeworlds-0.6.3-r1.ebuild | 13 +++++++------
22 games-action/teeworlds/teeworlds-0.6.3.ebuild | 5 +++--
23 .../{teeworlds-0.6.3-r1.ebuild => teeworlds-0.6.4.ebuild} | 15 ++++++++-------
24 9 files changed, 19 insertions(+), 15 deletions(-)
25
26 diff --git a/games-action/teeworlds/Manifest b/games-action/teeworlds/Manifest
27 index 9829eb71349..74b45ac09c5 100644
28 --- a/games-action/teeworlds/Manifest
29 +++ b/games-action/teeworlds/Manifest
30 @@ -1 +1,2 @@
31 DIST teeworlds-0.6.3-src.tar.gz 13101446 SHA256 490ee7c372898761c609af8d7b0c6bd55942c6c6fcd7f361eefa00abfc70077b SHA512 0c7ef6ca59e4b49f9e208f39e8b0edd76965d67848008af3a223cb7615a6c62ff433d3113f733ae4dafc364baf522d2f56255e058d26d9f5c48071cdde41526d WHIRLPOOL dc501bb9a2f4c3971ad063102a55cc70633857e3052f3a349d032dd8e92ea05f6138c62e9775b743b38dc3a56366d9920850b5a7ffbf6913ed73536a5cacdff4
32 +DIST teeworlds-0.6.4-src.tar.gz 8771622 SHA256 c261d19ebb00b5451faa2ceb4a7ca945cad2add48b06046eb43b40ccc9fd98e2 SHA512 7546ee358a2126339f6c727bb7b5f49009a8fad0b5e77a796202cba4d8fc5dfcaf79b7e65151d85fead2a70ad61ef3e1888b8c07fe0206f87575d5dd8c9f91ce WHIRLPOOL ea45aeb1eeef511e38b19e051dc575b7506dba002ed27a3850aabbb9bfac9a0530bc033d3428ede75a0081c054a573a91c0c942cf49477645674ad5d4aa28764
33
34 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
35 similarity index 100%
36 rename from games-action/teeworlds/files/0.6.3/01-use-system-wavpack.patch
37 rename to games-action/teeworlds/files/0.6/01-use-system-wavpack.patch
38
39 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
40 similarity index 100%
41 rename from games-action/teeworlds/files/0.6.3/02-fixed-wavpack-sound-loading.patch
42 rename to games-action/teeworlds/files/0.6/02-fixed-wavpack-sound-loading.patch
43
44 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
45 similarity index 100%
46 rename from games-action/teeworlds/files/0.6.3/03-use-system-pnglite.patch
47 rename to games-action/teeworlds/files/0.6/03-use-system-pnglite.patch
48
49 diff --git a/games-action/teeworlds/files/0.6.3/04-dedicated.patch b/games-action/teeworlds/files/0.6/04-dedicated.patch
50 similarity index 100%
51 rename from games-action/teeworlds/files/0.6.3/04-dedicated.patch
52 rename to games-action/teeworlds/files/0.6/04-dedicated.patch
53
54 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
55 similarity index 100%
56 rename from games-action/teeworlds/files/0.6.3/05-cc-cflags.patch
57 rename to games-action/teeworlds/files/0.6/05-cc-cflags.patch
58
59 diff --git a/games-action/teeworlds/teeworlds-0.6.3-r1.ebuild b/games-action/teeworlds/teeworlds-0.6.3-r1.ebuild
60 index fe0ccfa211b..c7affb67818 100644
61 --- a/games-action/teeworlds/teeworlds-0.6.3-r1.ebuild
62 +++ b/games-action/teeworlds/teeworlds-0.6.3-r1.ebuild
63 @@ -3,7 +3,7 @@
64
65 EAPI=6
66 PYTHON_COMPAT=( python2_7 )
67 -inherit eutils multiprocessing python-any-r1 toolchain-funcs
68 +inherit eutils multiprocessing python-any-r1 toolchain-funcs versionator
69
70 REVISION="b177-r50edfd37"
71
72 @@ -32,13 +32,14 @@ DEPEND="${RDEPEND}
73 ~dev-util/bam-0.4.0"
74
75 S=${WORKDIR}/${P}-src
76 +MY_PV=$(get_version_component_range 1-2)
77
78 PATCHES=(
79 - "${FILESDIR}/${PV}/01-use-system-wavpack.patch"
80 - "${FILESDIR}/${PV}/02-fixed-wavpack-sound-loading.patch"
81 - "${FILESDIR}/${PV}/03-use-system-pnglite.patch"
82 - "${FILESDIR}/${PV}/04-dedicated.patch"
83 - "${FILESDIR}/${PV}/05-cc-cflags.patch"
84 + "${FILESDIR}/${MY_PV}/01-use-system-wavpack.patch"
85 + "${FILESDIR}/${MY_PV}/02-fixed-wavpack-sound-loading.patch"
86 + "${FILESDIR}/${MY_PV}/03-use-system-pnglite.patch"
87 + "${FILESDIR}/${MY_PV}/04-dedicated.patch"
88 + "${FILESDIR}/${MY_PV}/05-cc-cflags.patch"
89 )
90
91 pkg_setup() {
92
93 diff --git a/games-action/teeworlds/teeworlds-0.6.3.ebuild b/games-action/teeworlds/teeworlds-0.6.3.ebuild
94 index 6ec2bfd5c05..791c9d00e07 100644
95 --- a/games-action/teeworlds/teeworlds-0.6.3.ebuild
96 +++ b/games-action/teeworlds/teeworlds-0.6.3.ebuild
97 @@ -3,7 +3,7 @@
98
99 EAPI=5
100 PYTHON_COMPAT=( python2_7 )
101 -inherit eutils multiprocessing python-any-r1 toolchain-funcs games
102 +inherit eutils multiprocessing python-any-r1 toolchain-funcs games versionator
103
104 REVISION="b177-r50edfd37"
105
106 @@ -31,6 +31,7 @@ DEPEND="${RDEPEND}
107 ~dev-util/bam-0.4.0"
108
109 S=${WORKDIR}/${P}-src
110 +MY_PV=$(get_version_component_range 1-2)
111
112 pkg_setup() {
113 python-any-r1_pkg_setup
114 @@ -41,7 +42,7 @@ src_prepare() {
115 rm -r src/engine/external/* || die
116
117 # 01 & 02 from pull request: https://github.com/oy/teeworlds/pull/493
118 - EPATCH_SOURCE="${FILESDIR}/${PV}" EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" \
119 + EPATCH_SOURCE="${FILESDIR}/${MY_PV}" EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" \
120 epatch
121
122 cat <<- __EOF__ > "${S}/gentoo.lua"
123
124 diff --git a/games-action/teeworlds/teeworlds-0.6.3-r1.ebuild b/games-action/teeworlds/teeworlds-0.6.4.ebuild
125 similarity index 84%
126 copy from games-action/teeworlds/teeworlds-0.6.3-r1.ebuild
127 copy to games-action/teeworlds/teeworlds-0.6.4.ebuild
128 index fe0ccfa211b..dc1a0d9c2f2 100644
129 --- a/games-action/teeworlds/teeworlds-0.6.3-r1.ebuild
130 +++ b/games-action/teeworlds/teeworlds-0.6.4.ebuild
131 @@ -3,9 +3,9 @@
132
133 EAPI=6
134 PYTHON_COMPAT=( python2_7 )
135 -inherit eutils multiprocessing python-any-r1 toolchain-funcs
136 +inherit eutils multiprocessing python-any-r1 toolchain-funcs versionator
137
138 -REVISION="b177-r50edfd37"
139 +REVISION="b177-rff25472"
140
141 DESCRIPTION="Online multi-player platform 2D shooter"
142 HOMEPAGE="http://www.teeworlds.com/"
143 @@ -32,13 +32,14 @@ DEPEND="${RDEPEND}
144 ~dev-util/bam-0.4.0"
145
146 S=${WORKDIR}/${P}-src
147 +MY_PV=$(get_version_component_range 1-2)
148
149 PATCHES=(
150 - "${FILESDIR}/${PV}/01-use-system-wavpack.patch"
151 - "${FILESDIR}/${PV}/02-fixed-wavpack-sound-loading.patch"
152 - "${FILESDIR}/${PV}/03-use-system-pnglite.patch"
153 - "${FILESDIR}/${PV}/04-dedicated.patch"
154 - "${FILESDIR}/${PV}/05-cc-cflags.patch"
155 + "${FILESDIR}/${MY_PV}/01-use-system-wavpack.patch"
156 + "${FILESDIR}/${MY_PV}/02-fixed-wavpack-sound-loading.patch"
157 + "${FILESDIR}/${MY_PV}/03-use-system-pnglite.patch"
158 + "${FILESDIR}/${MY_PV}/04-dedicated.patch"
159 + "${FILESDIR}/${MY_PV}/05-cc-cflags.patch"
160 )
161
162 pkg_setup() {
Report Message
Find on MARC Find on Google Groups