Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 936674 - Current ebuilds for media-tv/v4l-utils and media-libs/libv4l conflict
Summary: Current ebuilds for media-tv/v4l-utils and media-libs/libv4l conflict
Status: RESOLVED PKGREMOVED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Current packages (show other bugs)
Hardware: All Linux
: Normal normal (vote)
Deadline: 2024-08-29
Assignee: James Le Cuirot
URL:
Whiteboard:
Keywords: PMASKED
Depends on: 936675
Blocks:
  Show dependency tree
 
Reported: 2024-07-26 18:46 UTC by Anthony Lieuallen
Modified: 2024-09-06 18:33 UTC (History)
1 user (show)

See Also:
Package list:
Runtime testing required: ---


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Anthony Lieuallen 2024-07-26 18:46:38 UTC
As far as I can tell, currently media-libs/libv4l version 1.26.1 is unmasked (as of a few hours ago https://gitweb.gentoo.org/repo/gentoo.git/commit/media-libs/libv4l/libv4l-1.26.1.ebuild?id=f5ea67c3e5602924e6c3b758e68372b65c4db1e9 ).  But it depends on `!<media-tv/v4l-utils-1.26`.  Welp, the newest unmasked version of that is 1.22.1-r1.  There's a 1.24.1 and a 1.26, but they're both masked (all for amd64).

Today this caused a merge conflict for me.  I think, only by reading the ebuilds, I'm maybe supposed to un-merge `v4l-utils` and merge `libv4l` with USE=utils ?  That's hard to find from a merge conflict.
Comment 1 Sam James archtester Gentoo Infrastructure gentoo-dev Security 2024-07-26 18:48:31 UTC
> Today this caused a merge conflict for me.  I think, only by reading the ebuilds, I'm maybe supposed to un-merge `v4l-utils` and merge `libv4l` with USE=utils ?  That's hard to find from a merge conflict.

Your deduction is correct, but I agree that figuring this out isn't easy. Last-riting it with an extended period would mean people get a nice notice for what to do.
Comment 2 Sam James archtester Gentoo Infrastructure gentoo-dev Security 2024-07-26 19:12:15 UTC
Somewhere I proposed making v4l-utils a dummy package which just depends on libv4l[utils].
Comment 3 Sam James archtester Gentoo Infrastructure gentoo-dev Security 2024-07-26 19:12:31 UTC
(In reply to Sam James from comment #2)
> Somewhere I proposed making v4l-utils a dummy package which just depends on
> libv4l[utils].

ah, and Chewi *did* do that, we just need to stable it :)
Comment 4 Larry the Git Cow gentoo-dev 2024-07-29 21:39:44 UTC
The bug has been referenced in the following commit(s):

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

commit b68cb7c73d193fb7b2e0227fd85919c78bec6a2f
Author:     James Le Cuirot <chewi@gentoo.org>
AuthorDate: 2024-07-29 21:34:57 +0000
Commit:     James Le Cuirot <chewi@gentoo.org>
CommitDate: 2024-07-29 21:36:54 +0000

    profiles: Last-rite media-tv/v4l-utils
    
    Superseded by media-libs/libv4l[utils]. Removal on 2024-08-29.
    
    Bug: https://bugs.gentoo.org/936674
    Signed-off-by: James Le Cuirot <chewi@gentoo.org>

 profiles/package.mask | 5 +++++
 1 file changed, 5 insertions(+)
Comment 5 James Le Cuirot gentoo-dev 2024-07-29 21:40:29 UTC
I've dropped the last consumer now.
Comment 6 Larry the Git Cow gentoo-dev 2024-09-06 18:33:37 UTC
The bug has been closed via the following commit(s):

https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92d4e854c1d553d859e45125e5c14a2f14b6adf4

commit 92d4e854c1d553d859e45125e5c14a2f14b6adf4
Author:     Arthur Zamarin <arthurzam@gentoo.org>
AuthorDate: 2024-09-06 18:29:19 +0000
Commit:     Arthur Zamarin <arthurzam@gentoo.org>
CommitDate: 2024-09-06 18:33:05 +0000

    media-tv/v4l-utils: treeclean
    
    Closes: https://bugs.gentoo.org/936674 (pkgremoved)
    Signed-off-by: Arthur Zamarin <arthurzam@gentoo.org>

 media-tv/v4l-utils/Manifest                        |   1 -
 .../v4l-utils-1.22.1-no-stack-protector-bpf.patch  |  25 -----
 media-tv/v4l-utils/metadata.xml                    |  11 --
 media-tv/v4l-utils/v4l-utils-1.22.1-r1.ebuild      | 123 ---------------------
 media-tv/v4l-utils/v4l-utils-1.26.ebuild           |  14 ---
 profiles/arch/alpha/package.use.mask               |   1 -
 profiles/arch/powerpc/ppc32/package.use.mask       |   1 -
 profiles/arch/sparc/package.use.mask               |   1 -
 profiles/package.mask                              |   5 -
 9 files changed, 182 deletions(-)