public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: profiles/updates/, media-libs/openimageio/, media-gfx/blender/, media-libs/osl/, ...
@ 2023-10-27  2:59 Sam James
  0 siblings, 0 replies; only message in thread
From: Sam James @ 2023-10-27  2:59 UTC (permalink / raw
  To: gentoo-commits

commit:     1bc006a4583391f6a3cf3ae03799205fe535698a
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 27 02:59:06 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Oct 27 02:59:06 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1bc006a4

Revert "media-libs/openimageio -> media-libs/OpenImageIO: rename"

This reverts commit 060642c3e2944ee6d37afd3259c424b3a8f5bdec.

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

 media-gfx/blender/blender-3.3.6-r1.ebuild              |  2 +-
 media-gfx/blender/blender-3.3.8.ebuild                 |  2 +-
 media-gfx/blender/blender-3.4.1-r3.ebuild              |  2 +-
 media-gfx/blender/blender-3.5.1-r1.ebuild              |  2 +-
 media-gfx/blender/blender-3.6.0.ebuild                 |  2 +-
 media-gfx/blender/blender-9999.ebuild                  |  2 +-
 media-gfx/blender/metadata.xml                         |  2 +-
 media-libs/OpenImageIO/Manifest                        |  7 -------
 media-libs/embree/embree-3.13.4.ebuild                 |  2 +-
 media-libs/embree/embree-3.13.5.ebuild                 |  2 +-
 media-libs/opencolorio/opencolorio-2.1.3.ebuild        |  2 +-
 media-libs/opencolorio/opencolorio-2.2.1.ebuild        |  2 +-
 media-libs/opencolorio/opencolorio-2.3.0.ebuild        |  2 +-
 media-libs/openimageio/Manifest                        |  7 +++++++
 media-libs/{OpenImageIO => openimageio}/metadata.xml   |  2 +-
 .../openimageio-2.4.12.0.ebuild}                       | 18 +++++++++---------
 .../openimageio-2.4.13.0.ebuild}                       | 18 +++++++++---------
 .../openimageio-2.4.6.0-r1.ebuild}                     | 16 ++++++++--------
 media-libs/osl/osl-1.12.11.0.ebuild                    |  2 +-
 media-libs/osl/osl-1.12.13.0.ebuild                    |  2 +-
 media-libs/osl/osl-1.12.7.0.ebuild                     |  2 +-
 profiles/arch/powerpc/package.use.mask                 |  2 +-
 profiles/arch/powerpc/ppc64/64le/package.mask          |  2 +-
 profiles/arch/powerpc/ppc64/package.mask               |  2 +-
 profiles/arch/x86/package.use.stable.mask              |  2 +-
 profiles/updates/4Q-2023                               |  1 -
 26 files changed, 53 insertions(+), 54 deletions(-)

diff --git a/media-gfx/blender/blender-3.3.6-r1.ebuild b/media-gfx/blender/blender-3.3.6-r1.ebuild
index ff74f60260ae..8452075832d4 100644
--- a/media-gfx/blender/blender-3.3.6-r1.ebuild
+++ b/media-gfx/blender/blender-3.3.6-r1.ebuild
@@ -87,7 +87,7 @@ RDEPEND="${PYTHON_DEPS}
 	nls? ( virtual/libiconv )
 	openal? ( media-libs/openal )
 	oidn? ( >=media-libs/oidn-1.4.1 )
-	openimageio? ( >=media-libs/OpenImageIO-2.3.12.0-r3:= )
+	openimageio? ( >=media-libs/openimageio-2.3.12.0-r3:= )
 	openexr? (
 		>=dev-libs/imath-3.1.4-r2:=
 		>=media-libs/openexr-3:0=

diff --git a/media-gfx/blender/blender-3.3.8.ebuild b/media-gfx/blender/blender-3.3.8.ebuild
index ec894f0f44c9..12beb87e5c35 100644
--- a/media-gfx/blender/blender-3.3.8.ebuild
+++ b/media-gfx/blender/blender-3.3.8.ebuild
@@ -87,7 +87,7 @@ RDEPEND="${PYTHON_DEPS}
 	nls? ( virtual/libiconv )
 	openal? ( media-libs/openal )
 	oidn? ( >=media-libs/oidn-1.4.1 )
-	openimageio? ( >=media-libs/OpenImageIO-2.3.12.0-r3:= )
+	openimageio? ( >=media-libs/openimageio-2.3.12.0-r3:= )
 	openexr? (
 		>=dev-libs/imath-3.1.4-r2:=
 		>=media-libs/openexr-3:0=

diff --git a/media-gfx/blender/blender-3.4.1-r3.ebuild b/media-gfx/blender/blender-3.4.1-r3.ebuild
index 7aac532555f8..801a0d0bf0db 100644
--- a/media-gfx/blender/blender-3.4.1-r3.ebuild
+++ b/media-gfx/blender/blender-3.4.1-r3.ebuild
@@ -82,7 +82,7 @@ RDEPEND="${PYTHON_DEPS}
 	nls? ( virtual/libiconv )
 	openal? ( media-libs/openal )
 	oidn? ( >=media-libs/oidn-1.4.1 )
-	openimageio? ( >=media-libs/OpenImageIO-2.3.12.0-r3:= )
+	openimageio? ( >=media-libs/openimageio-2.3.12.0-r3:= )
 	openexr? (
 		>=dev-libs/imath-3.1.4-r2:=
 		>=media-libs/openexr-3:0=

diff --git a/media-gfx/blender/blender-3.5.1-r1.ebuild b/media-gfx/blender/blender-3.5.1-r1.ebuild
index 1cd394e1e6c6..879f40ec9257 100644
--- a/media-gfx/blender/blender-3.5.1-r1.ebuild
+++ b/media-gfx/blender/blender-3.5.1-r1.ebuild
@@ -61,7 +61,7 @@ RDEPEND="${PYTHON_DEPS}
 	media-libs/libjpeg-turbo:=
 	media-libs/libpng:=
 	media-libs/libsamplerate
-	>=media-libs/OpenImageIO-2.4.6.0:=
+	>=media-libs/openimageio-2.4.6.0:=
 	sys-libs/zlib:=
 	virtual/glu
 	virtual/libintl

diff --git a/media-gfx/blender/blender-3.6.0.ebuild b/media-gfx/blender/blender-3.6.0.ebuild
index 1cd394e1e6c6..879f40ec9257 100644
--- a/media-gfx/blender/blender-3.6.0.ebuild
+++ b/media-gfx/blender/blender-3.6.0.ebuild
@@ -61,7 +61,7 @@ RDEPEND="${PYTHON_DEPS}
 	media-libs/libjpeg-turbo:=
 	media-libs/libpng:=
 	media-libs/libsamplerate
-	>=media-libs/OpenImageIO-2.4.6.0:=
+	>=media-libs/openimageio-2.4.6.0:=
 	sys-libs/zlib:=
 	virtual/glu
 	virtual/libintl

diff --git a/media-gfx/blender/blender-9999.ebuild b/media-gfx/blender/blender-9999.ebuild
index 3eea70617d92..1d0f62f242c9 100644
--- a/media-gfx/blender/blender-9999.ebuild
+++ b/media-gfx/blender/blender-9999.ebuild
@@ -61,7 +61,7 @@ RDEPEND="${PYTHON_DEPS}
 	media-libs/libjpeg-turbo:=
 	media-libs/libpng:=
 	media-libs/libsamplerate
-	>=media-libs/OpenImageIO-2.4.6.0:=
+	>=media-libs/openimageio-2.4.6.0:=
 	sys-libs/zlib:=
 	virtual/glu
 	virtual/libintl

diff --git a/media-gfx/blender/metadata.xml b/media-gfx/blender/metadata.xml
index 7c630a02cee3..5b6cbb8d18d1 100644
--- a/media-gfx/blender/metadata.xml
+++ b/media-gfx/blender/metadata.xml
@@ -34,7 +34,7 @@
 			Build cycles renderer with nVidia CUDA support.
 		</flag>
 		<flag name="cycles">
-			Build cycles renderer (requires <pkg>media-libs/OpenImageIO</pkg> and
+			Build cycles renderer (requires <pkg>media-libs/openimageio</pkg> and
 			<pkg>dev-libs/boost</pkg>).
 		</flag>
 		<flag name="cycles-bin-kernels">

diff --git a/media-libs/OpenImageIO/Manifest b/media-libs/OpenImageIO/Manifest
deleted file mode 100644
index 1a670ec1834f..000000000000
--- a/media-libs/OpenImageIO/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST OpenImageIO-2.4.12.0.tar.gz 32157951 BLAKE2B dd7dd7b641266a7c575eafbc258ffc4b298236043960ae6ef878f46cd3ec3342f3be5b9a14459724578abc6390318666e43e8835ef6b2f25bc05a52002c7096f SHA512 5a0b9e6b634326be051dac46d2145149e9ff3e33d60d05728420d156431d6aa85186706b5f5b66ab820f4cd97f68d049a76e2da13f99e457135360f56fb5a257
-DIST OpenImageIO-2.4.13.0.tar.gz 32162857 BLAKE2B 43d6c16fb9dfba2e01ea6a7b68e8c72ec0c11be0d42d96e476a79b7972bcf61f2ac377009493e8fa9367001cc788a1453f8c0f1cf061a204f9da4b9f713d5554 SHA512 9e887c7039995ce7c41556e09a7eed940863260a522ecf7d9bec300189026ed507da560620dfa4a619deeb679be7adf42fe3a7020ff3094df777c7934c771227
-DIST OpenImageIO-2.4.6.0.tar.gz 10356052 BLAKE2B e5e660d8c2aee62cecaf520f9bc6bc65e243bd90a88b1a233f95fa3b4bb24390dbc80a922c313672c4d70a0de58bc7573d49ecfda35bde1ae95ecaeeccea90cb SHA512 cb16d767cde35852c9c3618f4eb22f81bc5ba52bce5354a0e819fe16dbd6941fb3847060e8efeb9e367121d8d6421042c82230751c1ea1d9f078bad6df044de6
-DIST OpenImageIO-oexr-test-image-df16e765fee28a947244657cae3251959ae63c00.tar.gz 252131865 BLAKE2B f5f2477897f84148574cdd02b673c7bdff49d8f45026375095bb6f184230466e2e60020be7583e5a5aa0aa9c971e7251979d3eeb2ee620d47342b1e4435427e0 SHA512 e89c2935496c5fec2ebe1175e9b9bd3aecb23374ec3947057195ee6d31a883c1a67c4dc754bf0a5b68859093b5e169b70ffabd4736cf67f9e3dc09f3299fc54f
-DIST OpenImageIO-oexr-test-image-f17e353fbfcde3406fe02675f4d92aeae422a560.tar.gz 252226183 BLAKE2B b94fb08515e18821e5b88c10031ca53675c56f96397e00b4e186d8dfb9f8557bc935ff102d61835590dca6deeef90dba03b81fd76a7958ab4d0592c042c2130a SHA512 26b9b2cda9d48554b8a53f06bc20301f8ff77dc5e1d7caf9ec45aaaefd8578d3d4d4b2e0a1d1b0f697805fdc0c5d4bae4948cea21821df3006ac0f8b9020f85f
-DIST OpenImageIO-oiio-test-image-245e50edede2792205080eadc1dedce33ff5c1e4.tar.gz 137900826 BLAKE2B e89fd990b5e3ef23a853fc554066804c2a092b74a7ee54e3f1654bf419904ca094fef2703cd2f29d90c6d2bc5b8c8808cf9e66eb858c6d8495fdb7941f5029d7 SHA512 6568d4171c7dbd12d86099fd3dc35bfe2cbd46af84e58884900c5cea6ccea0139eabdb6d2194217ab3cffac56a81d37db4fbae57eb2a05f7916c27fe75a51ee6
-DIST OpenImageIO-oiio-test-image-aae37a54e31c0e719edcec852994d052ecf6541e.tar.gz 137910473 BLAKE2B 4fb43e1dc0a726fc64085884494b8fef23a824d38e79c5ec33ab4bd9338f5efbb91a6b534b89f37f868838984e22530e8f938436674b0972537fb6b25f3b9d57 SHA512 d7e49efd1ce07364f226318b6572ceb46d654f22d94baa031dea05c6529b51a23a81ae6940136c3f7dd749f65f105c2efcdb5609b21b291110b92419233b2521

diff --git a/media-libs/embree/embree-3.13.4.ebuild b/media-libs/embree/embree-3.13.4.ebuild
index 03cb02f581bd..1925f9f320b4 100644
--- a/media-libs/embree/embree-3.13.4.ebuild
+++ b/media-libs/embree/embree-3.13.4.ebuild
@@ -30,7 +30,7 @@ RDEPEND="
 	tutorial? (
 		media-libs/libjpeg-turbo
 		>=media-libs/libpng-1.6.34:0=
-		>=media-libs/OpenImageIO-1.8.7:0=
+		>=media-libs/openimageio-1.8.7:0=
 	)
 "
 DEPEND="${RDEPEND}"

diff --git a/media-libs/embree/embree-3.13.5.ebuild b/media-libs/embree/embree-3.13.5.ebuild
index 4445462c8f10..7a4464c22033 100644
--- a/media-libs/embree/embree-3.13.5.ebuild
+++ b/media-libs/embree/embree-3.13.5.ebuild
@@ -28,7 +28,7 @@ RDEPEND="
 	tutorial? (
 		media-libs/libjpeg-turbo
 		>=media-libs/libpng-1.6.34:0=
-		>=media-libs/OpenImageIO-1.8.7:0=
+		>=media-libs/openimageio-1.8.7:0=
 	)
 "
 DEPEND="${RDEPEND}"

diff --git a/media-libs/opencolorio/opencolorio-2.1.3.ebuild b/media-libs/opencolorio/opencolorio-2.1.3.ebuild
index ca3439486480..6dfee6592f05 100644
--- a/media-libs/opencolorio/opencolorio-2.1.3.ebuild
+++ b/media-libs/opencolorio/opencolorio-2.1.3.ebuild
@@ -35,7 +35,7 @@ RDEPEND="
 	dev-libs/tinyxml
 	opengl? (
 		media-libs/lcms:2
-		>=media-libs/OpenImageIO-2.3.12.0-r3:=
+		>=media-libs/openimageio-2.3.12.0-r3:=
 		media-libs/glew:=
 		media-libs/freeglut
 		virtual/opengl

diff --git a/media-libs/opencolorio/opencolorio-2.2.1.ebuild b/media-libs/opencolorio/opencolorio-2.2.1.ebuild
index b18e4c59f212..b5c5ca2e8c1a 100644
--- a/media-libs/opencolorio/opencolorio-2.2.1.ebuild
+++ b/media-libs/opencolorio/opencolorio-2.2.1.ebuild
@@ -71,7 +71,7 @@ BDEPEND="
 	)
 "
 # 	test? (
-# 		>=media-libs/OpenImageIO-2.2.14
+# 		>=media-libs/openimageio-2.2.14
 # 		>=media-libs/osl-1.11
 # 	)
 # "

diff --git a/media-libs/opencolorio/opencolorio-2.3.0.ebuild b/media-libs/opencolorio/opencolorio-2.3.0.ebuild
index c6af877ca4f3..dc1dfe604786 100644
--- a/media-libs/opencolorio/opencolorio-2.3.0.ebuild
+++ b/media-libs/opencolorio/opencolorio-2.3.0.ebuild
@@ -71,7 +71,7 @@ BDEPEND="
 	)
 "
 # 	test? (
-# 		>=media-libs/OpenImageIO-2.2.14
+# 		>=media-libs/openimageio-2.2.14
 # 		>=media-libs/osl-1.11
 # 	)
 # "

diff --git a/media-libs/openimageio/Manifest b/media-libs/openimageio/Manifest
new file mode 100644
index 000000000000..d5e8b771c4cc
--- /dev/null
+++ b/media-libs/openimageio/Manifest
@@ -0,0 +1,7 @@
+DIST openimageio-2.4.12.0.tar.gz 32157785 BLAKE2B b2578165b389029dc6ad295b50d008790f9690c03ca17fda7c1d1ede84039ab4065cb1c88402e2b20913736d669a72781bb523d391af2403a10ddae148ae07a6 SHA512 bf8fa84c6732cabd2810a5cfbdd3ea41b273d82e51762426c8a2b60a31e114ff672c18ce433eb5cf27eb250996da18b7f9ece1b34093a0cb4c7305328174e74e
+DIST openimageio-2.4.13.0.tar.gz 32162551 BLAKE2B f0d219b2f585528e8901f695ccde0c599943914ce1b64faf53c172d9eacd3c2f6843a2fd7c1eebd6fcda762b61643a7ea5ed7fbabfd909963afedbedd8d200a1 SHA512 9325beefce55b66a58fcfc2ce93e1406558ed5f6cc37cb1e8e04aee470c4f30a14483bebfb311c329f7868afb6c508a052661c6b12d819a69f707c1a30cd9549
+DIST openimageio-2.4.6.0.tar.gz 31951691 BLAKE2B c21caf6784f366200127ba17a296e2134fa0d494e2cbf9cf592d020fdb820f62db0269545ac37c3969d64ddd8352d06a4f002fa9a7b3f05503ca9ec7d4a15415 SHA512 6e4e5294209c533eb9cf7c8df89b531bc77547df28af0d7964e255ce78142c201d5aa92a1f5f3b17348fdfc7d2a7aa9f2121acdf22fa98a6a872f0d31936bdf5
+DIST openimageio-oexr-test-image-df16e765fee28a947244657cae3251959ae63c00.tar.gz 252131865 BLAKE2B f5f2477897f84148574cdd02b673c7bdff49d8f45026375095bb6f184230466e2e60020be7583e5a5aa0aa9c971e7251979d3eeb2ee620d47342b1e4435427e0 SHA512 e89c2935496c5fec2ebe1175e9b9bd3aecb23374ec3947057195ee6d31a883c1a67c4dc754bf0a5b68859093b5e169b70ffabd4736cf67f9e3dc09f3299fc54f
+DIST openimageio-oexr-test-image-f17e353fbfcde3406fe02675f4d92aeae422a560.tar.gz 252226183 BLAKE2B b94fb08515e18821e5b88c10031ca53675c56f96397e00b4e186d8dfb9f8557bc935ff102d61835590dca6deeef90dba03b81fd76a7958ab4d0592c042c2130a SHA512 26b9b2cda9d48554b8a53f06bc20301f8ff77dc5e1d7caf9ec45aaaefd8578d3d4d4b2e0a1d1b0f697805fdc0c5d4bae4948cea21821df3006ac0f8b9020f85f
+DIST openimageio-oiio-test-image-245e50edede2792205080eadc1dedce33ff5c1e4.tar.gz 137901071 BLAKE2B 1e260eeba062026c719499425a3f7e3c2ccc7bd662725b6cceab4332d2d026bacc7df4c904cb776637ea60f9e2ba854d6e5010ffdc2a1621ad943b166d8402d3 SHA512 e7f7741d1cfadb3ea9ec5bab0b2556c58424c2dd89f938d5e93aeb99bff55479b11faa19cda4a481339be60de73317faa95e190d34d493c7825f706f4e57e73c
+DIST openimageio-oiio-test-image-aae37a54e31c0e719edcec852994d052ecf6541e.tar.gz 137910860 BLAKE2B 1dfc1a87ae895e62f223d915583378581cc1be12489d46155009ae10c8f63ab0fa93bfc06b67afe85f6e8a313779b9fed4e32cc6d9b92cd7d53d3c4b6e51bcce SHA512 7a46681a22145e96da5dc6ba4e6432ef38c6c352a607db348dcd194d86caa45b4f76ecb10c28cd50e3ee597404fbb3ede4acf071b4ebabc2de4e7b3cd204dade

diff --git a/media-libs/OpenImageIO/metadata.xml b/media-libs/openimageio/metadata.xml
similarity index 91%
rename from media-libs/OpenImageIO/metadata.xml
rename to media-libs/openimageio/metadata.xml
index 84fca6c20010..cdd067175302 100644
--- a/media-libs/OpenImageIO/metadata.xml
+++ b/media-libs/openimageio/metadata.xml
@@ -15,6 +15,6 @@
 		<flag name="tools">Build the command-line tools</flag>
 	</use>
 	<upstream>
-		<remote-id type="github">AcademySoftwareFoundation/OpenImageIO</remote-id>
+		<remote-id type="github">OpenImageIO/oiio</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/media-libs/OpenImageIO/OpenImageIO-2.4.12.0.ebuild b/media-libs/openimageio/openimageio-2.4.12.0.ebuild
similarity index 89%
rename from media-libs/OpenImageIO/OpenImageIO-2.4.12.0.ebuild
rename to media-libs/openimageio/openimageio-2.4.12.0.ebuild
index 6d4df45f2de3..031e7ea96764 100644
--- a/media-libs/OpenImageIO/OpenImageIO-2.4.12.0.ebuild
+++ b/media-libs/openimageio/openimageio-2.4.12.0.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=8
 
+FONT_PN=OpenImageIO
 PYTHON_COMPAT=( python3_{9..11} )
 
 TEST_OIIO_IMAGE_COMMIT="aae37a54e31c0e719edcec852994d052ecf6541e"
@@ -11,13 +12,12 @@ inherit cmake font python-single-r1
 
 DESCRIPTION="A library for reading and writing images"
 HOMEPAGE="https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO"
-SRC_URI="
-	https://github.com/AcademySoftwareFoundation/OpenImageIO/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	test? (
-		https://github.com/AcademySoftwareFoundation/OpenImageIO-images/archive/${TEST_OIIO_IMAGE_COMMIT}.tar.gz -> ${PN}-oiio-test-image-${TEST_OIIO_IMAGE_COMMIT}.tar.gz
-		https://github.com/AcademySoftwareFoundation/openexr-images/archive/${TEST_OEXR_IMAGE_COMMIT}.tar.gz -> ${PN}-oexr-test-image-${TEST_OEXR_IMAGE_COMMIT}.tar.gz
-	)
-"
+SRC_URI="https://github.com/OpenImageIO/oiio/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" test? (
+	https://github.com/OpenImageIO/oiio-images/archive/${TEST_OIIO_IMAGE_COMMIT}.tar.gz -> ${PN}-oiio-test-image-${TEST_OIIO_IMAGE_COMMIT}.tar.gz
+	https://github.com/AcademySoftwareFoundation/openexr-images/archive/${TEST_OEXR_IMAGE_COMMIT}.tar.gz -> ${PN}-oexr-test-image-${TEST_OEXR_IMAGE_COMMIT}.tar.gz
+)"
+S="${WORKDIR}/oiio-${PV}"
 
 LICENSE="BSD"
 SLOT="0/$(ver_cut 1-2)"
@@ -109,8 +109,8 @@ src_prepare() {
 
 	if use test ; then
 		mkdir -p "${BUILD_DIR}"/testsuite || die
-		mv "${WORKDIR}/${PN}-images-${TEST_OIIO_IMAGE_COMMIT}" "${BUILD_DIR}"/testsuite/oiio-images || die
-		mv "${WORKDIR}/openexr-images-${TEST_OEXR_IMAGE_COMMIT}" "${BUILD_DIR}"/testsuite/openexr-images || die
+		mv "${WORKDIR}"/oiio-images-${TEST_OIIO_IMAGE_COMMIT} "${BUILD_DIR}"/testsuite/oiio-images || die
+		mv "${WORKDIR}"/openexr-images-${TEST_OEXR_IMAGE_COMMIT} "${BUILD_DIR}"/testsuite/openexr-images || die
 	fi
 }
 

diff --git a/media-libs/OpenImageIO/OpenImageIO-2.4.13.0.ebuild b/media-libs/openimageio/openimageio-2.4.13.0.ebuild
similarity index 90%
rename from media-libs/OpenImageIO/OpenImageIO-2.4.13.0.ebuild
rename to media-libs/openimageio/openimageio-2.4.13.0.ebuild
index 748daf715907..8eedb3eb3558 100644
--- a/media-libs/OpenImageIO/OpenImageIO-2.4.13.0.ebuild
+++ b/media-libs/openimageio/openimageio-2.4.13.0.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=8
 
+FONT_PN=OpenImageIO
 PYTHON_COMPAT=( python3_{10..11} )
 
 TEST_OIIO_IMAGE_COMMIT="aae37a54e31c0e719edcec852994d052ecf6541e"
@@ -11,13 +12,12 @@ inherit cmake flag-o-matic font python-single-r1
 
 DESCRIPTION="A library for reading and writing images"
 HOMEPAGE="https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO"
-SRC_URI="
-	https://github.com/AcademySoftwareFoundation/OpenImageIO/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	test? (
-		https://github.com/AcademySoftwareFoundation/OpenImageIO-images/archive/${TEST_OIIO_IMAGE_COMMIT}.tar.gz -> ${PN}-oiio-test-image-${TEST_OIIO_IMAGE_COMMIT}.tar.gz
-		https://github.com/AcademySoftwareFoundation/openexr-images/archive/${TEST_OEXR_IMAGE_COMMIT}.tar.gz -> ${PN}-oexr-test-image-${TEST_OEXR_IMAGE_COMMIT}.tar.gz
-	)
-"
+SRC_URI="https://github.com/OpenImageIO/oiio/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" test? (
+	https://github.com/OpenImageIO/oiio-images/archive/${TEST_OIIO_IMAGE_COMMIT}.tar.gz -> ${PN}-oiio-test-image-${TEST_OIIO_IMAGE_COMMIT}.tar.gz
+	https://github.com/AcademySoftwareFoundation/openexr-images/archive/${TEST_OEXR_IMAGE_COMMIT}.tar.gz -> ${PN}-oexr-test-image-${TEST_OEXR_IMAGE_COMMIT}.tar.gz
+)"
+S="${WORKDIR}/oiio-${PV}"
 
 LICENSE="BSD"
 SLOT="0/$(ver_cut 1-2)"
@@ -109,8 +109,8 @@ src_prepare() {
 
 	if use test ; then
 		mkdir -p "${BUILD_DIR}"/testsuite || die
-		mv "${WORKDIR}/${PN}-images-${TEST_OIIO_IMAGE_COMMIT}" "${BUILD_DIR}"/testsuite/oiio-images || die
-		mv "${WORKDIR}/openexr-images-${TEST_OEXR_IMAGE_COMMIT}" "${BUILD_DIR}"/testsuite/openexr-images || die
+		mv "${WORKDIR}"/oiio-images-${TEST_OIIO_IMAGE_COMMIT} "${BUILD_DIR}"/testsuite/oiio-images || die
+		mv "${WORKDIR}"/openexr-images-${TEST_OEXR_IMAGE_COMMIT} "${BUILD_DIR}"/testsuite/openexr-images || die
 	fi
 }
 

diff --git a/media-libs/OpenImageIO/OpenImageIO-2.4.6.0-r1.ebuild b/media-libs/openimageio/openimageio-2.4.6.0-r1.ebuild
similarity index 91%
rename from media-libs/OpenImageIO/OpenImageIO-2.4.6.0-r1.ebuild
rename to media-libs/openimageio/openimageio-2.4.6.0-r1.ebuild
index ba2f255c1afd..09223e5d244c 100644
--- a/media-libs/OpenImageIO/OpenImageIO-2.4.6.0-r1.ebuild
+++ b/media-libs/openimageio/openimageio-2.4.6.0-r1.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=8
 
+FONT_PN=OpenImageIO
 PYTHON_COMPAT=( python3_{9..11} )
 
 TEST_OIIO_IMAGE_COMMIT="245e50edede2792205080eadc1dedce33ff5c1e4"
@@ -11,13 +12,12 @@ inherit cmake font python-single-r1
 
 DESCRIPTION="A library for reading and writing images"
 HOMEPAGE="https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO"
-SRC_URI="
-	https://github.com/AcademySoftwareFoundation/OpenImageIO/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	test? (
-		https://github.com/AcademySoftwareFoundation/OpenImageIO-images/archive/${TEST_OIIO_IMAGE_COMMIT}.tar.gz -> ${PN}-oiio-test-image-${TEST_OIIO_IMAGE_COMMIT}.tar.gz
+SRC_URI="https://github.com/OpenImageIO/oiio/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" test? (
+		https://github.com/OpenImageIO/oiio-images/archive/${TEST_OIIO_IMAGE_COMMIT}.tar.gz -> ${PN}-oiio-test-image-${TEST_OIIO_IMAGE_COMMIT}.tar.gz
 		https://github.com/AcademySoftwareFoundation/openexr-images/archive/${TEST_OEXR_IMAGE_COMMIT}.tar.gz -> ${PN}-oexr-test-image-${TEST_OEXR_IMAGE_COMMIT}.tar.gz
-	)
-"
+	)"
+S="${WORKDIR}/oiio-${PV}"
 
 LICENSE="BSD"
 SLOT="0/$(ver_cut 1-2)"
@@ -105,8 +105,8 @@ src_prepare() {
 
 	if use test ; then
 		mkdir -p "${BUILD_DIR}"/testsuite || die
-		mv "${WORKDIR}/${PN}-images-${TEST_OIIO_IMAGE_COMMIT}" "${BUILD_DIR}"/testsuite/oiio-images || die
-		mv "${WORKDIR}/openexr-images-${TEST_OEXR_IMAGE_COMMIT}" "${BUILD_DIR}"/testsuite/openexr-images || die
+		mv "${WORKDIR}"/oiio-images-${TEST_OIIO_IMAGE_COMMIT} "${BUILD_DIR}"/testsuite/oiio-images || die
+		mv "${WORKDIR}"/openexr-images-${TEST_OEXR_IMAGE_COMMIT} "${BUILD_DIR}"/testsuite/openexr-images || die
 	fi
 }
 

diff --git a/media-libs/osl/osl-1.12.11.0.ebuild b/media-libs/osl/osl-1.12.11.0.ebuild
index f73535ac16f9..58c299d89c9d 100644
--- a/media-libs/osl/osl-1.12.11.0.ebuild
+++ b/media-libs/osl/osl-1.12.11.0.ebuild
@@ -34,7 +34,7 @@ RDEPEND="
 	dev-libs/boost:=
 	dev-libs/pugixml
 	>=media-libs/openexr-3:0=
-	>=media-libs/OpenImageIO-2.3.12.0:=
+	>=media-libs/openimageio-2.3.12.0:=
 	<sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):=
 	sys-libs/zlib:=
 	python? (

diff --git a/media-libs/osl/osl-1.12.13.0.ebuild b/media-libs/osl/osl-1.12.13.0.ebuild
index 10cfd4a418fc..dd1d1fecff02 100644
--- a/media-libs/osl/osl-1.12.13.0.ebuild
+++ b/media-libs/osl/osl-1.12.13.0.ebuild
@@ -34,7 +34,7 @@ RDEPEND="
 	dev-libs/boost:=
 	dev-libs/pugixml
 	>=media-libs/openexr-3:0=
-	>=media-libs/OpenImageIO-2.3.12.0:=
+	>=media-libs/openimageio-2.3.12.0:=
 	<sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):=
 	sys-libs/zlib:=
 	python? (

diff --git a/media-libs/osl/osl-1.12.7.0.ebuild b/media-libs/osl/osl-1.12.7.0.ebuild
index 070e6b3e9375..901706148ec2 100644
--- a/media-libs/osl/osl-1.12.7.0.ebuild
+++ b/media-libs/osl/osl-1.12.7.0.ebuild
@@ -34,7 +34,7 @@ RDEPEND="
 	dev-libs/boost:=
 	dev-libs/pugixml
 	>=media-libs/openexr-3:0=
-	>=media-libs/OpenImageIO-2.3.12.0:=
+	>=media-libs/openimageio-2.3.12.0:=
 	<sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):=
 	sys-libs/zlib:=
 	python? (

diff --git a/profiles/arch/powerpc/package.use.mask b/profiles/arch/powerpc/package.use.mask
index 672434aa47c1..ec682d796980 100644
--- a/profiles/arch/powerpc/package.use.mask
+++ b/profiles/arch/powerpc/package.use.mask
@@ -210,7 +210,7 @@ x11-themes/qtcurve plasma
 
 # Jonathan Scruggs <j.scruggs@gmail.com> (2017-09-23)
 # dependencies not keyworded yet
-media-libs/OpenImageIO ptex
+media-libs/openimageio ptex
 
 # Arfrever Frehtes Taifersar Arahesis <arfrever.fta@gmail.com> (2017-08-22)
 # Dictionary Manager requires unkeyworded dev-qt/qtwebengine.

diff --git a/profiles/arch/powerpc/ppc64/64le/package.mask b/profiles/arch/powerpc/ppc64/64le/package.mask
index 29a6449f6bb1..703c39a8fa69 100644
--- a/profiles/arch/powerpc/ppc64/64le/package.mask
+++ b/profiles/arch/powerpc/ppc64/64le/package.mask
@@ -28,7 +28,7 @@
 -media-gfx/openvdb
 -media-libs/embree
 -media-libs/opencolorio
--media-libs/OpenImageIO
+-media-libs/openimageio
 -media-libs/osl
 
 # Sam James <sam@gentoo.org> (2021-10-16)

diff --git a/profiles/arch/powerpc/ppc64/package.mask b/profiles/arch/powerpc/ppc64/package.mask
index bb5dfed1f30f..ddeda73b9834 100644
--- a/profiles/arch/powerpc/ppc64/package.mask
+++ b/profiles/arch/powerpc/ppc64/package.mask
@@ -31,7 +31,7 @@ media-libs/ctl
 media-gfx/openvdb
 media-libs/embree
 media-libs/opencolorio
-media-libs/OpenImageIO
+media-libs/openimageio
 media-libs/osl
 
 # Sam James <sam@gentoo.org> (2021-10-16)

diff --git a/profiles/arch/x86/package.use.stable.mask b/profiles/arch/x86/package.use.stable.mask
index ed0fc7ba092b..9e2282f168af 100644
--- a/profiles/arch/x86/package.use.stable.mask
+++ b/profiles/arch/x86/package.use.stable.mask
@@ -33,7 +33,7 @@ kde-plasma/plasma-workspace gps
 media-gfx/graphviz gts
 media-libs/libpano13 suitesparse
 media-libs/opencv gdal lapack
-media-libs/OpenImageIO dicom
+media-libs/openimageio dicom
 sci-libs/cholmod partition
 sci-libs/gdal armadillo fits geos hdf5 netcdf ogdi
 sci-libs/gsl cblas-external

diff --git a/profiles/updates/4Q-2023 b/profiles/updates/4Q-2023
index 92cfaef70836..fc232094ccab 100644
--- a/profiles/updates/4Q-2023
+++ b/profiles/updates/4Q-2023
@@ -5,4 +5,3 @@ move dev-python/sphinx_lv2_theme dev-python/sphinx-lv2-theme
 move dev-python/jschema_to_python dev-python/jschema-to-python
 move dev-python/sarif_om dev-python/sarif-om
 move dev-python/memory_allocator dev-python/memory-allocator
-move media-libs/openimageio media-libs/OpenImageIO


^ permalink raw reply related	[flat|nested] only message in thread
only message in thread, other threads:[~2023-10-27  2:59 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-10-27  2:59 [gentoo-commits] repo/gentoo:master commit in: profiles/updates/, media-libs/openimageio/, media-gfx/blender/, media-libs/osl/, Sam James

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