summaryrefslogtreecommitdiff
path: root/dev-util/diffuse
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2021-04-28 20:21:43 +0100
committerV3n3RiX <venerix@redcorelinux.org>2021-04-28 20:21:43 +0100
commit40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch)
tree758c221bad35c9288d0bd6df9c7dfc226728e52c /dev-util/diffuse
parent8d5dbd847cbc704a6a06405856e94b461011afe3 (diff)
gentoo resync : 28.04.2021
Diffstat (limited to 'dev-util/diffuse')
-rw-r--r--dev-util/diffuse/Manifest4
-rw-r--r--dev-util/diffuse/diffuse-0.5.0_alpha7-r1.ebuild61
-rw-r--r--dev-util/diffuse/diffuse-0.6.0.ebuild2
3 files changed, 2 insertions, 65 deletions
diff --git a/dev-util/diffuse/Manifest b/dev-util/diffuse/Manifest
index ce1dd65114b3..4b97b7343bcc 100644
--- a/dev-util/diffuse/Manifest
+++ b/dev-util/diffuse/Manifest
@@ -1,5 +1,3 @@
-DIST diffuse-0.5.0_alpha7.tar.xz 531124 BLAKE2B e97b8dd1b24253c4049dd4dc0f185049f030163945d822c3dbf6763f14eff270ed6bea82ae55b6cecaaa0f90976aab286db53c3f69d54f708e403832f8b2b1c1 SHA512 280d2c3c698affbf91b0e25ba658133999ea9b0199d8c165e2cef05210386f0fb3ff8611710903c1a3cb13aed01a648d04b3b8b13227f96803b74adbebf62adf
DIST diffuse-0.6.0.tar.gz 621120 BLAKE2B c39cbe55edb6e1734d4db1343a0b0029ab146fe92ef4edc58cd6ea82bc6780e3f789d6765d2bddecd941fa458781c59ddde71a010f1b90d4ca238e6d6b233dc2 SHA512 fe9842738560dbefe9c546c8bba3f9f1cefcf4c327ad644430c512ec6bb1b4877986ca2b816af75226975eefa9b0f70120a4ed574e2ed90058b0a92380e8995a
-EBUILD diffuse-0.5.0_alpha7-r1.ebuild 1412 BLAKE2B 26c9c509ca41c0e774c553491d72f5e98260b814d02d7e776832d693d6579a3de6cd6822268c8463607f7d3cedb0e718e116eda7cdba3983a5336c2d3c799352 SHA512 6ddf8811d286d9ae953889b3aedbf7af89c3b4ab8eda13182af115b5d34c70a2e60ee00a62131f3b4b0df54c0eaf86456d13c2e8c8491cd49a449a544b10a9e4
-EBUILD diffuse-0.6.0.ebuild 1361 BLAKE2B 04af69408ea1c4b529eb626ba0abff615b45c79517f9bce3852683b20be83bd0b3f5860798c0f02e7e789a74fb338e89c1cf17ecfb85a05fb57b6bb79be59ed1 SHA512 f76cb4ca93b9a7066e64e49c3a4b59044e29cb9e0d8788089e1eb763fd660463dc6cb28eb728d1d27c9bd96db8d7b5f2cb76c9e757ca75ac0236300ee29f0284
+EBUILD diffuse-0.6.0.ebuild 1359 BLAKE2B e799eda9eba9ab630c0a02d307e084cbf80cd768be7bf8ee8d16cb25a2a150ce8cc9927d5ae161506b38ce6d2e56a7f706ec649c66506348021e3aac21ddbf04 SHA512 ed65cf78bc5950503174d825a70be7d960e62b08d7909c9ea371c6d569641d7dd06032e1b12455faa5ff35aa9601a30342da98c775ba357ff977a60cb594b787
MISC metadata.xml 323 BLAKE2B cc8163e0d9562747e2d52729e8298b38ba93b077f3b6a387a800c4720d52ad90bc13482f4120ba9ca9a41ee65e15e2ed2d52b81c41d9906c0ee2b677d4c67b8f SHA512 327c3e242485b96d7923358eb647b5a711d87b6b75c0cf76f01b6118b5b9a3436b0286de1e390a07a76d78d752b701a51319f5c35e24af2160dd6745521d965c
diff --git a/dev-util/diffuse/diffuse-0.5.0_alpha7-r1.ebuild b/dev-util/diffuse/diffuse-0.5.0_alpha7-r1.ebuild
deleted file mode 100644
index 5a34c6760601..000000000000
--- a/dev-util/diffuse/diffuse-0.5.0_alpha7-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
-PLOCALES="cs de es it ja ko pl pt ru sv th zh_CN zh_TW"
-inherit python-single-r1 l10n xdg-utils
-
-DESCRIPTION="A graphical tool to compare and merge text files"
-HOMEPAGE="http://diffuse.sourceforge.net/ https://github.com/MightyCreak/diffuse/"
-SRC_URI="https://dev.gentoo.org/~grozin/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
- $(python_gen_cond_dep '
- dev-python/pygobject:3[${PYTHON_MULTI_USEDEP},cairo]
- ')
- x11-libs/gtk+:3[introspection]"
-# file collision, bug #279018
-DEPEND="${DEPEND}
- !sci-chemistry/tinker"
-
-src_prepare() {
- default
- l10n_find_plocales_changes translations '' '.po'
-
- rm_locale() {
- rm -f translations/${1}.po
- rm -rf src/usr/share/man/${1}
- rm -rf src/usr/share/gnome/help/${PN}/$1
- rm -f src/usr/share/omf/${PN}/${PN}-$1.omf
- }
-
- l10n_for_each_disabled_locale_do rm_locale
-}
-
-src_install() {
- "${PYTHON}" install.py \
- --prefix="${EPREFIX}"/usr \
- --sysconfdir="${EPREFIX}"/etc \
- --files-only \
- --destdir="${D}" \
- || die "Installation failed"
- dodoc AUTHORS ChangeLog README.md
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
- xdg_icon_cache_update
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
- xdg_icon_cache_update
-}
diff --git a/dev-util/diffuse/diffuse-0.6.0.ebuild b/dev-util/diffuse/diffuse-0.6.0.ebuild
index fd3abb9089ba..3a755a4b5aeb 100644
--- a/dev-util/diffuse/diffuse-0.6.0.ebuild
+++ b/dev-util/diffuse/diffuse-0.6.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/MightyCreak/diffuse/archive/v${PV}.tar.gz -> ${P}.ta
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
REQUIRED_USE="${PYTHON_REQUIRED_USE}"