gentoo resync : 16.06.2019

3 files changed, 22 insertions, 31 deletions

diff --git a/media-libs/partio/Manifest b/media-libs/partio/Manifest
index 42fa45b9e3a4..fdbe2c973292 100644
--- a/media-libs/partio/Manifest
+++ b/media-libs/partio/Manifest
@@ -4,6 +4,6 @@ DIST partio-1.5.0.tar.gz 291604 BLAKE2B d0d6eab4ef541e61fe4498b4cdd8b9c60e62545a
 DIST partio-1.5.4.tar.gz 291617 BLAKE2B 638fae984d392e1e6c95862ad9a8dd8b8a0d80b2c83dfd03e887af36e420d15fd67f0b2c71e5e8c335668b512660bf14f03a1329ac0d7a48431674a51043585d SHA512 967da5b648b19c45bd0c3c8ff56f891e2d54a07b2cd113f18d5d0b646cbfabd968e31ee48c0e167bf9a911d8d5af42d5291b355da305a2b9134fa78fc23e5636
 EBUILD partio-1.1.0_p20170829.ebuild 1053 BLAKE2B 155ea504acb3b14457a34f151b190eb6b96e5ce0c4a1046fab08c0be80c6f32bf2abdda8c678c7e1010451b0c075d59ef53b48ff847cc51dd11c1b23745f08ed SHA512 9dfd4a750fa6cb158f7ebb3d010dfc1f820962aae514ffa7a91acd8b94aeda8b85c83ef809b7d958525dbe09779a9b9863714f99fd13be2a90d778fe40a853d8
 EBUILD partio-1.5.0.ebuild 903 BLAKE2B bafbecc4326402fc541260b2bee725c5b1df02ceb9d5971bcc0fa70ac892972960a9a63359d364fd138014818e9d9f447a3713f076a8dd801858ff869e057d56 SHA512 70862becc3eb0c58423fc2e772e5842cf6882ebda71fca823da4b024c4fcf56de5367b9dc2f7f3c0364025d9c45fefa5565de7ffbbfd3cad6b86a13a0f1c2ebd
-EBUILD partio-1.5.4.ebuild 903 BLAKE2B bafbecc4326402fc541260b2bee725c5b1df02ceb9d5971bcc0fa70ac892972960a9a63359d364fd138014818e9d9f447a3713f076a8dd801858ff869e057d56 SHA512 70862becc3eb0c58423fc2e772e5842cf6882ebda71fca823da4b024c4fcf56de5367b9dc2f7f3c0364025d9c45fefa5565de7ffbbfd3cad6b86a13a0f1c2ebd
-EBUILD partio-9999.ebuild 1113 BLAKE2B 349b80f261c629eda7d27396361e363e771512ac7ede54dfbe53c59b0dbcc6717518981f2e8bc27de87dad91719c765acca1a9d0eb7fee67d30840011420261e SHA512 4ee4db5b8ae843297c5def3c9e5540ee23b90011708924057b8c19f59face92c856ca14c9c07daeb8f2ba0b31dc0e574df3583c130f25668d57e39a29a885178
+EBUILD partio-1.5.4.ebuild 867 BLAKE2B 65f9802bd80a02087bb8cadf530908a165ed4c0b984b963862684e68839994db4dad20f3e7d57d97aa56a5b77c63bb168c1fde0a38eafa3d15c5c37f8239aad2 SHA512 827505c7b1f01db93722d4e7b5034d759d3ae880afcf6671bf46bf6c097fbc272e4e38d77f2880d8b1ee33e303612d674d400fa7844e2e718ea671894e5a87c1
+EBUILD partio-9999.ebuild 869 BLAKE2B fd5b476407d8454ff3941cd60754e9d421c589a9293431b092e471c39a32d07c9f79b716b0a637e0c9a25a6e9a3604819b4d20dc1d62ea32d94ba7ddcd18b1c7 SHA512 e2ed573172e87366a20bb36c1c30a28dc659cc5a7566bc7787f66d05d1a4d94ec55cbc629879bc54449bfdf1d28a7cadcb0bbbb0b29c55b46df864c8033a21d7
 MISC metadata.xml 640 BLAKE2B 3b2c33cb14c466bd4641cc04781d1de05d01170ccc591b3caae40356f934944c4c969834bad5ccdcf9f5390d203270055863b08feb7321492a27d4d7575aced5 SHA512 7116217ccc87ab80d8cb4ee0ea20089ea1c0a5b4ea9b3f666548b37422c01a8917516a5db565fc55f779bb19613fbfb515cfae0b9f87f010f5034c14d27ed8e0
diff --git a/media-libs/partio/partio-1.5.4.ebuild b/media-libs/partio/partio-1.5.4.ebuild
index f8604288badc..84a164057290 100644
--- a/media-libs/partio/partio-1.5.4.ebuild
+++ b/media-libs/partio/partio-1.5.4.ebuild
@@ -1,11 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
 PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
 inherit cmake-utils python-single-r1
 
 if [[ ${PV} == *9999 ]]; then
@@ -13,10 +11,10 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/wdas/partio.git"
 else
 	SRC_URI="https://github.com/wdas/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
-DESCRIPTION="A library for particle IO and manipulation"
+DESCRIPTION="Library for particle IO and manipulation"
 HOMEPAGE="https://www.disneyanimation.com/technology/partio.html"
 
 LICENSE="BSD"
@@ -24,16 +22,16 @@ SLOT="0"
 IUSE="doc"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
+BDEPEND="
+	dev-lang/swig
+	doc? ( app-doc/doxygen[latex] )
+"
 RDEPEND="${PYTHON_DEPS}
 	media-libs/freeglut
-	sys-libs/zlib:=
+	sys-libs/zlib
 	virtual/opengl
 "
-
-DEPEND="${RDEPEND}
-	dev-lang/swig:*
-	doc? ( app-doc/doxygen[latex] )
-"
+DEPEND="${RDEPEND}"
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/media-libs/partio/partio-9999.ebuild b/media-libs/partio/partio-9999.ebuild
index 8c68311fbd9b..1b109fd6da7f 100644
--- a/media-libs/partio/partio-9999.ebuild
+++ b/media-libs/partio/partio-9999.ebuild
@@ -1,23 +1,20 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
 PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-inherit cmake-utils vcs-snapshot python-single-r1
+inherit cmake-utils python-single-r1
 
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/wdas/partio.git"
 else
-	MY_GIT_COMMIT="2774ef3958da46d9f8a4230ebda9e04b1aa8f4e5"
-	SRC_URI="https://github.com/wdas/${PN}/archive/${MY_GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/wdas/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 fi
 
-DESCRIPTION="A library for particle IO and manipulation"
+DESCRIPTION="Library for particle IO and manipulation"
 HOMEPAGE="https://www.disneyanimation.com/technology/partio.html"
 
 LICENSE="BSD"
@@ -25,24 +22,20 @@ SLOT="0"
 IUSE="doc"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
+BDEPEND="
+	dev-lang/swig
+	doc? ( app-doc/doxygen[latex] )
+"
 RDEPEND="${PYTHON_DEPS}
 	media-libs/freeglut
+	sys-libs/zlib
 	virtual/opengl
-	sys-libs/zlib:="
-
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen[latex] )
-	dev-lang/swig:*"
-
-src_prepare() {
-	cmake-utils_src_prepare
-	cmake_comment_add_subdirectory "src/tests"
-}
+"
+DEPEND="${RDEPEND}"
 
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_find_package doc Doxygen)
-		-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
 	)
 	cmake-utils_src_configure
 }