diff options
Diffstat (limited to 'net-im/skype')
| -rw-r--r-- | net-im/skype/ChangeLog | 6 | ||||
| -rw-r--r-- | net-im/skype/Manifest | 16 | ||||
| -rw-r--r-- | net-im/skype/skype-2.0.0.63.ebuild | 19 | ||||
| -rw-r--r-- | net-im/skype/skype-2.0.0.68.ebuild | 19 |
4 files changed, 18 insertions, 42 deletions
diff --git a/net-im/skype/ChangeLog b/net-im/skype/ChangeLog index 6e65e5f11d9b..863cd01d4ef1 100644 --- a/net-im/skype/ChangeLog +++ b/net-im/skype/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-im/skype # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/skype/ChangeLog,v 1.96 2008/08/05 18:02:31 gentoofan23 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/skype/ChangeLog,v 1.97 2008/08/11 18:21:17 yngwin Exp $ + + 11 Aug 2008; Ben de Groot <yngwin@gentoo.org> skype-2.0.0.63.ebuild, + skype-2.0.0.68.ebuild: + Fix split qt4 deps and use check wrt bug 217161. 05 Aug 2008; Thomas Anderson <gentoofan23@gentoo.org> metadata.xml: Add USE flag description to metadata as per GLEP 56. diff --git a/net-im/skype/Manifest b/net-im/skype/Manifest index 8548b6400b69..21c939aed88c 100644 --- a/net-im/skype/Manifest +++ b/net-im/skype/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX sDaemonWrapper-r1 2156 RMD160 29aa71c39c0e6049d9073f1a37b4548d76195248 SHA1 c2fe043de8bf0eb7e5666b90ab849710d16aa72f SHA256 997724ef746507af4f2255ee33d93316101dd072388807103cab98172282a4a8 AUX skype-callto-handler 1813 RMD160 c9d6ebefac813587b294c561808729ab15aafe70 SHA1 1d8d214b7c4aab9125bc02e8ccebd8818a33c7e5 SHA256 dc004f93e107622910980acf6d132ee603e12e294ca35870e3a04184db64ae3c AUX skype.debus.config 436 RMD160 ec47725458e05cca8e37316989f473963b5b654d SHA1 e0a969c12264ac2657491f8533f0349fc8a8d4f0 SHA256 6de68b9e62afd284f1d7d5899fc5747de2be2c18a96022130826917625941ea2 @@ -14,14 +11,7 @@ DIST skype_static-1.4.0.118.tar.bz2 19582287 RMD160 39f95c35e6dc483fde6a5b6b3688 DIST skype_static-2.0.0.63.tar.bz2 21568615 RMD160 4a53cad35e0983ea332e314ca9ac621cd6c686ae SHA1 2ccb2b28bc692a82930c44e215ba58caac0d9e7a SHA256 e14b9c6faae3e55fd5dc4c6253fa7c2781418d532d75554928f5fd6c086ce736 DIST skype_static-2.0.0.68.tar.bz2 21590097 RMD160 5d2382b2df198fd9aa2f61336a24fbba07e7b520 SHA1 30e96181ff019fd490e4666df640d2a04350f1a1 SHA256 846c979d6e06c0062b9876e2fcda5c1ef1f545e16eb8c828eb17738456885253 EBUILD skype-1.4.0.118.ebuild 3714 RMD160 bf7b3680b58d0ec46a6e87a3657ae4745e9e77d1 SHA1 51ab991c34f6e4f69fce4de3967dede615cc16b1 SHA256 557af4ed10868ad92de1caf61a52d8557dc1854c1d315ee2503a6b180a004a30 -EBUILD skype-2.0.0.63.ebuild 3281 RMD160 240f2a59063bd69a7d51f936d71133b1b0c3cae5 SHA1 4fef856b90eedb5b9dfae7941003af98a460c86f SHA256 32624ba0907001f7c801525e87467355d56f144bc355cd3b94a825a52492a041 -EBUILD skype-2.0.0.68.ebuild 3283 RMD160 92773988fcf60b67bc00c23a34a9230ccc7a02cd SHA1 840562d5984c59d561064f97de25bb30c7100230 SHA256 ee39564b622a99b4d1a05d3ed5dcd1c8068af8966c708be93a12d47624952f3e -MISC ChangeLog 17985 RMD160 6df5be2b3b799b2436d55e07cc9ada67e4df411b SHA1 48878f6611325ee3e0abcfaa14657364364a6298 SHA256 6c3fc5bde0f56f5c4e132f460a493ebc159980e23a7744774356aa1771f90b7e +EBUILD skype-2.0.0.63.ebuild 3100 RMD160 700a64ed223f80c1e901b5445d4c05cda629ab44 SHA1 58dc73ea2eebe87bbb1d41d04f6177d811b212f0 SHA256 afa4f28e9524649bcff8ed679e0bf3265281da7e1c0402e83f432a2b280fb4c7 +EBUILD skype-2.0.0.68.ebuild 3102 RMD160 fd3b50e701a744f94423b813276bacf58043fd15 SHA1 da1b1a05314a340c803cdbb8354c07b1bdd6f743 SHA256 73e0acbb6ff83569472deb8398e8f7beb3672c065ca365b5d4c773ba98feb44a +MISC ChangeLog 18128 RMD160 6a104def03b76b77877afaa8c4309876fe1aad79 SHA1 b11dfbd6114cedc91821a0b5d306691682f948cb SHA256 3ae01a441f6eb0bf953d619c9e7236e014cfceb8eb34ac7767925551313b31dc MISC metadata.xml 574 RMD160 8b4dbbc23a0cdff6e73ace07c8aaff5ac6bb1e49 SHA1 474a65946ca1d57f50b123d4f6f6518ab6106553 SHA256 ba7224ee8e985051a464944ba62227ff7e9364df9be83270ac0075b2e95b2ef0 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.9 (GNU/Linux) - -iEYEARECAAYFAkiYmVcACgkQF6yMcaBxwHnINACfXxXbsa2Ps6TFBPsE5f/4jefU -jLMAmgM1ATO/ojUoIC1eitWJ655ZuWQV -=MVWA ------END PGP SIGNATURE----- diff --git a/net-im/skype/skype-2.0.0.63.ebuild b/net-im/skype/skype-2.0.0.63.ebuild index b4baf330a2a9..eaf19a1ca823 100644 --- a/net-im/skype/skype-2.0.0.63.ebuild +++ b/net-im/skype/skype-2.0.0.63.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/skype/skype-2.0.0.63.ebuild,v 1.6 2008/07/28 21:28:27 carlo Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/skype/skype-2.0.0.63.ebuild,v 1.7 2008/08/11 18:21:17 yngwin Exp $ EAPI=1 -inherit eutils qt4 pax-utils +inherit eutils pax-utils qt4 DESCRIPTION="A P2P-VoiceIP client." HOMEPAGE="http://www.skype.com/" @@ -40,7 +40,8 @@ DEPEND="amd64? ( >=app-emulation/emul-linux-x86-xlibs-1.2 x11-libs/libXrandr x11-libs/libXrender x11-libs/libX11 ) - !qt-static? ( =x11-libs/qt-4.3*:4 + !qt-static? ( || ( ( x11-libs/qt-gui:4 x11-libs/qt-dbus:4 ) + =x11-libs/qt-4.3*:4 ) x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp ) )" @@ -49,17 +50,7 @@ RDEPEND="${DEPEND}" QA_EXECSTACK="opt/skype/skype" use qt-static && S="${WORKDIR}/${PN}_static-${PV}" - -pkg_setup() { - if ! use qt-static && ! built_with_use ">=x11-libs/qt-4.0" accessibility dbus ; then - eerror "Rebuild qt-4 with USE=\"accessibility dbus\" or set USE=qt-static" - die "USE=\"-qt-static\" only works with qt-4 built with USE=\"accessibility dbus\"." - fi -} - -src_unpack() { - unpack ${A} -} +use !qt-static && QT4_BUILT_WITH_USE_CHECK="guiaccessibility dbus" src_install() { # remove mprotect() restrictions for PaX usage - see Bug 100507 diff --git a/net-im/skype/skype-2.0.0.68.ebuild b/net-im/skype/skype-2.0.0.68.ebuild index bb2758501aec..63894c59530b 100644 --- a/net-im/skype/skype-2.0.0.68.ebuild +++ b/net-im/skype/skype-2.0.0.68.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/skype/skype-2.0.0.68.ebuild,v 1.2 2008/07/28 21:28:27 carlo Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/skype/skype-2.0.0.68.ebuild,v 1.3 2008/08/11 18:21:17 yngwin Exp $ EAPI=1 -inherit eutils qt4 pax-utils +inherit eutils pax-utils qt4 DESCRIPTION="A P2P-VoiceIP client." HOMEPAGE="http://www.skype.com/" @@ -40,7 +40,8 @@ DEPEND="amd64? ( >=app-emulation/emul-linux-x86-xlibs-1.2 x11-libs/libXrandr x11-libs/libXrender x11-libs/libX11 ) - !qt-static? ( =x11-libs/qt-4.3*:4 + !qt-static? ( || ( ( x11-libs/qt-gui:4 x11-libs/qt-dbus:4 ) + =x11-libs/qt-4.3*:4 ) x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp ) )" @@ -49,17 +50,7 @@ RDEPEND="${DEPEND}" QA_EXECSTACK="opt/skype/skype" use qt-static && S="${WORKDIR}/${PN}_static-${PV}" - -pkg_setup() { - if ! use qt-static && ! built_with_use ">=x11-libs/qt-4.0" accessibility dbus ; then - eerror "Rebuild qt-4 with USE=\"accessibility dbus\" or set USE=qt-static" - die "USE=\"-qt-static\" only works with qt-4 built with USE=\"accessibility dbus\"." - fi -} - -src_unpack() { - unpack ${A} -} +use !qt-static && QT4_BUILT_WITH_USE_CHECK="guiaccessibility dbus" src_install() { # remove mprotect() restrictions for PaX usage - see Bug 100507 |