gentoo resync : 27.03.2021

3 files changed, 81 insertions, 2 deletions

diff --git a/dev-libs/gobject-introspection/Manifest b/dev-libs/gobject-introspection/Manifest
index 88967593d428..974c11af33d5 100644
--- a/dev-libs/gobject-introspection/Manifest
+++ b/dev-libs/gobject-introspection/Manifest
@@ -1,7 +1,9 @@
 DIST gobject-introspection-1.62.0.tar.xz 980732 BLAKE2B 96ecc98bea97b7cb24e2c0a0adb8158cfc8915ee8e3b980adf08ec3256d4d0f87bc92d33cce30f5b23c85c4b144d8da755e5313735091b27ff53fea45a80014e SHA512 b460a95fd7a323e9b0c9a45e680ebe98bbae7632abfa53b3e0b0ec050775cab17dde693314d6d4f8e93614c32b5587f8ce0b4a4c9ee9ba46c029ce029014e638
 DIST gobject-introspection-1.64.1.tar.xz 1000280 BLAKE2B c0248831648f6f1849516f30facac9ecade4b4fdb9dce70f93f516364c08f93d0622e06376bd7895dd25c3f1fb5b0af533d6c60f1b2590848cc6781b81a584f4 SHA512 7610871f7ed5778ea9813062ed6465d131af58c00bdea1bb51dde7f98f459f44ae453eb6d0c5bdc6f7dcd92d639816f4e0773ccd5673cd065d22dabc6448647c
 DIST gobject-introspection-1.66.1.tar.xz 1012784 BLAKE2B dd3faa70a482016c9d45b41a62eb1708b775979b92a466c45e70fa9f7679f3931467f5f41a30ecf2260afdd5759218f0afe68b82901587d7cf9267b1fe59d4e8 SHA512 ea1e20cd94ff8af3572f417f35e96648ffc3e94a91d4e4c81adf99bb0f408ac21ecf40990f9dbd5f2e0f4e83360286ca5db88dbc45bd59289596a324acf7df3d
+DIST gobject-introspection-1.68.0.tar.xz 1019732 BLAKE2B 2f99cc9cec5ea05f1a5fa4473d1ad424cc1f6b097075f798e89cf740519db180417a3f0de37afc8a0cf0771436a9d9f7d6193b69289dfb47ec077d33a7d27c91 SHA512 d2e64c119aa500b624a57baa2cebe9126ab100003d98b771f4fb51cf92748635de352997f702f40656f7c665f3dfedfbfa19912cc7a2d039d254555243bbc381
 EBUILD gobject-introspection-1.62.0-r1.ebuild 1859 BLAKE2B 795ef4666619c07a748877530d15eabfdd36b7f879c443302aa8e7a4df838ef4c5b542d05d7501ef327ae9d29122dc386c915b4349f3aa7148251c575a5436a8 SHA512 8907970414f5b476118aa1767723af2a89dbad574b367e3b1ab72ce6b6a7fb53b8514cf82edea6fa6626a529da2f0965cc8492a776f5bec7f9623ee816e62f0b
 EBUILD gobject-introspection-1.64.1-r1.ebuild 1991 BLAKE2B 08b7dba997ae74f49652ed88a627a9ee4a78b87bcae3c51f0965ee7b19955fd7e5f7be57658549ef058d41482b3168733b9ba38282d33397667406b323d8a65b SHA512 7d840f3d50e3bc413b0802d8d0fe2914b885b5bfb3f85f92e1cbff73a56d6d72c1ccfa511cd8f8c3e3d610e80b1ff931876a8b2444081cb867a6ee18ff4d908c
-EBUILD gobject-introspection-1.66.1.ebuild 2001 BLAKE2B 7cf0365b14a1aa8a7d0be775f52c98a246bfd16364679d4a3dc2158e1f040b2211416e124afcd2a674ffa3d064dbc78b93bccf37ede6899be7bb8f7aeae81d2a SHA512 436d5e09e79a9ac721623b99730fb7e3e94b6c2c9b68e8e433bc6d8ed9021cd90a3f2574bf211f3e9100d3acac684abe73f4b62b00c07fc8d49364092a257a7f
+EBUILD gobject-introspection-1.66.1.ebuild 1999 BLAKE2B 2725fbfeecf0e0409c534e849b320d5513967273f8c043a05878361634e4cc9966f1fa4e9451929fbcbc5da80c51f4473e76f070539408232586744b99808c94 SHA512 eb8d4dd24fc807a9cf2ece4b6b262b9a5f8145f44d026ec8747989bca59f50363bb67104c6d042e2ea1defdd435e0a6178592f7baeb8bb7ba561cc090e5b8502
+EBUILD gobject-introspection-1.68.0.ebuild 2002 BLAKE2B 7b07d4469f899141ab22f76b3ac2edc479bed6c0634b4da5b1486c54a51bc5d5caea1b85cfe5611155dae13e9ed42c673782accff1f14becbf967c38293df532 SHA512 05d809a40a9cac45ce04e0b9079fafa562ba38d1c6cae12ba144b7ddb0bab18e5f8c2d7954e541e6fda50b254b6330cfa33c409c55b6edbee4aad71bc8422c3e
 MISC metadata.xml 367 BLAKE2B b69aefd2ddda2f8e216d449de9ca13a5a8c473353b291bc5093ec2f6f3ac3346dc9fa25c85a64f15950813d9d6dfafd356a234c748436edb7639f37e95c71151 SHA512 1430924bf7430f4a409d6c3335a52b59567d5972440068e53e637d6c71486ef3e606ed9043184dfc168d731909e11c769042d2846e137312cd0ee0ce6f52e431
diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.66.1.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.66.1.ebuild
index ce38bcb6a0ee..9a97f44f7394 100644
--- a/dev-libs/gobject-introspection/gobject-introspection-1.66.1.ebuild
+++ b/dev-libs/gobject-introspection/gobject-introspection-1.66.1.ebuild
@@ -15,7 +15,7 @@ SLOT="0"
 IUSE="doctool gtk-doc test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # virtual/pkgconfig needed at runtime, bug #505408
 RDEPEND="
diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.68.0.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.68.0.ebuild
new file mode 100644
index 000000000000..23eb08dfbd85
--- /dev/null
+++ b/dev-libs/gobject-introspection/gobject-introspection-1.68.0.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_REQ_USE="xml"
+inherit gnome.org meson python-single-r1 toolchain-funcs xdg
+
+DESCRIPTION="Introspection system for GObject-based libraries"
+HOMEPAGE="https://wiki.gnome.org/Projects/GObjectIntrospection"
+
+LICENSE="LGPL-2+ GPL-2+"
+SLOT="0"
+IUSE="doctool gtk-doc test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+# virtual/pkgconfig needed at runtime, bug #505408
+RDEPEND="
+	>=dev-libs/gobject-introspection-common-${PV}
+	>=dev-libs/glib-2.58.0:2
+	dev-libs/libffi:=
+	doctool? (
+		$(python_gen_cond_dep '
+			dev-python/mako[${PYTHON_MULTI_USEDEP}]
+			dev-python/markdown[${PYTHON_MULTI_USEDEP}]
+		')
+	)
+	virtual/pkgconfig
+	${PYTHON_DEPS}
+"
+# Wants real bison, not virtual/yacc
+DEPEND="${RDEPEND}
+	gtk-doc? ( >=dev-util/gtk-doc-1.19
+		app-text/docbook-xml-dtd:4.3
+		app-text/docbook-xml-dtd:4.5
+	)
+	sys-devel/bison
+	sys-devel/flex
+	test? (
+		x11-libs/cairo[glib]
+		$(python_gen_cond_dep '
+			dev-python/mako[${PYTHON_MULTI_USEDEP}]
+			dev-python/markdown[${PYTHON_MULTI_USEDEP}]
+		')
+	)
+"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature test cairo)
+		$(meson_feature doctool)
+		#-Dglib_src_dir
+		$(meson_use gtk-doc gtk_doc)
+		#-Dcairo_libname
+		-Dpython="${EPYTHON}"
+		#-Dgir_dir_prefix
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	python_fix_shebang "${ED}"/usr/bin/
+	python_optimize "${ED}"/usr/$(get_libdir)/gobject-introspection/giscanner
+
+	# Prevent collision with gobject-introspection-common
+	rm -v "${ED}"/usr/share/aclocal/introspection.m4 \
+		"${ED}"/usr/share/gobject-introspection-1.0/Makefile.introspection || die
+	rmdir "${ED}"/usr/share/aclocal || die
+}