public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/Imath/, profiles/
@ 2023-10-27  2:34 Sam James
  0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2023-10-27  2:34 UTC (permalink / raw
  To: gentoo-commits

commit:     a8cfff0ca3e694c5fe286dc05032f1f7d47386c7
Author:     Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com>
AuthorDate: Wed Oct 11 21:10:21 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Oct 27 02:31:50 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8cfff0c

dev-libs/Imath: add 3.1.9, remove 3.1.7

move 3.1.7 to 3.1.9 to fix soname issues
drop blockers on old removed packages

Closes: https://bugs.gentoo.org/907211
Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-libs/Imath/Imath-3.1.6.ebuild                         | 3 ---
 dev-libs/Imath/{Imath-3.1.7.ebuild => Imath-3.1.9.ebuild} | 9 +++------
 dev-libs/Imath/Manifest                                   | 2 +-
 profiles/package.mask                                     | 7 -------
 4 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/dev-libs/Imath/Imath-3.1.6.ebuild b/dev-libs/Imath/Imath-3.1.6.ebuild
index 7be7d851d903..3374d6407bba 100644
--- a/dev-libs/Imath/Imath-3.1.6.ebuild
+++ b/dev-libs/Imath/Imath-3.1.6.ebuild
@@ -21,11 +21,8 @@ RESTRICT="!test? ( test )"
 
 # blocker due to file collision #803347
 RDEPEND="
-	!dev-libs/imath:0
-	!media-libs/ilmbase
 	sys-libs/zlib
 	python? (
-		!dev-python/pyilmbase
 		${PYTHON_DEPS}
 		$(python_gen_cond_dep '
 			dev-libs/boost:=[python,${PYTHON_USEDEP}]

diff --git a/dev-libs/Imath/Imath-3.1.7.ebuild b/dev-libs/Imath/Imath-3.1.9.ebuild
similarity index 87%
rename from dev-libs/Imath/Imath-3.1.7.ebuild
rename to dev-libs/Imath/Imath-3.1.9.ebuild
index 6bf1de90a8d2..dd64ee70e7cb 100644
--- a/dev-libs/Imath/Imath-3.1.7.ebuild
+++ b/dev-libs/Imath/Imath-3.1.9.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit cmake python-single-r1
 
@@ -11,21 +11,18 @@ DESCRIPTION="Imath basic math package"
 HOMEPAGE="https://imath.readthedocs.io"
 SRC_URI="https://github.com/AcademySoftwareFoundation/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
 # re-keywording needed for (according to ilmbase keywords): ~x64-macos
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 LICENSE="BSD"
-SLOT="3/30"
+SLOT="3/29"
 IUSE="large-stack python test"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 RESTRICT="!test? ( test )"
 
 # blocker due to file collision #803347
 RDEPEND="
-	!dev-libs/imath:0
-	!media-libs/ilmbase
 	sys-libs/zlib
 	python? (
-		!dev-python/pyilmbase
 		${PYTHON_DEPS}
 		$(python_gen_cond_dep '
 			dev-libs/boost:=[python,${PYTHON_USEDEP}]

diff --git a/dev-libs/Imath/Manifest b/dev-libs/Imath/Manifest
index ea8c385883f6..22ce78503b62 100644
--- a/dev-libs/Imath/Manifest
+++ b/dev-libs/Imath/Manifest
@@ -1,2 +1,2 @@
 DIST Imath-3.1.6.tar.gz 573255 BLAKE2B c4d5a785a2aed9c5b9b1441ab016a5cf47abeb1d44c0625f0654e8c4d1e47dddddd62c61f83fd7b160beae8aaf5db9350d2a3bc43754e795fe75b10c4836a1b8 SHA512 c099a291ed7fd7702a7609575f2f3d2ed7f95256c23c2180e2ef1f76ceb07734365f57da5244b1d6cec81ca9859864eb4c9236df02a64aa783af6639a3b59acd
-DIST Imath-3.1.7.tar.gz 583049 BLAKE2B 54619339f349a944e1d72fcea4438d7bd2ef6c9655ba0e16ac608934a8df30c97a2f3cf5c75adaeb8a6fe6bf19ec3240c11439550b452571d0a8cbf75d6bd83e SHA512 e298454cb845cadde28f7881fdaa4739c3942f941278a07ec912459ac376c2ee7858cb3b2d2047b9afb4d4dacae7a8a52ffef4c104f8499b4e0a1f0ed46cc0f0
+DIST Imath-3.1.9.tar.gz 598497 BLAKE2B fe3afce26c19f5ddace3c420f9b83caca7b4c75902820fc2182ef9fb9f4d27581f27ca72262b63d65f794eeb73af55782412ba846d142072e0090ff7224d8960 SHA512 ad96b2ac306fc13c01e8ea3256f885499c3f545be327feaba0f5e093b70b544bcca6f8b353fa7e35107aae515c19caced44331a95d0414f367ead4691ec73564

diff --git a/profiles/package.mask b/profiles/package.mask
index 1573793c32fa..0fa9e167e5c2 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -382,13 +382,6 @@ net-misc/openr2
 =dev-db/mariadb-10.11.2
 =dev-db/mariadb-10.11.3
 
-# Bernd Waibel <waebbl-gentoo@posteo.net> (2023-05-31)
-# Mask this version for uptime soversion issue. There will be an updated release
-# shortly which fixes this.
-# See https://github.com/AcademySoftwareFoundation/Imath/issues/189#issuecomment-1567077722
-# Bug: #907211
-=dev-libs/Imath-3.1.7
-
 # Sam James <sam@gentoo.org> (2023-05-19)
 # Breaks Portage's pid-sandbox at least with 5.10 kernels. Pending investigation.
 # If you're hitting this, try: FEATURES="-pid-sandbox" emerge -v1 sys-apps/util-linux


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

* [gentoo-commits] repo/gentoo:master commit in: dev-libs/Imath/, profiles/
@ 2023-10-27  2:59 Sam James
  0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2023-10-27  2:59 UTC (permalink / raw
  To: gentoo-commits

commit:     3f0ec7571e66809cea92eca33970aa59935d8cea
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 27 02:58:39 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Oct 27 02:58:39 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f0ec757

Revert "dev-libs/Imath: add 3.1.9, remove 3.1.7"

This reverts commit a8cfff0ca3e694c5fe286dc05032f1f7d47386c7.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-libs/Imath/Imath-3.1.6.ebuild                         | 3 +++
 dev-libs/Imath/{Imath-3.1.9.ebuild => Imath-3.1.7.ebuild} | 9 ++++++---
 dev-libs/Imath/Manifest                                   | 2 +-
 profiles/package.mask                                     | 7 +++++++
 4 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/dev-libs/Imath/Imath-3.1.6.ebuild b/dev-libs/Imath/Imath-3.1.6.ebuild
index 3374d6407bba..7be7d851d903 100644
--- a/dev-libs/Imath/Imath-3.1.6.ebuild
+++ b/dev-libs/Imath/Imath-3.1.6.ebuild
@@ -21,8 +21,11 @@ RESTRICT="!test? ( test )"
 
 # blocker due to file collision #803347
 RDEPEND="
+	!dev-libs/imath:0
+	!media-libs/ilmbase
 	sys-libs/zlib
 	python? (
+		!dev-python/pyilmbase
 		${PYTHON_DEPS}
 		$(python_gen_cond_dep '
 			dev-libs/boost:=[python,${PYTHON_USEDEP}]

diff --git a/dev-libs/Imath/Imath-3.1.9.ebuild b/dev-libs/Imath/Imath-3.1.7.ebuild
similarity index 87%
rename from dev-libs/Imath/Imath-3.1.9.ebuild
rename to dev-libs/Imath/Imath-3.1.7.ebuild
index dd64ee70e7cb..6bf1de90a8d2 100644
--- a/dev-libs/Imath/Imath-3.1.9.ebuild
+++ b/dev-libs/Imath/Imath-3.1.7.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{9..11} )
 
 inherit cmake python-single-r1
 
@@ -11,18 +11,21 @@ DESCRIPTION="Imath basic math package"
 HOMEPAGE="https://imath.readthedocs.io"
 SRC_URI="https://github.com/AcademySoftwareFoundation/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
 # re-keywording needed for (according to ilmbase keywords): ~x64-macos
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 
 LICENSE="BSD"
-SLOT="3/29"
+SLOT="3/30"
 IUSE="large-stack python test"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 RESTRICT="!test? ( test )"
 
 # blocker due to file collision #803347
 RDEPEND="
+	!dev-libs/imath:0
+	!media-libs/ilmbase
 	sys-libs/zlib
 	python? (
+		!dev-python/pyilmbase
 		${PYTHON_DEPS}
 		$(python_gen_cond_dep '
 			dev-libs/boost:=[python,${PYTHON_USEDEP}]

diff --git a/dev-libs/Imath/Manifest b/dev-libs/Imath/Manifest
index 22ce78503b62..ea8c385883f6 100644
--- a/dev-libs/Imath/Manifest
+++ b/dev-libs/Imath/Manifest
@@ -1,2 +1,2 @@
 DIST Imath-3.1.6.tar.gz 573255 BLAKE2B c4d5a785a2aed9c5b9b1441ab016a5cf47abeb1d44c0625f0654e8c4d1e47dddddd62c61f83fd7b160beae8aaf5db9350d2a3bc43754e795fe75b10c4836a1b8 SHA512 c099a291ed7fd7702a7609575f2f3d2ed7f95256c23c2180e2ef1f76ceb07734365f57da5244b1d6cec81ca9859864eb4c9236df02a64aa783af6639a3b59acd
-DIST Imath-3.1.9.tar.gz 598497 BLAKE2B fe3afce26c19f5ddace3c420f9b83caca7b4c75902820fc2182ef9fb9f4d27581f27ca72262b63d65f794eeb73af55782412ba846d142072e0090ff7224d8960 SHA512 ad96b2ac306fc13c01e8ea3256f885499c3f545be327feaba0f5e093b70b544bcca6f8b353fa7e35107aae515c19caced44331a95d0414f367ead4691ec73564
+DIST Imath-3.1.7.tar.gz 583049 BLAKE2B 54619339f349a944e1d72fcea4438d7bd2ef6c9655ba0e16ac608934a8df30c97a2f3cf5c75adaeb8a6fe6bf19ec3240c11439550b452571d0a8cbf75d6bd83e SHA512 e298454cb845cadde28f7881fdaa4739c3942f941278a07ec912459ac376c2ee7858cb3b2d2047b9afb4d4dacae7a8a52ffef4c104f8499b4e0a1f0ed46cc0f0

diff --git a/profiles/package.mask b/profiles/package.mask
index 8d6d670938ff..9e3fb16662d2 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -382,6 +382,13 @@ net-misc/openr2
 =dev-db/mariadb-10.11.2
 =dev-db/mariadb-10.11.3
 
+# Bernd Waibel <waebbl-gentoo@posteo.net> (2023-05-31)
+# Mask this version for uptime soversion issue. There will be an updated release
+# shortly which fixes this.
+# See https://github.com/AcademySoftwareFoundation/Imath/issues/189#issuecomment-1567077722
+# Bug: #907211
+=dev-libs/Imath-3.1.7
+
 # Sam James <sam@gentoo.org> (2023-05-19)
 # Breaks Portage's pid-sandbox at least with 5.10 kernels. Pending investigation.
 # If you're hitting this, try: FEATURES="-pid-sandbox" emerge -v1 sys-apps/util-linux


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

* [gentoo-commits] repo/gentoo:master commit in: dev-libs/imath/, profiles/
@ 2023-10-27  3:20 Sam James
  0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2023-10-27  3:20 UTC (permalink / raw
  To: gentoo-commits

commit:     ad26be7b99ce5e0fc82abe7ab9a5d70cc886e24e
Author:     Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com>
AuthorDate: Wed Oct 11 21:10:21 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Oct 27 03:15:24 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad26be7b

dev-libs/Imath: add 3.1.9, remove 3.1.7

* move 3.1.7 to 3.1.9 to fix soname issues
* drop blockers on old removed packages

Closes: https://bugs.gentoo.org/907211
Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-libs/imath/Manifest                                   |  2 +-
 dev-libs/imath/imath-3.1.6.ebuild                         |  3 ---
 dev-libs/imath/{imath-3.1.7.ebuild => imath-3.1.9.ebuild} | 10 +++-------
 profiles/package.mask                                     |  7 -------
 4 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/dev-libs/imath/Manifest b/dev-libs/imath/Manifest
index 4bf4962b7f9d..0c1d8253aabe 100644
--- a/dev-libs/imath/Manifest
+++ b/dev-libs/imath/Manifest
@@ -1,2 +1,2 @@
 DIST imath-3.1.6.tar.gz 573255 BLAKE2B c4d5a785a2aed9c5b9b1441ab016a5cf47abeb1d44c0625f0654e8c4d1e47dddddd62c61f83fd7b160beae8aaf5db9350d2a3bc43754e795fe75b10c4836a1b8 SHA512 c099a291ed7fd7702a7609575f2f3d2ed7f95256c23c2180e2ef1f76ceb07734365f57da5244b1d6cec81ca9859864eb4c9236df02a64aa783af6639a3b59acd
-DIST imath-3.1.7.tar.gz 583049 BLAKE2B 54619339f349a944e1d72fcea4438d7bd2ef6c9655ba0e16ac608934a8df30c97a2f3cf5c75adaeb8a6fe6bf19ec3240c11439550b452571d0a8cbf75d6bd83e SHA512 e298454cb845cadde28f7881fdaa4739c3942f941278a07ec912459ac376c2ee7858cb3b2d2047b9afb4d4dacae7a8a52ffef4c104f8499b4e0a1f0ed46cc0f0
+DIST imath-3.1.9.tar.gz 598497 BLAKE2B fe3afce26c19f5ddace3c420f9b83caca7b4c75902820fc2182ef9fb9f4d27581f27ca72262b63d65f794eeb73af55782412ba846d142072e0090ff7224d8960 SHA512 ad96b2ac306fc13c01e8ea3256f885499c3f545be327feaba0f5e093b70b544bcca6f8b353fa7e35107aae515c19caced44331a95d0414f367ead4691ec73564

diff --git a/dev-libs/imath/imath-3.1.6.ebuild b/dev-libs/imath/imath-3.1.6.ebuild
index 140156298dbb..f1bce4102c11 100644
--- a/dev-libs/imath/imath-3.1.6.ebuild
+++ b/dev-libs/imath/imath-3.1.6.ebuild
@@ -24,11 +24,8 @@ RESTRICT="!test? ( test )"
 
 # blocker due to file collision #803347
 RDEPEND="
-	!dev-libs/imath:0
-	!media-libs/ilmbase
 	sys-libs/zlib
 	python? (
-		!dev-python/pyilmbase
 		${PYTHON_DEPS}
 		$(python_gen_cond_dep '
 			dev-libs/boost:=[python,${PYTHON_USEDEP}]

diff --git a/dev-libs/imath/imath-3.1.7.ebuild b/dev-libs/imath/imath-3.1.9.ebuild
similarity index 84%
rename from dev-libs/imath/imath-3.1.7.ebuild
rename to dev-libs/imath/imath-3.1.9.ebuild
index 2e490284d2c3..aea484a270f9 100644
--- a/dev-libs/imath/imath-3.1.7.ebuild
+++ b/dev-libs/imath/imath-3.1.9.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit cmake python-single-r1
 
@@ -12,23 +12,19 @@ MY_PN="${PN^}"
 DESCRIPTION="Imath basic math package"
 HOMEPAGE="https://imath.readthedocs.io"
 SRC_URI="https://github.com/AcademySoftwareFoundation/${MY_PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-# re-keywording needed for (according to ilmbase keywords): ~x64-macos
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
 S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="BSD"
-SLOT="3/30"
+SLOT="3/29"
 IUSE="large-stack python test"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 RESTRICT="!test? ( test )"
 
 # blocker due to file collision #803347
 RDEPEND="
-	!dev-libs/imath:0
-	!media-libs/ilmbase
 	sys-libs/zlib
 	python? (
-		!dev-python/pyilmbase
 		${PYTHON_DEPS}
 		$(python_gen_cond_dep '
 			dev-libs/boost:=[python,${PYTHON_USEDEP}]

diff --git a/profiles/package.mask b/profiles/package.mask
index ca1422449084..8d6d670938ff 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -382,13 +382,6 @@ net-misc/openr2
 =dev-db/mariadb-10.11.2
 =dev-db/mariadb-10.11.3
 
-# Bernd Waibel <waebbl-gentoo@posteo.net> (2023-05-31)
-# Mask this version for uptime soversion issue. There will be an updated release
-# shortly which fixes this.
-# See https://github.com/AcademySoftwareFoundation/Imath/issues/189#issuecomment-1567077722
-# Bug: #907211
-=dev-libs/imath-3.1.7
-
 # Sam James <sam@gentoo.org> (2023-05-19)
 # Breaks Portage's pid-sandbox at least with 5.10 kernels. Pending investigation.
 # If you're hitting this, try: FEATURES="-pid-sandbox" emerge -v1 sys-apps/util-linux


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

end of thread, other threads:[~2023-10-27  3:20 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-10-27  3:20 [gentoo-commits] repo/gentoo:master commit in: dev-libs/imath/, profiles/ Sam James
  -- strict thread matches above, loose matches on Subject: below --
2023-10-27  2:59 [gentoo-commits] repo/gentoo:master commit in: dev-libs/Imath/, profiles/ Sam James
2023-10-27  2:34 Sam James

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