Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 710538 - dev-util/cdiff: removal (was: dev-util/cdiff-1.0 -> dev-util/ydiff-1.1 upstream rename, patched in master branch commits for python{2_7,3_{6,7,8}} compat)
Summary: dev-util/cdiff: removal (was: dev-util/cdiff-1.0 -> dev-util/ydiff-1.1 upstre...
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Current packages (show other bugs)
Hardware: All Linux
: Normal normal (vote)
Deadline: 2020-07-05
Assignee: No maintainer - Look at https://wiki.gentoo.org/wiki/Project:Proxy_Maintainers if you want to take care of it
URL:
Whiteboard:
Keywords: PMASKED
Depends on:
Blocks: python3.7-compat
  Show dependency tree
 
Reported: 2020-02-22 23:09 UTC by Jason Chan
Modified: 2020-07-13 04:54 UTC (History)
4 users (show)

See Also:
Package list:
dev-util/ydiff-1.1 amd64 x86
Runtime testing required: ---


Attachments
ydiff-1.1.ebuild (ydiff-1.1.ebuild,741 bytes, text/plain)
2020-02-22 23:09 UTC, Jason Chan
Details
master branch merge (ydiff-1.1-merge-20191123-commit.patch,8.36 KB, patch)
2020-02-22 23:10 UTC, Jason Chan
Details | Diff
build.log (build.log,77.89 KB, text/x-log)
2020-02-22 23:17 UTC, Jason Chan
Details

Note You need to log in before you can comment on or make changes to this bug.
Description Jason Chan 2020-02-22 23:09:26 UTC
Created attachment 615184 [details]
ydiff-1.1.ebuild

Commit to show rename: https://github.com/ymattw/ydiff/commit/ba7dea407c0748fdca37232a026d2bc25df16bea

Commit from which changes were diff'd against release 1.1: https://github.com/ymattw/ydiff/commit/c3771b98e4379c85c2e9be67e19301ae42a17b9e

Reason for patching release 1.1: Test fails with Python versions greater than 3.6.

The fix for Python >=3.7: https://github.com/ymattw/ydiff/commit/0fdd167f927b2782a11385f046fb19bf59a8f494

ydiff works, and passed tests for 2.7, 3.6, 3.7, and 3.8. There are warnings in the log that I'm unclear on the severity of.

Bug #616446 might need to be revisited.

I recommend removing older revisions of cdiff since they do not share the same Python compatibility as 1.1.
Comment 1 Jason Chan 2020-02-22 23:10:35 UTC
Created attachment 615186 [details, diff]
master branch merge
Comment 2 Jason Chan 2020-02-22 23:17:07 UTC
Created attachment 615188 [details]
build.log
Comment 3 Jonas Stein gentoo-dev 2020-02-23 11:23:46 UTC
Thank you for your contribution. I had a short look on the ebuild. 
Here a few ideas:

• Please test the ebuild with repoman full -d -x https://wiki.gentoo.org/wiki/Repoman
• KEYWORDS need ~ after a version bump run ekeyword ~all YOUREBUILD
• A bot can look for additional mistakes, if you upload a PR via github
Comment 4 Larry the Git Cow gentoo-dev 2020-03-18 00:42:27 UTC
The bug has been referenced in the following commit(s):

https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6868e6f31fca7a3ed0ee803b4f4eb7f405a5a31a

commit 6868e6f31fca7a3ed0ee803b4f4eb7f405a5a31a
Author:     Sebastian Pipping <sping@gentoo.org>
AuthorDate: 2020-03-18 00:37:36 +0000
Commit:     Sebastian Pipping <sping@gentoo.org>
CommitDate: 2020-03-18 00:42:11 +0000

    dev-util/cdiff: 1.1, transition to dev-util/ydiff
    
    Bug: https://bugs.gentoo.org/710538
    Signed-off-by: Sebastian Pipping <sping@gentoo.org>
    Package-Manager: Portage-2.3.92, Repoman-2.3.20

 dev-util/cdiff/cdiff-1.1.ebuild | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4072fa366a599b2cf3267d0bbcdceb63df1a228e

commit 4072fa366a599b2cf3267d0bbcdceb63df1a228e
Author:     Sebastian Pipping <sping@gentoo.org>
AuthorDate: 2020-03-18 00:27:54 +0000
Commit:     Sebastian Pipping <sping@gentoo.org>
CommitDate: 2020-03-18 00:42:10 +0000

    dev-util/ydiff: New package, successor to dev-util/cdiff
    
    Bug: https://bugs.gentoo.org/710538
    Signed-off-by: Sebastian Pipping <sping@gentoo.org>
    Package-Manager: Portage-2.3.92, Repoman-2.3.20

 dev-util/ydiff/Manifest         |  1 +
 dev-util/ydiff/metadata.xml     | 12 ++++++++++++
 dev-util/ydiff/ydiff-1.1.ebuild | 30 ++++++++++++++++++++++++++++++
 3 files changed, 43 insertions(+)
Comment 5 Sebastian Pipping gentoo-dev 2020-03-18 00:46:32 UTC
(In reply to Jason Chan from comment #1)
> Created attachment 615186 [details, diff] [details, diff]
> master branch merge

Hi Jason, could you elaborate how that patch was created and why we need it on top of ydiff 1.1?  Thank you!
Comment 6 Michał Górny archtester Gentoo Infrastructure gentoo-dev Security 2020-04-19 13:49:47 UTC
@sping, can you lastrite cdiff when ready?
Comment 7 Sebastian Pipping gentoo-dev 2020-04-19 14:36:35 UTC
ydiff is not Gentoo-stable but cdiff is.  So a last-rite of cdiff would be trouble to users of stable without prior stabilisation.
Comment 8 Michał Górny archtester Gentoo Infrastructure gentoo-dev Security 2020-04-19 14:43:11 UTC
That's why I said 'when ready'.
Comment 9 Michał Górny archtester Gentoo Infrastructure gentoo-dev Security 2020-05-31 09:36:39 UTC
Can we stabilize it now?
Comment 10 Agostino Sarubbo gentoo-dev 2020-06-04 06:25:02 UTC
amd64 stable
Comment 11 Agostino Sarubbo gentoo-dev 2020-06-04 06:43:21 UTC
x86 stable. Closing.
Comment 12 Sebastian Pipping gentoo-dev 2020-06-04 20:15:26 UTC
mgorny, you can last-rite dev-util/cdiff now if you like.
Comment 13 Michał Górny archtester Gentoo Infrastructure gentoo-dev Security 2020-06-05 05:19:31 UTC
Lemme reuse the bug since it carries all info on why it's happening.
Comment 14 Larry the Git Cow gentoo-dev 2020-06-05 05:21:41 UTC
The bug has been referenced in the following commit(s):

https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=319773e7cca2c25d4dd3f734e07f73df722e2fda

commit 319773e7cca2c25d4dd3f734e07f73df722e2fda
Author:     Michał Górny <mgorny@gentoo.org>
AuthorDate: 2020-06-05 05:21:16 +0000
Commit:     Michał Górny <mgorny@gentoo.org>
CommitDate: 2020-06-05 05:21:37 +0000

    package.mask: Last rite dev-util/cdiff
    
    Bug: https://bugs.gentoo.org/710538
    Signed-off-by: Michał Górny <mgorny@gentoo.org>

 profiles/package.mask | 5 +++++
 1 file changed, 5 insertions(+)
Comment 15 Larry the Git Cow gentoo-dev 2020-07-13 04:54:44 UTC
The bug has been closed via the following commit(s):

https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62f7495f92dc2c173f9ff189a7b354de4f3279b8

commit 62f7495f92dc2c173f9ff189a7b354de4f3279b8
Author:     Michał Górny <mgorny@gentoo.org>
AuthorDate: 2020-07-13 04:53:38 +0000
Commit:     Michał Górny <mgorny@gentoo.org>
CommitDate: 2020-07-13 04:53:38 +0000

    dev-util/cdiff: Remove last-rited pkg
    
    Closes: https://bugs.gentoo.org/710538
    Signed-off-by: Michał Górny <mgorny@gentoo.org>

 dev-util/cdiff/Manifest                            |  1 -
 dev-util/cdiff/cdiff-1.0.ebuild                    | 31 ---------------------
 dev-util/cdiff/cdiff-1.1.ebuild                    | 21 --------------
 dev-util/cdiff/cdiff-9999.ebuild                   | 32 ----------------------
 ...ff-0.9.2-disable-unimportant-failing-test.patch | 11 --------
 dev-util/cdiff/metadata.xml                        |  9 ------
 profiles/package.mask                              |  5 ----
 7 files changed, 110 deletions(-)