[gentoo-commits] repo/gentoo:master commit in: dev-libs/imath/

["Joonas Niilola" <juippis@gentoo.org>]

commit:     47122ed36f9c089457664d4e7e75c4d4ee2f0a2e
Author:     Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Thu Jul 22 19:25:17 2021 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri Jul 23 07:41:02 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47122ed3

dev-libs/imath: add blocker for v3.0.1

Due to a file collision, probably caused by a missing slotmove, which
can occur when updating from v3.0.1 to v3.0.5. The blocker solves this.

Closes: https://bugs.gentoo.org/803347
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/21748
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 dev-libs/imath/{imath-3.0.5.ebuild => imath-3.0.5-r1.ebuild} | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/dev-libs/imath/imath-3.0.5.ebuild b/dev-libs/imath/imath-3.0.5-r1.ebuild
similarity index 93%
rename from dev-libs/imath/imath-3.0.5.ebuild
rename to dev-libs/imath/imath-3.0.5-r1.ebuild
index a4cce563f14..15316618778 100644
--- a/dev-libs/imath/imath-3.0.5.ebuild
+++ b/dev-libs/imath/imath-3.0.5-r1.ebuild
@@ -15,6 +15,7 @@ SRC_URI="https://github.com/AcademySoftwareFoundation/${MY_PN}/archive/refs/tags
 # re-keywording needed for (according to ilmbase keywords):
 # ~arm ~arm64 ~mips ~x64-macos ~x86-solaris
 KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="BSD"
 SLOT="3/28"
@@ -22,7 +23,9 @@ IUSE="doc large-stack python static-libs test"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 RESTRICT="!test? ( test )"
 
+# blocker due to file collision #803347
 RDEPEND="
+	!~dev-libs/imath-3.0.1:0
 	sys-libs/zlib
 	python? (
 		${PYTHON_DEPS}
@@ -39,13 +42,9 @@ BDEPEND="
 	python? ( ${PYTHON_DEPS} )
 "
 
-PATCHES=(
-	"${FILESDIR}"/${P}-0001-changes-needed-for-proper-slotting.patch
-)
+PATCHES=( "${FILESDIR}"/${P}-0001-changes-needed-for-proper-slotting.patch )
 DOCS=( CHANGES.md CONTRIBUTORS.md README.md SECURITY.md docs/PortingGuide2-3.md )
 
-S="${WORKDIR}/${MY_PN}-${PV}"
-
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
 }