[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/geocode-glib/, profiles/

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/geocode-glib/, profiles/

[Matt Turner]

commit:     6deac11431c97edede1ef99485a5962ea3e0fb92
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 16 17:45:34 2022 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Wed Nov 16 17:50:06 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6deac114

sci-geosciences/geocode-glib: Provide .svg files in SLOT="2"

Basically everything that depends on geocode-glib is ready for
libsoup:3.0/geocode-glib:2, so this will allow depcleaning
geocode-glib:0.

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 profiles/package.mask                                         |  1 +
 ...-glib-3.26.4-r200.ebuild => geocode-glib-3.26.4-r1.ebuild} | 11 ++++++-----
 ...lib-3.26.4-r200.ebuild => geocode-glib-3.26.4-r201.ebuild} |  9 ++-------
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/profiles/package.mask b/profiles/package.mask
index 8d38e08f537b..fd0ef3645a60 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -578,6 +578,7 @@ net-libs/webkit-gtk:5
 >=net-misc/rygel-0.42
 >=net-misc/spice-gtk-0.41-r1
 sci-geosciences/geocode-glib:2
+>=sci-geosciences/geocode-glib-3.26.4-r1:0
 >=sci-geosciences/gnome-maps-43
 >=sys-apps/osinfo-db-tools-1.10.0-r1
 >=sys-libs/libosinfo-1.10.0-r1

diff --git a/sci-geosciences/geocode-glib/geocode-glib-3.26.4-r200.ebuild b/sci-geosciences/geocode-glib/geocode-glib-3.26.4-r1.ebuild
similarity index 85%
copy from sci-geosciences/geocode-glib/geocode-glib-3.26.4-r200.ebuild
copy to sci-geosciences/geocode-glib/geocode-glib-3.26.4-r1.ebuild
index 2912deb19a51..6763e2b351b8 100644
--- a/sci-geosciences/geocode-glib/geocode-glib-3.26.4-r200.ebuild
+++ b/sci-geosciences/geocode-glib/geocode-glib-3.26.4-r1.ebuild
@@ -8,19 +8,20 @@ DESCRIPTION="GLib helper library for geocoding services"
 HOMEPAGE="https://gitlab.gnome.org/GNOME/geocode-glib"
 
 LICENSE="LGPL-2+"
-SLOT="2"
+SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="gtk-doc +introspection test"
 RESTRICT="!test? ( test )"
 
-# Needs to depend on geocode-glib-3.26.4:0 because only slot 0 has some svg
+# Needs to depend on geocode-glib-3.26.4:2 because only slot 2 has some svg
 # files that we patch out here to avoid file collisions.
 RDEPEND="
 	>=dev-libs/glib-2.44:2
 	>=dev-libs/json-glib-0.99.2[introspection?]
-	>=net-libs/libsoup-3.0.8:3.0[introspection?]
+	>=net-libs/libsoup-2.42:2.4[introspection?]
 	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-	>=sci-geosciences/geocode-glib-3.26.4:0
+
+	>=sci-geosciences/geocode-glib-3.26.4-r201:2
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
@@ -42,7 +43,7 @@ src_configure() {
 		-Denable-installed-tests=false
 		$(meson_use introspection enable-introspection)
 		$(meson_use gtk-doc enable-gtk-doc)
-		-Dsoup2=false
+		-Dsoup2=true
 	)
 	meson_src_configure
 }

diff --git a/sci-geosciences/geocode-glib/geocode-glib-3.26.4-r200.ebuild b/sci-geosciences/geocode-glib/geocode-glib-3.26.4-r201.ebuild
similarity index 80%
rename from sci-geosciences/geocode-glib/geocode-glib-3.26.4-r200.ebuild
rename to sci-geosciences/geocode-glib/geocode-glib-3.26.4-r201.ebuild
index 2912deb19a51..a0b7b3004da4 100644
--- a/sci-geosciences/geocode-glib/geocode-glib-3.26.4-r200.ebuild
+++ b/sci-geosciences/geocode-glib/geocode-glib-3.26.4-r201.ebuild
@@ -13,14 +13,13 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="gtk-doc +introspection test"
 RESTRICT="!test? ( test )"
 
-# Needs to depend on geocode-glib-3.26.4:0 because only slot 0 has some svg
-# files that we patch out here to avoid file collisions.
 RDEPEND="
 	>=dev-libs/glib-2.44:2
 	>=dev-libs/json-glib-0.99.2[introspection?]
 	>=net-libs/libsoup-3.0.8:3.0[introspection?]
 	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-	>=sci-geosciences/geocode-glib-3.26.4:0
+
+	!<sci-geosciences/geocode-glib-3.26.4:0
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
@@ -33,10 +32,6 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
-PATCHES=(
-	"${FILESDIR}"/${PV}-r200-do-not-install-icons.patch
-)
-
 src_configure() {
 	local emesonargs=(
 		-Denable-installed-tests=false