gentoo resync : 28.04.2019

4 files changed, 7 insertions, 81 deletions

diff --git a/x11-plugins/pidgin-telegram/Manifest b/x11-plugins/pidgin-telegram/Manifest
index ce5bd7da47ee..27ee692e3ba0 100644
--- a/x11-plugins/pidgin-telegram/Manifest
+++ b/x11-plugins/pidgin-telegram/Manifest
@@ -1,5 +1,3 @@
-AUX pidgin-telegram-1.3.1-libressl.patch 769 BLAKE2B 0954d78f0fbe84db39e32da959988104182895b3393c8fa6630b12e1beb87b7ea588a6945aecde4e89117e9c4651a0ec4e8c89250c8e9a86cdcd45126eed18c0 SHA512 d493243498e536c5b4b5cf99613f8bbbe1195e6a5d15dd1b0ac5bbc914a13d02f33162207d2a5faa2de6816674b6b101047a54398d1cfebadb9587f61c7be30f
-DIST telegram-purple_1.3.1.orig.tar.gz 509083 BLAKE2B 5842fac81fa1cd9d2681fe5ac790f0be227dadc49d2031a1682da74f62ae163c7ee9d7bb8f421a974bb0d3ea135b1d44983c976b1afbb81758a3953e89f9c68a SHA512 3d088ea8b77aeba1d7f26dcd3223420bcd50372d610368b8786eca0cbdb0a11bcc2d93f7948348c5e0305479703f74e5b5ad8e06e782e2df119cfd73a4e4a63e
-EBUILD pidgin-telegram-1.3.1-r1.ebuild 1058 BLAKE2B e926b7b87df1ac3d907d7a468d38ee2cfb35451e8e7adcda3c7b8a111ffcc08dbd6e5105e865648a6a800a2b28dca96e64a69589c6f81810acc94c3d22eafa05 SHA512 d8a9d59c89582473643fc472e2794fe896438f59a33be38f2c7678310c077817ededfc3b0538f9ec492adddf78e1bf41be7016a73080734c3488e3d58abbafe9
-EBUILD pidgin-telegram-1.3.1-r2.ebuild 1172 BLAKE2B d91891b60ee464c9f0c9b65daa71b62568e053e6be64661431b4f0d2ee2bab00e50453ece6d68f2aae0524977ed59104818adb4fcaf7a83efaf0c8bc23ddad30 SHA512 a5cfd095ec93ebcc3c34c058ff2e4935c6dc679e13daa683aa29b9e6a304d67a6834a35d09f21d3681395b666d2b8c5de032efb58786602ab38ec6d2b75a3d81
+DIST telegram-purple_1.4.1.orig.tar.gz 482389 BLAKE2B 84c753c5dcdb8e66d1ec56d5307d3489780e932032f382e2d026ad4b6529d4c161e677483a794e56e6388cd76164d9b93955828f5cfc7b199ff8fa8314ad8951 SHA512 335da688021d2401122065f9089b86b6ccba6e812b06d8d8bc96e0defbbe693b35c1f981f5bf772ebc2577ab60ac7e97ce08d72361bcd17b27fc11740084ff1a
+EBUILD pidgin-telegram-1.4.1.ebuild 1127 BLAKE2B 73b5006fe0635ec92ca1ed433cc9711cd00e5c12d25d664b1bcaea2bdc14dec8ab79d05f57978c8ca5d2d76bae22a7204efdb4f4b6b07dde0862f309db0c3a36 SHA512 be3ac80389f72c0751018d31cea0f570fd20876f2fa177c79da30d16d325710f47df4b34edf7789e0b915a95ee7c12b2a1fe627b3b4c48a4c12fcd791b557f2d
 MISC metadata.xml 841 BLAKE2B 418d8799e7ed539b31cbe2a4db6ac744f9f6b72a23b1b4056e56efd91cbec160ee7af899eed2d9655a4a08aafea54b0065559b7286012fe5d57b45a80ab34a8e SHA512 7465ee52ba4461a1051acd37a2ebfcff479d92b1acdba5495a244d29126baed68d101355fc4b2a04bcb30be30bd9a581a8955a601a4d5644639750ea086350a6
diff --git a/x11-plugins/pidgin-telegram/files/pidgin-telegram-1.3.1-libressl.patch b/x11-plugins/pidgin-telegram/files/pidgin-telegram-1.3.1-libressl.patch
deleted file mode 100644
index ca1ffee7cc4b..000000000000
--- a/x11-plugins/pidgin-telegram/files/pidgin-telegram-1.3.1-libressl.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 6ab594162a228bb5d79ba274859d4d2ab0eb7041 Mon Sep 17 00:00:00 2001
-From: Stefan Strogin <stefan.strogin@gmail.com>
-Date: Sat, 10 Nov 2018 10:15:19 +0200
-Subject: [PATCH] Fix LibreSSL <2.7.0 support
-
----
- tgl/crypto/rsa_pem_openssl.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tgl/crypto/rsa_pem_openssl.c b/tgl/crypto/rsa_pem_openssl.c
-index fe5cd9c..be657b3 100644
---- a/tgl/crypto/rsa_pem_openssl.c
-+++ b/tgl/crypto/rsa_pem_openssl.c
-@@ -31,7 +31,7 @@
- #include "meta.h"
- #include "rsa_pem.h"
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || (defined(LIBRESSL_VERSION_NUMBER) && (LIBRESSL_VERSION_NUMBER < 0x2070000fL))
- 
- int RSA_set0_key(RSA *r, BIGNUM *n, BIGNUM *e, BIGNUM *d)
- {
--- 
-2.19.1
-
diff --git a/x11-plugins/pidgin-telegram/pidgin-telegram-1.3.1-r1.ebuild b/x11-plugins/pidgin-telegram/pidgin-telegram-1.3.1-r1.ebuild
deleted file mode 100644
index ca6954389b7a..000000000000
--- a/x11-plugins/pidgin-telegram/pidgin-telegram-1.3.1-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 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 +nls +webp"
-
-RDEPEND="
-	net-im/pidgin
-	sys-libs/zlib:=
-	gcrypt? ( dev-libs/libgcrypt:0= )
-	!gcrypt? ( dev-libs/openssl:0= )
-	nls? ( sys-devel/gettext )
-	webp? ( media-libs/libwebp:= )
-"
-
-DEPEND="
-	${RDEPEND}
-	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-telegram/pidgin-telegram-1.3.1-r2.ebuild b/x11-plugins/pidgin-telegram/pidgin-telegram-1.4.1.ebuild
index 07eb0e85f55f..dd5f1391d74e 100644
--- a/x11-plugins/pidgin-telegram/pidgin-telegram-1.3.1-r2.ebuild
+++ b/x11-plugins/pidgin-telegram/pidgin-telegram-1.4.1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI=7
 
 DESCRIPTION="A libpurple protocol plugin that adds support for the Telegram messenger"
 HOMEPAGE="https://github.com/majn/telegram-purple"
@@ -19,13 +19,14 @@ RDEPEND="net-im/pidgin
 		libressl? ( dev-libs/libressl:0= )
 		!libressl? ( dev-libs/openssl:0= )
 	)
-	nls? ( sys-devel/gettext )
 	webp? ( media-libs/libwebp:= )"
 
-BDEPEND="virtual/pkgconfig"
 DEPEND="${RDEPEND}"
 
-PATCHES=( "${FILESDIR}/${P}-libressl.patch" )
+BDEPEND="
+	nls? ( sys-devel/gettext )
+	virtual/pkgconfig
+"
 
 S="${WORKDIR}/telegram-purple"