New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
EFL, enlightenment and terminology version bump #5832
Conversation
Thanks, there is already a similar PR: #5819 To avoid duplicating work, please check if you add anything in addition to that PR. |
cfd7b1c
to
5ae31a5
Compare
Thanks for this, I made some comment in the mentioned PR |
I closed my PR in favour of this one. |
5ae31a5
to
57cf191
Compare
New proposal including @nemunaire changes for terminology |
57cf191
to
f742194
Compare
f742194
to
0054b75
Compare
@bjacquin could you please regenerate Manifest files? I'll merge this PR afterwards. |
0054b75
to
24beafd
Compare
Manifest update done as long as new version bump |
24beafd
to
a55aacb
Compare
<maintainer type="person"> | ||
<email>bertrand@jacquin.bzh</email> | ||
<name>Bertrand Jacquin</name> | ||
</maintainer> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You didn't add proxy-maint team, so we can't merge this. Also, it's a good idea to split maintainer change into a separate commit.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fixed
a55aacb
to
a3eea53
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm sorry to say but this is a huge piece of software that has been neglected for years, so you've got a hard task ahead of you. Please note that some comments from the first changeset may apply to subsequent files.
@@ -1,4 +1,4 @@ | |||
# Copyright 1999-2017 Gentoo Foundation |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The Gentoo-Bug
commit tag is obsolete. Please use either Bug
or Closes
(with full URL), depending on whether you wish to close a bug or just leave a comment.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done
@@ -1,2 +1,3 @@ | |||
DIST efl-1.17.0.tar.xz 43485360 BLAKE2B 97a79bda40658eac6e50886a01821bb8c98d6f56d18fcd51dc3827154506064bec3bf665c8f471919aedb03ae83ce4045293afa9a0bf8d3eaf947221ef7cba9e SHA512 e4f28f938daf4ec1cb3d761407a443e401b59c6bb0f9fa6cd771dbd256b95f4a32a5f9e6bd8ad8328708a382f732e67abd1a23c7be2ff222f08bc8135a2435da |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please shorten the commit message to only roughly describe changes. There is really no need or reason to make it into a detailed changelog, and it is going to occupy a lot of screen space for anyone looking at the log.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done
dev-libs/efl/efl-1.20.7.ebuild
Outdated
DESCRIPTION="Enlightenment Foundation Libraries all-in-one package" | ||
|
||
LICENSE="BSD-2 GPL-2 LGPL-2.1 ZLIB" | ||
IUSE="avahi +bmp debug connman drm +eet egl examples fbcon +fontconfig fribidi gif gles glib gnutls gstreamer harfbuzz hyphen +ico ibus jpeg2k libressl neon oldlua opengl ssl pdf physics pixman +png postscript +ppm +psd pulseaudio raw scim sdl sound svg systemd tga tiff tslib unwind v4l valgrind vlc vnc wayland webp X xcf xim xine xpm" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please wrap overlong lists, with special exception for KEYWORDS
that should not be wrapped not to break ekeyword
tool.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done
dev-libs/efl/efl-1.20.7.ebuild
Outdated
IUSE="avahi +bmp debug connman drm +eet egl examples fbcon +fontconfig fribidi gif gles glib gnutls gstreamer harfbuzz hyphen +ico ibus jpeg2k libressl neon oldlua opengl ssl pdf physics pixman +png postscript +ppm +psd pulseaudio raw scim sdl sound svg systemd tga tiff tslib unwind v4l valgrind vlc vnc wayland webp X xcf xim xine xpm" | ||
|
||
REQUIRED_USE=" | ||
pulseaudio? ( sound ) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please don't align. This is highly dependant on tab size and turns it into a mess. Also, sort lexically unless you need to explicitly express preference between two options.
Also, it seems that some of those constraints are circular, so it might be reasonable to eventually look into cleaning them up. However, this is not strictly necessary right now.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done
dev-libs/efl/efl-1.20.7.ebuild
Outdated
opengl? ( || ( X sdl wayland ) ) | ||
gles? ( || ( X wayland ) ) | ||
gles? ( !sdl ) | ||
gles? ( egl ) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Merge all the gles?
-es into one.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done
media-gfx/graphviz[python] | ||
dev-python/sphinx[${PYTHON_USEDEP}] | ||
) | ||
doc? ( >dev-python/sphinx-1.0[${PYTHON_USEDEP}] )" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why two doc?
blocks (also with duplicate dep on sphinx).
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Agreed, dropped
dev-python/setuptools[${PYTHON_USEDEP}] | ||
>=dev-python/cython-0.21[${PYTHON_USEDEP}] | ||
doc? ( | ||
media-gfx/graphviz[python] |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If you dep on [python]
, then you also need to use-dep on it. Please verify if that's really the case and if it is, then you'd either have to lower the ebuild to just py2.7 or use any-of API of python-r1 (which is harder).
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Indeed, [python] is not needed, dropping it
|
||
python_install_all() { | ||
use doc && DOCS=( "${S}"/build/doc/html ) | ||
use examples && EXAMPLES=( examples/. ) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is banned in EAPI 6.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What exactly is banned in EAPI 6 in this context ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
EXAMPLES
variable.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done
} | ||
|
||
python_install_all() { | ||
use doc && DOCS=( "${S}"/build/doc/html ) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why the absolute path?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No reason, this was in place before, changing this.
dev-libs/efl/metadata.xml
Outdated
<email>proxy-maint@gentoo.org</email> | ||
<name>Proxy Maintainers</name> | ||
</maintainer> | ||
<maintainer type="person"> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Reverse the order, proxy-maint always goes last.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fixed
96735fe
to
5cf2e81
Compare
How is this PR/Review going? Is the last remaining issue the broken eclass? Is it really necessary for this PR to get merged? |
Ok, I'll merge it now and we'll continue later on. Few minor notes (I'll fix them for you):
|
Add missing USE flags. Adjust dependency atoms. Adjust REQUIRED_USE. Call gnome2_icon_cache_update in order to update icon cache Call xdg_mimeinfo_database_update in order to update xdg cache Closes: https://bugs.gentoo.org/618400 Closes: https://bugs.gentoo.org/648828 Package-Manager: Portage-2.3.8, Repoman-2.3.1
Closes: https://bugs.gentoo.org/631578 Package-Manager: Portage-2.3.8, Repoman-2.3.1
Closes: https://bugs.gentoo.org/631580 Package-Manager: Portage-2.3.8, Repoman-2.3.1
Move to git-r3 Move URL to https Package-Manager: Portage-2.3.8, Repoman-2.3.1
Package-Manager: Portage-2.3.19, Repoman-2.3.6
Package-Manager: Portage-2.3.19, Repoman-2.3.6
Package-Manager: Portage-2.3.19, Repoman-2.3.6
Closes: gentoo#5832 Package-Manager: Portage-2.3.19, Repoman-2.3.6
5cf2e81
to
3f6726e
Compare
@bjacquin, I've force-pushed commits updated for merge to your branch. Please fetch and I can't merge this since it fails for me straight away:
|
Pull request CI report Report generated at: 2018-03-25 14:03 UTC Issues already there before the PR (double-check them): |
Pull Request assignment Areas affected: ebuilds dev-libs/efl: @gentoo/proxy-maint (maintainer needed) WARNING: The following maintainers do not match any Bugzilla accounts: Bugs linked: 618400, 648828, 631578, 631956, 631580 In order to force reassignment and/or bug reference scan, please append 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. |
ping |
disregard. both bugs referenced are fixed. If this PR addresses anything outside of those bugs then please re-open. |
Since most of the change were actually merged, not including original author and including load of unrelated stuff, I am not sure this is worth to keep this ticket open anymore. I will contribute via new PR. |
Hi,
This request is to version bump EFL, enlightenment and terminology as per https://bugs.gentoo.org/show_bug.cgi?id=631580 and https://bugs.gentoo.org/show_bug.cgi?id=631578