commit: 367a333f8f911be67f8f4e42d51648e387fd3459
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 25 02:20:09 2024 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Wed Sep 25 02:32:31 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=367a333f
x11-apps/xisxwayland: Use xorg-3.eclass
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
x11-apps/xisxwayland/xisxwayland-2.ebuild | 25 ++++++++++---------------
x11-apps/xisxwayland/xisxwayland-9999.ebuild | 27 +++++++++++----------------
2 files changed, 21 insertions(+), 31 deletions(-)
diff --git a/x11-apps/xisxwayland/xisxwayland-2.ebuild
b/x11-apps/xisxwayland/xisxwayland-2.ebuild
index c82f6bbc37cd..ea94facec6af 100644
--- a/x11-apps/xisxwayland/xisxwayland-2.ebuild
+++ b/x11-apps/xisxwayland/xisxwayland-2.ebuild
@@ -1,29 +1,24 @@
-# Copyright 2020-2022 Gentoo Authors
+# Copyright 2020-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
+XORG_TARBALL_SUFFIX="xz"
-if [[ ${PV} = 9999* ]]; then
- GIT_ECLASS="git-r3"
- EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/app/${PN}.git";
-fi
-
-inherit ${GIT_ECLASS} meson
+inherit xorg-3 meson
-DESCRIPTION="Tool to determine whether the X server in use is Xwayland"
-HOMEPAGE="https://gitlab.freedesktop.org/xorg/app/xisxwayland";
-if [[ ${PV} = 9999* ]]; then
- SRC_URI=""
-else
+if [[ ${PV} != *9999* ]]; then
KEYWORDS="amd64 ~loong"
-
SRC_URI="https://xorg.freedesktop.org/archive/individual/app/${P}.tar.xz";
fi
-LICENSE="MIT"
-SLOT="0"
+DESCRIPTION="Tool to determine whether the X server in use is Xwayland"
RDEPEND="
x11-libs/libX11
x11-libs/libXrandr"
DEPEND="${RDEPEND}
x11-base/xorg-proto"
+
+# Override xorg-3's src_prepare
+src_prepare() {
+ default
+}
diff --git a/x11-apps/xisxwayland/xisxwayland-9999.ebuild
b/x11-apps/xisxwayland/xisxwayland-9999.ebuild
index c7f9d5034c09..ea94facec6af 100644
--- a/x11-apps/xisxwayland/xisxwayland-9999.ebuild
+++ b/x11-apps/xisxwayland/xisxwayland-9999.ebuild
@@ -1,29 +1,24 @@
-# Copyright 2020-2022 Gentoo Authors
+# Copyright 2020-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
+XORG_TARBALL_SUFFIX="xz"
-if [[ ${PV} = 9999* ]]; then
- GIT_ECLASS="git-r3"
- EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/app/${PN}.git";
-fi
-
-inherit ${GIT_ECLASS} meson
+inherit xorg-3 meson
-DESCRIPTION="Tool to determine whether the X server in use is Xwayland"
-HOMEPAGE="https://gitlab.freedesktop.org/xorg/app/xisxwayland";
-if [[ ${PV} = 9999* ]]; then
- SRC_URI=""
-else
- KEYWORDS="~amd64 ~loong"
-
SRC_URI="https://xorg.freedesktop.org/archive/individual/app/${P}.tar.xz";
+if [[ ${PV} != *9999* ]]; then
+ KEYWORDS="amd64 ~loong"
fi
-LICENSE="MIT"
-SLOT="0"
+DESCRIPTION="Tool to determine whether the X server in use is Xwayland"
RDEPEND="
x11-libs/libX11
x11-libs/libXrandr"
DEPEND="${RDEPEND}
x11-base/xorg-proto"
+
+# Override xorg-3's src_prepare
+src_prepare() {
+ default
+}
