diff options
| -rw-r--r-- | net-im/skype/ChangeLog | 9 | ||||
| -rw-r--r-- | net-im/skype/Manifest | 19 | ||||
| -rw-r--r-- | net-im/skype/skype-4.0.0.7-r1.ebuild | 101 |
3 files changed, 14 insertions, 115 deletions
diff --git a/net-im/skype/ChangeLog b/net-im/skype/ChangeLog index 69779a67f21e..7aece4f86e2f 100644 --- a/net-im/skype/ChangeLog +++ b/net-im/skype/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for net-im/skype # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/skype/ChangeLog,v 1.132 2012/06/14 22:04:29 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/skype/ChangeLog,v 1.133 2012/06/14 22:18:58 ssuominen Exp $ + + 14 Jun 2012; Samuli Suominen <ssuominen@gentoo.org> -skype-4.0.0.7-r1.ebuild: + old *skype-4.0.0.7-r2 (14 Jun 2012) @@ -15,8 +18,8 @@ *skype-4.0.0.7-r1 (14 Jun 2012) 14 Jun 2012; Samuli Suominen <ssuominen@gentoo.org> +skype-4.0.0.7-r1.ebuild: - Punt /usr/share/skype in pkg_preinst() because Portage is keeping the symlink - to /opt/skype on upgrade from 2.x series. Thanks to "pesa" for noticing. + Punt /usr/share/skype in pkg_preinst() for upgrade path because Portage is + keeping the symlink to /opt/skype wrt #421165. Thanks to "pesa" for noticing. 14 Jun 2012; Samuli Suominen <ssuominen@gentoo.org> skype-4.0.0.7.ebuild: Remove unused inherit qt4-r2. Thanks to "pesa" for noticing. diff --git a/net-im/skype/Manifest b/net-im/skype/Manifest index ce65b75188ff..595b933fa1c0 100644 --- a/net-im/skype/Manifest +++ b/net-im/skype/Manifest @@ -3,23 +3,20 @@ Hash: SHA1 DIST skype-2.2.0.35.tar.bz2 23079739 RMD160 70c9af95f2b41c0ab4bf4d50842f9845f4305bfe SHA1 c3a93e3fd0f5ff30e65afe4632e04b05e9f453b1 SHA256 b56b7170e218da1e2d52d63f8519d365c54296d294a32ab605788910d950eb94 DIST skype-4.0.0.7.tar.bz2 28817742 RMD160 6af6db41afd5be634ef2bc64847d5bd0873442bd SHA1 d0667b1db373cff0a19106c8075b8787c9ee2d60 SHA256 d615fb48bb0535ab4fbf0630b08c825c3b09f05f41520c9faba36c8db9e23a57 -DIST skype-debian_4.0.0.7-1_amd64.deb 29341976 RMD160 7c9b38d84af5f47ca1e4697eb2558826bbfbc8ac SHA1 b318d2fea0491ef120012225258e6beb86c8e402 SHA256 556c8dd83ff4ccdd0a5942b2d14bc512db858afad047d12dbd70bcc1ee61a881 -DIST skype-debian_4.0.0.7-1_i386.deb 29342008 RMD160 a93ce779097cfbd450184c363ead2353e0610073 SHA1 2e52f137a0bd1f6e4a696f5896d7fb52a22f1fed SHA256 c051b58e72f7577307fca618bb6acca3661d0cb199e98c5eb9bd0a4eb20dada2 DIST skype_static-2.2.0.99.tar.bz2 34592774 RMD160 2f9e2e75ff26ebde5d0852b8bebbd42c5b1531ed SHA1 0277b886d722e64480a9bc65befa432bcb571625 SHA256 a9fa7744cb86060397597013a0ec44d21f72d30e42c5a6a28cd3ec33c0b5d955 DIST skype_static-4.0.0.7.tar.bz2 40957412 RMD160 23648d51320a3e5c77ab7c2df0f86d042f6514d4 SHA1 36e17ca52fa8df72196c792c879df51045be2630 SHA256 b9cbeed210788182da25c0048548009ccba8ae5f93f59e54fc481be6cbeb6139 EBUILD skype-2.2.0.35-r99.ebuild 2997 RMD160 33cb939ee76e846eac0c389d7fac70dd1d98466c SHA1 88c9950af1538691cb438aa344c025e2b3a2a230 SHA256 35fe7d98c0c4d8620dee304cd3105fccb29b631486520e584b4ac810b769a817 -EBUILD skype-4.0.0.7-r1.ebuild 2910 RMD160 30e1fabf4d85f94fbd15b0cd6609f22b34359ff9 SHA1 8c901ba99104d5c9be0cc5b0bb1104935de60cd8 SHA256 500253f0a020bd18fb05aa20c92abb4f0f019e2f76b9e1f49b5d9aa4087c742b EBUILD skype-4.0.0.7-r2.ebuild 2877 RMD160 c73f9b607ffc46504c5cf5d24481ca7d3b116f64 SHA1 d6b70e9a204198dafc85399a02c1e3710e6d96a7 SHA256 f0821f6b696d63c40c0078600b042e9c24fff63fd2ddfa30d63791a0abf322c5 -MISC ChangeLog 23674 RMD160 ac23b995c89e332a13add00a84b2835cc87c3257 SHA1 5c82f160519a6b4ba8c5f7d08560cca6a377f003 SHA256 a3353e26af010467bd9bdcac11945cd7bbff0a457e173d7732b81dddb99322df +MISC ChangeLog 23763 RMD160 c209c9b42565400af1f2627d4c317ede083a3f9e SHA1 e21c2bc2d43f573efac6d42978175a90969e0166 SHA256 bb4fa6d3e2683049a3d8fcc765742682d2570946d1d4262f26e35f81030af89d MISC metadata.xml 738 RMD160 0ed439a565474528f4a7fd72bcb89bb82137fddd SHA1 41ad435a8e40169c4940cf33f44b9a3222777495 SHA256 b4da26338494bf44ebf212868c5d9a1422a1f6274b0c36a4616318fe91bddd3c -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iQEcBAEBAgAGBQJP2mCtAAoJEEdUh39IaPFN5UYH/2vingc3cSWNWBc/ZVbPNtE7 -mUOVsyQmH8NAZLiiRZJKiQdsZp3bERSZCNG2eKZO0PwUDFDcKhPspqrapU0i/inb -WqmH/EllmQZwhAvBTTUoOaeiEX5C/Cz8COT2dEcpKUeF3NdsGwCjmm3864FepzSF -o1zMhQLTxKIz7CET1Yt9jb3/Vbz1/uUAbi8Y0dstPn63PIm3heD+NRks4Yz34Drg -38+xAjn2f11eEl8ftVMHhaXqgkLaryjXBPkXxVKYQpr34CCvUWiAgf/vWZQ36oJw -3dneTgppLFXHIV3fKE5xMG3DFBr10tIEI6MXghguoHwezu/AYu8oDQd9dX1Tkp8= -=uEgB +iQEcBAEBAgAGBQJP2mJaAAoJEEdUh39IaPFNwbAH/jHfS4MnW0uQd+lsq5jJpaVg +wavOWKIFHCek9zl1B4/FkZqGxRq3CfbBUuq7gGVJClfi2k7xn1vfP9cNVQ8q+q8h +4swXx0HE1KutZYimN9uddmKj7mPry6rlj5VFweNnx8tYmen2f87wAxZMEE5UoYEu +OCluiDnGhERB7c2y9/NSiQX2/aNZ3PF+fOGA4vhZNld07D7kE8BLU+ROl99cw9MJ ++ZK92CjKQx5sUuCon57nMCwk0uQZ8y94p4gBDL3stpd6GsftB3N4nk/0kRvQjN6s ++AUE5wPu+pi9npUEokOGANdLJrfhICfNeF2Zmxndfkxr7uk4uqJ8vJkdZQ22S0c= +=1wPt -----END PGP SIGNATURE----- diff --git a/net-im/skype/skype-4.0.0.7-r1.ebuild b/net-im/skype/skype-4.0.0.7-r1.ebuild deleted file mode 100644 index 507437fc002a..000000000000 --- a/net-im/skype/skype-4.0.0.7-r1.ebuild +++ /dev/null @@ -1,101 +0,0 @@ -# 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.7-r1.ebuild,v 1.2 2012/06/14 21:08:27 ssuominen Exp $ - -EAPI=4 -inherit eutils gnome2-utils pax-utils unpacker - -DESCRIPTION="An P2P Internet Telephony (VoiceIP) client" -HOMEPAGE="http://www.skype.com/" -SKYPE_URI="http://download.${PN}.com/linux" -# TODO: skype-4.0.0.7.tar.bz2 is now present in the same SRC_URI, flip it -# on the next time fixing something else here -SRC_URI="amd64? ( ${SKYPE_URI}/${PN}-debian_${PV}-1_amd64.deb ) - x86? ( ${SKYPE_URI}/${PN}-debian_${PV}-1_i386.deb )" - -LICENSE="${P}-copyright ${P}-third-party_attributions.txt" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="pax_kernel" - -QA_PREBUILT=opt/bin/${PN} -RESTRICT="mirror strip" #299368 - -EMUL_X86_VER=20120127 - -RDEPEND="virtual/ttf-fonts - amd64? ( - >=app-emulation/emul-linux-x86-qtlibs-${EMUL_X86_VER} - >=app-emulation/emul-linux-x86-soundlibs-${EMUL_X86_VER} - >=app-emulation/emul-linux-x86-xlibs-${EMUL_X86_VER} - ) - x86? ( - media-libs/alsa-lib - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXScrnSaver - x11-libs/libXv - x11-libs/qt-core:4 - x11-libs/qt-dbus:4 - x11-libs/qt-gui:4[accessibility,dbus] - )" - -S=${WORKDIR} - -src_compile() { - local langdir=usr/share/${PN}/lang - type -P lrelease >/dev/null && lrelease ${langdir}/*.ts - rm -f ${langdir}/*.ts -} - -src_install() { - into /opt - dobin usr/bin/${PN} - fowners root:audio /opt/bin/${PN} - - insinto /etc/dbus-1/system.d - doins etc/dbus-1/system.d/${PN}.conf - - insinto /usr/share - doins -r usr/share/${PN} - - dodoc usr/share/doc/${PN}/README - - doicon -s 48 usr/share/icons/${PN}.png - make_desktop_entry ${PN} 'Skype VoIP' ${PN} 'Network;InstantMessaging;Telephony' - - if use pax_kernel; then - pax-mark Cm "${ED}"/opt/bin/${PN} || die - eqawarn "You have set USE=pax_kernel meaning that you intend to run" - eqawarn "${PN} under a PaX enabled kernel. To do so, we must modify" - eqawarn "the ${PN} binary itself and this *may* lead to breakage! If" - eqawarn "you suspect that ${PN} is being broken by this modification," - eqawarn "please open a bug." - fi -} - -pkg_preinst() { - gnome2_icon_savelist - - # Temporary workaround until Portage is fixed for upgrade path from 2.x - # series: - # "One or more symlinks to directories have been preserved in order to - # ensure that files installed via these symlinks remain accessible." - rm -rf "${EROOT}"/usr/share/${PN} -} - -pkg_postinst() { - gnome2_icon_cache_update - - # http://bugs.gentoo.org/360815 - elog "For webcam support, see \"LD_PRELOAD\" section of \"README.lib\" document provided by" - elog "media-libs/libv4l package and \"README\" document of this package." - if use amd64; then - elog "You can install app-emulation/emul-linux-x86-medialibs package for the 32bit" - elog "libraries from the media-libs/libv4l package." - fi -} - -pkg_postrm() { - gnome2_icon_cache_update -} |