small fixes, including pax fix

(Portage version: 2.1.1_pre1-r3)

3 files changed, 134 insertions, 1 deletions

diff --git a/net-im/skype/ChangeLog b/net-im/skype/ChangeLog
index 29b90446b204..1bfcbc8031f6 100644
--- a/net-im/skype/ChangeLog
+++ b/net-im/skype/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-im/skype
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/skype/ChangeLog,v 1.55 2006/06/30 23:50:29 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/skype/ChangeLog,v 1.56 2006/07/02 22:48:06 humpback Exp $
+
+*skype-1.3.0.30-r1 (02 Jul 2006)
+
+  02 Jul 2006; Gustavo Felisberto <humpback@gentoo.org>;
+  -skype-1.3.0.30.ebuild, +skype-1.3.0.30-r1.ebuild:
+  Added some fixes that were reported by Mike Auty <ikelos@gentoo.org>
 
   30 Jun 2006; Gustavo Felisberto <humpback@gentoo.org>;
   skype-1.3.0.30.ebuild:
diff --git a/net-im/skype/files/digest-skype-1.3.0.30-r1 b/net-im/skype/files/digest-skype-1.3.0.30-r1
new file mode 100644
index 000000000000..31eb35bc0f14
--- /dev/null
+++ b/net-im/skype/files/digest-skype-1.3.0.30-r1
@@ -0,0 +1,9 @@
+MD5 5b3195993d01ed0d439a28b505665382 skype-avatars-1.0.tgz 377763
+RMD160 54f6faeebc6509ebec8418fc27d0b2fbdc383bcf skype-avatars-1.0.tgz 377763
+SHA256 de7a9187a99ef7a13bba99c4ad61f6809bbd1e129f6456267b416090e57d71d6 skype-avatars-1.0.tgz 377763
+MD5 0c94f3c46f6f6ef6e764395b7e2a1035 skype-beta-1.3.0.30.tar.bz2 9868041
+RMD160 fc633250861eab32cfc745413d8ed9eb117ac4f9 skype-beta-1.3.0.30.tar.bz2 9868041
+SHA256 0feba2ae26b881f8a2afc17333b39f439146d056a8784502403fed2e02830e1a skype-beta-1.3.0.30.tar.bz2 9868041
+MD5 2a6155ddc0c9afdfe4a3846ca8276f7b skype-beta_staticQT-1.3.0.30.tar.bz2 15402445
+RMD160 517d27ab63b3a59d2a56c75a426629d6706bb3d1 skype-beta_staticQT-1.3.0.30.tar.bz2 15402445
+SHA256 5895f49e7e44ddaeebc4058ecaf3fe6b165dbd7ce6214eea408a952d7e0d5394 skype-beta_staticQT-1.3.0.30.tar.bz2 15402445
diff --git a/net-im/skype/skype-1.3.0.30-r1.ebuild b/net-im/skype/skype-1.3.0.30-r1.ebuild
new file mode 100644
index 000000000000..2db0371d8da6
--- /dev/null
+++ b/net-im/skype/skype-1.3.0.30-r1.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/skype/skype-1.3.0.30-r1.ebuild,v 1.1 2006/07/02 22:48:06 humpback Exp $
+
+inherit eutils qt3
+
+
+#If you want to know when this package will be marked stable please see the Changelog
+RESTRICT="nomirror nostrip"
+AVATARV="1.0"
+DESCRIPTION="${PN} is a P2P-VoiceIP client."
+MY_PN=${PN}-beta
+HOMEPAGE="http://www.skype.com/"
+SRC_URI="http://dev.gentoo.org/~humpback/skype-avatars-${AVATARV}.tgz
+		!static? ( http://download.skype.com/linux/${MY_PN}-${PV}.tar.bz2 )
+		static? ( http://download.skype.com/linux/${MY_PN}_staticQT-${PV}.tar.bz2 )"
+
+LICENSE="skype-eula"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="static"
+DEPEND="
+	amd64? ( >=app-emulation/emul-linux-x86-xlibs-1.2
+		>=app-emulation/emul-linux-x86-baselibs-2.1.1
+		!static? ( >=app-emulation/emul-linux-x86-qtlibs-1.1 ) )
+	x86? ( >=sys-libs/glibc-2.3.2
+		!static? ( $(qt_min_version 3.2) ) )"
+RDEPEND="${DEPEND}
+	>=sys-apps/dbus-0.23.4"
+
+QA_EXECSTACK_x86="opt/skype/skype"
+QA_EXECSTACK_amd64="opt/skype/skype"
+
+src_unpack() {
+	if use static;
+	then
+		unpack ${MY_PN}_staticQT-${PV}.tar.bz2
+	else
+		unpack ${MY_PN}-${PV}.tar.bz2
+	fi
+	cd ${P}
+	unpack skype-avatars-${AVATARV}.tgz
+
+}
+
+src_install() {
+	## Install the wrapper script
+	#mv skype skype
+	#cp ${FILESDIR}/sDaemonWrapper-r1 skype
+
+	# remove mprotect() restrictions for PaX usage - see Bug 100507
+	[[ -x /sbin/chpax ]] && /sbin/chpax -m skype
+
+	dodir /opt/${PN}
+	exeopts -m0755
+	exeinto /opt/${PN}
+	doexe skype
+	doexe ${FILESDIR}/skype.sh
+	dosym /opt/skype/skype.sh /usr/bin/skype
+
+	doexe skype-callto-handler
+	insinto /opt/${PN}/sound
+	doins sound/*.wav
+
+	insinto /opt/${PN}/lang
+	doins lang/*.qm
+	#Skype still shows ALL languagues no matter what were installed
+	#for i in ${LINGUAS}; do
+	#	if [ -f lang/${PN}_${i}.qm ]; then
+	#		doins lang/${PN}_${i}.qm
+	#	fi;
+	#done;
+	insinto /etc/dbus-1/system.d
+	newins ${FILESDIR}/skype.debus.config skype.conf
+
+	insinto /opt/${PN}/avatars
+	doins avatars/*.jpg
+
+	insinto /opt/${PN}
+	for SIZE in 16 32 48
+	do
+		insinto /usr/share/icons/hicolor/${SIZE}x${SIZE}/apps
+		newins ${S}/icons/${PN}_${SIZE}_32.png ${PN}.png
+	done
+
+	# The skype icon doesn't show up in gnome for some reason
+	# Putting the icon in /usr/share/pixmaps seems to solve it
+	insinto /usr/share/pixmaps
+	newins ${S}/icons/${PN}_48_32.png ${PN}.png
+
+	fowners root:audio /opt/skype/skype
+	fowners root:audio /opt/skype/skype-callto-handler
+
+	insinto /usr/share/applications/
+	doins skype.desktop
+
+	dodir /usr/bin/
+	# Install the Documentation
+	dodoc README LICENSE
+
+	# TODO: Optional configuration of callto:// in KDE, Mozilla and friends
+}
+
+pkg_postinst() {
+	einfo "Have a look at ${PORTDIR}/licenses/${LICENSE} before running this software"
+	einfo "If you have sound problems please visit: "
+	einfo "http://forum.skype.com/bb/viewtopic.php?t=4489"
+	# This will always be true in future, since skype stores the contacts in
+	# the peer-to-peer network.
+	ewarn "If you are upgrading and skype does not autologin do a manual login"
+	ewarn "you will not lose your contacts."
+
+	ewarn ""
+	ewarn "This release no longer uses the old wrapper because skype now uses
+	ALSA"
+	ewarn ""
+
+}