[gentoo-commits] repo/gentoo:master commit in: x11-plugins/pidgin-telegram/, x11-plugins/pidgin-telegram/files/

[Conrad Kostecki]

commit:     9520892a3a96f921215e524912005a1e8c0be4cb
Author:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Mon Feb  8 09:51:36 2021 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Mon Feb  8 09:58:47 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9520892a

x11-plugins/pidgin-telegram: drop old version

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 x11-plugins/pidgin-telegram/Manifest               |   1 -
 .../files/pidgin-telegram-1.4.3-clang.patch        | 101 ---------------------
 .../pidgin-telegram/pidgin-telegram-1.4.4.ebuild   |  56 ------------
 3 files changed, 158 deletions(-)

diff --git a/x11-plugins/pidgin-telegram/Manifest b/x11-plugins/pidgin-telegram/Manifest
index a00c5606393..7f44531286f 100644
--- a/x11-plugins/pidgin-telegram/Manifest
+++ b/x11-plugins/pidgin-telegram/Manifest
@@ -1,2 +1 @@
-DIST telegram-purple_1.4.4.orig.tar.gz 495386 BLAKE2B 7ecac3a334f88f3d9c0367c5910d3de03b1e6749f18628a58f90c0ae3602dd04d0a1bec79b1016af236375bfe3eb7d4c40437c31fbbee0e9648e5425e40bb43d SHA512 9907da48b978294749f0697313cc7dbf26358535d6528190d8b61cdce5e478af8e756528a212af806025eb75b7f7ec90054ee763eea327f101ef469d0f4fd43e
 DIST telegram-purple_1.4.6.orig.tar.gz 497757 BLAKE2B 1f666aaf4ef1913420cf735e3d85e1d91be8a2f07932785d55bc0be37e2cd8cabaf6b0be2b520afafc6636a692086be180d3bd4438215f8b14ae867da9891e18 SHA512 bf3e14a2d1dec7382833011ea891ba5bce81820766b3d6adee582bf0257baadeb7aa7eab7aa6e20adf8dd7728eb653db35b1d8f56bfffe7a92f9bf7506401e6e

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
deleted file mode 100644
index d7d00d6234e..00000000000
--- a/x11-plugins/pidgin-telegram/files/pidgin-telegram-1.4.3-clang.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-From b196e11eabb14d11e5a6b4c3cd65bf115a71f0d9 Mon Sep 17 00:00:00 2001
-From: Conrad Kostecki <conrad@××××××××.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@××××××××.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@××××××××.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@××××××××.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.4.ebuild b/x11-plugins/pidgin-telegram/pidgin-telegram-1.4.4.ebuild
deleted file mode 100644
index 3687b6477ca..00000000000
--- a/x11-plugins/pidgin-telegram/pidgin-telegram-1.4.4.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2021 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 +png +webp"
-
-RDEPEND="
-	net-im/pidgin
-	sys-libs/zlib:=
-	gcrypt? ( dev-libs/libgcrypt:0= )
-	!gcrypt? (
-		libressl? ( dev-libs/libressl:0= )
-		!libressl? ( dev-libs/openssl:0= )
-	)
-	png? ( media-libs/libpng: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" )
-
-PATCHES=( "${FILESDIR}/${PN}-1.4.3-clang.patch" )
-
-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 png libpng)
-		$(use_enable webp libwebp)
-	)
-
-	econf "${myeconfargs[@]}"
-}