commit: a957579a812c7d8064e0bb8df899eec373993273
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 20 13:01:14 2025 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Dec 20 13:14:12 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a957579a
media-gfx/displaycal-py3: Remove old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
media-gfx/displaycal-py3/Manifest | 2 -
.../displaycal-py3/displaycal-py3-3.9.10-r3.ebuild | 71 ------------------
.../displaycal-py3-3.9.13_pre20240925.ebuild | 78 --------------------
.../files/displaycal-py3-3.9.10-python-3.11.patch | 83 ----------------------
...splaycal-py3-3.9.13_pre20240925-Fix-build.patch | 57 ---------------
5 files changed, 291 deletions(-)
diff --git a/media-gfx/displaycal-py3/Manifest
b/media-gfx/displaycal-py3/Manifest
index a8d936d623ef..8beb9776ca0a 100644
--- a/media-gfx/displaycal-py3/Manifest
+++ b/media-gfx/displaycal-py3/Manifest
@@ -1,3 +1 @@
-DIST DisplayCAL-3.9.10.tar.gz 10676033 BLAKE2B
94bfa3ac95bfc16788421fa5b9a31920c40da66d2875e4037b3b20b6792a1005ee9fea11b5325a94ffae845f56583647e42de9d4d7d96d149264a86e6d1158a6
SHA512
fc1b981925c6f4660557d8f0935a62d0112b39664b0c74cdb1a907e0e7b7e3f61ec76986fa2072f8ada1d105ebfa61bb116df75dc10f902ff545db3368634fc5
-DIST DisplayCAL-3.9.13_pre20240925.tar.gz 14027557 BLAKE2B
915ef1b74e26da9efdb2dbb70ac0920fdb773868d7cbfc9ef7be5e4d60b300fe22ff54a7d762e3ef901c0ea70e0ba073881df055fecfec38afc8df873879064b
SHA512
82993dd4f922b2316954f29ec976851aecc263acbe0e01c1cc158013e04d829c0387b5440092a78bd61743cee416a3bc3cde905843dce9c8233eb18f68915184
DIST DisplayCAL-3.9.16.tar.gz 14406126 BLAKE2B
c7d50251feed08ce33cc2f09d3e23a5bfbe54c0634fa39926862a638689e6e52b1a567b3b7433b84498bc38ea0e70208f263ba01107e39940d7eaa2183db30dd
SHA512
54c0202b2803702b760b2b57a83ca273c4b70a504540e1bb4a543f0b16ad490b3f7d336516d754b3047c957fd8c274c779074422c55f6d422728c216e59aba64
diff --git a/media-gfx/displaycal-py3/displaycal-py3-3.9.10-r3.ebuild
b/media-gfx/displaycal-py3/displaycal-py3-3.9.10-r3.ebuild
deleted file mode 100644
index 6cf08031c321..000000000000
--- a/media-gfx/displaycal-py3/displaycal-py3-3.9.10-r3.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{9..11} )
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-
-inherit distutils-r1 xdg
-
-MY_PN="DisplayCAL"
-MY_P="${MY_PN}-${PV}"
-
-SRC_URI="https://github.com/eoyilmaz/displaycal-py3/releases/download/${PV}/${MY_P}.tar.gz";
-KEYWORDS="~amd64"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Modernize the DisplayCAL code including Python 3 support"
-HOMEPAGE="https://github.com/eoyilmaz/displaycal-py3";
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE=""
-
-RESTRICT="test"
-
-PATCHES="${FILESDIR}/${P}-python-3.11.patch"
-
-DEPEND="
- dev-python/build[${PYTHON_USEDEP}]
- dev-python/dbus-python[${PYTHON_USEDEP}]
- dev-python/distro[${PYTHON_USEDEP}]
- dev-python/numpy[${PYTHON_USEDEP}]
- dev-python/pillow[${PYTHON_USEDEP}]
- dev-python/pychromecast[${PYTHON_USEDEP}]
- dev-python/send2trash[${PYTHON_USEDEP}]
- dev-python/zeroconf[${PYTHON_USEDEP}]
- >=dev-python/wxpython-4.2.0[${PYTHON_USEDEP}]
- media-gfx/argyllcms
- x11-libs/libXxf86vm"
-
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- # Fix QA warning
- sed -e 's/license_file/license_files/g' -i setup.cfg || die
-
- # remove dependency only imported if `sys.platform in ("darwin",
"win32")`
- sed -e '/certifi/d' -i setup.cfg || die
-
- # Remove x-world MIME
- sed -i 's|x-world/x-vrml;||g' \
- misc/displaycal-vrml-to-x3d-converter.desktop || die
-
- distutils-r1_src_prepare
-}
-
-src_install() {
- distutils-r1_src_install
-
- # Use Gentoo package name for doc folder
- mv "${ED}/usr/share/doc/${MY_P}" "${ED}/usr/share/doc/${PF}" || die
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
-}
-
-pkg_postrm() {
- xdg_pkg_postrm
-}
diff --git a/media-gfx/displaycal-py3/displaycal-py3-3.9.13_pre20240925.ebuild
b/media-gfx/displaycal-py3/displaycal-py3-3.9.13_pre20240925.ebuild
deleted file mode 100644
index 8602a8c66ea1..000000000000
--- a/media-gfx/displaycal-py3/displaycal-py3-3.9.13_pre20240925.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_{9..12} )
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-
-inherit distutils-r1 xdg
-
-DESCRIPTION="Modernize the DisplayCAL code including Python 3 support"
-HOMEPAGE="https://github.com/eoyilmaz/displaycal-py3";
-
-MY_PN="DisplayCAL"
-MY_P="${MY_PN}-${PV}"
-MY_COMMIT="eda424388be5dc18f76b02f8d015d6b2ddafa174"
-SRC_URI="https://github.com/eoyilmaz/displaycal-py3/archive/${MY_COMMIT}.tar.gz
-> ${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-
-SLOT="0"
-KEYWORDS="~amd64"
-
-RESTRICT="test"
-
-PATCHES="${FILESDIR}/${P}-Fix-build.patch"
-
-DEPEND="
- dev-python/build[${PYTHON_USEDEP}]
- dev-python/dbus-python[${PYTHON_USEDEP}]
- dev-python/distro[${PYTHON_USEDEP}]
- dev-python/numpy[${PYTHON_USEDEP}]
- dev-python/pillow[${PYTHON_USEDEP}]
- dev-python/pychromecast[${PYTHON_USEDEP}]
- dev-python/send2trash[${PYTHON_USEDEP}]
- dev-python/zeroconf[${PYTHON_USEDEP}]
- >=dev-python/wxpython-4.2.0[${PYTHON_USEDEP}]
- dev-python/installer[${PYTHON_USEDEP}]
- dev-python/certifi[${PYTHON_USEDEP}]
- dev-python/wheel[${PYTHON_USEDEP}]
- media-gfx/argyllcms
- x11-libs/libXxf86vm"
-
-RDEPEND="${DEPEND}"
-
-src_unpack() {
- default
- # Upstream build system is very sensitive to the build folder name
- mv "${WORKDIR}/${PN}-${MY_COMMIT}" "${S}" || die
-}
-
-src_prepare() {
- sed -e 's/license_file/license_files/g' -i setup.cfg || die
-
- # remove dependency only imported if `sys.platform in ("darwin",
"win32")`
- sed -e '/certifi/d' -i setup.cfg || die
-
- # Remove x-world MIME
- sed -i 's|x-world/x-vrml;||g' \
- misc/displaycal-vrml-to-x3d-converter.desktop || die
-
- distutils-r1_src_prepare
-}
-
-src_install() {
- distutils-r1_src_install
-
- # Use Gentoo package name for doc folder
- mv "${ED}/usr/share/doc/${MY_P}" "${ED}/usr/share/doc/${PF}" || die
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
-}
-
-pkg_postrm() {
- xdg_pkg_postrm
-}
diff --git
a/media-gfx/displaycal-py3/files/displaycal-py3-3.9.10-python-3.11.patch
b/media-gfx/displaycal-py3/files/displaycal-py3-3.9.10-python-3.11.patch
deleted file mode 100644
index d8e7d05abfb4..000000000000
--- a/media-gfx/displaycal-py3/files/displaycal-py3-3.9.10-python-3.11.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-Based on
-https://github.com/eoyilmaz/displaycal-py3/commit/3762e7be0368484d68c4a90923672fdb0f51a5fc
-and
-https://github.com/eoyilmaz/displaycal-py3/commit/97f0c91f5855e4d21f47181ef596251eb03cb835
-
-diff --git a/DisplayCAL/RealDisplaySizeMM.py b/DisplayCAL/RealDisplaySizeMM.py
-index 00957692c..25b730d05 100644
---- a/DisplayCAL/RealDisplaySizeMM.py
-+++ b/DisplayCAL/RealDisplaySizeMM.py
-@@ -25,6 +25,8 @@
- from DisplayCAL.lib64.python39.RealDisplaySizeMM import *
- elif sys.version_info[:2] == (3, 10):
- from DisplayCAL.lib64.python310.RealDisplaySizeMM import *
-+ elif sys.version_info[:2] == (3, 11):
-+ from DisplayCAL.lib64.python311.RealDisplaySizeMM import *
- # else:
- # pass
-
-diff --git a/DisplayCAL/defaultpaths.py b/DisplayCAL/defaultpaths.py
-index cd11d6d75..59258e79d 100644
---- a/DisplayCAL/defaultpaths.py
-+++ b/DisplayCAL/defaultpaths.py
-@@ -235,9 +235,14 @@ def set_translation(obj):
- obj.GETTEXT_PACKAGE, locale_dir, codeset="UTF-8"
- )
- except TypeError:
-- obj.translation = gettext.translation(
-- obj.GETTEXT_PACKAGE, locale_dir
-- )
-+ try:
-+ obj.translation = gettext.translation(
-+ obj.GETTEXT_PACKAGE, locale_dir
-+ )
-+ except FileNotFoundError as exc:
-+ print("XDG:", exc)
-+ obj.translation = gettext.NullTranslations()
-+ return False
- except IOError as exception:
- print("XDG:", exception)
- obj.translation = gettext.NullTranslations()
-@@ -261,11 +266,7 @@ def get_config_files(filename):
-
- @staticmethod
- def shell_unescape(s):
-- a = []
-- for i, c in enumerate(s):
-- if c == "\\" and len(s) > i + 1:
-- continue
-- a.append(c)
-+ a = [c for i, c in enumerate(s) if c != "\\" or len(s) <= i + 1]
- return "".join(a)
-
- @staticmethod
-diff --git a/DisplayCAL/lib64/python311/__init__.py
b/DisplayCAL/lib64/python311/__init__.py
-new file mode 100644
-index 000000000..e69de29bb
-diff --git a/README.md b/README.md
-index 3ff3c4ec4..4119ace70 100644
---- a/README.md
-+++ b/README.md
-@@ -25,7 +25,7 @@ Here is a screenshots showing the tool working with Python
3.10:
-
-
-
--Currently, DisplayCAL is working with Python 3.8, 3.9 and 3.10 and wxPython
4.1.1 or 4.2.0.
-+Currently, DisplayCAL is working with Python 3.8, 3.9, 3.10 and 3.11 and
wxPython 4.1.1 or 4.2.0.
-
- Here is a list of things that is working:
-
-
-diff --git a/DisplayCAL/meta.py b/DisplayCAL/meta.py
-index 00b9c82c..30797cdf 100644
---- a/DisplayCAL/meta.py
-+++ b/DisplayCAL/meta.py
-@@ -62,7 +62,7 @@
- name_html = '<span class="appname">Display<span>CAL</span></span>'
-
- py_minversion = (3, 8)
--py_maxversion = (3, 10)
-+py_maxversion = (3, 11)
-
- version = VERSION_STRING
- version_lin = VERSION_STRING # Linux
diff --git
a/media-gfx/displaycal-py3/files/displaycal-py3-3.9.13_pre20240925-Fix-build.patch
b/media-gfx/displaycal-py3/files/displaycal-py3-3.9.13_pre20240925-Fix-build.patch
deleted file mode 100644
index 6d7ad881054b..000000000000
---
a/media-gfx/displaycal-py3/files/displaycal-py3-3.9.13_pre20240925-Fix-build.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-diff --git a/DisplayCAL/__version__.py b/DisplayCAL/__version__.py
-new file mode 100644
-index 00000000..28eceb81
---- /dev/null
-+++ b/DisplayCAL/__version__.py
-@@ -0,0 +1,7 @@
-+# generated by setup.py
-+
-+BUILD_DATE = "2022-11-21T22:56:25Z"
-+LASTMOD = '2022-11-21T22:55:57Z'
-+VERSION = (3, 9, 13)
-+VERSION_BASE = (3, 9, 13)
-+VERSION_STRING = '3.9.13_pre20240925'
-diff --git a/DisplayCAL/setup.py b/DisplayCAL/setup.py
-index 27425a18..43b6143b 100644
---- a/DisplayCAL/setup.py
-+++ b/DisplayCAL/setup.py
-@@ -384,9 +384,12 @@ def get_data(tgt_dir, key, pkgname=None, subkey=None,
excludes=None):
- data = []
- for pth in files:
- if not [exclude for exclude in excludes or [] if fnmatch(pth,
exclude)]:
-- normalized_path = os.path.normpath(os.path.join(tgt_dir,
os.path.dirname(pth)))
-- safe_path = [relpath(p, src_dir) for p in
safe_glob(os.path.join(src_dir, pth))]
-- data.append((normalized_path, safe_path))
-+ data.append(
-+ (
-+ os.path.normpath(os.path.join(tgt_dir,
os.path.dirname(pth))),
-+ safe_glob(os.path.join(src_dir, pth)),
-+ )
-+ )
- return data
-
-
-@@ -659,20 +662,6 @@ def setup():
- )
- )
-
-- # metainfo / appdata.xml
-- data_files.append(
-- (
-- os.path.join(os.path.dirname(data), "metainfo"),
-- [
-- relpath(
-- os.path.normpath(
-- os.path.join(pydir, "..", "dist",
f"{appstream_id}.appdata.xml")
-- ),
-- source_dir,
-- )
-- ],
-- )
-- )
-
- if sys.platform not in ("darwin", "win32") or do_py2app or do_py2exe:
- # Linux/Unix or py2app/py2exe
---
-2.45.2
-
