Version bump wrt but 547726; Thanks to nE0sIghT <ykonotopov@gmail.com> for the notification and the ebuild patch

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xD1F781EFF9F4A3B6

5 files changed, 155 insertions, 17 deletions

diff --git a/www-plugins/freshplayerplugin/ChangeLog b/www-plugins/freshplayerplugin/ChangeLog
index 2df4ad250cdf..dbfdabfb443b 100644
--- a/www-plugins/freshplayerplugin/ChangeLog
+++ b/www-plugins/freshplayerplugin/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-plugins/freshplayerplugin
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/freshplayerplugin/ChangeLog,v 1.1 2015/03/11 01:13:44 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/freshplayerplugin/ChangeLog,v 1.2 2015/04/27 00:44:13 grknight Exp $
+
+*freshplayerplugin-0.2.4 (27 Apr 2015)
+
+  27 Apr 2015; Brian Evans <grknight@gentoo.org> +files/0.2.4-cmake.patch,
+  +freshplayerplugin-0.2.4.ebuild, metadata.xml:
+  Version bump wrt but 547726; Thanks to nE0sIghT <ykonotopov@gmail.com> for the
+  notification and the ebuild patch
 
 *freshplayerplugin-0.2.3 (11 Mar 2015)
 
diff --git a/www-plugins/freshplayerplugin/Manifest b/www-plugins/freshplayerplugin/Manifest
index 40d44be5aae6..41017e1d5c39 100644
--- a/www-plugins/freshplayerplugin/Manifest
+++ b/www-plugins/freshplayerplugin/Manifest
@@ -1,27 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX 0.2.4-cmake.patch 2575 SHA256 587906e9644397abfadc3fc3381aee04cbe2a653f0ce22eabcc68f539c05e2d2 SHA512 e5b2646ab2799ff82eac0764f28fc7ad15815ecf24943974316116617684d34805174d5c4f4cd4c2572275a5586750e02fbc676bdd7ad2e6d2bc20e7d87b1541 WHIRLPOOL edfc512728cda5cf2858ee054b7da1bf32527f81038a2736e1974cb6516afc58cf14415cd79d8dba583bab223c37ac0ea2498897b0322c698ab8602d0c8d6bad
 AUX with-pulseaudio-cmake.patch 771 SHA256 4847c1a716654f18a3c52b67210a5dbbe44b81e087378e3391b9f9677486837c SHA512 dcc2ebc1afa1c0f034f5ef2358167d0ef80777ce8b1045822b0b5bce7571de3213f8477be49187332c65f0b472fb93bc4804bd98490d7eedda88b45cce742eab WHIRLPOOL 9742e62a2cb1dc0d70431584130702987b4b6a6b58b00b0abef3f984bc7bad732ca83c9bbd29a6bea1af3422af0b1b452b53df9f6a5c660c3c20482b752ad8a9
 DIST freshplayerplugin-0.2.3.tar.gz 402126 SHA256 b28ae17dec274aa6eb819d496088efbc503aa6bfba09192e2f08200ecf66d10b SHA512 bc2ee4377103d7d56d40ebed19cff0dd4acdb7a810225381d9d49874ca3925cb5c72f9ca576f2b9e58a4374fe546d99a0bc97c9c95eb3d44e08fe68e1310bf51 WHIRLPOOL 5180f9709ae6bd691c1df8daaf03b91aa80ab1a5e0b1c562919dd179f8252a5ae8bfe6fdc98bde1d4fff88098045a06e6cdabc66ab95604e70c9a084e2bc085d
+DIST freshplayerplugin-0.2.4.tar.gz 490685 SHA256 e071c811778577f44331edcd418472fc392effd416c0750cbf384a30c9269163 SHA512 b16bfb90554ce2355a10d2a81fe611a9c15e8e945b39d0d2e1d954e87ea0ba849206785187cd4b52f523e560ee28e9a6728ec58244d41000050d59d13d96e7c4 WHIRLPOOL 21f6b66bbee6ea13c6708316281bfb963fe73e8104d5db202a0241ff7c46553ffeac4736f7b66d94a7c12e94c4a38336e4ba56dfccee3481e85da856dde5631f
 EBUILD freshplayerplugin-0.2.3.ebuild 1471 SHA256 fffb869d3dd94d404826e98505b38a78f2ceff1469c3c6e010f886c33d1c9b72 SHA512 837ae4828ca19f13f36032b00e0b5d9a93f2ff7e9208652c96e4e744a65657277dc7ccc4976bf679532d19634cca8d72b69f4647bf3cc024be92d908a2c9e4a9 WHIRLPOOL 813cd897e891e39fff2b3792113d3d67b3b66942af3aa2048bf8bb922531f71b493fe045e3d806581e8072c4983e1b7e42670f909b8db8a4fb602f961e90936f
-MISC ChangeLog 495 SHA256 2304cbdfca1d1758a420fef1064d2bb2af14b554a9dee8a054b97441dd5cb06f SHA512 02598f145644937c5160cdefc2c408c91c352727d1d4622b4bfda2e034566adfc0fbc5468fca38d36418341f5344475f63ec7870a9ac8974125cdc254e082551 WHIRLPOOL 708b416a2d25e69c68dfb045b599f4b5df35c3896210918f5aed253f7a888f1f13caf557360a64dea60a1902b7f2aba2d9fbb3703aabe9c609535e695b6c401a
-MISC metadata.xml 228 SHA256 3276782b32068142f9cdd2fc035aea8881f10754f955200c41f77667bc1e2f7a SHA512 20795b5733cd27d679546b09d7e783ea5542a487ebb25d624c99fe8811f85fba91b9674667a1c2603d537fceaf588f4b884e00393e003590d94be9261648f8db WHIRLPOOL 6d7bcbacd82acd20fa264aa71b9cbf03ffabe312b60ea382bc363f47644cb2e5f1efec126ff487e357c6e2757c40606a498b6dc466e2a1f61ae742e11ef2a4e7
+EBUILD freshplayerplugin-0.2.4.ebuild 1629 SHA256 d38badc9828c611ef3b9316d73778b3c5349d9f768db6d1b835f9da092b6cfe2 SHA512 b402dddc17272b74438008c4a1513220483aefa62400f84a89f64577af6fa505186b840811be9e1a1803c6066787098dc0bd66fe6d5caa03ef565904992182c9 WHIRLPOOL 65affee1f666540c01ab29f6b7a7f711c85e50a4e8239343d21ea8d6da0d692074ce8be5ee11841c661530b79d7a0516fb64755b05ccd026290962444abd47a7
+MISC ChangeLog 777 SHA256 fc8b2462e4d1ec8b4ff7d8599c2795704a87e625bd7285370596b3b737afd005 SHA512 ad0946afc77548ae91056227b60aa82f748a1fb8e45fcf4a7e2d58746babcbad7d8befb3937591374c60b333846e838e6f2889b8ce195f8d2ce61a1dca53593c WHIRLPOOL 1ecd957fb9d455c553be3f207bb332482d02bf82c41d212da82f4daebd7ee979e8b5620e7f46037f3273acbc86bbcbbf602492fe66f95beb24a125f2f7fa6109
+MISC metadata.xml 303 SHA256 4d9b473cc2be5911143be966ce6a2ce887b4c826c91ffa37294e9d51f79a375c SHA512 d020660d9d52b27fc126192fdd451dcebbc12fd8586f82eb459bc252d2a60875dc86e9d8a1dc0f3380d96de4d0b6cc1d526f91b10c6c26bef100a9ce79053f4b WHIRLPOOL a44781631f978e98de6e152031617c9c63542c2765eef239d65f9ccfd142ea3d74e9825dd7678f30990b75fcb790d537ccdb41e94fc67d5092defb024a4a16cd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJU/5bMXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJVPYZhXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2NkMyRTQ0RUQ5MEUzMjc1OEU3RDU1QzBE
-MUY3ODFFRkY5RjRBM0I2AAoJENH3ge/59KO2hRkQALmVOyGI2KhFVcSd3uv6JbK7
-kC9UyzW/uHKQ+xe54LCme9EhDBIJgk8k5dPUx6FWQPhW+IpNLYRAnRThsBYgQFMS
-+Iyuv8/1+dl4BkOqxuphwLIYBZdpdmECCqVI5bk+0JpAwaVeAs3ovxMFuBEBJhXx
-PFs3uSVvVYQQXfXLqONP/UTB1JDSfvlRDCJaYYmKxXrMEo1dvawe2E9+qhuaEEr6
-YH0yoS8JjGNSYxTQScTuxO8gaQySA09WaXlFc1l6ZWz/FuZjEdAfNvVy1rdmZCPl
-4bl1Y9Gxmo7RNYUaLhSvUIAfpDN3naY3Dp/VrKw6OyF4/o0akHYW4yj0TMkOlqNe
-byRqJV6rbsfvKTQov7HFNaQ8BJHBmQQGMgKwsCtaFaSKzIAZV6lmhaGEMDNT6kNZ
-1ivAyB6WGw/l2pa37WDwZKAp/iyngKUwv2jMrVyORzw1KBGU3t+6SUJ85w5Xz+C3
-3liCD5e5crTQ9WsvejRqzA+t6RK/8KdtM0tiMT/bJ2nxmDqS6Ww2s3yLtIQ0eg1V
-RsWr4eQQwSM94LjpyiNAqps+bozW1obKCagn/bkK3IVVmj3NV2qzlPu7KXoD695U
-t43+b3aqtINpkWHce0m6m/ejx8TGKGE6Vr9d8McQKKukxIg4qMJ4VMDJXGNnkNX7
-9RJ7RI0XlOnfjKA94Qrs
-=YZOL
+MUY3ODFFRkY5RjRBM0I2AAoJENH3ge/59KO2bUEQAMu9SEjmK+aWIL3vXQtxT1aZ
+S+1uGlPynddaDZvDor5LnkuJULHEKrhwPieqrTvxtGwoxp7ysVDv8VQrZTxOnJcM
+zq+SDpb6+C5fweQcW4BQOfom1Digm9nDYu5pbBlb9EFKIigNA1tqklB2DmGw/TlC
+gGDJ3B+ATAQImoTYkmjVwJk7fQ9mDHnW5aPVplpE0tCZtROx1vxh4pOo7NMKzYjv
+Q4WB2Wtt7t7LLtXw8FrSgk0cpDg+D2L2xjbVeIJB/WtOSSuDM0SyMAPJgdXSo+mw
+N45NlWGGFq7Uw/4XxX79ndtEg8ohXaE9Jwv/l4hf86i1+efBx1iqaUeiAl/x5V4i
+s7Ziq88yRCrIk1zgb5VhGr6oDzZfAiJDX9JB1ohORFXQQdsraQMz9DJVvlzDf/R7
+G39swJ3dkUSc285PqTogK5FJxqhlZeOvQIA5Y2oCm9bthW642DkKlXSoLw9QyiFv
+K6MB89/F0HPAj87cE1/PCwQ/xLWt8ySl0oruKltzulw6eC7eo2pYig7ehmzFb911
+iV8FaaI9C76untKdW7pGcM3V21t3F+BjXckBmRe0KH0JRZgqj/LpCyWWYUF/Urp5
+nAdk0R1/1ebZ2mBYjdFx9j2hLwpHUkssu/ycZ2vGUzoP6OwW2Lha3PzW0sjr4gG7
+/sN6LLUyu1BaF4Hkz9KI
+=DX/h
 -----END PGP SIGNATURE-----
diff --git a/www-plugins/freshplayerplugin/files/0.2.4-cmake.patch b/www-plugins/freshplayerplugin/files/0.2.4-cmake.patch
new file mode 100644
index 000000000000..3ad1523e2ab5
--- /dev/null
+++ b/www-plugins/freshplayerplugin/files/0.2.4-cmake.patch
@@ -0,0 +1,59 @@
+diff -uarN a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt	2015-04-25 11:17:24.000000000 -0400
++++ b/CMakeLists.txt	2015-04-26 20:14:43.152014529 -0400
+@@ -61,35 +61,36 @@
+ # optional dependencies
+ message(STATUS "checking for optional dependencies")
+ 
+-pkg_check_modules(PULSEAUDIO QUIET libpulse)
+-pkg_check_modules(JACK QUIET jack)
+-pkg_check_modules(SOXR QUIET soxr)
+ set(WITH_PULSEAUDIO TRUE CACHE STRING "enable PulseAudio support")
+ set(WITH_JACK TRUE CACHE STRING "enable JACK Audio Connection Kit")
+ 
+-if (PULSEAUDIO_FOUND AND WITH_PULSEAUDIO)
++if (WITH_PULSEAUDIO)
++    pkg_check_modules(PULSEAUDIO libpulse)
++    if (NOT PULSEAUDIO_FOUND)
++        message(FATAL_ERROR "PulseAudio requested but not found.")
++    endif()
+     add_definitions(-DHAVE_PULSEAUDIO=1)
+-    message(STATUS "  found libpulse, version ${PULSEAUDIO_VERSION} (optional)")
++    message(STATUS "  found libpulse, version ${PULSEAUDIO_VERSION}")
+     list(APPEND REQ_LIBRARY_DIRS ${PULSEAUDIO_LIBRARY_DIRS})
+     list(APPEND REQ_INCLUDE_DIRS ${PULSEAUDIO_INCLUDE_DIRS})
+     list(APPEND REQ_LIBRARIES    ${PULSEAUDIO_LIBRARIES})
+-else()
+-    message(STATUS "  no libpulse found (optional)")
+ endif()
+ 
+-if (JACK_FOUND AND WITH_JACK)
+-    message(STATUS "  found jack, version ${JACK_VERSION} (optional)")
+-    if (SOXR_FOUND)
+-        message(STATUS "  found soxr, version ${SOXR_VERSION}")
+-        add_definitions(-DHAVE_JACK=1)
+-        list(APPEND REQ_LIBRARY_DIRS "${JACK_LIBRARY_DIRS}" "${SOXR_LIBRARY_DIRS}")
+-        list(APPEND REQ_INCLUDE_DIRS "${JACK_INCLUDE_DIRS}" "${SOXR_INCLUDE_DIRS}")
+-        list(APPEND REQ_LIBRARIES    "${JACK_LIBRARIES}" "${SOXR_LIBRARIES}")
+-    else()
+-        message(STATUS "  no soxr found, JACK output disabled")
++if (WITH_JACK)
++    pkg_check_modules(JACK QUIET jack)
++    if (NOT JACK_FOUND)
++        message(FATAL_ERROR "JACK support requested but not found.")
++    endif()
++    pkg_check_modules(SOXR QUIET soxr)
++    if (NOT SOXR_FOUND)
++        message(FATAL_ERROR "SOXR libray not found but needed for JACK support.")
+     endif()
+-else()
+-    message(STATUS "  no jack found (optional)")
++    message(STATUS "  found jack, version ${JACK_VERSION}")
++    message(STATUS "  found soxr, version ${SOXR_VERSION}")
++    add_definitions(-DHAVE_JACK=1)
++    list(APPEND REQ_LIBRARY_DIRS "${JACK_LIBRARY_DIRS}" "${SOXR_LIBRARY_DIRS}")
++    list(APPEND REQ_INCLUDE_DIRS "${JACK_INCLUDE_DIRS}" "${SOXR_INCLUDE_DIRS}")
++    list(APPEND REQ_LIBRARIES    "${JACK_LIBRARIES}" "${SOXR_LIBRARIES}")
+ endif()
+ 
+ list(APPEND REQ_LIBRARIES img-resources)
diff --git a/www-plugins/freshplayerplugin/freshplayerplugin-0.2.4.ebuild b/www-plugins/freshplayerplugin/freshplayerplugin-0.2.4.ebuild
new file mode 100644
index 000000000000..0445f9f1ca35
--- /dev/null
+++ b/www-plugins/freshplayerplugin/freshplayerplugin-0.2.4.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/freshplayerplugin/freshplayerplugin-0.2.4.ebuild,v 1.1 2015/04/27 00:44:13 grknight Exp $
+
+EAPI=5
+
+CMAKE_MIN_VERSION="2.8.8"
+
+inherit cmake-utils multilib
+
+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="gtk3 jack pulseaudio"
+
+KEYWORDS="~amd64 ~x86"
+
+CDEPEND="
+	dev-libs/glib:2=
+	dev-libs/libconfig:=
+	dev-libs/libevent:=[threads]
+	dev-libs/openssl:0=
+	media-libs/alsa-lib:=
+	media-libs/freetype:2=
+	media-libs/mesa:=[egl,gles2]
+	x11-libs/libXrandr:=
+	x11-libs/libXrender:=
+	x11-libs/pango:=[X]
+	jack? ( media-sound/jack )
+	pulseaudio? ( media-sound/pulseaudio )
+	!gtk3? ( x11-libs/gtk+:2= )
+	gtk3? ( x11-libs/gtk+:3= )
+"
+
+DEPEND="${CDEPEND}
+	dev-util/ragel
+	virtual/pkgconfig
+	"
+RDEPEND="${CDEPEND}
+	|| (
+		www-plugins/chrome-binary-plugins[flash]
+		www-client/google-chrome
+		www-client/google-chrome-beta
+		www-client/google-chrome-unstable
+	)
+	"
+
+PATCHES=( "${FILESDIR}/${PV}-cmake.patch" )
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_with jack JACK)
+		$(cmake-utils_use_with pulseaudio PULSEAUDIO)
+		-DWITH_GTK=$(usex gtk3 3 2)
+		-DCMAKE_SKIP_RPATH=1
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	dodoc ChangeLog data/freshwrapper.conf.example README.md
+	exeinto /usr/$(get_libdir)/nsbrowser/plugins
+	doexe "${BUILD_DIR}/libfreshwrapper-pepperflash.so"
+}
diff --git a/www-plugins/freshplayerplugin/metadata.xml b/www-plugins/freshplayerplugin/metadata.xml
index 994d2278b194..d511fa946bfb 100644
--- a/www-plugins/freshplayerplugin/metadata.xml
+++ b/www-plugins/freshplayerplugin/metadata.xml
@@ -5,4 +5,7 @@
 	<email>grknight@gentoo.org</email>
 	<name>Brian Evans</name>
 </maintainer>
+<use>
+	<flag name='gtk3'>Build with GTK+ 3 instead of GTK+ 2</flag>
+</use>
 </pkgmetadata>