Version bump wrt bug 554216; Drop old

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

4 files changed, 42 insertions, 51 deletions

diff --git a/www-plugins/freshplayerplugin/ChangeLog b/www-plugins/freshplayerplugin/ChangeLog
index 6c8a8e179fc2..7f557d8ca926 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.3 2015/06/17 02:58:15 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/freshplayerplugin/ChangeLog,v 1.4 2015/07/14 23:57:18 grknight Exp $
+
+*freshplayerplugin-0.3.1 (14 Jul 2015)
+
+  14 Jul 2015; Brian Evans <grknight@gentoo.org>
+  +freshplayerplugin-0.3.1.ebuild, -files/with-pulseaudio-cmake.patch,
+  -freshplayerplugin-0.2.3.ebuild:
+  Version bump wrt bug 554216; Drop old
 
 *freshplayerplugin-0.3.0 (17 Jun 2015)
 
diff --git a/www-plugins/freshplayerplugin/Manifest b/www-plugins/freshplayerplugin/Manifest
index c3d9ff415656..429eefbd8932 100644
--- a/www-plugins/freshplayerplugin/Manifest
+++ b/www-plugins/freshplayerplugin/Manifest
@@ -2,31 +2,30 @@
 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
 DIST freshplayerplugin-0.3.0.tar.gz 2706001 SHA256 ca0281884874f010243496567e9f6717dfea5fdf0406ee39260d234fd57f247e SHA512 5e72131959a119805dcee9fd8d7e5eda0a2100de34eba75643adab7543ec5120babce2b824f8813763da83927c599c14db5ef93ab8ae83a7ea4b942ca4746445 WHIRLPOOL 7cc4867034a0374640e36378665ffa831ea164610b3bb57f607e3f9648e6dc609ee6196a11c781b8f4f138e22e7e9689b2f642258110e088d4eb17e9f820b47f
-EBUILD freshplayerplugin-0.2.3.ebuild 1471 SHA256 fffb869d3dd94d404826e98505b38a78f2ceff1469c3c6e010f886c33d1c9b72 SHA512 837ae4828ca19f13f36032b00e0b5d9a93f2ff7e9208652c96e4e744a65657277dc7ccc4976bf679532d19634cca8d72b69f4647bf3cc024be92d908a2c9e4a9 WHIRLPOOL 813cd897e891e39fff2b3792113d3d67b3b66942af3aa2048bf8bb922531f71b493fe045e3d806581e8072c4983e1b7e42670f909b8db8a4fb602f961e90936f
+DIST freshplayerplugin-0.3.1.tar.gz 2711793 SHA256 4ed582896fff618d8025dd51bbf2fae0c5e36e2875065acc536b2c76befb593c SHA512 78e87548ecd758ad9ff0dab59b1b2f68b8b9a639ff19de08046a7090ab51d87f0e4c879b1b0075151ff17642d50ff937e199733c55c4a9cff94599fd98eae9de WHIRLPOOL d8be949cc9a2087d8f62fcfb4a1786d68574a5ec52dccc45da06df9838ee84e8dd4d7f3c3f86703e428df1b3f4d6d75c1e87d0809d3f78550a16ed278d51b211
 EBUILD freshplayerplugin-0.2.4.ebuild 1629 SHA256 d38badc9828c611ef3b9316d73778b3c5349d9f768db6d1b835f9da092b6cfe2 SHA512 b402dddc17272b74438008c4a1513220483aefa62400f84a89f64577af6fa505186b840811be9e1a1803c6066787098dc0bd66fe6d5caa03ef565904992182c9 WHIRLPOOL 65affee1f666540c01ab29f6b7a7f711c85e50a4e8239343d21ea8d6da0d692074ce8be5ee11841c661530b79d7a0516fb64755b05ccd026290962444abd47a7
 EBUILD freshplayerplugin-0.3.0.ebuild 1717 SHA256 61ec22fa4db9e4b9751e6f1a9b8d0ec6fe69127461b2e56f4fb559f0ead69567 SHA512 f85ef25cb0f0d78ae70cd7ad1ec2a2756cc056f52cad3c6541001df0a84c3d60fb75a4031c14a5100bc423238f992e226e7ea9246eeabb0a5160cd7e7039bc8b WHIRLPOOL 4fbdece51522225b8921fbc7678e41823e27ad5a220f35c525ecb6193619c8dfb9ec901587ccec71d18ba506717d3b134f6d82c311301b873e84adddd5772e1a
-MISC ChangeLog 917 SHA256 306bd478c37d4eb053ade9122956b4ff22df0c0891932f5a7681d29488b5a403 SHA512 d857ecd1302e0b3ab13b0f4c071ede5bfd4bdeb8d1bf2593f4a24e63f9ebf65c6af57f0707351d2c19d5a091fd43398802dfb8ad23c42e34403184f90202824e WHIRLPOOL 1ad49f170de8d1a8b0ef021a834335bfa037f6c3c72794177c0623e5b119646b53e38f9f3a8b1494427ed0da75b26ea726468e05a51e4a6e149b5dc25eec40ed
+EBUILD freshplayerplugin-0.3.1.ebuild 1738 SHA256 48c00ba764d61a9850a80662f39b9509347b80a9c77f7cf46e680fb5f403d437 SHA512 d51c28ed23f1a59cf002bc4644adec4221c7763e9effd0117fca2f60ddb4c7a82ab9d37fd807f12d697777467744d335d097ffd80b16029215806cc25f071272 WHIRLPOOL b9cb8af9fcfc41dfdc9426604cc80d6768f06b40e96d91a1e4fab6119e563c3b32367bbbc0d02c4386eab9b47c1777c2efd2c96c7b80261d3965c6f558441a55
+MISC ChangeLog 1153 SHA256 f8e9fdc3ab3ecaa56eb10f26cf4f0ac6db1df1fceccd6c96667a38f7d3a52f1c SHA512 7936a5a49fbe8ad5425b8fe3ee7b7b079bab5250aa05bb876fcdca45b71d53fe72f05140b493a4a690b7dfbffb97ac24a80dc7cef890057b282806c308d117ad WHIRLPOOL 95ceb8e824304e256d495856337ef3b66b379acae3aa8d135815fdc62a42ad78950fa606f153b60d7ad1a0f6ebe9788ffb0b3db3c8da3213ce0cdaba3815cc0c
 MISC metadata.xml 400 SHA256 ba82a545361ca22db0e7bf83e3a8ed7bc7210b5b571bf725d3ae89cbfa4bade2 SHA512 d259e6581aace82cf27f4425c3f119ce5b855d13d92880a1c9ca449274fbe6fb6c5323379786ab57138abfb3521ce4e25293fdafc54d260a9a84196bc246c629 WHIRLPOOL e445c42d937923fc94a37bb2f72d873c204bbdf038222628a5d535717c3a3d73ee6377b179183989a5763b9d81a77b711696de444abc28f8a63201bdad308843
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVgOJMXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJVpaHjXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2NkMyRTQ0RUQ5MEUzMjc1OEU3RDU1QzBE
-MUY3ODFFRkY5RjRBM0I2AAoJENH3ge/59KO2CyMP/R0m8ijNJ2LKS2e5W6t7TmoF
-H9cNOK/SyfW5G/zCcT4ggYVLwmRjjt44tajonD8FctDrsP0Q00WBYEwviB/lVLO9
-ujdM2haalyc1W6WwKGa9y48vE2rgXmUfaZdSSO3D06DW2mGcJfNUQ+mIUFKW7aed
-NN9xLWOAJEySKQKZloaO7g1vYq6yD3l9i7Wuts5bfbg4G64Awy4o5PiSJ2mYtPYC
-sXd06Zd6IWlF4+xVNE93e85RQbfXDig48k2+AglR9fmpaRo9h6tmIWeV/4cZELkm
-j9ySMy7Es+C+lyjlBBLlvdbXElZTuloEbzitDgo6e06vUg68mRmPvlos74zntL5z
-Bf3gJVW/oXfhpmGsPOyMYIGsKLCvAKNBScwHYKQd4qMiDdI0JqrJphl13/jYkyN/
-CIQAm797NTcPaXNDK7ScsvcL85gT0oEursSpLULKyEOK80NxHi18/k4ZwqICkfdR
-kkiJrTzshV3bmkZkhJLAyB7EWrrtf5gMxs2zLk3aQQq4IUOXm3lWDbQ21PlocGIy
-YQoVvMsM7yTdz1+k72fQ1pvyFkwrxxhi7O/TrI9kXRq2jBM2mIwZ6mme+uJmt4J3
-OJNCcewZNf5Dp8pOCUEOgxUwDrHGenoJFgH4FowcsLi3DYiOVNH4Z5UGz3aJJj8d
-QQGff53hBgvnHhWXcEDb
-=1E6l
+MUY3ODFFRkY5RjRBM0I2AAoJENH3ge/59KO20WMP/1BczG29B4v+07MokAKKA4TD
+OFSNLq+I6uDSzf7E2EeCPRCt6ceaEr1vc7qcgnpZsDnba4yD1d4DfUWxf4tRWKrM
+m8gSIaOMwVwBMrnYyFdprlMMO9YjFcpxwd/Hd5lXuksyb7AIEdHIRCCPY9NrLSuh
+zCwSTcnbSjAGdXork3imcAs+PqEdOQQRADweB8mMDaKpy7vRlro0h+Gd/eznyOZM
+HJrKfIB1ERyoEXvBWeqwj908jMbJZyGb//OFU+QUqiAdHBgb4ou94P4bVR6dkwIL
+q3vbU6w25MKpI9ydleWjUB265KNRpCy6OPEmCOiOLoVxyT4p2rYo22p1TXBbuTji
+/DIl0/ZNVKLvlYnorOCSJ8O4RKcsq2sE7rHxbU5VL3ofmttPuf/qucExG1lDpsVe
+hCfMxV/jhJ/ZzJJEyVWYPP6ibKaClt4oa4k9aqPYjR3xktbKrRr08rAkQUfeLlfX
+CbIMbfvlVa/r/sn6QCJov04H65MELJ0oFUBoHJZyvPYxpIeoQY7o67tYbvBWXCYs
+jeuTRYZeeyXM28ioi/O/Olk6dovw8bF25nDcoG0XCockwz4jsjvjkfNWoa/wkQzs
+g3Os7UIvrl/xEeNVay3olqkhcZPWPyna+dkq97F0x/WwcC9DhPoQJJqW9QEpkKl1
+2STDJSytkaz2vRvG30E4
+=uJm6
 -----END PGP SIGNATURE-----
diff --git a/www-plugins/freshplayerplugin/files/with-pulseaudio-cmake.patch b/www-plugins/freshplayerplugin/files/with-pulseaudio-cmake.patch
deleted file mode 100644
index 22bad5728292..000000000000
--- a/www-plugins/freshplayerplugin/files/with-pulseaudio-cmake.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -aurN a/CMakeLists.txt b/CMakeLists.txt
---- a/CMakeLists.txt	2015-02-15 17:05:40.000000000 -0500
-+++ b/CMakeLists.txt	2015-03-10 19:33:48.519110012 -0400
-@@ -45,12 +45,18 @@
-     openssl
-     REQUIRED)
- 
--pkg_check_modules(PULSEAUDIO libpulse)
-+OPTION(WITH_PULSEAUDIO "Enable pulseaudio support" ON)
- 
--if (${PULSEAUDIO_FOUND})
--    add_definitions(-DHAVE_PULSEAUDIO=1)
--    set(HAVE_PULSEAUDIO 1)
--endif()
-+IF(WITH_PULSEAUDIO)
-+    pkg_check_modules(PULSEAUDIO libpulse)
-+
-+    if (${PULSEAUDIO_FOUND})
-+        add_definitions(-DHAVE_PULSEAUDIO=1)
-+        set(HAVE_PULSEAUDIO 1)
-+    else()
-+        MESSAGE(FATAL_ERROR "PulseAudio not found")
-+    endif()
-+ENDIF(WITH_PULSEAUDIO)
- 
- include_directories(${REQ_INCLUDE_DIRS})
- add_definitions(${REQ_CFLAGS_OTHER})
diff --git a/www-plugins/freshplayerplugin/freshplayerplugin-0.2.3.ebuild b/www-plugins/freshplayerplugin/freshplayerplugin-0.3.1.ebuild
index f3ddc5e8fdbd..d13aae06cc69 100644
--- a/www-plugins/freshplayerplugin/freshplayerplugin-0.2.3.ebuild
+++ b/www-plugins/freshplayerplugin/freshplayerplugin-0.3.1.ebuild
@@ -1,6 +1,6 @@
 # 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.3.ebuild,v 1.1 2015/03/11 01:13:44 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/freshplayerplugin/freshplayerplugin-0.3.1.ebuild,v 1.1 2015/07/14 23:57:18 grknight Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ 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="pulseaudio"
+IUSE="gtk3 jack pulseaudio vaapi"
 
 KEYWORDS="~amd64 ~x86"
 
@@ -24,12 +24,18 @@ CDEPEND="
 	dev-libs/openssl:0=
 	media-libs/alsa-lib:=
 	media-libs/freetype:2=
+	media-libs/libv4l:0=
 	media-libs/mesa:=[egl,gles2]
-	x11-libs/gtk+:2=
 	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= )
+	vaapi? ( x11-libs/libva
+		x11-libs/libvdpau
+	)
 "
 
 DEPEND="${CDEPEND}
@@ -45,10 +51,16 @@ RDEPEND="${CDEPEND}
 	)
 	"
 
-PATCHES=( "${FILESDIR}/with-pulseaudio-cmake.patch" )
+PATCHES=( "${FILESDIR}/0.2.4-cmake.patch" )
 
 src_configure() {
-	mycmakeargs=( $(cmake-utils_use_with pulseaudio PULSEAUDIO)  )
+	mycmakeargs=(
+		$(cmake-utils_use_with jack JACK)
+		$(cmake-utils_use_with pulseaudio PULSEAUDIO)
+		-DWITH_GTK=$(usex gtk3 3 2)
+		-DCMAKE_SKIP_RPATH=1
+		-DWITH_HWDEC=$(usex vaapi 1 0)
+	)
 	cmake-utils_src_configure
 }