* [gentoo-commits] repo/gentoo:master commit in: net-im/pidgin/, net-im/pidgin/files/
@ 2018-12-26 12:58 Sergei Trofimovich
0 siblings, 0 replies; 9+ messages in thread
From: Sergei Trofimovich @ 2018-12-26 12:58 UTC (permalink / raw
To: gentoo-commits
commit: 77c3d4af06b35ec6410ad51d07d3c2218906e9b2
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 26 12:57:40 2018 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Wed Dec 26 12:57:40 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77c3d4af
net-im/pidgin: disable single faulty jid test case, bug #593338
Testcase fails on all platform for a few years.
It's not a stable blocker. Let's disable it downstream
until it's fixed upstream.
Bug: https://bugs.gentoo.org/666858
Bug: https://bugs.gentoo.org/593338
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
.../files/pidgin-2.13.0-disable-one-jid-test.patch | 24 ++++++++++++++++++++++
net-im/pidgin/pidgin-2.13.0.ebuild | 4 +++-
2 files changed, 27 insertions(+), 1 deletion(-)
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
new file mode 100644
index 00000000000..cf3a6de7bfb
--- /dev/null
+++ b/net-im/pidgin/files/pidgin-2.13.0-disable-one-jid-test.patch
@@ -0,0 +1,24 @@
+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/pidgin-2.13.0.ebuild b/net-im/pidgin/pidgin-2.13.0.ebuild
index 5a4e20069c8..68fc76b0cb0 100644
--- a/net-im/pidgin/pidgin-2.13.0.ebuild
+++ b/net-im/pidgin/pidgin-2.13.0.ebuild
@@ -144,6 +144,7 @@ PATCHES=(
"${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
)
pkg_setup() {
@@ -263,7 +264,8 @@ src_install() {
}
src_test() {
- emake check
+ # make default build logs slightly more useful
+ emake check VERBOSE=1
}
pkg_preinst() { gnome2_icon_savelist; }
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-im/pidgin/, net-im/pidgin/files/
@ 2020-03-13 20:25 Lars Wendler
0 siblings, 0 replies; 9+ messages in thread
From: Lars Wendler @ 2020-03-13 20:25 UTC (permalink / raw
To: gentoo-commits
commit: 2dd6c1852251b5b67c3045badf173be9535b97a9
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 13 20:01:59 2020 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri Mar 13 20:25:53 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2dd6c185
net-im/pidgin: Revbump to fix build with latest networkmanager
Also install appdata file into /usr/share/metainfo
Thanks-to: Joonas Niilola <juippis <AT> gentoo.org>
Package-Manager: Portage-2.3.93, Repoman-2.3.20
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
.../pidgin-2.13.0-fix-build-against-nm-1.0.patch | 54 ++++
net-im/pidgin/files/pidgin-2.13.0-metainfo.patch | 11 +
net-im/pidgin/pidgin-2.13.0-r8.ebuild | 281 +++++++++++++++++++++
3 files changed, 346 insertions(+)
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 00000000000..d9d27930439
--- /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 00000000000..34d1dc16044
--- /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-r8.ebuild b/net-im/pidgin/pidgin-2.13.0-r8.ebuild
new file mode 100644
index 00000000000..c29e0e69673
--- /dev/null
+++ b/net-im/pidgin/pidgin-2.13.0-r8.ebuild
@@ -0,0 +1,281 @@
+# 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,8} )
+
+inherit autotools flag-o-matic toolchain-funcs multilib perl-module python-single-r1 xdg
+
+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="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() {
+ 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
+}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-im/pidgin/, net-im/pidgin/files/
@ 2020-06-10 7:57 Lars Wendler
0 siblings, 0 replies; 9+ messages in thread
From: Lars Wendler @ 2020-06-10 7:57 UTC (permalink / raw
To: gentoo-commits
commit: 392479918e965852bff3bcd7766f52907ecb4cfd
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 10 07:43:05 2020 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Wed Jun 10 07:57:07 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39247991
net-im/pidgin: Bump to version 2.14.0
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
net-im/pidgin/Manifest | 1 +
net-im/pidgin/files/pidgin-2.14.0-gold.patch | 11 +
net-im/pidgin/pidgin-2.14.0.ebuild | 297 +++++++++++++++++++++++++++
3 files changed, 309 insertions(+)
diff --git a/net-im/pidgin/Manifest b/net-im/pidgin/Manifest
index 1793616a9ac..89e81170fbc 100644
--- a/net-im/pidgin/Manifest
+++ b/net-im/pidgin/Manifest
@@ -1,3 +1,4 @@
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-2.14.0.tar.bz2 8852009 BLAKE2B 36b0def5bcd004f85b7ab1dea633c04f1bd679084016540c473d07ec99c60155315bed7aad89ec7d9fb22e7b80029a559c2698816ee78b8a1b1f4dcc20a12e18 SHA512 39da85f7b446f60e8475cd4256b8a0f5681503082087206b887e06f8bb39fb2b56865a564493b67539e04cb90dc2c5da26570469909a692cbb5e7c41f8f497cf
DIST pidgin-eds-3.6.patch.bz2 2352 BLAKE2B 1d69dc55f43b9efe5d5278a017642702d67a297fe2587467ec0fdca7f9888e26640efe9ac2a18f77ae9c523bf125a2cec6d0bf621f0b2b16f55d30df1bf470df SHA512 a0195679ab55ed9c7ea18ace6dbf0fc994698f1f4eea9d8335dfdcdcd6a68975c0191bd22f150bf5a9a0a691ce7e9e73d79598e1e8be541efa1d9824a633d877
diff --git a/net-im/pidgin/files/pidgin-2.14.0-gold.patch b/net-im/pidgin/files/pidgin-2.14.0-gold.patch
new file mode 100644
index 00000000000..718b3099581
--- /dev/null
+++ b/net-im/pidgin/files/pidgin-2.14.0-gold.patch
@@ -0,0 +1,11 @@
+--- 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/pidgin-2.14.0.ebuild b/net-im/pidgin/pidgin-2.14.0.ebuild
new file mode 100644
index 00000000000..36ffb95f5d0
--- /dev/null
+++ b/net-im/pidgin/pidgin-2.14.0.ebuild
@@ -0,0 +1,297 @@
+# 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.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"
+)
+
+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
+}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-im/pidgin/, net-im/pidgin/files/
@ 2020-09-09 15:17 Lars Wendler
0 siblings, 0 replies; 9+ messages in thread
From: Lars Wendler @ 2020-09-09 15:17 UTC (permalink / raw
To: gentoo-commits
commit: b4a5d59dcba12a0a628269689b0e61dd9de2d319
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 9 14:04:37 2020 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Wed Sep 9 15:17:48 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4a5d59d
net-im/pidgin: Removed old
Package-Manager: Portage-3.0.6, Repoman-3.0.1
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
net-im/pidgin/Manifest | 1 -
net-im/pidgin/files/pidgin-2.10.0-gold.patch | 30 ---
.../pidgin-2.13.0-fix-build-against-nm-1.0.patch | 54 ----
.../files/pidgin-2.13.0-gnutls_sni_support.patch | 33 ---
.../files/pidgin-2.13.0-python3_support.patch | 37 ---
net-im/pidgin/pidgin-2.13.0-r7.ebuild | 281 -------------------
net-im/pidgin/pidgin-2.13.0-r8.ebuild | 300 ---------------------
7 files changed, 736 deletions(-)
diff --git a/net-im/pidgin/Manifest b/net-im/pidgin/Manifest
index 19285a4611f..d5ad48d94d0 100644
--- a/net-im/pidgin/Manifest
+++ b/net-im/pidgin/Manifest
@@ -1,4 +1,3 @@
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-2.14.1.tar.bz2 8849275 BLAKE2B 27cd58a79f36c0176147c2e5bac7c4c18ec74c446c556e2326465c3607a95c3a58c1bdbbf9b4fb9741783ae982a6ce8fe0556ccff5b1608c9bba98626560412c SHA512 6ce5c58f32fa680d7f67e37a42b0f77c8253018cee21df2895d52166d9eb6ecaf0458b1610adbd46f337d00e75933db7578c2f9808654bd22838ba5db0a13030
DIST pidgin-eds-3.6.patch.bz2 2352 BLAKE2B 1d69dc55f43b9efe5d5278a017642702d67a297fe2587467ec0fdca7f9888e26640efe9ac2a18f77ae9c523bf125a2cec6d0bf621f0b2b16f55d30df1bf470df SHA512 a0195679ab55ed9c7ea18ace6dbf0fc994698f1f4eea9d8335dfdcdcd6a68975c0191bd22f150bf5a9a0a691ce7e9e73d79598e1e8be541efa1d9824a633d877
diff --git a/net-im/pidgin/files/pidgin-2.10.0-gold.patch b/net-im/pidgin/files/pidgin-2.10.0-gold.patch
deleted file mode 100644
index 819bfdc5c6b..00000000000
--- a/net-im/pidgin/files/pidgin-2.10.0-gold.patch
+++ /dev/null
@@ -1,30 +0,0 @@
- pidgin/Makefile.am | 2 +-
- pidgin/Makefile.in | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/pidgin/Makefile.am b/pidgin/Makefile.am
-index b6a5bd4..96d207d 100644
---- a/pidgin/Makefile.am
-+++ b/pidgin/Makefile.am
-@@ -158,7 +158,7 @@ pidgin_LDADD = \
- $(GTKSPELL_LIBS) \
- $(LIBXML_LIBS) \
- $(GTK_LIBS) \
-- $(top_builddir)/libpurple/libpurple.la
-+ $(top_builddir)/libpurple/libpurple.la -lm
-
- if USE_INTERNAL_LIBGADU
- INTGG_CFLAGS = -DUSE_INTERNAL_LIBGADU
-diff --git a/pidgin/Makefile.in b/pidgin/Makefile.in
-index 615c196..0293e5c 100644
---- a/pidgin/Makefile.in
-+++ b/pidgin/Makefile.in
-@@ -607,7 +607,7 @@ EXTRA_DIST = \
- @ENABLE_GTK_TRUE@ $(GTKSPELL_LIBS) \
- @ENABLE_GTK_TRUE@ $(LIBXML_LIBS) \
- @ENABLE_GTK_TRUE@ $(GTK_LIBS) \
--@ENABLE_GTK_TRUE@ $(top_builddir)/libpurple/libpurple.la
-+@ENABLE_GTK_TRUE@ $(top_builddir)/libpurple/libpurple.la -lm
-
- @ENABLE_GTK_TRUE@@USE_INTERNAL_LIBGADU_TRUE@INTGG_CFLAGS = -DUSE_INTERNAL_LIBGADU
- @ENABLE_GTK_TRUE@AM_CPPFLAGS = \
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
deleted file mode 100644
index d9d27930439..00000000000
--- a/net-im/pidgin/files/pidgin-2.13.0-fix-build-against-nm-1.0.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-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-gnutls_sni_support.patch b/net-im/pidgin/files/pidgin-2.13.0-gnutls_sni_support.patch
deleted file mode 100644
index df6b8e5cd03..00000000000
--- a/net-im/pidgin/files/pidgin-2.13.0-gnutls_sni_support.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-# HG changeset patch
-# User Mihai Moldovan <ionic@ionic.de>
-# Date 1576498301 -3600
-# Branch release-2.x.y
-# Node ID 6dba8046e1b120c506e1d911c6aa8757d7774c57
-# Parent 7a975763d3b64bdd8dd5371d711a4add647ed726
-Implement SNI support for the gnutls SSL plugin.
-
-Note that gnutls is picky in regard to what it accepts as the server name - it
-MUST be a domain name. IP addresses are not supported according to the
-documentation.
-
-Hence, filter out IP addresses and hope that whatever is not recognized as
-such an address is actually a domain name. This will probably fail for more
-exotic addresses (especially in IPv6 realm), but wiring up a full-blown parser
-is too much effort and SSL plugins are not part of purple-3 anyway.
-
-Fixes #17300
-
-diff --git a/libpurple/plugins/ssl/ssl-gnutls.c b/libpurple/plugins/ssl/ssl-gnutls.c
---- a/libpurple/plugins/ssl/ssl-gnutls.c
-+++ b/libpurple/plugins/ssl/ssl-gnutls.c
-@@ -403,6 +403,10 @@
-
- gnutls_transport_set_ptr(gnutls_data->session, GINT_TO_POINTER(gsc->fd));
-
-+ /* SNI support. */
-+ if (gsc->host && !g_hostname_is_ip_address(gsc->host))
-+ gnutls_server_name_set(gnutls_data->session, GNUTLS_NAME_DNS, gsc->host, strlen(gsc->host));
-+
- gnutls_data->handshake_handler = purple_input_add(gsc->fd,
- PURPLE_INPUT_READ, ssl_gnutls_handshake_cb, gsc);
-
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
deleted file mode 100644
index 19ece4a9a22..00000000000
--- a/net-im/pidgin/files/pidgin-2.13.0-python3_support.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-# 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-r7.ebuild b/net-im/pidgin/pidgin-2.13.0-r7.ebuild
deleted file mode 100644
index 4875939166f..00000000000
--- a/net-im/pidgin/pidgin-2.13.0-r7.ebuild
+++ /dev/null
@@ -1,281 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-GENTOO_DEPEND_ON_PERL=no
-PYTHON_COMPAT=( python3_{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 ~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
-
-# 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-1.19 )
- 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
- "${FILESDIR}/${PN}-2.13.0-gnutls_sni_support.patch" #708226
-)
-
-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 )
- 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_postinst() {
- xdg_icon_cache_update
- xdg_desktop_database_update
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
- xdg_desktop_database_update
-}
diff --git a/net-im/pidgin/pidgin-2.13.0-r8.ebuild b/net-im/pidgin/pidgin-2.13.0-r8.ebuild
deleted file mode 100644
index f3f3b6b1f4e..00000000000
--- a/net-im/pidgin/pidgin-2.13.0-r8.ebuild
+++ /dev/null
@@ -1,300 +0,0 @@
-# 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
-}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-im/pidgin/, net-im/pidgin/files/
@ 2021-10-15 18:33 Lars Wendler
0 siblings, 0 replies; 9+ messages in thread
From: Lars Wendler @ 2021-10-15 18:33 UTC (permalink / raw
To: gentoo-commits
commit: 6cc9c56c9d1caa4b23fdc4ebb380bcc840d44dbe
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 15 11:29:08 2021 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri Oct 15 18:33:11 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6cc9c56c
net-im/pidgin: Removed old
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
net-im/pidgin/Manifest | 1 -
net-im/pidgin/files/pidgin-2.10.11-tinfo.patch | 24 --
net-im/pidgin/pidgin-2.14.5-r1.ebuild | 289 -------------------------
3 files changed, 314 deletions(-)
diff --git a/net-im/pidgin/Manifest b/net-im/pidgin/Manifest
index b52ce6c805f..e3f6cfe153b 100644
--- a/net-im/pidgin/Manifest
+++ b/net-im/pidgin/Manifest
@@ -1,5 +1,4 @@
DIST pidgin-2.10.9-irc_join_sleep.patch 534 BLAKE2B 0215cebb93993e19e700e4d4974351ab5e9a00ea094775076d8f439569b34c0ec2faaed360965867df58bc42677516983ce11a2601dd322c1bdf2f288253a5b8 SHA512 8de0d6f05e48cd5a3e894576e06c7fb82e4bfc778cce8bb179fa22e2a05f5c2390a0e4c5b626ee4b910a18eab170d8f4be200f435ce408a86575af99e51e3bdf
-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-2.14.7.tar.bz2 8713379 BLAKE2B d48670c8b7419df67c6dddedf8eb15c0c4d61877386f65793b1423b659c6131d92eb58ae6cf63a31432426c8a09da0bdab0be8770517436bae51610a60886b59 SHA512 189b02b5500ca3560972cad9c84e94007e1c8cedd56d39214293412b31ee38bc2dbb33ab2f9320338bb226131f51cc8a1f6a4c66ba889a0f55d91edc15ac7465
DIST pidgin-2.14.8.tar.bz2 8683281 BLAKE2B 757ae81cc17db61bb5d434920f230d18c25639179c0584346b2bc6f34620d5ef499fd564ded5bfb649cf619700bbfd7eab6a222fdaf0324903bb92d81f77d182 SHA512 23975501b07d14829edab7b92628703962d7a8f90849b303e2a765ec6e47d1fcbdeff62539811e26682e300a2f94520193369844de3b1c0e87f99721ca0255e6
diff --git a/net-im/pidgin/files/pidgin-2.10.11-tinfo.patch b/net-im/pidgin/files/pidgin-2.10.11-tinfo.patch
deleted file mode 100644
index 370ac62a6e2..00000000000
--- a/net-im/pidgin/files/pidgin-2.10.11-tinfo.patch
+++ /dev/null
@@ -1,24 +0,0 @@
- configure.ac | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/configure.ac b/configure.ac
-index 51471b1..81c57ff 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -635,6 +635,8 @@ AC_ARG_WITH(ncurses-headers, [AC_HELP_STRING([--with-ncurses-headers=DIR],
- [compile finch against the ncurses includes in DIR])],
- [ac_ncurses_includes="$withval"], [ac_ncurses_includes=""])
- if test "x$enable_consoleui" = "xyes"; then
-+ PKG_CHECK_MODULES([GNT], [ncursesw panelw], [], [
-+ PKG_CHECK_MODULES([GNT], [ncurses panel], [], [
- AC_CHECK_LIB(ncursesw, initscr, [GNT_LIBS="-lncursesw"], [enable_consoleui=no])
- AC_CHECK_LIB(panelw, update_panels, [GNT_LIBS="$GNT_LIBS -lpanelw"],
- [enable_consoleui=no], [$GNT_LIBS])
-@@ -699,6 +701,7 @@ if test "x$enable_consoleui" = "xyes"; then
- fi
- fi
- fi
-+ ])])
- fi
-
- if test "x$force_finch" = "xyes" -a "x$enable_consoleui" != "xyes"; then
diff --git a/net-im/pidgin/pidgin-2.14.5-r1.ebuild b/net-im/pidgin/pidgin-2.14.5-r1.ebuild
deleted file mode 100644
index b3ff977ba24..00000000000
--- a/net-im/pidgin/pidgin-2.14.5-r1.ebuild
+++ /dev/null
@@ -1,289 +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 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.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
-)
-
-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
-
- 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
- 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
-}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-im/pidgin/, net-im/pidgin/files/
@ 2022-01-18 9:22 Lars Wendler
0 siblings, 0 replies; 9+ messages in thread
From: Lars Wendler @ 2022-01-18 9:22 UTC (permalink / raw
To: gentoo-commits
commit: ab140b6c50407b21f5ed3c91f41f4441c023bf09
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 18 09:21:59 2022 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Jan 18 09:22:24 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab140b6c
net-im/pidgin: Fixed test suite
Closes: https://bugs.gentoo.org/819774
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.ebuild | 3 +-
2 files changed, 54 insertions(+), 1 deletion(-)
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.8.ebuild b/net-im/pidgin/pidgin-2.14.8.ebuild
index 9fa6d8518eac..101ef0a63f4f 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
@@ -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() {
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-im/pidgin/, net-im/pidgin/files/
@ 2022-01-18 23:09 Lars Wendler
0 siblings, 0 replies; 9+ messages in thread
From: Lars Wendler @ 2022-01-18 23:09 UTC (permalink / raw
To: gentoo-commits
commit: b869ecc529a76935ceb270d4ed2b7401162ed99a
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 18 23:09:34 2022 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Jan 18 23:09:34 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b869ecc5
net-im/pidgin: Removed old
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
net-im/pidgin/Manifest | 2 -
.../files/pidgin-2.13.0-disable-one-jid-test.patch | 24 --
net-im/pidgin/pidgin-2.14.6-r1.ebuild | 288 ---------------------
net-im/pidgin/pidgin-2.14.7.ebuild | 287 --------------------
4 files changed, 601 deletions(-)
diff --git a/net-im/pidgin/Manifest b/net-im/pidgin/Manifest
index e3f6cfe153b4..ab2a3ce2a6e3 100644
--- a/net-im/pidgin/Manifest
+++ b/net-im/pidgin/Manifest
@@ -1,4 +1,2 @@
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
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/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
-}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-im/pidgin/, net-im/pidgin/files/
@ 2022-04-29 7:05 Lars Wendler
0 siblings, 0 replies; 9+ messages in thread
From: Lars Wendler @ 2022-04-29 7:05 UTC (permalink / raw
To: gentoo-commits
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() {
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-im/pidgin/, net-im/pidgin/files/
@ 2023-01-09 9:52 Sam James
0 siblings, 0 replies; 9+ messages in thread
From: Sam James @ 2023-01-09 9:52 UTC (permalink / raw
To: gentoo-commits
commit: 32cb1b90a7c0c79f060f2a2e6232450f3ebae8e6
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 9 09:51:35 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jan 9 09:52:06 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32cb1b90
net-im/pidgin: drop 2.14.8, 2.14.9
Bug: https://bugs.gentoo.org/841611
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-im/pidgin/Manifest | 2 -
.../files/pidgin-2.14.8-libpurple_test_fix.patch | 52 ----
net-im/pidgin/pidgin-2.14.8.ebuild | 288 --------------------
net-im/pidgin/pidgin-2.14.9.ebuild | 291 ---------------------
4 files changed, 633 deletions(-)
diff --git a/net-im/pidgin/Manifest b/net-im/pidgin/Manifest
index 52bc481c3d89..5b9e90d9d95f 100644
--- a/net-im/pidgin/Manifest
+++ b/net-im/pidgin/Manifest
@@ -1,4 +1,2 @@
DIST pidgin-2.10.9-irc_join_sleep.patch 534 BLAKE2B 0215cebb93993e19e700e4d4974351ab5e9a00ea094775076d8f439569b34c0ec2faaed360965867df58bc42677516983ce11a2601dd322c1bdf2f288253a5b8 SHA512 8de0d6f05e48cd5a3e894576e06c7fb82e4bfc778cce8bb179fa22e2a05f5c2390a0e4c5b626ee4b910a18eab170d8f4be200f435ce408a86575af99e51e3bdf
DIST pidgin-2.14.10.tar.bz2 8229328 BLAKE2B 9f004abda0f00b315e763e8b17e4e938b44b8a971d5411d775b9428363ab2ae071462d6d16654fcc09270123c434ef2d1f639d7f6d85c08a83b05c0ba4342c21 SHA512 53241e9f62170fe7a8ea27ac03176d442f8aad4ed16da0033164b0949b00c3d476539b182e761950e7d6c385f22a891524c5f40a9cf8fe543b3003c37693314d
-DIST pidgin-2.14.8.tar.bz2 8683281 BLAKE2B 757ae81cc17db61bb5d434920f230d18c25639179c0584346b2bc6f34620d5ef499fd564ded5bfb649cf619700bbfd7eab6a222fdaf0324903bb92d81f77d182 SHA512 23975501b07d14829edab7b92628703962d7a8f90849b303e2a765ec6e47d1fcbdeff62539811e26682e300a2f94520193369844de3b1c0e87f99721ca0255e6
-DIST pidgin-2.14.9.tar.bz2 8254729 BLAKE2B 3151e1ba21894f3c16ce615223e56e8ebff8f4098fe448b15752ed93e26d7895094fe584dfe0ebc6d8e4e0dba8a51ac57e90e2b7e286f4a840edcac2630df7c2 SHA512 fa610b49f77711df9ec76d886c836a80c5ea1563da4e861cbfcc7f7aba3130eeb5db7bb217e2aac571f9aea5d03da8b15c1aeec300468ab2ede6c409cce60d4f
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.ebuild b/net-im/pidgin/pidgin-2.14.8.ebuild
deleted file mode 100644
index dfdb2ffb0211..000000000000
--- a/net-im/pidgin/pidgin-2.14.8.ebuild
+++ /dev/null
@@ -1,288 +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 +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
-DEFAULT_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 && DEFAULT_PRPLS+=",gg"
- use groupwise && DEFAULT_PRPLS+=",novell"
- use meanwhile && DEFAULT_PRPLS+=",sametime"
- use zephyr && DEFAULT_PRPLS+=",zephyr"
- use zeroconf && DEFAULT_PRPLS+=",bonjour"
-
- local myconf=(
- --disable-mono
- --disable-static
- --with-dynamic-prpls="${DEFAULT_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.9.ebuild b/net-im/pidgin/pidgin-2.14.9.ebuild
deleted file mode 100644
index 5fa3ae3e271a..000000000000
--- a/net-im/pidgin/pidgin-2.14.9.ebuild
+++ /dev/null
@@ -1,291 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-GENTOO_DEPEND_ON_PERL=no
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit autotools gnome2-utils flag-o-matic 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
-DEFAULT_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_environment_reset
- default
- eautoreconf
-}
-
-src_configure() {
- # Stabilize things, for your own good
- strip-flags
- replace-flags -O? -O2
- use pie && append-cflags -fPIE -pie
-
- use gadu && DEFAULT_PRPLS+=",gg"
- use groupwise && DEFAULT_PRPLS+=",novell"
- use meanwhile && DEFAULT_PRPLS+=",sametime"
- use zephyr && DEFAULT_PRPLS+=",zephyr"
- use zeroconf && DEFAULT_PRPLS+=",bonjour"
-
- local myconf=(
- --disable-mono
- --disable-static
- --with-dynamic-prpls="${DEFAULT_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
-}
^ permalink raw reply related [flat|nested] 9+ messages in thread
end of thread, other threads:[~2023-01-09 9:52 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-12-26 12:58 [gentoo-commits] repo/gentoo:master commit in: net-im/pidgin/, net-im/pidgin/files/ Sergei Trofimovich
-- strict thread matches above, loose matches on Subject: below --
2020-03-13 20:25 Lars Wendler
2020-06-10 7:57 Lars Wendler
2020-09-09 15:17 Lars Wendler
2021-10-15 18:33 Lars Wendler
2022-01-18 9:22 Lars Wendler
2022-01-18 23:09 Lars Wendler
2022-04-29 7:05 Lars Wendler
2023-01-09 9:52 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox