From cc4618c9ba3d974948ebf340b542d8cb01db2f55 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Thu, 16 Sep 2021 22:05:01 +0100
Subject: gentoo resync : 16.09.2021

---
 dev-libs/json-glib/Manifest                  |  4 +-
 dev-libs/json-glib/json-glib-1.6.6-r1.ebuild | 58 ++++++++++++++++++++++++++++
 dev-libs/json-glib/json-glib-1.6.6.ebuild    | 46 ----------------------
 dev-libs/json-glib/metadata.xml              |  2 +-
 4 files changed, 61 insertions(+), 49 deletions(-)
 create mode 100644 dev-libs/json-glib/json-glib-1.6.6-r1.ebuild
 delete mode 100644 dev-libs/json-glib/json-glib-1.6.6.ebuild

(limited to 'dev-libs/json-glib')

diff --git a/dev-libs/json-glib/Manifest b/dev-libs/json-glib/Manifest
index cd568cbde7aa..a5b177ac3038 100644
--- a/dev-libs/json-glib/Manifest
+++ b/dev-libs/json-glib/Manifest
@@ -1,5 +1,5 @@
 DIST json-glib-1.6.2.tar.xz 170260 BLAKE2B 8039661c92c0f8d79189fcc2d01fea0615ce13190526960178f727255c8ca5e1cd2f06079782b3513aa6686fe402d45b10ead798af196523552be73912cb54e9 SHA512 8412390a639d368ed11181621739f43bc4900143ac062c3824c7140abec58ca2b09773a415034f03896a4ff63aa3414b492997da532848709238a83c3a068b11
 DIST json-glib-1.6.6.tar.xz 1306232 BLAKE2B 93814dad74ef61ef265e348e9e145ceb63c950f1e9ecda23fbaad24e291a1cbfc690e287ccc8959fd7c056634f80815ef54fa2c75b09ebd3e158f3fa4df1c8e7 SHA512 b9a737e4ba3ecdfb9cb8f5fb751cc74e5b1553664d3088c44a1f9e5396d4037958af214dcd290ddf5af98088f46167e10e371e134e1de5cbb7aec84c5c0fd017
 EBUILD json-glib-1.6.2.ebuild 1375 BLAKE2B 3c0dd469acf28bfda3bd4e5f5bb4586608f7d0f59af216b7f495ecd08a14b511706cb976c61baa90905a2b3608161beda873900d6d5287fc2a1dd3009f1b03f2 SHA512 8a1e9737690d3bd911f75827a0d40669482dc2ef7ac3144ef07c417db9b74fe6d189342e4e10bec9828b8fe07749d24cbff9a0312ca9ea0ae20fc481248dba69
-EBUILD json-glib-1.6.6.ebuild 1382 BLAKE2B 2c563851a557e2471324346e5cdfd2797ffa1ec3349791cf4ecb1249a989ee94e8a3b98c13958cdfa177795c3011e09ba953f94c58824be0aa4532cdc12f9035 SHA512 3567262c840f8c85b8f3bc8c0dc65c87cc1e343aa55eddd8fb12c56c06922306b44b9eb652753fb9852864c5a322cf9d19dead6d18dc6b3c813b2404ab56b4d6
-MISC metadata.xml 1168 BLAKE2B f92f6fe2026abedfcd6f51797df84573b33817b10203e0325aa9790cc9c58ea6c9d69724b122dfe3c9b7b2a34cbf15e5e245c8aa93a1f8802757ac1c2ce61a7d SHA512 9af9dffd8e1d56c9dad5a0c53bdf16f5d54261c8c121cbc9644865340b84101a0bfcafc393bfe0d6b31024b16f1bbe9f9305286bc56a2df20a08984f55cb91e1
+EBUILD json-glib-1.6.6-r1.ebuild 1734 BLAKE2B 52dec60f03ee76977bb6ad2f06b2bb3b7315c804dbb2d0672f4dd8bed84417a03741927840f99c494193a1fdd8f64447c84657da5d7c22021fca8579405397e2 SHA512 e6dda626615a6d84c21435ec5bac0261e8a9bc6b88c834bc0d9ae7ef2a63b146466e1c4420c260cddab8666c51377f6c0e5439438b2cd84ac585316e763a5fbf
+MISC metadata.xml 1169 BLAKE2B 940ddda4a78b735deba5a4ab0ae6e840e0f09ee3ffb5254ceca11e3b15e42e3b22bcd8e0b40dbed10179a51d93501a4407dd53e5d9d8d5b22549f8f415e8c9b1 SHA512 df2e5e05eaecbd42d7ebba8330f3fb44096cfa8eee4e9ee9e99509a749f841612e38ed102737b7f8b6b8a1b991aadb67226c2c3b6494964662c94696501e519f
diff --git a/dev-libs/json-glib/json-glib-1.6.6-r1.ebuild b/dev-libs/json-glib/json-glib-1.6.6-r1.ebuild
new file mode 100644
index 000000000000..173cbd9e95a2
--- /dev/null
+++ b/dev-libs/json-glib/json-glib-1.6.6-r1.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 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 ~riscv ~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/gi-docgen-2021.6 )
+	>=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=(
+		# Never use gi-docgen subproject
+		--wrap-mode nofallback
+
+		$(meson_native_use_feature introspection)
+		$(meson_native_use_feature gtk-doc gtk_doc)
+		$(meson_native_true man)
+	)
+	meson_src_configure
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	if use gtk-doc ; then
+		# Move to location that <devhelp-41 will see, reconsider once devhelp-41 is stable
+		mkdir -p "${ED}"/usr/share/gtk-doc/html || die
+		mv "${ED}"/usr/share/doc/json-glib-1.0 "${ED}"/usr/share/gtk-doc/html/ || die
+	fi
+}
diff --git a/dev-libs/json-glib/json-glib-1.6.6.ebuild b/dev-libs/json-glib/json-glib-1.6.6.ebuild
deleted file mode 100644
index 562120a52c5e..000000000000
--- a/dev-libs/json-glib/json-glib-1.6.6.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome.org meson-multilib 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 ~riscv ~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=(
-		$(meson_native_use_feature introspection)
-		$(meson_native_use_feature gtk-doc gtk_doc)
-		$(meson_native_true man)
-	)
-	meson_src_configure
-}
diff --git a/dev-libs/json-glib/metadata.xml b/dev-libs/json-glib/metadata.xml
index 0aa1782a946f..b22a0e7839e3 100644
--- a/dev-libs/json-glib/metadata.xml
+++ b/dev-libs/json-glib/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<email>voyageur@gentoo.org</email>
-- 
cgit v1.2.3