From 9a61893009323c2f3142d8b7967fc2cfb10d374e Mon Sep 17 00:00:00 2001 From: Samuli Suominen Date: Wed, 6 Jan 2010 16:39:51 +0000 Subject: Restricting "strip" again wrt #299368. Package-Manager: portage-2.2_rc61/cvs/Linux x86_64 --- net-im/skype/ChangeLog | 8 ++- net-im/skype/Manifest | 4 +- net-im/skype/skype-2.1.0.47-r1.ebuild | 112 ++++++++++++++++++++++++++++++++++ net-im/skype/skype-2.1.0.47.ebuild | 111 --------------------------------- 4 files changed, 121 insertions(+), 114 deletions(-) create mode 100644 net-im/skype/skype-2.1.0.47-r1.ebuild delete mode 100644 net-im/skype/skype-2.1.0.47.ebuild (limited to 'net-im/skype') diff --git a/net-im/skype/ChangeLog b/net-im/skype/ChangeLog index 3013f8f0b1bd..09da8754eaa5 100644 --- a/net-im/skype/ChangeLog +++ b/net-im/skype/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-im/skype # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/skype/ChangeLog,v 1.105 2010/01/02 12:24:15 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/skype/ChangeLog,v 1.106 2010/01/06 16:39:51 ssuominen Exp $ + +*skype-2.1.0.47-r1 (06 Jan 2010) + + 06 Jan 2010; Samuli Suominen + +skype-2.1.0.47-r1.ebuild: + Restricting "strip" again wrt #299368. 02 Jan 2010; Samuli Suominen skype-2.1.0.47.ebuild: Use shipped skype.conf instead of one from FILESDIR. diff --git a/net-im/skype/Manifest b/net-im/skype/Manifest index 605b62a6de9a..e2a50d43808c 100644 --- a/net-im/skype/Manifest +++ b/net-im/skype/Manifest @@ -5,6 +5,6 @@ DIST skype-2.1.0.47.tar.bz2 19748117 RMD160 7b5a3255b6a1db7c622355793ec3e582d9ff 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 EBUILD skype-2.0.0.72.ebuild 2635 RMD160 047bf50be407d3ddc9b0af51569e080925d42bb7 SHA1 14f1d20cd8b16517487da1aaf45c9fd8116d1e41 SHA256 e67d531d87dfab6028ea64d010f4ef2fb6e1cb39eb21a0b661cec09db7dc4438 -EBUILD skype-2.1.0.47.ebuild 2891 RMD160 000f0c4e872398efdec90ff30c89938689d16094 SHA1 f3049dd4b7bfe2ea7f16a79cb1e0a2c0fa3c7063 SHA256 ca65f345d382eb5b1229bf6e10f66c53df6c5501945f8482bb1c82dac2e5df7f -MISC ChangeLog 19249 RMD160 f743bca16e02572031061715c02e61337c550ca8 SHA1 524fcafc05aa57b1a1d1fb0a3aab447f1394c2ee SHA256 81b262b1605f6626c99b2da7fd92447135b13a9de3385851d5119066bed09508 +EBUILD skype-2.1.0.47-r1.ebuild 2916 RMD160 1772055bf14e507922295d3a106512ac302d204d SHA1 449bbf8bef93ff7baa82d10fcb7912b3674deb18 SHA256 0c1ac36e1e3b5bfd2f457d58b4ba4a6405665a159f704e53467bf7eddd73106c +MISC ChangeLog 19408 RMD160 8f855e500ff0f140bd7e8452730690479497963f SHA1 292dbd128f8bf3702c03e428e764ef40b7d8a60e SHA256 1e0654d61a161258a58822987628a27e924b1702790a2a5e99eba5a6369ddcaf 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 new file mode 100644 index 000000000000..331b3e3cc94f --- /dev/null +++ b/net-im/skype/skype-2.1.0.47-r1.ebuild @@ -0,0 +1,112 @@ +# 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.47.ebuild b/net-im/skype/skype-2.1.0.47.ebuild deleted file mode 100644 index 0f22910601dc..000000000000 --- a/net-im/skype/skype-2.1.0.47.ebuild +++ /dev/null @@ -1,111 +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.ebuild,v 1.3 2010/01/02 12:24:15 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" -RESTRICT="mirror" - -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? ( >=sys-libs/glibc-2.4 - >=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. -DEPEND="${RDEPEND} - amd64? ( !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 -} -- cgit v1.2.3-65-gdbad