games-action/minetest: version bump to 0.4.16 #3874

Anth0rx · 2017-02-07T17:43:12Z

Gentoo-Bug: 604424

gentoo-repo-qa-bot · 2017-02-07T17:44:07Z

Pull Request assignment

Areas affected: ebuilds
Packages affected: games-action/minetest

games-action/minetest: @gentoo/proxy-maint (maintainer needed)

SoapGentoo · 2017-02-07T21:08:08Z

games-action/minetest/Manifest

+EBUILD minetest-0.4.13.ebuild 3210 SHA256 4a6d4fbccec809b0bc52101ea6dff188d608fbc1da58cb36e68a6ee35e071bf6 SHA512 c500846bd9ccd91189b761e950c349a0bbec404a58eb47d5fcdc3775c99d874f2d05cb9f20bfa87c805e8edeae21f939a394f3240cbdbd250ff4d7628a95bb4a WHIRLPOOL a8a71e1c50e5a951c3fe963cca49436bee152c7c8443c10d350bc2b355e0ee14a6564d4838ff3bf65a66094d178f8599904418940de510e25869c09524b1bf58
+EBUILD minetest-0.4.14.ebuild 3157 SHA256 ce63d9acd9e9393583aa7de9a4c0fb7575b98cd36ac9d9e9cb33cf466a90597a SHA512 514dcd11f1143bd96480de71c821c7eee7b7d1f993da6a0b02f6222d22d264042101831b0c18887eff6fc8c05eeaf856309b8398fa9d9b536349ecbd8658ffe3 WHIRLPOOL e3e4200ce34533e9192cbf11eecbbc73db08db1f6aba1ec80c472cea6ed336373cd948fd8610d4660d25af7e364559fce4f06a153592847e9e22fc0815543df0
+EBUILD minetest-0.4.15.ebuild 3157 SHA256 ce63d9acd9e9393583aa7de9a4c0fb7575b98cd36ac9d9e9cb33cf466a90597a SHA512 514dcd11f1143bd96480de71c821c7eee7b7d1f993da6a0b02f6222d22d264042101831b0c18887eff6fc8c05eeaf856309b8398fa9d9b536349ecbd8658ffe3 WHIRLPOOL e3e4200ce34533e9192cbf11eecbbc73db08db1f6aba1ec80c472cea6ed336373cd948fd8610d4660d25af7e364559fce4f06a153592847e9e22fc0815543df0
+MISC metadata.xml 1974 SHA256 d58cb792e3212a7cb79ae1b52651697f26908764aa2a966102030f937049bb15 SHA512 73f1aae76e6d363abe2cb5e87e7481850119334c6fc65e50760d7de9afb87a9b81fc66c907390c183d8ef98c9df381a77f825c89f29c9bf645d8ff9c7f46eb5f WHIRLPOOL 9a74006d37702fa27df0539c4cccb2c606ed6c38494ba62248fe65153b8867dedd3d30501ae9d427e0c9a8858ca577f320c193283d0d4ca3d75bd84fd50ebff3


same here, AUX, MISC, EBUILD need to be gone

SoapGentoo · 2017-02-07T21:09:43Z

games-action/minetest/minetest-0.4.15.ebuild

@@ -0,0 +1,139 @@
+# Copyright 1999-2016 Gentoo Foundation


please use repoman full to check that the ebuild has no QA violations, this should be 2017

SoapGentoo · 2017-02-07T21:10:03Z

games-action/minetest/minetest-0.4.15.ebuild

+	!dedicated? (
+		app-arch/bzip2
+		>=dev-games/irrlicht-1.8-r2
+		dev-libs/gmp:0


Are the mentioned slot operators meant to be applied on all mentioned dependencies?

nope, just line preceding it (gmp in this case)

SoapGentoo · 2017-02-07T21:10:10Z

games-action/minetest/minetest-0.4.15.ebuild

+		app-arch/bzip2
+		>=dev-games/irrlicht-1.8-r2
+		dev-libs/gmp:0
+		media-libs/libpng:0


SoapGentoo · 2017-02-07T21:10:39Z

games-action/minetest/minetest-0.4.15.ebuild

+		sound? (
+			media-libs/libogg
+			media-libs/libvorbis
+			media-libs/openal


SoapGentoo · 2017-02-07T21:12:06Z

games-action/minetest/minetest-0.4.15.ebuild

+}
+
+src_prepare() {
+	eapply_user


chuck this, and do cmake-utils_src_prepare instead

SoapGentoo · 2017-02-07T21:12:46Z

games-action/minetest/minetest-0.4.15.ebuild

+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_CLIENT=$(usex !dedicated)
+		-DCUSTOM_BINDIR="/usr/bin"


all these dirs should have ${EPREFIX} added, like so:
-DCUSTOM_BINDIR="${EPREFIX}/usr/bin"

SoapGentoo · 2017-02-07T21:13:26Z

games-action/minetest/minetest-0.4.15.ebuild

+	)
+
+	use dedicated && mycmakeargs+=(
+		-DIRRLICHT_SOURCE_DIR=/the/irrlicht/source


is this even a proper directory?

Actually I just used the ebuild file of the previous version. Is there a way to test ebuild files properly (like in a sandboxed mode)?

Yes, you can cd into the package directory and use the ebuild command to invoke various phases. e.g. ebuild minetest-0.4.15.ebuild configure

Could this be from the minetest wiki? Quote from Compiling Minetest#Building without Irrlicht / X dependency:

You can build the Minetest server without library dependencies to Irrlicht or any graphical stuff. You still need the Irrlicht headers for this, so first, download the irrlicht source to somewhere.
When invoking CMake, use -DBUILD_CLIENT=0 -DIRRLICHT_SOURCE_DIR=/wherever/you/unzipped/the/source
So probably even for just the dedicated server, irrlicht should be a build time dependency, then giving the directory manually should not be necessary.

thats the update here? Can you include the path to the irrlicht sources?

SoapGentoo · 2017-02-07T21:14:09Z

games-action/minetest/minetest-0.4.15.ebuild

+	cmake-utils_src_compile
+
+	if use doc ; then
+		cmake-utils_src_compile doc


add after this:
HTML_DOCS=( "${CMAKE_BUILD_DIR}"/doc/html/. )
and then...

SoapGentoo · 2017-02-07T21:14:35Z

games-action/minetest/minetest-0.4.15.ebuild

+	if use doc ; then
+		cd "${CMAKE_BUILD_DIR}"/doc || die
+		dodoc -r html
+	fi


... you can remove this entire if block

quazgar · 2017-02-15T00:43:13Z

games-action/minetest/minetest-0.4.15.ebuild

+		-DCUSTOM_BINDIR="${EPREFIX}/usr/bin"
+		-DCUSTOM_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
+		-DCUSTOM_LOCALEDIR="${EPREFIX}/usr/share/${PN}/locale"
+		-DCUSTOM_SHAREDIR="${EPREFIX}/usr/share/${PN}"
 		-DCUSTOM_EXAMPLE_CONF_DIR="/usr/share/doc/${PF}"


${EPREFIX} here as well for the CUSTOM_EXAMPLE_CONF_DIR?

quazgar · 2017-02-18T12:13:05Z

Tested myself and works for me.

Anth0rx · 2017-02-27T14:20:11Z

Is this okay now and can be merged?

quazgar · 2017-03-04T21:22:19Z

I am not sure about @SoapGentoo's comment about setting HTML_DOCS, if that's critical. And to me, the easiest solution about the Irrlicht dependency for a dedicated server seems to be to just include it into the DEPENDS regardless of the dedicated USE flag. SoapGentoo, do you think that these changes would be sufficient?

Anth0rx · 2017-04-12T18:55:33Z

What is this qa-bot thingy with those app-leechcraft problems?

soredake · 2017-06-05T22:13:30Z

Any progress?

Anth0rx · 2017-06-24T10:32:48Z

I doubt the breakages were added by the pull request. How would you recommend doing the rebase?

soredake · 2017-06-24T10:37:52Z

@Anth0rx git pull upstream master -r

Sur3 · 2017-06-28T18:03:24Z

Should also be updated to 0.4.16 I suppose.

Anth0rx · 2017-06-28T18:15:48Z

Yes it should. So it will be a new "bug" at https://bugs.gentoo.org followed by a new Pull Request here on GitHub?

Sur3 · 2017-06-28T19:11:06Z

I suppose just a new pull request is ok, no second bug needed. ;)

mgorny · 2017-07-05T08:50:23Z

No need for a new PR. Just update this one.

Anth0rx · 2017-08-04T11:48:18Z

So I executed the git pull upstream master -r command. Unfortunately now it looks a bit messy with all those commits here in the PR. Was is supposed to be like this?

soredake · 2017-08-04T12:23:33Z

@Anth0rx do git reset --hard 096f97d95f7d85ce76f04c6446aa04f6b5620bc9 then git pull -r upstream master again.

Anth0rx · 2017-08-08T15:40:07Z

So, should I now squash the commits together?

soredake · 2017-08-09T01:03:27Z

Yes, squash and leave only 0.4.16 version and remove '# $Id$' header from ebuild.

Anth0rx · 2017-08-09T08:21:01Z

Why can't I leave the 0.4.15 version? It is functioning after all. I could also add the live-ebuild of the development version of Minetest.

Do you know how to properly test ebuilds? Since I solely tested them on my system with my USE flags.
I thought of some Stage-3 docker image which is completely stock. Or maybe a chroot? But I have never found out some generic way to do so.

mgorny · 2017-08-10T12:22:57Z

We do not add interim versions unless there is a very good reason to. If you are adding both at the same time, people will just use the newer and the older one will get no testing. Eventually, it will be removed as cleanup, so you're only making double work.

mgorny · 2017-08-17T18:10:24Z

games-action/minetest/minetest-0.4.16.ebuild

+DEPEND="${RDEPEND}
+	>=dev-games/irrlicht-1.8-r2
+	doc? (
+	    app-doc/doxygen


Misindent. But didn't I report that already somewhere?

mgorny · 2017-08-17T18:12:02Z

games-action/minetest/minetest-0.4.16.ebuild

+	cmake-utils_src_prepare
+	# set paths
+	sed \
+		-e "s#@BINDIR@#/usr/bin#g" \


Shouldn't this take EPREFIX too?

Where should I put the EPREFIX?

Before /usr, just like the path in mycmakeargs.

mgorny · 2017-08-17T18:13:10Z

games-action/minetest/minetest-0.4.16.ebuild

+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_CLIENT=$(usex !dedicated)


I'd prefer explicit USE=client than this negative logic but I can live with it if you insist.

mgorny · 2017-08-17T18:13:36Z

games-action/minetest/minetest-0.4.16.ebuild

+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_CLIENT=$(usex !dedicated)
+		-DCUSTOM_BINDIR="${EPREFIX}/usr/bin"


Are all those overrides really necessary? i.e. doesn't the game respect CMAKE_INSTALL_PREFIX and so on?

That's a good question. Since I simply did a version bump, leaving merely everything as it was, I don't know what the previous maintainer had in mind.

Feel free to leave it as-is, and make yourself a note to verify it in the future.

mgorny · 2017-08-17T18:14:53Z

games-action/minetest/minetest-0.4.16.ebuild

+	)
+
+	use dedicated && mycmakeargs+=(
+        -DIRRLICHT_INCLUDE_DIR=${EPREFIX}/usr/include/irrlicht


Tab-indent, please.

mgorny · 2017-08-17T18:15:33Z

games-action/minetest/minetest-0.4.16.ebuild

+}
+
+pkg_preinst() {
+	gnome2_icon_savelist


This is no longer necessary.

Anth0rx · 2017-08-20T21:14:50Z

I merged the changes from the minetest_game (PR #3875) branch into this one. Thus the QA problems caused by the games-action/minetest_game dependency to games-action/minetest are avoided.

mgorny · 2017-08-21T15:11:41Z

There is still the comment wrt EPREFIX in sed that needs addressing (you can see it in the 'files changed' tab). Also, please either prefix the fix commits with package name, or squash them into the original commit.

soredake · 2017-08-28T20:22:24Z

Ping.

Anth0rx · 2017-08-29T18:26:03Z

Ping.
?

The 'client' use flag was not defined so I replaced it by the original '!dedicated' flag.

Anth0rx · 2017-08-29T18:56:35Z

So I just removed the invalid USE flag 'client'. Now it builds again. If it is okay on your side this PR can be merged I think (after rebasing).

gentoo-repo-qa-bot · 2017-08-29T19:08:57Z

😞 The QA check for this pull request has found the following issues:

Issues inherited from Gentoo (may be modified by PR):
https://qa-reports.gentoo.org/output/gentoo-ci/84c1740c8/output.html#media-sound/snd
https://qa-reports.gentoo.org/output/gentoo-ci/84c1740c8/output.html#sys-devel/binutils-hppa64

mgorny

Why don't you use repoman?

RepoMan scours the neighborhood...
  ebuild.minorsyn               1
   games-action/minetest/minetest-0.4.16.ebuild: Unquoted Variable on line: 87

Note: use --include-dev (-d) to check dependencies for 'dev' profiles

RepoMan sez: "You're only giving me a partial QA payment?
              I'll take it this time, but I'm not happy."

I'm building it now.

mgorny · 2017-09-02T07:31:44Z

games-action/minetest/minetest-0.4.16.ebuild

@@ -64,7 +64,7 @@ src_prepare() {



Squash this commit.

mgorny · 2017-09-02T08:12:24Z

I'm going to fix it and merge.

Closes: gentoo#3874

gentoo-repo-qa-bot added maintainer-needed There is at least one affected package with no maintainer. Review it if you can. assigned PR successfully assigned to the package maintainer(s). labels Feb 7, 2017

gktrk requested a review from SoapGentoo February 7, 2017 19:47

SoapGentoo suggested changes Feb 7, 2017

View reviewed changes

quazgar reviewed Feb 15, 2017

View reviewed changes

Anth0rx changed the title ~~games-action/minetest: version bump to 0.4.15~~ games-action/minetest: version bump to 0.4.16 Aug 4, 2017

Anth0rx force-pushed the minetest-bump branch from 84fd6ac to 488b430 Compare August 8, 2017 15:39

Anth0rx force-pushed the minetest-bump branch 3 times, most recently from b25e5c4 to 556ad03 Compare August 12, 2017 09:53

Anth0rx mentioned this pull request Aug 15, 2017

games-action/minetest_game: version bump to 0.4.16 #3875

Closed

mgorny requested changes Aug 17, 2017

View reviewed changes

Anth0rx force-pushed the minetest-bump branch 2 times, most recently from 8df91fc to e15337e Compare August 17, 2017 21:43

Anth0rx added 2 commits August 21, 2017 18:52

games-action/minetest_game: version bump to 0.4.16

d17a1f3

games-action/minetest: version bump to 0.4.16

d6803e2

Anth0rx force-pushed the minetest-bump branch from e15337e to d6803e2 Compare August 25, 2017 11:41

Remove invalid USE flag

f148b7d

The 'client' use flag was not defined so I replaced it by the original '!dedicated' flag.

mgorny reviewed Sep 2, 2017

View reviewed changes

games-action/minetest/minetest-0.4.16.ebuild Outdated

@@ -64,7 +64,7 @@ src_prepare() {

Copy link

Member

mgorny Sep 2, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Squash this commit.

mgorny self-assigned this Sep 2, 2017

mgorny added the fix on merge There is at least one issue still needing fixing. Please read the comments and fix it while merging. label Sep 2, 2017

mgorny approved these changes Sep 2, 2017

View reviewed changes

gentoo-bot closed this in 11c1ff4 Sep 2, 2017

strahlc pushed a commit to strahlc/gentoo that referenced this pull request Sep 6, 2017

games-action/minetest_game: version bump to 0.4.16

42bcd74

Closes: gentoo#3874

games-action/minetest: version bump to 0.4.16 #3874

games-action/minetest: version bump to 0.4.16 #3874

Conversation

Anth0rx commented Feb 7, 2017

gentoo-repo-qa-bot commented Feb 7, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Anth0rx Feb 9, 2017 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

quazgar Feb 15, 2017 • edited

Choose a reason for hiding this comment

quazgar commented Feb 18, 2017

Anth0rx commented Feb 27, 2017

quazgar commented Mar 4, 2017

Anth0rx commented Apr 12, 2017

soredake commented Jun 5, 2017

Anth0rx commented Jun 24, 2017

soredake commented Jun 24, 2017

Sur3 commented Jun 28, 2017

Anth0rx commented Jun 28, 2017

Sur3 commented Jun 28, 2017

mgorny commented Jul 5, 2017

Anth0rx commented Aug 4, 2017

soredake commented Aug 4, 2017

Anth0rx commented Aug 8, 2017

soredake commented Aug 9, 2017 • edited

Anth0rx commented Aug 9, 2017 • edited

mgorny commented Aug 10, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Anth0rx commented Aug 20, 2017

mgorny commented Aug 21, 2017

soredake commented Aug 28, 2017

Anth0rx commented Aug 29, 2017

Anth0rx commented Aug 29, 2017

gentoo-repo-qa-bot commented Aug 29, 2017

mgorny left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mgorny commented Sep 2, 2017

Anth0rx Feb 9, 2017 •

edited

quazgar Feb 15, 2017 •

edited

soredake commented Aug 9, 2017 •

edited

Anth0rx commented Aug 9, 2017 •

edited