summaryrefslogtreecommitdiff
path: root/metadata/md5-cache/games-fps
diff options
context:
space:
mode:
Diffstat (limited to 'metadata/md5-cache/games-fps')
-rw-r--r--metadata/md5-cache/games-fps/Manifest.gzbin21609 -> 21615 bytes
-rw-r--r--metadata/md5-cache/games-fps/doomsday-2.1.14
-rw-r--r--metadata/md5-cache/games-fps/gzdoom-4.2.12
3 files changed, 5 insertions, 1 deletions
diff --git a/metadata/md5-cache/games-fps/Manifest.gz b/metadata/md5-cache/games-fps/Manifest.gz
index 8a66101e63f7..33a51de09730 100644
--- a/metadata/md5-cache/games-fps/Manifest.gz
+++ b/metadata/md5-cache/games-fps/Manifest.gz
Binary files differ
diff --git a/metadata/md5-cache/games-fps/doomsday-2.1.1 b/metadata/md5-cache/games-fps/doomsday-2.1.1
index 29c8d24fcaa4..3d3ab5bb789a 100644
--- a/metadata/md5-cache/games-fps/doomsday-2.1.1
+++ b/metadata/md5-cache/games-fps/doomsday-2.1.1
@@ -11,5 +11,9 @@ PDEPEND=demo? ( games-fps/doom-data ) freedoom? ( games-fps/freedoom )
RDEPEND=dev-qt/qtcore:5= dev-qt/qtgui:5=[-gles2] dev-qt/qtnetwork:5= dev-qt/qtopengl:5= dev-qt/qtwidgets:5= dev-qt/qtx11extras:5= media-libs/assimp net-misc/curl sys-libs/zlib fmod? ( media-libs/fmod:1 ) fluidsynth? ( media-sound/fluidsynth:= ) openal? ( media-libs/openal ) tools? ( sys-libs/ncurses:0= )
SLOT=0
SRC_URI=https://downloads.sourceforge.net/project/deng/Doomsday%20Engine/2.1.1/doomsday-2.1.1.tar.gz
+<<<<<<< HEAD
+_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba
+=======
_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba
+>>>>>>> next
_md5_=c18154fb36c92e3ebca7b677689d1b2c
diff --git a/metadata/md5-cache/games-fps/gzdoom-4.2.1 b/metadata/md5-cache/games-fps/gzdoom-4.2.1
index 70064535ca90..bb8fd1db9e80 100644
--- a/metadata/md5-cache/games-fps/gzdoom-4.2.1
+++ b/metadata/md5-cache/games-fps/gzdoom-4.2.1
@@ -10,5 +10,5 @@ LICENSE=BSD BZIP2 DUMB-0.9.3 GPL-3 LGPL-3 MIT nonfree? ( Activision ChexQuest3 D
RDEPEND=media-libs/libsdl2[opengl] media-libs/libsndfile media-libs/openal media-sound/fluidsynth:= media-sound/mpg123 sys-libs/zlib virtual/jpeg:0 gtk? ( gtk2? ( x11-libs/gtk+:2 ) !gtk2? ( x11-libs/gtk+:3 ) )
SLOT=0
SRC_URI=https://github.com/coelckers/gzdoom/archive/g4.2.1.tar.gz -> gzdoom-4.2.1.tar.gz
-_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c desktop b1d22ac8bdd4679ab79c71aca235009d eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c desktop b1d22ac8bdd4679ab79c71aca235009d eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=457ff7314ddb404a72ead33217ad0290