gentoo resync : 08.08.2018

3 files changed, 67 insertions, 2 deletions

diff --git a/media-libs/opensubdiv/Manifest b/media-libs/opensubdiv/Manifest
index e5840ed24fa9..37342493932e 100644
--- a/media-libs/opensubdiv/Manifest
+++ b/media-libs/opensubdiv/Manifest
@@ -2,5 +2,7 @@ AUX opensubdiv-3.3.0-add-CUDA9-compatibility.patch 897 BLAKE2B 528eaabdbe1613e6f
 AUX opensubdiv-3.3.0-fix-quotes.patch 432 BLAKE2B e2b80762392cfe6b9ddb714780adbfffed3eb05feb5072c4b1856164eb01896eb9298723aac4bc032e0aaba8ec55d84bb1dfa6664f1def32af2bd93b553c396b SHA512 89eca174bf991920f71fd278e61f04bb90d143491ec05575507013215c92bca18f0274b6084d61750a66f877d928f01f0e779d08dd3b2372d8119aecaa8b58a9
 AUX opensubdiv-3.3.0-use-gnuinstalldirs.patch 1133 BLAKE2B f762b52e23c60c2dded82948be891654923adae6a2e4f870857e357478f92cb9a239c282f0d09f75f6f2a58682c50d8f437989859710668071b46b1cde499424 SHA512 4f463fbea3e94e93711888a077faa375054aae193abfbe4c600081fae43efa4adf5dc5687ceb7c59795c20ae97ec158ce4035e72dfdb0c89ee5943e41e58bdef
 DIST opensubdiv-3.3.0.tar.gz 19263469 BLAKE2B f169b5c58877d1dd4ea45cb04d52567803da7c2d11edab072e2b65583109c7c2d52abe07f5bd2b03cba215cdb524a0468900419d8381e95c35eb2f3f4bebe02b SHA512 7c17d847187d46182d08fbee9396fd8793ac04591821084d40da475c9d25560d01575282946e1a30252bba12db9ea06cbf50ff649f91adce72f6127ad6a36418
-EBUILD opensubdiv-3.3.0.ebuild 1656 BLAKE2B f7fb85a987b15e23a4342d053b65da1b8e862ebee1f0d8435c91a4cc635f92be10ba2de6783110220ab617584b82fda46441affc6f7c6102317360c0da057819 SHA512 905e0290ab10dcb017e46e22963f015ee62731bd195f69e5ae7fcd032a5838a2e001a8f6d8abc2655e589ca98d9f9ee7506eaa18d9b2f5b6a60f23981989acfb
+DIST opensubdiv-3.3.3.tar.gz 19286806 BLAKE2B 05e25f28a6f2194122d9d4e5299e6d68e236c1e78b4e8494a70191dfb37e45da30968322719bbb784a15d698206fea9e26e92d4689668592bc9ec9bccbc0201d SHA512 65cd72b4240eeb3fdb6d52497a2daa2fc68e10c25c41ffa0cf81449ebcb860e303539043c672265916267a0115f250566570b5705fd5da54f46abe7b9f7baf81
+EBUILD opensubdiv-3.3.0.ebuild 1642 BLAKE2B 934fe6e9f491dbb4ba0e36bacba6ad2bfae774e33099ef3b966573288e1479452bb769ad9c6619b4e859feba89963348d56cd45aa5aa761399dadc485895bc7e SHA512 0bae40e658414b4cf94750fa2b680069be3e63b9a03880a01454db0eef78094ee2d726f12bb967de33003814d6c0241c832158fef7f32402ecceb7adb8bba189
+EBUILD opensubdiv-3.3.3.ebuild 1602 BLAKE2B 5c4758c2b2c89ac6c10f0bf07a32a20b4ee9ff6bfc0d4de292e3d32dfe06103cb5a8fbbdbc86f61096f9d946292b4c4b827ec2285242ffe9110bcd794773b3a5 SHA512 ade1a653e9d368b35bbc1b2ffeb0ae85c4bbb7c057911b2e6fe19899ec8907bb4b36e21077cd3615431d0e3ecbd1d2515cc44d5bf37dd8fd8d918e15fe365b58
 MISC metadata.xml 1233 BLAKE2B a5508cb0e3c44cdfa63d01b709a47f974eb8a97028cfc0aeee184854623ab41fc7b1419df5a755423bbbc3156175d9a0021b42db198b290cc89fce92944f7cb0 SHA512 b225ff89ab0e2c45bfc68a1932d567b474e8f44573cf2d256445600a5ffa205f210ab63eecd4dcdefa68913babe5c21255dc6f75812f76430b8484c36322797a
diff --git a/media-libs/opensubdiv/opensubdiv-3.3.0.ebuild b/media-libs/opensubdiv/opensubdiv-3.3.0.ebuild
index 31007283c41f..fc3580b365e6 100644
--- a/media-libs/opensubdiv/opensubdiv-3.3.0.ebuild
+++ b/media-libs/opensubdiv/opensubdiv-3.3.0.ebuild
@@ -45,7 +45,6 @@ pkg_setup() {
 
 src_configure() {
 	local mycmakeargs=(
-		-DNO_MAYA=1
 		-DNO_CLEW=1
 		-DNO_DOC=$(usex !doc)
 		-DNO_TBB=$(usex !tbb)
diff --git a/media-libs/opensubdiv/opensubdiv-3.3.3.ebuild b/media-libs/opensubdiv/opensubdiv-3.3.3.ebuild
new file mode 100644
index 000000000000..043b810269d4
--- /dev/null
+++ b/media-libs/opensubdiv/opensubdiv-3.3.3.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils toolchain-funcs eapi7-ver
+
+MY_PV="$(ver_rs "1-3" '_')"
+DESCRIPTION="An Open-Source subdivision surface library"
+HOMEPAGE="http://graphics.pixar.com/opensubdiv/"
+SRC_URI="https://github.com/PixarAnimationStudios/OpenSubdiv/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cuda doc opencl openmp ptex tbb"
+
+RDEPEND="media-libs/glew:=
+	media-libs/glfw:=
+	cuda? ( dev-util/nvidia-cuda-toolkit:* )
+	opencl? ( virtual/opencl )
+	ptex? ( media-libs/ptex )"
+
+DEPEND="${RDEPEND}
+	doc? (
+		dev-python/docutils
+		app-doc/doxygen
+	)
+	tbb? ( dev-cpp/tbb )"
+
+S="${WORKDIR}/OpenSubdiv-${MY_PV}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.3.0-fix-quotes.patch"
+	"${FILESDIR}/${PN}-3.3.0-use-gnuinstalldirs.patch"
+	"${FILESDIR}/${PN}-3.3.0-add-CUDA9-compatibility.patch"
+)
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DNO_CLEW=1
+		-DNO_DOC=$(usex !doc)
+		-DNO_TBB=$(usex !tbb)
+		-DNO_PTEX=$(usex !ptex)
+		-DNO_OMP=$(usex !openmp)
+		-DNO_OPENCL=$(usex !opencl)
+		-DNO_CUDA=$(usex !cuda)
+		-DNO_REGRESSION=1 # They don't work with certain settings
+		-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)"
+	)
+
+	cmake-utils_src_configure
+}