gentoo resync : 05.04.2018

5 files changed, 10 insertions, 10 deletions

diff --git a/x11-plugins/Manifest.gz b/x11-plugins/Manifest.gz
index cd27a2f6ce19..57acd0b53155 100644
--- a/x11-plugins/Manifest.gz
+++ b/x11-plugins/Manifest.gz
diff --git a/x11-plugins/pidgin-sipe/Manifest b/x11-plugins/pidgin-sipe/Manifest
index 83259a8a6efe..d692703ff164 100644
--- a/x11-plugins/pidgin-sipe/Manifest
+++ b/x11-plugins/pidgin-sipe/Manifest
@@ -1,7 +1,7 @@
 DIST pidgin-sipe-1.22.0.tar.gz 1255851 BLAKE2B 442206854bc420f8a93a34246f28a923adc83c08a9c113d871f920799e2b33505a14b4181d1b20aa65e03c6d6483b01be22e66ed4496ea8571247bfc560d2a97 SHA512 4135bbf526659663b0b053592d889588574ed2a1bc9346e6ba62960203409e2604552ffb02ed32e2b4bb46c4f40f62089302b301344b9f7b45657e64a585f7ed
-DIST pidgin-sipe-1.22.1.tar.gz 1265440 BLAKE2B 88f5ef6473af2b50aab0d2adfb9bccf62c9654a1d80319d5e8e43b18719e875e0b3fda45a76e85a6fd892fd516dcfbf5f5ec4a134b1525972eaf35b9841d5210 SHA512 1fff886b32f7f8cb99a0af710b3a1502f62d27dedb541a9e2d8ae9eaf5eb7be0983216e730ccc912c20eee3d940ed1f789f704ee21736db76d141efda66ec018
 DIST pidgin-sipe-1.23.0.tar.gz 1296050 BLAKE2B 1c69587ab6407b6c83dda349ab9a5ad61e3e1d8936b58d7edd71cbead3f8573ab60f7e95866968ec55163a533077be268d6166354d9d22cd2110e6b2ae1708c0 SHA512 8ed0c353e83707b99059791b97568d874634eb1d5ec1a43031864cc8469dc859e7485eb617fe5e23960c091fb15334a903452827ef8a650ed4d677f3a2222cef
+DIST pidgin-sipe-1.23.2.tar.gz 1297900 BLAKE2B 2e37fc883c04ae9cb3ed562e932f0d207c449f67521c65a64bd52a580386fb822d10814bb7fda7cb0f6a67ae949b428db0b3c160f113c279b2e8440360af14ba SHA512 150dd41577c571442c664d91b55cff461ce2bd8dfdca6e8c8dffd27ee22c35393031ddcc7e070409ed5206f8cd0f17246f70d9ebfb6c868503a90be989ac34e6
 EBUILD pidgin-sipe-1.22.0.ebuild 1341 BLAKE2B ed5be88ca89073860f316078ec1133c2320513fc15e07d694b0c364959ab1b445d4b356a626d54a5b746d154619991669728bac87cb322380a43ec9749a73dc4 SHA512 eff9f421b21e3f108ba85c8f6f3ba22420c262cd1df01f3a5c6ffce5a56bd2c79e4641279dab12c54fc40a6733868a105835f8fecac3440a179c3e8aa519e46f
-EBUILD pidgin-sipe-1.22.1.ebuild 1343 BLAKE2B 15d14dfbc6f20da9ecd1be0b0a6c8816abe7484583a2d9356e278080cffb6c81b2247752c2ba1267964ed200a04bb039e5a18c64b5c1be0084445743da89cfb6 SHA512 43baf3436eb8e9728c09cf2b99565e73c7e69ab0d93708ac03039d785ac280110ceec8ccfa42beaa59e1998ef0dad63a39b268ed34cfa71ddc7a6ca1574b172d
 EBUILD pidgin-sipe-1.23.0.ebuild 1344 BLAKE2B 3a1721aa32f475098613ad9e9bc7f2fbc763bafd792f56241255a645b71fc9fcdb980a476f72349e5d73f23cba7398bb89f56d0345cc6f8d4c0d98a09a6ad272 SHA512 3079263ade25f09405f42d95c5c0a22cb5444593d7343573549c68fb0893444621704bdf4182c437d9aba9a09a7dcc3dc611abf3f7c337202d513ce5d47f9cc6
+EBUILD pidgin-sipe-1.23.2.ebuild 1344 BLAKE2B a520f0994c19a8c38f75c300f78029c54869c3721992bccf0da594fa228ae57af3632ee02fddf2be9ab8789d592fa28ae1b6210d72ab31cf3d15f4d92a888e82 SHA512 aef0f86051cd40690b06c9111dd4717d850e12f4664d1568359e7c2d2e648010c755d493de8408d143f22a08823b9501c56b4c9978b55eee5d5ea620a4252ef3
 MISC metadata.xml 862 BLAKE2B a48a0574208ea31609e18d48b4676763e509d97e28f562bc7a103d99183ee75184b8d674245e24b19e0d1adcda6b8091fbfc1c7e3cdb42569094fb9aeb02e932 SHA512 ff38f1be40af0b781cb545c216873eff77f07f0142b1c3db8a1ce2ca43b53fa9f2ce6a9b4940ff8843f26bb5f024d2ed8d3917762cf74b4820550bb704cc4b14
diff --git a/x11-plugins/pidgin-sipe/pidgin-sipe-1.22.1.ebuild b/x11-plugins/pidgin-sipe/pidgin-sipe-1.23.2.ebuild
index 8b7372dda468..6eaeda36c6bf 100644
--- a/x11-plugins/pidgin-sipe/pidgin-sipe-1.22.1.ebuild
+++ b/x11-plugins/pidgin-sipe/pidgin-sipe-1.23.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit autotools eutils
+inherit autotools
 
 DESCRIPTION="Pidgin Plug-in SIPE (Sip Exchange Protocol)"
 HOMEPAGE="http://sipe.sourceforge.net/"
@@ -13,7 +13,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-IUSE="debug kerberos ocs2005-message-hack openssl telepathy voice"
+IUSE="dbus debug kerberos ocs2005-message-hack openssl telepathy voice"
 
 RDEPEND="
 	dev-libs/gmime:2.6
@@ -25,13 +25,12 @@ RDEPEND="
 		>=dev-libs/glib-2.28.0
 		>=net-libs/libnice-0.1.0
 		media-libs/gstreamer:1.0
-		>=net-im/pidgin-2.8.0
 		net-libs/farstream:0.2
 	)
 	!voice? (
 		>=dev-libs/glib-2.12.0:2
-		net-im/pidgin
 	)
+	net-im/pidgin[dbus?]
 	telepathy? (
 		>=sys-apps/dbus-1.1.0
 		>=dev-libs/dbus-glib-0.61
@@ -57,6 +56,7 @@ src_configure() {
 		$(use_enable telepathy) \
 		$(use_enable debug) \
 		$(use_enable ocs2005-message-hack) \
+		$(use_with dbus) \
 		$(use_with kerberos krb5) \
 		$(use_with voice vv) \
 		$(use_enable !openssl nss) \
diff --git a/x11-plugins/pidgin-xmpp-receipts/Manifest b/x11-plugins/pidgin-xmpp-receipts/Manifest
index 563e6b4604b3..3c02b6d14678 100644
--- a/x11-plugins/pidgin-xmpp-receipts/Manifest
+++ b/x11-plugins/pidgin-xmpp-receipts/Manifest
@@ -1,5 +1,5 @@
 DIST pidgin-xmpp-receipts-0.6.tar.gz 15946 BLAKE2B e611f2eb5a69db9447f0e14188b624a37d85a24f5e2abdbafe280f3d22b69197daa1bd29dd960317a7d35c0aef8bd03de03d4c542b3191b33cd534b35d23b61b SHA512 160270206d0d6394bddaa15ca59896756ab3a546f7c74cc9e3d4ec634f70b829ae3b013ee6086a5d4a5376b7d2b81341c44c3ef0ecab2a66d612b96fd37dfeff
 DIST pidgin-xmpp-receipts-0.8.tar.gz 16021 BLAKE2B ba6eb7cb49ec75981e2c15f8aa471e6169ca4f9e6b03061248ff99669b7e31c838c466b1b476fed20bf3c1321954de13b053bbdd599f1ac4f58defacebabf383 SHA512 04113236d46066211d7e0f3c66f4bf1b6fb8a33ac675203f3cff15300eb97ffd3ee627e03fcc3ab3d1e9431fc107a9f7e9fca319f3debb773603d311b167b5a8
 EBUILD pidgin-xmpp-receipts-0.6.ebuild 925 BLAKE2B 81d54cc3df2c5f0e99f0e4a79a37b741ce43aa85046e9a82f567b347e586913608af2e2dadd93a2bf74428a08939711e1debad8f97a9d5b6bd54ceb28ffebfc5 SHA512 1c997e27d85d4f97b65b31efdfd9e9667fc5ef6645214fc445c2760f5ce3222979f1f95e0db7d62702842b4d050c04df5447443c2a9cad78400a32af816a7072
-EBUILD pidgin-xmpp-receipts-0.8.ebuild 887 BLAKE2B f51fb71e8c323439d8b155791bf6f962617b3a9003bf0683f81984df571d421be68efa1508e23d80c3f22f95641dc2065bf9025c46b903dbd69c27fbe646705b SHA512 f52ecabe2e6cb7317816281c4fa408df58816bf3d361e1e756bcd1634f692dc1af3d026a605b3f2d5284d1426e5077232cb223bc06997d6db1162654a024a21c
+EBUILD pidgin-xmpp-receipts-0.8.ebuild 886 BLAKE2B 0c3225f3ea6febf81693970007271c84a1ab8712f384aa5d125d000af7a6d43ca5b56c29ffadf0b757d8c6603ddacc47c67e4d4df9b200d0e6fe5470249bd652 SHA512 e263e4dd770d7b4605837d59bc8f909127ce1c1fdd3e5d123cb9ca0cfa277ab4ab0877c8b8f9e1b39cdb43373b89259b9fae5f5a896c86066c4819e06554b4c5
 MISC metadata.xml 168 BLAKE2B 5f277cc66dbafa7e7985433f84b0f9a656a176a9b901862e2a8353ca2d4526797dded9696e835b9696c7f72324e94959cfb5a22de49a7e3e61604153886037ab SHA512 00eec08786156434460f5ed77b647579546cf1a86341a4f2c9c9c84326468c2c21dc5101c4277103b19266bb6f788823f4ddf3b9d044da26326d79bf2ac9a274
diff --git a/x11-plugins/pidgin-xmpp-receipts/pidgin-xmpp-receipts-0.8.ebuild b/x11-plugins/pidgin-xmpp-receipts/pidgin-xmpp-receipts-0.8.ebuild
index ecb5f4ae29ff..601b7d04adf2 100644
--- a/x11-plugins/pidgin-xmpp-receipts/pidgin-xmpp-receipts-0.8.ebuild
+++ b/x11-plugins/pidgin-xmpp-receipts/pidgin-xmpp-receipts-0.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/noonien-d/pidgin-xmpp-receipts/archive/release_${PV}
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE=""
 
 RDEPEND="net-im/pidgin[gtk]"