commit: ec57874082d859b6f767885db39496a45f3ff1d9 Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> AuthorDate: Thu Nov 24 15:21:16 2016 +0000 Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> CommitDate: Thu Nov 24 15:21:40 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec578740
www-plugins/adobe-flash: Add USE=npapi dependencies (bug #600672 by reagentoo) Package-Manager: portage-2.3.2 .../adobe-flash/adobe-flash-11.2.202.644.ebuild | 6 ++-- .../adobe-flash/adobe-flash-24.0.0.154.ebuild | 33 ++++++++++++++++++++++ 2 files changed, 36 insertions(+), 3 deletions(-) diff --git a/www-plugins/adobe-flash/adobe-flash-11.2.202.644.ebuild b/www-plugins/adobe-flash/adobe-flash-11.2.202.644.ebuild index 7454867..ae35599 100644 --- a/www-plugins/adobe-flash/adobe-flash-11.2.202.644.ebuild +++ b/www-plugins/adobe-flash/adobe-flash-11.2.202.644.ebuild @@ -40,7 +40,7 @@ RESTRICT="strip mirror" S="${WORKDIR}" -NATIVE_DEPS=" +NATIVE_RDEPEND=" dev-libs/atk dev-libs/glib:2 dev-libs/nspr @@ -78,7 +78,7 @@ DEPEND=" " RDEPEND=" ${DEPEND} - abi_x86_64? ( ${NATIVE_DEPS} ) + abi_x86_64? ( ${NATIVE_RDEPEND} ) abi_x86_32? ( amd64? ( >=dev-libs/atk-2.10.0[abi_x86_32(-)] @@ -97,7 +97,7 @@ RDEPEND=" >=x11-libs/libXt-1.1.4[abi_x86_32(-)] >=x11-libs/pango-1.36.3[abi_x86_32(-)] ) - x86? ( ${NATIVE_DEPS} ) + x86? ( ${NATIVE_RDEPEND} ) ) || ( media-fonts/liberation-fonts media-fonts/corefonts ) selinux? ( sec-policy/selinux-flash ) diff --git a/www-plugins/adobe-flash/adobe-flash-24.0.0.154.ebuild b/www-plugins/adobe-flash/adobe-flash-24.0.0.154.ebuild index 7c835c4..f2b7ef1 100644 --- a/www-plugins/adobe-flash/adobe-flash-24.0.0.154.ebuild +++ b/www-plugins/adobe-flash/adobe-flash-24.0.0.154.ebuild @@ -35,7 +35,40 @@ KEYWORDS="-* ~amd64 ~x86" LICENSE="AdobeFlash-11.x" RESTRICT="strip mirror" +NPAPI_RDEPEND=" + dev-libs/atk + dev-libs/glib:2 + dev-libs/nspr + dev-libs/nss + kde? ( + dev-qt/qtcore:4 + dev-qt/qtdbus:4 + dev-qt/qtgui:4 + dev-qt/qtsvg:4 + kde-base/kdelibs + x11-libs/libICE + x11-libs/libSM + x11-libs/libXau + x11-libs/libXdmcp + x11-libs/libXext + x11-libs/libXft + x11-libs/libXpm + ) + media-libs/fontconfig + media-libs/freetype + >=sys-libs/glibc-2.4 + x11-libs/cairo + x11-libs/gdk-pixbuf + x11-libs/gtk+:2 + x11-libs/libX11 + x11-libs/libXcursor + x11-libs/libXext + x11-libs/libXrender + x11-libs/libXt + x11-libs/pango +" RDEPEND=" + npapi? ( ${NPAPI_RDEPEND} ) !www-plugins/chrome-binary-plugins[flash(-)] npapi? ( !www-plugins/adobe-flash:0 ) "