6 files changed, 59 insertions, 6 deletions
diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index 74ccd32efd2e..21e0431c150f 100644
--- a/gnome-extra/Manifest.gz
+++ b/gnome-extra/Manifest.gz
diff --git a/gnome-extra/chrome-gnome-shell/Manifest b/gnome-extra/chrome-gnome-shell/Manifest
deleted file mode 100644
index 5f6b0fd3baee..000000000000
--- a/gnome-extra/chrome-gnome-shell/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST chrome-gnome-shell-10.tar.xz 158972 BLAKE2B fe4df942f885aee40d5c5e01dcd127a9deb46aeb57765336c91a7a9c56f7c953eb36d822ffa821300b99e3d765c1b162767fc5debc24e42a16bddb1404796c9c SHA512 cf0d108c3fb57deb4926a4cf043dd64d776eda4c01ec595a1472c6c45726b8460381b9bd7cb1b43d7a5bd8a585be0d1b648c720a2f0a7a377c133b8750e76cd6
-EBUILD chrome-gnome-shell-10-r5.ebuild 1401 BLAKE2B 71e9615355e527e5e4569889647f8871d1ce1e54660a0a96d32affb05fdeef752836cd863b1793142f81704a2a385f813b99967d463b225bc010248f9837497d SHA512 91ec86e2b3a9958f1f2c2056a9bbabc6a83a31ac34654cd820dadf17680f6d932ee56fb1c11b71ef5c95948cf2b648cb15a0cfe0d032d087f7ea69486667d5d5
-MISC metadata.xml 569 BLAKE2B 75ca01eca709bea5e7e2876676f2cead028f56f99ea921f6c8068191ab1497c2424f2b0b526a35b347bdf95a0ec851237b1091647294f122d208f7df4112e4e2 SHA512 93b2791f3bdcc9462030f0afcf5c9fe956f92ddb1fa26c024b9a689476cb0055dcefdfc4f62200d2648733e4b3a83e8592ec0c4bb79ce7400f7e5d3e5a8879b7
diff --git a/gnome-extra/gnome-browser-connector/Manifest b/gnome-extra/gnome-browser-connector/Manifest
new file mode 100644
index 000000000000..42766b394ac7
--- /dev/null
+++ b/gnome-extra/gnome-browser-connector/Manifest
@@ -0,0 +1,5 @@
+DIST chrome-gnome-shell-10.tar.xz 158972 BLAKE2B fe4df942f885aee40d5c5e01dcd127a9deb46aeb57765336c91a7a9c56f7c953eb36d822ffa821300b99e3d765c1b162767fc5debc24e42a16bddb1404796c9c SHA512 cf0d108c3fb57deb4926a4cf043dd64d776eda4c01ec595a1472c6c45726b8460381b9bd7cb1b43d7a5bd8a585be0d1b648c720a2f0a7a377c133b8750e76cd6
+DIST gnome-browser-connector-v42.0.tar.gz 29652 BLAKE2B 59dde83ea62c7eb8c71f2ea23b4ef0bc0a2178de2236e35b1d6abf7ec0671ef69e923656a9e6c8cecb239a34c0d3b147433e5fec92aeb2d28f7a30387fc91482 SHA512 8679349245bd8f5a29367316fb3cdbd13b4d5f3ed7c8adfc4d83973f86e15de8a1155dda1b155e20ed1a5dccdc7fbbbe22e0c454fcb15fd6cc073ce63ec4c59e
+EBUILD gnome-browser-connector-10-r5.ebuild 1479 BLAKE2B 3743b1c5c3d9b778b8a59ccb36ad226914c8de754d807ae60ba3156335dc3b79bf61bbff4123cde12a8a89103acb314ace96082a661fdf40169051bb61eb2433 SHA512 c5fd03a76a09433790f2dc5674b3df5e4487ffdba199df0020a7912852f314ba2f490055990d66973ffda49e385f8e24cffeafde877afbe48a2a3a35318fd4ae
+EBUILD gnome-browser-connector-42.0.ebuild 1419 BLAKE2B 4dabb8ada270ce9809d4333d1a8b08ade1737519adf09ec2609c8708f6647f1edbc619eb33e56fc9561aa7347b3914b738ab65c8972c52d30d3781e09433ddd2 SHA512 129dc9b3e864614f08857210fdf66d327881191eef789f3c4568854cd81d98d01c4fdcfdf2be8e67c9e816d17c224e8865a83d108bf7d02cd32f3993c2b5ab6d
+MISC metadata.xml 511 BLAKE2B 6f99ce90fa8a68aa26fa2a99aab993e8e945d719c041a8a58a1176b1ccca1c09a17fecdcd9755c6f9ca09fdcbe9ff1084363b197651e46d674915f54b1976329 SHA512 fd9c5cc8c6d07934f26279f0bc69e5985c841ed681587f7993268d708ce41aa7d0ecfac16373bd6fe6705c4b9e7f4574a3ccb2e974ec5f4d7699994af4f8b50c
diff --git a/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-10-r5.ebuild b/gnome-extra/gnome-browser-connector/gnome-browser-connector-10-r5.ebuild
index 8198915b17bf..950eda443d11 100644
--- a/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-10-r5.ebuild
+++ b/gnome-extra/gnome-browser-connector/gnome-browser-connector-10-r5.ebuild
@@ -4,12 +4,15 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
+MY_PN="chrome-gnome-shell"
+MY_P="${MY_PN}-${PV}"
 
 inherit cmake python-single-r1
 
 DESCRIPTION="GNOME Shell integration for Chrome/Chromium, Firefox, Vivaldi, Opera browsers"
 HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShellIntegrationForChrome"
-SRC_URI="mirror://gnome/sources/${PN}/${PV}/${P}.tar.xz"
+SRC_URI="mirror://gnome/sources/${MY_PN}/${PV}/${MY_P}.tar.xz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-3+"
 SLOT="0"
diff --git a/gnome-extra/gnome-browser-connector/gnome-browser-connector-42.0.ebuild b/gnome-extra/gnome-browser-connector/gnome-browser-connector-42.0.ebuild
new file mode 100644
index 000000000000..cfe911015f90
--- /dev/null
+++ b/gnome-extra/gnome-browser-connector/gnome-browser-connector-42.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit meson python-single-r1 xdg
+
+DESCRIPTION="OS-native connector counterpart for GNOME Shell browser extension"
+HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShellIntegration"
+SRC_URI="https://gitlab.gnome.org/nE0sIghT/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.gz"
+S="${WORKDIR}/${PN}-v${PV}"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+	$(python_gen_cond_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]')
+"
+RDEPEND="${DEPEND}
+	gnome-base/gnome-shell
+"
+
+src_install() {
+	meson_src_install
+	python_fix_shebang "${D}/usr/bin/${PN}"
+	python_fix_shebang "${D}/usr/bin/${PN}-host"
+	python_optimize
+
+	if [[ $(get_libdir) != "lib" && "${SYMLINK_LIB}" != yes ]]; then
+		# Workaround www-client/firefox-bin manifests location
+		# Bug: https://bugs.gentoo.org/643522
+		insinto /usr/lib/mozilla/native-messaging-hosts
+		for id in chrome_gnome_shell browser_connector; do
+			doins "${ED}/usr/$(get_libdir)/mozilla/native-messaging-hosts/org.gnome.${id}.json"
+		done
+	fi
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	elog "Please note that this package provides OS-native connector only."
+	elog "You can install browser extension using link provided at"
+	elog "https://extensions.gnome.org website."
+}
diff --git a/gnome-extra/chrome-gnome-shell/metadata.xml b/gnome-extra/gnome-browser-connector/metadata.xml
index 3358e47dd7f9..69a4f4e1a20c 100644
--- a/gnome-extra/chrome-gnome-shell/metadata.xml
+++ b/gnome-extra/gnome-browser-connector/metadata.xml
@@ -10,7 +10,6 @@
 		<name>Proxy Maintainers</name>
 	</maintainer>
 	<upstream>
-		<bugs-to>https://github.com/nE0sIghT/chrome-gnome-shell-mirror/issues</bugs-to>
-		<remote-id type="github">GNOME/chrome-gnome-shell</remote-id>
+		<bugs-to>https://gitlab.gnome.org/nE0sIghT/gnome-browser-connector/-/issues</bugs-to>
 	</upstream>
 </pkgmetadata>