media-libs/opensubdiv: ebuild and metadata fixes.

* remove tutorial use flag from metadata.xml.
* remove examples and tutorials as they violate installation
  location rules.

Closes: https://bugs.gentoo.org/633756
Closes: https://github.com/gentoo/gentoo/pull/5919

diff --git a/media-libs/opensubdiv/metadata.xml b/media-libs/opensubdiv/metadata.xml
index f4db4009bddac184c33c710daf9f3581caac83f9..8a3f73ac7b22ee7ae7a9a3e40ded66c2c83a2f24 100644 (file)
--- a/media-libs/opensubdiv/metadata.xml
+++ b/media-libs/opensubdiv/metadata.xml
@@ -33,8 +33,6 @@
                        Enable OpenCL support through
                        <pkg>virtual/opencl</pkg>.
                </flag>
-               <flag name="tutorials">
-               </flag>
        </use>
        <upstream>
                <remote-id type="github">PixarAnimationStudios/OpenSubdiv</remote-id>

diff --git a/media-libs/opensubdiv/opensubdiv-3.1.0.ebuild b/media-libs/opensubdiv/opensubdiv-3.1.0.ebuild
index d822c40cc99e366e883222e8c870b9cb7fec9481..aa63d90eeda49c7ca145fe7a999c6762afa6ffeb 100644 (file)
--- a/media-libs/opensubdiv/opensubdiv-3.1.0.ebuild
+++ b/media-libs/opensubdiv/opensubdiv-3.1.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/PixarAnimationStudios/OpenSubdiv/archive/v${MY_PV}.t
 
 LICENSE="ZLIB"
 SLOT="0"
-IUSE="cuda doc examples opencl openmp ptex tbb test tutorials"
+IUSE="cuda doc opencl openmp ptex tbb test"
 
 RDEPEND="media-libs/glew:=
        media-libs/glfw:=
@@ -49,8 +49,8 @@ src_configure() {
                -DNO_OPENCL=$(usex !opencl)
                -DNO_CUDA=$(usex !cuda)
                -DNO_REGRESSION=$(usex !test)
-               -DNO_EXAMPLES=$(usex !examples)
-               -DNO_TUTORIALS=$(usex !tutorials)
+               -DNO_EXAMPLES=1 # broken
+               -DNO_TUTORIALS=1 # broken
                -DGLEW_LOCATION="${EPREFIX}/usr/$(get_libdir)"
                -DGLFW_LOCATION="${EPREFIX}/usr/$(get_libdir)"
        )

diff --git a/media-libs/opensubdiv/opensubdiv-3.1.1.ebuild b/media-libs/opensubdiv/opensubdiv-3.1.1.ebuild
index 0003926a6d4b13042b5b3dff8e3ceee5015ae320..5c1768b6b37c9d50b8080014e19439884b5e353a 100644 (file)
--- a/media-libs/opensubdiv/opensubdiv-3.1.1.ebuild
+++ b/media-libs/opensubdiv/opensubdiv-3.1.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/PixarAnimationStudios/OpenSubdiv/archive/v${MY_PV}.t
 
 LICENSE="ZLIB"
 SLOT="0"
-IUSE="cuda doc examples opencl openmp ptex tbb tutorials"
+IUSE="cuda doc opencl openmp ptex tbb"
 
 RDEPEND="media-libs/glew:=
        media-libs/glfw:=
@@ -54,8 +54,8 @@ src_configure() {
                -DNO_OPENCL=$(usex !opencl)
                -DNO_CUDA=$(usex !cuda)
                -DNO_REGRESSION=1 # The don't work with certain settings
-               -DNO_EXAMPLES=$(usex !examples)
-               -DNO_TUTORIALS=$(usex !tutorials)
+               -DNO_EXAMPLES=1 # Broken
+               -DNO_TUTORIALS=1 # Broken
                -DGLEW_LOCATION="${EPREFIX}/usr/$(get_libdir)"
                -DGLFW_LOCATION="${EPREFIX}/usr/$(get_libdir)"
        )

diff --git a/media-libs/opensubdiv/opensubdiv-3.3.0.ebuild b/media-libs/opensubdiv/opensubdiv-3.3.0.ebuild
index b73f2a25deb5dd25f7a751e2adaa396022e77e16..28ba08cb7a520fd2a1ce48f94a2046d39df6488b 100644 (file)
--- a/media-libs/opensubdiv/opensubdiv-3.3.0.ebuild
+++ b/media-libs/opensubdiv/opensubdiv-3.3.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/PixarAnimationStudios/OpenSubdiv/archive/v${MY_PV}.t
 LICENSE="ZLIB"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="cuda doc examples opencl openmp ptex tbb tutorials"
+IUSE="cuda doc opencl openmp ptex tbb"
 
 RDEPEND="media-libs/glew:=
        media-libs/glfw:=
@@ -21,7 +21,7 @@ RDEPEND="media-libs/glew:=
 
 DEPEND="${RDEPEND}
        tbb? ( dev-cpp/tbb )
-       doc? ( 
+       doc? (
                dev-python/docutils
                app-doc/doxygen
        )"
@@ -52,8 +52,8 @@ src_configure() {
                -DNO_OPENCL=$(usex !opencl)
                -DNO_CUDA=$(usex !cuda)
                -DNO_REGRESSION=1 # They don't work with certain settings
-               -DNO_EXAMPLES=$(usex !examples)
-               -DNO_TUTORIALS=$(usex !tutorials)
+               -DNO_EXAMPLES=1 # Not needed.
+               -DNO_TUTORIALS=1 # They install illegally. Need to find a better solution.
                -DGLEW_LOCATION="${EPREFIX}/usr/$(get_libdir)"
                -DGLFW_LOCATION="${EPREFIX}/usr/$(get_libdir)"
                -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"