Version bump. Fixes bug #362353.

Package-Manager: portage-2.2.0_alpha29/cvs/Linux x86_64

3 files changed, 132 insertions, 16 deletions

diff --git a/net-im/skype/ChangeLog b/net-im/skype/ChangeLog
index 85cdcb32f46e..b6708e473c26 100644
--- a/net-im/skype/ChangeLog
+++ b/net-im/skype/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-im/skype
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/skype/ChangeLog,v 1.114 2011/03/06 11:58:17 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/skype/ChangeLog,v 1.115 2011/04/07 09:24:46 scarabeus Exp $
+
+*skype-2.2.0.25 (07 Apr 2011)
+
+  07 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org> +skype-2.2.0.25.ebuild:
+  Version bump. Fixes bug #362353.
 
   06 Mar 2011; Markos Chandras <hwoarang@gentoo.org> skype-2.1.0.81.ebuild:
   Stable on amd64 wrt bug #357475
diff --git a/net-im/skype/Manifest b/net-im/skype/Manifest
index 0406588637ff..cc473627beb1 100644
--- a/net-im/skype/Manifest
+++ b/net-im/skype/Manifest
@@ -1,25 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 DIST skype-2.1.0.81.tar.bz2 19659673 RMD160 0b145ee9e89ab2592fc7d3590412da0a36eb903f SHA1 8d4fbb26eb1a791f2e6f2da7bba8a698377b8592 SHA256 5f1218b658fb7d22f03ffdeb660c74896ffe20ac68f392b0d21a300012a928f4
+DIST skype-2.2.0.25.tar.bz2 23057633 RMD160 eb794cef43f0c30ea5cd5dd7a015f77bb1cc1a80 SHA1 1b7e969ca3fdb4b4dc2ed0d674149cf016fd55c3 SHA256 09065baed79dbd22325e9f0d79bf26b169010b9c84beeed599aa9350e8f1f9a5
 DIST skype_static-2.1.0.81.tar.bz2 27555345 RMD160 bdc6f4b04ec61d1002cca8ff3def331102c53011 SHA1 8839a80b2fe7276c53ac4ec5b0fd77f2e8d63904 SHA256 5cbdc7c07b47af01607ac6d0b7285368866f92a244f52aed68c4f7c227d466ae
+DIST skype_static-2.2.0.25.tar.bz2 30882910 RMD160 833b77599112447c28ecfdfa0d60f897a55336b7 SHA1 9fd37a0cfb28aa7ebe3b8ce4b8961f437e05924e SHA256 1025952445bd7ce97bafdb0f74decc66d217ff183ee06621eaa3a033cb910e44
 EBUILD skype-2.1.0.81.ebuild 2765 RMD160 8bb76545075bd05566f04d502e41231c6eb1507e SHA1 8cb49442861d431e4779ed3273980b34657b40ff SHA256 0859b2177189f9b813319a5ae216d385d8507899c825bafe9e0d9265c62cb5c9
-MISC ChangeLog 20592 RMD160 197b6d158448423f3d814c465706895a61b14d75 SHA1 a253550e8a2450642f0fe1467d77465f0a257b0d SHA256 af096bc4ea36c5399f37154bc9d4bf95a3c35ca0f0087a4defbadb67d5f2acc3
+EBUILD skype-2.2.0.25.ebuild 2770 RMD160 89d0195733d4a6294084809bab9fba384c5d8397 SHA1 26047792437c7304862b7a3a9f4e3cb91eae1831 SHA256 ff50a4e57267470ba1662303eb8529bac5f17b126e929e3086a76a3d5ef94fe5
+MISC ChangeLog 20739 RMD160 3ff4ae65ffbcc434fd6ed03c8fb49739a04d17f8 SHA1 14a260be18b3242bd2f32d990ce7525e8adec8d4 SHA256 342502ee9d95d702eb137f77a799a506f51fd2fd5a5ca20b8ea0ff18b1e3824e
 MISC metadata.xml 574 RMD160 8b4dbbc23a0cdff6e73ace07c8aaff5ac6bb1e49 SHA1 474a65946ca1d57f50b123d4f6f6518ab6106553 SHA256 ba7224ee8e985051a464944ba62227ff7e9364df9be83270ac0075b2e95b2ef0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJNc3beAAoJEPqDWhW0r/LCED0P/3ldnLtlyrF0gZnpOHREFnTt
-9OgFsHhV1k1n5qKX2KLiGOQtDH4IynvA0tJb6cexXSFvK6bAmNOCmYcJ/rsWaVf+
-6jfVpxc88LWQ704gzLihNOSSHOa5u9Y0MzrdpzXItVTXoHhBInTyvXgZTadf24Wh
-yag9cb/SC9ev6vwQBrqC37RkAcsokInwm0tEm9/n/AJl2jklscDOmb5ajpHIfdGn
-GVt4OhasMwbYcXzAv/ugEuXtN29mMJOSgtxqoYIjHMjiGvuWb8YsPI5UmTdcC2uL
-wnt2rk/+RjbQAiIkxSVPRdSlfeIWNKZVfPoCr/4dUP7FeT05lyuogUjwHPGNepL6
-SzRGEX8Sa94lthnidtYAMKkCeZ2ZqZv8StJ4CpEqcTr7iRYO1NONo9yOf7vOw1qk
-vu948racDCXrmuFeyz1soGjyKTNHlxf1WdFgS7GIoZB3TLOP5jvjtG0urKQcSLY7
-a8lgfbQAgNXmHHdFXMhs/xdd/Tft58irzanbV52HBvXMy1cd9v95xXeSE7iJaPwu
-Yjyc7mXxhm5Cyd7cnWR/O3CP73z6rWc/KzwXP2OaoVgAQWJE9J7RFaafhmoTeO+M
-Ld6rF/vNtnYoZhBuPwu405xoxrNF5Qb+7fBvkKe1eI8NEqMpS5UwAOxn7iHR8dOt
-8wY4FyDVvItERmbMNoc0
-=LK8d
+iEYEARECAAYFAk2dguQACgkQHB6c3gNBRYdrfQCgxovQ0KVjxEw6/YzbFD8++6IW
+C/kAoKvlnGLgsNCzIWPAm3azAb9XT5SK
+=C7li
 -----END PGP SIGNATURE-----
diff --git a/net-im/skype/skype-2.2.0.25.ebuild b/net-im/skype/skype-2.2.0.25.ebuild
new file mode 100644
index 000000000000..05001ff050dd
--- /dev/null
+++ b/net-im/skype/skype-2.2.0.25.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/skype/skype-2.2.0.25.ebuild,v 1.1 2011/04/07 09:24:46 scarabeus Exp $
+
+EAPI=4
+inherit gnome2-utils eutils qt4-r2 pax-utils
+
+SFILENAME=${PN}_static-${PV}.tar.bz2
+DFILENAME=${P}.tar.bz2
+
+DESCRIPTION="A P2P-VoiceIP client."
+HOMEPAGE="http://www.skype.com/"
+SRC_URI="!qt-static? ( http://download.skype.com/linux/${DFILENAME} )
+	qt-static? ( http://download.skype.com/linux/${SFILENAME} )"
+
+LICENSE="skype-eula"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="qt-static"
+
+RESTRICT="mirror strip" # Bug 299368
+EMUL_VER=20091231
+
+RDEPEND="
+	amd64? ( >=app-emulation/emul-linux-x86-xlibs-${EMUL_VER}
+			>=app-emulation/emul-linux-x86-baselibs-${EMUL_VER}
+			>=app-emulation/emul-linux-x86-soundlibs-${EMUL_VER}
+			>=app-emulation/emul-linux-x86-opengl-${EMUL_VER}
+			!qt-static? ( >=app-emulation/emul-linux-x86-qtlibs-${EMUL_VER} ) )
+	x86? ( >=media-libs/alsa-lib-1.0.11
+		x11-libs/libXScrnSaver
+		x11-libs/libXv
+		qt-static? ( media-libs/alsa-lib
+			x11-libs/libXv
+			x11-libs/libXScrnSaver
+			x11-libs/libSM
+			x11-libs/libICE
+			x11-libs/libXi
+			x11-libs/libXrender
+			x11-libs/libXrandr
+			media-libs/freetype
+			media-libs/fontconfig
+			x11-libs/libXext
+			x11-libs/libX11
+			dev-libs/glib:2 )
+		!qt-static? ( media-libs/alsa-lib
+			x11-libs/libXv
+			x11-libs/libXScrnSaver
+			x11-libs/qt-gui:4[accessibility,dbus]
+			x11-libs/qt-dbus:4
+			x11-libs/libXext
+			x11-libs/libX11 ) )
+	virtual/ttf-fonts"
+
+# Required for lrelease command at buildtime
+DEPEND="!qt-static? ( x11-libs/qt-core:4 )"
+
+QA_EXECSTACK="opt/skype/skype"
+QA_WX_LOAD="opt/skype/skype"
+QA_DT_HASH="opt/skype/skype"
+# QA_PRESTRIPPED="opt/skype/skype"
+
+pkg_setup() {
+	:
+}
+
+src_install() {
+	local MY_S="${S}"
+	use qt-static && MY_S="${WORKDIR}/${PN}_static-${PV}"
+	cd "${MY_S}"
+
+	exeinto /opt/skype
+	doexe skype || die
+	fowners root:audio /opt/skype/skype
+	make_wrapper skype ./skype /opt/skype /opt/skype
+
+	insinto /opt/skype/sounds
+	doins sounds/*.wav || die
+
+	if ! use qt-static; then
+		insinto /etc/dbus-1/system.d
+		doins skype.conf || die
+	fi
+
+	if ! use qt-static; then
+		lrelease lang/*.ts
+	fi
+
+	insinto /opt/skype/lang
+	doins lang/*.qm || die
+
+	insinto /opt/skype/avatars
+	doins avatars/*.png || die
+
+	local res
+	for res in 16 32 48; do
+		insinto /usr/share/icons/hicolor/${res}x${res}/apps
+		newins icons/SkypeBlue_${res}x${res}.png skype.png || die
+	done
+
+	dodoc README
+
+	make_desktop_entry skype "Skype VoIP" skype "Network;InstantMessaging;Telephony"
+
+	dosym /opt/skype /usr/share/skype #Fix for disabled sound notification
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}