[gentoo-commits] gentoo-x86 commit in net-im/skype: ChangeLog skype-4.2.0.11-r1.ebuild skype-4.2.0.13.ebuild metadata.xml

[Justin Lecher (jlec)]

jlec        14/01/29 15:55:50

  Modified:             ChangeLog skype-4.2.0.11-r1.ebuild metadata.xml
  Added:                skype-4.2.0.13.ebuild
  Log:
  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!)

Revision  Changes    Path
1.154                net-im/skype/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/skype/ChangeLog?rev=1.154&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/skype/ChangeLog?rev=1.154&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/skype/ChangeLog?r1=1.153&r2=1.154

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-im/skype/ChangeLog,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -r1.153 -r1.154
--- ChangeLog	17 Oct 2013 18:32:40 -0000	1.153
+++ ChangeLog	29 Jan 2014 15:55:49 -0000	1.154
@@ -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@g.o> 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@g.o> skype-4.2.0.11-r1.ebuild:
   Do not require -abi_x86_32 on emul-linux to simplify installing. It does not



1.5                  net-im/skype/skype-4.2.0.11-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/skype/skype-4.2.0.11-r1.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/skype/skype-4.2.0.11-r1.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/skype/skype-4.2.0.11-r1.ebuild?r1=1.4&r2=1.5

Index: skype-4.2.0.11-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-im/skype/skype-4.2.0.11-r1.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- skype-4.2.0.11-r1.ebuild	17 Oct 2013 18:32:40 -0000	1.4
+++ skype-4.2.0.11-r1.ebuild	29 Jan 2014 15:55:49 -0000	1.5
@@ -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 @@
 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"



1.10                 net-im/skype/metadata.xml

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/skype/metadata.xml?rev=1.10&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/skype/metadata.xml?rev=1.10&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/skype/metadata.xml?r1=1.9&r2=1.10

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-im/skype/metadata.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- metadata.xml	16 Dec 2012 20:20:01 -0000	1.9
+++ metadata.xml	29 Jan 2014 15:55:49 -0000	1.10
@@ -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@g.o</email>
-	</maintainer>
-	<longdescription>Skype is the next phenomenon from the people who 
+  <maintainer>
+    <email>maintainer-needed@g.o</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>



1.1                  net-im/skype/skype-4.2.0.13.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/skype/skype-4.2.0.13.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/skype/skype-4.2.0.13.ebuild?rev=1.1&content-type=text/plain

Index: skype-4.2.0.13.ebuild
===================================================================
# 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
}