commit: 73ccf4a6bbacf812ff1d4da6e5e7f30de7d67aa4 Author: Tim Harder <radhermit <AT> gentoo <DOT> org> AuthorDate: Sun Feb 10 04:41:45 2019 +0000 Commit: Tim Harder <radhermit <AT> gentoo <DOT> org> CommitDate: Sun Feb 10 04:46:03 2019 +0000 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 <radhermit <AT> gentoo.org> net-im/bitlbee/Manifest | 1 + .../{bitlbee-9999.ebuild => bitlbee-3.6.ebuild} | 29 ++++------------------ 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, 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-9999.ebuild b/net-im/bitlbee/bitlbee-3.6.ebuild similarity index 80% copy from net-im/bitlbee/bitlbee-9999.ebuild copy to net-im/bitlbee/bitlbee-3.6.ebuild index ba55773394d..703647ae05d 100644 --- a/net-im/bitlbee/bitlbee-9999.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} != "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/bitlbee-9999.ebuild b/net-im/bitlbee/bitlbee-9999.ebuild index ba55773394d..703647ae05d 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 00000000000..afd24f857f2 --- /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 00000000000..0b3b1a4911b --- /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}"
