gentoo Easter resync : 12.04.2020

5 files changed, 371 insertions, 3 deletions

diff --git a/net-im/pidgin/Manifest b/net-im/pidgin/Manifest
index 3a28248c32f8..6fd3e9fb89b1 100644
--- a/net-im/pidgin/Manifest
+++ b/net-im/pidgin/Manifest
@@ -3,10 +3,13 @@ AUX pidgin-2.10.10-eds-3.6-configure.ac.patch 1088 BLAKE2B 5f83a3a9f36810c446bdc
 AUX pidgin-2.10.11-tinfo.patch 892 BLAKE2B 50e16a86ed29510c8632a8d6d2021236ba125a4f8fc4cd5c0408b2c0fcfe8187a4d72df512a2e224fbf801df88cb8f39c2d63487ba0f04934be09315d1306ac1 SHA512 019148522e6851e1e52cf52a3b855f0d5fb10dd5a3e7236e5abfe21f270b9feb1b998aaaa668768c85e855019eb69f7b7458c220ca06a189aba3e77947b158db
 AUX pidgin-2.10.9-fix-gtkmedia.patch 267 BLAKE2B 71718c2d469c2418ee4abba9ca1ebdd672094e43773681fca25aeb940a442b56fca7b4342b4e983e4bd75835c80bdbba4171b0c4781c1f4425908e8a3a1f6fcd SHA512 e78c95e1e4b86c4e702ed9e184de75940f4b93265cfce73d0d6b2145d4a07c79f41dbaa996cbb76e5ac19d9fd1a606d1dd31982e948ac58376b24c1ab866e6bd
 AUX pidgin-2.13.0-disable-one-jid-test.patch 872 BLAKE2B 648d92b095dba563e9dd3c6499208192d51d2dc92c06570eb131abfc07d5775d1e28db6ed27c41a4d945b9f3869f17db890ddeac69debbd465ac2e57db27ed47 SHA512 2358af54f9d63e75660f19898f25035ed331571d73a6cf5d09f42df60c82743a22dde84d2ddfcf7706df4e0226d0f6e0689a784fca0e84627edbf3616070d993
+AUX pidgin-2.13.0-fix-build-against-nm-1.0.patch 1772 BLAKE2B 2d6c23ca93375bc7b495866f0a0dfb72ac900203358241307abf97bdb9a9bd564cd1f7813209b28c548d729f6d67f35f92da4ec461f307dbf1999ecc58276553 SHA512 8df00a481022b51047fd94b0b8dfced7ce79a5622a31fceeb2ed3c04e6debf13abb7fe7bb4e95d6542d40b7bbabbaf0e8994d35b658c60b4caf1bbdc5aa194dd
 AUX pidgin-2.13.0-gnutls_sni_support.patch 1298 BLAKE2B 1bf2be33e4328d5e52256ced4ee53a4ba7b4a294e7a8f47833950019dfae654c37f1b7dc63d6fe4b1d3f7b4e35fe3a1fc8d527a72660f43b9f16f2f218d491ee SHA512 ebdc088aeec3064e98e5f033f67eefa6c5a38cd074aa04d1bbd1db2738e932326a2abcddb27bd4b4a92bfde84811fec3517d4965cb215bd035762c4f1d006d8a
+AUX pidgin-2.13.0-metainfo.patch 345 BLAKE2B 7f0a56f0de53860c3963bd88c1646570ca0687eec5c3022b007a3519ff7974bb18d7f3aa17abddfa516e1a546282e33b56714a2c2e6d64c2f2e15e696c05144a SHA512 6276d11f408dd26f6749f8ee11a1842eb0d60b8f79f01ba7054f4521e26f2e330ded50e8177368491b76d02a12a2694db3b7c6760193b7da4c52a36df55343ce
 AUX pidgin-2.13.0-python3_support.patch 1156 BLAKE2B be31ac0d0ab07588d2ae635f0662823888a7f844fc1f6f7b498755c447ee78cffc9bbafb7f7c531710d3045795517825257f2786f0c999829656d469bd835adb SHA512 3ae82355321c59b0c4afa916e5c27ff0d2df95951ba363c67fada5634bf5673c2ded01515a3b927f1c6020c5f56d19279e6a7e9715ce766013ad763c4e61652b
 DIST pidgin-2.10.9-irc_join_sleep.patch 534 BLAKE2B 0215cebb93993e19e700e4d4974351ab5e9a00ea094775076d8f439569b34c0ec2faaed360965867df58bc42677516983ce11a2601dd322c1bdf2f288253a5b8 SHA512 8de0d6f05e48cd5a3e894576e06c7fb82e4bfc778cce8bb179fa22e2a05f5c2390a0e4c5b626ee4b910a18eab170d8f4be200f435ce408a86575af99e51e3bdf
 DIST pidgin-2.13.0.tar.bz2 8994457 BLAKE2B 32be31509a90b924fba4a4dbaba304580d88dfc6d3bbe0c88ef12eef381f70e031af1a55ada2abfb6968a9967a9fdadfa69973482b80dea7bb554a983a96fa12 SHA512 68b3d1eefee111544c7eb347386d0aea4f47c3e320d5963a4e0d833ed6af7b1be243a7bcd6a38c9234b58601d10a9aebf8541f1d97decfeca754fa78dc693047
 DIST pidgin-eds-3.6.patch.bz2 2352 BLAKE2B 1d69dc55f43b9efe5d5278a017642702d67a297fe2587467ec0fdca7f9888e26640efe9ac2a18f77ae9c523bf125a2cec6d0bf621f0b2b16f55d30df1bf470df SHA512 a0195679ab55ed9c7ea18ace6dbf0fc994698f1f4eea9d8335dfdcdcd6a68975c0191bd22f150bf5a9a0a691ce7e9e73d79598e1e8be541efa1d9824a633d877
-EBUILD pidgin-2.13.0-r6.ebuild 7862 BLAKE2B 105e3f6c3cda1bf56e25b9eebedd47cbb765b1a73f17d94ce7751c0f1527d4ad62ad09d78328d378c66a3734a2c82c0f1877878e17e4070f38de4b88d3d32434 SHA512 b83b2ea8323a526afc623f16b3bd1a47c5533dd18111331b161d5bfe999c2ca9c19deabfc814acdb9f27f61bd7cd9e4d5e3c81ef0a743e4b3b832d889fbd9340
+EBUILD pidgin-2.13.0-r7.ebuild 7863 BLAKE2B c3a5835561479c42c0b870de3b2996d3b05eaeb564df4133f7f24c2ed3e559bba7ae510f049233c25c54b5662b27b17abed953310566048a990e420f83df08b4 SHA512 daa3adc3cba97abb26047c46ffcb7ec2e3771948c9b6722061c74a50926ed81b4a95392649b69e796ea54e415858dc3f59501f48e214c172e3f4c61419162d35
+EBUILD pidgin-2.13.0-r8.ebuild 8096 BLAKE2B cadd7ac7dabdf8f0a4039c4a201b58b1c455d8a9eb5d45da14c3e8ef44b3dcfa97590e7d9789ef880e92e9e17b9cc857403f48d7afacbc1b664aac52c64893cd SHA512 e346b3c5bd2682bb4c1d9ea31a9dc9eca995983d98b80c3d3a7749e9ff19aefe4541bcdeefcb0fb8de45d8b17a603877be633790bd0c4a1b30300e92166f0d22
 MISC metadata.xml 1418 BLAKE2B b484d6c252dfa5f4c2bd4ef21b718cb449e3248506dab7f1f0e017e648323653e61a0f37bf2bb562f6a9b97b3fb0fcbaff897e3f030ad36e2e0813e27dfcbadc SHA512 13ff337bab4cf2924f9b652ad73d11a6d6ce268cc4aea4f9f2435acfefc85597b290de5785601ed8ad0e220047f3eff47c85150b7d81bf6e7e7b8ca9173161f7
diff --git a/net-im/pidgin/files/pidgin-2.13.0-fix-build-against-nm-1.0.patch b/net-im/pidgin/files/pidgin-2.13.0-fix-build-against-nm-1.0.patch
new file mode 100644
index 000000000000..d9d27930439c
--- /dev/null
+++ b/net-im/pidgin/files/pidgin-2.13.0-fix-build-against-nm-1.0.patch
@@ -0,0 +1,54 @@
+https://src.fedoraproject.org/rpms/pidgin/raw/master/f/pidgin-2.13.0-fix-build-against-nm-1.0.patch
+
+diff --git a/configure.ac b/configure.ac
+index 04836fa..0a2d451 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1423,18 +1423,24 @@ fi
+ dnl Check for NetworkManager.h; if we don't have it, oh well
+ if test "x$enable_dbus" = "xyes" ; then
+ 	if test "x$enable_nm" = "xyes" ; then
+-		PKG_CHECK_MODULES(NETWORKMANAGER, [NetworkManager >= 0.5.0], [
++		PKG_CHECK_MODULES(NETWORKMANAGER, [libnm], [
+ 			AC_SUBST(NETWORKMANAGER_CFLAGS)
+ 			AC_SUBST(NETWORKMANAGER_LIBS)
+ 			AC_DEFINE(HAVE_NETWORKMANAGER, 1, [Define if we have NetworkManager.])
+ 		], [
+-			enable_nm=no
+-			if test "x$force_deps" = "xyes" ; then
+-				AC_MSG_ERROR([
++			PKG_CHECK_MODULES(NETWORKMANAGER, [NetworkManager >= 0.5.0], [
++				AC_SUBST(NETWORKMANAGER_CFLAGS)
++				AC_SUBST(NETWORKMANAGER_LIBS)
++				AC_DEFINE(HAVE_NETWORKMANAGER, 1, [Define if we have NetworkManager.])
++			], [
++				enable_nm=no
++				if test "x$force_deps" = "xyes" ; then
++					AC_MSG_ERROR([
+ NetworkManager development headers not found.
+ Use --disable-nm if you do not need NetworkManager support.
+ ])
+-			fi])
++				fi])
++		])
+ 	fi
+ else
+ 	enable_nm=no
+diff --git a/libpurple/network.c b/libpurple/network.c
+index c43e3c7..b17e439 100644
+--- a/libpurple/network.c
++++ b/libpurple/network.c
+@@ -939,8 +939,13 @@ nm_update_state(NMState state)
+ #if NM_CHECK_VERSION(0,8,992)
+ 		case NM_STATE_DISCONNECTING:
+ #endif
++#if NM_CHECK_VERSION(1,0,0)
++			if (prev != NM_STATE_CONNECTED_GLOBAL && prev != NM_STATE_UNKNOWN)
++				break;
++#else
+ 			if (prev != NM_STATE_CONNECTED && prev != NM_STATE_UNKNOWN)
+ 				break;
++#endif
+ 			if (ui_ops != NULL && ui_ops->network_disconnected != NULL)
+ 				ui_ops->network_disconnected();
+ 			break;
diff --git a/net-im/pidgin/files/pidgin-2.13.0-metainfo.patch b/net-im/pidgin/files/pidgin-2.13.0-metainfo.patch
new file mode 100644
index 000000000000..34d1dc160445
--- /dev/null
+++ b/net-im/pidgin/files/pidgin-2.13.0-metainfo.patch
@@ -0,0 +1,11 @@
+--- 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/pidgin-2.13.0-r6.ebuild b/net-im/pidgin/pidgin-2.13.0-r7.ebuild
index aee1ccb0a4bf..4875939166f5 100644
--- a/net-im/pidgin/pidgin-2.13.0-r6.ebuild
+++ b/net-im/pidgin/pidgin-2.13.0-r7.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0/2" # libpurple version
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
 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" # mono
@@ -72,7 +72,7 @@ RDEPEND="
 	tcl? ( dev-lang/tcl:0= )
 	tk? ( dev-lang/tk:0= )
 	sasl? ( dev-libs/cyrus-sasl:2 )
-	networkmanager? ( net-misc/networkmanager )
+	networkmanager? ( <net-misc/networkmanager-1.19 )
 	idn? ( net-dns/libidn:= )
 	!<x11-plugins/pidgin-facebookchat-1.69-r1"
 	# Mono support crashes pidgin
diff --git a/net-im/pidgin/pidgin-2.13.0-r8.ebuild b/net-im/pidgin/pidgin-2.13.0-r8.ebuild
new file mode 100644
index 000000000000..f3f3b6b1f4e3
--- /dev/null
+++ b/net-im/pidgin/pidgin-2.13.0-r8.ebuild
@@ -0,0 +1,300 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+GENTOO_DEPEND_ON_PERL=no
+PYTHON_COMPAT=( python3_{6,7} )
+
+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 ~x86-macos"
+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? (
+		sys-libs/ncurses:0=[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_MULTI_USEDEP}]
+		')
+	)
+	perl? ( >=dev-lang/perl-5.16:= )
+	gadu? ( || (
+		>=net-libs/libgadu-1.11.0[ssl,gnutls(+)]
+		>=net-libs/libgadu-1.11.0[-ssl]
+	) )
+	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:= )
+	!<x11-plugins/pidgin-facebookchat-1.69-r1
+"
+
+# 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,oscar,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.10.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-python3_support.patch" #459996
+	"${FILESDIR}/${PN}-2.13.0-gnutls_sni_support.patch" #708226
+	"${FILESDIR}/${PN}-2.13.0-fix-build-against-nm-1.0.patch"
+	"${FILESDIR}/${PN}-2.13.0-metainfo.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
+		--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-python=${PYTHON} )
+	else
+		myconf+=( --without-python )
+	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 complient with new hicolor theme yet, #323355
+		local 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}" \( -name "*.a" -o -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
+}