summaryrefslogtreecommitdiff
path: root/net-im
diff options
context:
space:
mode:
authorSven Vermeulen <swift@gentoo.org>2012-08-11 18:34:28 +0000
committerSven Vermeulen <swift@gentoo.org>2012-08-11 18:34:28 +0000
commitda1409e323b0dd5eee80d5d384a62236b3074cff (patch)
tree841fde9a7ed032b500a204b977029d59d6afa385 /net-im
parentAdd missing runtime dep on kde-base/libkdeedu by Joost Ruis <joost.ruis@sabay... (diff)
downloadhistorical-da1409e323b0dd5eee80d5d384a62236b3074cff.tar.gz
historical-da1409e323b0dd5eee80d5d384a62236b3074cff.tar.bz2
historical-da1409e323b0dd5eee80d5d384a62236b3074cff.zip
Add USE=selinux dependency towards selinux-skype
Package-Manager: portage-2.1.10.65/cvs/Linux x86_64
Diffstat (limited to 'net-im')
-rw-r--r--net-im/skype/ChangeLog6
-rw-r--r--net-im/skype/Manifest20
-rw-r--r--net-im/skype/skype-2.2.0.35-r99.ebuild10
-rw-r--r--net-im/skype/skype-4.0.0.8-r1.ebuild7
4 files changed, 18 insertions, 25 deletions
diff --git a/net-im/skype/ChangeLog b/net-im/skype/ChangeLog
index a6914fb29286..8b37fe9fcffc 100644
--- a/net-im/skype/ChangeLog
+++ b/net-im/skype/ChangeLog
@@ -1,6 +1,10 @@
# 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.137 2012/08/06 08:54:05 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/skype/ChangeLog,v 1.138 2012/08/11 18:34:28 swift Exp $
+
+ 11 Aug 2012; <swift@gentoo.org> skype-2.2.0.35-r99.ebuild,
+ skype-4.0.0.8-r1.ebuild:
+ Add USE=selinux dependency towards selinux-skype
06 Aug 2012; Samuli Suominen <ssuominen@gentoo.org> -skype-4.0.0.7-r2.ebuild,
-skype-4.0.0.8.ebuild:
diff --git a/net-im/skype/Manifest b/net-im/skype/Manifest
index 7dba09065601..54dd74872e31 100644
--- a/net-im/skype/Manifest
+++ b/net-im/skype/Manifest
@@ -1,22 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
DIST skype-2.2.0.35.tar.bz2 23079739 SHA256 b56b7170e218da1e2d52d63f8519d365c54296d294a32ab605788910d950eb94 SHA512 d4496ec15d93e22ca6fac884c097aa26f4533f1cda36e23518da4f98e17736684532c33689bb58ffcddb1d537cd2ae0de8f336db2588d034f451d46a59c0720b WHIRLPOOL 9d3b3e2cc5cd973c280a50883f19839cfd2df5166ef0f82cbf043a822e9fb94e2d8350daa85cb941faec5df4982c73d4bc9a81282f2623986c39b34545de9af6
DIST skype-4.0.0.8.tar.bz2 28719848 SHA256 f7044abb001dff02f3cf7753fab86df1a593792ec466a5328c0534595726023f SHA512 f29c5be1fd5d787583181afb2baa7bf09b9fef6aa9812bad5a76ecaeffc55789d3b18f838680051e4cfa1a10a92988166848b8074cc0e3dbb6a7870258967c08 WHIRLPOOL 36428288a655fec4145cfbec455ae530b8996fb678e6ea7379c51bf39dee7d949d7db8528e43dcbb6976f27e885f90aa1c4b0233f79161a988aa6e70b84e9048
DIST skype_static-2.2.0.99.tar.bz2 34592774 SHA256 a9fa7744cb86060397597013a0ec44d21f72d30e42c5a6a28cd3ec33c0b5d955 SHA512 f67cfd98d6285d2c8a4506a68e7d3c3d7aff53695cbfde2dc7ed0b5bfdef59f2c41994b5cfe263c97d477df89ab6c57dc272418d6d2d89e5f0c4a553991914a0 WHIRLPOOL 01ff0d672a9ef9286e8a1974f07029519980942580135a293c1c3c8949b75711a480a733c37703ff755af753d9da2423bc7d235c35815ba3e0c33463312616e8
DIST skype_static-4.0.0.8.tar.bz2 40843888 SHA256 434cfaf1de87d53b8e6b78a3deb85f2eebf75195a0f8c25f453cd618d8d1efce SHA512 9d63422b58d041ea854c7b768ce8b2f9cd3f5fda3f3113df4d71b97116e8480b2f4ee682f60d8e054b321f00ce90e45229170ca1c23a6a476a58d198ca7279cf WHIRLPOOL 062247935d2641f36d5b34530c666d1c3d262495e9d1de5d544ebdf562453bdcffb40e4e15c4bb2ec9216c84221682147c18fba3a66c8837f98f7bf028e79235
-EBUILD skype-2.2.0.35-r99.ebuild 2997 SHA256 35fe7d98c0c4d8620dee304cd3105fccb29b631486520e584b4ac810b769a817 SHA512 3833d2a18346bbb99cc98b0f15a7aaa22b044dbfbfad221091d80ee0a513f3251ff0163497a9570ab1d8f572aa7ca56a758b3999064ac0e045598056cf3eb1dc WHIRLPOOL c87f796eb8c1bf3844e5b628397ed98540190e7ee67ec59dc1bb534d83edbba304bb6aa9a478b2d208b76cb88ae1f080d211426f3f42822916317d33fdb79dff
-EBUILD skype-4.0.0.8-r1.ebuild 3013 SHA256 be3e0b62716fc79270b87c7e6ca4f91b16d86842f106c3970b3f6611829bbb1e SHA512 7649ebac5a6c4cc4e87e92d82de4557e24b59eaa33ba856f8c85d34c8664935cc188e9990ed821e5d8def5cd1ba3d42934aaa56b0688d040cf286136b8d6375e WHIRLPOOL 05342820b990226bf25a2dd0f9b282c205bbf2d8cac76408b33973ea92bc7a7c4b4810b93cf056f3f8333fa72997b5c1518ac1b8a4c4163730f45357f8caff50
-MISC ChangeLog 24354 SHA256 1794801aefbeae38a64f85d03e6ade297d0c9ad7e1ea329dfcf4c264536525a0 SHA512 92154d525e6d7f436040f6d5e255675b99eb880404706f06c3b7799aeadc62a8eb81e55634a8143107bee30439d56184e5931a64e7ce5502aa5f9706f661b9ef WHIRLPOOL ca6e042253a35ea8a6f7840b5989a85b6d6e7d707dce10a7757a59a3972531be7ffd5a878342e1b14465676a964169863adbcac233f90f6728687ab255c457f0
+EBUILD skype-2.2.0.35-r99.ebuild 3079 SHA256 f1835a7c27fb32c8436eedac93fa9e9c9071db0011eb1bf4183e046d9aea1e9f SHA512 ab2c5217bc288dd8340e53f1fad7017f5e1c4aa867c9fc499acfe2f3c7ebd33885274b042e173b855618f29bc01dfc28211017fc3b3c320ecc7220ca72a5f859 WHIRLPOOL 9c826809c5b0da963c7ef9e9ec7493807109791ba8682c3e3865cc2a230bd4af7bcdf4ab9ae3d76b0da1090acc509da04e876231e55a76a0c09ef876a88f1697
+EBUILD skype-4.0.0.8-r1.ebuild 3056 SHA256 8776a5110776c4ac69fd0c6a4bdff8ad29ab29552b5081ec3bed05c8ca39e0eb SHA512 1d24836ada879dca709f0000389866c84bc330f9fc3f5ae5f49bedb6241dedbad4b75126b570e6306c514cae1c879af9711b570a35d090f4aab9dc809e75ee00 WHIRLPOOL 216565a2b08929292ecca0c41a23e77812e2125cc0349ec3e3e9a6400291644e74eb79387c311067364d43f690639d780cd6bebce59e9129643d7f2ca949f2ac
+MISC ChangeLog 24490 SHA256 3160692319a143aa5aa5cbc8badda171dd28f380f4c9d0c8542904211b133379 SHA512 a7c9c9ba0c3408b71c4aa7969b94114d7cec1b9f996272daff1e05b9906edcd9b989b44dd3facc0c56ab8d98a1be374ea695ae3c074f2fc160759662aa425c79 WHIRLPOOL b748f17e3143f3f655618a7fa4455450dc0576f8ff81c2777990aa42389bb06530dc5fbeb6d27758058c18f4a1e75939e159103363b377247cde115aadf5093e
MISC metadata.xml 738 SHA256 b4da26338494bf44ebf212868c5d9a1422a1f6274b0c36a4616318fe91bddd3c SHA512 ca7f9cb6f617977d53c6d94f477f67921715afb42328da05dc352d0332f8f02695c5e2ab581b28b2ad9f43f99ebf544daccf046ab0efef958aabaf5aa544744d WHIRLPOOL 546b0eceb4fe62af52839fb5b3591b56befeeed0ae155e4db8462222296eed59ad4ec9f2803c0a7a78c09afb7d8f21381bb32cd2df11d5d7eb34b257ac08e5ff
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iQEcBAEBCAAGBQJQH4YpAAoJEEdUh39IaPFNyxUH/1ljXutO1NaNWG6R01G1aBxA
-VCjD1Oh+fZcBpP41PkGncjWlgiQ7pv6huXXbxplr5jmeG/2KkWrWbUq9B48P/vtU
-o1zKbXnCrGMQFab/1OJ5c8MUdKtS5fixvecoVTP9fFLeFS3OA2Shl+b1p6hTGUxU
-piOQfTV+cQBwg33fxHZ7+VDUYAQq8QmRusq6zS3IFGR6zgDkCa2nZDO6WW9Q4xGJ
-2y75Z7IcWTul5quoOBWzUmICHwBxukN8q4xlz7pD4lgJTWPXnmNtUYS+hun/SyT5
-+V9EQLlSaZO0cvn1pO+jxeK0e4byzQgFe5rZzDQBE6nvsCaQOYaHt+xHTvXAwpA=
-=+cXZ
------END PGP SIGNATURE-----
diff --git a/net-im/skype/skype-2.2.0.35-r99.ebuild b/net-im/skype/skype-2.2.0.35-r99.ebuild
index 58ade5f785ec..5e23dc99a15c 100644
--- a/net-im/skype/skype-2.2.0.35-r99.ebuild
+++ b/net-im/skype/skype-2.2.0.35-r99.ebuild
@@ -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-2.2.0.35-r99.ebuild,v 1.5 2012/05/21 21:05:25 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/skype/skype-2.2.0.35-r99.ebuild,v 1.6 2012/08/11 18:34:28 swift Exp $
EAPI=4
inherit eutils gnome2-utils qt4-r2 pax-utils
@@ -18,7 +18,7 @@ SRC_URI="qt-static? ( http://download.skype.com/linux/${SFILENAME} )
LICENSE="skype-eula"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="pax_kernel qt-static"
+IUSE="pax_kernel selinux qt-static"
RESTRICT="mirror strip" #299368
EMUL_VER=20120520
@@ -52,10 +52,12 @@ RDEPEND="
x11-libs/qt-gui:4[accessibility,dbus]
)
)
- virtual/ttf-fonts"
+ virtual/ttf-fonts
+ selinux? ( sec-policy/selinux-skype )"
# Required to get `lrelease` command for src_install()
-DEPEND="!qt-static? ( x11-libs/qt-core:4 )"
+DEPEND="!qt-static? ( x11-libs/qt-core:4 )
+ selinux? ( sec-policy/selinux-skype )"
QA_EXECSTACK="opt/skype/skype"
QA_WX_LOAD="opt/skype/skype"
diff --git a/net-im/skype/skype-4.0.0.8-r1.ebuild b/net-im/skype/skype-4.0.0.8-r1.ebuild
index df255de8570e..1befe6000186 100644
--- a/net-im/skype/skype-4.0.0.8-r1.ebuild
+++ b/net-im/skype/skype-4.0.0.8-r1.ebuild
@@ -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.1 2012/08/06 08:49:43 ssuominen Exp $
+# $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 $
EAPI=4
inherit eutils gnome2-utils pax-utils
@@ -14,7 +14,7 @@ SRC_URI="!qt-static? ( ${SKYPE_URI}/${P}.tar.bz2 )
LICENSE="${PN}-4.0.0.7-copyright ${PN}-4.0.0.7-third-party_attributions.txt"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="pax_kernel qt-static"
+IUSE="pax_kernel selinux qt-static"
QA_PREBUILT=opt/bin/${PN}
RESTRICT="mirror strip" #299368
@@ -49,7 +49,8 @@ RDEPEND="virtual/ttf-fonts
x11-libs/qt-dbus:4
x11-libs/qt-gui:4[accessibility,dbus]
)
- )"
+ )
+ selinux? ( sec-policy/selinux-skype )"
src_unpack() {
unpack ${A}