[gentoo-commits] repo/proj/guru:dev commit in: games-fps/gzdoom/files/4.1.2/, games-fps/gzdoom/, games-fps/gzdoom/files/4.1.1/

2019-06-03 Thread William Breathitt Gray
commit: 556708d30e281f2abcb923ab75ff263ea668c846
Author: William Breathitt Gray  gmail  com>
AuthorDate: Mon Jun  3 08:52:41 2019 +
Commit: William Breathitt Gray  gmail  com>
CommitDate: Mon Jun  3 08:52:41 2019 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=556708d3

games-fps/gzdoom: Remove gzdoom package

The gzdoom ebuild has been merged to the Gentoo ebuild repository.

Signed-off-by: William Breathitt Gray  gmail.com>

 games-fps/gzdoom/Manifest  |   2 -
 .../0001-made-DUMB-library-always-static.patch |  26 
 ...orce-STATIC-for-internal-GZDoom-libraries.patch | 139 -
 ...orce-STATIC-for-internal-GZDoom-libraries.patch | 139 -
 games-fps/gzdoom/gzdoom-4.1.1.ebuild   |  65 --
 games-fps/gzdoom/gzdoom-4.1.2.ebuild   |  65 --
 games-fps/gzdoom/metadata.xml  |  19 ---
 7 files changed, 455 deletions(-)

diff --git a/games-fps/gzdoom/Manifest b/games-fps/gzdoom/Manifest
deleted file mode 100644
index 829f134..000
--- a/games-fps/gzdoom/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST gzdoom-4.1.1.tar.gz 13008847 BLAKE2B 
ac2bddbcc618148ed9de15dfe9105d1f3b9f319496b995d2af06834eb1349415ab3ee48beaa3e1acac04c81152e32bc89b71ac53576cf7789c1471a29a0a5339
 SHA512 
649e8bbf7f7f669d1bda13f1ab654428b69fa3e03a97eefb2ff1e996dbf62c66df72dddee9b8c139664ce5374ffbcdd8a10d1c4e3d0e6e65848ed5660b547d34
-DIST gzdoom-4.1.2.tar.gz 13045742 BLAKE2B 
38c70eb82ba266e5b41bf62f28f4cee77ba17c0cc1e4186bf11be9021386511346c111874b695ef56a4ed3c93668bb64a71ba4169183646e49d0ab60a1c0793a
 SHA512 
915029e676b17dd330aeee17fa8a9e07bb8e7a16e8ebce9fcdcd24e5b2f0cc48fd8f6914314029b332112ad4215a0f0d45d8e448e9025ac3c2a708a5e0bbd399

diff --git 
a/games-fps/gzdoom/files/4.1.1/0001-made-DUMB-library-always-static.patch 
b/games-fps/gzdoom/files/4.1.1/0001-made-DUMB-library-always-static.patch
deleted file mode 100644
index b6e0829..000
--- a/games-fps/gzdoom/files/4.1.1/0001-made-DUMB-library-always-static.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From c96d8c198e95876cb27b7cf9d0ec8d510d7a643d Mon Sep 17 00:00:00 2001
-From: "alexey.lysiuk" 
-Date: Fri, 10 May 2019 15:35:57 +0300
-Subject: [PATCH] - made DUMB library always static
-
-DUMB uses dumb_decode_vorbis() function from the main executable, so it failed 
to link as a dynamic library

- dumb/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/dumb/CMakeLists.txt b/dumb/CMakeLists.txt
-index 85e052209..904ca75c3 100644
 a/dumb/CMakeLists.txt
-+++ b/dumb/CMakeLists.txt
-@@ -24,7 +24,7 @@ endif()
- 
- include_directories( include )
- 
--add_library( dumb
-+add_library( dumb STATIC
- src/core/unload.c
- src/core/rendsig.c
- src/core/rendduh.c
--- 
-2.21.0
-

diff --git 
a/games-fps/gzdoom/files/4.1.1/0002-Force-STATIC-for-internal-GZDoom-libraries.patch
 
b/games-fps/gzdoom/files/4.1.1/0002-Force-STATIC-for-internal-GZDoom-libraries.patch
deleted file mode 100644
index f05a5f5..000
--- 
a/games-fps/gzdoom/files/4.1.1/0002-Force-STATIC-for-internal-GZDoom-libraries.patch
+++ /dev/null
@@ -1,139 +0,0 @@
-From 4a899ecb9c85d39d49a1d477c0fcdca5fb96c6c0 Mon Sep 17 00:00:00 2001
-From: William Breathitt Gray 
-Date: Wed, 15 May 2019 23:58:28 +0900
-Subject: [PATCH] Force STATIC for internal GZDoom libraries
-
-This makes sure the internal versions of these libraries bundled with
-the GZDoom source code is used. This prevents the system from building
-GZDoom for dynamic linking with incompatible external libraries (see
-).

- asmjit/CMakeLists.txt | 2 +-
- bzip2/CMakeLists.txt  | 2 +-
- game-music-emu/gme/CMakeLists.txt | 2 +-
- gdtoa/CMakeLists.txt  | 2 +-
- glslang/glslang/CMakeLists.txt| 2 +-
- glslang/spirv/CMakeLists.txt  | 2 +-
- jpeg/CMakeLists.txt   | 2 +-
- lzma/CMakeLists.txt   | 2 +-
- zlib/CMakeLists.txt   | 2 +-
- 9 files changed, 9 insertions(+), 9 deletions(-)
-
-diff --git a/asmjit/CMakeLists.txt b/asmjit/CMakeLists.txt
-index ab5c2fb4f..6b7636ebe 100644
 a/asmjit/CMakeLists.txt
-+++ b/asmjit/CMakeLists.txt
-@@ -97,7 +97,7 @@ set(ASMJIT_SRCS
- asmjit/x86/x86regalloc.cpp
- )
- 
--add_library(${ASMJITNAME} ${ASMJIT_SRCS} ${ASMJIT_PUBLIC_HDRS})
-+add_library(${ASMJITNAME} STATIC ${ASMJIT_SRCS} ${ASMJIT_PUBLIC_HDRS})
- 
- set_target_properties(${ASMJITNAME} PROPERTIES OUTPUT_NAME asmjit)
- 
-diff --git a/bzip2/CMakeLists.txt b/bzip2/CMakeLists.txt
-index 6ff9a2172..7fefb2bf2 100644
 a/bzip2/CMakeLists.txt
-+++ b/bzip2/CMakeLists.txt
-@@ -7,7 +7,7 @@ if( ZD_CMAKE_COMPILER_IS_GNUC_COMPATIBLE )
- endif()
- 
- add_definitions( -DBZ_NO_STDIO )
--add_library( bz2
-+add_library( bz2 STATIC
- blocksort.c
- bzlib.c
- compress.c
-diff --git a/game-music-emu/gme/CMakeLists.txt 
b/game-music-emu/gme/CMakeLists.txt
-index 

[gentoo-commits] repo/proj/guru:dev commit in: games-fps/gzdoom/, games-fps/gzdoom/files/4.1.2/

2019-05-18 Thread William Breathitt Gray
commit: cbc5abeccf8385d449fc86f6f11ab61e3b5a855c
Author: William Breathitt Gray  gmail  com>
AuthorDate: Sun May 19 02:49:53 2019 +
Commit: William Breathitt Gray  gmail  com>
CommitDate: Sun May 19 02:49:53 2019 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=cbc5abec

games-fps/gzdoom: Use upstream patch instead of global define

Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: William Breathitt Gray  gmail.com>

 ...orce-STATIC-for-internal-GZDoom-libraries.patch | 139 +
 games-fps/gzdoom/gzdoom-4.1.2.ebuild   |   3 +-
 2 files changed, 141 insertions(+), 1 deletion(-)

diff --git 
a/games-fps/gzdoom/files/4.1.2/0001-Force-STATIC-for-internal-GZDoom-libraries.patch
 
b/games-fps/gzdoom/files/4.1.2/0001-Force-STATIC-for-internal-GZDoom-libraries.patch
new file mode 100644
index 000..344fc01
--- /dev/null
+++ 
b/games-fps/gzdoom/files/4.1.2/0001-Force-STATIC-for-internal-GZDoom-libraries.patch
@@ -0,0 +1,139 @@
+From 6fafa297bfe0f82696d898d66e39c50f4f5eef16 Mon Sep 17 00:00:00 2001
+From: William Breathitt Gray 
+Date: Wed, 15 May 2019 23:58:28 +0900
+Subject: [PATCH] Force STATIC for internal GZDoom libraries
+
+This makes sure the internal versions of these libraries bundled with
+the GZDoom source code is used. This prevents the system from building
+GZDoom for dynamic linking with incompatible external libraries (see
+).
+---
+ asmjit/CMakeLists.txt | 2 +-
+ bzip2/CMakeLists.txt  | 2 +-
+ game-music-emu/gme/CMakeLists.txt | 2 +-
+ gdtoa/CMakeLists.txt  | 2 +-
+ glslang/glslang/CMakeLists.txt| 2 +-
+ glslang/spirv/CMakeLists.txt  | 2 +-
+ jpeg/CMakeLists.txt   | 2 +-
+ lzma/CMakeLists.txt   | 2 +-
+ zlib/CMakeLists.txt   | 2 +-
+ 9 files changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/asmjit/CMakeLists.txt b/asmjit/CMakeLists.txt
+index ab5c2fb4f..6b7636ebe 100644
+--- a/asmjit/CMakeLists.txt
 b/asmjit/CMakeLists.txt
+@@ -97,7 +97,7 @@ set(ASMJIT_SRCS
+ asmjit/x86/x86regalloc.cpp
+ )
+ 
+-add_library(${ASMJITNAME} ${ASMJIT_SRCS} ${ASMJIT_PUBLIC_HDRS})
++add_library(${ASMJITNAME} STATIC ${ASMJIT_SRCS} ${ASMJIT_PUBLIC_HDRS})
+ 
+ set_target_properties(${ASMJITNAME} PROPERTIES OUTPUT_NAME asmjit)
+ 
+diff --git a/bzip2/CMakeLists.txt b/bzip2/CMakeLists.txt
+index 6ff9a2172..7fefb2bf2 100644
+--- a/bzip2/CMakeLists.txt
 b/bzip2/CMakeLists.txt
+@@ -7,7 +7,7 @@ if( ZD_CMAKE_COMPILER_IS_GNUC_COMPATIBLE )
+ endif()
+ 
+ add_definitions( -DBZ_NO_STDIO )
+-add_library( bz2
++add_library( bz2 STATIC
+ blocksort.c
+ bzlib.c
+ compress.c
+diff --git a/game-music-emu/gme/CMakeLists.txt 
b/game-music-emu/gme/CMakeLists.txt
+index a5e06bc8a..5c37ebd29 100644
+--- a/game-music-emu/gme/CMakeLists.txt
 b/game-music-emu/gme/CMakeLists.txt
+@@ -163,7 +163,7 @@ set (EXPORTED_HEADERS gme.h)
+ include_directories(${CMAKE_CURRENT_BINARY_DIR})
+ 
+ # Add library to be compiled.
+-add_library(gme ${libgme_SRCS})
++add_library(gme STATIC ${libgme_SRCS})
+ 
+ if(ZLIB_FOUND)
+ message(" ** ZLib library located, compressed file formats will be 
supported")
+diff --git a/gdtoa/CMakeLists.txt b/gdtoa/CMakeLists.txt
+index a0b76e0c3..485f3778b 100644
+--- a/gdtoa/CMakeLists.txt
 b/gdtoa/CMakeLists.txt
+@@ -35,7 +35,7 @@ if( NOT MSVC AND NOT APPLE )
+   set( GEN_FP_DEPS ${CMAKE_CURRENT_BINARY_DIR}/arith.h 
${CMAKE_CURRENT_BINARY_DIR}/gd_qnan.h )
+ endif()
+ 
+-add_library( gdtoa
++add_library( gdtoa STATIC
+   ${GEN_FP_FILES}
+   dmisc.c
+   dtoa.c
+diff --git a/glslang/glslang/CMakeLists.txt b/glslang/glslang/CMakeLists.txt
+index c86eccb6e..e376a9178 100644
+--- a/glslang/glslang/CMakeLists.txt
 b/glslang/glslang/CMakeLists.txt
+@@ -120,7 +120,7 @@ endmacro(glslang_pch)
+ 
+ glslang_pch(SOURCES MachineIndependent/pch.cpp)
+ 
+-add_library(glslang ${LIB_TYPE} ${BISON_GLSLParser_OUTPUT_SOURCE} ${SOURCES} 
${HEADERS})
++add_library(glslang STATIC ${LIB_TYPE} ${BISON_GLSLParser_OUTPUT_SOURCE} 
${SOURCES} ${HEADERS})
+ set_property(TARGET glslang PROPERTY FOLDER glslang)
+ set_property(TARGET glslang PROPERTY POSITION_INDEPENDENT_CODE ON)
+ target_link_libraries(glslang OGLCompiler OSDependent)
+diff --git a/glslang/spirv/CMakeLists.txt b/glslang/spirv/CMakeLists.txt
+index 8062f8067..03d34d8f4 100644
+--- a/glslang/spirv/CMakeLists.txt
 b/glslang/spirv/CMakeLists.txt
+@@ -59,7 +59,7 @@ if(ENABLE_NV_EXTENSIONS)
+  GLSL.ext.NV.h)
+ endif(ENABLE_NV_EXTENSIONS)
+ 
+-add_library(SPIRV ${LIB_TYPE} ${SOURCES} ${HEADERS})
++add_library(SPIRV STATIC ${LIB_TYPE} ${SOURCES} ${HEADERS})
+ set_property(TARGET SPIRV PROPERTY FOLDER glslang)
+ set_property(TARGET SPIRV PROPERTY POSITION_INDEPENDENT_CODE ON)
+ target_include_directories(SPIRV PUBLIC ..)
+diff --git a/jpeg/CMakeLists.txt b/jpeg/CMakeLists.txt
+index 81834c742..33a3938cf 100644
+--- 

[gentoo-commits] repo/proj/guru:dev commit in: games-fps/gzdoom/

2019-05-17 Thread William Breathitt Gray
commit: 14649a97ea233699ddbc71f2c27a26af508eecb1
Author: William Breathitt Gray  gmail  com>
AuthorDate: Fri May 17 08:47:02 2019 +
Commit: William Breathitt Gray  gmail  com>
CommitDate: Fri May 17 08:48:04 2019 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=14649a97

games-fps/gzdoom: version bump to 4.1.2

Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: William Breathitt Gray  gmail.com>

 games-fps/gzdoom/Manifest|  1 +
 games-fps/gzdoom/gzdoom-4.1.2.ebuild | 64 
 2 files changed, 65 insertions(+)

diff --git a/games-fps/gzdoom/Manifest b/games-fps/gzdoom/Manifest
index 21c3976..829f134 100644
--- a/games-fps/gzdoom/Manifest
+++ b/games-fps/gzdoom/Manifest
@@ -1 +1,2 @@
 DIST gzdoom-4.1.1.tar.gz 13008847 BLAKE2B 
ac2bddbcc618148ed9de15dfe9105d1f3b9f319496b995d2af06834eb1349415ab3ee48beaa3e1acac04c81152e32bc89b71ac53576cf7789c1471a29a0a5339
 SHA512 
649e8bbf7f7f669d1bda13f1ab654428b69fa3e03a97eefb2ff1e996dbf62c66df72dddee9b8c139664ce5374ffbcdd8a10d1c4e3d0e6e65848ed5660b547d34
+DIST gzdoom-4.1.2.tar.gz 13045742 BLAKE2B 
38c70eb82ba266e5b41bf62f28f4cee77ba17c0cc1e4186bf11be9021386511346c111874b695ef56a4ed3c93668bb64a71ba4169183646e49d0ab60a1c0793a
 SHA512 
915029e676b17dd330aeee17fa8a9e07bb8e7a16e8ebce9fcdcd24e5b2f0cc48fd8f6914314029b332112ad4215a0f0d45d8e448e9025ac3c2a708a5e0bbd399

diff --git a/games-fps/gzdoom/gzdoom-4.1.2.ebuild 
b/games-fps/gzdoom/gzdoom-4.1.2.ebuild
new file mode 100644
index 000..cde070a
--- /dev/null
+++ b/games-fps/gzdoom/gzdoom-4.1.2.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils desktop xdg
+
+DESCRIPTION="A modder-friendly OpenGL source port based on the DOOM engine"
+HOMEPAGE="https://zdoom.org;
+SRC_URI="https://github.com/coelckers/${PN}/archive/g${PV}.tar.gz -> 
${P}.tar.gz"
+
+LICENSE="BSD BZIP2 DUMB-0.9.2 GPL-3 LGPL-3 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="fluidsynth gtk openal openmp"
+
+DEPEND="
+   media-libs/libsdl2[opengl]
+   sys-libs/zlib
+   virtual/jpeg:0
+   gtk? ( 

[gentoo-commits] repo/proj/guru:dev commit in: games-fps/gzdoom/files/4.1.1/, games-fps/gzdoom/

2019-05-15 Thread William Breathitt Gray
commit: b0ff4b1b6b4b5b9e00525b46cd78311495e96d12
Author: William Breathitt Gray  gmail  com>
AuthorDate: Wed May 15 16:00:35 2019 +
Commit: William Breathitt Gray  gmail  com>
CommitDate: Wed May 15 16:00:35 2019 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=b0ff4b1b

games-fps/gzdoom: Fix makefiles for bundled libraries

GZDoom includes bundled libraries with modifications made for GZDoom.
This commit adds patches to ensure the bundled libraries are built as
intended by the GZDoom project. The glslang dependency is removed since
GZDoom has its own modified bundled version.

Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: William Breathitt Gray  gmail.com>

 .../0001-made-DUMB-library-always-static.patch |  26 
 ...orce-STATIC-for-internal-GZDoom-libraries.patch | 139 +
 games-fps/gzdoom/gzdoom-4.1.1.ebuild   |   3 +-
 3 files changed, 167 insertions(+), 1 deletion(-)

diff --git 
a/games-fps/gzdoom/files/4.1.1/0001-made-DUMB-library-always-static.patch 
b/games-fps/gzdoom/files/4.1.1/0001-made-DUMB-library-always-static.patch
new file mode 100644
index 000..b6e0829
--- /dev/null
+++ b/games-fps/gzdoom/files/4.1.1/0001-made-DUMB-library-always-static.patch
@@ -0,0 +1,26 @@
+From c96d8c198e95876cb27b7cf9d0ec8d510d7a643d Mon Sep 17 00:00:00 2001
+From: "alexey.lysiuk" 
+Date: Fri, 10 May 2019 15:35:57 +0300
+Subject: [PATCH] - made DUMB library always static
+
+DUMB uses dumb_decode_vorbis() function from the main executable, so it failed 
to link as a dynamic library
+---
+ dumb/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/dumb/CMakeLists.txt b/dumb/CMakeLists.txt
+index 85e052209..904ca75c3 100644
+--- a/dumb/CMakeLists.txt
 b/dumb/CMakeLists.txt
+@@ -24,7 +24,7 @@ endif()
+ 
+ include_directories( include )
+ 
+-add_library( dumb
++add_library( dumb STATIC
+ src/core/unload.c
+ src/core/rendsig.c
+ src/core/rendduh.c
+-- 
+2.21.0
+

diff --git 
a/games-fps/gzdoom/files/4.1.1/0002-Force-STATIC-for-internal-GZDoom-libraries.patch
 
b/games-fps/gzdoom/files/4.1.1/0002-Force-STATIC-for-internal-GZDoom-libraries.patch
new file mode 100644
index 000..f05a5f5
--- /dev/null
+++ 
b/games-fps/gzdoom/files/4.1.1/0002-Force-STATIC-for-internal-GZDoom-libraries.patch
@@ -0,0 +1,139 @@
+From 4a899ecb9c85d39d49a1d477c0fcdca5fb96c6c0 Mon Sep 17 00:00:00 2001
+From: William Breathitt Gray 
+Date: Wed, 15 May 2019 23:58:28 +0900
+Subject: [PATCH] Force STATIC for internal GZDoom libraries
+
+This makes sure the internal versions of these libraries bundled with
+the GZDoom source code is used. This prevents the system from building
+GZDoom for dynamic linking with incompatible external libraries (see
+).
+---
+ asmjit/CMakeLists.txt | 2 +-
+ bzip2/CMakeLists.txt  | 2 +-
+ game-music-emu/gme/CMakeLists.txt | 2 +-
+ gdtoa/CMakeLists.txt  | 2 +-
+ glslang/glslang/CMakeLists.txt| 2 +-
+ glslang/spirv/CMakeLists.txt  | 2 +-
+ jpeg/CMakeLists.txt   | 2 +-
+ lzma/CMakeLists.txt   | 2 +-
+ zlib/CMakeLists.txt   | 2 +-
+ 9 files changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/asmjit/CMakeLists.txt b/asmjit/CMakeLists.txt
+index ab5c2fb4f..6b7636ebe 100644
+--- a/asmjit/CMakeLists.txt
 b/asmjit/CMakeLists.txt
+@@ -97,7 +97,7 @@ set(ASMJIT_SRCS
+ asmjit/x86/x86regalloc.cpp
+ )
+ 
+-add_library(${ASMJITNAME} ${ASMJIT_SRCS} ${ASMJIT_PUBLIC_HDRS})
++add_library(${ASMJITNAME} STATIC ${ASMJIT_SRCS} ${ASMJIT_PUBLIC_HDRS})
+ 
+ set_target_properties(${ASMJITNAME} PROPERTIES OUTPUT_NAME asmjit)
+ 
+diff --git a/bzip2/CMakeLists.txt b/bzip2/CMakeLists.txt
+index 6ff9a2172..7fefb2bf2 100644
+--- a/bzip2/CMakeLists.txt
 b/bzip2/CMakeLists.txt
+@@ -7,7 +7,7 @@ if( ZD_CMAKE_COMPILER_IS_GNUC_COMPATIBLE )
+ endif()
+ 
+ add_definitions( -DBZ_NO_STDIO )
+-add_library( bz2
++add_library( bz2 STATIC
+ blocksort.c
+ bzlib.c
+ compress.c
+diff --git a/game-music-emu/gme/CMakeLists.txt 
b/game-music-emu/gme/CMakeLists.txt
+index a5e06bc8a..5c37ebd29 100644
+--- a/game-music-emu/gme/CMakeLists.txt
 b/game-music-emu/gme/CMakeLists.txt
+@@ -163,7 +163,7 @@ set (EXPORTED_HEADERS gme.h)
+ include_directories(${CMAKE_CURRENT_BINARY_DIR})
+ 
+ # Add library to be compiled.
+-add_library(gme ${libgme_SRCS})
++add_library(gme STATIC ${libgme_SRCS})
+ 
+ if(ZLIB_FOUND)
+ message(" ** ZLib library located, compressed file formats will be 
supported")
+diff --git a/gdtoa/CMakeLists.txt b/gdtoa/CMakeLists.txt
+index a0b76e0c3..485f3778b 100644
+--- a/gdtoa/CMakeLists.txt
 b/gdtoa/CMakeLists.txt
+@@ -35,7 +35,7 @@ if( NOT MSVC AND NOT APPLE )
+   set( GEN_FP_DEPS ${CMAKE_CURRENT_BINARY_DIR}/arith.h 
${CMAKE_CURRENT_BINARY_DIR}/gd_qnan.h )
+ endif()
+ 
+-add_library( gdtoa
++add_library( gdtoa STATIC
+   ${GEN_FP_FILES}
+   

[gentoo-commits] repo/proj/guru:dev commit in: games-fps/gzdoom/

2019-05-14 Thread William Breathitt Gray
commit: b8f9ea037a42efaea53fd9d5faf88e4317af11da
Author: William Breathitt Gray  gmail  com>
AuthorDate: Tue May 14 11:58:54 2019 +
Commit: William Breathitt Gray  gmail  com>
CommitDate: Tue May 14 11:58:54 2019 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=b8f9ea03

games-fps/gzdoom: DESCRIPTION should not contain the package name

Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: William Breathitt Gray  gmail.com>

 games-fps/gzdoom/gzdoom-4.1.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-fps/gzdoom/gzdoom-4.1.1.ebuild 
b/games-fps/gzdoom/gzdoom-4.1.1.ebuild
index 26483ce..7860625 100644
--- a/games-fps/gzdoom/gzdoom-4.1.1.ebuild
+++ b/games-fps/gzdoom/gzdoom-4.1.1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 inherit cmake-utils desktop xdg
 
-DESCRIPTION="GZDoom - a modder-friendly OpenGL source port based on the DOOM 
engine"
+DESCRIPTION="A modder-friendly OpenGL source port based on the DOOM engine"
 HOMEPAGE="https://zdoom.org;
 SRC_URI="https://github.com/coelckers/${PN}/archive/g${PV}.tar.gz -> 
${P}.tar.gz"
 



[gentoo-commits] repo/proj/guru:dev commit in: games-fps/gzdoom/

2019-05-14 Thread William Breathitt Gray
commit: faa6f6e669cc8176ac52c93fe1598573964b6576
Author: William Breathitt Gray  gmail  com>
AuthorDate: Tue May 14 11:55:51 2019 +
Commit: William Breathitt Gray  gmail  com>
CommitDate: Tue May 14 11:55:51 2019 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=faa6f6e6

games-fps/gzdoom: bzip2 is a base system package

Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: William Breathitt Gray  gmail.com>

 games-fps/gzdoom/gzdoom-4.1.1.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/games-fps/gzdoom/gzdoom-4.1.1.ebuild 
b/games-fps/gzdoom/gzdoom-4.1.1.ebuild
index 6f635ed..26483ce 100644
--- a/games-fps/gzdoom/gzdoom-4.1.1.ebuild
+++ b/games-fps/gzdoom/gzdoom-4.1.1.ebuild
@@ -15,7 +15,6 @@ KEYWORDS="~amd64 ~x86"
 IUSE="fluidsynth gtk openal openmp"
 
 DEPEND="
-   app-arch/bzip2
>=dev-util/glslang-7.11.3114_pre20190415-r1
media-libs/libsdl2[opengl]
sys-libs/zlib



[gentoo-commits] repo/proj/guru:dev commit in: games-fps/gzdoom/

2019-05-13 Thread William Breathitt Gray
commit: 1f945bc22fa13f81115985d4182d8b2623bb61de
Author: William Breathitt Gray  gmail  com>
AuthorDate: Tue May 14 03:09:12 2019 +
Commit: William Breathitt Gray  gmail  com>
CommitDate: Tue May 14 03:09:57 2019 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=1f945bc2

games-fps/gzdoom: rebuild on gtk+ slot updates

The gtk+ dependency is moved to DEPEND since it is a build dependency.

Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: William Breathitt Gray  gmail.com>

 games-fps/gzdoom/gzdoom-4.1.1.ebuild | 9 ++---
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/games-fps/gzdoom/gzdoom-4.1.1.ebuild 
b/games-fps/gzdoom/gzdoom-4.1.1.ebuild
index e292fa4..6f635ed 100644
--- a/games-fps/gzdoom/gzdoom-4.1.1.ebuild
+++ b/games-fps/gzdoom/gzdoom-4.1.1.ebuild
@@ -19,16 +19,11 @@ DEPEND="
>=dev-util/glslang-7.11.3114_pre20190415-r1
media-libs/libsdl2[opengl]
sys-libs/zlib
-   virtual/jpeg:0"
+   virtual/jpeg:0
+   gtk? ( 

[gentoo-commits] repo/proj/guru:dev commit in: games-fps/gzdoom/

2019-05-13 Thread William Breathitt Gray
commit: 05b2e3c77eaec3a662748a5cfd453947ea4cd5be
Author: William Breathitt Gray  gmail  com>
AuthorDate: Tue May 14 00:11:51 2019 +
Commit: William Breathitt Gray  gmail  com>
CommitDate: Tue May 14 00:11:51 2019 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=05b2e3c7

games-fps/gzdoom: restrict glslang to dynamic library ebuilds

See also: https://bugs.gentoo.org/685514

Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: William Breathitt Gray  gmail.com>

 games-fps/gzdoom/gzdoom-4.1.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-fps/gzdoom/gzdoom-4.1.1.ebuild 
b/games-fps/gzdoom/gzdoom-4.1.1.ebuild
index 81898f6..03a3dce 100644
--- a/games-fps/gzdoom/gzdoom-4.1.1.ebuild
+++ b/games-fps/gzdoom/gzdoom-4.1.1.ebuild
@@ -16,7 +16,7 @@ IUSE="fluidsynth gtk openal openmp"
 
 DEPEND="
app-arch/bzip2
-   dev-util/glslang
+   >=dev-util/glslang-7.11.3114_pre20190415-r1
media-libs/libsdl2[opengl]
sys-libs/zlib
virtual/jpeg:0"



[gentoo-commits] repo/proj/guru:dev commit in: games-fps/gzdoom/

2019-05-13 Thread William Breathitt Gray
commit: 0108c377e4397d5772bd81a4f458ef44ba496266
Author: William Breathitt Gray  gmail  com>
AuthorDate: Tue May 14 00:29:29 2019 +
Commit: William Breathitt Gray  gmail  com>
CommitDate: Tue May 14 00:29:29 2019 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=0108c377

games-fps/gzdoom: restrict gtk+ to slot 2 and 3

Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: William Breathitt Gray  gmail.com>

 games-fps/gzdoom/gzdoom-4.1.1.ebuild | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/games-fps/gzdoom/gzdoom-4.1.1.ebuild 
b/games-fps/gzdoom/gzdoom-4.1.1.ebuild
index 03a3dce..e292fa4 100644
--- a/games-fps/gzdoom/gzdoom-4.1.1.ebuild
+++ b/games-fps/gzdoom/gzdoom-4.1.1.ebuild
@@ -23,7 +23,12 @@ DEPEND="
 RDEPEND="
${DEPEND}
fluidsynth? ( media-sound/fluidsynth )
-   gtk? ( x11-libs/gtk+:* )
+   gtk? (
+   || (
+   x11-libs/gtk+:2
+   x11-libs/gtk+:3
+   )
+   )
openal? (
media-libs/libsndfile
media-libs/openal



[gentoo-commits] repo/proj/guru:dev commit in: games-fps/gzdoom/

2019-05-12 Thread William Breathitt Gray
commit: 5ffd10106df16f7bca99339ccc3e6a597a90fe10
Author: William Breathitt Gray  gmail  com>
AuthorDate: Sun May 12 06:18:25 2019 +
Commit: William Breathitt Gray  gmail  com>
CommitDate: Sun May 12 06:20:58 2019 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=5ffd1010

Revert "games-fps/gzdoom: Add phonehome USE flag"

This reverts commit 8228a66ceb61a750e4e57850fe1002af67df6de8. The
phonehome functionality is not supported in the GZDoom 4.1.1 release.

Signed-off-by: William Breathitt Gray  gmail.com>

 games-fps/gzdoom/gzdoom-4.1.1.ebuild | 3 +--
 games-fps/gzdoom/metadata.xml| 1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/games-fps/gzdoom/gzdoom-4.1.1.ebuild 
b/games-fps/gzdoom/gzdoom-4.1.1.ebuild
index 02d1423..81898f6 100644
--- a/games-fps/gzdoom/gzdoom-4.1.1.ebuild
+++ b/games-fps/gzdoom/gzdoom-4.1.1.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://github.com/coelckers/${PN}/archive/g${PV}.tar.gz -> ${P}.tar.gz
 LICENSE="BSD BZIP2 DUMB-0.9.2 GPL-3 LGPL-3 MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="fluidsynth gtk openal openmp phonehome"
+IUSE="fluidsynth gtk openal openmp"
 
 DEPEND="
app-arch/bzip2
@@ -42,7 +42,6 @@ src_configure() {
-DNO_GTK="$(usex !gtk)"
-DNO_OPENAL="$(usex !openal)"
-DNO_OPENMP="$(usex !openmp)"
-   -DSEND_ANON_STATS="$(usex phonehome)"
)
cmake-utils_src_configure
 }

diff --git a/games-fps/gzdoom/metadata.xml b/games-fps/gzdoom/metadata.xml
index 4d5eb5b..53026d9 100644
--- a/games-fps/gzdoom/metadata.xml
+++ b/games-fps/gzdoom/metadata.xml
@@ -10,7 +10,6 @@


Use media-sound/fluidsynth 
for MIDI support
-   Enable sending of anonymous hardware 
statistics


https://forum.zdoom.org/viewforum.php?f=2



[gentoo-commits] repo/proj/guru:dev commit in: games-fps/gzdoom/

2019-05-11 Thread William Breathitt Gray
commit: ed9bb3facc97e85b54cfa3100ab093e2df494f18
Author: William Breathitt Gray  gmail  com>
AuthorDate: Sun May 12 04:00:19 2019 +
Commit: William Breathitt Gray  gmail  com>
CommitDate: Sun May 12 04:00:19 2019 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=ed9bb3fa

games-fps/gzdoom: gtk and openal are runtime dependencies

Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: William Breathitt Gray  gmail.com>

 games-fps/gzdoom/gzdoom-4.1.1.ebuild | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/games-fps/gzdoom/gzdoom-4.1.1.ebuild 
b/games-fps/gzdoom/gzdoom-4.1.1.ebuild
index c37e38a..02d1423 100644
--- a/games-fps/gzdoom/gzdoom-4.1.1.ebuild
+++ b/games-fps/gzdoom/gzdoom-4.1.1.ebuild
@@ -19,16 +19,16 @@ DEPEND="
dev-util/glslang
media-libs/libsdl2[opengl]
sys-libs/zlib
-   virtual/jpeg:0
+   virtual/jpeg:0"
+RDEPEND="
+   ${DEPEND}
+   fluidsynth? ( media-sound/fluidsynth )
gtk? ( x11-libs/gtk+:* )
openal? (
media-libs/libsndfile
media-libs/openal
media-sound/mpg123
)"
-RDEPEND="
-   ${DEPEND}
-   fluidsynth? ( media-sound/fluidsynth )"
 
 S="${WORKDIR}/${PN}-g${PV}"
 



[gentoo-commits] repo/proj/guru:dev commit in: games-fps/gzdoom/

2019-05-11 Thread William Breathitt Gray
commit: 8228a66ceb61a750e4e57850fe1002af67df6de8
Author: William Breathitt Gray  gmail  com>
AuthorDate: Sun May 12 03:38:46 2019 +
Commit: William Breathitt Gray  gmail  com>
CommitDate: Sun May 12 03:38:46 2019 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=8228a66c

games-fps/gzdoom: Add phonehome USE flag

Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: William Breathitt Gray  gmail.com>

 games-fps/gzdoom/gzdoom-4.1.1.ebuild | 3 ++-
 games-fps/gzdoom/metadata.xml| 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/games-fps/gzdoom/gzdoom-4.1.1.ebuild 
b/games-fps/gzdoom/gzdoom-4.1.1.ebuild
index fc2c4be..c37e38a 100644
--- a/games-fps/gzdoom/gzdoom-4.1.1.ebuild
+++ b/games-fps/gzdoom/gzdoom-4.1.1.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://github.com/coelckers/${PN}/archive/g${PV}.tar.gz -> ${P}.tar.gz
 LICENSE="BSD BZIP2 DUMB-0.9.2 GPL-3 LGPL-3 MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="fluidsynth gtk openal openmp"
+IUSE="fluidsynth gtk openal openmp phonehome"
 
 DEPEND="
app-arch/bzip2
@@ -42,6 +42,7 @@ src_configure() {
-DNO_GTK="$(usex !gtk)"
-DNO_OPENAL="$(usex !openal)"
-DNO_OPENMP="$(usex !openmp)"
+   -DSEND_ANON_STATS="$(usex phonehome)"
)
cmake-utils_src_configure
 }

diff --git a/games-fps/gzdoom/metadata.xml b/games-fps/gzdoom/metadata.xml
index 53026d9..4d5eb5b 100644
--- a/games-fps/gzdoom/metadata.xml
+++ b/games-fps/gzdoom/metadata.xml
@@ -10,6 +10,7 @@


Use media-sound/fluidsynth 
for MIDI support
+   Enable sending of anonymous hardware 
statistics


https://forum.zdoom.org/viewforum.php?f=2



[gentoo-commits] repo/proj/guru:dev commit in: games-fps/gzdoom/

2019-05-11 Thread William Breathitt Gray
commit: 907b35da57f2d3739b36fcaddcb141010239fe83
Author: William Breathitt Gray  gmail  com>
AuthorDate: Sun May 12 03:23:09 2019 +
Commit: William Breathitt Gray  gmail  com>
CommitDate: Sun May 12 03:23:09 2019 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=907b35da

games-fps/gzdoom: timidity and wildmidi are internal

Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: William Breathitt Gray  gmail.com>

 games-fps/gzdoom/gzdoom-4.1.1.ebuild | 8 ++--
 games-fps/gzdoom/metadata.xml| 2 +-
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/games-fps/gzdoom/gzdoom-4.1.1.ebuild 
b/games-fps/gzdoom/gzdoom-4.1.1.ebuild
index 2ebc1c2..fc2c4be 100644
--- a/games-fps/gzdoom/gzdoom-4.1.1.ebuild
+++ b/games-fps/gzdoom/gzdoom-4.1.1.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://github.com/coelckers/${PN}/archive/g${PV}.tar.gz -> ${P}.tar.gz
 LICENSE="BSD BZIP2 DUMB-0.9.2 GPL-3 LGPL-3 MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="gtk openal openmp midi"
+IUSE="fluidsynth gtk openal openmp"
 
 DEPEND="
app-arch/bzip2
@@ -21,7 +21,6 @@ DEPEND="
sys-libs/zlib
virtual/jpeg:0
gtk? ( x11-libs/gtk+:* )
-   midi? ( media-sound/wildmidi )
openal? (
media-libs/libsndfile
media-libs/openal
@@ -29,10 +28,7 @@ DEPEND="
)"
 RDEPEND="
${DEPEND}
-   midi? (
-   media-sound/fluidsynth
-   media-sound/timidity++
-   )"
+   fluidsynth? ( media-sound/fluidsynth )"
 
 S="${WORKDIR}/${PN}-g${PV}"
 

diff --git a/games-fps/gzdoom/metadata.xml b/games-fps/gzdoom/metadata.xml
index 6a4872a..53026d9 100644
--- a/games-fps/gzdoom/metadata.xml
+++ b/games-fps/gzdoom/metadata.xml
@@ -9,7 +9,7 @@
William Breathitt Gray


-   Enables MIDI support
+   Use media-sound/fluidsynth 
for MIDI support


https://forum.zdoom.org/viewforum.php?f=2



[gentoo-commits] repo/proj/guru:dev commit in: games-fps/gzdoom/

2019-05-10 Thread William Breathitt Gray
commit: 5ad016ab948bcf49f443c2f4182f185e6e357782
Author: William Breathitt Gray  gmail  com>
AuthorDate: Thu May  2 13:00:54 2019 +
Commit: William Breathitt Gray  gmail  com>
CommitDate: Fri May 10 11:06:57 2019 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=5ad016ab

games-fps/gzdoom: New package

Package-Manager: Portage-2.3.65, Repoman-2.3.12
Signed-off-by: William Breathitt Gray  gmail.com>

 games-fps/gzdoom/Manifest|  1 +
 games-fps/gzdoom/gzdoom-4.1.1.ebuild | 69 
 games-fps/gzdoom/metadata.xml| 19 ++
 3 files changed, 89 insertions(+)

diff --git a/games-fps/gzdoom/Manifest b/games-fps/gzdoom/Manifest
new file mode 100644
index 000..21c3976
--- /dev/null
+++ b/games-fps/gzdoom/Manifest
@@ -0,0 +1 @@
+DIST gzdoom-4.1.1.tar.gz 13008847 BLAKE2B 
ac2bddbcc618148ed9de15dfe9105d1f3b9f319496b995d2af06834eb1349415ab3ee48beaa3e1acac04c81152e32bc89b71ac53576cf7789c1471a29a0a5339
 SHA512 
649e8bbf7f7f669d1bda13f1ab654428b69fa3e03a97eefb2ff1e996dbf62c66df72dddee9b8c139664ce5374ffbcdd8a10d1c4e3d0e6e65848ed5660b547d34

diff --git a/games-fps/gzdoom/gzdoom-4.1.1.ebuild 
b/games-fps/gzdoom/gzdoom-4.1.1.ebuild
new file mode 100644
index 000..2ebc1c2
--- /dev/null
+++ b/games-fps/gzdoom/gzdoom-4.1.1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils desktop xdg
+
+DESCRIPTION="GZDoom - a modder-friendly OpenGL source port based on the DOOM 
engine"
+HOMEPAGE="https://zdoom.org;
+SRC_URI="https://github.com/coelckers/${PN}/archive/g${PV}.tar.gz -> 
${P}.tar.gz"
+
+LICENSE="BSD BZIP2 DUMB-0.9.2 GPL-3 LGPL-3 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gtk openal openmp midi"
+
+DEPEND="
+   app-arch/bzip2
+   dev-util/glslang
+   media-libs/libsdl2[opengl]
+   sys-libs/zlib
+   virtual/jpeg:0
+   gtk? ( x11-libs/gtk+:* )
+   midi? ( media-sound/wildmidi )
+   openal? (
+   media-libs/libsndfile
+   media-libs/openal
+   media-sound/mpg123
+   )"
+RDEPEND="
+   ${DEPEND}
+   midi? (
+   media-sound/fluidsynth
+   media-sound/timidity++
+   )"
+
+S="${WORKDIR}/${PN}-g${PV}"
+
+src_prepare() {
+   cmake-utils_src_prepare
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DINSTALL_DOCS_PATH="${EPREFIX}/usr/share/doc/${P}/docs"
+   -DNO_GTK="$(usex !gtk)"
+   -DNO_OPENAL="$(usex !openal)"
+   -DNO_OPENMP="$(usex !openmp)"
+   )
+   cmake-utils_src_configure
+}
+
+src_install() {
+   newicon src/posix/zdoom.xpm "${PN}.xpm"
+   make_desktop_entry "${PN}" "GZDoom" "${PN}" "Game;ActionGame"
+   cmake-utils_src_install
+}
+
+pkg_preinst() {
+   xdg_pkg_preinst
+}
+
+pkg_postinst() {
+   xdg_pkg_postinst
+}
+
+pkg_postrm() {
+   xdg_pkg_postrm
+}

diff --git a/games-fps/gzdoom/metadata.xml b/games-fps/gzdoom/metadata.xml
new file mode 100644
index 000..6a4872a
--- /dev/null
+++ b/games-fps/gzdoom/metadata.xml
@@ -0,0 +1,19 @@
+
+http://www.gentoo.org/dtd/metadata.dtd;>
+
+   
+   GZDoom is a modder-friendly OpenGL source port based on the 
DOOM engine
+   
+   
+   vilhelm.g...@gmail.com
+   William Breathitt Gray
+   
+   
+   Enables MIDI support
+   
+   
+   https://forum.zdoom.org/viewforum.php?f=2
+   https://zdoom.org
+   coelckers/gzdoom
+   
+