[gentoo-commits] repo/gentoo:master commit in: net-im/bitlbee-facebook/, net-im/bitlbee-facebook/files/
commit: 4fe48c3b8deae35fa9ddce073bb58a31245da2ef Author: Petr Vaněk gentoo org> AuthorDate: Fri Aug 2 08:55:16 2024 + Commit: Petr Vaněk gentoo org> CommitDate: Fri Aug 2 09:12:40 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4fe48c3b net-im/bitlbee-facebook: fix make --shuffle problem Closes: https://bugs.gentoo.org/883263 Signed-off-by: Petr Vaněk gentoo.org> .../bitlbee-facebook-1.2.2-r1.ebuild | 4 +++ .../bitlbee-facebook-1.2.2-fix-make-deps.patch | 38 ++ 2 files changed, 42 insertions(+) diff --git a/net-im/bitlbee-facebook/bitlbee-facebook-1.2.2-r1.ebuild b/net-im/bitlbee-facebook/bitlbee-facebook-1.2.2-r1.ebuild index 7563f3db8c1c..b4093a7b8c5e 100644 --- a/net-im/bitlbee-facebook/bitlbee-facebook-1.2.2-r1.ebuild +++ b/net-im/bitlbee-facebook/bitlbee-facebook-1.2.2-r1.ebuild @@ -28,6 +28,10 @@ BDEPEND=" dev-util/glib-utils virtual/pkgconfig" +PATCHES=( + "${FILESDIR}/${P}-fix-make-deps.patch" +) + src_prepare() { default eautoreconf diff --git a/net-im/bitlbee-facebook/files/bitlbee-facebook-1.2.2-fix-make-deps.patch b/net-im/bitlbee-facebook/files/bitlbee-facebook-1.2.2-fix-make-deps.patch new file mode 100644 index ..458302a06ab8 --- /dev/null +++ b/net-im/bitlbee-facebook/files/bitlbee-facebook-1.2.2-fix-make-deps.patch @@ -0,0 +1,38 @@ +From b63e0697ee6809e7460ebc4918c72fb99b256bba Mon Sep 17 00:00:00 2001 +From: Sergei Trofimovich +Date: Sun, 27 Nov 2022 17:15:37 + +Subject: [PATCH] facebook/Makefile.am: add generated files to BUILT_SOURCES + +Without the change there is no giarantee that facebook-marshal.h +gets built before it's dependencies. On `make-4.4` `--shuffle` is +able to catch missing dependency as: + +$ make --shuffle + CC facebook_la-facebook-mqtt.lo +facebook-mqtt.c:23:10: fatal error: facebook-marshal.h: No such file or directory + 23 | #include "facebook-marshal.h" + | ^~~~ + +Automake's BUILT_SOURCES builds all sources before first object file. +The change pulls it there. + +Before the change 1-2 builds triggered `make --shuffle` failure. +After the change 20 sequential rebuilds succeeded without failures. + +Upstream-PR: https://github.com/bitlbee/bitlbee-facebook/pull/217 + +diff --git a/facebook/Makefile.am b/facebook/Makefile.am +index 779abbe..f28bf4e 100644 +--- a/facebook/Makefile.am b/facebook/Makefile.am +@@ -38,6 +38,10 @@ facebook_la_LDFLAGS += -module -avoid-version + EXTRA_DIST = \ + marshaller.list + ++BUILT_SOURCES = \ ++ facebook-marshal.c \ ++ facebook-marshal.h ++ + CLEANFILES = \ + facebook-marshal.c \ + facebook-marshal.h
[gentoo-commits] repo/gentoo:master commit in: net-im/bitlbee-facebook/
commit: a389c9caf6a96ab0ccfff98c0dc1441d5623a4e8 Author: Filip Kobierski pm me> AuthorDate: Thu Aug 1 18:01:58 2024 + Commit: Petr Vaněk gentoo org> CommitDate: Fri Aug 2 09:12:35 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a389c9ca net-im/bitlbee-facebook: bump EAPI, fix pkgcheck issues Signed-off-by: Filip Kobierski pm.me> Closes: https://github.com/gentoo/gentoo/pull/37868 Signed-off-by: Petr Vaněk gentoo.org> ...-facebook-.ebuild => bitlbee-facebook-1.2.2-r1.ebuild} | 11 +-- net-im/bitlbee-facebook/bitlbee-facebook-.ebuild | 11 +-- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/net-im/bitlbee-facebook/bitlbee-facebook-.ebuild b/net-im/bitlbee-facebook/bitlbee-facebook-1.2.2-r1.ebuild similarity index 93% copy from net-im/bitlbee-facebook/bitlbee-facebook-.ebuild copy to net-im/bitlbee-facebook/bitlbee-facebook-1.2.2-r1.ebuild index f7a43704ab51..7563f3db8c1c 100644 --- a/net-im/bitlbee-facebook/bitlbee-facebook-.ebuild +++ b/net-im/bitlbee-facebook/bitlbee-facebook-1.2.2-r1.ebuild @@ -1,17 +1,13 @@ -# Copyright 2017-2019 Gentoo Authors +# Copyright 2017-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit autotools DESCRIPTION="Facebook protocol plugin for BitlBee" HOMEPAGE="https://github.com/bitlbee/bitlbee-facebook; -LICENSE="GPL-2" -SLOT="0" -IUSE="" - if [[ ${PV} == * ]] ; then inherit git-r3 EGIT_REPO_URI="https://github.com/bitlbee/bitlbee-facebook; @@ -20,6 +16,9 @@ else KEYWORDS="~amd64 ~x86" fi +LICENSE="GPL-2" +SLOT="0" + RDEPEND=" dev-libs/glib:2 dev-libs/json-glib diff --git a/net-im/bitlbee-facebook/bitlbee-facebook-.ebuild b/net-im/bitlbee-facebook/bitlbee-facebook-.ebuild index f7a43704ab51..7563f3db8c1c 100644 --- a/net-im/bitlbee-facebook/bitlbee-facebook-.ebuild +++ b/net-im/bitlbee-facebook/bitlbee-facebook-.ebuild @@ -1,17 +1,13 @@ -# Copyright 2017-2019 Gentoo Authors +# Copyright 2017-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit autotools DESCRIPTION="Facebook protocol plugin for BitlBee" HOMEPAGE="https://github.com/bitlbee/bitlbee-facebook; -LICENSE="GPL-2" -SLOT="0" -IUSE="" - if [[ ${PV} == * ]] ; then inherit git-r3 EGIT_REPO_URI="https://github.com/bitlbee/bitlbee-facebook; @@ -20,6 +16,9 @@ else KEYWORDS="~amd64 ~x86" fi +LICENSE="GPL-2" +SLOT="0" + RDEPEND=" dev-libs/glib:2 dev-libs/json-glib
[gentoo-commits] repo/gentoo:master commit in: net-im/bitlbee/, net-im/bitlbee/files/
commit: 8efebc002a1d5694b8387ad21e0081a6f0341b56 Author: Petr Vaněk gentoo org> AuthorDate: Tue Feb 20 08:39:40 2024 + Commit: Petr Vaněk gentoo org> CommitDate: Tue Feb 20 09:08:08 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8efebc00 net-im/bitlbee: drop 3.6-r2 Signed-off-by: Petr Vaněk gentoo.org> net-im/bitlbee/bitlbee-3.6-r2.ebuild | 154 - .../files/bitlbee-3.6-strict-aliasing.patch| 31 - 2 files changed, 185 deletions(-) diff --git a/net-im/bitlbee/bitlbee-3.6-r2.ebuild b/net-im/bitlbee/bitlbee-3.6-r2.ebuild deleted file mode 100644 index 6b55ced61ee1.. --- a/net-im/bitlbee/bitlbee-3.6-r2.ebuild +++ /dev/null @@ -1,154 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{9..11} ) - -inherit python-any-r1 systemd toolchain-funcs - -if [[ ${PV} == "" ]]; then - EGIT_REPO_URI="https://github.com/bitlbee/bitlbee.git; - inherit git-r3 -else - SRC_URI="https://get.bitlbee.org/src/${P}.tar.gz; - KEYWORDS="amd64 ~arm64 ppc ~ppc64 x86" -fi - -DESCRIPTION="irc to IM gateway that support multiple IM protocols" -HOMEPAGE="https://www.bitlbee.org/; - -LICENSE="GPL-2 BSD-2" -SLOT="0" -IUSE_PROTOCOLS="purple twitter +xmpp" -IUSE="debug +gnutls ipv6 libevent nss otr +plugins selinux test xinetd - ${IUSE_PROTOCOLS}" -RESTRICT="!test? ( test )" - -REQUIRED_USE=" - || ( purple xmpp ) - purple? ( plugins ) - test? ( xmpp ) -" - -COMMON_DEPEND=" - acct-group/bitlbee - acct-user/bitlbee - dev-libs/glib:2 - purple? ( net-im/pidgin ) - libevent? ( dev-libs/libevent:= ) - otr? ( >=net-libs/libotr-4 ) - gnutls? ( net-libs/gnutls:= ) - !gnutls? ( - nss? ( dev-libs/nss ) - !nss? ( - dev-libs/openssl:0= - ) - ) -" -DEPEND="${COMMON_DEPEND} - selinux? ( sec-policy/selinux-bitlbee ) - test? ( dev-libs/check ) -" - -RDEPEND="${COMMON_DEPEND} - xinetd? ( sys-apps/xinetd ) -" - -BDEPEND="${PYTHON_DEPS} - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}"/${PN}-3.5-systemd-user.patch - "${FILESDIR}"/${PN}-3.5-libcheck.patch - "${FILESDIR}"/${PN}-3.5-libevent.patch - "${FILESDIR}"/${P}-disabled-plugins-use.patch - "${FILESDIR}"/${P}-strict-aliasing.patch -) - -src_configure() { - local myconf - - # setup plugins, protocol, ipv6 and debug - myconf+=( --jabber=$(usex xmpp 1 0) ) - for flag in debug ipv6 plugins ${IUSE_PROTOCOLS/+xmpp/} ; do - myconf+=( --${flag}=$(usex ${flag} 1 0) ) - done - - # set otr - if use otr && use plugins ; then - myconf+=( --otr=plugin ) - else - if use otr ; then - ewarn "OTR support has been disabled automatically because it" - ewarn "requires the plugins USE flag." - fi - myconf+=( --otr=0 ) - fi - - # setup ssl use flags - if use gnutls ; then - myconf+=( --ssl=gnutls ) - einfo "Using gnutls for SSL support" - else - ewarn "Only gnutls is officially supported by upstream." - if use nss ; then - myconf+=( --ssl=nss ) - einfo "Using nss for SSL support" - else - myconf+=( --ssl=openssl ) - einfo "Using openssl for SSL support" - fi - fi - - # set event handler - if use libevent ; then - myconf+=( --events=libevent ) - else - myconf+=( --events=glib ) - fi - - # not autotools-based - ./configure \ - --prefix=/usr \ - --datadir=/usr/share/bitlbee \ - --etcdir=/etc/bitlbee \ - --libdir=/usr/$(get_libdir) \ - --plugindir=/usr/$(get_libdir)/bitlbee \ - --pcdir=/usr/$(get_libdir)/pkgconfig \ - --systemdsystemunitdir=$(systemd_get_systemunitdir) \ - --doc=1 \ - --strip=0 \ - --verbose=1 \ - "${myconf[@]}" || die - - sed -i \ - -e "/^EFLAGS/s:=:&${LDFLAGS} :" \ - Makefile.settings || die -} - -src_compile() { - emake CC="$(tc-getCC)" LD="$(tc-getLD)" -} - -src_install() { - emake DESTDIR="${D}" install install-etc install-doc install-dev install-systemd - - keepdir /var/lib/bitlbee - fperms 700 /var/lib/bitlbee - fowners bitlbee:bitlbee /var/lib/bitlbee - - dodoc doc/{AUTHORS,CHANGES,CREDITS,FAQ,README} - - if use xinetd ; then - insinto /etc/xinetd.d - newins doc/bitlbee.xinetd bitlbee - fi - -
[gentoo-commits] repo/gentoo:master commit in: net-im/bitlbee/
commit: e759f099516467215ebd28189ef7ef6a1b45adbb Author: Petr Vaněk gentoo org> AuthorDate: Tue Feb 20 07:35:01 2024 + Commit: Petr Vaněk gentoo org> CommitDate: Tue Feb 20 09:08:07 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e759f099 net-im/bitlbee: sync live Signed-off-by: Petr Vaněk gentoo.org> net-im/bitlbee/bitlbee-.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net-im/bitlbee/bitlbee-.ebuild b/net-im/bitlbee/bitlbee-.ebuild index 8931b9d5feda..8fe3918c4465 100644 --- a/net-im/bitlbee/bitlbee-.ebuild +++ b/net-im/bitlbee/bitlbee-.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit python-any-r1 systemd toolchain-funcs
[gentoo-commits] repo/gentoo:master commit in: net-im/bitlbee/
commit: 302560d4f7f96f3bc97e6dce9918597325780616 Author: Petr Vaněk gentoo org> AuthorDate: Tue Feb 20 07:31:42 2024 + Commit: Petr Vaněk gentoo org> CommitDate: Tue Feb 20 09:08:06 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=302560d4 net-im/bitlbee: enable py3.12 Signed-off-by: Petr Vaněk gentoo.org> net-im/bitlbee/bitlbee-3.6-r3.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net-im/bitlbee/bitlbee-3.6-r3.ebuild b/net-im/bitlbee/bitlbee-3.6-r3.ebuild index c59af899cace..5978987e6e22 100644 --- a/net-im/bitlbee/bitlbee-3.6-r3.ebuild +++ b/net-im/bitlbee/bitlbee-3.6-r3.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit python-any-r1 systemd toolchain-funcs
[gentoo-commits] repo/gentoo:master commit in: net-im/bitlbee-steam/
commit: a1510ac56e4267752bba72dabfdf13d9ee8d6f0f Author: Michael Mair-Keimberger levelnine at> AuthorDate: Tue Jul 11 14:58:29 2023 + Commit: Conrad Kostecki gentoo org> CommitDate: Wed Jul 12 18:38:48 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1510ac5 net-im/bitlbee-steam: EAPI8 bump Signed-off-by: Michael Mair-Keimberger levelnine.at> Closes: https://github.com/gentoo/gentoo/pull/31839 Signed-off-by: Conrad Kostecki gentoo.org> net-im/bitlbee-steam/bitlbee-steam-1.4.2.ebuild | 8 net-im/bitlbee-steam/bitlbee-steam-.ebuild | 8 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/net-im/bitlbee-steam/bitlbee-steam-1.4.2.ebuild b/net-im/bitlbee-steam/bitlbee-steam-1.4.2.ebuild index 485f9d30d9b9..e49b0bf478ea 100644 --- a/net-im/bitlbee-steam/bitlbee-steam-1.4.2.ebuild +++ b/net-im/bitlbee-steam/bitlbee-steam-1.4.2.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit autotools @@ -23,8 +23,8 @@ RDEPEND=" dev-libs/glib:2 dev-libs/libgcrypt:0= >=net-im/bitlbee-3.4[plugins]" -DEPEND="${RDEPEND} - virtual/pkgconfig" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" src_prepare() { default diff --git a/net-im/bitlbee-steam/bitlbee-steam-.ebuild b/net-im/bitlbee-steam/bitlbee-steam-.ebuild index 485f9d30d9b9..e49b0bf478ea 100644 --- a/net-im/bitlbee-steam/bitlbee-steam-.ebuild +++ b/net-im/bitlbee-steam/bitlbee-steam-.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit autotools @@ -23,8 +23,8 @@ RDEPEND=" dev-libs/glib:2 dev-libs/libgcrypt:0= >=net-im/bitlbee-3.4[plugins]" -DEPEND="${RDEPEND} - virtual/pkgconfig" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" src_prepare() { default
[gentoo-commits] repo/gentoo:master commit in: net-im/bitlbee/
commit: 8cd7e7e8ae70da427ba192cc90f758a1cdfaa8d5 Author: Agostino Sarubbo gentoo org> AuthorDate: Fri Sep 30 15:24:43 2022 + Commit: Agostino Sarubbo gentoo org> CommitDate: Fri Sep 30 15:24:43 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8cd7e7e8 net-im/bitlbee: Stabilize 3.6-r3 x86, #873586 Signed-off-by: Agostino Sarubbo gentoo.org> net-im/bitlbee/bitlbee-3.6-r3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-im/bitlbee/bitlbee-3.6-r3.ebuild b/net-im/bitlbee/bitlbee-3.6-r3.ebuild index 2f194882480a..58a5879455b9 100644 --- a/net-im/bitlbee/bitlbee-3.6-r3.ebuild +++ b/net-im/bitlbee/bitlbee-3.6-r3.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} == "" ]]; then inherit git-r3 else SRC_URI="https://get.bitlbee.org/src/${P}.tar.gz; - KEYWORDS="amd64 ~arm64 ppc ~ppc64 ~x86" + KEYWORDS="amd64 ~arm64 ppc ~ppc64 x86" fi DESCRIPTION="irc to IM gateway that support multiple IM protocols"
[gentoo-commits] repo/gentoo:master commit in: net-im/bitlbee/
commit: cb5a091d3c5a2f5d66348e65af69453f9da74467 Author: Agostino Sarubbo gentoo org> AuthorDate: Fri Sep 30 15:23:21 2022 + Commit: Agostino Sarubbo gentoo org> CommitDate: Fri Sep 30 15:23:21 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb5a091d net-im/bitlbee: Stabilize 3.6-r3 ppc, #873586 Signed-off-by: Agostino Sarubbo gentoo.org> net-im/bitlbee/bitlbee-3.6-r3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-im/bitlbee/bitlbee-3.6-r3.ebuild b/net-im/bitlbee/bitlbee-3.6-r3.ebuild index 492ff81b9cc4..2f194882480a 100644 --- a/net-im/bitlbee/bitlbee-3.6-r3.ebuild +++ b/net-im/bitlbee/bitlbee-3.6-r3.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} == "" ]]; then inherit git-r3 else SRC_URI="https://get.bitlbee.org/src/${P}.tar.gz; - KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 ~x86" + KEYWORDS="amd64 ~arm64 ppc ~ppc64 ~x86" fi DESCRIPTION="irc to IM gateway that support multiple IM protocols"
[gentoo-commits] repo/gentoo:master commit in: net-im/bitlbee/
commit: cef66ed2794661fe91c14576cde22d4a0294c13c Author: Agostino Sarubbo gentoo org> AuthorDate: Fri Sep 30 15:21:58 2022 + Commit: Agostino Sarubbo gentoo org> CommitDate: Fri Sep 30 15:21:58 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cef66ed2 net-im/bitlbee: Stabilize 3.6-r3 amd64, #873586 Signed-off-by: Agostino Sarubbo gentoo.org> net-im/bitlbee/bitlbee-3.6-r3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-im/bitlbee/bitlbee-3.6-r3.ebuild b/net-im/bitlbee/bitlbee-3.6-r3.ebuild index 1d6fa8851f55..492ff81b9cc4 100644 --- a/net-im/bitlbee/bitlbee-3.6-r3.ebuild +++ b/net-im/bitlbee/bitlbee-3.6-r3.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} == "" ]]; then inherit git-r3 else SRC_URI="https://get.bitlbee.org/src/${P}.tar.gz; - KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86" + KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 ~x86" fi DESCRIPTION="irc to IM gateway that support multiple IM protocols"
[gentoo-commits] repo/gentoo:master commit in: net-im/bitlbee/
commit: d207998bcc4547d69b8b5035ae210661c921f0ea Author: Jakov Smolić gentoo org> AuthorDate: Tue Aug 30 08:47:10 2022 + Commit: Jakov Smolić gentoo org> CommitDate: Tue Aug 30 08:47:10 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d207998b net-im/bitlbee: Keyword 3.6-r3 x86, #866105 Signed-off-by: Jakov Smolić gentoo.org> net-im/bitlbee/bitlbee-3.6-r3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-im/bitlbee/bitlbee-3.6-r3.ebuild b/net-im/bitlbee/bitlbee-3.6-r3.ebuild index 52561db8c790..1d6fa8851f55 100644 --- a/net-im/bitlbee/bitlbee-3.6-r3.ebuild +++ b/net-im/bitlbee/bitlbee-3.6-r3.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} == "" ]]; then inherit git-r3 else SRC_URI="https://get.bitlbee.org/src/${P}.tar.gz; - KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64" + KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86" fi DESCRIPTION="irc to IM gateway that support multiple IM protocols"
[gentoo-commits] repo/gentoo:master commit in: net-im/bitlbee/files/, net-im/bitlbee/
commit: 54bb9f516d5608cbf3bb445af98fa8876ce938e9 Author: Petr Vaněk atlas cz> AuthorDate: Mon Aug 22 14:52:33 2022 + Commit: Sam James gentoo org> CommitDate: Tue Aug 23 04:51:19 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54bb9f51 net-im/bitlbee: remove system-json-parser patch from live This feature is now integrated in upstream. Signed-off-by: Petr Vaněk atlas.cz> Closes: https://github.com/gentoo/gentoo/pull/26925 Signed-off-by: Sam James gentoo.org> net-im/bitlbee/bitlbee-.ebuild | 3 +- .../files/bitlbee--system-json-parser.patch| 99 -- 2 files changed, 1 insertion(+), 101 deletions(-) diff --git a/net-im/bitlbee/bitlbee-.ebuild b/net-im/bitlbee/bitlbee-.ebuild index 8d4f88ddc3d1..079feaea767b 100644 --- a/net-im/bitlbee/bitlbee-.ebuild +++ b/net-im/bitlbee/bitlbee-.ebuild @@ -62,7 +62,6 @@ BDEPEND="${PYTHON_DEPS} PATCHES=( "${FILESDIR}/${PN}-3.5-systemd-user.patch" - "${FILESDIR}/${P}-system-json-parser.patch" ) src_configure() { @@ -115,7 +114,7 @@ src_configure() { --libdir=/usr/$(get_libdir) \ --pcdir=/usr/$(get_libdir)/pkgconfig \ --plugindir=/usr/$(get_libdir)/bitlbee \ - --externaljsonparser=1 \ + --external_json_parser=1 \ --systemdsystemunitdir=$(systemd_get_systemunitdir) \ --doc=1 \ --strip=0 \ diff --git a/net-im/bitlbee/files/bitlbee--system-json-parser.patch b/net-im/bitlbee/files/bitlbee--system-json-parser.patch deleted file mode 100644 index d0020307cfa3.. --- a/net-im/bitlbee/files/bitlbee--system-json-parser.patch +++ /dev/null @@ -1,99 +0,0 @@ -This is adapted patch from upstream PR 151. Original PR defines ---external-json-parser which breaks configuration, see [1]. It was changed to ---externaljsonparser and $external_json_parser to $externaljsonparser. -Additionally, LDFLAGS_CHECK variable was introduced in order to make -tests working, see [2] and #865667. - -[1] https://github.com/bitlbee/bitlbee/pull/151#issuecomment-1201181905 -[2] https://github.com/bitlbee/bitlbee/pull/151#issuecomment-1219254239 - -Upstream-PR: https://github.com/bitlbee/bitlbee/pull/151 - -diff --git a/configure b/configure -index 2291e9a4..3ba40933 100755 a/configure -+++ b/configure -@@ -47,6 +47,7 @@ plugins=1 - otr=0 - - events=glib -+externaljsonparser=auto - ssl=auto - - pam=0 -@@ -154,6 +155,7 @@ Option Description Default - --events=... Event handler (glib, libevent) $events - --ssl=... SSL library to use (gnutls, nss, openssl, auto) - $ssl -+--externaljsonparser=0/1/auto Use External JSON parser $externaljsonparser - - - --target=... Cross compilation targetsame as host -@@ -404,6 +406,21 @@ else - fi - echo 'EVENT_HANDLER=events_'$events'.o' >> Makefile.settings - -+if [ "$externaljsonparser" = "auto" ]; then -+ if pkg-config --exists json-parser; then -+ externaljsonparser=1 -+ else -+ externaljsonparser=0 -+ fi -+fi -+echo "EXTERNAL_JSON_PARSER=$externaljsonparser" >> Makefile.settings -+if [ "$externaljsonparser" = "1" ]; then -+echo "CFLAGS+=$(pkg-config --cflags json-parser)" >> Makefile.settings -+echo "LDFLAGS_BITLBEE+=$(pkg-config --libs json-parser)" >> Makefile.settings -+echo "LDFLAGS_CHECK+=$(pkg-config --libs json-parser)" >> Makefile.settings -+fi -+ -+ - detect_gnutls() - { - if $PKG_CONFIG --exists gnutls; then -@@ -993,6 +1010,12 @@ else - echo ' systemd disabled.' - fi - -+if [ "$externaljsonparser" = "1" ]; then -+echo ' Using system JSON parser.' -+else -+echo ' Using bundled JSON parser.' -+fi -+ - echo ' Using python: '$PYTHON - echo ' Using event handler: '$events - echo ' Using SSL library: '$ssl -diff --git a/lib/Makefile b/lib/Makefile -index fc46aedc..ad95d9cb 100644 a/lib/Makefile -+++ b/lib/Makefile -@@ -12,7 +12,11 @@ _SRCDIR_ := $(_SRCDIR_)lib/ - endif - - # [SH] Program variables --objects = arc.o base64.o canohost.o $(EVENT_HANDLER) ftutil.o http_client.o ini.o json.o json_util.o md5.o misc.o oauth.o oauth2.o proxy.o sha1.o $(SSL_CLIENT) url.o xmltree.o ns_parse.o -+objects = arc.o base64.o canohost.o $(EVENT_HANDLER) ftutil.o http_client.o ini.o json_util.o md5.o misc.o oauth.o oauth2.o proxy.o sha1.o $(SSL_CLIENT) url.o xmltree.o ns_parse.o -+ -+ifneq ($(EXTERNAL_JSON_PARSER),1) -+objects += json.o -+endif - - LFLAGS += -r - -diff --git a/tests/Makefile b/tests/Makefile -index 76122a2f..2235bf1d 100644 a/tests/Makefile -+++ b/tests/Makefile -@@ -20,7 +20,7 @@ test_objs = check.o check_util.o check_nick.o check_md5.o check_arc.o check_irc. - - check: $(test_objs) $(addprefix ../, $(main_objs)) ../protocols/protocols.o ../lib/lib.o -
[gentoo-commits] repo/gentoo:master commit in: net-im/bitlbee/
commit: 2b967f38394043d8cddb92b1008091dc2da64522 Author: Petr Vaněk atlas cz> AuthorDate: Thu Aug 18 14:29:08 2022 + Commit: Sam James gentoo org> CommitDate: Tue Aug 23 04:51:07 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b967f38 net-im/bitlbee: tests require xmpp enabled not plugins plugins use flag is not required for test to work but xmpp is, because of tests/check_jabber_* tests. The test? ( plugin ) requirement was wrongly introduced in commit eb108d8b5224 ("net-im/bitlbee: force plugins to be enabled for tests") as a solution for bug https://bugs.gentoo.org/617604 which was later reported again in bug https://bugs.gentoo.org/739510 and correctly fixed in commit 05dc33a126ab ("net-im/bitlbee: fix compilation with disabled plugins use"). Bug: https://bugs.gentoo.org/617604 Bug: https://bugs.gentoo.org/739510 Signed-off-by: Petr Vaněk atlas.cz> Signed-off-by: Sam James gentoo.org> net-im/bitlbee/bitlbee-3.6-r2.ebuild | 2 +- net-im/bitlbee/bitlbee-3.6-r3.ebuild | 2 +- net-im/bitlbee/bitlbee-.ebuild | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/net-im/bitlbee/bitlbee-3.6-r2.ebuild b/net-im/bitlbee/bitlbee-3.6-r2.ebuild index 983d5a872b1c..4c086510b8d5 100644 --- a/net-im/bitlbee/bitlbee-3.6-r2.ebuild +++ b/net-im/bitlbee/bitlbee-3.6-r2.ebuild @@ -28,7 +28,7 @@ RESTRICT="!test? ( test )" REQUIRED_USE=" || ( purple xmpp ) purple? ( plugins ) - test? ( plugins ) + test? ( xmpp ) xmpp? ( !nss ) " diff --git a/net-im/bitlbee/bitlbee-3.6-r3.ebuild b/net-im/bitlbee/bitlbee-3.6-r3.ebuild index dc1b934e114a..6e4406af9f57 100644 --- a/net-im/bitlbee/bitlbee-3.6-r3.ebuild +++ b/net-im/bitlbee/bitlbee-3.6-r3.ebuild @@ -28,7 +28,7 @@ RESTRICT="!test? ( test )" REQUIRED_USE=" || ( purple xmpp ) purple? ( plugins ) - test? ( plugins ) + test? ( xmpp ) xmpp? ( !nss ) " diff --git a/net-im/bitlbee/bitlbee-.ebuild b/net-im/bitlbee/bitlbee-.ebuild index c1ec4905594e..58c3144ff8d5 100644 --- a/net-im/bitlbee/bitlbee-.ebuild +++ b/net-im/bitlbee/bitlbee-.ebuild @@ -28,7 +28,7 @@ RESTRICT="!test? ( test )" REQUIRED_USE=" || ( purple xmpp ) purple? ( plugins ) - test? ( plugins ) + test? ( xmpp ) xmpp? ( !nss ) "
[gentoo-commits] repo/gentoo:master commit in: net-im/bitlbee/
commit: b2cdfd96e3450154b38fa6b7a62ef42f817c7f5d Author: Petr Vaněk atlas cz> AuthorDate: Fri Aug 19 10:54:33 2022 + Commit: Sam James gentoo org> CommitDate: Tue Aug 23 04:51:18 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2cdfd96 net-im/bitlbee: remove obsolete xmpp? ( !nss ) requirement This requirement was basically introduced with 1.2 release in commit [1] in order to solve https://bugs.gentoo.org/213958#c8 issue (the xmpp use flag was called jabber back then). The requirement was later transformed to REQUIRED_USE in commit [2]. However, this requirement seems no longer be valid. The nss use description in metadata was also bogus, it is changed to more generic form. [1] https://gitweb.gentoo.org/repo/gentoo/historical.git/commit/?id=30a0fafed3bd420fdb03e6e0a0da3d5f0a86b62e [2] https://gitweb.gentoo.org/repo/gentoo/historical.git/commit/?id=65aa90800da80b1fbffc36c7b15c3503c37d7fd0 Bug: https://bugs.gentoo.org/213958 Signed-off-by: Petr Vaněk atlas.cz> Signed-off-by: Sam James gentoo.org> net-im/bitlbee/bitlbee-3.6-r2.ebuild | 1 - net-im/bitlbee/bitlbee-3.6-r3.ebuild | 1 - net-im/bitlbee/bitlbee-.ebuild | 1 - net-im/bitlbee/metadata.xml | 2 +- 4 files changed, 1 insertion(+), 4 deletions(-) diff --git a/net-im/bitlbee/bitlbee-3.6-r2.ebuild b/net-im/bitlbee/bitlbee-3.6-r2.ebuild index 4c086510b8d5..26f201ce42fd 100644 --- a/net-im/bitlbee/bitlbee-3.6-r2.ebuild +++ b/net-im/bitlbee/bitlbee-3.6-r2.ebuild @@ -29,7 +29,6 @@ REQUIRED_USE=" || ( purple xmpp ) purple? ( plugins ) test? ( xmpp ) - xmpp? ( !nss ) " COMMON_DEPEND=" diff --git a/net-im/bitlbee/bitlbee-3.6-r3.ebuild b/net-im/bitlbee/bitlbee-3.6-r3.ebuild index 6e4406af9f57..01b8a33d3618 100644 --- a/net-im/bitlbee/bitlbee-3.6-r3.ebuild +++ b/net-im/bitlbee/bitlbee-3.6-r3.ebuild @@ -29,7 +29,6 @@ REQUIRED_USE=" || ( purple xmpp ) purple? ( plugins ) test? ( xmpp ) - xmpp? ( !nss ) " COMMON_DEPEND=" diff --git a/net-im/bitlbee/bitlbee-.ebuild b/net-im/bitlbee/bitlbee-.ebuild index 58c3144ff8d5..8d4f88ddc3d1 100644 --- a/net-im/bitlbee/bitlbee-.ebuild +++ b/net-im/bitlbee/bitlbee-.ebuild @@ -29,7 +29,6 @@ REQUIRED_USE=" || ( purple xmpp ) purple? ( plugins ) test? ( xmpp ) - xmpp? ( !nss ) " COMMON_DEPEND=" diff --git a/net-im/bitlbee/metadata.xml b/net-im/bitlbee/metadata.xml index 9dbb1759075c..0541d2f03527 100644 --- a/net-im/bitlbee/metadata.xml +++ b/net-im/bitlbee/metadata.xml @@ -11,7 +11,7 @@ Use libevent for event handling - Use NSS for SSL support in Jabber + Prefer dev-libs/nss as SSL/TLS provider Enable support for encrypted conversations Enable support for plugins Use libpurple instead of the built-in IM protocol support
[gentoo-commits] repo/gentoo:master commit in: net-im/bitlbee/files/
commit: 9234f9e1d6a7a7c9b4bd9f4fd11c33b1bd33bee1 Author: Petr Vaněk atlas cz> AuthorDate: Thu Aug 18 09:25:51 2022 + Commit: Sam James gentoo org> CommitDate: Tue Aug 23 04:50:22 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9234f9e1 net-im/bitlbee: fix tests in 3.6-r3 and live It was necessary to adapt system-json-parser patches more with LDFLAGS_CHECK variable which is used when ./tests/check binary is linked. Fixes: 90a3d5fff1c0 ("net-im/bitlbee: Use system json-parser") Fixes: 2f4aeedeec9c ("net-im/bitlbee: sync live") Closes: https://bugs.gentoo.org/865667 Signed-off-by: Petr Vaněk atlas.cz> Signed-off-by: Sam James gentoo.org> .../files/bitlbee-3.6-system-json-parser.patch | 23 --- .../files/bitlbee--system-json-parser.patch| 26 +- 2 files changed, 41 insertions(+), 8 deletions(-) diff --git a/net-im/bitlbee/files/bitlbee-3.6-system-json-parser.patch b/net-im/bitlbee/files/bitlbee-3.6-system-json-parser.patch index 02d57e02d6d2..0a9c197d763d 100644 --- a/net-im/bitlbee/files/bitlbee-3.6-system-json-parser.patch +++ b/net-im/bitlbee/files/bitlbee-3.6-system-json-parser.patch @@ -1,13 +1,16 @@ This is adapted patch from upstream PR 151. Original PR defines --external-json-parser which breaks configuration, see [1]. It was changed to --externaljsonparser and $external_json_parser to $externaljsonparser. +Additionally, LDFLAGS_CHECK variable was introduced in order to make +tests working, see [2] and #865667. [1] https://github.com/bitlbee/bitlbee/pull/151#issuecomment-1201181905 +[2] https://github.com/bitlbee/bitlbee/pull/151#issuecomment-1219254239 Upstream-PR: https://github.com/bitlbee/bitlbee/pull/151 diff --git a/configure b/configure -index 4640c806..77b1213b 100755 +index fd8d363a..39495515 100755 --- a/configure +++ b/configure @@ -47,6 +47,7 @@ plugins=1 @@ -26,7 +29,7 @@ index 4640c806..77b1213b 100755 --target=... Cross compilation targetsame as host -@@ -398,6 +400,20 @@ else +@@ -398,6 +400,21 @@ else fi echo 'EVENT_HANDLER=events_'$events'.o' >> Makefile.settings @@ -41,13 +44,14 @@ index 4640c806..77b1213b 100755 +if [ "$externaljsonparser" = "1" ]; then +echo "CFLAGS+=$(pkg-config --cflags json-parser)" >> Makefile.settings +echo "LDFLAGS_BITLBEE+=$(pkg-config --libs json-parser)" >> Makefile.settings ++echo "LDFLAGS_CHECK+=$(pkg-config --libs json-parser)" >> Makefile.settings +fi + + detect_gnutls() { if $PKG_CONFIG --exists gnutls; then -@@ -979,6 +995,12 @@ else +@@ -979,6 +996,12 @@ else echo ' systemd disabled.' fi @@ -77,6 +81,19 @@ index fc46aedc..ad95d9cb 100644 LFLAGS += -r +diff --git a/tests/Makefile b/tests/Makefile +index 76122a2f..2235bf1d 100644 +--- a/tests/Makefile b/tests/Makefile +@@ -20,7 +20,7 @@ test_objs = check.o check_util.o check_nick.o check_md5.o check_arc.o check_irc. + + check: $(test_objs) $(addprefix ../, $(main_objs)) ../protocols/protocols.o ../lib/lib.o + @echo '*' Linking $@ +- $(VERBOSE) $(CC) $(CFLAGS) -o $@ $^ $(LFLAGS) $(EFLAGS) ++ $(VERBOSE) $(CC) $(CFLAGS) -o $@ $^ $(LFLAGS) $(LDFLAGS_CHECK) $(EFLAGS) + + %.o: $(_SRCDIR_)%.c + @echo '*' Compiling $< -- 2.35.1 diff --git a/net-im/bitlbee/files/bitlbee--system-json-parser.patch b/net-im/bitlbee/files/bitlbee--system-json-parser.patch index 07f2878525ec..d0020307cfa3 100644 --- a/net-im/bitlbee/files/bitlbee--system-json-parser.patch +++ b/net-im/bitlbee/files/bitlbee--system-json-parser.patch @@ -1,13 +1,16 @@ This is adapted patch from upstream PR 151. Original PR defines --external-json-parser which breaks configuration, see [1]. It was changed to --externaljsonparser and $external_json_parser to $externaljsonparser. +Additionally, LDFLAGS_CHECK variable was introduced in order to make +tests working, see [2] and #865667. [1] https://github.com/bitlbee/bitlbee/pull/151#issuecomment-1201181905 +[2] https://github.com/bitlbee/bitlbee/pull/151#issuecomment-1219254239 Upstream-PR: https://github.com/bitlbee/bitlbee/pull/151 diff --git a/configure b/configure -index 4640c806..77b1213b 100755 +index 2291e9a4..3ba40933 100755 --- a/configure +++ b/configure @@ -47,6 +47,7 @@ plugins=1 @@ -18,7 +21,7 @@ index 4640c806..77b1213b 100755 ssl=auto pam=0 -@@ -148,6 +149,7 @@ Option Description Default +@@ -154,6 +155,7 @@ Option Description Default --events=... Event handler (glib, libevent) $events --ssl=... SSL library to use (gnutls, nss, openssl, auto) $ssl @@ -26,7 +29,7 @@ index 4640c806..77b1213b 100755 --target=... Cross compilation targetsame as host -@@ -398,6 +400,20 @@ else +@@ -404,6 +406,21 @@ else fi echo
[gentoo-commits] repo/gentoo:master commit in: net-im/bitlbee/
commit: 982bc21809ccdbcbe59692f89bd6b214b73ba0ad Author: Petr Vaněk atlas cz> AuthorDate: Fri Aug 19 07:23:31 2022 + Commit: Sam James gentoo org> CommitDate: Tue Aug 23 04:50:22 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=982bc218 net-im/bitlbee: drop msn and oscar use flags msn[1] and oscar[2] protocols were removed in version 3.6, therefore both use flags do nothing. [1] https://github.com/bitlbee/bitlbee/commit/7ec2ce8fd7d30a536823ef9e08a3dad80ce76d4e [2] https://github.com/bitlbee/bitlbee/commit/e5d2c5607310ef9669a051a1b93e019319495955 Signed-off-by: Petr Vaněk atlas.cz> Signed-off-by: Sam James gentoo.org> net-im/bitlbee/bitlbee-3.6-r2.ebuild | 4 ++-- net-im/bitlbee/bitlbee-3.6-r3.ebuild | 4 ++-- net-im/bitlbee/bitlbee-.ebuild | 4 ++-- net-im/bitlbee/metadata.xml | 7 ++- 4 files changed, 8 insertions(+), 11 deletions(-) diff --git a/net-im/bitlbee/bitlbee-3.6-r2.ebuild b/net-im/bitlbee/bitlbee-3.6-r2.ebuild index 127f0a88198d..983d5a872b1c 100644 --- a/net-im/bitlbee/bitlbee-3.6-r2.ebuild +++ b/net-im/bitlbee/bitlbee-3.6-r2.ebuild @@ -20,13 +20,13 @@ HOMEPAGE="https://www.bitlbee.org/; LICENSE="GPL-2 BSD-2" SLOT="0" -IUSE_PROTOCOLS="msn oscar purple twitter +xmpp" +IUSE_PROTOCOLS="purple twitter +xmpp" IUSE="debug +gnutls ipv6 libevent nss otr +plugins selinux test xinetd ${IUSE_PROTOCOLS}" RESTRICT="!test? ( test )" REQUIRED_USE=" - || ( purple xmpp msn oscar ) + || ( purple xmpp ) purple? ( plugins ) test? ( plugins ) xmpp? ( !nss ) diff --git a/net-im/bitlbee/bitlbee-3.6-r3.ebuild b/net-im/bitlbee/bitlbee-3.6-r3.ebuild index 72d2a7207ba2..dc1b934e114a 100644 --- a/net-im/bitlbee/bitlbee-3.6-r3.ebuild +++ b/net-im/bitlbee/bitlbee-3.6-r3.ebuild @@ -20,13 +20,13 @@ HOMEPAGE="https://www.bitlbee.org/; LICENSE="GPL-2" SLOT="0" -IUSE_PROTOCOLS="msn oscar purple twitter +xmpp" +IUSE_PROTOCOLS="purple twitter +xmpp" IUSE="debug +gnutls ipv6 libevent nss otr +plugins selinux test xinetd ${IUSE_PROTOCOLS}" RESTRICT="!test? ( test )" REQUIRED_USE=" - || ( purple xmpp msn oscar ) + || ( purple xmpp ) purple? ( plugins ) test? ( plugins ) xmpp? ( !nss ) diff --git a/net-im/bitlbee/bitlbee-.ebuild b/net-im/bitlbee/bitlbee-.ebuild index 0a8cc973ae18..c1ec4905594e 100644 --- a/net-im/bitlbee/bitlbee-.ebuild +++ b/net-im/bitlbee/bitlbee-.ebuild @@ -20,13 +20,13 @@ HOMEPAGE="https://www.bitlbee.org/; LICENSE="GPL-2" SLOT="0" -IUSE_PROTOCOLS="msn oscar purple twitter +xmpp" +IUSE_PROTOCOLS="purple twitter +xmpp" IUSE="debug +gnutls ipv6 libevent nss otr +plugins selinux test xinetd ${IUSE_PROTOCOLS}" RESTRICT="!test? ( test )" REQUIRED_USE=" - || ( purple xmpp msn oscar ) + || ( purple xmpp ) purple? ( plugins ) test? ( plugins ) xmpp? ( !nss ) diff --git a/net-im/bitlbee/metadata.xml b/net-im/bitlbee/metadata.xml index a3e4b3e074d2..9dbb1759075c 100644 --- a/net-im/bitlbee/metadata.xml +++ b/net-im/bitlbee/metadata.xml @@ -11,9 +11,7 @@ Use libevent for event handling - Enable MSN Messenger IM protocol support. - Use NSS for SSL support in MSN and Jabber - Enable Oscar (AIM/ICQ) IM protocol support + Use NSS for SSL support in Jabber Enable support for encrypted conversations Enable support for plugins Use libpurple instead of the built-in IM protocol support @@ -21,8 +19,7 @@ Bitlbee as an IRC to IM gateway. It provides an irc server that allows - you to log on and then connect to various instant messaging protocols - (AIM, MSN, Yahoo, Jabber, etc). + you to log on and then connect to various instant messaging protocols. bitlbee/bitlbee
[gentoo-commits] repo/gentoo:master commit in: net-im/bitlbee/
commit: c2b7dd2966a0ffa122db92865ed4b9962f4627a7 Author: Petr Vaněk atlas cz> AuthorDate: Thu Jul 28 09:47:59 2022 + Commit: Joonas Niilola gentoo org> CommitDate: Thu Aug 18 07:06:18 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2b7dd29 net-im/bitlbee: set correct --libdir The libdir is currently not used to install any files, however, it is used in generated bitlbee.pc, where it should point to correct directory. Closes: https://bugs.gentoo.org/861383 Fixes: b88db9002a8e ("net-im/bitlbee: Install pkgconfig to /usr/$(get_libdir)/pkgconfig") Signed-off-by: Petr Vaněk atlas.cz> Signed-off-by: Joonas Niilola gentoo.org> net-im/bitlbee/{bitlbee-3.6-r1.ebuild => bitlbee-3.6-r2.ebuild} | 1 + net-im/bitlbee/bitlbee-.ebuild | 1 + 2 files changed, 2 insertions(+) diff --git a/net-im/bitlbee/bitlbee-3.6-r1.ebuild b/net-im/bitlbee/bitlbee-3.6-r2.ebuild similarity index 99% rename from net-im/bitlbee/bitlbee-3.6-r1.ebuild rename to net-im/bitlbee/bitlbee-3.6-r2.ebuild index 73fbb3f13b6c..127f0a88198d 100644 --- a/net-im/bitlbee/bitlbee-3.6-r1.ebuild +++ b/net-im/bitlbee/bitlbee-3.6-r2.ebuild @@ -115,6 +115,7 @@ src_configure() { --prefix=/usr \ --datadir=/usr/share/bitlbee \ --etcdir=/etc/bitlbee \ + --libdir=/usr/$(get_libdir) \ --plugindir=/usr/$(get_libdir)/bitlbee \ --pcdir=/usr/$(get_libdir)/pkgconfig \ --systemdsystemunitdir=$(systemd_get_systemunitdir) \ diff --git a/net-im/bitlbee/bitlbee-.ebuild b/net-im/bitlbee/bitlbee-.ebuild index fc8360cb0399..d811ebc6f0c2 100644 --- a/net-im/bitlbee/bitlbee-.ebuild +++ b/net-im/bitlbee/bitlbee-.ebuild @@ -111,6 +111,7 @@ src_configure() { --prefix=/usr \ --datadir=/usr/share/bitlbee \ --etcdir=/etc/bitlbee \ + --libdir=/usr/$(get_libdir) \ --plugindir=/usr/$(get_libdir)/bitlbee \ --pcdir=/usr/$(get_libdir)/pkgconfig \ --systemdsystemunitdir=$(systemd_get_systemunitdir) \
[gentoo-commits] repo/gentoo:master commit in: net-im/bitlbee/files/, net-im/bitlbee/
commit: ad699292711447f8983a44382c61c0dd00967145 Author: Petr Vaněk atlas cz> AuthorDate: Fri Jul 29 12:42:10 2022 + Commit: Joonas Niilola gentoo org> CommitDate: Thu Aug 18 07:06:18 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad699292 net-im/bitlbee: fix strict-aliasing issue in bundled library The patch is based on fixes from upstream. LICENSE is extended with BSD-2, the license of bundled library. Upstream-PR: https://github.com/bitlbee/bitlbee/pull/162 Closes: https://bugs.gentoo.org/861371 Signed-off-by: Petr Vaněk atlas.cz> Signed-off-by: Joonas Niilola gentoo.org> net-im/bitlbee/bitlbee-3.6-r1.ebuild | 3 ++- .../files/bitlbee-3.6-strict-aliasing.patch| 31 ++ 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/net-im/bitlbee/bitlbee-3.6-r1.ebuild b/net-im/bitlbee/bitlbee-3.6-r1.ebuild index c54da3fb2392..73fbb3f13b6c 100644 --- a/net-im/bitlbee/bitlbee-3.6-r1.ebuild +++ b/net-im/bitlbee/bitlbee-3.6-r1.ebuild @@ -18,7 +18,7 @@ fi DESCRIPTION="irc to IM gateway that support multiple IM protocols" HOMEPAGE="https://www.bitlbee.org/; -LICENSE="GPL-2" +LICENSE="GPL-2 BSD-2" SLOT="0" IUSE_PROTOCOLS="msn oscar purple twitter +xmpp" IUSE="debug +gnutls ipv6 libevent nss otr +plugins selinux test xinetd @@ -65,6 +65,7 @@ PATCHES=( "${FILESDIR}"/${PN}-3.5-libcheck.patch "${FILESDIR}"/${PN}-3.5-libevent.patch "${FILESDIR}"/${P}-disabled-plugins-use.patch + "${FILESDIR}"/${P}-strict-aliasing.patch ) src_configure() { diff --git a/net-im/bitlbee/files/bitlbee-3.6-strict-aliasing.patch b/net-im/bitlbee/files/bitlbee-3.6-strict-aliasing.patch new file mode 100644 index ..30ecff9747ee --- /dev/null +++ b/net-im/bitlbee/files/bitlbee-3.6-strict-aliasing.patch @@ -0,0 +1,31 @@ +Based on upstream [1] commits: +- 161dff8321df ("Fix error type-punned pointer warning") +- d7b67db02aaa ("Fix error type-punned pointer warning") + +[1] https://github.com/json-parser/json-parser + +Upstream-PR: https://github.com/bitlbee/bitlbee/pull/162 + +diff --git a/lib/json.c b/lib/json.c +index 24288f94..2150cbaf 100644 +--- a/lib/json.c b/lib/json.c +@@ -139,7 +139,7 @@ static int new_value + return 0; + } + +- value->_reserved.object_mem = (*(char **) >u.object.values) + values_size; ++ value->_reserved.object_mem = (void *) (((char *) value->u.object.values) + values_size); + + value->u.object.length = 0; + break; +@@ -406,7 +406,8 @@ json_value * json_parse_ex(json_settings * settings, + case json_object: + + if (state.first_pass) { +- (*(json_char **) >u.object.values) += string_length + 1; ++ json_char **chars = (json_char **) >u.object.values; ++ chars[0] += string_length + 1; + } else { + top->u.object.values [top->u.object.length].name + = (json_char *) top->_reserved.object_mem;
[gentoo-commits] repo/gentoo:master commit in: net-im/bitlbee/files/, net-im/bitlbee/
commit: 90a3d5fff1c032b3b2de6133c6eb9c7711daccb9 Author: Petr Vaněk atlas cz> AuthorDate: Mon Aug 1 14:10:01 2022 + Commit: Joonas Niilola gentoo org> CommitDate: Thu Aug 18 07:06:18 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90a3d5ff net-im/bitlbee: Use system json-parser - Applied patch allows us to use system json-parser, it is based on upstream PR, see the link below - Dropped arm64, ppc, ppc64 and x86 keywords because newly introduced dev-libs/json-parser dependency has currently only ~amd64 keyword - EAPI 7 -> 8 Upstream-PR: https://github.com/bitlbee/bitlbee/pull/151 Bug: https://bugs.gentoo.org/861371 Signed-off-by: Petr Vaněk atlas.cz> Signed-off-by: Joonas Niilola gentoo.org> net-im/bitlbee/bitlbee-3.6-r3.ebuild | 157 + .../files/bitlbee-3.6-system-json-parser.patch | 82 +++ 2 files changed, 239 insertions(+) diff --git a/net-im/bitlbee/bitlbee-3.6-r3.ebuild b/net-im/bitlbee/bitlbee-3.6-r3.ebuild new file mode 100644 index ..72d2a7207ba2 --- /dev/null +++ b/net-im/bitlbee/bitlbee-3.6-r3.ebuild @@ -0,0 +1,157 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8..11} ) + +inherit python-any-r1 systemd toolchain-funcs + +if [[ ${PV} == "" ]]; then + EGIT_REPO_URI="https://github.com/bitlbee/bitlbee.git; + inherit git-r3 +else + SRC_URI="https://get.bitlbee.org/src/${P}.tar.gz; + KEYWORDS="~amd64" +fi + +DESCRIPTION="irc to IM gateway that support multiple IM protocols" +HOMEPAGE="https://www.bitlbee.org/; + +LICENSE="GPL-2" +SLOT="0" +IUSE_PROTOCOLS="msn oscar purple twitter +xmpp" +IUSE="debug +gnutls ipv6 libevent nss otr +plugins selinux test xinetd + ${IUSE_PROTOCOLS}" +RESTRICT="!test? ( test )" + +REQUIRED_USE=" + || ( purple xmpp msn oscar ) + purple? ( plugins ) + test? ( plugins ) + xmpp? ( !nss ) +" + +COMMON_DEPEND=" + acct-group/bitlbee + acct-user/bitlbee + dev-libs/glib:2 + dev-libs/json-parser:= + purple? ( net-im/pidgin ) + libevent? ( dev-libs/libevent:= ) + otr? ( >=net-libs/libotr-4 ) + gnutls? ( net-libs/gnutls:= ) + !gnutls? ( + nss? ( dev-libs/nss ) + !nss? ( + dev-libs/openssl:0= + ) + ) +" +DEPEND="${COMMON_DEPEND} + selinux? ( sec-policy/selinux-bitlbee ) + test? ( dev-libs/check ) +" + +RDEPEND="${COMMON_DEPEND} + xinetd? ( sys-apps/xinetd ) +" + +BDEPEND="${PYTHON_DEPS} + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}/${PN}-3.5-systemd-user.patch" + "${FILESDIR}/${PN}-3.5-libcheck.patch" + "${FILESDIR}/${PN}-3.5-libevent.patch" + "${FILESDIR}/${P}-disabled-plugins-use.patch" + "${FILESDIR}/${P}-system-json-parser.patch" +) + +src_configure() { + local myconf + + # setup plugins, protocol, ipv6 and debug + myconf+=( --jabber=$(usex xmpp 1 0) ) + for flag in debug ipv6 plugins ${IUSE_PROTOCOLS/+xmpp/} ; do + myconf+=( --${flag}=$(usex ${flag} 1 0) ) + done + + # set otr + if use otr && use plugins ; then + myconf+=( --otr=plugin ) + else + if use otr ; then + ewarn "OTR support has been disabled automatically because it" + ewarn "requires the plugins USE flag." + fi + myconf+=( --otr=0 ) + fi + + # setup ssl use flags + if use gnutls ; then + myconf+=( --ssl=gnutls ) + einfo "Using gnutls for SSL support" + else + ewarn "Only gnutls is officially supported by upstream." + if use nss ; then + myconf+=( --ssl=nss ) + einfo "Using nss for SSL support" + else + myconf+=( --ssl=openssl ) + einfo "Using openssl for SSL support" + fi + fi + + # set event handler + if use libevent ; then + myconf+=( --events=libevent ) + else + myconf+=( --events=glib ) + fi + + # not autotools-based + ./configure \ + --prefix=/usr \ + --datadir=/usr/share/bitlbee \ + --etcdir=/etc/bitlbee \ + --libdir=/usr/$(get_libdir) \ + --pcdir=/usr/$(get_libdir)/pkgconfig \ + --plugindir=/usr/$(get_libdir)/bitlbee \ + --externaljsonparser=1 \ + --systemdsystemunitdir=$(systemd_get_systemunitdir) \ + --doc=1 \ + --strip=0 \ + --verbose=1 \ + "${myconf[@]}" || die + + sed -i \ + -e "/^EFLAGS/s:=:&${LDFLAGS} :" \ + Makefile.settings || die
[gentoo-commits] repo/gentoo:master commit in: net-im/bitlbee/files/, net-im/bitlbee/
commit: 2f4aeedeec9c18047dbda18f31325ac3aeb6a617 Author: Petr Vaněk atlas cz> AuthorDate: Mon Aug 1 20:35:08 2022 + Commit: Joonas Niilola gentoo org> CommitDate: Thu Aug 18 07:06:18 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f4aeede net-im/bitlbee: sync live Signed-off-by: Petr Vaněk atlas.cz> Closes: https://github.com/gentoo/gentoo/pull/26703 Signed-off-by: Joonas Niilola gentoo.org> net-im/bitlbee/bitlbee-.ebuild | 9 ++- .../files/bitlbee--system-json-parser.patch| 83 ++ 2 files changed, 89 insertions(+), 3 deletions(-) diff --git a/net-im/bitlbee/bitlbee-.ebuild b/net-im/bitlbee/bitlbee-.ebuild index d811ebc6f0c2..0a8cc973ae18 100644 --- a/net-im/bitlbee/bitlbee-.ebuild +++ b/net-im/bitlbee/bitlbee-.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} == "" ]]; then inherit git-r3 else SRC_URI="https://get.bitlbee.org/src/${P}.tar.gz; - KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" + KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86" fi DESCRIPTION="irc to IM gateway that support multiple IM protocols" @@ -36,6 +36,7 @@ COMMON_DEPEND=" acct-group/bitlbee acct-user/bitlbee dev-libs/glib:2 + dev-libs/json-parser:= purple? ( net-im/pidgin ) libevent? ( dev-libs/libevent:= ) otr? ( >=net-libs/libotr-4 ) @@ -61,7 +62,8 @@ BDEPEND="${PYTHON_DEPS} " PATCHES=( - "${FILESDIR}"/${PN}-3.5-systemd-user.patch + "${FILESDIR}/${PN}-3.5-systemd-user.patch" + "${FILESDIR}/${P}-system-json-parser.patch" ) src_configure() { @@ -112,8 +114,9 @@ src_configure() { --datadir=/usr/share/bitlbee \ --etcdir=/etc/bitlbee \ --libdir=/usr/$(get_libdir) \ - --plugindir=/usr/$(get_libdir)/bitlbee \ --pcdir=/usr/$(get_libdir)/pkgconfig \ + --plugindir=/usr/$(get_libdir)/bitlbee \ + --externaljsonparser=1 \ --systemdsystemunitdir=$(systemd_get_systemunitdir) \ --doc=1 \ --strip=0 \ diff --git a/net-im/bitlbee/files/bitlbee--system-json-parser.patch b/net-im/bitlbee/files/bitlbee--system-json-parser.patch new file mode 100644 index ..07f2878525ec --- /dev/null +++ b/net-im/bitlbee/files/bitlbee--system-json-parser.patch @@ -0,0 +1,83 @@ +This is adapted patch from upstream PR 151. Original PR defines +--external-json-parser which breaks configuration, see [1]. It was changed to +--externaljsonparser and $external_json_parser to $externaljsonparser. + +[1] https://github.com/bitlbee/bitlbee/pull/151#issuecomment-1201181905 + +Upstream-PR: https://github.com/bitlbee/bitlbee/pull/151 + +diff --git a/configure b/configure +index 4640c806..77b1213b 100755 +--- a/configure b/configure +@@ -47,6 +47,7 @@ plugins=1 + otr=0 + + events=glib ++externaljsonparser=auto + ssl=auto + + pam=0 +@@ -148,6 +149,7 @@ Option Description Default + --events=... Event handler (glib, libevent) $events + --ssl=... SSL library to use (gnutls, nss, openssl, auto) + $ssl ++--externaljsonparser=0/1/auto Use External JSON parser $externaljsonparser + + + --target=... Cross compilation targetsame as host +@@ -398,6 +400,20 @@ else + fi + echo 'EVENT_HANDLER=events_'$events'.o' >> Makefile.settings + ++if [ "$externaljsonparser" = "auto" ]; then ++ if pkg-config --exists json-parser; then ++ externaljsonparser=1 ++ else ++ externaljsonparser=0 ++ fi ++fi ++echo "EXTERNAL_JSON_PARSER=$externaljsonparser" >> Makefile.settings ++if [ "$externaljsonparser" = "1" ]; then ++echo "CFLAGS+=$(pkg-config --cflags json-parser)" >> Makefile.settings ++echo "LDFLAGS_BITLBEE+=$(pkg-config --libs json-parser)" >> Makefile.settings ++fi ++ ++ + detect_gnutls() + { + if $PKG_CONFIG --exists gnutls; then +@@ -979,6 +995,12 @@ else + echo ' systemd disabled.' + fi + ++if [ "$externaljsonparser" = "1" ]; then ++echo ' Using system JSON parser.' ++else ++echo ' Using bundled JSON parser.' ++fi ++ + echo ' Using python: '$PYTHON + echo ' Using event handler: '$events + echo ' Using SSL library: '$ssl + #echo ' Building with these storage backends: '$STORAGES +diff --git a/lib/Makefile b/lib/Makefile +index fc46aedc..ad95d9cb 100644 +--- a/lib/Makefile b/lib/Makefile +@@ -12,7 +12,11 @@ _SRCDIR_ := $(_SRCDIR_)lib/ + endif + + # [SH] Program variables +-objects = arc.o base64.o canohost.o $(EVENT_HANDLER) ftutil.o http_client.o ini.o json.o json_util.o md5.o misc.o oauth.o oauth2.o proxy.o sha1.o $(SSL_CLIENT) url.o xmltree.o ns_parse.o ++objects = arc.o base64.o canohost.o $(EVENT_HANDLER) ftutil.o http_client.o ini.o json_util.o md5.o misc.o oauth.o oauth2.o proxy.o sha1.o
[gentoo-commits] repo/gentoo:master commit in: net-im/bitlbee/
commit: 4ef1090bb43cf13200a7c35af8c709a90ae1cde3 Author: Sam James gentoo org> AuthorDate: Thu Jul 28 06:58:14 2022 + Commit: Sam James gentoo org> CommitDate: Thu Jul 28 07:09:51 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ef1090b net-im/bitlbee: add github upstream metadata Signed-off-by: Sam James gentoo.org> net-im/bitlbee/metadata.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/net-im/bitlbee/metadata.xml b/net-im/bitlbee/metadata.xml index 4d61638429f9..a3e4b3e074d2 100644 --- a/net-im/bitlbee/metadata.xml +++ b/net-im/bitlbee/metadata.xml @@ -24,4 +24,7 @@ you to log on and then connect to various instant messaging protocols (AIM, MSN, Yahoo, Jabber, etc). + + bitlbee/bitlbee +
[gentoo-commits] repo/gentoo:master commit in: net-im/bitlbee/
commit: 78bae8fe57511c076b7cc9ca814e00b9e96b58bd Author: Petr Vaněk atlas cz> AuthorDate: Sat Jul 9 08:58:51 2022 + Commit: Sam James gentoo org> CommitDate: Sat Jul 9 09:54:55 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78bae8fe net-im/bitlbee: enable py3.11 Signed-off-by: Petr Vaněk atlas.cz> Closes: https://github.com/gentoo/gentoo/pull/26304 Signed-off-by: Sam James gentoo.org> net-im/bitlbee/bitlbee-3.6-r1.ebuild | 2 +- net-im/bitlbee/bitlbee-.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/net-im/bitlbee/bitlbee-3.6-r1.ebuild b/net-im/bitlbee/bitlbee-3.6-r1.ebuild index 592437d7f4bb..c54da3fb2392 100644 --- a/net-im/bitlbee/bitlbee-3.6-r1.ebuild +++ b/net-im/bitlbee/bitlbee-3.6-r1.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_COMPAT=( python3_{8..11} ) inherit python-any-r1 systemd toolchain-funcs diff --git a/net-im/bitlbee/bitlbee-.ebuild b/net-im/bitlbee/bitlbee-.ebuild index 075402136f9c..fc8360cb0399 100644 --- a/net-im/bitlbee/bitlbee-.ebuild +++ b/net-im/bitlbee/bitlbee-.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_COMPAT=( python3_{8..11} ) inherit python-any-r1 systemd toolchain-funcs
[gentoo-commits] repo/gentoo:master commit in: net-im/bitlbee/
commit: dd51e1a2dac9b2362ee115e0bceff95524580f14 Author: Jakov Smolić gentoo org> AuthorDate: Tue Jun 21 16:11:55 2022 + Commit: Jakov Smolić gentoo org> CommitDate: Tue Jun 21 16:11:55 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd51e1a2 net-im/bitlbee: Keyword 3.6-r1 arm64, #852857 Signed-off-by: Jakov Smolić gentoo.org> net-im/bitlbee/bitlbee-3.6-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-im/bitlbee/bitlbee-3.6-r1.ebuild b/net-im/bitlbee/bitlbee-3.6-r1.ebuild index 16e04e799848..592437d7f4bb 100644 --- a/net-im/bitlbee/bitlbee-3.6-r1.ebuild +++ b/net-im/bitlbee/bitlbee-3.6-r1.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} == "" ]]; then inherit git-r3 else SRC_URI="https://get.bitlbee.org/src/${P}.tar.gz; - KEYWORDS="amd64 ppc ~ppc64 x86" + KEYWORDS="amd64 ~arm64 ppc ~ppc64 x86" fi DESCRIPTION="irc to IM gateway that support multiple IM protocols"
[gentoo-commits] repo/gentoo:master commit in: net-im/bitlbee/
commit: e80138b2720f0059d29263c071b5a2d9dba92127 Author: Petr Vaněk atlas cz> AuthorDate: Mon Feb 7 14:32:39 2022 + Commit: Arthur Zamarin gentoo org> CommitDate: Mon Feb 7 20:19:57 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e80138b2 net-im/bitlbee: disable py3.7 Signed-off-by: Petr Vaněk atlas.cz> Closes: https://github.com/gentoo/gentoo/pull/24068 Signed-off-by: Arthur Zamarin gentoo.org> net-im/bitlbee/bitlbee-3.6-r1.ebuild | 2 +- net-im/bitlbee/bitlbee-.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/net-im/bitlbee/bitlbee-3.6-r1.ebuild b/net-im/bitlbee/bitlbee-3.6-r1.ebuild index 84a7f7c4e7bb..16e04e799848 100644 --- a/net-im/bitlbee/bitlbee-3.6-r1.ebuild +++ b/net-im/bitlbee/bitlbee-3.6-r1.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{7..10} ) +PYTHON_COMPAT=( python3_{8..10} ) inherit python-any-r1 systemd toolchain-funcs diff --git a/net-im/bitlbee/bitlbee-.ebuild b/net-im/bitlbee/bitlbee-.ebuild index 754994f83425..075402136f9c 100644 --- a/net-im/bitlbee/bitlbee-.ebuild +++ b/net-im/bitlbee/bitlbee-.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{7..10} ) +PYTHON_COMPAT=( python3_{8..10} ) inherit python-any-r1 systemd toolchain-funcs
[gentoo-commits] repo/gentoo:master commit in: net-im/bitlbee/
commit: 7defb52f9cc136d4063c31b4dab83fb9c20f8160 Author: Petr Vaněk atlas cz> AuthorDate: Thu Feb 3 14:17:42 2022 + Commit: Arthur Zamarin gentoo org> CommitDate: Mon Feb 7 20:19:57 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7defb52f net-im/bitlbee: enable py3.10 Signed-off-by: Petr Vaněk atlas.cz> Signed-off-by: Arthur Zamarin gentoo.org> net-im/bitlbee/bitlbee-3.6-r1.ebuild | 4 ++-- net-im/bitlbee/bitlbee-.ebuild | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/net-im/bitlbee/bitlbee-3.6-r1.ebuild b/net-im/bitlbee/bitlbee-3.6-r1.ebuild index 4a6f1db23842..84a7f7c4e7bb 100644 --- a/net-im/bitlbee/bitlbee-3.6-r1.ebuild +++ b/net-im/bitlbee/bitlbee-3.6-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{7..9} ) +PYTHON_COMPAT=( python3_{7..10} ) inherit python-any-r1 systemd toolchain-funcs diff --git a/net-im/bitlbee/bitlbee-.ebuild b/net-im/bitlbee/bitlbee-.ebuild index e1f92087579b..b85617f5b02f 100644 --- a/net-im/bitlbee/bitlbee-.ebuild +++ b/net-im/bitlbee/bitlbee-.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{7..9} ) +PYTHON_COMPAT=( python3_{7..10} ) inherit python-any-r1 systemd toolchain-funcs
[gentoo-commits] repo/gentoo:master commit in: net-im/bitlbee/
commit: 4b3696530a0f9ae2545d9e73dcf9268516087117 Author: Petr Vaněk atlas cz> AuthorDate: Thu Feb 3 14:22:21 2022 + Commit: Arthur Zamarin gentoo org> CommitDate: Mon Feb 7 20:19:57 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b369653 net-im/bitlbee: update EAPI 7 -> 8 Signed-off-by: Petr Vaněk atlas.cz> Signed-off-by: Arthur Zamarin gentoo.org> net-im/bitlbee/bitlbee-.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-im/bitlbee/bitlbee-.ebuild b/net-im/bitlbee/bitlbee-.ebuild index b85617f5b02f..754994f83425 100644 --- a/net-im/bitlbee/bitlbee-.ebuild +++ b/net-im/bitlbee/bitlbee-.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 PYTHON_COMPAT=( python3_{7..10} )
[gentoo-commits] repo/gentoo:master commit in: net-im/bitlbee/
commit: f4dc5bb62635485188d0bdce1c2c5dc6649f5548 Author: Mikle Kolyada gentoo org> AuthorDate: Sun May 2 19:39:00 2021 + Commit: Mikle Kolyada gentoo org> CommitDate: Sun May 2 19:39:00 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4dc5bb6 net-im/bitlbee: remove libressl support Package-Manager: Portage-3.0.18, Repoman-3.0.2 Signed-off-by: Mikle Kolyada gentoo.org> net-im/bitlbee/bitlbee-3.6-r1.ebuild | 5 ++--- net-im/bitlbee/bitlbee-.ebuild | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/net-im/bitlbee/bitlbee-3.6-r1.ebuild b/net-im/bitlbee/bitlbee-3.6-r1.ebuild index 0411dc061d1..4a6f1db2384 100644 --- a/net-im/bitlbee/bitlbee-3.6-r1.ebuild +++ b/net-im/bitlbee/bitlbee-3.6-r1.ebuild @@ -21,7 +21,7 @@ HOMEPAGE="https://www.bitlbee.org/; LICENSE="GPL-2" SLOT="0" IUSE_PROTOCOLS="msn oscar purple twitter +xmpp" -IUSE="debug +gnutls ipv6 libevent libressl nss otr +plugins selinux test xinetd +IUSE="debug +gnutls ipv6 libevent nss otr +plugins selinux test xinetd ${IUSE_PROTOCOLS}" RESTRICT="!test? ( test )" @@ -43,8 +43,7 @@ COMMON_DEPEND=" !gnutls? ( nss? ( dev-libs/nss ) !nss? ( - libressl? ( dev-libs/libressl:= ) - !libressl? ( dev-libs/openssl:0= ) + dev-libs/openssl:0= ) ) " diff --git a/net-im/bitlbee/bitlbee-.ebuild b/net-im/bitlbee/bitlbee-.ebuild index b1eb2f2c62c..e1f92087579 100644 --- a/net-im/bitlbee/bitlbee-.ebuild +++ b/net-im/bitlbee/bitlbee-.ebuild @@ -21,7 +21,7 @@ HOMEPAGE="https://www.bitlbee.org/; LICENSE="GPL-2" SLOT="0" IUSE_PROTOCOLS="msn oscar purple twitter +xmpp" -IUSE="debug +gnutls ipv6 libevent libressl nss otr +plugins selinux test xinetd +IUSE="debug +gnutls ipv6 libevent nss otr +plugins selinux test xinetd ${IUSE_PROTOCOLS}" RESTRICT="!test? ( test )" @@ -43,8 +43,7 @@ COMMON_DEPEND=" !gnutls? ( nss? ( dev-libs/nss ) !nss? ( - libressl? ( dev-libs/libressl:= ) - !libressl? ( dev-libs/openssl:0= ) + dev-libs/openssl:0= ) ) "
[gentoo-commits] repo/gentoo:master commit in: net-im/bitlbee-steam/
commit: d262f1241ca53614917e48ed430512586fb29e60 Author: Sam James gentoo org> AuthorDate: Wed Apr 21 00:41:51 2021 + Commit: Sam James gentoo org> CommitDate: Wed Apr 21 02:09:45 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d262f124 net-im/bitlbee-steam: ltprune-- Signed-off-by: Sam James gentoo.org> net-im/bitlbee-steam/bitlbee-steam-1.4.2.ebuild | 7 --- net-im/bitlbee-steam/bitlbee-steam-.ebuild | 7 --- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/net-im/bitlbee-steam/bitlbee-steam-1.4.2.ebuild b/net-im/bitlbee-steam/bitlbee-steam-1.4.2.ebuild index c0ec7c0ca9c..485f9d30d9b 100644 --- a/net-im/bitlbee-steam/bitlbee-steam-1.4.2.ebuild +++ b/net-im/bitlbee-steam/bitlbee-steam-1.4.2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit ltprune autotools +inherit autotools if [[ ${PV} == "" ]] ; then EGIT_REPO_URI="https://github.com/bitlbee/bitlbee-steam.git; @@ -33,5 +33,6 @@ src_prepare() { src_install() { default - prune_libtool_files --modules + + find "${ED}" -name '*.la' -delete || die } diff --git a/net-im/bitlbee-steam/bitlbee-steam-.ebuild b/net-im/bitlbee-steam/bitlbee-steam-.ebuild index c0ec7c0ca9c..485f9d30d9b 100644 --- a/net-im/bitlbee-steam/bitlbee-steam-.ebuild +++ b/net-im/bitlbee-steam/bitlbee-steam-.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit ltprune autotools +inherit autotools if [[ ${PV} == "" ]] ; then EGIT_REPO_URI="https://github.com/bitlbee/bitlbee-steam.git; @@ -33,5 +33,6 @@ src_prepare() { src_install() { default - prune_libtool_files --modules + + find "${ED}" -name '*.la' -delete || die }
[gentoo-commits] repo/gentoo:master commit in: net-im/bitlbee/, net-im/bitlbee/files/
commit: 05dc33a126ab1b84858d1bed82a594b7c5dbad9e Author: Petr Vaněk atlas cz> AuthorDate: Mon Apr 12 09:52:46 2021 + Commit: Joonas Niilola gentoo org> CommitDate: Thu Apr 15 08:40:59 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05dc33a1 net-im/bitlbee: fix compilation with disabled plugins use The patch is taken from upstream where it was already merged. Upstream-PR: https://github.com/bitlbee/bitlbee/pull/156 Closes: https://bugs.gentoo.org/739510 Signed-off-by: Petr Vaněk atlas.cz> Signed-off-by: Joonas Niilola gentoo.org> net-im/bitlbee/bitlbee-3.6-r1.ebuild | 1 + .../files/bitlbee-3.6-disabled-plugins-use.patch | 55 ++ 2 files changed, 56 insertions(+) diff --git a/net-im/bitlbee/bitlbee-3.6-r1.ebuild b/net-im/bitlbee/bitlbee-3.6-r1.ebuild index 126e7ae66fc..320da052e95 100644 --- a/net-im/bitlbee/bitlbee-3.6-r1.ebuild +++ b/net-im/bitlbee/bitlbee-3.6-r1.ebuild @@ -64,6 +64,7 @@ PATCHES=( "${FILESDIR}"/${PN}-3.5-systemd-user.patch "${FILESDIR}"/${PN}-3.5-libcheck.patch "${FILESDIR}"/${PN}-3.5-libevent.patch + "${FILESDIR}"/${P}-disabled-plugins-use.patch ) src_configure() { diff --git a/net-im/bitlbee/files/bitlbee-3.6-disabled-plugins-use.patch b/net-im/bitlbee/files/bitlbee-3.6-disabled-plugins-use.patch new file mode 100644 index 000..0973bd4bd5f --- /dev/null +++ b/net-im/bitlbee/files/bitlbee-3.6-disabled-plugins-use.patch @@ -0,0 +1,55 @@ +This patch is taken from upstrem https://github.com/bitlbee/bitlbee/pull/156 +where it was already merged. + +From a8196d6f72b44be9c315b9ad7dc45276d2aaca0c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20Van=C4=9Bk?= +Date: Tue, 23 Mar 2021 13:07:18 +0100 +Subject: [PATCH] root_commands: prevent linker error when plugins are disabled + +This commit fixes compilation issue with disabled plugin support +(./configure --plugins=0), where get_plugins function is unavailable. +The problem has been introduced with addition of new 'plugins info' +subcommand, where get_plugins is used in cmd_plugins_info function, +which should be conditionally available only if WITH_PLUGINS is defined. + +Bug: https://bugs.gentoo.org/739510 +Bug: https://bugs.gentoo.org/617604 +Fixes: 6908ab747d1e ("Add 'plugins info' subcommand, only show plugin details there") +Signed-off-by: Petr Vaněk +--- + root_commands.c | 4 + 1 file changed, 4 insertions(+) + +diff --git a/root_commands.c b/root_commands.c +index 8358c030..a4e72f83 100644 +--- a/root_commands.c b/root_commands.c +@@ -1168,6 +1168,7 @@ static void prplstr(GList *prpls, GString *gstr) + g_list_free(prpls); + } + ++#ifdef WITH_PLUGINS + static void cmd_plugins_info(irc_t *irc, char **cmd) + { + GList *l; +@@ -1201,6 +1202,7 @@ static void cmd_plugins_info(irc_t *irc, char **cmd) + irc_rootmsg(irc, " URL: %s", info->url); + } + } ++#endif + + static void cmd_plugins(irc_t *irc, char **cmd) + { +@@ -1208,7 +1210,9 @@ static void cmd_plugins(irc_t *irc, char **cmd) + GString *gstr; + + if (cmd[1] && g_strcasecmp(cmd[1], "info") == 0) { ++#ifdef WITH_PLUGINS + cmd_plugins_info(irc, cmd); ++#endif + return; + } + +-- +2.26.3 +
[gentoo-commits] repo/gentoo:master commit in: net-im/bitlbee/
commit: 7471ce3bb403552eb9f87a0c57f61930aeef76d2 Author: Petr Vaněk atlas cz> AuthorDate: Wed Apr 14 21:58:32 2021 + Commit: Joonas Niilola gentoo org> CommitDate: Thu Apr 15 08:40:59 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7471ce3b net-im/bitlbee: plugins use is required by purple Purple code uses function conditionally exposed by plugins use flag, therefore plugins use is required by purple. This requirement was introduced in upstream by commit 6d212f401cf7 ("purple: include purple plugins in the 'plugins' command list"), where function purple_initmodule calls plugin_info_add. Signed-off-by: Petr Vaněk atlas.cz> Closes: https://github.com/gentoo/gentoo/pull/20347 Signed-off-by: Joonas Niilola gentoo.org> net-im/bitlbee/bitlbee-3.6-r1.ebuild | 3 ++- net-im/bitlbee/bitlbee-.ebuild | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/net-im/bitlbee/bitlbee-3.6-r1.ebuild b/net-im/bitlbee/bitlbee-3.6-r1.ebuild index 320da052e95..0411dc061d1 100644 --- a/net-im/bitlbee/bitlbee-3.6-r1.ebuild +++ b/net-im/bitlbee/bitlbee-3.6-r1.ebuild @@ -27,8 +27,9 @@ RESTRICT="!test? ( test )" REQUIRED_USE=" || ( purple xmpp msn oscar ) - xmpp? ( !nss ) + purple? ( plugins ) test? ( plugins ) + xmpp? ( !nss ) " COMMON_DEPEND=" diff --git a/net-im/bitlbee/bitlbee-.ebuild b/net-im/bitlbee/bitlbee-.ebuild index 220b6904f2d..b1eb2f2c62c 100644 --- a/net-im/bitlbee/bitlbee-.ebuild +++ b/net-im/bitlbee/bitlbee-.ebuild @@ -27,8 +27,9 @@ RESTRICT="!test? ( test )" REQUIRED_USE=" || ( purple xmpp msn oscar ) - xmpp? ( !nss ) + purple? ( plugins ) test? ( plugins ) + xmpp? ( !nss ) " COMMON_DEPEND="
[gentoo-commits] repo/gentoo:master commit in: net-im/bitlbee-facebook/
commit: 84f527abb408b242d140338c8010c435cb0232c9 Author: Petr Vaněk atlas cz> AuthorDate: Sun Mar 28 10:30:36 2021 + Commit: Joonas Niilola gentoo org> CommitDate: Sat Apr 10 07:16:39 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84f527ab net-im/bitlbee-facebook: drop 1.2.0 This version does not work properly anymore. Signed-off-by: Petr Vaněk atlas.cz> Closes: https://github.com/gentoo/gentoo/pull/20162 Signed-off-by: Joonas Niilola gentoo.org> net-im/bitlbee-facebook/Manifest | 1 - .../bitlbee-facebook/bitlbee-facebook-1.2.0.ebuild | 40 -- 2 files changed, 41 deletions(-) diff --git a/net-im/bitlbee-facebook/Manifest b/net-im/bitlbee-facebook/Manifest index 9333df4c667..44f387fbfa4 100644 --- a/net-im/bitlbee-facebook/Manifest +++ b/net-im/bitlbee-facebook/Manifest @@ -1,2 +1 @@ -DIST bitlbee-facebook-1.2.0.tar.gz 71718 BLAKE2B 967e2f4250e92c88a74e32b1ddda8d96327a6e190e4b17e416f20e27e7a07083ae8ff2e2006de6ab114a98d7f81deccf515aec9206a7f0a2470ae67f5c787662 SHA512 b815dcaceb9ee12a68cfe7401da503139ba92cb0396e8d52e5491fed04431d2c6e4cf667bcc6f457bc51b916c8dc1dc43dc277ff0a683a1c0d72a65e819fe5b4 DIST bitlbee-facebook-1.2.2.tar.gz 71918 BLAKE2B 674cb8565f88faff695d5b14010036f6d3c65bcdab9a6fba84c5f0d775a59d02abfd863be5af4ddc7c3361a49c6345d0ef57bbd8b02202b7e24e62b31c2c6844 SHA512 534e7e704e7ddd296c810819171b9c4770747dde109a9bbdfb41fc05602b1d9ad9bfd2ec6c7a62ffb0c85ec61252b1597217cdee7ccffd191da897a7d40085cc diff --git a/net-im/bitlbee-facebook/bitlbee-facebook-1.2.0.ebuild b/net-im/bitlbee-facebook/bitlbee-facebook-1.2.0.ebuild deleted file mode 100644 index 79bb0580ebe..000 --- a/net-im/bitlbee-facebook/bitlbee-facebook-1.2.0.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 2017-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools - -DESCRIPTION="Facebook protocol plugin for BitlBee" -HOMEPAGE="https://github.com/bitlbee/bitlbee-facebook; - -LICENSE="GPL-2" -SLOT="0" -IUSE="" - -if [[ ${PV} == * ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/bitlbee/bitlbee-facebook; -else - SRC_URI="https://github.com/bitlbee/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 x86" -fi - -RDEPEND=" - dev-libs/glib:2 - dev-libs/json-glib - >=net-im/bitlbee-3[plugins]" -DEPEND="${RDEPEND}" -BDEPEND=" - dev-util/glib-utils - virtual/pkgconfig" - -src_prepare() { - default - eautoreconf -} - -src_install() { - default - find "${D}" -name '*.la' -delete || die -}
[gentoo-commits] repo/gentoo:master commit in: net-im/bitlbee-facebook/
commit: 69b29891d8a20657c3f21311450b53aa5842f278 Author: Agostino Sarubbo gentoo org> AuthorDate: Sun Mar 28 10:02:40 2021 + Commit: Agostino Sarubbo gentoo org> CommitDate: Sun Mar 28 10:02:40 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69b29891 net-im/bitlbee-facebook: x86 stable wrt bug #778359 Package-Manager: Portage-3.0.13, Repoman-3.0.2 RepoMan-Options: --include-arches="x86" Signed-off-by: Agostino Sarubbo gentoo.org> net-im/bitlbee-facebook/bitlbee-facebook-1.2.2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-im/bitlbee-facebook/bitlbee-facebook-1.2.2.ebuild b/net-im/bitlbee-facebook/bitlbee-facebook-1.2.2.ebuild index 05889a8ea3c..f220232e176 100644 --- a/net-im/bitlbee-facebook/bitlbee-facebook-1.2.2.ebuild +++ b/net-im/bitlbee-facebook/bitlbee-facebook-1.2.2.ebuild @@ -17,7 +17,7 @@ if [[ ${PV} == * ]] ; then EGIT_REPO_URI="https://github.com/bitlbee/bitlbee-facebook; else SRC_URI="https://github.com/bitlbee/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 ~x86" + KEYWORDS="amd64 x86" fi RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: net-im/bitlbee/
commit: b03dd0c5736445a232e14bcb43ad582a7544b2bb Author: Petr Vaněk atlas cz> AuthorDate: Tue Mar 23 08:31:16 2021 + Commit: Sam James gentoo org> CommitDate: Fri Mar 26 15:54:50 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b03dd0c5 net-im/bitlbee: add python 3.9 support Signed-off-by: Petr Vaněk atlas.cz> Closes: https://github.com/gentoo/gentoo/pull/20096 Signed-off-by: Sam James gentoo.org> net-im/bitlbee/bitlbee-3.6-r1.ebuild | 4 ++-- net-im/bitlbee/bitlbee-.ebuild | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/net-im/bitlbee/bitlbee-3.6-r1.ebuild b/net-im/bitlbee/bitlbee-3.6-r1.ebuild index c1743736b2a..126e7ae66fc 100644 --- a/net-im/bitlbee/bitlbee-3.6-r1.ebuild +++ b/net-im/bitlbee/bitlbee-3.6-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{7..8} ) +PYTHON_COMPAT=( python3_{7..9} ) inherit python-any-r1 systemd toolchain-funcs diff --git a/net-im/bitlbee/bitlbee-.ebuild b/net-im/bitlbee/bitlbee-.ebuild index 4de0dae0453..220b6904f2d 100644 --- a/net-im/bitlbee/bitlbee-.ebuild +++ b/net-im/bitlbee/bitlbee-.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{7..8} ) +PYTHON_COMPAT=( python3_{7..9} ) inherit python-any-r1 systemd toolchain-funcs
[gentoo-commits] repo/gentoo:master commit in: net-im/bitlbee-facebook/
commit: 1cca69085fc4a44f1548e451300f571c67738107 Author: Agostino Sarubbo gentoo org> AuthorDate: Fri Mar 26 15:54:10 2021 + Commit: Agostino Sarubbo gentoo org> CommitDate: Fri Mar 26 15:54:10 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1cca6908 net-im/bitlbee-facebook: amd64 stable wrt bug #778359 Package-Manager: Portage-3.0.13, Repoman-3.0.2 RepoMan-Options: --include-arches="amd64" Signed-off-by: Agostino Sarubbo gentoo.org> net-im/bitlbee-facebook/bitlbee-facebook-1.2.2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-im/bitlbee-facebook/bitlbee-facebook-1.2.2.ebuild b/net-im/bitlbee-facebook/bitlbee-facebook-1.2.2.ebuild index d28c1fce5d9..05889a8ea3c 100644 --- a/net-im/bitlbee-facebook/bitlbee-facebook-1.2.2.ebuild +++ b/net-im/bitlbee-facebook/bitlbee-facebook-1.2.2.ebuild @@ -17,7 +17,7 @@ if [[ ${PV} == * ]] ; then EGIT_REPO_URI="https://github.com/bitlbee/bitlbee-facebook; else SRC_URI="https://github.com/bitlbee/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" + KEYWORDS="amd64 ~x86" fi RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: net-im/bitlbee-facebook/
commit: 1fb9de30ae9b78710057156f2a6ffab7dad7b92b Author: Petr Vaněk atlas cz> AuthorDate: Sun Feb 14 17:42:13 2021 + Commit: Joonas Niilola gentoo org> CommitDate: Mon Feb 22 13:46:40 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1fb9de30 net-im/bitlbee-facebook: remove old version Package-Manager: Portage-3.0.13, Repoman-3.0.2 Signed-off-by: Petr Vaněk atlas.cz> Closes: https://github.com/gentoo/gentoo/pull/19395 Signed-off-by: Joonas Niilola gentoo.org> net-im/bitlbee-facebook/Manifest | 1 - .../bitlbee-facebook/bitlbee-facebook-1.2.1.ebuild | 40 -- 2 files changed, 41 deletions(-) diff --git a/net-im/bitlbee-facebook/Manifest b/net-im/bitlbee-facebook/Manifest index 8a4bf1c2b70..9333df4c667 100644 --- a/net-im/bitlbee-facebook/Manifest +++ b/net-im/bitlbee-facebook/Manifest @@ -1,3 +1,2 @@ DIST bitlbee-facebook-1.2.0.tar.gz 71718 BLAKE2B 967e2f4250e92c88a74e32b1ddda8d96327a6e190e4b17e416f20e27e7a07083ae8ff2e2006de6ab114a98d7f81deccf515aec9206a7f0a2470ae67f5c787662 SHA512 b815dcaceb9ee12a68cfe7401da503139ba92cb0396e8d52e5491fed04431d2c6e4cf667bcc6f457bc51b916c8dc1dc43dc277ff0a683a1c0d72a65e819fe5b4 -DIST bitlbee-facebook-1.2.1.tar.gz 71957 BLAKE2B 4694d5ea3df0a52b8dd7506d270f8257ec6950c35b90ed659fe65fa4a82128b3608733227fd1a1bc36c200879067ed3df5fd937efa1fb5932ad660b50cab5122 SHA512 6424931a93695c41816304177f13d3c02c1e7e352f8548a18a1245cc90b151123d31d354147851d56f6b42946c30c43eaefb6d2f296a8078067eb5c65c0da1d5 DIST bitlbee-facebook-1.2.2.tar.gz 71918 BLAKE2B 674cb8565f88faff695d5b14010036f6d3c65bcdab9a6fba84c5f0d775a59d02abfd863be5af4ddc7c3361a49c6345d0ef57bbd8b02202b7e24e62b31c2c6844 SHA512 534e7e704e7ddd296c810819171b9c4770747dde109a9bbdfb41fc05602b1d9ad9bfd2ec6c7a62ffb0c85ec61252b1597217cdee7ccffd191da897a7d40085cc diff --git a/net-im/bitlbee-facebook/bitlbee-facebook-1.2.1.ebuild b/net-im/bitlbee-facebook/bitlbee-facebook-1.2.1.ebuild deleted file mode 100644 index 9e788483c50..000 --- a/net-im/bitlbee-facebook/bitlbee-facebook-1.2.1.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 2017-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools - -DESCRIPTION="Facebook protocol plugin for BitlBee" -HOMEPAGE="https://github.com/bitlbee/bitlbee-facebook; - -LICENSE="GPL-2" -SLOT="0" -IUSE="" - -if [[ ${PV} == * ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/bitlbee/bitlbee-facebook; -else - SRC_URI="https://github.com/bitlbee/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -RDEPEND=" - dev-libs/glib:2 - dev-libs/json-glib - >=net-im/bitlbee-3[plugins]" -DEPEND="${RDEPEND}" -BDEPEND=" - dev-util/glib-utils - virtual/pkgconfig" - -src_prepare() { - default - eautoreconf -} - -src_install() { - default - find "${D}" -name '*.la' -delete || die -}
[gentoo-commits] repo/gentoo:master commit in: net-im/bitlbee-facebook/
commit: 37ffd8ed45f8d54199763eb2eb073fa32045d002 Author: Petr Vaněk atlas cz> AuthorDate: Sun Feb 14 17:36:24 2021 + Commit: Joonas Niilola gentoo org> CommitDate: Mon Feb 22 13:46:40 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37ffd8ed net-im/bitlbee-facebook: bump to 1.2.2 Closes: https://bugs.gentoo.org/769722 Package-Manager: Portage-3.0.13, Repoman-3.0.2 Signed-off-by: Petr Vaněk atlas.cz> Signed-off-by: Joonas Niilola gentoo.org> net-im/bitlbee-facebook/Manifest | 1 + .../bitlbee-facebook/bitlbee-facebook-1.2.2.ebuild | 40 ++ 2 files changed, 41 insertions(+) diff --git a/net-im/bitlbee-facebook/Manifest b/net-im/bitlbee-facebook/Manifest index 067d7e42149..8a4bf1c2b70 100644 --- a/net-im/bitlbee-facebook/Manifest +++ b/net-im/bitlbee-facebook/Manifest @@ -1,2 +1,3 @@ DIST bitlbee-facebook-1.2.0.tar.gz 71718 BLAKE2B 967e2f4250e92c88a74e32b1ddda8d96327a6e190e4b17e416f20e27e7a07083ae8ff2e2006de6ab114a98d7f81deccf515aec9206a7f0a2470ae67f5c787662 SHA512 b815dcaceb9ee12a68cfe7401da503139ba92cb0396e8d52e5491fed04431d2c6e4cf667bcc6f457bc51b916c8dc1dc43dc277ff0a683a1c0d72a65e819fe5b4 DIST bitlbee-facebook-1.2.1.tar.gz 71957 BLAKE2B 4694d5ea3df0a52b8dd7506d270f8257ec6950c35b90ed659fe65fa4a82128b3608733227fd1a1bc36c200879067ed3df5fd937efa1fb5932ad660b50cab5122 SHA512 6424931a93695c41816304177f13d3c02c1e7e352f8548a18a1245cc90b151123d31d354147851d56f6b42946c30c43eaefb6d2f296a8078067eb5c65c0da1d5 +DIST bitlbee-facebook-1.2.2.tar.gz 71918 BLAKE2B 674cb8565f88faff695d5b14010036f6d3c65bcdab9a6fba84c5f0d775a59d02abfd863be5af4ddc7c3361a49c6345d0ef57bbd8b02202b7e24e62b31c2c6844 SHA512 534e7e704e7ddd296c810819171b9c4770747dde109a9bbdfb41fc05602b1d9ad9bfd2ec6c7a62ffb0c85ec61252b1597217cdee7ccffd191da897a7d40085cc diff --git a/net-im/bitlbee-facebook/bitlbee-facebook-1.2.2.ebuild b/net-im/bitlbee-facebook/bitlbee-facebook-1.2.2.ebuild new file mode 100644 index 000..d28c1fce5d9 --- /dev/null +++ b/net-im/bitlbee-facebook/bitlbee-facebook-1.2.2.ebuild @@ -0,0 +1,40 @@ +# Copyright 2017-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools + +DESCRIPTION="Facebook protocol plugin for BitlBee" +HOMEPAGE="https://github.com/bitlbee/bitlbee-facebook; + +LICENSE="GPL-2" +SLOT="0" +IUSE="" + +if [[ ${PV} == * ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/bitlbee/bitlbee-facebook; +else + SRC_URI="https://github.com/bitlbee/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi + +RDEPEND=" + dev-libs/glib:2 + dev-libs/json-glib + >=net-im/bitlbee-3[plugins]" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-util/glib-utils + virtual/pkgconfig" + +src_prepare() { + default + eautoreconf +} + +src_install() { + default + find "${D}" -name '*.la' -delete || die +}
[gentoo-commits] repo/gentoo:master commit in: net-im/bitlbee-facebook/
commit: f393fa69ac2fe01d408c0dcb1a7f005dccf57f27 Author: Petr Vaněk atlas cz> AuthorDate: Fri Nov 20 09:32:14 2020 + Commit: Joonas Niilola gentoo org> CommitDate: Mon Nov 23 13:11:23 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f393fa69 net-im/bitlbee-facebook: bump to 1.2.1 Package-Manager: Portage-3.0.9, Repoman-3.0.2 Signed-off-by: Petr Vaněk atlas.cz> Closes: https://github.com/gentoo/gentoo/pull/18335 Signed-off-by: Joonas Niilola gentoo.org> net-im/bitlbee-facebook/Manifest | 1 + .../bitlbee-facebook/bitlbee-facebook-1.2.1.ebuild | 40 ++ 2 files changed, 41 insertions(+) diff --git a/net-im/bitlbee-facebook/Manifest b/net-im/bitlbee-facebook/Manifest index dc3c19b4b19..067d7e42149 100644 --- a/net-im/bitlbee-facebook/Manifest +++ b/net-im/bitlbee-facebook/Manifest @@ -1 +1,2 @@ DIST bitlbee-facebook-1.2.0.tar.gz 71718 BLAKE2B 967e2f4250e92c88a74e32b1ddda8d96327a6e190e4b17e416f20e27e7a07083ae8ff2e2006de6ab114a98d7f81deccf515aec9206a7f0a2470ae67f5c787662 SHA512 b815dcaceb9ee12a68cfe7401da503139ba92cb0396e8d52e5491fed04431d2c6e4cf667bcc6f457bc51b916c8dc1dc43dc277ff0a683a1c0d72a65e819fe5b4 +DIST bitlbee-facebook-1.2.1.tar.gz 71957 BLAKE2B 4694d5ea3df0a52b8dd7506d270f8257ec6950c35b90ed659fe65fa4a82128b3608733227fd1a1bc36c200879067ed3df5fd937efa1fb5932ad660b50cab5122 SHA512 6424931a93695c41816304177f13d3c02c1e7e352f8548a18a1245cc90b151123d31d354147851d56f6b42946c30c43eaefb6d2f296a8078067eb5c65c0da1d5 diff --git a/net-im/bitlbee-facebook/bitlbee-facebook-1.2.1.ebuild b/net-im/bitlbee-facebook/bitlbee-facebook-1.2.1.ebuild new file mode 100644 index 000..9e788483c50 --- /dev/null +++ b/net-im/bitlbee-facebook/bitlbee-facebook-1.2.1.ebuild @@ -0,0 +1,40 @@ +# Copyright 2017-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools + +DESCRIPTION="Facebook protocol plugin for BitlBee" +HOMEPAGE="https://github.com/bitlbee/bitlbee-facebook; + +LICENSE="GPL-2" +SLOT="0" +IUSE="" + +if [[ ${PV} == * ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/bitlbee/bitlbee-facebook; +else + SRC_URI="https://github.com/bitlbee/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi + +RDEPEND=" + dev-libs/glib:2 + dev-libs/json-glib + >=net-im/bitlbee-3[plugins]" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-util/glib-utils + virtual/pkgconfig" + +src_prepare() { + default + eautoreconf +} + +src_install() { + default + find "${D}" -name '*.la' -delete || die +}
[gentoo-commits] repo/gentoo:master commit in: net-im/bitlbee/, net-im/bitlbee/files/
commit: a6a693598258bfd203fda3274c388263ac8bb24c Author: Sam James gentoo org> AuthorDate: Wed Sep 9 15:55:01 2020 + Commit: Sam James gentoo org> CommitDate: Wed Sep 9 15:55:01 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6a69359 net-im/bitlbee: security cleanup Bug: https://bugs.gentoo.org/631072 Package-Manager: Portage-3.0.4, Repoman-3.0.1 Signed-off-by: Sam James gentoo.org> net-im/bitlbee/Manifest| 1 - net-im/bitlbee/bitlbee-3.5.1.ebuild| 160 - .../bitlbee/files/bitlbee-3.5-verbose-build.patch | 200 - net-im/bitlbee/files/bitlbee.confd-r1 | 8 - net-im/bitlbee/files/bitlbee.initd-r1 | 30 5 files changed, 399 deletions(-) diff --git a/net-im/bitlbee/Manifest b/net-im/bitlbee/Manifest index 89d1716f8e6..062d56d7000 100644 --- a/net-im/bitlbee/Manifest +++ b/net-im/bitlbee/Manifest @@ -1,2 +1 @@ -DIST bitlbee-3.5.1.tar.gz 680351 BLAKE2B 952a12975d4f95020a5b577603aea791fca754006dc96af3c500d3885b6f2c50cabe51ab698625acb717524a729ef03d18a29aa25bd4815bae2f18fa6298aeea SHA512 4eb3b0d3a92910c8dd789cd23338cc6296bf40212c5244fcb27a88ede10e86424ea59c78e719841863701a7fdd8c61819f2775f7b58833e287d9110e49d036f3 DIST bitlbee-3.6.tar.gz 534961 BLAKE2B 007681a384fcb2c0736b901dfdc213ba0829ca006ad3204aca1bc4520a3874760867df6165a9218a9deeabb13bc06f118c9e2f804a97e671a348734f6cb7e963 SHA512 ccbf0f23e228de2de147241f36f59744b2256cba958e2fabfba0cfa60935e55bbb7d7e20fffa54da9a345e55ffa9ca82cb62e9b99dc738ba35c6e268c6561a8d diff --git a/net-im/bitlbee/bitlbee-3.5.1.ebuild b/net-im/bitlbee/bitlbee-3.5.1.ebuild deleted file mode 100644 index 5bae1f674e2..000 --- a/net-im/bitlbee/bitlbee-3.5.1.ebuild +++ /dev/null @@ -1,160 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit systemd toolchain-funcs - -if [[ ${PV} == "" ]]; then - EGIT_REPO_URI="https://github.com/bitlbee/bitlbee.git; - inherit git-r3 -else - SRC_URI="https://get.bitlbee.org/src/${P}.tar.gz; - KEYWORDS="amd64 ppc ~ppc64 x86" -fi - -DESCRIPTION="irc to IM gateway that support multiple IM protocols" -HOMEPAGE="https://www.bitlbee.org/; - -LICENSE="GPL-2" -SLOT="0" -IUSE_PROTOCOLS="msn oscar purple twitter +xmpp" -IUSE="debug +gnutls ipv6 libevent libressl nss otr +plugins selinux test xinetd - ${IUSE_PROTOCOLS}" -RESTRICT="!test? ( test )" - -REQUIRED_USE=" - || ( purple xmpp msn oscar ) - xmpp? ( !nss ) - test? ( plugins ) -" - -COMMON_DEPEND=" - acct-group/bitlbee - acct-user/bitlbee - >=dev-libs/glib-2.16 - purple? ( net-im/pidgin ) - libevent? ( dev-libs/libevent:= ) - otr? ( >=net-libs/libotr-4 ) - gnutls? ( net-libs/gnutls:= ) - !gnutls? ( - nss? ( dev-libs/nss ) - !nss? ( - libressl? ( dev-libs/libressl:= ) - !libressl? ( dev-libs/openssl:0= ) - ) - ) -" -DEPEND="${COMMON_DEPEND} - virtual/pkgconfig - selinux? ( sec-policy/selinux-bitlbee ) - test? ( dev-libs/check )" - -RDEPEND="${COMMON_DEPEND} - virtual/logger - xinetd? ( sys-apps/xinetd )" - -PATCHES=( - "${FILESDIR}"/${PN}-3.5-systemd-user.patch - "${FILESDIR}"/${PN}-3.5-verbose-build.patch - "${FILESDIR}"/${PN}-3.5-libcheck.patch - "${FILESDIR}"/${PN}-3.5-libevent.patch -) - -src_configure() { - local myconf - - # setup plugins, protocol, ipv6 and debug - myconf+=( --jabber=$(usex xmpp 1 0) ) - for flag in debug ipv6 plugins ${IUSE_PROTOCOLS/+xmpp/} ; do - myconf+=( --${flag}=$(usex ${flag} 1 0) ) - done - - # set otr - if use otr && use plugins ; then - myconf+=( --otr=plugin ) - else - if use otr ; then - ewarn "OTR support has been disabled automatically because it" - ewarn "requires the plugins USE flag." - fi - myconf+=( --otr=0 ) - fi - - # setup ssl use flags - if use gnutls ; then - myconf+=( --ssl=gnutls ) - einfo "Using gnutls for SSL support" - else - ewarn "Only gnutls is officially supported by upstream." - if use nss ; then - myconf+=( --ssl=nss ) - einfo "Using nss for SSL support" - else - myconf+=( --ssl=openssl ) - einfo "Using openssl for SSL support" - fi - fi - - # set event handler - if use libevent ; then - myconf+=( --events=libevent ) - else - myconf+=( --events=glib ) - fi - - # not autotools-based - ./configure \ - --prefix=/usr \
[gentoo-commits] repo/gentoo:master commit in: net-im/bitlbee/
commit: 9a8a77a12146dc6c00d29994b82d135525623518 Author: Sergei Trofimovich gentoo org> AuthorDate: Mon Sep 7 08:11:23 2020 + Commit: Sergei Trofimovich gentoo org> CommitDate: Mon Sep 7 08:20:08 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a8a77a1 net-im/bitlbee: stable 3.6-r1 for ppc stable wrt bug #631072 Package-Manager: Portage-3.0.5, Repoman-3.0.1 RepoMan-Options: --include-arches="ppc" Signed-off-by: Sergei Trofimovich gentoo.org> net-im/bitlbee/bitlbee-3.6-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-im/bitlbee/bitlbee-3.6-r1.ebuild b/net-im/bitlbee/bitlbee-3.6-r1.ebuild index 72ae3bbaf19..6d32273ed73 100644 --- a/net-im/bitlbee/bitlbee-3.6-r1.ebuild +++ b/net-im/bitlbee/bitlbee-3.6-r1.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} == "" ]]; then inherit git-r3 else SRC_URI="https://get.bitlbee.org/src/${P}.tar.gz; - KEYWORDS="amd64 ~ppc ~ppc64 x86" + KEYWORDS="amd64 ppc ~ppc64 x86" fi DESCRIPTION="irc to IM gateway that support multiple IM protocols"
[gentoo-commits] repo/gentoo:master commit in: net-im/bitlbee/
commit: 7e9dd3fc5396ac50bb27635bc3f350c880ffcd73 Author: Agostino Sarubbo gentoo org> AuthorDate: Sat Aug 22 11:25:11 2020 + Commit: Agostino Sarubbo gentoo org> CommitDate: Sat Aug 22 11:25:11 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e9dd3fc net-im/bitlbee: amd64 stable wrt bug #631072 Package-Manager: Portage-2.3.103, Repoman-2.3.23 RepoMan-Options: --include-arches="amd64" Signed-off-by: Agostino Sarubbo gentoo.org> net-im/bitlbee/bitlbee-3.6-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-im/bitlbee/bitlbee-3.6-r1.ebuild b/net-im/bitlbee/bitlbee-3.6-r1.ebuild index afd58f14014..72ae3bbaf19 100644 --- a/net-im/bitlbee/bitlbee-3.6-r1.ebuild +++ b/net-im/bitlbee/bitlbee-3.6-r1.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} == "" ]]; then inherit git-r3 else SRC_URI="https://get.bitlbee.org/src/${P}.tar.gz; - KEYWORDS="~amd64 ~ppc ~ppc64 x86" + KEYWORDS="amd64 ~ppc ~ppc64 x86" fi DESCRIPTION="irc to IM gateway that support multiple IM protocols"
[gentoo-commits] repo/gentoo:master commit in: net-im/bitlbee/
commit: 31df14659b52e7608523d8d03ae97e97776d0986 Author: Agostino Sarubbo gentoo org> AuthorDate: Sat Aug 22 05:48:43 2020 + Commit: Agostino Sarubbo gentoo org> CommitDate: Sat Aug 22 05:48:43 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31df1465 net-im/bitlbee: x86 stable wrt bug #631072 Package-Manager: Portage-2.3.103, Repoman-2.3.23 RepoMan-Options: --include-arches="x86" Signed-off-by: Agostino Sarubbo gentoo.org> net-im/bitlbee/bitlbee-3.6-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-im/bitlbee/bitlbee-3.6-r1.ebuild b/net-im/bitlbee/bitlbee-3.6-r1.ebuild index 28e2ef6bf5e..afd58f14014 100644 --- a/net-im/bitlbee/bitlbee-3.6-r1.ebuild +++ b/net-im/bitlbee/bitlbee-3.6-r1.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} == "" ]]; then inherit git-r3 else SRC_URI="https://get.bitlbee.org/src/${P}.tar.gz; - KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" + KEYWORDS="~amd64 ~ppc ~ppc64 x86" fi DESCRIPTION="irc to IM gateway that support multiple IM protocols"
[gentoo-commits] repo/gentoo:master commit in: net-im/bitlbee/
commit: 5be52125efb92ff18bc1292022040a9608ad67a5 Author: Petr Vaněk atlas cz> AuthorDate: Mon Feb 10 22:49:31 2020 + Commit: Joonas Niilola gentoo org> CommitDate: Tue May 5 08:46:34 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5be52125 net-im/bitlbee: use acct-{group,user}/bitlbee Signed-off-by: Petr Vaněk atlas.cz> Signed-off-by: Joonas Niilola gentoo.org> net-im/bitlbee/bitlbee-3.5.1.ebuild | 11 --- net-im/bitlbee/bitlbee-3.6.ebuild | 11 --- net-im/bitlbee/bitlbee-.ebuild | 11 --- 3 files changed, 12 insertions(+), 21 deletions(-) diff --git a/net-im/bitlbee/bitlbee-3.5.1.ebuild b/net-im/bitlbee/bitlbee-3.5.1.ebuild index 3ce9cca1ef2..4d724abf2b8 100644 --- a/net-im/bitlbee/bitlbee-3.5.1.ebuild +++ b/net-im/bitlbee/bitlbee-3.5.1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit user systemd toolchain-funcs +inherit systemd toolchain-funcs if [[ ${PV} == "" ]]; then EGIT_REPO_URI="https://github.com/bitlbee/bitlbee.git; @@ -30,6 +30,8 @@ REQUIRED_USE=" " COMMON_DEPEND=" + acct-group/bitlbee + acct-user/bitlbee >=dev-libs/glib-2.16 purple? ( net-im/pidgin ) libevent? ( dev-libs/libevent:= ) @@ -52,11 +54,6 @@ RDEPEND="${COMMON_DEPEND} virtual/logger xinetd? ( sys-apps/xinetd )" -pkg_setup() { - enewgroup bitlbee - enewuser bitlbee -1 -1 /var/lib/bitlbee bitlbee -} - src_prepare() { if [[ ${PV} != "" ]]; then eapply \ diff --git a/net-im/bitlbee/bitlbee-3.6.ebuild b/net-im/bitlbee/bitlbee-3.6.ebuild index 9df170295b6..6643e1c5920 100644 --- a/net-im/bitlbee/bitlbee-3.6.ebuild +++ b/net-im/bitlbee/bitlbee-3.6.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit user systemd toolchain-funcs +inherit systemd toolchain-funcs if [[ ${PV} == "" ]]; then EGIT_REPO_URI="https://github.com/bitlbee/bitlbee.git; @@ -30,6 +30,8 @@ REQUIRED_USE=" " COMMON_DEPEND=" + acct-group/bitlbee + acct-user/bitlbee >=dev-libs/glib-2.16 purple? ( net-im/pidgin ) libevent? ( dev-libs/libevent:= ) @@ -51,11 +53,6 @@ DEPEND="${COMMON_DEPEND} RDEPEND="${COMMON_DEPEND} xinetd? ( sys-apps/xinetd )" -pkg_setup() { - enewgroup bitlbee - enewuser bitlbee -1 -1 /var/lib/bitlbee bitlbee -} - src_prepare() { [[ ${PV} != "" ]] && eapply "${FILESDIR}"/${PN}-3.5-systemd-user.patch eapply_user diff --git a/net-im/bitlbee/bitlbee-.ebuild b/net-im/bitlbee/bitlbee-.ebuild index 9df170295b6..6643e1c5920 100644 --- a/net-im/bitlbee/bitlbee-.ebuild +++ b/net-im/bitlbee/bitlbee-.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit user systemd toolchain-funcs +inherit systemd toolchain-funcs if [[ ${PV} == "" ]]; then EGIT_REPO_URI="https://github.com/bitlbee/bitlbee.git; @@ -30,6 +30,8 @@ REQUIRED_USE=" " COMMON_DEPEND=" + acct-group/bitlbee + acct-user/bitlbee >=dev-libs/glib-2.16 purple? ( net-im/pidgin ) libevent? ( dev-libs/libevent:= ) @@ -51,11 +53,6 @@ DEPEND="${COMMON_DEPEND} RDEPEND="${COMMON_DEPEND} xinetd? ( sys-apps/xinetd )" -pkg_setup() { - enewgroup bitlbee - enewuser bitlbee -1 -1 /var/lib/bitlbee bitlbee -} - src_prepare() { [[ ${PV} != "" ]] && eapply "${FILESDIR}"/${PN}-3.5-systemd-user.patch eapply_user
[gentoo-commits] repo/gentoo:master commit in: net-im/bitlbee/, net-im/bitlbee/files/
commit: 52be431756a9deb44aaadf779905d9a12a30595a Author: Petr Vaněk atlas cz> AuthorDate: Fri May 1 09:43:04 2020 + Commit: Joonas Niilola gentoo org> CommitDate: Tue May 5 08:46:34 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52be4317 net-im/bitlbee: fix libcheck and libevent bugs Both patches are taken from upstream. Closes: https://bugs.gentoo.org/690504 Closes: https://bugs.gentoo.org/711364 Package-Manager: Portage-2.3.89, Repoman-2.3.20 Signed-off-by: Petr Vaněk atlas.cz> Signed-off-by: Joonas Niilola gentoo.org> net-im/bitlbee/bitlbee-3.5.1.ebuild | 15 +- net-im/bitlbee/bitlbee-3.6.ebuild | 9 +- net-im/bitlbee/files/bitlbee-3.5-libcheck.patch | 645 net-im/bitlbee/files/bitlbee-3.5-libevent.patch | 71 +++ 4 files changed, 727 insertions(+), 13 deletions(-) diff --git a/net-im/bitlbee/bitlbee-3.5.1.ebuild b/net-im/bitlbee/bitlbee-3.5.1.ebuild index 4d724abf2b8..b637b82642c 100644 --- a/net-im/bitlbee/bitlbee-3.5.1.ebuild +++ b/net-im/bitlbee/bitlbee-3.5.1.ebuild @@ -54,15 +54,12 @@ RDEPEND="${COMMON_DEPEND} virtual/logger xinetd? ( sys-apps/xinetd )" -src_prepare() { - if [[ ${PV} != "" ]]; then - eapply \ - "${FILESDIR}"/${PN}-3.5-systemd-user.patch \ - "${FILESDIR}"/${PN}-3.5-verbose-build.patch - fi - - eapply_user -} +PATCHES=( + "${FILESDIR}"/${PN}-3.5-systemd-user.patch + "${FILESDIR}"/${PN}-3.5-verbose-build.patch + "${FILESDIR}"/${PN}-3.5-libcheck.patch + "${FILESDIR}"/${PN}-3.5-libevent.patch +) src_configure() { local myconf diff --git a/net-im/bitlbee/bitlbee-3.6.ebuild b/net-im/bitlbee/bitlbee-3.6.ebuild index 6643e1c5920..3fba9718c97 100644 --- a/net-im/bitlbee/bitlbee-3.6.ebuild +++ b/net-im/bitlbee/bitlbee-3.6.ebuild @@ -53,10 +53,11 @@ DEPEND="${COMMON_DEPEND} RDEPEND="${COMMON_DEPEND} xinetd? ( sys-apps/xinetd )" -src_prepare() { - [[ ${PV} != "" ]] && eapply "${FILESDIR}"/${PN}-3.5-systemd-user.patch - eapply_user -} +PATCHES=( + "${FILESDIR}"/${PN}-3.5-systemd-user.patch + "${FILESDIR}"/${PN}-3.5-libcheck.patch + "${FILESDIR}"/${PN}-3.5-libevent.patch +) src_configure() { local myconf diff --git a/net-im/bitlbee/files/bitlbee-3.5-libcheck.patch b/net-im/bitlbee/files/bitlbee-3.5-libcheck.patch new file mode 100644 index 000..474789e5e1c --- /dev/null +++ b/net-im/bitlbee/files/bitlbee-3.5-libcheck.patch @@ -0,0 +1,645 @@ +diff --git a/tests/check_arc.c b/tests/check_arc.c +index 9fcd4b25..c7e1dfef 100644 +--- a/tests/check_arc.c b/tests/check_arc.c +@@ -17,7 +17,7 @@ char *clear_tests[] = + NULL + }; + +-static void check_codec(int l) ++START_TEST(check_codec) + { + int i; + +@@ -37,6 +37,7 @@ static void check_codec(int l) + g_free(decrypted); + } + } ++END_TEST + + struct { + unsigned char crypted[30]; +@@ -72,7 +73,7 @@ struct { + { "", 0, NULL } + }; + +-static void check_decod(int l) ++START_TEST(check_decod) + { + int i; + +@@ -92,6 +93,7 @@ static void check_decod(int l) + g_free(decrypted); + } + } ++END_TEST + + Suite *arc_suite(void) + { +diff --git a/tests/check_help.c b/tests/check_help.c +index 92d7c28f..ccf136a4 100644 +--- a/tests/check_help.c b/tests/check_help.c +@@ -7,20 +7,24 @@ + #include "help.h" + + START_TEST(test_help_initfree) +-help_t * h, *r; +-r = help_init(, "/dev/null"); +-fail_if(r == NULL); +-fail_if(r != h); ++{ ++help_t * h, *r; ++r = help_init(, "/dev/null"); ++fail_if(r == NULL); ++fail_if(r != h); + +-help_free(); +-fail_if(h != NULL); ++help_free(); ++fail_if(h != NULL); ++} + END_TEST + + START_TEST(test_help_nonexistent) +-help_t * h, *r; +-r = help_init(, "/dev/null"); +-fail_unless(help_get(, "nonexistent") == NULL); +-fail_if(r == NULL); ++{ ++help_t * h, *r; ++r = help_init(, "/dev/null"); ++fail_unless(help_get(, "nonexistent") == NULL); ++fail_if(r == NULL); ++} + END_TEST + + Suite *help_suite(void) +diff --git a/tests/check_irc.c b/tests/check_irc.c +index 5c940729..e2054106 100644 +--- a/tests/check_irc.c b/tests/check_irc.c +@@ -8,49 +8,53 @@ + #include "testsuite.h" + + START_TEST(test_connect) +-GIOChannel * ch1, *ch2; +-irc_t *irc; +-char *raw; +-fail_unless(g_io_channel_pair(, )); ++{ ++GIOChannel * ch1, *ch2; ++irc_t *irc; ++char *raw; ++fail_unless(g_io_channel_pair(, )); + +-irc = irc_new(g_io_channel_unix_get_fd(ch1)); ++irc = irc_new(g_io_channel_unix_get_fd(ch1)); + +-irc_free(irc); ++irc_free(irc); + +-fail_unless(g_io_channel_read_to_end(ch2, , NULL, NULL) == G_IO_STATUS_NORMAL); ++fail_unless(g_io_channel_read_to_end(ch2, , NULL, NULL) == G_IO_STATUS_NORMAL); + +-fail_if(strcmp(raw, "") != 0); ++fail_if(strcmp(raw, "") != 0); +
[gentoo-commits] repo/gentoo:master commit in: net-im/bitlbee/
commit: 0ddaa64969647c4bd4aab17526408c31fd1e8685 Author: Petr Vaněk atlas cz> AuthorDate: Mon Mar 16 21:42:43 2020 + Commit: Joonas Niilola gentoo org> CommitDate: Tue May 5 08:46:34 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ddaa649 net-im/bitlbee: add myself as a maintainer Signed-off-by: Petr Vaněk atlas.cz> Signed-off-by: Joonas Niilola gentoo.org> net-im/bitlbee/metadata.xml | 9 - 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/net-im/bitlbee/metadata.xml b/net-im/bitlbee/metadata.xml index 9cb8be28fed..6ecb78d5688 100644 --- a/net-im/bitlbee/metadata.xml +++ b/net-im/bitlbee/metadata.xml @@ -1,7 +1,14 @@ http://www.gentoo.org/dtd/metadata.dtd;> - + + arka...@atlas.cz + Petr Vaněk + + + proxy-ma...@gentoo.org + Proxy Maintainers + Use libevent for event handling Enable MSN Messenger IM protocol support.
[gentoo-commits] repo/gentoo:master commit in: net-im/bitlbee/
commit: ed6f485c2830f0ae5ba116cc440dfab05bdaa7db Author: Petr Vaněk atlas cz> AuthorDate: Fri May 1 12:04:33 2020 + Commit: Joonas Niilola gentoo org> CommitDate: Tue May 5 08:46:35 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed6f485c net-im/bitlbee: remove unnecessary chown from pkg_postinst phase Closes: https://bugs.gentoo.org/630912 Package-Manager: Portage-2.3.89, Repoman-2.3.20 Signed-off-by: Petr Vaněk atlas.cz> Closes: https://github.com/gentoo/gentoo/pull/14984 Signed-off-by: Joonas Niilola gentoo.org> net-im/bitlbee/bitlbee-3.5.1.ebuild | 4 net-im/bitlbee/bitlbee-3.6-r1.ebuild | 4 net-im/bitlbee/bitlbee-.ebuild | 4 3 files changed, 12 deletions(-) diff --git a/net-im/bitlbee/bitlbee-3.5.1.ebuild b/net-im/bitlbee/bitlbee-3.5.1.ebuild index b637b82642c..5bae1f674e2 100644 --- a/net-im/bitlbee/bitlbee-3.5.1.ebuild +++ b/net-im/bitlbee/bitlbee-3.5.1.ebuild @@ -147,10 +147,6 @@ src_install() { } pkg_postinst() { - chown -R bitlbee:bitlbee "${ROOT}"/var/lib/bitlbee - [[ -d "${ROOT}"/var/run/bitlbee ]] && - chown -R bitlbee:bitlbee "${ROOT}"/var/run/bitlbee - if [[ -z ${REPLACING_VERSIONS} ]]; then einfo elog "The bitlbee init script will now attempt to stop all processes owned by the" diff --git a/net-im/bitlbee/bitlbee-3.6-r1.ebuild b/net-im/bitlbee/bitlbee-3.6-r1.ebuild index 847614625a9..28e2ef6bf5e 100644 --- a/net-im/bitlbee/bitlbee-3.6-r1.ebuild +++ b/net-im/bitlbee/bitlbee-3.6-r1.ebuild @@ -150,7 +150,3 @@ src_install() { exeinto /usr/share/bitlbee doexe utils/{convert_purple.py,bitlbee-ctl.pl} } - -pkg_postinst() { - chown -R bitlbee:bitlbee "${ROOT}"/var/lib/bitlbee -} diff --git a/net-im/bitlbee/bitlbee-.ebuild b/net-im/bitlbee/bitlbee-.ebuild index 37efbe6e16b..b76660b5f28 100644 --- a/net-im/bitlbee/bitlbee-.ebuild +++ b/net-im/bitlbee/bitlbee-.ebuild @@ -148,7 +148,3 @@ src_install() { exeinto /usr/share/bitlbee doexe utils/{convert_purple.py,bitlbee-ctl.pl} } - -pkg_postinst() { - chown -R bitlbee:bitlbee "${ROOT}"/var/lib/bitlbee -}
[gentoo-commits] repo/gentoo:master commit in: net-im/bitlbee/
commit: 05ff2b3241b7facf365ecf15b9d0db1ed7d020c2 Author: Petr Vaněk atlas cz> AuthorDate: Fri May 1 09:46:19 2020 + Commit: Joonas Niilola gentoo org> CommitDate: Tue May 5 08:46:35 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05ff2b32 net-im/bitlbee: fix dependencies in live ebuild Package-Manager: Portage-2.3.89, Repoman-2.3.20 Signed-off-by: Petr Vaněk atlas.cz> Signed-off-by: Joonas Niilola gentoo.org> net-im/bitlbee/bitlbee-.ebuild | 24 +++- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/net-im/bitlbee/bitlbee-.ebuild b/net-im/bitlbee/bitlbee-.ebuild index 6643e1c5920..37efbe6e16b 100644 --- a/net-im/bitlbee/bitlbee-.ebuild +++ b/net-im/bitlbee/bitlbee-.ebuild @@ -3,7 +3,9 @@ EAPI=7 -inherit systemd toolchain-funcs +PYTHON_COMPAT=( python3_{6..8} ) + +inherit python-any-r1 systemd toolchain-funcs if [[ ${PV} == "" ]]; then EGIT_REPO_URI="https://github.com/bitlbee/bitlbee.git; @@ -32,7 +34,7 @@ REQUIRED_USE=" COMMON_DEPEND=" acct-group/bitlbee acct-user/bitlbee - >=dev-libs/glib-2.16 + dev-libs/glib:2 purple? ( net-im/pidgin ) libevent? ( dev-libs/libevent:= ) otr? ( >=net-libs/libotr-4 ) @@ -46,17 +48,21 @@ COMMON_DEPEND=" ) " DEPEND="${COMMON_DEPEND} - virtual/pkgconfig selinux? ( sec-policy/selinux-bitlbee ) - test? ( dev-libs/check )" + test? ( dev-libs/check ) +" RDEPEND="${COMMON_DEPEND} - xinetd? ( sys-apps/xinetd )" + xinetd? ( sys-apps/xinetd ) +" -src_prepare() { - [[ ${PV} != "" ]] && eapply "${FILESDIR}"/${PN}-3.5-systemd-user.patch - eapply_user -} +BDEPEND="${PYTHON_DEPS} + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}"/${PN}-3.5-systemd-user.patch +) src_configure() { local myconf
[gentoo-commits] repo/gentoo:master commit in: net-im/bitlbee/
commit: c5ddc78302bcf975d0b4b2724a828aad5da94c2c Author: Petr Vaněk atlas cz> AuthorDate: Fri May 1 09:49:03 2020 + Commit: Joonas Niilola gentoo org> CommitDate: Tue May 5 08:46:35 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5ddc783 net-im/bitlbee: sync 3.6 with live ebuild Package-Manager: Portage-2.3.89, Repoman-2.3.20 Signed-off-by: Petr Vaněk atlas.cz> Signed-off-by: Joonas Niilola gentoo.org> .../{bitlbee-3.6.ebuild => bitlbee-3.6-r1.ebuild} | 17 - 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/net-im/bitlbee/bitlbee-3.6.ebuild b/net-im/bitlbee/bitlbee-3.6-r1.ebuild similarity index 94% rename from net-im/bitlbee/bitlbee-3.6.ebuild rename to net-im/bitlbee/bitlbee-3.6-r1.ebuild index 3fba9718c97..847614625a9 100644 --- a/net-im/bitlbee/bitlbee-3.6.ebuild +++ b/net-im/bitlbee/bitlbee-3.6-r1.ebuild @@ -3,7 +3,9 @@ EAPI=7 -inherit systemd toolchain-funcs +PYTHON_COMPAT=( python3_{6..8} ) + +inherit python-any-r1 systemd toolchain-funcs if [[ ${PV} == "" ]]; then EGIT_REPO_URI="https://github.com/bitlbee/bitlbee.git; @@ -32,7 +34,7 @@ REQUIRED_USE=" COMMON_DEPEND=" acct-group/bitlbee acct-user/bitlbee - >=dev-libs/glib-2.16 + dev-libs/glib:2 purple? ( net-im/pidgin ) libevent? ( dev-libs/libevent:= ) otr? ( >=net-libs/libotr-4 ) @@ -46,12 +48,17 @@ COMMON_DEPEND=" ) " DEPEND="${COMMON_DEPEND} - virtual/pkgconfig selinux? ( sec-policy/selinux-bitlbee ) - test? ( dev-libs/check )" + test? ( dev-libs/check ) +" RDEPEND="${COMMON_DEPEND} - xinetd? ( sys-apps/xinetd )" + xinetd? ( sys-apps/xinetd ) +" + +BDEPEND="${PYTHON_DEPS} + virtual/pkgconfig +" PATCHES=( "${FILESDIR}"/${PN}-3.5-systemd-user.patch
[gentoo-commits] repo/gentoo:master commit in: net-im/bitlbee-facebook/
commit: b5698529f078a691dcd4a3fd6527fb275d6d3a6b Author: Petr Vaněk atlas cz> AuthorDate: Sat Nov 23 18:07:16 2019 + Commit: Michał Górny gentoo org> CommitDate: Sat Nov 23 18:48:33 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5698529 net-im/bitlbee-facebook: drop old version Package-Manager: Portage-2.3.76, Repoman-2.3.16 Signed-off-by: Petr Vaněk atlas.cz> Closes: https://github.com/gentoo/gentoo/pull/13745 Signed-off-by: Michał Górny gentoo.org> net-im/bitlbee-facebook/Manifest | 1 - .../bitlbee-facebook/bitlbee-facebook-1.1.2.ebuild | 39 -- 2 files changed, 40 deletions(-) diff --git a/net-im/bitlbee-facebook/Manifest b/net-im/bitlbee-facebook/Manifest index b5f01ba7b49..dc3c19b4b19 100644 --- a/net-im/bitlbee-facebook/Manifest +++ b/net-im/bitlbee-facebook/Manifest @@ -1,2 +1 @@ -DIST bitlbee-facebook-1.1.2.tar.gz 67269 BLAKE2B 7f6b9c3706a6955d49dd79e7ee25e252679838468011a5044b0e8fa140cd7d144fca86ef9d65fccb65b9c1844348dcca292a3cde16c9371264e252d28dc1cbf8 SHA512 3e27935cd4c8c1d55de9dfe9d6fd1e7aef1bf410e64c711436875ddfb83f67f1da0055af3b279d2d6627bafe438a7689e280c2bfd51ec4f64cf7c614182003da DIST bitlbee-facebook-1.2.0.tar.gz 71718 BLAKE2B 967e2f4250e92c88a74e32b1ddda8d96327a6e190e4b17e416f20e27e7a07083ae8ff2e2006de6ab114a98d7f81deccf515aec9206a7f0a2470ae67f5c787662 SHA512 b815dcaceb9ee12a68cfe7401da503139ba92cb0396e8d52e5491fed04431d2c6e4cf667bcc6f457bc51b916c8dc1dc43dc277ff0a683a1c0d72a65e819fe5b4 diff --git a/net-im/bitlbee-facebook/bitlbee-facebook-1.1.2.ebuild b/net-im/bitlbee-facebook/bitlbee-facebook-1.1.2.ebuild deleted file mode 100644 index 5e6c0743780..000 --- a/net-im/bitlbee-facebook/bitlbee-facebook-1.1.2.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 2017-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools - -DESCRIPTION="Facebook protocol plugin for BitlBee" -HOMEPAGE="https://github.com/bitlbee/bitlbee-facebook; - -LICENSE="GPL-2" -SLOT="0" -IUSE="" - -if [[ ${PV} == * ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/bitlbee/bitlbee-facebook; -else - SRC_URI="https://github.com/bitlbee/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -RDEPEND=" - dev-libs/glib:2 - dev-libs/json-glib - >=net-im/bitlbee-3[plugins]" -DEPEND="${RDEPEND} - dev-util/glib-utils - virtual/pkgconfig" - -src_prepare() { - default - eautoreconf -} - -src_install() { - default - find "${D}" -name '*.la' -delete || die -}
[gentoo-commits] repo/gentoo:master commit in: net-im/bitlbee-facebook/
commit: 4301e8751257443638f01c42877a0d037522b933 Author: Agostino Sarubbo gentoo org> AuthorDate: Fri Nov 22 10:24:31 2019 + Commit: Agostino Sarubbo gentoo org> CommitDate: Fri Nov 22 10:24:31 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4301e875 net-im/bitlbee-facebook: amd64 stable wrt bug #700814 Package-Manager: Portage-2.3.76, Repoman-2.3.16 RepoMan-Options: --include-arches="amd64" Signed-off-by: Agostino Sarubbo gentoo.org> net-im/bitlbee-facebook/bitlbee-facebook-1.2.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-im/bitlbee-facebook/bitlbee-facebook-1.2.0.ebuild b/net-im/bitlbee-facebook/bitlbee-facebook-1.2.0.ebuild index f7a43704ab5..19c6f0abccc 100644 --- a/net-im/bitlbee-facebook/bitlbee-facebook-1.2.0.ebuild +++ b/net-im/bitlbee-facebook/bitlbee-facebook-1.2.0.ebuild @@ -17,7 +17,7 @@ if [[ ${PV} == * ]] ; then EGIT_REPO_URI="https://github.com/bitlbee/bitlbee-facebook; else SRC_URI="https://github.com/bitlbee/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" + KEYWORDS="amd64 ~x86" fi RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: net-im/bitlbee/
commit: b88db9002a8eb1fb3f8a16c57912955e5f7c Author: Petr Vaněk atlas cz> AuthorDate: Tue Nov 5 13:01:32 2019 + Commit: Joonas Niilola gentoo org> CommitDate: Wed Nov 20 14:39:40 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b88db900 net-im/bitlbee: Install pkgconfig to /usr/$(get_libdir)/pkgconfig This commit indirectly solves issues #678128 and #678510 because pkg-config searches bitlbee.pc in /usr/lib64/pkgconfig by default for ARCH=amd64. Closes: https://bugs.gentoo.org/678128 Closes: https://bugs.gentoo.org/678510 Package-Manager: Portage-2.3.76, Repoman-2.3.16 Signed-off-by: Petr Vaněk atlas.cz> Closes: https://github.com/gentoo/gentoo/pull/13554 Signed-off-by: Joonas Niilola gentoo.org> net-im/bitlbee/bitlbee-3.5.1.ebuild | 3 ++- net-im/bitlbee/bitlbee-3.6.ebuild | 1 + net-im/bitlbee/bitlbee-.ebuild | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/net-im/bitlbee/bitlbee-3.5.1.ebuild b/net-im/bitlbee/bitlbee-3.5.1.ebuild index c6145c59a2f..1e09301af29 100644 --- a/net-im/bitlbee/bitlbee-3.5.1.ebuild +++ b/net-im/bitlbee/bitlbee-3.5.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -114,6 +114,7 @@ src_configure() { --datadir=/usr/share/bitlbee \ --etcdir=/etc/bitlbee \ --plugindir=/usr/$(get_libdir)/bitlbee \ + --pcdir=/usr/$(get_libdir)/pkgconfig \ --systemdsystemunitdir=$(systemd_get_systemunitdir) \ --doc=1 \ --strip=0 \ diff --git a/net-im/bitlbee/bitlbee-3.6.ebuild b/net-im/bitlbee/bitlbee-3.6.ebuild index 4969b10a633..9df170295b6 100644 --- a/net-im/bitlbee/bitlbee-3.6.ebuild +++ b/net-im/bitlbee/bitlbee-3.6.ebuild @@ -109,6 +109,7 @@ src_configure() { --datadir=/usr/share/bitlbee \ --etcdir=/etc/bitlbee \ --plugindir=/usr/$(get_libdir)/bitlbee \ + --pcdir=/usr/$(get_libdir)/pkgconfig \ --systemdsystemunitdir=$(systemd_get_systemunitdir) \ --doc=1 \ --strip=0 \ diff --git a/net-im/bitlbee/bitlbee-.ebuild b/net-im/bitlbee/bitlbee-.ebuild index 4969b10a633..9df170295b6 100644 --- a/net-im/bitlbee/bitlbee-.ebuild +++ b/net-im/bitlbee/bitlbee-.ebuild @@ -109,6 +109,7 @@ src_configure() { --datadir=/usr/share/bitlbee \ --etcdir=/etc/bitlbee \ --plugindir=/usr/$(get_libdir)/bitlbee \ + --pcdir=/usr/$(get_libdir)/pkgconfig \ --systemdsystemunitdir=$(systemd_get_systemunitdir) \ --doc=1 \ --strip=0 \
[gentoo-commits] repo/gentoo:master commit in: net-im/bitlbee/
commit: 6cdb4f1aa5eea729c866db0a54d683a790848664 Author: Tim Harder gentoo org> AuthorDate: Mon Nov 18 05:01:10 2019 + Commit: Tim Harder gentoo org> CommitDate: Mon Nov 18 05:01:10 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6cdb4f1a net-im/bitlbee: drop myself as a maintainer Signed-off-by: Tim Harder gentoo.org> net-im/bitlbee/metadata.xml | 5 + 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/net-im/bitlbee/metadata.xml b/net-im/bitlbee/metadata.xml index e28610b3c86..9cb8be28fed 100644 --- a/net-im/bitlbee/metadata.xml +++ b/net-im/bitlbee/metadata.xml @@ -1,10 +1,7 @@ http://www.gentoo.org/dtd/metadata.dtd;> - - radher...@gentoo.org - Tim Harder - + Use libevent for event handling Enable MSN Messenger IM protocol support.
[gentoo-commits] repo/gentoo:master commit in: net-im/bitlbee/, net-im/gajim/, net-im/silc-toolkit/, net-im/jabber-base/, ...
commit: 4187381af0431d7d82e15ed10145a10286939596 Author: Michał Górny gentoo org> AuthorDate: Fri Oct 11 15:36:43 2019 + Commit: Michał Górny gentoo org> CommitDate: Fri Oct 11 15:36:43 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4187381a net-im: Remove *-fbsd KEYWORDS Signed-off-by: Michał Górny gentoo.org> net-im/bitlbee/bitlbee-3.5.1.ebuild| 2 +- net-im/bitlbee/bitlbee-3.6.ebuild | 2 +- net-im/bitlbee/bitlbee-.ebuild | 2 +- net-im/centerim/centerim-5.0.1.ebuild | 2 +- net-im/gajim/gajim-1.0.3-r1.ebuild | 2 +- net-im/gajim/gajim-1.0.3.ebuild| 2 +- net-im/gajim/gajim-1.1.3.ebuild| 2 +- net-im/jabber-base/jabber-base-0.01-r1.ebuild | 2 +- net-im/jabber-base/jabber-base-0.01.ebuild | 2 +- net-im/silc-toolkit/silc-toolkit-1.1.10.ebuild | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/net-im/bitlbee/bitlbee-3.5.1.ebuild b/net-im/bitlbee/bitlbee-3.5.1.ebuild index e1536d6244b..c6145c59a2f 100644 --- a/net-im/bitlbee/bitlbee-3.5.1.ebuild +++ b/net-im/bitlbee/bitlbee-3.5.1.ebuild @@ -10,7 +10,7 @@ if [[ ${PV} == "" ]]; then inherit git-r3 else SRC_URI="https://get.bitlbee.org/src/${P}.tar.gz; - KEYWORDS="amd64 ppc ~ppc64 x86 ~x86-fbsd" + KEYWORDS="amd64 ppc ~ppc64 x86" fi DESCRIPTION="irc to IM gateway that support multiple IM protocols" diff --git a/net-im/bitlbee/bitlbee-3.6.ebuild b/net-im/bitlbee/bitlbee-3.6.ebuild index 1108861dd62..4969b10a633 100644 --- a/net-im/bitlbee/bitlbee-3.6.ebuild +++ b/net-im/bitlbee/bitlbee-3.6.ebuild @@ -10,7 +10,7 @@ if [[ ${PV} == "" ]]; then inherit git-r3 else SRC_URI="https://get.bitlbee.org/src/${P}.tar.gz; - KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd" + KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" fi DESCRIPTION="irc to IM gateway that support multiple IM protocols" diff --git a/net-im/bitlbee/bitlbee-.ebuild b/net-im/bitlbee/bitlbee-.ebuild index 1108861dd62..4969b10a633 100644 --- a/net-im/bitlbee/bitlbee-.ebuild +++ b/net-im/bitlbee/bitlbee-.ebuild @@ -10,7 +10,7 @@ if [[ ${PV} == "" ]]; then inherit git-r3 else SRC_URI="https://get.bitlbee.org/src/${P}.tar.gz; - KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd" + KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" fi DESCRIPTION="irc to IM gateway that support multiple IM protocols" diff --git a/net-im/centerim/centerim-5.0.1.ebuild b/net-im/centerim/centerim-5.0.1.ebuild index a98925568fb..e0696b89523 100644 --- a/net-im/centerim/centerim-5.0.1.ebuild +++ b/net-im/centerim/centerim-5.0.1.ebuild @@ -10,7 +10,7 @@ SRC_URI="http://www.centerim.org/download/cim5/${MY_P}.tar.gz; HOMEPAGE="http://www.centerim.org/; SLOT="0" LICENSE="GPL-2" -KEYWORDS="amd64 x86 ~x86-fbsd" +KEYWORDS="amd64 x86" IUSE="debug nls" DEPEND=">=sys-libs/ncurses-5.2:= diff --git a/net-im/gajim/gajim-1.0.3-r1.ebuild b/net-im/gajim/gajim-1.0.3-r1.ebuild index 0ea841d01b3..d6499db4218 100644 --- a/net-im/gajim/gajim-1.0.3-r1.ebuild +++ b/net-im/gajim/gajim-1.0.3-r1.ebuild @@ -15,7 +15,7 @@ SRC_URI="https://www.gajim.org/downloads/$(get_version_component_range 1-2)/${P} LICENSE="GPL-3" SLOT="0" -#KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd" +#KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86" KEYWORDS="~amd64 ~x86" IUSE="+crypt geolocation jingle keyring networkmanager remote rst +spell upnp +webp" diff --git a/net-im/gajim/gajim-1.0.3.ebuild b/net-im/gajim/gajim-1.0.3.ebuild index 0727b7f841e..c7c78054cdc 100644 --- a/net-im/gajim/gajim-1.0.3.ebuild +++ b/net-im/gajim/gajim-1.0.3.ebuild @@ -15,7 +15,7 @@ SRC_URI="https://www.gajim.org/downloads/$(get_version_component_range 1-2)/${P} LICENSE="GPL-3" SLOT="0" -#KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd" +#KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86" KEYWORDS="amd64 x86" IUSE="+crypt geolocation jingle keyring networkmanager remote rst +spell upnp +webp" diff --git a/net-im/gajim/gajim-1.1.3.ebuild b/net-im/gajim/gajim-1.1.3.ebuild index 54f26a180be..ac975f29dde 100644 --- a/net-im/gajim/gajim-1.1.3.ebuild +++ b/net-im/gajim/gajim-1.1.3.ebuild @@ -15,7 +15,7 @@ SRC_URI="https://www.gajim.org/downloads/$(ver_cut 1-2)/${P}.tar.bz2" LICENSE="GPL-3" SLOT="0" -#KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd" +#KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86" KEYWORDS="~amd64 ~x86" IUSE="+crypt geolocation jingle networkmanager remote rst +spell upnp +webp" diff --git a/net-im/jabber-base/jabber-base-0.01-r1.ebuild b/net-im/jabber-base/jabber-base-0.01-r1.ebuild index 381c463e51d..efafd06a286 100644 --- a/net-im/jabber-base/jabber-base-0.01-r1.ebuild +++ b/net-im/jabber-base/jabber-base-0.01-r1.ebuild @@ -11,7 +11,7 @@ HOMEPAGE="https://www.gentoo.org/; LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc sparc x86 ~x86-fbsd" +KEYWORDS="~alpha amd64 ~arm
[gentoo-commits] repo/gentoo:master commit in: net-im/bitlbee/
commit: 0f0797171bb98c75e9a43c41d39950b5e5ad8d8a Author: Michał Górny gentoo org> AuthorDate: Sun Sep 15 14:40:14 2019 + Commit: Michał Górny gentoo org> CommitDate: Sun Sep 15 14:40:14 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f079717 net-im/bitlbee: Make USE=msn local Signed-off-by: Michał Górny gentoo.org> net-im/bitlbee/metadata.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/net-im/bitlbee/metadata.xml b/net-im/bitlbee/metadata.xml index 7f107c38de1..225bb51bb89 100644 --- a/net-im/bitlbee/metadata.xml +++ b/net-im/bitlbee/metadata.xml @@ -7,6 +7,7 @@ Use libevent for event handling + Enable MSN Messenger IM protocol support. Use NSS for SSL support in MSN and Jabber Enable support for encrypted conversations Enable support for plugins
[gentoo-commits] repo/gentoo:master commit in: net-im/bitlbee/
commit: 0407a3fbc28ac25a27768a9e23d35880d7e854be Author: Michał Górny gentoo org> AuthorDate: Sun Sep 15 14:41:29 2019 + Commit: Michał Górny gentoo org> CommitDate: Sun Sep 15 14:41:29 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0407a3fb net-im/bitlbee: Make USE=oscar local Signed-off-by: Michał Górny gentoo.org> net-im/bitlbee/metadata.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/net-im/bitlbee/metadata.xml b/net-im/bitlbee/metadata.xml index 225bb51bb89..e28610b3c86 100644 --- a/net-im/bitlbee/metadata.xml +++ b/net-im/bitlbee/metadata.xml @@ -9,6 +9,7 @@ Use libevent for event handling Enable MSN Messenger IM protocol support. Use NSS for SSL support in MSN and Jabber + Enable Oscar (AIM/ICQ) IM protocol support Enable support for encrypted conversations Enable support for plugins Use libpurple instead of the built-in IM protocol support
[gentoo-commits] repo/gentoo:master commit in: net-im/bitlbee/
commit: ddcc35e599c3b242297d1ba8db548f26881b7865 Author: Tim Harder gentoo org> AuthorDate: Wed Aug 14 23:12:45 2019 + Commit: Tim Harder gentoo org> CommitDate: Wed Aug 14 23:14:41 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ddcc35e5 net-im/bitlbee: add missing conditional test RESTRICT Signed-off-by: Tim Harder gentoo.org> net-im/bitlbee/bitlbee-3.6.ebuild | 1 + net-im/bitlbee/bitlbee-.ebuild | 1 + 2 files changed, 2 insertions(+) diff --git a/net-im/bitlbee/bitlbee-3.6.ebuild b/net-im/bitlbee/bitlbee-3.6.ebuild index 703647ae05d..1108861dd62 100644 --- a/net-im/bitlbee/bitlbee-3.6.ebuild +++ b/net-im/bitlbee/bitlbee-3.6.ebuild @@ -21,6 +21,7 @@ SLOT="0" IUSE_PROTOCOLS="msn oscar purple twitter +xmpp" IUSE="debug +gnutls ipv6 libevent libressl nss otr +plugins selinux test xinetd ${IUSE_PROTOCOLS}" +RESTRICT="!test? ( test )" REQUIRED_USE=" || ( purple xmpp msn oscar ) diff --git a/net-im/bitlbee/bitlbee-.ebuild b/net-im/bitlbee/bitlbee-.ebuild index 703647ae05d..1108861dd62 100644 --- a/net-im/bitlbee/bitlbee-.ebuild +++ b/net-im/bitlbee/bitlbee-.ebuild @@ -21,6 +21,7 @@ SLOT="0" IUSE_PROTOCOLS="msn oscar purple twitter +xmpp" IUSE="debug +gnutls ipv6 libevent libressl nss otr +plugins selinux test xinetd ${IUSE_PROTOCOLS}" +RESTRICT="!test? ( test )" REQUIRED_USE=" || ( purple xmpp msn oscar )
[gentoo-commits] repo/gentoo:master commit in: net-im/bitlbee/, net-im/bitlbee/files/
commit: 73ccf4a6bbacf812ff1d4da6e5e7f30de7d67aa4 Author: Tim Harder gentoo org> AuthorDate: Sun Feb 10 04:41:45 2019 + Commit: Tim Harder gentoo org> CommitDate: Sun Feb 10 04:46:03 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73ccf4a6 net-im/bitlbee: version bump to 3.6 Also, simplify the init script. Bug: https://bugs.gentoo.org/631072 Closes: https://bugs.gentoo.org/640126 Signed-off-by: Tim Harder gentoo.org> net-im/bitlbee/Manifest| 1 + .../{bitlbee-.ebuild => bitlbee-3.6.ebuild}| 29 -- net-im/bitlbee/bitlbee-.ebuild | 29 -- net-im/bitlbee/files/bitlbee.confd-r2 | 7 ++ net-im/bitlbee/files/bitlbee.initd-r2 | 7 ++ 5 files changed, 25 insertions(+), 48 deletions(-) diff --git a/net-im/bitlbee/Manifest b/net-im/bitlbee/Manifest index 3176cc89495..89d1716f8e6 100644 --- a/net-im/bitlbee/Manifest +++ b/net-im/bitlbee/Manifest @@ -1 +1,2 @@ DIST bitlbee-3.5.1.tar.gz 680351 BLAKE2B 952a12975d4f95020a5b577603aea791fca754006dc96af3c500d3885b6f2c50cabe51ab698625acb717524a729ef03d18a29aa25bd4815bae2f18fa6298aeea SHA512 4eb3b0d3a92910c8dd789cd23338cc6296bf40212c5244fcb27a88ede10e86424ea59c78e719841863701a7fdd8c61819f2775f7b58833e287d9110e49d036f3 +DIST bitlbee-3.6.tar.gz 534961 BLAKE2B 007681a384fcb2c0736b901dfdc213ba0829ca006ad3204aca1bc4520a3874760867df6165a9218a9deeabb13bc06f118c9e2f804a97e671a348734f6cb7e963 SHA512 ccbf0f23e228de2de147241f36f59744b2256cba958e2fabfba0cfa60935e55bbb7d7e20fffa54da9a345e55ffa9ca82cb62e9b99dc738ba35c6e268c6561a8d diff --git a/net-im/bitlbee/bitlbee-.ebuild b/net-im/bitlbee/bitlbee-3.6.ebuild similarity index 80% copy from net-im/bitlbee/bitlbee-.ebuild copy to net-im/bitlbee/bitlbee-3.6.ebuild index ba55773394d..703647ae05d 100644 --- a/net-im/bitlbee/bitlbee-.ebuild +++ b/net-im/bitlbee/bitlbee-3.6.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit user systemd toolchain-funcs @@ -48,7 +48,6 @@ DEPEND="${COMMON_DEPEND} test? ( dev-libs/check )" RDEPEND="${COMMON_DEPEND} - virtual/logger xinetd? ( sys-apps/xinetd )" pkg_setup() { @@ -57,12 +56,7 @@ pkg_setup() { } src_prepare() { - if [[ ${PV} != "" ]]; then - eapply \ - "${FILESDIR}"/${P}-systemd-user.patch \ - "${FILESDIR}"/${P}-verbose-build.patch - fi - + [[ ${PV} != "" ]] && eapply "${FILESDIR}"/${PN}-3.5-systemd-user.patch eapply_user } @@ -143,8 +137,8 @@ src_install() { newins doc/bitlbee.xinetd bitlbee fi - newinitd "${FILESDIR}"/bitlbee.initd-r1 bitlbee - newconfd "${FILESDIR}"/bitlbee.confd-r1 bitlbee + newinitd "${FILESDIR}"/bitlbee.initd-r2 bitlbee + newconfd "${FILESDIR}"/bitlbee.confd-r2 bitlbee exeinto /usr/share/bitlbee doexe utils/{convert_purple.py,bitlbee-ctl.pl} @@ -152,17 +146,4 @@ src_install() { pkg_postinst() { chown -R bitlbee:bitlbee "${ROOT}"/var/lib/bitlbee - [[ -d "${ROOT}"/var/run/bitlbee ]] && - chown -R bitlbee:bitlbee "${ROOT}"/var/run/bitlbee - - if [[ -z ${REPLACING_VERSIONS} ]]; then - einfo - elog "The bitlbee init script will now attempt to stop all processes owned by the" - elog "bitlbee user, including per-client forks." - elog - elog "Tell the init script not to touch anything besides the main bitlbee process" - elog "by changing the BITLBEE_STOP_ALL variable in" - elog " /etc/conf.d/bitlbee" - einfo - fi } diff --git a/net-im/bitlbee/bitlbee-.ebuild b/net-im/bitlbee/bitlbee-.ebuild index ba55773394d..703647ae05d 100644 --- a/net-im/bitlbee/bitlbee-.ebuild +++ b/net-im/bitlbee/bitlbee-.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit user systemd toolchain-funcs @@ -48,7 +48,6 @@ DEPEND="${COMMON_DEPEND} test? ( dev-libs/check )" RDEPEND="${COMMON_DEPEND} - virtual/logger xinetd? ( sys-apps/xinetd )" pkg_setup() { @@ -57,12 +56,7 @@ pkg_setup() { } src_prepare() { - if [[ ${PV} != "" ]]; then - eapply \ - "${FILESDIR}"/${P}-systemd-user.patch \ - "${FILESDIR}"/${P}-verbose-build.patch - fi - + [[ ${PV} != "" ]] && eapply "${FILESDIR}"/${PN}-3.5-systemd-user.patch eapply_user } @@ -143,8 +137,8 @@ src_install() { newins doc/bitlbee.xinetd bitlbee fi -
[gentoo-commits] repo/gentoo:master commit in: net-im/bitlbee-facebook/
commit: 50e2653ecf22445cbc7340ada7771b2fdf4ece24 Author: Petr Vaněk atlas cz> AuthorDate: Thu Jan 24 12:34:40 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Feb 3 14:07:52 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50e2653e net-im/bitlbee-facebook: Version bump 1.2.0 Package-Manager: Portage-2.3.51, Repoman-2.3.11 Signed-off-by: Petr Vaněk atlas.cz> Closes: https://github.com/gentoo/gentoo/pull/10902 Signed-off-by: Andreas Sturmlechner gentoo.org> net-im/bitlbee-facebook/Manifest | 1 + .../bitlbee-facebook/bitlbee-facebook-1.2.0.ebuild | 40 ++ 2 files changed, 41 insertions(+) diff --git a/net-im/bitlbee-facebook/Manifest b/net-im/bitlbee-facebook/Manifest index ea4b2be0563..b5f01ba7b49 100644 --- a/net-im/bitlbee-facebook/Manifest +++ b/net-im/bitlbee-facebook/Manifest @@ -1 +1,2 @@ DIST bitlbee-facebook-1.1.2.tar.gz 67269 BLAKE2B 7f6b9c3706a6955d49dd79e7ee25e252679838468011a5044b0e8fa140cd7d144fca86ef9d65fccb65b9c1844348dcca292a3cde16c9371264e252d28dc1cbf8 SHA512 3e27935cd4c8c1d55de9dfe9d6fd1e7aef1bf410e64c711436875ddfb83f67f1da0055af3b279d2d6627bafe438a7689e280c2bfd51ec4f64cf7c614182003da +DIST bitlbee-facebook-1.2.0.tar.gz 71718 BLAKE2B 967e2f4250e92c88a74e32b1ddda8d96327a6e190e4b17e416f20e27e7a07083ae8ff2e2006de6ab114a98d7f81deccf515aec9206a7f0a2470ae67f5c787662 SHA512 b815dcaceb9ee12a68cfe7401da503139ba92cb0396e8d52e5491fed04431d2c6e4cf667bcc6f457bc51b916c8dc1dc43dc277ff0a683a1c0d72a65e819fe5b4 diff --git a/net-im/bitlbee-facebook/bitlbee-facebook-1.2.0.ebuild b/net-im/bitlbee-facebook/bitlbee-facebook-1.2.0.ebuild new file mode 100644 index 000..f7a43704ab5 --- /dev/null +++ b/net-im/bitlbee-facebook/bitlbee-facebook-1.2.0.ebuild @@ -0,0 +1,40 @@ +# Copyright 2017-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools + +DESCRIPTION="Facebook protocol plugin for BitlBee" +HOMEPAGE="https://github.com/bitlbee/bitlbee-facebook; + +LICENSE="GPL-2" +SLOT="0" +IUSE="" + +if [[ ${PV} == * ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/bitlbee/bitlbee-facebook; +else + SRC_URI="https://github.com/bitlbee/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi + +RDEPEND=" + dev-libs/glib:2 + dev-libs/json-glib + >=net-im/bitlbee-3[plugins]" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-util/glib-utils + virtual/pkgconfig" + +src_prepare() { + default + eautoreconf +} + +src_install() { + default + find "${D}" -name '*.la' -delete || die +}
[gentoo-commits] repo/gentoo:master commit in: net-im/bitlbee-facebook/
commit: 3fc9223b932b06582fdc954ee161467837e9 Author: Petr Vaněk atlas cz> AuthorDate: Tue Nov 20 07:35:26 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri Jan 18 11:00:57 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3fc9223b net-im/bitlbee-facebook: add missing dep on dev-util/glib-utils #668448 Closes: https://bugs.gentoo.org/668448 Package-Manager: Portage-2.3.51, Repoman-2.3.11 Signed-off-by: Petr Vaněk atlas.cz> Closes: https://github.com/gentoo/gentoo/pull/10453 Signed-off-by: Andreas Sturmlechner gentoo.org> net-im/bitlbee-facebook/bitlbee-facebook-1.1.2.ebuild | 3 ++- net-im/bitlbee-facebook/bitlbee-facebook-.ebuild | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/net-im/bitlbee-facebook/bitlbee-facebook-1.1.2.ebuild b/net-im/bitlbee-facebook/bitlbee-facebook-1.1.2.ebuild index be0c1efdefc..5e6c0743780 100644 --- a/net-im/bitlbee-facebook/bitlbee-facebook-1.1.2.ebuild +++ b/net-im/bitlbee-facebook/bitlbee-facebook-1.1.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 2017 Gentoo Foundation +# Copyright 2017-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -25,6 +25,7 @@ RDEPEND=" dev-libs/json-glib >=net-im/bitlbee-3[plugins]" DEPEND="${RDEPEND} + dev-util/glib-utils virtual/pkgconfig" src_prepare() { diff --git a/net-im/bitlbee-facebook/bitlbee-facebook-.ebuild b/net-im/bitlbee-facebook/bitlbee-facebook-.ebuild index be0c1efdefc..5e6c0743780 100644 --- a/net-im/bitlbee-facebook/bitlbee-facebook-.ebuild +++ b/net-im/bitlbee-facebook/bitlbee-facebook-.ebuild @@ -1,4 +1,4 @@ -# Copyright 2017 Gentoo Foundation +# Copyright 2017-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -25,6 +25,7 @@ RDEPEND=" dev-libs/json-glib >=net-im/bitlbee-3[plugins]" DEPEND="${RDEPEND} + dev-util/glib-utils virtual/pkgconfig" src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: net-im/bitlbee-facebook/
commit: 3a0fb0d2a102d12c6dbe70d21e41f0064cf810ca Author: Petr Vaněk atlas cz> AuthorDate: Thu Jan 17 10:02:29 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri Jan 18 11:00:57 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a0fb0d2 net-im/bitlbee-facebook: bump to EAPI=7 in Package-Manager: Portage-2.3.51, Repoman-2.3.11 Signed-off-by: Petr Vaněk atlas.cz> Signed-off-by: Andreas Sturmlechner gentoo.org> net-im/bitlbee-facebook/bitlbee-facebook-.ebuild | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/net-im/bitlbee-facebook/bitlbee-facebook-.ebuild b/net-im/bitlbee-facebook/bitlbee-facebook-.ebuild index 5e6c0743780..f7a43704ab5 100644 --- a/net-im/bitlbee-facebook/bitlbee-facebook-.ebuild +++ b/net-im/bitlbee-facebook/bitlbee-facebook-.ebuild @@ -1,7 +1,7 @@ # Copyright 2017-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit autotools @@ -24,7 +24,8 @@ RDEPEND=" dev-libs/glib:2 dev-libs/json-glib >=net-im/bitlbee-3[plugins]" -DEPEND="${RDEPEND} +DEPEND="${RDEPEND}" +BDEPEND=" dev-util/glib-utils virtual/pkgconfig"
[gentoo-commits] repo/gentoo:master commit in: net-im/bitlbee-facebook/, net-im/silc-toolkit/, net-im/pyaim-t/, ...
commit: f9da8da24f658e38e8985ce9bca5e06493d74881 Author: Michał Górny gentoo org> AuthorDate: Sun Dec 10 11:19:31 2017 + Commit: Michał Górny gentoo org> CommitDate: Sun Dec 10 11:19:31 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9da8da2 net-im/*: Update Manifest hashes net-im/ayttm/Manifest | 2 +- net-im/bitlbee-facebook/Manifest | 2 +- net-im/bitlbee-steam/Manifest | 4 ++-- net-im/bitlbee/Manifest | 2 +- net-im/centerim/Manifest | 4 ++-- net-im/choqok/Manifest| 2 +- net-im/climm/Manifest | 2 +- net-im/coccinella/Manifest| 2 +- net-im/corebird/Manifest | 14 +++--- net-im/coturn/Manifest| 4 ++-- net-im/cpop/Manifest | 2 +- net-im/dianara/Manifest | 2 +- net-im/discord-bin/Manifest | 2 +- net-im/ejabberd/Manifest | 6 +++--- net-im/ekg2/Manifest | 2 +- net-im/empathy/Manifest | 4 ++-- net-im/err/Manifest | 2 +- net-im/gajim/Manifest | 4 ++-- net-im/gg-transport/Manifest | 4 ++-- net-im/gitter-bin/Manifest| 4 ++-- net-im/jabberd2/Manifest | 2 +- net-im/kadu/Manifest | 4 ++-- net-im/kouchat/Manifest | 4 ++-- net-im/librvp/Manifest| 4 ++-- net-im/mattermost-desktop-bin/Manifest| 24 net-im/mcabber/Manifest | 4 ++-- net-im/minbif/Manifest| 2 +- net-im/mu-conference/Manifest | 2 +- net-im/openfire/Manifest | 6 +++--- net-im/pidgin/Manifest| 6 +++--- net-im/pork/Manifest | 2 +- net-im/prosody/Manifest | 8 net-im/psi/Manifest | 8 net-im/purple-events/Manifest | 4 ++-- net-im/pyaim-t/Manifest | 2 +- net-im/pyicq-t/Manifest | 2 +- net-im/qtox/Manifest | 4 ++-- net-im/reaim/Manifest | 2 +- net-im/sendxmpp/Manifest | 4 ++-- net-im/silc-toolkit/Manifest | 2 +- net-im/slack-bin/Manifest | 12 ++-- net-im/telegram-desktop-bin/Manifest | 12 ++-- net-im/telepathy-logger/Manifest | 4 ++-- net-im/telepathy-mission-control/Manifest | 2 +- net-im/tkabber/Manifest | 4 ++-- net-im/toxic/Manifest | 6 +++--- net-im/turses/Manifest| 2 +- net-im/vacuum/Manifest| 2 +- net-im/ysm/Manifest | 2 +- 49 files changed, 106 insertions(+), 106 deletions(-) diff --git a/net-im/ayttm/Manifest b/net-im/ayttm/Manifest index eab53d6a4ba..781aa412335 100644 --- a/net-im/ayttm/Manifest +++ b/net-im/ayttm/Manifest @@ -1 +1 @@ -DIST ayttm-0.6.3.tar.bz2 1377010 SHA256 2c48d3b8183139e7657c03dab9d17c997077624fd97a177d932f80ee6c596157 SHA512 8480b9e6b6e1c45a3cdd16d991ebf7e12c400d282243f5f44715ba20d4db4523a0343fe49016f7dba3e1a23d963eef52fbb0823c27aedec0db33457319138270 WHIRLPOOL f0a49a588d1aacc5e9d0338f18a32078933cd15f841fa87c33377ab2173bbf6c70eb5758dcd3e499fe5756da4968e4e7f669a62e008b5a3e8f4c0be746ae2b75 +DIST ayttm-0.6.3.tar.bz2 1377010 BLAKE2B 692bac07386783f98a4e873b93f8c2a088fb954f39613ec47d151433e59b578f532f80d47b6dc7caab789ea06024a4a82d0f0c8264963d19c076e1b524495b19 SHA512 8480b9e6b6e1c45a3cdd16d991ebf7e12c400d282243f5f44715ba20d4db4523a0343fe49016f7dba3e1a23d963eef52fbb0823c27aedec0db33457319138270 diff --git a/net-im/bitlbee-facebook/Manifest b/net-im/bitlbee-facebook/Manifest index 428cd382857..ea4b2be0563 100644 --- a/net-im/bitlbee-facebook/Manifest +++ b/net-im/bitlbee-facebook/Manifest @@ -1 +1 @@ -DIST bitlbee-facebook-1.1.2.tar.gz 67269 SHA256 dc4294d84b9f9d3e50cc1548000eafb518dfdb86bf8ecbf4261729e4e3472407 SHA512 3e27935cd4c8c1d55de9dfe9d6fd1e7aef1bf410e64c711436875ddfb83f67f1da0055af3b279d2d6627bafe438a7689e280c2bfd51ec4f64cf7c614182003da WHIRLPOOL b3213740a03a60287d4d9c38366c622e512c8ffb40296143ea0bff5fd0f576de3e247ac52cd0ba61024a0e4d86c0ae1b8f7d6d589b0e1d006c7b3fe48c80fc4c +DIST bitlbee-facebook-1.1.2.tar.gz 67269 BLAKE2B 7f6b9c3706a6955d49dd79e7ee25e252679838468011a5044b0e8fa140cd7d144fca86ef9d65fccb65b9c1844348dcca292a3cde16c9371264e252d28dc1cbf8 SHA512 3e27935cd4c8c1d55de9dfe9d6fd1e7aef1bf410e64c711436875ddfb83f67f1da0055af3b279d2d6627bafe438a7689e280c2bfd51ec4f64cf7c614182003da diff --git a/net-im/bitlbee-steam/Manifest b/net-im/bitlbee-steam/Manifest index c1e9cb80818..edac75b8000 100644 --- a/net-im/bitlbee-steam/Manifest +++ b/net-im/bitlbee-steam/Manifest @@ -1,2 +1,2 @@ -DIST
[gentoo-commits] repo/gentoo:master commit in: net-im/bitlbee-facebook/
commit: 61413c4e36893de158a1f3e58b606c4ac1032f6d Author: Petr Vaněk atlas cz> AuthorDate: Fri Nov 17 17:06:02 2017 + Commit: David Seifert gentoo org> CommitDate: Fri Nov 17 18:38:44 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61413c4e net-im/bitlbee-facebook: New ebuild Closes: https://bugs.gentoo.org/550184 Package-Manager: Portage-2.3.13, Repoman-2.3.3 net-im/bitlbee-facebook/Manifest | 1 + .../bitlbee-facebook/bitlbee-facebook-1.1.2.ebuild | 38 ++ .../bitlbee-facebook/bitlbee-facebook-.ebuild | 38 ++ net-im/bitlbee-facebook/metadata.xml | 24 ++ 4 files changed, 101 insertions(+) diff --git a/net-im/bitlbee-facebook/Manifest b/net-im/bitlbee-facebook/Manifest new file mode 100644 index 000..428cd382857 --- /dev/null +++ b/net-im/bitlbee-facebook/Manifest @@ -0,0 +1 @@ +DIST bitlbee-facebook-1.1.2.tar.gz 67269 SHA256 dc4294d84b9f9d3e50cc1548000eafb518dfdb86bf8ecbf4261729e4e3472407 SHA512 3e27935cd4c8c1d55de9dfe9d6fd1e7aef1bf410e64c711436875ddfb83f67f1da0055af3b279d2d6627bafe438a7689e280c2bfd51ec4f64cf7c614182003da WHIRLPOOL b3213740a03a60287d4d9c38366c622e512c8ffb40296143ea0bff5fd0f576de3e247ac52cd0ba61024a0e4d86c0ae1b8f7d6d589b0e1d006c7b3fe48c80fc4c diff --git a/net-im/bitlbee-facebook/bitlbee-facebook-1.1.2.ebuild b/net-im/bitlbee-facebook/bitlbee-facebook-1.1.2.ebuild new file mode 100644 index 000..be0c1efdefc --- /dev/null +++ b/net-im/bitlbee-facebook/bitlbee-facebook-1.1.2.ebuild @@ -0,0 +1,38 @@ +# Copyright 2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit autotools + +DESCRIPTION="Facebook protocol plugin for BitlBee" +HOMEPAGE="https://github.com/bitlbee/bitlbee-facebook; + +LICENSE="GPL-2" +SLOT="0" +IUSE="" + +if [[ ${PV} == * ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/bitlbee/bitlbee-facebook; +else + SRC_URI="https://github.com/bitlbee/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi + +RDEPEND=" + dev-libs/glib:2 + dev-libs/json-glib + >=net-im/bitlbee-3[plugins]" +DEPEND="${RDEPEND} + virtual/pkgconfig" + +src_prepare() { + default + eautoreconf +} + +src_install() { + default + find "${D}" -name '*.la' -delete || die +} diff --git a/net-im/bitlbee-facebook/bitlbee-facebook-.ebuild b/net-im/bitlbee-facebook/bitlbee-facebook-.ebuild new file mode 100644 index 000..be0c1efdefc --- /dev/null +++ b/net-im/bitlbee-facebook/bitlbee-facebook-.ebuild @@ -0,0 +1,38 @@ +# Copyright 2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit autotools + +DESCRIPTION="Facebook protocol plugin for BitlBee" +HOMEPAGE="https://github.com/bitlbee/bitlbee-facebook; + +LICENSE="GPL-2" +SLOT="0" +IUSE="" + +if [[ ${PV} == * ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/bitlbee/bitlbee-facebook; +else + SRC_URI="https://github.com/bitlbee/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi + +RDEPEND=" + dev-libs/glib:2 + dev-libs/json-glib + >=net-im/bitlbee-3[plugins]" +DEPEND="${RDEPEND} + virtual/pkgconfig" + +src_prepare() { + default + eautoreconf +} + +src_install() { + default + find "${D}" -name '*.la' -delete || die +} diff --git a/net-im/bitlbee-facebook/metadata.xml b/net-im/bitlbee-facebook/metadata.xml new file mode 100644 index 000..6aab9ecf858 --- /dev/null +++ b/net-im/bitlbee-facebook/metadata.xml @@ -0,0 +1,24 @@ + +http://www.gentoo.org/dtd/metadata.dtd;> + + + arka...@atlas.cz + Petr Vaněk + + + proxy-ma...@gentoo.org + Proxy Maintainers + + + The Facebook protocol plugin for bitlbee. This plugin uses the Facebook + Mobile API. + + + + jgebo...@gmail.com + James Geboski + + https://github.com/bitlbee/bitlbee-facebook/issues + bitlbee/bitlbee-facebook + +
[gentoo-commits] repo/gentoo:master commit in: net-im/bitlbee/
commit: eb108d8b5224d9986d607b683ec8bcd6c9e56633 Author: Tim Harder gentoo org> AuthorDate: Mon Sep 11 06:42:26 2017 + Commit: Tim Harder gentoo org> CommitDate: Mon Sep 11 06:43:53 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb108d8b net-im/bitlbee: force plugins to be enabled for tests Closes: https://bugs.gentoo.org/show_bug.cgi?id=617604 net-im/bitlbee/bitlbee-3.5.1.ebuild | 1 + net-im/bitlbee/bitlbee-.ebuild | 1 + 2 files changed, 2 insertions(+) diff --git a/net-im/bitlbee/bitlbee-3.5.1.ebuild b/net-im/bitlbee/bitlbee-3.5.1.ebuild index e3a92df4294..e1536d6244b 100644 --- a/net-im/bitlbee/bitlbee-3.5.1.ebuild +++ b/net-im/bitlbee/bitlbee-3.5.1.ebuild @@ -25,6 +25,7 @@ IUSE="debug +gnutls ipv6 libevent libressl nss otr +plugins selinux test xinetd REQUIRED_USE=" || ( purple xmpp msn oscar ) xmpp? ( !nss ) + test? ( plugins ) " COMMON_DEPEND=" diff --git a/net-im/bitlbee/bitlbee-.ebuild b/net-im/bitlbee/bitlbee-.ebuild index 8a915ec5c38..ba55773394d 100644 --- a/net-im/bitlbee/bitlbee-.ebuild +++ b/net-im/bitlbee/bitlbee-.ebuild @@ -25,6 +25,7 @@ IUSE="debug +gnutls ipv6 libevent libressl nss otr +plugins selinux test xinetd REQUIRED_USE=" || ( purple xmpp msn oscar ) xmpp? ( !nss ) + test? ( plugins ) " COMMON_DEPEND="
[gentoo-commits] repo/gentoo:master commit in: net-im/bitlbee-steam/
commit: b5bf85e9ba537b25c10253cb007e7fc45c570eba Author: Tim Harder gentoo org> AuthorDate: Fri Aug 18 02:14:50 2017 + Commit: Tim Harder gentoo org> CommitDate: Fri Aug 18 02:15:52 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5bf85e9 net-im/bitlbee-steam: version bump to 1.4.2 Bug #580786 by Alex Xu. net-im/bitlbee-steam/Manifest | 1 + net-im/bitlbee-steam/bitlbee-steam-1.4.2.ebuild | 37 + net-im/bitlbee-steam/bitlbee-steam-.ebuild | 34 +++ net-im/bitlbee-steam/metadata.xml | 4 +-- 4 files changed, 57 insertions(+), 19 deletions(-) diff --git a/net-im/bitlbee-steam/Manifest b/net-im/bitlbee-steam/Manifest index af5b2af784c..c1e9cb80818 100644 --- a/net-im/bitlbee-steam/Manifest +++ b/net-im/bitlbee-steam/Manifest @@ -1 +1,2 @@ DIST bitlbee-steam-1.2.0.tar.gz 40277 SHA256 ffcfbaf4aef55e78470fc8102554dc190a43d3a5cf6c055188f26036c8fb3a11 SHA512 706f22193d7a22dcbcaa6a07d2dcd4707b666d9a831a9864949ce9a6f2a1db33d3a07f94b3cde9a8d6042fd53caa07b1f87749f87b146d88793578cca997adee WHIRLPOOL e8b69dbbdcc07a82fc75e270bb431611f4de0b1e96ef0756adff4d20cc0656828b159b8973ea9b1d735ae9a641882e1fcb68a8ce9513cb605be3e26eca22a5da +DIST bitlbee-steam-1.4.2.tar.gz 43003 SHA256 fced6878906e14d96f899d362620de17c41a7fb84c2460068a9c08fc6904de38 SHA512 c8acf584052246112b76c433e26805ade204802173147b9f1b73778f1300557df41ab97562a1cfbc20ad1bb0288718d62c03f90b7d11a9faf4d647938009ee48 WHIRLPOOL 37f6070dc9d6dc9a81cc4791ce0333162a75dc582a5113a0e7040437a600cf6dc6dafa972b71c4883e9ebc5737b11ab7a1cac187e6cf860191a7635619780be8 diff --git a/net-im/bitlbee-steam/bitlbee-steam-1.4.2.ebuild b/net-im/bitlbee-steam/bitlbee-steam-1.4.2.ebuild new file mode 100644 index 000..c0ec7c0ca9c --- /dev/null +++ b/net-im/bitlbee-steam/bitlbee-steam-1.4.2.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit ltprune autotools + +if [[ ${PV} == "" ]] ; then + EGIT_REPO_URI="https://github.com/bitlbee/bitlbee-steam.git; + inherit git-r3 +else + SRC_URI="https://github.com/bitlbee/bitlbee-steam/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi + +DESCRIPTION="Steam protocol plugin for BitlBee" +HOMEPAGE="https://github.com/bitlbee/bitlbee-steam; + +LICENSE="GPL-2+" +SLOT="0" + +RDEPEND=" + dev-libs/glib:2 + dev-libs/libgcrypt:0= + >=net-im/bitlbee-3.4[plugins]" +DEPEND="${RDEPEND} + virtual/pkgconfig" + +src_prepare() { + default + eautoreconf +} + +src_install() { + default + prune_libtool_files --modules +} diff --git a/net-im/bitlbee-steam/bitlbee-steam-.ebuild b/net-im/bitlbee-steam/bitlbee-steam-.ebuild index 680b1000596..c0ec7c0ca9c 100644 --- a/net-im/bitlbee-steam/bitlbee-steam-.ebuild +++ b/net-im/bitlbee-steam/bitlbee-steam-.ebuild @@ -1,37 +1,37 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=6 -inherit eutils autotools git-2 +inherit ltprune autotools + +if [[ ${PV} == "" ]] ; then + EGIT_REPO_URI="https://github.com/bitlbee/bitlbee-steam.git; + inherit git-r3 +else + SRC_URI="https://github.com/bitlbee/bitlbee-steam/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi DESCRIPTION="Steam protocol plugin for BitlBee" -HOMEPAGE="https://github.com/jgeboski/bitlbee-steam; -EGIT_REPO_URI="https://github.com/jgeboski/bitlbee-steam.git; +HOMEPAGE="https://github.com/bitlbee/bitlbee-steam; -LICENSE="GPL-2 LGPL-2.1 BSD-2" +LICENSE="GPL-2+" SLOT="0" -KEYWORDS="" -IUSE="debug" RDEPEND=" dev-libs/glib:2 - dev-libs/libgpg-error - >=net-im/bitlbee-3.2.1[plugins]" + dev-libs/libgcrypt:0= + >=net-im/bitlbee-3.4[plugins]" DEPEND="${RDEPEND} virtual/pkgconfig" src_prepare() { + default eautoreconf } -src_configure() { - econf \ - $(use_enable debug) \ - --enable-minimal-flags -} - src_install() { default - prune_libtool_files + prune_libtool_files --modules } diff --git a/net-im/bitlbee-steam/metadata.xml b/net-im/bitlbee-steam/metadata.xml index 7a7128a8844..6b674f5fd99 100644 --- a/net-im/bitlbee-steam/metadata.xml +++ b/net-im/bitlbee-steam/metadata.xml @@ -12,7 +12,7 @@ jgebo...@gmail.com James Geboski - https://github.com/jgeboski/bitlbee-steam/issues - jgeboski/bitlbee-steam + https://github.com/bitlbee/bitlbee-steam/issues + bitlbee/bitlbee-steam
[gentoo-commits] repo/gentoo:master commit in: net-im/bitlbee/, net-im/bitlbee/files/
commit: 5b9fcf6070aa5835ef7e8f597d6065ecc66e125e Author: Tim Harder gentoo org> AuthorDate: Sun Apr 2 06:11:49 2017 + Commit: Tim Harder gentoo org> CommitDate: Sun Apr 2 06:11:49 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b9fcf60 net-im/bitlbee: remove old net-im/bitlbee/Manifest| 2 - net-im/bitlbee/bitlbee-3.4.2-r1.ebuild | 157 --- net-im/bitlbee/bitlbee-3.5-r1.ebuild | 167 - net-im/bitlbee/files/bitlbee-3.2.1-configure.patch | 17 --- .../bitlbee/files/bitlbee-3.4.2-systemd-user.patch | 10 -- 5 files changed, 353 deletions(-) diff --git a/net-im/bitlbee/Manifest b/net-im/bitlbee/Manifest index 09af66d4a68..232c35070d5 100644 --- a/net-im/bitlbee/Manifest +++ b/net-im/bitlbee/Manifest @@ -1,3 +1 @@ -DIST bitlbee-3.4.2.tar.gz 719456 SHA256 69c85554def74f314e3b6e390389a30b0e748f23ef37883e9d7545ee2c45ea57 SHA512 2b839c014cfad037d815aa0e0867dda1b4628ff076d8de6fec1e80ab1499bca565d9afbe104929d492ff68c86b745cc3f76acbeba102766d656f2d359b70302e WHIRLPOOL 43803ba2bbe6297e05e465912d22b0547bb0f9c3cd184a6c0c924dc023b9d505e3666aa732de83c79249e59aa0e2d6f621ee15c508ccc17eed1898b755f0112e DIST bitlbee-3.5.1.tar.gz 680351 SHA256 9636d7fd89ebb3756c13a9a3387736ca6d56ccf66ec0580d512f07b21db0fa69 SHA512 4eb3b0d3a92910c8dd789cd23338cc6296bf40212c5244fcb27a88ede10e86424ea59c78e719841863701a7fdd8c61819f2775f7b58833e287d9110e49d036f3 WHIRLPOOL fd8645bb72e2cae336a5d627de0631f5858ffaf4d4d43e7efc5656605068179d86d0deff2810f56e5154995ffdd58ee8be90bc459ff9766dacd5e74d08aaefc7 -DIST bitlbee-3.5.tar.gz 657177 SHA256 549d02181ab303dfe8a219faafd7a1aea7ee642eb071b767f668782a57388319 SHA512 7f044474fff5b1213dddc29e19aae102d1bbe4361cddcf9e58f965c01a58b6f7ed41cbf6ecec050a96f91f55dca15f6df948dee105eff001086d9daa15ba0499 WHIRLPOOL 72434e9d7d43a0d1bf6d1f8c0eda10a099fca262d5431430d0001a7dc7b34e7594e5a6dc0942eebc04f7073bc73d4d8b3f7d00991b21b47d1cfb15ea542715c7 diff --git a/net-im/bitlbee/bitlbee-3.4.2-r1.ebuild b/net-im/bitlbee/bitlbee-3.4.2-r1.ebuild deleted file mode 100644 index 8cf60e73216..000 --- a/net-im/bitlbee/bitlbee-3.4.2-r1.ebuild +++ /dev/null @@ -1,157 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit user systemd - -if [[ ${PV} == "" ]]; then - EGIT_REPO_URI="https://github.com/bitlbee/bitlbee.git; - inherit git-r3 -else - SRC_URI="http://get.bitlbee.org/src/${P}.tar.gz; - KEYWORDS="amd64 ppc ~ppc64 x86 ~x86-fbsd" -fi - -DESCRIPTION="irc to IM gateway that support multiple IM protocols" -HOMEPAGE="http://www.bitlbee.org/; - -LICENSE="GPL-2" -SLOT="0" -IUSE_PROTOCOLS="msn oscar purple twitter +xmpp yahoo" -IUSE="debug +gnutls ipv6 libevent libressl nss otr +plugins selinux test xinetd - ${IUSE_PROTOCOLS}" - -REQUIRED_USE=" - || ( purple xmpp msn oscar yahoo ) - xmpp? ( !nss ) -" - -COMMON_DEPEND=" - >=dev-libs/glib-2.16 - purple? ( net-im/pidgin ) - libevent? ( dev-libs/libevent:= ) - otr? ( >=net-libs/libotr-4 ) - gnutls? ( net-libs/gnutls:= ) - !gnutls? ( - nss? ( dev-libs/nss ) - !nss? ( - libressl? ( dev-libs/libressl:= ) - !libressl? ( dev-libs/openssl:0= ) - ) - ) -" -DEPEND="${COMMON_DEPEND} - virtual/pkgconfig - selinux? ( sec-policy/selinux-bitlbee ) - test? ( dev-libs/check )" - -RDEPEND="${COMMON_DEPEND} - virtual/logger - xinetd? ( sys-apps/xinetd )" - -pkg_setup() { - enewgroup bitlbee - enewuser bitlbee -1 -1 /var/lib/bitlbee bitlbee -} - -src_prepare() { - [[ ${PV} != "" ]] && eapply "${FILESDIR}"/${P}-systemd-user.patch - eapply_user -} - -src_configure() { - local myconf - - # setup plugins, protocol, ipv6 and debug - myconf+=( --jabber=$(usex xmpp 1 0) ) - for flag in debug ipv6 plugins ${IUSE_PROTOCOLS/+xmpp/} ; do - myconf+=( --${flag}=$(usex ${flag} 1 0) ) - done - - # set otr - if use otr && use plugins ; then - myconf+=( --otr=plugin ) - else - if use otr ; then - ewarn "OTR support has been disabled automatically because it" - ewarn "requires the plugins USE flag." - fi - myconf+=( --otr=0 ) - fi - - # setup ssl use flags - if use gnutls ; then - myconf+=( --ssl=gnutls ) - einfo "Using gnutls for SSL support" - else - ewarn "Only gnutls is officially supported by upstream." - if use nss ; then - myconf+=( --ssl=nss ) - einfo "Using nss for SSL support" - else - myconf+=( --ssl=openssl ) -
[gentoo-commits] repo/gentoo:master commit in: net-im/bitlbee/
commit: a557744b8fb62c1a43bd0dafb6f670df3912d632 Author: Agostino Sarubbo gentoo org> AuthorDate: Sun Feb 12 15:41:59 2017 + Commit: Agostino Sarubbo gentoo org> CommitDate: Sun Feb 12 15:43:57 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a557744b net-im/bitlbee: x86 stable wrt bug #607764 Package-Manager: portage-2.3.3 RepoMan-Options: --include-arches="x86" Signed-off-by: Agostino Sarubbo gentoo.org> net-im/bitlbee/bitlbee-3.5.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-im/bitlbee/bitlbee-3.5.1.ebuild b/net-im/bitlbee/bitlbee-3.5.1.ebuild index 59bddd1363..6f8f3e06dd 100644 --- a/net-im/bitlbee/bitlbee-3.5.1.ebuild +++ b/net-im/bitlbee/bitlbee-3.5.1.ebuild @@ -11,7 +11,7 @@ if [[ ${PV} == "" ]]; then inherit git-r3 else SRC_URI="https://get.bitlbee.org/src/${P}.tar.gz; - KEYWORDS="amd64 ppc ~ppc64 ~x86 ~x86-fbsd" + KEYWORDS="amd64 ppc ~ppc64 x86 ~x86-fbsd" fi DESCRIPTION="irc to IM gateway that support multiple IM protocols"
[gentoo-commits] repo/gentoo:master commit in: net-im/bitlbee/
commit: 53297d4f7b7046647ddeaa9df35b90ed16450b82 Author: Michael Weber gentoo org> AuthorDate: Wed Feb 8 02:05:59 2017 + Commit: Michael Weber gentoo org> CommitDate: Wed Feb 8 02:12:46 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53297d4f net-im/bitlbee: ppc stable (bug 607764). Package-Manager: Portage-2.3.3, Repoman-2.3.1 net-im/bitlbee/bitlbee-3.5.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-im/bitlbee/bitlbee-3.5.1.ebuild b/net-im/bitlbee/bitlbee-3.5.1.ebuild index 179ac6f..59bddd1 100644 --- a/net-im/bitlbee/bitlbee-3.5.1.ebuild +++ b/net-im/bitlbee/bitlbee-3.5.1.ebuild @@ -11,7 +11,7 @@ if [[ ${PV} == "" ]]; then inherit git-r3 else SRC_URI="https://get.bitlbee.org/src/${P}.tar.gz; - KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd" + KEYWORDS="amd64 ppc ~ppc64 ~x86 ~x86-fbsd" fi DESCRIPTION="irc to IM gateway that support multiple IM protocols"
[gentoo-commits] repo/gentoo:master commit in: net-im/bitlbee/
commit: b88292933045504e17c969385ab46df7661a9d80 Author: Tim Harder gentoo org> AuthorDate: Wed Feb 1 22:30:18 2017 + Commit: Tim Harder gentoo org> CommitDate: Wed Feb 1 22:32:06 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8829293 net-im/bitlbee: version bump to 3.5.1 net-im/bitlbee/Manifest | 1 + net-im/bitlbee/bitlbee-3.5.1.ebuild | 168 2 files changed, 169 insertions(+) diff --git a/net-im/bitlbee/Manifest b/net-im/bitlbee/Manifest index 1afab0c..09af66d 100644 --- a/net-im/bitlbee/Manifest +++ b/net-im/bitlbee/Manifest @@ -1,2 +1,3 @@ DIST bitlbee-3.4.2.tar.gz 719456 SHA256 69c85554def74f314e3b6e390389a30b0e748f23ef37883e9d7545ee2c45ea57 SHA512 2b839c014cfad037d815aa0e0867dda1b4628ff076d8de6fec1e80ab1499bca565d9afbe104929d492ff68c86b745cc3f76acbeba102766d656f2d359b70302e WHIRLPOOL 43803ba2bbe6297e05e465912d22b0547bb0f9c3cd184a6c0c924dc023b9d505e3666aa732de83c79249e59aa0e2d6f621ee15c508ccc17eed1898b755f0112e +DIST bitlbee-3.5.1.tar.gz 680351 SHA256 9636d7fd89ebb3756c13a9a3387736ca6d56ccf66ec0580d512f07b21db0fa69 SHA512 4eb3b0d3a92910c8dd789cd23338cc6296bf40212c5244fcb27a88ede10e86424ea59c78e719841863701a7fdd8c61819f2775f7b58833e287d9110e49d036f3 WHIRLPOOL fd8645bb72e2cae336a5d627de0631f5858ffaf4d4d43e7efc5656605068179d86d0deff2810f56e5154995ffdd58ee8be90bc459ff9766dacd5e74d08aaefc7 DIST bitlbee-3.5.tar.gz 657177 SHA256 549d02181ab303dfe8a219faafd7a1aea7ee642eb071b767f668782a57388319 SHA512 7f044474fff5b1213dddc29e19aae102d1bbe4361cddcf9e58f965c01a58b6f7ed41cbf6ecec050a96f91f55dca15f6df948dee105eff001086d9daa15ba0499 WHIRLPOOL 72434e9d7d43a0d1bf6d1f8c0eda10a099fca262d5431430d0001a7dc7b34e7594e5a6dc0942eebc04f7073bc73d4d8b3f7d00991b21b47d1cfb15ea542715c7 diff --git a/net-im/bitlbee/bitlbee-3.5.1.ebuild b/net-im/bitlbee/bitlbee-3.5.1.ebuild new file mode 100644 index ..c27ab7a --- /dev/null +++ b/net-im/bitlbee/bitlbee-3.5.1.ebuild @@ -0,0 +1,168 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +inherit user systemd toolchain-funcs + +if [[ ${PV} == "" ]]; then + EGIT_REPO_URI="https://github.com/bitlbee/bitlbee.git; + inherit git-r3 +else + SRC_URI="https://get.bitlbee.org/src/${P}.tar.gz; + KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd" +fi + +DESCRIPTION="irc to IM gateway that support multiple IM protocols" +HOMEPAGE="https://www.bitlbee.org/; + +LICENSE="GPL-2" +SLOT="0" +IUSE_PROTOCOLS="msn oscar purple twitter +xmpp" +IUSE="debug +gnutls ipv6 libevent libressl nss otr +plugins selinux test xinetd + ${IUSE_PROTOCOLS}" + +REQUIRED_USE=" + || ( purple xmpp msn oscar ) + xmpp? ( !nss ) +" + +COMMON_DEPEND=" + >=dev-libs/glib-2.16 + purple? ( net-im/pidgin ) + libevent? ( dev-libs/libevent:= ) + otr? ( >=net-libs/libotr-4 ) + gnutls? ( net-libs/gnutls:= ) + !gnutls? ( + nss? ( dev-libs/nss ) + !nss? ( + libressl? ( dev-libs/libressl:= ) + !libressl? ( dev-libs/openssl:0= ) + ) + ) +" +DEPEND="${COMMON_DEPEND} + virtual/pkgconfig + selinux? ( sec-policy/selinux-bitlbee ) + test? ( dev-libs/check )" + +RDEPEND="${COMMON_DEPEND} + virtual/logger + xinetd? ( sys-apps/xinetd )" + +pkg_setup() { + enewgroup bitlbee + enewuser bitlbee -1 -1 /var/lib/bitlbee bitlbee +} + +src_prepare() { + if [[ ${PV} != "" ]]; then + eapply \ + "${FILESDIR}"/${PN}-3.5-systemd-user.patch \ + "${FILESDIR}"/${PN}-3.5-verbose-build.patch + fi + + eapply_user +} + +src_configure() { + local myconf + + # setup plugins, protocol, ipv6 and debug + myconf+=( --jabber=$(usex xmpp 1 0) ) + for flag in debug ipv6 plugins ${IUSE_PROTOCOLS/+xmpp/} ; do + myconf+=( --${flag}=$(usex ${flag} 1 0) ) + done + + # set otr + if use otr && use plugins ; then + myconf+=( --otr=plugin ) + else + if use otr ; then + ewarn "OTR support has been disabled automatically because it" + ewarn "requires the plugins USE flag." + fi + myconf+=( --otr=0 ) + fi + + # setup ssl use flags + if use gnutls ; then + myconf+=( --ssl=gnutls ) + einfo "Using gnutls for SSL support" + else + ewarn "Only gnutls is officially supported by upstream." + if use nss ; then + myconf+=( --ssl=nss ) + einfo "Using nss for SSL support" + else + myconf+=( --ssl=openssl ) + einfo "Using openssl for SSL support" + fi + fi
[gentoo-commits] repo/gentoo:master commit in: net-im/bitlbee/
commit: 07c239870dd066754b8339f3b50d6a5e2e558d13 Author: Tim Harder gentoo org> AuthorDate: Wed Jan 25 06:27:29 2017 + Commit: Tim Harder gentoo org> CommitDate: Wed Jan 25 06:27:29 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07c23987 net-im/bitlbee: drop yahoo support (bug #607126) net-im/bitlbee/{bitlbee-.ebuild => bitlbee-3.5-r1.ebuild} | 4 ++-- net-im/bitlbee/bitlbee-.ebuild| 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/net-im/bitlbee/bitlbee-.ebuild b/net-im/bitlbee/bitlbee-3.5-r1.ebuild similarity index 97% copy from net-im/bitlbee/bitlbee-.ebuild copy to net-im/bitlbee/bitlbee-3.5-r1.ebuild index d010143..6ce539f 100644 --- a/net-im/bitlbee/bitlbee-.ebuild +++ b/net-im/bitlbee/bitlbee-3.5-r1.ebuild @@ -19,12 +19,12 @@ HOMEPAGE="https://www.bitlbee.org/; LICENSE="GPL-2" SLOT="0" -IUSE_PROTOCOLS="msn oscar purple twitter +xmpp yahoo" +IUSE_PROTOCOLS="msn oscar purple twitter +xmpp" IUSE="debug +gnutls ipv6 libevent libressl nss otr +plugins selinux test xinetd ${IUSE_PROTOCOLS}" REQUIRED_USE=" - || ( purple xmpp msn oscar yahoo ) + || ( purple xmpp msn oscar ) xmpp? ( !nss ) " diff --git a/net-im/bitlbee/bitlbee-.ebuild b/net-im/bitlbee/bitlbee-.ebuild index d010143..6ce539f 100644 --- a/net-im/bitlbee/bitlbee-.ebuild +++ b/net-im/bitlbee/bitlbee-.ebuild @@ -19,12 +19,12 @@ HOMEPAGE="https://www.bitlbee.org/; LICENSE="GPL-2" SLOT="0" -IUSE_PROTOCOLS="msn oscar purple twitter +xmpp yahoo" +IUSE_PROTOCOLS="msn oscar purple twitter +xmpp" IUSE="debug +gnutls ipv6 libevent libressl nss otr +plugins selinux test xinetd ${IUSE_PROTOCOLS}" REQUIRED_USE=" - || ( purple xmpp msn oscar yahoo ) + || ( purple xmpp msn oscar ) xmpp? ( !nss ) "
[gentoo-commits] repo/gentoo:master commit in: net-im/bitlbee/
commit: fe50051b158b98f8011b8cc0a427a15405410857 Author: Tim Harder gentoo org> AuthorDate: Wed Jan 25 06:28:11 2017 + Commit: Tim Harder gentoo org> CommitDate: Wed Jan 25 06:29:06 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe50051b net-im/bitlbee: remove old net-im/bitlbee/Manifest | 1 - net-im/bitlbee/bitlbee-3.4.1.ebuild | 178 net-im/bitlbee/bitlbee-3.5.ebuild | 168 -- net-im/bitlbee/metadata.xml | 1 - 4 files changed, 348 deletions(-) diff --git a/net-im/bitlbee/Manifest b/net-im/bitlbee/Manifest index aa75627..1afab0c 100644 --- a/net-im/bitlbee/Manifest +++ b/net-im/bitlbee/Manifest @@ -1,3 +1,2 @@ -DIST bitlbee-3.4.1.tar.gz 688072 SHA256 500a0b19943040d67458eb3beb0a63d004abb2aa54a777addeb2a895d4f5c0e1 SHA512 fad297c7a792c932ba74daf7dc894883037842ae5d39a4c831c6615100580073001806c1af60555aa1c775399e8a484d99a4e601e96c6a075e12546e5d153532 WHIRLPOOL 431faa8f065233ee7345d4950d147fea9fc627ba4b78ca0f25bed9627804d3dd4d512a12c9f98bd29a01ebfb680c8cf7e756bb53b38a484b304a0e973c657993 DIST bitlbee-3.4.2.tar.gz 719456 SHA256 69c85554def74f314e3b6e390389a30b0e748f23ef37883e9d7545ee2c45ea57 SHA512 2b839c014cfad037d815aa0e0867dda1b4628ff076d8de6fec1e80ab1499bca565d9afbe104929d492ff68c86b745cc3f76acbeba102766d656f2d359b70302e WHIRLPOOL 43803ba2bbe6297e05e465912d22b0547bb0f9c3cd184a6c0c924dc023b9d505e3666aa732de83c79249e59aa0e2d6f621ee15c508ccc17eed1898b755f0112e DIST bitlbee-3.5.tar.gz 657177 SHA256 549d02181ab303dfe8a219faafd7a1aea7ee642eb071b767f668782a57388319 SHA512 7f044474fff5b1213dddc29e19aae102d1bbe4361cddcf9e58f965c01a58b6f7ed41cbf6ecec050a96f91f55dca15f6df948dee105eff001086d9daa15ba0499 WHIRLPOOL 72434e9d7d43a0d1bf6d1f8c0eda10a099fca262d5431430d0001a7dc7b34e7594e5a6dc0942eebc04f7073bc73d4d8b3f7d00991b21b47d1cfb15ea542715c7 diff --git a/net-im/bitlbee/bitlbee-3.4.1.ebuild b/net-im/bitlbee/bitlbee-3.4.1.ebuild deleted file mode 100644 index 02ea33f.. --- a/net-im/bitlbee/bitlbee-3.4.1.ebuild +++ /dev/null @@ -1,178 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -PYTHON_COMPAT=( python2_7 ) - -inherit eutils multilib user python-single-r1 systemd - -DESCRIPTION="irc to IM gateway that support multiple IM protocols" -HOMEPAGE="http://www.bitlbee.org/; -SRC_URI="http://get.bitlbee.org/src/${P}.tar.gz; - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc ~ppc64 x86 ~x86-fbsd" -IUSE="debug gnutls ipv6 +xmpp libevent msn nss +oscar otr +plugins purple selinux - skype ssl test twitter +yahoo xinetd libressl" - -COMMON_DEPEND=" - >=dev-libs/glib-2.16 - purple? ( net-im/pidgin ) - libevent? ( dev-libs/libevent ) - otr? ( >=net-libs/libotr-4 ) - gnutls? ( net-libs/gnutls ) - !gnutls? ( - nss? ( dev-libs/nss ) - !nss? ( ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl:= ) ) ) - ) - " -DEPEND="${COMMON_DEPEND} - dev-lang/python - virtual/pkgconfig - selinux? ( sec-policy/selinux-bitlbee ) - test? ( dev-libs/check )" - -RDEPEND="${COMMON_DEPEND} - virtual/logger - skype? ( - dev-python/skype4py[${PYTHON_USEDEP}] - net-im/skype - ) - xinetd? ( sys-apps/xinetd )" - -REQUIRED_USE="|| ( purple xmpp msn oscar yahoo ) - msn? ( || ( gnutls nss ssl ) ) - xmpp? ( !nss )" - -pkg_setup() { - if use xmpp && ! use gnutls && ! use ssl ; then - einfo - elog "You have enabled support for Jabber but do not have SSL" - elog "support enabled. This *will* prevent bitlbee from being" - elog "able to connect to SSL enabled Jabber servers. If you need to" - elog "connect to Jabber over SSL, enable ONE of the following use" - elog "flags: gnutls or ssl" - einfo - fi - - use skype && python-single-r1_pkg_setup - - enewgroup bitlbee - enewuser bitlbee -1 -1 /var/lib/bitlbee bitlbee -} - -src_prepare() { - sed -i \ - -e "s@/usr/local/sbin/bitlbee@/usr/sbin/bitlbee@" \ - -e "s/nobody/bitlbee/" \ - -e "s/}/disable = yes\n}/" \ - doc/bitlbee.xinetd || die "sed failed in xinetd" - - sed -i \ - -e "s@mozilla-nss@nss@g" \ - configure || die "sed failed in configure" - - use skype && python_fix_shebang protocols/skype/skyped.py - - epatch "${FILESDIR}"/${PN}-3.2.1-configure.patch -} - -src_configure() { - # setup plugins, protocol, ipv6 and debug - use xmpp && myconf="${myconf} --jabber=1" - for flag in debug ipv6 msn oscar plugins purple skype twitter yahoo ; do - if use ${flag} ; then -
[gentoo-commits] repo/gentoo:master commit in: net-im/bitlbee/, net-im/bitlbee/files/
commit: f488b698d3c4e4a34cbb7fa0b9ba275b9e2e7836 Author: Tim Harder gentoo org> AuthorDate: Fri Jan 20 20:59:44 2017 + Commit: Tim Harder gentoo org> CommitDate: Fri Jan 20 21:00:35 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f488b698 net-im/bitlbee: version bump to 3.5 net-im/bitlbee/Manifest| 1 + .../{bitlbee-.ebuild => bitlbee-3.5.ebuild}| 22 ++- net-im/bitlbee/bitlbee-.ebuild | 22 ++- .../bitlbee/files/bitlbee-3.5-systemd-user.patch | 10 ++ .../bitlbee/files/bitlbee-3.5-verbose-build.patch | 200 + 5 files changed, 243 insertions(+), 12 deletions(-) diff --git a/net-im/bitlbee/Manifest b/net-im/bitlbee/Manifest index 521ead2..aa75627 100644 --- a/net-im/bitlbee/Manifest +++ b/net-im/bitlbee/Manifest @@ -1,2 +1,3 @@ DIST bitlbee-3.4.1.tar.gz 688072 SHA256 500a0b19943040d67458eb3beb0a63d004abb2aa54a777addeb2a895d4f5c0e1 SHA512 fad297c7a792c932ba74daf7dc894883037842ae5d39a4c831c6615100580073001806c1af60555aa1c775399e8a484d99a4e601e96c6a075e12546e5d153532 WHIRLPOOL 431faa8f065233ee7345d4950d147fea9fc627ba4b78ca0f25bed9627804d3dd4d512a12c9f98bd29a01ebfb680c8cf7e756bb53b38a484b304a0e973c657993 DIST bitlbee-3.4.2.tar.gz 719456 SHA256 69c85554def74f314e3b6e390389a30b0e748f23ef37883e9d7545ee2c45ea57 SHA512 2b839c014cfad037d815aa0e0867dda1b4628ff076d8de6fec1e80ab1499bca565d9afbe104929d492ff68c86b745cc3f76acbeba102766d656f2d359b70302e WHIRLPOOL 43803ba2bbe6297e05e465912d22b0547bb0f9c3cd184a6c0c924dc023b9d505e3666aa732de83c79249e59aa0e2d6f621ee15c508ccc17eed1898b755f0112e +DIST bitlbee-3.5.tar.gz 657177 SHA256 549d02181ab303dfe8a219faafd7a1aea7ee642eb071b767f668782a57388319 SHA512 7f044474fff5b1213dddc29e19aae102d1bbe4361cddcf9e58f965c01a58b6f7ed41cbf6ecec050a96f91f55dca15f6df948dee105eff001086d9daa15ba0499 WHIRLPOOL 72434e9d7d43a0d1bf6d1f8c0eda10a099fca262d5431430d0001a7dc7b34e7594e5a6dc0942eebc04f7073bc73d4d8b3f7d00991b21b47d1cfb15ea542715c7 diff --git a/net-im/bitlbee/bitlbee-.ebuild b/net-im/bitlbee/bitlbee-3.5.ebuild similarity index 90% copy from net-im/bitlbee/bitlbee-.ebuild copy to net-im/bitlbee/bitlbee-3.5.ebuild index ae09048..d010143 100644 --- a/net-im/bitlbee/bitlbee-.ebuild +++ b/net-im/bitlbee/bitlbee-3.5.ebuild @@ -1,21 +1,21 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ EAPI=6 -inherit user systemd +inherit user systemd toolchain-funcs if [[ ${PV} == "" ]]; then EGIT_REPO_URI="https://github.com/bitlbee/bitlbee.git; inherit git-r3 else - SRC_URI="http://get.bitlbee.org/src/${P}.tar.gz; + SRC_URI="https://get.bitlbee.org/src/${P}.tar.gz; KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd" fi DESCRIPTION="irc to IM gateway that support multiple IM protocols" -HOMEPAGE="http://www.bitlbee.org/; +HOMEPAGE="https://www.bitlbee.org/; LICENSE="GPL-2" SLOT="0" @@ -41,7 +41,7 @@ COMMON_DEPEND=" !libressl? ( dev-libs/openssl:0= ) ) ) - " +" DEPEND="${COMMON_DEPEND} virtual/pkgconfig selinux? ( sec-policy/selinux-bitlbee ) @@ -57,7 +57,12 @@ pkg_setup() { } src_prepare() { - [[ ${PV} != "" ]] && eapply "${FILESDIR}"/${P}-systemd-user.patch + if [[ ${PV} != "" ]]; then + eapply \ + "${FILESDIR}"/${P}-systemd-user.patch \ + "${FILESDIR}"/${P}-verbose-build.patch + fi + eapply_user } @@ -112,6 +117,7 @@ src_configure() { --systemdsystemunitdir=$(systemd_get_systemunitdir) \ --doc=1 \ --strip=0 \ + --verbose=1 \ "${myconf[@]}" || die sed -i \ @@ -119,6 +125,10 @@ src_configure() { Makefile.settings || die } +src_compile() { + emake CC="$(tc-getCC)" LD="$(tc-getLD)" +} + src_install() { emake DESTDIR="${D}" install install-etc install-doc install-dev install-systemd diff --git a/net-im/bitlbee/bitlbee-.ebuild b/net-im/bitlbee/bitlbee-.ebuild index ae09048..d010143 100644 --- a/net-im/bitlbee/bitlbee-.ebuild +++ b/net-im/bitlbee/bitlbee-.ebuild @@ -1,21 +1,21 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ EAPI=6 -inherit user systemd +inherit user systemd toolchain-funcs if [[ ${PV} == "" ]]; then EGIT_REPO_URI="https://github.com/bitlbee/bitlbee.git; inherit git-r3 else - SRC_URI="http://get.bitlbee.org/src/${P}.tar.gz; + SRC_URI="https://get.bitlbee.org/src/${P}.tar.gz; KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd" fi DESCRIPTION="irc to IM gateway that support multiple IM protocols"
[gentoo-commits] repo/gentoo:master commit in: net-im/bitlbee/
commit: 4a8057effe733e5d3f8d6cb56e9e644272b7c0a8 Author: Agostino Sarubbo gentoo org> AuthorDate: Wed Jan 4 17:08:02 2017 + Commit: Agostino Sarubbo gentoo org> CommitDate: Wed Jan 4 17:08:02 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a8057ef net-im/bitlbee: x86 stable wrt bug #598724 Package-Manager: portage-2.3.0 RepoMan-Options: --include-arches="x86" Signed-off-by: Agostino Sarubbo gentoo.org> net-im/bitlbee/bitlbee-3.4.2-r1.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net-im/bitlbee/bitlbee-3.4.2-r1.ebuild b/net-im/bitlbee/bitlbee-3.4.2-r1.ebuild index edfcd48..ab4fb2a 100644 --- a/net-im/bitlbee/bitlbee-3.4.2-r1.ebuild +++ b/net-im/bitlbee/bitlbee-3.4.2-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -11,7 +11,7 @@ if [[ ${PV} == "" ]]; then inherit git-r3 else SRC_URI="http://get.bitlbee.org/src/${P}.tar.gz; - KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd" + KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd" fi DESCRIPTION="irc to IM gateway that support multiple IM protocols"
[gentoo-commits] repo/gentoo:master commit in: net-im/bitlbee/
commit: 40f7562e9dc48b2b3d293c74353b15d604c8839e Author: Tobias Klausmann gentoo org> AuthorDate: Wed Dec 21 11:10:17 2016 + Commit: Tobias Klausmann gentoo org> CommitDate: Wed Dec 21 11:28:12 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40f7562e net-im/bitlbee-3.4.2-r1: stable on amd64 Gentoo-Bug: 598724 net-im/bitlbee/bitlbee-3.4.2-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-im/bitlbee/bitlbee-3.4.2-r1.ebuild b/net-im/bitlbee/bitlbee-3.4.2-r1.ebuild index 8e5f4f7..edfcd48 100644 --- a/net-im/bitlbee/bitlbee-3.4.2-r1.ebuild +++ b/net-im/bitlbee/bitlbee-3.4.2-r1.ebuild @@ -11,7 +11,7 @@ if [[ ${PV} == "" ]]; then inherit git-r3 else SRC_URI="http://get.bitlbee.org/src/${P}.tar.gz; - KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd" + KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd" fi DESCRIPTION="irc to IM gateway that support multiple IM protocols"
[gentoo-commits] repo/gentoo:master commit in: net-im/bitlbee/, net-im/bitlbee/files/
commit: 4c0977021bf6397fb0f95b764e25f4386781f8b1 Author: Tim Harder gentoo org> AuthorDate: Fri Sep 23 20:15:07 2016 + Commit: Tim Harder gentoo org> CommitDate: Fri Sep 23 20:15:07 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c097702 net-im/bitlbee: remove old net-im/bitlbee/bitlbee-3.4.2.ebuild | 189 net-im/bitlbee/files/bitlbee.confd | 2 - net-im/bitlbee/files/bitlbee.initd | 28 -- 3 files changed, 219 deletions(-) diff --git a/net-im/bitlbee/bitlbee-3.4.2.ebuild b/net-im/bitlbee/bitlbee-3.4.2.ebuild deleted file mode 100644 index 8a75327.. --- a/net-im/bitlbee/bitlbee-3.4.2.ebuild +++ /dev/null @@ -1,189 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -PYTHON_COMPAT=( python2_7 ) - -inherit eutils multilib user python-single-r1 systemd - -if [[ ${PV} == "" ]]; then - EGIT_REPO_URI="https://github.com/bitlbee/bitlbee.git; - inherit git-r3 -else - SRC_URI="http://get.bitlbee.org/src/${P}.tar.gz; - KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd" -fi - -DESCRIPTION="irc to IM gateway that support multiple IM protocols" -HOMEPAGE="http://www.bitlbee.org/; - -LICENSE="GPL-2" -SLOT="0" -IUSE="debug gnutls ipv6 +xmpp libevent msn nss +oscar otr +plugins purple selinux - skype ssl test twitter +yahoo xinetd libressl" - -COMMON_DEPEND=" - >=dev-libs/glib-2.16 - purple? ( net-im/pidgin ) - libevent? ( dev-libs/libevent:= ) - otr? ( >=net-libs/libotr-4 ) - gnutls? ( net-libs/gnutls:= ) - !gnutls? ( - nss? ( dev-libs/nss ) - !nss? ( ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) - ) - " -DEPEND="${COMMON_DEPEND} - dev-lang/python - virtual/pkgconfig - selinux? ( sec-policy/selinux-bitlbee ) - test? ( dev-libs/check )" - -RDEPEND="${COMMON_DEPEND} - virtual/logger - skype? ( - dev-python/skype4py[${PYTHON_USEDEP}] - net-im/skype - ) - xinetd? ( sys-apps/xinetd )" - -REQUIRED_USE="|| ( purple xmpp msn oscar yahoo ) - msn? ( || ( gnutls nss ssl ) ) - xmpp? ( !nss )" - -pkg_setup() { - if use xmpp && ! use gnutls && ! use ssl ; then - einfo - elog "You have enabled support for Jabber but do not have SSL" - elog "support enabled. This *will* prevent bitlbee from being" - elog "able to connect to SSL enabled Jabber servers. If you need to" - elog "connect to Jabber over SSL, enable ONE of the following use" - elog "flags: gnutls or ssl" - einfo - fi - - use skype && python-single-r1_pkg_setup - - enewgroup bitlbee - enewuser bitlbee -1 -1 /var/lib/bitlbee bitlbee -} - -src_prepare() { - sed -i \ - -e "s@/usr/local/sbin/bitlbee@/usr/sbin/bitlbee@" \ - -e "s/nobody/bitlbee/" \ - -e "s/}/disable = yes\n}/" \ - doc/bitlbee.xinetd || die "sed failed in xinetd" - - sed -i \ - -e "s@mozilla-nss@nss@g" \ - configure || die "sed failed in configure" - - use skype && python_fix_shebang protocols/skype/skyped.py - - [[ ${PV} != "" ]] && epatch "${FILESDIR}"/${PN}-3.2.1-configure.patch - epatch_user -} - -src_configure() { - # setup plugins, protocol, ipv6 and debug - use xmpp && myconf="${myconf} --jabber=1" - for flag in debug ipv6 msn oscar plugins purple skype twitter yahoo ; do - if use ${flag} ; then - myconf="${myconf} --${flag}=1" - else - myconf="${myconf} --${flag}=0" - fi - done - - # set otr - if use otr && use plugins ; then - myconf="${myconf} --otr=plugin" - else - if use otr ; then - ewarn "OTR support has been disabled automatically because it" - ewarn "requires the plugins USE flag." - fi - myconf="${myconf} --otr=0" - fi - - # setup ssl use flags - if use gnutls ; then - myconf="${myconf} --ssl=gnutls" - einfo "Using gnutls for SSL support" - elif use ssl ; then - myconf="${myconf} --ssl=openssl" - einfo "Using openssl for SSL support" - elif use nss ; then - myconf="${myconf} --ssl=nss" - einfo "Using nss for SSL support" - else - myconf="${myconf} --ssl=bogus" - einfo "You will not have any encryption support enabled." - fi - - # set event handler - if use libevent ; then - myconf="${myconf} --events=libevent" - else -
[gentoo-commits] repo/gentoo:master commit in: net-im/bitlbee/files/, net-im/bitlbee/
commit: 130dc998a483dad52f3bb6de991cb900de1c40db Author: Tim Harder gentoo org> AuthorDate: Mon Sep 5 03:15:05 2016 + Commit: Tim Harder gentoo org> CommitDate: Mon Sep 5 03:21:29 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=130dc998 net-im/bitlbee: revision bump for various updates * update to EAPI 6 * fix systemd unit to use bitlbee user (bug #472406) * update SSL handling, make it non-optional (bug #582658 by Alex Xu) * drop skype support, use libpurple and x11-plugins/pidgin-skypeweb instead (https://wiki.bitlbee.org/HowtoSkypeWeb) net-im/bitlbee/bitlbee-3.4.2-r1.ebuild | 158 + net-im/bitlbee/bitlbee-.ebuild | 121 ++-- .../bitlbee/files/bitlbee-3.4.2-systemd-user.patch | 10 ++ 3 files changed, 213 insertions(+), 76 deletions(-) diff --git a/net-im/bitlbee/bitlbee-3.4.2-r1.ebuild b/net-im/bitlbee/bitlbee-3.4.2-r1.ebuild new file mode 100644 index ..8e5f4f7 --- /dev/null +++ b/net-im/bitlbee/bitlbee-3.4.2-r1.ebuild @@ -0,0 +1,158 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +inherit user systemd + +if [[ ${PV} == "" ]]; then + EGIT_REPO_URI="https://github.com/bitlbee/bitlbee.git; + inherit git-r3 +else + SRC_URI="http://get.bitlbee.org/src/${P}.tar.gz; + KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd" +fi + +DESCRIPTION="irc to IM gateway that support multiple IM protocols" +HOMEPAGE="http://www.bitlbee.org/; + +LICENSE="GPL-2" +SLOT="0" +IUSE_PROTOCOLS="msn oscar purple twitter +xmpp yahoo" +IUSE="debug +gnutls ipv6 libevent libressl nss otr +plugins selinux test xinetd + ${IUSE_PROTOCOLS}" + +REQUIRED_USE=" + || ( purple xmpp msn oscar yahoo ) + xmpp? ( !nss ) +" + +COMMON_DEPEND=" + >=dev-libs/glib-2.16 + purple? ( net-im/pidgin ) + libevent? ( dev-libs/libevent:= ) + otr? ( >=net-libs/libotr-4 ) + gnutls? ( net-libs/gnutls:= ) + !gnutls? ( + nss? ( dev-libs/nss ) + !nss? ( + libressl? ( dev-libs/libressl:= ) + !libressl? ( dev-libs/openssl:0= ) + ) + ) +" +DEPEND="${COMMON_DEPEND} + virtual/pkgconfig + selinux? ( sec-policy/selinux-bitlbee ) + test? ( dev-libs/check )" + +RDEPEND="${COMMON_DEPEND} + virtual/logger + xinetd? ( sys-apps/xinetd )" + +pkg_setup() { + enewgroup bitlbee + enewuser bitlbee -1 -1 /var/lib/bitlbee bitlbee +} + +src_prepare() { + [[ ${PV} != "" ]] && eapply "${FILESDIR}"/${P}-systemd-user.patch + eapply_user +} + +src_configure() { + local myconf + + # setup plugins, protocol, ipv6 and debug + myconf+=( --jabber=$(usex xmpp 1 0) ) + for flag in debug ipv6 plugins ${IUSE_PROTOCOLS/+xmpp/} ; do + myconf+=( --${flag}=$(usex ${flag} 1 0) ) + done + + # set otr + if use otr && use plugins ; then + myconf+=( --otr=plugin ) + else + if use otr ; then + ewarn "OTR support has been disabled automatically because it" + ewarn "requires the plugins USE flag." + fi + myconf+=( --otr=0 ) + fi + + # setup ssl use flags + if use gnutls ; then + myconf+=( --ssl=gnutls ) + einfo "Using gnutls for SSL support" + else + ewarn "Only gnutls is officially supported by upstream." + if use nss ; then + myconf+=( --ssl=nss ) + einfo "Using nss for SSL support" + else + myconf+=( --ssl=openssl ) + einfo "Using openssl for SSL support" + fi + fi + + # set event handler + if use libevent ; then + myconf+=( --events=libevent ) + else + myconf+=( --events=glib ) + fi + + # not autotools-based + ./configure \ + --prefix=/usr \ + --datadir=/usr/share/bitlbee \ + --etcdir=/etc/bitlbee \ + --plugindir=/usr/$(get_libdir)/bitlbee \ + --systemdsystemunitdir=$(systemd_get_systemunitdir) \ + --doc=1 \ + --strip=0 \ + "${myconf[@]}" || die + + sed -i \ + -e "/^EFLAGS/s:=:&${LDFLAGS} :" \ + Makefile.settings || die +} + +src_install() { + emake DESTDIR="${D}" install install-etc install-doc install-dev install-systemd + + keepdir /var/lib/bitlbee + fperms 700 /var/lib/bitlbee + fowners bitlbee:bitlbee /var/lib/bitlbee + + dodoc doc/{AUTHORS,CHANGES,CREDITS,FAQ,README} + + if use xinetd ; then + insinto /etc/xinetd.d + newins doc/bitlbee.xinetd
[gentoo-commits] repo/gentoo:master commit in: net-im/bitlbee/
commit: ee4aeb26cb286471319eba5c33e3adc5f78f7765 Author: Pacho Ramos gentoo org> AuthorDate: Sun Aug 7 06:43:11 2016 + Commit: Pacho Ramos gentoo org> CommitDate: Sun Aug 7 06:43:11 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee4aeb26 net-im/bitlbee: Cleanup per bug #269977 Package-Manager: portage-2.3.0 net-im/bitlbee/metadata.xml | 4 1 file changed, 4 deletions(-) diff --git a/net-im/bitlbee/metadata.xml b/net-im/bitlbee/metadata.xml index 88806b5..3251066 100644 --- a/net-im/bitlbee/metadata.xml +++ b/net-im/bitlbee/metadata.xml @@ -2,10 +2,6 @@ http://www.gentoo.org/dtd/metadata.dtd;> - wi...@gentoo.org - Alex Alexander - - radher...@gentoo.org Tim Harder
[gentoo-commits] repo/gentoo:master commit in: net-im/bitlbee/
commit: c19292c68540a2e5dfb11dc476bb319ac12f2b96 Author: Zac Medico gentoo org> AuthorDate: Sun Jul 3 22:57:52 2016 + Commit: Zac Medico gentoo org> CommitDate: Sun Jul 3 23:01:32 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c19292c6 net-im/bitlbee: add ${EPREFIX} to configure args Package-Manager: portage-2.3.0 net-im/bitlbee/bitlbee-3.4.2.ebuild | 6 -- net-im/bitlbee/bitlbee-.ebuild | 6 -- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/net-im/bitlbee/bitlbee-3.4.2.ebuild b/net-im/bitlbee/bitlbee-3.4.2.ebuild index dceb0c2..8a75327 100644 --- a/net-im/bitlbee/bitlbee-3.4.2.ebuild +++ b/net-im/bitlbee/bitlbee-3.4.2.ebuild @@ -133,8 +133,10 @@ src_configure() { # NOTE: bitlbee's configure script is not an autotool creation, # so that is why we don't use econf. ./configure \ - --prefix=/usr --datadir=/usr/share/bitlbee \ - --etcdir=/etc/bitlbee --plugindir=/usr/$(get_libdir)/bitlbee \ + --prefix="${EPREFIX}/usr" \ + --datadir="${EPREFIX}/usr/share/bitlbee" \ + --etcdir="${EPREFIX}/etc/bitlbee" \ + --plugindir="${EPREFIX}/usr/$(get_libdir)/bitlbee" \ --systemdsystemunitdir=$(systemd_get_unitdir) \ --doc=1 --strip=0 ${myconf} || die "econf failed" diff --git a/net-im/bitlbee/bitlbee-.ebuild b/net-im/bitlbee/bitlbee-.ebuild index dceb0c2..8a75327 100644 --- a/net-im/bitlbee/bitlbee-.ebuild +++ b/net-im/bitlbee/bitlbee-.ebuild @@ -133,8 +133,10 @@ src_configure() { # NOTE: bitlbee's configure script is not an autotool creation, # so that is why we don't use econf. ./configure \ - --prefix=/usr --datadir=/usr/share/bitlbee \ - --etcdir=/etc/bitlbee --plugindir=/usr/$(get_libdir)/bitlbee \ + --prefix="${EPREFIX}/usr" \ + --datadir="${EPREFIX}/usr/share/bitlbee" \ + --etcdir="${EPREFIX}/etc/bitlbee" \ + --plugindir="${EPREFIX}/usr/$(get_libdir)/bitlbee" \ --systemdsystemunitdir=$(systemd_get_unitdir) \ --doc=1 --strip=0 ${myconf} || die "econf failed"
[gentoo-commits] repo/gentoo:master commit in: net-im/bitlbee/
commit: 51a2d7a258a4943331177760f591e941e03d37d0 Author: Tim Harder gentoo org> AuthorDate: Sun Mar 27 01:22:04 2016 + Commit: Tim Harder gentoo org> CommitDate: Sun Mar 27 01:26:38 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51a2d7a2 net-im/bitlbee: version bump to 3.4.2 net-im/bitlbee/Manifest | 1 + .../{bitlbee-.ebuild => bitlbee-3.4.2.ebuild} | 17 ++--- net-im/bitlbee/bitlbee-.ebuild | 17 ++--- 3 files changed, 29 insertions(+), 6 deletions(-) diff --git a/net-im/bitlbee/Manifest b/net-im/bitlbee/Manifest index de17c3e..2153c6c 100644 --- a/net-im/bitlbee/Manifest +++ b/net-im/bitlbee/Manifest @@ -1,2 +1,3 @@ DIST bitlbee-3.2.2.tar.gz 661757 SHA256 ba38939281f23e8a0e71022c7be0cb68f6544248404362c5e20245fa7a67558e SHA512 5826a9d64e2de42c5560d85c3e7c96a72930afae005143323b6a301b588328b156b50cde571c7f396ca00952d950d22db1ea11cc42256935d3d72ec90215e7d2 WHIRLPOOL cbc3552289949e5e10281d65f617f38075016c813bf2cbb13e09af913ea8545c46a69225bf4f523e1a73f955d7309b8c7b94e23affdedf5dce2760eee55203ae DIST bitlbee-3.4.1.tar.gz 688072 SHA256 500a0b19943040d67458eb3beb0a63d004abb2aa54a777addeb2a895d4f5c0e1 SHA512 fad297c7a792c932ba74daf7dc894883037842ae5d39a4c831c6615100580073001806c1af60555aa1c775399e8a484d99a4e601e96c6a075e12546e5d153532 WHIRLPOOL 431faa8f065233ee7345d4950d147fea9fc627ba4b78ca0f25bed9627804d3dd4d512a12c9f98bd29a01ebfb680c8cf7e756bb53b38a484b304a0e973c657993 +DIST bitlbee-3.4.2.tar.gz 719456 SHA256 69c85554def74f314e3b6e390389a30b0e748f23ef37883e9d7545ee2c45ea57 SHA512 2b839c014cfad037d815aa0e0867dda1b4628ff076d8de6fec1e80ab1499bca565d9afbe104929d492ff68c86b745cc3f76acbeba102766d656f2d359b70302e WHIRLPOOL 43803ba2bbe6297e05e465912d22b0547bb0f9c3cd184a6c0c924dc023b9d505e3666aa732de83c79249e59aa0e2d6f621ee15c508ccc17eed1898b755f0112e diff --git a/net-im/bitlbee/bitlbee-.ebuild b/net-im/bitlbee/bitlbee-3.4.2.ebuild similarity index 89% copy from net-im/bitlbee/bitlbee-.ebuild copy to net-im/bitlbee/bitlbee-3.4.2.ebuild index 181f319..dceb0c2 100644 --- a/net-im/bitlbee/bitlbee-.ebuild +++ b/net-im/bitlbee/bitlbee-3.4.2.ebuild @@ -26,12 +26,12 @@ IUSE="debug gnutls ipv6 +xmpp libevent msn nss +oscar otr +plugins purple selinu COMMON_DEPEND=" >=dev-libs/glib-2.16 purple? ( net-im/pidgin ) - libevent? ( dev-libs/libevent ) + libevent? ( dev-libs/libevent:= ) otr? ( >=net-libs/libotr-4 ) - gnutls? ( net-libs/gnutls ) + gnutls? ( net-libs/gnutls:= ) !gnutls? ( nss? ( dev-libs/nss ) - !nss? ( ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl:= ) ) ) + !nss? ( ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) ) " DEPEND="${COMMON_DEPEND} @@ -173,4 +173,15 @@ pkg_postinst() { chown -R bitlbee:bitlbee "${ROOT}"/var/lib/bitlbee [[ -d "${ROOT}"/var/run/bitlbee ]] && chown -R bitlbee:bitlbee "${ROOT}"/var/run/bitlbee + + if [[ -z ${REPLACING_VERSIONS} ]]; then + einfo + elog "The bitlbee init script will now attempt to stop all processes owned by the" + elog "bitlbee user, including per-client forks." + elog + elog "Tell the init script not to touch anything besides the main bitlbee process" + elog "by changing the BITLBEE_STOP_ALL variable in" + elog " /etc/conf.d/bitlbee" + einfo + fi } diff --git a/net-im/bitlbee/bitlbee-.ebuild b/net-im/bitlbee/bitlbee-.ebuild index 181f319..dceb0c2 100644 --- a/net-im/bitlbee/bitlbee-.ebuild +++ b/net-im/bitlbee/bitlbee-.ebuild @@ -26,12 +26,12 @@ IUSE="debug gnutls ipv6 +xmpp libevent msn nss +oscar otr +plugins purple selinu COMMON_DEPEND=" >=dev-libs/glib-2.16 purple? ( net-im/pidgin ) - libevent? ( dev-libs/libevent ) + libevent? ( dev-libs/libevent:= ) otr? ( >=net-libs/libotr-4 ) - gnutls? ( net-libs/gnutls ) + gnutls? ( net-libs/gnutls:= ) !gnutls? ( nss? ( dev-libs/nss ) - !nss? ( ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl:= ) ) ) + !nss? ( ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) ) " DEPEND="${COMMON_DEPEND} @@ -173,4 +173,15 @@ pkg_postinst() { chown -R bitlbee:bitlbee "${ROOT}"/var/lib/bitlbee [[ -d "${ROOT}"/var/run/bitlbee ]] && chown -R bitlbee:bitlbee "${ROOT}"/var/run/bitlbee + + if [[ -z ${REPLACING_VERSIONS} ]]; then + einfo + elog "The bitlbee init script will now attempt to stop all processes owned by the" + elog "bitlbee user, including per-client forks." + elog +
[gentoo-commits] repo/gentoo:master commit in: net-im/bitlbee/
commit: 012d1d1b2258f11b53bee287f0224362bfce4b52 Author: Tim Harder gentoo org> AuthorDate: Sun Mar 27 01:25:40 2016 + Commit: Tim Harder gentoo org> CommitDate: Sun Mar 27 01:26:38 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=012d1d1b net-im/bitlbee: remove old net-im/bitlbee/Manifest | 1 - net-im/bitlbee/bitlbee-3.2.2.ebuild | 182 2 files changed, 183 deletions(-) diff --git a/net-im/bitlbee/Manifest b/net-im/bitlbee/Manifest index 2153c6c..521ead2 100644 --- a/net-im/bitlbee/Manifest +++ b/net-im/bitlbee/Manifest @@ -1,3 +1,2 @@ -DIST bitlbee-3.2.2.tar.gz 661757 SHA256 ba38939281f23e8a0e71022c7be0cb68f6544248404362c5e20245fa7a67558e SHA512 5826a9d64e2de42c5560d85c3e7c96a72930afae005143323b6a301b588328b156b50cde571c7f396ca00952d950d22db1ea11cc42256935d3d72ec90215e7d2 WHIRLPOOL cbc3552289949e5e10281d65f617f38075016c813bf2cbb13e09af913ea8545c46a69225bf4f523e1a73f955d7309b8c7b94e23affdedf5dce2760eee55203ae DIST bitlbee-3.4.1.tar.gz 688072 SHA256 500a0b19943040d67458eb3beb0a63d004abb2aa54a777addeb2a895d4f5c0e1 SHA512 fad297c7a792c932ba74daf7dc894883037842ae5d39a4c831c6615100580073001806c1af60555aa1c775399e8a484d99a4e601e96c6a075e12546e5d153532 WHIRLPOOL 431faa8f065233ee7345d4950d147fea9fc627ba4b78ca0f25bed9627804d3dd4d512a12c9f98bd29a01ebfb680c8cf7e756bb53b38a484b304a0e973c657993 DIST bitlbee-3.4.2.tar.gz 719456 SHA256 69c85554def74f314e3b6e390389a30b0e748f23ef37883e9d7545ee2c45ea57 SHA512 2b839c014cfad037d815aa0e0867dda1b4628ff076d8de6fec1e80ab1499bca565d9afbe104929d492ff68c86b745cc3f76acbeba102766d656f2d359b70302e WHIRLPOOL 43803ba2bbe6297e05e465912d22b0547bb0f9c3cd184a6c0c924dc023b9d505e3666aa732de83c79249e59aa0e2d6f621ee15c508ccc17eed1898b755f0112e diff --git a/net-im/bitlbee/bitlbee-3.2.2.ebuild b/net-im/bitlbee/bitlbee-3.2.2.ebuild deleted file mode 100644 index a67a133..000 --- a/net-im/bitlbee/bitlbee-3.2.2.ebuild +++ /dev/null @@ -1,182 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" -PYTHON_COMPAT=( python2_7 ) - -inherit eutils multilib user python-single-r1 systemd - -DESCRIPTION="irc to IM gateway that support multiple IM protocols" -HOMEPAGE="http://www.bitlbee.org/; -SRC_URI="http://get.bitlbee.org/src/${P}.tar.gz; - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc ~ppc64 x86 ~x86-fbsd" -IUSE="debug gnutls ipv6 +xmpp libevent msn nss +oscar otr +plugins purple selinux -skype ssl test twitter +yahoo xinetd" - -COMMON_DEPEND=" - >=dev-libs/glib-2.14 - purple? ( net-im/pidgin ) - libevent? ( dev-libs/libevent ) - otr? ( >=net-libs/libotr-4 ) - gnutls? ( net-libs/gnutls ) - !gnutls? ( - nss? ( dev-libs/nss ) - !nss? ( ssl? ( dev-libs/openssl ) ) - ) - " -DEPEND="${COMMON_DEPEND} - virtual/pkgconfig - selinux? ( sec-policy/selinux-bitlbee ) - skype? ( app-text/asciidoc ) - test? ( dev-libs/check )" - -RDEPEND="${COMMON_DEPEND} - virtual/logger - skype? ( - dev-python/skype4py[${PYTHON_USEDEP}] - net-im/skype - ) - xinetd? ( sys-apps/xinetd )" - -REQUIRED_USE="|| ( purple xmpp msn oscar yahoo ) - msn? ( || ( gnutls nss ssl ) ) - xmpp? ( !nss )" - -pkg_setup() { - if use xmpp && ! use gnutls && ! use ssl ; then - einfo - elog "You have enabled support for Jabber but do not have SSL" - elog "support enabled. This *will* prevent bitlbee from being" - elog "able to connect to SSL enabled Jabber servers. If you need to" - elog "connect to Jabber over SSL, enable ONE of the following use" - elog "flags: gnutls or ssl" - einfo - fi - - use skype && python-single-r1_pkg_setup - - enewgroup bitlbee - enewuser bitlbee -1 -1 /var/lib/bitlbee bitlbee -} - -src_prepare() { - sed -i \ - -e "s@/usr/local/sbin/bitlbee@/usr/sbin/bitlbee@" \ - -e "s/nobody/bitlbee/" \ - -e "s/}/disable = yes\n}/" \ - doc/bitlbee.xinetd || die "sed failed in xinetd" - - sed -i \ - -e "s@mozilla-nss@nss@g" \ - configure || die "sed failed in configure" - - use skype && python_fix_shebang protocols/skype/skyped.py - - epatch "${FILESDIR}"/${PN}-3.2.1-configure.patch -} - -src_configure() { - # setup plugins, protocol, ipv6 and debug - use xmpp && myconf="${myconf} --jabber=1" - for flag in debug ipv6 msn oscar plugins purple skype twitter yahoo ; do - if use ${flag} ; then - myconf="${myconf} --${flag}=1" - else - myconf="${myconf} --${flag}=0" - fi - done - - # set otr - if use otr && use
[gentoo-commits] repo/gentoo:master commit in: net-im/bitlbee/
commit: a6296afc86864dff3b9dd0354c57dea58ca6db3b Author: Agostino Sarubbo gentoo org> AuthorDate: Wed Mar 16 11:49:10 2016 + Commit: Agostino Sarubbo gentoo org> CommitDate: Wed Mar 16 11:51:11 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6296afc net-im/bitlbee: ppc stable wrt bug #574942 Package-Manager: portage-2.2.26 RepoMan-Options: --include-arches="ppc" Signed-off-by: Agostino Sarubbo gentoo.org> net-im/bitlbee/bitlbee-3.4.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-im/bitlbee/bitlbee-3.4.1.ebuild b/net-im/bitlbee/bitlbee-3.4.1.ebuild index 35b36e7..02ea33f 100644 --- a/net-im/bitlbee/bitlbee-3.4.1.ebuild +++ b/net-im/bitlbee/bitlbee-3.4.1.ebuild @@ -13,7 +13,7 @@ SRC_URI="http://get.bitlbee.org/src/${P}.tar.gz; LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd" +KEYWORDS="amd64 ppc ~ppc64 x86 ~x86-fbsd" IUSE="debug gnutls ipv6 +xmpp libevent msn nss +oscar otr +plugins purple selinux skype ssl test twitter +yahoo xinetd libressl"
[gentoo-commits] repo/gentoo:master commit in: net-im/bitlbee/
commit: 670b9683c08fd227b0ab73e49e9c6ad136b92d50 Author: Agostino Sarubbo gentoo org> AuthorDate: Tue Mar 15 15:26:08 2016 + Commit: Agostino Sarubbo gentoo org> CommitDate: Tue Mar 15 15:26:08 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=670b9683 net-im/bitlbee: x86 stable wrt bug #574942 Package-Manager: portage-2.2.26 RepoMan-Options: --include-arches="x86" Signed-off-by: Agostino Sarubbo gentoo.org> net-im/bitlbee/bitlbee-3.4.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-im/bitlbee/bitlbee-3.4.1.ebuild b/net-im/bitlbee/bitlbee-3.4.1.ebuild index c3a8047..35b36e7 100644 --- a/net-im/bitlbee/bitlbee-3.4.1.ebuild +++ b/net-im/bitlbee/bitlbee-3.4.1.ebuild @@ -13,7 +13,7 @@ SRC_URI="http://get.bitlbee.org/src/${P}.tar.gz; LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd" +KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd" IUSE="debug gnutls ipv6 +xmpp libevent msn nss +oscar otr +plugins purple selinux skype ssl test twitter +yahoo xinetd libressl"
[gentoo-commits] repo/gentoo:master commit in: net-im/bitlbee/
commit: fab4b011a2b374affc1e920a7df75c69e5b4dde0 Author: Agostino Sarubbo gentoo org> AuthorDate: Sun Mar 6 12:56:09 2016 + Commit: Agostino Sarubbo gentoo org> CommitDate: Sun Mar 6 12:58:28 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fab4b011 net-im/bitlbee: amd64 stable wrt bug #574942 Package-Manager: portage-2.2.26 RepoMan-Options: --include-arches="amd64" Signed-off-by: Agostino Sarubbo gentoo.org> net-im/bitlbee/bitlbee-3.4.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-im/bitlbee/bitlbee-3.4.1.ebuild b/net-im/bitlbee/bitlbee-3.4.1.ebuild index 2390ec6..c3a8047 100644 --- a/net-im/bitlbee/bitlbee-3.4.1.ebuild +++ b/net-im/bitlbee/bitlbee-3.4.1.ebuild @@ -13,7 +13,7 @@ SRC_URI="http://get.bitlbee.org/src/${P}.tar.gz; LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd" +KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd" IUSE="debug gnutls ipv6 +xmpp libevent msn nss +oscar otr +plugins purple selinux skype ssl test twitter +yahoo xinetd libressl"
[gentoo-commits] repo/gentoo:master commit in: net-im/bitlbee/
commit: 0cc2768a9f6683d4cdcf32571adcf860682a0d8a Author: Tim Harder gentoo org> AuthorDate: Mon Jan 18 03:31:10 2016 + Commit: Tim Harder gentoo org> CommitDate: Mon Jan 18 03:31:54 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0cc2768a net-im/bitlbee: add live ebuild net-im/bitlbee/bitlbee-.ebuild | 176 + 1 file changed, 176 insertions(+) diff --git a/net-im/bitlbee/bitlbee-.ebuild b/net-im/bitlbee/bitlbee-.ebuild new file mode 100644 index 000..fb77fd8 --- /dev/null +++ b/net-im/bitlbee/bitlbee-.ebuild @@ -0,0 +1,176 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +PYTHON_COMPAT=( python2_7 ) + +inherit eutils multilib user python-single-r1 systemd + +if [[ ${PV} == "" ]]; then + EGIT_REPO_URI="https://github.com/bitlbee/bitlbee.git; + inherit git-r3 +else + SRC_URI="http://get.bitlbee.org/src/${P}.tar.gz; + KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd" +fi + +DESCRIPTION="irc to IM gateway that support multiple IM protocols" +HOMEPAGE="http://www.bitlbee.org/; + +LICENSE="GPL-2" +SLOT="0" +IUSE="debug gnutls ipv6 +xmpp libevent msn nss +oscar otr +plugins purple selinux + skype ssl test twitter +yahoo xinetd" + +COMMON_DEPEND=" + >=dev-libs/glib-2.16 + purple? ( net-im/pidgin ) + libevent? ( dev-libs/libevent ) + otr? ( >=net-libs/libotr-4 ) + gnutls? ( net-libs/gnutls ) + !gnutls? ( + nss? ( dev-libs/nss ) + !nss? ( ssl? ( dev-libs/openssl:0 ) ) + ) + " +DEPEND="${COMMON_DEPEND} + dev-lang/python + virtual/pkgconfig + selinux? ( sec-policy/selinux-bitlbee ) + test? ( dev-libs/check )" + +RDEPEND="${COMMON_DEPEND} + virtual/logger + skype? ( + dev-python/skype4py[${PYTHON_USEDEP}] + net-im/skype + ) + xinetd? ( sys-apps/xinetd )" + +REQUIRED_USE="|| ( purple xmpp msn oscar yahoo ) + msn? ( || ( gnutls nss ssl ) ) + xmpp? ( !nss )" + +pkg_setup() { + if use xmpp && ! use gnutls && ! use ssl ; then + einfo + elog "You have enabled support for Jabber but do not have SSL" + elog "support enabled. This *will* prevent bitlbee from being" + elog "able to connect to SSL enabled Jabber servers. If you need to" + elog "connect to Jabber over SSL, enable ONE of the following use" + elog "flags: gnutls or ssl" + einfo + fi + + use skype && python-single-r1_pkg_setup + + enewgroup bitlbee + enewuser bitlbee -1 -1 /var/lib/bitlbee bitlbee +} + +src_prepare() { + sed -i \ + -e "s@/usr/local/sbin/bitlbee@/usr/sbin/bitlbee@" \ + -e "s/nobody/bitlbee/" \ + -e "s/}/disable = yes\n}/" \ + doc/bitlbee.xinetd || die "sed failed in xinetd" + + sed -i \ + -e "s@mozilla-nss@nss@g" \ + configure || die "sed failed in configure" + + use skype && python_fix_shebang protocols/skype/skyped.py + + [[ ${PV} != "" ]] && epatch "${FILESDIR}"/${PN}-3.2.1-configure.patch + epatch_user +} + +src_configure() { + # setup plugins, protocol, ipv6 and debug + use xmpp && myconf="${myconf} --jabber=1" + for flag in debug ipv6 msn oscar plugins purple skype twitter yahoo ; do + if use ${flag} ; then + myconf="${myconf} --${flag}=1" + else + myconf="${myconf} --${flag}=0" + fi + done + + # set otr + if use otr && use plugins ; then + myconf="${myconf} --otr=plugin" + else + if use otr ; then + ewarn "OTR support has been disabled automatically because it" + ewarn "requires the plugins USE flag." + fi + myconf="${myconf} --otr=0" + fi + + # setup ssl use flags + if use gnutls ; then + myconf="${myconf} --ssl=gnutls" + einfo "Using gnutls for SSL support" + elif use ssl ; then + myconf="${myconf} --ssl=openssl" + einfo "Using openssl for SSL support" + elif use nss ; then + myconf="${myconf} --ssl=nss" + einfo "Using nss for SSL support" + else + myconf="${myconf} --ssl=bogus" + einfo "You will not have any encryption support enabled." + fi + + # set event handler + if use libevent ; then + myconf="${myconf} --events=libevent" + else + myconf="${myconf} --events=glib" + fi + + # NOTE: bitlbee's configure script is not an autotool creation, + # so that is why we
[gentoo-commits] repo/gentoo:master commit in: net-im/bitlbee/
commit: f3a83e24bcc8dec126f00b3ecb6344f3cc1234fd Author: Tim Harder gentoo org> AuthorDate: Sun Jan 17 21:44:19 2016 + Commit: Tim Harder gentoo org> CommitDate: Sun Jan 17 22:20:01 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3a83e24 net-im/bitlbee: version bump to 3.4.1 net-im/bitlbee/Manifest | 1 + net-im/bitlbee/bitlbee-3.4.1.ebuild | 178 2 files changed, 179 insertions(+) diff --git a/net-im/bitlbee/Manifest b/net-im/bitlbee/Manifest index 452cb35..3bd3f16 100644 --- a/net-im/bitlbee/Manifest +++ b/net-im/bitlbee/Manifest @@ -1 +1,2 @@ DIST bitlbee-3.2.2.tar.gz 661757 SHA256 ba38939281f23e8a0e71022c7be0cb68f6544248404362c5e20245fa7a67558e SHA512 5826a9d64e2de42c5560d85c3e7c96a72930afae005143323b6a301b588328b156b50cde571c7f396ca00952d950d22db1ea11cc42256935d3d72ec90215e7d2 WHIRLPOOL cbc3552289949e5e10281d65f617f38075016c813bf2cbb13e09af913ea8545c46a69225bf4f523e1a73f955d7309b8c7b94e23affdedf5dce2760eee55203ae +DIST bitlbee-3.4.1.tar.gz 700767 SHA256 f5347de9fe0ac5817686e90ccdf6d79b2895fd6d0a9d2c72f619d3319bf4625f SHA512 bc5e44a95d0d646118e730704d7d37d3be44d3905b5016759500173224568481d92a214ff66b1a91ea2d941ca2f1fdaeb040902bb7d22609de732fa7cd9940fb WHIRLPOOL 351f6e9c5cc59b605d0d0a01136c11a6fb58f7ec53ef478a65f421bd693bdd7cbeaf63605d442c96c209b15bc94b3f397b65c58fa1027ce6ee9c8ca51b8f4b1b diff --git a/net-im/bitlbee/bitlbee-3.4.1.ebuild b/net-im/bitlbee/bitlbee-3.4.1.ebuild new file mode 100644 index 000..4c281c9 --- /dev/null +++ b/net-im/bitlbee/bitlbee-3.4.1.ebuild @@ -0,0 +1,178 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +PYTHON_COMPAT=( python2_7 ) + +inherit eutils multilib user python-single-r1 systemd + +DESCRIPTION="irc to IM gateway that support multiple IM protocols" +HOMEPAGE="http://www.bitlbee.org/; +SRC_URI="http://get.bitlbee.org/src/${P}.tar.gz; + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd" +IUSE="debug gnutls ipv6 +xmpp libevent msn nss +oscar otr +plugins purple selinux + skype ssl test twitter +yahoo xinetd" + +COMMON_DEPEND=" + >=dev-libs/glib-2.16 + purple? ( net-im/pidgin ) + libevent? ( dev-libs/libevent ) + otr? ( >=net-libs/libotr-4 ) + gnutls? ( net-libs/gnutls ) + !gnutls? ( + nss? ( dev-libs/nss ) + !nss? ( ssl? ( dev-libs/openssl:0 ) ) + ) + " +DEPEND="${COMMON_DEPEND} + dev-lang/python + virtual/pkgconfig + selinux? ( sec-policy/selinux-bitlbee ) + test? ( dev-libs/check )" + +RDEPEND="${COMMON_DEPEND} + virtual/logger + skype? ( + dev-python/skype4py[${PYTHON_USEDEP}] + net-im/skype + ) + xinetd? ( sys-apps/xinetd )" + +REQUIRED_USE="|| ( purple xmpp msn oscar yahoo ) + msn? ( || ( gnutls nss ssl ) ) + xmpp? ( !nss )" + +pkg_setup() { + if use xmpp && ! use gnutls && ! use ssl ; then + einfo + elog "You have enabled support for Jabber but do not have SSL" + elog "support enabled. This *will* prevent bitlbee from being" + elog "able to connect to SSL enabled Jabber servers. If you need to" + elog "connect to Jabber over SSL, enable ONE of the following use" + elog "flags: gnutls or ssl" + einfo + fi + + use skype && python-single-r1_pkg_setup + + enewgroup bitlbee + enewuser bitlbee -1 -1 /var/lib/bitlbee bitlbee +} + +src_prepare() { + sed -i \ + -e "s@/usr/local/sbin/bitlbee@/usr/sbin/bitlbee@" \ + -e "s/nobody/bitlbee/" \ + -e "s/}/disable = yes\n}/" \ + doc/bitlbee.xinetd || die "sed failed in xinetd" + + sed -i \ + -e "s@mozilla-nss@nss@g" \ + configure || die "sed failed in configure" + + use skype && python_fix_shebang protocols/skype/skyped.py + + epatch "${FILESDIR}"/${PN}-3.2.1-configure.patch +} + +src_configure() { + # setup plugins, protocol, ipv6 and debug + use xmpp && myconf="${myconf} --jabber=1" + for flag in debug ipv6 msn oscar plugins purple skype twitter yahoo ; do + if use ${flag} ; then + myconf="${myconf} --${flag}=1" + else + myconf="${myconf} --${flag}=0" + fi + done + + # set otr + if use otr && use plugins ; then + myconf="${myconf} --otr=plugin" + else + if use otr ; then + ewarn "OTR support has been disabled automatically because it" + ewarn "requires the plugins USE flag." + fi + myconf="${myconf} --otr=0" + fi + + # setup ssl use flags + if use
[gentoo-commits] repo/gentoo:master commit in: net-im/bitlbee/
commit: a985ee245998077d74b74b3af6adc546a0332db9 Author: Tim Harder gentoo org> AuthorDate: Mon Jan 18 03:16:53 2016 + Commit: Tim Harder gentoo org> CommitDate: Mon Jan 18 03:17:29 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a985ee24 net-im/bitlbee: update manifest for changed upstream tarball net-im/bitlbee/Manifest | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-im/bitlbee/Manifest b/net-im/bitlbee/Manifest index 3bd3f16..de17c3e 100644 --- a/net-im/bitlbee/Manifest +++ b/net-im/bitlbee/Manifest @@ -1,2 +1,2 @@ DIST bitlbee-3.2.2.tar.gz 661757 SHA256 ba38939281f23e8a0e71022c7be0cb68f6544248404362c5e20245fa7a67558e SHA512 5826a9d64e2de42c5560d85c3e7c96a72930afae005143323b6a301b588328b156b50cde571c7f396ca00952d950d22db1ea11cc42256935d3d72ec90215e7d2 WHIRLPOOL cbc3552289949e5e10281d65f617f38075016c813bf2cbb13e09af913ea8545c46a69225bf4f523e1a73f955d7309b8c7b94e23affdedf5dce2760eee55203ae -DIST bitlbee-3.4.1.tar.gz 700767 SHA256 f5347de9fe0ac5817686e90ccdf6d79b2895fd6d0a9d2c72f619d3319bf4625f SHA512 bc5e44a95d0d646118e730704d7d37d3be44d3905b5016759500173224568481d92a214ff66b1a91ea2d941ca2f1fdaeb040902bb7d22609de732fa7cd9940fb WHIRLPOOL 351f6e9c5cc59b605d0d0a01136c11a6fb58f7ec53ef478a65f421bd693bdd7cbeaf63605d442c96c209b15bc94b3f397b65c58fa1027ce6ee9c8ca51b8f4b1b +DIST bitlbee-3.4.1.tar.gz 688072 SHA256 500a0b19943040d67458eb3beb0a63d004abb2aa54a777addeb2a895d4f5c0e1 SHA512 fad297c7a792c932ba74daf7dc894883037842ae5d39a4c831c6615100580073001806c1af60555aa1c775399e8a484d99a4e601e96c6a075e12546e5d153532 WHIRLPOOL 431faa8f065233ee7345d4950d147fea9fc627ba4b78ca0f25bed9627804d3dd4d512a12c9f98bd29a01ebfb680c8cf7e756bb53b38a484b304a0e973c657993
[gentoo-commits] repo/gentoo:master commit in: net-im/bitlbee-steam/
commit: 796a7e670981c2336aad145c41455b9e74917414 Author: Julian Ospald hasufell AT gentoo DOT org AuthorDate: Fri Aug 14 22:55:03 2015 + Commit: Julian Ospald hasufell AT gentoo DOT org CommitDate: Fri Aug 14 22:55:03 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=796a7e67 net-im/bitlbee-steam: rm old net-im/bitlbee-steam/Manifest | 1 - net-im/bitlbee-steam/bitlbee-steam-1.1.0.ebuild | 38 - 2 files changed, 39 deletions(-) diff --git a/net-im/bitlbee-steam/Manifest b/net-im/bitlbee-steam/Manifest index f2b4498..af5b2af 100644 --- a/net-im/bitlbee-steam/Manifest +++ b/net-im/bitlbee-steam/Manifest @@ -1,2 +1 @@ -DIST bitlbee-steam-1.1.0.tar.gz 38832 SHA256 9c818b58408dfa5bcf1151ef18559da35c687578dabb13c4f3f72488c11a34dc SHA512 2bc8ed281dd6102f6898ec1a3adf232b42fdd98e8858797dab7a54118c4bddbe6cfbb0b0f0b972795935437f4d1e87a146ba026f7853898053e372c901f52d70 WHIRLPOOL 28ec3a44fe5777abdd4af45cd44d0601de02b18dd7195f78ff12f32bd6bd7caeece31b44f1650f7b4b504f989dd76887e62c0af8d7190b4c944c5e599be82875 DIST bitlbee-steam-1.2.0.tar.gz 40277 SHA256 ffcfbaf4aef55e78470fc8102554dc190a43d3a5cf6c055188f26036c8fb3a11 SHA512 706f22193d7a22dcbcaa6a07d2dcd4707b666d9a831a9864949ce9a6f2a1db33d3a07f94b3cde9a8d6042fd53caa07b1f87749f87b146d88793578cca997adee WHIRLPOOL e8b69dbbdcc07a82fc75e270bb431611f4de0b1e96ef0756adff4d20cc0656828b159b8973ea9b1d735ae9a641882e1fcb68a8ce9513cb605be3e26eca22a5da diff --git a/net-im/bitlbee-steam/bitlbee-steam-1.1.0.ebuild b/net-im/bitlbee-steam/bitlbee-steam-1.1.0.ebuild deleted file mode 100644 index bb3858e..000 --- a/net-im/bitlbee-steam/bitlbee-steam-1.1.0.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit eutils autotools - -DESCRIPTION=Steam protocol plugin for BitlBee -HOMEPAGE=https://github.com/jgeboski/bitlbee-steam; -SRC_URI=https://github.com/jgeboski/bitlbee-steam/archive/v${PV}.tar.gz - ${P}.tar.gz - -LICENSE=GPL-2 LGPL-2.1 BSD-2 -SLOT=0 -KEYWORDS=~amd64 ~x86 -IUSE=debug - -RDEPEND= - dev-libs/gmp:0 - =net-im/bitlbee-3.2.1[plugins] -DEPEND=${RDEPEND} - dev-libs/glib:2 - virtual/pkgconfig - -src_prepare() { - eautoreconf -} - -src_configure() { - econf \ - $(use_enable debug) \ - --enable-minimal-flags -} - -src_install() { - default - prune_libtool_files -}
[gentoo-commits] repo/gentoo:master commit in: net-im/bitlbee-steam/, x11-plugins/bitlbee-steam/, profiles/updates/
commit: 066841e0b9acefb71485a8a51b972d0deb2a248d Author: Julian Ospald hasufell AT gentoo DOT org AuthorDate: Tue Aug 11 00:35:40 2015 + Commit: Julian Ospald hasufell AT gentoo DOT org CommitDate: Tue Aug 11 00:36:53 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=066841e0 move x11-plugins/bitlbee-steam to net-im/bitlbee-steam Gentoo-Bug: 519024 {x11-plugins = net-im}/bitlbee-steam/Manifest | 0 {x11-plugins = net-im}/bitlbee-steam/bitlbee-steam-1.1.0.ebuild | 0 {x11-plugins = net-im}/bitlbee-steam/bitlbee-steam-1.2.0.ebuild | 0 {x11-plugins = net-im}/bitlbee-steam/bitlbee-steam-.ebuild | 0 {x11-plugins = net-im}/bitlbee-steam/metadata.xml | 0 profiles/updates/3Q-2015 | 1 + 6 files changed, 1 insertion(+) diff --git a/x11-plugins/bitlbee-steam/Manifest b/net-im/bitlbee-steam/Manifest similarity index 100% rename from x11-plugins/bitlbee-steam/Manifest rename to net-im/bitlbee-steam/Manifest diff --git a/x11-plugins/bitlbee-steam/bitlbee-steam-1.1.0.ebuild b/net-im/bitlbee-steam/bitlbee-steam-1.1.0.ebuild similarity index 100% rename from x11-plugins/bitlbee-steam/bitlbee-steam-1.1.0.ebuild rename to net-im/bitlbee-steam/bitlbee-steam-1.1.0.ebuild diff --git a/x11-plugins/bitlbee-steam/bitlbee-steam-1.2.0.ebuild b/net-im/bitlbee-steam/bitlbee-steam-1.2.0.ebuild similarity index 100% rename from x11-plugins/bitlbee-steam/bitlbee-steam-1.2.0.ebuild rename to net-im/bitlbee-steam/bitlbee-steam-1.2.0.ebuild diff --git a/x11-plugins/bitlbee-steam/bitlbee-steam-.ebuild b/net-im/bitlbee-steam/bitlbee-steam-.ebuild similarity index 100% rename from x11-plugins/bitlbee-steam/bitlbee-steam-.ebuild rename to net-im/bitlbee-steam/bitlbee-steam-.ebuild diff --git a/x11-plugins/bitlbee-steam/metadata.xml b/net-im/bitlbee-steam/metadata.xml similarity index 100% rename from x11-plugins/bitlbee-steam/metadata.xml rename to net-im/bitlbee-steam/metadata.xml diff --git a/profiles/updates/3Q-2015 b/profiles/updates/3Q-2015 index b631df9..31f8665 100644 --- a/profiles/updates/3Q-2015 +++ b/profiles/updates/3Q-2015 @@ -3,3 +3,4 @@ move dev-perl/locale-maketext-lexicon dev-perl/Locale-Maketext-Lexicon slotmove dev-util/kdevelop-pg-qt 0 4 slotmove dev-util/kdevelop-qmake 0 4 move dev-java/biojava sci-biology/biojava +move x11-plugins/bitlbee-steam net-im/bitlbee-steam