net-dns/djbdns: update IPv6 patch

[DerDakon]

Bug: https://bugs.gentoo.org/652156
Package-Manager: Portage-2.3.24, Repoman-2.3.6

[gentoo-repo-qa-bot]

Pull Request assignment

Areas affected: ebuilds
Packages affected: net-dns/djbdns

net-dns/djbdns: @orlitzky

Bugs linked: 652156

In order to force reassignment and/or bug reference scan, please append [please reassign] to the pull request title.

[orlitzky]

Thanks for this, and I apologize for the delay. It looks like the new patch fixes a long-standing crash with dnstrace. We do a lot of gymnastics in the ebuild to work around that, so I think it can be simplified now:

1. In src_prepare, we create a separate source tree that is not needed:

	if use ipv6; then
		# Create a separate copy of the source tree for dnstrace.
		cp -pR "${S}" "${S}-noipv6" || die
		...
		cd "${S}-noipv6" || die

That can all be simplified now since the extra directory is no longer needed. Everything that now takes place in the "noipv6" directory can be done instead in an else block corresponding to if use ipv6.

2. Remove the special-case in src_compile:

	# If djbdns is compiled with IPv6 support, it breaks dnstrace.
	# Therefore we must compile dnstrace separately without IPv6
	# support.
	if use ipv6; then
		elog 'Compiling dnstrace without ipv6 support'
		cp conf-cc conf-ld conf-home "${S}-noipv6/" || die
		cd "${S}-noipv6" || die
		emake dnstrace
	fi

3. Same thing in src_install:

	if use ipv6; then
		dobin dnsip6 dnsip6q "${S}-noipv6/dnstrace"
	fi

the last argument can simply be removed.

4. You can use the "Closes:" tag in the commit message instead of "Bug:" since this will completely fix the issue =)

[DerDakon]

Should be all fixed now. I took the opportunity to get rid of all the manual eapply things and just let EAPI6 handle it for us.

[gentoo-repo-qa-bot]

Pull request CI report

Report generated at: 2018-04-10 17:50 UTC
Newest commit scanned: d55c683
Status: ✅ good

Issues already there before the PR (double-check them):
https://qa-reports.gentoo.org/output/gentoo-ci/6e40e6622/output.html#app-admin/rsyslog
https://qa-reports.gentoo.org/output/gentoo-ci/6e40e6622/output.html#media-libs/freeverb3
https://qa-reports.gentoo.org/output/gentoo-ci/6e40e6622/output.html#net-fs/samba

---

Gentoo Mirror & CI services are provided by Michał Górny. The hardware was kindly provided by Todd Goodman. This unofficial service is not associated with Gentoo Infrastructure or Gentoo Foundation.

This service is provided by the service provider "as is" and any express or implied warranties, including, but not limited to, the implied warranties of merchantability and fitness for a particular purpose are disclaimed. In no event shall the service provider be liable for any direct, indirect, incidental, special, exemplary, or consequential damages (including, but not limited to, procurement of substitute goods or services; loss of use, data, or profits; or business interruption) however caused and on any theory of liability, whether in contract, strict liability, or tort (including negligence or otherwise) arising in any way out of the use of this service, even if advised of the possibility of such damage.

[orlitzky]

Merged, thanks!