commit: e3a38f765a1d4145ccfec89086f53a147ff21d1d Author: Raymond Jennings <shentino <AT> gmail <DOT> com> AuthorDate: Mon Oct 17 14:59:46 2016 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Fri Oct 21 18:48:33 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3a38f76
net-im/skypeforlinux: Revbump * Remove obsolete blocker on net-im/skype:1 * Readd dependencies on gcc and glibc - Turns out we need to hardcode them if upstream does the compile for us and gives us a binary - Also, we need to require gcc use cxx, to pull in libstdc++ * Fix bug 596980 - Uncomment amended paxmarking - Document the pax_kernel USE flag - Slash standardize ED - Mark paxctl with || die * Minor formatting fix to src_unpack() * Fix up IUSE for pax_kernel and removal of selinux * Remove bogus fowners call * Clean up unicode fluff out of metadata.xml - Seriously, why do we need fancy apostrophes when an ASCII one will do just fine? * Amend HOMEPAGE to use https Closes: https://github.com/gentoo/gentoo/pull/2601 Signed-off-by: David Seifert <soap <AT> gentoo.org> net-im/skypeforlinux/metadata.xml | 5 +++- ...0.1.ebuild => skypeforlinux-1.10.0.1-r1.ebuild} | 32 +++++++++------------- 2 files changed, 17 insertions(+), 20 deletions(-) diff --git a/net-im/skypeforlinux/metadata.xml b/net-im/skypeforlinux/metadata.xml index 7651eec..c6d726f 100644 --- a/net-im/skypeforlinux/metadata.xml +++ b/net-im/skypeforlinux/metadata.xml @@ -9,5 +9,8 @@ <email>proxy-ma...@gentoo.org</email> <name>Proxy Maintainers</name> </maintainer> - <longdescription>Skype is for doing things together, whenever you’re apart. Skype’s text, voice and video make it simple to share experiences with the people that matter to you, wherever they are.</longdescription> + <use> + <flag name="pax_kernel">Triggers a paxmarking of the main skype binary</flag> + </use> + <longdescription>Skype is for doing things together, whenever you're apart. Skype's text, voice and video make it simple to share experiences with the people that matter to you, wherever they are.</longdescription> </pkgmetadata> diff --git a/net-im/skypeforlinux/skypeforlinux-1.10.0.1.ebuild b/net-im/skypeforlinux/skypeforlinux-1.10.0.1-r1.ebuild similarity index 78% rename from net-im/skypeforlinux/skypeforlinux-1.10.0.1.ebuild rename to net-im/skypeforlinux/skypeforlinux-1.10.0.1-r1.ebuild index 106a1e5..1001af4 100644 --- a/net-im/skypeforlinux/skypeforlinux-1.10.0.1.ebuild +++ b/net-im/skypeforlinux/skypeforlinux-1.10.0.1-r1.ebuild @@ -8,21 +8,19 @@ EAPI=6 inherit eutils rpm DESCRIPTION="P2P Internet Telephony (VoiceIP) client" -HOMEPAGE="http://www.skype.com/"; +HOMEPAGE="https://www.skype.com/"; SRC_URI="https://repo.skype.com/rpm/stable/${PN}_${PV}-1.x86_64.rpm"; LICENSE="Skype-TOS no-source-code" SLOT="0" KEYWORDS="~amd64" -#IUSE="pax_kernel selinux" -IUSE="" +IUSE="pax_kernel" S="${WORKDIR}" QA_PREBUILT=opt/skypeforlinux/skypeforlinux RESTRICT="mirror bindist strip" #299368 RDEPEND="virtual/ttf-fonts - !net-im/skype:1 dev-libs/atk dev-libs/expat dev-libs/glib:2 @@ -35,6 +33,8 @@ RDEPEND="virtual/ttf-fonts media-libs/freetype:2 net-print/cups sys-apps/dbus + sys-devel/gcc[cxx] + sys-libs/glibc x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 @@ -50,9 +50,8 @@ RDEPEND="virtual/ttf-fonts x11-libs/libXScrnSaver x11-libs/libXtst x11-libs/pango" -# selinux? ( sec-policy/selinux-skype )" -src_unpack () { +src_unpack() { rpm_src_unpack ${A} } @@ -86,7 +85,6 @@ src_install() { into /opt dobin usr/bin/skypeforlinux - fowners root:audio /opt/bin/skypeforlinux /opt/skypeforlinux/skypeforlinux # insinto /etc/dbus-1/system.d # doins ${PN}.conf @@ -102,18 +100,14 @@ src_install() { domenu usr/share/applications/skypeforlinux.desktop -# if use pax_kernel; then -# if use apulse; then -# pax-mark Cm "${ED}"/opt/bin/${PN}-bin || die -# else -# pax-mark Cm "${ED}"/opt/bin/${PN} || die -# fi -# 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 + if use pax_kernel; then + paxctl -Cm "${ED%/}"/opt/skypeforlinux/skypeforlinux || 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
