old, whitespace

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

3 files changed, 3 insertions, 118 deletions

diff --git a/net-im/skype/Manifest b/net-im/skype/Manifest
index cd79cbcff000..511f7ffc8121 100644
--- a/net-im/skype/Manifest
+++ b/net-im/skype/Manifest
@@ -1,13 +1,10 @@
 AUX skype-callto-handler 1813 RMD160 c9d6ebefac813587b294c561808729ab15aafe70 SHA1 1d8d214b7c4aab9125bc02e8ccebd8818a33c7e5 SHA256 dc004f93e107622910980acf6d132ee603e12e294ca35870e3a04184db64ae3c
 AUX skype.debus.config 436 RMD160 ec47725458e05cca8e37316989f473963b5b654d SHA1 e0a969c12264ac2657491f8533f0349fc8a8d4f0 SHA256 6de68b9e62afd284f1d7d5899fc5747de2be2c18a96022130826917625941ea2
 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-2.1.0.81.tar.bz2 19659673 RMD160 0b145ee9e89ab2592fc7d3590412da0a36eb903f SHA1 8d4fbb26eb1a791f2e6f2da7bba8a698377b8592 SHA256 5f1218b658fb7d22f03ffdeb660c74896ffe20ac68f392b0d21a300012a928f4
 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
 DIST skype_static-2.1.0.81.tar.bz2 27555345 RMD160 bdc6f4b04ec61d1002cca8ff3def331102c53011 SHA1 8839a80b2fe7276c53ac4ec5b0fd77f2e8d63904 SHA256 5cbdc7c07b47af01607ac6d0b7285368866f92a244f52aed68c4f7c227d466ae
 EBUILD skype-2.0.0.72.ebuild 2635 RMD160 047bf50be407d3ddc9b0af51569e080925d42bb7 SHA1 14f1d20cd8b16517487da1aaf45c9fd8116d1e41 SHA256 e67d531d87dfab6028ea64d010f4ef2fb6e1cb39eb21a0b661cec09db7dc4438
-EBUILD skype-2.1.0.47-r1.ebuild 2916 RMD160 1772055bf14e507922295d3a106512ac302d204d SHA1 449bbf8bef93ff7baa82d10fcb7912b3674deb18 SHA256 0c1ac36e1e3b5bfd2f457d58b4ba4a6405665a159f704e53467bf7eddd73106c
-EBUILD skype-2.1.0.81.ebuild 2669 RMD160 335d694604966fe577baabcf400777e186ec013d SHA1 c9226ad43e84257e89c77f49940faf82ad0f2b17 SHA256 4d4b9406bca6fee118f181b4f78cb6853a6ec33c0efd598aed4aa69d9f3f890d
+EBUILD skype-2.1.0.81.ebuild 2668 RMD160 7614e087686be9277a1c52778eefad304d2df679 SHA1 a638c5f09a2d13b00e7f273e89b72e2978f7dafa SHA256 d0422a78fa62b1a6496ff40ca9a347b65a707a1cb0967e13a6489639232884ee
 MISC ChangeLog 19722 RMD160 6c531915bab637a948482d8798638a5307cce370 SHA1 d196dea6975a0636d556174141e332c956370679 SHA256 78f69284ea8e558bd0e37d8db68a792eefa569ae11d4125ae74078f94997f4bc
 MISC metadata.xml 574 RMD160 8b4dbbc23a0cdff6e73ace07c8aaff5ac6bb1e49 SHA1 474a65946ca1d57f50b123d4f6f6518ab6106553 SHA256 ba7224ee8e985051a464944ba62227ff7e9364df9be83270ac0075b2e95b2ef0
diff --git a/net-im/skype/skype-2.1.0.47-r1.ebuild b/net-im/skype/skype-2.1.0.47-r1.ebuild
deleted file mode 100644
index 331b3e3cc94f..000000000000
--- a/net-im/skype/skype-2.1.0.47-r1.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# 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-r1.ebuild,v 1.1 2010/01/06 16:39:51 ssuominen 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"
-
-# http://bugs.gentoo.org/show_bug.cgi?id=299368
-RESTRICT="mirror strip"
-
-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}
-			!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/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 ) )"
-
-# 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"
-
-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 || die
-	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 || die
-
-	if ! use qt-static ; then
-		insinto /etc/dbus-1/system.d
-		doins ${PN}.conf || die
-	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 || die
-
-	insinto /opt/${PN}/avatars
-	doins avatars/*.png || die
-
-	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
-}
diff --git a/net-im/skype/skype-2.1.0.81.ebuild b/net-im/skype/skype-2.1.0.81.ebuild
index d990be6c6ecd..aa779dff9f11 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-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.81.ebuild,v 1.3 2010/01/23 14:01:08 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/skype/skype-2.1.0.81.ebuild,v 1.4 2010/01/23 17:17:01 ssuominen Exp $
 
 EAPI=2
 inherit gnome2-utils eutils qt4 pax-utils
@@ -57,7 +57,7 @@ QA_DT_HASH="opt/skype/skype"
 # QA_PRESTRIPPED="opt/skype/skype"
 
 pkg_setup() {
-	 check_license
+	check_license
 }
 
 src_install() {