update to 1.4.0.118 with my fix for the lang in static

Package-Manager: portage-2.1.3.9

4 files changed, 170 insertions, 5 deletions

diff --git a/net-im/skype/ChangeLog b/net-im/skype/ChangeLog
index 037d2abd496a..16b439fb19c4 100644
--- a/net-im/skype/ChangeLog
+++ b/net-im/skype/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-im/skype
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/skype/ChangeLog,v 1.78 2007/08/19 16:53:39 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/skype/ChangeLog,v 1.79 2007/10/06 11:32:48 humpback Exp $
+
+*skype-1.4.0.118 (06 Oct 2007)
+
+  06 Oct 2007; Gustavo Felisberto <humpback@gentoo.org>
+  +skype-1.4.0.118.ebuild:
+  Added 1.4.0.118. The delay was because there is a problem with the upstream
+  static version that does not include compiled translations. This was fixed
+  by an extra download that i did with the translations.
 
 *skype-1.4.0.99 (19 Aug 2007)
 
diff --git a/net-im/skype/Manifest b/net-im/skype/Manifest
index 150695d1511c..31f07cc85afb 100644
--- a/net-im/skype/Manifest
+++ b/net-im/skype/Manifest
@@ -18,11 +18,14 @@ DIST libsigc++20-2.0.17-1-from-fc5.rf.i386.tar.gz 7845 RMD160 e66d772cc6548fce16
 DIST skype-1.2.0.18.tar.bz2 7915144 RMD160 3aab2d168667032d3e0da2c735d99f2f03f9d103 SHA1 9621f59e07358a4c97a112899c365c05d249d2fb SHA256 373c2bb69da8ba231281d24d61d2c35bdfefa2fb8ca556a9c06120194b470a0d
 DIST skype-1.2.0.21-1mdk.i586.rpm 7802660 RMD160 0f76ee645d1e90d52a4478a4397e90c6473f86b0 SHA1 085ee4d9df401463f87e75c0a3e2eceb68c0f6d1 SHA256 c70e7ff0add74ceb1b833398eaa07c5699207845f70ebc0a35414af8ff473b12
 DIST skype-1.3.0.53-generic.tar.bz2 9871707 RMD160 d977d263357e94f7587a91e5691488564e7d36eb SHA1 b76f888e89e7e0ae91a6b8de95260e408bc4def7 SHA256 3eb799ce8351697d523da4ef7631ed55bdbe4a69ca1be974ec619a493a0d6ab0
+DIST skype-1.4.0.118.tar.bz2 13200492 RMD160 7dc762c99e47de4c5f43ea78723a4444722c84ca SHA1 8bf7737086702adbd276f081aad3bfe00ea8e22c SHA256 fbbcaf65a74bc7c13ad953fc17d219ad56b23da933e59e493d10bf0215662613
 DIST skype-1.4.0.74-static.tar.bz2 17082427 RMD160 4d551359ca0c62f5dbc20fe18edfcc3ebdd94a0f SHA1 fd937549d6fc8370d45704d912e1223b0d78215b SHA256 e4174e1b06bb348a0a91ab6374f6d0d6cffe45e73a02203557cc30093afbdc3f
 DIST skype-1.4.0.74.bz2 11228352 RMD160 4ae86ec11894d977ae45b40cbccdeeb83e699abc SHA1 81c68e9bffa8e118707ea56af4f5ec531901d55f SHA256 ae70b6fcf6f02ebdf670512b1ef2542f41cc60a37d02ecec02dc871099a2ceb1
 DIST skype-1.4.0.94.tar.bz2 11792373 RMD160 1a187cea9765e0133915853ef636ba1668d8990a SHA1 413c2456449038663b9b382f16a0b812de7965d9 SHA256 16d1ebd31a890f4bae0aab120e8a8b80ba788df0cfa23dc981501beb9f96a9d1
 DIST skype-1.4.0.99.tar.bz2 11789589 RMD160 0e087b894112bdf399d65d0fb5d69a96e5c39d82 SHA1 4908c0cc1005cc0591844d1d3bda45472e9deb88 SHA256 7679f9e2fc9182e3f60ec99980f12050e6c0210aaa5ff179739e148941d06b95
 DIST skype-avatars-1.0.tgz 377763 RMD160 54f6faeebc6509ebec8418fc27d0b2fbdc383bcf SHA1 7cd8ab6935fe91e4c6f59fd571291a7c5fb56a21 SHA256 de7a9187a99ef7a13bba99c4ad61f6809bbd1e129f6456267b416090e57d71d6
+DIST skype-lang-1.4.0.118.tar.bz2 261369 RMD160 0469c735da70459f39eb56a2b14afb1d8d8206da SHA1 344a73a10376f3b1d5b77b9adadb15405ccaede5 SHA256 d2421894d6933a4e658b69c9d00c3eb3728aa26ec82acda537159516b3636cce
+DIST skype_static-1.4.0.118.tar.bz2 19582287 RMD160 39f95c35e6dc483fde6a5b6b3688160338fda594 SHA1 19d1a9581b8f97a88f2196bd32c493406cea79d3 SHA256 1293f54811a36b2a1b83c56a4ad2844e58c753fe39b61422fac66b001d0f9e0c
 DIST skype_static-1.4.0.94.tar.bz2 17647422 RMD160 a79a6b4c78edc1b614f54dd491c4a9243bd6b355 SHA1 fae56e856b64a19791ecd81963b00320f459c9ad SHA256 7534ff037f7c29aad94dcee845d1bb74aa5149fe7df90eef3755025f8aa8bde4
 DIST skype_static-1.4.0.99.tar.bz2 17543204 RMD160 c329ffb87538744e1fae8ebec5195a7d45fceb85 SHA1 0885377c4e6a0c8cd57e827d25bc02167a3e67cb SHA256 bfa236e74b00222360d8e4a83fac7560e6043d264d29911645bcdea8be5fe14c
 DIST skype_staticQT-1.2.0.18.tar.bz2 10678284 RMD160 057f858ecd95ad01727d3643a4d18664bff68df7 SHA1 86026a460fe694287a9b782d6b6f8d1a2807bacb SHA256 fa825ff455b7c6fb53bd4090e7fb99038ce426b4078b4f1dda0307fc4fa216b3
@@ -39,6 +42,10 @@ EBUILD skype-1.3.0.53-r1.ebuild 3494 RMD160 d1784f51b29d2e9c79647b6c8dbab0b9996f
 MD5 cb4b929464546f486e8992bf3b1507dc skype-1.3.0.53-r1.ebuild 3494
 RMD160 d1784f51b29d2e9c79647b6c8dbab0b9996f97b2 skype-1.3.0.53-r1.ebuild 3494
 SHA256 72913446eee7ddc9c62e189a5d696f79e677f67a0d8b7d9725e742a69bc853e8 skype-1.3.0.53-r1.ebuild 3494
+EBUILD skype-1.4.0.118.ebuild 3634 RMD160 e8fbcbce8149b0c539af96bb0c9872ef2ac64126 SHA1 94b8242adb13da367438904a34cd197417cad706 SHA256 858838eb1aeebd2c3049e683f64e321cf9ebae3103fd43036dd54c13253fc1c7
+MD5 0fee2effcea5d68c60629def4bcc4786 skype-1.4.0.118.ebuild 3634
+RMD160 e8fbcbce8149b0c539af96bb0c9872ef2ac64126 skype-1.4.0.118.ebuild 3634
+SHA256 858838eb1aeebd2c3049e683f64e321cf9ebae3103fd43036dd54c13253fc1c7 skype-1.4.0.118.ebuild 3634
 EBUILD skype-1.4.0.74-r2.ebuild 3448 RMD160 773678f5dfaa9473a72e1885deeec3481d250cac SHA1 55258d14fe0778e9f7903774ac01e50627577b65 SHA256 0a118fc9ca5eaf3c9696783a6b2bc404fae2975798f6b9ab01f2f02feeda3647
 MD5 ba18e240c66bf5fe1aa7779c3d39178c skype-1.4.0.74-r2.ebuild 3448
 RMD160 773678f5dfaa9473a72e1885deeec3481d250cac skype-1.4.0.74-r2.ebuild 3448
@@ -51,10 +58,10 @@ EBUILD skype-1.4.0.99.ebuild 3357 RMD160 d1281456c6dfd9ef60938f3ab94ed4a98134db3
 MD5 d3ccb466e9d06a7bc91c6317b1e2eee5 skype-1.4.0.99.ebuild 3357
 RMD160 d1281456c6dfd9ef60938f3ab94ed4a98134db3b skype-1.4.0.99.ebuild 3357
 SHA256 1f1bcf69da68833712ee2640bbcc2040e49e7a84d48ef6b98ba370b8f5b2e9a1 skype-1.4.0.99.ebuild 3357
-MISC ChangeLog 14850 RMD160 311c8a17077c877013bd6d8fbbacbc0842d9b891 SHA1 cfce47a1e93edcc29f4d2a6746dc5598627edda7 SHA256 50bceb7c5b525a5c644db631506b38daa8fb8e4ce744ae7f5f4758de098e0f98
-MD5 3f60a3b14645ec041b37bd3287d6e864 ChangeLog 14850
-RMD160 311c8a17077c877013bd6d8fbbacbc0842d9b891 ChangeLog 14850
-SHA256 50bceb7c5b525a5c644db631506b38daa8fb8e4ce744ae7f5f4758de098e0f98 ChangeLog 14850
+MISC ChangeLog 15178 RMD160 c00968e9915bd870f11f83616a98c6f3a673b44d SHA1 ff5ea74952c4c692ec817a9d31a10994ca095828 SHA256 8a2ee22743a7282a0c46944d8f1a5ebc81e4370a2a16de08db658d3b8da475d8
+MD5 83b70d0801ed8a5c790f5052e468eb7f ChangeLog 15178
+RMD160 c00968e9915bd870f11f83616a98c6f3a673b44d ChangeLog 15178
+SHA256 8a2ee22743a7282a0c46944d8f1a5ebc81e4370a2a16de08db658d3b8da475d8 ChangeLog 15178
 MISC metadata.xml 488 RMD160 0dc53516bb6b9f04aad7625aaf8e81f94f288117 SHA1 8e376a6a24f831850ee87a8538c5b3336f6986e2 SHA256 964cb103f057a79a194dea8ef8cd183400daa2d8f7041a57f95f3544b0b0a7a9
 MD5 dbaa6f09202bfea8c248e1f7c222d40f metadata.xml 488
 RMD160 0dc53516bb6b9f04aad7625aaf8e81f94f288117 metadata.xml 488
@@ -68,6 +75,9 @@ SHA256 4b42f1a7bddcb3e6e5983b00f4586a56e33980ae9ccd64d9f1f2970ba21aad2e files/di
 MD5 ab5b36105b359eb1767d8744cdab9ea0 files/digest-skype-1.3.0.53-r1 822
 RMD160 52043ad46fb7bb6f36c29e765ae24b1cfc471656 files/digest-skype-1.3.0.53-r1 822
 SHA256 2bbcbf2f1b9029baf2c5227bb14f07d47c84c901f506b4625a418190424c4f73 files/digest-skype-1.3.0.53-r1 822
+MD5 6cd98cf7bee498ece160f2e949426ab3 files/digest-skype-1.4.0.118 1105
+RMD160 8d9238e25b7dcf85c3c95477fbf6412e2f039750 files/digest-skype-1.4.0.118 1105
+SHA256 c54e4e3d8d688a561b45b8717b4b1f96834a64144264800c916335b1c5e85c6b files/digest-skype-1.4.0.118 1105
 MD5 10f2445538e1baaad5bdc00f269de7fd files/digest-skype-1.4.0.74-r2 822
 RMD160 8d62bee17e397dbd0f14aec4dccca76a8360cc66 files/digest-skype-1.4.0.74-r2 822
 SHA256 d2e532cc145e43a2e11e1bd1e6b2e4e8e1923dd42453ccc925bb0c6bee93c9ac files/digest-skype-1.4.0.74-r2 822
diff --git a/net-im/skype/files/digest-skype-1.4.0.118 b/net-im/skype/files/digest-skype-1.4.0.118
new file mode 100644
index 000000000000..459eed9ba560
--- /dev/null
+++ b/net-im/skype/files/digest-skype-1.4.0.118
@@ -0,0 +1,12 @@
+MD5 751c485f35585ab8039fb56d6f9d5146 libsigc++20-2.0.17-1-from-fc5.rf.i386.tar.gz 7845
+RMD160 e66d772cc6548fce1681febab7fbfa0846c9b910 libsigc++20-2.0.17-1-from-fc5.rf.i386.tar.gz 7845
+SHA256 066422155ddb13eb6882fcd8d253460edcf4ee3961706ff027be90136aee7d56 libsigc++20-2.0.17-1-from-fc5.rf.i386.tar.gz 7845
+MD5 519d3b26874c0a8e4b8bf4b16ea8a501 skype-1.4.0.118.tar.bz2 13200492
+RMD160 7dc762c99e47de4c5f43ea78723a4444722c84ca skype-1.4.0.118.tar.bz2 13200492
+SHA256 fbbcaf65a74bc7c13ad953fc17d219ad56b23da933e59e493d10bf0215662613 skype-1.4.0.118.tar.bz2 13200492
+MD5 169ed7964251b9a9fb03de057ad0bace skype-lang-1.4.0.118.tar.bz2 261369
+RMD160 0469c735da70459f39eb56a2b14afb1d8d8206da skype-lang-1.4.0.118.tar.bz2 261369
+SHA256 d2421894d6933a4e658b69c9d00c3eb3728aa26ec82acda537159516b3636cce skype-lang-1.4.0.118.tar.bz2 261369
+MD5 95d44d423ec7566b48af47007c7a02c6 skype_static-1.4.0.118.tar.bz2 19582287
+RMD160 39f95c35e6dc483fde6a5b6b3688160338fda594 skype_static-1.4.0.118.tar.bz2 19582287
+SHA256 1293f54811a36b2a1b83c56a4ad2844e58c753fe39b61422fac66b001d0f9e0c skype_static-1.4.0.118.tar.bz2 19582287
diff --git a/net-im/skype/skype-1.4.0.118.ebuild b/net-im/skype/skype-1.4.0.118.ebuild
new file mode 100644
index 000000000000..0c7f631356bc
--- /dev/null
+++ b/net-im/skype/skype-1.4.0.118.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/skype/skype-1.4.0.118.ebuild,v 1.1 2007/10/06 11:32:48 humpback Exp $
+
+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}
+				http://felisberto.net/~humpback/${PN}-lang-${PV}.tar.bz2 )
+	amd64? ( http://felisberto.net/~humpback/libsigc++20-2.0.17-1-from-fc5.rf.i386.tar.gz )"
+
+LICENSE="skype-eula"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="qt-static"
+RESTRICT="mirror strip"
+
+DEPEND="amd64? ( >=app-emulation/emul-linux-x86-xlibs-1.2
+		>=app-emulation/emul-linux-x86-baselibs-2.1.1
+		>=app-emulation/emul-linux-x86-soundlibs-2.4
+		app-emulation/emul-linux-x86-compat )
+	x86? ( >=sys-libs/glibc-2.4
+		>=dev-libs/libsigc++-2
+		>=media-libs/alsa-lib-1.0.11
+		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? ( $(qt4_min_version 4.2.3)
+				x11-libs/libX11
+				x11-libs/libXau
+				x11-libs/libXdmcp ) )"
+RDEPEND="${DEPEND}"
+
+QA_EXECSTACK="opt/skype/skype"
+
+use qt-static && S="${WORKDIR}/${PN}_static-${PV}"
+
+pkg_setup() {
+	if ! use qt-static && ! built_with_use ">=x11-libs/qt-4.0" accessibility dbus ; then
+		eerror "Rebuild qt-4 with USE=\"accessibility dbus\" or set USE=qt-static"
+		die "USE=\"-qt-static\" only works with qt-4 built with USE=\"accessibility dbus\"."
+	fi
+}
+
+src_unpack() {
+	if use qt-static ; then
+		unpack $SFILENAME
+		cd $S
+		unpack ${PN}-lang-${PV}.tar.bz2
+	else
+		unpack $DFILENAME
+	fi
+}
+
+src_install() {
+	# remove mprotect() restrictions for PaX usage - see Bug 100507
+	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
+	#
+	#BIG FAT WARNING. REMOVE THE LRELEASE BEFORE PUTTING IN TREE
+	#
+	#lrelease lang/*.ts
+	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}.png "Network;InstantMessaging;Telephony"
+
+	# AMD64 team does not provide this so we add it:
+	if use amd64; then
+		exeinto /opt/${PN}
+		dosym libsigc-2.0.so.0.0.0 /opt/${PN}/libsigc-2.0.so.0
+		doexe "${WORKDIR}"/libsigc-2.0.so.0.0.0
+	fi
+
+	#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
+}
+
+pkg_postinst() {
+	elog "If you have sound problems please visit: "
+	elog "http://forum.skype.com/bb/viewtopic.php?t=4489"
+	elog "These kernel options are reported to help"
+	elog
+	elog "Processor type and features --->"
+	elog "-- Preemption Model (Preemptible Kernel (Low-Latency Desktop))"
+	elog "-- Timer frequency (250 HZ)"
+	elog
+	ewarn "This release no longer uses the old wrapper because ${PN} now uses ALSA"
+	ewarn
+
+}