diff options
author | V3n3RiX <venerix@koprulu.sector> | 2022-02-02 01:39:05 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2022-02-02 01:39:05 +0000 |
commit | fcc5224904648a8e6eb528d7603154160a20022f (patch) | |
tree | 3bfce096b38a9cea8eed13fc70c1526c456e9abd /net-im/pidgin | |
parent | 2fd57282f0262ca084e05b0f2c63fbada395d02b (diff) |
gentoo resync : 02.02.2022
Diffstat (limited to 'net-im/pidgin')
-rw-r--r-- | net-im/pidgin/Manifest | 8 | ||||
-rw-r--r-- | net-im/pidgin/files/pidgin-2.13.0-disable-one-jid-test.patch | 24 | ||||
-rw-r--r-- | net-im/pidgin/files/pidgin-2.14.8-libpurple_test_fix.patch | 52 | ||||
-rw-r--r-- | net-im/pidgin/pidgin-2.14.6-r1.ebuild | 288 | ||||
-rw-r--r-- | net-im/pidgin/pidgin-2.14.7.ebuild | 287 | ||||
-rw-r--r-- | net-im/pidgin/pidgin-2.14.8.ebuild | 5 |
6 files changed, 57 insertions, 607 deletions
diff --git a/net-im/pidgin/Manifest b/net-im/pidgin/Manifest index 743a160406a0..1065ab95f687 100644 --- a/net-im/pidgin/Manifest +++ b/net-im/pidgin/Manifest @@ -1,9 +1,5 @@ -AUX pidgin-2.13.0-disable-one-jid-test.patch 872 BLAKE2B 648d92b095dba563e9dd3c6499208192d51d2dc92c06570eb131abfc07d5775d1e28db6ed27c41a4d945b9f3869f17db890ddeac69debbd465ac2e57db27ed47 SHA512 2358af54f9d63e75660f19898f25035ed331571d73a6cf5d09f42df60c82743a22dde84d2ddfcf7706df4e0226d0f6e0689a784fca0e84627edbf3616070d993 +AUX pidgin-2.14.8-libpurple_test_fix.patch 1895 BLAKE2B 2174772177ff0b906dc9dc90545469207e96671171e4f3b5bd60e361c935160362687b373aa89eacdd22c80bdb2291718a2e6165e628b7bb86b8f76f4f4c3da1 SHA512 9b328516173c8c81bc99c3045fc91c1cd99a4b74a26b37b93ba9ec2fbfb7560bcaf0c5b8890a8ee02bbb19052a774f608d9a4061eb9966f70e5b19cd1dc144eb DIST pidgin-2.10.9-irc_join_sleep.patch 534 BLAKE2B 0215cebb93993e19e700e4d4974351ab5e9a00ea094775076d8f439569b34c0ec2faaed360965867df58bc42677516983ce11a2601dd322c1bdf2f288253a5b8 SHA512 8de0d6f05e48cd5a3e894576e06c7fb82e4bfc778cce8bb179fa22e2a05f5c2390a0e4c5b626ee4b910a18eab170d8f4be200f435ce408a86575af99e51e3bdf -DIST pidgin-2.14.6.tar.bz2 8672222 BLAKE2B d2e6428728f18096c957b10d7cc5e79704c0fbb403967e3968f59393db125307fc6fc84c90d66788b4a27bd9707b126c1f0df532c2a1e7d1b62356127e87371c SHA512 19ea12b6c9e99b6215a7d955f02d52ad19de8c4beb00806276c8c184d5cc338db119197e0cc9f4685705bd8b83f35c8f63565095b49a319f9696aab37735951b -DIST pidgin-2.14.7.tar.bz2 8713379 BLAKE2B d48670c8b7419df67c6dddedf8eb15c0c4d61877386f65793b1423b659c6131d92eb58ae6cf63a31432426c8a09da0bdab0be8770517436bae51610a60886b59 SHA512 189b02b5500ca3560972cad9c84e94007e1c8cedd56d39214293412b31ee38bc2dbb33ab2f9320338bb226131f51cc8a1f6a4c66ba889a0f55d91edc15ac7465 DIST pidgin-2.14.8.tar.bz2 8683281 BLAKE2B 757ae81cc17db61bb5d434920f230d18c25639179c0584346b2bc6f34620d5ef499fd564ded5bfb649cf619700bbfd7eab6a222fdaf0324903bb92d81f77d182 SHA512 23975501b07d14829edab7b92628703962d7a8f90849b303e2a765ec6e47d1fcbdeff62539811e26682e300a2f94520193369844de3b1c0e87f99721ca0255e6 -EBUILD pidgin-2.14.6-r1.ebuild 7552 BLAKE2B df1322c043eea5f238ae31e356126a5051b15a5c2e23ff2cb85655cffc19324d85f2c98d1bacc28ef4a58342037ad278e08f194ff7d35317e4ed816f17d9d83f SHA512 6d0d0dd56fd925166dbd9bf43721a07e8b6077574ea31d3e98a23fa83a53f05801701b55f754c1c7686825e1fb2ca5dc4eab90ee733d8705a1548da591bf22af -EBUILD pidgin-2.14.7.ebuild 7495 BLAKE2B d2ff2260170869d9ca447e325ac12a174b1a8cdeff8c86a66f5e15faada00b96a8fa0ee68f194058c67a041e963ce668b0ed76d04a9a470cd89d829b3569db4b SHA512 6ad1f97c37079222dd11118ea76e83cabf193505a51159473efefa5c144ab94ba49ee6305f6bfd1c6a5c67715b4d3788fdf3a88c927ff6637984e9cbb4aef9ed -EBUILD pidgin-2.14.8.ebuild 7490 BLAKE2B bb47ba2fb8d1d3c280ccfe4f3abe43e10cb8e3f384c8ff8d7ff8853e01ef7abcbd8c75e2ce15ebd7a3b41057c7f4d39f61a28d2432e7ff9810801a3585f33054 SHA512 45f60542459d1a03830fc1c083d4ce25f598e9ee7254329cb7255b607f1c2df1b40fa1666acfdc358256223b0fb808c3b30da2b9826ae3b742326a4cc310fb21 +EBUILD pidgin-2.14.8.ebuild 7541 BLAKE2B 1a17044f45b46eeb68c2fdf5a26bc5108fdd04e80e2e48e9fbc962d2253de698f04fe3e18ac504250a50647e3537a7ebbf9f399f0a8fc3f6e3eb4463dc162d55 SHA512 c08924d8ae02003f8aaf69210207fddb31480ea1d7fd180841a1f011f7976efd4d7073c955b5d06f49d8500fb61ec54a74e7404673c9d8f0dbf2300d668993d0 MISC metadata.xml 1419 BLAKE2B 6b87c11749b1e15503eddb0d73d18ed264e86d8d8e515cd30ba6787117401f8f07ea5030accd5cbf86da7c059eaf4f4d2fa3ff5d0c2bf5db1f987f5f536ac448 SHA512 c7bc589c6ddd1fb628832105691f08555f0fd7e5578bd3c5905a6b082198c36a34f86182a8772b8e8aa14b75f2b99eeba99c2c77ef480f3d80fa199aa792067d diff --git a/net-im/pidgin/files/pidgin-2.13.0-disable-one-jid-test.patch b/net-im/pidgin/files/pidgin-2.13.0-disable-one-jid-test.patch deleted file mode 100644 index cf3a6de7bfb2..000000000000 --- a/net-im/pidgin/files/pidgin-2.13.0-disable-one-jid-test.patch +++ /dev/null @@ -1,24 +0,0 @@ -https://bugs.gentoo.org/593338 - -Workaround one failing test. test fails on all platforms. -Needs to be fixed upstream. - ---- a/libpurple/tests/test_jabber_jutil.c -+++ b/libpurple/tests/test_jabber_jutil.c -@@ -144,7 +144,16 @@ START_TEST(test_jabber_id_new) - * string MUST NOT contain any LCat character." - * The character is U+066D (ARABIC FIVE POINTED STAR). - */ -+#if 0 -+ /* -+ Fails in gentoo: https://bugs.gentoo.org/593338 -+ -+ 98%: Checks: 87, Failures: 1, Errors: 0 -+ test_jabber_jutil.c:147:F:JID validate:test_jabber_id_new:0: JID 'foo@example.com/٭simplexe٭' is invalid but jabber_id_new() allowed it -+ FAIL check_libpurple (exit status: 1) -+ */ - assert_invalid_jid("foo@example.com/٭simplexe٭"); -+#endif - - /* Ensure that jabber_id_new is properly lowercasing node and domains */ - assert_jid_parts("paul", "darkrain42.org", "PaUL@darkrain42.org"); diff --git a/net-im/pidgin/files/pidgin-2.14.8-libpurple_test_fix.patch b/net-im/pidgin/files/pidgin-2.14.8-libpurple_test_fix.patch new file mode 100644 index 000000000000..30caaa92e9c5 --- /dev/null +++ b/net-im/pidgin/files/pidgin-2.14.8-libpurple_test_fix.patch @@ -0,0 +1,52 @@ +# HG changeset patch +# Node ID e8f8e1558e11 +# Parent 930e4fb71321 +diff --git a/libpurple/tests/test_util.c b/libpurple/tests/test_util.c +--- a/libpurple/tests/test_util.c ++++ b/libpurple/tests/test_util.c +@@ -172,7 +172,7 @@ + fail_unless(1282941722 == purple_str_to_time("2010-08-27.204202", TRUE, NULL, NULL, NULL)); + fail_unless(1175919261 == purple_str_to_time("20070407T04:14:21.3234", TRUE, NULL, NULL, NULL)); + fail_unless(1175919261 == purple_str_to_time("20070407T04:14:21Z", TRUE, NULL, NULL, NULL)); +- fail_unless(1631512800 == purple_str_to_time("09-13-2021", TRUE, NULL, NULL, NULL)); ++ fail_unless(1631491200 == purple_str_to_time("09-13-2021", TRUE, NULL, NULL, NULL)); + + /* For testing local time we use Asia/Kathmandu because it's +05:45 and + * doesn't have DST which means the test should always pass regardless of +@@ -195,9 +195,14 @@ + * localtime. + */ + timestamp = purple_str_to_time("09/13/202115:34:34", TRUE, NULL, NULL, &rest); +- fail_unless(1631470500 == timestamp); ++ fail_unless(1631491200 == timestamp); + assert_string_equal("15:34:34", rest); + ++ timestamp = purple_str_to_time("2010-08-27.134202-0700PDT", FALSE, &tm, &tz_off, &rest); ++ fail_unless(1282941722 == timestamp); ++ fail_unless((-7 * 60 * 60) == tz_off); ++ assert_string_equal("PDT", rest); ++ + /* finally revert the TZ environment variable */ + if(oldtz != NULL) { + g_setenv("TZ", oldtz, TRUE); +diff --git a/libpurple/util.c b/libpurple/util.c +--- a/libpurple/util.c ++++ b/libpurple/util.c +@@ -887,6 +887,17 @@ + t.tm_isdst = -1; /* -1 means dst info is not available */ + } + } ++ } else { ++ /* If we have a time, figure out if we need to adjust our tz offset. */ ++ if(!mktime_with_utc) { ++ if(utc) { ++ mktime_with_utc = TRUE; ++ tzoff = 0; ++ } else { ++ /* Local Time */ ++ t.tm_isdst = -1; /* -1 means dst info is not available */ ++ } ++ } + } + + g_free(hours); diff --git a/net-im/pidgin/pidgin-2.14.6-r1.ebuild b/net-im/pidgin/pidgin-2.14.6-r1.ebuild deleted file mode 100644 index a912c204bcb5..000000000000 --- a/net-im/pidgin/pidgin-2.14.6-r1.ebuild +++ /dev/null @@ -1,288 +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://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 ~riscv 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/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=( - "${DISTDIR}/${PN}-2.10.9-irc_join_sleep.patch" # 577286 - "${FILESDIR}/${PN}-2.13.0-disable-one-jid-test.patch" # 593338 -) - -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() { - xdg_src_prepare - 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 - - use dbus && python_fix_shebang "${ED}" - if use python || use dbus ; then - 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 - local -x GST_PLUGIN_SYSTEM_PATH_1_0= - 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.7.ebuild b/net-im/pidgin/pidgin-2.14.7.ebuild deleted file mode 100644 index 5b28584d138a..000000000000 --- a/net-im/pidgin/pidgin-2.14.7.ebuild +++ /dev/null @@ -1,287 +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://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 ~riscv ~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/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=( - "${DISTDIR}/${PN}-2.10.9-irc_join_sleep.patch" # 577286 -) - -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() { - xdg_src_prepare - 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 - - use dbus && python_fix_shebang "${ED}" - if use python || use dbus ; then - 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 - local -x GST_PLUGIN_SYSTEM_PATH_1_0= - 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.8.ebuild b/net-im/pidgin/pidgin-2.14.8.ebuild index 9fa6d8518eac..9dc37e46de11 100644 --- a/net-im/pidgin/pidgin-2.14.8.ebuild +++ b/net-im/pidgin/pidgin-2.14.8.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -16,7 +16,7 @@ SRC_URI=" LICENSE="GPL-2" SLOT="0/2" # libpurple version -KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv 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" @@ -134,6 +134,7 @@ DYNAMIC_PRPLS="irc,jabber,simple" PATCHES=( "${DISTDIR}/${PN}-2.10.9-irc_join_sleep.patch" # 577286 + "${FILESDIR}/${P}-libpurple_test_fix.patch" #819774 ) pkg_pretend() { |