From dc7cbdfa65fd814b3b9aa3c56257da201109e807 Mon Sep 17 00:00:00 2001 From: V3n3RiX <venerix@redcorelinux.org> Date: Fri, 5 Apr 2019 21:17:31 +0100 Subject: gentoo resync : 05.04.2019 --- net-im/pidgin/Manifest | 2 + .../files/pidgin-2.13.0-python3_support.patch | 37 +++ net-im/pidgin/pidgin-2.13.0-r1.ebuild | 285 +++++++++++++++++++++ 3 files changed, 324 insertions(+) create mode 100644 net-im/pidgin/files/pidgin-2.13.0-python3_support.patch create mode 100644 net-im/pidgin/pidgin-2.13.0-r1.ebuild (limited to 'net-im/pidgin') diff --git a/net-im/pidgin/Manifest b/net-im/pidgin/Manifest index e7b81a29fb65..a08678ba5b88 100644 --- a/net-im/pidgin/Manifest +++ b/net-im/pidgin/Manifest @@ -3,8 +3,10 @@ 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-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-r1.ebuild 7936 BLAKE2B 9bf0f588551409f9dca69ba24703d2797f478e34fe082be3535a96243f581d694a30f5acdc2157e198e104a514cc43734a44c93b82bb1cb2045392e23e677d0f SHA512 cc391181a0e9ae9a62eda94f75d6e0589a69c2d9035dea52db2d28efb985d3b3074f90fabc39b2729670ab7e9830812713128750f5c7711243e8ffeb9a42e149 EBUILD pidgin-2.13.0.ebuild 7816 BLAKE2B 06ac1560723ea4d89111934d05158089e217669b3f4584424dcb55fb7f564a52c3207f26209522ccc80a0644577e09bfe3177b2cabfcf76ebb023c79894bdfb1 SHA512 af67dd4c9ab151759cacf6dbe172f66fda58fb9c99446139a5fc15e7b2a3a8bffa98cc89d0e1ca01da04bc50c1e16c254f83baf6b5c54afb4ec460d5d2e0d854 MISC metadata.xml 1480 BLAKE2B 09a69fc87ec34ef69c1862ba62eefabdde0cc806e47e005d2e13cfd639c6cd0d7f7ec6ac5e9a9d2b438c29d98caaf613b472e41ede2cef93de303da15c553e43 SHA512 de9430a267c6d93ec7a922f7ee447e36c2008cc37931896513398ae3f32af7e2a08ebb2ff7f9fb254c7facbf1ee5a4959e562e2fccd6bd85595f3d9b1d0e1e00 diff --git a/net-im/pidgin/files/pidgin-2.13.0-python3_support.patch b/net-im/pidgin/files/pidgin-2.13.0-python3_support.patch new file mode 100644 index 000000000000..19ece4a9a223 --- /dev/null +++ b/net-im/pidgin/files/pidgin-2.13.0-python3_support.patch @@ -0,0 +1,37 @@ +# HG changeset patch +# User John Bailey <rekkanoryo@rekkanoryo.org> +# Date 1527918187 14400 +# Sat Jun 02 01:43:07 2018 -0400 +# Branch upstream-fedora-patches +# Node ID ab3a54cf9afbd2a1cb6736c7ee424d8fc82e7b14 +# Parent de18cefddad5ffe593a192f3a20f6f91165ab516 +Modified Jan Synacek's purple-remote python3 compatibility patch to make it +compatible with both python2 and python3. + +diff --git a/COPYRIGHT b/COPYRIGHT +--- a/COPYRIGHT ++++ b/COPYRIGHT +@@ -544,6 +544,7 @@ + Sun Microsystems + Marcus Sundberg + Mårten Svantesson (fursten) ++Jan Synacek <jsynacek@redhat.com> + Amir Szekely (kichik) + Gábor Szuromi (kukkerman) + Jakub Szypulka +diff --git a/libpurple/purple-remote b/libpurple/purple-remote +--- a/libpurple/purple-remote ++++ b/libpurple/purple-remote +@@ -14,7 +14,11 @@ + import xml.dom.minidom + + sys.stdin = codecs.getwriter('utf-8')(sys.stdin); +-sys.stdout = codecs.getwriter('utf-8')(sys.stdout); ++ ++if(sys.version_info > (3,0)): ++ sys.stdout = codecs.getwriter('utf-8')(sys.stdout.detach()); ++else: ++ sys.stdout = codecs.getwriter('utf-8')(sys.stdout); + + xml.dom.minidom.Element.all = xml.dom.minidom.Element.getElementsByTagName + diff --git a/net-im/pidgin/pidgin-2.13.0-r1.ebuild b/net-im/pidgin/pidgin-2.13.0-r1.ebuild new file mode 100644 index 000000000000..68c1f9e981a0 --- /dev/null +++ b/net-im/pidgin/pidgin-2.13.0-r1.ebuild @@ -0,0 +1,285 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +GENTOO_DEPEND_ON_PERL=no +PYTHON_COMPAT=( python{2_7,3_{5,6,7}} ) + +inherit autotools flag-o-matic gnome2 toolchain-funcs multilib perl-module python-single-r1 xdg-utils + +DESCRIPTION="GTK Instant Messenger client" +HOMEPAGE="http://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 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos" +IUSE="dbus debug doc eds gadu gnutls +gstreamer +gtk idn meanwhile pie" +IUSE+=" networkmanager nls perl silc tcl tk spell sasl ncurses" +IUSE+=" groupwise prediction python +xscreensaver zephyr zeroconf" # mono" +IUSE+=" aqua" + +# 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 + dev-python/dbus-python[${PYTHON_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 ) + silc? ( >=net-im/silc-toolkit-1.0.1 ) + 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" + # Mono support crashes pidgin + #mono? ( dev-lang/mono )" + +# We want nls in case gtk is enabled, bug # +NLS_DEPEND=">=dev-util/intltool-0.41.1 sys-devel/gettext" + +DEPEND="$RDEPEND + dev-lang/perl + dev-perl/XML-Parser + virtual/pkgconfig + gtk? ( + x11-base/xorg-proto + ${NLS_DEPEND} + ) + dbus? ( ${PYTHON_DEPS} ) + 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 +) + +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 silc && DYNAMIC_PRPLS+=",silc" + 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 ) + myconf+=( --with-gnutls-includes="${EPREFIX}/usr/include/gnutls" ) + myconf+=( --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() { + gnome2_src_install + + 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_icon_savelist; } + +pkg_postinst() { + gnome2_icon_cache_update + xdg_desktop_database_update +} + +pkg_postrm() { + gnome2_icon_cache_update + xdg_desktop_database_update +} -- cgit v1.2.3