diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2022-05-12 16:42:50 +0300 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2022-05-12 16:42:50 +0300 |
| commit | 752d6256e5204b958b0ef7905675a940b5e9172f (patch) | |
| tree | 330d16e6362a49cbed8875a777fe641a43376cd3 /dev-util/diffuse | |
| parent | 0c100b7dd2b30e75b799d806df4ef899fd98e1ea (diff) | |
gentoo resync : 12.05.2022
Diffstat (limited to 'dev-util/diffuse')
| -rw-r--r-- | dev-util/diffuse/Manifest | 4 | ||||
| -rw-r--r-- | dev-util/diffuse/diffuse-0.7.5.ebuild (renamed from dev-util/diffuse/diffuse-0.7.2.ebuild) | 14 |
2 files changed, 10 insertions, 8 deletions
diff --git a/dev-util/diffuse/Manifest b/dev-util/diffuse/Manifest index 85c1ea48ccbb..a05a73627d0b 100644 --- a/dev-util/diffuse/Manifest +++ b/dev-util/diffuse/Manifest @@ -1,7 +1,7 @@ DIST diffuse-0.6.0.tar.gz 621120 BLAKE2B c39cbe55edb6e1734d4db1343a0b0029ab146fe92ef4edc58cd6ea82bc6780e3f789d6765d2bddecd941fa458781c59ddde71a010f1b90d4ca238e6d6b233dc2 SHA512 fe9842738560dbefe9c546c8bba3f9f1cefcf4c327ad644430c512ec6bb1b4877986ca2b816af75226975eefa9b0f70120a4ed574e2ed90058b0a92380e8995a -DIST diffuse-0.7.2.tar.gz 512468 BLAKE2B 82d9e13399fe775ae7d901198fca4bcc596914cbc5b2b52497a68292d78298346f51caa2031704858cfc770c7cbd6cb6ce1648fc2df7a674db71041c6abbf1ee SHA512 86488cf5a22b791c036de7299c0cd95e63de0bb26d89080c785972341144e72b006910860652190ff250fa5ecad6c7fac64aa3fe90035eda42b923650e292b76 DIST diffuse-0.7.3.tar.gz 519865 BLAKE2B 2980e919cd3fb5c88fef631f83fe6587511791a7fb63cf9b3b7c6b08445baac2f59811a516bb01cad0f2d30d11e113de5c672f26f7d1a17322c711d1ffeaa42d SHA512 b490ba761375092b759daf2e2a89fd0ad3e69d3043487d82c0635c2d35d1ebdad5e32922e53ff3496684e8b02ea8e1f123313d891695e9b0647a775c12b80ea7 +DIST diffuse-0.7.5.tar.gz 509048 BLAKE2B f69d9afea243069bdb9d313059556cc83283cd037e2f32de4b1221a2b53c493cb8a0a9bf8b4fc4d8a50e94fc60fe6043d30e3b5e7b7ceb2cec8529d8e136db0f SHA512 466cdc834e1103ad794979a287838b5005379712ee1d77e400d5fe71dcf5e79097decb39e26b213669077a4a2a525444db99b5587929f01b8b2df9f31ec190fd EBUILD diffuse-0.6.0.ebuild 1350 BLAKE2B 8e7abd2f25376e92f92af19fa9af96f24f691593fa89d2f71ed66454dd55ddfff435be4d8e3cc2cc795ac122b514e42970072748be67ea26f62734bd094bfab3 SHA512 3a06bd7033665dfd1d5c73826cd4d1307cddc66f1b20c4f6b4811a9525dc622ba92669921cdcbe41856693ddc437730e85916d0be65d0d80e88450f7a1e5b803 -EBUILD diffuse-0.7.2.ebuild 1432 BLAKE2B 52ebf4beba94e1de95acd6d05c21d517e36a7da2de47f8108eefef4b027be6fe44313faec1ff0f0ef51161512302ea5da66f1b2445adeb6c19814ee6cf053f1e SHA512 fb83499c9f5b3833d120ce9c31210783480c0dc76ec9eddfeefc8b5bc4824bdd0ee61f0b2b91dbb9b3b0857a779651c9406f9b0a75577c5059cd8a608ef84ed1 EBUILD diffuse-0.7.3.ebuild 1459 BLAKE2B 342f413c27b28ccd276e73eb70565924ff5a6356cd95b349195eb08478ac4c3a9edf5ff41f16fb8238fc31af3f1bc43b8f857ab6e5e4eea5cfe89f892b7b1e16 SHA512 08a8b48018ac0ee0ab0776752de81f65f8950a165a9c4f60ea2d47d841d7fe33afe919e8780a35d30abe02d5ffd34a9c26ae51b39d680c4bc0692cf1a6b230da +EBUILD diffuse-0.7.5.ebuild 1462 BLAKE2B efca91e4770a87d947e8674938c3cb0602dee8dd13e267856b2a370d211758f9bac6b7f1b926ce0a132f7bb5a0d93fd96e61a3d4dc1a55d52fd319d29f4aaaf9 SHA512 f1d0b6ad4de2a41ec0d6e168d9c6fe6285a1d8874f7bff678055bd8ff1bc1b28ffa78853e2e0fa21ff84330bb6cb203f605e6ae995b104fcab50221d9f9053c2 MISC metadata.xml 324 BLAKE2B f4889c3b688d5c75efaef149b263839d073cc9bb5af34143db1fe800459b42a4a2676e03af21bdff14e75a85e9cf20a8e2e6d9447678c45a849798e35d587811 SHA512 24b6f7a5010dea044356f4fec287c0faeae4d3aa7ed79c3d436c28e12edce917f5c34597d7efab39dd59b907baab8cacfd942e61ccf843248df093092cdacd32 diff --git a/dev-util/diffuse/diffuse-0.7.2.ebuild b/dev-util/diffuse/diffuse-0.7.5.ebuild index 461429fba3d2..4bf1060186f9 100644 --- a/dev-util/diffuse/diffuse-0.7.2.ebuild +++ b/dev-util/diffuse/diffuse-0.7.5.ebuild @@ -3,7 +3,7 @@ EAPI=8 PYTHON_COMPAT=( python3_{8..10} ) -PLOCALES="cs de es it ja ko pl pt pt_BR ru sv th zh_CN zh_TW" +PLOCALES="cs de es fr it ja ko pl pt pt_BR ru sv th zh_CN zh_TW" inherit meson plocale python-r1 xdg DESCRIPTION="A graphical tool to compare and merge text files" @@ -13,15 +13,17 @@ SRC_URI="https://github.com/MightyCreak/diffuse/archive/v${PV}.tar.gz -> ${P}.ta LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" +IUSE="" REQUIRED_USE="${PYTHON_REQUIRED_USE}" -BDEPEND="${PYTHON_DEPS}" -# file collision, bug #279018 -RDEPEND="${PYTHON_DEPS} +DEPEND="${PYTHON_DEPS}" +RDEPEND="${DEPEND} $(python_gen_cond_dep ' dev-python/pygobject:3[${PYTHON_USEDEP},cairo] ') - x11-libs/gtk+:3[introspection] + x11-libs/gtk+:3[introspection]" +# file collision, bug #279018 +DEPEND="${DEPEND} !sci-chemistry/tinker" src_prepare() { @@ -42,7 +44,7 @@ src_prepare() { src_install() { meson_src_install rm "${D}"/usr/bin/${PN} || die "rm ${PN} failed" - python_foreach_impl python_doscript ../${P}-build/src/${PN} + python_foreach_impl python_doscript ../${P}-build/src/${PN}/${PN} mkdir "${D}"/usr/share/metainfo || die "mkdir metainfo failed" mv "${D}"/usr/share/appdata/* "${D}"/usr/share/metainfo/ \ || die "mv appdata -> metainfo failed" |