Gentoo Archives: gentoo-commits

From: Pacho Ramos <pacho@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-misc/virtualgl/
Date: Wed, 22 Dec 2021 10:30:20
Message-Id: 1640169007.2eb93feb58f6cfed74dbcc7e5d4559039078c226.pacho@gentoo
1 commit: 2eb93feb58f6cfed74dbcc7e5d4559039078c226
2 Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
3 AuthorDate: Wed Dec 22 10:30:07 2021 +0000
4 Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
5 CommitDate: Wed Dec 22 10:30:07 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2eb93feb
7
8 x11-misc/virtualgl: Avoid file collision with mesa-progs[egl]
9
10 Thanks-to: Edgar Dragon
11 Closes: https://bugs.gentoo.org/829792
12 Package-Manager: Portage-3.0.30, Repoman-3.0.3
13 Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>
14
15 x11-misc/virtualgl/{virtualgl-3.0.ebuild => virtualgl-3.0-r1.ebuild} | 2 ++
16 1 file changed, 2 insertions(+)
17
18 diff --git a/x11-misc/virtualgl/virtualgl-3.0.ebuild b/x11-misc/virtualgl/virtualgl-3.0-r1.ebuild
19 similarity index 96%
20 rename from x11-misc/virtualgl/virtualgl-3.0.ebuild
21 rename to x11-misc/virtualgl/virtualgl-3.0-r1.ebuild
22 index 284d9b318933..9eaf3b90069a 100644
23 --- a/x11-misc/virtualgl/virtualgl-3.0.ebuild
24 +++ b/x11-misc/virtualgl/virtualgl-3.0-r1.ebuild
25 @@ -93,7 +93,9 @@ src_install() {
26 systemd_dounit "${FILESDIR}/vgl.service"
27
28 # Rename glxinfo to vglxinfo to avoid conflict with x11-apps/mesa-progs
29 + # and eglinfo to veglinto because of conflict with mesa-progs[egl]
30 mv "${D}"/usr/bin/{,v}glxinfo || die
31 + mv "${D}"/usr/bin/{,v}eglinfo || die
32
33 # Remove license files, bug 536284
34 rm "${D}"/usr/share/doc/${PF}/{LGPL.txt*,LICENSE*} || die