gentoo resync : 25.09.2019

9 files changed, 61 insertions, 5 deletions

diff --git a/x11-plugins/Manifest.gz b/x11-plugins/Manifest.gz
index 717fbbbf51c4..3c55cca6beb5 100644
--- a/x11-plugins/Manifest.gz
+++ b/x11-plugins/Manifest.gz
diff --git a/x11-plugins/pidgin-gpg/Manifest b/x11-plugins/pidgin-gpg/Manifest
index d6311e18ed87..c951d51d55e0 100644
--- a/x11-plugins/pidgin-gpg/Manifest
+++ b/x11-plugins/pidgin-gpg/Manifest
@@ -1,5 +1,5 @@
 DIST pidgin-gpg-0.9.3.tar.gz 806492 BLAKE2B 67ca75307419fe25d6a7f90ce33f63e736eae59e0cab9fd2fafbf7f9ccd61569fb9906e755163400c462bcd63fa8e9b1e42deb98e459fb9e070d73de9cfb28ab SHA512 bff7ec08d7999d40b689aabc0b559b7eab1fae765b6ffc799e355601ac3a2bb05c3831c1e56e30b95f387c446f7d07d1576af7e7824094fca9ac6c6636d62f6c
 DIST pidgin-gpg-0.9.tar.gz 288403 BLAKE2B c1fc16a2744d2896727b36f114fc347f48fce071da5813eadb88a7251d27751d56dcea0ff3f1d396db164aec26e88787134bbd1e5605a24e79e06f2a70e1a8c2 SHA512 391d013dcc62972e13fded2737325d8262edd62c5afb640e244bc6dca868f966dcc4155c6a5604e5c87fc3dd0b3fdf5c339305756a9e6992765193c20838aa50
 EBUILD pidgin-gpg-0.9.3.ebuild 589 BLAKE2B fb2eee61fdf6e0d4abc1a721c34fd8caf2d53290c7855f34ba6fe863806d0f0cb7bc1b74742ca59b4a345e2b764ab53d551774b18eb1bc6755221de635d0b8a5 SHA512 2088323415551e28aba80fef75e0ef1c2f4d6cc03b984630c19fb22d8448f1930eb43b186b56c9b868de867b34aaebc911455fcd3504c141b8add224dab9d010
-EBUILD pidgin-gpg-0.9.ebuild 490 BLAKE2B 147cd4427e9b006a3847c14deab2b6a41ca3dc62a2e006aae49a14ea3cf3a0b0b212713afe534443ef8bbea4cfb747f7e49f6a3df2b101715110274e242e442a SHA512 e63abc301d32e04a6b358ba9064bc547ae538d3c312624de7024e1ebb16ee30b303208538d60f4de8c0929b7d98824b74699ede92f11411706e44384065029be
+EBUILD pidgin-gpg-0.9.ebuild 503 BLAKE2B c4a74a09d28e881c9c8f918fd297ae2aa9b2b15f551759aaec248a1170ff4481062335084d71775b60af60e8788f06fbc5df6b7b709b1ed22c7b7e1140d9c226 SHA512 7ec83858b7078182202b31a1958a6e92691a9ad2049ddb3696c1f5b8b41d9a898f724f2494d9568ff9af58b1a13b9ccb9b7d9f9eb7bfa46f35f7c07f2da2edec
 MISC metadata.xml 571 BLAKE2B e9b44d1044f832df7e7d051b6bcafe3bc982895192323aa728645da686f76ae8720f6c68230b62b7164b803a049422081143ad688040e9c7bc099d8cff6be361 SHA512 4227ccc4175c649cf27d528b2c6cca160c9ee267bdb916a006ea6c6c3631d2d460ffd35a48c72fef1e537c61dc3e77ab78b8cab4bc80b0afc065c91e1eac1869
diff --git a/x11-plugins/pidgin-gpg/pidgin-gpg-0.9.ebuild b/x11-plugins/pidgin-gpg/pidgin-gpg-0.9.ebuild
index d33df67594cb..e1bd36c2d6c6 100644
--- a/x11-plugins/pidgin-gpg/pidgin-gpg-0.9.ebuild
+++ b/x11-plugins/pidgin-gpg/pidgin-gpg-0.9.ebuild
@@ -7,7 +7,7 @@ inherit eutils
 
 DESCRIPTION="Pidgin GPG/OpenPGP (XEP-0027) plugin"
 HOMEPAGE="https://github.com/segler-alex/Pidgin-GPG"
-SRC_URI="mirror://github/segler-alex/Pidgin-GPG/${P}.tar.gz"
+SRC_URI="https://github.com/downloads/segler-alex/Pidgin-GPG/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/x11-plugins/pidgin-telegram/Manifest b/x11-plugins/pidgin-telegram/Manifest
index 3fe4ba1aa48d..1986dd580c75 100644
--- a/x11-plugins/pidgin-telegram/Manifest
+++ b/x11-plugins/pidgin-telegram/Manifest
@@ -1,3 +1,5 @@
 DIST telegram-purple_1.4.1.orig.tar.gz 482389 BLAKE2B 84c753c5dcdb8e66d1ec56d5307d3489780e932032f382e2d026ad4b6529d4c161e677483a794e56e6388cd76164d9b93955828f5cfc7b199ff8fa8314ad8951 SHA512 335da688021d2401122065f9089b86b6ccba6e812b06d8d8bc96e0defbbe693b35c1f981f5bf772ebc2577ab60ac7e97ce08d72361bcd17b27fc11740084ff1a
+DIST telegram-purple_1.4.2.orig.tar.gz 484790 BLAKE2B d198ce3d1a5f4d226d48b6ff1cdf6f0899a5a1b79ef74c8ac77afa613aae5ec1cf53c8de69cfbab6b2f70df896be0315a90470f2b0da34d1644103be8e7d96ad SHA512 f2f88de8dd4038adaa1a63f2fa3678dd45ddda051be700d6eca563f4bd5b7c8dcb61fdf60bffb01b3fce0ffd01f7b2524686d997bfe4ca8b191cc7b6ce7375a1
 EBUILD pidgin-telegram-1.4.1.ebuild 1125 BLAKE2B c3fdb7773f5f30992bbd0bb929158d837a0052d30d692cea7959b5bbdc5c3178517e29b0c99d46980435926c69307d7ff914ce20381ee64712ff07669354f205 SHA512 8826e13b35c34c2bccf52d0b7dcc756e44b2864f3fe3f8e64eee902f169f8f562cd8d033eb747463685c914a47329b48c1a969c972ac998455116b48f5701257
+EBUILD pidgin-telegram-1.4.2.ebuild 1127 BLAKE2B 10fc4a4342664036d17c8a5446203951866e9dfa8431713ab503308041e4c0e4a4de021a8c40eca31d7a3ff0d34ca121c52db9c452eaa7a6e3877e2ada903b8e SHA512 2dcbc36d9e50ffd4dfc2c6ddf2df1eac926bc7b6520b96643ad2ada662a223ccdb361b7c8a02785a3e1a64f95fc1f107ee2fea44eea49835a50e1f4c31b4d06d
 MISC metadata.xml 841 BLAKE2B 418d8799e7ed539b31cbe2a4db6ac744f9f6b72a23b1b4056e56efd91cbec160ee7af899eed2d9655a4a08aafea54b0065559b7286012fe5d57b45a80ab34a8e SHA512 7465ee52ba4461a1051acd37a2ebfcff479d92b1acdba5495a244d29126baed68d101355fc4b2a04bcb30be30bd9a581a8955a601a4d5644639750ea086350a6
diff --git a/x11-plugins/pidgin-telegram/pidgin-telegram-1.4.2.ebuild b/x11-plugins/pidgin-telegram/pidgin-telegram-1.4.2.ebuild
new file mode 100644
index 000000000000..77aeab01a2e4
--- /dev/null
+++ b/x11-plugins/pidgin-telegram/pidgin-telegram-1.4.2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A libpurple protocol plugin that adds support for the Telegram messenger"
+HOMEPAGE="https://github.com/majn/telegram-purple"
+SRC_URI="https://github.com/majn/telegram-purple/releases/download/v${PV}/telegram-purple_${PV}.orig.tar.gz"
+
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="gcrypt libressl +nls +webp"
+
+RDEPEND="net-im/pidgin
+	sys-libs/zlib:=
+	gcrypt? ( dev-libs/libgcrypt:0= )
+	!gcrypt? (
+		libressl? ( dev-libs/libressl:0= )
+		!libressl? ( dev-libs/openssl:0= )
+	)
+	webp? ( media-libs/libwebp:= )"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	nls? ( sys-devel/gettext )
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/telegram-purple"
+
+DOCS=( "AUTHORS" "CHANGELOG.md" "HACKING.md" "HACKING.BUILD.md" "README.md" )
+
+src_prepare() {
+	default
+
+	# Remove '-Werror' to make it compile
+	find -name 'Makefile*' -exec sed -i -e 's/-Werror //'  {} + || die
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable gcrypt)
+		$(use_enable nls translation)
+		$(use_enable webp libwebp)
+	)
+
+	econf "${myeconfargs[@]}"
+}
diff --git a/x11-plugins/pidgin-window_merge/Manifest b/x11-plugins/pidgin-window_merge/Manifest
index 86ed15610b7d..c495f628f218 100644
--- a/x11-plugins/pidgin-window_merge/Manifest
+++ b/x11-plugins/pidgin-window_merge/Manifest
@@ -1,3 +1,3 @@
 DIST window_merge-0.3.tar.gz 328953 BLAKE2B 2277f2c5cb83d98ed34b4e0961281b7c8ebf8209b31471447bf64e9405c9cd0c2e0edc0388f64904f377d77a9916c411cecbc9c6cf235f2127685cf553906c69 SHA512 6863c58b3054aac51ed109ca8fff5e02459220648e6afa700c7231e259e71893ec7ca237263c230632a512d470c6907d3e8cfc9516cb752c1e78bbfdb05a50d3
-EBUILD pidgin-window_merge-0.3.ebuild 693 BLAKE2B 9149649fcb77a8ee97bbd3b720763ebde47682247924a85ffca17740894db2f12c0161b763d25bf3b0d28c4624b562b2f1413e67bf9856d12c358d2ca7bcb69f SHA512 1f9c6c1de9cf7a302aed32db7ccd1c37a69f5e4a57f4474db8ea13cd3e5de535fb82c3edc0c6c5c6cc22fedab8daba9ca7bc5c58b53bc5697e08416626048d29
+EBUILD pidgin-window_merge-0.3.ebuild 706 BLAKE2B 8f644d0ace94ba1c28ea2da49f43239fd7eaccf439ab331133dc4d04b10295af88feb881afbe92782e41093df67f1699e186a521a95ce3290e6e92d59189a05f SHA512 ff9095aa9d3c66814da9774c6f3f5539bcfb9f781ad82983d6b034993ab42758ef0ef968f6250e2bfd1751878b8ef17378f723251753a2c240dab5ef10f4f713
 MISC metadata.xml 333 BLAKE2B b458848f22eab0215a7dd163c7e5a274032cf3b0444b8de14c6f331978c143249ba2a68038a47d82ba4a5d89742491a5949be5aee4f140e1dc4e3cc866bedea9 SHA512 38298a8d49cc03e1f0f390d3d52cd4e7a87cc88b8b74b8a53835000b57a8e658f778dd3b97afe3015bfc2893d24632452bfc0b17734d95122464f071be5e5e35
diff --git a/x11-plugins/pidgin-window_merge/pidgin-window_merge-0.3.ebuild b/x11-plugins/pidgin-window_merge/pidgin-window_merge-0.3.ebuild
index 2b81415d2166..95abeb686964 100644
--- a/x11-plugins/pidgin-window_merge/pidgin-window_merge-0.3.ebuild
+++ b/x11-plugins/pidgin-window_merge/pidgin-window_merge-0.3.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="A Pidgin plugin that merges the Buddy List window with a conversation window"
 HOMEPAGE="https://github.com/dm0-/window_merge"
-SRC_URI="mirror://github/dm0-/${PN#pidgin-}/${P#pidgin-}.tar.gz"
+SRC_URI="https://github.com/downloads/dm0-/${PN#pidgin-}/${P#pidgin-}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/x11-plugins/wmbattery/Manifest b/x11-plugins/wmbattery/Manifest
index 469c52330c36..f0a10437d2e1 100644
--- a/x11-plugins/wmbattery/Manifest
+++ b/x11-plugins/wmbattery/Manifest
@@ -2,4 +2,4 @@ DIST wmbattery-2.50.tar.gz 40938 BLAKE2B 1193e164af78d1839ed3f6ac251cb01fe36f863
 DIST wmbattery-2.51.tar.gz 164657 BLAKE2B f2432c9d31f4440a88ed67a0aa1b3bc494df2584175df9269c12e08430783777e46ec882bd2d71a1bc5530d2dbb1e277ccc8d1bd8dce2136df8584aaa2013a8b SHA512 2ad508e796a4f5c826bd7c785c3cf1c2ee77923db92c99e75031cd305b351d82fbce158c69cc5393b904afe639574aea38186438fbedfa20243ff03c7824186b
 EBUILD wmbattery-2.50.ebuild 780 BLAKE2B 17bbe9f6a0608703269710535f78c4a52a3cd99f3df2ffeb91499368ce501b047b8c3acc601db0cbd8f55fbe4a2f4d4fdb6978ac7a445f4e76e94a3535242c78 SHA512 a185eb5952a9653267fb6fdc9d12bd34da6a5ec9b7e473f16a1245e267d8bed82e5a05379b325196b814d7e17c8de8cfc1b5f3d173bee24cb137a869b3563a1a
 EBUILD wmbattery-2.51.ebuild 783 BLAKE2B c4ecb1e35b94f19d51be7b272596e17d296fb5f58dd493e34c701e9c27790ebaad78fae6cd2b871c35b6777b2b1b00adfb38331da5afe5b5cd8f3ce1725a9690 SHA512 b6e04bc74a30f25d7c1448ee73bba9f098b2a1c88fb2bf343e4ad0f9614ae1e095b3a1e82251845aba6acae7097d50fb31999f876a37034af18c0993179be77e
-MISC metadata.xml 594 BLAKE2B b7fc0673a486480d1751146a257db743b436d0235e0b7504e8bd5256e50a77847f8150424019a58542e2ba58c13c81f4842780a3efa5c21db6edb639ac59dddc SHA512 38630acdd195e92672d3658f2a82c340198d4cd3835b655190aeb1b6712889058e30da170a7d84d3c19acc4710c728f0739dddd4dedffa46fe291bad6e208584
+MISC metadata.xml 677 BLAKE2B 4711a784d2e1c2fc8f8daf171e64f9f8233c1f9f34734794481a906e7d97f67eb6c9e729ee76b430276dcc4d55f9bab999414c4b4c4d589f699f3ae6a367268b SHA512 d6101277d76e2e36dec42d8ffe6d99077d09ce288d8ac08b32c93cc9f4f50d6855028126edbacd1bdbfbf695150a35006f3ba3e4ea491b7b8926015d721c5fb2
diff --git a/x11-plugins/wmbattery/metadata.xml b/x11-plugins/wmbattery/metadata.xml
index 9691901a04b3..d4f7efc5067e 100644
--- a/x11-plugins/wmbattery/metadata.xml
+++ b/x11-plugins/wmbattery/metadata.xml
@@ -6,6 +6,10 @@
 	<name>Bernard Cafarelli</name>
 </maintainer>
 
+<use>
+	<flag name="apm">Add APM (Advanced Power Management) support</flag>
+</use>
+
 <longdescription>
 Wmbattery displays the status of your laptop's battery in a small icon. This 
 includes if it is plugged in, if the battery is charging, how many minutes of