games-board/cockatrice: version bump to 20181220

[GuillaumeSeren]

Closes: https://bugs.gentoo.org/664712
Closes: https://bugs.gentoo.org/678690
Package-Manager: Portage-2.3.51, Repoman-2.3.11

[gentoo-bot]

Copyright policy change

Please note that on 2018-09-15 Trustees have approved new Gentoo copyright policy. All contributions made to Gentoo need to follow this policy. If you include the Signed-off-by line in your commit message, you indicate that you have read the policy and agree to its terms. For more detailed explanation, please see the new Gentoo copyright policy explained article.

Pull Request assignment

Submitter: @GuillaumeSeren
Areas affected: ebuilds
Packages affected: games-board/cockatrice

games-board/cockatrice: @gentoo/games

Linked bugs

Bugs linked: 664712, 678690

Missing GCO sign-off

Please read the terms of Gentoo Certificate of Origin and acknowledge them by adding a sign-off to all your commits.

---

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

Docs: Code of Conduct ● Copyright policy (expl.) ● Devmanual ● GitHub PRs ● Proxy-maint guide

[GuillaumeSeren]

Hey,
I have addedd the Signed-off-by tag in the commit, please tell me if there is a problem.

[GuillaumeSeren]

Hey,
I have rebased the branch, I will be around if any changes are needed.

[GuillaumeSeren]

Hey,
I rebased the branch.

[GuillaumeSeren]

Hello @chewi I have heard on irc,
that you might be interrested in this, can you help me ?

[chewi]

Sorry for the wait. I don't have time to deal with every game. 😞 Unfortunately 2.7.0 came out a few days ago! Some other points to address:

• dev-qt/linguist-tools should be in BDEPEND, not DEPEND.
• The directories in src_configure should include ${EPREFIX}.
• The build is unconditionally using ccache, which is bad. There doesn't seem to be a way to turn this off without patching. A patch to remove this would be appreciated. An option to disable it that could be upstreamed would be even better.

[GuillaumeSeren]

Hey @chewi thank you for the quick answer.

I don't have time to deal with every game

Yes sorry to HL you in particular but someone give your name on irc (hey @juippis), so I try'ed.

Unfortunately 2.7.0 came out a few days ago!

Yes let's aggre on the main issue on this version, then I'll bump it.

dev-qt/linguist-tools should be in BDEPEND, not DEPEND.

I Never used this before, but I find some doc on EAPI7 guide.

The directories in src_configure should include ${EPREFIX}.

Never used that also, I upgraded like:

		-DICONDIR="${EPREFIX}/usr/share/icons"
		-DDESKTOPDIR="${EPREFIX}/usr/share/applications" )

The build is unconditionally using ccache, which is bad. There doesn't seem to be a way to turn this off without patching. A patch to remove this would be appreciated. An option to disable it that could be upstreamed would be even better.

This does not seems so trivial, I will check the sources tomorrow but if you have any pointer (or similar patch) that could help me working on that.

[chewi]

Thanks for that.

Sorry, I've just realised protobuf needs to be in all three depends, including BDEPEND. protoc is executed during the build. I hope it's platform-agnostic! I wondered whether the SLOT operator should be :0= but that's debatable at this point so leave it be.

Regarding CMake, I'm no expert but you could add an OPTION called USE_CCACHE that defaults to ON and wrap the existing ccache stuff in a conditional. If it's too tricky, let me know and I'll handle it.

[GuillaumeSeren]

Well thank you for the feedback,

Sorry, I've just realised protobuf needs to be in all three depends, including BDEPEND. protoc is executed during the build. I hope it's platform-agnostic! I wondered whether the SLOT operator should be :0= but that's debatable at this point so leave it be.

Ok done with.

BDEPEND="
	dev-qt/linguist-tools:5
	client? || server?(
		dev-libs/protobuf:=
	)"

Regarding CMake, I'm no expert but you could add an OPTION called USE_CCACHE that defaults to ON and wrap the existing ccache stuff in a conditional. If it's too tricky, let me know and I'll handle it.

Well I checked the cockatrice source about the ccache stuff,
what do you think ?

	# Disable the ccache if not activated
	if ! has ccache ${FEATURES}; then
		sed -e 's/^export CCACHE_CPP2=true/export CCACHE_CPP2=false/' -i cmake/launch-c.in
		sed -e 's/^export CCACHE_CPP2=true/export CCACHE_CPP2=false/' -i cmake/launch-cxx.in
	fi

Guillaume

[GuillaumeSeren]

Hello @chewi ,
I have upgraded the branch if you want to check it up.

[gentoo-repo-qa-bot]

Pull request CI report

Report generated at: 2019-03-12 10:19 UTC
Newest commit scanned: ddb342a
Status: ✅ good

No issues found

[chewi]

Merged now. You evidently didn't test that last change though, your use of || was invalid syntax. 😉 I took the liberty of fixing that and removing := from protobuf in BDEPEND as it doesn't make sense there. The ccache fix wasn't right I'm afraid but I dealt with that too. Hopefully upstream will take my patch. I also bumped to the latest version. Thanks for your help!

[GuillaumeSeren]

@chewi Ah yes I made the changes in a hurry and didn't the time to test it,
thank you for your help I will do better next time.