gentoo resync : 07.10.2018

4 files changed, 3 insertions, 137 deletions

diff --git a/media-plugins/frei0r-plugins/Manifest b/media-plugins/frei0r-plugins/Manifest
index 58a7f2d30bcf..0ac81332e715 100644
--- a/media-plugins/frei0r-plugins/Manifest
+++ b/media-plugins/frei0r-plugins/Manifest
@@ -1,7 +1,3 @@
-DIST frei0r-plugins-1.5.0.tar.gz 1519006 BLAKE2B 6b47190c2104616536796ee40d9779d8df55fee233983864e9fcbba157b9d242bab73ab25ea6ccb3784cfb3150fb83f57daf3d0621877ac1af5a33caa18328d9 SHA512 9be0384421ff5ac9000dcda9acefb5cb2b6dc05ea72d9771fae990cb5fad4424dcef8dd15c1e5031a89169f914af8c7a30e47934ad007a3bc0150f3c005bc6bf
-DIST frei0r-plugins-1.6.0.tar.gz 1090145 BLAKE2B 8c6bc2ff55109601d5a78f580eca97c846d8aff1660c8118a95d5057e84398713a873d7159cd982a806266f3d55f3cd912ebaa37fd5fa150082ec3a4ea92b2bc SHA512 0736c3e874d9406777e9dd1d7010e6ddd87c656df6d803d2dc689e1d6ee0d053aaaab5991484b58d142f14fe52f8dc51a31d2a6604f06d567fbb3414cb62645d
 DIST frei0r-plugins-1.6.1.tar.gz 1103969 BLAKE2B febcfc0a5918834e38c2aad2016c0b72f3fed731732e482ae8f9564bb5c2e0825ce050149f6728a8263d6caef11810b33ee3edfb697b0f8a212ae996e0085f45 SHA512 843790389e6de83817d1c3744a91d3365864bb0c22cf6598707ccba5ec8933f6209434011cde1303e16edd89f6cde2f22aa1fb6eca3548d892a2c77332c44aac
-EBUILD frei0r-plugins-1.5.0.ebuild 1290 BLAKE2B e7aa6d779fce831eddbd29ce2bd586ad47085d70ba5b0a84450d828215204c91f97939e901de2a00b1c303ab9fe540456282be1212b0628d6005813562c84f12 SHA512 18c84c694aa519e272d5553b7f3a3a5b50d873ab1e9a432614fa344bd5c9d8ac6ad79d28fb640382d6a59c6dc7d1608e7184141c31f5216f38dd1144daffcc44
-EBUILD frei0r-plugins-1.6.0.ebuild 1294 BLAKE2B 3b944f9b5e05689bda50b0fa261a9ea7186c14cf015673bd41d8c8ca500fd914a18a660801b2776bb67e16a08a32cb36cc07c2d672375bdcfc84772b37da07a5 SHA512 aab6a851079c884d0cf24e0f1bf6e826a5839dcf86e8423ad79184390a46c1b883e7fae6f54e25933c2327b3d9756a6f896db871b68345dd293630c15ba30064
-EBUILD frei0r-plugins-1.6.1.ebuild 1299 BLAKE2B d5563097d5a7f0df4af5d32a4ab5de860d7ddfe194737658dacf29ead0e42886eb5e0f28019c12d683b885a3aae8191c7ca287a262b6f9e34d88ac2122e6062a SHA512 3b717929ad2b648e05ea1cba83921d25f1e3b96db707bec06bd1dda4fce0d6e3ac8fcffd490a18296c3715ad6c58a2b073b05f987be033286aa7ca8fb6aff2a2
+EBUILD frei0r-plugins-1.6.1.ebuild 1295 BLAKE2B 92905386f4bd05ee0164a0bedb3f028758a5ffccddfd56da123bc6e4e191f6019005246bc07ff87cafb8a395115c97ecef78f78d378d82df59c18f3614022f6e SHA512 7f8fd134f5b7efc7d2fae5830ccf248fc189fb7cbd8333818c66b7fe528e15fb45a8975290ab88e29af31a57dea506f9eeeae0ecc2c91f0ae802fa044af5f305
 MISC metadata.xml 558 BLAKE2B 3849525e3af111dc1aa936ff68798bcb5080143a2eaff7c9023ddf23b15afff5e3987f2877ca6349de5e029b26e9c50fed4262fe447dfbb74e8991bc4d55e757 SHA512 11b9bc52481fb1db15cce40f024a595598382b50e96ba0d294968739638676d4d7769c26390e7fd7ef84f214d9d83b04c46bad44938bd9485af4497ff14ea131
diff --git a/media-plugins/frei0r-plugins/frei0r-plugins-1.5.0.ebuild b/media-plugins/frei0r-plugins/frei0r-plugins-1.5.0.ebuild
deleted file mode 100644
index 46c0dd3169ab..000000000000
--- a/media-plugins/frei0r-plugins/frei0r-plugins-1.5.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils multilib
-
-DESCRIPTION="A minimalistic plugin API for video effects"
-HOMEPAGE="https://www.dyne.org/software/frei0r/"
-SRC_URI="https://files.dyne.org/frei0r/releases/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm hppa ppc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="doc +facedetect +scale0tilt"
-
-RDEPEND="x11-libs/cairo
-	facedetect? ( >=media-libs/opencv-2.3.0:= )
-	scale0tilt? ( >=media-libs/gavl-1.2.0 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )"
-
-DOCS=( AUTHORS.txt ChangeLog.txt README.txt TODO.txt )
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	local f=CMakeLists.txt
-
-	sed -i \
-		-e '/set(CMAKE_C_FLAGS/d' \
-		-e "/LIBDIR.*frei0r-1/s:lib:$(get_libdir):" \
-		${f} || die
-
-	# https://bugs.gentoo.org/418243
-	sed -i \
-		-e '/set.*CMAKE_C_FLAGS/s:"): ${CMAKE_C_FLAGS}&:' \
-		src/filter/*/${f} || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITHOUT_OPENCV=$(usex !facedetect)
-		-DWITHOUT_GAVL=$(usex !scale0tilt)
-	)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-
-	if use doc; then
-		pushd doc
-		doxygen || die
-		popd
-	fi
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	use doc && dodoc -r doc/html
-}
diff --git a/media-plugins/frei0r-plugins/frei0r-plugins-1.6.0.ebuild b/media-plugins/frei0r-plugins/frei0r-plugins-1.6.0.ebuild
deleted file mode 100644
index 59c5f9f4674a..000000000000
--- a/media-plugins/frei0r-plugins/frei0r-plugins-1.6.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils multilib
-
-DESCRIPTION="A minimalistic plugin API for video effects"
-HOMEPAGE="https://www.dyne.org/software/frei0r/"
-SRC_URI="https://files.dyne.org/frei0r/releases/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="doc +facedetect +scale0tilt"
-
-RDEPEND="x11-libs/cairo
-	facedetect? ( >=media-libs/opencv-2.3.0:= )
-	scale0tilt? ( >=media-libs/gavl-1.2.0 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )"
-
-DOCS=( AUTHORS.txt ChangeLog.txt README.txt TODO.txt )
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	local f=CMakeLists.txt
-
-	sed -i \
-		-e '/set(CMAKE_C_FLAGS/d' \
-		-e "/LIBDIR.*frei0r-1/s:lib:$(get_libdir):" \
-		${f} || die
-
-	# https://bugs.gentoo.org/418243
-	sed -i \
-		-e '/set.*CMAKE_C_FLAGS/s:"): ${CMAKE_C_FLAGS}&:' \
-		src/filter/*/${f} || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITHOUT_OPENCV=$(usex !facedetect)
-		-DWITHOUT_GAVL=$(usex !scale0tilt)
-	)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-
-	if use doc; then
-		pushd doc
-		doxygen || die
-		popd
-	fi
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	use doc && dodoc -r doc/html
-}
diff --git a/media-plugins/frei0r-plugins/frei0r-plugins-1.6.1.ebuild b/media-plugins/frei0r-plugins/frei0r-plugins-1.6.1.ebuild
index 5e6b5d11a882..1de5c86c3d6e 100644
--- a/media-plugins/frei0r-plugins/frei0r-plugins-1.6.1.ebuild
+++ b/media-plugins/frei0r-plugins/frei0r-plugins-1.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://files.dyne.org/frei0r/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="doc +facedetect +scale0tilt"
 
 RDEPEND="x11-libs/cairo