diff --git a/sci-geosciences/XyGrib/Manifest b/sci-geosciences/XyGrib/Manifest
index 39d7855..b8fabe1 100644
--- a/sci-geosciences/XyGrib/Manifest
+++ b/sci-geosciences/XyGrib/Manifest
@@ -1,15 +1,15 @@
 AUX XyGrib-gcc10.patch 317 BLAKE2B b99b0015ad26a60d47b3158d4f2d0c883c2066a6dff51b5896f882003495eced0c0f6887ec0351ac3e3fc56a842127e623192fec9452e8f9de2fab39d5d169e0 SHA512 74a571200371802145c5b0d8776c3adef0a58eae2017a7e4cd0396ccb84ac1477bf92971432401dede98684c7732ffe5a87559eb9faebb6fe4bad3427dbba24c
 AUX locations.patch 1582 BLAKE2B f3410e7b586937c66a246e95cf1e8c13e138cff4c9c47df233d4dfe101a71639261d84a3d16965acb857a2c14cd37cdc9c50d2aa006799803c383bdad700f5c8 SHA512 91821bbec61f67ee5c7d64bb32cd3461456f9e1ab9750f715219c0b111a4ed086b02046fbb39de3518804419a69fea5eb6f6aca012273d7abf4ed4c69de90b14
 AUX openjpeg-2.4.patch 457 BLAKE2B 4189f10c396142cf5bf64fd1dbc25ef7f300b9e2c30f9ec7e8e384a056cf0642d933187ce0f7aff584fa3014dd4c510b4e6fad27e717a07a6e42707e9729fb8e SHA512 0cf546bc21ab6ec6a061949a6d55c7f46b7d5d612e9ddbf47113fb3928adbf101314218f3ef68eeb552c9f95065c9a7f470c7c7045b4ec79b04af2d273b31311
 AUX xygrib.desktop 223 BLAKE2B 3e6d30e12650b95ac937e2f45cf806c653090badb4c446b238cb664437f7879abf0250c0f18b13a3a2267e5fce4c9a5e6dc9abbcbaa9ab82dcf0019f79dbc456 SHA512 fa157dbfe75420bfcbfddbb615dfb4679332f7be0808ded1241c8051174f7ab37e318c8020c62256b33c0578e3f2b508914afd36446ad1b25dd351fcdecbb9f3
 DIST XyGrib-1.2.6.1.tar.gz 14704088 BLAKE2B 25a6f9824b7aeb998b7a420f4e67cbb77c76b9096439532b8c8f6ced4f1a6c2552e16f4e9b49fbbee755c22799e1ffa68fdfeaf41a3e58267748ec862da40c9f SHA512 33c8a0fc6791dbe3342524555dc90362560fed08b4e2a624111167d92e2c71890dcb5bfe7e85d7df2ffc11a382ea5afa484cdab84c29935d4be2e673c76a371c
 DIST XyGrib-1.2.6.tar.gz 14704199 BLAKE2B 95c39c959bda2ddbdd30c3cdb7349d798be929ca060a2584d773e09c911e03d0eef42ca3ed68e2971f38a897b4960f1cfc264bf035e4c39c88d9ff78977d2a68 SHA512 310537083b31f1ac0906518d44a9e251d8b92edd329ecc8b42c38c9b7af662629d83144bf239446507c1afc714bdf9c8bd591c3b74932ae491d961aeb7d7597a
 DIST XyGrib-1.2.7_p20220202.tar.gz 14731604 BLAKE2B 755e68f94f5acf504fb4ddcc8fd0faa88df2ddaaf68439f8c197ad59416a1cd8f76b25f4ce22716f1d14f204cff364d03428d49b0a677b51141e968f26cc5c63 SHA512 6fa24d97bed2b4b580af52a1e70b93e7a514db6c5e9eedc94f0ba09efdae1f30a78ab1294f3a01d7184900293b5f297f564d72b529dd0ff0a65618e862e6c62b
 DIST XyGrib-High_Resolution_Maps-1.1.1.tar.gz 103284692 BLAKE2B 7343cfba8867bf3f821028f61cabfbb8eafd0ee1565bd54199540906dcacca2c52325b91713adf106bbef71a937080ec30127862ea568eff318236dcf2c4cb7d SHA512 42d1f938ade119ab73cb8da7b2fe4758a4288a869e8fbb2974c0f2fe8e4418af826a2cc0dbf282e0a30cf814fc3ea18dccda2ff6b6c2ab62e6d0e1ea1916c909
 DIST XyGrib-cities-1.1.1.tar.gz 2487518 BLAKE2B 9f45d11bfb2c06b9f08cd2684745040863ea3fd5ba29cf65d7f7cfd9cec0fcd0e5a1409064ea73ef226b170898581fa21e06527da1b758c157ec321778ce4317 SHA512 6bb9362c87fec7633b0ad1fd3b8717408c0fffa36631db1d1a680928c724e8e49758c292cac164ad7a9773fd51a432d25628eecbaa1261f5f3c5ab6fc499fd01
 DIST XyGrib-icon.png 1542 BLAKE2B c194d546eb08619f61d2826b7ae9692e09c275e3b1fc56c530faed6ed33b2b91080d36b1596fedf95a9cb63810b99d824c53fa05d5a19285cc18b04f74ad64a7 SHA512 0c4059a8aa6bc29d7bdf396decaf60cdef679edf48f0dfc146a01d74141d959b429f198deb874b3b6e4f322560041d9165e746637f23045faa5e9326096a8738
 EBUILD XyGrib-1.2.6.1.ebuild 1657 BLAKE2B 307409bc69ddc3e7e8c3769475c84acc8e2b13daaeddfcbd8c485dec44c9b2bac48d47187c9a9511437f9cea793141f56b30caef4a26e2f260e1d0d942026af4 SHA512 95ee64f9790074d0b3e5c6e00676c6de6d8db0e237d49f782320743ef093b02302a06ab5a00154f332eaf06a41a9ea99887f58b0d5f2236f74a9cf95deeecd0d
 EBUILD XyGrib-1.2.6.ebuild 1470 BLAKE2B c6ffa82dde8bbf93cc26ae265e0016ef63737e15ea67ea907951fecb471e9b6d0fdc510c341367ee3adb541f1de29d408818e72cb07680cb519b6e82a84f83b6 SHA512 b53e87da5c5680748c459b489fa9b731e626245877d38589efea689be10c2b085fc9d397ff39b90f1ae71aca8a79f29bdf2e7b1263f16e99168b591a889aa3dc
-EBUILD XyGrib-1.2.7_p20220202.ebuild 1779 BLAKE2B f3fe473f192661803acae0b9ac58026412b498d64c6ec4705da1a316dcf1490e9f11eb66c4150464c055f05660635b83cf9aa841095339d0959079c0d814282c SHA512 992131691e6e705b91c11e5f80c710ae3631c18c8b64872a9fb57dc5102aa487d4e777b961deb645e4c0715291524dcaa41e983e6d4c212e7f5fa311102b06ff
-EBUILD XyGrib-9999.ebuild 1977 BLAKE2B db8838bc7319b374b4e93838e82d377a598d50f668ccedd8ec6be544cb9d0cc77a52e9ab8baeabfd28d49090c43b4fa397d6fbd65c7a82205fa3d71d4d085f75 SHA512 7bc638cef85c03f3c0ae873bf7ea861e54d3fe7c88a015c302128c9bc92db1b8b8bdb5d69553bfd96a7cf61c4025dc2660944f79c2854a2c4fcfd0bfcb9e908f
+EBUILD XyGrib-1.2.7_p20220202.ebuild 1891 BLAKE2B 787af89c09933dd4db34d9430e8a852cb0516fc26b5410fa08fb3bca750a0b70b3589d30334b14bf745640b52e1b5596322fd3d80ba54a1c5d5c92f75703294b SHA512 788e9fb2e20b33b56c2d657fe2daad827530049575609a58e3a53cc8f95602a882bd996f4fc4ab48d737b74641571897362e406e83cde8b6730093a0d1e2d2d3
+EBUILD XyGrib-9999.ebuild 2034 BLAKE2B 1e8b02473448f558742f56965830bf9df6304e6371dd1588c6d1ebfea0e508e5a22ba816c11d67830d3e018c69885470df0ea732191a29e63e72ef5a49daee23 SHA512 a2e4335dc1126686b489305e0d540946736cd2a8c722818612420c3a4e24d4f4a1ead1e10597bb33bababbc9c924fcff3f4890e8d74f262f8aa3f7654d99ac59
 MISC metadata.xml 468 BLAKE2B 1676995ef09224b8543968d1ef97cda0d67d3e2a091496db7f2219ff50b0cd5757b4621effb1aa7a38121dc11042eb2795ab491869570b2274c2a0966a31162f SHA512 a14c05eecca893d3ed7d4a565f05895d80759dae7548617bc1ddaf6275848ca1e80c4da74be5b4188d89c17b3b14d0958f76edf4a7bbd87830068b3355e98409
diff --git a/sci-geosciences/XyGrib/XyGrib-1.2.7_p20220202.ebuild b/sci-geosciences/XyGrib/XyGrib-1.2.7_p20220202.ebuild
index d4c32dc..7b5ee03 100644
--- a/sci-geosciences/XyGrib/XyGrib-1.2.7_p20220202.ebuild
+++ b/sci-geosciences/XyGrib/XyGrib-1.2.7_p20220202.ebuild
@@ -1,72 +1,74 @@
 # Copyright 2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 inherit cmake desktop eutils
 
 MY_VERSION="738aca228c57acf182e5c1c6972063dcc46634f3"
 
 DESCRIPTION="XyGrib is a Grib file reader and visualizes meteorological data."
 HOMEPAGE="https://opengribs.org"
 SRC_URI="https://github.com/opengribs/XyGrib/archive/${MY_VERSION}.tar.gz -> ${P}.tar.gz
 	https://github.com/opengribs/XyGrib/raw/master/debian/xygrib.png -> ${PN}-icon.png
 	maps?   (
 		https://github.com/opengribs/XyGrib/releases/download/v1.1.1/XyGrib___High_Resolution_Maps.tar.gz -> ${PN}-High_Resolution_Maps-1.1.1.tar.gz
 		https://github.com/opengribs/XyGrib/releases/download/v1.1.1/XyGrib___cities_files.tar.gz -> ${PN}-cities-1.1.1.tar.gz
 	)"
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="+maps"
 
 DEPEND="app-arch/bzip2
 	dev-qt/qtnetwork:5
 	dev-qt/qtsvg:5
 	media-libs/libpng:*
 	media-libs/openjpeg:*
 	sci-libs/libnova
 	sci-libs/proj
 	sys-libs/zlib
 	x11-libs/qwt:6[qt5(+)]"
 RDEPEND="${DEPEND}"
 BDPEND=""
 
 PATCHES=(
 	"${FILESDIR}/locations.patch"
 	"${FILESDIR}/openjpeg-2.4.patch"
 )
 
 S="${WORKDIR}/${PN}-${MY_VERSION}"
 
 src_unpack() {
 	unpack ${A}
 
 	if use maps; then
 		cd "${WORKDIR}"
 		mv data/data/maps/gshhs gshhs
 		mkdir gis
 		mv cities*.gz gis
 	fi
 }
 
 src_configure() {
 	sed -i 's,set(PREFIX_BIN ${PROJECT_NAME}),set(PREFIX_BIN ""),' CMakeLists.txt
 	sed -i 's,set(PREFIX_PKGDATA ${PROJECT_NAME}),set(PREFIX_PKGDATA "share/${PROJECT_NAME}"),' CMakeLists.txt
+    sed -i 's,PATH_SUFFIXES openjpeg-2.3,PATH_SUFFIXES openjpeg-2.5 openjpeg-2.4 openjpeg-2.3,' CMakeLists.txt
+
 	cmake_src_configure
 }
 
 src_install() {
 	cmake_src_install
 	doicon -s 32 "${DISTDIR}/${PN}-icon.png"
 	domenu "${FILESDIR}/xygrib.desktop"
 
 	if use maps; then
 		insinto "/usr/share/${PN}/data/maps"
 		doins -r "${WORKDIR}/gshhs"
 
 		insinto "/usr/share/$PN}/data"
 		doins -r "/${WORKDIR}/gis"
 	fi
 }
diff --git a/sci-geosciences/XyGrib/XyGrib-9999.ebuild b/sci-geosciences/XyGrib/XyGrib-9999.ebuild
index 377faeb..67924f2 100644
--- a/sci-geosciences/XyGrib/XyGrib-9999.ebuild
+++ b/sci-geosciences/XyGrib/XyGrib-9999.ebuild
@@ -1,85 +1,85 @@
 # Copyright 2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 inherit cmake desktop eutils
 
 DESCRIPTION="XyGrib is a Grib file reader and visualizes meteorological data."
 HOMEPAGE="https://opengribs.org"
 
 if [[ "${PV}" == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/opengribs/XyGrib.git"
 	inherit git-r3 cmake desktop eutils
 	KEYWORDS=""
 else
 	SRC_URI="https://github.com/opengribs/XyGrib/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 fi
 
 SRC_URI+="
 		https://github.com/opengribs/XyGrib/raw/master/debian/xygrib.png -> ${PN}-icon.png
 		maps?   (
 			https://github.com/opengribs/XyGrib/releases/download/v1.1.1/XyGrib___High_Resolution_Maps.tar.gz -> ${PN}-High_Resolution_Maps-1.1.1.tar.gz
 			https://github.com/opengribs/XyGrib/releases/download/v1.1.1/XyGrib___cities_files.tar.gz -> ${PN}-cities-1.1.1.tar.gz
 		)"
 
 LICENSE="GPL-3"
 SLOT="0"
 #KEYWORDS="~amd64 ~x86"
 IUSE="+maps"
 
 DEPEND="app-arch/bzip2
 	dev-qt/qtnetwork:5
 	dev-qt/qtsvg:5
 	media-libs/libpng:*
 	sci-libs/libnova
 	sci-libs/proj
 	sys-libs/zlib
 	x11-libs/qwt:6[qt5(+)]"
 RDEPEND="${DEPEND}"
 BDPEND=""
 
 PATCHES=(
 	"${FILESDIR}/locations.patch"
 	#"${FILESDIR}/${PN}-gcc10.patch"
 )
 
 src_unpack() {
 	if [[ ${PV} == "9999" ]]; then
 		git-r3_fetch
 		git-r3_checkout
 	fi
 
 	unpack ${A}
 
 	if use maps; then
 		cd "${WORKDIR}"
 		mv data/data/maps/gshhs gshhs
 		mkdir gis
 		mv cities*.gz gis
 	fi
 }
 
 src_configure() {
 	sed -i 's,set(PREFIX_BIN ${PROJECT_NAME}),set(PREFIX_BIN ""),' CMakeLists.txt
 	sed -i 's,set(PREFIX_PKGDATA ${PROJECT_NAME}),set(PREFIX_PKGDATA "share/${PROJECT_NAME}"),' CMakeLists.txt
-	sed -i 's,openjpeg-2.3,openjpeg-2.4,' CMakeLists.txt
+    sed -i 's,PATH_SUFFIXES openjpeg-2.3,PATH_SUFFIXES openjpeg-2.5 openjpeg-2.4 openjpeg-2.3,' CMakeLists.txt
 
 	cmake_src_configure
 }
 
 src_install() {
 	cmake_src_install
 
 	doicon -s 32 "${DISTDIR}/${PN}-icon.png"
 	domenu "${FILESDIR}/xygrib.desktop"
 
 	if use maps; then
 		insinto "/usr/share/${PN}/data/maps"
 		doins -r "${WORKDIR}/gshhs"
 
 		insinto "/usr/share/$PN}/data"
 		doins -r "/${WORKDIR}/gis"
 	fi
 }