Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/net-im/empathy
diff options
context:
space:
mode:
Diffstat (limited to 'net-im/empathy')
-rw-r--r--net-im/empathy/ChangeLog7
-rw-r--r--net-im/empathy/Manifest32
-rw-r--r--net-im/empathy/empathy-3.2.2-r1.ebuild9
-rw-r--r--net-im/empathy/empathy-3.4.2.1.ebuild4
-rw-r--r--net-im/empathy/empathy-3.4.2.ebuild4
5 files changed, 34 insertions, 22 deletions
diff --git a/net-im/empathy/ChangeLog b/net-im/empathy/ChangeLog
index 62f837028d00..1302b98b912e 100644
--- a/net-im/empathy/ChangeLog
+++ b/net-im/empathy/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for net-im/empathy
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/ChangeLog,v 1.107 2012/05/22 03:31:00 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/ChangeLog,v 1.108 2012/07/18 00:58:47 tetromino Exp $
+
+ 18 Jul 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+ empathy-3.2.2-r1.ebuild, empathy-3.4.2.ebuild, empathy-3.4.2.1.ebuild:
+ Block versions of telepathy-rakia that do not work with the corresponding
+ version of empathy (bug #403861, thanks to Olivier Crete).
*empathy-3.4.2.1 (22 May 2012)
diff --git a/net-im/empathy/Manifest b/net-im/empathy/Manifest
index e40bdc1aa41c..f60fffe24b9d 100644
--- a/net-im/empathy/Manifest
+++ b/net-im/empathy/Manifest
@@ -8,26 +8,26 @@ AUX empathy-2.34.0-missing-include.patch 379 SHA256 4e0db8f73a72c5adfd331f53d291
AUX empathy-3.2.2-cancellable-not-NULL.patch 1292 SHA256 b25914257a9403b24b5219e73882dd6b865c0a6f1e4300d9b27962ce0109aa63 SHA512 686c27a35203c82bd1325e168d8c098f01cb611997cd664a7346dc705791445a5c0e9cf0fb6a24808f0e1ca18b3ba9b971496439f955f0a2b4054340c1f257cf WHIRLPOOL 573b448d1d9073f6c6c62a4c3f351023c1265d238898beea0403e340c2235ab9988c0952367816d1bf15697e27d71041deb3a6517525d9d1049ecc64aa4e69a7
AUX empathy-3.2.2-delivery-failed.patch 1119 SHA256 25a155d821f6264b76c43ed2e0597b9149520de4d2a4a0a1da38fb1edb1a9571 SHA512 0c56cb4429b6e5f6e0158e3a2932379528c612e89565d524e518e66a555e32399c68a65098ad1c562753e4e341c06ee0278a5e6e8db2e74fa8a2dc49062c0b22 WHIRLPOOL fad48aa6bc7d53b33141f8cb51d692ff9011efde9dc4b28b415638260e7969fd1609fb8c8c8cf8200fb303985f67f5b6aca032192a69eb4934d095900e32e6f8
AUX empathy-3.2.2-telepathy-logger-0.4.patch 2980 SHA256 5b55c7c4b7c8bea11a0e842a44d52836f6b7d1dbfb2d0a567109ff0662c95448 SHA512 4713f31003d99360144b44068e6b059b1c19ae5f887da2e13cf2e8354d046a80a2fd97163ae89c3069264f39cbec6ab683b611d80d7382e387fd9ef9223fe8b8 WHIRLPOOL 366ab44903aa45204e3e449e2b6fc0e1feed299b5b2e0c4d361598d1fcb7cb870699839170a17aba7c13922e43d5f27fa4b922ba850851f1f6a3704c0085e7ec
-DIST empathy-2.32.2.tar.bz2 2936340 SHA256 f90a45955205fd8bd783a55acae4603197caab4f16a880106f8639cbbbe5e861
-DIST empathy-2.34.0.tar.bz2 3361496 SHA256 6efa0ae3ac3580ac9600f889c92497f36983e22da79d547a65030a14691369d1
-DIST empathy-3.2.2.tar.xz 3184408 SHA256 d6a391b801f58024ed6f97d9bf4e774b9ab9e1262d79aefb5c1dd95233fd5aa1
-DIST empathy-3.4.2.1.tar.xz 3433484 SHA256 e73a30259492860d5c93213b33f8850b8a45053222062fd6e2784ba447d9cce0
-DIST empathy-3.4.2.tar.xz 3432860 SHA256 e68936811d52c0b5419c93a87a81429b09f944d3f6cd65eb1554e6c7d489de32
+DIST empathy-2.32.2.tar.bz2 2936340 SHA256 f90a45955205fd8bd783a55acae4603197caab4f16a880106f8639cbbbe5e861 SHA512 38c0c4c0236967356f9b732bd5ca7e3d911866a31c486c17d3b0307feecd13e795a72536c78ebb3ad5e906287d970399cc9edd915f2d9b6f49ce9556ffede1ac WHIRLPOOL 8c26ed2992ebae65ddc20309d8bf74b529ae91e4866a600c2fd3566be9ab4edcf5612e16a287b016fdff2a6c8077e460bdfc0d24c720ef8c21666d94f1dcad52
+DIST empathy-2.34.0.tar.bz2 3361496 SHA256 6efa0ae3ac3580ac9600f889c92497f36983e22da79d547a65030a14691369d1 SHA512 df1f8bac59ceeeff5cef2730df1720084bb4c4d7008c5b36dec122ef83a6a4852dea84d7cf9b83cdc939f56d2b5f49bfe612d00f1f9332c48ee48bc5b17a8565 WHIRLPOOL 60e818e222519bc1f30efdc92aa1eb471869e11c11d364287d0ee65de01ccb8895d1dc7e739194eed681cb4a6eb2966529e31959696220e98f5238ce504cd337
+DIST empathy-3.2.2.tar.xz 3184408 SHA256 d6a391b801f58024ed6f97d9bf4e774b9ab9e1262d79aefb5c1dd95233fd5aa1 SHA512 40df2b5ad6d20fcc9a3fba5e0ed543e29e28af37f4574c5d0c5229914fee581281efda696461c517d90dd6bbdff7158e9c25a5fa251308b62042884708dac400 WHIRLPOOL 8b1b42a0189231d797d0171d9a4316976f17c59911f92e0fceca3cfd0bae2e63596485a6b59516d3c57a8c9fad041a4203bd116233fca6504e1e58972edd8b04
+DIST empathy-3.4.2.1.tar.xz 3433484 SHA256 e73a30259492860d5c93213b33f8850b8a45053222062fd6e2784ba447d9cce0 SHA512 052120940f0d548c53c8f0b92899e817861c093078fddf5edccd481991faac8bc51c17ec30321bd8036add32bf37160135e8cb30217a614e96f8c8c5278340b9 WHIRLPOOL 36e47bd073d002f3ed457d6c5e9d558afb3faa8e08213563a923851effe4a80d1cdec55c27d36751e9e50ae191fe97b423b4ccb29b495dce0f8303b5be4a569b
+DIST empathy-3.4.2.tar.xz 3432860 SHA256 e68936811d52c0b5419c93a87a81429b09f944d3f6cd65eb1554e6c7d489de32 SHA512 c897744d80265dab6b4e9316ccb4d864fc8c667a6fa246d9a9bacd9ab08ce3785814b5fabd9676835166e35d0ba30fbff6a067e5615907797116ef7ef70a0cf3 WHIRLPOOL 304046c290c6a37c1c4cd40b3f0a48890af273533e434ac6c45d1ec2292d20cae6dbb219644b34741b854f19003765c4c8f125e60e28972e01b1ef49f44cf534
EBUILD empathy-2.32.2.ebuild 3085 SHA256 7bb228fb0baa3c124e9ea04939533f8f7c9efb3e17e3ca33bc93410a5875a3a5 SHA512 53c6049c863e08b450e839ad6766f3191fbd8205ab19f1876f41e5568677b2a4078d17edc11a6ab6a3df21e680f07f609ac7bc2a69b9cc825f2d8932d01c9fa5 WHIRLPOOL f317e6751d052e76403b293440039b5bde0fb409090d98ba9310bdf302035d5d3454eaa860d89f1f4cac932b465ed5691cca85c092c4ecd17dce414f7552b045
EBUILD empathy-2.34.0-r2.ebuild 3286 SHA256 03b88ab0bebb3fe5ea20e177b1a682d458d8dea6ceaddc3abaeae8265c297ba9 SHA512 4e36450dfaf266a3d435e32b4ce6c9a14faccb63cab16d8adf6b26080150da507cbcf72935ecea76ad4c398ff97d0937df3ae7178099a738821fcb98c274fe52 WHIRLPOOL 5a7e966336b0f5d909f907c263b3fa58c507232678f872e84707c1abee9019d2c687c2422abcbf0c64a5e22394be28d6d74a7b475a883687eac7368d7e353129
-EBUILD empathy-3.2.2-r1.ebuild 3676 SHA256 9f07a6932c7dc0ccdead2e7e0c78d2aa0441d161de004818008e44f365db03fc SHA512 7d37f8eef859811beb18fc775557b2cdc5d94effbbe656a98891e87e9adbe5b709889400623dad4fcbfc9ca7ca01290f79eadbb484530e5924f6a97795c5ecb2 WHIRLPOOL 74656cd6dcb11f72c581795cfad9c7264b3464347df80ea92e018aba60dcc6691c1f672e23ba831a315d583967bdd9a2b833ee27eba87a25fb0b4b75e67aafad
-EBUILD empathy-3.4.2.1.ebuild 3681 SHA256 266541800e7a7b1409f43cfd7f78028cdb28efaa042b6360484cf188e6672718 SHA512 21b195ad5dacec9e271a0f681cc066c3cb27f9b5b28d0127ad38bf2f0880dbb15100a2c76ac952e006ee47a65f319d06b2cff7b8185f02456eb455805b00032c WHIRLPOOL 93e17d7e006f2b8ba3b09f712a8011aa280055927f650af640f381dd144d06814253b86e0e653878dada70484a0bcff5b501fc108317c61b3f36d0bd59757e18
-EBUILD empathy-3.4.2.ebuild 3686 SHA256 6da3bcb3ca8c35799dccc89ecb7aa764d0258d4ac350c57e288e2c458aacc9ad SHA512 c26f9d722f0073848f269bd1d123cab1eb80a788ffce93999f10f051e531be2ab373b633243a645a339c5203a7f7f79adffe04a7b8913f9e71276893a605646b WHIRLPOOL 5a93d44f5ab3079d53ccc68ab33912b271a7bc45dfb145f654a0bfe5f7d540bdecc7460a9e646d477afe92b7d8b6a76b0068729b9d7e71d952130080f997c42c
-MISC ChangeLog 18953 SHA256 e95849e41903bee2f30522d3788afbaad63eddca74745f06c6f073d88bfa545d SHA512 56a30614890ab8d198b14a96a488cb11e5e09f45f24a2c97c3a68d415aaa5dbf059f28b17ddb616d6be9b0ce8c22bdeced3cbc663402fdc4a02cd9bcbb7a5834 WHIRLPOOL 8f7aa73ad30714a5e5ebf33c708c516fab13c401f0fffaa4c24ab26207da732431c9b3fcaf188c2727474c3b57ca5232478eab5e9580a5772e7541b39dbd21d2
+EBUILD empathy-3.2.2-r1.ebuild 3830 SHA256 879b872f73a7824f3f963e78e6218ffdadbfeaccbc5ae6bf24e3f4a6848d9657 SHA512 ea801cc042d88f8f34bcdc0d321329de8ab2015baecd8e1fcafa013fde6d5335ecafab963fb510631e0a0d21a3d92a289bec120f92eb9a25e116596803d044d3 WHIRLPOOL bd091fe63e59a7a5d225a9288617d1f901f51e664c27975156117de5a7aca3196a749655edaebd2f5911a3d028ea7b8c8ee9d2a5abe871ff97735ce91f11d2cf
+EBUILD empathy-3.4.2.1.ebuild 3781 SHA256 0eb791181932acc129712172a591198354ec59a1fa22b46b9e9c8fb1a627cb89 SHA512 d18d15b3c7975d180bb3ec9b08e16c2b18c8f881c402514616a3f2493dc71abfecba32f30dd33d6e376cc66769acc5132cde8fa329f664388e7a3e862a92ecfa WHIRLPOOL 95a5ea37e99735169f843bc2320a3b932c035f5e4b568997e6c015949a965a40a991a8faab0075780f28c9ef01cb3f525a16057cb52675dd6eb21b2c71e07fb6
+EBUILD empathy-3.4.2.ebuild 3786 SHA256 00d73a3117a6947528c892c332ab988b4f8c1ab8b7dfbb220fd89f9d31a79b87 SHA512 b5de7c08fe310a0721b36dc766a874439346f72b4ae14aa70f1c02d73dc05348d0613d5414ca52a172056a07ffd3cae4054995bd60d0ddaea8e6edf2e9632f25 WHIRLPOOL cdca9567dc969679b68ad1ea5cf26d69bf118bd06c5c7ab0238cec7e9a0722eec9b4893e407ab35f73743b2f6e325bb09c73ad37db234b422eebfdb2dda8a6d4
+MISC ChangeLog 19223 SHA256 edce91068a88157096382aef1d707689e2605b31edddfd6334583e9bb58df9e2 SHA512 ebfbd2dd9afa0c9d5217d0ae3fc47f5d42375afc3722c2214918cb8aa58c87bc0e5ff4939b98489ed7f17ba5edec18f630ac4e54e01bd62a2541b394d4565747 WHIRLPOOL 9287950ad2e5c0c5bf7c24e1c259ac2987fc53cd8532782c541f3e52012a902a360a9a559a5f4b96cd592fade83b55f6e65f8d40124b185cf5f5ed9f0576de01
MISC metadata.xml 1665 SHA256 d004a67be9d82c28f16d52bb1fc2f50ec5c8bbd92b010b89ac0d652723c45140 SHA512 bb52d7245d6111add9c110a8aa3506d5ad8b7bf7d77385cd9d493133941176ed13081e056d65bb212796a9b0e955b7fe83025eaa165d1a0cae59b65fc3c9af6d WHIRLPOOL 800ffadf5d4f5fcd81f799b09ae9cc1299ebeb7f5bc75cddc17496c3c44c18a3c95752963d855653263228a89b3a704dd06635c3cba82efbb8808ceef80beab4
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iQEcBAEBCAAGBQJQADEQAAoJEO+t9ga+3I3a2HkIAIM6j8Rs1mzXkaaAu3xPl96D
-oWdMAlutcWzVjS2UBFA9zjgQLIgYe01BLkkxlUW/T2oRXgvAWiSL8DztGDGTWptP
-u2+3y/QdCdEUpNTbzNeckY2Z22BmEcqBQOP3wW6FdfCDMCcmsWD5G0HONGdrSon+
-WVz/6rGn55t8iiWxyK4TymE9EhQPvALMF0hvzT8PGySj2fAetP+puW/I7GnJRLzr
-gq1pDjteG/ODFpzbBLVTp12nCOVrHxGm1XBcQIzOro7kR5aPjD90a9VaRLyOSmty
-ExHOPre+62hecH+VBFP8pV1A7IZ7smraLcY4TEd+1ZsSrl9yzoq+LG0Eudv+d2s=
-=2h11
+iQEcBAEBCAAGBQJQBgpOAAoJEJ0WA1zPCt1hCTUH/jo4ZN3tmP5tJ7CR+qsCykO7
+Kwt5rYmfhIC1ooDeZATP8MNZuMneS8pVMuIwTfq56r1+WKOv7EP+fi/Z7z/9aK6V
+Iy933vT2d/MExQI1qhuTpcwFtGP1hX4nl/hdJ8ClOqGuLuGNqbbXbLscJLcHJSPQ
+hh7DJulO2dcjiKmUYHgpPjq1Y0HU6RSijpDr5wScpSYIDm1uOBczed0ZmpxJINMX
+lZQwDG6Io5F0xT/JUMhBt+mjJbtA+X2qGUrqOXvTZ8ns/N298/ecHZgwgSRbC+sT
+NxAbtD2mraOTE2ffDuCUyphOHBwTRcGqpo9zsxSt9wELG3YqPTRvlQGjgSa73Ig=
+=FRMN
-----END PGP SIGNATURE-----
diff --git a/net-im/empathy/empathy-3.2.2-r1.ebuild b/net-im/empathy/empathy-3.2.2-r1.ebuild
index e24ac216822e..0a60d1f3ea37 100644
--- a/net-im/empathy/empathy-3.2.2-r1.ebuild
+++ b/net-im/empathy/empathy-3.2.2-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/empathy/empathy-3.2.2-r1.ebuild,v 1.2 2012/05/04 06:22:12 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/empathy-3.2.2-r1.ebuild,v 1.3 2012/07/18 00:58:48 tetromino Exp $
EAPI="4"
GCONF_DEBUG="no"
@@ -21,7 +21,7 @@ IUSE="call debug eds +map +geoloc gnome-online-accounts +networkmanager sendto s
# eventually at which point the dep can be dropped
# libgee extensively used in libempathy
# gdk-pixbuf and pango extensively used in libempathy-gtk
-RDEPEND=">=dev-libs/glib-2.28:2
+COMMON_DEPEND=">=dev-libs/glib-2.28:2
x11-libs/gdk-pixbuf:2
>=x11-libs/gtk+-3.0.2:3
x11-libs/pango
@@ -70,7 +70,10 @@ RDEPEND=">=dev-libs/glib-2.28:2
media-plugins/gst-plugins-v4l2:0.10
>=media-video/cheese-2.91.91.1 )
"
-DEPEND="${RDEPEND}
+# empathy-3.2 is incompatible with >=telepathy-rakia/sofiasip-0.7, bug #403861
+RDEPEND="${COMMON_DEPEND}
+ !>=net-voip/telepathy-rakia-0.7"
+DEPEND="${COMMON_DEPEND}
app-text/scrollkeeper
>=app-text/gnome-doc-utils-0.17.3
>=dev-util/intltool-0.35.0
diff --git a/net-im/empathy/empathy-3.4.2.1.ebuild b/net-im/empathy/empathy-3.4.2.1.ebuild
index bf37a06a16b0..f1a0c19e7209 100644
--- a/net-im/empathy/empathy-3.4.2.1.ebuild
+++ b/net-im/empathy/empathy-3.4.2.1.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/empathy/empathy-3.4.2.1.ebuild,v 1.1 2012/05/22 03:31:00 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/empathy-3.4.2.1.ebuild,v 1.2 2012/07/18 00:58:47 tetromino Exp $
EAPI="4"
GCONF_DEBUG="no"
@@ -69,10 +69,12 @@ COMMON_DEPEND=">=dev-libs/glib-2.30:2
"
# FIXME: gst-plugins-bad is required for the valve plugin. This should move to good
# eventually at which point the dep can be dropped
+# empathy-3.4 is incompatible with telepathy-rakia-0.6, bug #403861
RDEPEND="${COMMON_DEPEND}
media-libs/gst-plugins-base:0.10
media-libs/gst-plugins-bad
net-im/telepathy-connection-managers
+ !<net-voip/telepathy-rakia-0.7
x11-themes/gnome-icon-theme-symbolic
gnome? ( gnome-extra/gnome-contacts )
!legacy-call? ( !<net-voip/telepathy-gabble-0.16 )
diff --git a/net-im/empathy/empathy-3.4.2.ebuild b/net-im/empathy/empathy-3.4.2.ebuild
index 755fcca1a133..d4cccfd338c2 100644
--- a/net-im/empathy/empathy-3.4.2.ebuild
+++ b/net-im/empathy/empathy-3.4.2.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/empathy/empathy-3.4.2.ebuild,v 1.2 2012/05/15 23:30:10 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/empathy-3.4.2.ebuild,v 1.3 2012/07/18 00:58:47 tetromino Exp $
EAPI="4"
GCONF_DEBUG="no"
@@ -69,10 +69,12 @@ COMMON_DEPEND=">=dev-libs/glib-2.30:2
"
# FIXME: gst-plugins-bad is required for the valve plugin. This should move to good
# eventually at which point the dep can be dropped
+# empathy-3.4 is incompatible with telepathy-rakia-0.6, bug #403861
RDEPEND="${COMMON_DEPEND}
media-libs/gst-plugins-base:0.10
media-libs/gst-plugins-bad
net-im/telepathy-connection-managers
+ !<net-voip/telepathy-rakia-0.7
x11-themes/gnome-icon-theme-symbolic
gnome? ( gnome-extra/gnome-contacts )
!legacy-call? ( !<net-voip/telepathy-gabble-0.16 )