Removing flash-player block (Bug #300294) and using ewarn instead.

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

diff --git a/www-plugins/libflashsupport/ChangeLog b/www-plugins/libflashsupport/ChangeLog
index 4261f8da51a0a654704dee4988adf4763967b1df..3d6d4dca7b251db8044b508594beedeb57e4919b 100644 (file)
--- 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 9c2058b73fd16c95d783c83349a24b840f83ce8d..9f75182a62e6d07fd36fae0fe8c89b83b42f0c60 100644 (file)
--- 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
+}