gentoo resync : 11.01.2018

6 files changed, 94 insertions, 6 deletions

diff --git a/www-plugins/Manifest.gz b/www-plugins/Manifest.gz
index 5cc83de55b62..67267aba93c9 100644
--- a/www-plugins/Manifest.gz
+++ b/www-plugins/Manifest.gz
diff --git a/www-plugins/adobe-flash/Manifest b/www-plugins/adobe-flash/Manifest
index 79d46db7f880..0909e94fdb24 100644
--- a/www-plugins/adobe-flash/Manifest
+++ b/www-plugins/adobe-flash/Manifest
@@ -1,9 +1,9 @@
 AUX mms.cfg 4420 BLAKE2B 4557315bfa6f8edb6c8b28907065cdac3771175bd36a8ce2b6e72f0e1f0af20a7bb1ea8abb67f5c7b16fcaa7dd81c3eb89f926957d2ae5fffd499a7e6e709354 SHA512 597380071a06176f09df1a56cba24e83a74990c175fe9f167f026eacbf01e66a083d2389ff399ead0a39654a40ae636f8459feed2d6012e51e65c5407fe7fdbd
 AUX pepper-flash 151 BLAKE2B ab58f8d7dd307fea0d53b7f58887e3caeef8913940d6bfb662a42cc1f475ec59009998898e991d7a82d55a26ec1b2fbbc8b2a626fb8c9ba0d2da1e1735ab26ac SHA512 f20176b9567097482c3b1fdd062affb33a69b671f6298a98cd58e03ca80dd01bada4126ac5fd940fddc53a097669f52d4b8bba7850daf211e11dc24cc4d97eb1
 AUX pepper-flash-r1 143 BLAKE2B 049f7ec4e3df5fbdaa62e40acf8d21d42f61789c6d9ecde64f300df3d3c51f2b5580fb571ebbf172d590799801c632a2eb4daa01dd86e318441719ff6412f3ed SHA512 e4e1c1f204af1e5ce531dd43a22b4cd08e8def1099bba88ac96af09bd0879dfbb6383653ec85d5d199d418098e4b17d71998bee5a9fb5bb7bd8873432a4f66ee
-DIST adobe-flash-28.0.0.126-npapi.i386.tar.gz 8510309 BLAKE2B 383e35d60cb0ff7c4a18c5d134a9999b0ebd19d9998fa724b4d1aa481531400bca4c52293c8e5be3069a0b7fb22add3100c572bc4cc8cd5bff67c635fc142102 SHA512 5dd398ab8f0134572728549634b4fcce6795047b276d365d707d8df1d7ff4ddb0b6551a6485f35dab0164d4a1bff069f592ae4e10d7e5a8661ca72f9e403b798
-DIST adobe-flash-28.0.0.126-npapi.x86_64.tar.gz 9027151 BLAKE2B 3f1371bf3ffbdf834a51cd7e00df387832fda565deed9cf3c46276e626c727d1fa66b4ab691c1e78b441842fc22adb6e2a84f5df2d928a3856a6e36a621e95ab SHA512 f8916cd3afa17536e3657232971b6363829b0434472884a8bef000c8ed64daa61fa0d6562eca34d6280c5dd3113e1713f5911d96d8d4bb2234855527a0145357
-DIST adobe-flash-28.0.0.126-ppapi.i386.tar.gz 8546535 BLAKE2B ff4e27158c3af0107c14f2c22299fc15572d88d2a4660b6905594e4cb00d70fa5c7e24b77ebe43553195b79db94df1232a58faa3d284576fa16355c555b30386 SHA512 aa8a5ccc53dfaa737f8dd0250f26484298cd5cb05dfa45db5fde2788534b5aa5e6d3e2a96dfc0f4ce38e7cc8b28ed16d9d3bea9176cfb9df609878b99dbce8b1
-DIST adobe-flash-28.0.0.126-ppapi.x86_64.tar.gz 9464135 BLAKE2B e0be3deb0454e0b0305993bc1922266d4ad0f3f10af69e955a2df76ee94f87173fcf590b9fbafb71fcd94968484bece3ce74219a72994ffedb36daf1be61f79d SHA512 9e7af54862a1dd5fa3ed059f5f64d44ae4c71b1c7d2104dc73b25d815b81e18db16b727810556f814b42e207fccdcc056044861b9ac48d59be5ff83b3e5183fa
-EBUILD adobe-flash-28.0.0.126.ebuild 3662 BLAKE2B 79b2cdce0449e1aae816ad39cc526cc9b4265ad1f651b2b3833fd3954f2e13bbf41a23c6709149746a6a2d6769220f6d4a043c8bbb1787828946272cdb26c34a SHA512 738b9fe87e14b9988ad5e6f1bdb822c346d12f3e076f7116d47da5a9dde237f9c24fd2a900f27368afe8677c4550498b5ae88aa49b05a0c3f65eb6bc524d0ce2
+DIST adobe-flash-28.0.0.137-npapi.i386.tar.gz 8511300 BLAKE2B e1396927c13af726ec083402ec77f20ac40abe05ca868005f82156da0c3aef40651ccb3d1431f127e3cd4fa4669e809ef5e61a3989bea4597630c7197eae8e0d SHA512 37d5664096876adfe70d008277e0cb1bacf1264f8ca8270e4e775b17bcf7e032dcf5f4a0b13f77b6fd30184d07b3460698db48fd28a92f6820d702cab9891ae8
+DIST adobe-flash-28.0.0.137-npapi.x86_64.tar.gz 9027156 BLAKE2B 136f75ec96466c60895e38d8a4b36cab7f872d110459daac104d90384384c65ce05656ba01218d456917fd2fff2cb710a03b2374bd2d75c65a8e85cc37a24013 SHA512 07d0284296e4f6dbd8a7351da968cfdb4dff1885a997735b8e97f8c7a87c892241758cba376cd3b1ea059d26818111790fe1d3d665c4babaaeb7ae645a990a15
+DIST adobe-flash-28.0.0.137-ppapi.i386.tar.gz 8547088 BLAKE2B 8b5964935b752e26809e35b44d87ce613a951714019ca9d9902c64fa22f0cf057bd57ed57b5ce56c8b16e1ab859401425c21c85c06c123ba6f23f65bec46fc01 SHA512 f5d9d344c4f6522f35dbcefbd786f6dabd701346688f4858a9feb3b683cfa79342c0f5f62c08cb53870278f717a405803186bba49c1091f5a23fe86b9bcf43b1
+DIST adobe-flash-28.0.0.137-ppapi.x86_64.tar.gz 9463126 BLAKE2B 9fa28932aeaa4050282e202cb14adb83fc51d89ce1a36d5f7aa6b490069ad76827726ab0574580c351fe8f4ea755839c1549d94f4ffc3ca4663c3be9567eeb07 SHA512 9087b9197e0eeb8d71401246c7dd30bff9a571ce1bb07e30d99bda493b2da765a6929d13ec66a7e7ffb8614c58fcc2ed6556ed555c93adbeaa6e388e8d54e427
+EBUILD adobe-flash-28.0.0.137.ebuild 3662 BLAKE2B 498cd0a7cfd254b95c9f597a640131189fdd0c18889c0f932cdf93b07d4d9f5e19205f4fd625942c73bea2531feafb04266cb528d121352752629d8abce61519 SHA512 aa2662560e571a3adce5860f107ce640cf5dc6a8a77f75223f76cebdace872e7d6b305ed9c107efd0b48b379d19fe4477bc890a231b14bc8ab2fcfa76183c9fd
 MISC metadata.xml 552 BLAKE2B 56ec8c5f43e9624c4102f52834b63855be35d064ce05bfbc866af225fb8e60cf1b83e02c9917b474183b81cad9e4ecfba7595d8de7fa94974824d2a7f4de302d SHA512 0f84cf3e517eb92f73629e6a157a2999f409fa6dea40682e2248edeb957e5bc6f5228c49aebdc3b5d434d0fd8f717a19c793aee8776397871e1bc5ebf8cf7fa1
diff --git a/www-plugins/adobe-flash/adobe-flash-28.0.0.126.ebuild b/www-plugins/adobe-flash/adobe-flash-28.0.0.137.ebuild
index ce9885dfe11b..c0de0f4b7479 100644
--- a/www-plugins/adobe-flash/adobe-flash-28.0.0.126.ebuild
+++ b/www-plugins/adobe-flash/adobe-flash-28.0.0.137.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/www-plugins/freshplayerplugin/Manifest b/www-plugins/freshplayerplugin/Manifest
index 9aa437d85946..2bea2302c7ce 100644
--- a/www-plugins/freshplayerplugin/Manifest
+++ b/www-plugins/freshplayerplugin/Manifest
@@ -1,8 +1,11 @@
 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
 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 1776 BLAKE2B 3380edf72199d1ff89b2852b61fec4839b607638611e2e4f1eb0b6b4c164c13497e8f24865179665a59087ca3e30872fed0f5f6fcc769d785eff5c993fe59464 SHA512 b389ea1ca36286ce5e65767f3c4acb6bcb2435f1ac26f5f7d6003a9002bb50cb8ffa0f460505fa3191961fa8a4af6bac2ded9776a90762045ab9d9b07e83a41c
 MISC metadata.xml 574 BLAKE2B cf3f2b659df90486a1187c2afe59cd5e1e3941b03bc407e0444a2d3938c71de2e8bd06957bb59aead5e85f31f7d6ce09ec225a7fee71b84574925c9f7669e485 SHA512 97da2e0c03c499e76f400cf6d690e6a0f19779ff1dee966c72b109cd114dae905f044c6ef0a58bc9e15ac648474d05aa770c060150c824c54da25ac1d7bede60
diff --git a/www-plugins/freshplayerplugin/files/0.3.9-ioctl.patch b/www-plugins/freshplayerplugin/files/0.3.9-ioctl.patch
new file mode 100644
index 000000000000..112b839016f9
--- /dev/null
+++ b/www-plugins/freshplayerplugin/files/0.3.9-ioctl.patch
@@ -0,0 +1,11 @@
+diff -aurN a/src/ppb_video_capture.c b/src/ppb_video_capture.c
+--- a/src/ppb_video_capture.c	2017-12-23 09:34:01.000000000 -0500
++++ b/src/ppb_video_capture.c	2018-01-10 20:03:05.498415644 -0500
+@@ -75,6 +75,7 @@
+ 
+ #if !HAVE_LIBV4L2
+ // define simple wrappers, if libv4l2 is not used
++#include <sys/ioctl.h>
+ static
+ ssize_t
+ v4l2_read(int fd, void *buffer, size_t n)
diff --git a/www-plugins/freshplayerplugin/freshplayerplugin-0.3.9.ebuild b/www-plugins/freshplayerplugin/freshplayerplugin-0.3.9.ebuild
new file mode 100644
index 000000000000..4348e877cbfe
--- /dev/null
+++ b/www-plugins/freshplayerplugin/freshplayerplugin-0.3.9.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2018 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 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 )
+	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.9-ioctl.patch" )
+DOCS=( ChangeLog data/freshwrapper.conf.example README.md )
+
+src_configure() {
+	mycmakeargs=(
+		-DWITH_JACK=$(usex jack)
+		-DWITH_PULSEAUDIO=$(usex pulseaudio)
+		-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
+}