--- file_not_specified_in_diff +++ file_not_specified_in_diff @@ -, +, @@ --- /usr/portage/media-sound/murmur/murmur-1.3.0_rc2.ebuild 2019-06-26 12:09:44.000000000 +0300 +++ /var/db/repos/localrepo/media-sound/murmur/murmur-1.3.0_rc2.ebuild 2019-07-03 23:14:37.405587015 +0300 @@ -72,10 +72,14 @@ src_prepare() { default + if [[ "${PV}" == 9999 ]] ; then + ( cd "${S}"/scripts && "${S}"/scripts/mkini.sh ) + fi + sed \ -e 's:mumble-server:murmur:g' \ -e 's:/var/run:/run:g' \ - -i "${S}"/scripts/murmur.{conf,ini} || die + -i "${S}"/scripts/murmur.{conf,ini.system} || die } src_configure() { @@ -110,11 +114,11 @@ dobin "${dir}"/murmurd - insinto /etc/murmur/ - doins scripts/murmur.ini + insinto /etc/ + newins scripts/murmur.ini.system murmur.ini insinto /etc/logrotate.d/ - newins "${FILESDIR}"/murmur.logrotate murmur + newins "${FILESDIR}"/murmur.logrotate-r1 murmur insinto /etc/dbus-1/system.d/ doins scripts/murmur.conf @@ -123,7 +127,7 @@ doins src/murmur/Murmur.ice newinitd "${FILESDIR}"/murmur.initd-r1 murmur - newconfd "${FILESDIR}"/murmur.confd murmur + newconfd "${FILESDIR}"/murmur.confd-r1 murmur systemd_dounit scripts/${PN}.service systemd_newtmpfilesd "${FILESDIR}"/murmurd-dbus.tmpfiles "${PN}".conf @@ -134,8 +138,8 @@ # Fix permissions on config file as it might contain passwords. # (bug #559362) - fowners root:murmur /etc/murmur/murmur.ini - fperms 640 /etc/murmur/murmur.ini + fowners root:murmur /etc/murmur.ini + fperms 640 /etc/murmur.ini doman man/murmurd.1