commit: 3ac41e02f79acc131daf0d305adac6b703de91ef Author: Jaco Kroon <jaco <AT> uls <DOT> co <DOT> za> AuthorDate: Sun Apr 19 19:40:25 2020 +0000 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> CommitDate: Tue Apr 21 08:17:21 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ac41e02
net-misc/asterisk: fix USE=-samples. Note: USE=samples only really install default configs into /etc/asterisk, as such, IUSE=samples is going away on the next bump, so default configs will be installed. Use INSTALL_MASK to prevent this if you don't want this: INSTALL_MASK=/etc/asterisk/* in make.conf Closes: https://bugs.gentoo.org/717450 Package-Manager: Portage-2.3.89, Repoman-2.3.20 Signed-off-by: Jaco Kroon <jaco <AT> uls.co.za> Closes: https://github.com/gentoo/gentoo/pull/15416 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> net-misc/asterisk/asterisk-13.32.0-r1.ebuild | 10 +--------- net-misc/asterisk/asterisk-16.9.0.ebuild | 10 +--------- 2 files changed, 2 insertions(+), 18 deletions(-) diff --git a/net-misc/asterisk/asterisk-13.32.0-r1.ebuild b/net-misc/asterisk/asterisk-13.32.0-r1.ebuild index 63d8d692786..49dc718b5c0 100644 --- a/net-misc/asterisk/asterisk-13.32.0-r1.ebuild +++ b/net-misc/asterisk/asterisk-13.32.0-r1.ebuild @@ -247,21 +247,13 @@ src_install() { diropts -m 0750 -o root -g asterisk keepdir /etc/asterisk if use samples; then - emake NOISY_BUILD=yes DESTDIR="${ED}" samples + emake NOISY_BUILD=yes DESTDIR="${ED}" CONFIG_SRC=configs/samples CONFIG_EXTEN=.sample install-configs for conffile in "${ED}/etc/asterisk/"* do fowners root:root "${conffile#${ED}}" fperms 0644 "${conffile#${ED}}" done - einfo "Sample files have been installed" - else - einfo "Skipping installation of sample files..." - rm "${ED}"/var/lib/asterisk/mohmp3/* || die - rm "${ED}"/var/lib/asterisk/sounds/demo-* || die - rm "${ED}"/var/lib/asterisk/agi-bin/* || die - rm "${ED}"/etc/asterisk/* || die fi - rm -r "${ED}"/var/spool/asterisk/voicemail/default || die # keep directories diropts -m 0750 -o asterisk -g root diff --git a/net-misc/asterisk/asterisk-16.9.0.ebuild b/net-misc/asterisk/asterisk-16.9.0.ebuild index 9f32978aaa5..b7d72507ad5 100644 --- a/net-misc/asterisk/asterisk-16.9.0.ebuild +++ b/net-misc/asterisk/asterisk-16.9.0.ebuild @@ -248,21 +248,13 @@ src_install() { diropts -m 0750 -o root -g asterisk keepdir /etc/asterisk if use samples; then - emake NOISY_BUILD=yes DESTDIR="${ED}" samples + emake NOISY_BUILD=yes DESTDIR="${ED}" CONFIG_SRC=configs/samples CONFIG_EXTEN=.sample install-configs for conffile in "${ED}/etc/asterisk/"* do fowners root:root "${conffile#${ED}}" fperms 0644 "${conffile#${ED}}" done - einfo "Sample files have been installed" - else - einfo "Skipping installation of sample files..." - rm "${ED}"/var/lib/asterisk/mohmp3/* || die - rm "${ED}"/var/lib/asterisk/sounds/demo-* || die - rm "${ED}"/var/lib/asterisk/agi-bin/* || die - rm "${ED}"/etc/asterisk/* || die fi - rm -r "${ED}"/var/spool/asterisk/voicemail/default || die # keep directories diropts -m 0750 -o asterisk -g root
