diff options
| author |   Ulrich Müller <ulm@gentoo.org> | 2015-06-14 18:42:28 +0000 |
|---|---|---|
| committer | Ulrich Müller <ulm@gentoo.org> | 2015-06-14 18:42:28 +0000 |
| commit | 05e2a6e73cd3c87aa97da9487a87169ffcc64cad (patch) | |
| tree | a85de6fa8906bece7aa5d96b77d8ec8bc107ebd3 /net-im | |
| parent | [QA] Remove emul-linux-x86-* from dependencies. (diff) | |
| download | historical-05e2a6e73cd3c87aa97da9487a87169ffcc64cad.tar.gz historical-05e2a6e73cd3c87aa97da9487a87169ffcc64cad.tar.bz2 historical-05e2a6e73cd3c87aa97da9487a87169ffcc64cad.zip | |
[QA] Merge x86 and amd64 multilib dependencies.
Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x9433907D693FB5B8!
Diffstat (limited to 'net-im')
| -rw-r--r-- | net-im/skype/ChangeLog | 5 | ||||
| -rw-r--r-- | net-im/skype/Manifest | 21 | ||||
| -rw-r--r-- | net-im/skype/skype-4.3.0.37-r5.ebuild | 39 |
3 files changed, 28 insertions, 37 deletions
diff --git a/net-im/skype/ChangeLog b/net-im/skype/ChangeLog index a80ef44c8f59..87147099ab84 100644 --- a/net-im/skype/ChangeLog +++ b/net-im/skype/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for net-im/skype # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/skype/ChangeLog,v 1.173 2015/06/14 11:22:59 amynka Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/skype/ChangeLog,v 1.174 2015/06/14 18:42:25 ulm Exp $ + + 14 Jun 2015; Ulrich Müller <ulm@gentoo.org> skype-4.3.0.37-r5.ebuild: + [QA] Merge x86 and amd64 multilib dependencies. 14 Jun 2015; <amy@gentoo.org> skype-4.3.0.37-r5.ebuild: Removed emul from dependencies diff --git a/net-im/skype/Manifest b/net-im/skype/Manifest index 1ae3268d6c1f..d26d0ba8aa68 100644 --- a/net-im/skype/Manifest +++ b/net-im/skype/Manifest @@ -4,17 +4,20 @@ Hash: SHA256 AUX skype 55 SHA256 4b7dcba418eb0b971d6051ffb928eb377b1c8ae233c9837ce1e0c4bd06cf75f4 SHA512 051e51fdc18ea93550a00bf1795232e172f046862257fe7d7d01c68fdee45fec5d863b63c00fd0b9dff1a3bd04fcc30f1f1221f3579d95fe7128b88e188c5724 WHIRLPOOL 37a6d3f02460f5673701067a682d61da95ffa17a2fecb59f8f58fc738877996fc182bb683397621a5f189e881b6925521c47555026fbee3abacf2a918048c7d0 AUX skype-4.3.0.37-desktop.patch 331 SHA256 afc6c53311814b1bcbf90c04f69fd3d9fbe2495d94811c80ba3332d8f1b31bd8 SHA512 3141a1b3e70836fead32e612da44f2a4312443e26b549bdd864602e9119be6f2b92f2e829f89cb28ba54607c2db28b00ab8b8d10fecbaada435bd6dacb8f6f5d WHIRLPOOL 2b3f98d5c62b246c43dddf7005d2009d049e9c9c21d7f77e069389b7de70ef203e4ac2c263e5af59d9633e5ebe5145717f47d41f7057b0b9b09eaa4e4bf514db DIST skype-4.3.0.37.tar.bz2 19310701 SHA256 8c99dc3978a588fb13303df7c8134379fb55b8dd460efefbc79ae594269b892d SHA512 935d0c06c031a90414f9b20c9a782c59deee36abff781c08f1dfd62194763dc9674bb85d478ae916b1bf440b123291d64380bc28295e9ecdd6522d17b434b7a5 WHIRLPOOL 1e5a84b04d7eb9bbf3bae9ae6e69bb41587a1cef7f5ff19af0363343fd7fc949d5202959efaf93b0ed9ccb939b8b2ad4d61fc9626fffbdc2a8d898f9fa29b300 -EBUILD skype-4.3.0.37-r5.ebuild 3610 SHA256 03dd3905c06719cbff1292210be9d07ae3881bdb2d54e51d33a139ac2ef7b599 SHA512 2cf7677f090d692668680cb5b95e4a89eb416f5343e34dc97a7f9b08a3bf4aca224d0c9febdf85c61f352fb54fc958c7ff757e3f1df43052530a755c2155967b WHIRLPOOL 7e04abf8172ee23976d5e1a818340e42180755d8f7088acba411673aed608e4bf32677ac41a42a5f856fd80304e98e6d3d9fd398e06bc30aecfe70966cca972e -MISC ChangeLog 31003 SHA256 b4889203a4f40fb9423965c74f4283b1f07bdbb49a221607f31d13bcf39aa823 SHA512 7e52aa8211c4f72997f9f75af41423a390c34bb74957fc9331f92cfd6260f934ab81d5aa6e6882b801db04a84f8da3aec84cd185f07c76d5f1f57f2da0efd876 WHIRLPOOL 7895bad4b002c2d0f58ff1243de9cb012e14568ae797deb01ef8745e8f120532bdf5612bfbda9071242a5dee9e13bbc06675c4e5075e31219623c1726374e98b +EBUILD skype-4.3.0.37-r5.ebuild 3310 SHA256 1a850fc60ed54abe31569bf99679c0f467989607c6b6493af4d84d6282556de0 SHA512 f24ed8d67b645ca188e36bffd1b185b54cacd07593a749190ac40881906f9d007deafe8361016259d8799095cab8935b9eb3931081f0468eda797e2574ed717a WHIRLPOOL 4f78c36bb58ac5ffb6f5180a167834d2ef7668fdfe2fe8891ca456aeab43eb0f445da310753d659b7937ff6880dc45a1f4697a500ed3c4a4115e38b3491c1d5f +MISC ChangeLog 31124 SHA256 7c4fde297d470081d0382089667b032f138677b46760c4b88cd0b9e130fa47fb SHA512 8ece095329e7d1c434677a6574766ad1bec678dadc391f0904fd1ad45362e9f9ef7fb853170de40664532d212454a4b01aa0f95d768eeff49d5d1c27751719f3 WHIRLPOOL b881d3eab50d991b16ac711e4fefb5d51bd9eeec48b0f1b3cf120aebb6aec20a0a088d6b58826715e3f103314e561ce516d982d1e3624b5b14c624f1c4400ede MISC metadata.xml 665 SHA256 530bd6a9f0ae4a4fd1f846fa1d33cf6068102dff09cd755071d21aad632465aa SHA512 84c28c6e8d857c1fb7dbd18dab22fd3c682c167e3a8db33630836a0c13096d603b3217772216d55d239d8bdcfb74ff57497095b8297f5228e720e351c7e684fb WHIRLPOOL c133a1f94f7dcaa2da61ec2b0928de4840a692971853947280d65b39b81faba2634616dc0384d7e8c120cd0017701d84ba8628ae17c5ef8467435460d1b29534 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQEcBAEBCAAGBQJVfWZsAAoJEDuJ1FA05peBAdwIAKUFgvYM4oGbz9RKqBOtnkuR -lIRFeWi1UQkNL6MVTgopLfM3olUj0XZLukwjl9e828vbz87fSknc6kuTx98iX3Hg -TMC7j1IEcvGxsGH8fKQoaCnZm8eZcJHLdM6+6q6Dtr4aCaFvZh6S0G+y8q6+Fybr -k4xtpNphRM903D5ZwtoOziCj3k3ulLa2dCceDaV/ClWDAisJGQ8ldmKFoF8Taaet -gD2zHRcuBL8VPOPWW3B/Mch68k7zlj9A0425VGZ03zAcZFCiGRsIC8OJj32kKQDF -cIzX1Tbtv8vXYdb/H+/3Bt+Er2GKNmJDTP0HaAPKqXmgReZulexAhsGvCG4MAe8= -=E8o+ +iQGcBAEBCAAGBQJVfcqbAAoJEJQzkH1pP7W4TzkL/0czxUF5ADn1Pw9hBPtS4+3M +GkKERdU4URfJ7IpzKS7czpCJ4p6UvKV8OgFgr2lBqZ07IBAxYLV/PXt1Cdo+P5w7 +fcTMI7k3wKQ4ZUSBql41Xv0dBSub8H/Kvq5ofU5WaCCYAqb8oliH4yQKwc9VSNah +tIUeVBPyhJFIa0QZT5VEV+5NdK8Ic8jrwaaACgUTBDJiUWyMpeRjQ8KO8tCDkS5X +sC8n7QsEXXzJz2lGDU0qxO4bv2DKGXu5+wdHG/a7pMoDMf5J5ABV4hADHdpVueCB +jYXrtDEjQaWulKnBZyGH5c7IuhXEZKtH5D+u4NFMOhf3R/+1oAN+Ui6mtIIiwmcz +NnpUL8tjtaBHv8J5rGL9xS/Ma5U0ad8afyWBfOJLkOTeTUmXOxpjb3rnr8AVmiQZ +8eT7fzbmiMZ7h8Tim8pvj5waDdj4DfyPFG5ADR0HYSjaqgrIxnTDUK0P9S+k6wT/ +5AD9bR5GQX7ZGrzyPVdFKBeeXyKJsGtWAkCqPbCX6Q== +=SM9p -----END PGP SIGNATURE----- diff --git a/net-im/skype/skype-4.3.0.37-r5.ebuild b/net-im/skype/skype-4.3.0.37-r5.ebuild index cc27d8228661..18972f4e1171 100644 --- a/net-im/skype/skype-4.3.0.37-r5.ebuild +++ b/net-im/skype/skype-4.3.0.37-r5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/skype/skype-4.3.0.37-r5.ebuild,v 1.3 2015/06/14 11:22:59 amynka Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/skype/skype-4.3.0.37-r5.ebuild,v 1.4 2015/06/14 18:42:25 ulm Exp $ EAPI=5 @@ -23,32 +23,17 @@ EMUL_X86_VER=20120520 RDEPEND=" virtual/ttf-fonts - amd64? ( - dev-qt/qtcore:4[abi_x86_32(-)] - dev-qt/qtdbus:4[abi_x86_32(-)] - dev-qt/qtgui:4[accessibility,abi_x86_32(-)] - dev-qt/qtwebkit:4[abi_x86_32(-)] - media-libs/alsa-lib[abi_x86_32(-)] - x11-libs/libX11[abi_x86_32(-)] - x11-libs/libXext[abi_x86_32(-)] - x11-libs/libXScrnSaver[abi_x86_32(-)] - x11-libs/libXv[abi_x86_32(-)] - pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)] ) - apulse? ( media-sound/apulse[abi_x86_32(-)] ) - ) - x86? ( - media-libs/alsa-lib - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXScrnSaver - x11-libs/libXv - dev-qt/qtcore:4 - dev-qt/qtdbus:4 - dev-qt/qtgui:4[accessibility] - dev-qt/qtwebkit:4 - apulse? ( media-sound/apulse ) - ) - pulseaudio? ( media-sound/pulseaudio ) + dev-qt/qtcore:4[abi_x86_32(-)] + dev-qt/qtdbus:4[abi_x86_32(-)] + dev-qt/qtgui:4[accessibility,abi_x86_32(-)] + dev-qt/qtwebkit:4[abi_x86_32(-)] + media-libs/alsa-lib[abi_x86_32(-)] + x11-libs/libX11[abi_x86_32(-)] + x11-libs/libXext[abi_x86_32(-)] + x11-libs/libXScrnSaver[abi_x86_32(-)] + x11-libs/libXv[abi_x86_32(-)] + apulse? ( media-sound/apulse[abi_x86_32(-)] ) + pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)] ) selinux? ( sec-policy/selinux-skype )" src_prepare() { |