[gentoo-commits] repo/gentoo:master commit in: media-gfx/openvdb/

[Sam James]

commit:     59dc07c51f1fa0b7d092f5696c62da83349e8c7f
Author:     Adrian Grigo <agrigo2001 <AT> yahoo <DOT> com <DOT> au>
AuthorDate: Wed Aug 19 22:03:58 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Aug 24 13:41:54 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59dc07c5

media-gfx/openvdb: Remove support for ABI3 from openvdb 6

Openvdb 6 deprecated ABI 3. Support for it has been removed.
Openvdb 6 supports ABI 4 to 6.
ABI 3 is still available in Openvdb 4 and 5.

Signed-off-by: Adrian Grigo <agrigo2001 <AT> yahoo.com.au>
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/openvdb/metadata.xml            | 2 +-
 media-gfx/openvdb/openvdb-5.2.0-r1.ebuild | 3 ++-
 media-gfx/openvdb/openvdb-6.2.1.ebuild    | 8 +++-----
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/media-gfx/openvdb/metadata.xml b/media-gfx/openvdb/metadata.xml
index 7d62609da7c..aac3bf03086 100644
--- a/media-gfx/openvdb/metadata.xml
+++ b/media-gfx/openvdb/metadata.xml
@@ -18,7 +18,7 @@
                <flag restrict="&gt;=media-gfx/openvdb-7.0.0" name="numpy">
                        Build pyopenvdb with support for 
<pkg>dev-python/numpy</pkg>
                </flag>
-               <flag restrict="&lt;=media-gfx/openvdb-7.0.0" 
name="abi3-compat">
+               <flag restrict="&lt;=media-gfx/openvdb-6.0.0" 
name="abi3-compat">
                        Disables newer features to maintain compatibility with 
ABI3.
                </flag>
                <flag restrict="&lt;=media-gfx/openvdb-7.0.0" 
name="abi4-compat">

diff --git a/media-gfx/openvdb/openvdb-5.2.0-r1.ebuild 
b/media-gfx/openvdb/openvdb-5.2.0-r1.ebuild
index 5871d41b900..744922c69e8 100644
--- a/media-gfx/openvdb/openvdb-5.2.0-r1.ebuild
+++ b/media-gfx/openvdb/openvdb-5.2.0-r1.ebuild
@@ -54,7 +54,8 @@ DEPEND="${RDEPEND}
        )
        test? ( dev-util/cppunit )"
 
-PATCHES=( "${FILESDIR}/${P}-use-gnuinstalldirs.patch"
+PATCHES=(
+       "${FILESDIR}/${P}-use-gnuinstalldirs.patch"
        "${FILESDIR}/${P}-use-pkgconfig-for-ilmbase-and-openexr.patch"
        "${FILESDIR}/${PN}-4.0.2-fix-const-correctness-for-unittest.patch"
        "${FILESDIR}/${PN}-4.0.2-fix-build-docs.patch"

diff --git a/media-gfx/openvdb/openvdb-6.2.1.ebuild 
b/media-gfx/openvdb/openvdb-6.2.1.ebuild
index e9fd355cdf5..11a4fd54333 100644
--- a/media-gfx/openvdb/openvdb-6.2.1.ebuild
+++ b/media-gfx/openvdb/openvdb-6.2.1.ebuild
@@ -15,12 +15,12 @@ 
SRC_URI="https://github.com/AcademySoftwareFoundation/${PN}/archive/v${PV}.tar.g
 LICENSE="MPL-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="abi3-compat abi4-compat abi5-compat abi6-compat doc python test"
+IUSE="abi4-compat abi5-compat abi6-compat doc python test"
 RESTRICT="!test? ( test )"
 
 REQUIRED_USE="
        python? ( ${PYTHON_REQUIRED_USE} )
-       ^^ ( abi3-compat abi4-compat abi5-compat abi6-compat )
+       ^^ ( abi4-compat abi5-compat abi6-compat )
 "
 
 RDEPEND="
@@ -71,9 +71,7 @@ src_configure() {
        local myprefix="${EPREFIX}/usr/"
 
        local version
-       if use abi3-compat; then
-               version=3
-       elif use abi4-compat; then
+       if use abi4-compat; then
                version=4
        elif use abi5-compat; then
                version=5