Merge branch 'edge' into next

4 files changed, 0 insertions, 182 deletions

diff --git a/dev-libs/gom/Manifest b/dev-libs/gom/Manifest
index 236ff3c3c46e..b9ef744afe8f 100644
--- a/dev-libs/gom/Manifest
+++ b/dev-libs/gom/Manifest
@@ -1,8 +1,3 @@
-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 1480 BLAKE2B 768f4d3721e370dc7064afdc391dfbb4ecfc9ba29b56e8ea505e210b09c29d2c106e26383dce6538aad59ab800848f65cddba3b5f9a980420642ee8cda228809 SHA512 071b7fca68016667362bcc075db1e82ba6899854772678d338eedbde654fcaf00fb67ef6ea3b72f399cca98d4a029e64181ee146300999fa2a07a23e209029e4
 EBUILD gom-0.4.ebuild 1439 BLAKE2B da279d4ecd0e936b244923018b4b3741ee08f98727f18e7f94ddb59480dced05e20829f5a9eac39bbf046c8b21b9880c4f13de0ff899c0d8e323b715b520e1da SHA512 00f17b4a97fd126597a54cb7162e6e0dec2d89714c2318e806eb592e031019b6adc5d2b51591efe3eb87c0e1ea9458fe94242d8995d326a7b4a0addddb4bbaf5
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/gom/files/0.3.2-fix-pkgconfig.patch b/dev-libs/gom/files/0.3.2-fix-pkgconfig.patch
deleted file mode 100644
index 447c91421cc9..000000000000
--- a/dev-libs/gom/files/0.3.2-fix-pkgconfig.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 07c35149964c7258e52effa374d877a8f2f102e8 Mon Sep 17 00:00:00 2001
-From: Alexander Tsoy <alexander@tsoy.me>
-Date: Fri, 29 Jul 2016 03:18:03 +0300
-Subject: [PATCH] build: Replace hardcoded values in pkg-config file
-
-https://bugzilla.gnome.org/show_bug.cgi?id=769291
----
- data/gom-1.0.pc.in | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/data/gom-1.0.pc.in b/data/gom-1.0.pc.in
-index ce19de6..6edc841 100644
---- a/data/gom-1.0.pc.in
-+++ b/data/gom-1.0.pc.in
-@@ -1,11 +1,11 @@
- prefix=@prefix@
--exec_prefix=${prefix}
--libdir=${exec_prefix}/lib
--includedir=${exec_prefix}/include
-+exec_prefix=@exec_prefix@
-+libdir=@libdir@
-+includedir=@includedir@
- 
- Name: Gom
- Description: GObject Data Mapper
- Version: @VERSION@
--Libs: -L${libdir} -lgom-1.0
--Cflags: -I${includedir}/gom-1.0
-+Libs: -L${libdir} -lgom-@GOM_API_VERSION@
-+Cflags: -I${includedir}/gom-@GOM_API_VERSION@
- Requires: gobject-2.0
--- 
-2.17.0
-
diff --git a/dev-libs/gom/gom-0.3.2-r1.ebuild b/dev-libs/gom/gom-0.3.2-r1.ebuild
deleted file mode 100644
index 78a1aa3ffe4e..000000000000
--- a/dev-libs/gom/gom-0.3.2-r1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCONF_DEBUG="yes"
-PYTHON_COMPAT=( python3_6 )
-
-inherit epatch gnome2 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="+introspection python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} introspection )"
-
-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}
-	>=dev-util/gtk-doc-am-1.14
-	>=dev-util/intltool-0.40.0
-	sys-devel/gettext
-	virtual/pkgconfig
-	x11-libs/gdk-pixbuf:2
-"
-# TODO: make gdk-pixbuf properly optional with USE=test
-
-pkg_setup() {
-	use python && python_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PV}-fix-pkgconfig.patch
-	gnome2_src_prepare
-
-	use python && python_copy_sources
-}
-
-src_configure() {
-	# glibtest is a relic from AM_PATH_GLIB macro
-	local myconf=(
-		--disable-static
-		--disable-glibtest
-	)
-
-	gnome2_src_configure \
-		${myconf[@]} \
-		--disable-python \
-		$(use_enable introspection)
-
-	if use python ; then
-		python_foreach_impl run_in_build_dir \
-		gnome2_src_configure \
-			${myconf[@]} \
-			--enable-python
-	fi
-}
-
-src_install() {
-	gnome2_src_install
-
-	if use python ; then
-		docinto examples
-		dodoc examples/*.py
-
-		python_foreach_impl run_in_build_dir \
-		emake DESTDIR="${D}" install-overridesPYTHON
-	fi
-}
diff --git a/dev-libs/gom/gom-0.3.3.ebuild b/dev-libs/gom/gom-0.3.3.ebuild
deleted file mode 100644
index 5d6e936cc3a9..000000000000
--- a/dev-libs/gom/gom-0.3.3.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# 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} )
-
-inherit gnome.org gnome2-utils 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 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}
-	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
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use introspection enable-introspection)
-		$(meson_use gtk-doc enable-gtk-doc)
-	)
-
-	python_foreach_impl meson_src_configure
-}
-
-src_compile() {
-	python_foreach_impl meson_src_compile
-}
-
-src_install() {
-	docinto examples
-	dodoc examples/*.py
-
-	installing() {
-		meson_src_install
-		python_optimize
-	}
-	python_foreach_impl installing
-}
-
-src_test() {
-	# tests may take a long time
-	python_foreach_impl meson_src_test
-}