gentoo (leap year) resync : 29.02.2020

3 files changed, 71 insertions, 7 deletions

diff --git a/dev-libs/gom/Manifest b/dev-libs/gom/Manifest
index dd9b4fd47b69..a1cd1642cc9a 100644
--- a/dev-libs/gom/Manifest
+++ b/dev-libs/gom/Manifest
@@ -1,6 +1,8 @@
 AUX 0.3.2-fix-pkgconfig.patch 935 BLAKE2B cc769ecd649c5ee39a5f934268cd55b031bc64512f0abce40e440e9a7fed30b497e1d8d14e267647a0022736befa1880b56b8e1c37a879892bd47381eb9e312f SHA512 5a98cffcff486f485ce9b73ddcee65566689d45df18f86a0a5697df1b2fb4ed3fa1bfe9a915bb8f22c2f3afc4f24da97b739bc1a61310b34fded75bd7a415eb8
 DIST gom-0.3.2.tar.xz 410300 BLAKE2B c0c79c1c3f8a28a0ee992fa4c316538eb87ec26c77def353e8b2038e32f30f9daed433c6d6f6c81069e05e46a980f7d944c955182d973d42f3bd84a341c5a34d SHA512 a7bfb263e5ff6f89768d8fcbdcc949d4ec9b82ecbb80952becd357a3d5781a60e52a327e865e39e46d542b2a2c5e5c861e5302d7ae3c3a2258d3c3f698263675
 DIST gom-0.3.3.tar.xz 101580 BLAKE2B 08e0abb9eaf23ba3bbbca54289ebaa695af705e65b9b612f125e72c62f337baec899d16e657d3de51baeb4ffb79b583716a01d74067e256d59e1dcb63723273e SHA512 152924e704c92f39c493a8becc73fac1f7fe396f4f9e7c154dccec2b4413476821e43abf3c108cc1304de471e61f56c265f124710379ad8568b68f8902064e03
+DIST gom-0.4.tar.xz 102744 BLAKE2B 8116ac388a56e85effbb37c3d5ea5036f6de2f4ad7ee8fe119bd058e1ac3e293eab612a739cdba7467202bc9e258f7cd65b1f116e146577d3a103fc03afba37f SHA512 d847928ce09c53a3f64777c313cb843052e5e001873f29d3f7acf02772cadf0e4b133fb0137aa0463b4ff95dd54810bde87062d8e396ff4fc6d142ba59c8e9c8
 EBUILD gom-0.3.2-r1.ebuild 1591 BLAKE2B 2c29de492c91663ebc682ecb8baa7d59f0aa62baf913a31d972c4a7450275ff9c2689465eec7bfe21ce91fa2b1c7b273b1832f7799d305d826109f16017316b7 SHA512 c6ea43c72be19c8162a37891b56a2f1563ae2aea5dc076125d5286b577c2a633b54a50863ec5f532190d2772afed82f15db4b0537bdbef075ed18c4bb0a959e1
-EBUILD gom-0.3.3.ebuild 1316 BLAKE2B 3c920c55bb033c57023b8add61c2bc8307815ba902c050ca80cdf75e9f459f7791316898849a1c6c8b8de1ac86d9d2c250857a86c38de8fbb60c27336db5c37b SHA512 e2940c7661a35bed4b54682669ab8126a7d31eb27c14208ee729ed84385cb5318acac1355914352a0b435e54682483e7d4ee65f41bacee54c1c1bf8df397393d
+EBUILD gom-0.3.3.ebuild 1480 BLAKE2B 768f4d3721e370dc7064afdc391dfbb4ecfc9ba29b56e8ea505e210b09c29d2c106e26383dce6538aad59ab800848f65cddba3b5f9a980420642ee8cda228809 SHA512 071b7fca68016667362bcc075db1e82ba6899854772678d338eedbde654fcaf00fb67ef6ea3b72f399cca98d4a029e64181ee146300999fa2a07a23e209029e4
+EBUILD gom-0.4.ebuild 1441 BLAKE2B 6c7e140fa0f1c5bb417ae4b094907e983d12b35138d3277e8d6615b6f6d1267a082dba2f4b273dc59bbc7c02d2d3d11a0f74ff8e3c59176f8ad153f81f2a86c6 SHA512 1433b25d11d1627c08ca0f0b2f5f9874dad1e6ecdd3813ef2902a46614a07dad4614a508a6fa960aa65ba728ad18a771aea0b60bbcbb0ccde75044ca8282eea9
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/gom/gom-0.3.3.ebuild b/dev-libs/gom/gom-0.3.3.ebuild
index 146fe47ed507..5d6e936cc3a9 100644
--- a/dev-libs/gom/gom-0.3.3.ebuild
+++ b/dev-libs/gom/gom-0.3.3.ebuild
@@ -13,24 +13,24 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Gom"
 LICENSE="LGPL-2+"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc +introspection test"
+IUSE="gtk-doc +introspection test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
+# <glib-2.63.3 to avoid getting hit worse by https://gitlab.gnome.org/GNOME/gom/issues/24 - fixed in gom-0.4
 RDEPEND="
 	>=dev-db/sqlite-3.7:3
 	>=dev-libs/glib-2.36:2
+	<dev-libs/glib-2.63.3:2
 	introspection? ( >=dev-libs/gobject-introspection-1.30.0:= )
 	${PYTHON_DEPS}
 	>=dev-python/pygobject-3.16:3[${PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}
-	doc? ( dev-util/gtk-doc )
-	>=dev-util/intltool-0.40.0
-	sys-devel/gettext
+	gtk-doc? ( dev-util/gtk-doc )
 	virtual/pkgconfig
 	x11-libs/gdk-pixbuf:2
-"
+" # only tests need gdk-pixbuf, but they are unconditionally built
 
 pkg_setup() {
 	python_setup
@@ -39,7 +39,7 @@ pkg_setup() {
 src_configure() {
 	local emesonargs=(
 		$(meson_use introspection enable-introspection)
-		$(meson_use doc enable-gtk-doc)
+		$(meson_use gtk-doc enable-gtk-doc)
 	)
 
 	python_foreach_impl meson_src_configure
diff --git a/dev-libs/gom/gom-0.4.ebuild b/dev-libs/gom/gom-0.4.ebuild
new file mode 100644
index 000000000000..39a0e11e94df
--- /dev/null
+++ b/dev-libs/gom/gom-0.4.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+GCONF_DEBUG="yes"
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit gnome.org meson python-r1
+
+DESCRIPTION="GObject to SQLite object mapper library"
+HOMEPAGE="https://wiki.gnome.org/Projects/Gom"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="gtk-doc +introspection python test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="python? ( introspection ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	>=dev-db/sqlite-3.7:3
+	>=dev-libs/glib-2.36:2
+	introspection? ( >=dev-libs/gobject-introspection-1.30.0:= )
+	python? ( ${PYTHON_DEPS}
+		>=dev-python/pygobject-3.16:3[${PYTHON_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	gtk-doc? ( dev-util/gtk-doc
+		app-text/docbook-xml-dtd:4.3 )
+	virtual/pkgconfig
+	test? ( x11-libs/gdk-pixbuf:2 )
+"
+
+src_prepare() {
+	default
+	sed -i -e '/subdir.*python/d' bindings/meson.build || die
+	# drop test building and deps if not enabled
+	if ! use test; then
+		sed -i -e '/gdkpixbuf_dep/d' meson.build || die
+		sed -i -e '/subdir(.*tests.*)/d' meson.build || die
+	fi
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use introspection enable-introspection)
+		$(meson_use gtk-doc enable-gtk-doc)
+	)
+
+	meson_src_configure
+}
+
+src_install() {
+	docinto examples
+	dodoc examples/*.py
+
+	meson_src_install
+
+	if use python; then
+		python_foreach_impl python_domodule bindings/python/gi
+	fi
+}