[gentoo-commits] repo/gentoo:master commit in: www-plugins/freshplayerplugin/, www-plugins/freshplayerplugin/files/

[Brian Evans]

commit:     09277371d30e5cc2c325fb3c76df4e6ca47168f3
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 13 18:14:08 2016 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Thu Oct 13 18:14:08 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09277371

www-plugins/freshplayerplugin: Drop old versions with unresolvable deps

Package-Manager: portage-2.3.2

 www-plugins/freshplayerplugin/Manifest             |  1 -
 .../freshplayerplugin/files/0.2.4-cmake.patch      | 59 ---------------
 .../freshplayerplugin-0.3.2.ebuild                 | 82 ---------------------
 .../freshplayerplugin-0.3.5.ebuild                 | 85 ----------------------
 4 files changed, 227 deletions(-)

diff --git a/www-plugins/freshplayerplugin/Manifest b/www-plugins/freshplayerplugin/Manifest
index 4097ca7..58cfd8d 100644
--- a/www-plugins/freshplayerplugin/Manifest
+++ b/www-plugins/freshplayerplugin/Manifest
@@ -1,2 +1 @@
-DIST freshplayerplugin-0.3.2.tar.gz 2713241 SHA256 b3687b9d67ab88c64fea32b17f281f142bf861e33d9135b00da5d90d385d9ce5 SHA512 9c908ce1a168c0797dc3b0da8e98d722cc32d729acb1c4a8f38b7e95c23fe870baabe4b3f8790d021711578fdb9a61f44aba27cebb924fec9aabcf8cd91323e5 WHIRLPOOL 2e9b78bcc3605409ec6853caf31aab03658c044e0d05449a620b31261323856503db8db960db9992d6db4fd61df8f9feb05800124c2f4a450c4ff65b22fc7c34
 DIST freshplayerplugin-0.3.5.tar.gz 781003 SHA256 b08f7c6690de13b1e358fef4cab41cb303b9e80b3504678e94c9646f44dd7104 SHA512 dd447db4cbfdb80b89ff42894099971c100023d19fe5fbad023d5ac1afa827fdc5a169a03f4702ffda3cf6e0dd9c63217b68d97d047ac43afc22f488020a0ba0 WHIRLPOOL cf22758e0ed947db27e8e6e053f17bafc425beebebd9314008eef105e828a0a51f73fd42f2d0c00e12e56f817e2b9078baeb55bd54a6c6a55e8ebd00d2e27ccc

diff --git a/www-plugins/freshplayerplugin/files/0.2.4-cmake.patch b/www-plugins/freshplayerplugin/files/0.2.4-cmake.patch
deleted file mode 100644
index 3ad1523..00000000
--- a/www-plugins/freshplayerplugin/files/0.2.4-cmake.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-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.3.2.ebuild b/www-plugins/freshplayerplugin/freshplayerplugin-0.3.2.ebuild
deleted file mode 100644
index 3bb24e7..00000000
--- a/www-plugins/freshplayerplugin/freshplayerplugin-0.3.2.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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 libav pulseaudio vaapi vdpau"
-
-KEYWORDS="amd64"
-
-HWDEC_DEPEND="
-	libav? ( media-video/libav:0=[vaapi?,vdpau?,x264] )
-	!libav? ( media-video/ffmpeg:0=[vaapi?,vdpau?,x264] )
-	x11-libs/libva
-	x11-libs/libvdpau
-"
-
-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/libv4l:0=
-	media-libs/mesa:=[egl,gles2]
-	x11-libs/libXrandr:=
-	x11-libs/libXrender:=
-	x11-libs/libdrm:=
-	x11-libs/pango:=[X]
-	jack? ( media-sound/jack-audio-connection-kit )
-	pulseaudio? ( media-sound/pulseaudio )
-	!gtk3? ( x11-libs/gtk+:2= )
-	gtk3? ( x11-libs/gtk+:3= )
-	vaapi? ( ${HWDEC_DEPEND} )
-	vdpau? ( ${HWDEC_DEPEND} )
-"
-
-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}/0.2.4-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
-	)
-	if use vaapi || use vdpau ; then
-		mycmakeargs+=( -DWITH_HWDEC=1 )
-	else
-		mycmakeargs+=( -DWITH_HWDEC=0 )
-	fi
-	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/freshplayerplugin-0.3.5.ebuild b/www-plugins/freshplayerplugin/freshplayerplugin-0.3.5.ebuild
deleted file mode 100644
index c6b4a10..00000000
--- a/www-plugins/freshplayerplugin/freshplayerplugin-0.3.5.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-CMAKE_MIN_VERSION="2.8.8"
-
-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/chrome-binary-plugins[flash]
-		www-client/google-chrome
-		www-client/google-chrome-beta
-		www-client/google-chrome-unstable
-	)
-	"
-
-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
-}