[gentoo-commits] repo/gentoo:master commit in: games-action/teeworlds/files/

2020-07-20 Thread Sam James
commit: 146baa3b961a0b5f95cb0350c0f9b826dead2c7f
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Mon Jul 20 16:15:13 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jul 20 23:30:16 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=146baa3b

games-action/teeworlds: remove unused file

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Michael Mair-Keimberger  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/16753
Signed-off-by: Sam James  gentoo.org>

 games-action/teeworlds/files/teeworlds.xpm | 66 --
 1 file changed, 66 deletions(-)

diff --git a/games-action/teeworlds/files/teeworlds.xpm 
b/games-action/teeworlds/files/teeworlds.xpm
deleted file mode 100644
index 76e30166dd3..000
--- a/games-action/teeworlds/files/teeworlds.xpm
+++ /dev/null
@@ -1,66 +0,0 @@
-/* XPM */
-static char *teeworlds__[] = {
-/* columns rows colors chars-per-pixel */
-"48 48 12 1",
-"  c #00",
-". c #80",
-"X c #FF",
-"o c #008000",
-"O c #808000",
-"+ c #00",
-"@ c #80",
-"# c #800080",
-"$ c #008080",
-"% c #808080",
-"& c #C0C0C0",
-"* c None",
-/* pixels */
-"*%%.%%%*",
-"*%%*",
-"*** .%O%OOO. ***",
-"*   ..%+&   @*",
-"***%   O&&++%   ",
-"**O  .+&&+O  %**",
-"*@  O&&&+++%  %*",
-"  .O&+++%  %",
-"***%  O+&%  ",
-"***  O+&&+%  ***",
-"**  O+X&+++O .**",
-"*% .OX++  **",
-"*  .   +O@ ++  *",
-"%  ++X+ +++O  . +  *",
-"  O+X++ +++ +O %",
-"  X++X+ +++ ++  ",
-"  ++X+& +++ ++  ",
-"***% .+X+O+ +++ ++O ",
-"***% O++X+& +++ ++% %***",
-"***  O+X+++ +++O++O %***",
-"***  OX+X+X+   +   +++& .***",
-"***  X+&++O $***",
-"***  OX+X++%++% .***",
-"***  O+O++X+++% %***",
-"***  O+X+X+++ %***",
-"***% .+O++X+X+  ",
-"  +X+X+++%+++&  ",
-"  O++O+OX+&++%  ",
-"% .+X+X&+. %",
-"*  O+O+X+OX+&+++%  *",
-"*  O+X++X+++@ %*",
-"**  OO+X++X+X++%  **",
-"**%  ++O+X++O+&  %**",
-"***  .O o   .O.O+&+++&. %***",
-"**%O.OOO#o.  OO+&+++&.  ",
-"*%  .O+X+X+X%+.  OX++&+&++X+ ***",
-"*  .%OX+O+%O+&+X&+O oO+X+XO .OO   **",
-"% .OO+%++&+X+%+X .+O++X+O. #%+X+.  *",
-"  O+X+X+X+%+X&++%+O+% O+X+OO .O+X+ *",
-"  OX+%+O%+%+%+++XO OO  .O%+%+%X+%O $",
-"  +OOX+X+X+X+X+%+X+%+.  ..O%X+X+X+%+X% .",
-"  OX+%+%+%+%+%+%+%+X+. O+%+O+%+%+%+X+O  ",
-"  OOX+X+X+X+OX+X+X+OO.OX+X+XOX+X+X+OO  %",
-"%  OOO+XO+O.  OO+OO.   %",
-"* %*",
-"***.%***",
-"***%%%**",
-""
-};



[gentoo-commits] repo/gentoo:master commit in: games-action/teeworlds/files/0.6/, games-action/teeworlds/

2020-07-17 Thread Sam James
commit: a9e74fa9c10625e66021aa729889d6b418754c9d
Author: Sam James  gentoo  org>
AuthorDate: Fri Jul 17 21:31:24 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jul 17 23:59:59 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9e74fa9

games-action/teeworlds: security cleanup

Bug: https://bugs.gentoo.org/683000
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Sam James  gentoo.org>

 games-action/teeworlds/Manifest|   1 -
 .../files/0.6/01-use-system-wavpack.patch  | 101 -
 .../files/0.6/02-fixed-wavpack-sound-loading.patch | 109 --
 .../files/0.6/03-use-system-pnglite.patch  | 160 -
 .../teeworlds/files/0.6/04-dedicated.patch |  15 --
 .../teeworlds/files/0.6/05-cc-cflags.patch |  18 ---
 games-action/teeworlds/teeworlds-0.6.4.ebuild  | 118 ---
 7 files changed, 522 deletions(-)

diff --git a/games-action/teeworlds/Manifest b/games-action/teeworlds/Manifest
index 6b9d796adb2..08b8c1c89d4 100644
--- a/games-action/teeworlds/Manifest
+++ b/games-action/teeworlds/Manifest
@@ -1,4 +1,3 @@
-DIST teeworlds-0.6.4-src.tar.gz 8771622 BLAKE2B 
14493fcad458b0e1c749e40bdd6a5a858704bf971d53d11782d52fbe9b5fe2a09235dcac25340e51a3330001d46ee512f2971e8db06eb9f51eec5e6b3cd2a328
 SHA512 
7546ee358a2126339f6c727bb7b5f49009a8fad0b5e77a796202cba4d8fc5dfcaf79b7e65151d85fead2a70ad61ef3e1888b8c07fe0206f87575d5dd8c9f91ce
 DIST teeworlds-0.7.5-maps.tar.gz 151689 BLAKE2B 
f8ffbb6a024755bb972955a8c7d277709e17021c0554be0e2803e8c1b4848f5dca6d91b9f7f4e0731766745878c1143d27be3fa8aede01ff9cc69ac557ca70a8
 SHA512 
74084e169c1870cd541f5bb719c209210227055d304b3ce22fbad3d32d24b3356fbdec8d948edf3aa582270a8b0db7dec41e4924401f8398f7d5feba5ded49b3
 DIST teeworlds-0.7.5-translation.tar.gz 169121 BLAKE2B 
1c649392385abf8e00d8c9e64ca7eaaa5af5848878566081cda83c7d78c417652137e7285d16038f302a6fdf94eb3993c506886d4cc1359694d534c7be5ea925
 SHA512 
41c69cd9e9290857b44be18f89ab9f3a7ccd6804757332966b973aec3a9e6fd5a40d323696a044a724228b2bb67b097311fa8c24fdec226eecb7a27c2da559dc
 DIST teeworlds-0.7.5.tar.gz 8654985 BLAKE2B 
ebeb9aa1119950e4d78d8c0d6c7be5711894c3212755a6db3b8b8c1f1803dba1e0d2e1a0e294e1a1fffe84a28beab8fac0e55fa0e94c68ed97e8764ac3b742d3
 SHA512 
673410a5fb5e488229ddc4ea4a1ac9cd8143a6e9499bde9f5535d7f0be5b6c85163065da9580c3de0d240f1cad63e0bc12c10caf1d893c324edb301bc150653b

diff --git a/games-action/teeworlds/files/0.6/01-use-system-wavpack.patch 
b/games-action/teeworlds/files/0.6/01-use-system-wavpack.patch
deleted file mode 100644
index 4a11a866511..000
--- a/games-action/teeworlds/files/0.6/01-use-system-wavpack.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-commit 7202b142891ee10771af9f1f3063664d75a38bbc
-Author: hasufell 
-Date:   Thu Sep 5 12:28:30 2013 +0200
-
-Use system wavpack. Based on patch from Gentoo Bugzilla
-
-From: Azamat H. Hackimov 
-
-https://bugs.gentoo.org/show_bug.cgi?id=363395
-
-diff --git a/bam.lua b/bam.lua
-index 11ac7b9..35c1d8d 100644
 a/bam.lua
-+++ b/bam.lua
-@@ -11,6 +11,7 @@ config:Add(OptTestCompileC("stackprotector", "int 
main(){return 0;}", "-fstack-p
- config:Add(OptTestCompileC("minmacosxsdk", "int main(){return 0;}", 
"-mmacosx-version-min=10.5 -isysroot /Developer/SDKs/MacOSX10.5.sdk"))
- config:Add(OptTestCompileC("macosxppc", "int main(){return 0;}", "-arch ppc"))
- config:Add(OptLibrary("zlib", "zlib.h", false))
-+config:Add(OptLibrary("wavpack", "wavpack/wavpack.h", false))
- config:Add(SDL.OptFind("sdl", true))
- config:Add(FreeType.OptFind("freetype", true))
- config:Finalize("config.lua")
-@@ -187,7 +188,7 @@ function build(settings)
-   end
- 
-   -- compile zlib if needed
--  if config.zlib.value == 1 then
-+  if config.zlib.value == true then
-   settings.link.libs:Add("z")
-   if config.zlib.include_path then
-   settings.cc.includes:Add(config.zlib.include_path)
-@@ -198,8 +199,18 @@ function build(settings)
-   settings.cc.includes:Add("src/engine/external/zlib")
-   end
- 
-+  if config.wavpack.value == true then
-+  settings.link.libs:Add("wavpack")
-+  if config.wavpack.include_path then
-+  settings.cc.includes:Add(config.wavpack.include_path)
-+  end
-+  wavpack = {}
-+  else
-+  wavpack = Compile(settings, 
Collect("src/engine/external/wavpack/*.c"))
-+  settings.cc.includes:Add("src/engine/external/") --The header 
is wavpack/wavpack.h so include the external folder
-+  end
-+
-   -- build the small libraries
--  wavpack = Compile(settings, Collect("src/engine/external/wavpack/*.c"))
-   pnglite = Compile(settings, Collect("src/engine/external/pnglite/*.c"))
- 
-   -- build game components
-diff --git a/src/engine/client/sound.cpp b/src/engine/client/sound.cpp
-index 343fa2e..e32cac9 100644

[gentoo-commits] repo/gentoo:master commit in: games-action/teeworlds/

2020-07-01 Thread Andreas Sturmlechner
commit: 6101c95ee5879e1d10a5e502c88f3a752df06751
Author: Victor Kustov  yandex  ru>
AuthorDate: Mon May 11 13:34:18 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Jul  1 10:16:15 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6101c95e

games-action/teeworlds: bump to 0.7.5

Bump version
Remove dev-util/bam (switch to cmake)

Closes: https://bugs.gentoo.org/668928
Signed-off-by: Victor Kustov  yandex.ru>
Closes: https://github.com/gentoo/gentoo/pull/13781
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 games-action/teeworlds/Manifest   |  4 ++
 games-action/teeworlds/teeworlds-0.7.5.ebuild | 80 +++
 2 files changed, 84 insertions(+)

diff --git a/games-action/teeworlds/Manifest b/games-action/teeworlds/Manifest
index 78521c5092a..6b9d796adb2 100644
--- a/games-action/teeworlds/Manifest
+++ b/games-action/teeworlds/Manifest
@@ -1 +1,5 @@
 DIST teeworlds-0.6.4-src.tar.gz 8771622 BLAKE2B 
14493fcad458b0e1c749e40bdd6a5a858704bf971d53d11782d52fbe9b5fe2a09235dcac25340e51a3330001d46ee512f2971e8db06eb9f51eec5e6b3cd2a328
 SHA512 
7546ee358a2126339f6c727bb7b5f49009a8fad0b5e77a796202cba4d8fc5dfcaf79b7e65151d85fead2a70ad61ef3e1888b8c07fe0206f87575d5dd8c9f91ce
+DIST teeworlds-0.7.5-maps.tar.gz 151689 BLAKE2B 
f8ffbb6a024755bb972955a8c7d277709e17021c0554be0e2803e8c1b4848f5dca6d91b9f7f4e0731766745878c1143d27be3fa8aede01ff9cc69ac557ca70a8
 SHA512 
74084e169c1870cd541f5bb719c209210227055d304b3ce22fbad3d32d24b3356fbdec8d948edf3aa582270a8b0db7dec41e4924401f8398f7d5feba5ded49b3
+DIST teeworlds-0.7.5-translation.tar.gz 169121 BLAKE2B 
1c649392385abf8e00d8c9e64ca7eaaa5af5848878566081cda83c7d78c417652137e7285d16038f302a6fdf94eb3993c506886d4cc1359694d534c7be5ea925
 SHA512 
41c69cd9e9290857b44be18f89ab9f3a7ccd6804757332966b973aec3a9e6fd5a40d323696a044a724228b2bb67b097311fa8c24fdec226eecb7a27c2da559dc
+DIST teeworlds-0.7.5.tar.gz 8654985 BLAKE2B 
ebeb9aa1119950e4d78d8c0d6c7be5711894c3212755a6db3b8b8c1f1803dba1e0d2e1a0e294e1a1fffe84a28beab8fac0e55fa0e94c68ed97e8764ac3b742d3
 SHA512 
673410a5fb5e488229ddc4ea4a1ac9cd8143a6e9499bde9f5535d7f0be5b6c85163065da9580c3de0d240f1cad63e0bc12c10caf1d893c324edb301bc150653b
+DIST teeworlds.png 21502 BLAKE2B 
8064e0c2149f20f182b2ca2f7454f0e8395e199a432b8f21a9963cc771b1504ebe8cbe427ecd738d35313b1a378eaf8e305d509cd5360a07e9ab3c5224b78b77
 SHA512 
a272a1d9f13504c43ba873d93899df93c435f58cec20ae68bc9493a983e54cdd4c8f0f2e0630558c5e915aec891d2267bc3459ecc78c25738602452a2123fadf

diff --git a/games-action/teeworlds/teeworlds-0.7.5.ebuild 
b/games-action/teeworlds/teeworlds-0.7.5.ebuild
new file mode 100644
index 000..f2e0b2da85e
--- /dev/null
+++ b/games-action/teeworlds/teeworlds-0.7.5.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+
+inherit cmake-utils desktop python-any-r1 xdg-utils
+
+COMMIT_LANG="4ba6f824e9c34565e61340d25bc8c3cc004d40fb"
+COMMIT_MAPS="1d3401a37a3334e311faf18a22aeff0e0ac9ee65"
+
+DESCRIPTION="Online multi-player platform 2D shooter"
+HOMEPAGE="https://www.teeworlds.com/;
+SRC_URI="
+   https://github.com/ktrace/gentoo-blobs/raw/master/teeworlds.png
+   https://github.com/teeworlds/teeworlds/archive/${PV}.tar.gz -> 
${P}.tar.gz
+   
https://github.com/teeworlds/teeworlds-maps/archive/${COMMIT_MAPS}.tar.gz -> 
${P}-maps.tar.gz
+   
https://github.com/teeworlds/teeworlds-translation/archive/${COMMIT_LANG}.tar.gz
 -> ${P}-translation.tar.gz
+   "
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug dedicated"
+
+RDEPEND="
+   !dedicated? (
+   app-arch/bzip2
+   media-libs/freetype
+   media-libs/libsdl[X,sound,opengl,video]
+   media-libs/pnglite
+   media-sound/wavpack
+   virtual/glu
+   virtual/opengl
+   x11-libs/libX11
+   )
+   dev-libs/openssl:0=
+   sys-libs/zlib"
+
+DEPEND="${RDEPEND} ${PYTHON_DEPS}"
+
+src_prepare() {
+   rm -r "${S}/datasrc/languages" || die
+   rm -r "${S}/datasrc/maps" || die
+   mv "${WORKDIR}/${PN}-translation-${COMMIT_LANG}" 
"${S}/datasrc/languages" || die
+   mv "${WORKDIR}/${PN}-maps-${COMMIT_MAPS}" "${S}/datasrc/maps" || die
+   cp "${DISTDIR}/${PN}.png" "${S}/" || die
+   python_fix_shebang scripts/
+   cmake-utils_src_prepare
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DCLIENT=$(usex dedicated OFF ON)
+   -DDEV=$(usex debug ON OFF)
+   -DPYTHON_EXECUTABLE="${PYTHON}"
+   )
+
+   cmake-utils_src_configure
+}
+
+src_install() {
+   cmake-utils_src_install
+   doicon -s 256 "${PN}.png"
+   domenu other/teeworlds.desktop
+   newinitd "${FILESDIR}"/${PN}-init.d ${PN}
+   insinto "/etc/${PN}"
+   doins "${FILESDIR}"/teeworlds_srv.cfg
+}
+
+pkg_postinst() {
+   

[gentoo-commits] repo/gentoo:master commit in: games-action/teeworlds/

2020-07-01 Thread Andreas Sturmlechner
commit: 756334db7d87f8a52c2d48302b88c39b613d51f4
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Jul  1 10:19:06 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Jul  1 10:27:05 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=756334db

games-action/teeworlds: Up to speed with 2020: cmake.eclass, py38+39

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 games-action/teeworlds/teeworlds-0.7.5.ebuild | 15 +++
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/games-action/teeworlds/teeworlds-0.7.5.ebuild 
b/games-action/teeworlds/teeworlds-0.7.5.ebuild
index f2e0b2da85e..7e5532fed00 100644
--- a/games-action/teeworlds/teeworlds-0.7.5.ebuild
+++ b/games-action/teeworlds/teeworlds-0.7.5.ebuild
@@ -3,12 +3,11 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit cmake-utils desktop python-any-r1 xdg-utils
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 COMMIT_LANG="4ba6f824e9c34565e61340d25bc8c3cc004d40fb"
 COMMIT_MAPS="1d3401a37a3334e311faf18a22aeff0e0ac9ee65"
+inherit cmake desktop python-any-r1 xdg-utils
 
 DESCRIPTION="Online multi-player platform 2D shooter"
 HOMEPAGE="https://www.teeworlds.com/;
@@ -17,7 +16,7 @@ SRC_URI="
https://github.com/teeworlds/teeworlds/archive/${PV}.tar.gz -> 
${P}.tar.gz

https://github.com/teeworlds/teeworlds-maps/archive/${COMMIT_MAPS}.tar.gz -> 
${P}-maps.tar.gz

https://github.com/teeworlds/teeworlds-translation/archive/${COMMIT_LANG}.tar.gz
 -> ${P}-translation.tar.gz
-   "
+"
 
 LICENSE="ZLIB"
 SLOT="0"
@@ -26,7 +25,7 @@ IUSE="debug dedicated"
 
 RDEPEND="
!dedicated? (
-   app-arch/bzip2
+   app-arch/bzip2:=
media-libs/freetype
media-libs/libsdl[X,sound,opengl,video]
media-libs/pnglite
@@ -41,13 +40,13 @@ RDEPEND="
 DEPEND="${RDEPEND} ${PYTHON_DEPS}"
 
 src_prepare() {
+   cmake_src_prepare
rm -r "${S}/datasrc/languages" || die
rm -r "${S}/datasrc/maps" || die
mv "${WORKDIR}/${PN}-translation-${COMMIT_LANG}" 
"${S}/datasrc/languages" || die
mv "${WORKDIR}/${PN}-maps-${COMMIT_MAPS}" "${S}/datasrc/maps" || die
cp "${DISTDIR}/${PN}.png" "${S}/" || die
python_fix_shebang scripts/
-   cmake-utils_src_prepare
 }
 
 src_configure() {
@@ -57,11 +56,11 @@ src_configure() {
-DPYTHON_EXECUTABLE="${PYTHON}"
)
 
-   cmake-utils_src_configure
+   cmake_src_configure
 }
 
 src_install() {
-   cmake-utils_src_install
+   cmake_src_install
doicon -s 256 "${PN}.png"
domenu other/teeworlds.desktop
newinitd "${FILESDIR}"/${PN}-init.d ${PN}



[gentoo-commits] repo/gentoo:master commit in: games-action/teeworlds/

2018-04-15 Thread David Seifert
commit: 8e6750fa57677e5e017bde46ab4109b9b4b7d4ad
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Sun Apr 15 08:50:20 2018 +
Commit: David Seifert  gentoo  org>
CommitDate: Sun Apr 15 11:33:29 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e6750fa

games-action/teeworlds: use HTTPS

 games-action/teeworlds/teeworlds-0.6.4.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/games-action/teeworlds/teeworlds-0.6.4.ebuild 
b/games-action/teeworlds/teeworlds-0.6.4.ebuild
index 160ddb439d5..e0a27845920 100644
--- a/games-action/teeworlds/teeworlds-0.6.4.ebuild
+++ b/games-action/teeworlds/teeworlds-0.6.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit eutils multiprocessing python-any-r1 toolchain-funcs 
versionator
 REVISION="b177-rff25472"
 
 DESCRIPTION="Online multi-player platform 2D shooter"
-HOMEPAGE="http://www.teeworlds.com/;
+HOMEPAGE="https://www.teeworlds.com/;
 SRC_URI="https://downloads.teeworlds.com/${P}-src.tar.gz;
 
 LICENSE="ZLIB"



[gentoo-commits] repo/gentoo:master commit in: games-action/teeworlds/

2017-05-06 Thread James Le Cuirot
commit: 059541e7707feb0d4465a863d2bacbc850d1495f
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sat May  6 19:53:57 2017 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sat May  6 19:53:57 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=059541e7

games-action/teeworlds: Remove vulnerable 0.6.3 wrt bug #600178

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 games-action/teeworlds/Manifest  |   1 -
 games-action/teeworlds/teeworlds-0.6.3-r1.ebuild | 122 ---
 games-action/teeworlds/teeworlds-0.6.3.ebuild| 118 --
 3 files changed, 241 deletions(-)

diff --git a/games-action/teeworlds/Manifest b/games-action/teeworlds/Manifest
index 74b45ac09c5..b3b591ad637 100644
--- a/games-action/teeworlds/Manifest
+++ b/games-action/teeworlds/Manifest
@@ -1,2 +1 @@
-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/teeworlds-0.6.3-r1.ebuild 
b/games-action/teeworlds/teeworlds-0.6.3-r1.ebuild
deleted file mode 100644
index c7affb67818..000
--- a/games-action/teeworlds/teeworlds-0.6.3-r1.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-inherit eutils multiprocessing python-any-r1 toolchain-funcs versionator
-
-REVISION="b177-r50edfd37"
-
-DESCRIPTION="Online multi-player platform 2D shooter"
-HOMEPAGE="http://www.teeworlds.com/;
-SRC_URI="https://downloads.teeworlds.com/${P}-src.tar.gz;
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug dedicated"
-
-RDEPEND="
-   !dedicated? (
-   app-arch/bzip2
-   media-libs/freetype
-   media-libs/libsdl[X,sound,opengl,video]
-   media-libs/pnglite
-   media-sound/wavpack
-   virtual/glu
-   virtual/opengl
-   x11-libs/libX11 )
-   sys-libs/zlib"
-DEPEND="${RDEPEND}
-   ${PYTHON_DEPS}
-   ~dev-util/bam-0.4.0"
-
-S=${WORKDIR}/${P}-src
-MY_PV=$(get_version_component_range 1-2)
-
-PATCHES=(
-   "${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() {
-   python-any-r1_pkg_setup
-}
-
-src_prepare() {
-   default
-
-   rm -r src/engine/external/* || die
-
-   cat <<- __EOF__ > "${S}/gentoo.lua"
-   function addSettings(settings)
-   print("Adding Gentoo settings")
-   settings.optimize = 0
-   settings.cc.exe_c = "$(tc-getCC)"
-   settings.cc.exe_cxx = "$(tc-getCXX)"
-   settings.cc.flags_c:Add("${CFLAGS}")
-   settings.cc.flags_cxx:Add("${CXXFLAGS}")
-   settings.link.exe = "$(tc-getCXX)"
-   settings.link.flags:Add("${LDFLAGS}")
-   end
-   __EOF__
-
-   sed -i \
-   -e "s#/usr/share/games/teeworlds/data#/usr/share/${PN}/data#" \
-   src/engine/shared/storage.cpp || die
-}
-
-src_configure() {
-   bam -v config || die
-}
-
-src_compile() {
-   local myopt
-
-   if use debug; then
-   myopt=" server_debug"
-   else
-   myopt=" server_release"
-   fi
-   if ! use dedicated; then
-   if use debug; then
-   myopt+=" client_debug"
-   else
-   myopt+=" client_release"
-   fi
-   fi
-
-   bam -v -a -j $(makeopts_jobs) ${myopt} || die
-}
-
-src_install() {
-   if use debug; then
-   newbin ${PN}_srv_d ${PN}_srv
-   else
-   dobin ${PN}_srv
-   fi
-   if ! use dedicated; then
-   if use debug; then
-   newbin ${PN}_d ${PN}
-   else
-   dobin ${PN}
-   fi
-
-   doicon "${FILESDIR}"/${PN}.xpm
-   make_desktop_entry ${PN} Teeworlds
-

[gentoo-commits] repo/gentoo:master commit in: games-action/teeworlds/

2017-05-06 Thread Agostino Sarubbo
commit: bc95c9b5ea91492bde1c073e4ce838f3ab559b75
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sat May  6 17:20:16 2017 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sat May  6 17:20:16 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc95c9b5

games-action/teeworlds: x86 stable wrt bug #600178

Package-Manager: Portage-2.3.5, Repoman-2.3.1
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 games-action/teeworlds/teeworlds-0.6.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-action/teeworlds/teeworlds-0.6.4.ebuild 
b/games-action/teeworlds/teeworlds-0.6.4.ebuild
index eb4619bff93..4ffbb88a2c8 100644
--- a/games-action/teeworlds/teeworlds-0.6.4.ebuild
+++ b/games-action/teeworlds/teeworlds-0.6.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://downloads.teeworlds.com/${P}-src.tar.gz;
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug dedicated"
 
 RDEPEND="



[gentoo-commits] repo/gentoo:master commit in: games-action/teeworlds/

2017-05-05 Thread Agostino Sarubbo
commit: 25fd4955929ce75c8c1b01c4fff456fb54a79a52
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri May  5 14:10:22 2017 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri May  5 14:10:22 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25fd4955

games-action/teeworlds: amd64 stable wrt bug #600178

Package-Manager: Portage-2.3.5, Repoman-2.3.1
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 games-action/teeworlds/teeworlds-0.6.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-action/teeworlds/teeworlds-0.6.4.ebuild 
b/games-action/teeworlds/teeworlds-0.6.4.ebuild
index 160ddb439d5..eb4619bff93 100644
--- a/games-action/teeworlds/teeworlds-0.6.4.ebuild
+++ b/games-action/teeworlds/teeworlds-0.6.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://downloads.teeworlds.com/${P}-src.tar.gz;
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="debug dedicated"
 
 RDEPEND="



[gentoo-commits] repo/gentoo:master commit in: games-action/teeworlds/

2017-05-04 Thread James Le Cuirot
commit: 7a56f75b82e732e9931bfa0e03a6333114986bd7
Author: Learath  gmail  com>
AuthorDate: Sun Apr  9 20:41:26 2017 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Thu May  4 21:20:56 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a56f75b

games-action/teeworlds: Remove ugly patch

https://bugs.gentoo.org/show_bug.cgi?id=598637
Closes: https://github.com/gentoo/gentoo/pull/4400

 games-action/teeworlds/teeworlds-0.6.4.ebuild | 4 
 1 file changed, 4 deletions(-)

diff --git a/games-action/teeworlds/teeworlds-0.6.4.ebuild 
b/games-action/teeworlds/teeworlds-0.6.4.ebuild
index dc1a0d9c2f2..160ddb439d5 100644
--- a/games-action/teeworlds/teeworlds-0.6.4.ebuild
+++ b/games-action/teeworlds/teeworlds-0.6.4.ebuild
@@ -63,10 +63,6 @@ src_prepare() {
settings.link.flags:Add("${LDFLAGS}")
end
__EOF__
-
-   sed -i \
-   -e "s#/usr/share/games/teeworlds/data#/usr/share/${PN}/data#" \
-   src/engine/shared/storage.cpp || die
 }
 
 src_configure() {



[gentoo-commits] repo/gentoo:master commit in: games-action/teeworlds/

2017-01-30 Thread Austin English
commit: ccc6222da4aa0c0336f9918c69773e82aaf60927
Author: Austin English  gentoo  org>
AuthorDate: Mon Jan 30 22:23:06 2017 +
Commit: Austin English  gentoo  org>
CommitDate: Mon Jan 30 23:09:14 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ccc6222d

games-action/teeworlds: remove deprecated games eclass

Also update to EAPI 6

Gentoo-Bug: https://bugs.gentoo.org/574082

Package-Manager: Portage-2.3.2, Repoman-2.3.1

 games-action/teeworlds/teeworlds-0.6.3-r1.ebuild | 122 +++
 1 file changed, 122 insertions(+)

diff --git a/games-action/teeworlds/teeworlds-0.6.3-r1.ebuild 
b/games-action/teeworlds/teeworlds-0.6.3-r1.ebuild
new file mode 100644
index ..2f0aa98
--- /dev/null
+++ b/games-action/teeworlds/teeworlds-0.6.3-r1.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+inherit eutils multiprocessing python-any-r1 toolchain-funcs
+
+REVISION="b177-r50edfd37"
+
+DESCRIPTION="Online multi-player platform 2D shooter"
+HOMEPAGE="http://www.teeworlds.com/;
+SRC_URI="https://downloads.teeworlds.com/${P}-src.tar.gz;
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug dedicated"
+
+RDEPEND="
+   !dedicated? (
+   app-arch/bzip2
+   media-libs/freetype
+   media-libs/libsdl[X,sound,opengl,video]
+   media-libs/pnglite
+   media-sound/wavpack
+   virtual/glu
+   virtual/opengl
+   x11-libs/libX11 )
+   sys-libs/zlib"
+DEPEND="${RDEPEND}
+   ${PYTHON_DEPS}
+   ~dev-util/bam-0.4.0"
+
+S=${WORKDIR}/${P}-src
+
+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"
+)
+
+pkg_setup() {
+   python-any-r1_pkg_setup
+}
+
+src_prepare() {
+   default
+
+   rm -r src/engine/external/* || die
+
+   cat <<- __EOF__ > "${S}/gentoo.lua"
+   function addSettings(settings)
+   print("Adding Gentoo settings")
+   settings.optimize = 0
+   settings.cc.exe_c = "$(tc-getCC)"
+   settings.cc.exe_cxx = "$(tc-getCXX)"
+   settings.cc.flags_c:Add("${CFLAGS}")
+   settings.cc.flags_cxx:Add("${CXXFLAGS}")
+   settings.link.exe = "$(tc-getCXX)"
+   settings.link.flags:Add("${LDFLAGS}")
+   end
+   __EOF__
+
+   sed -i \
+   -e "s#/usr/share/games/teeworlds/data#/usr/share/${PN}/data#" \
+   src/engine/shared/storage.cpp || die
+}
+
+src_configure() {
+   bam -v config || die
+}
+
+src_compile() {
+   local myopt
+
+   if use debug; then
+   myopt=" server_debug"
+   else
+   myopt=" server_release"
+   fi
+   if ! use dedicated; then
+   if use debug; then
+   myopt+=" client_debug"
+   else
+   myopt+=" client_release"
+   fi
+   fi
+
+   bam -v -a -j $(makeopts_jobs) ${myopt} || die
+}
+
+src_install() {
+   if use debug; then
+   newbin ${PN}_srv_d ${PN}_srv
+   else
+   dobin ${PN}_srv
+   fi
+   if ! use dedicated; then
+   if use debug; then
+   newbin ${PN}_d ${PN}
+   else
+   dobin ${PN}
+   fi
+
+   doicon "${FILESDIR}"/${PN}.xpm
+   make_desktop_entry ${PN} Teeworlds
+
+   insinto /usr/share/${PN}/data
+   doins -r data/*
+   else
+   insinto /usr/share/${PN}/data/maps
+   doins -r data/maps/*
+   fi
+   newinitd "${FILESDIR}"/${PN}-init.d ${PN}
+   insinto "/etc/${PN}"
+   doins "${FILESDIR}"/teeworlds_srv.cfg
+
+   dodoc readme.txt
+}