gentoo resync : 20.03.2021

3 files changed, 62 insertions, 2 deletions

diff --git a/dev-libs/json-glib/Manifest b/dev-libs/json-glib/Manifest
index fb3621db7d4c..36c853263880 100644
--- a/dev-libs/json-glib/Manifest
+++ b/dev-libs/json-glib/Manifest
@@ -1,5 +1,7 @@
 DIST json-glib-1.4.4.tar.xz 165584 BLAKE2B 0cdb518cd139b8dbdbf31c9bc00ddedca6385d7132843455a7898f3544fb43b62d6626d49944e83ef10ab9a555cf21c7e4548df7d784bcb4020f4026e0f3045e SHA512 cf56a99dce3938b5c0075810f105719836fac65392da33a49b26ebf33aee1fab89ca9fac58059a2008d688ecc75a3e524de60621a5b027d566963541f38b971f
 DIST json-glib-1.6.0.tar.xz 168648 BLAKE2B 45a323b49cb7e9b3b37fdceb0bd95585663983acee82fa8a54afb2c817e9b86332dd94775db0be81e7ff25cfd56515816487275165889f44fef918250b71115b SHA512 0025f913c54a223e6c5f7e65c081afc8ea65ab5a30ed9f30d2d2bb28d17c5695f6e308c64dfdf128e47ddc99d3178421204b5273e78305a096c0b7dfe67dd406
+DIST json-glib-1.6.2.tar.xz 170260 BLAKE2B 8039661c92c0f8d79189fcc2d01fea0615ce13190526960178f727255c8ca5e1cd2f06079782b3513aa6686fe402d45b10ead798af196523552be73912cb54e9 SHA512 8412390a639d368ed11181621739f43bc4900143ac062c3824c7140abec58ca2b09773a415034f03896a4ff63aa3414b492997da532848709238a83c3a068b11
 EBUILD json-glib-1.4.4.ebuild 1514 BLAKE2B c6c90de778fd04db9f8d1656bc195a66643dec302b44eb46c845d87f226ea37ac5641df57d0d9076ec1ed69039458ee00c609f7fdcfdba0dbb0122aa39998ce0 SHA512 a65556de5ead0c2563fe9106a2d94ab83a428a8973d1b5931f79858fc2a73d47d1bd7244a4d77347a3e14ff4809674be35a7d02bd3c7b7689e8e16878447c5e4
-EBUILD json-glib-1.6.0.ebuild 1547 BLAKE2B 72c9a1fb4378b6c5932c4dc2e24933e44d6902a440dcf205bc85c277c52caf51537f8e2896e7a50224680e474762df48c342b2c2006fd3e7879222cf4965a86a SHA512 91f47205aeb81251f0c89ef920f32718cebb9279e64f00a02bacfc21ae19fed73fc5ea13e0f1af4fbe5ff69855c629381bbabaf3cf8f5235ae36eb9fdc6ad0f2
+EBUILD json-glib-1.6.0.ebuild 1546 BLAKE2B d0fd4b5fc752e04635cfa09a871ef20be76f7b4583bd2b891557dcd48a12e1f7f00a8719321aafdbf275e305d572c1cf5bf19c7013b6a462a5953e712a228225 SHA512 9031ed6ccca2955ea60bae281c8b0d18aea3c8fb3356216106f12249b696a4982e52f76574e593ed7da79e63b1f99c3100ac151a4fe5e01f1e217de6043330e2
+EBUILD json-glib-1.6.2.ebuild 1548 BLAKE2B 37c85cae4a14e5c954455abec37a247f0b5c58f3ea3ae6f966c1fdef7492b8fb0288daa2525183a59ea5a4711092c8ca7a8efed41215ab94fe93caa283f2568e SHA512 5e575a9c93fccc033aabcc1a12c260410af684b21e56d3cf60d07b440c2d366ea3f88a60489c15fb36d405a0bd71b6dabe0c9921c23e5197be644858a865b198
 MISC metadata.xml 1168 BLAKE2B f92f6fe2026abedfcd6f51797df84573b33817b10203e0325aa9790cc9c58ea6c9d69724b122dfe3c9b7b2a34cbf15e5e245c8aa93a1f8802757ac1c2ce61a7d SHA512 9af9dffd8e1d56c9dad5a0c53bdf16f5d54261c8c121cbc9644865340b84101a0bfcafc393bfe0d6b31024b16f1bbe9f9305286bc56a2df20a08984f55cb91e1
diff --git a/dev-libs/json-glib/json-glib-1.6.0.ebuild b/dev-libs/json-glib/json-glib-1.6.0.ebuild
index 2dd59591b36e..36f1245c389f 100644
--- a/dev-libs/json-glib/json-glib-1.6.0.ebuild
+++ b/dev-libs/json-glib/json-glib-1.6.0.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/JsonGlib"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86"
 IUSE="gtk-doc +introspection"
 
 RDEPEND="
diff --git a/dev-libs/json-glib/json-glib-1.6.2.ebuild b/dev-libs/json-glib/json-glib-1.6.2.ebuild
new file mode 100644
index 000000000000..52f80fbce692
--- /dev/null
+++ b/dev-libs/json-glib/json-glib-1.6.2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome.org meson multilib-minimal xdg-utils
+
+DESCRIPTION="Library providing GLib serialization and deserialization for the JSON format"
+HOMEPAGE="https://wiki.gnome.org/Projects/JsonGlib"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="gtk-doc +introspection"
+
+RDEPEND="
+	>=dev-libs/glib-2.54.0:2[${MULTILIB_USEDEP}]
+	introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
+"
+DEPEND="${RDEPEND}"
+# TODO: Can we use a newer docbook-xml-dtd, or is one needed at all?
+BDEPEND="
+	~app-text/docbook-xml-dtd-4.1.2
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	dev-util/glib-utils
+	gtk-doc? ( >=dev-util/gtk-doc-1.20 )
+	>=sys-devel/gettext-0.18
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	xdg_environment_reset
+	default
+	# Disable installed-tests; this also indirectly removes build_aux/gen-installed-test.py calls, thus not needing python-any-r1.eclass
+	sed -e 's/install: true/install: false/g' -i json-glib/tests/meson.build || die
+	sed -e '/install_data/d' -i json-glib/tests/meson.build || die
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Dintrospection=$(multilib_native_usex introspection enabled disabled)
+		-Dgtk_doc=$(multilib_native_usex gtk-doc enabled disabled)
+		-Dman=true
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_install() {
+	meson_src_install
+}
+
+multilib_src_test() {
+	meson_src_test
+}