From b0bab803d2f1c96af5760374e2684f9a85591916 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 2 Oct 2022 01:11:51 +0100 Subject: gentoo auto-resync : 02:10:2022 - 01:11:51 --- dev-util/meld/Manifest | 2 +- dev-util/meld/meld-3.22.0-r1.ebuild | 64 +++++++++++++++++++++++++++++++++++++ dev-util/meld/meld-3.22.0.ebuild | 63 ------------------------------------ 3 files changed, 65 insertions(+), 64 deletions(-) create mode 100644 dev-util/meld/meld-3.22.0-r1.ebuild delete mode 100644 dev-util/meld/meld-3.22.0.ebuild (limited to 'dev-util/meld') diff --git a/dev-util/meld/Manifest b/dev-util/meld/Manifest index 88c9cb0ec48a..8a01f5ef13e8 100644 --- a/dev-util/meld/Manifest +++ b/dev-util/meld/Manifest @@ -1,5 +1,5 @@ DIST meld-3.20.4.tar.xz 617020 BLAKE2B 70bdd7c6ecfd4dd99d1bc0b503900da65563ba74469b97590da4971d0597d4023cf74a3fd6300701d73fe7ed1b646089a5b23527e4a519313816f53c31632dad SHA512 e7b5c07e68972e7e8e4d396140fa2ee627609728533269f1bc52e9339e89a58f0949a1e8ec7b7847eec3eff5a67ea0bd5e07ad8002d2c640d173f9b0c4aa724e DIST meld-3.22.0.tar.xz 674212 BLAKE2B 1d5af5fa9943c46fd150bd1e1c74003579a0017dea56178e92c4ba0dd1ba0bc3348a6f2625bfe5191fe4d8394b06462a30f2173ae623ffd32c637642f9c36183 SHA512 4cc1c9a76379401c1f116292bb4730301ec0f2413cdab7b463ed519ea7ee0ee86143a9c83a13f1ef09860aad192c04769d111bfb1eb10b5e1bc81fb44c530526 EBUILD meld-3.20.4.ebuild 1732 BLAKE2B 011373c0cb2155e968c762e1132fff049a6f34f6027b41f24352ea13cf5d603d374d754ff7008fb91ec1f332002f18e7cb7538edeedc4b15c65fe213557f4957 SHA512 1de351b39e4c3d47c7205bfaba733197960c1cc7e1709082e79cfc71a1ee2148d41654843a492bd4eeec708e8ee464fa36c366f08c638cd88cd8a7a3334f36c3 -EBUILD meld-3.22.0.ebuild 1466 BLAKE2B c060f32e42159746f8cbc3a306db77831f8db9a9b2226a448824e7f367abe497b76243ed37e5ebf8cb9145c9db0c323943df44e74b1b52d5f3be0596e17f6001 SHA512 ccb01545b09f849eeca312d582093b06502250ebc239e1039d53c653e480a3cb06a2b3d87b459c94b04b3feffbf1ef5dc8281dd267179c4933dcecb14894192c +EBUILD meld-3.22.0-r1.ebuild 1507 BLAKE2B a401bc397fe3e653e180ae65ab8168f71f6f450fe928ca70ad6411c49989711c17f49123fa18676c1a48c230840065ea875138a02612eda36216c6801ae58b47 SHA512 c2ccc01451e34f2677ed084b95b011dd229f227101c6b650b12e7f1f96f1220fbecbdfdb767f260fa33b43ae0ac145b81bc4cf45f82f93780bc05c79b01bfa54 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8 diff --git a/dev-util/meld/meld-3.22.0-r1.ebuild b/dev-util/meld/meld-3.22.0-r1.ebuild new file mode 100644 index 000000000000..8b8cafb1d5ae --- /dev/null +++ b/dev-util/meld/meld-3.22.0-r1.ebuild @@ -0,0 +1,64 @@ +# 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 + python_fix_shebang "${ED}"/usr/bin/meld +} diff --git a/dev-util/meld/meld-3.22.0.ebuild b/dev-util/meld/meld-3.22.0.ebuild deleted file mode 100644 index 546bbe598e0a..000000000000 --- a/dev-util/meld/meld-3.22.0.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# 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 -} -- cgit v1.2.3