diff options
Diffstat (limited to 'metadata/md5-cache/games-strategy')
-rw-r--r-- | metadata/md5-cache/games-strategy/Manifest.gz | bin | 11702 -> 11743 bytes | |||
-rw-r--r-- | metadata/md5-cache/games-strategy/colobot-0.1.12 | 4 | ||||
-rw-r--r-- | metadata/md5-cache/games-strategy/colobot-9999 | 4 | ||||
-rw-r--r-- | metadata/md5-cache/games-strategy/colobot-data-0.1.11 | 4 | ||||
-rw-r--r-- | metadata/md5-cache/games-strategy/colobot-data-0.1.12 | 4 |
5 files changed, 16 insertions, 0 deletions
diff --git a/metadata/md5-cache/games-strategy/Manifest.gz b/metadata/md5-cache/games-strategy/Manifest.gz Binary files differindex 996f12040990..f4a28edbb4a1 100644 --- a/metadata/md5-cache/games-strategy/Manifest.gz +++ b/metadata/md5-cache/games-strategy/Manifest.gz diff --git a/metadata/md5-cache/games-strategy/colobot-0.1.12 b/metadata/md5-cache/games-strategy/colobot-0.1.12 index bbc94388d044..30805fdf5a05 100644 --- a/metadata/md5-cache/games-strategy/colobot-0.1.12 +++ b/metadata/md5-cache/games-strategy/colobot-0.1.12 @@ -11,5 +11,9 @@ RDEPEND=dev-games/physfs dev-libs/boost:= media-libs/glew:0 media-libs/libogg me RESTRICT=!test? ( test ) SLOT=0 SRC_URI=https://github.com/colobot/colobot/archive/colobot-gold-0.1.12-alpha.tar.gz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c desktop b1d22ac8bdd4679ab79c71aca235009d eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c desktop b1d22ac8bdd4679ab79c71aca235009d eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=8ab33d4826363e3efac7547630c47b17 diff --git a/metadata/md5-cache/games-strategy/colobot-9999 b/metadata/md5-cache/games-strategy/colobot-9999 index 03491ddd8f67..aea50b9bc34c 100644 --- a/metadata/md5-cache/games-strategy/colobot-9999 +++ b/metadata/md5-cache/games-strategy/colobot-9999 @@ -10,5 +10,9 @@ PROPERTIES=live RDEPEND=dev-games/physfs dev-libs/boost:= media-libs/glew:0 media-libs/libogg media-libs/libpng:0= media-libs/libsdl2:= media-libs/libsndfile:= media-libs/libvorbis:= media-libs/sdl2-image media-libs/sdl2-ttf media-sound/vorbis-tools openal? ( media-libs/openal ) games-strategy/colobot-data RESTRICT=!test? ( test ) SLOT=0 +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c desktop b1d22ac8bdd4679ab79c71aca235009d eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca git-r3 562b380fc59ae6a8622171d0acb777d1 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c desktop b1d22ac8bdd4679ab79c71aca235009d eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 git-r3 562b380fc59ae6a8622171d0acb777d1 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=7dfa4fcdd02953bb4129a76059ef45c3 diff --git a/metadata/md5-cache/games-strategy/colobot-data-0.1.11 b/metadata/md5-cache/games-strategy/colobot-data-0.1.11 index 3ea15b1174aa..7ed700df17a3 100644 --- a/metadata/md5-cache/games-strategy/colobot-data-0.1.11 +++ b/metadata/md5-cache/games-strategy/colobot-data-0.1.11 @@ -9,5 +9,9 @@ LICENSE=GPL-3 REQUIRED_USE=music? ( ^^ ( music-flac-convert music-ogg ) ) music-flac-convert? ( music ) music-ogg? ( music ) SLOT=0 SRC_URI=https://github.com/colobot/colobot-data/archive/colobot-gold-0.1.11-alpha.tar.gz -> colobot-data-0.1.11.tar.gz music-ogg? ( https://colobot.info/files/music/colobot-music_ogg_0.1.11-alpha.tar.gz -> colobot-data-0.1.11-music-ogg.tar.gz ) music-flac-convert? ( https://colobot.info/files/music/colobot-music_flac_0.1.11-alpha.tar.gz -> colobot-data-0.1.11-music-flac.tar.gz ) +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=3e4bfcfe34f1b8c9d45ac40dec711fa4 diff --git a/metadata/md5-cache/games-strategy/colobot-data-0.1.12 b/metadata/md5-cache/games-strategy/colobot-data-0.1.12 index fd63b1202890..49a5a72353f9 100644 --- a/metadata/md5-cache/games-strategy/colobot-data-0.1.12 +++ b/metadata/md5-cache/games-strategy/colobot-data-0.1.12 @@ -8,5 +8,9 @@ KEYWORDS=~amd64 LICENSE=GPL-3+ SLOT=0 SRC_URI=https://github.com/colobot/colobot-data/archive/colobot-gold-0.1.12-alpha.tar.gz -> colobot-gold-0.1.12-alpha.data.tar.gz music? ( https://colobot.info/files/music/colobot-music_ogg_0.1.12-alpha.tar.gz ) +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=69f3b22451750adf19de1a424139858e |