diff options
Diffstat (limited to 'dev-util/diffuse')
| -rw-r--r-- | dev-util/diffuse/Manifest | 2 | ||||
| -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, 9 insertions, 7 deletions
diff --git a/dev-util/diffuse/Manifest b/dev-util/diffuse/Manifest index 09d19566b88a..2027a61878b7 100644 --- a/dev-util/diffuse/Manifest +++ b/dev-util/diffuse/Manifest @@ -1,3 +1,3 @@ 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 diff --git a/dev-util/diffuse/diffuse-0.7.2.ebuild b/dev-util/diffuse/diffuse-0.7.5.ebuild index aa61d7ce9c9b..9faf2c36fc90 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_{7,8,9,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" |