commit: 6f24a5c69cd4538e3b0cffcacd6c621f3f158f1d
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 29 07:04:32 2022 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri Apr 29 07:05:02 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f24a5c6
net-im/pidgin: Removed old
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
.../files/pidgin-2.14.8-libpurple_test_fix.patch | 52 ----
net-im/pidgin/pidgin-2.14.8-r1.ebuild | 291 ---------------------
net-im/pidgin/pidgin-2.14.9.ebuild | 3 +-
3 files changed, 1 insertion(+), 345 deletions(-)
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
deleted file mode 100644
index 30caaa92e9c5..000000000000
--- a/net-im/pidgin/files/pidgin-2.14.8-libpurple_test_fix.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-# 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.8-r1.ebuild
b/net-im/pidgin/pidgin-2.14.8-r1.ebuild
deleted file mode 100644
index 028282d415c0..000000000000
--- a/net-im/pidgin/pidgin-2.14.8-r1.ebuild
+++ /dev/null
@@ -1,291 +0,0 @@
-# Copyright 1999-2022 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 v4l +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
- dbus? (
- >=dev-libs/dbus-glib-0.71
- >=sys-apps/dbus-0.90
- $(python_gen_cond_dep '
- dev-python/dbus-python[${PYTHON_USEDEP}]
- ')
- )
- gadu? ( >=net-libs/libgadu-1.11.0 )
- gnutls? ( net-libs/gnutls:= )
- !gnutls? (
- dev-libs/nspr
- dev-libs/nss
- )
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- >=net-libs/farstream-0.2.7:0.2
- )
- 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 )
- )
- idn? ( net-dns/libidn:= )
- meanwhile? ( net-libs/meanwhile )
- ncurses? (
- >=dev-libs/libgnt-$(ver_cut 1-2)
- sys-libs/ncurses:=[unicode(+)]
- dbus? ( ${PYTHON_DEPS} )
- python? ( ${PYTHON_DEPS} )
- )
- networkmanager? ( net-misc/networkmanager )
- perl? ( >=dev-lang/perl-5.16:= )
- sasl? ( dev-libs/cyrus-sasl:2 )
- tcl? ( dev-lang/tcl:0= )
- tk? ( dev-lang/tk:0= )
- v4l? ( media-plugins/gst-plugins-v4l2 )
- zeroconf? ( net-dns/avahi[dbus] )
-"
-
-# 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} )
- v4l? ( gstreamer )
-"
-
-# 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}/${P}-libpurple_test_fix.patch" #819774
-)
-
-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 dbus)
- $(use_enable debug)
- $(use_enable doc doxygen)
- $(use_enable gstreamer)
- $(use_enable gtk gtkui)
- $(use_enable gtk sm)
- $(use_enable idn)
- $(use_enable meanwhile)
- $(use_enable networkmanager nm)
- $(use_enable ncurses consoleui)
- $(use_enable perl)
- $(use_enable sasl cyrus-sasl )
- $(use_enable tk)
- $(use_enable tcl)
- $(use_enable v4l farstream)
- $(use_enable v4l gstreamer-video)
- $(use_enable v4l vv)
- $(use_enable zeroconf avahi)
- $(use_with gstreamer gstreamer 1.0)
- $(usex gtk '--enable-nls' "$(use_enable nls)")
- $(use gtk && use_enable eds gevolution)
- $(use gtk && use_enable prediction cap)
- $(use gtk && use_enable spell gtkspell)
- $(use gtk && use_enable xscreensaver screensaver)
- )
-
- if use gnutls ; then
- einfo "Disabling NSS, using GnuTLS"
- myconf+=(
- --enable-gnutls=yes
- --enable-nss=no
- --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 we no longer use gnome2.eclass
- 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.9.ebuild
b/net-im/pidgin/pidgin-2.14.9.ebuild
index 300091b9b0fb..8b7a3577b542 100644
--- a/net-im/pidgin/pidgin-2.14.9.ebuild
+++ b/net-im/pidgin/pidgin-2.14.9.ebuild
@@ -6,7 +6,7 @@ EAPI=8
GENTOO_DEPEND_ON_PERL=no
PYTHON_COMPAT=( python3_{8..10} )
-inherit autotools gnome2-utils flag-o-matic toolchain-funcs multilib
perl-module python-single-r1 xdg
+inherit autotools gnome2-utils flag-o-matic perl-module python-single-r1 xdg
DESCRIPTION="GTK Instant Messenger client"
HOMEPAGE="https://pidgin.im/";
@@ -158,7 +158,6 @@ pkg_setup() {
if use python || use dbus ; then
python-single-r1_pkg_setup
fi
-
}
src_prepare() {
