diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-10-13 21:54:24 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-10-13 21:54:24 +0100 |
| commit | da491770b9ba5f179e18db461c49cb6f1ccf0e1f (patch) | |
| tree | d3e34a8bd906741ab18cf69d8d4f732853e26ade /dev-python/m2r | |
| parent | ad6182343997a405079870a2fe91c4e0c6b94595 (diff) | |
| parent | 5a165c60b9b8c4847067cb83b4be7da785d01f93 (diff) | |
gentoo resync : 28.09.2019
Diffstat (limited to 'dev-python/m2r')
| -rw-r--r-- | dev-python/m2r/Manifest | 4 | ||||
| -rw-r--r-- | dev-python/m2r/m2r-0.1.6.ebuild | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/dev-python/m2r/Manifest b/dev-python/m2r/Manifest index 5d1011ef4f36..1b8f176dae14 100644 --- a/dev-python/m2r/Manifest +++ b/dev-python/m2r/Manifest @@ -8,5 +8,9 @@ DIST m2r-0.1.6.tar.gz 13615 BLAKE2B e0c98c059f5c569bf88a1f97bc1c8a912675f9c0e044 EBUILD m2r-0.1.12.ebuild 1218 BLAKE2B 557c674f096982aa69f048e5d85936737cb7856363ba83386c4dcd30ab5fc452e888ccf1d6bd7d737ade17415af3edb1b17018a286f0ae0f635c945333014c0a SHA512 c5d3a2bde7e5f3d3c6e7f36d01441f46c816e6d6f3a0897be6307d5f0f33eff8344e2d7f8c3e832f6f66c6efd91b9d1b8321a8c5557d99c7d9283ca7a189c8e6 EBUILD m2r-0.1.14.ebuild 1298 BLAKE2B 9c729388bb13f154935f096040e5dc3f81c5886144b31e167cf6b8421f2c5023c95cec1ec82f6fd984706100b23e015aef5f9b13e9fa422b5bb440ddb42fcc7e SHA512 5013eb2fcfc96e9b947bf5cc52488cb9598c23830fafd801c0531f51b11f1165bc74f9929eafb24000cdce8fb35f3172e54bb766b011b97e20f93945f72f59bb EBUILD m2r-0.1.5.ebuild 1271 BLAKE2B 21912af5451c48c9d6611e3f35c111a0f865c406695aece7fd8cfa6acfa280a5b333b37e645fd7a3f44f789c076cc8915f9bfe1483f3799017d66b608faa4b7a SHA512 1f9409bed0fddab84d52b68fd219ba5edbe867c5783df9c872ece636a5b3b7137eb87dc6cc1a5afc6f452041fc384a30fa2c114c93c1210cb0b8ebff821cfacf +<<<<<<< HEAD EBUILD m2r-0.1.6.ebuild 1273 BLAKE2B 9bdf9ab39c40ff14cecc9efc5ef48c82958285bee81325f62d2894a66d6915b2da7aede0d478fbeed09fbd054dfa7eb53498f36b83b895f05e017aeca74eb81a SHA512 4a5ebe86949f59e8bc23344c322aae00da0c5756bfef8d96c57dca64c1a0b6bcfe994da19a786147d89c9b782a9fc53760f526113010d72994cba22a45df5fca +======= +EBUILD m2r-0.1.6.ebuild 1293 BLAKE2B 0dafe99d353eba5465ca2bdf093092cd573dca25b5e7ba4fe5ca0556bc076db319606ee49753a12ea3a7bbcb20482700699ac8301faa0a4f3e96b3b8fae219e9 SHA512 076d2b335cd09a118281bb7003af3d7953525d45238f02615467723f0d07a347d52e650b32bb17c9979474d939ddbe32083916233232988ec10a8d24d96b0dda +>>>>>>> next MISC metadata.xml 504 BLAKE2B 9e21e9256baae870dce5b60ba0f2c9feb5857c79f6ff81dbf10aafcb81d7886c18114155f2f825a6bdb7ab5b51f5e9f733ae4e8c799bbbb8c424c662cec85959 SHA512 551e5a6e90f257d5171995d6cb7ed7122e3820a787cb4acf177a9b0acc22810e71d432b8cd53667793c2e01e39edcb43540841e541737097231fe36b51eca7fd diff --git a/dev-python/m2r/m2r-0.1.6.ebuild b/dev-python/m2r/m2r-0.1.6.ebuild index d8841aaed7ec..32a4e1abc643 100644 --- a/dev-python/m2r/m2r-0.1.6.ebuild +++ b/dev-python/m2r/m2r-0.1.6.ebuild @@ -21,7 +21,8 @@ RDEPEND=" " DEPEND=" dev-python/setuptools[${PYTHON_USEDEP}] - test? ( $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7) ) + test? ( dev-python/pytest + $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7) ) ${RDEPEND} " |