From 1608f248383d09617ea3c8ae69e529162052d976 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Mon, 13 Nov 2023 22:07:21 +0000
Subject: net-misc/warpinator : revision bump

---
 .../warpinator/files/warpinator-system-paths.patch | 21 ++++++++
 net-misc/warpinator/warpinator-1.7.0-r1.ebuild     | 55 ---------------------
 net-misc/warpinator/warpinator-1.7.0-r2.ebuild     | 56 ++++++++++++++++++++++
 3 files changed, 77 insertions(+), 55 deletions(-)
 create mode 100644 net-misc/warpinator/files/warpinator-system-paths.patch
 delete mode 100644 net-misc/warpinator/warpinator-1.7.0-r1.ebuild
 create mode 100644 net-misc/warpinator/warpinator-1.7.0-r2.ebuild

(limited to 'net-misc')

diff --git a/net-misc/warpinator/files/warpinator-system-paths.patch b/net-misc/warpinator/files/warpinator-system-paths.patch
new file mode 100644
index 00000000..45228202
--- /dev/null
+++ b/net-misc/warpinator/files/warpinator-system-paths.patch
@@ -0,0 +1,21 @@
+diff -Nur a/src/warpinator-launch.py b/src/warpinator-launch.py
+--- a/src/warpinator-launch.py	2023-10-16 18:26:49.000000000 +0100
++++ b/src/warpinator-launch.py	2023-11-13 22:05:06.499787499 +0000
+@@ -135,7 +135,7 @@
+ 
+     launch_args = []
+ 
+-    launch_args += ["/bin/bwrap"]
++    launch_args += ["/usr/bin/bwrap"]
+     launch_args += ["--ro-bind",         "/",                                               "/"]
+     launch_args += ["--dev",             "/dev"]
+     launch_args += ["--bind",            rundir + "/dconf",                                 rundir + "/dconf"]
+@@ -156,7 +156,7 @@
+     launch_args += ["--die-with-parent"]
+ 
+     # launch_args += ["/bin/sh"]
+-    launch_args += ["/bin/python3",      warpinator_path]
++    launch_args += ["/usr/bin/python3",      warpinator_path]
+ 
+     ret = 0
+ 
diff --git a/net-misc/warpinator/warpinator-1.7.0-r1.ebuild b/net-misc/warpinator/warpinator-1.7.0-r1.ebuild
deleted file mode 100644
index 1269f26a..00000000
--- a/net-misc/warpinator/warpinator-1.7.0-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Share files across the LAN"
-HOMEPAGE="https://github.com/linuxmint/warpinator"
-SRC_URI="https://github.com/linuxmint/${PN}/archive/refs/tags/master.lmde6.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-
-inherit meson gnome2-utils xdg
-
-DEPEND="
-	dev-libs/gobject-introspection
-	dev-python/cryptography
-	dev-python/ifaddr
-	dev-python/netaddr
-	dev-python/netifaces
-	dev-python/pynacl
-	dev-python/setproctitle
-	>=dev-python/python3-xapp-1.6.0
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	>=dev-util/meson-0.45.0
-"
-
-S="${WORKDIR}/${PN}-master.lmde6"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-bundled-grpcio-cython3.patch"
-)
-
-src_configure() {
-	local emesonargs=(
-		-Dinclude-firewall-mod=true
-		-Dbundle-zeroconf=true
-		-Dbundle-landlock=true
-		-Dbundle-grpc=true
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
diff --git a/net-misc/warpinator/warpinator-1.7.0-r2.ebuild b/net-misc/warpinator/warpinator-1.7.0-r2.ebuild
new file mode 100644
index 00000000..d84ecffa
--- /dev/null
+++ b/net-misc/warpinator/warpinator-1.7.0-r2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Share files across the LAN"
+HOMEPAGE="https://github.com/linuxmint/warpinator"
+SRC_URI="https://github.com/linuxmint/${PN}/archive/refs/tags/master.lmde6.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+
+inherit meson gnome2-utils xdg
+
+DEPEND="
+	dev-libs/gobject-introspection
+	dev-python/cryptography
+	dev-python/ifaddr
+	dev-python/netaddr
+	dev-python/netifaces
+	dev-python/pynacl
+	dev-python/setproctitle
+	>=dev-python/python3-xapp-1.6.0
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	>=dev-util/meson-0.45.0
+"
+
+S="${WORKDIR}/${PN}-master.lmde6"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-bundled-grpcio-cython3.patch"
+	"${FILESDIR}/${PN}-system-paths.patch"
+)
+
+src_configure() {
+	local emesonargs=(
+		-Dinclude-firewall-mod=true
+		-Dbundle-zeroconf=true
+		-Dbundle-landlock=true
+		-Dbundle-grpc=true
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
-- 
cgit v1.2.3