--- skype-1.2.0.21-r1.ebuild	2006-03-30 01:36:52.000000000 +0200
+++ skype-1.2.0.21-r2.ebuild	2006-04-25 14:03:31.000000000 +0200
@@ -11,16 +11,22 @@
 DESCRIPTION="${PN} is a P2P-VoiceIP client."
 HOMEPAGE="http://www.${PN}.com/"
 SRC_URI="http://dev.gentoo.org/~humpback/skype-avatars-${AVATARV}.tgz
-		http://download.skype.com/linux/${P}-1mdk.i586.rpm"
+	    http://download.skype.com/linux/${P}-1mdk.i586.rpm"
+
 LICENSE="skype-eula"
 SLOT="0"
 KEYWORDS="~x86 ~amd64"
-IUSE="static arts esd"
+
+# static use flag has been removed wrt bug Bug 109746 to avoid virtual/libstdc++5 dependency
+# this version is not available as static, only 1.2.0.18 is
+IUSE=""
+
 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 )"
+		>=app-emulation/emul-linux-x86-qtlibs-1.1 )
+	x86? ( >=sys-libs/glibc-2.3.2
+		 =x11-libs/qt-3* )"
 RDEPEND="${DEPEND}
 	>=sys-apps/dbus-0.23.4"
 
@@ -30,6 +36,16 @@
 	unpack skype-avatars-${AVATARV}.tgz
 }
 
+pkg_setup() {
+	einfo "NOTE: arts and esd use flags have been removed."
+	einfo "The wrapper script takes care of artsd/esd/no daemon selection."
+	einfo "If you wish to use a sound daemon with skype, you can"
+	einfo "emerge media-sound/esound or kde-base/arts yourself."
+	einfo
+	ewarn "NOTE: static use flag has been removed."
+	ewarn "This version is NOT available for download as static."
+}
+
 src_install() {
 	## Install the wrapper script
 	cd ${WORKDIR}/usr/share
@@ -43,6 +59,8 @@
 	cp pixmaps/skype.png ${WORKDIR}/temp/skype.png
 	rm -rf skype
 	cp ${FILESDIR}/sDaemonWrapper-r1 skype
+	# remove mprotect() restrictions for PaX usage - see Bug 100507
+	[[ -x /sbin/chpax ]] && /sbin/chpax -m skype.bin
 	cp ${FILESDIR}/skype-callto-handler skype-callto-handler
 
 	dodir /opt/${PN}
@@ -90,22 +108,16 @@
 	dosym /opt/skype/skype /usr/bin/skype
 	# Install the Documentation
 	cd ${WORKDIR}/usr/share
-	dodoc README LICENSE
+	dodoc README
 
 	# 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 "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"
-	if ( use arts );
-	then
-		ewarn "Dont forget to configure your arts to work in Full-Duplex mode"
-		ewarn "Open controlcenter, go to \"Sound & Multimedia\"->\"Sound System\""
-		ewarn "On the \"Hardware\" tab, check the box next to \"Full duplex\"."
-	fi
 	##I do not know if this is true for this version. But will leave the note here
-	ewarn "If you are upgrading and skype does not autologin do a manual login"
-	ewarn "you will not lose your contacts."
+	ewarn "If you are upgrading and skype does not autologin do a manual login."
+	ewarn "You will not lose your contacts."
 }