From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3C45215802E for ; Wed, 3 Jul 2024 04:57:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 827BCE2B5A; Wed, 3 Jul 2024 04:57:09 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5C313E2B5A for ; Wed, 3 Jul 2024 04:57:09 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1F231342FA6 for ; Wed, 3 Jul 2024 04:57:08 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AACAB1D9A for ; Wed, 3 Jul 2024 04:57:06 +0000 (UTC) From: "John M. Harris, Jr." To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "John M. Harris, Jr." Message-ID: <1719982600.266a8ec79da4760e4c569553d397b818a96953d4.johnmh@gentoo> Subject: [gentoo-commits] repo/proj/guru:dev commit in: gui-libs/xdg-desktop-portal-hyprland/ X-VCS-Repository: repo/proj/guru X-VCS-Files: gui-libs/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland-9999.ebuild X-VCS-Directories: gui-libs/xdg-desktop-portal-hyprland/ X-VCS-Committer: johnmh X-VCS-Committer-Name: John M. Harris, Jr. X-VCS-Revision: 266a8ec79da4760e4c569553d397b818a96953d4 X-VCS-Branch: dev Date: Wed, 3 Jul 2024 04:57:06 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: a299908c-5870-4871-a134-4330a5ce4da3 X-Archives-Hash: 9c67d4e27fc239a446e88bb7adbde27e commit: 266a8ec79da4760e4c569553d397b818a96953d4 Author: John M. Harris Jr. johnmh me> AuthorDate: Wed Jul 3 04:56:40 2024 +0000 Commit: John M. Harris, Jr. johnmh me> CommitDate: Wed Jul 3 04:56:40 2024 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=266a8ec7 gui-libs/xdg-desktop-portal-hyprland: Remove subproject, live Signed-off-by: John M. Harris Jr. johnmh.me> .../xdg-desktop-portal-hyprland-9999.ebuild | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/gui-libs/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland-9999.ebuild b/gui-libs/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland-9999.ebuild index 8b4b42926..465163d48 100644 --- a/gui-libs/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland-9999.ebuild +++ b/gui-libs/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland-9999.ebuild @@ -9,14 +9,10 @@ DESCRIPTION="xdg-desktop-portal backend for hyprland" HOMEPAGE="https://github.com/hyprwm/xdg-desktop-portal-hyprland" if [[ ${PV} == 9999 ]]; then - EGIT_REPO_URI="https://github.com/hyprwm/xdg-desktop-portal-hyprland.git" + EGIT_REPO_URI="https://github.com/hyprwm/${PN}.git" inherit git-r3 else - PROTO_COMMIT="4d29e48433270a2af06b8bc711ca1fe5109746cd" - SRC_URI="https://github.com/hyprwm/xdg-desktop-portal-hyprland/archive/refs/tags/v${PV}.tar.gz \ - -> xdg-desktop-hyprland-${PV}.tar.gz - https://github.com/hyprwm/hyprland-protocols/archive/${PROTO_COMMIT}.tar.gz \ - -> proto-subproject-${PV}.tar.gz" + SRC_URI="https://github.com/hyprwm/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz" KEYWORDS="~amd64" fi @@ -72,16 +68,6 @@ pkg_setup() { fi } -src_unpack() { - if [[ ${PV} == 9999 ]]; then - git-r3_src_unpack - else - default - rmdir "${S}/subprojects/hyprland-protocols" || die - mv "hyprland-protocols-${PROTO_COMMIT}" "${S}/subprojects/hyprland-protocols" || die - fi -} - src_prepare() { eapply "${FILESDIR}/xdg-desktop-portal-hyprland-1.3.2_use_sys_sdbus-c++.patch" sed -i "/add_compile_options(-O3)/d" "${S}/CMakeLists.txt" || die