diff options
| author |   Jim Ramsay <lack@gentoo.org> | 2010-05-03 15:02:39 +0000 |
|---|---|---|
| committer | Jim Ramsay <lack@gentoo.org> | 2010-05-03 15:02:39 +0000 |
| commit | 9ec8ffbc912b7d39b8ae225959cd1df71f0487a4 (patch) | |
| tree | df76d45fca7bd8bd49021be66c57805af191792f | |
| parent | Removing libflashsupport block (Bug #300294) (diff) | |
| download | gentoo-2-9ec8ffbc912b7d39b8ae225959cd1df71f0487a4.tar.gz gentoo-2-9ec8ffbc912b7d39b8ae225959cd1df71f0487a4.tar.bz2 gentoo-2-9ec8ffbc912b7d39b8ae225959cd1df71f0487a4.zip | |
Removing flash-player block (Bug #300294) and using ewarn instead.
(Portage version: 2.1.8.3/cvs/Linux x86_64)
| -rw-r--r-- | www-plugins/libflashsupport/ChangeLog | 5 | ||||
| -rw-r--r-- | www-plugins/libflashsupport/libflashsupport-1.2.ebuild | 22 |
2 files changed, 20 insertions, 7 deletions
diff --git a/www-plugins/libflashsupport/ChangeLog b/www-plugins/libflashsupport/ChangeLog index 4261f8da51a0..3d6d4dca7b25 100644 --- a/www-plugins/libflashsupport/ChangeLog +++ b/www-plugins/libflashsupport/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for www-plugins/libflashsupport # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-plugins/libflashsupport/ChangeLog,v 1.4 2010/02/08 20:38:25 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-plugins/libflashsupport/ChangeLog,v 1.5 2010/05/03 15:02:39 lack Exp $ + + 03 May 2010; Jim Ramsay <lack@gentoo.org> libflashsupport-1.2.ebuild: + Removing flash-player block (Bug #300294) and using ewarn instead. 08 Feb 2010; Jeroen Roovers <jer@gentoo.org> libflashsupport-1.2.ebuild, +files/libflashsupport-1.2-gentoo.patch: diff --git a/www-plugins/libflashsupport/libflashsupport-1.2.ebuild b/www-plugins/libflashsupport/libflashsupport-1.2.ebuild index 9c2058b73fd1..9f75182a62e6 100644 --- a/www-plugins/libflashsupport/libflashsupport-1.2.ebuild +++ b/www-plugins/libflashsupport/libflashsupport-1.2.ebuild @@ -1,7 +1,8 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-plugins/libflashsupport/libflashsupport-1.2.ebuild,v 1.4 2010/02/08 20:38:25 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-plugins/libflashsupport/libflashsupport-1.2.ebuild,v 1.5 2010/05/03 15:02:39 lack Exp $ +EAPI="3" inherit eutils multilib toolchain-funcs DESCRIPTION="Adds pulseaudio/esd/oss audio output and HTTPS/RTMPS support to @@ -22,12 +23,9 @@ DEPEND="gnutls? ( net-libs/gnutls ) pulseaudio? ( media-sound/pulseaudio )" RDEPEND="${DEPEND} - esd? ( media-sound/esound ) - !>=www-plugins/adobe-flash-10" + esd? ( media-sound/esound )" -src_unpack() { - unpack ${A} - cd "${S}" +src_prepare() { sed -i -e 's:/var/lib/run/pulse/native:/var/run/pulse/native:' \ README flashsupport.c || die "sed failed" @@ -94,3 +92,15 @@ src_install() { dolib.so libflashsupport.so dodoc README } + +pkg_postinst() { + if has_version ">=www-plugins/adobe-flash-10" && use pulseaudio; then + ewarn "You do not need libflashsupport to use adobe-flash with pulseaudio" + ewarn "Please consider removing this package and using" + ewarn "media-plugins/alsa-plugins[pulseaudio] instead." + fi + + if use amd64 && has_version ">=www-plugins/adobe-flash-10[32bit]"; then + ewarn "The 32-bit flash plugin cannot use libflashsupport which is 64-bit only." + fi +} |