From c4d92ab721dfc646b4a58429d965e9446294ce26 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 4 Dec 2022 21:03:51 +0000 Subject: gentoo auto-resync : 04:12:2022 - 21:03:51 --- dev-util/meld/Manifest | 2 +- dev-util/meld/meld-3.22.0-r1.ebuild | 74 ------------------------------------- dev-util/meld/meld-3.22.0-r2.ebuild | 74 +++++++++++++++++++++++++++++++++++++ 3 files changed, 75 insertions(+), 75 deletions(-) delete mode 100644 dev-util/meld/meld-3.22.0-r1.ebuild create mode 100644 dev-util/meld/meld-3.22.0-r2.ebuild (limited to 'dev-util/meld') diff --git a/dev-util/meld/Manifest b/dev-util/meld/Manifest index 80ebb13f6484..9afdd5d3b41a 100644 --- a/dev-util/meld/Manifest +++ b/dev-util/meld/Manifest @@ -1,3 +1,3 @@ DIST meld-3.22.0.tar.xz 674212 BLAKE2B 1d5af5fa9943c46fd150bd1e1c74003579a0017dea56178e92c4ba0dd1ba0bc3348a6f2625bfe5191fe4d8394b06462a30f2173ae623ffd32c637642f9c36183 SHA512 4cc1c9a76379401c1f116292bb4730301ec0f2413cdab7b463ed519ea7ee0ee86143a9c83a13f1ef09860aad192c04769d111bfb1eb10b5e1bc81fb44c530526 -EBUILD meld-3.22.0-r1.ebuild 1651 BLAKE2B 6d3c91c56a3c6c136c2fd23dc0912ae25351bd400117e40db6ce93ba883369af9c18b28c2a87c4dbbf921299694e158310fd99df5bb15c762c436c3d8df88463 SHA512 efc918121afa280470d7dcaaf9331412078c6828137cff8e648cabaf1320f6aa832e8d1eee70cfc70a46117f6c461a1ad3862084d34702053cc20c79e1300f8a +EBUILD meld-3.22.0-r2.ebuild 1640 BLAKE2B 75a23231f2b6a70b9c9f83060a28051e3c9b25f99bc30cc743cb5c86a0328cbd01f43f2185c52219491f4950864141cd6510a357b56d5755d3a1cbfffc5b544d SHA512 9c67034c3474563386298eb49de7a7d2d919ee207ac9cc47c76a543fe4cd446831a134152f26655acee0c6b8c6658112a8c8f0293866be9550e06a896d5f5e4f MISC metadata.xml 345 BLAKE2B 3983c99529677ef9ca8365596b512eb33383219b31af470e3721379d6cd0975a9550200ee154549973849f7cc0ed16333cb91cb387e1e23dca2047faa1e0f91b SHA512 b04c508f3924cf28491c83f1cdb797332abe85bd016434805abfd082722f5a1d5616db3cdf9bbc139e2f66f91c81ccb9f4cfc0b1ce7708d06cd13e624ba11c89 diff --git a/dev-util/meld/meld-3.22.0-r1.ebuild b/dev-util/meld/meld-3.22.0-r1.ebuild deleted file mode 100644 index 7a048446df60..000000000000 --- a/dev-util/meld/meld-3.22.0-r1.ebuild +++ /dev/null @@ -1,74 +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 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_icon_cache_update - xdg_desktop_database_update -} - -pkg_postrm() { - xdg_icon_cache_update - xdg_desktop_database_update -} diff --git a/dev-util/meld/meld-3.22.0-r2.ebuild b/dev-util/meld/meld-3.22.0-r2.ebuild new file mode 100644 index 000000000000..2944993f987d --- /dev/null +++ b/dev-util/meld/meld-3.22.0-r2.ebuild @@ -0,0 +1,74 @@ +# 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 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 +} -- cgit v1.2.3