Skip to content
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

Closed
wants to merge 9 commits into from

Conversation

bjacquin
Copy link
Contributor

@bjacquin bjacquin commented Oct 1, 2017

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

@a17r
Copy link
Member

a17r commented Oct 1, 2017

Thanks, there is already a similar PR: #5819

To avoid duplicating work, please check if you add anything in addition to that PR.

@gentoo-repo-qa-bot gentoo-repo-qa-bot added the assigned PR successfully assigned to the package maintainer(s). label Oct 1, 2017
@bjacquin
Copy link
Contributor Author

bjacquin commented Oct 2, 2017

Thanks for this, I made some comment in the mentioned PR

@nemunaire
Copy link
Contributor

I closed my PR in favour of this one.

@bjacquin
Copy link
Contributor Author

bjacquin commented Oct 9, 2017

New proposal including @nemunaire changes for terminology

@mgorny mgorny removed the assigned PR successfully assigned to the package maintainer(s). label Nov 4, 2017
@gentoo-repo-qa-bot gentoo-repo-qa-bot added assigned PR successfully assigned to the package maintainer(s). no bug found No Bug/Closes found in the commits. labels Nov 4, 2017
@monsieurp
Copy link
Member

@bjacquin could you please regenerate Manifest files? I'll merge this PR afterwards.

@bjacquin
Copy link
Contributor Author

Manifest update done as long as new version bump

@mgorny mgorny removed the assigned PR successfully assigned to the package maintainer(s). label Mar 3, 2018
<maintainer type="person">
<email>bertrand@jacquin.bzh</email>
<name>Bertrand Jacquin</name>
</maintainer>
Copy link
Member

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.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Fixed

@gentoo-repo-qa-bot gentoo-repo-qa-bot added assigned PR successfully assigned to the package maintainer(s). no bug found No Bug/Closes found in the commits. and removed no bug found No Bug/Closes found in the commits. labels Mar 3, 2018
Copy link
Member

@mgorny mgorny left a 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
Copy link
Member

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.

Copy link
Contributor Author

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
Copy link
Member

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.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done

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"
Copy link
Member

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.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done

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 )
Copy link
Member

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.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done

opengl? ( || ( X sdl wayland ) )
gles? ( || ( X wayland ) )
gles? ( !sdl )
gles? ( egl )
Copy link
Member

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.

Copy link
Contributor Author

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}] )"
Copy link
Member

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).

Copy link
Contributor Author

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]
Copy link
Member

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).

Copy link
Contributor Author

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/. )
Copy link
Member

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.

Copy link
Contributor Author

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 ?

Copy link
Member

Choose a reason for hiding this comment

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

EXAMPLES variable.

Copy link
Contributor Author

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 )
Copy link
Member

Choose a reason for hiding this comment

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

Why the absolute path?

Copy link
Contributor Author

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.

<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
<maintainer type="person">
Copy link
Member

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.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Fixed

@bjacquin bjacquin force-pushed the dev/beber/e-bump branch 3 times, most recently from 96735fe to 5cf2e81 Compare March 4, 2018 00:02
@ff2000
Copy link

ff2000 commented Mar 25, 2018

How is this PR/Review going? Is the last remaining issue the broken eclass? Is it really necessary for this PR to get merged?
Because at least the 0.21.7 ebuild is broken and it is way behind upstream. It looks like Bertrand did a great job, would be nice to see it merged!

@mgorny
Copy link
Member

mgorny commented Mar 25, 2018

Ok, I'll merge it now and we'll continue later on. Few minor notes (I'll fix them for you):

  • please mention the new version in commit message summary,
  • adding you as co-maint doesn't really close the bug of enlightenment team being non-existing.

nemunaire and others added 9 commits March 25, 2018 12:38
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
@mgorny
Copy link
Member

mgorny commented Mar 25, 2018

@bjacquin, I've force-pushed commits updated for merge to your branch. Please fetch and git reset --hard to my code before you start working again.

I can't merge this since it fails for me straight away:

configure: error: Full OpenGL with EGL is not supported, please add --with-opengl=es to your configure options to switch to EGL + OpenGL ES.

!!! Please attach the following file when seeking support:
!!! /tmp/portage/dev-libs/efl-1.20.7/work/efl-1.20.7/config.log

@gentoo-repo-qa-bot
Copy link
Collaborator

Pull request CI report

Report generated at: 2018-03-25 14:03 UTC
Newest commit scanned: 3f6726e
Status: ✅ good

Issues already there before the PR (double-check them):
https://qa-reports.gentoo.org/output/gentoo-ci/af93872b7/output.html#net-fs/samba

@mgorny mgorny removed the assigned PR successfully assigned to the package maintainer(s). label Apr 16, 2018
@gentoo-repo-qa-bot
Copy link
Collaborator

Pull Request assignment

Areas affected: ebuilds
Packages affected: dev-libs/efl, dev-python/python-efl, x11-terms/terminology, x11-wm/enlightenment

dev-libs/efl: @gentoo/proxy-maint (maintainer needed)
dev-python/python-efl: @gentoo/proxy-maint (maintainer needed)
x11-terms/terminology: @gentoo/proxy-maint (maintainer needed)
x11-wm/enlightenment: @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 [please reassign] to the pull request title.


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.

@gentoo-repo-qa-bot 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). bug linked Bug/Closes found in footer, and cross-linked with the PR. and removed no bug found No Bug/Closes found in the commits. labels Apr 16, 2018
@FuzzyGophers
Copy link
Contributor

ping

@FuzzyGophers
Copy link
Contributor

disregard. both bugs referenced are fixed. If this PR addresses anything outside of those bugs then please re-open.

@bjacquin
Copy link
Contributor Author

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.

@bjacquin bjacquin deleted the dev/beber/e-bump branch June 26, 2018 22:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
assigned PR successfully assigned to the package maintainer(s). bug linked Bug/Closes found in footer, and cross-linked with the PR. maintainer-needed There is at least one affected package with no maintainer. Review it if you can.
Projects
None yet
8 participants