gentoo resync : 18.11.2018

4 files changed, 2 insertions, 119 deletions

diff --git a/media-libs/libopenshot/Manifest b/media-libs/libopenshot/Manifest
index 4be3af3fe327..7c4649fe6839 100644
--- a/media-libs/libopenshot/Manifest
+++ b/media-libs/libopenshot/Manifest
@@ -1,7 +1,4 @@
-AUX libopenshot-0.1.8-fix-tests.patch 1073 BLAKE2B 1ee4f19a3251924c688c49059a55510e620df9f2cdfd30bcd23b32e3cd1b4a8b1976e29837322f3ea1bb74e88a69aab60f6fdcf39747ce1e34a8d76654d6539c SHA512 0adaae336fe5d8a8eaf74b5c0b39eeb6845c54d60d506eb6ba24238a1064c536c0d1e903a673175c3d498bb6c1926a4ff1d3fb1d2d1c6d00dd8059bae3dba157
 AUX libopenshot-0.2.2-imagemagick7.patch 3545 BLAKE2B e2fe6ae205459c69ff288f14ba2d0a2b461b761e7ff6e9e66e11e4895b10661d5fc2ab9e2011899ca983399af685a0d411aa4820c02d02b4600617bd314d7670 SHA512 06622c81253fd15440e1cf0256a0beb21e2039a5a98a8c889828898b137a9a6efeb6fb295a0646dc5aa12da9805ff73b62c29272b0037cb1ea2454de7571f59b
-DIST libopenshot-0.1.8.tar.gz 11019495 BLAKE2B a86994a09328e24705fe06ec3c47cbedb89815e6ec1440237dc58babfc066655f1c7dacc19257b02b645a9415c63cd4e0c1191fa452b7632cf531d98a1b073c3 SHA512 02630d7ce9fd378ad648d034622d4f971728a2074691d7facc8a36dcd52b87c1372dd5a9588c0ba852589105bdbf78941083fd6b1eb1bcc0a33d4ca49634162c
 DIST libopenshot-0.2.2.tar.gz 11037768 BLAKE2B c307e41bf17d40ae421a541bbdf4cd53c6ef4d97041a476c6910bd156c10815aa5a5811813b24fdc472401516f29cf8cb68fbda17a0b434767c3f3aa63d6f222 SHA512 b89189e57e82da68a063417bba9c94704c04b0546c0aed227daa23a794eee56341a05988d8e28dbd339edfcdeeaed48103b347060eccf94f32fe1a4bf23d6553
-EBUILD libopenshot-0.1.8.ebuild 2185 BLAKE2B 34b9556926c8f76c570a470b34dd66d2e722e712a557536b6d7c01a45493eb5e0401962d03ebb9a4633e232330d3c621ba42718fd968f58d2ce755e76bb42f98 SHA512 1c0d40239e19214ac3a0162f75e07180aebb94bf79da82e6f3752a2d5a9cf794a4babeab17fdd2160899a2a60bf46d36292b3f305502238a954adf4872fcdae5
-EBUILD libopenshot-0.2.2.ebuild 2211 BLAKE2B ed168c1fc226da7f3d237836e5225f992f52011ec92175bb6a88862c436b0c8063f218eb608477e169a3ce0051f678a4534d8160ba446b9bec3b1073530268ad SHA512 e320c0ec38d3bf9414bd5c549ad89b3319a3f2a493ed818e43155caf17f76792ee0a669ff12b4786c2f5415140c06ac97d96864bc8e507342bb44f07c8b150d9
+EBUILD libopenshot-0.2.2.ebuild 2209 BLAKE2B 28574fba62134b2e811806ec9aceabf3c9774b4a10825d3784989d308937a7f8b8d6544fba82eb7691cfcb27e8c0bb1e191527d0560e922768d2acfb6462f785 SHA512 1bf1c2905474764f5fc67df38d799c1dc72fe2231edf850d98d1e9fc623038ac5acca679a1dd623848f50bc18fee9a54dabfb088c3cb7fcea062d6199d2e2029
 MISC metadata.xml 374 BLAKE2B cc763fd4cda8c70fc654d85ebaa8a3b748499308a4633c6f70aeef1cbb767f5b5eaad0f6c4402a74862e8ebe392b6862722835e92cb53ef4b88a9cc87b2315db SHA512 2a1810910f38b67624eea2d8778c095bbe884cf8a06ababaf595a295d8fbb904e13a809ccc888b8d5956e87a2ddf1295982133741596a08e713f9cbb6a6347ba
diff --git a/media-libs/libopenshot/files/libopenshot-0.1.8-fix-tests.patch b/media-libs/libopenshot/files/libopenshot-0.1.8-fix-tests.patch
deleted file mode 100644
index bad8bcb9b4f0..000000000000
--- a/media-libs/libopenshot/files/libopenshot-0.1.8-fix-tests.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
-index 431987b..2c45550 100644
---- a/tests/CMakeLists.txt
-+++ b/tests/CMakeLists.txt
-@@ -24,16 +24,19 @@
- # along with OpenShot Library. If not, see <http://www.gnu.org/licenses/>.
- ################################################################################
- 
-+SET(TEST_MEDIA_PATH "${openshot_SOURCE_DIR}/src/examples/")
- 
- ################ WINDOWS ##################
- # Set some compiler options for Windows
- # required for libopenshot-audio headers
- IF (WIN32)
--	STRING(REPLACE "/" "\\\\" TEST_MEDIA_PATH "${openshot_SOURCE_DIR}/src/examples/")
--	add_definitions( -DIGNORE_JUCE_HYPOT=1 -DTEST_MEDIA_PATH="${TEST_MEDIA_PATH}" )
-+	STRING(REPLACE "/" "\\\\" TEST_MEDIA_PATH TEST_MEDIA_PATH)
-+	add_definitions( -DIGNORE_JUCE_HYPOT=1 )
- 	SET(CMAKE_CXX_FLAGS " ${CMAKE_CXX_FLAGS} -include cmath")
- ENDIF(WIN32)
- 
-+add_definitions( -DTEST_MEDIA_PATH="${TEST_MEDIA_PATH}" )
-+
- ################### UNITTEST++ #####################
- # Find UnitTest++ libraries (used for unit testing)
- FIND_PACKAGE(UnitTest++ REQUIRED)
diff --git a/media-libs/libopenshot/libopenshot-0.1.8.ebuild b/media-libs/libopenshot/libopenshot-0.1.8.ebuild
deleted file mode 100644
index 91aa0166e29d..000000000000
--- a/media-libs/libopenshot/libopenshot-0.1.8.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{4,5,6} )
-
-inherit cmake-utils python-single-r1 toolchain-funcs versionator
-
-DESCRIPTION="Video editing library used by OpenShot"
-HOMEPAGE="http://www.openshotvideo.com/"
-SRC_URI="https://github.com/OpenShot/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+imagemagick libav +python test"
-# https://github.com/OpenShot/libopenshot/issues/43
-RESTRICT="test"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	net-libs/cppzmq
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtmultimedia:5[widgets]
-	media-libs/libopenshot-audio
-	imagemagick? ( <media-gfx/imagemagick-7:0=[cxx] )
-	libav? ( media-video/libav:=[encode,x264,xvid,vpx,mp3,theora] )
-	!libav? ( media-video/ffmpeg:0=[encode,x264,xvid,vpx,mp3,theora] )
-	python? ( ${PYTHON_DEPS} )
-"
-DEPEND="
-	${RDEPEND}
-	python? ( dev-lang/swig )
-	test? ( dev-libs/unittest++ )
-"
-
-# https://github.com/OpenShot/libopenshot/pull/45
-PATCHES=( ${FILESDIR}/${PN}-0.1.8-fix-tests.patch )
-
-check_compiler() {
-	if [[ ${MERGE_TYPE} != binary ]] && ! tc-has-openmp; then
-		eerror "${P} requires a compiler with OpenMP support. Your current"
-		eerror "compiler does not support it. If you use gcc, you can"
-		eerror "re-emerge it with the 'openmp' use flag enabled."
-		die "The current compiler does not support OpenMP"
-	fi
-}
-
-pkg_pretend() {
-	check_compiler
-}
-
-pkg_setup() {
-	check_compiler
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-	# https://github.com/OpenShot/libopenshot/issues/17
-	use test || cmake_comment_add_subdirectory tests
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_RUBY=OFF # TODO: add ruby support
-		-DENABLE_PYTHON=$(usex python)
-		$(cmake-utils_use_find_package imagemagick ImageMagick)
-	)
-	use python && mycmakeargs+=(
-		-DPYTHON_EXECUTABLE="${PYTHON}"
-		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
-		-DPYTHON_LIBRARY="$(python_get_library_path)"
-	)
-	cmake-utils_src_configure
-}
-
-src_test() {
-	cmake-utils_src_make test
-}
-
-src_install() {
-	cmake-utils_src_install
-	python_optimize
-}
diff --git a/media-libs/libopenshot/libopenshot-0.2.2.ebuild b/media-libs/libopenshot/libopenshot-0.2.2.ebuild
index 4b0aeae13e16..cdbd9c418001 100644
--- a/media-libs/libopenshot/libopenshot-0.2.2.ebuild
+++ b/media-libs/libopenshot/libopenshot-0.2.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/OpenShot/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+imagemagick libav +python test"
 # https://github.com/OpenShot/libopenshot/issues/43
 RESTRICT="test"