diff options
author | Petr Vaněk <arkamar@gentoo.org> | 2024-02-20 09:39:40 +0100 |
---|---|---|
committer | Petr Vaněk <arkamar@gentoo.org> | 2024-02-20 10:08:08 +0100 |
commit | 8efebc002a1d5694b8387ad21e0081a6f0341b56 (patch) | |
tree | 7cc53f84d59320525c371cf2874eafc38a51aff8 | |
parent | net-im/bitlbee: sync live (diff) | |
download | gentoo-8efebc002a1d5694b8387ad21e0081a6f0341b56.tar.gz gentoo-8efebc002a1d5694b8387ad21e0081a6f0341b56.tar.bz2 gentoo-8efebc002a1d5694b8387ad21e0081a6f0341b56.zip |
net-im/bitlbee: drop 3.6-r2
Signed-off-by: Petr Vaněk <arkamar@gentoo.org>
-rw-r--r-- | net-im/bitlbee/bitlbee-3.6-r2.ebuild | 154 | ||||
-rw-r--r-- | net-im/bitlbee/files/bitlbee-3.6-strict-aliasing.patch | 31 |
2 files changed, 0 insertions, 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..000000000000 --- 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} == "9999" ]]; 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 - - newinitd "${FILESDIR}"/bitlbee.initd-r2 bitlbee - newconfd "${FILESDIR}"/bitlbee.confd-r2 bitlbee - - exeinto /usr/share/bitlbee - doexe utils/{convert_purple.py,bitlbee-ctl.pl} -} diff --git a/net-im/bitlbee/files/bitlbee-3.6-strict-aliasing.patch b/net-im/bitlbee/files/bitlbee-3.6-strict-aliasing.patch deleted file mode 100644 index 30ecff9747ee..000000000000 --- a/net-im/bitlbee/files/bitlbee-3.6-strict-aliasing.patch +++ /dev/null @@ -1,31 +0,0 @@ -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 **) &value->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 **) &top->u.object.values) += string_length + 1; -+ json_char **chars = (json_char **) &top->u.object.values; -+ chars[0] += string_length + 1; - } else { - top->u.object.values [top->u.object.length].name - = (json_char *) top->_reserved.object_mem; |