gentoo auto-resync : 28:09:2022 - 03:11:19

6 files changed, 79 insertions, 2 deletions

diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index 59c3a056958f..a4c269a2b0f9 100644
--- a/sci-geosciences/Manifest.gz
+++ b/sci-geosciences/Manifest.gz
diff --git a/sci-geosciences/geocode-glib/Manifest b/sci-geosciences/geocode-glib/Manifest
index d2fea9768409..55df7db2f8eb 100644
--- a/sci-geosciences/geocode-glib/Manifest
+++ b/sci-geosciences/geocode-glib/Manifest
@@ -1,6 +1,8 @@
 AUX 3.26.3-tests-Fix-locale-in-pi-test.patch 1287 BLAKE2B 5b177f4bc116823ceec58971836d33c733f338f21db3d6109213b929c03e8ddf22a8b0c34edc40c8cf5fa50745a7c7907d1ce408647975d29b6fdad721d29420 SHA512 b8c21c64e743e8ef8dfa662c9d46f4cbe7ee075e17ecbe2f9d5589e6b33ea3f9681b68be03fc9589fb9f22d219ee6241f3a0ca6b40ab0538f5d2a05a82ae2724
+AUX 3.26.4-r200-do-not-install-icons.patch 1060 BLAKE2B 358511d8f441562f81540545655865d415d1e5146a121c82518176f375e48c91ad6f9df7e5656fb2d4ca862ed94d84b8916fdfc39e3a24fdff2c9d5c59cad831 SHA512 c3de683f01136de3cd6fa25fa46c16eb42a574230dace8f16ab22ff92bbf2444d9a8884f3375cae4cb497d831d0edea04a49ebb161202de72b71a23b26c5a183
 DIST geocode-glib-3.26.3.tar.xz 75148 BLAKE2B 8eba0cb40511a724cddcab659fe0720b0c0534d811c83f8a90d21b9153af242de2a69b2c882b3eb3008ac128d1631a2ac7692c5e000284579aade987334f6cce SHA512 42313b1da24f5256ad73bd4be366d6bacf35256acc098e4865bbff58e92c5b78f4a2537e4787c6387190f10a2be2a72bc1507f7cb436e096e772195cf30fca7c
 DIST geocode-glib-3.26.4.tar.xz 75352 BLAKE2B be783328b2372e1647c3fd6debadaf8313688fe1c993cbc1e084cd9ad8ba8fec0b142a0f579f63085684ef8fafc6e7ec6f54441a085d25d9d5f2eed31a893d1b SHA512 998c2f02a8d3d34a8b6a4b031da2e7c28df27014bcf58f3374fbc0c829fff6257c2622fd9bf331e05b85fbc761c64554fb77ce2d986e0f8b59b17aa486f9f609
 EBUILD geocode-glib-3.26.3.ebuild 1042 BLAKE2B cd26ac83eeabc1f0e4f189b1fb74228964d090af06773895cf0f76c187c7c8141b10aee056584ff2cc471e420e8dc7bad5de2dfa9701ce4d8d42953b3b0a0214 SHA512 832c7436642181280b45b2933b9d1f6aa00c442c20e6d59efd26cee0ce3bd0e9cd721a5fc7decb73032534bee88e28dd8b0b31d1614f79ccfa568f6603c3c219
+EBUILD geocode-glib-3.26.4-r200.ebuild 1219 BLAKE2B 188448c36bb6b8b761d66ad4c274be23458be054b8c5b4c6b71248ed25ec2ea18da92634f3a5ceb1b5494cf9260965655890f9329af9e0e3fb49b869f66353f7 SHA512 1b5b18104e6ea2c3795f56ea464862a52592312d13cf89d6c68bfca480f8ee610ca6c752c871e35e53357115e09f9b2b1bc43f7946ff84b9b54b820dc133dba5
 EBUILD geocode-glib-3.26.4.ebuild 974 BLAKE2B aa9554ca93f0607df9b2c3d3d5fe80f3c87751fbe73594403393343662deb01dce700565e8796006aa3a607e727f9fd77845ea46dd77a690a9c27f5f2c16a637 SHA512 71e5bc980648f16c27f5cfc9a9963e404421d13b7e3a8c0d40da5414e23306c7c06956a41031223ceabaf2b7ba8a5582b1ae081d4361924b75a958e988a299ce
 MISC metadata.xml 417 BLAKE2B 887efe27b7afb861a1da9dd6f3a8bdcbf515e0db4993e6fc897e376b4b4efb7607ede8057ab3a9a1d2ea7c375e27fe6a465f781b0de0d628158cd01d414b9089 SHA512 83a96a8542a501f30f0b1c072f74731b36602b9146003c15e9596318db776b048a46dc0a85a9864280e26e848a08259da51043aee008447f230fc740a56d9968
diff --git a/sci-geosciences/geocode-glib/files/3.26.4-r200-do-not-install-icons.patch b/sci-geosciences/geocode-glib/files/3.26.4-r200-do-not-install-icons.patch
new file mode 100644
index 000000000000..c85e250e5c2f
--- /dev/null
+++ b/sci-geosciences/geocode-glib/files/3.26.4-r200-do-not-install-icons.patch
@@ -0,0 +1,27 @@
+geocode-glib-3.26.4 in SLOT="2" has file collissions with geocode-glib-3.26.4 with SLOT="0".
+These file collissions are only 11 svg-files. We do not install them with SLOT="2" and instead only install them with SLOT="0" and
+SLOT="2" depends on SLOT="0" to make sure users that try to only install SLOT="2" get the files regardless.
+
+2022-09-24 - Pascal Jaeger (Schievel) <pascal.jaeger@leimstift.de>
+
+---
+
+diff --git a/icons/meson.build b/icons/meson.build
+index 8d58886..edecbed 100644
+--- a/icons/meson.build
++++ b/icons/meson.build
+@@ -10,14 +10,3 @@ public_icons = [ 'poi-airport.svg',
+                  'poi-restaurant.svg',
+                  'poi-bar.svg',
+                  'poi-light-rail-station.svg' ]
+-
+-foreach icon : public_icons
+-    file = join_paths('maki' , icon)
+-    install_dir = join_paths(get_option('datadir'),
+-                             'icons',
+-                             'hicolor',
+-                             'scalable',
+-                             'places')
+-
+-    install_data(file, install_dir: install_dir)
+-endforeach
diff --git a/sci-geosciences/geocode-glib/geocode-glib-3.26.4-r200.ebuild b/sci-geosciences/geocode-glib/geocode-glib-3.26.4-r200.ebuild
new file mode 100644
index 000000000000..2912deb19a51
--- /dev/null
+++ b/sci-geosciences/geocode-glib/geocode-glib-3.26.4-r200.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit gnome.org meson xdg
+
+DESCRIPTION="GLib helper library for geocoding services"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/geocode-glib"
+
+LICENSE="LGPL-2+"
+SLOT="2"
+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
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/glib-utils
+	gtk-doc? (
+		>=dev-util/gtk-doc-1.13
+		app-text/docbook-xml-dtd:4.3
+	)
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-r200-do-not-install-icons.patch
+)
+
+src_configure() {
+	local emesonargs=(
+		-Denable-installed-tests=false
+		$(meson_use introspection enable-introspection)
+		$(meson_use gtk-doc enable-gtk-doc)
+		-Dsoup2=false
+	)
+	meson_src_configure
+}
diff --git a/sci-geosciences/gnome-maps/Manifest b/sci-geosciences/gnome-maps/Manifest
index 8492c72f0d77..2295165583bb 100644
--- a/sci-geosciences/gnome-maps/Manifest
+++ b/sci-geosciences/gnome-maps/Manifest
@@ -1,3 +1,3 @@
 DIST gnome-maps-42.3.tar.xz 2317328 BLAKE2B 365eb5cb8f7b20e2069338249418f5fad1abd47a1ab7ecda2d671dc97dfa45fb9f5687ae01fd605613c7ecf6eb9048aef6ab121cac0f455a42df9156581c87e2 SHA512 e52509603914de8f345a874f931beb68d11f718827b956a48464fe804c42559d977eacb0bbd5d4346b6329ab3f9169ac9afa8ef681f040c5b6a82b440b9786cb
-EBUILD gnome-maps-42.3-r1.ebuild 1509 BLAKE2B 7e6a1b9841f7cbe267f500d756bcf6899b29b00832ab1cb9c6cf3fd2c6770b244e880cfb554f0968184b3abdbb59d9e9b4114499a071fad2c81fdfda7d8d4b5e SHA512 936257f63b0c6643767b87f1954c7236310e6e0b4cc033a80a17ffe56ec39062e3f7a1037303c701d4ad5cdfd3cb5015dcdd66fe6c2e0d2488c5827bdb657c1f
+EBUILD gnome-maps-42.3-r2.ebuild 1511 BLAKE2B 2d2cc74c697c48045a5f6b4895dd1d6d5d15d185742dab8c4db9b0a798c2376b1f64083d888a5b27e178dfbc8f1a2472788043e35bbb9850a2541a0e77e1fdeb SHA512 d8e817b67fe47eb56ccceb7856b012e0b5ec9fe03dd306c15bfda6c01dd6ccd75aaa7ed3b180df77c4aa6c807451f3132800af485b1d1d06bef4547113bda9a3
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/sci-geosciences/gnome-maps/gnome-maps-42.3-r1.ebuild b/sci-geosciences/gnome-maps/gnome-maps-42.3-r2.ebuild
index d420eae7634f..0f047db35354 100644
--- a/sci-geosciences/gnome-maps/gnome-maps-42.3-r1.ebuild
+++ b/sci-geosciences/gnome-maps/gnome-maps-42.3-r2.ebuild
@@ -23,7 +23,7 @@ RDEPEND="
 	>=gui-libs/libhandy-1.5.0:1=
 	>=dev-libs/libgee-0.16:0.8[introspection]
 	>=dev-libs/folks-0.10:=
-	>=sci-geosciences/geocode-glib-3.15.2[introspection]
+	>=sci-geosciences/geocode-glib-3.15.2:0[introspection]
 	>=media-libs/libchamplain-0.12.14:0.12[gtk,introspection]
 	dev-libs/libxml2:2
 	>=net-libs/rest-0.7.90:0.7[introspection]