summaryrefslogtreecommitdiff
path: root/metadata/md5-cache/sci-geosciences/mapserver-7.0.7
diff options
context:
space:
mode:
Diffstat (limited to 'metadata/md5-cache/sci-geosciences/mapserver-7.0.7')
-rw-r--r--metadata/md5-cache/sci-geosciences/mapserver-7.0.74
1 files changed, 4 insertions, 0 deletions
diff --git a/metadata/md5-cache/sci-geosciences/mapserver-7.0.7 b/metadata/md5-cache/sci-geosciences/mapserver-7.0.7
index 9629b7bf9137..f93b0001d100 100644
--- a/metadata/md5-cache/sci-geosciences/mapserver-7.0.7
+++ b/metadata/md5-cache/sci-geosciences/mapserver-7.0.7
@@ -10,5 +10,9 @@ RDEPEND=dev-libs/expat >=media-libs/gd-2.0.12[truetype,jpeg,png,zlib] media-libs
REQUIRED_USE=php? ( php_targets_php5-6 ) xslt? ( xml ) || ( python_targets_python2_7 ) php? ( || ( php_targets_php5-6 ) )
SLOT=0
SRC_URI=https://download.osgeo.org/mapserver/mapserver-7.0.7.tar.gz
+<<<<<<< HEAD
_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 cmake-utils 91d6ef31dc426240577497cacbf2508c depend.apache 05ca915dc22ea60059f85d8d9a34d3de desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 9838160d624a44b2d56d1266a69fd473 eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f perl-functions 6ec4c4d8fc8324200f1c14e8d158c59b perl-module 20c90ae7e826995a597683580cdfcdcb php-ext-source-r3 dd53cd94748f9e498bea0f9480ba8d77 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf webapp 16783e418aca3ffa461d68310bf7ab12 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+=======
+_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 cmake-utils 91d6ef31dc426240577497cacbf2508c depend.apache 05ca915dc22ea60059f85d8d9a34d3de desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 9838160d624a44b2d56d1266a69fd473 eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f perl-functions 6ec4c4d8fc8324200f1c14e8d158c59b perl-module 20c90ae7e826995a597683580cdfcdcb php-ext-source-r3 dd53cd94748f9e498bea0f9480ba8d77 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf webapp 16783e418aca3ffa461d68310bf7ab12 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+>>>>>>> next
_md5_=14333728236270683a636ab99579ec5d