[gentoo-commits] repo/gentoo:master commit in: dev-util/diffuse/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/gentoo:master commit in: dev-util/diffuse/
@ 2016-11-09 14:04 Pacho Ramos
  0 siblings, 0 replies; 29+ messages in thread
From: Pacho Ramos @ 2016-11-09 14:04 UTC (permalink / raw
  To: gentoo-commits

commit:     2d26d69d4358c4c409604ff3cc3e39fa53a04520
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Wed Nov  9 13:55:54 2016 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Wed Nov  9 14:04:22 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d26d69d

dev-util/diffuse: Drop old

Package-Manager: portage-2.3.2

 dev-util/diffuse/Manifest                |  2 --
 dev-util/diffuse/diffuse-0.4.6.ebuild    | 46 -------------------------
 dev-util/diffuse/diffuse-0.4.7-r1.ebuild | 58 --------------------------------
 3 files changed, 106 deletions(-)

diff --git a/dev-util/diffuse/Manifest b/dev-util/diffuse/Manifest
index 28193c7..e631cff 100644
--- a/dev-util/diffuse/Manifest
+++ b/dev-util/diffuse/Manifest
@@ -1,3 +1 @@
-DIST diffuse-0.4.6.tar.bz2 170246 SHA256 748922902573de316a4829f1ccc2cb6fab218b4aaf69a1a4aadba7fd8f8fd916 SHA512 ddde5e6c06ecaeb9b164de47590f22074e52d32a9969764466aa09a2a24925b6fa6aa3a098816c83d4fdef34ff1d2d88eab963a3bb8de3f403e40d797d497ae6 WHIRLPOOL cc8cc5e43cf1c098a4b92f8e33c7aeb48e82bbe9ad2bf7de833ec0c29b150938e4b10c90de19d142d771bd3720d686d9d3bb4e8521311d5f4f771e273c27edce
-DIST diffuse-0.4.7.tar.bz2 189257 SHA256 b0f56acbd246f4b9a692ef51aab167134ae6650423a68d8e5f4ff4c8938f39ac SHA512 3db665ec2f05d8fd8b30f391a53e75ae0ef271d3f35f0c89f20226bda296ca46e88491a741cd3bcaa1159b9d5d2581931362ca600176b6d599351f4a34f56e2f WHIRLPOOL 3a0c382ffcb598f0d3aba8c9e45914a83d41a9f946f6cf10aab73320fdf8f6b8cc4f5f84ad6c86ca61e2ed33d00faa50d3846a560ebd4b7e9588402eefa055d2
 DIST diffuse-0.4.8.tar.bz2 557966 SHA256 c1d3b79bba9352fcb9aa4003537d3fece248fb824781c5e21f3fcccafd42df2b SHA512 0c62976526804a328f1cc1775f842e9575fab50309cc964171af5ee89d8f303d4cbdf66a078ed64bb8826f5a57c2cc7fc59afc1ee87646ece340212d34f2514e WHIRLPOOL d1f044497103c6c429f9980fa759e3df019176359adf13bd71d07c030188aad7c297a2b202290ac7124beed3536172ba17aca18d1e7a4b535218e3dd2cb015d3

diff --git a/dev-util/diffuse/diffuse-0.4.6.ebuild b/dev-util/diffuse/diffuse-0.4.6.ebuild
deleted file mode 100644
index 6c8868a..00000000
--- a/dev-util/diffuse/diffuse-0.4.6.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-PYTHON_DEPEND="2"
-
-inherit fdo-mime python
-
-DESCRIPTION="A graphical tool to compare and merge text files"
-HOMEPAGE="http://diffuse.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-python/pygtk"
-# file collision, bug #279018
-DEPEND="!sci-chemistry/tinker"
-
-pkg_setup() {
-	python_set_active_version 2
-}
-
-src_prepare() {
-	python_convert_shebangs 2 src/usr/bin/diffuse
-}
-
-src_install() {
-	"$(PYTHON)" install.py \
-		--prefix=/usr \
-		--files-only \
-		--destdir="${D}" \
-		|| die "Installation failed"
-	dodoc AUTHORS ChangeLog README
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}

diff --git a/dev-util/diffuse/diffuse-0.4.7-r1.ebuild b/dev-util/diffuse/diffuse-0.4.7-r1.ebuild
deleted file mode 100644
index f1ea525..00000000
--- a/dev-util/diffuse/diffuse-0.4.7-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit fdo-mime python-single-r1
-
-DESCRIPTION="A graphical tool to compare and merge text files"
-HOMEPAGE="http://diffuse.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86 ~x64-solaris"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
-	dev-python/pygtk[${PYTHON_USEDEP}]"
-# file collision, bug #279018
-DEPEND="${DEPEND}
-	!sci-chemistry/tinker"
-
-src_prepare() {
-	local i p
-
-	# linguas handling wrt #406433
-	if [[ -n "${LINGUAS+x}" ]] ; then
-		for i in $(for p in translations/*.po ; do echo ${p%.po} ; done) ; do
-			if ! has ${i##*/} ${LINGUAS} ; then
-				rm "${S}"/${i}.po || die
-			fi
-		done
-	fi
-
-	python_fix_shebang src/usr/bin/diffuse
-}
-
-src_install() {
-	"${PYTHON}" install.py \
-		--prefix="${EPREFIX}"/usr \
-		--sysconfdir="${EPREFIX}"/etc \
-		--files-only \
-		--destdir="${D}" \
-		|| die "Installation failed"
-	dodoc AUTHORS ChangeLog README
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}


^ permalink raw reply related	[flat|nested] 29+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-util/diffuse/
@ 2020-02-08 15:28 Andrey Grozin
  0 siblings, 0 replies; 29+ messages in thread
From: Andrey Grozin @ 2020-02-08 15:28 UTC (permalink / raw
  To: gentoo-commits

commit:     481cbdbfc8f7bf820c5b0f5954cb90929b32965a
Author:     Andrey Grozin <grozin <AT> gentoo <DOT> org>
AuthorDate: Sat Feb  8 15:27:58 2020 +0000
Commit:     Andrey Grozin <grozin <AT> gentoo <DOT> org>
CommitDate: Sat Feb  8 15:27:58 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=481cbdbf

dev-util/diffuse: a new version for python3, pygobject and gtk3

Bug: https://bugs.gentoo.org/708074
Package-Manager: Portage-2.3.87, Repoman-2.3.20
Signed-off-by: Andrey Grozin <grozin <AT> gentoo.org>

 dev-util/diffuse/Manifest                    |  1 +
 dev-util/diffuse/diffuse-0.5.0_alpha7.ebuild | 59 ++++++++++++++++++++++++++++
 2 files changed, 60 insertions(+)

diff --git a/dev-util/diffuse/Manifest b/dev-util/diffuse/Manifest
index 58c91e54731..9700495ff27 100644
--- a/dev-util/diffuse/Manifest
+++ b/dev-util/diffuse/Manifest
@@ -1 +1,2 @@
 DIST diffuse-0.4.8.tar.bz2 557966 BLAKE2B 97879c41db390c9e3f0b0634ab34b33021013aaa8e28b0afe98a1131772803129fa81ccc6532a921d28f0eee51c4ccfbecb400645ed4141e6d2fe669e552014e SHA512 0c62976526804a328f1cc1775f842e9575fab50309cc964171af5ee89d8f303d4cbdf66a078ed64bb8826f5a57c2cc7fc59afc1ee87646ece340212d34f2514e
+DIST diffuse-0.5.0_alpha7.tar.xz 531124 BLAKE2B e97b8dd1b24253c4049dd4dc0f185049f030163945d822c3dbf6763f14eff270ed6bea82ae55b6cecaaa0f90976aab286db53c3f69d54f708e403832f8b2b1c1 SHA512 280d2c3c698affbf91b0e25ba658133999ea9b0199d8c165e2cef05210386f0fb3ff8611710903c1a3cb13aed01a648d04b3b8b13227f96803b74adbebf62adf

diff --git a/dev-util/diffuse/diffuse-0.5.0_alpha7.ebuild b/dev-util/diffuse/diffuse-0.5.0_alpha7.ebuild
new file mode 100644
index 00000000000..eb5c6a23cbd
--- /dev/null
+++ b/dev-util/diffuse/diffuse-0.5.0_alpha7.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,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}
+	dev-python/pygobject[${PYTHON_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
+}


^ permalink raw reply related	[flat|nested] 29+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-util/diffuse/
@ 2020-02-09  4:17 Andrey Grozin
  0 siblings, 0 replies; 29+ messages in thread
From: Andrey Grozin @ 2020-02-09  4:17 UTC (permalink / raw
  To: gentoo-commits

commit:     11bb487cbdcd14d650ad45c3059b688f80ecabd0
Author:     Andrey Grozin <grozin <AT> gentoo <DOT> org>
AuthorDate: Sun Feb  9 04:16:54 2020 +0000
Commit:     Andrey Grozin <grozin <AT> gentoo <DOT> org>
CommitDate: Sun Feb  9 04:16:54 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11bb487c

dev-util/diffuse: ebuild improvement

Package-Manager: Portage-2.3.87, Repoman-2.3.20
Signed-off-by: Andrey Grozin <grozin <AT> gentoo.org>

 dev-util/diffuse/diffuse-0.5.0_alpha7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/diffuse/diffuse-0.5.0_alpha7.ebuild b/dev-util/diffuse/diffuse-0.5.0_alpha7.ebuild
index eb5c6a23cbd..a9ff6d831b6 100644
--- a/dev-util/diffuse/diffuse-0.5.0_alpha7.ebuild
+++ b/dev-util/diffuse/diffuse-0.5.0_alpha7.ebuild
@@ -18,7 +18,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DEPEND="${PYTHON_DEPS}"
 RDEPEND="${DEPEND}
-	dev-python/pygobject[${PYTHON_USEDEP},cairo]
+	dev-python/pygobject:3[${PYTHON_USEDEP},cairo]
 	x11-libs/gtk+:3[introspection]"
 # file collision, bug #279018
 DEPEND="${DEPEND}


^ permalink raw reply related	[flat|nested] 29+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-util/diffuse/
@ 2020-03-09 13:44 Agostino Sarubbo
  0 siblings, 0 replies; 29+ messages in thread
From: Agostino Sarubbo @ 2020-03-09 13:44 UTC (permalink / raw
  To: gentoo-commits

commit:     6c5879a9b714b43e3aae7394141a1c211bcf9bf5
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Mon Mar  9 13:44:16 2020 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Mon Mar  9 13:44:16 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c5879a9

dev-util/diffuse: amd64 stable wrt bug #708074

Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 dev-util/diffuse/diffuse-0.5.0_alpha7-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/diffuse/diffuse-0.5.0_alpha7-r1.ebuild b/dev-util/diffuse/diffuse-0.5.0_alpha7-r1.ebuild
index 1cb786be52c..257485a5be3 100644
--- a/dev-util/diffuse/diffuse-0.5.0_alpha7-r1.ebuild
+++ b/dev-util/diffuse/diffuse-0.5.0_alpha7-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://dev.gentoo.org/~grozin/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 


^ permalink raw reply related	[flat|nested] 29+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-util/diffuse/
@ 2020-03-09 14:15 Thomas Deutschmann
  0 siblings, 0 replies; 29+ messages in thread
From: Thomas Deutschmann @ 2020-03-09 14:15 UTC (permalink / raw
  To: gentoo-commits

commit:     40c1331d1039e18efe5fbb25d62af5b39538632e
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Mar  9 14:12:58 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Mar  9 14:12:58 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40c1331d

dev-util/diffuse: x86 stable (bug #708074)

Package-Manager: Portage-2.3.91, Repoman-2.3.20
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 dev-util/diffuse/diffuse-0.5.0_alpha7-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/diffuse/diffuse-0.5.0_alpha7-r1.ebuild b/dev-util/diffuse/diffuse-0.5.0_alpha7-r1.ebuild
index 257485a5be3..c11d80eb5f9 100644
--- a/dev-util/diffuse/diffuse-0.5.0_alpha7-r1.ebuild
+++ b/dev-util/diffuse/diffuse-0.5.0_alpha7-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://dev.gentoo.org/~grozin/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 


^ permalink raw reply related	[flat|nested] 29+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-util/diffuse/
@ 2020-03-09 20:22 Andreas Sturmlechner
  0 siblings, 0 replies; 29+ messages in thread
From: Andreas Sturmlechner @ 2020-03-09 20:22 UTC (permalink / raw
  To: gentoo-commits

commit:     22f5993c12748ad15f5ffc38665fa9ba12fe22d6
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Mar  9 20:19:56 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Mar  9 20:22:00 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22f5993c

dev-util/diffuse: Drop 0.4.8-r1

Closes: https://bugs.gentoo.org/708074
Package-Manager: Portage-2.3.93, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 dev-util/diffuse/Manifest                |  1 -
 dev-util/diffuse/diffuse-0.4.8-r1.ebuild | 59 --------------------------------
 2 files changed, 60 deletions(-)

diff --git a/dev-util/diffuse/Manifest b/dev-util/diffuse/Manifest
index 9700495ff27..1ed6f939a32 100644
--- a/dev-util/diffuse/Manifest
+++ b/dev-util/diffuse/Manifest
@@ -1,2 +1 @@
-DIST diffuse-0.4.8.tar.bz2 557966 BLAKE2B 97879c41db390c9e3f0b0634ab34b33021013aaa8e28b0afe98a1131772803129fa81ccc6532a921d28f0eee51c4ccfbecb400645ed4141e6d2fe669e552014e SHA512 0c62976526804a328f1cc1775f842e9575fab50309cc964171af5ee89d8f303d4cbdf66a078ed64bb8826f5a57c2cc7fc59afc1ee87646ece340212d34f2514e
 DIST diffuse-0.5.0_alpha7.tar.xz 531124 BLAKE2B e97b8dd1b24253c4049dd4dc0f185049f030163945d822c3dbf6763f14eff270ed6bea82ae55b6cecaaa0f90976aab286db53c3f69d54f708e403832f8b2b1c1 SHA512 280d2c3c698affbf91b0e25ba658133999ea9b0199d8c165e2cef05210386f0fb3ff8611710903c1a3cb13aed01a648d04b3b8b13227f96803b74adbebf62adf

diff --git a/dev-util/diffuse/diffuse-0.4.8-r1.ebuild b/dev-util/diffuse/diffuse-0.4.8-r1.ebuild
deleted file mode 100644
index 5a0d5a3968a..00000000000
--- a/dev-util/diffuse/diffuse-0.4.8-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit fdo-mime python-single-r1
-
-DESCRIPTION="A graphical tool to compare and merge text files"
-HOMEPAGE="http://diffuse.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86 ~x64-solaris"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
-	$(python_gen_cond_dep '
-		dev-python/pygtk[${PYTHON_MULTI_USEDEP}]
-	')"
-# file collision, bug #279018
-DEPEND="${DEPEND}
-	!sci-chemistry/tinker"
-
-src_prepare() {
-	local i p
-
-	# linguas handling wrt #406433
-	if [[ -n "${LINGUAS+x}" ]] ; then
-		for i in $(for p in translations/*.po ; do echo ${p%.po} ; done) ; do
-			if ! has ${i##*/} ${LINGUAS} ; then
-				rm "${S}"/${i}.po || die
-			fi
-		done
-	fi
-
-	python_fix_shebang src/usr/bin/diffuse
-}
-
-src_install() {
-	"${PYTHON}" install.py \
-		--prefix="${EPREFIX}"/usr \
-		--sysconfdir="${EPREFIX}"/etc \
-		--files-only \
-		--destdir="${D}" \
-		|| die "Installation failed"
-	dodoc AUTHORS ChangeLog README
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}


^ permalink raw reply related	[flat|nested] 29+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-util/diffuse/
@ 2021-02-17  8:21 Andrey Grozin
  0 siblings, 0 replies; 29+ messages in thread
From: Andrey Grozin @ 2021-02-17  8:21 UTC (permalink / raw
  To: gentoo-commits

commit:     2737fc0172db0f101f5722d340deb71af9244482
Author:     Andrey Grozin <grozin <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 17 08:20:59 2021 +0000
Commit:     Andrey Grozin <grozin <AT> gentoo <DOT> org>
CommitDate: Wed Feb 17 08:20:59 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2737fc01

dev-util/diffuse: bump to 0.6.0

Suggested-by: Hans F. Nordhaug <hansfn <AT> gmail.com>
Closes: https://bugs.gentoo.org/770925
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andrey Grozin <grozin <AT> gentoo.org>

 dev-util/diffuse/Manifest             |  1 +
 dev-util/diffuse/diffuse-0.6.0.ebuild | 57 +++++++++++++++++++++++++++++++++++
 2 files changed, 58 insertions(+)

diff --git a/dev-util/diffuse/Manifest b/dev-util/diffuse/Manifest
index 1ed6f939a32..cfb67284739 100644
--- a/dev-util/diffuse/Manifest
+++ b/dev-util/diffuse/Manifest
@@ -1 +1,2 @@
 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

diff --git a/dev-util/diffuse/diffuse-0.6.0.ebuild b/dev-util/diffuse/diffuse-0.6.0.ebuild
new file mode 100644
index 00000000000..fd3abb9089b
--- /dev/null
+++ b/dev-util/diffuse/diffuse-0.6.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+PLOCALES="cs de es it ja ko pl pt ru sv th zh_CN zh_TW"
+inherit meson 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://github.com/MightyCreak/diffuse/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+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
+		sed -e "/^${1}/d" -i translations/LINGUAS
+	}
+
+	l10n_for_each_disabled_locale_do rm_locale
+}
+
+src_install() {
+	meson_src_install
+	dodoc AUTHORS CHANGELOG.md README.md
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}


^ permalink raw reply related	[flat|nested] 29+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-util/diffuse/
@ 2021-04-27 18:01 Sam James
  0 siblings, 0 replies; 29+ messages in thread
From: Sam James @ 2021-04-27 18:01 UTC (permalink / raw
  To: gentoo-commits

commit:     28ce9d7191a98528df3d13389062efa76ba911fd
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 27 18:00:53 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Apr 27 18:00:53 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28ce9d71

dev-util/diffuse: Stabilize 0.6.0 amd64, #785841

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-util/diffuse/diffuse-0.6.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/diffuse/diffuse-0.6.0.ebuild b/dev-util/diffuse/diffuse-0.6.0.ebuild
index fd3abb9089b..d5d3152be95 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}"
 


^ permalink raw reply related	[flat|nested] 29+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-util/diffuse/
@ 2021-04-27 18:02 Sam James
  0 siblings, 0 replies; 29+ messages in thread
From: Sam James @ 2021-04-27 18:02 UTC (permalink / raw
  To: gentoo-commits

commit:     58346e7dc07aaae871a9bfeb6dad49065295cd9b
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 27 18:01:56 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Apr 27 18:01:56 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58346e7d

dev-util/diffuse: Stabilize 0.6.0 x86, #785841

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-util/diffuse/diffuse-0.6.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/diffuse/diffuse-0.6.0.ebuild b/dev-util/diffuse/diffuse-0.6.0.ebuild
index d5d3152be95..3a755a4b5ae 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}"
 


^ permalink raw reply related	[flat|nested] 29+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-util/diffuse/
@ 2021-04-28  7:45 Andrey Grozin
  0 siblings, 0 replies; 29+ messages in thread
From: Andrey Grozin @ 2021-04-28  7:45 UTC (permalink / raw
  To: gentoo-commits

commit:     48bdbecbd03d3899bd5c3abf0abf841bf47a0f04
Author:     Andrey Grozin <grozin <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 28 07:44:40 2021 +0000
Commit:     Andrey Grozin <grozin <AT> gentoo <DOT> org>
CommitDate: Wed Apr 28 07:44:40 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48bdbecb

dev-util/diffuse: remove old

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andrey Grozin <grozin <AT> gentoo.org>

 dev-util/diffuse/Manifest                       |  1 -
 dev-util/diffuse/diffuse-0.5.0_alpha7-r1.ebuild | 61 -------------------------
 2 files changed, 62 deletions(-)

diff --git a/dev-util/diffuse/Manifest b/dev-util/diffuse/Manifest
index cfb67284739..7388c55e4ca 100644
--- a/dev-util/diffuse/Manifest
+++ b/dev-util/diffuse/Manifest
@@ -1,2 +1 @@
-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

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 5a34c676060..00000000000
--- 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
-}


^ permalink raw reply related	[flat|nested] 29+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-util/diffuse/
@ 2021-11-21 17:08 Andrey Grozin
  0 siblings, 0 replies; 29+ messages in thread
From: Andrey Grozin @ 2021-11-21 17:08 UTC (permalink / raw
  To: gentoo-commits

commit:     3cf318dae8ac11f37d8a2c3ba56ec447856e0ad0
Author:     Andrey Grozin <grozin <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 21 17:08:25 2021 +0000
Commit:     Andrey Grozin <grozin <AT> gentoo <DOT> org>
CommitDate: Sun Nov 21 17:08:25 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3cf318da

dev-util/diffuse: bump to 0.7.2

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Andrey Grozin <grozin <AT> gentoo.org>

 dev-util/diffuse/Manifest             |  1 +
 dev-util/diffuse/diffuse-0.7.2.ebuild | 52 +++++++++++++++++++++++++++++++++++
 2 files changed, 53 insertions(+)

diff --git a/dev-util/diffuse/Manifest b/dev-util/diffuse/Manifest
index 7388c55e4caa..9ac73c226f8f 100644
--- a/dev-util/diffuse/Manifest
+++ b/dev-util/diffuse/Manifest
@@ -1 +1,2 @@
 DIST diffuse-0.6.0.tar.gz 621120 BLAKE2B c39cbe55edb6e1734d4db1343a0b0029ab146fe92ef4edc58cd6ea82bc6780e3f789d6765d2bddecd941fa458781c59ddde71a010f1b90d4ca238e6d6b233dc2 SHA512 fe9842738560dbefe9c546c8bba3f9f1cefcf4c327ad644430c512ec6bb1b4877986ca2b816af75226975eefa9b0f70120a4ed574e2ed90058b0a92380e8995a
+DIST diffuse-0.7.2.tar.gz 512468 BLAKE2B 82d9e13399fe775ae7d901198fca4bcc596914cbc5b2b52497a68292d78298346f51caa2031704858cfc770c7cbd6cb6ce1648fc2df7a674db71041c6abbf1ee SHA512 86488cf5a22b791c036de7299c0cd95e63de0bb26d89080c785972341144e72b006910860652190ff250fa5ecad6c7fac64aa3fe90035eda42b923650e292b76

diff --git a/dev-util/diffuse/diffuse-0.7.2.ebuild b/dev-util/diffuse/diffuse-0.7.2.ebuild
new file mode 100644
index 000000000000..7e314bbfba40
--- /dev/null
+++ b/dev-util/diffuse/diffuse-0.7.2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+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"
+inherit meson plocale python-r1 xdg
+
+DESCRIPTION="A graphical tool to compare and merge text files"
+HOMEPAGE="http://diffuse.sourceforge.net/ https://github.com/MightyCreak/diffuse/"
+SRC_URI="https://github.com/MightyCreak/diffuse/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+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_USEDEP},cairo]
+	')
+	x11-libs/gtk+:3[introspection]"
+# file collision, bug #279018
+DEPEND="${DEPEND}
+	!sci-chemistry/tinker"
+
+src_prepare() {
+	default
+	plocale_find_changes po '' '.po'
+
+	rm_locale() {
+		rm -f po/${1}.po
+		rm -rf data/usr/share/man/${1}
+		rm -rf data/usr/share/gnome/help/${PN}/$1
+		rm -f data/usr/share/omf/${PN}/${PN}-$1.omf
+		sed -e "/^${1}/d" -i po/LINGUAS
+	}
+
+	plocale_for_each_disabled_locale rm_locale
+}
+
+src_install() {
+	meson_src_install
+	rm "${D}"/usr/bin/${PN} || die "rm ${PN} failed"
+	python_foreach_impl python_doscript ../${P}-build/src/${PN}
+	mkdir "${D}"/usr/share/metainfo || die "mkdir metainfo failed"
+	mv "${D}"/usr/share/appdata/* "${D}"/usr/share/metainfo/ \
+		|| die "mv appdata -> metainfo failed"
+	dodoc AUTHORS CHANGELOG.md README.md
+}


^ permalink raw reply related	[flat|nested] 29+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-util/diffuse/
@ 2022-01-03  5:01 Andrey Grozin
  0 siblings, 0 replies; 29+ messages in thread
From: Andrey Grozin @ 2022-01-03  5:01 UTC (permalink / raw
  To: gentoo-commits

commit:     68e52694d4f2e34469c9285f68eccff6a48e12cc
Author:     Andrey Grozin <grozin <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  3 05:01:08 2022 +0000
Commit:     Andrey Grozin <grozin <AT> gentoo <DOT> org>
CommitDate: Mon Jan  3 05:01:08 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68e52694

dev-util/diffuse: bump to 0.7.3

Signed-off-by: Andrey Grozin <grozin <AT> gentoo.org>

 dev-util/diffuse/Manifest             |  1 +
 dev-util/diffuse/diffuse-0.7.3.ebuild | 52 +++++++++++++++++++++++++++++++++++
 2 files changed, 53 insertions(+)

diff --git a/dev-util/diffuse/Manifest b/dev-util/diffuse/Manifest
index 9ac73c226f8f..09d19566b88a 100644
--- a/dev-util/diffuse/Manifest
+++ b/dev-util/diffuse/Manifest
@@ -1,2 +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

diff --git a/dev-util/diffuse/diffuse-0.7.3.ebuild b/dev-util/diffuse/diffuse-0.7.3.ebuild
new file mode 100644
index 000000000000..b2550df09ec4
--- /dev/null
+++ b/dev-util/diffuse/diffuse-0.7.3.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+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"
+inherit meson plocale python-r1 xdg
+
+DESCRIPTION="A graphical tool to compare and merge text files"
+HOMEPAGE="http://diffuse.sourceforge.net/ https://github.com/MightyCreak/diffuse/"
+SRC_URI="https://github.com/MightyCreak/diffuse/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+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_USEDEP},cairo]
+	')
+	x11-libs/gtk+:3[introspection]"
+# file collision, bug #279018
+DEPEND="${DEPEND}
+	!sci-chemistry/tinker"
+
+src_prepare() {
+	default
+	plocale_find_changes po '' '.po'
+
+	rm_locale() {
+		rm -f po/${1}.po
+		rm -rf data/usr/share/man/${1}
+		rm -rf data/usr/share/gnome/help/${PN}/$1
+		rm -f data/usr/share/omf/${PN}/${PN}-$1.omf
+		sed -e "/^${1}/d" -i po/LINGUAS
+	}
+
+	plocale_for_each_disabled_locale rm_locale
+}
+
+src_install() {
+	meson_src_install
+	rm "${D}"/usr/bin/${PN} || die "rm ${PN} failed"
+	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"
+	dodoc AUTHORS CHANGELOG.md README.md
+}


^ permalink raw reply related	[flat|nested] 29+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-util/diffuse/
@ 2022-01-03  5:20 Sam James
  0 siblings, 0 replies; 29+ messages in thread
From: Sam James @ 2022-01-03  5:20 UTC (permalink / raw
  To: gentoo-commits

commit:     cd40e232579704e8f8905d6d60407070f4f49064
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  3 05:20:23 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jan  3 05:20:48 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd40e232

dev-util/diffuse: add blocker to RDEPEND

See https://devmanual.gentoo.org/general-concepts/dependencies/#blockers.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-util/diffuse/diffuse-0.7.2.ebuild | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/dev-util/diffuse/diffuse-0.7.2.ebuild b/dev-util/diffuse/diffuse-0.7.2.ebuild
index 7e314bbfba40..bc3aa72a1d0f 100644
--- a/dev-util/diffuse/diffuse-0.7.2.ebuild
+++ b/dev-util/diffuse/diffuse-0.7.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,17 +13,14 @@ 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}"
 
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
-	$(python_gen_cond_dep '
+BDEPEND="${PYTHON_DEPS}"
+# file collision, bug #279018
+RDEPEND="$(python_gen_cond_dep '
 		dev-python/pygobject:3[${PYTHON_USEDEP},cairo]
 	')
-	x11-libs/gtk+:3[introspection]"
-# file collision, bug #279018
-DEPEND="${DEPEND}
+	x11-libs/gtk+:3[introspection]
 	!sci-chemistry/tinker"
 
 src_prepare() {


^ permalink raw reply related	[flat|nested] 29+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-util/diffuse/
@ 2022-01-03  5:21 Sam James
  0 siblings, 0 replies; 29+ messages in thread
From: Sam James @ 2022-01-03  5:21 UTC (permalink / raw
  To: gentoo-commits

commit:     e3c669810259e776f9c393a568beb4729410011d
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  3 05:21:35 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jan  3 05:21:35 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3c66981

dev-util/diffuse: keep ${PYTHON_DEPS} in RDEPEND

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-util/diffuse/diffuse-0.7.2.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dev-util/diffuse/diffuse-0.7.2.ebuild b/dev-util/diffuse/diffuse-0.7.2.ebuild
index bc3aa72a1d0f..461429fba3d2 100644
--- a/dev-util/diffuse/diffuse-0.7.2.ebuild
+++ b/dev-util/diffuse/diffuse-0.7.2.ebuild
@@ -17,7 +17,8 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 BDEPEND="${PYTHON_DEPS}"
 # file collision, bug #279018
-RDEPEND="$(python_gen_cond_dep '
+RDEPEND="${PYTHON_DEPS}
+	$(python_gen_cond_dep '
 		dev-python/pygobject:3[${PYTHON_USEDEP},cairo]
 	')
 	x11-libs/gtk+:3[introspection]


^ permalink raw reply related	[flat|nested] 29+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-util/diffuse/
@ 2022-04-26  9:08 Andrey Grozin
  0 siblings, 0 replies; 29+ messages in thread
From: Andrey Grozin @ 2022-04-26  9:08 UTC (permalink / raw
  To: gentoo-commits

commit:     748a95795c126a0c9b80c4dcdada186f410a95bb
Author:     Andrey Grozin <grozin <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 26 09:08:15 2022 +0000
Commit:     Andrey Grozin <grozin <AT> gentoo <DOT> org>
CommitDate: Tue Apr 26 09:08:15 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=748a9579

dev-util/diffuse: remove old version

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andrey Grozin <grozin <AT> gentoo.org>

 dev-util/diffuse/Manifest             |  1 -
 dev-util/diffuse/diffuse-0.7.2.ebuild | 50 -----------------------------------
 2 files changed, 51 deletions(-)

diff --git a/dev-util/diffuse/Manifest b/dev-util/diffuse/Manifest
index 09d19566b88a..b59e891d7cc9 100644
--- a/dev-util/diffuse/Manifest
+++ b/dev-util/diffuse/Manifest
@@ -1,3 +1,2 @@
 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

diff --git a/dev-util/diffuse/diffuse-0.7.2.ebuild b/dev-util/diffuse/diffuse-0.7.2.ebuild
deleted file mode 100644
index 461429fba3d2..000000000000
--- a/dev-util/diffuse/diffuse-0.7.2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-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"
-inherit meson plocale python-r1 xdg
-
-DESCRIPTION="A graphical tool to compare and merge text files"
-HOMEPAGE="http://diffuse.sourceforge.net/ https://github.com/MightyCreak/diffuse/"
-SRC_URI="https://github.com/MightyCreak/diffuse/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-BDEPEND="${PYTHON_DEPS}"
-# file collision, bug #279018
-RDEPEND="${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/pygobject:3[${PYTHON_USEDEP},cairo]
-	')
-	x11-libs/gtk+:3[introspection]
-	!sci-chemistry/tinker"
-
-src_prepare() {
-	default
-	plocale_find_changes po '' '.po'
-
-	rm_locale() {
-		rm -f po/${1}.po
-		rm -rf data/usr/share/man/${1}
-		rm -rf data/usr/share/gnome/help/${PN}/$1
-		rm -f data/usr/share/omf/${PN}/${PN}-$1.omf
-		sed -e "/^${1}/d" -i po/LINGUAS
-	}
-
-	plocale_for_each_disabled_locale rm_locale
-}
-
-src_install() {
-	meson_src_install
-	rm "${D}"/usr/bin/${PN} || die "rm ${PN} failed"
-	python_foreach_impl python_doscript ../${P}-build/src/${PN}
-	mkdir "${D}"/usr/share/metainfo || die "mkdir metainfo failed"
-	mv "${D}"/usr/share/appdata/* "${D}"/usr/share/metainfo/ \
-		|| die "mv appdata -> metainfo failed"
-	dodoc AUTHORS CHANGELOG.md README.md
-}


^ permalink raw reply related	[flat|nested] 29+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-util/diffuse/
@ 2022-04-26  9:10 Andrey Grozin
  0 siblings, 0 replies; 29+ messages in thread
From: Andrey Grozin @ 2022-04-26  9:10 UTC (permalink / raw
  To: gentoo-commits

commit:     2c0fa51e806fb33460b77ad4a6e80916b7aabff1
Author:     Andrey Grozin <grozin <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 26 09:10:07 2022 +0000
Commit:     Andrey Grozin <grozin <AT> gentoo <DOT> org>
CommitDate: Tue Apr 26 09:10:07 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c0fa51e

dev-util/diffuse: bump to 0.7.5

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andrey Grozin <grozin <AT> gentoo.org>

 dev-util/diffuse/Manifest             |  1 +
 dev-util/diffuse/diffuse-0.7.5.ebuild | 52 +++++++++++++++++++++++++++++++++++
 2 files changed, 53 insertions(+)

diff --git a/dev-util/diffuse/Manifest b/dev-util/diffuse/Manifest
index b59e891d7cc9..2027a61878b7 100644
--- a/dev-util/diffuse/Manifest
+++ b/dev-util/diffuse/Manifest
@@ -1,2 +1,3 @@
 DIST diffuse-0.6.0.tar.gz 621120 BLAKE2B c39cbe55edb6e1734d4db1343a0b0029ab146fe92ef4edc58cd6ea82bc6780e3f789d6765d2bddecd941fa458781c59ddde71a010f1b90d4ca238e6d6b233dc2 SHA512 fe9842738560dbefe9c546c8bba3f9f1cefcf4c327ad644430c512ec6bb1b4877986ca2b816af75226975eefa9b0f70120a4ed574e2ed90058b0a92380e8995a
 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.5.ebuild b/dev-util/diffuse/diffuse-0.7.5.ebuild
new file mode 100644
index 000000000000..4bf1060186f9
--- /dev/null
+++ b/dev-util/diffuse/diffuse-0.7.5.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..10} )
+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"
+HOMEPAGE="http://diffuse.sourceforge.net/ https://github.com/MightyCreak/diffuse/"
+SRC_URI="https://github.com/MightyCreak/diffuse/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+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_USEDEP},cairo]
+	')
+	x11-libs/gtk+:3[introspection]"
+# file collision, bug #279018
+DEPEND="${DEPEND}
+	!sci-chemistry/tinker"
+
+src_prepare() {
+	default
+	plocale_find_changes po '' '.po'
+
+	rm_locale() {
+		rm -f po/${1}.po
+		rm -rf data/usr/share/man/${1}
+		rm -rf data/usr/share/gnome/help/${PN}/$1
+		rm -f data/usr/share/omf/${PN}/${PN}-$1.omf
+		sed -e "/^${1}/d" -i po/LINGUAS
+	}
+
+	plocale_for_each_disabled_locale rm_locale
+}
+
+src_install() {
+	meson_src_install
+	rm "${D}"/usr/bin/${PN} || die "rm ${PN} failed"
+	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"
+	dodoc AUTHORS CHANGELOG.md README.md
+}


^ permalink raw reply related	[flat|nested] 29+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-util/diffuse/
@ 2022-06-05  7:06 Agostino Sarubbo
  0 siblings, 0 replies; 29+ messages in thread
From: Agostino Sarubbo @ 2022-06-05  7:06 UTC (permalink / raw
  To: gentoo-commits

commit:     446dbc40c709625761efe00d478751bd2d4ee83f
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sun Jun  5 07:06:03 2022 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sun Jun  5 07:06:03 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=446dbc40

dev-util/diffuse: amd64 stable wrt bug #849671

Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 dev-util/diffuse/diffuse-0.7.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/diffuse/diffuse-0.7.5.ebuild b/dev-util/diffuse/diffuse-0.7.5.ebuild
index 4bf1060186f9..f195dfeea750 100644
--- a/dev-util/diffuse/diffuse-0.7.5.ebuild
+++ b/dev-util/diffuse/diffuse-0.7.5.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}"
 


^ permalink raw reply related	[flat|nested] 29+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-util/diffuse/
@ 2022-06-05  7:09 Agostino Sarubbo
  0 siblings, 0 replies; 29+ messages in thread
From: Agostino Sarubbo @ 2022-06-05  7:09 UTC (permalink / raw
  To: gentoo-commits

commit:     ac4699858c7c401134add5f1fa996eaa2b63e6bf
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sun Jun  5 07:08:55 2022 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sun Jun  5 07:08:55 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac469985

dev-util/diffuse: x86 stable wrt bug #849671

Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 dev-util/diffuse/diffuse-0.7.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/diffuse/diffuse-0.7.5.ebuild b/dev-util/diffuse/diffuse-0.7.5.ebuild
index f195dfeea750..8716b4796421 100644
--- a/dev-util/diffuse/diffuse-0.7.5.ebuild
+++ b/dev-util/diffuse/diffuse-0.7.5.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}"
 


^ permalink raw reply related	[flat|nested] 29+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-util/diffuse/
@ 2022-06-05 11:37 Andrey Grozin
  0 siblings, 0 replies; 29+ messages in thread
From: Andrey Grozin @ 2022-06-05 11:37 UTC (permalink / raw
  To: gentoo-commits

commit:     43e1cf8702a04537ac197c31f9f7640a8b0e44f8
Author:     Andrey Grozin <grozin <AT> gentoo <DOT> org>
AuthorDate: Sun Jun  5 11:35:27 2022 +0000
Commit:     Andrey Grozin <grozin <AT> gentoo <DOT> org>
CommitDate: Sun Jun  5 11:35:27 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43e1cf87

dev-util/diffuse: remove old versions

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andrey Grozin <grozin <AT> gentoo.org>

 dev-util/diffuse/Manifest             |  2 --
 dev-util/diffuse/diffuse-0.6.0.ebuild | 57 -----------------------------------
 dev-util/diffuse/diffuse-0.7.3.ebuild | 52 --------------------------------
 3 files changed, 111 deletions(-)

diff --git a/dev-util/diffuse/Manifest b/dev-util/diffuse/Manifest
index 2027a61878b7..7b0d98557a35 100644
--- a/dev-util/diffuse/Manifest
+++ b/dev-util/diffuse/Manifest
@@ -1,3 +1 @@
-DIST diffuse-0.6.0.tar.gz 621120 BLAKE2B c39cbe55edb6e1734d4db1343a0b0029ab146fe92ef4edc58cd6ea82bc6780e3f789d6765d2bddecd941fa458781c59ddde71a010f1b90d4ca238e6d6b233dc2 SHA512 fe9842738560dbefe9c546c8bba3f9f1cefcf4c327ad644430c512ec6bb1b4877986ca2b816af75226975eefa9b0f70120a4ed574e2ed90058b0a92380e8995a
-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.6.0.ebuild b/dev-util/diffuse/diffuse-0.6.0.ebuild
deleted file mode 100644
index 7f6bd593c6d2..000000000000
--- a/dev-util/diffuse/diffuse-0.6.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..9} )
-PLOCALES="cs de es it ja ko pl pt ru sv th zh_CN zh_TW"
-inherit meson plocale python-single-r1 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://github.com/MightyCreak/diffuse/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-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_USEDEP},cairo]
-	')
-	x11-libs/gtk+:3[introspection]"
-# file collision, bug #279018
-DEPEND="${DEPEND}
-	!sci-chemistry/tinker"
-
-src_prepare() {
-	default
-	plocale_find_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
-		sed -e "/^${1}/d" -i translations/LINGUAS
-	}
-
-	plocale_for_each_disabled_locale rm_locale
-}
-
-src_install() {
-	meson_src_install
-	dodoc AUTHORS CHANGELOG.md 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.7.3.ebuild b/dev-util/diffuse/diffuse-0.7.3.ebuild
deleted file mode 100644
index b2550df09ec4..000000000000
--- a/dev-util/diffuse/diffuse-0.7.3.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-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"
-inherit meson plocale python-r1 xdg
-
-DESCRIPTION="A graphical tool to compare and merge text files"
-HOMEPAGE="http://diffuse.sourceforge.net/ https://github.com/MightyCreak/diffuse/"
-SRC_URI="https://github.com/MightyCreak/diffuse/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-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_USEDEP},cairo]
-	')
-	x11-libs/gtk+:3[introspection]"
-# file collision, bug #279018
-DEPEND="${DEPEND}
-	!sci-chemistry/tinker"
-
-src_prepare() {
-	default
-	plocale_find_changes po '' '.po'
-
-	rm_locale() {
-		rm -f po/${1}.po
-		rm -rf data/usr/share/man/${1}
-		rm -rf data/usr/share/gnome/help/${PN}/$1
-		rm -f data/usr/share/omf/${PN}/${PN}-$1.omf
-		sed -e "/^${1}/d" -i po/LINGUAS
-	}
-
-	plocale_for_each_disabled_locale rm_locale
-}
-
-src_install() {
-	meson_src_install
-	rm "${D}"/usr/bin/${PN} || die "rm ${PN} failed"
-	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"
-	dodoc AUTHORS CHANGELOG.md README.md
-}


^ permalink raw reply related	[flat|nested] 29+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-util/diffuse/
@ 2023-01-30 15:52 Andrey Grozin
  0 siblings, 0 replies; 29+ messages in thread
From: Andrey Grozin @ 2023-01-30 15:52 UTC (permalink / raw
  To: gentoo-commits

commit:     5c9447eca4abd8acf080938192a3d0eda3fc4516
Author:     Andrey Grozin <grozin <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 30 15:51:43 2023 +0000
Commit:     Andrey Grozin <grozin <AT> gentoo <DOT> org>
CommitDate: Mon Jan 30 15:51:43 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c9447ec

dev-util/diffuse: bump to 0.7.7

Signed-off-by: Andrey Grozin <grozin <AT> gentoo.org>

 dev-util/diffuse/Manifest             |  1 +
 dev-util/diffuse/diffuse-0.7.7.ebuild | 52 +++++++++++++++++++++++++++++++++++
 2 files changed, 53 insertions(+)

diff --git a/dev-util/diffuse/Manifest b/dev-util/diffuse/Manifest
index 7b0d98557a35..5b0592b6f66d 100644
--- a/dev-util/diffuse/Manifest
+++ b/dev-util/diffuse/Manifest
@@ -1 +1,2 @@
 DIST diffuse-0.7.5.tar.gz 509048 BLAKE2B f69d9afea243069bdb9d313059556cc83283cd037e2f32de4b1221a2b53c493cb8a0a9bf8b4fc4d8a50e94fc60fe6043d30e3b5e7b7ceb2cec8529d8e136db0f SHA512 466cdc834e1103ad794979a287838b5005379712ee1d77e400d5fe71dcf5e79097decb39e26b213669077a4a2a525444db99b5587929f01b8b2df9f31ec190fd
+DIST diffuse-0.7.7.tar.gz 620577 BLAKE2B 5c6cf09519e177404dd4d0fd8b27d176581ac08fb9d6dac5b4a90b130f7c28fce0f0f3802a99c7b3078e608f967a36851532d43f5e661854755242b5b23a64e8 SHA512 bf9576734ebd696252732b3b0ce6f1f18508a800520388459d9f27482a43251db879c2198c3a279bad9528afc08cf8e7f23a3253b58edad049db9b1c697fd6e0

diff --git a/dev-util/diffuse/diffuse-0.7.7.ebuild b/dev-util/diffuse/diffuse-0.7.7.ebuild
new file mode 100644
index 000000000000..4b47edc65ee9
--- /dev/null
+++ b/dev-util/diffuse/diffuse-0.7.7.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{9..11} )
+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"
+HOMEPAGE="http://diffuse.sourceforge.net/ https://github.com/MightyCreak/diffuse/"
+SRC_URI="https://github.com/MightyCreak/diffuse/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+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_USEDEP},cairo]
+	')
+	x11-libs/gtk+:3[introspection]"
+# file collision, bug #279018
+DEPEND="${DEPEND}
+	!sci-chemistry/tinker"
+
+src_prepare() {
+	default
+	plocale_find_changes po '' '.po'
+
+	rm_locale() {
+		rm -f po/${1}.po
+		rm -rf data/usr/share/man/${1}
+		rm -rf data/usr/share/gnome/help/${PN}/$1
+		rm -f data/usr/share/omf/${PN}/${PN}-$1.omf
+		sed -e "/^${1}/d" -i po/LINGUAS
+	}
+
+	plocale_for_each_disabled_locale rm_locale
+}
+
+src_install() {
+	meson_src_install
+	rm "${D}"/usr/bin/${PN} || die "rm ${PN} failed"
+	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"
+	dodoc AUTHORS CHANGELOG.md README.md
+}


^ permalink raw reply related	[flat|nested] 29+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-util/diffuse/
@ 2023-04-19 11:08 Sam James
  0 siblings, 0 replies; 29+ messages in thread
From: Sam James @ 2023-04-19 11:08 UTC (permalink / raw
  To: gentoo-commits

commit:     c3e36ddaf499f82db32058c074cdc51a92d1bd79
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 19 11:08:09 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Apr 19 11:08:09 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3e36dda

dev-util/diffuse: Stabilize 0.7.7 x86, #904649

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-util/diffuse/diffuse-0.7.7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/diffuse/diffuse-0.7.7.ebuild b/dev-util/diffuse/diffuse-0.7.7.ebuild
index 4b47edc65ee9..6e24a239ad9a 100644
--- a/dev-util/diffuse/diffuse-0.7.7.ebuild
+++ b/dev-util/diffuse/diffuse-0.7.7.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}"
 


^ permalink raw reply related	[flat|nested] 29+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-util/diffuse/
@ 2023-05-01  9:22 Sam James
  0 siblings, 0 replies; 29+ messages in thread
From: Sam James @ 2023-05-01  9:22 UTC (permalink / raw
  To: gentoo-commits

commit:     81996e542ce574ef02fd24ff756495624d842886
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon May  1 09:19:09 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon May  1 09:19:09 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81996e54

dev-util/diffuse: Stabilize 0.7.7 amd64, #904649

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-util/diffuse/diffuse-0.7.7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/diffuse/diffuse-0.7.7.ebuild b/dev-util/diffuse/diffuse-0.7.7.ebuild
index 6e24a239ad9a..d7fd99579407 100644
--- a/dev-util/diffuse/diffuse-0.7.7.ebuild
+++ b/dev-util/diffuse/diffuse-0.7.7.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}"
 


^ permalink raw reply related	[flat|nested] 29+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-util/diffuse/
@ 2023-05-09  6:16 Andrey Grozin
  0 siblings, 0 replies; 29+ messages in thread
From: Andrey Grozin @ 2023-05-09  6:16 UTC (permalink / raw
  To: gentoo-commits

commit:     0cc118c1776a5a5d5c515b0fc21fbb01bc8f25a8
Author:     Andrey Grozin <grozin <AT> gentoo <DOT> org>
AuthorDate: Tue May  9 06:15:21 2023 +0000
Commit:     Andrey Grozin <grozin <AT> gentoo <DOT> org>
CommitDate: Tue May  9 06:15:21 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0cc118c1

dev-util/diffuse: remove old version

Signed-off-by: Andrey Grozin <grozin <AT> gentoo.org>

 dev-util/diffuse/Manifest             |  1 -
 dev-util/diffuse/diffuse-0.7.5.ebuild | 52 -----------------------------------
 2 files changed, 53 deletions(-)

diff --git a/dev-util/diffuse/Manifest b/dev-util/diffuse/Manifest
index 5b0592b6f66d..d01f7b900813 100644
--- a/dev-util/diffuse/Manifest
+++ b/dev-util/diffuse/Manifest
@@ -1,2 +1 @@
-DIST diffuse-0.7.5.tar.gz 509048 BLAKE2B f69d9afea243069bdb9d313059556cc83283cd037e2f32de4b1221a2b53c493cb8a0a9bf8b4fc4d8a50e94fc60fe6043d30e3b5e7b7ceb2cec8529d8e136db0f SHA512 466cdc834e1103ad794979a287838b5005379712ee1d77e400d5fe71dcf5e79097decb39e26b213669077a4a2a525444db99b5587929f01b8b2df9f31ec190fd
 DIST diffuse-0.7.7.tar.gz 620577 BLAKE2B 5c6cf09519e177404dd4d0fd8b27d176581ac08fb9d6dac5b4a90b130f7c28fce0f0f3802a99c7b3078e608f967a36851532d43f5e661854755242b5b23a64e8 SHA512 bf9576734ebd696252732b3b0ce6f1f18508a800520388459d9f27482a43251db879c2198c3a279bad9528afc08cf8e7f23a3253b58edad049db9b1c697fd6e0

diff --git a/dev-util/diffuse/diffuse-0.7.5.ebuild b/dev-util/diffuse/diffuse-0.7.5.ebuild
deleted file mode 100644
index bb49b42635bd..000000000000
--- a/dev-util/diffuse/diffuse-0.7.5.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{9..10} )
-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"
-HOMEPAGE="http://diffuse.sourceforge.net/ https://github.com/MightyCreak/diffuse/"
-SRC_URI="https://github.com/MightyCreak/diffuse/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-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_USEDEP},cairo]
-	')
-	x11-libs/gtk+:3[introspection]"
-# file collision, bug #279018
-DEPEND="${DEPEND}
-	!sci-chemistry/tinker"
-
-src_prepare() {
-	default
-	plocale_find_changes po '' '.po'
-
-	rm_locale() {
-		rm -f po/${1}.po
-		rm -rf data/usr/share/man/${1}
-		rm -rf data/usr/share/gnome/help/${PN}/$1
-		rm -f data/usr/share/omf/${PN}/${PN}-$1.omf
-		sed -e "/^${1}/d" -i po/LINGUAS
-	}
-
-	plocale_for_each_disabled_locale rm_locale
-}
-
-src_install() {
-	meson_src_install
-	rm "${D}"/usr/bin/${PN} || die "rm ${PN} failed"
-	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"
-	dodoc AUTHORS CHANGELOG.md README.md
-}


^ permalink raw reply related	[flat|nested] 29+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-util/diffuse/
@ 2023-05-23 12:50 Andrey Grozin
  0 siblings, 0 replies; 29+ messages in thread
From: Andrey Grozin @ 2023-05-23 12:50 UTC (permalink / raw
  To: gentoo-commits

commit:     cede311a22f0fe95ac87f4da322f937b9bde61bd
Author:     Andrey Grozin <grozin <AT> gentoo <DOT> org>
AuthorDate: Tue May 23 12:49:16 2023 +0000
Commit:     Andrey Grozin <grozin <AT> gentoo <DOT> org>
CommitDate: Tue May 23 12:49:39 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cede311a

dev-util/diffuse: bump to 0.8.2

Signed-off-by: Andrey Grozin <grozin <AT> gentoo.org>

 dev-util/diffuse/Manifest             |  1 +
 dev-util/diffuse/diffuse-0.8.2.ebuild | 52 +++++++++++++++++++++++++++++++++++
 dev-util/diffuse/metadata.xml         |  2 +-
 3 files changed, 54 insertions(+), 1 deletion(-)

diff --git a/dev-util/diffuse/Manifest b/dev-util/diffuse/Manifest
index d01f7b900813..f26fbdc543e3 100644
--- a/dev-util/diffuse/Manifest
+++ b/dev-util/diffuse/Manifest
@@ -1 +1,2 @@
 DIST diffuse-0.7.7.tar.gz 620577 BLAKE2B 5c6cf09519e177404dd4d0fd8b27d176581ac08fb9d6dac5b4a90b130f7c28fce0f0f3802a99c7b3078e608f967a36851532d43f5e661854755242b5b23a64e8 SHA512 bf9576734ebd696252732b3b0ce6f1f18508a800520388459d9f27482a43251db879c2198c3a279bad9528afc08cf8e7f23a3253b58edad049db9b1c697fd6e0
+DIST diffuse-0.8.2.tar.gz 1187378 BLAKE2B 466cb2291dcc812a82ade4fb59c3e3faf1f632d741fc3efef886c00b100e8edebdddc1837e980d9bb86c18182172cf9afca3b1abc17a8258669f6aada0763beb SHA512 c2a5c1cac435bc0879fc6e6f10bcf10bd8e58e4a2cb603a4e1435c411b3d66373424680d1a41296d38c249e659aa53e67c8783eb26a3d02a42ef5c7e7fa1e245

diff --git a/dev-util/diffuse/diffuse-0.8.2.ebuild b/dev-util/diffuse/diffuse-0.8.2.ebuild
new file mode 100644
index 000000000000..6c606d89d34a
--- /dev/null
+++ b/dev-util/diffuse/diffuse-0.8.2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{9..11} )
+PLOCALES="cs de es fr it ja ka ko nl pl pt pt_BR ru sv th tr zh_CN zh_TW"
+inherit meson plocale python-r1 xdg
+
+DESCRIPTION="A graphical tool to compare and merge text files"
+HOMEPAGE="http://diffuse.sourceforge.net/ https://github.com/MightyCreak/diffuse/"
+SRC_URI="https://github.com/MightyCreak/diffuse/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+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_USEDEP},cairo]
+	')
+	x11-libs/gtk+:3[introspection]"
+# file collision, bug #279018
+DEPEND="${DEPEND}
+	!sci-chemistry/tinker"
+
+src_prepare() {
+	default
+	plocale_find_changes po '' '.po'
+
+	rm_locale() {
+		rm -f po/${1}.po
+		rm -rf data/usr/share/man/${1}
+		rm -rf data/usr/share/gnome/help/${PN}/$1
+		rm -f data/usr/share/omf/${PN}/${PN}-$1.omf
+		sed -e "/^${1}/d" -i po/LINGUAS
+	}
+
+	plocale_for_each_disabled_locale rm_locale
+}
+
+src_install() {
+	meson_src_install
+	rm "${D}"/usr/bin/${PN} || die "rm ${PN} failed"
+	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"
+	dodoc AUTHORS CHANGELOG.md README.md
+}

diff --git a/dev-util/diffuse/metadata.xml b/dev-util/diffuse/metadata.xml
index c1a33ad7fc6e..2b41d624d4c8 100644
--- a/dev-util/diffuse/metadata.xml
+++ b/dev-util/diffuse/metadata.xml
@@ -6,6 +6,6 @@
 		<name>Andrey Grozin</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="sourceforge">diffuse</remote-id>
+		<remote-id type="github">MightyCreak/diffuse</remote-id>
 	</upstream>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 29+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-util/diffuse/
@ 2023-07-21 12:49 Sam James
  0 siblings, 0 replies; 29+ messages in thread
From: Sam James @ 2023-07-21 12:49 UTC (permalink / raw
  To: gentoo-commits

commit:     f3bc141e1b67ef5b5362ea80532f26fe0bbb9eef
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 21 12:49:05 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jul 21 12:49:12 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3bc141e

dev-util/diffuse: Stabilize 0.8.2 x86, #910630

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-util/diffuse/diffuse-0.8.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/diffuse/diffuse-0.8.2.ebuild b/dev-util/diffuse/diffuse-0.8.2.ebuild
index 6c606d89d34a..2384580d7701 100644
--- a/dev-util/diffuse/diffuse-0.8.2.ebuild
+++ b/dev-util/diffuse/diffuse-0.8.2.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}"
 


^ permalink raw reply related	[flat|nested] 29+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-util/diffuse/
@ 2023-07-21 12:49 Sam James
  0 siblings, 0 replies; 29+ messages in thread
From: Sam James @ 2023-07-21 12:49 UTC (permalink / raw
  To: gentoo-commits

commit:     dfda8fbb988ee7f02fbcb3785432c6c3ae61fc49
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 21 12:49:06 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jul 21 12:49:13 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dfda8fbb

dev-util/diffuse: Stabilize 0.8.2 amd64, #910630

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-util/diffuse/diffuse-0.8.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/diffuse/diffuse-0.8.2.ebuild b/dev-util/diffuse/diffuse-0.8.2.ebuild
index 2384580d7701..9368932d5804 100644
--- a/dev-util/diffuse/diffuse-0.8.2.ebuild
+++ b/dev-util/diffuse/diffuse-0.8.2.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}"
 


^ permalink raw reply related	[flat|nested] 29+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-util/diffuse/
@ 2023-07-21 14:55 Andrey Grozin
  0 siblings, 0 replies; 29+ messages in thread
From: Andrey Grozin @ 2023-07-21 14:55 UTC (permalink / raw
  To: gentoo-commits

commit:     2158f5c838726d486826b1dec12d138fbef02504
Author:     Andrey Grozin <grozin <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 21 14:55:40 2023 +0000
Commit:     Andrey Grozin <grozin <AT> gentoo <DOT> org>
CommitDate: Fri Jul 21 14:55:40 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2158f5c8

dev-util/diffuse: remove old version

Signed-off-by: Andrey Grozin <grozin <AT> gentoo.org>

 dev-util/diffuse/Manifest             |  1 -
 dev-util/diffuse/diffuse-0.7.7.ebuild | 52 -----------------------------------
 2 files changed, 53 deletions(-)

diff --git a/dev-util/diffuse/Manifest b/dev-util/diffuse/Manifest
index f26fbdc543e3..45671f2e8adc 100644
--- a/dev-util/diffuse/Manifest
+++ b/dev-util/diffuse/Manifest
@@ -1,2 +1 @@
-DIST diffuse-0.7.7.tar.gz 620577 BLAKE2B 5c6cf09519e177404dd4d0fd8b27d176581ac08fb9d6dac5b4a90b130f7c28fce0f0f3802a99c7b3078e608f967a36851532d43f5e661854755242b5b23a64e8 SHA512 bf9576734ebd696252732b3b0ce6f1f18508a800520388459d9f27482a43251db879c2198c3a279bad9528afc08cf8e7f23a3253b58edad049db9b1c697fd6e0
 DIST diffuse-0.8.2.tar.gz 1187378 BLAKE2B 466cb2291dcc812a82ade4fb59c3e3faf1f632d741fc3efef886c00b100e8edebdddc1837e980d9bb86c18182172cf9afca3b1abc17a8258669f6aada0763beb SHA512 c2a5c1cac435bc0879fc6e6f10bcf10bd8e58e4a2cb603a4e1435c411b3d66373424680d1a41296d38c249e659aa53e67c8783eb26a3d02a42ef5c7e7fa1e245

diff --git a/dev-util/diffuse/diffuse-0.7.7.ebuild b/dev-util/diffuse/diffuse-0.7.7.ebuild
deleted file mode 100644
index d7fd99579407..000000000000
--- a/dev-util/diffuse/diffuse-0.7.7.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{9..11} )
-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"
-HOMEPAGE="http://diffuse.sourceforge.net/ https://github.com/MightyCreak/diffuse/"
-SRC_URI="https://github.com/MightyCreak/diffuse/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-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_USEDEP},cairo]
-	')
-	x11-libs/gtk+:3[introspection]"
-# file collision, bug #279018
-DEPEND="${DEPEND}
-	!sci-chemistry/tinker"
-
-src_prepare() {
-	default
-	plocale_find_changes po '' '.po'
-
-	rm_locale() {
-		rm -f po/${1}.po
-		rm -rf data/usr/share/man/${1}
-		rm -rf data/usr/share/gnome/help/${PN}/$1
-		rm -f data/usr/share/omf/${PN}/${PN}-$1.omf
-		sed -e "/^${1}/d" -i po/LINGUAS
-	}
-
-	plocale_for_each_disabled_locale rm_locale
-}
-
-src_install() {
-	meson_src_install
-	rm "${D}"/usr/bin/${PN} || die "rm ${PN} failed"
-	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"
-	dodoc AUTHORS CHANGELOG.md README.md
-}


^ permalink raw reply related	[flat|nested] 29+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-util/diffuse/
@ 2024-04-14  5:38 Andrey Grozin
  0 siblings, 0 replies; 29+ messages in thread
From: Andrey Grozin @ 2024-04-14  5:38 UTC (permalink / raw
  To: gentoo-commits

commit:     2f076d5dc28f9e76e41da902d8ea176b48f53cd5
Author:     Andrey Grozin <grozin <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 14 05:38:18 2024 +0000
Commit:     Andrey Grozin <grozin <AT> gentoo <DOT> org>
CommitDate: Sun Apr 14 05:38:18 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f076d5d

dev-util/diffuse: bump to 0.9.0

Closes: https://bugs.gentoo.org/929535
Signed-off-by: Andrey Grozin <grozin <AT> gentoo.org>

 dev-util/diffuse/Manifest             |  1 +
 dev-util/diffuse/diffuse-0.9.0.ebuild | 50 +++++++++++++++++++++++++++++++++++
 2 files changed, 51 insertions(+)

diff --git a/dev-util/diffuse/Manifest b/dev-util/diffuse/Manifest
index 45671f2e8adc..5e8acb655b95 100644
--- a/dev-util/diffuse/Manifest
+++ b/dev-util/diffuse/Manifest
@@ -1 +1,2 @@
 DIST diffuse-0.8.2.tar.gz 1187378 BLAKE2B 466cb2291dcc812a82ade4fb59c3e3faf1f632d741fc3efef886c00b100e8edebdddc1837e980d9bb86c18182172cf9afca3b1abc17a8258669f6aada0763beb SHA512 c2a5c1cac435bc0879fc6e6f10bcf10bd8e58e4a2cb603a4e1435c411b3d66373424680d1a41296d38c249e659aa53e67c8783eb26a3d02a42ef5c7e7fa1e245
+DIST diffuse-0.9.0.tar.gz 1193105 BLAKE2B 934d38722e0bd9f83a915c681521c1699e0a2efefdcbbb3e23c3f9635467fb31d9f364a72b0e7c78ca65bf9fe154e5ebbeecdbfe1a4b412149a3b0f3a511d6e9 SHA512 9a9ed6047531eaf80fed867bc2feba081f183ee7e5e5c940b0cb912af6d17c7c22df48b7aa76c3f17d4fafeff1bade45216d26ef689fef33b3680bdc70ed80ac

diff --git a/dev-util/diffuse/diffuse-0.9.0.ebuild b/dev-util/diffuse/diffuse-0.9.0.ebuild
new file mode 100644
index 000000000000..0c1ca8533aac
--- /dev/null
+++ b/dev-util/diffuse/diffuse-0.9.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{9..12} )
+PLOCALES="cs de es fr it ja ka ko nl pl pt pt_BR ru sv th tr zh_CN zh_TW"
+inherit meson plocale python-r1 xdg
+
+DESCRIPTION="A graphical tool to compare and merge text files"
+HOMEPAGE="http://diffuse.sourceforge.net/ https://github.com/MightyCreak/diffuse/"
+SRC_URI="https://github.com/MightyCreak/diffuse/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}"
+RDEPEND="${DEPEND}
+	$(python_gen_cond_dep '
+		dev-python/pygobject:3[${PYTHON_USEDEP},cairo]
+	')
+	x11-libs/gtk+:3[introspection]
+	!sci-chemistry/tinker"
+# file collision, bug #279018
+
+src_prepare() {
+	default
+	plocale_find_changes po '' '.po'
+
+	rm_locale() {
+		rm -f po/${1}.po
+		rm -rf data/usr/share/man/${1}
+		rm -rf data/usr/share/gnome/help/${PN}/$1
+		rm -f data/usr/share/omf/${PN}/${PN}-$1.omf
+		sed -e "/^${1}/d" -i po/LINGUAS
+	}
+
+	plocale_for_each_disabled_locale rm_locale
+}
+
+src_install() {
+	meson_src_install
+	rm "${D}"/usr/bin/${PN} || die "rm ${PN} failed"
+	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"
+	dodoc AUTHORS CHANGELOG.md README.md
+}


^ permalink raw reply related	[flat|nested] 29+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-util/diffuse/
@ 2024-05-28 12:35 Sam James
  0 siblings, 0 replies; 29+ messages in thread
From: Sam James @ 2024-05-28 12:35 UTC (permalink / raw
  To: gentoo-commits

commit:     d9e67d3c5065d9b0dfcc3891d2001df6456fa3be
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue May 28 12:34:18 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue May 28 12:34:18 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9e67d3c

dev-util/diffuse: Stabilize 0.9.0 x86, #932958

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-util/diffuse/diffuse-0.9.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/diffuse/diffuse-0.9.0.ebuild b/dev-util/diffuse/diffuse-0.9.0.ebuild
index 0c1ca8533aac..bec749d2ab1d 100644
--- a/dev-util/diffuse/diffuse-0.9.0.ebuild
+++ b/dev-util/diffuse/diffuse-0.9.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"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DEPEND="${PYTHON_DEPS}"


^ permalink raw reply related	[flat|nested] 29+ messages in thread

end of thread, other threads:[~2024-05-28 12:35 UTC | newest]

Thread overview: 29+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-11-21 17:08 [gentoo-commits] repo/gentoo:master commit in: dev-util/diffuse/ Andrey Grozin
  -- strict thread matches above, loose matches on Subject: below --
2024-05-28 12:35 Sam James
2024-04-14  5:38 Andrey Grozin
2023-07-21 14:55 Andrey Grozin
2023-07-21 12:49 Sam James
2023-07-21 12:49 Sam James
2023-05-23 12:50 Andrey Grozin
2023-05-09  6:16 Andrey Grozin
2023-05-01  9:22 Sam James
2023-04-19 11:08 Sam James
2023-01-30 15:52 Andrey Grozin
2022-06-05 11:37 Andrey Grozin
2022-06-05  7:09 Agostino Sarubbo
2022-06-05  7:06 Agostino Sarubbo
2022-04-26  9:10 Andrey Grozin
2022-04-26  9:08 Andrey Grozin
2022-01-03  5:21 Sam James
2022-01-03  5:20 Sam James
2022-01-03  5:01 Andrey Grozin
2021-04-28  7:45 Andrey Grozin
2021-04-27 18:02 Sam James
2021-04-27 18:01 Sam James
2021-02-17  8:21 Andrey Grozin
2020-03-09 20:22 Andreas Sturmlechner
2020-03-09 14:15 Thomas Deutschmann
2020-03-09 13:44 Agostino Sarubbo
2020-02-09  4:17 Andrey Grozin
2020-02-08 15:28 Andrey Grozin
2016-11-09 14:04 Pacho Ramos

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox