Add FLAVORS to devel/eric6

[dbn]

Summary

Add the following flavor permutations to devel/eric6:

• Python 2 and Python3
• Qt 4 and Qt 5

My motivation for switching the port to flavors is:

1. we are supporting dual major versions of Python and Qt;
2. given the different versions having user/compile testing is important; and
3. to allow a package user to not have to use the default version of Python/Qt

Test Plan

• Exp-run: http://dbn.westeurope.cloudapp.azure.com/11_1-amd64-default-eric6/latest/build
• Test against revised patch from https://reviews.freebsd.org/D13449

[mat]

It would probably be easier to have the flavors named qtX_pyY, so you don't conflict with the flavors from USES=python.

As a side note, is it possible for this port, as it seems to be an IDE, to support both Python versions at the same time ? A bit like editors/vim does.

devel/eric6/Makefile.inc

26–27 ↗

(On Diff #36465)

This should probably be in the MASTERPORT as it is only used there.

37 ↗

(On Diff #36465)

​PLIST_FILES= ${DATADIR}/i18n/${PORTNAME}_${I18N_LANG}.qm

42–48 ↗

(On Diff #36465)

It could be written in an easier way as:

PY_FLAVORS=        py${PYTHON_DEFAULT:S/.//} py${PYTHON2_DEFAULT:S/.//} py${PYTHON3_DEFAULT:S/.//}
​.for flavor in ${PY_FLAVORS}
​.  if empty(FLAVORS:M${flavor}_qt4)
​FLAVORS:=        ${FLAVORS} ${flavor}_qt4 ${flavor}_qt5
​.  endif
​.endfor

51–53 ↗

(On Diff #36465)

That is not needed.

63–65 ↗

(On Diff #36465)

I am not sure what this is doing, it is never used. Also, if it is only used in the MASTERPORT, it should probably be in the MASTERPORT.

[dbn]

In D13448#281293, @mat wrote:

It would probably be easier to have the flavors named qtX_pyY, so you don't conflict with the flavors from USES=python.

I have switched to the other way around. FYI, I think this is inconsistent with (although a symmetric translation of) the PKGNAMEPREFIX convention.

I suggest python.mk get hardened to avoid this conflict.

As a side note, is it possible for this port, as it seems to be an IDE, to support both Python versions at the same time ? A bit like editors/vim does.

Correct, the IDE does support both python2 and python3 (and thus the flavor is not strictly required) - however I think it will be useful for a package user should they wish to go python3 only.

devel/eric6/Makefile.inc

63–65 ↗

(On Diff #36465)

It was a carry over from options. It should read RUN_DEPENDS+=...

[dbn]

Update patch per comments.

[dbn]

devel/eric6/Makefile.inc

63–65 ↗

(On Diff #36465)

In this case, PYQRVER is only defined after the includes and so cannot be in MASTERPORT.

[mat]

In D13448#281425, @dbn wrote:

I suggest python.mk get hardened to avoid this conflict.

Already done.

devel/eric6/Makefile.inc

49–53 ↗

(On Diff #36513)

USES=python already does that, remove.

63–65 ↗

(On Diff #36465)

It is defined line 20 of the Makefile.

[dbn]

Thanks, I has misunderstanding when FLAVOR gets defined (I thought only after including bsd.port.options.mk, or co). Fixed that and removed redundant code.

[mat]

devel/eric6/Makefile

20 ↗

(On Diff #36566)

FLAVOR can be undefined here, and you are using PYQTVER before it gets defined, so it should be guarded with :U. Also, a default value should probably be set.

devel/eric6/Makefile.inc

47 ↗

(On Diff #36566)

Is this needed ?

[dbn]

• Add a default FLAVOR, after defining FLAVORS.
• Remove redundant ".include <bsd.port.pre.mk>"

[dbn]

Is there any other change suggested/required? Can this change be committed (with flavors)?

[mat]

Let me build test all this, I wonder if there is not some edge case I have not seen but is broken.

[mat]

I do not think the language files should be flavored. They install the exact same content at the exact same place. The dependencies should probably be reversed, devel/eric6 should depend on them, or they should be pointed out in pkg-message and the dependencies should be removed.

[dbn]

I've opted for your second suggest: break dependency of the language ports on eric6 and instead mention them in a pkg-message.

[dbn]

Fix error with i18n ports identified by exp-run. I think this is ready to ship :-)

[dbn]

@mat thank you for your effort in reviewing this port, and improving both the FLAVORS implementation within eric6 and eric6 in general.