--- /usr/portage/net-im/skype/skype-4.0.0.8-r1.ebuild 2012-08-11 21:01:22.000000000 +0200 +++ attachment.cgi?id=329616 2012-11-15 18:55:31.072610060 +0100 @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/skype/skype-4.0.0.8-r1.ebuild,v 1.2 2012/08/11 18:34:28 swift Exp $ +# $Header $ EAPI=4 inherit eutils gnome2-utils pax-utils @@ -8,13 +8,12 @@ DESCRIPTION="An P2P Internet Telephony (VoiceIP) client" HOMEPAGE="http://www.skype.com/" SKYPE_URI="http://download.${PN}.com/linux" -SRC_URI="!qt-static? ( ${SKYPE_URI}/${P}.tar.bz2 ) - qt-static? ( ${SKYPE_URI}/${PN}_static-${PV}.tar.bz2 )" +SRC_URI="${SKYPE_URI}/${P}.tar.bz2" -LICENSE="${PN}-4.0.0.7-copyright ${PN}-4.0.0.7-third-party_attributions.txt" +LICENSE="${P}-copyright ${P}-third-party_attributions.txt" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="pax_kernel selinux qt-static" +IUSE="pax_kernel" QA_PREBUILT=opt/bin/${PN} RESTRICT="mirror strip" #299368 @@ -26,7 +25,7 @@ >=app-emulation/emul-linux-x86-baselibs-${EMUL_X86_VER} >=app-emulation/emul-linux-x86-soundlibs-${EMUL_X86_VER} >=app-emulation/emul-linux-x86-xlibs-${EMUL_X86_VER} - !qt-static? ( >=app-emulation/emul-linux-x86-qtlibs-${EMUL_X86_VER} ) + >=app-emulation/emul-linux-x86-qtlibs-${EMUL_X86_VER} ) x86? ( media-libs/alsa-lib @@ -34,23 +33,10 @@ x11-libs/libXext x11-libs/libXScrnSaver x11-libs/libXv - qt-static? ( - >=dev-libs/glib-2.28 - media-libs/fontconfig - >=media-libs/freetype-2 - >=media-libs/tiff-3.9.5-r3:3 - sys-libs/zlib - x11-libs/libICE - x11-libs/libSM - x11-libs/libXrender - ) - !qt-static? ( - x11-libs/qt-core:4 - x11-libs/qt-dbus:4 - x11-libs/qt-gui:4[accessibility,dbus] - ) - ) - selinux? ( sec-policy/selinux-skype )" + x11-libs/qt-core:4 + x11-libs/qt-dbus:4 + x11-libs/qt-gui:4[accessibility,dbus] + )" src_unpack() { unpack ${A} @@ -90,9 +76,6 @@ eqawarn "you suspect that ${PN} is being broken by this modification," eqawarn "please open a bug." fi - - echo PRELINK_PATH_MASK=/opt/bin/${PN} > ${T}/99${PN} - doenvd "${T}"/99${PN} #430142 } pkg_preinst() {