summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKostadin Shishmanov <kocelfc@tutanota.com>2024-04-26 22:24:47 +0300
committerSam James <sam@gentoo.org>2024-05-03 12:01:21 +0100
commit14fa69d8137898dbd6525c91846d37e50cc81dac (patch)
tree104fbb5c0b2b85aaee8100a0bb16e350424ac9b1
parentdev-libs/xerces-c: drop merged upstream patch from 9999 (diff)
downloadgentoo-14fa69d8137898dbd6525c91846d37e50cc81dac.tar.gz
gentoo-14fa69d8137898dbd6525c91846d37e50cc81dac.tar.bz2
gentoo-14fa69d8137898dbd6525c91846d37e50cc81dac.zip
media-libs/libglvnd: enable py3.12, fix QA warning about SRC_URI
Closes: https://bugs.gentoo.org/929641 Signed-off-by: Kostadin Shishmanov <kocelfc@tutanota.com> Closes: https://github.com/gentoo/gentoo/pull/36442 Signed-off-by: Sam James <sam@gentoo.org>
-rw-r--r--media-libs/libglvnd/libglvnd-1.7.0.ebuild17
-rw-r--r--media-libs/libglvnd/libglvnd-9999.ebuild17
2 files changed, 12 insertions, 22 deletions
diff --git a/media-libs/libglvnd/libglvnd-1.7.0.ebuild b/media-libs/libglvnd/libglvnd-1.7.0.ebuild
index 912c6c769279..ac956be50c41 100644
--- a/media-libs/libglvnd/libglvnd-1.7.0.ebuild
+++ b/media-libs/libglvnd/libglvnd-1.7.0.ebuild
@@ -1,23 +1,18 @@
-# Copyright 2018-2023 Gentoo Authors
+# Copyright 2018-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-EGIT_REPO_URI="https://gitlab.freedesktop.org/glvnd/libglvnd.git"
-
-if [[ ${PV} = 9999* ]]; then
- GIT_ECLASS="git-r3"
-fi
-
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
VIRTUALX_REQUIRED=manual
-inherit ${GIT_ECLASS} meson-multilib python-any-r1 virtualx
+inherit meson-multilib python-any-r1 virtualx
DESCRIPTION="The GL Vendor-Neutral Dispatch library"
HOMEPAGE="https://gitlab.freedesktop.org/glvnd/libglvnd"
-if [[ ${PV} = 9999* ]]; then
- SRC_URI=""
+if [[ ${PV} = 9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://gitlab.freedesktop.org/glvnd/${PN}.git"
else
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
SRC_URI="https://gitlab.freedesktop.org/glvnd/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2 -> ${P}.tar.bz2"
diff --git a/media-libs/libglvnd/libglvnd-9999.ebuild b/media-libs/libglvnd/libglvnd-9999.ebuild
index 4b9d2e7d521c..8df0d572ada4 100644
--- a/media-libs/libglvnd/libglvnd-9999.ebuild
+++ b/media-libs/libglvnd/libglvnd-9999.ebuild
@@ -1,23 +1,18 @@
-# Copyright 2018-2023 Gentoo Authors
+# Copyright 2018-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-EGIT_REPO_URI="https://gitlab.freedesktop.org/glvnd/libglvnd.git"
-
-if [[ ${PV} = 9999* ]]; then
- GIT_ECLASS="git-r3"
-fi
-
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
VIRTUALX_REQUIRED=manual
-inherit ${GIT_ECLASS} meson-multilib python-any-r1 virtualx
+inherit meson-multilib python-any-r1 virtualx
DESCRIPTION="The GL Vendor-Neutral Dispatch library"
HOMEPAGE="https://gitlab.freedesktop.org/glvnd/libglvnd"
-if [[ ${PV} = 9999* ]]; then
- SRC_URI=""
+if [[ ${PV} = 9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://gitlab.freedesktop.org/glvnd/${PN}.git"
else
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
SRC_URI="https://gitlab.freedesktop.org/glvnd/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2 -> ${P}.tar.bz2"