gentoo resync : 23.09.2020

3 files changed, 107 insertions, 2 deletions

diff --git a/x11-plugins/pidgin-telegram/Manifest b/x11-plugins/pidgin-telegram/Manifest
index 21fbb5ae9626..407cd47337e5 100644
--- a/x11-plugins/pidgin-telegram/Manifest
+++ b/x11-plugins/pidgin-telegram/Manifest
@@ -1,4 +1,5 @@
 AUX pidgin-telegram-1.4.3-change-metadata-location.patch 1749 BLAKE2B ad5dd197f162223d31d802259c183e4285921ee3270010bc2d6070048d625a4ca5e0c0457c26a65396aba1fb9dbbea5bf87ef21513782a06ad3d69dd4018b47e SHA512 fc42f57d033a5f5192a104fb1c364b44a54a54059613989c147fdb741ebcb3eb1b4870a5325260e8b6f4b328ad0d74f1e236c5540f5ff837054ff99c6c9f4b14
+AUX pidgin-telegram-1.4.3-clang.patch 3674 BLAKE2B c1fb52b984168afcd576b429ab97f92b44a04bdbe39af9f98c71a76bb0a18c9b82a0b7e16a5dd0c70cbd0d743a3a597b2cae9eea9ee04cb98674699452b0fea2 SHA512 f855a52582dc05266e3ac1410af668f6ce6e7f9a074d514b07c5d7c39b317f338967c41732f56db427bd3ab33b91af67d0df354ae1d43663abc45fd4edacfd02
 DIST telegram-purple_1.4.3.orig.tar.gz 491997 BLAKE2B 30d42b34525c6553498c67f8a28cfe789442555a3a135a116195edc982611b8ccae6d7c53006358ebdca679258ae6a40b29a1d2ebb764e082bc2ee77d39584db SHA512 697d070da5c6671dd54a1709b37153d4b569ae1cd19d574a2d92a777a89ebd7884596b35829564a7f6fd49104f5d26e35cbe9634f64c678b5f061af8197fba16
-EBUILD pidgin-telegram-1.4.3.ebuild 1250 BLAKE2B 9d53fd821a4f85ec5d21abf7617812c2659eec182ad32c7721aac3c5bece03cae7b82694b6f9e4a709fb83c76493268bedf199ec549a2792f12d15ec5e4b5214 SHA512 311265d1515aa5d83e3be71374573984ee99f5e0738794df1d7ac447f919223cef795f72e3a9a044b53e5c2abbb62e1ba43fa1d106c07cafdfa0a2eed440020b
+EBUILD pidgin-telegram-1.4.3.ebuild 1287 BLAKE2B 62c3af492fe528b4628836c27ef4fd98cccd4259713313bd71ede962aad93faab48eddc66ef579450c24cb573645805259a638e3939cb5f1925307fcb5f42427 SHA512 420a1b1e1476bdcaab4d74add52033dfa57c97b4f6e3d3dddff4957d736eda3931080d0ca205070f1d68049b9ac53fddf4f2ee0d59a73bff0c524f614d66dda5
 MISC metadata.xml 722 BLAKE2B fb8498a592b6da08fda5cb1961fd84ea2a4e839233719330625166f487f2d01e8000860d2383488ea1c377105f8d74aae928871f349ed08efda1dd7c0420db10 SHA512 6b7e5121c5662de9943b7b7d30e6acf6c2df04b5c9d19b3ce942b6e403e62023f1a07076c4023d899ccb97f7fd2a29b331f9bf76391cb5db1c477d5bfce088c8
diff --git a/x11-plugins/pidgin-telegram/files/pidgin-telegram-1.4.3-clang.patch b/x11-plugins/pidgin-telegram/files/pidgin-telegram-1.4.3-clang.patch
new file mode 100644
index 000000000000..d7d00d6234e3
--- /dev/null
+++ b/x11-plugins/pidgin-telegram/files/pidgin-telegram-1.4.3-clang.patch
@@ -0,0 +1,101 @@
+From b196e11eabb14d11e5a6b4c3cd65bf115a71f0d9 Mon Sep 17 00:00:00 2001
+From: Conrad Kostecki <conrad@kostecki.com>
+Date: Wed, 16 Sep 2020 20:55:21 +0200
+Subject: [PATCH] configure: fix compilation with clang
+
+If -L/usr/lib is being included, this will break compiling on 64-bit with clang.
+
+Signed-off-by: Conrad Kostecki <conrad@kostecki.com>
+---
+ configure | 11 ++++-------
+ 1 file changed, 4 insertions(+), 7 deletions(-)
+
+diff --git a/configure b/configure
+index 5142055..aed9234 100755
+--- a/configure
++++ b/configure
+@@ -2283,11 +2283,10 @@ ac_config_headers="$ac_config_headers config.h"
+ #
+ #   If both header file and library are found, shell commands
+ #   'action-if-found' is run. If 'action-if-found' is not specified, the
+-#   default action appends '-I${ZLIB_HOME}/include' to CPFLAGS, appends
+-#   '-L$ZLIB_HOME}/lib' to LDFLAGS, prepends '-lz' to LIBS, and calls
+-#   AC_DEFINE(HAVE_LIBZ). You should use autoheader to include a definition
+-#   for this symbol in a config.h file. Sample usage in a C/C++ source is as
+-#   follows:
++#   default action appends '-I${ZLIB_HOME}/include' to CPFLAGS,prepends '-lz'
++#   to LIBS, and calls AC_DEFINE(HAVE_LIBZ). You should use autoheader to
++#   include a definition for this symbol in a config.h file.
++#   Sample usage in a C/C++ source is as follows:
+ #
+ #     #ifdef HAVE_LIBZ
+ #     #include <zlib.h>
+@@ -4079,7 +4078,6 @@ then
+   ZLIB_OLD_LDFLAGS=$LDFLAGS
+   ZLIB_OLD_CPPFLAGS=$CPPFLAGS
+   if test -n "${ZLIB_HOME}"; then
+-        LDFLAGS="$LDFLAGS -L${ZLIB_HOME}/lib"
+         CPPFLAGS="$CPPFLAGS -I${ZLIB_HOME}/include"
+   fi
+ 
+@@ -4152,7 +4150,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+     #
+ 
+                 CPPFLAGS="$CPPFLAGS -I${ZLIB_HOME}/include"
+-                LDFLAGS="$LDFLAGS -L${ZLIB_HOME}/lib"
+                 LIBS="-lz $LIBS"
+ 
+ $as_echo "#define HAVE_LIBZ 1" >>confdefs.h
+-- 
+2.28.0
+
+From b7d92ac6c01f006dde8d317a4311497c6eda0bd7 Mon Sep 17 00:00:00 2001
+From: Conrad Kostecki <conrad@kostecki.com>
+Date: Wed, 16 Sep 2020 21:02:07 +0200
+Subject: [PATCH] configure: fix compilation with clang
+
+If -L/usr/lib is being included, this will break compiling on 64-bit with clang.
+
+Signed-off-by: Conrad Kostecki <conrad@kostecki.com>
+---
+ configure | 11 ++++-------
+ 1 file changed, 4 insertions(+), 7 deletions(-)
+
+diff --git a/tgl/configure b/tgl/configure
+index 701a5d6..7ff1dac 100755
+--- a/tgl/configure
++++ b/tgl/configure
+@@ -2245,11 +2245,10 @@
+ #
+ #   If both header file and library are found, shell commands
+ #   'action-if-found' is run. If 'action-if-found' is not specified, the
+-#   default action appends '-I${ZLIB_HOME}/include' to CPFLAGS, appends
+-#   '-L$ZLIB_HOME}/lib' to LDFLAGS, prepends '-lz' to LIBS, and calls
+-#   AC_DEFINE(HAVE_LIBZ). You should use autoheader to include a definition
+-#   for this symbol in a config.h file. Sample usage in a C/C++ source is as
+-#   follows:
++#   default action appends '-I${ZLIB_HOME}/include' to CPFLAGS, prepends '-lz'
++#   to LIBS, and calls AC_DEFINE(HAVE_LIBZ). You should use autoheader to
++#   include a definition for this symbol in a config.h file. Sample usage
++#   in a C/C++ source is as follows:
+ #
+ #     #ifdef HAVE_LIBZ
+ #     #include <zlib.h>
+@@ -4072,7 +4071,6 @@
+   ZLIB_OLD_LDFLAGS=$LDFLAGS
+   ZLIB_OLD_CPPFLAGS=$CPPFLAGS
+   if test -n "${ZLIB_HOME}"; then
+-        LDFLAGS="$LDFLAGS -L${ZLIB_HOME}/lib"
+         CPPFLAGS="$CPPFLAGS -I${ZLIB_HOME}/include"
+   fi
+ 
+@@ -4145,7 +4143,6 @@
+     #
+ 
+                 CPPFLAGS="$CPPFLAGS -I${ZLIB_HOME}/include"
+-                LDFLAGS="$LDFLAGS -L${ZLIB_HOME}/lib"
+                 LIBS="-lz $LIBS"
+ 
+ $as_echo "#define HAVE_LIBZ 1" >>confdefs.h
+--
+2.28.0
diff --git a/x11-plugins/pidgin-telegram/pidgin-telegram-1.4.3.ebuild b/x11-plugins/pidgin-telegram/pidgin-telegram-1.4.3.ebuild
index 605769b62335..2683ce2015f4 100644
--- a/x11-plugins/pidgin-telegram/pidgin-telegram-1.4.3.ebuild
+++ b/x11-plugins/pidgin-telegram/pidgin-telegram-1.4.3.ebuild
@@ -35,7 +35,10 @@ S="${WORKDIR}/telegram-purple"
 
 DOCS=( "AUTHORS" "CHANGELOG.md" "HACKING.md" "HACKING.BUILD.md" "README.md" )
 
-PATCHES="${FILESDIR}/${P}-change-metadata-location.patch"
+PATCHES=(
+	"${FILESDIR}/${P}-change-metadata-location.patch"
+	"${FILESDIR}/${P}-clang.patch"
+)
 
 src_prepare() {
 	default