gentoo resync : 28.07.2021

9 files changed, 4 insertions, 372 deletions

diff --git a/net-im/pidgin/Manifest b/net-im/pidgin/Manifest
index f5bdd8c25137..dd5915dbc5a2 100644
--- a/net-im/pidgin/Manifest
+++ b/net-im/pidgin/Manifest
@@ -1,16 +1,8 @@
-AUX pidgin-2.10.10-eds-3.6-configure.ac.patch 940 BLAKE2B 6eea4774395ad9da80f087e55f82165268f44aa153113af0c589cad0f2dacc8eb0a49625d6378937e676f8e22cc190c345f451c585dacf69ccb3452ccfd56b8b SHA512 2b1cc0dca724510462ae24df93bc5563734372daf7ed353ae0c90cf44380354615a1afa04c1d73ba1e9191bf7eefa9aa0bccf8517d9050203a1d34aa04d9dd55
 AUX pidgin-2.10.11-tinfo.patch 892 BLAKE2B 50e16a86ed29510c8632a8d6d2021236ba125a4f8fc4cd5c0408b2c0fcfe8187a4d72df512a2e224fbf801df88cb8f39c2d63487ba0f04934be09315d1306ac1 SHA512 019148522e6851e1e52cf52a3b855f0d5fb10dd5a3e7236e5abfe21f270b9feb1b998aaaa668768c85e855019eb69f7b7458c220ca06a189aba3e77947b158db
-AUX pidgin-2.10.9-fix-gtkmedia.patch 195 BLAKE2B 4f2d56c74e9a4ba017de44836a249be361118eaf32c752a7b07f4dd5b1b73a470607755de7ef2966fea0db5628dfab19f5ac87a63b467fe1ca2885376b977ade SHA512 3bf944695a9128e7894ddef8ad38f3da3511670273ef8abb8f51a4ef3dc435b78aa0f8ee7a7acd2ea74f50152a083d09a067ca84826d58c1765676b223cb7a18
 AUX pidgin-2.13.0-disable-one-jid-test.patch 872 BLAKE2B 648d92b095dba563e9dd3c6499208192d51d2dc92c06570eb131abfc07d5775d1e28db6ed27c41a4d945b9f3869f17db890ddeac69debbd465ac2e57db27ed47 SHA512 2358af54f9d63e75660f19898f25035ed331571d73a6cf5d09f42df60c82743a22dde84d2ddfcf7706df4e0226d0f6e0689a784fca0e84627edbf3616070d993
-AUX pidgin-2.13.0-metainfo.patch 345 BLAKE2B 7f0a56f0de53860c3963bd88c1646570ca0687eec5c3022b007a3519ff7974bb18d7f3aa17abddfa516e1a546282e33b56714a2c2e6d64c2f2e15e696c05144a SHA512 6276d11f408dd26f6749f8ee11a1842eb0d60b8f79f01ba7054f4521e26f2e330ded50e8177368491b76d02a12a2694db3b7c6760193b7da4c52a36df55343ce
-AUX pidgin-2.14.0-gold.patch 284 BLAKE2B 3d658d69f4d226adf238cd6e624067741ea9d80e3d56ac235b766f8fdb7a926bd97769f4723871cb32672123ae84d04cee4c9936e39cff9430d087de9601362c SHA512 f754357cceb88053af2ee074e5926e0fb11613ba42a375a38aaec1b11172f55f9b1b99fca651a3f4af2c16326c5ae0f871b70df28b08f384917a97acc312579e
-AUX pidgin-2.14.3-remove_oscar_tests.patch 396 BLAKE2B 139f898c82283b896a50edb8d2e6825513b8549dee63f51d0d90b4e71a55685a2e5886a4fe84cf361ef1fb5f607876469d0501c7711afacd9b722b3401e19bf8 SHA512 cf6fe751035d4756f13843141d0ead9ad25275702143c2b2b30f8e3160545c3c72e9bb0e67ea258a622f950b4c3431c28943b9d63cf185c73bed2cb559e93508
 DIST pidgin-2.10.9-irc_join_sleep.patch 534 BLAKE2B 0215cebb93993e19e700e4d4974351ab5e9a00ea094775076d8f439569b34c0ec2faaed360965867df58bc42677516983ce11a2601dd322c1bdf2f288253a5b8 SHA512 8de0d6f05e48cd5a3e894576e06c7fb82e4bfc778cce8bb179fa22e2a05f5c2390a0e4c5b626ee4b910a18eab170d8f4be200f435ce408a86575af99e51e3bdf
-DIST pidgin-2.14.3.tar.bz2 8688849 BLAKE2B 5d1f28ca5c452b13d2a6d6ab0c9101f14da3b5a291a838dab4b7cda99c76b3e411414b186ae493f08bd9764c65eab4b41eb9a45d340fe885f8bf9bf092911d43 SHA512 70f426900ce76afcdad76bcd06ebc320f562fe4089ec87c639d8d0d90823077f5e815932b62c3ff3da6270b3acfde3c8222d9b8c5cbb211421239c9dcc69b909
 DIST pidgin-2.14.5.tar.bz2 8696780 BLAKE2B 4563b6aabdaba8af7dd7a1f8978418bcdcc347fc10731606e44de537d2a451c9cec17d17c44d88e0eefda110927c471788ae6128a7e006666603bdc6d842c9b1 SHA512 3aa00156e73643c7a23bc3a1ff26ecd7ee89c0d91571a23bf00e54aa87f25d2b604990d33263e8f74f6499d8e08646aa524e14063e8000e60d1b49d74c5cc784
 DIST pidgin-2.14.6.tar.bz2 8672222 BLAKE2B d2e6428728f18096c957b10d7cc5e79704c0fbb403967e3968f59393db125307fc6fc84c90d66788b4a27bd9707b126c1f0df532c2a1e7d1b62356127e87371c SHA512 19ea12b6c9e99b6215a7d955f02d52ad19de8c4beb00806276c8c184d5cc338db119197e0cc9f4685705bd8b83f35c8f63565095b49a319f9696aab37735951b
-DIST pidgin-eds-3.6.patch.bz2 2352 BLAKE2B 1d69dc55f43b9efe5d5278a017642702d67a297fe2587467ec0fdca7f9888e26640efe9ac2a18f77ae9c523bf125a2cec6d0bf621f0b2b16f55d30df1bf470df SHA512 a0195679ab55ed9c7ea18ace6dbf0fc994698f1f4eea9d8335dfdcdcd6a68975c0191bd22f150bf5a9a0a691ce7e9e73d79598e1e8be541efa1d9824a633d877
-EBUILD pidgin-2.14.3-r2.ebuild 7892 BLAKE2B 2ca7042ea5e1c1c8b43d98921b164ac46024892e9d013a2cb2901f3fbe4d2062933f90d5a4b7842b20ef02325986df5f570a61eb04d7074b95dac29d46a21dd7 SHA512 0e54da4e56dbe215cd5d06e1daca6ec8ae9f5200a3c887a263da40f0a1ea66e28d4d68a7e31bad16f78b121d1d66396d1d5242d99e288c600b5928fa6ea84776
-EBUILD pidgin-2.14.5-r1.ebuild 7558 BLAKE2B 1cad17311a17cf600f9ca3473108d43b9d94f7375663ad6e3b483b46a8b94e8f811066c73b5b736591061e520ddcbc24d2d1200bb659b26e411ae1e731a4b60f SHA512 23b23f488475e17b351efec647d13d875f692b53eef32af1620d921b8441e90c6947c42ebc536fd2ad25e9a04ef4a6f541ff57cc6420fab6dbaa7262a7fda407
-EBUILD pidgin-2.14.6-r1.ebuild 7524 BLAKE2B 667cd32d96a26e121eab48311fcf81ccf2dc33a5f3f9407c269de3edaca89bc54e5d2f1ff08282651e8f4811cad6673fd432b2690550ce7bd87c4cd83e2a9754 SHA512 f76eff2b24246254f1e6039b881cbb778a611d0023efa75d21c3d14e763271144f6d9c459458185dfe2982a70f2f0a67b524bfbf4d79400cf3804d9f3c18abe1
+EBUILD pidgin-2.14.5-r1.ebuild 7569 BLAKE2B e9093afec931c7a48d730f0cc531f904001a7e9d0f80f4f7d771b5dc9bf14ed669457996ec0ee50fd7ae1d993243ae1ee1b860a815927b13d9bb705abbfa72c7 SHA512 33ff1a4da14c4fdd6f6d66b96397641b8d9c836f6589eb519e9080ff26bb6709d4f153f9a9c76bd3aed5df4dc128ef636be51a4beeb9a649c361a5b8dd98a41a
+EBUILD pidgin-2.14.6-r1.ebuild 7535 BLAKE2B 19d38854ee17b4550aa6bc9da1d7fa5128454a5a792bcd0f4e667654f08f1bc1b64a4f0951381b1b1bd51b0c0d8bd005c1a3a53bb1f75c4d0ff31ee4cc756eed SHA512 2fe3813173867f40ef36f6d75bb17dc50ed911b2cb4e3120cb1bb12f506a8e551a9b71e8460a2b6d2769ff1fb4b7e248c5edfe700c9f66028a381e7e47f82f7b
 MISC metadata.xml 1418 BLAKE2B b484d6c252dfa5f4c2bd4ef21b718cb449e3248506dab7f1f0e017e648323653e61a0f37bf2bb562f6a9b97b3fb0fcbaff897e3f030ad36e2e0813e27dfcbadc SHA512 13ff337bab4cf2924f9b652ad73d11a6d6ce268cc4aea4f9f2435acfefc85597b290de5785601ed8ad0e220047f3eff47c85150b7d81bf6e7e7b8ca9173161f7
diff --git a/net-im/pidgin/files/pidgin-2.10.10-eds-3.6-configure.ac.patch b/net-im/pidgin/files/pidgin-2.10.10-eds-3.6-configure.ac.patch
deleted file mode 100644
index dc60b147e8e8..000000000000
--- a/net-im/pidgin/files/pidgin-2.10.10-eds-3.6-configure.ac.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- pidgin-2.10.10/configure.ac
-+++ pidgin-2.10.10/configure.ac
-@@ -569,18 +569,10 @@
- 	dnl # Check for stuff needed by the Evolution integration plugin.
- 	dnl #######################################################################
- 	if test "x$enable_gevolution" = "xyes"; then
--		evo_deps="libebook-1.2 libedata-book-1.2 evolution-data-server-1.2 < 3.6"
-+		evo_deps="libebook-1.2 libedata-book-1.2 evolution-data-server-1.2 >= 3.6"
- 		PKG_CHECK_MODULES(EVOLUTION_ADDRESSBOOK, $evo_deps, , [
- 			enable_gevolution="no"
- 		])
--		if test "x$enable_gevolution" = "xno"; then
--			evo_deps="libebook-1.0 libedata-book-1.0"
--			PKG_CHECK_MODULES(EVOLUTION_ADDRESSBOOK, $evo_deps, [
--				enable_gevolution="yes"
--			], [
--				enable_gevolution="no"
--			])
--		fi
- 		if test "x$enable_gevolution" = "xyes"; then
- 			AC_DEFINE(HAVE_EVOLUTION_ADDRESSBOOK, 1, [Define if we're using evolution addressbook.])
- 			AC_SUBST(EVOLUTION_ADDRESSBOOK_CFLAGS)
diff --git a/net-im/pidgin/files/pidgin-2.10.9-fix-gtkmedia.patch b/net-im/pidgin/files/pidgin-2.10.9-fix-gtkmedia.patch
deleted file mode 100644
index 74b30021d485..000000000000
--- a/net-im/pidgin/files/pidgin-2.10.9-fix-gtkmedia.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/pidgin/Makefile.am
-+++ b/pidgin/Makefile.am
-@@ -154,6 +154,7 @@
- 	$(GSTREAMER_LIBS) \
- 	$(XSS_LIBS) \
- 	$(SM_LIBS) \
-+	$(X11_LIBS) \
- 	$(INTLLIBS) \
- 	$(GTKSPELL_LIBS) \
- 	$(LIBXML_LIBS) \
diff --git a/net-im/pidgin/files/pidgin-2.13.0-metainfo.patch b/net-im/pidgin/files/pidgin-2.13.0-metainfo.patch
deleted file mode 100644
index 34d1dc160445..000000000000
--- a/net-im/pidgin/files/pidgin-2.13.0-metainfo.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- pidgin-2.13.0/pidgin/Makefile.am
-+++ pidgin-2.13.0/pidgin/Makefile.am
-@@ -191,7 +191,7 @@
- apps_DATA = $(apps_in_files:.desktop.in=.desktop)
- @INTLTOOL_DESKTOP_RULE@
- 
--appdatadir = $(datarootdir)/appdata
-+appdatadir = $(datarootdir)/metainfo
- appdata_DATA = $(appdata_in_files:.xml.in=.xml)
- appdata_in_files = data/pidgin.appdata.xml.in
- 
diff --git a/net-im/pidgin/files/pidgin-2.14.0-gold.patch b/net-im/pidgin/files/pidgin-2.14.0-gold.patch
deleted file mode 100644
index 718b3099581e..000000000000
--- a/net-im/pidgin/files/pidgin-2.14.0-gold.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- pidgin-2.14.0/pidgin/Makefile.am
-+++ pidgin-2.14.0/pidgin/Makefile.am
-@@ -162,7 +162,7 @@
- 	$(LIBXML_LIBS) \
- 	$(GTK_LIBS) \
- 	$(GIO_UNIX_LIBS) \
--	$(top_builddir)/libpurple/libpurple.la
-+	$(top_builddir)/libpurple/libpurple.la -lm
- 
- AM_CPPFLAGS = \
- 	-DDATADIR=\"$(datadir)\" \
diff --git a/net-im/pidgin/files/pidgin-2.14.3-remove_oscar_tests.patch b/net-im/pidgin/files/pidgin-2.14.3-remove_oscar_tests.patch
deleted file mode 100644
index c20b1a00e87c..000000000000
--- a/net-im/pidgin/files/pidgin-2.14.3-remove_oscar_tests.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- pidgin-2.14.3/libpurple/tests/check_libpurple.c
-+++ pidgin-2.14.3/libpurple/tests/check_libpurple.c
-@@ -91,7 +91,6 @@
- 	srunner_add_suite(sr, jabber_digest_md5_suite());
- 	srunner_add_suite(sr, jabber_jutil_suite());
- 	srunner_add_suite(sr, jabber_scram_suite());
--	srunner_add_suite(sr, oscar_util_suite());
- 	srunner_add_suite(sr, util_suite());
- 	srunner_add_suite(sr, xmlnode_suite());
- 
diff --git a/net-im/pidgin/pidgin-2.14.3-r2.ebuild b/net-im/pidgin/pidgin-2.14.3-r2.ebuild
deleted file mode 100644
index fca4c0679d35..000000000000
--- a/net-im/pidgin/pidgin-2.14.3-r2.ebuild
+++ /dev/null
@@ -1,296 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-GENTOO_DEPEND_ON_PERL=no
-PYTHON_COMPAT=( python3_{8..9} )
-
-inherit autotools gnome2-utils flag-o-matic toolchain-funcs multilib perl-module python-single-r1 xdg
-
-DESCRIPTION="GTK Instant Messenger client"
-HOMEPAGE="https://pidgin.im/"
-SRC_URI="
-	mirror://sourceforge/${PN}/${P}.tar.bz2
-	https://dev.gentoo.org/~polynomial-c/${PN}-eds-3.6.patch.bz2
-	https://gist.githubusercontent.com/imcleod/77f38d11af11b2413ada/raw/46e9d6cb4d2f839832dad2d697bb141a88028e04/pidgin-irc-join-sleep.patch -> ${PN}-2.10.9-irc_join_sleep.patch"
-
-LICENSE="GPL-2"
-SLOT="0/2" # libpurple version
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="aqua dbus debug doc eds gadu gnutls groupwise +gstreamer +gtk idn
-meanwhile ncurses networkmanager nls perl pie prediction python sasl spell tcl
-tk +xscreensaver zephyr zeroconf"
-
-# dbus requires python to generate C code for dbus bindings (thus DEPEND only).
-# finch uses libgnt that links with libpython - {R,}DEPEND. But still there is
-# no way to build dbus and avoid libgnt linkage with python. If you want this
-# send patch upstream.
-# purple-url-handler and purple-remote require dbus-python thus in reality we
-# rdepend on python if dbus enabled. But it is possible to separate this dep.
-RDEPEND="
-	>=dev-libs/glib-2.16
-	>=dev-libs/libxml2-2.6.18
-	ncurses? (
-		>=dev-libs/libgnt-$(ver_cut 1-2)
-		sys-libs/ncurses:=[unicode(+)]
-		dbus? ( ${PYTHON_DEPS} )
-		python? ( ${PYTHON_DEPS} )
-	)
-	gtk? (
-		>=x11-libs/gtk+-2.10:2[aqua=]
-		x11-libs/libSM
-		>=x11-libs/pango-1.4.0
-		xscreensaver? ( x11-libs/libXScrnSaver )
-		spell? ( >=app-text/gtkspell-2.0.2:2 )
-		eds? ( >=gnome-extra/evolution-data-server-3.6:= )
-		prediction? ( >=dev-db/sqlite-3.3:3 )
-	)
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-		>=net-libs/farstream-0.2.7:0.2
-	)
-	zeroconf? ( net-dns/avahi[dbus] )
-	dbus? (
-		>=dev-libs/dbus-glib-0.71
-		>=sys-apps/dbus-0.90
-		$(python_gen_cond_dep '
-			dev-python/dbus-python[${PYTHON_USEDEP}]
-		')
-	)
-	perl? ( >=dev-lang/perl-5.16:= )
-	gadu? ( >=net-libs/libgadu-1.11.0 )
-	gnutls? ( net-libs/gnutls:= )
-	!gnutls? (
-		dev-libs/nspr
-		dev-libs/nss
-	)
-	meanwhile? ( net-libs/meanwhile )
-	tcl? ( dev-lang/tcl:0= )
-	tk? ( dev-lang/tk:0= )
-	sasl? ( dev-libs/cyrus-sasl:2 )
-	networkmanager? ( net-misc/networkmanager )
-	idn? ( net-dns/libidn:= )
-"
-
-# We want nls in case gtk is enabled, bug #
-NLS_DEPEND=">=dev-util/intltool-0.41.1 sys-devel/gettext"
-
-DEPEND="${RDEPEND}
-	gtk? (
-		x11-base/xorg-proto
-		${NLS_DEPEND}
-	)
-	dbus? ( ${PYTHON_DEPS} )
-"
-BDEPEND="
-	dev-lang/perl
-	dev-perl/XML-Parser
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	!gtk? ( nls? ( ${NLS_DEPEND} ) )
-"
-
-DOCS=( AUTHORS HACKING NEWS README ChangeLog )
-
-REQUIRED_USE="
-	dbus? ( ${PYTHON_REQUIRED_USE} )
-	networkmanager? ( dbus )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-# Enable Default protocols
-DYNAMIC_PRPLS="irc,jabber,simple"
-
-# List of plugins
-#   app-accessibility/pidgin-festival
-#   net-im/librvp
-#   x11-plugins/guifications
-#	x11-plugins/msn-pecan
-#   x11-plugins/pidgin-encryption
-#   x11-plugins/pidgin-extprefs
-#   x11-plugins/pidgin-hotkeys
-#   x11-plugins/pidgin-latex
-#   x11-plugins/pidgintex
-#   x11-plugins/pidgin-libnotify
-#	x11-plugins/pidgin-mbpurple
-#	x11-plugins/pidgin-bot-sentry
-#   x11-plugins/pidgin-otr
-#   x11-plugins/pidgin-rhythmbox
-#   x11-plugins/purple-plugin_pack
-#   x11-themes/pidgin-smileys
-#	x11-plugins/pidgin-knotify
-# Plugins in Sunrise:
-#	x11-plugins/pidgin-audacious-remote
-#	x11-plugins/pidgin-autoanswer
-#	x11-plugins/pidgin-birthday-reminder
-#	x11-plugins/pidgin-blinklight
-#	x11-plugins/pidgin-convreverse
-#	x11-plugins/pidgin-embeddedvideo
-#	x11-plugins/pidgin-extended-blist-sort
-#	x11-plugins/pidgin-gfire
-#	x11-plugins/pidgin-lastfm
-#	x11-plugins/pidgin-sendscreenshot
-#	x11-plugins/pidgimpd
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.14.0-gold.patch"
-	"${WORKDIR}/${PN}-eds-3.6.patch"
-	"${FILESDIR}/${PN}-2.10.9-fix-gtkmedia.patch"
-	"${FILESDIR}/${PN}-2.10.10-eds-3.6-configure.ac.patch"
-	"${FILESDIR}/${PN}-2.10.11-tinfo.patch"
-	"${DISTDIR}/${PN}-2.10.9-irc_join_sleep.patch" # 577286
-	"${FILESDIR}/${PN}-2.13.0-disable-one-jid-test.patch" # 593338
-	"${FILESDIR}/${PN}-2.13.0-metainfo.patch"
-	"${FILESDIR}/${PN}-2.14.3-remove_oscar_tests.patch"
-)
-
-pkg_pretend() {
-	if ! use gtk && ! use ncurses ; then
-		elog "You did not pick the ncurses or gtk use flags, only libpurple"
-		elog "will be built."
-	fi
-
-	# dbus is enabled, no way to disable linkage with python => python is enabled
-	#REQUIRED_USE="gtk? ( nls ) dbus? ( python )"
-	if use gtk && ! use nls ; then
-		ewarn "gtk build => nls is enabled!"
-	fi
-	if use dbus && ! use python ; then
-		elog "dbus is enabled, no way to disable linkage with python => python is enabled"
-	fi
-}
-
-pkg_setup() {
-	if use python || use dbus ; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# Stabilize things, for your own good
-	strip-flags
-	replace-flags -O? -O2
-	use pie && append-cflags -fPIE -pie
-
-	use gadu 	&& DYNAMIC_PRPLS+=",gg"
-	use groupwise 	&& DYNAMIC_PRPLS+=",novell"
-	use meanwhile 	&& DYNAMIC_PRPLS+=",sametime"
-	use zephyr 	&& DYNAMIC_PRPLS+=",zephyr"
-	use zeroconf 	&& DYNAMIC_PRPLS+=",bonjour"
-
-	local myconf=(
-		--disable-mono
-		--disable-static
-		--with-dynamic-prpls="${DYNAMIC_PRPLS}"
-		--with-system-ssl-certs="${EPREFIX}/etc/ssl/certs/"
-		--x-includes="${EPREFIX}"/usr/include/X11
-		$(use_enable ncurses consoleui)
-		$(use_enable gtk gtkui)
-		$(use_enable gtk sm)
-		$(usex gtk '--enable-nls' "$(use_enable nls)")
-		$(use gtk && use_enable xscreensaver screensaver)
-		$(use gtk && use_enable prediction cap)
-		$(use gtk && use_enable eds gevolution)
-		$(use gtk && use_enable spell gtkspell)
-		$(use_enable perl)
-		$(use_enable tk)
-		$(use_enable tcl)
-		$(use_enable debug)
-		$(use_enable dbus)
-		$(use_enable meanwhile)
-		$(use_enable gstreamer)
-		$(use_with gstreamer gstreamer 1.0)
-		$(use_enable gstreamer farstream)
-		$(use_enable gstreamer vv)
-		$(use_enable sasl cyrus-sasl )
-		$(use_enable doc doxygen)
-		$(use_enable networkmanager nm)
-		$(use_enable zeroconf avahi)
-		$(use_enable idn)
-	)
-
-	if use gnutls; then
-		einfo "Disabling NSS, using GnuTLS"
-		myconf+=(
-			--enable-nss=no
-			--enable-gnutls=yes
-			--with-gnutls-includes="${EPREFIX}/usr/include/gnutls"
-			--with-gnutls-libs="${EPREFIX}/usr/$(get_libdir)"
-		)
-	else
-		einfo "Disabling GnuTLS, using NSS"
-		myconf+=(
-			--enable-gnutls=no
-			--enable-nss=yes
-		)
-	fi
-
-	if use dbus || { use ncurses && use python ; } ; then
-		myconf+=( --with-python3=${PYTHON} )
-	else
-		myconf+=( --without-python3 )
-	fi
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	# setting this here because gnome2.eclass is not EAPI-7 ready
-	export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL="1"
-	default
-
-	if use gtk ; then
-		# Fix tray paths for e16 (x11-wm/enlightenment) and other
-		# implementations that are not compliant with new hicolor theme yet, #323355
-		local d f pixmapdir
-		for d in 16 22 32 48 ; do
-			pixmapdir="${ED}/usr/share/pixmaps/pidgin/tray/hicolor/${d}x${d}/actions"
-			mkdir "${pixmapdir}" || die
-			pushd "${pixmapdir}" >/dev/null || die
-			for f in ../status/*; do
-				ln -s ${f} || die
-			done
-			popd >/dev/null || die
-		done
-	fi
-	use perl && perl_delete_localpod
-
-	if use python || use dbus ; then
-		python_fix_shebang "${ED}"
-		python_optimize
-	fi
-
-	dodoc ${DOCS[@]} finch/plugins/pietray.py
-	docompress -x /usr/share/doc/${PF}/pietray.py
-
-	find "${ED}" -type f -name "*.la" -delete || die
-}
-
-src_test() {
-	# make default build logs slightly more useful
-	emake check VERBOSE=1
-}
-
-pkg_preinst() {
-	gnome2_gconf_savelist
-	xdg_pkg_preinst
-}
-
-pkg_postinst() {
-	gnome2_gconf_install
-	gnome2_schemas_update
-	xdg_pkg_postinst
-}
-
-pkg_postrm() {
-	gnome2_gconf_uninstall
-	gnome2_schemas_update
-	xdg_pkg_postrm
-}
diff --git a/net-im/pidgin/pidgin-2.14.5-r1.ebuild b/net-im/pidgin/pidgin-2.14.5-r1.ebuild
index 21139390fc9e..b3ff977ba24c 100644
--- a/net-im/pidgin/pidgin-2.14.5-r1.ebuild
+++ b/net-im/pidgin/pidgin-2.14.5-r1.ebuild
@@ -255,8 +255,8 @@ src_install() {
 	fi
 	use perl && perl_delete_localpod
 
+	use dbus && python_fix_shebang "${ED}"
 	if use python || use dbus ; then
-		python_fix_shebang "${ED}"
 		python_optimize
 	fi
 
diff --git a/net-im/pidgin/pidgin-2.14.6-r1.ebuild b/net-im/pidgin/pidgin-2.14.6-r1.ebuild
index a9ab6bb11e2b..6983523531df 100644
--- a/net-im/pidgin/pidgin-2.14.6-r1.ebuild
+++ b/net-im/pidgin/pidgin-2.14.6-r1.ebuild
@@ -254,8 +254,8 @@ src_install() {
 	fi
 	use perl && perl_delete_localpod
 
+	use dbus && python_fix_shebang "${ED}"
 	if use python || use dbus ; then
-		python_fix_shebang "${ED}"
 		python_optimize
 	fi