diff options
| author | root <root@alpha.trunkmasters.com> | 2026-06-12 11:50:53 -0500 |
|---|---|---|
| committer | root <root@alpha.trunkmasters.com> | 2026-06-12 11:50:53 -0500 |
| commit | 290aebdea65a02557706eaeda477fef0437b6a48 (patch) | |
| tree | f87a939169a508a2e943570501b64cc16b411cda /dev-util/meld | |
| parent | 6783ddcd4b73d9ce586a71770caed352bec93b16 (diff) | |
| download | baldeagleos-repo-290aebdea65a02557706eaeda477fef0437b6a48.tar.gz baldeagleos-repo-290aebdea65a02557706eaeda477fef0437b6a48.tar.xz baldeagleos-repo-290aebdea65a02557706eaeda477fef0437b6a48.zip | |
Adding metadata
Diffstat (limited to 'dev-util/meld')
| -rw-r--r-- | dev-util/meld/Manifest | 2 | ||||
| -rw-r--r-- | dev-util/meld/files/meld-3.22.2-py3.13.patch | 33 | ||||
| -rw-r--r-- | dev-util/meld/meld-3.22.2-r1.ebuild | 78 | ||||
| -rw-r--r-- | dev-util/meld/meld-3.22.3.ebuild | 71 | ||||
| -rw-r--r-- | dev-util/meld/metadata.xml | 9 |
5 files changed, 0 insertions, 193 deletions
diff --git a/dev-util/meld/Manifest b/dev-util/meld/Manifest deleted file mode 100644 index 612ed0de8724..000000000000 --- a/dev-util/meld/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST meld-3.22.2.tar.xz 676376 BLAKE2B 5e592e378ac2c942dd98df6d9ac4f9af7a1eee552af1691aade2e0f453a5ddf649ca09c38191b2c2ffdb7b6fa165012b4d8372e9e99c33052f612e2ab8ca8670 SHA512 fd8b12567cd8dcf77f265d831c9ac9ba33d13fb78c95b01b496b016308ff4159963b4610a68f41d04a52cc5bcc13bb4568d24bbade5bd79246111e463e413284 -DIST meld-3.22.3.tar.xz 676560 BLAKE2B 2dc1a81aeb9307cba060fee095b4c497e93a46ae4235b6d077f7030c2e69a5d678d7cabd24650afab5a736bcdb8c077cce89a98c6376960a010015df0274a9a9 SHA512 8ac4aa046b12f2d9a35ce455493eb0f0531ceb3d137d30650fb6f83f31bf6c19d45cbb8bd6cc3a7fba7e6adc89644b579370f27462a8cde312a6c3c7c8181fb8 diff --git a/dev-util/meld/files/meld-3.22.2-py3.13.patch b/dev-util/meld/files/meld-3.22.2-py3.13.patch deleted file mode 100644 index b49499f63ce2..000000000000 --- a/dev-util/meld/files/meld-3.22.2-py3.13.patch +++ /dev/null @@ -1,33 +0,0 @@ -https://bugs.gentoo.org/941526 -https://gitlab.gnome.org/GNOME/meld/-/issues/873 -https://gitlab.gnome.org/GNOME/meld/-/commit/aa817dce6bb0667fc6ef38163c213803dc8b37b3 - -From aa817dce6bb0667fc6ef38163c213803dc8b37b3 Mon Sep 17 00:00:00 2001 -From: "FeRD (Frank Dana)" <ferdnyc@gmail.com> -Date: Fri, 29 Sep 2023 04:23:22 -0400 -Subject: [PATCH] Don't use deprecated pipes module - -Only `pipes.quote()` was being used in Meld, and that symbol in -pipes is just an import of `shlex.quote()` anyway. Switch to calling -`shlex.quote()` directly, since pipes will be removed in Python 3.13. ---- a/meld/melddoc.py -+++ b/meld/melddoc.py -@@ -17,7 +17,6 @@ - import enum - import logging - import os --import pipes - import shlex - import string - import subprocess -@@ -45,7 +44,7 @@ def make_custom_editor_command(path: str, line: int = 0) -> Sequence[str]: - log.error("Unsupported fields found") - return [custom_command, path] - else: -- cmd = custom_command.format(file=pipes.quote(path), line=line) -+ cmd = custom_command.format(file=shlex.quote(path), line=line) - return shlex.split(cmd) - - --- -GitLab diff --git a/dev-util/meld/meld-3.22.2-r1.ebuild b/dev-util/meld/meld-3.22.2-r1.ebuild deleted file mode 100644 index 9165bfa5db26..000000000000 --- a/dev-util/meld/meld-3.22.2-r1.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -PYTHON_COMPAT=( python3_{13..14} ) -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 ~ppc ~ppc64 ~riscv ~sparc x86" -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. - -PATCHES=( - "${FILESDIR}"/meld-3.22.2-py3.13.patch -) - -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 -} diff --git a/dev-util/meld/meld-3.22.3.ebuild b/dev-util/meld/meld-3.22.3.ebuild deleted file mode 100644 index 346199c7cb5f..000000000000 --- a/dev-util/meld/meld-3.22.3.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2026 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -PYTHON_COMPAT=( python3_{13..14} ) -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 ~ppc ~ppc64 ~riscv ~sparc x86" -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}]') -" - -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 -} diff --git a/dev-util/meld/metadata.xml b/dev-util/meld/metadata.xml deleted file mode 100644 index f6b6cde5f785..000000000000 --- a/dev-util/meld/metadata.xml +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://docs.baldeagleos.com/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>gnome@gentoo.org</email> - <name>Gentoo GNOME Desktop</name> - </maintainer> - <origin>baldeagleos-repo</origin> -</pkgmetadata> |
