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

2024-03-24 Thread Mart Raudsepp
commit: fb8a03fdb6c8f533d081ebdf455d26f02ca270f6
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Sun Mar 24 20:10:57 2024 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Sun Mar 24 20:45:01 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb8a03fd

dev-util/meld: add 3.22.2

Signed-off-by: Mart Raudsepp  gentoo.org>

 dev-util/meld/Manifest   |  1 +
 dev-util/meld/meld-3.22.2.ebuild | 74 
 2 files changed, 75 insertions(+)

diff --git a/dev-util/meld/Manifest b/dev-util/meld/Manifest
index be81f8fa181c..3087c33ec47a 100644
--- a/dev-util/meld/Manifest
+++ b/dev-util/meld/Manifest
@@ -1,2 +1,3 @@
 DIST meld-3.22.0.tar.xz 674212 BLAKE2B 
1d5af5fa9943c46fd150bd1e1c74003579a0017dea56178e92c4ba0dd1ba0bc3348a6f2625bfe5191fe4d8394b06462a30f2173ae623ffd32c637642f9c36183
 SHA512 
4cc1c9a76379401c1f116292bb4730301ec0f2413cdab7b463ed519ea7ee0ee86143a9c83a13f1ef09860aad192c04769d111bfb1eb10b5e1bc81fb44c530526
 DIST meld-3.22.1.tar.xz 675984 BLAKE2B 
47ad8cc0b3f55e2ab8066bd811a925eb12446d041b26220d56a11eedc727042357c8bbec26a5b9f1a9e220357753968acbc43dd257fe48013a3fcf7ef4243364
 SHA512 
7cb4c64a8134d02ee629c5459d5361c8ee1b1fb80efb02b9f3d2c577ecb69dca2ff66b90affb479682b7fceda41c60717ef859d93e3b93070a84901ae772b2cd
+DIST meld-3.22.2.tar.xz 676376 BLAKE2B 
5e592e378ac2c942dd98df6d9ac4f9af7a1eee552af1691aade2e0f453a5ddf649ca09c38191b2c2ffdb7b6fa165012b4d8372e9e99c33052f612e2ab8ca8670
 SHA512 
fd8b12567cd8dcf77f265d831c9ac9ba33d13fb78c95b01b496b016308ff4159963b4610a68f41d04a52cc5bcc13bb4568d24bbade5bd79246111e463e413284

diff --git a/dev-util/meld/meld-3.22.2.ebuild b/dev-util/meld/meld-3.22.2.ebuild
new file mode 100644
index ..48ffb7c894f2
--- /dev/null
+++ b/dev-util/meld/meld-3.22.2.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{9..12} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit gnome.org gnome2-utils meson python-single-r1 xdg
+
+DESCRIPTION="A graphical diff and merge tool"
+HOMEPAGE="http://meldmerge.org/;
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 
~amd64-linux ~x86-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+   ${PYTHON_DEPS}
+   >=x11-libs/gtk+-3.20:3[introspection]
+   >=dev-libs/glib-2.48:2
+   >=x11-libs/gtksourceview-4.0.0:4[introspection]
+   $(python_gen_cond_dep '
+   >=dev-python/pygobject-3.30:3[cairo,${PYTHON_USEDEP}]
+   ')
+   gnome-base/gsettings-desktop-schemas
+   >=x11-libs/pango-1.34[introspection]
+   x11-themes/hicolor-icon-theme
+"
+DEPEND="${RDEPEND}
+   test? (
+   dev-util/desktop-file-utils
+   dev-libs/appstream-glib
+   )
+"
+BDEPEND="
+   dev-util/intltool
+   dev-util/itstool
+   sys-devel/gettext
+   $(python_gen_cond_dep 'dev-python/distro[${PYTHON_USEDEP}]')
+"
+# dev-python/distro is soft-required in BDEPEND for python3.8 and onwards,
+# but it's mainly needed for debian and derivatives - seems the fallback
+# works fine, as we aren't a special_case, just an annoying warning.
+
+pkg_setup() {
+   python-single-r1_pkg_setup
+}
+
+src_configure() {
+   local emesonargs=(
+   -Dprofile=''
+   -Dbyte-compile=false
+   )
+   meson_src_configure
+}
+
+src_install() {
+   meson_src_install
+   python_optimize
+   python_fix_shebang "${ED}"/usr/bin/meld
+}
+
+pkg_postinst() {
+   xdg_pkg_postinst
+   gnome2_schemas_update
+}
+
+pkg_postrm() {
+   xdg_pkg_postrm
+   gnome2_schemas_update
+}



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

2024-03-03 Thread Mart Raudsepp
commit: 0e5b12dc37006127386f568195747b8bd6fb2f33
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Sun Mar  3 18:08:25 2024 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Sun Mar  3 18:09:49 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e5b12dc

dev-util/meld: add 3.22.1

Closes: https://bugs.gentoo.org/925737
Signed-off-by: Mart Raudsepp  gentoo.org>

 dev-util/meld/Manifest   |  1 +
 dev-util/meld/meld-3.22.1.ebuild | 74 
 2 files changed, 75 insertions(+)

diff --git a/dev-util/meld/Manifest b/dev-util/meld/Manifest
index 8e742e02d7f2..be81f8fa181c 100644
--- a/dev-util/meld/Manifest
+++ b/dev-util/meld/Manifest
@@ -1 +1,2 @@
 DIST meld-3.22.0.tar.xz 674212 BLAKE2B 
1d5af5fa9943c46fd150bd1e1c74003579a0017dea56178e92c4ba0dd1ba0bc3348a6f2625bfe5191fe4d8394b06462a30f2173ae623ffd32c637642f9c36183
 SHA512 
4cc1c9a76379401c1f116292bb4730301ec0f2413cdab7b463ed519ea7ee0ee86143a9c83a13f1ef09860aad192c04769d111bfb1eb10b5e1bc81fb44c530526
+DIST meld-3.22.1.tar.xz 675984 BLAKE2B 
47ad8cc0b3f55e2ab8066bd811a925eb12446d041b26220d56a11eedc727042357c8bbec26a5b9f1a9e220357753968acbc43dd257fe48013a3fcf7ef4243364
 SHA512 
7cb4c64a8134d02ee629c5459d5361c8ee1b1fb80efb02b9f3d2c577ecb69dca2ff66b90affb479682b7fceda41c60717ef859d93e3b93070a84901ae772b2cd

diff --git a/dev-util/meld/meld-3.22.1.ebuild b/dev-util/meld/meld-3.22.1.ebuild
new file mode 100644
index ..48ffb7c894f2
--- /dev/null
+++ b/dev-util/meld/meld-3.22.1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{9..12} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit gnome.org gnome2-utils meson python-single-r1 xdg
+
+DESCRIPTION="A graphical diff and merge tool"
+HOMEPAGE="http://meldmerge.org/;
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 
~amd64-linux ~x86-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+   ${PYTHON_DEPS}
+   >=x11-libs/gtk+-3.20:3[introspection]
+   >=dev-libs/glib-2.48:2
+   >=x11-libs/gtksourceview-4.0.0:4[introspection]
+   $(python_gen_cond_dep '
+   >=dev-python/pygobject-3.30:3[cairo,${PYTHON_USEDEP}]
+   ')
+   gnome-base/gsettings-desktop-schemas
+   >=x11-libs/pango-1.34[introspection]
+   x11-themes/hicolor-icon-theme
+"
+DEPEND="${RDEPEND}
+   test? (
+   dev-util/desktop-file-utils
+   dev-libs/appstream-glib
+   )
+"
+BDEPEND="
+   dev-util/intltool
+   dev-util/itstool
+   sys-devel/gettext
+   $(python_gen_cond_dep 'dev-python/distro[${PYTHON_USEDEP}]')
+"
+# dev-python/distro is soft-required in BDEPEND for python3.8 and onwards,
+# but it's mainly needed for debian and derivatives - seems the fallback
+# works fine, as we aren't a special_case, just an annoying warning.
+
+pkg_setup() {
+   python-single-r1_pkg_setup
+}
+
+src_configure() {
+   local emesonargs=(
+   -Dprofile=''
+   -Dbyte-compile=false
+   )
+   meson_src_configure
+}
+
+src_install() {
+   meson_src_install
+   python_optimize
+   python_fix_shebang "${ED}"/usr/bin/meld
+}
+
+pkg_postinst() {
+   xdg_pkg_postinst
+   gnome2_schemas_update
+}
+
+pkg_postrm() {
+   xdg_pkg_postrm
+   gnome2_schemas_update
+}



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

2023-10-03 Thread Mart Raudsepp
commit: 1573a4eef490b061a84d040f271cab5e2eff00be
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Tue Oct  3 21:31:29 2023 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Tue Oct  3 21:31:29 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1573a4ee

dev-util/meld: enable py3.12

Signed-off-by: Mart Raudsepp  gentoo.org>

 dev-util/meld/meld-3.22.0-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/meld/meld-3.22.0-r2.ebuild 
b/dev-util/meld/meld-3.22.0-r2.ebuild
index e1ee5884d75e..0bf443a41182 100644
--- a/dev-util/meld/meld-3.22.0-r2.ebuild
+++ b/dev-util/meld/meld-3.22.0-r2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{9..12} )
 PYTHON_REQ_USE="xml(+)"
 
 inherit gnome.org gnome2-utils meson python-single-r1 xdg



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

2022-12-04 Thread Matt Turner
commit: f395bd59c413c4f7018e4cb32013ec8535a411bd
Author: Matt Turner  gentoo  org>
AuthorDate: Sun Dec  4 17:13:12 2022 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sun Dec  4 17:15:35 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f395bd59

dev-util/meld: Do more postinst updates

Closes: https://bugs.gentoo.org/870064
Closes: https://bugs.gentoo.org/870067
Closes: https://bugs.gentoo.org/881387
Signed-off-by: Matt Turner  gentoo.org>

 dev-util/meld/{meld-3.22.0-r1.ebuild => meld-3.22.0-r2.ebuild} | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/dev-util/meld/meld-3.22.0-r1.ebuild 
b/dev-util/meld/meld-3.22.0-r2.ebuild
similarity index 90%
rename from dev-util/meld/meld-3.22.0-r1.ebuild
rename to dev-util/meld/meld-3.22.0-r2.ebuild
index 7a048446df60..2944993f987d 100644
--- a/dev-util/meld/meld-3.22.0-r1.ebuild
+++ b/dev-util/meld/meld-3.22.0-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 PYTHON_COMPAT=( python3_{8..11} )
 PYTHON_REQ_USE="xml(+)"
 
-inherit gnome.org meson python-single-r1 xdg
+inherit gnome.org gnome2-utils meson python-single-r1 xdg
 
 DESCRIPTION="A graphical diff and merge tool"
 HOMEPAGE="http://meldmerge.org/;
@@ -64,11 +64,11 @@ src_install() {
 }
 
 pkg_postinst() {
-   xdg_icon_cache_update
-   xdg_desktop_database_update
+   xdg_pkg_postinst
+   gnome2_schemas_update
 }
 
 pkg_postrm() {
-   xdg_icon_cache_update
-   xdg_desktop_database_update
+   xdg_pkg_postrm
+   gnome2_schemas_update
 }



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

2022-10-13 Thread Matt Turner
commit: d4e7f634db08d1fc46eb355eb27b6cc46a009d37
Author: Matt Turner  gentoo  org>
AuthorDate: Thu Oct 13 16:24:24 2022 +
Commit: Matt Turner  gentoo  org>
CommitDate: Thu Oct 13 16:26:13 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4e7f634

dev-util/meld: Call xdg postinst functions

Closes: https://bugs.gentoo.org/873004
Signed-off-by: Matt Turner  gentoo.org>

 dev-util/meld/meld-3.22.0-r1.ebuild | 12 +++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/dev-util/meld/meld-3.22.0-r1.ebuild 
b/dev-util/meld/meld-3.22.0-r1.ebuild
index 8b8cafb1d5ae..6d023ef276db 100644
--- a/dev-util/meld/meld-3.22.0-r1.ebuild
+++ b/dev-util/meld/meld-3.22.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 PYTHON_COMPAT=( python3_{8..11} )
 PYTHON_REQ_USE="xml(+)"
 
-inherit gnome.org meson python-single-r1
+inherit gnome.org meson python-single-r1 xdg
 
 DESCRIPTION="A graphical diff and merge tool"
 HOMEPAGE="http://meldmerge.org/;
@@ -62,3 +62,13 @@ src_install() {
python_optimize
python_fix_shebang "${ED}"/usr/bin/meld
 }
+
+pkg_postinst() {
+   xdg_icon_cache_update
+   xdg_desktop_database_update
+}
+
+pkg_postrm() {
+   xdg_icon_cache_update
+   xdg_desktop_database_update
+}



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

2022-10-01 Thread Sebastian Pipping
commit: 892f2fe6879667312b33108bbf18c4a07f0aa452
Author: Sebastian Pipping  gentoo  org>
AuthorDate: Sat Oct  1 19:18:44 2022 +
Commit: Sebastian Pipping  gentoo  org>
CommitDate: Sat Oct  1 19:19:36 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=892f2fe6

dev-util/meld: Add missing revbump

Bug: https://bugs.gentoo.org/870694
Signed-off-by: Sebastian Pipping  gentoo.org>

 dev-util/meld/{meld-3.22.0.ebuild => meld-3.22.0-r1.ebuild} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/dev-util/meld/meld-3.22.0.ebuild 
b/dev-util/meld/meld-3.22.0-r1.ebuild
similarity index 100%
rename from dev-util/meld/meld-3.22.0.ebuild
rename to dev-util/meld/meld-3.22.0-r1.ebuild



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

2022-10-01 Thread Matt Turner
commit: fdf3b6cd0b7528b64a514759110b2ae4e017e853
Author: Matt Turner  gentoo  org>
AuthorDate: Sat Oct  1 18:55:33 2022 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sat Oct  1 18:55:54 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fdf3b6cd

dev-util/meld: Fix python shebang

Closes: https://bugs.gentoo.org/870694
Signed-off-by: Matt Turner  gentoo.org>

 dev-util/meld/meld-3.22.0.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev-util/meld/meld-3.22.0.ebuild b/dev-util/meld/meld-3.22.0.ebuild
index 546bbe598e0a..8b8cafb1d5ae 100644
--- a/dev-util/meld/meld-3.22.0.ebuild
+++ b/dev-util/meld/meld-3.22.0.ebuild
@@ -60,4 +60,5 @@ src_configure() {
 src_install() {
meson_src_install
python_optimize
+   python_fix_shebang "${ED}"/usr/bin/meld
 }



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

2022-09-13 Thread Matt Turner
commit: f41702b5494753fd5af0684cf740a4a4d7aaba70
Author: Matt Turner  gentoo  org>
AuthorDate: Tue Sep 13 19:38:33 2022 +
Commit: Matt Turner  gentoo  org>
CommitDate: Tue Sep 13 20:06:00 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f41702b5

dev-util/meld: Version bump to 3.22.0

Closes: https://bugs.gentoo.org/737138
Signed-off-by: Matt Turner  gentoo.org>

 dev-util/meld/Manifest   |  1 +
 dev-util/meld/meld-3.22.0.ebuild | 63 
 2 files changed, 64 insertions(+)

diff --git a/dev-util/meld/Manifest b/dev-util/meld/Manifest
index 3fdeaf8b3ec7..495b1a8d931f 100644
--- a/dev-util/meld/Manifest
+++ b/dev-util/meld/Manifest
@@ -1 +1,2 @@
 DIST meld-3.20.4.tar.xz 617020 BLAKE2B 
70bdd7c6ecfd4dd99d1bc0b503900da65563ba74469b97590da4971d0597d4023cf74a3fd6300701d73fe7ed1b646089a5b23527e4a519313816f53c31632dad
 SHA512 
e7b5c07e68972e7e8e4d396140fa2ee627609728533269f1bc52e9339e89a58f0949a1e8ec7b7847eec3eff5a67ea0bd5e07ad8002d2c640d173f9b0c4aa724e
+DIST meld-3.22.0.tar.xz 674212 BLAKE2B 
1d5af5fa9943c46fd150bd1e1c74003579a0017dea56178e92c4ba0dd1ba0bc3348a6f2625bfe5191fe4d8394b06462a30f2173ae623ffd32c637642f9c36183
 SHA512 
4cc1c9a76379401c1f116292bb4730301ec0f2413cdab7b463ed519ea7ee0ee86143a9c83a13f1ef09860aad192c04769d111bfb1eb10b5e1bc81fb44c530526

diff --git a/dev-util/meld/meld-3.22.0.ebuild b/dev-util/meld/meld-3.22.0.ebuild
new file mode 100644
index ..546bbe598e0a
--- /dev/null
+++ b/dev-util/meld/meld-3.22.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..11} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit gnome.org meson python-single-r1
+
+DESCRIPTION="A graphical diff and merge tool"
+HOMEPAGE="http://meldmerge.org/;
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 
~amd64-linux ~x86-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+   ${PYTHON_DEPS}
+   >=x11-libs/gtk+-3.20:3[introspection]
+   >=dev-libs/glib-2.48:2
+   >=x11-libs/gtksourceview-4.0.0:4[introspection]
+   $(python_gen_cond_dep '
+   >=dev-python/pygobject-3.30:3[cairo,${PYTHON_USEDEP}]
+   ')
+   gnome-base/gsettings-desktop-schemas
+   >=x11-libs/pango-1.34[introspection]
+   x11-themes/hicolor-icon-theme
+"
+DEPEND="${RDEPEND}
+   test? (
+   dev-util/desktop-file-utils
+   dev-libs/appstream-glib
+   )
+"
+BDEPEND="
+   dev-util/intltool
+   dev-util/itstool
+   sys-devel/gettext
+   $(python_gen_cond_dep 'dev-python/distro[${PYTHON_USEDEP}]')
+"
+# dev-python/distro is soft-required in BDEPEND for python3.8 and onwards,
+# but it's mainly needed for debian and derivatives - seems the fallback
+# works fine, as we aren't a special_case, just an annoying warning.
+
+pkg_setup() {
+   python-single-r1_pkg_setup
+}
+
+src_configure() {
+   local emesonargs=(
+   -Dprofile=''
+   -Dbyte-compile=false
+   )
+   meson_src_configure
+}
+
+src_install() {
+   meson_src_install
+   python_optimize
+}



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

2022-09-07 Thread Michał Górny
commit: fa3a6a2e769ade282187413730f6b272838ad153
Author: Michał Górny  gentoo  org>
AuthorDate: Sun Sep  4 19:43:09 2022 +
Commit: Michał Górny  gentoo  org>
CommitDate: Wed Sep  7 07:51:54 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa3a6a2e

dev-util/meld: Update PYTHON_REQ_USE to xml(+)

Update PYTHON_REQ_USE to specify "xml(+)", as Python 3.11 no longer
features the "xml" flag.

Signed-off-by: Michał Górny  gentoo.org>

 dev-util/meld/meld-3.20.4.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-util/meld/meld-3.20.4.ebuild b/dev-util/meld/meld-3.20.4.ebuild
index a747164ecbc2..1a416d7610fc 100644
--- a/dev-util/meld/meld-3.20.4.ebuild
+++ b/dev-util/meld/meld-3.20.4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_REQ_USE="xml"
+PYTHON_REQ_USE="xml(+)"
 PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_SINGLE_IMPL=1
 DISTUTILS_USE_SETUPTOOLS=no



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

2021-11-05 Thread Sam James
commit: 372c15a29e69c9434ad584a35842753368bd395d
Author: Sam James  gentoo  org>
AuthorDate: Sat Nov  6 04:08:45 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Nov  6 04:08:45 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=372c15a2

dev-util/meld: Stabilize 3.20.4 x86, #815013

Signed-off-by: Sam James  gentoo.org>

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

diff --git a/dev-util/meld/meld-3.20.4.ebuild b/dev-util/meld/meld-3.20.4.ebuild
index a82d9d54436..9223e1ebb5f 100644
--- a/dev-util/meld/meld-3.20.4.ebuild
+++ b/dev-util/meld/meld-3.20.4.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://meldmerge.org/;
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux 
~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux 
~x86-linux"
 IUSE=""
 
 RDEPEND="${PYTHON_DEPS}



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

2021-10-03 Thread Sam James
commit: 7a6c130b51f4a686850a2a31602e881d72a7947b
Author: Sam James  gentoo  org>
AuthorDate: Mon Oct  4 01:24:44 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Oct  4 01:24:44 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a6c130b

dev-util/meld: Stabilize 3.20.4 amd64, #815013

Signed-off-by: Sam James  gentoo.org>

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

diff --git a/dev-util/meld/meld-3.20.4.ebuild b/dev-util/meld/meld-3.20.4.ebuild
index 5f935a31e2e..a82d9d54436 100644
--- a/dev-util/meld/meld-3.20.4.ebuild
+++ b/dev-util/meld/meld-3.20.4.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://meldmerge.org/;
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux 
~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux 
~x86-linux"
 IUSE=""
 
 RDEPEND="${PYTHON_DEPS}



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

2021-08-13 Thread Mart Raudsepp
commit: cab03a47b2a08827df625403021fcde8402892b5
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Fri Aug 13 15:46:02 2021 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Fri Aug 13 16:27:26 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cab03a47

dev-util/meld: Enable py3.10

Package-Manager: Portage-3.0.20, Repoman-3.0.2
Signed-off-by: Mart Raudsepp  gentoo.org>

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

diff --git a/dev-util/meld/meld-3.20.4.ebuild b/dev-util/meld/meld-3.20.4.ebuild
index 69b74182e4e..ca18cbcb9d0 100644
--- a/dev-util/meld/meld-3.20.4.ebuild
+++ b/dev-util/meld/meld-3.20.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 PYTHON_REQ_USE="xml"
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_SINGLE_IMPL=1
 DISTUTILS_USE_SETUPTOOLS=no
 



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

2021-08-13 Thread Mart Raudsepp
commit: d7c239bcfbbf8f770fca33143b82e8542c3dd8f2
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Fri Aug 13 16:26:06 2021 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Fri Aug 13 16:27:26 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7c239bc

dev-util/meld: Enable tests

Package-Manager: Portage-3.0.20, Repoman-3.0.2
Signed-off-by: Mart Raudsepp  gentoo.org>

 dev-util/meld/meld-3.20.4.ebuild | 9 -
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/dev-util/meld/meld-3.20.4.ebuild b/dev-util/meld/meld-3.20.4.ebuild
index ca18cbcb9d0..5f935a31e2e 100644
--- a/dev-util/meld/meld-3.20.4.ebuild
+++ b/dev-util/meld/meld-3.20.4.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_SINGLE_IMPL=1
 DISTUTILS_USE_SETUPTOOLS=no
 
-inherit gnome2 distutils-r1
+inherit gnome2 distutils-r1 virtualx
 
 DESCRIPTION="A graphical diff and merge tool"
 HOMEPAGE="http://meldmerge.org/;
@@ -39,6 +39,8 @@ BDEPEND="
 # but it's mainly needed for debian and derivatives - seems the fallback
 # works fine, as we aren't a special_case, just an annoying warning.
 
+distutils_enable_tests pytest
+
 python_check_deps() {
has_version -b "dev-python/distro[${PYTHON_USEDEP}]"
 }
@@ -53,3 +55,8 @@ python_install() {
rm "${ED}"/usr/share/doc/meld-${PV}/{COPYING,NEWS} || die
rmdir "${ED}"/usr/share/doc/meld-${PV} || die
 }
+
+python_test() {
+   # test_gutterrendererchunk.py needs a GdkScreen for 
Gtk.IconTheme.get_default() to work
+   virtx epytest
+}



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

2021-08-13 Thread Mart Raudsepp
commit: 2656da83cf96833eb01d4e3e8663881c9f95922e
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Fri Aug 13 15:41:58 2021 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Fri Aug 13 16:27:25 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2656da83

dev-util/meld: bump to 3.20.4

Package-Manager: Portage-3.0.20, Repoman-3.0.2
Signed-off-by: Mart Raudsepp  gentoo.org>

 dev-util/meld/Manifest   |  1 +
 dev-util/meld/meld-3.20.4.ebuild | 55 
 2 files changed, 56 insertions(+)

diff --git a/dev-util/meld/Manifest b/dev-util/meld/Manifest
index e4f885b2b55..b22a9bf6d7c 100644
--- a/dev-util/meld/Manifest
+++ b/dev-util/meld/Manifest
@@ -1 +1,2 @@
 DIST meld-3.20.3.tar.xz 615248 BLAKE2B 
e60e6e9437c27cd217d39d045a5a23000b5b52e99387cfe0612c32ffb31205e467a13c8f42f478515bc8ba0d27814963649c362a7a95ac53e98f14398fd0cb3f
 SHA512 
88052d1a59453e780a7842d2bf4d42ac5db8f5b4aa4b1ec3a931fb8d982d45fd212cfb75bb8395a2ad7b380a6e0c33d020a0562b4ffdf4afdc74d92d6d5751f0
+DIST meld-3.20.4.tar.xz 617020 BLAKE2B 
70bdd7c6ecfd4dd99d1bc0b503900da65563ba74469b97590da4971d0597d4023cf74a3fd6300701d73fe7ed1b646089a5b23527e4a519313816f53c31632dad
 SHA512 
e7b5c07e68972e7e8e4d396140fa2ee627609728533269f1bc52e9339e89a58f0949a1e8ec7b7847eec3eff5a67ea0bd5e07ad8002d2c640d173f9b0c4aa724e

diff --git a/dev-util/meld/meld-3.20.4.ebuild b/dev-util/meld/meld-3.20.4.ebuild
new file mode 100644
index 000..69b74182e4e
--- /dev/null
+++ b/dev-util/meld/meld-3.20.4.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_REQ_USE="xml"
+PYTHON_COMPAT=( python3_{8..9} )
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_SETUPTOOLS=no
+
+inherit gnome2 distutils-r1
+
+DESCRIPTION="A graphical diff and merge tool"
+HOMEPAGE="http://meldmerge.org/;
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux 
~x86-linux"
+IUSE=""
+
+RDEPEND="${PYTHON_DEPS}
+   >=dev-libs/glib-2.50:2
+   $(python_gen_cond_dep '
+   >=dev-python/pygobject-3.12:3[cairo,${PYTHON_USEDEP}]
+   ')
+   gnome-base/gsettings-desktop-schemas
+   >=x11-libs/gtk+-3.20:3[introspection]
+   >=x11-libs/gtksourceview-3.20.0:3.0[introspection]
+   >=x11-libs/pango-1.34[introspection]
+   x11-themes/hicolor-icon-theme
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+   dev-util/intltool
+   dev-util/itstool
+   sys-devel/gettext
+   $(python_gen_cond_dep 'dev-python/distro[${PYTHON_USEDEP}]')
+"
+# dev-python/distro is soft-required in BDEPEND for python3.8 and onwards,
+# but it's mainly needed for debian and derivatives - seems the fallback
+# works fine, as we aren't a special_case, just an annoying warning.
+
+python_check_deps() {
+   has_version -b "dev-python/distro[${PYTHON_USEDEP}]"
+}
+
+python_compile_all() {
+   mydistutilsargs=( --no-update-icon-cache --no-compile-schemas )
+}
+
+python_install() {
+   local mydistutilsargs=( --no-update-icon-cache --no-compile-schemas 
build )
+   distutils-r1_python_install
+   rm "${ED}"/usr/share/doc/meld-${PV}/{COPYING,NEWS} || die
+   rmdir "${ED}"/usr/share/doc/meld-${PV} || die
+}



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

2021-04-18 Thread Matt Turner
commit: 13bde601e38ff110f6ddbb88cb1f7550b5e0bfbb
Author: Matt Turner  gentoo  org>
AuthorDate: Sun Apr 18 15:19:23 2021 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sun Apr 18 15:19:34 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13bde601

dev-util/meld: BDEPEND on dev-python/distro

Closes: https://bugs.gentoo.org/771690
Signed-off-by: Matt Turner  gentoo.org>

 dev-util/meld/meld-3.20.3.ebuild | 5 +
 1 file changed, 5 insertions(+)

diff --git a/dev-util/meld/meld-3.20.3.ebuild b/dev-util/meld/meld-3.20.3.ebuild
index 93c774cbc35..a7542f75829 100644
--- a/dev-util/meld/meld-3.20.3.ebuild
+++ b/dev-util/meld/meld-3.20.3.ebuild
@@ -33,11 +33,16 @@ BDEPEND="
dev-util/intltool
dev-util/itstool
sys-devel/gettext
+   $(python_gen_cond_dep 'dev-python/distro[${PYTHON_USEDEP}]')
 "
 # dev-python/distro is soft-required in BDEPEND for python3.8 and onwards,
 # but it's mainly needed for debian and derivatives - seems the fallback
 # works fine, as we aren't a special_case, just an annoying warning.
 
+python_check_deps() {
+   has_version -b "dev-python/distro[${PYTHON_USEDEP}]"
+}
+
 python_compile_all() {
mydistutilsargs=( --no-update-icon-cache --no-compile-schemas )
 }



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

2021-02-14 Thread Rick Farina
commit: 6efbfcf34cc76b5228d16ddecaff4c2b9f963c2b
Author: Rick Farina  gentoo  org>
AuthorDate: Fri Feb 12 18:42:40 2021 +
Commit: Rick Farina  gentoo  org>
CommitDate: Mon Feb 15 02:19:36 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6efbfcf3

dev-util/meld: python bump

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Rick Farina  gentoo.org>

 dev-util/meld/meld-3.20.2-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-util/meld/meld-3.20.2-r1.ebuild 
b/dev-util/meld/meld-3.20.2-r1.ebuild
index 2238ffdef30..5e3097a134e 100644
--- a/dev-util/meld/meld-3.20.2-r1.ebuild
+++ b/dev-util/meld/meld-3.20.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 PYTHON_REQ_USE="xml"
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 DISTUTILS_SINGLE_IMPL=1
 DISTUTILS_USE_SETUPTOOLS=no
 



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

2021-02-14 Thread Mart Raudsepp
commit: 0a0955d319433b0ea9c94d4744f00310196d0965
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Sun Feb 14 21:30:08 2021 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Sun Feb 14 21:42:36 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a0955d3

dev-util/meld: bump to 3.20.3

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Mart Raudsepp  gentoo.org>

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

diff --git a/dev-util/meld/Manifest b/dev-util/meld/Manifest
index 03b0aa5539f..a2247f6877b 100644
--- a/dev-util/meld/Manifest
+++ b/dev-util/meld/Manifest
@@ -1 +1,2 @@
 DIST meld-3.20.2.tar.xz 593948 BLAKE2B 
9f2fee48405d76f9ae2fd0b0dd4116321aa176059dd4ef217a5c4c8d0edff5859bab72bbca83b2e7d612706f017d1889d68579eaf9838d7784c9ecb74ed7d403
 SHA512 
9c9074cb879e3574eb9a1025eb1212771419ab0d8e92bf8a99f38e70ca583ff5c8cbeaccb87b414e6ff73a61afa08e10742991d574b810cc90e8c4a5ac82ddaa
+DIST meld-3.20.3.tar.xz 615248 BLAKE2B 
e60e6e9437c27cd217d39d045a5a23000b5b52e99387cfe0612c32ffb31205e467a13c8f42f478515bc8ba0d27814963649c362a7a95ac53e98f14398fd0cb3f
 SHA512 
88052d1a59453e780a7842d2bf4d42ac5db8f5b4aa4b1ec3a931fb8d982d45fd212cfb75bb8395a2ad7b380a6e0c33d020a0562b4ffdf4afdc74d92d6d5751f0

diff --git a/dev-util/meld/meld-3.20.3.ebuild b/dev-util/meld/meld-3.20.3.ebuild
new file mode 100644
index 000..f398fdb8b2f
--- /dev/null
+++ b/dev-util/meld/meld-3.20.3.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_REQ_USE="xml"
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_SETUPTOOLS=no
+
+inherit gnome2 distutils-r1
+
+DESCRIPTION="A graphical diff and merge tool"
+HOMEPAGE="http://meldmerge.org/;
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux 
~x86-linux"
+IUSE=""
+
+RDEPEND="${PYTHON_DEPS}
+   >=dev-libs/glib-2.50:2
+   $(python_gen_cond_dep '
+   >=dev-python/pygobject-3.12:3[cairo,${PYTHON_MULTI_USEDEP}]
+   ')
+   gnome-base/gsettings-desktop-schemas
+   >=x11-libs/gtk+-3.20:3[introspection]
+   >=x11-libs/gtksourceview-3.20.0:3.0[introspection]
+   >=x11-libs/pango-1.34[introspection]
+   x11-themes/hicolor-icon-theme
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+   dev-util/intltool
+   dev-util/itstool
+   sys-devel/gettext
+"
+# dev-python/distro is soft-required in BDEPEND for python3.8 and onwards,
+# but it's mainly needed for debian and derivatives - seems the fallback
+# works fine, as we aren't a special_case, just an annoying warning.
+
+python_compile_all() {
+   mydistutilsargs=( --no-update-icon-cache --no-compile-schemas )
+}
+
+python_install() {
+   local mydistutilsargs=( --no-update-icon-cache --no-compile-schemas 
build )
+   distutils-r1_python_install
+   rm "${ED}"/usr/share/doc/meld-${PV}/{COPYING,NEWS} || die
+   rmdir "${ED}"/usr/share/doc/meld-${PV} || die
+}



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

2020-04-22 Thread Mart Raudsepp
commit: 5dada79038b992c07cfe863d515ff17479dc6d3a
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Wed Apr 22 16:35:11 2020 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Wed Apr 22 16:35:51 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5dada790

dev-util/meld: workaround problems with --skip-build

Fixes regression since eclass commit
180fa85d7d00aea463c399f70348beaad9166eb7

Closes: https://bugs.gentoo.org/718014
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mart Raudsepp  gentoo.org>

 dev-util/meld/{meld-3.20.2.ebuild => meld-3.20.2-r1.ebuild} | 7 +++
 1 file changed, 7 insertions(+)

diff --git a/dev-util/meld/meld-3.20.2.ebuild 
b/dev-util/meld/meld-3.20.2-r1.ebuild
similarity index 83%
rename from dev-util/meld/meld-3.20.2.ebuild
rename to dev-util/meld/meld-3.20.2-r1.ebuild
index 7227b74d1d9..cd83e457a06 100644
--- a/dev-util/meld/meld-3.20.2.ebuild
+++ b/dev-util/meld/meld-3.20.2-r1.ebuild
@@ -40,3 +40,10 @@ DEPEND="${RDEPEND}
 python_compile_all() {
mydistutilsargs=( --no-update-icon-cache --no-compile-schemas )
 }
+
+python_install() {
+   local mydistutilsargs=( --no-update-icon-cache --no-compile-schemas 
build )
+   distutils-r1_python_install
+   rm "${ED}"/usr/share/doc/meld-${PV}/{COPYING,NEWS} || die
+   rmdir "${ED}"/usr/share/doc/meld-${PV} || die
+}



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

2020-04-20 Thread Mart Raudsepp
commit: f9eaa6a15e61a67ef0bb38af213f54f8284164c8
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Mon Apr 20 20:25:29 2020 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Mon Apr 20 20:25:29 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9eaa6a1

dev-util/meld: remove old

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mart Raudsepp  gentoo.org>

 dev-util/meld/Manifest  |  1 -
 dev-util/meld/meld-3.20.1-r1.ebuild | 38 -
 2 files changed, 39 deletions(-)

diff --git a/dev-util/meld/Manifest b/dev-util/meld/Manifest
index a93c2b08289..03b0aa5539f 100644
--- a/dev-util/meld/Manifest
+++ b/dev-util/meld/Manifest
@@ -1,2 +1 @@
-DIST meld-3.20.1.tar.xz 594812 BLAKE2B 
a06ae48af37008b99e7110a826e1d97326b71150870c1546b50d971f51d6c9eb3b24fd8e5ae8e8e8daf30f0a83c71356a368d9ed49114989cd22fb793a644a78
 SHA512 
cd21f298dc1da6eb08261599b9270989c837e0923d5cf5cfdad227dd7f256ac5f53ac903939ebef90ea6cd684c7355ce9482648057284f4ce44f1c7101959c1f
 DIST meld-3.20.2.tar.xz 593948 BLAKE2B 
9f2fee48405d76f9ae2fd0b0dd4116321aa176059dd4ef217a5c4c8d0edff5859bab72bbca83b2e7d612706f017d1889d68579eaf9838d7784c9ecb74ed7d403
 SHA512 
9c9074cb879e3574eb9a1025eb1212771419ab0d8e92bf8a99f38e70ca583ff5c8cbeaccb87b414e6ff73a61afa08e10742991d574b810cc90e8c4a5ac82ddaa

diff --git a/dev-util/meld/meld-3.20.1-r1.ebuild 
b/dev-util/meld/meld-3.20.1-r1.ebuild
deleted file mode 100644
index 7891198a1d5..000
--- a/dev-util/meld/meld-3.20.1-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_REQ_USE="xml"
-PYTHON_COMPAT=( python3_{6,7} )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit gnome2 distutils-r1
-
-DESCRIPTION="A graphical diff and merge tool"
-HOMEPAGE="http://meldmerge.org/;
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux 
~x86-linux"
-IUSE=""
-
-RDEPEND="${PYTHON_DEPS}
-   >=dev-libs/glib-2.50:2[dbus]
-   $(python_gen_cond_dep '
-   >=dev-python/pygobject-3.12:3[cairo,${PYTHON_MULTI_USEDEP}]
-   ')
-   gnome-base/gsettings-desktop-schemas
-   >=x11-libs/gtk+-3.20:3[introspection]
-   >=x11-libs/gtksourceview-3.20.0:3.0[introspection]
-   >=x11-libs/pango-1.34[introspection]
-   x11-themes/hicolor-icon-theme
-"
-DEPEND="${RDEPEND}
-   dev-util/intltool
-   dev-util/itstool
-   sys-devel/gettext
-"
-
-python_compile_all() {
-   mydistutilsargs=( --no-update-icon-cache --no-compile-schemas )
-}



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

2020-02-18 Thread Mart Raudsepp
commit: 031d98e888679aed81034894fae0307a6bb21eaa
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Tue Feb 18 09:29:27 2020 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Tue Feb 18 12:14:18 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=031d98e8

dev-util/meld: bump to 3.20.2

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mart Raudsepp  gentoo.org>

 dev-util/meld/Manifest   |  1 +
 dev-util/meld/meld-3.20.2.ebuild | 42 
 2 files changed, 43 insertions(+)

diff --git a/dev-util/meld/Manifest b/dev-util/meld/Manifest
index 94ebb24ace3..a93c2b08289 100644
--- a/dev-util/meld/Manifest
+++ b/dev-util/meld/Manifest
@@ -1 +1,2 @@
 DIST meld-3.20.1.tar.xz 594812 BLAKE2B 
a06ae48af37008b99e7110a826e1d97326b71150870c1546b50d971f51d6c9eb3b24fd8e5ae8e8e8daf30f0a83c71356a368d9ed49114989cd22fb793a644a78
 SHA512 
cd21f298dc1da6eb08261599b9270989c837e0923d5cf5cfdad227dd7f256ac5f53ac903939ebef90ea6cd684c7355ce9482648057284f4ce44f1c7101959c1f
+DIST meld-3.20.2.tar.xz 593948 BLAKE2B 
9f2fee48405d76f9ae2fd0b0dd4116321aa176059dd4ef217a5c4c8d0edff5859bab72bbca83b2e7d612706f017d1889d68579eaf9838d7784c9ecb74ed7d403
 SHA512 
9c9074cb879e3574eb9a1025eb1212771419ab0d8e92bf8a99f38e70ca583ff5c8cbeaccb87b414e6ff73a61afa08e10742991d574b810cc90e8c4a5ac82ddaa

diff --git a/dev-util/meld/meld-3.20.2.ebuild b/dev-util/meld/meld-3.20.2.ebuild
new file mode 100644
index 000..8c64e793921
--- /dev/null
+++ b/dev-util/meld/meld-3.20.2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_REQ_USE="xml"
+PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_SETUPTOOLS=no
+
+inherit gnome2 distutils-r1
+
+DESCRIPTION="A graphical diff and merge tool"
+HOMEPAGE="http://meldmerge.org/;
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux 
~x86-linux"
+IUSE=""
+
+RDEPEND="${PYTHON_DEPS}
+   >=dev-libs/glib-2.50:2
+   $(python_gen_cond_dep '
+   >=dev-python/pygobject-3.12:3[cairo,${PYTHON_MULTI_USEDEP}]
+   ')
+   gnome-base/gsettings-desktop-schemas
+   >=x11-libs/gtk+-3.20:3[introspection]
+   >=x11-libs/gtksourceview-3.20.0:3.0[introspection]
+   >=x11-libs/pango-1.34[introspection]
+   x11-themes/hicolor-icon-theme
+"
+DEPEND="${RDEPEND}
+   dev-util/intltool
+   dev-util/itstool
+   sys-devel/gettext
+"
+# dev-python/distro is soft-required in BDEPEND for python3.8 and onwards,
+# but it's mainly needed for debian and derivatives - seems the fallback
+# works fine, as we aren't a special_case, just an annoying warning.
+
+python_compile_all() {
+   mydistutilsargs=( --no-update-icon-cache --no-compile-schemas )
+}



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

2019-05-18 Thread Mart Raudsepp
commit: 518a8eacb459285d47ca0825dbdc3b5bf26f09bb
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Sat May 18 19:57:14 2019 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Sat May 18 19:59:07 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=518a8eac

dev-util/meld: remove old

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Mart Raudsepp  gentoo.org>

 dev-util/meld/Manifest   |  2 --
 dev-util/meld/meld-3.18.2.ebuild | 36 
 dev-util/meld/meld-3.20.0.ebuild | 36 
 3 files changed, 74 deletions(-)

diff --git a/dev-util/meld/Manifest b/dev-util/meld/Manifest
index ecfb7118fdc..94ebb24ace3 100644
--- a/dev-util/meld/Manifest
+++ b/dev-util/meld/Manifest
@@ -1,3 +1 @@
-DIST meld-3.18.2.tar.xz 568292 BLAKE2B 
379ec993e7e2ba79d5ff8ea0e960c294fba390d3ba4276bea7700ebe1e55820b07d00d2a88ec5b95a8eae0549a976af0a06e1b7cb7f211aa5e77b0afb266a0d4
 SHA512 
6a3e47c472b12cbebc392e964b30ac80d344e0a82d0dd25a43df3eeba185e40e6ae5245b09e79ad9d789618b91ccec1ccb0f1c5e6c0ae1d76bb6b4fcd9446574
-DIST meld-3.20.0.tar.xz 591956 BLAKE2B 
cf4dce55b8282c287a9bcf964f6c412e5db246cc8c85ab98729af0e12f861ae323eaab1db57a7bd7f27028896148a5142b8d02f3f5abbd86b98eeb1882cf76a8
 SHA512 
33a14aeb474351a35ff08ba828846e849f1c4f000af81c38fa8f7d481b5de464e728d29742eac40164138c44557f92f6b2a329a337ee59f28d00a5bbc4652798
 DIST meld-3.20.1.tar.xz 594812 BLAKE2B 
a06ae48af37008b99e7110a826e1d97326b71150870c1546b50d971f51d6c9eb3b24fd8e5ae8e8e8daf30f0a83c71356a368d9ed49114989cd22fb793a644a78
 SHA512 
cd21f298dc1da6eb08261599b9270989c837e0923d5cf5cfdad227dd7f256ac5f53ac903939ebef90ea6cd684c7355ce9482648057284f4ce44f1c7101959c1f

diff --git a/dev-util/meld/meld-3.18.2.ebuild b/dev-util/meld/meld-3.18.2.ebuild
deleted file mode 100644
index c64834c8984..000
--- a/dev-util/meld/meld-3.18.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_REQ_USE="xml"
-PYTHON_COMPAT=( python3_{5,6} )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit gnome2 distutils-r1
-
-DESCRIPTION="A graphical diff and merge tool"
-HOMEPAGE="http://meldmerge.org/;
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux 
~x86-linux"
-IUSE=""
-
-RDEPEND="${PYTHON_DEPS}
-   >=dev-libs/glib-2.50:2[dbus]
-   >=dev-python/pygobject-3.12:3[cairo,${PYTHON_USEDEP}]
-   gnome-base/gsettings-desktop-schemas
-   >=x11-libs/gtk+-3.14:3[introspection]
-   >=x11-libs/gtksourceview-3.14:3.0[introspection]
-   >=x11-libs/pango-1.34[introspection]
-   x11-themes/hicolor-icon-theme
-"
-DEPEND="${RDEPEND}
-   dev-util/intltool
-   dev-util/itstool
-   sys-devel/gettext
-"
-
-python_compile_all() {
-   mydistutilsargs=( --no-update-icon-cache --no-compile-schemas )
-}

diff --git a/dev-util/meld/meld-3.20.0.ebuild b/dev-util/meld/meld-3.20.0.ebuild
deleted file mode 100644
index 013f796de48..000
--- a/dev-util/meld/meld-3.20.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_REQ_USE="xml"
-PYTHON_COMPAT=( python3_{5,6,7} )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit gnome2 distutils-r1
-
-DESCRIPTION="A graphical diff and merge tool"
-HOMEPAGE="http://meldmerge.org/;
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux 
~x86-linux"
-IUSE=""
-
-RDEPEND="${PYTHON_DEPS}
-   >=dev-libs/glib-2.50:2[dbus]
-   >=dev-python/pygobject-3.12:3[cairo,${PYTHON_USEDEP}]
-   gnome-base/gsettings-desktop-schemas
-   >=x11-libs/gtk+-3.20:3[introspection]
-   >=x11-libs/gtksourceview-3.20.0:3.0[introspection]
-   >=x11-libs/pango-1.34[introspection]
-   x11-themes/hicolor-icon-theme
-"
-DEPEND="${RDEPEND}
-   dev-util/intltool
-   dev-util/itstool
-   sys-devel/gettext
-"
-
-python_compile_all() {
-   mydistutilsargs=( --no-update-icon-cache --no-compile-schemas )
-}



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

2019-03-30 Thread Mart Raudsepp
commit: e653f8aa77bd7e271748a9249f50839d4de3060d
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Sat Mar 30 22:32:48 2019 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Sat Mar 30 22:32:48 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e653f8aa

dev-util/meld: bump to 3.20.1

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Mart Raudsepp  gentoo.org>

 dev-util/meld/Manifest   |  1 +
 dev-util/meld/meld-3.20.1.ebuild | 36 
 2 files changed, 37 insertions(+)

diff --git a/dev-util/meld/Manifest b/dev-util/meld/Manifest
index f0c4d7723f6..ecfb7118fdc 100644
--- a/dev-util/meld/Manifest
+++ b/dev-util/meld/Manifest
@@ -1,2 +1,3 @@
 DIST meld-3.18.2.tar.xz 568292 BLAKE2B 
379ec993e7e2ba79d5ff8ea0e960c294fba390d3ba4276bea7700ebe1e55820b07d00d2a88ec5b95a8eae0549a976af0a06e1b7cb7f211aa5e77b0afb266a0d4
 SHA512 
6a3e47c472b12cbebc392e964b30ac80d344e0a82d0dd25a43df3eeba185e40e6ae5245b09e79ad9d789618b91ccec1ccb0f1c5e6c0ae1d76bb6b4fcd9446574
 DIST meld-3.20.0.tar.xz 591956 BLAKE2B 
cf4dce55b8282c287a9bcf964f6c412e5db246cc8c85ab98729af0e12f861ae323eaab1db57a7bd7f27028896148a5142b8d02f3f5abbd86b98eeb1882cf76a8
 SHA512 
33a14aeb474351a35ff08ba828846e849f1c4f000af81c38fa8f7d481b5de464e728d29742eac40164138c44557f92f6b2a329a337ee59f28d00a5bbc4652798
+DIST meld-3.20.1.tar.xz 594812 BLAKE2B 
a06ae48af37008b99e7110a826e1d97326b71150870c1546b50d971f51d6c9eb3b24fd8e5ae8e8e8daf30f0a83c71356a368d9ed49114989cd22fb793a644a78
 SHA512 
cd21f298dc1da6eb08261599b9270989c837e0923d5cf5cfdad227dd7f256ac5f53ac903939ebef90ea6cd684c7355ce9482648057284f4ce44f1c7101959c1f

diff --git a/dev-util/meld/meld-3.20.1.ebuild b/dev-util/meld/meld-3.20.1.ebuild
new file mode 100644
index 000..5620f466773
--- /dev/null
+++ b/dev-util/meld/meld-3.20.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_REQ_USE="xml"
+PYTHON_COMPAT=( python3_{4,5,6,7} )
+DISTUTILS_SINGLE_IMPL=1
+
+inherit gnome2 distutils-r1
+
+DESCRIPTION="A graphical diff and merge tool"
+HOMEPAGE="http://meldmerge.org/;
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux 
~x86-linux"
+IUSE=""
+
+RDEPEND="${PYTHON_DEPS}
+   >=dev-libs/glib-2.50:2[dbus]
+   >=dev-python/pygobject-3.12:3[cairo,${PYTHON_USEDEP}]
+   gnome-base/gsettings-desktop-schemas
+   >=x11-libs/gtk+-3.20:3[introspection]
+   >=x11-libs/gtksourceview-3.20.0:3.0[introspection]
+   >=x11-libs/pango-1.34[introspection]
+   x11-themes/hicolor-icon-theme
+"
+DEPEND="${RDEPEND}
+   dev-util/intltool
+   dev-util/itstool
+   sys-devel/gettext
+"
+
+python_compile_all() {
+   mydistutilsargs=( --no-update-icon-cache --no-compile-schemas )
+}



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

2019-03-30 Thread Mart Raudsepp
commit: a2bd935be83ba9ff00589706074e96e266a64eb3
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Sat Mar 30 21:34:30 2019 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Sat Mar 30 21:56:00 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2bd935b

dev-util/meld: remove old

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Mart Raudsepp  gentoo.org>

 dev-util/meld/Manifest   |  1 -
 dev-util/meld/meld-3.18.3.ebuild | 36 
 2 files changed, 37 deletions(-)

diff --git a/dev-util/meld/Manifest b/dev-util/meld/Manifest
index 717e0dd7481..f0c4d7723f6 100644
--- a/dev-util/meld/Manifest
+++ b/dev-util/meld/Manifest
@@ -1,3 +1,2 @@
 DIST meld-3.18.2.tar.xz 568292 BLAKE2B 
379ec993e7e2ba79d5ff8ea0e960c294fba390d3ba4276bea7700ebe1e55820b07d00d2a88ec5b95a8eae0549a976af0a06e1b7cb7f211aa5e77b0afb266a0d4
 SHA512 
6a3e47c472b12cbebc392e964b30ac80d344e0a82d0dd25a43df3eeba185e40e6ae5245b09e79ad9d789618b91ccec1ccb0f1c5e6c0ae1d76bb6b4fcd9446574
-DIST meld-3.18.3.tar.xz 564660 BLAKE2B 
2dc939e7d21408659de969e50eb8e790231391af0a30a44aecc359dabaf258e863512663d9e19a2b38fb42a419cfdbe1094e05eada8311f52cd615cd6db4e98b
 SHA512 
7edd3c564616893732073995c8e161712964d8fc3abd8dad43183a6e36003bdad7b5593f04112e05244a59563b8d0fcf9d7c524f820d6145696ad0c73d67516c
 DIST meld-3.20.0.tar.xz 591956 BLAKE2B 
cf4dce55b8282c287a9bcf964f6c412e5db246cc8c85ab98729af0e12f861ae323eaab1db57a7bd7f27028896148a5142b8d02f3f5abbd86b98eeb1882cf76a8
 SHA512 
33a14aeb474351a35ff08ba828846e849f1c4f000af81c38fa8f7d481b5de464e728d29742eac40164138c44557f92f6b2a329a337ee59f28d00a5bbc4652798

diff --git a/dev-util/meld/meld-3.18.3.ebuild b/dev-util/meld/meld-3.18.3.ebuild
deleted file mode 100644
index e93d81db1f1..000
--- a/dev-util/meld/meld-3.18.3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_REQ_USE="xml"
-PYTHON_COMPAT=( python3_{4,5,6} )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit gnome2 distutils-r1
-
-DESCRIPTION="A graphical diff and merge tool"
-HOMEPAGE="http://meldmerge.org/;
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux 
~x86-linux"
-IUSE=""
-
-RDEPEND="${PYTHON_DEPS}
-   >=dev-libs/glib-2.50:2[dbus]
-   >=dev-python/pygobject-3.12:3[cairo,${PYTHON_USEDEP}]
-   gnome-base/gsettings-desktop-schemas
-   >=x11-libs/gtk+-3.14:3[introspection]
-   >=x11-libs/gtksourceview-3.14:3.0[introspection]
-   >=x11-libs/pango-1.34[introspection]
-   x11-themes/hicolor-icon-theme
-"
-DEPEND="${RDEPEND}
-   dev-util/intltool
-   dev-util/itstool
-   sys-devel/gettext
-"
-
-python_compile_all() {
-   mydistutilsargs=( --no-update-icon-cache --no-compile-schemas )
-}



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

2019-01-06 Thread Mart Raudsepp
commit: 866c358ae48bb29394ccbdbd6ba4a33c430b238d
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Sun Jan  6 12:41:08 2019 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Sun Jan  6 12:42:08 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=866c358a

dev-util/meld: bump to 3.20.0

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Mart Raudsepp  gentoo.org>

 dev-util/meld/Manifest   |  1 +
 dev-util/meld/meld-3.20.0.ebuild | 36 
 2 files changed, 37 insertions(+)

diff --git a/dev-util/meld/Manifest b/dev-util/meld/Manifest
index 1702677b1ad..717e0dd7481 100644
--- a/dev-util/meld/Manifest
+++ b/dev-util/meld/Manifest
@@ -1,2 +1,3 @@
 DIST meld-3.18.2.tar.xz 568292 BLAKE2B 
379ec993e7e2ba79d5ff8ea0e960c294fba390d3ba4276bea7700ebe1e55820b07d00d2a88ec5b95a8eae0549a976af0a06e1b7cb7f211aa5e77b0afb266a0d4
 SHA512 
6a3e47c472b12cbebc392e964b30ac80d344e0a82d0dd25a43df3eeba185e40e6ae5245b09e79ad9d789618b91ccec1ccb0f1c5e6c0ae1d76bb6b4fcd9446574
 DIST meld-3.18.3.tar.xz 564660 BLAKE2B 
2dc939e7d21408659de969e50eb8e790231391af0a30a44aecc359dabaf258e863512663d9e19a2b38fb42a419cfdbe1094e05eada8311f52cd615cd6db4e98b
 SHA512 
7edd3c564616893732073995c8e161712964d8fc3abd8dad43183a6e36003bdad7b5593f04112e05244a59563b8d0fcf9d7c524f820d6145696ad0c73d67516c
+DIST meld-3.20.0.tar.xz 591956 BLAKE2B 
cf4dce55b8282c287a9bcf964f6c412e5db246cc8c85ab98729af0e12f861ae323eaab1db57a7bd7f27028896148a5142b8d02f3f5abbd86b98eeb1882cf76a8
 SHA512 
33a14aeb474351a35ff08ba828846e849f1c4f000af81c38fa8f7d481b5de464e728d29742eac40164138c44557f92f6b2a329a337ee59f28d00a5bbc4652798

diff --git a/dev-util/meld/meld-3.20.0.ebuild b/dev-util/meld/meld-3.20.0.ebuild
new file mode 100644
index 000..5620f466773
--- /dev/null
+++ b/dev-util/meld/meld-3.20.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_REQ_USE="xml"
+PYTHON_COMPAT=( python3_{4,5,6,7} )
+DISTUTILS_SINGLE_IMPL=1
+
+inherit gnome2 distutils-r1
+
+DESCRIPTION="A graphical diff and merge tool"
+HOMEPAGE="http://meldmerge.org/;
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux 
~x86-linux"
+IUSE=""
+
+RDEPEND="${PYTHON_DEPS}
+   >=dev-libs/glib-2.50:2[dbus]
+   >=dev-python/pygobject-3.12:3[cairo,${PYTHON_USEDEP}]
+   gnome-base/gsettings-desktop-schemas
+   >=x11-libs/gtk+-3.20:3[introspection]
+   >=x11-libs/gtksourceview-3.20.0:3.0[introspection]
+   >=x11-libs/pango-1.34[introspection]
+   x11-themes/hicolor-icon-theme
+"
+DEPEND="${RDEPEND}
+   dev-util/intltool
+   dev-util/itstool
+   sys-devel/gettext
+"
+
+python_compile_all() {
+   mydistutilsargs=( --no-update-icon-cache --no-compile-schemas )
+}



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

2018-11-17 Thread Sebastian Pipping
commit: 722d3ff3129d16d9d06a103e0450e834f7fba826
Author: Sebastian Pipping  gentoo  org>
AuthorDate: Sat Nov 17 15:22:48 2018 +
Commit: Sebastian Pipping  gentoo  org>
CommitDate: Sat Nov 17 15:32:12 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=722d3ff3

dev-util/meld: 3.18.3

Signed-off-by: Sebastian Pipping  gentoo.org>
Package-Manager: Portage-2.3.50, Repoman-2.3.11

 dev-util/meld/Manifest   |  1 +
 dev-util/meld/meld-3.18.3.ebuild | 36 
 2 files changed, 37 insertions(+)

diff --git a/dev-util/meld/Manifest b/dev-util/meld/Manifest
index 2d125cbd844..1702677b1ad 100644
--- a/dev-util/meld/Manifest
+++ b/dev-util/meld/Manifest
@@ -1 +1,2 @@
 DIST meld-3.18.2.tar.xz 568292 BLAKE2B 
379ec993e7e2ba79d5ff8ea0e960c294fba390d3ba4276bea7700ebe1e55820b07d00d2a88ec5b95a8eae0549a976af0a06e1b7cb7f211aa5e77b0afb266a0d4
 SHA512 
6a3e47c472b12cbebc392e964b30ac80d344e0a82d0dd25a43df3eeba185e40e6ae5245b09e79ad9d789618b91ccec1ccb0f1c5e6c0ae1d76bb6b4fcd9446574
+DIST meld-3.18.3.tar.xz 564660 BLAKE2B 
2dc939e7d21408659de969e50eb8e790231391af0a30a44aecc359dabaf258e863512663d9e19a2b38fb42a419cfdbe1094e05eada8311f52cd615cd6db4e98b
 SHA512 
7edd3c564616893732073995c8e161712964d8fc3abd8dad43183a6e36003bdad7b5593f04112e05244a59563b8d0fcf9d7c524f820d6145696ad0c73d67516c

diff --git a/dev-util/meld/meld-3.18.3.ebuild b/dev-util/meld/meld-3.18.3.ebuild
new file mode 100644
index 000..e93d81db1f1
--- /dev/null
+++ b/dev-util/meld/meld-3.18.3.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_REQ_USE="xml"
+PYTHON_COMPAT=( python3_{4,5,6} )
+DISTUTILS_SINGLE_IMPL=1
+
+inherit gnome2 distutils-r1
+
+DESCRIPTION="A graphical diff and merge tool"
+HOMEPAGE="http://meldmerge.org/;
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux 
~x86-linux"
+IUSE=""
+
+RDEPEND="${PYTHON_DEPS}
+   >=dev-libs/glib-2.50:2[dbus]
+   >=dev-python/pygobject-3.12:3[cairo,${PYTHON_USEDEP}]
+   gnome-base/gsettings-desktop-schemas
+   >=x11-libs/gtk+-3.14:3[introspection]
+   >=x11-libs/gtksourceview-3.14:3.0[introspection]
+   >=x11-libs/pango-1.34[introspection]
+   x11-themes/hicolor-icon-theme
+"
+DEPEND="${RDEPEND}
+   dev-util/intltool
+   dev-util/itstool
+   sys-devel/gettext
+"
+
+python_compile_all() {
+   mydistutilsargs=( --no-update-icon-cache --no-compile-schemas )
+}



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

2018-07-09 Thread Mart Raudsepp
commit: 1a874bed3618b04f7ccdd51b35ca33d166647712
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Mon Jul  9 19:11:45 2018 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Mon Jul  9 19:15:17 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a874bed

dev-util/meld: remove old

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 dev-util/meld/Manifest   |  2 --
 dev-util/meld/meld-3.18.0.ebuild | 35 ---
 dev-util/meld/meld-3.18.1.ebuild | 36 
 3 files changed, 73 deletions(-)

diff --git a/dev-util/meld/Manifest b/dev-util/meld/Manifest
index 974d4b66f83..2d125cbd844 100644
--- a/dev-util/meld/Manifest
+++ b/dev-util/meld/Manifest
@@ -1,3 +1 @@
-DIST meld-3.18.0.tar.xz 553772 BLAKE2B 
9a481f18147a767e65cb6d58bd4770232e9d2f8e10261f8fe19d305ab44c19b8728dd5f7e7b77e4607fcdc4e6b47a0464ba5dbb4491ddc9d91ae8c1a10c1e409
 SHA512 
1d9f07223f33f2156e6821a567b7f3b28c942adf62b2948504301ce8788100bdac525fc4626a59c9c03cba63fa590407910abdcc41d627da5b4c8fa6ccfd2582
-DIST meld-3.18.1.tar.xz 563516 BLAKE2B 
2463fd6c2a74d9eb655c6e2d531ef69950d8f7a275c01a0dbacf48a8c236a860b27dcc79a137a56241183a1b000d36503c33112c7dcb55055a931f4c415f178d
 SHA512 
ca60c8ea9a5b95b228bd72fe3f8c0d4a8aa004bed27c2b29cd8ff647839973f1808df81dcb5c85cb5420ab2ad4413b0ab31b617494fe6eb366b2b9ad3a83eef1
 DIST meld-3.18.2.tar.xz 568292 BLAKE2B 
379ec993e7e2ba79d5ff8ea0e960c294fba390d3ba4276bea7700ebe1e55820b07d00d2a88ec5b95a8eae0549a976af0a06e1b7cb7f211aa5e77b0afb266a0d4
 SHA512 
6a3e47c472b12cbebc392e964b30ac80d344e0a82d0dd25a43df3eeba185e40e6ae5245b09e79ad9d789618b91ccec1ccb0f1c5e6c0ae1d76bb6b4fcd9446574

diff --git a/dev-util/meld/meld-3.18.0.ebuild b/dev-util/meld/meld-3.18.0.ebuild
deleted file mode 100644
index 4ca57bfc588..000
--- a/dev-util/meld/meld-3.18.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_REQ_USE="xml"
-PYTHON_COMPAT=( python3_{4,5,6} )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit gnome2 distutils-r1
-
-DESCRIPTION="A graphical diff and merge tool"
-HOMEPAGE="http://meldmerge.org/;
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux 
~x86-linux"
-IUSE=""
-
-RDEPEND="${PYTHON_DEPS}
-   >=dev-libs/glib-2.50:2[dbus]
-   >=dev-python/pygobject-3.12:3[cairo,${PYTHON_USEDEP}]
-   gnome-base/gsettings-desktop-schemas
-   >=x11-libs/gtk+-3.14:3[introspection]
-   >=x11-libs/gtksourceview-3.14:3.0[introspection]
-   x11-themes/hicolor-icon-theme
-"
-DEPEND="${RDEPEND}
-   dev-util/intltool
-   dev-util/itstool
-   sys-devel/gettext
-"
-
-python_compile_all() {
-   mydistutilsargs=( --no-update-icon-cache --no-compile-schemas )
-}

diff --git a/dev-util/meld/meld-3.18.1.ebuild b/dev-util/meld/meld-3.18.1.ebuild
deleted file mode 100644
index ea18fe9d5a8..000
--- a/dev-util/meld/meld-3.18.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_REQ_USE="xml"
-PYTHON_COMPAT=( python3_{4,5,6} )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit gnome2 distutils-r1
-
-DESCRIPTION="A graphical diff and merge tool"
-HOMEPAGE="http://meldmerge.org/;
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux 
~x86-linux"
-IUSE=""
-
-RDEPEND="${PYTHON_DEPS}
-   >=dev-libs/glib-2.50:2[dbus]
-   >=dev-python/pygobject-3.12:3[cairo,${PYTHON_USEDEP}]
-   gnome-base/gsettings-desktop-schemas
-   >=x11-libs/gtk+-3.14:3[introspection]
-   >=x11-libs/gtksourceview-3.14:3.0[introspection]
-   >=x11-libs/pango-1.34[introspection]
-   x11-themes/hicolor-icon-theme
-"
-DEPEND="${RDEPEND}
-   dev-util/intltool
-   dev-util/itstool
-   sys-devel/gettext
-"
-
-python_compile_all() {
-   mydistutilsargs=( --no-update-icon-cache --no-compile-schemas )
-}



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

2018-07-09 Thread Mikle Kolyada
commit: 04ca235c2244c2d80a71bca11e2dac78a83dfbb4
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Mon Jul  9 16:09:24 2018 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Mon Jul  9 16:09:24 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04ca235c

dev-util/meld: amd64 stable wrt bug #660314

Package-Manager: Portage-2.3.40, Repoman-2.3.9

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

diff --git a/dev-util/meld/meld-3.18.2.ebuild b/dev-util/meld/meld-3.18.2.ebuild
index 4ca5b202b22..85480ada6de 100644
--- a/dev-util/meld/meld-3.18.2.ebuild
+++ b/dev-util/meld/meld-3.18.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://meldmerge.org/;
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux 
~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux 
~x86-linux"
 IUSE=""
 
 RDEPEND="${PYTHON_DEPS}



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

2018-07-06 Thread Thomas Deutschmann
commit: b94b93a60cd1a36eae63d85f4da3e6ba62561354
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Fri Jul  6 13:28:36 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Fri Jul  6 13:41:40 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b94b93a6

dev-util/meld: x86 stable (bug #660314)

Package-Manager: Portage-2.3.41, Repoman-2.3.9

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

diff --git a/dev-util/meld/meld-3.18.2.ebuild b/dev-util/meld/meld-3.18.2.ebuild
index ea18fe9d5a8..4ca5b202b22 100644
--- a/dev-util/meld/meld-3.18.2.ebuild
+++ b/dev-util/meld/meld-3.18.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://meldmerge.org/;
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux 
~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux 
~x86-linux"
 IUSE=""
 
 RDEPEND="${PYTHON_DEPS}



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

2018-06-19 Thread Mart Raudsepp
commit: ea508b5c031da67bf91c555416790b15c28cca6b
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Tue Jun 19 14:15:26 2018 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Tue Jun 19 14:24:18 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea508b5c

dev-util/meld: bump to 3.18.2

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 dev-util/meld/Manifest   |  1 +
 dev-util/meld/meld-3.18.2.ebuild | 36 
 2 files changed, 37 insertions(+)

diff --git a/dev-util/meld/Manifest b/dev-util/meld/Manifest
index 05d2f60dcbb..974d4b66f83 100644
--- a/dev-util/meld/Manifest
+++ b/dev-util/meld/Manifest
@@ -1,2 +1,3 @@
 DIST meld-3.18.0.tar.xz 553772 BLAKE2B 
9a481f18147a767e65cb6d58bd4770232e9d2f8e10261f8fe19d305ab44c19b8728dd5f7e7b77e4607fcdc4e6b47a0464ba5dbb4491ddc9d91ae8c1a10c1e409
 SHA512 
1d9f07223f33f2156e6821a567b7f3b28c942adf62b2948504301ce8788100bdac525fc4626a59c9c03cba63fa590407910abdcc41d627da5b4c8fa6ccfd2582
 DIST meld-3.18.1.tar.xz 563516 BLAKE2B 
2463fd6c2a74d9eb655c6e2d531ef69950d8f7a275c01a0dbacf48a8c236a860b27dcc79a137a56241183a1b000d36503c33112c7dcb55055a931f4c415f178d
 SHA512 
ca60c8ea9a5b95b228bd72fe3f8c0d4a8aa004bed27c2b29cd8ff647839973f1808df81dcb5c85cb5420ab2ad4413b0ab31b617494fe6eb366b2b9ad3a83eef1
+DIST meld-3.18.2.tar.xz 568292 BLAKE2B 
379ec993e7e2ba79d5ff8ea0e960c294fba390d3ba4276bea7700ebe1e55820b07d00d2a88ec5b95a8eae0549a976af0a06e1b7cb7f211aa5e77b0afb266a0d4
 SHA512 
6a3e47c472b12cbebc392e964b30ac80d344e0a82d0dd25a43df3eeba185e40e6ae5245b09e79ad9d789618b91ccec1ccb0f1c5e6c0ae1d76bb6b4fcd9446574

diff --git a/dev-util/meld/meld-3.18.2.ebuild b/dev-util/meld/meld-3.18.2.ebuild
new file mode 100644
index 000..ea18fe9d5a8
--- /dev/null
+++ b/dev-util/meld/meld-3.18.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_REQ_USE="xml"
+PYTHON_COMPAT=( python3_{4,5,6} )
+DISTUTILS_SINGLE_IMPL=1
+
+inherit gnome2 distutils-r1
+
+DESCRIPTION="A graphical diff and merge tool"
+HOMEPAGE="http://meldmerge.org/;
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux 
~x86-linux"
+IUSE=""
+
+RDEPEND="${PYTHON_DEPS}
+   >=dev-libs/glib-2.50:2[dbus]
+   >=dev-python/pygobject-3.12:3[cairo,${PYTHON_USEDEP}]
+   gnome-base/gsettings-desktop-schemas
+   >=x11-libs/gtk+-3.14:3[introspection]
+   >=x11-libs/gtksourceview-3.14:3.0[introspection]
+   >=x11-libs/pango-1.34[introspection]
+   x11-themes/hicolor-icon-theme
+"
+DEPEND="${RDEPEND}
+   dev-util/intltool
+   dev-util/itstool
+   sys-devel/gettext
+"
+
+python_compile_all() {
+   mydistutilsargs=( --no-update-icon-cache --no-compile-schemas )
+}



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

2018-01-18 Thread Gilles Dartiguelongue
commit: c11147afe9e7c612564d8e132f9d655e63d068bf
Author: Gilles Dartiguelongue  gentoo  org>
AuthorDate: Thu Jan 18 08:13:13 2018 +
Commit: Gilles Dartiguelongue  gentoo  org>
CommitDate: Thu Jan 18 08:13:13 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c11147af

dev-util/meld: drop unneeded dbus-python dependency

Nowhere to be found in code as explained in bug #636744.

Closes: https://bugs.gentoo.org/636744
Package-Manager: Portage-2.3.19, Repoman-2.3.6

 dev-util/meld/meld-3.18.0.ebuild | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/dev-util/meld/meld-3.18.0.ebuild b/dev-util/meld/meld-3.18.0.ebuild
index 04e721a6f80..4ca57bfc588 100644
--- a/dev-util/meld/meld-3.18.0.ebuild
+++ b/dev-util/meld/meld-3.18.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -18,7 +18,6 @@ IUSE=""
 
 RDEPEND="${PYTHON_DEPS}
>=dev-libs/glib-2.50:2[dbus]
-   dev-python/dbus-python[${PYTHON_USEDEP}]
>=dev-python/pygobject-3.12:3[cairo,${PYTHON_USEDEP}]
gnome-base/gsettings-desktop-schemas
>=x11-libs/gtk+-3.14:3[introspection]



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

2017-12-20 Thread Mart Raudsepp
commit: 8193a6edd0f60c1845affcad6b04e551b6a8d42c
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Wed Dec 20 20:09:23 2017 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Wed Dec 20 20:23:23 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8193a6ed

dev-util/meld: remove old

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 dev-util/meld/Manifest   |  1 -
 dev-util/meld/meld-3.16.4.ebuild | 36 
 2 files changed, 37 deletions(-)

diff --git a/dev-util/meld/Manifest b/dev-util/meld/Manifest
index e324c2ec1e7..0ebba8fcb8e 100644
--- a/dev-util/meld/Manifest
+++ b/dev-util/meld/Manifest
@@ -1,2 +1 @@
-DIST meld-3.16.4.tar.xz 537364 BLAKE2B 
c0f6c07ca4f717ed9ab135e1f3cbc469cb8d8847377832886740b1667757bc8b9459cb2e6450fa4811f0cdc62f94c6eb1f665a58f434c748a4fae2e1198db93c
 SHA512 
58ebca17b9ed9d9357d6f36357085603c3643eedbd86630a9a911ec87fd3a29a97a8e7ffba605b8e8d054322452ebdc299a5d50601968cf7b97d41ce6458be8f
 DIST meld-3.18.0.tar.xz 553772 BLAKE2B 
9a481f18147a767e65cb6d58bd4770232e9d2f8e10261f8fe19d305ab44c19b8728dd5f7e7b77e4607fcdc4e6b47a0464ba5dbb4491ddc9d91ae8c1a10c1e409
 SHA512 
1d9f07223f33f2156e6821a567b7f3b28c942adf62b2948504301ce8788100bdac525fc4626a59c9c03cba63fa590407910abdcc41d627da5b4c8fa6ccfd2582

diff --git a/dev-util/meld/meld-3.16.4.ebuild b/dev-util/meld/meld-3.16.4.ebuild
deleted file mode 100644
index 98a3b175b5c..000
--- a/dev-util/meld/meld-3.16.4.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_REQ_USE="xml"
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit gnome2 distutils-r1
-
-DESCRIPTION="A graphical diff and merge tool"
-HOMEPAGE="http://meldmerge.org/;
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux 
~x86-linux"
-IUSE=""
-
-RDEPEND="${PYTHON_DEPS}
-   >=dev-libs/glib-2.36:2[dbus]
-   dev-python/dbus-python[${PYTHON_USEDEP}]
-   >=dev-python/pygobject-3.8:3[cairo,${PYTHON_USEDEP}]
-   gnome-base/gsettings-desktop-schemas
-   >=x11-libs/gtk+-3.14:3[introspection]
-   >=x11-libs/gtksourceview-3.14:3.0[introspection]
-   x11-themes/hicolor-icon-theme
-"
-DEPEND="${RDEPEND}
-   dev-util/intltool
-   dev-util/itstool
-   sys-devel/gettext
-"
-
-python_compile_all() {
-   mydistutilsargs=( --no-update-icon-cache --no-compile-schemas )
-}



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

2017-11-01 Thread Mart Raudsepp
commit: b9b4df0ba1842667dbe99ef32a2ab6406c961c51
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Wed Nov  1 17:47:29 2017 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Wed Nov  1 17:48:22 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9b4df0b

dev-util/meld: remove old

Package-Manager: Portage-2.3.8, Repoman-2.3.2

 dev-util/meld/Manifest   |  1 -
 dev-util/meld/meld-3.17.4.ebuild | 36 
 2 files changed, 37 deletions(-)

diff --git a/dev-util/meld/Manifest b/dev-util/meld/Manifest
index 1c2183daae4..f619a710dd3 100644
--- a/dev-util/meld/Manifest
+++ b/dev-util/meld/Manifest
@@ -1,3 +1,2 @@
 DIST meld-3.16.4.tar.xz 537364 SHA256 
93c4f928319dae7484135ab292fe6ea4254123e8219549a66d3e2deba6a38e67 SHA512 
58ebca17b9ed9d9357d6f36357085603c3643eedbd86630a9a911ec87fd3a29a97a8e7ffba605b8e8d054322452ebdc299a5d50601968cf7b97d41ce6458be8f
 WHIRLPOOL 
c94fc2e5acbb839e4db60e841e5dcff1187a134f9f0f06a77b9b4ef25650e2987a8276258c298769a030026979ff32a032967683f0fc7c347e10072a9a4b5dcf
-DIST meld-3.17.4.tar.xz 553316 SHA256 
7e2d0a8b2a921e39c4142b500bf57d2199d90fca62fd1876103d95d113583e47 SHA512 
3026953691607bf7c4ae332822576704568daa471fe657015ae2533f40e25c89da50810d921e2962241824047580e67fe25fe336aa89c4d1a21cda7a8f0aca72
 WHIRLPOOL 
6b4631cc839660631393db4ff3a3bde6a99ae06b312433bda2b39edfde85c790adf07dec1e242732b46210476fe9a5fbdbc27b9430301a9f72a0a507ed6e7f0d
 DIST meld-3.18.0.tar.xz 553772 SHA256 
848158b1e5c7473b9da3ddc16e057aad8951ec82979beb5914b8b4acdf97223e SHA512 
1d9f07223f33f2156e6821a567b7f3b28c942adf62b2948504301ce8788100bdac525fc4626a59c9c03cba63fa590407910abdcc41d627da5b4c8fa6ccfd2582
 WHIRLPOOL 
1c0296d2ee1f51b35ec8e1f337452ad1248c261974a5a4510976783fbf5380496ca4b55ff21515f453a6b38afaa4710026f07a8b8311b80b1291bb3f82cfac1f

diff --git a/dev-util/meld/meld-3.17.4.ebuild b/dev-util/meld/meld-3.17.4.ebuild
deleted file mode 100644
index 417166e088e..000
--- a/dev-util/meld/meld-3.17.4.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_REQ_USE="xml"
-PYTHON_COMPAT=( python3_{4,5,6} )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit gnome2 distutils-r1
-
-DESCRIPTION="A graphical diff and merge tool"
-HOMEPAGE="http://meldmerge.org/;
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux 
~x86-linux"
-IUSE=""
-
-RDEPEND="${PYTHON_DEPS}
-   >=dev-libs/glib-2.50:2[dbus]
-   dev-python/dbus-python[${PYTHON_USEDEP}]
-   >=dev-python/pygobject-3.12:3[cairo,${PYTHON_USEDEP}]
-   gnome-base/gsettings-desktop-schemas
-   >=x11-libs/gtk+-3.14:3[introspection]
-   >=x11-libs/gtksourceview-3.14:3.0[introspection]
-   x11-themes/hicolor-icon-theme
-"
-DEPEND="${RDEPEND}
-   dev-util/intltool
-   dev-util/itstool
-   sys-devel/gettext
-"
-
-python_compile_all() {
-   mydistutilsargs=( --no-update-icon-cache --no-compile-schemas )
-}



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

2017-11-01 Thread Mart Raudsepp
commit: d15ef6601cc3743b44cf1a683ee9f83b2cfc3405
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Wed Nov  1 17:47:06 2017 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Wed Nov  1 17:48:20 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d15ef660

dev-util/meld: bump to 3.18.0

Package-Manager: Portage-2.3.8, Repoman-2.3.2

 dev-util/meld/Manifest   |  1 +
 dev-util/meld/meld-3.18.0.ebuild | 36 
 2 files changed, 37 insertions(+)

diff --git a/dev-util/meld/Manifest b/dev-util/meld/Manifest
index 92fa5116a10..1c2183daae4 100644
--- a/dev-util/meld/Manifest
+++ b/dev-util/meld/Manifest
@@ -1,2 +1,3 @@
 DIST meld-3.16.4.tar.xz 537364 SHA256 
93c4f928319dae7484135ab292fe6ea4254123e8219549a66d3e2deba6a38e67 SHA512 
58ebca17b9ed9d9357d6f36357085603c3643eedbd86630a9a911ec87fd3a29a97a8e7ffba605b8e8d054322452ebdc299a5d50601968cf7b97d41ce6458be8f
 WHIRLPOOL 
c94fc2e5acbb839e4db60e841e5dcff1187a134f9f0f06a77b9b4ef25650e2987a8276258c298769a030026979ff32a032967683f0fc7c347e10072a9a4b5dcf
 DIST meld-3.17.4.tar.xz 553316 SHA256 
7e2d0a8b2a921e39c4142b500bf57d2199d90fca62fd1876103d95d113583e47 SHA512 
3026953691607bf7c4ae332822576704568daa471fe657015ae2533f40e25c89da50810d921e2962241824047580e67fe25fe336aa89c4d1a21cda7a8f0aca72
 WHIRLPOOL 
6b4631cc839660631393db4ff3a3bde6a99ae06b312433bda2b39edfde85c790adf07dec1e242732b46210476fe9a5fbdbc27b9430301a9f72a0a507ed6e7f0d
+DIST meld-3.18.0.tar.xz 553772 SHA256 
848158b1e5c7473b9da3ddc16e057aad8951ec82979beb5914b8b4acdf97223e SHA512 
1d9f07223f33f2156e6821a567b7f3b28c942adf62b2948504301ce8788100bdac525fc4626a59c9c03cba63fa590407910abdcc41d627da5b4c8fa6ccfd2582
 WHIRLPOOL 
1c0296d2ee1f51b35ec8e1f337452ad1248c261974a5a4510976783fbf5380496ca4b55ff21515f453a6b38afaa4710026f07a8b8311b80b1291bb3f82cfac1f

diff --git a/dev-util/meld/meld-3.18.0.ebuild b/dev-util/meld/meld-3.18.0.ebuild
new file mode 100644
index 000..417166e088e
--- /dev/null
+++ b/dev-util/meld/meld-3.18.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_REQ_USE="xml"
+PYTHON_COMPAT=( python3_{4,5,6} )
+DISTUTILS_SINGLE_IMPL=1
+
+inherit gnome2 distutils-r1
+
+DESCRIPTION="A graphical diff and merge tool"
+HOMEPAGE="http://meldmerge.org/;
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux 
~x86-linux"
+IUSE=""
+
+RDEPEND="${PYTHON_DEPS}
+   >=dev-libs/glib-2.50:2[dbus]
+   dev-python/dbus-python[${PYTHON_USEDEP}]
+   >=dev-python/pygobject-3.12:3[cairo,${PYTHON_USEDEP}]
+   gnome-base/gsettings-desktop-schemas
+   >=x11-libs/gtk+-3.14:3[introspection]
+   >=x11-libs/gtksourceview-3.14:3.0[introspection]
+   x11-themes/hicolor-icon-theme
+"
+DEPEND="${RDEPEND}
+   dev-util/intltool
+   dev-util/itstool
+   sys-devel/gettext
+"
+
+python_compile_all() {
+   mydistutilsargs=( --no-update-icon-cache --no-compile-schemas )
+}



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

2017-09-03 Thread Gilles Dartiguelongue
commit: d456b049568d4961e1c97e03a10fee956e219208
Author: Gilles Dartiguelongue  gentoo  org>
AuthorDate: Sun Sep  3 22:29:34 2017 +
Commit: Gilles Dartiguelongue  gentoo  org>
CommitDate: Sun Sep  3 22:47:16 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d456b049

dev-util/meld: version bump 3.16.4 → 3.17.4

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 dev-util/meld/Manifest   |  1 +
 dev-util/meld/meld-3.17.4.ebuild | 36 
 2 files changed, 37 insertions(+)

diff --git a/dev-util/meld/Manifest b/dev-util/meld/Manifest
index 933cc252173..92fa5116a10 100644
--- a/dev-util/meld/Manifest
+++ b/dev-util/meld/Manifest
@@ -1 +1,2 @@
 DIST meld-3.16.4.tar.xz 537364 SHA256 
93c4f928319dae7484135ab292fe6ea4254123e8219549a66d3e2deba6a38e67 SHA512 
58ebca17b9ed9d9357d6f36357085603c3643eedbd86630a9a911ec87fd3a29a97a8e7ffba605b8e8d054322452ebdc299a5d50601968cf7b97d41ce6458be8f
 WHIRLPOOL 
c94fc2e5acbb839e4db60e841e5dcff1187a134f9f0f06a77b9b4ef25650e2987a8276258c298769a030026979ff32a032967683f0fc7c347e10072a9a4b5dcf
+DIST meld-3.17.4.tar.xz 553316 SHA256 
7e2d0a8b2a921e39c4142b500bf57d2199d90fca62fd1876103d95d113583e47 SHA512 
3026953691607bf7c4ae332822576704568daa471fe657015ae2533f40e25c89da50810d921e2962241824047580e67fe25fe336aa89c4d1a21cda7a8f0aca72
 WHIRLPOOL 
6b4631cc839660631393db4ff3a3bde6a99ae06b312433bda2b39edfde85c790adf07dec1e242732b46210476fe9a5fbdbc27b9430301a9f72a0a507ed6e7f0d

diff --git a/dev-util/meld/meld-3.17.4.ebuild b/dev-util/meld/meld-3.17.4.ebuild
new file mode 100644
index 000..417166e088e
--- /dev/null
+++ b/dev-util/meld/meld-3.17.4.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_REQ_USE="xml"
+PYTHON_COMPAT=( python3_{4,5,6} )
+DISTUTILS_SINGLE_IMPL=1
+
+inherit gnome2 distutils-r1
+
+DESCRIPTION="A graphical diff and merge tool"
+HOMEPAGE="http://meldmerge.org/;
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux 
~x86-linux"
+IUSE=""
+
+RDEPEND="${PYTHON_DEPS}
+   >=dev-libs/glib-2.50:2[dbus]
+   dev-python/dbus-python[${PYTHON_USEDEP}]
+   >=dev-python/pygobject-3.12:3[cairo,${PYTHON_USEDEP}]
+   gnome-base/gsettings-desktop-schemas
+   >=x11-libs/gtk+-3.14:3[introspection]
+   >=x11-libs/gtksourceview-3.14:3.0[introspection]
+   x11-themes/hicolor-icon-theme
+"
+DEPEND="${RDEPEND}
+   dev-util/intltool
+   dev-util/itstool
+   sys-devel/gettext
+"
+
+python_compile_all() {
+   mydistutilsargs=( --no-update-icon-cache --no-compile-schemas )
+}



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

2017-02-15 Thread Mart Raudsepp
commit: 9c6fbe1fc7e4401929524b1e11ff5b810e0b0651
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Wed Feb 15 19:29:25 2017 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Wed Feb 15 19:29:25 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c6fbe1f

dev-util/meld: remove old

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 dev-util/meld/Manifest   |  2 --
 dev-util/meld/meld-3.16.2.ebuild | 37 -
 dev-util/meld/meld-3.16.3.ebuild | 37 -
 3 files changed, 76 deletions(-)

diff --git a/dev-util/meld/Manifest b/dev-util/meld/Manifest
index 75ae5d73e7..933cc25217 100644
--- a/dev-util/meld/Manifest
+++ b/dev-util/meld/Manifest
@@ -1,3 +1 @@
-DIST meld-3.16.2.tar.xz 533092 SHA256 
2dd3f58b95444bf721e0c912668c29cf8f47a402440b772ea12c4b9a0c94966f SHA512 
c528d905182db928b2f4b382ab5f67ff15e4e218532c0d8112919c233fe910db2bf5d80dd68e1494821f7113bc2925181b1c088c5ec640eb859f3c83e6c0ce64
 WHIRLPOOL 
3c117fe48d2975c37576b0f685aa86d8b07d0b37565e9a11fd0134dcf8acb06a96a81332cfcd5528866cc42d042fd13c515d3eabc88cc96993c838e4756c4409
-DIST meld-3.16.3.tar.xz 533156 SHA256 
efcae1530bf78113dfad42785ecb03cc06e48cd6a325c3e9236d99948269884c SHA512 
4985a7d774e69133bad79fef4280a73ec94624bea0391e6e354eeb23316c5c80f8edc23042f31555de96acd8916de2fa59c584850d45dcbe668e1d193a53bdc8
 WHIRLPOOL 
a06fce7b4b9e2cf49c4241e325887a566ee5e64d9017f425ff4278f8523951d0c5439769f6cc41042643864e74a81e50f02617a9e95bde7cee24a4d85db4
 DIST meld-3.16.4.tar.xz 537364 SHA256 
93c4f928319dae7484135ab292fe6ea4254123e8219549a66d3e2deba6a38e67 SHA512 
58ebca17b9ed9d9357d6f36357085603c3643eedbd86630a9a911ec87fd3a29a97a8e7ffba605b8e8d054322452ebdc299a5d50601968cf7b97d41ce6458be8f
 WHIRLPOOL 
c94fc2e5acbb839e4db60e841e5dcff1187a134f9f0f06a77b9b4ef25650e2987a8276258c298769a030026979ff32a032967683f0fc7c347e10072a9a4b5dcf

diff --git a/dev-util/meld/meld-3.16.2.ebuild b/dev-util/meld/meld-3.16.2.ebuild
deleted file mode 100644
index e6fa878597..00
--- a/dev-util/meld/meld-3.16.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="6"
-PYTHON_REQ_USE="xml"
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit gnome2 distutils-r1
-
-DESCRIPTION="A graphical diff and merge tool"
-HOMEPAGE="http://meldmerge.org/;
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux 
~x86-linux"
-IUSE=""
-
-RDEPEND="${PYTHON_DEPS}
-   >=dev-libs/glib-2.36:2[dbus]
-   dev-python/dbus-python[${PYTHON_USEDEP}]
-   >=dev-python/pygobject-3.8:3[cairo,${PYTHON_USEDEP}]
-   gnome-base/gsettings-desktop-schemas
-   >=x11-libs/gtk+-3.14:3[introspection]
-   >=x11-libs/gtksourceview-3.14:3.0[introspection]
-   x11-themes/hicolor-icon-theme
-"
-DEPEND="${RDEPEND}
-   dev-util/intltool
-   dev-util/itstool
-   sys-devel/gettext
-"
-
-python_compile_all() {
-   mydistutilsargs=( --no-update-icon-cache --no-compile-schemas )
-}

diff --git a/dev-util/meld/meld-3.16.3.ebuild b/dev-util/meld/meld-3.16.3.ebuild
deleted file mode 100644
index 79faf360b1..00
--- a/dev-util/meld/meld-3.16.3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="6"
-PYTHON_REQ_USE="xml"
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit gnome2 distutils-r1
-
-DESCRIPTION="A graphical diff and merge tool"
-HOMEPAGE="http://meldmerge.org/;
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux 
~x86-linux"
-IUSE=""
-
-RDEPEND="${PYTHON_DEPS}
-   >=dev-libs/glib-2.36:2[dbus]
-   dev-python/dbus-python[${PYTHON_USEDEP}]
-   >=dev-python/pygobject-3.8:3[cairo,${PYTHON_USEDEP}]
-   gnome-base/gsettings-desktop-schemas
-   >=x11-libs/gtk+-3.14:3[introspection]
-   >=x11-libs/gtksourceview-3.14:3.0[introspection]
-   x11-themes/hicolor-icon-theme
-"
-DEPEND="${RDEPEND}
-   dev-util/intltool
-   dev-util/itstool
-   sys-devel/gettext
-"
-
-python_compile_all() {
-   mydistutilsargs=( --no-update-icon-cache --no-compile-schemas )
-}



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

2017-01-04 Thread Gilles Dartiguelongue
commit: acfd9eabc05a4f8fef195d4979900bc29d700252
Author: Christophe Lermytte  lermytte  be>
AuthorDate: Wed Dec 21 21:23:01 2016 +
Commit: Gilles Dartiguelongue  gentoo  org>
CommitDate: Wed Jan  4 22:37:08 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=acfd9eab

dev-util/meld: bump to 3.16.4

Package-Manager: Portage-2.3.3, Repoman-2.3.1
Closes: https://github.com/gentoo/gentoo/pull/3208

Signed-off-by: Gilles Dartiguelongue  gentoo.org>

 dev-util/meld/Manifest   |  1 +
 dev-util/meld/meld-3.16.4.ebuild | 37 +
 2 files changed, 38 insertions(+)

diff --git a/dev-util/meld/Manifest b/dev-util/meld/Manifest
index 526a6a5..75ae5d7 100644
--- a/dev-util/meld/Manifest
+++ b/dev-util/meld/Manifest
@@ -1,2 +1,3 @@
 DIST meld-3.16.2.tar.xz 533092 SHA256 
2dd3f58b95444bf721e0c912668c29cf8f47a402440b772ea12c4b9a0c94966f SHA512 
c528d905182db928b2f4b382ab5f67ff15e4e218532c0d8112919c233fe910db2bf5d80dd68e1494821f7113bc2925181b1c088c5ec640eb859f3c83e6c0ce64
 WHIRLPOOL 
3c117fe48d2975c37576b0f685aa86d8b07d0b37565e9a11fd0134dcf8acb06a96a81332cfcd5528866cc42d042fd13c515d3eabc88cc96993c838e4756c4409
 DIST meld-3.16.3.tar.xz 533156 SHA256 
efcae1530bf78113dfad42785ecb03cc06e48cd6a325c3e9236d99948269884c SHA512 
4985a7d774e69133bad79fef4280a73ec94624bea0391e6e354eeb23316c5c80f8edc23042f31555de96acd8916de2fa59c584850d45dcbe668e1d193a53bdc8
 WHIRLPOOL 
a06fce7b4b9e2cf49c4241e325887a566ee5e64d9017f425ff4278f8523951d0c5439769f6cc41042643864e74a81e50f02617a9e95bde7cee24a4d85db4
+DIST meld-3.16.4.tar.xz 537364 SHA256 
93c4f928319dae7484135ab292fe6ea4254123e8219549a66d3e2deba6a38e67 SHA512 
58ebca17b9ed9d9357d6f36357085603c3643eedbd86630a9a911ec87fd3a29a97a8e7ffba605b8e8d054322452ebdc299a5d50601968cf7b97d41ce6458be8f
 WHIRLPOOL 
c94fc2e5acbb839e4db60e841e5dcff1187a134f9f0f06a77b9b4ef25650e2987a8276258c298769a030026979ff32a032967683f0fc7c347e10072a9a4b5dcf

diff --git a/dev-util/meld/meld-3.16.4.ebuild b/dev-util/meld/meld-3.16.4.ebuild
new file mode 100644
index ..79faf36
--- /dev/null
+++ b/dev-util/meld/meld-3.16.4.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+PYTHON_REQ_USE="xml"
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_SINGLE_IMPL=1
+
+inherit gnome2 distutils-r1
+
+DESCRIPTION="A graphical diff and merge tool"
+HOMEPAGE="http://meldmerge.org/;
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux 
~x86-linux"
+IUSE=""
+
+RDEPEND="${PYTHON_DEPS}
+   >=dev-libs/glib-2.36:2[dbus]
+   dev-python/dbus-python[${PYTHON_USEDEP}]
+   >=dev-python/pygobject-3.8:3[cairo,${PYTHON_USEDEP}]
+   gnome-base/gsettings-desktop-schemas
+   >=x11-libs/gtk+-3.14:3[introspection]
+   >=x11-libs/gtksourceview-3.14:3.0[introspection]
+   x11-themes/hicolor-icon-theme
+"
+DEPEND="${RDEPEND}
+   dev-util/intltool
+   dev-util/itstool
+   sys-devel/gettext
+"
+
+python_compile_all() {
+   mydistutilsargs=( --no-update-icon-cache --no-compile-schemas )
+}



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

2016-10-01 Thread Mart Raudsepp
commit: b584ae16458a4459d87a50f87b6930369e773ac9
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Sat Oct  1 19:58:17 2016 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Sat Oct  1 20:01:27 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b584ae16

dev-util/meld: bump to 3.16.3 for bug fixes, including better gtk3.20 compat

Gentoo-bug: 595810
Package-Manager: portage-2.3.1

 dev-util/meld/Manifest   |  1 +
 dev-util/meld/meld-3.16.3.ebuild | 37 +
 2 files changed, 38 insertions(+)

diff --git a/dev-util/meld/Manifest b/dev-util/meld/Manifest
index b0e6283..ddc7511 100644
--- a/dev-util/meld/Manifest
+++ b/dev-util/meld/Manifest
@@ -1,3 +1,4 @@
 DIST meld-3.16.0.tar.xz 532000 SHA256 
341bfd53ac7c0167d6d43694c0e7dbedf76463bdf79b425c439376ba15b56c0a SHA512 
12425fbdcafcd305bebbf368292c0481fd17b2e75f73c9788d9e017ab22b6ef986f3b4ec2fb44063141b6a6072975397402f7a59ed27666a788c73e4861dd720
 WHIRLPOOL 
d29c3dbccd762b75b5c251aff8da596e22a8818d7bddac913b7b930b8e6cf23c731cef6beb7f1181b8344daf9a2c25c0fbc59cda561c254a4784eb68140d7b13
 DIST meld-3.16.1.tar.xz 532252 SHA256 
1bec697aa1ababa315ca8241ade65dc68ea87f0d316632f590975afcf967cfab SHA512 
933fb2e0fa509039bc0998c2f4b2b91720c43c9b6c11f9995aed1525103ab556e10fe48938fbe68bdc1d715df750115c4ee9a0b7af4c79c191ec25456a12b59b
 WHIRLPOOL 
b4dccb3d0b2029616b1b04485c4b8bf78c570c10a49d3b6401a354960d757474bac2e767a60875678de5362552b03456dbceff038951bf3897530e5d4990
 DIST meld-3.16.2.tar.xz 533092 SHA256 
2dd3f58b95444bf721e0c912668c29cf8f47a402440b772ea12c4b9a0c94966f SHA512 
c528d905182db928b2f4b382ab5f67ff15e4e218532c0d8112919c233fe910db2bf5d80dd68e1494821f7113bc2925181b1c088c5ec640eb859f3c83e6c0ce64
 WHIRLPOOL 
3c117fe48d2975c37576b0f685aa86d8b07d0b37565e9a11fd0134dcf8acb06a96a81332cfcd5528866cc42d042fd13c515d3eabc88cc96993c838e4756c4409
+DIST meld-3.16.3.tar.xz 533156 SHA256 
efcae1530bf78113dfad42785ecb03cc06e48cd6a325c3e9236d99948269884c SHA512 
4985a7d774e69133bad79fef4280a73ec94624bea0391e6e354eeb23316c5c80f8edc23042f31555de96acd8916de2fa59c584850d45dcbe668e1d193a53bdc8
 WHIRLPOOL 
a06fce7b4b9e2cf49c4241e325887a566ee5e64d9017f425ff4278f8523951d0c5439769f6cc41042643864e74a81e50f02617a9e95bde7cee24a4d85db4

diff --git a/dev-util/meld/meld-3.16.3.ebuild b/dev-util/meld/meld-3.16.3.ebuild
new file mode 100644
index ..79faf36
--- /dev/null
+++ b/dev-util/meld/meld-3.16.3.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+PYTHON_REQ_USE="xml"
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_SINGLE_IMPL=1
+
+inherit gnome2 distutils-r1
+
+DESCRIPTION="A graphical diff and merge tool"
+HOMEPAGE="http://meldmerge.org/;
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux 
~x86-linux"
+IUSE=""
+
+RDEPEND="${PYTHON_DEPS}
+   >=dev-libs/glib-2.36:2[dbus]
+   dev-python/dbus-python[${PYTHON_USEDEP}]
+   >=dev-python/pygobject-3.8:3[cairo,${PYTHON_USEDEP}]
+   gnome-base/gsettings-desktop-schemas
+   >=x11-libs/gtk+-3.14:3[introspection]
+   >=x11-libs/gtksourceview-3.14:3.0[introspection]
+   x11-themes/hicolor-icon-theme
+"
+DEPEND="${RDEPEND}
+   dev-util/intltool
+   dev-util/itstool
+   sys-devel/gettext
+"
+
+python_compile_all() {
+   mydistutilsargs=( --no-update-icon-cache --no-compile-schemas )
+}



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

2016-10-01 Thread Mart Raudsepp
commit: f735da030396bbffb05a44b1d56560c9ac1a
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Sat Oct  1 19:59:56 2016 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Sat Oct  1 20:01:30 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f735da03

dev-util/meld: remove old

Package-Manager: portage-2.3.1

 dev-util/meld/Manifest   |  2 --
 dev-util/meld/meld-3.16.0.ebuild | 37 -
 dev-util/meld/meld-3.16.1.ebuild | 37 -
 3 files changed, 76 deletions(-)

diff --git a/dev-util/meld/Manifest b/dev-util/meld/Manifest
index ddc7511..526a6a5 100644
--- a/dev-util/meld/Manifest
+++ b/dev-util/meld/Manifest
@@ -1,4 +1,2 @@
-DIST meld-3.16.0.tar.xz 532000 SHA256 
341bfd53ac7c0167d6d43694c0e7dbedf76463bdf79b425c439376ba15b56c0a SHA512 
12425fbdcafcd305bebbf368292c0481fd17b2e75f73c9788d9e017ab22b6ef986f3b4ec2fb44063141b6a6072975397402f7a59ed27666a788c73e4861dd720
 WHIRLPOOL 
d29c3dbccd762b75b5c251aff8da596e22a8818d7bddac913b7b930b8e6cf23c731cef6beb7f1181b8344daf9a2c25c0fbc59cda561c254a4784eb68140d7b13
-DIST meld-3.16.1.tar.xz 532252 SHA256 
1bec697aa1ababa315ca8241ade65dc68ea87f0d316632f590975afcf967cfab SHA512 
933fb2e0fa509039bc0998c2f4b2b91720c43c9b6c11f9995aed1525103ab556e10fe48938fbe68bdc1d715df750115c4ee9a0b7af4c79c191ec25456a12b59b
 WHIRLPOOL 
b4dccb3d0b2029616b1b04485c4b8bf78c570c10a49d3b6401a354960d757474bac2e767a60875678de5362552b03456dbceff038951bf3897530e5d4990
 DIST meld-3.16.2.tar.xz 533092 SHA256 
2dd3f58b95444bf721e0c912668c29cf8f47a402440b772ea12c4b9a0c94966f SHA512 
c528d905182db928b2f4b382ab5f67ff15e4e218532c0d8112919c233fe910db2bf5d80dd68e1494821f7113bc2925181b1c088c5ec640eb859f3c83e6c0ce64
 WHIRLPOOL 
3c117fe48d2975c37576b0f685aa86d8b07d0b37565e9a11fd0134dcf8acb06a96a81332cfcd5528866cc42d042fd13c515d3eabc88cc96993c838e4756c4409
 DIST meld-3.16.3.tar.xz 533156 SHA256 
efcae1530bf78113dfad42785ecb03cc06e48cd6a325c3e9236d99948269884c SHA512 
4985a7d774e69133bad79fef4280a73ec94624bea0391e6e354eeb23316c5c80f8edc23042f31555de96acd8916de2fa59c584850d45dcbe668e1d193a53bdc8
 WHIRLPOOL 
a06fce7b4b9e2cf49c4241e325887a566ee5e64d9017f425ff4278f8523951d0c5439769f6cc41042643864e74a81e50f02617a9e95bde7cee24a4d85db4

diff --git a/dev-util/meld/meld-3.16.0.ebuild b/dev-util/meld/meld-3.16.0.ebuild
deleted file mode 100644
index e6fa878..
--- a/dev-util/meld/meld-3.16.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="6"
-PYTHON_REQ_USE="xml"
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit gnome2 distutils-r1
-
-DESCRIPTION="A graphical diff and merge tool"
-HOMEPAGE="http://meldmerge.org/;
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux 
~x86-linux"
-IUSE=""
-
-RDEPEND="${PYTHON_DEPS}
-   >=dev-libs/glib-2.36:2[dbus]
-   dev-python/dbus-python[${PYTHON_USEDEP}]
-   >=dev-python/pygobject-3.8:3[cairo,${PYTHON_USEDEP}]
-   gnome-base/gsettings-desktop-schemas
-   >=x11-libs/gtk+-3.14:3[introspection]
-   >=x11-libs/gtksourceview-3.14:3.0[introspection]
-   x11-themes/hicolor-icon-theme
-"
-DEPEND="${RDEPEND}
-   dev-util/intltool
-   dev-util/itstool
-   sys-devel/gettext
-"
-
-python_compile_all() {
-   mydistutilsargs=( --no-update-icon-cache --no-compile-schemas )
-}

diff --git a/dev-util/meld/meld-3.16.1.ebuild b/dev-util/meld/meld-3.16.1.ebuild
deleted file mode 100644
index 79faf36..
--- a/dev-util/meld/meld-3.16.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="6"
-PYTHON_REQ_USE="xml"
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit gnome2 distutils-r1
-
-DESCRIPTION="A graphical diff and merge tool"
-HOMEPAGE="http://meldmerge.org/;
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux 
~x86-linux"
-IUSE=""
-
-RDEPEND="${PYTHON_DEPS}
-   >=dev-libs/glib-2.36:2[dbus]
-   dev-python/dbus-python[${PYTHON_USEDEP}]
-   >=dev-python/pygobject-3.8:3[cairo,${PYTHON_USEDEP}]
-   gnome-base/gsettings-desktop-schemas
-   >=x11-libs/gtk+-3.14:3[introspection]
-   >=x11-libs/gtksourceview-3.14:3.0[introspection]
-   x11-themes/hicolor-icon-theme
-"
-DEPEND="${RDEPEND}
-   dev-util/intltool
-   dev-util/itstool
-   sys-devel/gettext
-"
-
-python_compile_all() {
-   mydistutilsargs=( --no-update-icon-cache --no-compile-schemas )
-}



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

2016-07-30 Thread Pacho Ramos
commit: 8e67dc2af9f138cf26f2ef53f8d0a78c86d0e993
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sat Jul 30 10:14:10 2016 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sat Jul 30 10:49:52 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e67dc2a

dev-util/meld: Version bump

Package-Manager: portage-2.3.0

 dev-util/meld/Manifest   |  1 +
 dev-util/meld/meld-3.16.2.ebuild | 37 +
 2 files changed, 38 insertions(+)

diff --git a/dev-util/meld/Manifest b/dev-util/meld/Manifest
index d428b64..b0e6283 100644
--- a/dev-util/meld/Manifest
+++ b/dev-util/meld/Manifest
@@ -1,2 +1,3 @@
 DIST meld-3.16.0.tar.xz 532000 SHA256 
341bfd53ac7c0167d6d43694c0e7dbedf76463bdf79b425c439376ba15b56c0a SHA512 
12425fbdcafcd305bebbf368292c0481fd17b2e75f73c9788d9e017ab22b6ef986f3b4ec2fb44063141b6a6072975397402f7a59ed27666a788c73e4861dd720
 WHIRLPOOL 
d29c3dbccd762b75b5c251aff8da596e22a8818d7bddac913b7b930b8e6cf23c731cef6beb7f1181b8344daf9a2c25c0fbc59cda561c254a4784eb68140d7b13
 DIST meld-3.16.1.tar.xz 532252 SHA256 
1bec697aa1ababa315ca8241ade65dc68ea87f0d316632f590975afcf967cfab SHA512 
933fb2e0fa509039bc0998c2f4b2b91720c43c9b6c11f9995aed1525103ab556e10fe48938fbe68bdc1d715df750115c4ee9a0b7af4c79c191ec25456a12b59b
 WHIRLPOOL 
b4dccb3d0b2029616b1b04485c4b8bf78c570c10a49d3b6401a354960d757474bac2e767a60875678de5362552b03456dbceff038951bf3897530e5d4990
+DIST meld-3.16.2.tar.xz 533092 SHA256 
2dd3f58b95444bf721e0c912668c29cf8f47a402440b772ea12c4b9a0c94966f SHA512 
c528d905182db928b2f4b382ab5f67ff15e4e218532c0d8112919c233fe910db2bf5d80dd68e1494821f7113bc2925181b1c088c5ec640eb859f3c83e6c0ce64
 WHIRLPOOL 
3c117fe48d2975c37576b0f685aa86d8b07d0b37565e9a11fd0134dcf8acb06a96a81332cfcd5528866cc42d042fd13c515d3eabc88cc96993c838e4756c4409

diff --git a/dev-util/meld/meld-3.16.2.ebuild b/dev-util/meld/meld-3.16.2.ebuild
new file mode 100644
index 000..79faf36
--- /dev/null
+++ b/dev-util/meld/meld-3.16.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+PYTHON_REQ_USE="xml"
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_SINGLE_IMPL=1
+
+inherit gnome2 distutils-r1
+
+DESCRIPTION="A graphical diff and merge tool"
+HOMEPAGE="http://meldmerge.org/;
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux 
~x86-linux"
+IUSE=""
+
+RDEPEND="${PYTHON_DEPS}
+   >=dev-libs/glib-2.36:2[dbus]
+   dev-python/dbus-python[${PYTHON_USEDEP}]
+   >=dev-python/pygobject-3.8:3[cairo,${PYTHON_USEDEP}]
+   gnome-base/gsettings-desktop-schemas
+   >=x11-libs/gtk+-3.14:3[introspection]
+   >=x11-libs/gtksourceview-3.14:3.0[introspection]
+   x11-themes/hicolor-icon-theme
+"
+DEPEND="${RDEPEND}
+   dev-util/intltool
+   dev-util/itstool
+   sys-devel/gettext
+"
+
+python_compile_all() {
+   mydistutilsargs=( --no-update-icon-cache --no-compile-schemas )
+}



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

2016-07-30 Thread Pacho Ramos
commit: 4a37edddb0c7585e8fb9fdae9330cf2444ae005d
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sat Jul 30 10:13:21 2016 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sat Jul 30 10:49:50 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a37eddd

dev-util/meld: Drop old

Package-Manager: portage-2.3.0

 dev-util/meld/Manifest   |  1 -
 dev-util/meld/meld-3.14.2.ebuild | 38 --
 2 files changed, 39 deletions(-)

diff --git a/dev-util/meld/Manifest b/dev-util/meld/Manifest
index f9904dc..d428b64 100644
--- a/dev-util/meld/Manifest
+++ b/dev-util/meld/Manifest
@@ -1,3 +1,2 @@
-DIST meld-3.14.2.tar.xz 505488 SHA256 
4a3c0951cd3b7e7ae2480f66adfb0e50b3bd301821d6e2adb518130446231873 SHA512 
a74b07db0e3ce4186d2ef4d2156ed1ad1a0cd39d953e999d75d457345d1a294fe0832049531b78fc8e75a038b07991fbfbcdf745d74e5b2802199a35007333b1
 WHIRLPOOL 
69823c4bc555e12f3b80c8f35f61fe44a22e246c2093e0535d69fadbcf5a55bf2e6ddc611ae2d5368173e4620d373cd26c85571d0e5648ebf82216ffcae6adf7
 DIST meld-3.16.0.tar.xz 532000 SHA256 
341bfd53ac7c0167d6d43694c0e7dbedf76463bdf79b425c439376ba15b56c0a SHA512 
12425fbdcafcd305bebbf368292c0481fd17b2e75f73c9788d9e017ab22b6ef986f3b4ec2fb44063141b6a6072975397402f7a59ed27666a788c73e4861dd720
 WHIRLPOOL 
d29c3dbccd762b75b5c251aff8da596e22a8818d7bddac913b7b930b8e6cf23c731cef6beb7f1181b8344daf9a2c25c0fbc59cda561c254a4784eb68140d7b13
 DIST meld-3.16.1.tar.xz 532252 SHA256 
1bec697aa1ababa315ca8241ade65dc68ea87f0d316632f590975afcf967cfab SHA512 
933fb2e0fa509039bc0998c2f4b2b91720c43c9b6c11f9995aed1525103ab556e10fe48938fbe68bdc1d715df750115c4ee9a0b7af4c79c191ec25456a12b59b
 WHIRLPOOL 
b4dccb3d0b2029616b1b04485c4b8bf78c570c10a49d3b6401a354960d757474bac2e767a60875678de5362552b03456dbceff038951bf3897530e5d4990

diff --git a/dev-util/meld/meld-3.14.2.ebuild b/dev-util/meld/meld-3.14.2.ebuild
deleted file mode 100644
index bf465c6..000
--- a/dev-util/meld/meld-3.14.2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-PYTHON_REQ_USE="xml"
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit gnome2 distutils-r1
-
-DESCRIPTION="A graphical diff and merge tool"
-HOMEPAGE="http://meldmerge.org/;
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux 
~x86-linux"
-IUSE=""
-
-RDEPEND="${PYTHON_DEPS}
-   >=dev-libs/glib-2.36:2[dbus]
-   dev-python/dbus-python[${PYTHON_USEDEP}]
-   >=dev-python/pygobject-3.8:3[cairo,${PYTHON_USEDEP}]
-   gnome-base/gsettings-desktop-schemas
-   >=x11-libs/gtk+-3.12:3[introspection]
-   >=x11-libs/gtksourceview-3.10:3.0[introspection]
-   x11-themes/hicolor-icon-theme
-"
-DEPEND="${RDEPEND}
-   dev-util/intltool
-   dev-util/itstool
-   sys-devel/gettext
-"
-
-python_compile_all() {
-   mydistutilsargs=( --no-update-icon-cache --no-compile-schemas )
-}



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

2016-07-02 Thread Pacho Ramos
commit: 608d9b4348091caf8c7300e596504152e82ab1d7
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sat Jul  2 10:27:49 2016 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sat Jul  2 10:43:20 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=608d9b43

dev-util/meld: Version bump

Package-Manager: portage-2.3.0_rc1

 dev-util/meld/Manifest   |  1 +
 dev-util/meld/meld-3.16.1.ebuild | 37 +
 2 files changed, 38 insertions(+)

diff --git a/dev-util/meld/Manifest b/dev-util/meld/Manifest
index f4d22bc..f9904dc 100644
--- a/dev-util/meld/Manifest
+++ b/dev-util/meld/Manifest
@@ -1,2 +1,3 @@
 DIST meld-3.14.2.tar.xz 505488 SHA256 
4a3c0951cd3b7e7ae2480f66adfb0e50b3bd301821d6e2adb518130446231873 SHA512 
a74b07db0e3ce4186d2ef4d2156ed1ad1a0cd39d953e999d75d457345d1a294fe0832049531b78fc8e75a038b07991fbfbcdf745d74e5b2802199a35007333b1
 WHIRLPOOL 
69823c4bc555e12f3b80c8f35f61fe44a22e246c2093e0535d69fadbcf5a55bf2e6ddc611ae2d5368173e4620d373cd26c85571d0e5648ebf82216ffcae6adf7
 DIST meld-3.16.0.tar.xz 532000 SHA256 
341bfd53ac7c0167d6d43694c0e7dbedf76463bdf79b425c439376ba15b56c0a SHA512 
12425fbdcafcd305bebbf368292c0481fd17b2e75f73c9788d9e017ab22b6ef986f3b4ec2fb44063141b6a6072975397402f7a59ed27666a788c73e4861dd720
 WHIRLPOOL 
d29c3dbccd762b75b5c251aff8da596e22a8818d7bddac913b7b930b8e6cf23c731cef6beb7f1181b8344daf9a2c25c0fbc59cda561c254a4784eb68140d7b13
+DIST meld-3.16.1.tar.xz 532252 SHA256 
1bec697aa1ababa315ca8241ade65dc68ea87f0d316632f590975afcf967cfab SHA512 
933fb2e0fa509039bc0998c2f4b2b91720c43c9b6c11f9995aed1525103ab556e10fe48938fbe68bdc1d715df750115c4ee9a0b7af4c79c191ec25456a12b59b
 WHIRLPOOL 
b4dccb3d0b2029616b1b04485c4b8bf78c570c10a49d3b6401a354960d757474bac2e767a60875678de5362552b03456dbceff038951bf3897530e5d4990

diff --git a/dev-util/meld/meld-3.16.1.ebuild b/dev-util/meld/meld-3.16.1.ebuild
new file mode 100644
index 000..79faf36
--- /dev/null
+++ b/dev-util/meld/meld-3.16.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+PYTHON_REQ_USE="xml"
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_SINGLE_IMPL=1
+
+inherit gnome2 distutils-r1
+
+DESCRIPTION="A graphical diff and merge tool"
+HOMEPAGE="http://meldmerge.org/;
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux 
~x86-linux"
+IUSE=""
+
+RDEPEND="${PYTHON_DEPS}
+   >=dev-libs/glib-2.36:2[dbus]
+   dev-python/dbus-python[${PYTHON_USEDEP}]
+   >=dev-python/pygobject-3.8:3[cairo,${PYTHON_USEDEP}]
+   gnome-base/gsettings-desktop-schemas
+   >=x11-libs/gtk+-3.14:3[introspection]
+   >=x11-libs/gtksourceview-3.14:3.0[introspection]
+   x11-themes/hicolor-icon-theme
+"
+DEPEND="${RDEPEND}
+   dev-util/intltool
+   dev-util/itstool
+   sys-devel/gettext
+"
+
+python_compile_all() {
+   mydistutilsargs=( --no-update-icon-cache --no-compile-schemas )
+}



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

2016-05-28 Thread Pacho Ramos
commit: 50a71326ce5b50bd7a3038071f41e6898ea273a0
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sat May 28 15:23:41 2016 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sat May 28 15:49:15 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50a71326

dev-util/meld: Version bump

Package-Manager: portage-2.3.0_rc1

 dev-util/meld/Manifest   |  1 +
 dev-util/meld/meld-3.16.0.ebuild | 37 +
 2 files changed, 38 insertions(+)

diff --git a/dev-util/meld/Manifest b/dev-util/meld/Manifest
index b05f32d..f4d22bc 100644
--- a/dev-util/meld/Manifest
+++ b/dev-util/meld/Manifest
@@ -1 +1,2 @@
 DIST meld-3.14.2.tar.xz 505488 SHA256 
4a3c0951cd3b7e7ae2480f66adfb0e50b3bd301821d6e2adb518130446231873 SHA512 
a74b07db0e3ce4186d2ef4d2156ed1ad1a0cd39d953e999d75d457345d1a294fe0832049531b78fc8e75a038b07991fbfbcdf745d74e5b2802199a35007333b1
 WHIRLPOOL 
69823c4bc555e12f3b80c8f35f61fe44a22e246c2093e0535d69fadbcf5a55bf2e6ddc611ae2d5368173e4620d373cd26c85571d0e5648ebf82216ffcae6adf7
+DIST meld-3.16.0.tar.xz 532000 SHA256 
341bfd53ac7c0167d6d43694c0e7dbedf76463bdf79b425c439376ba15b56c0a SHA512 
12425fbdcafcd305bebbf368292c0481fd17b2e75f73c9788d9e017ab22b6ef986f3b4ec2fb44063141b6a6072975397402f7a59ed27666a788c73e4861dd720
 WHIRLPOOL 
d29c3dbccd762b75b5c251aff8da596e22a8818d7bddac913b7b930b8e6cf23c731cef6beb7f1181b8344daf9a2c25c0fbc59cda561c254a4784eb68140d7b13

diff --git a/dev-util/meld/meld-3.16.0.ebuild b/dev-util/meld/meld-3.16.0.ebuild
new file mode 100644
index 000..79faf36
--- /dev/null
+++ b/dev-util/meld/meld-3.16.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+PYTHON_REQ_USE="xml"
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_SINGLE_IMPL=1
+
+inherit gnome2 distutils-r1
+
+DESCRIPTION="A graphical diff and merge tool"
+HOMEPAGE="http://meldmerge.org/;
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux 
~x86-linux"
+IUSE=""
+
+RDEPEND="${PYTHON_DEPS}
+   >=dev-libs/glib-2.36:2[dbus]
+   dev-python/dbus-python[${PYTHON_USEDEP}]
+   >=dev-python/pygobject-3.8:3[cairo,${PYTHON_USEDEP}]
+   gnome-base/gsettings-desktop-schemas
+   >=x11-libs/gtk+-3.14:3[introspection]
+   >=x11-libs/gtksourceview-3.14:3.0[introspection]
+   x11-themes/hicolor-icon-theme
+"
+DEPEND="${RDEPEND}
+   dev-util/intltool
+   dev-util/itstool
+   sys-devel/gettext
+"
+
+python_compile_all() {
+   mydistutilsargs=( --no-update-icon-cache --no-compile-schemas )
+}



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

2016-03-25 Thread Dennis Lamm
commit: 8d15362959aafded3402085c8745993cd0c34c7d
Author: Dennis Lamm  gentoo  org>
AuthorDate: Fri Mar 25 12:07:18 2016 +
Commit: Dennis Lamm  gentoo  org>
CommitDate: Fri Mar 25 12:07:18 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d153629

dev-util/meld: Drop old

Package-Manager: portage-2.2.26

 dev-util/meld/Manifest   |  1 -
 dev-util/meld/meld-3.14.1.ebuild | 38 --
 2 files changed, 39 deletions(-)

diff --git a/dev-util/meld/Manifest b/dev-util/meld/Manifest
index a05d3bc..b05f32d 100644
--- a/dev-util/meld/Manifest
+++ b/dev-util/meld/Manifest
@@ -1,2 +1 @@
-DIST meld-3.14.1.tar.xz 496100 SHA256 
f43f750ed00da7925ecc70d6c5fc398c46ccf5af2f9e14b42c9a8afc7fbc06a3 SHA512 
dd32ff3012be14050f1c647fad2eb91b7018dbee1957b5609021283b8f769183e00ba8ef97f5ba6b9ace31e7344549075c9e4509d9140433e3fe8a6144a957cd
 WHIRLPOOL 
41459e736ec817856724aa8d01e6d009bc132d7db156a74b6d7a79d489d93096fded213c5ff277e83dc8812832289e24ad6f86920c64babd7402cc6cbc08b775
 DIST meld-3.14.2.tar.xz 505488 SHA256 
4a3c0951cd3b7e7ae2480f66adfb0e50b3bd301821d6e2adb518130446231873 SHA512 
a74b07db0e3ce4186d2ef4d2156ed1ad1a0cd39d953e999d75d457345d1a294fe0832049531b78fc8e75a038b07991fbfbcdf745d74e5b2802199a35007333b1
 WHIRLPOOL 
69823c4bc555e12f3b80c8f35f61fe44a22e246c2093e0535d69fadbcf5a55bf2e6ddc611ae2d5368173e4620d373cd26c85571d0e5648ebf82216ffcae6adf7

diff --git a/dev-util/meld/meld-3.14.1.ebuild b/dev-util/meld/meld-3.14.1.ebuild
deleted file mode 100644
index bf465c6..000
--- a/dev-util/meld/meld-3.14.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-PYTHON_REQ_USE="xml"
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit gnome2 distutils-r1
-
-DESCRIPTION="A graphical diff and merge tool"
-HOMEPAGE="http://meldmerge.org/;
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux 
~x86-linux"
-IUSE=""
-
-RDEPEND="${PYTHON_DEPS}
-   >=dev-libs/glib-2.36:2[dbus]
-   dev-python/dbus-python[${PYTHON_USEDEP}]
-   >=dev-python/pygobject-3.8:3[cairo,${PYTHON_USEDEP}]
-   gnome-base/gsettings-desktop-schemas
-   >=x11-libs/gtk+-3.12:3[introspection]
-   >=x11-libs/gtksourceview-3.10:3.0[introspection]
-   x11-themes/hicolor-icon-theme
-"
-DEPEND="${RDEPEND}
-   dev-util/intltool
-   dev-util/itstool
-   sys-devel/gettext
-"
-
-python_compile_all() {
-   mydistutilsargs=( --no-update-icon-cache --no-compile-schemas )
-}



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

2016-03-06 Thread Mikle Kolyada
commit: b1c6c3475ca9f6ebbafe787280b2e5ce79866bf3
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sun Mar  6 16:31:55 2016 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sun Mar  6 16:40:17 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1c6c347

dev-util/meld: x86 stable wrt bug #427546

Package-Manager: portage-2.2.26

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

diff --git a/dev-util/meld/meld-3.14.2.ebuild b/dev-util/meld/meld-3.14.2.ebuild
index 97b1245..bf465c6 100644
--- a/dev-util/meld/meld-3.14.2.ebuild
+++ b/dev-util/meld/meld-3.14.2.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="http://meldmerge.org/;
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux 
~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux 
~x86-linux"
 IUSE=""
 
 RDEPEND="${PYTHON_DEPS}



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

2015-12-12 Thread Pacho Ramos
commit: 83a827fab0f679de9117f6c484d0a18516edc5f6
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sat Dec 12 13:08:00 2015 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sat Dec 12 14:28:39 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83a827fa

dev-util/meld: Version bump

Package-Manager: portage-2.2.24

 dev-util/meld/Manifest   |  1 +
 dev-util/meld/meld-3.14.2.ebuild | 38 ++
 2 files changed, 39 insertions(+)

diff --git a/dev-util/meld/Manifest b/dev-util/meld/Manifest
index b2199e9..a81214f 100644
--- a/dev-util/meld/Manifest
+++ b/dev-util/meld/Manifest
@@ -1,2 +1,3 @@
 DIST meld-3.14.0.tar.xz 495168 SHA256 
430e2936b787c90ffa0999d3c94611fcaa64ca1920933f31550d5b931b4f103c SHA512 
3d64ad5e9c7b1a061b7ffd3b41343e521533a507aa90063499ab314339f541fc2099d17e570dd4c8f3d52e59a62d39e7b5e19c9a4d98dac5182c5080fbb43325
 WHIRLPOOL 
8cac08b5f3b8a577cb68148c0654d2e1dbd01a97f9768a5801e0e5ffc577af5535c3306972ada300d3dd7bb93e9528802e55dd0f11ae48490298b6e2efd63a6d
 DIST meld-3.14.1.tar.xz 496100 SHA256 
f43f750ed00da7925ecc70d6c5fc398c46ccf5af2f9e14b42c9a8afc7fbc06a3 SHA512 
dd32ff3012be14050f1c647fad2eb91b7018dbee1957b5609021283b8f769183e00ba8ef97f5ba6b9ace31e7344549075c9e4509d9140433e3fe8a6144a957cd
 WHIRLPOOL 
41459e736ec817856724aa8d01e6d009bc132d7db156a74b6d7a79d489d93096fded213c5ff277e83dc8812832289e24ad6f86920c64babd7402cc6cbc08b775
+DIST meld-3.14.2.tar.xz 505488 SHA256 
4a3c0951cd3b7e7ae2480f66adfb0e50b3bd301821d6e2adb518130446231873 SHA512 
a74b07db0e3ce4186d2ef4d2156ed1ad1a0cd39d953e999d75d457345d1a294fe0832049531b78fc8e75a038b07991fbfbcdf745d74e5b2802199a35007333b1
 WHIRLPOOL 
69823c4bc555e12f3b80c8f35f61fe44a22e246c2093e0535d69fadbcf5a55bf2e6ddc611ae2d5368173e4620d373cd26c85571d0e5648ebf82216ffcae6adf7

diff --git a/dev-util/meld/meld-3.14.2.ebuild b/dev-util/meld/meld-3.14.2.ebuild
new file mode 100644
index 000..3ed56a0
--- /dev/null
+++ b/dev-util/meld/meld-3.14.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+PYTHON_REQ_USE="xml"
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_SINGLE_IMPL=1
+
+inherit gnome2 distutils-r1
+
+DESCRIPTION="A graphical diff and merge tool"
+HOMEPAGE="http://meldmerge.org/;
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux 
~x86-linux"
+IUSE=""
+
+RDEPEND="${PYTHON_DEPS}
+   >=dev-libs/glib-2.36:2[dbus]
+   dev-python/dbus-python[${PYTHON_USEDEP}]
+   >=dev-python/pygobject-3.8:3[cairo,${PYTHON_USEDEP}]
+   gnome-base/gsettings-desktop-schemas
+   >=x11-libs/gtk+-3.12:3[introspection]
+   >=x11-libs/gtksourceview-3.10:3.0[introspection]
+   x11-themes/hicolor-icon-theme
+"
+DEPEND="${RDEPEND}
+   dev-util/intltool
+   dev-util/itstool
+   sys-devel/gettext
+"
+
+python_compile_all() {
+   mydistutilsargs=( --no-update-icon-cache --no-compile-schemas )
+}



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

2015-12-12 Thread Pacho Ramos
commit: 5f58302b3ee37614008279428309eca2f5ac41bb
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sat Dec 12 13:08:22 2015 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sat Dec 12 14:28:42 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f58302b

dev-util/meld: Drop old

Package-Manager: portage-2.2.24

 dev-util/meld/Manifest   |  1 -
 dev-util/meld/meld-3.14.0.ebuild | 38 --
 2 files changed, 39 deletions(-)

diff --git a/dev-util/meld/Manifest b/dev-util/meld/Manifest
index a81214f..a05d3bc 100644
--- a/dev-util/meld/Manifest
+++ b/dev-util/meld/Manifest
@@ -1,3 +1,2 @@
-DIST meld-3.14.0.tar.xz 495168 SHA256 
430e2936b787c90ffa0999d3c94611fcaa64ca1920933f31550d5b931b4f103c SHA512 
3d64ad5e9c7b1a061b7ffd3b41343e521533a507aa90063499ab314339f541fc2099d17e570dd4c8f3d52e59a62d39e7b5e19c9a4d98dac5182c5080fbb43325
 WHIRLPOOL 
8cac08b5f3b8a577cb68148c0654d2e1dbd01a97f9768a5801e0e5ffc577af5535c3306972ada300d3dd7bb93e9528802e55dd0f11ae48490298b6e2efd63a6d
 DIST meld-3.14.1.tar.xz 496100 SHA256 
f43f750ed00da7925ecc70d6c5fc398c46ccf5af2f9e14b42c9a8afc7fbc06a3 SHA512 
dd32ff3012be14050f1c647fad2eb91b7018dbee1957b5609021283b8f769183e00ba8ef97f5ba6b9ace31e7344549075c9e4509d9140433e3fe8a6144a957cd
 WHIRLPOOL 
41459e736ec817856724aa8d01e6d009bc132d7db156a74b6d7a79d489d93096fded213c5ff277e83dc8812832289e24ad6f86920c64babd7402cc6cbc08b775
 DIST meld-3.14.2.tar.xz 505488 SHA256 
4a3c0951cd3b7e7ae2480f66adfb0e50b3bd301821d6e2adb518130446231873 SHA512 
a74b07db0e3ce4186d2ef4d2156ed1ad1a0cd39d953e999d75d457345d1a294fe0832049531b78fc8e75a038b07991fbfbcdf745d74e5b2802199a35007333b1
 WHIRLPOOL 
69823c4bc555e12f3b80c8f35f61fe44a22e246c2093e0535d69fadbcf5a55bf2e6ddc611ae2d5368173e4620d373cd26c85571d0e5648ebf82216ffcae6adf7

diff --git a/dev-util/meld/meld-3.14.0.ebuild b/dev-util/meld/meld-3.14.0.ebuild
deleted file mode 100644
index bf465c6..000
--- a/dev-util/meld/meld-3.14.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-PYTHON_REQ_USE="xml"
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit gnome2 distutils-r1
-
-DESCRIPTION="A graphical diff and merge tool"
-HOMEPAGE="http://meldmerge.org/;
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux 
~x86-linux"
-IUSE=""
-
-RDEPEND="${PYTHON_DEPS}
-   >=dev-libs/glib-2.36:2[dbus]
-   dev-python/dbus-python[${PYTHON_USEDEP}]
-   >=dev-python/pygobject-3.8:3[cairo,${PYTHON_USEDEP}]
-   gnome-base/gsettings-desktop-schemas
-   >=x11-libs/gtk+-3.12:3[introspection]
-   >=x11-libs/gtksourceview-3.10:3.0[introspection]
-   x11-themes/hicolor-icon-theme
-"
-DEPEND="${RDEPEND}
-   dev-util/intltool
-   dev-util/itstool
-   sys-devel/gettext
-"
-
-python_compile_all() {
-   mydistutilsargs=( --no-update-icon-cache --no-compile-schemas )
-}



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

2015-10-04 Thread Pacho Ramos
commit: 3ae6144571b5a5504bb4cf9fea153d9a7a5f407b
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sun Oct  4 10:42:11 2015 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sun Oct  4 10:42:11 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ae61445

dev-util/meld: Drop old

Package-Manager: portage-2.2.22

 dev-util/meld/Manifest   |  1 -
 dev-util/meld/meld-3.12.3.ebuild | 39 ---
 2 files changed, 40 deletions(-)

diff --git a/dev-util/meld/Manifest b/dev-util/meld/Manifest
index 9193e67..b2199e9 100644
--- a/dev-util/meld/Manifest
+++ b/dev-util/meld/Manifest
@@ -1,3 +1,2 @@
-DIST meld-3.12.3.tar.xz 462856 SHA256 
db3572c5c6905b09f4fc28415a7f6f223014391492dd2165ed1bc8512ac4e6fd SHA512 
ea462ece2dcc1a6843ac6ce557aa0ed09c320078b1945d40f2436bbd9f953bf2d826043fc5ee18e4840210cb1da8dd6031f2922109f457400b292d044fd3d27e
 WHIRLPOOL 
e1a84aafc16b0cdf4f64f524abd4972b32a37504b9810252161e03feb27a975f29f6d3926d66a99cd9e005613fdb77dabb7367243a1d3d137585c8829e2ec28e
 DIST meld-3.14.0.tar.xz 495168 SHA256 
430e2936b787c90ffa0999d3c94611fcaa64ca1920933f31550d5b931b4f103c SHA512 
3d64ad5e9c7b1a061b7ffd3b41343e521533a507aa90063499ab314339f541fc2099d17e570dd4c8f3d52e59a62d39e7b5e19c9a4d98dac5182c5080fbb43325
 WHIRLPOOL 
8cac08b5f3b8a577cb68148c0654d2e1dbd01a97f9768a5801e0e5ffc577af5535c3306972ada300d3dd7bb93e9528802e55dd0f11ae48490298b6e2efd63a6d
 DIST meld-3.14.1.tar.xz 496100 SHA256 
f43f750ed00da7925ecc70d6c5fc398c46ccf5af2f9e14b42c9a8afc7fbc06a3 SHA512 
dd32ff3012be14050f1c647fad2eb91b7018dbee1957b5609021283b8f769183e00ba8ef97f5ba6b9ace31e7344549075c9e4509d9140433e3fe8a6144a957cd
 WHIRLPOOL 
41459e736ec817856724aa8d01e6d009bc132d7db156a74b6d7a79d489d93096fded213c5ff277e83dc8812832289e24ad6f86920c64babd7402cc6cbc08b775

diff --git a/dev-util/meld/meld-3.12.3.ebuild b/dev-util/meld/meld-3.12.3.ebuild
deleted file mode 100644
index bcd495f..000
--- a/dev-util/meld/meld-3.12.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-PYTHON_REQ_USE="xml"
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit gnome2 distutils-r1
-
-DESCRIPTION="A graphical diff and merge tool"
-HOMEPAGE="http://meldmerge.org/;
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux 
~x86-linux"
-IUSE=""
-
-RDEPEND="
-   ${PYTHON_DEPS}
-   >=dev-libs/glib-2.36:2
-   dev-python/dbus-python[${PYTHON_USEDEP}]
-   >=dev-python/pygobject-3.8:3[cairo,${PYTHON_USEDEP}]
-   gnome-base/gsettings-desktop-schemas
-   >=x11-libs/gtk+-3.6:3[introspection]
-   >=x11-libs/gtksourceview-3.6:3.0[introspection]
-   x11-themes/hicolor-icon-theme
-"
-DEPEND="${RDEPEND}
-   dev-util/intltool
-   dev-util/itstool
-   sys-devel/gettext
-"
-
-python_compile_all() {
-   mydistutilsargs=( --no-update-icon-cache --no-compile-schemas )
-}



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

2015-10-04 Thread Pacho Ramos
commit: 90cd7630f4449340fd6588b3d797d1e9c0852adb
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sun Oct  4 10:41:38 2015 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sun Oct  4 10:41:38 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90cd7630

dev-util/meld: Version bump

Package-Manager: portage-2.2.22

 dev-util/meld/Manifest   |  1 +
 dev-util/meld/meld-3.14.1.ebuild | 38 ++
 2 files changed, 39 insertions(+)

diff --git a/dev-util/meld/Manifest b/dev-util/meld/Manifest
index 868489a..9193e67 100644
--- a/dev-util/meld/Manifest
+++ b/dev-util/meld/Manifest
@@ -1,2 +1,3 @@
 DIST meld-3.12.3.tar.xz 462856 SHA256 
db3572c5c6905b09f4fc28415a7f6f223014391492dd2165ed1bc8512ac4e6fd SHA512 
ea462ece2dcc1a6843ac6ce557aa0ed09c320078b1945d40f2436bbd9f953bf2d826043fc5ee18e4840210cb1da8dd6031f2922109f457400b292d044fd3d27e
 WHIRLPOOL 
e1a84aafc16b0cdf4f64f524abd4972b32a37504b9810252161e03feb27a975f29f6d3926d66a99cd9e005613fdb77dabb7367243a1d3d137585c8829e2ec28e
 DIST meld-3.14.0.tar.xz 495168 SHA256 
430e2936b787c90ffa0999d3c94611fcaa64ca1920933f31550d5b931b4f103c SHA512 
3d64ad5e9c7b1a061b7ffd3b41343e521533a507aa90063499ab314339f541fc2099d17e570dd4c8f3d52e59a62d39e7b5e19c9a4d98dac5182c5080fbb43325
 WHIRLPOOL 
8cac08b5f3b8a577cb68148c0654d2e1dbd01a97f9768a5801e0e5ffc577af5535c3306972ada300d3dd7bb93e9528802e55dd0f11ae48490298b6e2efd63a6d
+DIST meld-3.14.1.tar.xz 496100 SHA256 
f43f750ed00da7925ecc70d6c5fc398c46ccf5af2f9e14b42c9a8afc7fbc06a3 SHA512 
dd32ff3012be14050f1c647fad2eb91b7018dbee1957b5609021283b8f769183e00ba8ef97f5ba6b9ace31e7344549075c9e4509d9140433e3fe8a6144a957cd
 WHIRLPOOL 
41459e736ec817856724aa8d01e6d009bc132d7db156a74b6d7a79d489d93096fded213c5ff277e83dc8812832289e24ad6f86920c64babd7402cc6cbc08b775

diff --git a/dev-util/meld/meld-3.14.1.ebuild b/dev-util/meld/meld-3.14.1.ebuild
new file mode 100644
index 000..3ed56a0
--- /dev/null
+++ b/dev-util/meld/meld-3.14.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+PYTHON_REQ_USE="xml"
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_SINGLE_IMPL=1
+
+inherit gnome2 distutils-r1
+
+DESCRIPTION="A graphical diff and merge tool"
+HOMEPAGE="http://meldmerge.org/;
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux 
~x86-linux"
+IUSE=""
+
+RDEPEND="${PYTHON_DEPS}
+   >=dev-libs/glib-2.36:2[dbus]
+   dev-python/dbus-python[${PYTHON_USEDEP}]
+   >=dev-python/pygobject-3.8:3[cairo,${PYTHON_USEDEP}]
+   gnome-base/gsettings-desktop-schemas
+   >=x11-libs/gtk+-3.12:3[introspection]
+   >=x11-libs/gtksourceview-3.10:3.0[introspection]
+   x11-themes/hicolor-icon-theme
+"
+DEPEND="${RDEPEND}
+   dev-util/intltool
+   dev-util/itstool
+   sys-devel/gettext
+"
+
+python_compile_all() {
+   mydistutilsargs=( --no-update-icon-cache --no-compile-schemas )
+}