From de731fad0c280fe41214d157579a6d2f90a0efb9 Mon Sep 17 00:00:00 2001 From: Amy Liffey Date: Sun, 7 Dec 2014 10:48:42 +0000 Subject: Jauhien changes for working apulse according to bug 531350 (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 34E69781) --- net-im/skype/ChangeLog | 8 +- net-im/skype/files/skype | 3 + net-im/skype/skype-4.3.0.37-r3.ebuild | 143 -------------------------------- net-im/skype/skype-4.3.0.37-r4.ebuild | 151 ++++++++++++++++++++++++++++++++++ 4 files changed, 161 insertions(+), 144 deletions(-) create mode 100644 net-im/skype/files/skype delete mode 100644 net-im/skype/skype-4.3.0.37-r3.ebuild create mode 100644 net-im/skype/skype-4.3.0.37-r4.ebuild (limited to 'net-im/skype') diff --git a/net-im/skype/ChangeLog b/net-im/skype/ChangeLog index 5624e1167d98..d4283df1b453 100644 --- a/net-im/skype/ChangeLog +++ b/net-im/skype/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-im/skype # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/skype/ChangeLog,v 1.168 2014/11/12 14:44:40 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/skype/ChangeLog,v 1.169 2014/12/07 10:48:42 amynka Exp $ + +*skype-4.3.0.37-r4 (07 Dec 2014) + + 07 Dec 2014; Amy Winston +files/skype, + +skype-4.3.0.37-r4.ebuild, -skype-4.3.0.37-r3.ebuild: + Jauhien changes for working apulse according to bug 531350 12 Nov 2014; Michał Górny skype-4.3.0.37-r3.ebuild: Fix emul-linux-x86 deps. Bug #528956. diff --git a/net-im/skype/files/skype b/net-im/skype/files/skype new file mode 100644 index 000000000000..912c79cb2233 --- /dev/null +++ b/net-im/skype/files/skype @@ -0,0 +1,3 @@ +#!/bin/sh + +i686-pc-linux-gnu-apulse skype-bin diff --git a/net-im/skype/skype-4.3.0.37-r3.ebuild b/net-im/skype/skype-4.3.0.37-r3.ebuild deleted file mode 100644 index 8879a91187f3..000000000000 --- a/net-im/skype/skype-4.3.0.37-r3.ebuild +++ /dev/null @@ -1,143 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/skype/skype-4.3.0.37-r3.ebuild,v 1.2 2014/11/12 14:44:40 mgorny Exp $ - -EAPI=5 - -inherit eutils gnome2-utils pax-utils - -DESCRIPTION="P2P Internet Telephony (VoiceIP) client" -HOMEPAGE="http://www.skype.com/" -SRC_URI="http://download.${PN}.com/linux/${P}.tar.bz2" - -LICENSE="skype-4.0.0.7-copyright BSD MIT RSA W3C regexp-UofT no-source-code" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="apulse pax_kernel +pulseaudio selinux" -REQUIRED_USE="apulse? ( !pulseaudio )" - -QA_PREBUILT=opt/bin/${PN} -RESTRICT="mirror bindist strip" #299368 - -EMUL_X86_VER=20120520 - -RDEPEND=" - virtual/ttf-fonts - amd64? ( - || ( - ( - dev-qt/qtcore:4[abi_x86_32(-)] - dev-qt/qtdbus:4[abi_x86_32(-)] - dev-qt/qtgui:4[accessibility,abi_x86_32(-)] - dev-qt/qtwebkit:4[abi_x86_32(-)] - ) - >=app-emulation/emul-linux-x86-qtlibs-${EMUL_X86_VER}[-abi_x86_32(-)] - ) - || ( - media-libs/alsa-lib[abi_x86_32(-)] - >=app-emulation/emul-linux-x86-soundlibs-${EMUL_X86_VER}[-abi_x86_32(-)] - ) - || ( - ( - x11-libs/libX11[abi_x86_32(-)] - x11-libs/libXext[abi_x86_32(-)] - x11-libs/libXScrnSaver[abi_x86_32(-)] - x11-libs/libXv[abi_x86_32(-)] - ) - >=app-emulation/emul-linux-x86-xlibs-${EMUL_X86_VER}[-abi_x86_32(-)] - ) - pulseaudio? ( || ( - media-sound/pulseaudio[abi_x86_32(-)] - >=app-emulation/emul-linux-x86-soundlibs-${EMUL_X86_VER}[-abi_x86_32(-)] - ) ) - apulse? ( media-sound/apulse[abi_x86_32(-)] ) - ) - x86? ( - media-libs/alsa-lib - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXScrnSaver - x11-libs/libXv - dev-qt/qtcore:4 - dev-qt/qtdbus:4 - dev-qt/qtgui:4[accessibility] - dev-qt/qtwebkit:4 - apulse? ( media-sound/apulse ) - ) - pulseaudio? ( media-sound/pulseaudio ) - selinux? ( sec-policy/selinux-skype )" - -src_prepare() { - epatch "${FILESDIR}/${P}-desktop.patch" -} - -src_compile() { - if type -P lrelease >/dev/null; then - lrelease lang/*.ts || die - fi - rm -f lang/*.ts || die -} - -src_install() { - into /opt - dobin ${PN} - fowners root:audio /opt/bin/${PN} - - insinto /etc/dbus-1/system.d - doins ${PN}.conf - - insinto /usr/share/skype - doins -r avatars lang sounds - - dodoc README - - local res - for res in 16 32 48 64 96 128 256; do - newicon -s ${res} icons/SkypeBlue_${res}x${res}.png ${PN}.png - done - - domenu skype.desktop - - if use pax_kernel; then - pax-mark Cm "${ED}"/opt/bin/${PN} || die - eqawarn "You have set USE=pax_kernel meaning that you intend to run" - eqawarn "${PN} under a PaX enabled kernel. To do so, we must modify" - eqawarn "the ${PN} binary itself and this *may* lead to breakage! If" - eqawarn "you suspect that ${PN} is being broken by this modification," - eqawarn "please open a bug." - fi - - echo PRELINK_PATH_MASK=/opt/bin/${PN} > ${T}/99${PN} - doenvd "${T}"/99${PN} #430142 -} - -pkg_preinst() { - gnome2_icon_savelist - - rm -rf "${EROOT}"/usr/share/${PN} #421165 -} - -pkg_postinst() { - gnome2_icon_cache_update - - # http://bugs.gentoo.org/360815 - elog "For webcam support, see \"LD_PRELOAD\" section of \"README.lib\" document provided by" - elog "media-libs/libv4l package and \"README\" document of this package." - if use amd64; then - elog "You can install app-emulation/emul-linux-x86-medialibs package for the 32bit" - elog "libraries from the media-libs/libv4l package." - fi - - if ! use pulseaudio && ! use apulse; then - ewarn "ALSA support was removed from Skype" - ewarn "consider installing media-sound/pulseaudio" - ewarn "or media-sound/apulse for pulseaudio emulation" - ewarn "otherwise sound will not work for you." - ewarn "These packages can be pulled in by setting" - ewarn "appropriate USE flags for net-im/skype." - fi -} - -pkg_postrm() { - gnome2_icon_cache_update -} diff --git a/net-im/skype/skype-4.3.0.37-r4.ebuild b/net-im/skype/skype-4.3.0.37-r4.ebuild new file mode 100644 index 000000000000..65f84c2bb46d --- /dev/null +++ b/net-im/skype/skype-4.3.0.37-r4.ebuild @@ -0,0 +1,151 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-im/skype/skype-4.3.0.37-r4.ebuild,v 1.1 2014/12/07 10:48:42 amynka Exp $ + +EAPI=5 + +inherit eutils gnome2-utils pax-utils + +DESCRIPTION="P2P Internet Telephony (VoiceIP) client" +HOMEPAGE="http://www.skype.com/" +SRC_URI="http://download.${PN}.com/linux/${P}.tar.bz2" + +LICENSE="skype-4.0.0.7-copyright BSD MIT RSA W3C regexp-UofT no-source-code" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="apulse pax_kernel +pulseaudio selinux" +REQUIRED_USE="apulse? ( !pulseaudio )" + +QA_PREBUILT=opt/bin/${PN} +RESTRICT="mirror bindist strip" #299368 + +EMUL_X86_VER=20120520 + +RDEPEND=" + virtual/ttf-fonts + amd64? ( + || ( + ( + dev-qt/qtcore:4[abi_x86_32(-)] + dev-qt/qtdbus:4[abi_x86_32(-)] + dev-qt/qtgui:4[accessibility,abi_x86_32(-)] + dev-qt/qtwebkit:4[abi_x86_32(-)] + ) + >=app-emulation/emul-linux-x86-qtlibs-${EMUL_X86_VER}[-abi_x86_32(-)] + ) + || ( + media-libs/alsa-lib[abi_x86_32(-)] + >=app-emulation/emul-linux-x86-soundlibs-${EMUL_X86_VER}[-abi_x86_32(-)] + ) + || ( + ( + x11-libs/libX11[abi_x86_32(-)] + x11-libs/libXext[abi_x86_32(-)] + x11-libs/libXScrnSaver[abi_x86_32(-)] + x11-libs/libXv[abi_x86_32(-)] + ) + >=app-emulation/emul-linux-x86-xlibs-${EMUL_X86_VER}[-abi_x86_32(-)] + ) + pulseaudio? ( || ( + media-sound/pulseaudio[abi_x86_32(-)] + >=app-emulation/emul-linux-x86-soundlibs-${EMUL_X86_VER}[-abi_x86_32(-)] + ) ) + apulse? ( media-sound/apulse[abi_x86_32(-)] ) + ) + x86? ( + media-libs/alsa-lib + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXScrnSaver + x11-libs/libXv + dev-qt/qtcore:4 + dev-qt/qtdbus:4 + dev-qt/qtgui:4[accessibility] + dev-qt/qtwebkit:4 + apulse? ( media-sound/apulse ) + ) + pulseaudio? ( media-sound/pulseaudio ) + selinux? ( sec-policy/selinux-skype )" + +src_prepare() { + epatch "${FILESDIR}/${P}-desktop.patch" +} + +src_compile() { + if type -P lrelease >/dev/null; then + lrelease lang/*.ts || die + fi + rm -f lang/*.ts || die +} + +src_install() { + + if use apulse; then + into /opt + newbin ${PN} ${PN}-bin + dobin "${FILESDIR}/${PN}" + fowners root:audio /opt/bin/${PN} /opt/bin/${PN}-bin + else + into /opt + dobin ${PN} + fowners root:audio /opt/bin/${PN} + fi + + insinto /etc/dbus-1/system.d + doins ${PN}.conf + + insinto /usr/share/skype + doins -r avatars lang sounds + + dodoc README + + local res + for res in 16 32 48 64 96 128 256; do + newicon -s ${res} icons/SkypeBlue_${res}x${res}.png ${PN}.png + done + + domenu skype.desktop + + if use pax_kernel; then + pax-mark Cm "${ED}"/opt/bin/${PN} || die + eqawarn "You have set USE=pax_kernel meaning that you intend to run" + eqawarn "${PN} under a PaX enabled kernel. To do so, we must modify" + eqawarn "the ${PN} binary itself and this *may* lead to breakage! If" + eqawarn "you suspect that ${PN} is being broken by this modification," + eqawarn "please open a bug." + fi + + echo PRELINK_PATH_MASK=/opt/bin/${PN} > ${T}/99${PN} + doenvd "${T}"/99${PN} #430142 +} + +pkg_preinst() { + gnome2_icon_savelist + + rm -rf "${EROOT}"/usr/share/${PN} #421165 +} + +pkg_postinst() { + gnome2_icon_cache_update + + # http://bugs.gentoo.org/360815 + elog "For webcam support, see \"LD_PRELOAD\" section of \"README.lib\" document provided by" + elog "media-libs/libv4l package and \"README\" document of this package." + if use amd64; then + elog "You can install app-emulation/emul-linux-x86-medialibs package for the 32bit" + elog "libraries from the media-libs/libv4l package." + fi + + if ! use pulseaudio && ! use apulse; then + ewarn "ALSA support was removed from Skype" + ewarn "consider installing media-sound/pulseaudio" + ewarn "or media-sound/apulse for pulseaudio emulation" + ewarn "otherwise sound will not work for you." + ewarn "These packages can be pulled in by setting" + ewarn "appropriate USE flags for net-im/skype." + fi +} + +pkg_postrm() { + gnome2_icon_cache_update +} -- cgit v1.2.3-65-gdbad