gentoo resync : 16.04.2022

3 files changed, 47 insertions, 23 deletions

diff --git a/app-editors/ghex/Manifest b/app-editors/ghex/Manifest
index e83926aac043..3787468dfd63 100644
--- a/app-editors/ghex/Manifest
+++ b/app-editors/ghex/Manifest
@@ -1,6 +1,6 @@
 DIST ghex-3.41.1.tar.xz 1499804 BLAKE2B dd75dc1cc5d847ae3b932ed0bb98b8e15f44943f76f0ba9f053c6770d05e31d211c9f75a910c93c09cf2de143db8fa0eda4fdb876a0ea3ed0534650e7ac36a65 SHA512 5eccf81c41f5ae56bfe5eab0fb843db0095c75080e7dfc0b19a4c71f40f89931e1cbcd2c58744a6b249d16e2a2e4f96513aaac4c41f46d3b5ae8b2bc851851a0
-DIST ghex-4.alpha.1.tar.gz 2165701 BLAKE2B f98758b657f2cc73913bb205439d265e8d8168c91080ca0e064decf277a7e300d9eb82a869951f846a66b5155016f69b0935b2877d24a0482a6b003a821adac2 SHA512 6e7e8d8ff0b981f14f48ed16d3b31ce51a0fb4c978c525cc9f3b2c06114bc1cfaf42e71ea98f1b0d33940a2f6b15a5e053228484259bdc4525bb18f2835b97c8
+DIST ghex-42.0.tar.xz 1007772 BLAKE2B db85755e22470f345fcd926e26addcb3ea71c90bc0d71fb5f02ad71e875b3b0100856e4365f950a4040f266c1826be992e6a7a23e32ddebbf9ccdfce88e45f46 SHA512 20eb8b876e65e3a63b2bf5bcb7258f4c196380395805e7aa374a4dba79e8e0356507b7dad660cdfd49490cb9832863e84dfcfa74dd680f05d34742a3c23f6108
 EBUILD ghex-3.41.1.ebuild 688 BLAKE2B eb2299b663b824da78475537d939b41f2d3be2f1f0c8d2f28852dc613d78b60221500ec592c0a93af2b0f865f9dd593a21e6f2d149077244695f13de0b68d996 SHA512 30750b262e0282ddc7e44b5f893e9dd4cbddf99acb2923d7c409884775a928b9d3ce1f7427d5060a66e62997989c4cee9b997e44c846430b02ff9b6e695bccfe
-EBUILD ghex-4.0.0_alpha.ebuild 959 BLAKE2B f45a28eec7b5a04229e6a46049df47d07b177ed2c756c90f045ac4c74867dd0a31c64435d49e4e402847c6a28b3417ef656220540369afbb97217b279b7c6604 SHA512 07164df7a6385410fc8f6e84e2ba26869d86b1dd76bc31fac4aad238b43c37b12cceb05473e24d75db55c02bb7ddf05f4b47f36c27ce9a6dc26cfc887df66eeb
-EBUILD ghex-9999.ebuild 959 BLAKE2B f45a28eec7b5a04229e6a46049df47d07b177ed2c756c90f045ac4c74867dd0a31c64435d49e4e402847c6a28b3417ef656220540369afbb97217b279b7c6604 SHA512 07164df7a6385410fc8f6e84e2ba26869d86b1dd76bc31fac4aad238b43c37b12cceb05473e24d75db55c02bb7ddf05f4b47f36c27ce9a6dc26cfc887df66eeb
+EBUILD ghex-42.0-r1.ebuild 1133 BLAKE2B 292942cc63824ecc03559a0fa8cf8151fa28996cf9ee167fe76df7d8a65209917b93ab23d99e0232de494140448d0e5db59f3ebda252e9efddd8ff547fde5173 SHA512 3b18ffc6c3ac5ea2db326e140bba172ca95809a4412f508e56a39f4e2d30315331cc31c205f137d414a3900e56ff88c971d12ec85f318804ef470454cc66f1df
+EBUILD ghex-9999.ebuild 1133 BLAKE2B 292942cc63824ecc03559a0fa8cf8151fa28996cf9ee167fe76df7d8a65209917b93ab23d99e0232de494140448d0e5db59f3ebda252e9efddd8ff547fde5173 SHA512 3b18ffc6c3ac5ea2db326e140bba172ca95809a4412f508e56a39f4e2d30315331cc31c205f137d414a3900e56ff88c971d12ec85f318804ef470454cc66f1df
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/app-editors/ghex/ghex-4.0.0_alpha.ebuild b/app-editors/ghex/ghex-42.0-r1.ebuild
index 02e8fb9d1908..b9a8b8490096 100644
--- a/app-editors/ghex/ghex-4.0.0_alpha.ebuild
+++ b/app-editors/ghex/ghex-42.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,30 +13,42 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/ghex.git"
 	SRC_URI=""
 else
-	MY_PV="4.alpha.1"
-	SRC_URI="https://gitlab.gnome.org/GNOME/${PN}/-/archive/${MY_PV}/${PN}-${MY_PV}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~riscv ~x86 ~amd64-linux ~x86-linux"
-	S="${WORKDIR}/${PN}-${MY_PV}"
 fi
 
 LICENSE="GPL-2+ FDL-1.1+"
+IUSE="gtk-doc test"
+RESTRICT="!test? ( test )"
 SLOT="4"
 
 RDEPEND="
-	>=dev-libs/atk-1.0.0
-	>=dev-libs/glib-2.31.10:2
-	>=x11-libs/gtk+-3.3.8:3
-	gui-libs/gtk:4
+	>=dev-libs/glib-2.66.0:2
+	>=gui-libs/gtk-4.0.0:4
+	dev-libs/gobject-introspection
+	!app-editors/ghex:2
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
-	dev-libs/appstream-glib
-	dev-libs/libxml2:2
+	gtk-doc? ( dev-util/gi-docgen )
+	test? (
+		dev-util/desktop-file-utils
+		dev-libs/appstream-glib
+	)
+	dev-util/gtk-update-icon-cache
 	dev-util/itstool
 	>=sys-devel/gettext-0.19.8
 	virtual/pkgconfig
 "
 
+src_configure() {
+	local emesonargs=(
+		-Ddocdir="${EPREFIX}"/usr/share/gtk-doc/
+		-Dintrospection=enabled
+		$(meson_use gtk-doc gtk_doc)
+	)
+	meson_src_configure
+}
+
 pkg_postinst() {
 	xdg_pkg_postinst
 	gnome2_schemas_update
diff --git a/app-editors/ghex/ghex-9999.ebuild b/app-editors/ghex/ghex-9999.ebuild
index 02e8fb9d1908..b9a8b8490096 100644
--- a/app-editors/ghex/ghex-9999.ebuild
+++ b/app-editors/ghex/ghex-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,30 +13,42 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/ghex.git"
 	SRC_URI=""
 else
-	MY_PV="4.alpha.1"
-	SRC_URI="https://gitlab.gnome.org/GNOME/${PN}/-/archive/${MY_PV}/${PN}-${MY_PV}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~riscv ~x86 ~amd64-linux ~x86-linux"
-	S="${WORKDIR}/${PN}-${MY_PV}"
 fi
 
 LICENSE="GPL-2+ FDL-1.1+"
+IUSE="gtk-doc test"
+RESTRICT="!test? ( test )"
 SLOT="4"
 
 RDEPEND="
-	>=dev-libs/atk-1.0.0
-	>=dev-libs/glib-2.31.10:2
-	>=x11-libs/gtk+-3.3.8:3
-	gui-libs/gtk:4
+	>=dev-libs/glib-2.66.0:2
+	>=gui-libs/gtk-4.0.0:4
+	dev-libs/gobject-introspection
+	!app-editors/ghex:2
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
-	dev-libs/appstream-glib
-	dev-libs/libxml2:2
+	gtk-doc? ( dev-util/gi-docgen )
+	test? (
+		dev-util/desktop-file-utils
+		dev-libs/appstream-glib
+	)
+	dev-util/gtk-update-icon-cache
 	dev-util/itstool
 	>=sys-devel/gettext-0.19.8
 	virtual/pkgconfig
 "
 
+src_configure() {
+	local emesonargs=(
+		-Ddocdir="${EPREFIX}"/usr/share/gtk-doc/
+		-Dintrospection=enabled
+		$(meson_use gtk-doc gtk_doc)
+	)
+	meson_src_configure
+}
+
 pkg_postinst() {
 	xdg_pkg_postinst
 	gnome2_schemas_update