From 6bc2e4d7c5906e46a8f275a876ead6ec41aca5bb Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 10 Feb 2019 15:40:27 +0000 Subject: gentoo resync : 10.02.2019 --- net-im/bitlbee/Manifest | 6 +- net-im/bitlbee/bitlbee-3.6.ebuild | 149 ++++++++++++++++++++++++++++++++++ net-im/bitlbee/bitlbee-9999.ebuild | 29 ++----- net-im/bitlbee/files/bitlbee.confd-r2 | 7 ++ net-im/bitlbee/files/bitlbee.initd-r2 | 7 ++ 5 files changed, 173 insertions(+), 25 deletions(-) create mode 100644 net-im/bitlbee/bitlbee-3.6.ebuild create mode 100644 net-im/bitlbee/files/bitlbee.confd-r2 create mode 100644 net-im/bitlbee/files/bitlbee.initd-r2 (limited to 'net-im/bitlbee') diff --git a/net-im/bitlbee/Manifest b/net-im/bitlbee/Manifest index 605da367af9e..fc424eca7d68 100644 --- a/net-im/bitlbee/Manifest +++ b/net-im/bitlbee/Manifest @@ -1,8 +1,12 @@ AUX bitlbee-3.5-systemd-user.patch 188 BLAKE2B 9cdb3713aaf213b741a8dbef0a790a35458b955515bb720987471c519848ec6b9a232fe136ca554a3fe1eb0c184d96b8774cee4a41c0cd3d822a33598ac50e79 SHA512 1775b5dce7bdd4fbe52a46e361d8a9b0127be2dc32a3e8b438fca8fce9139903feb91c968847f002e099553eb8d4a110914cfb19121ae79a3f6c9eb100846edd AUX bitlbee-3.5-verbose-build.patch 5790 BLAKE2B d5ad371938cb7b8a2f9e0925633602ebc6a9a774dc0dfae6ba30350597840c4472411a1eced122b9f33afc3d36b221b8d9176c0d39e375bcbb100a7ae211dcde SHA512 0bb4d1e4d954ca4812f1968a3c83ae6d7ea1d812066e963b00471aa516b1ac0ca041c8574bfb4a1e91236b2e1ad3c9edf3041b7467a84bf22cc120b4e7e69faa AUX bitlbee.confd-r1 291 BLAKE2B bf576c629a6554127a8ae54a54d9ac03cc68accdf226376620727f0f77eab60610ad096b084e7b1568366376b8c7aacd180f2dbd276369af4389c8cd4791cbb1 SHA512 e5dcb6bdfd382b28011c5fc93273d45bfd9af0c652e4f8db1c0d11615b38c5dbb7042d9b33fa5bdce844593e85a5776f2b19f75e9a67a2c46dc88b90f260e11e +AUX bitlbee.confd-r2 303 BLAKE2B 01ac57be4d6d50be227d6528425909a98231d3e5e2d7718ee71195890123145169a4be1568514b41b9509b992e747c4169022d31fb33c62e00a00f757307d8d8 SHA512 4ba7b8a81d5b77bd8ccd94431b065d4850c97bb153ca715f5f4ea6a1f9a6c90ab2c99fb9d6342311ae948bd34904a9cc2b3696f1b8f09e2475b79d254f744ae4 AUX bitlbee.initd-r1 675 BLAKE2B fb9c803301bb73b1bb6a92d059ca85fbee119849cd27d92c9bf995e6e4dddffbc73960784b4102dea0c0f7b92990364426163c3c0291097303727fd47cf7acfd SHA512 5c65b85e72a2013454becceaab0d08e5e69bb9072c6081f1c4cd3cef87104b2413bcc432a1db0a761e91e42cf72df2344101fb0f886b88fe60882e26d597f921 +AUX bitlbee.initd-r2 247 BLAKE2B 066c26d4029571237904fbb7be455b9e1e7d930aedd6a28375fa000ae4146e8e3d7e933213f59ff2bc38958f9c34da8d7da463a7a0cc491e262bbac0491aa30f SHA512 7b9154229c9c5acf8fb480788d665fe8eec6c2038e56a9a24c54ca5ffcff3acaf55614d2ea2d9348f764b8b03b826db9171fe04771affc2636aadd31ac75da38 DIST bitlbee-3.5.1.tar.gz 680351 BLAKE2B 952a12975d4f95020a5b577603aea791fca754006dc96af3c500d3885b6f2c50cabe51ab698625acb717524a729ef03d18a29aa25bd4815bae2f18fa6298aeea SHA512 4eb3b0d3a92910c8dd789cd23338cc6296bf40212c5244fcb27a88ede10e86424ea59c78e719841863701a7fdd8c61819f2775f7b58833e287d9110e49d036f3 +DIST bitlbee-3.6.tar.gz 534961 BLAKE2B 007681a384fcb2c0736b901dfdc213ba0829ca006ad3204aca1bc4520a3874760867df6165a9218a9deeabb13bc06f118c9e2f804a97e671a348734f6cb7e963 SHA512 ccbf0f23e228de2de147241f36f59744b2256cba958e2fabfba0cfa60935e55bbb7d7e20fffa54da9a345e55ffa9ca82cb62e9b99dc738ba35c6e268c6561a8d EBUILD bitlbee-3.5.1.ebuild 3850 BLAKE2B 4118657834b2f7b4239298ce4e569da0ce719189b4bc661321663714063da662d257095ffb1e9d741ba4de98096271638a2e3358409dda09e9a2465dab94d59b SHA512 42f274030a1766cfb03ebf02a2d2099adf04b85b53788e59ecb9428c1c253cc01a431de03083810d30b1ab6f0d3ea531c75468dd34639a97f673b5b7989c6332 -EBUILD bitlbee-9999.ebuild 3843 BLAKE2B 6d524b9788873b6d4b8af09538c811b5610da4ee7aa16d43781ead488cfa27519bf7795c9cddf2e0710a0bd37e8f633a06908194ab66a8520b083eaa07430696 SHA512 fa22f93306ced1b557eb27e9bcd890c9d4e5daae616a488d0c3c88277dfb62f0653348177f58040d62a9f8f96f77c6139204ffc34323c5e5efca3166e25f4d8a +EBUILD bitlbee-3.6.ebuild 3301 BLAKE2B da6aa1f91abf37d77d686f5dc51b59d3380e9c0e04b9560d100aafa1ad82ea261c85644d970bea9d07a2e055275ad670cf41741ea88315a9871ba5f3fc3865d0 SHA512 f1192c5a6f4b028f25a8afd2a9353ccf6d6b1607e2e19f5bd4600f8c8c1d29c82deeb870a37a642f0d94cf00b740c41e3467e1003faaa78050a02ac768d0648f +EBUILD bitlbee-9999.ebuild 3301 BLAKE2B da6aa1f91abf37d77d686f5dc51b59d3380e9c0e04b9560d100aafa1ad82ea261c85644d970bea9d07a2e055275ad670cf41741ea88315a9871ba5f3fc3865d0 SHA512 f1192c5a6f4b028f25a8afd2a9353ccf6d6b1607e2e19f5bd4600f8c8c1d29c82deeb870a37a642f0d94cf00b740c41e3467e1003faaa78050a02ac768d0648f MISC metadata.xml 885 BLAKE2B cf00ece23b24c43f9632c58706bdfa531ffd121db272a248754dc6f7dde9770d344211e0bcd75279c31aea66d1ddf5bd6b66611aaeffb3269ac5c0d534a4e054 SHA512 1a4d426b0b76a7e33d80c6d6ff1563f8477f2bfbe1e0cd9e0371310d84b057ca3f46e621a8af18c7421977461205efd076777063a1f2892043515bef1d4fa038 diff --git a/net-im/bitlbee/bitlbee-3.6.ebuild b/net-im/bitlbee/bitlbee-3.6.ebuild new file mode 100644 index 000000000000..703647ae05d3 --- /dev/null +++ b/net-im/bitlbee/bitlbee-3.6.ebuild @@ -0,0 +1,149 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit user 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 ~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 ) + test? ( plugins ) +" + +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} + xinetd? ( sys-apps/xinetd )" + +pkg_setup() { + enewgroup bitlbee + enewuser bitlbee -1 -1 /var/lib/bitlbee bitlbee +} + +src_prepare() { + [[ ${PV} != "9999" ]] && eapply "${FILESDIR}"/${PN}-3.5-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 \ + --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} +} + +pkg_postinst() { + chown -R bitlbee:bitlbee "${ROOT}"/var/lib/bitlbee +} diff --git a/net-im/bitlbee/bitlbee-9999.ebuild b/net-im/bitlbee/bitlbee-9999.ebuild index ba55773394df..703647ae05d3 100644 --- a/net-im/bitlbee/bitlbee-9999.ebuild +++ b/net-im/bitlbee/bitlbee-9999.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} != "9999" ]]; then - eapply \ - "${FILESDIR}"/${P}-systemd-user.patch \ - "${FILESDIR}"/${P}-verbose-build.patch - fi - + [[ ${PV} != "9999" ]] && 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/files/bitlbee.confd-r2 b/net-im/bitlbee/files/bitlbee.confd-r2 new file mode 100644 index 000000000000..afd24f857f2d --- /dev/null +++ b/net-im/bitlbee/files/bitlbee.confd-r2 @@ -0,0 +1,7 @@ +# Bitlbee options (see /usr/sbin/bitlbee -h) +BITLBEE_OPTS="" + +# Specify the network services that correspond to "DaemonInterface" and +# "ClientInterface" settings in bitlbee.conf. For example, if bound to 0.0.0.0, +# this should be set to "net.lo" which provides the loopback interface. +rc_need="net.lo" diff --git a/net-im/bitlbee/files/bitlbee.initd-r2 b/net-im/bitlbee/files/bitlbee.initd-r2 new file mode 100644 index 000000000000..0b3b1a4911bc --- /dev/null +++ b/net-im/bitlbee/files/bitlbee.initd-r2 @@ -0,0 +1,7 @@ +#!/sbin/openrc-run +# Copyright 1999-2019 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +command="/usr/sbin/bitlbee" +pidfile="/run/${RC_SVCNAME}.pid" +command_args="-D -P ${pidfile} -u bitlbee ${BITLBEE_OPTS}" -- cgit v1.2.3