net-wireless/wpa_supplicant: Drop USE=qt4, bump to EAPI 6 #2673
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
monsieurp
added
enhancement
assigned
SoapGentoo
suggested changes
Oct 28, 2016
| ) | ||
| ssl? ( | ||
| !libressl? ( dev-libs/openssl:0= ) | ||
| libressl? ( dev-libs/libressl ) |
| if use qt5 ; then | ||
| pushd "${S}"/wpa_gui-qt4 > /dev/null | ||
| eqmake5 wpa_gui.pro | ||
| popd > /dev/null |
There was a problem hiding this comment.
pushd + popd are missing || die's
| pushd "${S}"/wpa_gui-qt4 > /dev/null | ||
| einfo "Building wpa_gui" | ||
| emake | ||
| popd > /dev/null |
| if [[ -e ${EROOT%/}etc/wpa_supplicant.conf ]] ; then | ||
| echo | ||
| ewarn "WARNING: your old configuration file ${EROOT}etc/wpa_supplicant.conf" | ||
| ewarn "needs to be moved to ${EROOT}etc/wpa_supplicant/wpa_supplicant.conf" |
| elog "An example configuration file is available for reference in" | ||
| elog "/usr/share/doc/${PF}/" | ||
|
|
||
| if [[ -e ${EROOT%/}etc/wpa_supplicant.conf ]] ; then |
| elog "/etc/wpa_supplicant/wpa_supplicant.conf" | ||
| elog | ||
| elog "An example configuration file is available for reference in" | ||
| elog "/usr/share/doc/${PF}/" |
| newins dbus-wpa_supplicant.conf wpa_supplicant.conf | ||
| insinto /usr/share/dbus-1/system-services | ||
| doins fi.epitest.hostap.WPASupplicant.service fi.w1.wpa_supplicant1.service | ||
| popd > /dev/null |
There was a problem hiding this comment.
pushd + popd are missing || die's
SoapGentoo
suggested changes
Oct 28, 2016
| if [[ -e "${EROOT%/}"/etc/wpa_supplicant.conf ]] ; then | ||
| echo | ||
| ewarn "WARNING: your old configuration file ${EROOT%/}etc/wpa_supplicant.conf" | ||
| ewarn "needs to be moved to ${EROOT%/}etc/wpa_supplicant/wpa_supplicant.conf" |
|
|
||
| if [[ -e "${EROOT%/}"/etc/wpa_supplicant.conf ]] ; then | ||
| echo | ||
| ewarn "WARNING: your old configuration file ${EROOT%/}etc/wpa_supplicant.conf" |
| pushd "${S}"/wpa_gui-qt4 > /dev/null || die | ||
| einfo "Building wpa_gui" | ||
| emake | ||
| popd > /dev/null || die |
There was a problem hiding this comment.
rather get rid of pushd + popd and do emake -C "${S}"/wpa_gui-qt4
SoapGentoo
suggested changes
Nov 6, 2016
| dev-libs/libgcrypt:* | ||
| net-libs/gnutls | ||
| ) | ||
| !gnutls? ( dev-libs/libtommath ) |
There was a problem hiding this comment.
this logic seems totally broken. So if you don't want SSL (i.e., USE="-ssl") you have gnutls shoved down your throat?
There was a problem hiding this comment.
|
|
||
| EAPI=6 | ||
|
|
||
| inherit toolchain-funcs qmake-utils systemd |
SoapGentoo
suggested changes
Nov 7, 2016
| ) | ||
| ssl? ( | ||
| gnutls? ( | ||
| dev-libs/libgcrypt:* |
| ssl? ( | ||
| gnutls? ( | ||
| dev-libs/libgcrypt:* | ||
| net-libs/gnutls |
SoapGentoo
approved these changes
Nov 29, 2016
Package-Manager: portage-2.3.0
Gentoo-bug: 587238 Package-Manager: portage-2.3.0
|
Thanks @a17r. I'm going to merge this PR. |
gentoo-bot
pushed a commit
that referenced
this pull request
Dec 4, 2016
Gentoo-Bug: https://bugs.gentoo.org/587238 Package-Manager: portage-2.3.0 Closes: #2673
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
If Qt5 works well enough, Qt4 should be dropped, especially when it reduces REQUIRED_USE.
@ZeroChaos-