gentoo resync : 16.06.2019

6 files changed, 1 insertions, 250 deletions

diff --git a/www-plugins/freshplayerplugin/Manifest b/www-plugins/freshplayerplugin/Manifest
index 5f247800e87b..d9441bc57199 100644
--- a/www-plugins/freshplayerplugin/Manifest
+++ b/www-plugins/freshplayerplugin/Manifest
@@ -1,12 +1,6 @@
-AUX 0.3.4-git-revision.patch 404 BLAKE2B 02f6fdc21f1a722623fb66013eba7af0a327e702444f1bedc61e52832575045938fbcd80b9bd8dc56e936d2b058b751a00eb5b147987cceab36fb2bc758cc8ed SHA512 617c5586d0948f9aa5acdef38cdceb29e98a07cb40a284e07e780d0344168408bf14fae612fb5d2baa648f6083b0d37820a70a002631abf6cdeb38a3948bd617
 AUX 0.3.5-cmake.patch 3049 BLAKE2B c6ee8f4d7647d2d216225fc35c6744cb4fadd4d8a958fe86196d250fefa38ad53e4c4ecdca43c84bd7aa1705ab74efd7b9d694d5457ee9fa2f4335921f4c8f79 SHA512 95d07febb1cf159bd22ba3551fd712ab04e26f2422a01940285a19648d570a92b0d399a48fad54eba6b7faecd00f51b98e117e5f5df4b7dd1238a73bbe46d353
 AUX 0.3.9-ioctl.patch 369 BLAKE2B 88dba5e3e0d49fc7f6f3c2b56a8e7888be48b88dc77c2613c48cdddfc6090772d8d18787bb0f0997246deb1ae07d588352c41becaa9f1767db20799519449b22 SHA512 6a1c32602ac889cd2de52beed3870d12c1815eba0eabe77a1de1380d5015fb21eb697be7f6ac9fa9efe8a0e74f71e741e3cde4b9dec775f4158905435af7bc16
 AUX freshplayerplugin-0.3.9-ffmpeg-4.patch 3116 BLAKE2B 820c6ab058620406fce34260470b46c70bd970571a518ecdbd38e18ed170711e93bddd95d0bc95f2cada1b6b5cf4a74cfcf68cb23699ac32d886e43b0d9f3b77 SHA512 f7adae50de4cdca812ba1bad32ec10f9f97bf484c7e88b06be22e7677774093f17353f3e21ce2d26273cb076cee128a41311b1bf5b891031df27dc2f0684b272
-DIST freshplayerplugin-0.3.5.tar.gz 781003 BLAKE2B 9874f07905a277c95374a697397dc9b3661cdba40b39ee74702d4ec67a0447d13cc2a187c695b47be9f922177b37bdf5fff8ebb9dd57b709f884ffa3db0da54d SHA512 dd447db4cbfdb80b89ff42894099971c100023d19fe5fbad023d5ac1afa827fdc5a169a03f4702ffda3cf6e0dd9c63217b68d97d047ac43afc22f488020a0ba0
-DIST freshplayerplugin-0.3.7.tar.gz 789974 BLAKE2B 0217e3431164e9dfce4ec21f07331aea4b5841b963c51c258f10c68d8089b8f860364d58af533f3724f8759b8d6381cba950f174b2ca3f0a7b59c581192b5a47 SHA512 9ef534b873833d69caa86a5702ad6150e4aa2fe399159a550b6cb0ebad2754d25e185c54b6285f6f50913c5595c5b460ce3e0d21ac45f0d25793805463ce1d5d
 DIST freshplayerplugin-0.3.9.tar.gz 790261 BLAKE2B 88526c01e7a06c7b295e5a7652602eb661097f869b30c8fd0978a4e03adea9d1fa75d35e5e9c0751d786c04f0247fc292aa0c1857cf1fa575eb0b11499bec7fc SHA512 999d7c223dd493e43a0fa7874371c7b781fe5273b2661fc30f814832b4aafd23f297795b644f58553107ef962ca17ce58fb39a637d1ab7bdf470cd33e0b19cf8
-EBUILD freshplayerplugin-0.3.5-r2.ebuild 1851 BLAKE2B 7bcd5da8e281c5d584966035fa6ff27c7c279ec72e8e45ec40b3e94e07be6ab92b945ceed726e6fe2cf36a2819f8fbca4e6aab24db5652301942cee35222e981 SHA512 d8ebf65ac798abf5e1e00438b5c10e9140adf2b0d531a9bfc95e0dd1b1e3193b366e23fe2647846a87aba5ea491d72e0d377b2d7dae8d958cad92819b41be04c
-EBUILD freshplayerplugin-0.3.5-r3.ebuild 1873 BLAKE2B 910f1cd17fe94f0a81306ece58ec4424a82ebe6ac953abc8ff7bb0969127da47d85d8aada676f8c57c50fbadd3422f97cbf33bcf87ab9db692098b3c12f698dc SHA512 83d5544d6b36efbafbfa25f12cdacd3c5d4c0f246dce0a9a19f7f7ac82ee344ebc9f3f593bdeb32f7763ecb0149bef169e217b3632a69e61c8e7bdc893188bca
-EBUILD freshplayerplugin-0.3.7.ebuild 1834 BLAKE2B e3efe1e39d17332e71feb9d9a88d0cea86ce38f52859684fe53007f89ca95eca3ae8ad4ac87840e22368dd9d9356069670b8e768672389e82b56ad2a2865e0b7 SHA512 58797302082e763a98e7dc573246657020003c4b2f7ff1845c85755dd79300e74d8730698709fcc032873cd7f1bdf36b5557660469f1c01364099a05379ba5c8
 EBUILD freshplayerplugin-0.3.9.ebuild 1809 BLAKE2B c59500c76fe4858f4d54cebd0a548780abb3636cdf6376d9863dfecfbdc22da36c3473e5dbcc0ae1e269a1ef2423116e3e219db293c67835bc6216addcbf2e4b SHA512 3f58a1cf00e8b1f278d35ae9b40dd1710cf7c9fcad5b882c00833d95b7e44e5dda032b689e40820c3caa0e6f07ce570ee873c0c3adb3cb4a9bc2217d3a63cb12
-MISC metadata.xml 467 BLAKE2B 1e0d9ff2c511c8e645d7cd5fe968b83e7ec32b583833fc007cf4a09d4644b64d22b11634fc8254430a311a4300daf0d0eeb8d86b4d277adbf32d28b48c5e758d SHA512 bea3036d6f203357e9598394f09ffe33fa34d3738317554815bb0c283ab71f24607948a4554a9dd75374f02db8893a96059ff4d61179c354e345b77d44d92db0
+MISC metadata.xml 404 BLAKE2B 98d95444e2cfc719be52f65b3628e2968b1dedfc9273e21767e8fd552f5080f6d6524a82b03c3fe019fb23ca2deea6498dfcedafde27c77cae9cb58b31cd4766 SHA512 6d6d0cc9af38d86062f359bedcde62502c746829113df09027c4c5ac6b604f3bc478ec9ad078de843f9e63212cc7a73879a96b4763fc9d87ca8f3b98ea1b66b0
diff --git a/www-plugins/freshplayerplugin/files/0.3.4-git-revision.patch b/www-plugins/freshplayerplugin/files/0.3.4-git-revision.patch
deleted file mode 100644
index 96cfce94c936..000000000000
--- a/www-plugins/freshplayerplugin/files/0.3.4-git-revision.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/cmake/update-version-info.sh	2015-12-20 08:38:33.000000000 -0500
-+++ b/cmake/update-version-info.sh	2015-12-26 20:14:00.000000000 -0500
-@@ -18,7 +18,7 @@
- GIT_COMMAND_EXISTS=1
- command -v git >/dev/null 2>&1 || GIT_COMMAND_EXISTS=0
- 
--if [ $GIT_COMMAND_EXISTS -eq 0 ]; then
-+if [ $GIT_COMMAND_EXISTS -eq 0 -o ! -d "${CMAKE_SOURCE_DIR}/.git" ]; then
-     update_header "no vcs hash"
-     exit 0
- fi
diff --git a/www-plugins/freshplayerplugin/freshplayerplugin-0.3.5-r2.ebuild b/www-plugins/freshplayerplugin/freshplayerplugin-0.3.5-r2.ebuild
deleted file mode 100644
index b69aaa96e3ee..000000000000
--- a/www-plugins/freshplayerplugin/freshplayerplugin-0.3.5-r2.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-LICENSE="MIT"
-HOMEPAGE="https://github.com/i-rinat/freshplayerplugin"
-DESCRIPTION="PPAPI-host NPAPI-plugin adapter for flashplayer in npapi based browsers"
-SRC_URI="https://github.com/i-rinat/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-SLOT=0
-IUSE="gles2 gtk3 jack libav libressl pulseaudio v4l vaapi vdpau"
-
-KEYWORDS="amd64"
-
-HWDEC_DEPEND="
-	libav? ( media-video/libav:0=[vaapi?,vdpau?] )
-	!libav? ( media-video/ffmpeg:0=[vaapi?,vdpau?] )
-	x11-libs/libva
-	x11-libs/libvdpau
-"
-
-COMMON_DEPEND="
-	dev-libs/glib:2=
-	dev-libs/icu:0=
-	dev-libs/libevent:=[threads]
-	media-libs/alsa-lib:=
-	media-libs/freetype:2=
-	media-libs/mesa:=[egl,gles2?]
-	x11-libs/cairo:=[X]
-	x11-libs/libXcursor:=
-	x11-libs/libXrandr:=
-	x11-libs/libXrender:=
-	x11-libs/libdrm:=
-	x11-libs/pango:=[X]
-	jack? (
-		media-sound/jack-audio-connection-kit
-		media-libs/soxr
-	)
-	pulseaudio? ( media-sound/pulseaudio )
-	!gtk3? ( x11-libs/gtk+:2= )
-	gtk3? ( x11-libs/gtk+:3= )
-	libressl? ( dev-libs/libressl:0= )
-	!libressl? ( dev-libs/openssl:0= )
-	v4l? ( media-libs/libv4l:0= )
-	vaapi? ( ${HWDEC_DEPEND} )
-	vdpau? ( ${HWDEC_DEPEND} )
-"
-
-DEPEND="${COMMON_DEPEND}
-	dev-util/ragel
-	virtual/pkgconfig
-	"
-RDEPEND="${COMMON_DEPEND}
-	www-plugins/adobe-flash:22
-	"
-
-PATCHES=( "${FILESDIR}/0.3.5-cmake.patch" "${FILESDIR}/0.3.4-git-revision.patch" )
-DOCS=( ChangeLog data/freshwrapper.conf.example README.md )
-
-src_configure() {
-	mycmakeargs=(
-		-DWITH_JACK=$(usex jack)
-		-DWITH_PULSEAUDIO=$(usex pulseaudio)
-		-DWITH_GTK=$(usex gtk3 3 2)
-		-DWITH_GLES2=$(usex gles2)
-		-DWITH_LIBV4L2=$(usex v4l)
-		-DCMAKE_SKIP_RPATH=1
-	)
-	if use vaapi || use vdpau ; then
-		mycmakeargs+=( -DWITH_HWDEC=1 )
-	else
-		mycmakeargs+=( -DWITH_HWDEC=0 )
-	fi
-	cmake-utils_src_configure
-}
diff --git a/www-plugins/freshplayerplugin/freshplayerplugin-0.3.5-r3.ebuild b/www-plugins/freshplayerplugin/freshplayerplugin-0.3.5-r3.ebuild
deleted file mode 100644
index a59a28573a43..000000000000
--- a/www-plugins/freshplayerplugin/freshplayerplugin-0.3.5-r3.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-LICENSE="MIT"
-HOMEPAGE="https://github.com/i-rinat/freshplayerplugin"
-DESCRIPTION="PPAPI-host NPAPI-plugin adapter for flashplayer in npapi based browsers"
-SRC_URI="https://github.com/i-rinat/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-SLOT=0
-IUSE="gles2 gtk3 jack libav libressl pulseaudio v4l vaapi vdpau"
-
-KEYWORDS="~amd64"
-
-HWDEC_DEPEND="
-	libav? ( media-video/libav:0=[vaapi?,vdpau?] )
-	!libav? ( media-video/ffmpeg:0=[vaapi?,vdpau?] )
-	x11-libs/libva
-	x11-libs/libvdpau
-"
-
-COMMON_DEPEND="
-	dev-libs/glib:2=
-	dev-libs/icu:0=
-	dev-libs/libevent:=[threads]
-	media-libs/alsa-lib:=
-	media-libs/freetype:2=
-	media-libs/mesa:=[egl,gles2?]
-	x11-libs/cairo:=[X]
-	x11-libs/libXcursor:=
-	x11-libs/libXrandr:=
-	x11-libs/libXrender:=
-	x11-libs/libdrm:=
-	x11-libs/pango:=[X]
-	jack? (
-		media-sound/jack-audio-connection-kit
-		media-libs/soxr
-	)
-	pulseaudio? ( media-sound/pulseaudio )
-	!gtk3? ( x11-libs/gtk+:2= )
-	gtk3? ( x11-libs/gtk+:3= )
-	libressl? ( dev-libs/libressl:0= )
-	!libressl? ( dev-libs/openssl:0= )
-	v4l? ( media-libs/libv4l:0= )
-	vaapi? ( ${HWDEC_DEPEND} )
-	vdpau? ( ${HWDEC_DEPEND} )
-"
-
-DEPEND="${COMMON_DEPEND}
-	dev-util/ragel
-	virtual/pkgconfig
-	"
-RDEPEND="${COMMON_DEPEND}
-	www-plugins/adobe-flash:22[abi_x86_64,ppapi(+)]
-	"
-
-PATCHES=( "${FILESDIR}/0.3.5-cmake.patch" "${FILESDIR}/0.3.4-git-revision.patch" )
-DOCS=( ChangeLog data/freshwrapper.conf.example README.md )
-
-src_configure() {
-	mycmakeargs=(
-		-DWITH_JACK=$(usex jack)
-		-DWITH_PULSEAUDIO=$(usex pulseaudio)
-		-DWITH_GTK=$(usex gtk3 3 2)
-		-DWITH_GLES2=$(usex gles2)
-		-DWITH_LIBV4L2=$(usex v4l)
-		-DCMAKE_SKIP_RPATH=1
-	)
-	if use vaapi || use vdpau ; then
-		mycmakeargs+=( -DWITH_HWDEC=1 )
-	else
-		mycmakeargs+=( -DWITH_HWDEC=0 )
-	fi
-	cmake-utils_src_configure
-}
diff --git a/www-plugins/freshplayerplugin/freshplayerplugin-0.3.7.ebuild b/www-plugins/freshplayerplugin/freshplayerplugin-0.3.7.ebuild
deleted file mode 100644
index 7f1968d12571..000000000000
--- a/www-plugins/freshplayerplugin/freshplayerplugin-0.3.7.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-LICENSE="MIT"
-HOMEPAGE="https://github.com/i-rinat/freshplayerplugin"
-DESCRIPTION="PPAPI-host NPAPI-plugin adapter for flashplayer in npapi based browsers"
-SRC_URI="https://github.com/i-rinat/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-SLOT=0
-IUSE="gles2 gtk3 jack libav libressl pulseaudio v4l vaapi vdpau"
-
-KEYWORDS="~amd64"
-
-HWDEC_DEPEND="
-	libav? ( media-video/libav:0=[vaapi?,vdpau?] )
-	!libav? ( media-video/ffmpeg:0=[vaapi?,vdpau?] )
-	x11-libs/libva
-	x11-libs/libvdpau
-"
-
-COMMON_DEPEND="
-	dev-libs/glib:2=
-	dev-libs/icu:0=
-	dev-libs/libevent:=[threads]
-	media-libs/alsa-lib:=
-	media-libs/freetype:2=
-	media-libs/mesa:=[egl,gles2?]
-	x11-libs/cairo:=[X]
-	x11-libs/libXcursor:=
-	x11-libs/libXrandr:=
-	x11-libs/libXrender:=
-	x11-libs/libdrm:=
-	x11-libs/pango:=[X]
-	jack? (
-		media-sound/jack-audio-connection-kit
-		media-libs/soxr
-	)
-	pulseaudio? ( media-sound/pulseaudio )
-	!gtk3? ( x11-libs/gtk+:2= )
-	gtk3? ( x11-libs/gtk+:3= )
-	libressl? ( dev-libs/libressl:0= )
-	!libressl? ( dev-libs/openssl:0= )
-	v4l? ( media-libs/libv4l:0= )
-	vaapi? ( ${HWDEC_DEPEND} )
-	vdpau? ( ${HWDEC_DEPEND} )
-"
-
-DEPEND="${COMMON_DEPEND}
-	dev-util/ragel
-	virtual/pkgconfig
-	"
-RDEPEND="${COMMON_DEPEND}
-	www-plugins/adobe-flash:22[abi_x86_64,ppapi(+)]
-	"
-
-PATCHES=( "${FILESDIR}/0.3.5-cmake.patch" )
-DOCS=( ChangeLog data/freshwrapper.conf.example README.md )
-
-src_configure() {
-	mycmakeargs=(
-		-DWITH_JACK=$(usex jack)
-		-DWITH_PULSEAUDIO=$(usex pulseaudio)
-		-DWITH_GTK=$(usex gtk3 3 2)
-		-DWITH_GLES2=$(usex gles2)
-		-DWITH_LIBV4L2=$(usex v4l)
-		-DCMAKE_SKIP_RPATH=1
-	)
-	if use vaapi || use vdpau ; then
-		mycmakeargs+=( -DWITH_HWDEC=1 )
-	else
-		mycmakeargs+=( -DWITH_HWDEC=0 )
-	fi
-	cmake-utils_src_configure
-}
diff --git a/www-plugins/freshplayerplugin/metadata.xml b/www-plugins/freshplayerplugin/metadata.xml
index 9355f3dea45a..9351b433717f 100644
--- a/www-plugins/freshplayerplugin/metadata.xml
+++ b/www-plugins/freshplayerplugin/metadata.xml
@@ -3,7 +3,6 @@
 <pkgmetadata>
 	<use>
 		<flag name="gles2">Use system GLESv2 libraries instead of ANGLE for shader translation</flag>
-		<flag name="gtk3">Build with GTK+ 3 instead of GTK+ 2</flag>
 		<flag name="v4l">Use libv4l2 for colorspace conversion</flag>
 	</use>
 	<upstream>