diff --git a/dev-python/guidata/Manifest b/dev-python/guidata/Manifest
index a8455c3fba..2ade6c5a0f 100644
--- a/dev-python/guidata/Manifest
+++ b/dev-python/guidata/Manifest
@@ -1,3 +1,4 @@
 DIST guidata-3.5.2.tar.gz 715460 BLAKE2B 8fa7f73cb306099c6e7cf5f2fe2eb5df3905ae6e8a9103682fddd70e5381cb7d485830c28cc4275735f9e8b726bde08b537877307be0075a40efc384ec6287ce SHA512 435f84c8fd25379a509180221d1caed1f967fde476ce68f709b0463116d333fc5ad2450b66d87d97104e5e826a366c935cbb0483267adbfcdf6326e52d5ac4ab
 DIST guidata-3.6.1.tar.gz 718020 BLAKE2B 69dc2b64fe9e0e6e63e705833d0f02dfead890a3caeaf0ad03b2aac2a9f1b0a14a5b552dc4ff3e479fc416ba348f3b84a713a409e08f8b584f0d9d8597b04e84 SHA512 38fb27b2484deb1c7780d7750cb1d522b53ae195fc3fd4f73ff0973898106ad3cbf974de912f5a72a95b8741d740235abff2b840ab12f36c7808f024eb16d2f9
 DIST guidata-3.6.2.tar.gz 718258 BLAKE2B 197698ec37ff44c4a75b812f8ae36a3662af43bc366e619b954489d48ae146705b6d4321a4a3f05ce20bfdb60b205a5b90bb4b6379cdb7383efbf9f669317381 SHA512 29459d9a08cf42f89d5d98eca4f729670a1d47921039debcc3a4e9d1fbca812ed1d3c059e70ae76a19d85ad7c41122097ccbf5dbde6046b81a18a96a7e606851
+DIST guidata-3.6.3.tar.gz 718459 BLAKE2B f3ec7bd4d367afe05741498df15ddef1904962c826fc0ce8200a72d3f46fdc198ba0facb5f9010f94be21506e7f43a02c4ffab6ca7d8adf27ab01efae493a1fe SHA512 b3e53dace35c19e30be19bdf91454322445446d87f2d278f6749b3c7d5b7029dc7786ccdd48baa9b10991a076d83084fac4cfb39a86f695659e37c5be28ed28a
diff --git a/dev-python/guidata/guidata-3.6.3.ebuild b/dev-python/guidata/guidata-3.6.3.ebuild
new file mode 100644
index 0000000000..f6f11c1394
--- /dev/null
+++ b/dev-python/guidata/guidata-3.6.3.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{11..12} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Library for user interfaces for easy dataset editing and display"
+HOMEPAGE="https://pypi.org/project/guidata/"
+LICENSE="BSD"
+
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test +pyqt5 pyqt6"
+
+REQUIRED_USE="|| ( pyqt5 pyqt6 )"
+
+RDEPEND="
+	pyqt5? ( dev-python/PyQt5[${PYTHON_USEDEP}] )
+	pyqt6? ( dev-python/PyQt6[${PYTHON_USEDEP}] )
+
+	dev-python/h5py[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/QtPy[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/tomli[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		dev-python/pytest-qt[${PYTHON_USEDEP}]
+		dev-python/pytest-xvfb[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	epytest -p xvfb
+}
diff --git a/dev-python/guidata/metadata.xml b/dev-python/guidata/metadata.xml
index 256ca01261..32a98316d1 100644
--- a/dev-python/guidata/metadata.xml
+++ b/dev-python/guidata/metadata.xml
@@ -7,6 +7,10 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="pypi">guidata</remote-id>
-		<remote-id type="github">PierreRaybaut/guidata</remote-id>
+		<remote-id type="github">PlotPyStack/guidata</remote-id>
 	</upstream>
+	<use>
+		<flag name="pyqt5">Use <pkg>dev-python/PyQt5</pkg> as Qt for Python implementation</flag>
+		<flag name="pyqt6">Use <pkg>dev-python/PyQt6</pkg> as Qt for Python implementation</flag>
+	</use>
 </pkgmetadata>