gentoo resync : 19.03.2019

4 files changed, 70 insertions, 63 deletions

diff --git a/media-libs/libchamplain/Manifest b/media-libs/libchamplain/Manifest
index 27ba13a83367..631ab6d30c91 100644
--- a/media-libs/libchamplain/Manifest
+++ b/media-libs/libchamplain/Manifest
@@ -1,5 +1,5 @@
 DIST libchamplain-0.12.16.tar.xz 623912 BLAKE2B fcdf351e5b264cc31e2ce2954e05abd9f9aaaa9ad622eb015e2267b24a8c281cd9fc79d0e5081f80b8805e0b9329b6c463d04e18d5704d75ab45139d86896e62 SHA512 78db380d87bd6437cab84b546af7f6505a8aaed7e8d9e8a06f3fdab1896b06a3bf1d11201384e4daedd2c78e528221e1d7e40665557e78251efec5fa036f4137
-DIST libchamplain-0.12.18.tar.xz 233108 BLAKE2B b244d0008af922e11f7e812972f1557e05a8ec5921a455db102ad102c64f0062a1d74f1650e6255e49e395d860b51f44f4e9e744e33daf6c9f07bf3e866e402d SHA512 204bed27a92ab0531d0d639a94deb55dbb5318de89d17b9ea44877d66034ae62948b0ec5380a9b756b61655a095817a2ad19a0c2b50342429af7af8750ac5ddf
+DIST libchamplain-0.12.19.tar.xz 233084 BLAKE2B b46ef4b1ceaef3d3b7d52652e825de30a11d7b8f5a68b5a08abcec7111c58443ba76b9aea6b350007ccd91bfc86a4062079c51416fc4e63795318269045ce509 SHA512 3fc03c123859b078f1c4f5062706c95446146a7ed2352306cea3f72f3fbf95099afd2a99f61182e3cb7c47e546de6501ff3ed6ff17614f23dc2e4139ba5e4902
 EBUILD libchamplain-0.12.16.ebuild 1627 BLAKE2B 5b27437597ad463e41c731ad01aca90a9280bdcd8164bc500fc8870cef5770a391c8cd66d4467d2e7f1a784d2a854378be6d0b5976cf585c4c3ecef7366451dc SHA512 121df5c8fa295c833f5ea2b66df4a70944ab4fb0c1e1eb9e44eafc872c97860580546ef839696bf91fd5bc12add81d419130d02d707e2576b9d72b6b8c1947aa
-EBUILD libchamplain-0.12.18.ebuild 1360 BLAKE2B 9464a1ec51b9b0e21b4b8c995c6c901054bfabc7569ef94dab9cc721f508200cc0a170d28cf337c93a4410c8dcb4e4679419f2165b93bf2bdc00eb385f779adf SHA512 32a5e626d395b73d8624d9e89d98078baaf9da3c5a8c40a13b97f547952a1980a14a3c54ccacaaa0e69d7594a6b0eeba1fd86f5d5302d5815752d57121806c62
-MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
+EBUILD libchamplain-0.12.19-r1.ebuild 1656 BLAKE2B ba6110dbf4d34c105e31921eb6e007dadb9d3bd11367824ee0c6baaa30eb5b2e05bcbd453f689177cf66c9eaa3d22cc83114a73a77f4b2496d4382bcac4bb075 SHA512 ad0a999e320cb11e4cd7845365afd1cfef09c20ccfaec421b6e6ec3687cece4b6b26b958108f14d5944c92bf6c8eb57ec608fb2124c208e64214db5a75cf7284
+MISC metadata.xml 621 BLAKE2B ff31085e2b6cee6e64d64161505ae026d3d6896964a0e5aa055b6052b6bc242396db2bc1bb603cfdd3b66300d65e39fa57a8556ac3cea2454ac52048eedea61e SHA512 6d2214f5f62f6deace80db56fee500efed4713be2087b6a9159594a36c503b534b8f50e728ceccfe13f17ce79614ec97baf5b56342680b9283e03096df644a64
diff --git a/media-libs/libchamplain/libchamplain-0.12.18.ebuild b/media-libs/libchamplain/libchamplain-0.12.18.ebuild
deleted file mode 100644
index 5bf54c2495e1..000000000000
--- a/media-libs/libchamplain/libchamplain-0.12.18.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_EAUTORECONF="yes"
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome2 vala
-
-DESCRIPTION="Clutter based world map renderer"
-HOMEPAGE="https://wiki.gnome.org/Projects/libchamplain"
-
-SLOT="0.12"
-LICENSE="LGPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-IUSE="debug +gtk +introspection vala"
-REQUIRED_USE="vala? ( introspection )"
-
-RDEPEND="
-	dev-db/sqlite:3
-	>=dev-libs/glib-2.38:2
-	>=media-libs/clutter-1.24:1.0[introspection?]
-	media-libs/cogl:=
-	>=net-libs/libsoup-2.42:2.4
-	>=x11-libs/cairo-1.4
-	x11-libs/gtk+:3
-	gtk? (
-		x11-libs/gtk+:3[introspection?]
-		media-libs/clutter-gtk:1.0 )
-	introspection? ( dev-libs/gobject-introspection:= )
-"
-DEPEND="${RDEPEND}
-	dev-util/glib-utils
-	dev-util/gtk-doc-am
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
-
-src_prepare() {
-	# Fix documentation slotability
-	sed \
-		-e "s/^DOC_MODULE.*/DOC_MODULE = ${PN}-${SLOT}/" \
-		-i docs/reference/Makefile.am || die "sed (1) failed"
-
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Vala demos are only built, so just disable them
-	gnome2_src_configure \
-		--disable-memphis \
-		--disable-static \
-		--disable-vala-demos \
-		$(use_enable debug) \
-		$(use_enable gtk) \
-		$(use_enable introspection) \
-		$(use_enable vala)
-}
diff --git a/media-libs/libchamplain/libchamplain-0.12.19-r1.ebuild b/media-libs/libchamplain/libchamplain-0.12.19-r1.ebuild
new file mode 100644
index 000000000000..1240a3e7c15c
--- /dev/null
+++ b/media-libs/libchamplain/libchamplain-0.12.19-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome.org meson vala xdg
+
+DESCRIPTION="Clutter based world map renderer"
+HOMEPAGE="https://wiki.gnome.org/Projects/libchamplain"
+
+SLOT="0.12"
+LICENSE="LGPL-2.1+"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="+gtk gtk-doc +introspection vala"
+REQUIRED_USE="
+	vala? ( introspection )
+	gtk-doc? ( gtk )
+" # gtk-doc build gets disabled in meson if gtk widgetry is disabled (no separate libchamplain-gtk gtk-docs anymore)
+
+RDEPEND="
+	>=dev-libs/glib-2.38:2
+	>=x11-libs/gtk+-3.0:3
+	>=media-libs/clutter-1.24:1.0[introspection?]
+	gtk? (
+		x11-libs/gtk+:3[introspection?]
+		media-libs/clutter-gtk:1.0 )
+	>=x11-libs/cairo-1.4
+	dev-db/sqlite:3
+	>=net-libs/libsoup-2.42:2.4
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+	media-libs/cogl:=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/glib-utils
+	>=dev-util/meson-0.49.0
+	virtual/pkgconfig
+	gtk-doc? ( >=dev-util/gtk-doc-1.15 )
+	vala? ( $(vala_depend) )
+"
+
+src_prepare() {
+	xdg_src_prepare
+	use vala && vala_src_prepare
+	# Fix showing inside devhelp (gtkdocdir subdir and name of the module need to match)
+	sed -i -e 's:package_name:package_string:' docs/reference/meson.build || die # https://gitlab.gnome.org/GNOME/libchamplain/merge_requests/7
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dmemphis=false # TODO: What's the state of this vector renderer?
+		$(meson_use introspection)
+		$(meson_use vala vapi)
+		$(meson_use gtk widgetry)
+		$(meson_use gtk-doc gtk_doc)
+		-Ddemos=false # only built, not installed
+	)
+	meson_src_configure
+}
diff --git a/media-libs/libchamplain/metadata.xml b/media-libs/libchamplain/metadata.xml
index 996e7cacd217..c119093f59a9 100644
--- a/media-libs/libchamplain/metadata.xml
+++ b/media-libs/libchamplain/metadata.xml
@@ -5,4 +5,10 @@
 		<email>gnome@gentoo.org</email>
 		<name>Gentoo GNOME Desktop</name>
 	</maintainer>
+	<longdescription lang="en">
+		libchamplain is a Gtk widget displaying zoomable and pannable maps that can be
+		loaded from various network sources. It supports overlay layers, markers, and
+		custom elements displayed on top of the maps. The library is written in C but
+		other language mappings are also available thanks to GObject-introspection.
+	</longdescription>
 </pkgmetadata>