Version bump. Bug #369827. Drop stable amd64 keyword. Bug #357475

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

4 files changed, 146 insertions, 9 deletions

diff --git a/net-im/skype/ChangeLog b/net-im/skype/ChangeLog
index b6708e473c26..60cb6180793d 100644
--- a/net-im/skype/ChangeLog
+++ b/net-im/skype/ChangeLog
@@ -1,6 +1,12 @@
 # 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.115 2011/04/07 09:24:46 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/skype/ChangeLog,v 1.116 2011/06/04 17:38:34 hwoarang Exp $
+
+*skype-2.2.0.35 (04 Jun 2011)
+
+  04 Jun 2011; Markos Chandras <hwoarang@gentoo.org> skype-2.1.0.81.ebuild,
+  +skype-2.2.0.35.ebuild:
+  Version bump. Bug #369827. Drop stable amd64 keyword. Bug #357475
 
 *skype-2.2.0.25 (07 Apr 2011)
 
diff --git a/net-im/skype/Manifest b/net-im/skype/Manifest
index cc473627beb1..06b422f04f4d 100644
--- a/net-im/skype/Manifest
+++ b/net-im/skype/Manifest
@@ -1,18 +1,31 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 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-2.2.0.35.tar.bz2 23079480 RMD160 b1bd07797facc5053985466570e832af38d734ac SHA1 2a0956b1eb6b2f6bf9c863843c80ab31864bfd9e SHA256 b1cba19e012a253a3ddd52959500012463e71bc01dad4cb72fc19112d75b8b9c
 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
+DIST skype_static-2.2.0.35.tar.bz2 30883020 RMD160 8f18fa03c214e0f0d874e91c14d08d51f19f7da8 SHA1 7cb0baffe5993b4c1dbe25fdebe4fb40773a4c26 SHA256 125a02cf03c4beea44535013ab2d1029d9189158f6e366c23d2f498ae241d1e7
+EBUILD skype-2.1.0.81.ebuild 2767 RMD160 fc7faabedad29c713c4f92bc0a067227c6eca6d2 SHA1 b789b801a7bb8e7e2b0d8ccb522dc01c3d92d956 SHA256 15e45595dc3f1b690e834275dd51112158c66485cae6507a874aa22d5816d919
 EBUILD skype-2.2.0.25.ebuild 2770 RMD160 89d0195733d4a6294084809bab9fba384c5d8397 SHA1 26047792437c7304862b7a3a9f4e3cb91eae1831 SHA256 ff50a4e57267470ba1662303eb8529bac5f17b126e929e3086a76a3d5ef94fe5
-MISC ChangeLog 20739 RMD160 3ff4ae65ffbcc434fd6ed03c8fb49739a04d17f8 SHA1 14a260be18b3242bd2f32d990ce7525e8adec8d4 SHA256 342502ee9d95d702eb137f77a799a506f51fd2fd5a5ca20b8ea0ff18b1e3824e
+EBUILD skype-2.2.0.35.ebuild 2769 RMD160 7e44e28a25d903768033052bded1634487f42001 SHA1 25f625c49cb5f4e88d4f3bb1df36bb1b09aae6a2 SHA256 9e57a253c93b40831180f8feaa8cdb9e8128ad3fcfc1fbc4392e8361dd04f06a
+MISC ChangeLog 20940 RMD160 42606515092b3dec44153e180a5f557509620f36 SHA1 a798b7a02632f8fe19723d41ae039b01d1126ea1 SHA256 7cca7dc0fc9b0ef00f182de9f9efac34378d82cc324b4f86d067b6fbb52dfe76
 MISC metadata.xml 574 RMD160 8b4dbbc23a0cdff6e73ace07c8aaff5ac6bb1e49 SHA1 474a65946ca1d57f50b123d4f6f6518ab6106553 SHA256 ba7224ee8e985051a464944ba62227ff7e9364df9be83270ac0075b2e95b2ef0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk2dguQACgkQHB6c3gNBRYdrfQCgxovQ0KVjxEw6/YzbFD8++6IW
-C/kAoKvlnGLgsNCzIWPAm3azAb9XT5SK
-=C7li
+iQIcBAEBCgAGBQJN6m2dAAoJEPqDWhW0r/LC3DkP/R4paHPHHseHYWYv36IEHz9Y
+NcJW763PRSk72gDXwmULJiqZ8kxwnu5kWJKKFdyJur779zH7w8ssNL7JjKMNCeDq
+oC+Y5/8T/AL7+oBMRNiK5qtKCmbHbubTOddNxlkDmXDLGVz5H5r7+0EVcCBxquHA
+lQldIrsnYKuHxMTaF/T2NPfVbUqTbAq8leZMZ7OtFD5VhvZ9U2n3FcIhDYxGFFIJ
+3jFvmU6CEb+Bc4mIufs7SbCpSH/PqOqqEsmq8iscwqAQNQdAfOd+AfviRcLiX7LA
+/15WReIPI/VMRmYL9cOB0tV/l+pSKQZVyLht7IT58LQwWCegt/zYVDrbZKxr3ITo
+aDv1Cs1dvcX7tqMNLbd5k6m+6iMMKXIwFY/05Smzw0m+X9KTOQ33GoX97A58DP+X
+z8PhhUzLqMddEMJSmRZ4LqjsEucSy2mvFdeZIdxe0W1ywsO89UyzEixlZm5rdLnL
+XX17WAiJ685AlsjyuFhXov5JdZrYcwvg6VZ2UP3icQhjEKdONVofSqm4wvQnEaK4
+uYgWZ5ncXVwT4JpED5NasoAl7jXqs8sS7sEQHtN6AIFhFnXreiwRSFyos6OLt+hE
+rmy6SlEXZ9cp6+31kY1yXU/gcvxcAODeWkxjLkVU+34+rDohdPM4oMQ9DttXbWhd
+/UX5ADABco6Lq+Rm+IC2
+=9ZLY
 -----END PGP SIGNATURE-----
diff --git a/net-im/skype/skype-2.1.0.81.ebuild b/net-im/skype/skype-2.1.0.81.ebuild
index a0635890c96a..b5911c6d80ab 100644
--- a/net-im/skype/skype-2.1.0.81.ebuild
+++ b/net-im/skype/skype-2.1.0.81.ebuild
@@ -1,6 +1,6 @@
 # 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.1.0.81.ebuild,v 1.9 2011/03/06 11:58:17 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/skype/skype-2.1.0.81.ebuild,v 1.10 2011/06/04 17:38:34 hwoarang Exp $
 
 EAPI=3
 inherit gnome2-utils eutils qt4 pax-utils
@@ -15,7 +15,7 @@ SRC_URI="!qt-static? ( http://download.skype.com/linux/${DFILENAME} )
 
 LICENSE="skype-eula"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="qt-static"
 
 RESTRICT="mirror strip" # Bug 299368
diff --git a/net-im/skype/skype-2.2.0.35.ebuild b/net-im/skype/skype-2.2.0.35.ebuild
new file mode 100644
index 000000000000..452777ca7b3d
--- /dev/null
+++ b/net-im/skype/skype-2.2.0.35.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.35.ebuild,v 1.1 2011/06/04 17:38:34 hwoarang 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
+}