public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/displaycal-py3/
@ 2024-08-01 16:23 Andreas Sturmlechner
  0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2024-08-01 16:23 UTC (permalink / raw
  To: gentoo-commits

commit:     e8260c1fb7c55cf1b19aab0a9e84a63e8f23e4a9
Author:     Filip Kobierski <fkobi <AT> pm <DOT> me>
AuthorDate: Thu Aug  1 11:03:40 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Aug  1 15:47:25 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8260c1f

media-gfx/displaycal-py3: drop 3.9.10-r0

Signed-off-by: Filip Kobierski <fkobi <AT> pm.me>
Closes: https://github.com/gentoo/gentoo/pull/37911
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../displaycal-py3/displaycal-py3-3.9.10.ebuild    | 66 ----------------------
 1 file changed, 66 deletions(-)

diff --git a/media-gfx/displaycal-py3/displaycal-py3-3.9.10.ebuild b/media-gfx/displaycal-py3/displaycal-py3-3.9.10.ebuild
deleted file mode 100644
index 0aef7b5146ef..000000000000
--- a/media-gfx/displaycal-py3/displaycal-py3-3.9.10.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{9..10} )
-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"
-
-DEPEND="
-	dev-python/build[${PYTHON_USEDEP}]
-	dev-python/certifi:0[${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 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/${P}" || die
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-}


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/displaycal-py3/
@ 2023-12-05  4:20 Michał Górny
  0 siblings, 0 replies; 4+ messages in thread
From: Michał Górny @ 2023-12-05  4:20 UTC (permalink / raw
  To: gentoo-commits

commit:     e94bf085fb28b26a70973bd72e1d66cdbda67062
Author:     Eli Schwartz <eschwartz93 <AT> gmail <DOT> com>
AuthorDate: Mon Nov 13 21:52:47 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Dec  5 04:20:33 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e94bf085

media-gfx/displaycal-py3: remove incorrect upstream certifi dependency

Upstream's setup.cfg has several oddities to it, including claiming an
RDEPEND on dev-python/build from when they copied their requirements.txt
verbatim into setup.cfg.

As for certifi specifically, it is handled in a fiddly try/except that
falls back to using a bundled copy that is copied over from certifi into
displaycal iff building a py2app/py2exe edition, and if that still
doesn't work, silently does nothing.

The object of all this is that if a custom cacert.pem is found
somewhere, it goes and sets os.environ['SSL_CERT_FILE'] to affect later
uses of urllib.request.

Reasonably enough, none of this is needed except on Windows and macOS,
so displaycal does precisely that: runs this entire thing only on
Windows and macOS. On Linux, it never even attempts to import certifi,
nor set an environment variable. So we shouldn't depend on it either.

Signed-off-by: Eli Schwartz <eschwartz93 <AT> gmail.com>
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 ...isplaycal-py3-3.9.10-r2.ebuild => displaycal-py3-3.9.10-r3.ebuild} | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/media-gfx/displaycal-py3/displaycal-py3-3.9.10-r2.ebuild b/media-gfx/displaycal-py3/displaycal-py3-3.9.10-r3.ebuild
similarity index 92%
rename from media-gfx/displaycal-py3/displaycal-py3-3.9.10-r2.ebuild
rename to media-gfx/displaycal-py3/displaycal-py3-3.9.10-r3.ebuild
index d6ac7689141f..6cf08031c321 100644
--- a/media-gfx/displaycal-py3/displaycal-py3-3.9.10-r2.ebuild
+++ b/media-gfx/displaycal-py3/displaycal-py3-3.9.10-r3.ebuild
@@ -28,7 +28,6 @@ PATCHES="${FILESDIR}/${P}-python-3.11.patch"
 
 DEPEND="
 	dev-python/build[${PYTHON_USEDEP}]
-	dev-python/certifi:0[${PYTHON_USEDEP}]
 	dev-python/dbus-python[${PYTHON_USEDEP}]
 	dev-python/distro[${PYTHON_USEDEP}]
 	dev-python/numpy[${PYTHON_USEDEP}]
@@ -46,6 +45,9 @@ 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


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/displaycal-py3/
@ 2023-05-02 22:26 Nick Sarnie
  0 siblings, 0 replies; 4+ messages in thread
From: Nick Sarnie @ 2023-05-02 22:26 UTC (permalink / raw
  To: gentoo-commits

commit:     b4c2d187b7808a86768364a9f396845f869ee495
Author:     Nick Sarnie <sarnex <AT> gentoo <DOT> org>
AuthorDate: Tue May  2 22:25:28 2023 +0000
Commit:     Nick Sarnie <sarnex <AT> gentoo <DOT> org>
CommitDate: Tue May  2 22:26:13 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4c2d187

media-gfx/displaycal-py3: Fix doc install dir

Closes: https://bugs.gentoo.org/905450

Signed-off-by: Nick Sarnie <sarnex <AT> gentoo.org>

 ...{displaycal-py3-3.9.10-r1.ebuild => displaycal-py3-3.9.10-r2.ebuild} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/displaycal-py3/displaycal-py3-3.9.10-r1.ebuild b/media-gfx/displaycal-py3/displaycal-py3-3.9.10-r2.ebuild
similarity index 95%
rename from media-gfx/displaycal-py3/displaycal-py3-3.9.10-r1.ebuild
rename to media-gfx/displaycal-py3/displaycal-py3-3.9.10-r2.ebuild
index 570bbc0db81d..d6ac7689141f 100644
--- a/media-gfx/displaycal-py3/displaycal-py3-3.9.10-r1.ebuild
+++ b/media-gfx/displaycal-py3/displaycal-py3-3.9.10-r2.ebuild
@@ -57,7 +57,7 @@ src_install() {
 	distutils-r1_src_install
 
 	# Use Gentoo package name for doc folder
-	mv "${ED}/usr/share/doc/${MY_P}" "${ED}/usr/share/doc/${P}" || die
+	mv "${ED}/usr/share/doc/${MY_P}" "${ED}/usr/share/doc/${PF}" || die
 }
 
 pkg_postinst() {


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/displaycal-py3/
@ 2023-02-20 18:43 Nick Sarnie
  0 siblings, 0 replies; 4+ messages in thread
From: Nick Sarnie @ 2023-02-20 18:43 UTC (permalink / raw
  To: gentoo-commits

commit:     014b42a59e00c0710b479014670565799404e179
Author:     Nick Sarnie <sarnex <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 20 18:37:27 2023 +0000
Commit:     Nick Sarnie <sarnex <AT> gentoo <DOT> org>
CommitDate: Mon Feb 20 18:42:38 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=014b42a5

media-gfx/displaycal-py3: new package, add 3.9.10

Closes: https://bugs.gentoo.org/724540

Signed-off-by: Nick Sarnie <sarnex <AT> gentoo.org>

 media-gfx/displaycal-py3/Manifest                  |  1 +
 .../displaycal-py3/displaycal-py3-3.9.10.ebuild    | 66 ++++++++++++++++++++++
 media-gfx/displaycal-py3/metadata.xml              | 17 ++++++
 3 files changed, 84 insertions(+)

diff --git a/media-gfx/displaycal-py3/Manifest b/media-gfx/displaycal-py3/Manifest
new file mode 100644
index 000000000000..9eff15b5ee37
--- /dev/null
+++ b/media-gfx/displaycal-py3/Manifest
@@ -0,0 +1 @@
+DIST DisplayCAL-3.9.10.tar.gz 10676033 BLAKE2B 94bfa3ac95bfc16788421fa5b9a31920c40da66d2875e4037b3b20b6792a1005ee9fea11b5325a94ffae845f56583647e42de9d4d7d96d149264a86e6d1158a6 SHA512 fc1b981925c6f4660557d8f0935a62d0112b39664b0c74cdb1a907e0e7b7e3f61ec76986fa2072f8ada1d105ebfa61bb116df75dc10f902ff545db3368634fc5

diff --git a/media-gfx/displaycal-py3/displaycal-py3-3.9.10.ebuild b/media-gfx/displaycal-py3/displaycal-py3-3.9.10.ebuild
new file mode 100644
index 000000000000..0aef7b5146ef
--- /dev/null
+++ b/media-gfx/displaycal-py3/displaycal-py3-3.9.10.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{9..10} )
+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"
+
+DEPEND="
+	dev-python/build[${PYTHON_USEDEP}]
+	dev-python/certifi:0[${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 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/${P}" || die
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+}

diff --git a/media-gfx/displaycal-py3/metadata.xml b/media-gfx/displaycal-py3/metadata.xml
new file mode 100644
index 000000000000..6ee5175df506
--- /dev/null
+++ b/media-gfx/displaycal-py3/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>sarnex@gentoo.org</email>
+    <name>Nick Sarnie</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">eoyilmaz/displaycal-py3</remote-id>
+  </upstream>
+  <longdescription>
+    This project intended to modernize the DisplayCAL code including Python 3 support.
+    Florian Höch, the original developer, did an incredible job of creating and maintaining DisplayCAL for all these years.
+    But, it seems that, during the pandemic, very understandably, he lost his passion to the project.
+    Now, it is time for us, the DisplayCAL community, to contribute back to this great tool.
+  </longdescription>
+</pkgmetadata>


^ permalink raw reply related	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2024-08-01 16:24 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-08-01 16:23 [gentoo-commits] repo/gentoo:master commit in: media-gfx/displaycal-py3/ Andreas Sturmlechner
  -- strict thread matches above, loose matches on Subject: below --
2023-12-05  4:20 Michał Górny
2023-05-02 22:26 Nick Sarnie
2023-02-20 18:43 Nick Sarnie

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox