old, whitespace

(Portage version: 2.2_rc61/cvs/Linux x86_64)

2 files changed, 2 insertions, 114 deletions

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() {