net-im/skype: Verion Bump, #499264; thanks Jouni Kosonen for the patch

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)

5 files changed, 162 insertions, 13 deletions

diff --git a/net-im/skype/ChangeLog b/net-im/skype/ChangeLog
index 510c1b2f7075..494cb31b76cf 100644
--- a/net-im/skype/ChangeLog
+++ b/net-im/skype/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-im/skype
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/skype/ChangeLog,v 1.153 2013/10/17 18:32:40 mgorny Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/skype/ChangeLog,v 1.154 2014/01/29 15:55:49 jlec Exp $
+
+*skype-4.2.0.13 (29 Jan 2014)
+
+  29 Jan 2014; Justin Lecher <jlec@gentoo.org> skype-4.2.0.11-r1.ebuild,
+  +skype-4.2.0.13.ebuild, +files/skype-4.2.0.13-desktop.patch, metadata.xml:
+  Verion Bump, #499264; thanks Jouni Kosonen for the patch
 
   17 Oct 2013; Michał Górny <mgorny@gentoo.org> skype-4.2.0.11-r1.ebuild:
   Do not require -abi_x86_32 on emul-linux to simplify installing. It does not
diff --git a/net-im/skype/files/skype-4.2.0.13-desktop.patch b/net-im/skype/files/skype-4.2.0.13-desktop.patch
new file mode 100644
index 000000000000..a77d86e3a1ac
--- /dev/null
+++ b/net-im/skype/files/skype-4.2.0.13-desktop.patch
@@ -0,0 +1,17 @@
+diff -urNp skype-4.2.0.13-orig/skype.desktop skype-4.2.0.13/skype.desktop
+--- skype-4.2.0.13-orig/skype.desktop	2013-12-18 20:52:54.000000000 +0200
++++ skype-4.2.0.13/skype.desktop	2013-12-18 20:52:54.000000000 +0200
+@@ -1,11 +1,11 @@
+ [Desktop Entry]
+ Name=Skype
+ Comment=Skype Internet Telephony
+ Exec=env PULSE_LATENCY_MSEC=60 skype %U
+-Icon=skype.png
++Icon=skype
+ Terminal=false
+ Type=Application
+ Encoding=UTF-8
+-Categories=Network;Application;
++Categories=Network;InstantMessaging;Telephony;
+ MimeType=x-scheme-handler/skype;
+ X-KDE-Protocols=skype
diff --git a/net-im/skype/metadata.xml b/net-im/skype/metadata.xml
index cae35e08b06f..2b4ba8b35b0c 100644
--- a/net-im/skype/metadata.xml
+++ b/net-im/skype/metadata.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
-	<longdescription>Skype is the next phenomenon from the people who 
+  <maintainer>
+    <email>maintainer-needed@gentoo.org</email>
+  </maintainer>
+  <longdescription>Skype is the next phenomenon from the people who 
 	brought you KaZaA. Just like KaZaA, Skype uses P2P (peer-to-peer) 
 	technology to connect you to other users  not to share files this 
 	time, but to talk and chat with your friends.
 	</longdescription>
-	<use>
-		<flag name='qt-static'>Install the main skype binary with internal copy of Qt</flag>
-		<flag name='pax_kernel'>Triggers a paxmarking of the main skype binary</flag>
-	</use>
+  <use>
+    <flag name="qt-static">Install the main skype binary with internal copy of Qt</flag>
+    <flag name="pax_kernel">Triggers a paxmarking of the main skype binary</flag>
+  </use>
 </pkgmetadata>
diff --git a/net-im/skype/skype-4.2.0.11-r1.ebuild b/net-im/skype/skype-4.2.0.11-r1.ebuild
index 276d8e9855a5..c79d8d7f589a 100644
--- a/net-im/skype/skype-4.2.0.11-r1.ebuild
+++ b/net-im/skype/skype-4.2.0.11-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# 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.2.0.11-r1.ebuild,v 1.4 2013/10/17 18:32:40 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/skype/skype-4.2.0.11-r1.ebuild,v 1.5 2014/01/29 15:55:49 jlec Exp $
 
 EAPI=5
 inherit eutils gnome2-utils pax-utils
@@ -9,7 +9,7 @@ DESCRIPTION="A P2P Internet Telephony (VoiceIP) client"
 HOMEPAGE="http://www.skype.com/"
 SRC_URI="http://download.${PN}.com/linux/${P}.tar.bz2"
 
-LICENSE="${PN}-4.0.0.7-copyright ${PN}-4.0.0.7-third-party_attributions.txt"
+LICENSE="${PN}-4.0.0.7-copyright ${PN}-4.0.0.7-third-party_attributions.txt MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="pax_kernel selinux"
diff --git a/net-im/skype/skype-4.2.0.13.ebuild b/net-im/skype/skype-4.2.0.13.ebuild
new file mode 100644
index 000000000000..c10127f4c6fb
--- /dev/null
+++ b/net-im/skype/skype-4.2.0.13.ebuild
@@ -0,0 +1,126 @@
+# 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.2.0.13.ebuild,v 1.1 2014/01/29 15:55:49 jlec 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="${PN}-4.0.0.7-copyright ${PN}-4.0.0.7-third-party_attributions.txt"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="pax_kernel selinux"
+
+QA_PREBUILT=opt/bin/${PN}
+RESTRICT="mirror 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}
+		)
+		|| (
+			media-libs/alsa-lib[abi_x86_32(-)]
+			>=app-emulation/emul-linux-x86-soundlibs-${EMUL_X86_VER}
+		)
+		|| (
+			(
+				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}
+		)
+	)
+	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
+	)
+	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
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}