Version bump, closes bug #283008 by Ivan Ivanich. Minor changes by me, major QA fixes by Samuli Suominen.

Package-Manager: portage-2.2_rc61/cvs/Linux x86_64

3 files changed, 125 insertions, 7 deletions

diff --git a/net-im/skype/ChangeLog b/net-im/skype/ChangeLog
index 6243a62a65f3..75290b826b34 100644
--- a/net-im/skype/ChangeLog
+++ b/net-im/skype/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-im/skype
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/skype/ChangeLog,v 1.103 2009/10/06 18:57:51 ayoy Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/skype/ChangeLog,v 1.104 2010/01/02 00:29:37 chainsaw Exp $
+
+*skype-2.1.0.47 (02 Jan 2010)
+
+  02 Jan 2010; <chainsaw@gentoo.org> +skype-2.1.0.47.ebuild:
+  Version bump, closes bug #283008 by Ivan Ivanich. Minor changes by me,
+  major QA fixes by Samuli Suominen.
 
   06 Oct 2009; Dominik Kapusta <ayoy@gentoo.org> skype-2.0.0.63.ebuild,
   skype-2.0.0.68.ebuild:
diff --git a/net-im/skype/Manifest b/net-im/skype/Manifest
index 5c7040db3ae4..af5eec50f4e3 100644
--- a/net-im/skype/Manifest
+++ b/net-im/skype/Manifest
@@ -6,18 +6,21 @@ AUX skype.debus.config 436 RMD160 ec47725458e05cca8e37316989f473963b5b654d SHA1
 DIST skype-2.0.0.63.tar.bz2 15050614 RMD160 aafe02b72cdfc0d734c593a88e4e66762cec375a SHA1 a787c6541aa1313f4600eb635b06ef808c11affa SHA256 48ec096f8cd55e66120b02e8c513acfaf4d40e62c8d4c1d54582088991c52cee
 DIST skype-2.0.0.68.tar.bz2 15077724 RMD160 479dac228ff2c975d35d56d8e8b12019ebed33bd SHA1 ebfa97fe6a3e0eb1eaf30a207b5c34995619efbf SHA256 92230ddae4adec19f6a6f07d7b0a2e122f40dcfe8131a45b4687078ea8ea1ec0
 DIST skype-2.0.0.72.tar.bz2 15104486 RMD160 ab8ad304c6739cb68ad3420b9da89abc97ca5588 SHA1 554a2d2fdf0b2291692ed84c2d862bc80b8a6b26 SHA256 d3087571ab206729e6628986eb485e48204f5f1f0ed3f28326c376d86d583fe8
+DIST skype-2.1.0.47.tar.bz2 19748117 RMD160 7b5a3255b6a1db7c622355793ec3e582d9ff2777 SHA1 a0c7918767f01e79c37d4bd4dc085855c111994b SHA256 f4db42b21138ca9d424409f880dd311faa0f5e60003f5bbb82d6006dcfd61971
 DIST skype_static-2.0.0.63.tar.bz2 21568615 RMD160 4a53cad35e0983ea332e314ca9ac621cd6c686ae SHA1 2ccb2b28bc692a82930c44e215ba58caac0d9e7a SHA256 e14b9c6faae3e55fd5dc4c6253fa7c2781418d532d75554928f5fd6c086ce736
 DIST skype_static-2.0.0.68.tar.bz2 21590097 RMD160 5d2382b2df198fd9aa2f61336a24fbba07e7b520 SHA1 30e96181ff019fd490e4666df640d2a04350f1a1 SHA256 846c979d6e06c0062b9876e2fcda5c1ef1f545e16eb8c828eb17738456885253
 DIST skype_static-2.0.0.72.tar.bz2 21613953 RMD160 fcadcbb30eeea2e548771984b38884d23d461f7f SHA1 bc69854b5cc83e2e92c91f9a5b7688a00dc7ce7e SHA256 2f37963e8f19c0ec5efd8631abe9633b6551f09dee024460c40fad10728bc580
+DIST skype_static-2.1.0.47.tar.bz2 27323809 RMD160 6e63f345a40bf06d51a9d9d7698bf61992ac93c8 SHA1 aa9a2b6b8bc164ffbaa0141bc0ba7de470792921 SHA256 56b0fa6185661b187a409dc09b99ada3e01fa82aaae5f1048f8a698aa6f86e81
 EBUILD skype-2.0.0.63.ebuild 3014 RMD160 90bc0868ae81d778233a7381237037a70b030a8d SHA1 cfd2b452b0578819e437163f0462b005e9d4bc02 SHA256 ab6f173841f162728f75701c75848af33d719d0e8c670d70e257d1efd17ea7ad
 EBUILD skype-2.0.0.68.ebuild 3016 RMD160 4004b8a5dcc2d146b6ed802a59fc38eb852b196c SHA1 f050ddb7daf484888f88329d8203fae6e67916e0 SHA256 201c251ed0f20296f47e0506b31fd46a67110f181d807d7cea6756a526afa448
 EBUILD skype-2.0.0.72.ebuild 2635 RMD160 047bf50be407d3ddc9b0af51569e080925d42bb7 SHA1 14f1d20cd8b16517487da1aaf45c9fd8116d1e41 SHA256 e67d531d87dfab6028ea64d010f4ef2fb6e1cb39eb21a0b661cec09db7dc4438
-MISC ChangeLog 18908 RMD160 dfae732cfda7996f521fb80ea40c7b941d1ad139 SHA1 66de67831d7df3c73a61d07af141ad95e6d466fc SHA256 b2f3908bc3d56eff228172d71a4117d043532fad9f4700e684dcc9d726f96540
+EBUILD skype-2.1.0.47.ebuild 2807 RMD160 baf0d2441e634a077c305b8ff14c5c714b52f8da SHA1 c9fdc3f9f06a2fcc71090915ec5ed9aca7ce0dd2 SHA256 6407e56698ec975dc9cbad3d550b41241aa989f5602a83859520c0cb8b9b279a
+MISC ChangeLog 19115 RMD160 a0b646942f0787eba9ce33543cea3079c4113802 SHA1 8d7d517aab84268ca462fcf3a214b0c87c9540cb SHA256 09786793de2b25cde0c2417eff6fd4c5bb08056603023e8b215689483c3c24fc
 MISC metadata.xml 574 RMD160 8b4dbbc23a0cdff6e73ace07c8aaff5ac6bb1e49 SHA1 474a65946ca1d57f50b123d4f6f6518ab6106553 SHA256 ba7224ee8e985051a464944ba62227ff7e9364df9be83270ac0075b2e95b2ef0
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkrLkzkACgkQ+CZEqwt+F6YgXwCgjzYBOhAUsmL7Fs0Bj+9iDjR8
-lR8AoJnwDq92ZXcuzFE37szUFhYIkjN7
-=Yf2p
+iEYEARECAAYFAks+k4cACgkQp5vW4rUFj5qlYACfRCS+H1g3xkYirOTKiXeWriLw
+KSMAoJHjr6d4tdBkByj24pUpQTKlyF2P
+=/SCq
 -----END PGP SIGNATURE-----
diff --git a/net-im/skype/skype-2.1.0.47.ebuild b/net-im/skype/skype-2.1.0.47.ebuild
new file mode 100644
index 000000000000..dbc5ed9d30a8
--- /dev/null
+++ b/net-im/skype/skype-2.1.0.47.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2010 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.47.ebuild,v 1.1 2010/01/02 00:29:37 chainsaw Exp $
+
+EAPI=2
+
+inherit eutils qt4 pax-utils
+
+DESCRIPTION="A P2P-VoiceIP client."
+HOMEPAGE="http://www.skype.com/"
+
+SFILENAME=${PN}_static-${PV}.tar.bz2
+DFILENAME=${P}.tar.bz2
+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"
+
+EMUL_VER=20091231
+
+DEPEND="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}
+			!qt-static? ( >=app-emulation/emul-linux-x86-qtlibs-${EMUL_VER} ) )
+	x86? ( >=sys-libs/glibc-2.4
+		>=media-libs/alsa-lib-1.0.11
+		x11-libs/libXScrnSaver
+		x11-libs/libXv
+		qt-static? ( media-libs/fontconfig
+			media-libs/freetype
+			x11-libs/libICE
+			x11-libs/libSM
+			x11-libs/libXcursor
+			x11-libs/libXext
+			x11-libs/libXfixes
+			x11-libs/libXi
+			x11-libs/libXinerama
+			x11-libs/libXrandr
+			x11-libs/libXrender
+			x11-libs/libX11 )
+		!qt-static? ( x11-libs/qt-gui:4[accessibility,dbus]
+			x11-libs/qt-dbus:4
+			x11-libs/libX11
+			x11-libs/libXau
+			x11-libs/libXdmcp ) )"
+RDEPEND="${DEPEND}"
+
+QA_EXECSTACK="opt/skype/skype"
+QA_WX_LOAD="opt/skype/skype"
+QA_DT_HASH="opt/skype/skype"
+QA_PRESTRIPPED="opt/skype/skype"
+
+use qt-static && S="${WORKDIR}/${PN}_static-${PV}"
+
+src_install() {
+	# remove mprotect() restrictions for PaX usage - see Bug 100507
+	# NOTE. Commented out because it's breaking Skype 2.1.0.47.
+	# pax-mark m "${S}"/skype
+
+	exeinto /opt/${PN}
+	doexe skype
+	fowners root:audio /opt/skype/skype
+	make_wrapper skype /opt/${PN}/skype /opt/${PN} /opt/${PN} /usr/bin
+
+	insinto /opt/${PN}/sounds
+	doins sounds/*.wav
+
+	if ! use qt-static ; then
+		insinto /etc/dbus-1/system.d
+		newins "${FILESDIR}"/skype.debus.config skype.conf
+	fi
+
+	insinto /opt/${PN}/lang
+	#
+	#There have been some issues were lang is not updated from the .ts files
+	#but if we have qt we can rebuild it
+	#
+	if ! use qt-static ; then
+		lrelease lang/*.ts
+	fi
+
+	doins lang/*.qm
+
+	insinto /opt/${PN}/avatars
+	doins avatars/*.png
+
+	insinto /opt/${PN}
+	for X in 16 32 48
+	do
+		insinto /usr/share/icons/hicolor/${X}x${X}/apps
+		newins "${S}"/icons/SkypeBlue_${X}x${X}.png ${PN}.png
+	done
+
+	dodoc README
+
+	# insinto /usr/share/applications/
+	# doins skype.desktop
+	make_desktop_entry ${PN} "Skype VoIP" ${PN} "Network;InstantMessaging;Telephony"
+
+	#Fix for no sound notifications
+	dosym /opt/${PN} /usr/share/${PN}
+
+	# TODO: Optional configuration of callto:// in KDE, Mozilla and friends
+	# doexe skype-callto-handler
+}
\ No newline at end of file